mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
user32-WindowDisplayAffinity: Rebase.
This commit is contained in:
Zebediah Figura
parent
772a410836
commit
d73f96248d
@ -1,7 +1,7 @@
|
||||
From 33a1f4fe6cd08f88acd01d413d0a2d490bd304d1 Mon Sep 17 00:00:00 2001
|
||||
From aec88fa96675ae6c4b3475167b21a0e3afbc5f88 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 13 Aug 2017 02:09:51 +0200
|
||||
Subject: user32: Add stubs for GetWindowDisplayAffinity and
|
||||
Subject: [PATCH] user32: Add stubs for GetWindowDisplayAffinity and
|
||||
SetWindowDisplayAffinity.
|
||||
|
||||
---
|
||||
@ -14,7 +14,7 @@ Subject: user32: Add stubs for GetWindowDisplayAffinity and
|
||||
6 files changed, 132 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec
|
||||
index 4b563ffddb7..ea155c098d9 100644
|
||||
index 4b563ff..ea155c0 100644
|
||||
--- a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec
|
||||
+++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ -36,7 +36,7 @@ index 4b563ffddb7..ea155c098d9 100644
|
||||
@ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW
|
||||
@ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW
|
||||
diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec
|
||||
index 4b563ffddb7..ea155c098d9 100644
|
||||
index 4b563ff..ea155c0 100644
|
||||
--- a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec
|
||||
+++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ -58,7 +58,7 @@ index 4b563ffddb7..ea155c098d9 100644
|
||||
@ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW
|
||||
@ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW
|
||||
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
|
||||
index 0fc262986bb..9b8d16adc5f 100644
|
||||
index 96a2467..6cd1bd8 100644
|
||||
--- a/dlls/user32/tests/win.c
|
||||
+++ b/dlls/user32/tests/win.c
|
||||
@@ -67,6 +67,8 @@ static BOOL (WINAPI *pFlashWindowEx)( PFLASHWINFO pfwi );
|
||||
@ -70,8 +70,8 @@ index 0fc262986bb..9b8d16adc5f 100644
|
||||
|
||||
static BOOL test_lbuttondown_flag;
|
||||
static DWORD num_gettext_msgs;
|
||||
@@ -9950,6 +9952,88 @@ static void test_desktop( void )
|
||||
}
|
||||
@@ -10433,6 +10435,88 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
|
||||
DestroyWindow(owner);
|
||||
}
|
||||
|
||||
+static void test_display_affinity( HWND win )
|
||||
@ -159,7 +159,7 @@ index 0fc262986bb..9b8d16adc5f 100644
|
||||
START_TEST(win)
|
||||
{
|
||||
char **argv;
|
||||
@@ -9974,6 +10058,8 @@ START_TEST(win)
|
||||
@@ -10457,6 +10541,8 @@ START_TEST(win)
|
||||
pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" );
|
||||
pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" );
|
||||
pMirrorRgn = (void *)GetProcAddress( gdi32, "MirrorRgn" );
|
||||
@ -168,16 +168,16 @@ index 0fc262986bb..9b8d16adc5f 100644
|
||||
|
||||
if (argc==4 && !strcmp(argv[2], "create_children"))
|
||||
{
|
||||
@@ -10099,6 +10185,7 @@ START_TEST(win)
|
||||
@@ -10581,6 +10667,7 @@ START_TEST(win)
|
||||
test_deferwindowpos();
|
||||
test_LockWindowUpdate(hwndMain);
|
||||
test_desktop();
|
||||
+ test_display_affinity(hwndMain);
|
||||
test_hide_window();
|
||||
test_minimize_window(hwndMain);
|
||||
|
||||
/* add the tests above this line */
|
||||
if (hhook) UnhookWindowsHookEx(hhook);
|
||||
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
|
||||
index 9407c34843b..b2588128145 100644
|
||||
index e45cafa..f601d7d 100644
|
||||
--- a/dlls/user32/user32.spec
|
||||
+++ b/dlls/user32/user32.spec
|
||||
@@ -388,6 +388,7 @@
|
||||
@ -197,10 +197,10 @@ index 9407c34843b..b2588128145 100644
|
||||
@ stdcall SetWindowLongA(long long long)
|
||||
@ stdcall -arch=win64 SetWindowLongPtrA(long long long)
|
||||
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
|
||||
index eced3969d36..3042a560ce9 100644
|
||||
index b13032b..794f333 100644
|
||||
--- a/dlls/user32/win.c
|
||||
+++ b/dlls/user32/win.c
|
||||
@@ -4034,3 +4034,37 @@ BOOL WINAPI GetGestureInfo(HGESTUREINFO handle, PGESTUREINFO ptr)
|
||||
@@ -4029,3 +4029,37 @@ BOOL WINAPI GetGestureInfo(HGESTUREINFO handle, PGESTUREINFO ptr)
|
||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
return FALSE;
|
||||
}
|
||||
@ -239,10 +239,10 @@ index eced3969d36..3042a560ce9 100644
|
||||
+ return FALSE;
|
||||
+}
|
||||
diff --git a/include/winuser.h b/include/winuser.h
|
||||
index c496087bbfb..d8a5bec4533 100644
|
||||
index 05bf590..08a0298 100644
|
||||
--- a/include/winuser.h
|
||||
+++ b/include/winuser.h
|
||||
@@ -2535,6 +2535,9 @@ typedef struct tagMINIMIZEDMETRICS {
|
||||
@@ -2533,6 +2533,9 @@ typedef struct tagMINIMIZEDMETRICS {
|
||||
int iArrange;
|
||||
} MINIMIZEDMETRICS, *PMINIMIZEDMETRICS, *LPMINIMIZEDMETRICS;
|
||||
|
||||
@ -252,7 +252,7 @@ index c496087bbfb..d8a5bec4533 100644
|
||||
|
||||
/* Window scrolling */
|
||||
#define SW_SCROLLCHILDREN 0x0001
|
||||
@@ -3772,6 +3775,7 @@ WINUSERAPI BOOL WINAPI GetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION
|
||||
@@ -3771,6 +3774,7 @@ WINUSERAPI BOOL WINAPI GetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION
|
||||
WINUSERAPI HWND WINAPI GetWindow(HWND,UINT);
|
||||
WINUSERAPI DWORD WINAPI GetWindowContextHelpId(HWND);
|
||||
WINUSERAPI HDC WINAPI GetWindowDC(HWND);
|
||||
@ -260,7 +260,7 @@ index c496087bbfb..d8a5bec4533 100644
|
||||
WINUSERAPI BOOL WINAPI GetWindowInfo(HWND, PWINDOWINFO);
|
||||
WINUSERAPI LONG WINAPI GetWindowLongA(HWND,INT);
|
||||
WINUSERAPI LONG WINAPI GetWindowLongW(HWND,INT);
|
||||
@@ -4074,6 +4078,7 @@ WINUSERAPI BOOL WINAPI SetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD)
|
||||
@@ -4073,6 +4077,7 @@ WINUSERAPI BOOL WINAPI SetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD)
|
||||
#define SetUserObjectInformation WINELIB_NAME_AW(SetUserObjectInformation)
|
||||
WINUSERAPI BOOL WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
|
||||
WINUSERAPI BOOL WINAPI SetWindowContextHelpId(HWND,DWORD);
|
||||
@ -269,5 +269,5 @@ index c496087bbfb..d8a5bec4533 100644
|
||||
WINUSERAPI LONG WINAPI SetWindowLongW(HWND,INT,LONG);
|
||||
#define SetWindowLong WINELIB_NAME_AW(SetWindowLong)
|
||||
--
|
||||
2.13.1
|
||||
2.7.4
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user