Module: wine Branch: master Commit: 2ea73fd7092a87d818a51baa8b58d52879fe64b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea73fd7092a87d818a51baa8b...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Dec 23 20:25:04 2009 +0100
user32: Remove the no longer needed WIN_ISDIALOG flag.
---
dlls/user32/defdlg.c | 1 - dlls/user32/dialog.c | 4 ++-- dlls/user32/win.c | 4 ++-- dlls/user32/win.h | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index faf5026..373260a 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -342,7 +342,6 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->idResult = 0; dlgInfo->flags = 0; wndPtr->dlgInfo = dlgInfo; - wndPtr->flags |= WIN_ISDIALOG; }
out: diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index bce2684..2df58a7 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1027,7 +1027,7 @@ static HWND DIALOG_FindMsgDestination( HWND hwndDlg ) pParent = WIN_GetPtr(hParent); if (!pParent || pParent == WND_OTHER_PROCESS || pParent == WND_DESKTOP) break;
- if (!(pParent->flags & WIN_ISDIALOG)) + if (!pParent->dlgInfo) { WIN_ReleasePtr(pParent); break; @@ -1135,7 +1135,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg )
if (pWnd && pWnd != WND_OTHER_PROCESS) { - fIsDialog = (pWnd->flags & WIN_ISDIALOG) != 0; + fIsDialog = (pWnd->dlgInfo != NULL); WIN_ReleasePtr(pWnd); }
diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f37f8f4..acf70a3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1986,7 +1986,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod retvalue = get_win_data( (char *)wndPtr->wExtra + offset, size );
/* Special case for dialog window procedure */ - if ((offset == DWLP_DLGPROC) && (size == sizeof(LONG_PTR)) && (wndPtr->flags & WIN_ISDIALOG)) + if ((offset == DWLP_DLGPROC) && (size == sizeof(LONG_PTR)) && wndPtr->dlgInfo) retvalue = (LONG_PTR)WINPROC_GetProc( (WNDPROC)retvalue, unicode ); WIN_ReleasePtr( wndPtr ); return retvalue; @@ -2115,7 +2115,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B break; case DWLP_DLGPROC: if ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && - (size == sizeof(LONG_PTR)) && (wndPtr->flags & WIN_ISDIALOG)) + (size == sizeof(LONG_PTR)) && wndPtr->dlgInfo) { WNDPROC *ptr = (WNDPROC *)((char *)wndPtr->wExtra + DWLP_DLGPROC); retval = (ULONG_PTR)WINPROC_GetProc( *ptr, unicode ); diff --git a/dlls/user32/win.h b/dlls/user32/win.h index bd8381e..58d5972 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -70,9 +70,8 @@ typedef struct tagWND #define WIN_NEED_SIZE 0x0002 /* Internal WM_SIZE is needed */ #define WIN_NCACTIVATED 0x0004 /* last WM_NCACTIVATE was positive */ #define WIN_ISMDICLIENT 0x0008 /* Window is an MDIClient */ -#define WIN_ISDIALOG 0x0010 /* Window is a dialog */ -#define WIN_ISUNICODE 0x0040 /* Window is Unicode */ -#define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0080 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ +#define WIN_ISUNICODE 0x0010 /* Window is Unicode */ +#define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */
/* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN;