diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 62ff179e6ce..3f8742cfaa8 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4301,7 +4301,7 @@ unsigned char * WINAPI NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg pFormat++; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; ALIGN_POINTER(pStubMsg->Buffer, increment); @@ -4333,7 +4333,7 @@ unsigned char * WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubM pFormat++; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; ALIGN_POINTER(pStubMsg->Buffer, increment); @@ -4365,7 +4365,7 @@ void WINAPI NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; ALIGN_LENGTH(pStubMsg->BufferLength, increment); @@ -4390,7 +4390,7 @@ ULONG WINAPI NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, ULONG switch_value; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; ALIGN_POINTER(pStubMsg->Buffer, increment); @@ -4417,7 +4417,7 @@ void WINAPI NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; switch_value = get_discriminant(switch_type, pMemory); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 44040dfedfe..65226db6691 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -396,7 +396,6 @@ union_tests(void) i = 11; ok(square_sun(&su) == 121.0, "RPC square_sun\n"); -todo_wine { eu.t = ENCU_I; eu.tagged_union.i = 7; ok(square_encu(&eu) == 49.0, "RPC square_encu\n"); @@ -405,7 +404,6 @@ todo_wine { eu.tagged_union.f = 3.0; ok(square_encu(&eu) == 9.0, "RPC square_encu\n"); } -} static test_list_t * null_list(void)