- Fix KiDispatchException to unmask KI_EXCEPTION_INTERNAL when setting the exception...

[reactos.git] / reactos / ntoskrnl / rtl / misc.c

diff --git a/reactos/ntoskrnl/rtl/misc.c b/reactos/ntoskrnl/rtl/misc.c
index 4874dde..9e2a565 100644 (file)
--- a/reactos/ntoskrnl/rtl/misc.c
+++ b/reactos/ntoskrnl/rtl/misc.c
@@ -30,8 +30,7 @@ DebugPrint(IN PANSI_STRING DebugString,
            IN ULONG Level)
 {
     /* Temporary hack */
-    //KdpPrintString(DebugString->Buffer, DebugString->Length);
-    //HalDisplayString((PCHAR)DebugString->Buffer);
+    KdpPrintString(DebugString->Buffer, DebugString->Length);
     return STATUS_SUCCESS;
 }
 
@@ -59,12 +58,12 @@ RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation)
       lpVersionInformation->dwMinorVersion = NtMinorVersion;
       lpVersionInformation->dwBuildNumber = NtBuildNumber;
       lpVersionInformation->dwPlatformId = VER_PLATFORM_WIN32_NT;
-      if(((NtOSCSDVersion >> 8) & 0xFF) != 0)
+      if(((CmNtCSDVersion >> 8) & 0xFF) != 0)
       {
         int i = _snwprintf(lpVersionInformation->szCSDVersion,
                            (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1,
                            L"Service Pack %d",
-                           ((NtOSCSDVersion >> 8) & 0xFF));
+                           ((CmNtCSDVersion >> 8) & 0xFF));
         lpVersionInformation->szCSDVersion[i] = L'\0';
       }
       else
@@ -74,8 +73,8 @@ RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation)
       if (lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW))
       {
          RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)lpVersionInformation;
-         InfoEx->wServicePackMajor = (USHORT)(NtOSCSDVersion >> 8) & 0xFF;
-         InfoEx->wServicePackMinor = (USHORT)(NtOSCSDVersion & 0xFF);
+         InfoEx->wServicePackMajor = (USHORT)(CmNtCSDVersion >> 8) & 0xFF;
+         InfoEx->wServicePackMinor = (USHORT)(CmNtCSDVersion & 0xFF);
          InfoEx->wSuiteMask = (USHORT)SharedUserData->SuiteMask;
          InfoEx->wProductType = SharedUserData->NtProductType;
       }
@@ -86,5 +85,3 @@ RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation)
    return STATUS_INVALID_PARAMETER;
 }
 
-
-