Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CSRSRV]

Browse source 
- Define NDEBUG only once
- Don't define helper macro in the source
- DPRINT fixes
[NTDLL/LDR]
- More verbose DPRINT for initialization failure

svn path=/trunk/; revision=53072
This commit is contained in:
Thomas Faber 2011-08-05 00:50:51 +00:00
parent 4b7e537cf9
commit 9c2f3b9dec
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/ntdll/ldr/ldrinit.c
View file

@ -1996,9 +1996,11 @@ NTAPI
LdrpInitFailure(NTSTATUS Status) LdrpInitFailure(NTSTATUS Status)
{ {
ULONG Response; ULONG Response;
PPEB Peb = NtCurrentPeb();
/* Print a debug message */ /* Print a debug message */
DPRINT1("LDR: Process initialization failure; NTSTATUS = %08lx\n", Status); DPRINT1("LDR: Process initialization failure for %wZ; NTSTATUS = %08lx\n",
&Peb->ProcessParameters->ImagePathName, Status);
/* Raise a hard error */ /* Raise a hard error */
if (!LdrpFatalHardErrorCount) if (!LdrpFatalHardErrorCount)

2
reactos/subsystems/win32/csrss/csrsrv/api/process.c
View file

@ -105,7 +105,7 @@ PCSRSS_PROCESS_DATA WINAPI CsrCreateProcessData(HANDLE ProcessId)
PROCESS_ALL_ACCESS, PROCESS_ALL_ACCESS,
&ObjectAttributes, &ObjectAttributes,
&ClientId); &ClientId);
DPRINT1("CSR PRocess: %p Handle: %p\n", pProcessData, pProcessData->Process); DPRINT1("CSR Process: %p Handle: %p\n", pProcessData, pProcessData->Process);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ProcessData[hash] = pProcessData->next; ProcessData[hash] = pProcessData->next;

3
reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
View file

@ -12,8 +12,6 @@
#include <srv.h> #include <srv.h>
#define NDEBUG
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
@ -181,7 +179,6 @@ CsrSrvCreateSharedSection(IN PCHAR ParameterValue)
if (!NT_SUCCESS(Status)) return Status; if (!NT_SUCCESS(Status)) return Status;
/* Multiply by 1024 entries and round to page size */ /* Multiply by 1024 entries and round to page size */
#define ROUND_UP(n,size) (((ULONG)(n) + (size - 1)) & ~(size - 1)) // hax
CsrSrvSharedSectionSize = ROUND_UP(Size * 1024, CsrNtSysInfo.PageSize); CsrSrvSharedSectionSize = ROUND_UP(Size * 1024, CsrNtSysInfo.PageSize);
DPRINT1("Size: %lx\n", CsrSrvSharedSectionSize); DPRINT1("Size: %lx\n", CsrSrvSharedSectionSize);

9
reactos/subsystems/win32/csrss/csrsrv/init.c
View file

@ -514,9 +514,12 @@ CsrpCreateHeap (int argc, char ** argv, char ** envp)
Status = CsrSrvCreateSharedSection(Value); Status = CsrSrvCreateSharedSection(Value);
DPRINT1("Status: %lx\n", Status); if (Status != STATUS_SUCCESS)
ASSERT(Status == STATUS_SUCCESS); {
DPRINT1("CsrSrvCreateSharedSection failed with status 0x%08lx\n", Status);
ASSERT(FALSE);
}
BasepFakeStaticServerData(); BasepFakeStaticServerData();
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

4
reactos/subsystems/win32/csrss/csrsrv/srv.h
View file

@ -18,3 +18,7 @@
/* Internal CSRSS Headers */ /* Internal CSRSS Headers */
#include <api.h> #include <api.h>
#include <csrplugin.h> #include <csrplugin.h>
/* Defines */
#define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
#define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l))