Added patch to ignore unsupported flags for CoInternetSetFeatureEnabled.

This commit is contained in:
Sebastian Lackner 2014-12-12 05:18:45 +01:00
parent fc24ba3f65
commit 47a163dcef
5 changed files with 48 additions and 1 deletions

View File

@ -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

1
debian/changelog vendored
View File

@ -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).

View File

@ -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:

View File

@ -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

View File

@ -0,0 +1 @@
Fixes: [35197] Ignore unsupported flags for CoInternetSetFeatureEnabled