ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpcrt4: Fix bug calculating union switch type.

This commit is contained in:
Dan Hipschman 2007-06-18 18:40:08 -07:00 committed by Alexandre Julliard
parent b09b917a5c
commit 6fd05b1dc7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/rpcrt4/ndr_marshall.c
View File

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

2
dlls/rpcrt4/tests/server.c
View File

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