server: Make mem_size_t always 64-bit.

dlls/ntdll/virtual.c

@@ -1967,6 +1967,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr,
             info->Protect           = result.virtual_query.prot;
             info->AllocationProtect = result.virtual_query.alloc_prot;
             info->Type              = result.virtual_query.alloc_type;
+            if (info->RegionSize != result.virtual_query.size)  /* truncated */
+                return STATUS_INVALID_PARAMETER;  /* FIXME */
             if (res_len) *res_len = sizeof(*info);
         }
         return result.virtual_query.status;

include/wine/server_protocol.h

@@ -24,7 +24,7 @@ typedef unsigned int data_size_t;
 typedef unsigned int ioctl_code_t;
 typedef unsigned long lparam_t;
 typedef unsigned long apc_param_t;
-typedef unsigned long mem_size_t;
+typedef unsigned __int64 mem_size_t;
 typedef unsigned __int64 file_pos_t;
 
 struct request_header
@@ -5049,6 +5049,6 @@ union generic_reply
     struct set_window_layered_info_reply set_window_layered_info_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 349
+#define SERVER_PROTOCOL_VERSION 350
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

server/protocol.def

@@ -40,7 +40,7 @@ typedef unsigned int data_size_t;
 typedef unsigned int ioctl_code_t;
 typedef unsigned long lparam_t;
 typedef unsigned long apc_param_t;
-typedef unsigned long mem_size_t;
+typedef unsigned __int64 mem_size_t;
 typedef unsigned __int64 file_pos_t;
 
 struct request_header

tools/make_requests

@@ -41,12 +41,12 @@ my %formats =
     "timeout_t"     => [  8,   8,  "&dump_timeout" ],
     "rectangle_t"   => [  16,  4,  "&dump_rectangle" ],
     "char_info_t"   => [  4,   2,  "&dump_char_info" ],
-    "apc_call_t"    => [  32,  4,  "&dump_apc_call" ],
-    "apc_result_t"  => [  28,  4,  "&dump_apc_result" ],
-    "async_data_t"  => [  28,  4,  "&dump_async_data" ],
+    "apc_call_t"    => [  40,  8,  "&dump_apc_call" ],
+    "apc_result_t"  => [  40,  8,  "&dump_apc_result" ],
+    "async_data_t"  => [  24,  4,  "&dump_async_data" ],
     "luid_t"        => [  8,   4,  "&dump_luid" ],
     "ioctl_code_t"  => [  4,   4,  "&dump_ioctl_code" ],
-    "file_pos_t"    => [  8,   8,  "&dump_file_pos" ],
+    "file_pos_t"    => [  8,   8,  "&dump_uint64" ],
 );
 
 my @requests = ();