Skip to content

W
wine-cw
Commit 891d3ef5 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

rpcrt4: Fix compilation on systems that don't support nameless unions.

parent 64e419ab
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
dlls/rpcrt4/ndr_marshall.c
View file @ 891d3ef5
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#define NONAMELESSUNION
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
...@@ -4379,15 +4380,15 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M ...@@ -4379,15 +4380,15 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M
if (level != 1) if (level != 1)
return RPC_S_INVALID_ARG; return RPC_S_INVALID_ARG;
memset(&umi->Level1, 0, sizeof(umi->Level1)); memset(&umi->u1.Level1, 0, sizeof(umi->u1.Level1));
umi->InformationLevel = level; umi->InformationLevel = level;
if (umcb->Signature != USER_MARSHAL_CB_SIGNATURE) if (umcb->Signature != USER_MARSHAL_CB_SIGNATURE)
return RPC_S_INVALID_ARG; return RPC_S_INVALID_ARG;
umi->Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; umi->u1.Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate;
umi->Level1.pfnFree = umcb->pStubMsg->pfnFree; umi->u1.Level1.pfnFree = umcb->pStubMsg->pfnFree;
umi->Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; umi->u1.Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer;
switch (umcb->CBType) switch (umcb->CBType)
{ {
...@@ -4403,8 +4404,8 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M ...@@ -4403,8 +4404,8 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M
umcb->pStubMsg->Buffer > buffer_end) umcb->pStubMsg->Buffer > buffer_end)
return ERROR_INVALID_USER_BUFFER; return ERROR_INVALID_USER_BUFFER;
umi->Level1.Buffer = umcb->pStubMsg->Buffer; umi->u1.Level1.Buffer = umcb->pStubMsg->Buffer;
umi->Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; umi->u1.Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer;
break; break;
} }
case USER_MARSHAL_CB_BUFFER_SIZE: case USER_MARSHAL_CB_BUFFER_SIZE:
......
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