diff --git a/README.md b/README.md index 76c719c3..a95ab36e 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Wine-Compholio contains fixes for the following Wine bugs: * Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](http://bugs.winehq.org/show_bug.cgi?id=23174 "Fallout 3: Diologue and Video/sound issues")) * Set ldr.EntryPoint for main executable ([Wine Bug #33034](http://bugs.winehq.org/show_bug.cgi?id=33034 "Many GFWL (Games For Windows Live) 1.x/2.x/3.x games crash or exit silently on startup (DiRT 2/3, GTA IV Steam)")) * Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](http://bugs.winehq.org/show_bug.cgi?id=34372 "Add missing function AllocateAndGetTcpExTableFromStack() to iphlpapi.dll")) +* 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 GetSystemTimes ([Wine Bug #19813](http://bugs.winehq.org/show_bug.cgi?id=19813 "Voddler needs GetSystemTimes to run")) * Support for ITextRange, ITextFont and ITextPara ([Wine Bug #18303](http://bugs.winehq.org/show_bug.cgi?id=18303 "Adobe Acrobat Pro 7: Crashes when selecting the \"edit\" menu while having a file open.")) * Support for Junction Points ([Wine Bug #12401](http://bugs.winehq.org/show_bug.cgi?id=12401 "Support junction points, i.e. DeviceIoCtl(FSCTL_SET_REPARSE_POINT/FSCTL_GET_REPARSE_POINT)")) diff --git a/debian/changelog b/debian/changelog index b35eb0a9..a6a43bd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ wine-compholio (1.7.25) UNRELEASED; urgency=low + * Added patch with stub for DwmInvalidateIconicBitmaps. * Added Courier Prime (OFLv1.1) as a Courier New replacement. * Added patch to better detect broken nVidia RandR 1.2 support. - -- Erich E. Hoover Sat, 09 Aug 2014 13:21:27 -0600 + -- Erich E. Hoover Sat, 09 Aug 2014 16:35:03 -0600 wine-compholio (1.7.24) unstable; urgency=low * Various further improvements to the patch system. diff --git a/patches/Makefile b/patches/Makefile index 7f83f395..e7d70ae8 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -14,6 +14,7 @@ PATCHLIST := \ comctl32-LoadIconMetric.ok \ ddraw-Empty_Hardware_Flags.ok \ dsound-Fast_Mixer.ok \ + dwmapi-Invalidate_Thumbnail.ok \ fonts-Missing_Fonts.ok \ iphlpapi-TCP_Table.ok \ kernel32-GetSystemTimes.ok \ @@ -191,6 +192,24 @@ 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] Solidworks 2012 needs unimplemented function dwmapi.dll.DwmInvalidateIconicBitmaps (Win7 mode) +# | +# | 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 new file mode 100644 index 00000000..e923919a --- /dev/null +++ b/patches/dwmapi-Invalidate_Thumbnail/0001-dwmapi-Add-stub-for-DwmInvalidateIconicBitmaps.patch @@ -0,0 +1,61 @@ +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 new file mode 100644 index 00000000..16f38e19 --- /dev/null +++ b/patches/dwmapi-Invalidate_Thumbnail/definition @@ -0,0 +1,4 @@ +Author: Erich E. Hoover +Subject: Add stub for DwmInvalidateIconicBitmaps. +Revision: 1 +Fixes: [32977] Support for DwmInvalidateIconicBitmaps