- Correct the RegionSize member of MEMORY_BASIC_INFORMATION -- it is pointer sized.

- Make RPC_STATUS respect __ROS_LONG64__ -- fixes a bunch of format warnings in the rpcrt4 Winetest.

svn path=/trunk/; revision=42513

diff --git a/reactos/include/ndk/mmtypes.h b/reactos/include/ndk/mmtypes.h
index 56cadde..32d4b27 100644 (file)
--- a/reactos/include/ndk/mmtypes.h
+++ b/reactos/include/ndk/mmtypes.h
@@ -756,7 +756,7 @@ typedef struct _MEMORY_BASIC_INFORMATION
     PVOID BaseAddress;
     PVOID AllocationBase;
     ULONG AllocationProtect;
     PVOID BaseAddress;
     PVOID AllocationBase;
     ULONG AllocationProtect;

-    ULONG RegionSize;
+    SIZE_T RegionSize;

     ULONG State;
     ULONG Protect;
     ULONG Type;
     ULONG State;
     ULONG Protect;
     ULONG Type;

diff --git a/reactos/include/psdk/rpc.h b/reactos/include/psdk/rpc.h
index f3a64af..de8aa7c 100644 (file)
--- a/reactos/include/psdk/rpc.h
+++ b/reactos/include/psdk/rpc.h
@@ -54,7 +54,11 @@ extern "C" {
 
 
 typedef void * I_RPC_HANDLE;
 
 
 typedef void * I_RPC_HANDLE;

+#ifndef __ROS_LONG64__

 typedef long RPC_STATUS;
 typedef long RPC_STATUS;

+#else
+typedef int RPC_STATUS;
+#endif

 #define __RPC_FAR
 
 #if defined(__RPC_WIN32__) || defined(__RPC_WIN64__)
 #define __RPC_FAR
 
 #if defined(__RPC_WIN32__) || defined(__RPC_WIN64__)

diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 056c860..84ea219 100644 (file)
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -3241,7 +3241,7 @@ typedef struct _MEMORY_BASIC_INFORMATION {
        PVOID BaseAddress;
        PVOID AllocationBase;
        DWORD AllocationProtect;
        PVOID BaseAddress;
        PVOID AllocationBase;
        DWORD AllocationProtect;

-       DWORD RegionSize;
+       SIZE_T RegionSize;

        DWORD State;
        DWORD Protect;
        DWORD Type;
        DWORD State;
        DWORD Protect;
        DWORD Type;