[ros-diffs] [cwittich] 30652: fix some format strings
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Wed Nov 21 22:25:27 CET 2007
Author: cwittich
Date: Thu Nov 22 00:25:26 2007
New Revision: 30652
URL: http://svn.reactos.org/svn/reactos?rev=30652&view=rev
Log:
fix some format strings
Modified:
trunk/reactos/base/system/smss/client.c
trunk/reactos/base/system/smss/initmv.c
trunk/reactos/base/system/smss/initss.c
trunk/reactos/base/system/smss/smapi.c
trunk/reactos/base/system/smss/smapicomp.c
trunk/reactos/base/system/smss/smapiexec.c
Modified: trunk/reactos/base/system/smss/client.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/client.c?rev=30652&r1=30651&r2=30652&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/client.c (original)
+++ trunk/reactos/base/system/smss/client.c Thu Nov 22 00:25:26 2007
@@ -64,7 +64,7 @@
VOID FASTCALL
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;
}
/**********************************************************************
@@ -141,7 +141,7 @@
static NTSTATUS STDCALL
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 */
NtTerminateProcess (Client->ServerProcess, DestroyReason);
RtlFreeHeap (SmpHeap, 0, Client);
@@ -173,7 +173,7 @@
HANDLE Process;
- DPRINT("SM: %s(%08lx,%08lx) called\n", __FUNCTION__,
+ DPRINT("SM: %s(%p,%p) called\n", __FUNCTION__,
Request, ClientData);
RtlEnterCriticalSection (& SmpClientDirectory.Lock);
@@ -366,7 +366,7 @@
HANDLE CandidateClientProcessHandle = (HANDLE) x;
LARGE_INTEGER TimeOut;
- DPRINT("SM: %s(%lx) called\n", __FUNCTION__, x);
+ DPRINT("SM: %s(%p) called\n", __FUNCTION__, x);
TimeOut.QuadPart = (LONGLONG) -300000000L; // 30s
Status = NtWaitForSingleObject (CandidateClientProcessHandle,
@@ -377,7 +377,7 @@
RtlEnterCriticalSection (& SmpClientDirectory.Lock);
if (NULL != SmpClientDirectory.CandidateClient)
{
- DPRINT("SM:%s: destroy candidate %08lx\n", __FUNCTION__,
+ DPRINT("SM:%s: destroy candidate %p\n", __FUNCTION__,
SmpClientDirectory.CandidateClient);
Status = SmpDestroyClientObject (SmpClientDirectory.CandidateClient,
STATUS_TIMEOUT);
@@ -411,7 +411,7 @@
{
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);
/*
@@ -425,7 +425,7 @@
*/
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);
Status = STATUS_NO_MEMORY;
}
@@ -438,13 +438,13 @@
sizeof (SM_CLIENT_DATA));
if (NULL == SmpClientDirectory.CandidateClient)
{
- DPRINT("SM: %s(%lx): out of memory!\n",
+ DPRINT("SM: %s(%p): out of memory!\n",
__FUNCTION__, ProcessInfo->ProcessHandle);
Status = STATUS_NO_MEMORY;
}
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);
/* Initialize the candidate client. */
RtlInitializeCriticalSection(& SmpClientDirectory.CandidateClient->Lock);
@@ -460,7 +460,7 @@
SM_SB_NAME_MAX_LENGTH);
}
} else {
- DPRINT1("SM: %s: CandidateClient %08lx pending!\n", __FUNCTION__,
+ DPRINT1("SM: %s: CandidateClient %p pending!\n", __FUNCTION__,
SmpClientDirectory.CandidateClient);
Status = STATUS_DEVICE_BUSY;
}
@@ -528,7 +528,7 @@
INT ClientIndex = 0;
INT Index = 0;
- DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, i);
+ DPRINT("SM: %s(%p) called\n", __FUNCTION__, i);
RtlEnterCriticalSection (& SmpClientDirectory.Lock);
@@ -563,7 +563,7 @@
NTSTATUS Status = STATUS_SUCCESS;
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);
ClientIndex = SmpLookupClient (i->SubSystemId);
Modified: trunk/reactos/base/system/smss/initmv.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initmv.c?rev=30652&r1=30651&r2=30652&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/initmv.c (original)
+++ trunk/reactos/base/system/smss/initmv.c Thu Nov 22 00:25:26 2007
@@ -374,7 +374,7 @@
static LPWSTR FistFileName = NULL;
DPRINT("SmpMoveFilesQueryRoutine() called \n");
- DPRINT("ValueData = %S \n", ValueData);
+ DPRINT("ValueData = %S \n", (PWSTR) ValueData);
if( !FistFileName )
{
Modified: trunk/reactos/base/system/smss/initss.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initss.c?rev=30652&r1=30651&r2=30652&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/initss.c (original)
+++ trunk/reactos/base/system/smss/initss.c Thu Nov 22 00:25:26 2007
@@ -59,7 +59,7 @@
ProcessInfo.Size = sizeof ProcessInfo;
ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId;
ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId;
- DPRINT("SM: %s: ProcessInfo.ProcessHandle=%lx\n",
+ DPRINT("SM: %s: ProcessInfo.ProcessHandle=%p\n",
__FUNCTION__,ProcessInfo.ProcessHandle);
Status = SmCreateClient (& ProcessInfo, PgmName);
if (NT_SUCCESS(Status))
@@ -164,14 +164,14 @@
Status = SmRegisterInternalSubsystem (L"Session Manager", IMAGE_SUBSYSTEM_NATIVE, & hSmApiPort);
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;
}
/* Load Required subsystems (Debug Windows) */
Status = SmpLoadRequiredSubsystems();
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;
}
/* done */
Modified: trunk/reactos/base/system/smss/smapi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?rev=30652&r1=30651&r2=30652&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/smapi.c (original)
+++ trunk/reactos/base/system/smss/smapi.c Thu Nov 22 00:25:26 2007
@@ -220,7 +220,7 @@
Status = SmBeginClientInitialization (Request, & ClientData);
if(STATUS_SUCCESS == Status)
{
- DPRINT("SM: %s: ClientData = 0x%08lx\n",
+ DPRINT("SM: %s: ClientData = %p\n",
__FUNCTION__, ClientData);
/*
* OK: the client is an environment subsystem
Modified: trunk/reactos/base/system/smss/smapicomp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapicomp.c?rev=30652&r1=30651&r2=30652&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/smapicomp.c (original)
+++ trunk/reactos/base/system/smss/smapicomp.c Thu Nov 22 00:25:26 2007
@@ -38,7 +38,7 @@
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);
Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess);
if (!NT_SUCCESS(Status))
Modified: trunk/reactos/base/system/smss/smapiexec.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapiexec.c?rev=30652&r1=30651&r2=30652&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/smapiexec.c (original)
+++ trunk/reactos/base/system/smss/smapiexec.c Thu Nov 22 00:25:26 2007
@@ -194,7 +194,7 @@
DPRINT1("SM: %s: Request == NULL!\n", __FUNCTION__);
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,
Request->Header.ClientId.UniqueThread);
ExecPgm = & Request->Request.ExecPgm;
More information about the Ros-diffs
mailing list