Rebase against aa27dd07aa55301f3e23acf9f74daa0f465e7b6d

This commit is contained in:
Alistair Leslie-Hughes
2018-04-12 10:22:53 +10:00
parent f70daff195
commit 8853cef050
4 changed files with 40 additions and 51 deletions

View File

@@ -1,4 +1,4 @@
From 4eb59ab2c6634560799be4d2fe3021f028f1e3e8 Mon Sep 17 00:00:00 2001
From 519f8f585bc53f6de0174e5c3b73833fb81a7499 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 a018dfc..c2559e0 100644
index 95a883d..c64047a 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -3074,8 +3074,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
@@ -3124,8 +3124,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT
*/
BOOL WINAPI GetAutoRotationState( AR_STATE *state )
{
@@ -31,18 +31,18 @@ index a018dfc..c2559e0 100644
}
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 876f84f..5096553 100644
index 5b185b9..e71aa3a 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -46,6 +46,7 @@ static DPI_AWARENESS_CONTEXT (WINAPI *pGetThreadDpiAwarenessContext)(void);
static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
@@ -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);
static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
+static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE);
static BOOL strict;
static int dpi, real_dpi;
@@ -3125,6 +3126,28 @@ static void test_window_dpi(void)
@@ -3254,6 +3255,28 @@ static void test_window_dpi(void)
pSetThreadDpiAwarenessContext( orig );
}
@@ -71,15 +71,15 @@ index 876f84f..5096553 100644
START_TEST(sysparams)
{
int argc;
@@ -3144,6 +3167,7 @@ START_TEST(sysparams)
pSetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetThreadDpiAwarenessContext");
@@ -3277,6 +3300,7 @@ START_TEST(sysparams)
pGetWindowDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetWindowDpiAwarenessContext");
pGetAwarenessFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetAwarenessFromDpiAwarenessContext");
pIsValidDpiAwarenessContext = (void*)GetProcAddress(hdll, "IsValidDpiAwarenessContext");
+ pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState");
hInstance = GetModuleHandleA( NULL );
hdc = GetDC(0);
@@ -3165,6 +3189,7 @@ START_TEST(sysparams)
@@ -3298,6 +3322,7 @@ START_TEST(sysparams)
trace("testing EnumDisplaySettings vs GetDeviceCaps\n");
test_EnumDisplaySettings( );
test_GetSysColorBrush( );
@@ -88,5 +88,5 @@ index 876f84f..5096553 100644
change_counter = 0;
change_last_param = 0;
--
2.7.4
1.9.1