wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 9e35dd15454be28c487b0f1bebefbbe530b2aca4.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-04-12 09:52:27 +02:00
parent b113596b6c
commit 4a75337774
14 changed files with 473 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 916af67f174d81515eb825e1bb45af8b54781bdf Mon Sep 17 00:00:00 2001
From c5093b9a61cc252beb6b406cc72e7dd5a6642751 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.
@@ -11,7 +11,7 @@ Subject: user32: Add semi-stub for GetAutoRotationState.
4 files changed, 56 insertions(+)
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 63c4ffe070d..c79b53c6e7b 100644
index 63c4ffe070..c79b53c6e7 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -2913,3 +2913,20 @@ BOOL WINAPI IsProcessDPIAware(void)
@@ -36,7 +36,7 @@ index 63c4ffe070d..c79b53c6e7b 100644
+ return TRUE;
+}
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 075a0c71f65..758fd45399a 100644
index 96b15814d7..3fe21abb90 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -39,6 +39,7 @@
@@ -46,8 +46,8 @@ index 075a0c71f65..758fd45399a 100644
+static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE);
static BOOL strict;
static int dpi;
@@ -2917,6 +2918,28 @@ static void test_GetSysColorBrush(void)
static int dpi, real_dpi;
@@ -2932,6 +2933,28 @@ static void test_GetSysColorBrush(void)
win_skip("COLOR_MENUBAR unsupported\n");
}
@@ -76,7 +76,7 @@ index 075a0c71f65..758fd45399a 100644
START_TEST(sysparams)
{
int argc;
@@ -2929,6 +2952,7 @@ START_TEST(sysparams)
@@ -2944,6 +2967,7 @@ START_TEST(sysparams)
hdll = GetModuleHandleA("user32.dll");
pChangeDisplaySettingsExA=(void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA");
@@ -84,7 +84,7 @@ index 075a0c71f65..758fd45399a 100644
hInstance = GetModuleHandleA( NULL );
hdc = GetDC(0);
@@ -2948,6 +2972,7 @@ START_TEST(sysparams)
@@ -2965,6 +2989,7 @@ START_TEST(sysparams)
trace("testing EnumDisplaySettings vs GetDeviceCaps\n");
test_EnumDisplaySettings( );
test_GetSysColorBrush( );
@@ -93,7 +93,7 @@ index 075a0c71f65..758fd45399a 100644
change_counter = 0;
change_last_param = 0;
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index 65a5bfe3c08..e53d57ca9ed 100644
index 6f2703a9b7..b3fa5ae532 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -251,6 +251,7 @@
@@ -105,10 +105,10 @@ index 65a5bfe3c08..e53d57ca9ed 100644
@ stdcall GetCaretBlinkTime()
@ stdcall GetCaretPos(ptr)
diff --git a/include/winuser.h b/include/winuser.h
index 2b8331c3b63..8af65e51380 100644
index 802b0b0660..ec4b753d02 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -1458,6 +1458,19 @@ DECL_WINELIB_TYPE_AW(LPHELPWININFO)
@@ -1460,6 +1460,19 @@ DECL_WINELIB_TYPE_AW(LPHELPWININFO)
#define CDS_SETRECT 0x20000000
#define CDS_RESET 0x40000000