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 d909f2759066afd128aa1a299d3367c7ab76da8f.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-07-29 08:38:12 +10:00
parent d3ed71430a
commit 8708356647
7 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/user32-DM_SETDEFID/0001-user32-Do-not-initialize-dialog-info-for-every-windo.patch
View File

@@ -1,4 +1,4 @@
From f5f76efccaf16896cfaf455c3f8e5383675a5b79 Mon Sep 17 00:00:00 2001
From fccb5f82e6bf351fdf815f7a77f0c6be4ef1f8a4 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 15 Jun 2016 14:57:10 +0800
Subject: [PATCH] user32: Do not initialize dialog info for every window passed
@@ -18,11 +18,11 @@ has been forced, so passing TRUE to DIALOG_get_info() is redundant there.
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c
index 3c7a8a78855..b7d30a7f1cf 100644
index 238951aa21c..ad2b0fe9fa9 100644
--- a/dlls/user32/defdlg.c
+++ b/dlls/user32/defdlg.c
@@ -361,7 +361,7 @@ static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
LRESULT result = 0;
@@ -325,7 +325,7 @@ static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
LRESULT result;
/* Perform DIALOGINFO initialization if not done */
- if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0;
@@ -30,17 +30,17 @@ index 3c7a8a78855..b7d30a7f1cf 100644
SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, 0 );
@@ -415,7 +415,7 @@ static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
LRESULT result = 0;
@@ -377,7 +377,7 @@ static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
LRESULT result;
/* Perform DIALOGINFO initialization if not done */
- if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0;
+ if (!(dlgInfo = DIALOG_get_info( hwnd, msg == WM_NCCREATE ))) return 0;
SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, 0 );
result = WINPROC_CallDlgProcW( hwnd, msg, wParam, lParam );
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index a3efd5b6742..a226c764c49 100644
index 5c74de65ac0..5c74d00973d 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -212,7 +212,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info,