From 5571baf8cc80501d2888e3af007a8874bf188239 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 4 May 2018 10:17:03 +1000 Subject: [PATCH] Rebase against e637a6f0bf1eeba3e6be62c4e1c5688bb8f6102e --- patches/patchinstall.sh | 20 +------- ...TERNET_OPTION_SETTINGS_CHANGED-on-co.patch | 44 ----------------- ...ort-for-INTERNET_OPTION_SETTINGS_CHA.patch | 47 ------------------- patches/wininet-Internet_Settings/definition | 1 - .../0001-wuauserv-Add-dummy-service.patch | 22 ++++----- 5 files changed, 12 insertions(+), 122 deletions(-) delete mode 100644 patches/wininet-Internet_Settings/0001-wininet-Allow-INTERNET_OPTION_SETTINGS_CHANGED-on-co.patch delete mode 100644 patches/wininet-Internet_Settings/0002-wininet-Add-support-for-INTERNET_OPTION_SETTINGS_CHA.patch delete mode 100644 patches/wininet-Internet_Settings/definition diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1b73c840..a645614d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "8dca6c35e11a104385242ed8346ee05707b78ef7" + echo "e637a6f0bf1eeba3e6be62c4e1c5688bb8f6102e" } # Show version information @@ -414,7 +414,6 @@ patch_enable_all () enable_wininet_Cleanup="$1" enable_wininet_Http_Decoding="$1" enable_wininet_InternetCrackUrlW="$1" - enable_wininet_Internet_Settings="$1" enable_winmm_Delay_Import_Depends="$1" enable_winmm_mciSendCommandA="$1" enable_wintrust_WTHelperGetProvCertFromChain="$1" @@ -1432,9 +1431,6 @@ patch_enable () wininet-InternetCrackUrlW) enable_wininet_InternetCrackUrlW="$2" ;; - wininet-Internet_Settings) - enable_wininet_Internet_Settings="$2" - ;; winmm-Delay_Import_Depends) enable_winmm_Delay_Import_Depends="$2" ;; @@ -8431,20 +8427,6 @@ if test "$enable_wininet_InternetCrackUrlW" -eq 1; then ) >> "$patchlist" fi -# Patchset wininet-Internet_Settings -# | -# | Modified files: -# | * dlls/wininet/internet.c, dlls/wininet/tests/internet.c -# | -if test "$enable_wininet_Internet_Settings" -eq 1; then - patch_apply wininet-Internet_Settings/0001-wininet-Allow-INTERNET_OPTION_SETTINGS_CHANGED-on-co.patch - patch_apply wininet-Internet_Settings/0002-wininet-Add-support-for-INTERNET_OPTION_SETTINGS_CHA.patch - ( - printf '%s\n' '+ { "Michael Müller", "wininet: Allow INTERNET_OPTION_SETTINGS_CHANGED on connections.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "wininet: Add support for INTERNET_OPTION_SETTINGS_CHANGED in InternetSetOption.", 1 },'; - ) >> "$patchlist" -fi - # Patchset winmm-Delay_Import_Depends # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wininet-Internet_Settings/0001-wininet-Allow-INTERNET_OPTION_SETTINGS_CHANGED-on-co.patch b/patches/wininet-Internet_Settings/0001-wininet-Allow-INTERNET_OPTION_SETTINGS_CHANGED-on-co.patch deleted file mode 100644 index ff1d001d..00000000 --- a/patches/wininet-Internet_Settings/0001-wininet-Allow-INTERNET_OPTION_SETTINGS_CHANGED-on-co.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 22a5c051cf024f7ca12e8fcde6cb0d925c53ac7e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 7 Aug 2015 03:44:39 +0200 -Subject: wininet: Allow INTERNET_OPTION_SETTINGS_CHANGED on connections. - ---- - dlls/wininet/internet.c | 3 +++ - dlls/wininet/tests/internet.c | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c -index b004c68..2f4be7b 100644 ---- a/dlls/wininet/internet.c -+++ b/dlls/wininet/internet.c -@@ -3045,6 +3045,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, - ret = (res == ERROR_SUCCESS); - break; - } -+ case INTERNET_OPTION_SETTINGS_CHANGED: -+ FIXME("INTERNET_OPTION_SETTINGS_CHANGED; STUB\n"); -+ break; - default: - FIXME("Option %d STUB\n",dwOption); - SetLastError(ERROR_INTERNET_INVALID_OPTION); -diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c -index 2efde07..3274ef7 100644 ---- a/dlls/wininet/tests/internet.c -+++ b/dlls/wininet/tests/internet.c -@@ -1136,6 +1136,12 @@ static void test_InternetSetOption(void) - ok(ret == FALSE, "InternetSetOption should've failed\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError()); - -+ ret = InternetSetOptionA(req, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); -+ ok(ret == TRUE, "InternetSetOption should've succeeded\n"); -+ -+ ret = InternetSetOptionA(ses, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); -+ ok(ret == TRUE, "InternetSetOption should've succeeded\n"); -+ - ret = InternetCloseHandle(req); - ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); - ret = InternetCloseHandle(con); --- -2.5.0 - diff --git a/patches/wininet-Internet_Settings/0002-wininet-Add-support-for-INTERNET_OPTION_SETTINGS_CHA.patch b/patches/wininet-Internet_Settings/0002-wininet-Add-support-for-INTERNET_OPTION_SETTINGS_CHA.patch deleted file mode 100644 index f73e1bf2..00000000 --- a/patches/wininet-Internet_Settings/0002-wininet-Add-support-for-INTERNET_OPTION_SETTINGS_CHA.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d49d4f54ace573abdf2919ce791ded8bf2242ce3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 7 Aug 2015 04:22:12 +0200 -Subject: wininet: Add support for INTERNET_OPTION_SETTINGS_CHANGED in - InternetSetOption. - ---- - dlls/wininet/internet.c | 3 +++ - dlls/wininet/tests/internet.c | 8 ++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c -index 2f4be7b..899c30b 100644 ---- a/dlls/wininet/internet.c -+++ b/dlls/wininet/internet.c -@@ -3048,6 +3048,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, - case INTERNET_OPTION_SETTINGS_CHANGED: - FIXME("INTERNET_OPTION_SETTINGS_CHANGED; STUB\n"); - break; -+ case INTERNET_OPTION_REFRESH: -+ FIXME("INTERNET_OPTION_REFRESH; STUB\n"); -+ break; - default: - FIXME("Option %d STUB\n",dwOption); - SetLastError(ERROR_INTERNET_INVALID_OPTION); -diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c -index 3274ef7..dd03758 100644 ---- a/dlls/wininet/tests/internet.c -+++ b/dlls/wininet/tests/internet.c -@@ -1142,6 +1142,14 @@ static void test_InternetSetOption(void) - ret = InternetSetOptionA(ses, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); - ok(ret == TRUE, "InternetSetOption should've succeeded\n"); - -+ ret = InternetSetOptionA(ses, INTERNET_OPTION_REFRESH, NULL, 0); -+ ok(ret == TRUE, "InternetSetOption should've succeeded\n"); -+ -+ SetLastError(0xdeadbeef); -+ ret = InternetSetOptionA(req, INTERNET_OPTION_REFRESH, NULL, 0); -+ todo_wine ok(ret == FALSE, "InternetSetOption should've failed\n"); -+ todo_wine ok(GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "GetLastError() = %x\n", GetLastError()); -+ - ret = InternetCloseHandle(req); - ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); - ret = InternetCloseHandle(con); --- -2.5.0 - diff --git a/patches/wininet-Internet_Settings/definition b/patches/wininet-Internet_Settings/definition deleted file mode 100644 index 0b98a2f4..00000000 --- a/patches/wininet-Internet_Settings/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Add stubs for additional wininet options in InternetSetOption diff --git a/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch b/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch index 981955d2..ad07925f 100644 --- a/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch +++ b/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch @@ -1,4 +1,4 @@ -From ed96944bde2b0e5cc749fc3e4fec7ad404b6ab20 Mon Sep 17 00:00:00 2001 +From 0873ea7db1a66d1555ac608b249ac350f9c9097b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 11 Mar 2016 21:44:53 +0100 Subject: [PATCH] wuauserv: Add dummy service. @@ -13,10 +13,10 @@ Subject: [PATCH] wuauserv: Add dummy service. create mode 100644 programs/wuauserv/main.c diff --git a/configure.ac b/configure.ac -index 053af80..595e94b 100644 +index 13467e5..ddfba7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4012,6 +4012,7 @@ WINE_CONFIG_MAKEFILE(programs/wordpad) +@@ -4039,6 +4039,7 @@ WINE_CONFIG_MAKEFILE(programs/wordpad) WINE_CONFIG_MAKEFILE(programs/write) WINE_CONFIG_MAKEFILE(programs/wscript) WINE_CONFIG_MAKEFILE(programs/wscript/tests) @@ -25,34 +25,34 @@ index 053af80..595e94b 100644 WINE_CONFIG_MAKEFILE(programs/xcopy) WINE_CONFIG_MAKEFILE(programs/xcopy/tests) diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index bd83ba2..b4377ed 100644 +index edb8401..c5d8e8f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -135,6 +135,7 @@ AddService=FontCache,0,FontCacheService - AddService=Schedule,0,TaskSchedulerService +@@ -136,6 +136,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=WineHID,0,WineHIDService + AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService -@@ -151,6 +152,7 @@ AddService=FontCache,0,FontCacheService - AddService=Schedule,0,TaskSchedulerService +@@ -153,6 +154,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=WineHID,0,WineHIDService + AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService -@@ -167,6 +169,7 @@ AddService=FontCache,0,FontCacheService - AddService=Schedule,0,TaskSchedulerService +@@ -170,6 +172,7 @@ AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService AddService=WineHID,0,WineHIDService + AddService=Winmgmt,0,WinmgmtService +AddService=wuauserv,0,wuauService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" -@@ -3458,6 +3461,14 @@ ErrorControl=1 +@@ -3471,6 +3474,14 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule"