Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
2ea73fd7
Commit
2ea73fd7
authored
Dec 23, 2009
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Remove the no longer needed WIN_ISDIALOG flag.
parent
5e640271
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
8 deletions
+6
-8
defdlg.c
dlls/user32/defdlg.c
+0
-1
dialog.c
dlls/user32/dialog.c
+2
-2
win.c
dlls/user32/win.c
+2
-2
win.h
dlls/user32/win.h
+2
-3
No files found.
dlls/user32/defdlg.c
View file @
2ea73fd7
...
...
@@ -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:
...
...
dlls/user32/dialog.c
View file @
2ea73fd7
...
...
@@ -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
);
}
...
...
dlls/user32/win.c
View file @
2ea73fd7
...
...
@@ -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
);
...
...
dlls/user32/win.h
View file @
2ea73fd7
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment