From 52911fc66c53816d7df1b417ca50ec25e24f9e88 Mon Sep 17 00:00:00 2001 From: Rob Shearman Date: Thu, 19 Jun 2008 07:50:51 +0100 Subject: [PATCH] include: Update the MIDL_STUB_MESSAGE structure. Reduce the size of the IsClient field, as is done in the latest SDKs to fix NdrClientInitializeNew tests on XP SP3 and Win2003+. --- dlls/rpcrt4/tests/generated.c | 1 - include/rpcndr.h | 4 +++- tools/winapi/tests.dat | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 2307f087aa4..9c4a5a778a0 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -407,7 +407,6 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, BufferLength, 20, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, MemorySize, 24, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char *, Memory, 28, 4, 4); - TEST_FIELD(MIDL_STUB_MESSAGE, int, IsClient, 32, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, int, ReuseBuffer, 36, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, struct NDR_ALLOC_ALL_NODES_CONTEXT *, pAllocAllNodesContext, 40, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, struct NDR_POINTER_QUEUE_STATE *, pPointerQueueState, 44, 4, 4); diff --git a/include/rpcndr.h b/include/rpcndr.h index 79385290099..a0968d58ec2 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -175,7 +175,9 @@ typedef struct _MIDL_STUB_MESSAGE ULONG BufferLength; ULONG MemorySize; unsigned char *Memory; - int IsClient; + unsigned char IsClient; + unsigned char Pad; + unsigned short uFlags2; int ReuseBuffer; struct NDR_ALLOC_ALL_NODES_CONTEXT *pAllocAllNodesContext; struct NDR_POINTER_QUEUE_STATE *pPointerQueueState; diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 8c159b3376e..1214909bc4f 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -950,7 +950,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount +MIDL_STUB_MESSAGE: !UniquePtrCount !IsClient !Pad !uFlags2 MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT