Paul Vriens : wininet/tests: Fix tests failures on W2K and below and some early XP.

Alexandre Julliard julliard at winehq.org
Mon Feb 2 09:01:10 CST 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Jan 30 16:48:43 2009 +0100

wininet/tests: Fix tests failures on W2K and below and some early XP.

---

 dlls/wininet/tests/internet.c |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index 13a5f5c..f3277d3 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -546,7 +546,9 @@ static void test_IsDomainLegalCookieDomainW(void)
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(NULL, NULL);
     error = GetLastError();
-    ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
+    ok(!ret ||
+        broken(ret), /* Win98, NT4, W2K, XP (some) */
+        "IsDomainLegalCookieDomainW succeeded\n");
     ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error);
 
     SetLastError(0xdeadbeef);
@@ -565,25 +567,33 @@ static void test_IsDomainLegalCookieDomainW(void)
     ret = pIsDomainLegalCookieDomainW(empty, gmail_com);
     error = GetLastError();
     ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
-    ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error);
+    ok(error == ERROR_INVALID_NAME ||
+        broken(error == ERROR_INVALID_PARAMETER), /* Win98, NT4, W2K, XP (some) */
+        "got %u expected ERROR_INVALID_NAME\n", error);
 
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(com, empty);
     error = GetLastError();
     ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
-    ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error);
+    ok(error == ERROR_INVALID_NAME ||
+        broken(error == ERROR_INVALID_PARAMETER), /* Win98, NT4, W2K, XP (some) */
+        "got %u expected ERROR_INVALID_NAME\n", error);
 
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(gmail_com, dot);
     error = GetLastError();
     ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
-    ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error);
+    ok(error == ERROR_INVALID_NAME ||
+        broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */
+        "got %u expected ERROR_INVALID_NAME\n", error);
 
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(dot, gmail_com);
     error = GetLastError();
     ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
-    ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error);
+    ok(error == ERROR_INVALID_NAME ||
+        broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */
+        "got %u expected ERROR_INVALID_NAME\n", error);
 
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(com, com);
@@ -595,13 +605,17 @@ static void test_IsDomainLegalCookieDomainW(void)
     ret = pIsDomainLegalCookieDomainW(com, dot_com);
     error = GetLastError();
     ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
-    ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error);
+    ok(error == ERROR_INVALID_NAME ||
+        broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */
+        "got %u expected ERROR_INVALID_NAME\n", error);
 
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(dot_com, com);
     error = GetLastError();
     ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
-    ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error);
+    ok(error == ERROR_INVALID_NAME ||
+        broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */
+        "got %u expected ERROR_INVALID_NAME\n", error);
 
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(com, gmail_com);
@@ -615,7 +629,7 @@ static void test_IsDomainLegalCookieDomainW(void)
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk);
     error = GetLastError();
-    ok(!ret, "IsDomainLegalCookieDomainW failed\n");
+    ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
     ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error);
 
     ret = pIsDomainLegalCookieDomainW(uk, co_uk);
@@ -633,8 +647,10 @@ static void test_IsDomainLegalCookieDomainW(void)
     SetLastError(0xdeadbeef);
     ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com);
     error = GetLastError();
-    ok(!ret, "IsDomainLegalCookieDomainW failed\n");
-    ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error);
+    ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");
+    ok(error == ERROR_INVALID_NAME ||
+        broken(error == 0xdeadbeef), /* Win98, NT4, W2K, XP (some) */
+        "got %u expected ERROR_INVALID_NAME\n", error);
 
     ret = pIsDomainLegalCookieDomainW(gmail_com, mail_gmail_com);
     ok(ret, "IsDomainLegalCookieDomainW failed\n");




More information about the wine-cvs mailing list