[cwittich] 39502: -remove wingdi.h from wine/winuser.h -define NOGDI for some wine dlls (this should be fixed in wine) -move wine specific window messages to internal user32 header -fix devenum includes -remove some wrong include guards in windows.h -remove the GetObjectW hack from jscript.dll

Author: cwittich
Date: Sun Feb  8 14:38:16 2009
New Revision: 39502
URL: http://svn.reactos.org/svn/reactos?rev=39502&view=rev
Log:
-remove wingdi.h from wine/winuser.h
-define NOGDI for some wine dlls (this should be fixed in wine)
-move wine specific window messages to internal user32 header
-fix devenum includes
-remove some wrong include guards in windows.h
-remove the GetObjectW hack from jscript.dll
Modified:
    trunk/reactos/dll/directx/devenum/devenum_private.h
    trunk/reactos/dll/directx/dinput/dinput.rbuild
    trunk/reactos/dll/directx/dplayx/dplayx.rbuild
    trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild
    trunk/reactos/dll/win32/jscript/global.c
    trunk/reactos/dll/win32/jscript/jscript.rbuild
    trunk/reactos/dll/win32/user32/include/message.h
    trunk/reactos/include/psdk/windows.h
    trunk/reactos/include/psdk/winuser.h
    trunk/reactos/include/reactos/wine/winuser.h
Modified: trunk/reactos/dll/directx/devenum/devenum_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu…
==============================================================================
--- trunk/reactos/dll/directx/devenum/devenum_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/devenum/devenum_private.h [iso-8859-1] Sun Feb  8 14:38:16
2009
@@ -26,6 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winreg.h"
 #include "winerror.h"
Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.…
==============================================================================
--- trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -4,6 +4,7 @@
        <autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
        <importlibrary definition="dinput.spec" />
        <define name="_WIN32_WINNT">0x600</define>
+       <define name="NOGDI" />
        <include base="dinput">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <library>wine</library>
Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.…
==============================================================================
--- trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -3,6 +3,7 @@
 <module name="dplayx" type="win32dll"
baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32"
installname="dplayx.dll" unicode="yes">
        <!-- Won't load correctly in ReactOS yet autoregister
infsection="OleControlDlls" type="DllRegisterServer" -->
        <importlibrary definition="dplayx.spec" />
+       <define name="NOGDI" />
        <include base="dplayx">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <library>wine</library>
Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -6,7 +6,7 @@
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
        <define name="USE_WIN32_OPENGL" />
-
+       <define name="NOGDI" />
        <library>uuid</library>
        <library>wine</library>
        <library>user32</library>
Modified: trunk/reactos/dll/win32/jscript/global.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c…
==============================================================================
--- trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -43,7 +43,7 @@
 static const WCHAR parseIntW[] =
{'p','a','r','s','e','I','n','t',0};
 static const WCHAR parseFloatW[] =
{'p','a','r','s','e','F','l','o','a','t',0};
 static const WCHAR unescapeW[] =
{'u','n','e','s','c','a','p','e',0};
-static const WCHAR getObjectW[] =
{'G','e','t','O','b','j','e','c','t',0};
+static const WCHAR GetObjectW[] =
{'G','e','t','O','b','j','e','c','t',0};
 static const WCHAR ScriptEngineW[] =
{'S','c','r','i','p','t','E','n','g','i','n','e',0};
 static const WCHAR ScriptEngineMajorVersionW[] =
{'S','c','r','i','p','t','E','n','g','i','n','e','M','a','j','o','r','V','e','r','s','i','o','n',0};
@@ -298,7 +298,7 @@
     {DateW,                      JSGlobal_Date,                      PROPF_CONSTR},
     {EnumeratorW,                JSGlobal_Enumerator,                PROPF_METHOD},
     {FunctionW,                  JSGlobal_Function,                  PROPF_CONSTR},
-    {getObjectW,                 JSGlobal_GetObject,                 PROPF_METHOD},
+    {GetObjectW,                 JSGlobal_GetObject,                 PROPF_METHOD},
     {InfinityW,                  JSGlobal_Infinity,                  0},
 /*  {MathW,                      JSGlobal_Math,                      0},  */
     {NaNW,                       JSGlobal_NaN,                       0},
Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.…
==============================================================================
--- trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -6,6 +6,7 @@
        <include base="jscript"
root="intermediate">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="__WINESRC__" />
+       <define name="RPC_NO_WINDOWS_H" />
        <dependency>jsglobal</dependency>
        <library>wine</library>
        <library>kernel32</library>
Modified: trunk/reactos/dll/win32/user32/include/message.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -12,4 +12,7 @@
 BOOL FASTCALL MessageInit(VOID);
 VOID FASTCALL MessageCleanup(VOID);
+#define WM_ALTTABACTIVE         0x0029
+#define WM_SETVISIBLE           0x0009
+
 #endif /* LIB_USER32_INCLUDE_MESSAGE_H */
Modified: trunk/reactos/include/psdk/windows.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -40,13 +40,9 @@
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
-#if !(defined NOGDI || defined  _WINGDI_H)
 #include <wingdi.h>
-#endif
+#include <winuser.h>
 #include <wincon.h>
-#ifndef _WINUSER_H
-#include <winuser.h>
-#endif
 #ifndef _WINNLS_H
 #include <winnls.h>
 #endif
Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -4483,6 +4483,7 @@
 #define WinHelp WinHelpW
 #define wsprintf wsprintfW
 #define wvsprintf wvsprintfW
+
 #ifndef NOGDI
 typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
 typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
Modified: trunk/reactos/include/reactos/wine/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus…
==============================================================================
--- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Sun Feb  8 14:38:16 2009
@@ -4,8 +4,6 @@
 /*
  * Compatibility header
  */
-
-#include <wingdi.h>
 #if !defined(_MSC_VER)
 #include_next "winuser.h"
@@ -17,7 +15,4 @@
 WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
 WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
-#define WM_ALTTABACTIVE         0x0029
-#define WM_SETVISIBLE           0x0009
-
 #endif /* __WINE_WINUSER_H */