Various fixex to make HEAD compile. I hope I did break nothing. Modified: trunk/reactos/hal/halx86/generic/processor.c Modified: trunk/reactos/lib/advapi32/sec/trustee.c Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c Modified: trunk/reactos/subsys/ntvdm/ntvdm.c Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/system/setup/setup.c Modified: trunk/reactos/subsys/system/winlogon/setup.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____
Modified: trunk/reactos/hal/halx86/generic/processor.c --- trunk/reactos/hal/halx86/generic/processor.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/hal/halx86/generic/processor.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -39,7 +39,9 @@
HalStartNextProcessor(ULONG Unknown1, ULONG ProcessorStack) { +#if 0 DPRINT("HalStartNextProcessor(%x %x)\n", ProcessorNumber, ProcessorStack); +#endif
return TRUE; } _____
Modified: trunk/reactos/lib/advapi32/sec/trustee.c --- trunk/reactos/lib/advapi32/sec/trustee.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/lib/advapi32/sec/trustee.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -198,8 +198,10 @@
SE_OBJECT_TYPE ObjectType, LPSTR ObjectTypeName, LPSTR InheritedObjectTypeName, LPSTR Name) { +#if 0 DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_a(Name)); +#endif
pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -217,8 +219,10 @@ SE_OBJECT_TYPE ObjectType, LPWSTR ObjectTypeName, LPWSTR InheritedObjectTypeName, LPWSTR Name) { +#if 0 DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_w(Name)); +#endif
pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; _____
Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -928,7 +928,9 @@
{ DWORD dwError;
+#if 0 DPRINT("UnlockServiceDatabase(%x)\n", hSCManager); +#endif
HandleBind();
_____
Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c --- trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -108,7 +108,7 @@
}
default: - DPRINT("Unknown notification code 0x%x sent to the desktop window!\n", nmh->code); + DPRINT("Unknown notification code 0x%x sent to the desktop window!\n", nmh->hdr.code); return 0; } } _____
Modified: trunk/reactos/subsys/ntvdm/ntvdm.c --- trunk/reactos/subsys/ntvdm/ntvdm.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/ntvdm/ntvdm.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -16,6 +16,9 @@
#include <wchar.h> #include "resource.h"
+#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/smss/client.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -62,6 +62,7 @@
VOID FASTCALL SmpSetClientInitialized (PSM_CLIENT_DATA Client) { + DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, Client); Client->Flags |= SM_CLIENT_FLAG_INITIALIZED; } /********************************************************************** @@ -101,8 +102,10 @@ Client = SmpClientDirectory.Client; while (NULL != Client) { + DPRINT("SM: %s: Client==%08lx\n", __FUNCTION__, Client); if (SubsystemId == Client->SubsystemId) { + DPRINT("SM: %s: FOUND Client==%08lx\n", __FUNCTION__, Client); break; } if(NULL != Parent) _____
Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/system/setup/setup.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -29,6 +29,9 @@
#include <syssetup/syssetup.h> #include <userenv.h>
+#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/system/winlogon/setup.c --- trunk/reactos/subsys/system/winlogon/setup.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/system/winlogon/setup.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -33,6 +33,9 @@
#include "setup.h"
+#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #define NDEBUG #include <debug.h>
_____
Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -1160,8 +1160,10 @@
if(vkPtr->wch[CapsState] == wChar) { CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState]; +#if 0 DPRINT("nMod %d Vk %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n", nMod, wVirtKey, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits); +#endif return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff)); } }