diff --git a/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch b/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch index 4e775a5f..fa8ee73a 100644 --- a/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch +++ b/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch @@ -1,4 +1,4 @@ -From 144cdcfa8f77e8bf2cdb01d6ced2faa240ea605e Mon Sep 17 00:00:00 2001 +From 204794b8da1f17308574230feee919c28f065c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 19 Aug 2014 22:47:51 +0200 Subject: dxgi: Improve stubs for MakeWindowAssociation and @@ -10,11 +10,11 @@ Subject: dxgi: Improve stubs for MakeWindowAssociation and 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h -index 59b436b..fc61bb2 100644 +index 129f6b4..1b3f49d 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -102,6 +102,7 @@ struct dxgi_factory - IDXGIAdapter1 **adapters; + struct wined3d *wined3d; BOOL extended; HWND device_window; + HWND assoc_window; @@ -22,10 +22,10 @@ index 59b436b..fc61bb2 100644 HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c -index 5956e62..8151221 100644 +index 1af7f72..2ec85e3 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c -@@ -163,16 +163,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory1 *iface, +@@ -168,16 +168,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory1 *iface, static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IDXGIFactory1 *iface, HWND window, UINT flags) { diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7106e4b1..04ea1baa 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "1ccc52169730079414eb3e4d1a18ec1131bb6ed3" + echo "ee9ae29a55b12b2c657f968fd3a958d72ecd7857" } # Show version information diff --git a/patches/wineps.drv-PostScript_Fixes/0004-wineps.drv-Add-support-for-GETFACENAME-and-DOWNLOADF.patch b/patches/wineps.drv-PostScript_Fixes/0004-wineps.drv-Add-support-for-GETFACENAME-and-DOWNLOADF.patch index 15b0c06a..57b0a915 100644 --- a/patches/wineps.drv-PostScript_Fixes/0004-wineps.drv-Add-support-for-GETFACENAME-and-DOWNLOADF.patch +++ b/patches/wineps.drv-PostScript_Fixes/0004-wineps.drv-Add-support-for-GETFACENAME-and-DOWNLOADF.patch @@ -1,4 +1,4 @@ -From 89144b9ac2938a343d9165f16f4b7b594fa98782 Mon Sep 17 00:00:00 2001 +From 99cd86cd9a33f96f15b6912fe7e70b2e1ed580ed Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 13 Apr 2016 15:52:38 +0800 Subject: wineps.drv: Add support for GETFACENAME and DOWNLOADFACE escapes. @@ -82,7 +82,7 @@ index 2f3ddfc..86a94fd 100644 case MFCOMMENT: diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h -index 75c062a..c806d52 100644 +index 79f23ea..40af794 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -547,6 +547,7 @@ extern BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, @@ -92,7 +92,7 @@ index 75c062a..c806d52 100644 +extern char *PSDRV_get_download_name(PHYSDEV dev, BOOL vertical) DECLSPEC_HIDDEN; extern BOOL PSDRV_SelectDownloadFont(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) DECLSPEC_HIDDEN; - extern BOOL PSDRV_WriteDownloadGlyphShow(PHYSDEV dev, const WORD *glpyhs, UINT count) DECLSPEC_HIDDEN; + extern BOOL PSDRV_WriteDownloadGlyphShow(PHYSDEV dev, const WORD *glyphs, UINT count) DECLSPEC_HIDDEN; -- 2.7.1