[ros-diffs] [fireball] 43401: [arwinss] - Merge Wine-1.1.31 server headers.

[fireball at svn.reactos.org]

Author: fireball
Date: Mon Oct 12 16:22:23 2009
New Revision: 43401

URL: http://svn.reactos.org/svn/reactos?rev=43401&view=rev
Log:
[arwinss]
- Merge Wine-1.1.31 server headers.

Modified:
    branches/arwinss/reactos/include/reactos/wine/server_protocol.h
    branches/arwinss/reactos/subsystems/win32/win32k/include/request.h   (contents, props changed)

Modified: branches/arwinss/reactos/include/reactos/wine/server_protocol.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos/wine/server_protocol.h?rev=43401&r1=43400&r2=43401&view=diff
==============================================================================
--- branches/arwinss/reactos/include/reactos/wine/server_protocol.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/wine/server_protocol.h [iso-8859-1] Mon Oct 12 16:22:23 2009
@@ -112,7 +112,6 @@
     struct
     {
         int          code;
-        int          unicode;
         client_ptr_t string;
         data_size_t  length;
     } output_string;
@@ -2045,8 +2044,6 @@
     struct request_header __header;
     data_size_t   length;
     client_ptr_t  string;
-    int           unicode;
-    char __pad_28[4];
 };
 struct output_debug_string_reply
 {
@@ -5344,6 +5341,6 @@
     struct set_window_layered_info_reply set_window_layered_info_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 390
+#define SERVER_PROTOCOL_VERSION 391
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/win32k/include/request.h?rev=43401&r1=43400&r2=43401&view=diff
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] Mon Oct 12 16:22:23 2009
@@ -1064,8 +1064,7 @@
 C_ASSERT( sizeof(struct get_exception_status_reply) == 8 );
 C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, length) == 12 );
 C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, string) == 16 );
-C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, unicode) == 24 );
-C_ASSERT( sizeof(struct output_debug_string_request) == 32 );
+C_ASSERT( sizeof(struct output_debug_string_request) == 24 );
 C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 );
 C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 );
 C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 );

Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 12 16:22:23 2009
@@ -1,3 +1,3 @@
 /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
 /trunk/reactos/subsystems/win32/win32k/include/request.h:42000-43126
-/vendor/wine/server/current/request.h:43136
+/vendor/wine/server/current/request.h:43136,43398