[ros-diffs] [fireball] 54741: - Misc changes, mostly involving the change in NDK path happened many many revisions ago. I commit this change since the compilability of arwinss branch itself is already broken (...

Author: fireball
Date: Fri Dec 23 18:15:17 2011
New Revision: 54741

URL: http://svn.reactos.org/svn/reactos?rev=54741&view=rev
Log:
- Misc changes, mostly involving the change in NDK path happened many many revisions ago.
I commit this change since the compilability of arwinss branch itself is already broken
(it's supposed to compile in trunk now).

Modified:
    branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c
    branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h
    branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
    branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c
    branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild

Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1] Fri Dec
23 18:15:17 2011
@@ -684,7 +684,6 @@
     PALETTE_ShareUnlockPalette(ppalSrc);
 }
 
-
 VOID
 NTAPI
 EXLATEOBJ_vInitBrushXlate(

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/keyboard.h [iso-8859-1] Fri
Dec 23 18:15:17 2011
@@ -1,7 +1,7 @@
 #ifndef _WIN32K_KBD_H
 #define _WIN32K_KBD_H
 
-#include <internal/kbd.h>
+#include <ndk/kbd.h>
 
 typedef struct _KBL
 {

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Fri Dec
23 18:15:17 2011
@@ -11,11 +11,13 @@
 #define _NO_COM
 
 /* DDK/NDK/SDK Headers */
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ddk/ntifs.h>
-#include <ddk/tvout.h>
-#include <ndk/ntndk.h>
+#undef NTDDI_VERSION
+#define NTDDI_VERSION NTDDI_WS03SP1
+#include <ntddk.h>
+#include <ntddmou.h>
+#include <ntifs.h>
+#include <tvout.h>
+#include <ntndk.h>
 
 /* Win32 Headers */
 /* FIXME: Defines in winbase.h that we need... */

Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/main/keyboard.c [iso-8859-1] Fri Dec
23 18:15:17 2011
@@ -129,7 +129,7 @@
       ModBits |= GetShiftBit( pkKT, VK_MENU );
 
    /* Handle Alt+Gr */
-   if (pkKT->fLocalFlags & 0x1) 
+   if (pkKT->fLocaleFlags & 0x1) 
       if (KeysSet( pkKT, KeyState, VK_RMENU, 0 ) &
             KEY_DOWN_BIT)
          ModBits |= GetShiftBit( pkKT, VK_CONTROL );

Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Fri Dec 23
18:15:17 2011
@@ -20,7 +20,7 @@
 
 	<library>ntoskrnl</library>
 	<library>hal</library>
-	<library>freetype</library>
+	<library>freetype_s</library>
 	<library>libcntpr</library>
 	<library>pseh</library>
 
@@ -156,4 +156,8 @@
 	</directory>
 	<file>win32k.rc</file>
 </module>
+<module name="win32ksys" type="staticlibrary">
+	<include base="ReactOS">include/reactos</include>
+	<file>sys-stubs.S</file>
+</module>
 </group>