From f8b5d1530a2232581ac994f815a15c5cdd11b553 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 16 Sep 2016 07:56:53 +0200 Subject: [PATCH] Rebase against 1938d389b293930c5ac2f2970c6241e09517cf49. [gdiplus-GdipCreateMetafileFromStream] Removed remaining patches to implement GdipGetMetafileHeaderFrom* functions (accepted upstream). --- ...pi-ms-win-core-quirks-l1-1-0-Add-dll.patch | 12 ++--- ...s-win-shcore-obsolete-l1-1-0-Add-dll.patch | 12 ++--- ...-ms-win-shcore-thread-l1-1-0-Add-dll.patch | 12 ++--- ...-ms-win-shcore-stream-l1-1-0-Add-dll.patch | 12 ++--- ...plement-GdipGetMetafileHeaderFromWmf.patch | 54 ------------------- ...ment-GdipGetMetafileHeaderFromStream.patch | 46 ---------------- ...lement-GdipGetMetafileHeaderFromFile.patch | 46 ---------------- patches/patchinstall.sh | 22 +------- 8 files changed, 25 insertions(+), 191 deletions(-) delete mode 100644 patches/gdiplus-GdipCreateMetafileFromStream/0003-gdiplus-Implement-GdipGetMetafileHeaderFromWmf.patch delete mode 100644 patches/gdiplus-GdipCreateMetafileFromStream/0004-gdiplus-Implement-GdipGetMetafileHeaderFromStream.patch delete mode 100644 patches/gdiplus-GdipCreateMetafileFromStream/0005-gdiplus-Implement-GdipGetMetafileHeaderFromFile.patch diff --git a/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch index b83d409c..1f16d873 100644 --- a/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 37ae55184352a775722f464a37e83246207f38d9 Mon Sep 17 00:00:00 2001 +From f0a7191902f7c386641557162c3d1dd2f7c2d615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 13:07:09 +0100 Subject: api-ms-win-core-quirks-l1-1-0: Add dll. @@ -13,17 +13,17 @@ Subject: api-ms-win-core-quirks-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 8007469..074974e 100644 +index f6b9039..27bcf28 100644 --- a/configure.ac +++ b/configure.ac -@@ -2706,6 +2706,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) +@@ -2710,6 +2710,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in new file mode 100644 index 0000000..9486e8b @@ -46,10 +46,10 @@ index 0000000..54ce373 +@ stub QuirkIsEnabledForPackage2 +@ stub QuirkIsEnabledForProcess diff --git a/tools/make_specfiles b/tools/make_specfiles -index e533ec8..564eae5 100755 +index 750b433..0552726 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -210,6 +210,10 @@ my @dll_groups = +@@ -216,6 +216,10 @@ my @dll_groups = "kernelbase", ], [ diff --git a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch index e5f076d8..63d9ff22 100644 --- a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From d89731065f3af3da465b805e8568c3a7ebac49f5 Mon Sep 17 00:00:00 2001 +From c1ff9090515cc05e016e3bfb039466c1ed565b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 17:02:41 +0100 Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll. @@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 557f26b..561260f 100644 +index 4c35810..b0fcad0 100644 --- a/configure.ac +++ b/configure.ac -@@ -2777,6 +2777,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) +@@ -2782,6 +2782,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) WINE_CONFIG_DLL(apphelp) - WINE_CONFIG_TEST(dlls/apphelp/tests) diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in new file mode 100644 index 0000000..6588d13 @@ -41,10 +41,10 @@ index 0000000..edb8143 +@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA +@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW diff --git a/tools/make_specfiles b/tools/make_specfiles -index 611aaca..56a4670 100755 +index 45e2727..c013b20 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -243,6 +243,10 @@ my @dll_groups = +@@ -249,6 +249,10 @@ my @dll_groups = "shcore", ], [ diff --git a/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch index 0622f89e..e5a47cc9 100644 --- a/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From ff834a2e2b529302bb042c163bcb46428e5dba63 Mon Sep 17 00:00:00 2001 +From 732a5c117d27d61a7487b590f78efc979e2fa5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 19 Jan 2016 16:19:11 +0100 Subject: api-ms-win-shcore-thread-l1-1-0: Add dll @@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-thread-l1-1-0: Add dll create mode 100644 dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index d293ad4..09ca59b 100644 +index 1dc9358..9eabb23 100644 --- a/configure.ac +++ b/configure.ac -@@ -2757,6 +2757,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) +@@ -2783,6 +2783,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) WINE_CONFIG_DLL(apphelp) - WINE_CONFIG_TEST(dlls/apphelp/tests) diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in new file mode 100644 index 0000000..0a20ccf @@ -46,10 +46,10 @@ index 0000000..1533005 +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef +@ stub SetProcessReference diff --git a/tools/make_specfiles b/tools/make_specfiles -index 65b5757..44304e4 100755 +index c013b20..e518b90 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -240,6 +240,7 @@ my @dll_groups = +@@ -251,6 +251,7 @@ my @dll_groups = [ "shcore", "api-ms-win-shcore-obsolete-l1-1-0", diff --git a/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch index d27d32e9..a506fcae 100644 --- a/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From c67dacd83cecd143683464fe0ce4cc35a13ff34d Mon Sep 17 00:00:00 2001 +From 79bc54ea483b2aac1353305a1f9c5bcbd90effe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 20:56:53 +0100 Subject: api-ms-win-shcore-stream-l1-1-0: Add dll @@ -13,17 +13,17 @@ Subject: api-ms-win-shcore-stream-l1-1-0: Add dll create mode 100644 dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index fa754f9..0f1b88a 100644 +index a678fef..52bb937 100644 --- a/configure.ac +++ b/configure.ac -@@ -2758,6 +2758,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) +@@ -2784,6 +2784,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-shcore-stream-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) - WINE_CONFIG_DLL(apphelp) diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in new file mode 100644 index 0000000..df2caad @@ -53,10 +53,10 @@ index 0000000..1ee9dd3 +@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW diff --git a/tools/make_specfiles b/tools/make_specfiles -index 9084162..9ced1f0 100755 +index e59dcdc..1dc71f6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -242,6 +242,7 @@ my @dll_groups = +@@ -253,6 +253,7 @@ my @dll_groups = "shcore", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-thread-l1-1-0", diff --git a/patches/gdiplus-GdipCreateMetafileFromStream/0003-gdiplus-Implement-GdipGetMetafileHeaderFromWmf.patch b/patches/gdiplus-GdipCreateMetafileFromStream/0003-gdiplus-Implement-GdipGetMetafileHeaderFromWmf.patch deleted file mode 100644 index 5057de71..00000000 --- a/patches/gdiplus-GdipCreateMetafileFromStream/0003-gdiplus-Implement-GdipGetMetafileHeaderFromWmf.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 109c9e762ab80fcddb5dc489907fe585d81dec89 Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Tue, 10 May 2016 12:56:24 +0800 -Subject: gdiplus: Implement GdipGetMetafileHeaderFromWmf. - ---- - dlls/gdiplus/gdiplus.spec | 2 +- - dlls/gdiplus/metafile.c | 17 +++++++++++++++++ - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec -index 9f7ce5f..893796e 100644 ---- a/dlls/gdiplus/gdiplus.spec -+++ b/dlls/gdiplus/gdiplus.spec -@@ -303,7 +303,7 @@ - 303 stdcall GdipGetMetafileHeaderFromFile(wstr ptr) - 304 stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) - 305 stdcall GdipGetMetafileHeaderFromStream(ptr ptr) --306 stub GdipGetMetafileHeaderFromWmf -+306 stdcall GdipGetMetafileHeaderFromWmf(ptr ptr ptr) - 307 stdcall GdipGetNearestColor(ptr ptr) - 308 stdcall GdipGetPageScale(ptr ptr) - 309 stdcall GdipGetPageUnit(ptr ptr) -diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c -index 30b2122..8efe122 100644 ---- a/dlls/gdiplus/metafile.c -+++ b/dlls/gdiplus/metafile.c -@@ -1064,6 +1064,23 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, - return Ok; - } - -+GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE hwmf, -+ GDIPCONST WmfPlaceableFileHeader *placeable, MetafileHeader *header) -+{ -+ GpStatus status; -+ GpMetafile *metafile; -+ -+ TRACE("(%p,%p,%p)\n", hwmf, placeable, header); -+ -+ status = GdipCreateMetafileFromWmf(hwmf, FALSE, placeable, &metafile); -+ if (status == Ok) -+ { -+ status = GdipGetMetafileHeaderFromMetafile(metafile, header); -+ GdipDisposeImage(&metafile->image); -+ } -+ return status; -+} -+ - GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, - MetafileHeader *header) - { --- -2.8.0 - diff --git a/patches/gdiplus-GdipCreateMetafileFromStream/0004-gdiplus-Implement-GdipGetMetafileHeaderFromStream.patch b/patches/gdiplus-GdipCreateMetafileFromStream/0004-gdiplus-Implement-GdipGetMetafileHeaderFromStream.patch deleted file mode 100644 index b91c1a43..00000000 --- a/patches/gdiplus-GdipCreateMetafileFromStream/0004-gdiplus-Implement-GdipGetMetafileHeaderFromStream.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 601c19472c2f57dbefa53deaf0c7bdb7625d7e7c Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Tue, 10 May 2016 12:59:48 +0800 -Subject: gdiplus: Implement GdipGetMetafileHeaderFromStream. - ---- - dlls/gdiplus/metafile.c | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c -index 8efe122..2164d42 100644 ---- a/dlls/gdiplus/metafile.c -+++ b/dlls/gdiplus/metafile.c -@@ -1102,19 +1102,21 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, - GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream *stream, - MetafileHeader *header) - { -- static int calls; -+ GpStatus status; -+ GpMetafile *metafile; - - TRACE("(%p,%p)\n", stream, header); - -- if(!stream || !header) -+ if (!stream || !header) - return InvalidParameter; - -- if(!(calls++)) -- FIXME("not implemented\n"); -- -- memset(header, 0, sizeof(MetafileHeader)); -- -- return Ok; -+ status = GdipCreateMetafileFromStream(stream, &metafile); -+ if (status == Ok) -+ { -+ status = GdipGetMetafileHeaderFromMetafile(metafile, header); -+ GdipDisposeImage(&metafile->image); -+ } -+ return status; - } - - GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, --- -2.8.0 - diff --git a/patches/gdiplus-GdipCreateMetafileFromStream/0005-gdiplus-Implement-GdipGetMetafileHeaderFromFile.patch b/patches/gdiplus-GdipCreateMetafileFromStream/0005-gdiplus-Implement-GdipGetMetafileHeaderFromFile.patch deleted file mode 100644 index 4cfa3e4a..00000000 --- a/patches/gdiplus-GdipCreateMetafileFromStream/0005-gdiplus-Implement-GdipGetMetafileHeaderFromFile.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 87e34fa7456d8055ac95b2452cda95cee1856310 Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Tue, 10 May 2016 13:02:45 +0800 -Subject: gdiplus: Implement GdipGetMetafileHeaderFromFile. - ---- - dlls/gdiplus/metafile.c | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c -index 2164d42..c4bd727 100644 ---- a/dlls/gdiplus/metafile.c -+++ b/dlls/gdiplus/metafile.c -@@ -1084,19 +1084,21 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE hwmf, - GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, - MetafileHeader *header) - { -- static int calls; -+ GpStatus status; -+ GpMetafile *metafile; - - TRACE("(%s,%p)\n", debugstr_w(filename), header); - -- if(!filename || !header) -+ if (!filename || !header) - return InvalidParameter; - -- if(!(calls++)) -- FIXME("not implemented\n"); -- -- memset(header, 0, sizeof(MetafileHeader)); -- -- return Ok; -+ status = GdipCreateMetafileFromFile(filename, &metafile); -+ if (status == Ok) -+ { -+ status = GdipGetMetafileHeaderFromMetafile(metafile, header); -+ GdipDisposeImage(&metafile->image); -+ } -+ return status; - } - - GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream *stream, --- -2.8.0 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index cf2f07f2..c883a7c6 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "4931e6f92bc7e0c229a057ebf2e000f8f5aa1edd" + echo "1938d389b293930c5ac2f2970c6241e09517cf49" } # Show version information @@ -152,7 +152,6 @@ patch_enable_all () enable_gdi32_MultiMonitor="$1" enable_gdi32_Path_Metafile="$1" enable_gdi32_Symbol_Truetype_Font="$1" - enable_gdiplus_GdipCreateMetafileFromStream="$1" enable_gdiplus_Grayscale_PNG="$1" enable_hal_KeQueryPerformanceCounter="$1" enable_hid_HidP_TranslateUsagesToI8042ScanCodes="$1" @@ -637,9 +636,6 @@ patch_enable () gdi32-Symbol_Truetype_Font) enable_gdi32_Symbol_Truetype_Font="$2" ;; - gdiplus-GdipCreateMetafileFromStream) - enable_gdiplus_GdipCreateMetafileFromStream="$2" - ;; gdiplus-Grayscale_PNG) enable_gdiplus_Grayscale_PNG="$2" ;; @@ -3870,22 +3866,6 @@ if test "$enable_gdi32_Symbol_Truetype_Font" -eq 1; then ) >> "$patchlist" fi -# Patchset gdiplus-GdipCreateMetafileFromStream -# | -# | Modified files: -# | * dlls/gdiplus/gdiplus.spec, dlls/gdiplus/metafile.c -# | -if test "$enable_gdiplus_GdipCreateMetafileFromStream" -eq 1; then - patch_apply gdiplus-GdipCreateMetafileFromStream/0003-gdiplus-Implement-GdipGetMetafileHeaderFromWmf.patch - patch_apply gdiplus-GdipCreateMetafileFromStream/0004-gdiplus-Implement-GdipGetMetafileHeaderFromStream.patch - patch_apply gdiplus-GdipCreateMetafileFromStream/0005-gdiplus-Implement-GdipGetMetafileHeaderFromFile.patch - ( - echo '+ { "Dmitry Timoshkov", "gdiplus: Implement GdipGetMetafileHeaderFromWmf.", 1 },'; - echo '+ { "Dmitry Timoshkov", "gdiplus: Implement GdipGetMetafileHeaderFromStream.", 1 },'; - echo '+ { "Dmitry Timoshkov", "gdiplus: Implement GdipGetMetafileHeaderFromFile.", 1 },'; - ) >> "$patchlist" -fi - # Patchset gdiplus-Grayscale_PNG # | # | This patchset fixes the following Wine bugs: