[ros-diffs] [sginsberg] 42677: - Define _WINE for gdi32, user32, winent and winex11 to be compatible with recent header changes - Properly define RtlNtStatusToDosError in winternl.h so it doesn't conflict with server.h (the inconsistency is not detected by gcc)

Author: sginsberg
Date: Sat Aug 15 10:00:02 2009
New Revision: 42677

URL: http://svn.reactos.org/svn/reactos?rev=42677&view=rev
Log:
- Define _WINE for gdi32, user32, winent and winex11 to be compatible with recent header
changes
- Properly define RtlNtStatusToDosError in winternl.h so it doesn't conflict with
server.h (the inconsistency is not detected by gcc)

Modified:
    branches/arwinss/reactos/dll/win32/gdi32/driver.c
    branches/arwinss/reactos/dll/win32/gdi32/freetype.c
    branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild
    branches/arwinss/reactos/dll/win32/user32/user32.rbuild
    branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild
    branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild
    branches/arwinss/reactos/include/psdk/winternl.h

Modified: branches/arwinss/reactos/dll/win32/gdi32/driver.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32…
==============================================================================
--- branches/arwinss/reactos/dll/win32/gdi32/driver.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/gdi32/driver.c [iso-8859-1] Sat Aug 15 10:00:02
2009
@@ -229,7 +229,9 @@
 {
     char buffer[MAX_PATH], libname[32], *name, *next;
     HMODULE module = 0;
+#if 0
     HKEY hkey;
+#endif
 
     if (display_driver)  /* already loaded */
     {

Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32…
==============================================================================
--- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sat Aug 15 10:00:02
2009
@@ -160,7 +160,7 @@
 
 static void *ft_handle = NULL;
 
-#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL
+#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL // FIXME: MSVC does not implement
typeof
 MAKE_FUNCPTR(FT_Vector_Unit);
 MAKE_FUNCPTR(FT_Done_Face);
 MAKE_FUNCPTR(FT_Get_Char_Index);
@@ -2714,7 +2714,7 @@
 	return FALSE;
     }
 
-#define LOAD_FUNCPTR(f) if((p##f = GetProcAddress(ft_handle, #f)) ==
NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;}
+#define LOAD_FUNCPTR(f) if((p##f = (PVOID)GetProcAddress(ft_handle, #f)) ==
NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;}
 
     LOAD_FUNCPTR(FT_Vector_Unit)
     LOAD_FUNCPTR(FT_Done_Face)
@@ -2742,16 +2742,16 @@
 
 #undef LOAD_FUNCPTR
     /* Don't warn if these ones are missing */
-    pFT_Library_Version = GetProcAddress(ft_handle, "FT_Library_Version");
-    pFT_Load_Sfnt_Table = GetProcAddress(ft_handle, "FT_Load_Sfnt_Table");
-    pFT_Get_First_Char = GetProcAddress(ft_handle, "FT_Get_First_Char");
-    pFT_Get_Next_Char = GetProcAddress(ft_handle, "FT_Get_Next_Char");
-    pFT_Get_TrueType_Engine_Type = GetProcAddress(ft_handle,
"FT_Get_TrueType_Engine_Type");
+    pFT_Library_Version = (PVOID)GetProcAddress(ft_handle,
"FT_Library_Version");
+    pFT_Load_Sfnt_Table = (PVOID)GetProcAddress(ft_handle,
"FT_Load_Sfnt_Table");
+    pFT_Get_First_Char = (PVOID)GetProcAddress(ft_handle,
"FT_Get_First_Char");
+    pFT_Get_Next_Char = (PVOID)GetProcAddress(ft_handle, "FT_Get_Next_Char");
+    pFT_Get_TrueType_Engine_Type = (PVOID)GetProcAddress(ft_handle,
"FT_Get_TrueType_Engine_Type");
 #ifdef HAVE_FREETYPE_FTLCDFIL_H
-    pFT_Library_SetLcdFilter = GetProcAddress(ft_handle,
"FT_Library_SetLcdFilter");
+    pFT_Library_SetLcdFilter = (PVOID)GetProcAddress(ft_handle,
"FT_Library_SetLcdFilter");
 #endif
 #ifdef HAVE_FREETYPE_FTWINFNT_H
-    pFT_Get_WinFNT_Header = GetProcAddress(ft_handle, "FT_Get_WinFNT_Header");
+    pFT_Get_WinFNT_Header = (PVOID)GetProcAddress(ft_handle,
"FT_Get_WinFNT_Header");
 #endif
       if(!GetProcAddress(ft_handle, "FT_Get_Postscript_Name") &&
 	 !GetProcAddress(ft_handle, "FT_Sqrt64")) {

Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32…
==============================================================================
--- branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Aug 15 10:00:02
2009
@@ -4,10 +4,11 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="ReactOS">dll/3rdparty/freetype/include</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="WINVER">0x0600</define>
-	<define name="_WIN32_WINNT">0x0501</define>
+	<redefine name="WINVER">0x0600</redefine>
+	<redefine name="_WIN32_WINNT">0x0501</redefine>
 	<define name="LANGPACK" />
 	<define name="__WINESRC__" />
+	<define name="_WINE" />
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>user32</library>

Modified: branches/arwinss/reactos/dll/win32/user32/user32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sat Aug 15
10:00:02 2009
@@ -5,9 +5,10 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_DISABLE_TIDENTS" />
-	<define name="WINVER">0x0600</define>
-	<define name="_WIN32_WINNT">0x0600</define>
+	<redefine name="WINVER">0x0600</redefine>
+	<redefine name="_WIN32_WINNT">0x0600</redefine>
 	<define name="__WINESRC__" />
+	<define name="_WINE" />
 	<library>wine</library>
 	<library>ntdll</library>
 	<library>gdi32</library>

Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] Sat Aug 15
10:00:02 2009
@@ -5,6 +5,7 @@
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__WINESRC__" />
+	<define name="_WINE" />
 	<file>font.c</file>
 	<file>gdidrv.c</file>
 	<file>main.c</file>

Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] Sat Aug 15
10:00:02 2009
@@ -5,6 +5,7 @@
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__WINESRC__" />
+	<define name="_WINE" />
 	<file>bitblt.c</file>
 	<file>bitmap.c</file>
 	<file>brush.c</file>

Modified: branches/arwinss/reactos/include/psdk/winternl.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi…
==============================================================================
--- branches/arwinss/reactos/include/psdk/winternl.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/winternl.h [iso-8859-1] Sat Aug 15 10:00:02
2009
@@ -2085,7 +2085,7 @@
 
 DWORD     WINAPI RtlNewSecurityObject(DWORD,DWORD,DWORD,DWORD,DWORD,DWORD);
 PRTL_USER_PROCESS_PARAMETERS WINAPI
RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*);
-ULONG     WINAPI RtlNtStatusToDosError(NTSTATUS);
+NTSYSAPI  ULONG  WINAPI RtlNtStatusToDosError(NTSTATUS);
 ULONG     WINAPI RtlNtStatusToDosErrorNoTeb(NTSTATUS);
 ULONG     WINAPI RtlNumberOfSetBits(PCRTL_BITMAP);
 ULONG     WINAPI RtlNumberOfClearBits(PCRTL_BITMAP);