You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against 79f93ecf429f42db15bc14f276045fdad35cef13
This commit is contained in:
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user