Rebase against e083986df52bd706d0c7e8ae8820a5d886942585.

patches/wininet-Internet_Settings/0001-wininet-Print-the-correct-function-name-in-ok-messag.patch

@@ -1,51 +0,0 @@
-From d09b181f7f9cbba7d9b28e3a5db4058f852b5688 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 7 Aug 2015 22:16:08 +0200
-Subject: wininet: Print the correct function name in ok() messages.
-
----
- dlls/wininet/tests/internet.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
-index 5e09525..2efde07 100644
---- a/dlls/wininet/tests/internet.c
-+++ b/dlls/wininet/tests/internet.c
-@@ -1111,29 +1111,29 @@ static void test_InternetSetOption(void)
-     SetLastError(0xdeadbeef);
-     ulArg = 11;
-     ret = InternetSetOptionA(NULL, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG));
--    ok(ret == FALSE, "InternetQueryOption should've failed\n");
-+    ok(ret == FALSE, "InternetSetOption should've failed\n");
-     ok(GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "GetLastError() = %x\n", GetLastError());
- 
-     SetLastError(0xdeadbeef);
-     ulArg = 11;
-     ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, 20);
--    ok(ret == FALSE, "InternetQueryOption should've failed\n");
-+    ok(ret == FALSE, "InternetSetOption should've failed\n");
-     ok(GetLastError() == ERROR_INTERNET_BAD_OPTION_LENGTH, "GetLastError() = %d\n", GetLastError());
- 
-     ulArg = 11;
-     ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG));
--    ok(ret == TRUE, "InternetQueryOption should've succeeded\n");
-+    ok(ret == TRUE, "InternetSetOption should've succeeded\n");
- 
-     SetLastError(0xdeadbeef);
-     ulArg = 4;
-     ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG));
--    ok(ret == FALSE, "InternetQueryOption should've failed\n");
-+    ok(ret == FALSE, "InternetSetOption should've failed\n");
-     ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError());
- 
-     SetLastError(0xdeadbeef);
-     ulArg = 16;
-     ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG));
--    ok(ret == FALSE, "InternetQueryOption should've failed\n");
-+    ok(ret == FALSE, "InternetSetOption should've failed\n");
-     ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError());
- 
-     ret = InternetCloseHandle(req);
--- 
-2.5.0
-