Paul Vriens : comdlg32/tests: Skip some not implemented functions on win98.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jun 7 16:26:38 CDT 2007


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Thu Jun  7 11:47:58 2007 +0200

comdlg32/tests: Skip some not implemented functions on win98.

---

 dlls/comdlg32/tests/filedlg.c |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c
index 9ae0c40..03192ba 100644
--- a/dlls/comdlg32/tests/filedlg.c
+++ b/dlls/comdlg32/tests/filedlg.c
@@ -72,10 +72,16 @@ static void test_DialogCancel(void)
     ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n",
               CDERR_INITIALIZATION, CommDlgExtendedError());
 
+    SetLastError(0xdeadbeef);
     result = GetOpenFileNameW((LPOPENFILENAMEW) &ofn);
-    ok(0 == result, "expected %d, got %d\n", 0, result);
-    ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0,
-       CommDlgExtendedError());
+    if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+        skip("GetOpenFileNameW is not implemented\n");
+    else
+    {
+        ok(0 == result, "expected %d, got %d\n", 0, result);
+        ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0,
+           CommDlgExtendedError());
+    }
 
     PrintDlgA(NULL);
     ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n",
@@ -90,10 +96,16 @@ static void test_DialogCancel(void)
     ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n",
               CDERR_INITIALIZATION, CommDlgExtendedError());
 
+    SetLastError(0xdeadbeef);
     result = GetSaveFileNameW((LPOPENFILENAMEW) &ofn);
-    ok(0 == result, "expected %d, got %d\n", 0, result);
-    ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0,
-       CommDlgExtendedError());
+    if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+        skip("GetSaveFileNameW is not implemented\n");
+    else
+    {
+        ok(0 == result, "expected %d, got %d\n", 0, result);
+        ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0,
+           CommDlgExtendedError());
+    }
 }
 
 




More information about the wine-cvs mailing list