wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ee9ae29a55b12b2c657f968fd3a958d72ecd7857.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-04-14 19:02:36 +02:00
parent 1a8a066920
commit 7cbb25d95d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch
View File

@ -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?= <michael@fds-team.de>
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)
{

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "1ccc52169730079414eb3e4d1a18ec1131bb6ed3"
echo "ee9ae29a55b12b2c657f968fd3a958d72ecd7857"
}
# Show version information

6
patches/wineps.drv-PostScript_Fixes/0004-wineps.drv-Add-support-for-GETFACENAME-and-DOWNLOADF.patch
View File

@ -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 <dmitry@baikal.ru>
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