[2/2] wininet: Disabling proxy should return success when no proxy was enabled.

Sebastian Lackner sebastian at fds-team.de
Thu Oct 8 00:15:47 CDT 2015


From: Michael Müller <michael at fds-team.de>

Signed-off-by: Michael Müller <michael at fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---
 dlls/wininet/internet.c       |    2 +-
 dlls/wininet/tests/internet.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index c64816e..9045b03 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -359,7 +359,7 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi )
     }
     else
     {
-        if ((ret = RegDeleteValueW( key, szProxyServer )))
+        if ((ret = RegDeleteValueW( key, szProxyServer )) && ret != ERROR_FILE_NOT_FOUND)
         {
             RegCloseKey( key );
             return ret;
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index 22016c1..5636d4b 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -1359,7 +1359,7 @@ static void test_Option_PerConnectionOptionA(void)
     ok(ret == TRUE, "InternetSetOption should've succeeded\n");
 
     ret = InternetSetOptionA(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, size);
-    todo_wine ok(ret == TRUE, "InternetSetOption should've succeeded\n");
+    ok(ret == TRUE, "InternetSetOption should've succeeded\n");
 
     HeapFree(GetProcessHeap(), 0, list.pOptions);
 
-- 
2.6.0



More information about the wine-patches mailing list