[ros-diffs] [fireball] 42023: - Make win32k compile. - Add "wine_server_call" system entry. - Adapt Wine's server.h to use it.

[fireball at svn.reactos.org]

Author: fireball
Date: Fri Jul 17 23:19:09 2009
New Revision: 42023

URL: http://svn.reactos.org/svn/reactos?rev=42023&view=rev
Log:
- Make win32k compile.
- Add "wine_server_call" system entry.
- Adapt Wine's server.h to use it.

Modified:
    branches/arwinss/reactos/include/reactos/wine/server.h
    branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c
    branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
    branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h
    branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db
    branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild

Modified: branches/arwinss/reactos/include/reactos/wine/server.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos/wine/server.h?rev=42023&r1=42022&r2=42023&view=diff
==============================================================================
--- branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] Fri Jul 17 23:19:09 2009
@@ -49,7 +49,7 @@
     struct __server_iovec data[__SERVER_MAX_DATA];  /* request variable size data */
 };
 
-extern unsigned int wine_server_call( void *req_ptr );
+W32KAPI UINT APIENTRY wine_server_call(void *req_ptr);
 extern void CDECL wine_server_send_fd( int fd );
 extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle );
 extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options );

Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c?rev=42023&r1=42022&r2=42023&view=diff
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] Fri Jul 17 23:19:09 2009
@@ -146,6 +146,14 @@
 {
     UNIMPLEMENTED;
     return STATUS_SUCCESS;
+}
+
+NTSTATUS
+APIENTRY
+NtGdiFlushUserBatch(VOID)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
 }
 
 /* DRIVER ENTRYPOINT *********************************************************/

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h?rev=42023&r1=42022&r2=42023&view=diff
==============================================================================
--- 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 Jul 17 23:19:09 2009
@@ -11,9 +11,9 @@
 /* Version Data */
 #undef __MSVCRT__
 #include <psdk/ntverp.h>
-#define _WIN32_WINNT _WIN32_WINNT_WS03
+//#define _WIN32_WINNT _WIN32_WINNT_WS03
 #define NTDDI_VERSION NTDDI_WS03SP1
-#define WINVER 0x600
+//#define WINVER 0x600
 
 /* Initial DDK/IFS Headers */
 #ifdef _MSC_VER
@@ -54,21 +54,21 @@
 #include <ntndk.h>
 
 /* SEH Support with PSEH */
-#include <pseh/pseh.h>
+#include <pseh/pseh2.h>
 
 /* CSRSS Header */
 #include <csrss/csrss.h>
 
 /* Helper Header */
-#include <reactos/helper.h>
+//#include <reactos/helper.h>
 
 /* Probe and capture */
-#include <reactos/probe.h>
+//#include <reactos/probe.h>
 
 /* Public Win32K Headers */
 #include <win32k/callback.h>
 #include <win32k/ntusrtyp.h>
-#include <win32k/ntuser.h>
+//#include <win32k/ntuser.h>
 #include <win32k/ntgdityp.h>
 #include <win32k/ntgdihdl.h>
 #define LANGPACK

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h?rev=42023&r1=42022&r2=42023&view=diff
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Fri Jul 17 23:19:09 2009
@@ -12,11 +12,7 @@
 /* INCLUDES ******************************************************************/
 
 /* Prototypes */
-NTSTATUS
-APIENTRY
-NtGdiFlushUserBatch(
-    VOID
-);
+W32KAPI UINT APIENTRY wine_server_call(void *req_ptr);
 
 /* Internal  Win32K Headers */
 //#include <gdiobj.h>

Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db?rev=42023&r1=42022&r2=42023&view=diff
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Fri Jul 17 23:19:09 2009
@@ -1,1 +1,1 @@
-ServDoNothing                                    1
+wine_server_call                                    1

Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild?rev=42023&r1=42022&r2=42023&view=diff
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Fri Jul 17 23:19:09 2009
@@ -19,6 +19,9 @@
 	<directory name="gre">
 		<file>init.c</file>
 	</directory>
+	<directory name="wine">
+		<file>main.c</file>
+	</directory>
 	<file>win32k.rc</file>
 </module>
 </group>