marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
oldstable
Francois Gouget 2007-01-10 16:28:20 +01:00 committed by Alexandre Julliard
parent 392ceba61f
commit fa7c32f56c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/rpcrt4/tests/ndr_marshall.c
View File

@ -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);

6
include/rpcndr.h
View File

@ -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;