mirror of
https://github.com/reactos/reactos.git
synced 2025-06-26 13:09:43 +00:00
Various fixex to make HEAD compile.
I hope I did break nothing. svn path=/trunk/; revision=16854
This commit is contained in:
parent
c20aa760c5
commit
3b17d563fa
9 changed files with 23 additions and 1 deletions
|
@ -39,7 +39,9 @@ BOOLEAN STDCALL
|
||||||
HalStartNextProcessor(ULONG Unknown1,
|
HalStartNextProcessor(ULONG Unknown1,
|
||||||
ULONG ProcessorStack)
|
ULONG ProcessorStack)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
DPRINT("HalStartNextProcessor(%x %x)\n", ProcessorNumber, ProcessorStack);
|
DPRINT("HalStartNextProcessor(%x %x)\n", ProcessorNumber, ProcessorStack);
|
||||||
|
#endif
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -198,8 +198,10 @@ BuildTrusteeWithObjectsAndNameA(PTRUSTEEA pTrustee, POBJECTS_AND_NAME_A pObjName
|
||||||
SE_OBJECT_TYPE ObjectType, LPSTR ObjectTypeName,
|
SE_OBJECT_TYPE ObjectType, LPSTR ObjectTypeName,
|
||||||
LPSTR InheritedObjectTypeName, LPSTR Name)
|
LPSTR InheritedObjectTypeName, LPSTR Name)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName,
|
DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName,
|
||||||
ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_a(Name));
|
ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_a(Name));
|
||||||
|
#endif
|
||||||
|
|
||||||
pTrustee->pMultipleTrustee = NULL;
|
pTrustee->pMultipleTrustee = NULL;
|
||||||
pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
|
pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
|
||||||
|
@ -217,8 +219,10 @@ BuildTrusteeWithObjectsAndNameW(PTRUSTEEW pTrustee, POBJECTS_AND_NAME_W pObjName
|
||||||
SE_OBJECT_TYPE ObjectType, LPWSTR ObjectTypeName,
|
SE_OBJECT_TYPE ObjectType, LPWSTR ObjectTypeName,
|
||||||
LPWSTR InheritedObjectTypeName, LPWSTR Name)
|
LPWSTR InheritedObjectTypeName, LPWSTR Name)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName,
|
DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName,
|
||||||
ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_w(Name));
|
ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_w(Name));
|
||||||
|
#endif
|
||||||
|
|
||||||
pTrustee->pMultipleTrustee = NULL;
|
pTrustee->pMultipleTrustee = NULL;
|
||||||
pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
|
pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
|
||||||
|
|
|
@ -928,7 +928,9 @@ UnlockServiceDatabase(SC_LOCK ScLock)
|
||||||
{
|
{
|
||||||
DWORD dwError;
|
DWORD dwError;
|
||||||
|
|
||||||
|
#if 0
|
||||||
DPRINT("UnlockServiceDatabase(%x)\n", hSCManager);
|
DPRINT("UnlockServiceDatabase(%x)\n", hSCManager);
|
||||||
|
#endif
|
||||||
|
|
||||||
HandleBind();
|
HandleBind();
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@ DtbgWindowProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||||
}
|
}
|
||||||
|
|
||||||
default:
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,9 @@
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
|
#define NTOS_MODE_USER
|
||||||
|
#include <ndk/ntndk.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,7 @@ SmInitializeClientManagement (VOID)
|
||||||
VOID FASTCALL
|
VOID FASTCALL
|
||||||
SmpSetClientInitialized (PSM_CLIENT_DATA Client)
|
SmpSetClientInitialized (PSM_CLIENT_DATA Client)
|
||||||
{
|
{
|
||||||
|
DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, Client);
|
||||||
Client->Flags |= SM_CLIENT_FLAG_INITIALIZED;
|
Client->Flags |= SM_CLIENT_FLAG_INITIALIZED;
|
||||||
}
|
}
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
|
@ -101,8 +102,10 @@ SmpLookupClient (USHORT SubsystemId,
|
||||||
Client = SmpClientDirectory.Client;
|
Client = SmpClientDirectory.Client;
|
||||||
while (NULL != Client)
|
while (NULL != Client)
|
||||||
{
|
{
|
||||||
|
DPRINT("SM: %s: Client==%08lx\n", __FUNCTION__, Client);
|
||||||
if (SubsystemId == Client->SubsystemId)
|
if (SubsystemId == Client->SubsystemId)
|
||||||
{
|
{
|
||||||
|
DPRINT("SM: %s: FOUND Client==%08lx\n", __FUNCTION__, Client);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if(NULL != Parent)
|
if(NULL != Parent)
|
||||||
|
|
|
@ -29,6 +29,9 @@
|
||||||
#include <syssetup/syssetup.h>
|
#include <syssetup/syssetup.h>
|
||||||
#include <userenv.h>
|
#include <userenv.h>
|
||||||
|
|
||||||
|
#define NTOS_MODE_USER
|
||||||
|
#include <ndk/ntndk.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,9 @@
|
||||||
|
|
||||||
#include "setup.h"
|
#include "setup.h"
|
||||||
|
|
||||||
|
#define NTOS_MODE_USER
|
||||||
|
#include <ndk/ntndk.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -1160,8 +1160,10 @@ NtUserVkKeyScanEx(
|
||||||
if(vkPtr->wch[CapsState] == wChar)
|
if(vkPtr->wch[CapsState] == wChar)
|
||||||
{
|
{
|
||||||
CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState];
|
CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState];
|
||||||
|
#if 0
|
||||||
DPRINT("nMod %d Vk %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n",
|
DPRINT("nMod %d Vk %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n",
|
||||||
nMod, wVirtKey, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits);
|
nMod, wVirtKey, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits);
|
||||||
|
#endif
|
||||||
return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff));
|
return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue