Module: wine Branch: master Commit: fa7c32f56c038af5e5c569e9cd257913a732dc1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7c32f56c038af5e5c569e9cd...
Author: Francois Gouget fgouget@free.fr Date: Wed Jan 10 16:28:20 2007 +0100
rpcrt4: Give a proper name to some formerly reserved MIDL_STUB_MESSAGE fields.
Define NTDDI_VERSION 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 | 7 +++++-- include/rpcndr.h | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index c625e26..4a5566f 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -20,6 +20,9 @@
#include <stdarg.h>
+#define NTDDI_WIN2K 0x05000000 +#define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ + #include "wine/test.h" #include <windef.h> #include <winbase.h> @@ -892,8 +895,8 @@ static void test_client_init(void) TEST_POINTER_UNSET(VarianceMark); ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%x\n", stubMsg.Unused); 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..126091b 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; + INT_PTR Unused; /* BackingStoreLowMark on IA64 */ 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;