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

rpcrt4/tests: Remove win9x hacks.

This commit is contained in:
Austin English 2011-02-25 17:50:35 -08:00 committed by Alexandre Julliard
parent 3ac1db562a
commit 01ca32ac91
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/rpcrt4/tests/rpc.c
View File

@ -119,13 +119,9 @@ static void UuidConversionAndComparison(void) {
for (i1 = 0; i1 < 10; i1++) { for (i1 = 0; i1 < 10; i1++) {
Uuid1 = Uuid_Table[i1]; Uuid1 = Uuid_Table[i1];
rslt=UuidToStringW(&Uuid1, &wstr); rslt=UuidToStringW(&Uuid1, &wstr);
if (rslt==RPC_S_CANNOT_SUPPORT) { ok( (rslt == RPC_S_OK), "Simple UUID->WString copy\n" );
/* Must be Win9x (no Unicode support), skip the tests */ ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String\n" );
break; ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform\n" );
}
ok( (rslt == RPC_S_OK), "Simple UUID->WString copy\n" );
ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String\n" );
ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform\n" );
/* invalid uuid tests -- size of valid UUID string=36 */ /* invalid uuid tests -- size of valid UUID string=36 */
for (i2 = 0; i2 < 36; i2++) { for (i2 = 0; i2 < 36; i2++) {
wx = wstr[i2]; wx = wstr[i2];
@ -265,8 +261,7 @@ todo_wine {
status = RpcBindingSetAuthInfo(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE, status = RpcBindingSetAuthInfo(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE,
RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME);
ok(status == RPC_S_OK || broken(status == RPC_S_UNKNOWN_AUTHN_SERVICE), /* win9x */ ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status);
"RpcBindingSetAuthInfo failed (%u)\n", status);
status = RpcBindingInqAuthInfo(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL); status = RpcBindingInqAuthInfo(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL);
ok(status == RPC_S_BINDING_HAS_NO_AUTH, "RpcBindingInqAuthInfo failed (%u)\n", ok(status == RPC_S_BINDING_HAS_NO_AUTH, "RpcBindingInqAuthInfo failed (%u)\n",
@ -436,14 +431,8 @@ static void test_I_RpcMapWin32Status(void)
{ {
LONG win32status; LONG win32status;
RPC_STATUS rpc_status; RPC_STATUS rpc_status;
BOOL on_win9x = FALSE;
BOOL w2k3_up = FALSE; BOOL w2k3_up = FALSE;
/* Win9x always returns the given status */
win32status = I_RpcMapWin32Status(ERROR_ACCESS_DENIED);
if (win32status == ERROR_ACCESS_DENIED)
on_win9x = TRUE;
/* Windows 2003 and Vista return STATUS_UNSUCCESSFUL if given an unknown status */ /* Windows 2003 and Vista return STATUS_UNSUCCESSFUL if given an unknown status */
win32status = I_RpcMapWin32Status(9999); win32status = I_RpcMapWin32Status(9999);
if (win32status == STATUS_UNSUCCESSFUL) if (win32status == STATUS_UNSUCCESSFUL)
@ -577,9 +566,6 @@ static void test_I_RpcMapWin32Status(void)
expected_win32status = rpc_status; expected_win32status = rpc_status;
} }
if (on_win9x)
missing = TRUE;
ok(win32status == expected_win32status || ok(win32status == expected_win32status ||
broken(missing && win32status == rpc_status), broken(missing && win32status == rpc_status),
"I_RpcMapWin32Status(%d) should have returned 0x%x instead of 0x%x%s\n", "I_RpcMapWin32Status(%d) should have returned 0x%x instead of 0x%x%s\n",