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 1c201a96c57a68caaf6c976d7f3732738c9d9ac8.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-04-11 20:57:58 +02:00
parent cb89c75141
commit 8064151dce
4 changed files with 27 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/user32-DeferWindowPos/0001-user32-Fix-error-handling-in-Begin-End-DeferWindowPo.patch
View File

@@ -1,30 +1,18 @@
From e205d3ce0d27afe10ecd82657b39790a4cf4e087 Mon Sep 17 00:00:00 2001
From 171fae0615017e437a374cb543bbd98cfe7b88d4 Mon Sep 17 00:00:00 2001
From: Rodrigo Rivas <rodrigorivascosta@gmail.com>
Date: Tue, 25 Aug 2015 15:08:43 +0200
Subject: user32: Fix error handling in {Begin,End,}DeferWindowPos() to match
Windows behavior (resend)
---
dlls/user32/winpos.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
dlls/user32/winpos.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index f92a3dc..7cb3a4f 100644
index 4915aad..b9f549e 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -2349,6 +2349,11 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter,
hwnd = WIN_GetFullHandle( hwnd );
if (is_desktop_window( hwnd )) return 0;
+ if (!IsWindow( hwnd ))
+ {
+ SetLastError( ERROR_INVALID_WINDOW_HANDLE );
+ return 0;
+ }
if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0;
if (pDWP == OBJ_OTHER_PROCESS)
@@ -2418,7 +2423,6 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
@@ -2422,7 +2422,6 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
{
DWP *pDWP;
WINDOWPOS *winpos;
@@ -32,7 +20,7 @@ index f92a3dc..7cb3a4f 100644
int i;
TRACE("%p\n", hdwp);
@@ -2430,20 +2434,20 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
@@ -2434,20 +2433,20 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
return FALSE;
}
@@ -58,5 +46,5 @@ index f92a3dc..7cb3a4f 100644
--
2.5.0
2.7.1