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

fix some format strings

Browse source 
svn path=/trunk/; revision=30652
This commit is contained in:
Christoph von Wittich 2007-11-21 21:25:26 +00:00
parent c045e00d74
commit 45c4d83bf6
6 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
reactos/base/system/smss/client.c
View file

@ -64,7 +64,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); DPRINT("SM: %s(%p) called\n", __FUNCTION__, Client);
Client->Flags |= SM_CLIENT_FLAG_INITIALIZED; Client->Flags |= SM_CLIENT_FLAG_INITIALIZED;
} }
/********************************************************************** /**********************************************************************
@ -141,7 +141,7 @@ SmpLookupClient (USHORT SubsystemId)
static NTSTATUS STDCALL static NTSTATUS STDCALL
SmpDestroyClientObject (PSM_CLIENT_DATA Client, NTSTATUS DestroyReason) SmpDestroyClientObject (PSM_CLIENT_DATA Client, NTSTATUS DestroyReason)
{ {
DPRINT("SM:%s(%08lx,%08lx) called\n", __FUNCTION__, DestroyReason); DPRINT("SM:%s(%p,%08lx) called\n", __FUNCTION__, Client, DestroyReason);
/* TODO: send shutdown to the SB port */ /* TODO: send shutdown to the SB port */
NtTerminateProcess (Client->ServerProcess, DestroyReason); NtTerminateProcess (Client->ServerProcess, DestroyReason);
RtlFreeHeap (SmpHeap, 0, Client); RtlFreeHeap (SmpHeap, 0, Client);
@ -173,7 +173,7 @@ SmBeginClientInitialization (IN PSM_PORT_MESSAGE Request,
HANDLE Process; HANDLE Process;
DPRINT("SM: %s(%08lx,%08lx) called\n", __FUNCTION__, DPRINT("SM: %s(%p,%p) called\n", __FUNCTION__,
Request, ClientData); Request, ClientData);
RtlEnterCriticalSection (& SmpClientDirectory.Lock); RtlEnterCriticalSection (& SmpClientDirectory.Lock);
@ -366,7 +366,7 @@ static VOID STDCALL SmpTimeoutCandidateClient (PVOID x)
HANDLE CandidateClientProcessHandle = (HANDLE) x; HANDLE CandidateClientProcessHandle = (HANDLE) x;
LARGE_INTEGER TimeOut; LARGE_INTEGER TimeOut;
DPRINT("SM: %s(%lx) called\n", __FUNCTION__, x); DPRINT("SM: %s(%p) called\n", __FUNCTION__, x);
TimeOut.QuadPart = (LONGLONG) -300000000L; // 30s TimeOut.QuadPart = (LONGLONG) -300000000L; // 30s
Status = NtWaitForSingleObject (CandidateClientProcessHandle, Status = NtWaitForSingleObject (CandidateClientProcessHandle,
@ -377,7 +377,7 @@ static VOID STDCALL SmpTimeoutCandidateClient (PVOID x)
RtlEnterCriticalSection (& SmpClientDirectory.Lock); RtlEnterCriticalSection (& SmpClientDirectory.Lock);
if (NULL != SmpClientDirectory.CandidateClient) if (NULL != SmpClientDirectory.CandidateClient)
{ {
DPRINT("SM:%s: destroy candidate %08lx\n", __FUNCTION__, DPRINT("SM:%s: destroy candidate %p\n", __FUNCTION__,
SmpClientDirectory.CandidateClient); SmpClientDirectory.CandidateClient);
Status = SmpDestroyClientObject (SmpClientDirectory.CandidateClient, Status = SmpDestroyClientObject (SmpClientDirectory.CandidateClient,
STATUS_TIMEOUT); STATUS_TIMEOUT);
@ -411,7 +411,7 @@ SmCreateClient (PRTL_USER_PROCESS_INFORMATION ProcessInfo, PWSTR ProgramName)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DPRINT("SM: %s(%lx, %S) called\n", __FUNCTION__, ProcessInfo->ProcessHandle, ProgramName); DPRINT("SM: %s(%p, %S) called\n", __FUNCTION__, ProcessInfo->ProcessHandle, ProgramName);
RtlEnterCriticalSection (& SmpClientDirectory.Lock); RtlEnterCriticalSection (& SmpClientDirectory.Lock);
/* /*
@ -425,7 +425,7 @@ SmCreateClient (PRTL_USER_PROCESS_INFORMATION ProcessInfo, PWSTR ProgramName)
*/ */
if (SM_INVALID_CLIENT_INDEX == SmpGetFirstFreeClientEntry()) if (SM_INVALID_CLIENT_INDEX == SmpGetFirstFreeClientEntry())
{ {
DPRINT("SM: %s(%lx): out of memory!\n", DPRINT("SM: %s(%p): out of memory!\n",
__FUNCTION__, ProcessInfo->ProcessHandle); __FUNCTION__, ProcessInfo->ProcessHandle);
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
} }
@ -438,13 +438,13 @@ SmCreateClient (PRTL_USER_PROCESS_INFORMATION ProcessInfo, PWSTR ProgramName)
sizeof (SM_CLIENT_DATA)); sizeof (SM_CLIENT_DATA));
if (NULL == SmpClientDirectory.CandidateClient) if (NULL == SmpClientDirectory.CandidateClient)
{ {
DPRINT("SM: %s(%lx): out of memory!\n", DPRINT("SM: %s(%p): out of memory!\n",
__FUNCTION__, ProcessInfo->ProcessHandle); __FUNCTION__, ProcessInfo->ProcessHandle);
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
} }
else else
{ {
DPRINT("SM:%s(%08lx,%S): candidate is %08lx\n", __FUNCTION__, DPRINT("SM:%s(%p,%S): candidate is %p\n", __FUNCTION__,
ProcessInfo, ProgramName, SmpClientDirectory.CandidateClient); ProcessInfo, ProgramName, SmpClientDirectory.CandidateClient);
/* Initialize the candidate client. */ /* Initialize the candidate client. */
RtlInitializeCriticalSection(& SmpClientDirectory.CandidateClient->Lock); RtlInitializeCriticalSection(& SmpClientDirectory.CandidateClient->Lock);
@ -460,7 +460,7 @@ SmCreateClient (PRTL_USER_PROCESS_INFORMATION ProcessInfo, PWSTR ProgramName)
SM_SB_NAME_MAX_LENGTH); SM_SB_NAME_MAX_LENGTH);
} }
} else { } else {
DPRINT1("SM: %s: CandidateClient %08lx pending!\n", __FUNCTION__, DPRINT1("SM: %s: CandidateClient %p pending!\n", __FUNCTION__,
SmpClientDirectory.CandidateClient); SmpClientDirectory.CandidateClient);
Status = STATUS_DEVICE_BUSY; Status = STATUS_DEVICE_BUSY;
} }
@ -528,7 +528,7 @@ SmGetClientBasicInformation (PSM_BASIC_INFORMATION i)
INT ClientIndex = 0; INT ClientIndex = 0;
INT Index = 0; INT Index = 0;
DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, i); DPRINT("SM: %s(%p) called\n", __FUNCTION__, i);
RtlEnterCriticalSection (& SmpClientDirectory.Lock); RtlEnterCriticalSection (& SmpClientDirectory.Lock);
@ -563,7 +563,7 @@ SmGetSubSystemInformation (PSM_SUBSYSTEM_INFORMATION i)
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
INT ClientIndex = SM_INVALID_CLIENT_INDEX; INT ClientIndex = SM_INVALID_CLIENT_INDEX;
DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, i); DPRINT("SM: %s(%p) called\n", __FUNCTION__, i);
RtlEnterCriticalSection (& SmpClientDirectory.Lock); RtlEnterCriticalSection (& SmpClientDirectory.Lock);
ClientIndex = SmpLookupClient (i->SubSystemId); ClientIndex = SmpLookupClient (i->SubSystemId);

2
reactos/base/system/smss/initmv.c
View file

@ -374,7 +374,7 @@ SmpMoveFilesQueryRoutine(IN PWSTR ValueName,
static LPWSTR FistFileName = NULL; static LPWSTR FistFileName = NULL;
DPRINT("SmpMoveFilesQueryRoutine() called \n"); DPRINT("SmpMoveFilesQueryRoutine() called \n");
DPRINT("ValueData = %S \n", ValueData); DPRINT("ValueData = %S \n", (PWSTR) ValueData);
if( !FistFileName ) if( !FistFileName )
{ {

6
reactos/base/system/smss/initss.c
View file

@ -59,7 +59,7 @@ NTSTATUS STDCALL SmRegisterInternalSubsystem (LPWSTR PgmName,
ProcessInfo.Size = sizeof ProcessInfo; ProcessInfo.Size = sizeof ProcessInfo;
ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId; ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId;
ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId; ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId;
DPRINT("SM: %s: ProcessInfo.ProcessHandle=%lx\n", DPRINT("SM: %s: ProcessInfo.ProcessHandle=%p\n",
__FUNCTION__,ProcessInfo.ProcessHandle); __FUNCTION__,ProcessInfo.ProcessHandle);
Status = SmCreateClient (& ProcessInfo, PgmName); Status = SmCreateClient (& ProcessInfo, PgmName);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
@ -164,14 +164,14 @@ SmLoadSubsystems(VOID)
Status = SmRegisterInternalSubsystem (L"Session Manager", IMAGE_SUBSYSTEM_NATIVE, & hSmApiPort); Status = SmRegisterInternalSubsystem (L"Session Manager", IMAGE_SUBSYSTEM_NATIVE, & hSmApiPort);
if(!NT_SUCCESS(Status)) if(!NT_SUCCESS(Status))
{ {
DPRINT1("SM: SmRegisterInternalSubsystem failed Status=%08lx\n", __FUNCTION__, Status); DPRINT1("SM: %s SmRegisterInternalSubsystem failed Status=%08lx\n", __FUNCTION__, Status);
return Status; return Status;
} }
/* Load Required subsystems (Debug Windows) */ /* Load Required subsystems (Debug Windows) */
Status = SmpLoadRequiredSubsystems(); Status = SmpLoadRequiredSubsystems();
if(!NT_SUCCESS(Status)) if(!NT_SUCCESS(Status))
{ {
DPRINT1("SM: SmpLoadRequiredSubsystems failed Status=%08lx\n", __FUNCTION__, Status); DPRINT1("SM: %s SmpLoadRequiredSubsystems failed Status=%08lx\n", __FUNCTION__, Status);
return Status; return Status;
} }
/* done */ /* done */

2
reactos/base/system/smss/smapi.c
View file

@ -220,7 +220,7 @@ SmpHandleConnectionRequest (PSM_PORT_MESSAGE Request)
Status = SmBeginClientInitialization (Request, & ClientData); Status = SmBeginClientInitialization (Request, & ClientData);
if(STATUS_SUCCESS == Status) if(STATUS_SUCCESS == Status)
{ {
DPRINT("SM: %s: ClientData = 0x%08lx\n", DPRINT("SM: %s: ClientData = %p\n",
__FUNCTION__, ClientData); __FUNCTION__, ClientData);
/* /*
* OK: the client is an environment subsystem * OK: the client is an environment subsystem

2
reactos/base/system/smss/smapicomp.c
View file

@ -38,7 +38,7 @@ SMAPI(SmCompSes)
DPRINT("SM: %s called\n", __FUNCTION__); DPRINT("SM: %s called\n", __FUNCTION__);
DPRINT("SM: %s: ClientId.UniqueProcess=%lx\n", DPRINT("SM: %s: ClientId.UniqueProcess=%p\n",
__FUNCTION__, Request->Header.ClientId.UniqueProcess); __FUNCTION__, Request->Header.ClientId.UniqueProcess);
Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess); Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))

2
reactos/base/system/smss/smapiexec.c
View file

@ -194,7 +194,7 @@ SMAPI(SmExecPgm)
DPRINT1("SM: %s: Request == NULL!\n", __FUNCTION__); DPRINT1("SM: %s: Request == NULL!\n", __FUNCTION__);
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
DPRINT("SM: %s called from CID(%lx|%lx)\n", DPRINT("SM: %s called from CID(%p|%p)\n",
__FUNCTION__, Request->Header.ClientId.UniqueProcess, __FUNCTION__, Request->Header.ClientId.UniqueProcess,
Request->Header.ClientId.UniqueThread); Request->Header.ClientId.UniqueThread);
ExecPgm = & Request->Request.ExecPgm; ExecPgm = & Request->Request.ExecPgm;