From 3385c78c50c2deabb3b4ec37d0a7bfd93ddaf192 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 21 Aug 2014 14:48:27 -0600 Subject: [PATCH] Removed patch with stub for DwmInvalidateIconicBitmaps (accepted upstream). --- README.md | 3 +- debian/changelog | 1 + patches/Makefile | 19 ------ ...-stub-for-DwmInvalidateIconicBitmaps.patch | 61 ------------------- .../dwmapi-Invalidate_Thumbnail/definition | 4 -- 5 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 patches/dwmapi-Invalidate_Thumbnail/0001-dwmapi-Add-stub-for-DwmInvalidateIconicBitmaps.patch delete mode 100644 patches/dwmapi-Invalidate_Thumbnail/definition diff --git a/README.md b/README.md index d2d29119..cd3a1042 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ which are not present in regular wine, and always report such issues to us Included bugfixes and improvements ---------------------------------- -**Bugfixes and features included in the next upcoming release [12]:** +**Bugfixes and features included in the next upcoming release [11]:** * Adobe Reader requires NtProtectVirtualMemory and NtCreateSection to be on separate pages ([Wine Bug #33162](http://bugs.winehq.org/show_bug.cgi?id=33162 "Acrobat Reader 11 crashes on start (native API application virtualization, NtProtectVirtualMemory removes execute page protection on its own code)")) * Fix ITERATE_MoveFiles when no source- and destname is specified ([Wine Bug #10085](http://bugs.winehq.org/show_bug.cgi?id=10085 "Adobe Bridge CS2 complains that it can't start due to licensing restrictions (affects photoshop)")) @@ -23,7 +23,6 @@ Included bugfixes and improvements * Multiple applications need BCryptGetFipsAlgorithmMode ([Wine Bug #32194](http://bugs.winehq.org/show_bug.cgi?id=32194 "Multiple games and applications need bcrypt.dll.BCryptGetFipsAlgorithmMode (Chess Position Trainer, Terraria, .NET System.Security.Cryptography)")) * Other Pipelight-specific enhancements * Prevent window managers from grouping all wine programs together ([Wine Bug #32699](http://bugs.winehq.org/show_bug.cgi?id=32699 "Add StartupWMClass to .desktop files.")) -* Support for DwmInvalidateIconicBitmaps ([Wine Bug #32977](http://bugs.winehq.org/show_bug.cgi?id=32977 "Solidworks 2012 needs unimplemented function dwmapi.dll.DwmInvalidateIconicBitmaps (Win7 mode)")) * Support for Dynamic DST (daylight saving time) information in registry * Support for GetFinalPathNameByHandle ([Wine Bug #36073](http://bugs.winehq.org/show_bug.cgi?id=36073 "OneDrive crashes on unimplemented function KERNEL32.dll.GetFinalPathNameByHandleW")) * nVidia driver for high-end laptop cards does not list all supported resolutions diff --git a/debian/changelog b/debian/changelog index 2cd5a794..9ba6bed1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ wine-compholio (1.7.25) UNRELEASED; urgency=low * Added Courier Prime (OFLv1.1) as a Courier New replacement. * Added patch to better detect broken nVidia RandR 1.2 support. * Removed patch to return empty D3D hardware flags for RGB device enumeration (accepted upstream). + * Removed patch with stub for DwmInvalidateIconicBitmaps (accepted upstream). -- Erich E. Hoover Mon, 11 Aug 2014 16:21:22 -0600 wine-compholio (1.7.24) unstable; urgency=low diff --git a/patches/Makefile b/patches/Makefile index 6649c037..c8311caa 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -15,7 +15,6 @@ PATCHLIST := \ comctl32-ImageList.ok \ comctl32-LoadIconMetric.ok \ dsound-Fast_Mixer.ok \ - dwmapi-Invalidate_Thumbnail.ok \ fonts-Missing_Fonts.ok \ iphlpapi-TCP_Table.ok \ kernel32-GetFinalPathNameByHandle.ok \ @@ -215,24 +214,6 @@ dsound-Fast_Mixer.ok: echo '+ { "dsound-Fast_Mixer", "Alexander E. Patrakov", "Add a linear resampler for use with a large number of dsound mixing buffers." },'; \ ) > dsound-Fast_Mixer.ok -# Patchset dwmapi-Invalidate_Thumbnail -# | -# | Included patches: -# | * Add stub for DwmInvalidateIconicBitmaps. [by Erich E. Hoover] -# | -# | This patchset fixes the following Wine bugs: -# | * [#32977] Support for DwmInvalidateIconicBitmaps -# | -# | Modified files: -# | * dlls/dwmapi/dwmapi.spec, dlls/dwmapi/dwmapi_main.c, include/dwmapi.h -# | -.INTERMEDIATE: dwmapi-Invalidate_Thumbnail.ok -dwmapi-Invalidate_Thumbnail.ok: - $(call APPLY_FILE,dwmapi-Invalidate_Thumbnail/0001-dwmapi-Add-stub-for-DwmInvalidateIconicBitmaps.patch) - @( \ - echo '+ { "dwmapi-Invalidate_Thumbnail", "Erich E. Hoover", "Add stub for DwmInvalidateIconicBitmaps." },'; \ - ) > dwmapi-Invalidate_Thumbnail.ok - # Patchset fonts-Missing_Fonts # | # | Included patches: diff --git a/patches/dwmapi-Invalidate_Thumbnail/0001-dwmapi-Add-stub-for-DwmInvalidateIconicBitmaps.patch b/patches/dwmapi-Invalidate_Thumbnail/0001-dwmapi-Add-stub-for-DwmInvalidateIconicBitmaps.patch deleted file mode 100644 index e923919a..00000000 --- a/patches/dwmapi-Invalidate_Thumbnail/0001-dwmapi-Add-stub-for-DwmInvalidateIconicBitmaps.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 30201042f9da59a0943902d45f65659226fa3583 Mon Sep 17 00:00:00 2001 -From: "Erich E. Hoover" -Date: Sat, 9 Aug 2014 16:30:53 -0600 -Subject: dwmapi: Add stub for DwmInvalidateIconicBitmaps. - ---- - dlls/dwmapi/dwmapi.spec | 1 + - dlls/dwmapi/dwmapi_main.c | 12 ++++++++++++ - include/dwmapi.h | 1 + - 3 files changed, 14 insertions(+) - -diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec -index 5f74970..764f04c 100644 ---- a/dlls/dwmapi/dwmapi.spec -+++ b/dlls/dwmapi/dwmapi.spec -@@ -33,6 +33,7 @@ - @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) - @ stdcall DwmGetTransportAttributes(ptr ptr ptr) - @ stdcall DwmGetWindowAttribute(ptr long ptr long) -+@ stdcall DwmInvalidateIconicBitmaps(ptr) - @ stdcall DwmIsCompositionEnabled(ptr) - @ stub DwmModifyPreviousDxFrameDuration - @ stub DwmQueryThumbnailSourceSize -diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c -index 8cc46f0..6ee45af 100644 ---- a/dlls/dwmapi/dwmapi_main.c -+++ b/dlls/dwmapi/dwmapi_main.c -@@ -108,6 +108,18 @@ HRESULT WINAPI DwmFlush(void) - } - - /********************************************************************** -+ * DwmInvalidateIconicBitmaps (DWMAPI.@) -+ */ -+HRESULT WINAPI DwmInvalidateIconicBitmaps(HWND hwnd) -+{ -+ static BOOL once; -+ -+ if (!once++) FIXME("(%p) stub\n", hwnd); -+ -+ return E_NOTIMPL; -+} -+ -+/********************************************************************** - * DwmSetWindowAttribute (DWMAPI.@) - */ - HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) -diff --git a/include/dwmapi.h b/include/dwmapi.h -index f85999a..db13b5f 100644 ---- a/include/dwmapi.h -+++ b/include/dwmapi.h -@@ -116,6 +116,7 @@ DWMAPI DwmEnableMMCSS(BOOL); - DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); - DWMAPI DwmGetColorizationColor(DWORD*,BOOL); - DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); -+DWMAPI DwmInvalidateIconicBitmaps(HWND); - DWMAPI DwmIsCompositionEnabled(BOOL*); - DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); - DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); --- -1.7.9.5 - diff --git a/patches/dwmapi-Invalidate_Thumbnail/definition b/patches/dwmapi-Invalidate_Thumbnail/definition deleted file mode 100644 index 16f38e19..00000000 --- a/patches/dwmapi-Invalidate_Thumbnail/definition +++ /dev/null @@ -1,4 +0,0 @@ -Author: Erich E. Hoover -Subject: Add stub for DwmInvalidateIconicBitmaps. -Revision: 1 -Fixes: [32977] Support for DwmInvalidateIconicBitmaps