diff --git a/README.md b/README.md index 0a2d3800..9f32f8cd 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ Included bug fixes and improvements * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115)) * Other Pipelight-specific enhancements * Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699)) -* Provide named entry point shell32.SHILCreateFromPath for vista apps ([Wine Bug #37265](https://bugs.winehq.org/show_bug.cgi?id=37265)) +* ~~Provide named entry point shell32.SHILCreateFromPath for vista apps~~ ([Wine Bug #37265](https://bugs.winehq.org/show_bug.cgi?id=37265)) * Reallocate buffer when adding records to AVI files ([Wine Bug #5137](https://bugs.winehq.org/show_bug.cgi?id=5137)) * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates) * Return an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087)) diff --git a/debian/changelog b/debian/changelog index fd4613a1..01cb60b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ wine-staging (1.7.34) UNRELEASED; urgency=low * Removed patch to implement shlwapi.StrCatChainW (accepted upstream). * Removed patch to implement semi-stub for psapi/kernel32 K32EnumProcessModulesEx (accepted upstream). * Removed patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK (accepted upstream). + * Removed patch to export SHILCreateFromPath by name (accepted upstream). * Partially removed patches for ntdll DOS attributes (accepted upstream). -- Sebastian Lackner Mon, 15 Dec 2014 22:42:09 +0100 diff --git a/patches/Makefile b/patches/Makefile index ceba369d..bc476987 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -102,7 +102,6 @@ PATCHLIST := \ shell32-RunDLL_CallEntry16.ok \ shell32-SHCreateSessionKey.ok \ shell32-SHFileOperation.ok \ - shell32-SHILCreateFromPath.ok \ shlwapi-PathIsDirectoryEmptyW.ok \ shlwapi-UrlCombine.ok \ urlmon-CoInternetSetFeatureEnabled.ok \ @@ -1580,21 +1579,6 @@ shell32-SHFileOperation.ok: echo '+ { "Michael Müller", "shell32: Choose return value for SHFileOperationW depending on windows version.", 1 },'; \ ) > shell32-SHFileOperation.ok -# Patchset shell32-SHILCreateFromPath -# | -# | This patchset fixes the following Wine bugs: -# | * [#37265] Provide named entry point shell32.SHILCreateFromPath for vista apps -# | -# | Modified files: -# | * dlls/shell32/shell32.spec -# | -.INTERMEDIATE: shell32-SHILCreateFromPath.ok -shell32-SHILCreateFromPath.ok: - $(call APPLY_FILE,shell32-SHILCreateFromPath/0001-shell32-export-SHILCreateFromPath-by-name-too.patch) - @( \ - echo '+ { "Stefan Leichter", "shell32: export SHILCreateFromPath by name too.", 1 },'; \ - ) > shell32-SHILCreateFromPath.ok - # Patchset shlwapi-PathIsDirectoryEmptyW # | # | This patchset fixes the following Wine bugs: diff --git a/patches/shell32-SHILCreateFromPath/0001-shell32-export-SHILCreateFromPath-by-name-too.patch b/patches/shell32-SHILCreateFromPath/0001-shell32-export-SHILCreateFromPath-by-name-too.patch deleted file mode 100644 index 6b7764b6..00000000 --- a/patches/shell32-SHILCreateFromPath/0001-shell32-export-SHILCreateFromPath-by-name-too.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5aea6b429bdc985c59e8149d7d51fde8133e79bf Mon Sep 17 00:00:00 2001 -From: Stefan Leichter -Date: Wed, 10 Dec 2014 23:38:23 +0100 -Subject: shell32: export SHILCreateFromPath by name too - -https://bugs.winehq.org/show_bug.cgi?id=37265 ---- - dlls/shell32/shell32.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec -index 0a8d448..f168ed7 100644 ---- a/dlls/shell32/shell32.spec -+++ b/dlls/shell32/shell32.spec -@@ -24,7 +24,7 @@ - 25 stdcall -ordinal ILCombine(ptr ptr) - 26 stdcall -noname ILLoadFromStream(ptr ptr) - 27 stdcall -ordinal ILSaveToStream(ptr ptr) -- 28 stdcall -noname SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW -+ 28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW - 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW - 30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW - 31 stdcall -noname PathFindExtension(ptr) PathFindExtensionAW --- -2.1.3 - diff --git a/patches/shell32-SHILCreateFromPath/definition b/patches/shell32-SHILCreateFromPath/definition deleted file mode 100644 index 30e9be99..00000000 --- a/patches/shell32-SHILCreateFromPath/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [37265] Provide named entry point shell32.SHILCreateFromPath for vista apps