Austin English : dsound/tests: Remove win9x hack.

Alexandre Julliard julliard at winehq.org
Mon Feb 28 11:02:07 CST 2011


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

Author: Austin English <austinenglish at gmail.com>
Date:   Fri Feb 25 14:32:26 2011 -0800

dsound/tests: Remove win9x hack.

---

 dlls/dsound/tests/dsound.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index 0bf04b7..f8b7aeb 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -750,7 +750,7 @@ static HRESULT test_secondary(LPGUID lpGuid)
 
             if (!gotdx8)
             {
-                skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n");
+                win_skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n");
                 /* Apparently they succeed with bogus values,
                  * which means that older dsound doesn't look at them
                  */
@@ -1095,8 +1095,7 @@ START_TEST(dsound)
         SetLastError(0xdeadbeef);
         ret = FreeLibrary(hDsound);
         ok( ret ||
-            broken(!ret && GetLastError() == ERROR_MOD_NOT_FOUND) || /* NT4 */
-            broken(!ret && GetLastError() == ERROR_INVALID_HANDLE),  /* Win9x */
+            broken(!ret && GetLastError() == ERROR_MOD_NOT_FOUND), /* NT4 */
             "FreeLibrary(2) returned %d\n", GetLastError());
         ok(!FreeLibrary(hDsound), "DirectSound DLL still loaded\n");
     }
@@ -1118,7 +1117,7 @@ START_TEST(dsound)
         FreeLibrary(hDsound);
     }
     else
-        skip("dsound.dll not found!\n");
+        win_skip("dsound.dll not found!\n");
 
     CoUninitialize();
 }




More information about the wine-cvs mailing list