wine/dlls/wininet tests/http.c internet.c

[Alexandre Julliard]

ChangeSet ID:	21246
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/14 05:23:02

Modified files:
    dlls/wininet/tests: http.c 
    dlls/wininet   : internet.c

Log message:
    Saulius Krasuckas 
    Fix a test for InternetCreateUrlA as no Windows platform sets last
    error here. Make InternetCreateUrlA pass the test.

Patch: http://cvs.winehq.org/patch.py?id=21246

Old revision  New revision  Changes     Path
 1.29          1.30          +2 -2       wine/dlls/wininet/tests/http.c
 1.139         1.140         +0 -2       wine/dlls/wininet/internet.c

Index: wine/dlls/wininet/tests/http.c
diff -u -p wine/dlls/wininet/tests/http.c:1.29 wine/dlls/wininet/tests/http.c:1.30
--- wine/dlls/wininet/tests/http.c:1.29	14 Nov 2005 11:23: 2 -0000
+++ wine/dlls/wininet/tests/http.c	14 Nov 2005 11:23: 2 -0000
@@ -784,8 +784,8 @@ static void InternetCreateUrlA_test()
    len = 42;
    ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len);
    ok(ret, "Expected success\n");
-	ok(GetLastError() == ERROR_ALREADY_EXISTS,
-		"Expected ERROR_ALREADYEXISTS, got %ld\n", GetLastError());
+	ok(GetLastError() == 0xdeadbeef,
+		"Expected 0xdeadbeef, got %ld\n", GetLastError());
    ok(len == 32, "Expected len 32, got %ld\n", len);
    ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL3, szUrl);

Index: wine/dlls/wininet/internet.c
diff -u -p wine/dlls/wininet/internet.c:1.139 wine/dlls/wininet/internet.c:1.140
--- wine/dlls/wininet/internet.c:1.139	14 Nov 2005 11:23: 2 -0000
+++ wine/dlls/wininet/internet.c	14 Nov 2005 11:23: 2 -0000
@@ -3584,8 +3584,6 @@ static BOOL calc_url_length(LPURL_COMPON
             SetLastError(ERROR_INVALID_PARAMETER);
             return FALSE;
         }
-        else
-            SetLastError(ERROR_ALREADY_EXISTS);
     }

if (lpUrlComponents->lpszPassword)