Austin English : rpcrt4/tests: Remove win9x hacks.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 01ca32ac91a3b00de11eb86a0c68036aae28e563
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=01ca32ac91a3b00de11eb86a0c68036aae28e563

Author: Austin English <austinenglish at gmail.com>
Date:   Fri Feb 25 17:50:35 2011 -0800

rpcrt4/tests: Remove win9x hacks.

---

 dlls/rpcrt4/tests/rpc.c |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c
index 684b47e..4d62f30 100644
--- a/dlls/rpcrt4/tests/rpc.c
+++ b/dlls/rpcrt4/tests/rpc.c
@@ -119,13 +119,9 @@ static void UuidConversionAndComparison(void) {
     for (i1 = 0; i1 < 10; i1++) {
         Uuid1 = Uuid_Table[i1];
         rslt=UuidToStringW(&Uuid1, &wstr);
-        if (rslt==RPC_S_CANNOT_SUPPORT) {
-            /* Must be Win9x (no Unicode support), skip the tests */
-            break;
-        }
-	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" );
+        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 */
 	for (i2 = 0; i2 < 36; i2++) {
 	    wx = wstr[i2];
@@ -265,8 +261,7 @@ todo_wine {
 
     status = RpcBindingSetAuthInfo(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE,
                                    RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME);
-    ok(status == RPC_S_OK || broken(status == RPC_S_UNKNOWN_AUTHN_SERVICE), /* win9x */
-       "RpcBindingSetAuthInfo failed (%u)\n", status);
+    ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status);
 
     status = RpcBindingInqAuthInfo(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL);
     ok(status == RPC_S_BINDING_HAS_NO_AUTH, "RpcBindingInqAuthInfo failed (%u)\n",
@@ -436,14 +431,8 @@ static void test_I_RpcMapWin32Status(void)
 {
     LONG win32status;
     RPC_STATUS rpc_status;
-    BOOL on_win9x = 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 */
     win32status = I_RpcMapWin32Status(9999);
     if (win32status == STATUS_UNSUCCESSFUL)
@@ -577,9 +566,6 @@ static void test_I_RpcMapWin32Status(void)
                 expected_win32status = rpc_status;
         }
 
-        if (on_win9x)
-            missing = TRUE;
-
         ok(win32status == expected_win32status ||
             broken(missing && win32status == rpc_status),
             "I_RpcMapWin32Status(%d) should have returned 0x%x instead of 0x%x%s\n",