Rebase against 89ef7b59f548a76960b2278d819a8f915c81e132.

patches/user32-GetAutoRotationState/0001-user32-Add-semi-stub-for-GetAutoRotationState.patch

@@ -1,29 +1,23 @@
-From c5093b9a61cc252beb6b406cc72e7dd5a6642751 Mon Sep 17 00:00:00 2001
+From 856606f7a35b0ee7245a41d356d5a6dd902899b2 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.
 
 ---
- dlls/user32/sysparams.c       | 17 +++++++++++++++++
+ dlls/user32/sysparams.c       | 11 +++++++++--
  dlls/user32/tests/sysparams.c | 25 +++++++++++++++++++++++++
- dlls/user32/user32.spec       |  1 +
- include/winuser.h             | 13 +++++++++++++
- 4 files changed, 56 insertions(+)
+ 2 files changed, 34 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
-index 63c4ffe070..c79b53c6e7 100644
+index ab3d717300..27560380bd 100644
 --- a/dlls/user32/sysparams.c
 +++ b/dlls/user32/sysparams.c
-@@ -2913,3 +2913,20 @@ BOOL WINAPI IsProcessDPIAware(void)
-     FIXME( "stub!\n");
-     return FALSE;
- }
-+
-+/***********************************************************************
-+ *      GetAutoRotationState   (USER32.@)
-+ */
-+BOOL WINAPI GetAutoRotationState(AR_STATE *state)
-+{
+@@ -2919,8 +2919,15 @@ BOOL WINAPI IsProcessDPIAware(void)
+  */
+ BOOL WINAPI GetAutoRotationState( AR_STATE *state )
+ {
+-    FIXME("(%p): stub\n", state);
+-    *state = AR_NOT_SUPPORTED;
 +    TRACE("(%p)\n", state);
 +
 +    if (!state)
@@ -33,8 +27,9 @@ index 63c4ffe070..c79b53c6e7 100644
 +    }
 +
 +    *state = AR_NOSENSOR;
-+    return TRUE;
-+}
+     return TRUE;
+ }
+ 
 diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
 index 96b15814d7..3fe21abb90 100644
 --- a/dlls/user32/tests/sysparams.c
@@ -92,42 +87,6 @@ index 96b15814d7..3fe21abb90 100644
  
      change_counter = 0;
      change_last_param = 0;
-diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
-index 6f2703a9b7..b3fa5ae532 100644
---- a/dlls/user32/user32.spec
-+++ b/dlls/user32/user32.spec
-@@ -251,6 +251,7 @@
- @ stdcall GetAppCompatFlags(long)
- @ stdcall GetAppCompatFlags2(long)
- @ stdcall GetAsyncKeyState(long)
-+@ stdcall GetAutoRotationState(ptr)
- @ stdcall GetCapture()
- @ stdcall GetCaretBlinkTime()
- @ stdcall GetCaretPos(ptr)
-diff --git a/include/winuser.h b/include/winuser.h
-index 802b0b0660..ec4b753d02 100644
---- a/include/winuser.h
-+++ b/include/winuser.h
-@@ -1460,6 +1460,19 @@ DECL_WINELIB_TYPE_AW(LPHELPWININFO)
- #define	CDS_SETRECT		0x20000000
- #define	CDS_RESET		0x40000000
- 
-+typedef enum tagAR_STATE
-+{
-+    AR_ENABLED       = 0x0,
-+    AR_DISABLED      = 0x1,
-+    AR_SUPPRESSED    = 0x2,
-+    AR_REMOTESESSION = 0x4,
-+    AR_MULTIMON      = 0x8,
-+    AR_NOSENSOR      = 0x10,
-+    AR_NOT_SUPPORTED = 0x20,
-+    AR_DOCKED        = 0x40,
-+    AR_LAPTOP        = 0x80
-+} AR_STATE, *PAR_STATE;
-+
- typedef struct tagWNDCLASSEXA
- {
-     UINT      cbSize;
 -- 
-2.11.0
+2.12.2