Rebase against 3f281a3baad9f5f8f875da902718a1d5d3dc0d9f

This commit is contained in:
Zebediah Figura
2018-04-13 18:45:57 -05:00
parent 3fe54232fa
commit 11233f0810
6 changed files with 180 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
From 519f8f585bc53f6de0174e5c3b73833fb81a7499 Mon Sep 17 00:00:00 2001
From d0df39ea652f6bd3470eda92e046882f7510be67 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: [PATCH] user32: Add semi-stub for GetAutoRotationState.
@@ -9,10 +9,10 @@ Subject: [PATCH] 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 95a883d..c64047a 100644
index 425acae..53155ae 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -3124,8 +3124,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
@@ -3342,8 +3342,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
*/
BOOL WINAPI GetAutoRotationState( AR_STATE *state )
{
@@ -31,18 +31,18 @@ index 95a883d..c64047a 100644
}
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 5b185b9..e71aa3a 100644
index e662517..1efbb15 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -50,6 +50,7 @@ static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENE
static DPI_AWARENESS_CONTEXT (WINAPI *pGetWindowDpiAwarenessContext)(HWND);
static DPI_AWARENESS (WINAPI *pGetAwarenessFromDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
@@ -52,6 +52,7 @@ static DPI_AWARENESS (WINAPI *pGetAwarenessFromDpiAwarenessContext)(DPI_AWARENES
static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
static INT (WINAPI *pGetSystemMetricsForDpi)(INT,UINT);
static BOOL (WINAPI *pSystemParametersInfoForDpi)(UINT,UINT,void*,UINT,UINT);
+static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE);
static BOOL strict;
static int dpi, real_dpi;
@@ -3254,6 +3255,28 @@ static void test_window_dpi(void)
@@ -3432,6 +3433,28 @@ static void test_window_dpi(void)
pSetThreadDpiAwarenessContext( orig );
}
@@ -71,16 +71,16 @@ index 5b185b9..e71aa3a 100644
START_TEST(sysparams)
{
int argc;
@@ -3277,6 +3300,7 @@ START_TEST(sysparams)
pGetWindowDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetWindowDpiAwarenessContext");
pGetAwarenessFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetAwarenessFromDpiAwarenessContext");
@@ -3458,6 +3481,7 @@ START_TEST(sysparams)
pIsValidDpiAwarenessContext = (void*)GetProcAddress(hdll, "IsValidDpiAwarenessContext");
pGetSystemMetricsForDpi = (void*)GetProcAddress(hdll, "GetSystemMetricsForDpi");
pSystemParametersInfoForDpi = (void*)GetProcAddress(hdll, "SystemParametersInfoForDpi");
+ pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState");
hInstance = GetModuleHandleA( NULL );
hdc = GetDC(0);
@@ -3298,6 +3322,7 @@ START_TEST(sysparams)
trace("testing EnumDisplaySettings vs GetDeviceCaps\n");
@@ -3479,6 +3503,7 @@ START_TEST(sysparams)
test_metrics_for_dpi( 192 );
test_EnumDisplaySettings( );
test_GetSysColorBrush( );
+ test_GetAutoRotationState( );
@@ -88,5 +88,5 @@ index 5b185b9..e71aa3a 100644
change_counter = 0;
change_last_param = 0;
--
1.9.1
2.7.4