wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ecbb4fa3ea2d3a9e1d3f560c7e0dea008439db5b

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-03-30 13:01:06 +11:00
parent ec58b6f6b1
commit 4e3fb17588
7 changed files with 39 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/ddraw-FlipToGDISurface/0001-ddraw-Implement-ddraw7_FlipToGDISurface.patch
View File

@@ -1,7 +1,7 @@
From 9a44bb05045ad2a8fbe8b6a15975474ea5be2c6a Mon Sep 17 00:00:00 2001
From 42c768f1f4b5f35b8cb282d7fb44cad2ea7114e4 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Sun, 8 Jan 2017 22:32:32 +0100
Subject: ddraw: Implement ddraw7_FlipToGDISurface. (v2)
Subject: [PATCH] ddraw: Implement ddraw7_FlipToGDISurface. (v2)
---
dlls/ddraw/ddraw.c | 9 ++++++++-
@@ -10,10 +10,10 @@ Subject: ddraw: Implement ddraw7_FlipToGDISurface. (v2)
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 32f0172..6c94eb8 100644
index ca8e2e64f7..e18c358c63 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2063,7 +2063,14 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid)
@@ -2093,7 +2093,14 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid)
*****************************************************************************/
static HRESULT WINAPI ddraw7_FlipToGDISurface(IDirectDraw7 *iface)
{
@@ -30,7 +30,7 @@ index 32f0172..6c94eb8 100644
return DD_OK;
}
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index a9632de..336c4dd 100644
index a9632de502..336c4dd35b 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -59,6 +59,7 @@ struct FvfToDecl
@@ -42,7 +42,7 @@ index a9632de..336c4dd 100644
#define DDRAW_STRIDE_ALIGNMENT 8
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 2d20049..0e4543b 100644
index 2d200493c9..0e4543bf74 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -64,7 +64,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface,
@@ -55,5 +55,5 @@ index 2d20049..0e4543b 100644
/* Nothing to do, we control the frontbuffer, or at least the parts we
* care about. */
--
2.7.4
2.16.2