From c3c9472eb4fe067794e3ddf1d415614f74066d79 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 11 May 2015 18:19:20 +0200 Subject: [PATCH] Added patch for stub of fltlib.FilterLoad. --- README.md | 3 +- debian/changelog | 1 + .../0001-fltlib-Add-stub-for-FilterLoad.patch | 46 ++++++++++++++++++ patches/fltlib-FilterLoad/definition | 1 + patches/patchinstall.sh | 47 +++++++++++++------ 5 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 patches/fltlib-FilterLoad/0001-fltlib-Add-stub-for-FilterLoad.patch create mode 100644 patches/fltlib-FilterLoad/definition diff --git a/README.md b/README.md index 6c65b139..32ae791a 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,10 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [8]:** +**Bug fixes and features included in the next upcoming release [9]:** * Add stub for atl80.AtlIPersistPropertyBag_Save ([Wine Bug #33888](https://bugs.winehq.org/show_bug.cgi?id=33888)) +* Add stub for fltlib.FilterLoad ([Wine Bug #38435](https://bugs.winehq.org/show_bug.cgi?id=38435)) * Add stub for winsta.WinStationEnumerateW ([Wine Bug #38102](https://bugs.winehq.org/show_bug.cgi?id=38102)) * Dirtify vertex shader on transformed update to fix graphical corruption ([Wine Bug #38539](https://bugs.winehq.org/show_bug.cgi?id=38539)) * Improve ReadDataAvailable handling in FilePipeLocalInformation class diff --git a/debian/changelog b/debian/changelog index 8b8156e8..0e6ed473 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ wine-staging (1.7.43) UNRELEASED; urgency=low corruption. * Added patch to use POSIX implementation to enumerate directory content on FreeBSD. + * Added patch for stub of fltlib.FilterLoad. * Removed patch to use lockfree implementation for FD cache (accepted upstream). * Removed patch to properly handle closing sockets during a select call diff --git a/patches/fltlib-FilterLoad/0001-fltlib-Add-stub-for-FilterLoad.patch b/patches/fltlib-FilterLoad/0001-fltlib-Add-stub-for-FilterLoad.patch new file mode 100644 index 00000000..c58cde40 --- /dev/null +++ b/patches/fltlib-FilterLoad/0001-fltlib-Add-stub-for-FilterLoad.patch @@ -0,0 +1,46 @@ +From b227af567a06d06fc453d227926faa936304eccd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Mon, 11 May 2015 18:14:42 +0200 +Subject: fltlib: Add stub for FilterLoad + +--- + dlls/fltlib/fltlib.c | 9 +++++++++ + dlls/fltlib/fltlib.spec | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c +index 50f46ac..bf2fa9c 100644 +--- a/dlls/fltlib/fltlib.c ++++ b/dlls/fltlib/fltlib.c +@@ -79,6 +79,15 @@ HRESULT WINAPI FilterFindClose(HANDLE handle) + } + + /********************************************************************** ++ * FilterLoad (FLTLIB.@) ++ */ ++HRESULT WINAPI FilterLoad(LPCWSTR lpFilterName) ++{ ++ FIXME("(%s) stub\n", debugstr_w(lpFilterName)); ++ return S_OK; ++} ++ ++/********************************************************************** + * FilterUnload (FLTLIB.@) + */ + HRESULT WINAPI FilterUnload(LPCWSTR lpFilterName) +diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec +index 91e803b..226a615 100644 +--- a/dlls/fltlib/fltlib.spec ++++ b/dlls/fltlib/fltlib.spec +@@ -16,7 +16,7 @@ + @ stub FilterInstanceFindFirst + @ stub FilterInstanceFindNext + @ stub FilterInstanceGetInformation +-@ stub FilterLoad ++@ stdcall FilterLoad(wstr) + @ stub FilterReplyMessage + @ stub FilterSendMessage + @ stdcall FilterUnload(wstr) +-- +2.4.0 + diff --git a/patches/fltlib-FilterLoad/definition b/patches/fltlib-FilterLoad/definition new file mode 100644 index 00000000..3b7d2ed1 --- /dev/null +++ b/patches/fltlib-FilterLoad/definition @@ -0,0 +1 @@ +Fixes: [38435] Add stub for fltlib.FilterLoad diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1032da28..28f1f58c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -118,6 +118,7 @@ patch_enable_all () enable_dsound_Fast_Mixer="$1" enable_dxgi_GetDesc="$1" enable_dxva2_Video_Decoder="$1" + enable_fltlib_FilterLoad="$1" enable_fltmgr_Stub_SYS="$1" enable_fonts_Missing_Fonts="$1" enable_gdi32_Default_Palette="$1" @@ -414,6 +415,9 @@ patch_enable () dxva2-Video_Decoder) enable_dxva2_Video_Decoder="$2" ;; + fltlib-FilterLoad) + enable_fltlib_FilterLoad="$2" + ;; fltmgr-Stub_SYS) enable_fltmgr_Stub_SYS="$2" ;; @@ -2992,6 +2996,21 @@ if test "$enable_dxva2_Video_Decoder" -eq 1; then ) >> "$patchlist" fi +# Patchset fltlib-FilterLoad +# | +# | This patchset fixes the following Wine bugs: +# | * [#38435] Add stub for fltlib.FilterLoad +# | +# | Modified files: +# | * dlls/fltlib/fltlib.c, dlls/fltlib/fltlib.spec +# | +if test "$enable_fltlib_FilterLoad" -eq 1; then + patch_apply fltlib-FilterLoad/0001-fltlib-Add-stub-for-FilterLoad.patch + ( + echo '+ { "Michael Müller", "fltlib: Add stub for FilterLoad.", 1 },'; + ) >> "$patchlist" +fi + # Patchset fltmgr-Stub_SYS # | # | This patchset fixes the following Wine bugs: @@ -3149,6 +3168,20 @@ if test "$enable_kernel32_CompareStringEx" -eq 1; then ) >> "$patchlist" fi +# Patchset kernel32-SetFileInformationByHandle +# | +# | Modified files: +# | * dlls/kernel32/file.c, include/winbase.h +# | +if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then + patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch + patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch + ( + echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; + echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },'; + ) >> "$patchlist" +fi + # Patchset server-File_Permissions # | # | Modified files: @@ -3190,20 +3223,6 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then ) >> "$patchlist" fi -# Patchset kernel32-SetFileInformationByHandle -# | -# | Modified files: -# | * dlls/kernel32/file.c, include/winbase.h -# | -if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then - patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch - patch_apply kernel32-SetFileInformationByHandle/0002-kernel32-Implement-SetFileInformationByHandle.patch - ( - echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; - echo '+ { "Michael Müller", "kernel32: Implement SetFileInformationByHandle.", 1 },'; - ) >> "$patchlist" -fi - # Patchset kernel32-CopyFileEx # | # | This patchset fixes the following Wine bugs: