You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 79f93ecf429f42db15bc14f276045fdad35cef13
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 42c768f1f4b5f35b8cb282d7fb44cad2ea7114e4 Mon Sep 17 00:00:00 2001
|
||||
From dcb29efe26feef864e311ab1e5974cd071482eed Mon Sep 17 00:00:00 2001
|
||||
From: Henri Verbeet <hverbeet@codeweavers.com>
|
||||
Date: Sun, 8 Jan 2017 22:32:32 +0100
|
||||
Subject: [PATCH] ddraw: Implement ddraw7_FlipToGDISurface. (v2)
|
||||
@@ -30,22 +30,22 @@ index ca8e2e64f7..e18c358c63 100644
|
||||
return DD_OK;
|
||||
}
|
||||
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
|
||||
index a9632de502..336c4dd35b 100644
|
||||
index b8552af287..4442919a22 100644
|
||||
--- a/dlls/ddraw/ddraw_private.h
|
||||
+++ b/dlls/ddraw/ddraw_private.h
|
||||
@@ -59,6 +59,7 @@ struct FvfToDecl
|
||||
#define DDRAW_NO3D 0x00000008
|
||||
@@ -60,6 +60,7 @@ struct FvfToDecl
|
||||
#define DDRAW_SCL_DDRAW1 0x00000010
|
||||
#define DDRAW_SCL_RECURSIVE 0x00000020
|
||||
+#define DDRAW_GDI_FLIP 0x00000040
|
||||
#define DDRAW_SWAPPED 0x00000040
|
||||
+#define DDRAW_GDI_FLIP 0x00000080
|
||||
|
||||
#define DDRAW_STRIDE_ALIGNMENT 8
|
||||
|
||||
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
|
||||
index 2d200493c9..0e4543bf74 100644
|
||||
index cb837b1f90..422081d5f4 100644
|
||||
--- a/dlls/ddraw/surface.c
|
||||
+++ b/dlls/ddraw/surface.c
|
||||
@@ -64,7 +64,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface,
|
||||
@@ -70,7 +70,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface,
|
||||
if (w <= 0 || h <= 0)
|
||||
return DD_OK;
|
||||
|
||||
|
Reference in New Issue
Block a user