[SMSS]

* Fix some print specifiers.

svn path=/trunk/; revision=59972

diff --git a/reactos/base/system/smss/pagefile.c b/reactos/base/system/smss/pagefile.c
index c947072..889dbeb 100644 (file)
--- a/reactos/base/system/smss/pagefile.c
+++ b/reactos/base/system/smss/pagefile.c
@@ -94,7 +94,7 @@ SmpCreatePagingFileDescriptor(IN PUNICODE_STRING PageFileToken)
     /* Make sure we don't have too many */
     if (SmpNumberOfPagingFiles >= 16)
     {
-        DPRINT1("SMSS:PFILE: Too many paging files specified - %d\n",
+        DPRINT1("SMSS:PFILE: Too many paging files specified - %lu\n",
                 SmpNumberOfPagingFiles);
         return STATUS_TOO_MANY_PAGING_FILES;
     }

diff --git a/reactos/base/system/smss/sminit.c b/reactos/base/system/smss/sminit.c
index 1f28e5f..206c8b7 100644 (file)
--- a/reactos/base/system/smss/sminit.c
+++ b/reactos/base/system/smss/sminit.c
@@ -236,7 +236,7 @@ SmpConfigureProtectionMode(IN PWSTR ValueName,
 
     /* Recreate the security descriptors to take into account security mode */
     SmpCreateSecurityDescriptors(FALSE);
-    DPRINT("SmpProtectionMode: %d\n", SmpProtectionMode);
+    DPRINT("SmpProtectionMode: %lu\n", SmpProtectionMode);
     return STATUS_SUCCESS;
 }
 
@@ -261,7 +261,7 @@ SmpConfigureAllowProtectedRenames(IN PWSTR ValueName,
         SmpAllowProtectedRenames = 0;
     }
 
-    DPRINT("SmpAllowProtectedRenames: %d\n", SmpAllowProtectedRenames);
+    DPRINT("SmpAllowProtectedRenames: %lu\n", SmpAllowProtectedRenames);
     return STATUS_SUCCESS;
 }
 
@@ -1819,13 +1819,13 @@ SmpCreateDynamicEnvironmentVariables(VOID)
     {
         /* To combine it into a single string */
         swprintf((PWCHAR)PartialInfo->Data + wcslen((PWCHAR)PartialInfo->Data),
-                 L", %ws",
+                 L", %S",
                  PartialInfo2->Data);
     }
 
     /* So that we can set this as the PROCESSOR_IDENTIFIER variable */
     RtlInitUnicodeString(&ValueName, L"PROCESSOR_IDENTIFIER");
-    DPRINT("Setting %wZ to %S\n", &ValueName, PartialInfo->Data);
+    DPRINT("Setting %wZ to %s\n", &ValueName, PartialInfo->Data);
     Status = NtSetValueKey(KeyHandle,
                            &ValueName,
                            0,
@@ -1884,7 +1884,7 @@ SmpCreateDynamicEnvironmentVariables(VOID)
 
     /* And finally, write the number of CPUs */
     RtlInitUnicodeString(&ValueName, L"NUMBER_OF_PROCESSORS");
-    swprintf(ValueBuffer, L"%u", BasicInfo.NumberOfProcessors);
+    swprintf(ValueBuffer, L"%d", BasicInfo.NumberOfProcessors);
     DPRINT("Setting %wZ to %S\n", &ValueName, ValueBuffer);
     Status = NtSetValueKey(KeyHandle,
                            &ValueName,

diff --git a/reactos/base/system/smss/smsessn.c b/reactos/base/system/smss/smsessn.c
index 805f99c..2422d59 100644 (file)
--- a/reactos/base/system/smss/smsessn.c
+++ b/reactos/base/system/smss/smsessn.c
@@ -184,7 +184,7 @@ SmpGetProcessMuSessionId(IN HANDLE ProcessHandle,
     else
     {
         /* Failure -- assume session zero */
-        DPRINT1("SMSS: GetProcessMuSessionId, Process=%x, Status=%x\n",
+        DPRINT1("SMSS: GetProcessMuSessionId, Process=%p, Status=%x\n",
                 ProcessHandle, Status);
         *SessionId = 0;
     }
@@ -207,7 +207,7 @@ SmpSetProcessMuSessionId(IN HANDLE ProcessHandle,
                                      sizeof(SessionId));
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("SMSS: SetProcessMuSessionId, Process=%x, Status=%x\n",
+        DPRINT1("SMSS: SetProcessMuSessionId, Process=%p, Status=%x\n",
                 ProcessHandle, Status);
     }
 

diff --git a/reactos/base/system/smss/smss.c b/reactos/base/system/smss/smss.c
index 9f6b4bd..9cfd774 100644 (file)
--- a/reactos/base/system/smss/smss.c
+++ b/reactos/base/system/smss/smss.c
@@ -420,7 +420,7 @@ SmpUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo)
     UNICODE_STRING DestinationString;
 
     /* Print and breakpoint into the debugger */
-    DbgPrint("SMSS: Unhandled exception - Status == %x  IP == %x\n",
+    DbgPrint("SMSS: Unhandled exception - Status == %x  IP == %p\n",
              ExceptionInfo->ExceptionRecord->ExceptionCode,
              ExceptionInfo->ExceptionRecord->ExceptionAddress);
     DbgPrint("      Memory Address: %x  Read/Write: %x\n",

diff --git a/reactos/base/system/smss/smsubsys.c b/reactos/base/system/smss/smsubsys.c
index e18435e..b15bdde 100644 (file)
--- a/reactos/base/system/smss/smsubsys.c
+++ b/reactos/base/system/smss/smsubsys.c
@@ -330,7 +330,7 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName,
         {
             /* Odd failure -- but handle it anyway */
             Status = STATUS_NO_SUCH_PACKAGE;
-            DPRINT1("SMSS: SmpLoadSubSystem - SmpLocateKnownSubSysByType Failed with  Status %lx for sessionid %ld\n",
+            DPRINT1("SMSS: SmpLoadSubSystem - SmpLocateKnownSubSysByType Failed with  Status %lx for sessionid %lu\n",
                     Status,
                     MuSessionId);
             goto Quickie;
@@ -347,7 +347,7 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName,
         if (!NT_SUCCESS(Status))
         {
             /* Fail since this is critical */
-            DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with  Status %lx for sessionid %ld\n",
+            DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with  Status %lx for sessionid %lu\n",
                     Status,
                     MuSessionId);
             goto Quickie;
@@ -364,7 +364,7 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName,
         if (!NT_SUCCESS(Status))
         {
             /* Fail since this is critical */
-            DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with  Status %lx for sessionid %ld\n",
+            DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with  Status %lx for sessionid %lu\n",
                     Status,
                     MuSessionId);
             goto Quickie;
@@ -387,7 +387,7 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName,
         {
             /* Delete the session and handle failure if the LPC call failed */
             SmpDeleteSession(CreateSession->SessionId);
-            DPRINT1("SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with  Status %lx for sessionid %ld\n",
+            DPRINT1("SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with  Status %lx for sessionid %lu\n",
                     Status,
                     CreateSession->SessionId);
             goto Quickie;
@@ -422,7 +422,7 @@ SmpLoadSubSystem(IN PUNICODE_STRING FileName,
         if (Status != STATUS_WAIT_0)
         {
             /* Something is wrong with the subsystem, so back out of everything */
-            DPRINT1("SMSS: SmpLoadSubSystem - Timeout waiting for subsystem connect with Status %lx for sessionid %ld\n",
+            DPRINT1("SMSS: SmpLoadSubSystem - Timeout waiting for subsystem connect with Status %lx for sessionid %lu\n",
                     Status,
                     MuSessionId);
             goto Quickie;
@@ -618,7 +618,7 @@ SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId,
         }
         if (!NT_SUCCESS(Status))
         {
-            DbgPrint("SMSS: Subsystem execute failed (%WZ)\n", &RegEntry->Value);
+            DbgPrint("SMSS: Subsystem execute failed (%wZ)\n", &RegEntry->Value);
             return Status;
         }