diff --git a/README.md b/README.md index 98f07323..6d49e5f7 100644 --- a/README.md +++ b/README.md @@ -37,12 +37,13 @@ Wine. All those differences are also documented on the Included bug fixes and improvements =================================== -**Bugfixes and features included in the next upcoming release [8]:** +**Bugfixes and features included in the next upcoming release [9]:** * Add support for GetPropValue to PulseAudio backend * Fix condition mask handling in RtlVerifyVersionInfo ([Wine Bug #36143](https://bugs.winehq.org/show_bug.cgi?id=36143)) * Fix possible segfault in pulse_rd_loop of PulseAudio backend * Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706)) +* Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197)) * Set last error when GetRawInputDeviceList fails ([Wine Bug #37667](https://bugs.winehq.org/show_bug.cgi?id=37667)) * Support for StrCatChainW * Support for combase HSTRING objects diff --git a/debian/changelog b/debian/changelog index ab78a7eb..3ac5805e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ wine-compholio (1.7.33) UNRELEASED; urgency=low * Added patch to implement stubs for MFStartup and MFShutdown. * Added patch for additional tests of CoWaitForMultipleHandles with WM_QUIT. * Added patch to fix return value of ScrollWindowEx for invisible windows. + * Added patch to ignore unsupported flags for CoInternetSetFeatureEnabled. * Removed patch to fix copy and paste errors in ws2_32 tests (accepted upstream). * Removed patch to fix ordering of IP addresses by metric if two addresses have the same metric (accepted upstream). * Removed patch to reset data->pWintrustData->u.pFile->hFile after closing handle (accepted upstream). diff --git a/patches/Makefile b/patches/Makefile index f516a334..1a28ad55 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -104,6 +104,7 @@ PATCHLIST := \ shlwapi-PathIsDirectoryEmptyW.ok \ shlwapi-StrCatChainW.ok \ shlwapi-UrlCombine.ok \ + urlmon-CoInternetSetFeatureEnabled.ok \ user32-Dialog_Paint_Event.ok \ user32-DrawTextExW.ok \ user32-GetRawInputDeviceList.ok \ @@ -1601,6 +1602,21 @@ shlwapi-UrlCombine.ok: echo '+ { "Sebastian Lackner", "shlwapi: UrlCombineW workaround for relative paths.", 1 },'; \ ) > shlwapi-UrlCombine.ok +# Patchset urlmon-CoInternetSetFeatureEnabled +# | +# | This patchset fixes the following Wine bugs: +# | * [#35197] Ignore unsupported flags for CoInternetSetFeatureEnabled +# | +# | Modified files: +# | * dlls/urlmon/internet.c +# | +.INTERMEDIATE: urlmon-CoInternetSetFeatureEnabled.ok +urlmon-CoInternetSetFeatureEnabled.ok: + $(call APPLY_FILE,urlmon-CoInternetSetFeatureEnabled/0001-urlmon-Ignore-unsupported-flags-for-CoInternetSetFea.patch) + @( \ + echo '+ { "Bruno Jesus", "urlmon: Ignore unsupported flags for CoInternetSetFeatureEnabled.", 1 },'; \ + ) > urlmon-CoInternetSetFeatureEnabled.ok + # Patchset user32-Dialog_Paint_Event # | # | This patchset fixes the following Wine bugs: diff --git a/patches/urlmon-CoInternetSetFeatureEnabled/0001-urlmon-Ignore-unsupported-flags-for-CoInternetSetFea.patch b/patches/urlmon-CoInternetSetFeatureEnabled/0001-urlmon-Ignore-unsupported-flags-for-CoInternetSetFea.patch new file mode 100644 index 00000000..91dacf4b --- /dev/null +++ b/patches/urlmon-CoInternetSetFeatureEnabled/0001-urlmon-Ignore-unsupported-flags-for-CoInternetSetFea.patch @@ -0,0 +1,28 @@ +From 15cc0b19149e0a1c811313ee1a97b82032cf41da Mon Sep 17 00:00:00 2001 +From: Bruno Jesus <00cpxxx@gmail.com> +Date: Fri, 12 Dec 2014 05:16:14 +0100 +Subject: urlmon: Ignore unsupported flags for CoInternetSetFeatureEnabled + +--- + dlls/urlmon/internet.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c +index e5d41b6..d7deccc 100644 +--- a/dlls/urlmon/internet.c ++++ b/dlls/urlmon/internet.c +@@ -536,10 +536,8 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO + if(feature >= FEATURE_ENTRY_COUNT) + return E_FAIL; + +- if(flags & ~supported_flags) { ++ if(flags & ~supported_flags) + FIXME("Unsupported flags: %08x\n", flags & ~supported_flags); +- return E_NOTIMPL; +- } + + if(flags & SET_FEATURE_ON_PROCESS) + set_feature_on_process(feature, enable); +-- +2.1.3 + diff --git a/patches/urlmon-CoInternetSetFeatureEnabled/definition b/patches/urlmon-CoInternetSetFeatureEnabled/definition new file mode 100644 index 00000000..6815cfb4 --- /dev/null +++ b/patches/urlmon-CoInternetSetFeatureEnabled/definition @@ -0,0 +1 @@ +Fixes: [35197] Ignore unsupported flags for CoInternetSetFeatureEnabled