rpcrt4: Give a proper name to some formerly reserved
MIDL_STUB_MESSAGE fields.
Francois Gouget
fgouget at free.fr
Wed Jan 10 05:40:15 CST 2007
Define NTDDI_WIN2K so we get definitions for the Reserved51_X fields with the PSDK.
This fixes compilation of the ndr_marshall.c with the PSDK.
---
dlls/rpcrt4/tests/ndr_marshall.c | 8 +++++---
include/rpcndr.h | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index c625e26..e31495b 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -20,6 +20,8 @@
#include <stdarg.h>
+#define NTDDI_WIN2K 0x05000000 /* for some MIDL_STUB_MESSAGE fields */
+
#include "wine/test.h"
#include <windef.h>
#include <winbase.h>
@@ -890,10 +892,10 @@ static void test_client_init(void)
TEST_POINTER_UNSET(pCSInfo);
TEST_POINTER_UNSET(ConformanceMark);
TEST_POINTER_UNSET(VarianceMark);
- ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%x\n", stubMsg.Unused);
+ ok(stubMsg.BackingStoreLowMark == (void*)0xcccccccc, "BackingStoreLowMark should have be unset instead of %p\n", stubMsg.BackingStoreLowMark);
TEST_POINTER_UNSET(pContext);
- TEST_ULONG_UNSET(Reserved51_1);
- TEST_ULONG_UNSET(Reserved51_2);
+ TEST_POINTER_UNSET(ContextHandleHash);
+ TEST_POINTER_UNSET(pUserMarshalList);
TEST_ULONG_UNSET(Reserved51_3);
TEST_ULONG_UNSET(Reserved51_4);
TEST_ULONG_UNSET(Reserved51_5);
diff --git a/include/rpcndr.h b/include/rpcndr.h
index 01beba2..59fee92 100644
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -222,10 +222,10 @@ typedef struct _MIDL_STUB_MESSAGE
CS_STUB_INFO *pCSInfo;
unsigned char *ConformanceMark;
unsigned char *VarianceMark;
- INT_PTR Unused;
+ void* BackingStoreLowMark;
struct _NDR_PROC_CONTEXT *pContext;
- INT_PTR Reserved51_1;
- INT_PTR Reserved51_2;
+ void* ContextHandleHash;
+ void* pUserMarshalList;
INT_PTR Reserved51_3;
INT_PTR Reserved51_4;
INT_PTR Reserved51_5;
--
1.4.4.2
More information about the wine-patches
mailing list