Module: wine Branch: master Commit: a345f985c0ef46aac6e2a7a01b6950f39ba08a6a URL: https://gitlab.winehq.org/wine/wine/-/commit/a345f985c0ef46aac6e2a7a01b6950f...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Jul 21 11:35:03 2023 +0200
rpcrt4/tests: Use nameless unions/structs.
---
dlls/rpcrt4/tests/ndr_marshall.c | 84 ++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 52e432e6436..1c684cd6f53 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2760,21 +2760,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == buffer + 15, + ok( umi.Level1.Buffer == buffer + 15, "umi.Level1.Buffer was %p instead of %p\n", - U1(umi).Level1.Buffer, buffer); - ok( U1(umi).Level1.BufferSize == 1, + umi.Level1.Buffer, buffer); + ok( umi.Level1.BufferSize == 1, "umi.Level1.BufferSize was %lu instead of 1\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer);
/* buffer size */
@@ -2794,21 +2794,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == NULL, + ok( umi.Level1.Buffer == NULL, "umi.Level1.Buffer was %p instead of NULL\n", - U1(umi).Level1.Buffer); - ok( U1(umi).Level1.BufferSize == 0, + umi.Level1.Buffer); + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer);
/* marshall */
@@ -2828,21 +2828,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == buffer + 15, + ok( umi.Level1.Buffer == buffer + 15, "umi.Level1.Buffer was %p instead of %p\n", - U1(umi).Level1.Buffer, buffer); - ok( U1(umi).Level1.BufferSize == 1, + umi.Level1.Buffer, buffer); + ok( umi.Level1.BufferSize == 1, "umi.Level1.BufferSize was %lu instead of 1\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer);
/* free */
@@ -2862,21 +2862,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == NULL, + ok( umi.Level1.Buffer == NULL, "umi.Level1.Buffer was %p instead of NULL\n", - U1(umi).Level1.Buffer); - ok( U1(umi).Level1.BufferSize == 0, + umi.Level1.Buffer); + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer);
/* boundary test */
@@ -2891,9 +2891,9 @@ static void test_NdrGetUserMarshalInfo(void)
status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %ld\n", status); - ok( U1(umi).Level1.BufferSize == 0, + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); + umi.Level1.BufferSize);
/* error conditions */