[ros-diffs] [tkreuzer] 54881: [WDM] Add missing #if (NTDDI_VERSION >= ...) NTOSKRNL/LPC] Don't check if ReplyMessage is NULL inside SEH, since it's dereferenced later anyway [WIN32K] Don't try to print uniniti...

Author: tkreuzer
Date: Sun Jan  8 21:17:40 2012
New Revision: 54881

URL: http://svn.reactos.org/svn/reactos?rev=54881&view=rev
Log:
[WDM] Add missing #if (NTDDI_VERSION >= ...)
NTOSKRNL/LPC] Don't check if ReplyMessage is NULL inside SEH, since it's
dereferenced later anyway
[WIN32K] Don't try to print uninitialized variables
Patch by Samuel Serapion

Modified:
    trunk/reactos/include/ddk/wdm.h
    trunk/reactos/include/xdk/iotypes.h
    trunk/reactos/ntoskrnl/lpc/reply.c
    trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c

Modified: trunk/reactos/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5488…
==============================================================================
--- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Jan  8 21:17:40 2012
@@ -4952,6 +4952,7 @@
   FileIdFullDirectoryInformation,
   FileValidDataLengthInformation,
   FileShortNameInformation,
+#if (NTDDI_VERSION >= NTDDI_VISTA)
   FileIoCompletionNotificationInformation,
   FileIoStatusBlockRangeInformation,
   FileIoPriorityHintInformation,
@@ -4961,12 +4962,15 @@
   FileProcessIdsUsingFileInformation,
   FileNormalizedNameInformation,
   FileNetworkPhysicalNameInformation,
+#endif
+#if (NTDDI_VERSION >= NTDDI_WIN7)
   FileIdGlobalTxDirectoryInformation,
   FileIsRemoteDeviceInformation,
   FileAttributeCacheInformation,
   FileNumaNodeInformation,
   FileStandardLinkInformation,
   FileRemoteProtocolInformation,
+#endif
   FileMaximumInformation
 } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;
 

Modified: trunk/reactos/include/xdk/iotypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=…
==============================================================================
--- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Sun Jan  8 21:17:40 2012
@@ -1283,6 +1283,7 @@
   FileIdFullDirectoryInformation,
   FileValidDataLengthInformation,
   FileShortNameInformation,
+#if (NTDDI_VERSION >= NTDDI_VISTA)
   FileIoCompletionNotificationInformation,
   FileIoStatusBlockRangeInformation,
   FileIoPriorityHintInformation,
@@ -1292,12 +1293,15 @@
   FileProcessIdsUsingFileInformation,
   FileNormalizedNameInformation,
   FileNetworkPhysicalNameInformation,
+#endif
+#if (NTDDI_VERSION >= NTDDI_WIN7)
   FileIdGlobalTxDirectoryInformation,
   FileIsRemoteDeviceInformation,
   FileAttributeCacheInformation,
   FileNumaNodeInformation,
   FileStandardLinkInformation,
   FileRemoteProtocolInformation,
+#endif
   FileMaximumInformation
 } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;
 

Modified: trunk/reactos/ntoskrnl/lpc/reply.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=5…
==============================================================================
--- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Sun Jan  8 21:17:40 2012
@@ -160,12 +160,9 @@
     {
         _SEH2_TRY
         {
-            if (ReplyMessage != NULL)
-            {
-                ProbeForRead(ReplyMessage, sizeof(PORT_MESSAGE), sizeof(ULONG));
-                /*RtlCopyMemory(&CapturedReplyMessage, ReplyMessage,
sizeof(PORT_MESSAGE));
-                ReplyMessage = &CapturedReplyMessage;*/
-            }
+            ProbeForRead(ReplyMessage, sizeof(PORT_MESSAGE), sizeof(ULONG));
+            /*RtlCopyMemory(&CapturedReplyMessage, ReplyMessage,
sizeof(PORT_MESSAGE));
+            ReplyMessage = &CapturedReplyMessage;*/
         }
         _SEH2_EXCEPT(ExSystemExceptionFilter())
         {

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun Jan  8
21:17:40 2012
@@ -791,8 +791,7 @@
     /* Call WH_KEYBOARD_LL hook */
     if (co_CallLowLevelKeyboardHook(wVk, wScanCode, dwFlags, bInjected, dwTime,
dwExtraInfo))
     {
-        ERR("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL
hook\n",
-            Msg.message, Msg.wParam, Msg.lParam);
+        ERR("Kbd msg dropped by WH_KEYBOARD_LL hook\n");
         bPostMsg = FALSE;
     }