Rebase against 448344c5e443b35c06bc0cc4f2e8ee9b7968008f

This commit is contained in:
Alistair Leslie-Hughes
2018-04-20 08:33:26 +10:00
parent 5b388bb912
commit d61501a68f
4 changed files with 24 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
From d0df39ea652f6bd3470eda92e046882f7510be67 Mon Sep 17 00:00:00 2001
From 1e70ffc87cfb0fc1c287bd1800a0023f673e9874 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 425acae..53155ae 100644
index 6a5482b..6f8ebf3 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -3342,8 +3342,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
@@ -3408,8 +3408,15 @@ BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt )
*/
BOOL WINAPI GetAutoRotationState( AR_STATE *state )
{
@@ -31,18 +31,18 @@ index 425acae..53155ae 100644
}
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index e662517..1efbb15 100644
index a4247f2..da3a67a 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -52,6 +52,7 @@ static DPI_AWARENESS (WINAPI *pGetAwarenessFromDpiAwarenessContext)(DPI_AWARENES
static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
static INT (WINAPI *pGetSystemMetricsForDpi)(INT,UINT);
@@ -55,6 +55,7 @@ static INT (WINAPI *pGetSystemMetricsForDpi)(INT,UINT);
static BOOL (WINAPI *pSystemParametersInfoForDpi)(UINT,UINT,void*,UINT,UINT);
static BOOL (WINAPI *pLogicalToPhysicalPointForPerMonitorDPI)(HWND,POINT*);
static BOOL (WINAPI *pPhysicalToLogicalPointForPerMonitorDPI)(HWND,POINT*);
+static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE);
static BOOL strict;
static int dpi, real_dpi;
@@ -3432,6 +3433,28 @@ static void test_window_dpi(void)
@@ -3570,6 +3571,28 @@ static void test_window_dpi(void)
pSetThreadDpiAwarenessContext( orig );
}
@@ -71,15 +71,15 @@ index e662517..1efbb15 100644
START_TEST(sysparams)
{
int argc;
@@ -3458,6 +3481,7 @@ START_TEST(sysparams)
pIsValidDpiAwarenessContext = (void*)GetProcAddress(hdll, "IsValidDpiAwarenessContext");
pGetSystemMetricsForDpi = (void*)GetProcAddress(hdll, "GetSystemMetricsForDpi");
@@ -3599,6 +3622,7 @@ START_TEST(sysparams)
pSystemParametersInfoForDpi = (void*)GetProcAddress(hdll, "SystemParametersInfoForDpi");
pLogicalToPhysicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "LogicalToPhysicalPointForPerMonitorDPI");
pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI");
+ pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState");
hInstance = GetModuleHandleA( NULL );
hdc = GetDC(0);
@@ -3479,6 +3503,7 @@ START_TEST(sysparams)
@@ -3620,6 +3644,7 @@ START_TEST(sysparams)
test_metrics_for_dpi( 192 );
test_EnumDisplaySettings( );
test_GetSysColorBrush( );
@@ -88,5 +88,5 @@ index e662517..1efbb15 100644
change_counter = 0;
change_last_param = 0;
--
2.7.4
1.9.1