wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 79f93ecf429f42db15bc14f276045fdad35cef13

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-03-31 08:44:45 +11:00
parent 6d95251218
commit 1dfd404d6d
3 changed files with 20 additions and 20 deletions
Show Stats 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,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;

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "ecbb4fa3ea2d3a9e1d3f560c7e0dea008439db5b"
echo "79f93ecf429f42db15bc14f276045fdad35cef13"
}
# Show version information

24
patches/user32-GetAutoRotationState/0001-user32-Add-semi-stub-for-GetAutoRotationState.patch
View File

@ -1,7 +1,7 @@
From d505408feb9b03a117ff0476944b92df0db3fea2 Mon Sep 17 00:00:00 2001
From 36f61f25fed49c7b25384957e8435325059d21ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 8 Jan 2017 18:22:30 +0100
Subject: user32: Add semi-stub for GetAutoRotationState.
Subject: [PATCH] user32: Add semi-stub for GetAutoRotationState.
---
dlls/user32/sysparams.c | 11 +++++++++--
@ -9,10 +9,10 @@ Subject: user32: Add semi-stub for GetAutoRotationState.
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index bec4d66edd..155dcaf6b6 100644
index 2c4ff5ec8d..5b89011b62 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -2930,8 +2930,15 @@ BOOL WINAPI IsProcessDPIAware(void)
@@ -3056,8 +3056,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
*/
BOOL WINAPI GetAutoRotationState( AR_STATE *state )
{
@ -31,18 +31,18 @@ index bec4d66edd..155dcaf6b6 100644
}
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index b5ab784b16..673cd1c146 100644
index 03fa8d5940..3779323a80 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -41,6 +41,7 @@
static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID);
@@ -42,6 +42,7 @@ static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD,
static BOOL (WINAPI *pIsProcessDPIAware)(void);
static BOOL (WINAPI *pSetProcessDPIAware)(void);
static BOOL (WINAPI *pSetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
+static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE);
static BOOL strict;
static int dpi, real_dpi;
@@ -2996,6 +2997,28 @@ static void test_dpi_aware(void)
@@ -3030,6 +3031,28 @@ static void test_dpi_aware(void)
test_GetSystemMetrics();
}
@ -71,15 +71,15 @@ index b5ab784b16..673cd1c146 100644
START_TEST(sysparams)
{
int argc;
@@ -3010,6 +3033,7 @@ START_TEST(sysparams)
pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA");
@@ -3045,6 +3068,7 @@ START_TEST(sysparams)
pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware");
pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware");
pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext");
+ pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState");
hInstance = GetModuleHandleA( NULL );
hdc = GetDC(0);
@@ -3031,6 +3055,7 @@ START_TEST(sysparams)
@@ -3066,6 +3090,7 @@ START_TEST(sysparams)
trace("testing EnumDisplaySettings vs GetDeviceCaps\n");
test_EnumDisplaySettings( );
test_GetSysColorBrush( );
@ -88,5 +88,5 @@ index b5ab784b16..673cd1c146 100644
change_counter = 0;
change_last_param = 0;
--
2.12.2
2.16.2