Rebase against b1203af6ba44ff8858ee9ca50fc05f4f3f633892.

This commit is contained in:
Sebastian Lackner
2017-05-03 05:43:41 +02:00
parent 5282f297be
commit eb4a245bbb
15 changed files with 367 additions and 1182 deletions

View File

@@ -1,4 +1,4 @@
From 856606f7a35b0ee7245a41d356d5a6dd902899b2 Mon Sep 17 00:00:00 2001
From d505408feb9b03a117ff0476944b92df0db3fea2 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.
@@ -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 ab3d717300..27560380bd 100644
index bec4d66edd..155dcaf6b6 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -2919,8 +2919,15 @@ BOOL WINAPI IsProcessDPIAware(void)
@@ -2930,8 +2930,15 @@ BOOL WINAPI IsProcessDPIAware(void)
*/
BOOL WINAPI GetAutoRotationState( AR_STATE *state )
{
@@ -31,19 +31,19 @@ index ab3d717300..27560380bd 100644
}
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 96b15814d7..3fe21abb90 100644
index b5ab784b16..673cd1c146 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -39,6 +39,7 @@
#endif
@@ -41,6 +41,7 @@
static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID);
static BOOL (WINAPI *pIsProcessDPIAware)(void);
static BOOL (WINAPI *pSetProcessDPIAware)(void);
+static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE);
static BOOL strict;
static int dpi, real_dpi;
@@ -2932,6 +2933,28 @@ static void test_GetSysColorBrush(void)
win_skip("COLOR_MENUBAR unsupported\n");
@@ -2996,6 +2997,28 @@ static void test_dpi_aware(void)
test_GetSystemMetrics();
}
+static void test_GetAutoRotationState(void)
@@ -71,15 +71,15 @@ index 96b15814d7..3fe21abb90 100644
START_TEST(sysparams)
{
int argc;
@@ -2944,6 +2967,7 @@ START_TEST(sysparams)
hdll = GetModuleHandleA("user32.dll");
pChangeDisplaySettingsExA=(void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA");
+ pGetAutoRotationState=(void*)GetProcAddress(hdll, "GetAutoRotationState");
@@ -3010,6 +3033,7 @@ START_TEST(sysparams)
pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA");
pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware");
pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware");
+ pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState");
hInstance = GetModuleHandleA( NULL );
hdc = GetDC(0);
@@ -2965,6 +2989,7 @@ START_TEST(sysparams)
@@ -3031,6 +3055,7 @@ START_TEST(sysparams)
trace("testing EnumDisplaySettings vs GetDeviceCaps\n");
test_EnumDisplaySettings( );
test_GetSysColorBrush( );