Lei Zhang : shlwapi: Fix a return value in UrlEscapeA.

Alexandre Julliard julliard at winehq.org
Thu Jan 10 06:42:02 CST 2008


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

Author: Lei Zhang <thestig at google.com>
Date:   Wed Jan  9 14:03:47 2008 -0800

shlwapi: Fix a return value in UrlEscapeA.

---

 dlls/shlwapi/tests/url.c |    4 +---
 dlls/shlwapi/url.c       |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index b7549bd..87b8b1d 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -480,9 +480,7 @@ static void test_UrlEscape(void)
 
     size = 1;
     ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY);
-    todo_wine {
-        ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER);
-    }
+    ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER);
     ok(size == 34, "got %d, expected %d\n", size, 34);
 
     for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) {
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index ac150e6..fed9a9f 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -860,7 +860,7 @@ HRESULT WINAPI UrlEscapeA(
             *pcchEscaped = lenA;
         } else {
             *pcchEscaped = lenA + 1;
-            ret = E_INVALIDARG;
+            ret = E_POINTER;
         }
     }
     if(escapedW != bufW) HeapFree(GetProcessHeap(), 0, escapedW);




More information about the wine-cvs mailing list