Commit fa7c32f5 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

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.
parent 392ceba6
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#include <stdarg.h> #include <stdarg.h>
#define NTDDI_WIN2K 0x05000000
#define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */
#include "wine/test.h" #include "wine/test.h"
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
...@@ -892,8 +895,8 @@ static void test_client_init(void) ...@@ -892,8 +895,8 @@ static void test_client_init(void)
TEST_POINTER_UNSET(VarianceMark); TEST_POINTER_UNSET(VarianceMark);
ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%x\n", stubMsg.Unused); ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%x\n", stubMsg.Unused);
TEST_POINTER_UNSET(pContext); TEST_POINTER_UNSET(pContext);
TEST_ULONG_UNSET(Reserved51_1); TEST_POINTER_UNSET(ContextHandleHash);
TEST_ULONG_UNSET(Reserved51_2); TEST_POINTER_UNSET(pUserMarshalList);
TEST_ULONG_UNSET(Reserved51_3); TEST_ULONG_UNSET(Reserved51_3);
TEST_ULONG_UNSET(Reserved51_4); TEST_ULONG_UNSET(Reserved51_4);
TEST_ULONG_UNSET(Reserved51_5); TEST_ULONG_UNSET(Reserved51_5);
......
...@@ -222,10 +222,10 @@ typedef struct _MIDL_STUB_MESSAGE ...@@ -222,10 +222,10 @@ typedef struct _MIDL_STUB_MESSAGE
CS_STUB_INFO *pCSInfo; CS_STUB_INFO *pCSInfo;
unsigned char *ConformanceMark; unsigned char *ConformanceMark;
unsigned char *VarianceMark; unsigned char *VarianceMark;
INT_PTR Unused; INT_PTR Unused; /* BackingStoreLowMark on IA64 */
struct _NDR_PROC_CONTEXT *pContext; struct _NDR_PROC_CONTEXT *pContext;
INT_PTR Reserved51_1; void* ContextHandleHash;
INT_PTR Reserved51_2; void* pUserMarshalList;
INT_PTR Reserved51_3; INT_PTR Reserved51_3;
INT_PTR Reserved51_4; INT_PTR Reserved51_4;
INT_PTR Reserved51_5; INT_PTR Reserved51_5;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment