Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
e7cdbb05
Commit
e7cdbb05
authored
26 years ago
by
Tim Newsome
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix for non-modal dialog closing.
parent
120e4576
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/dialog.h
+1
-0
1 addition, 0 deletions
include/dialog.h
windows/defdlg.c
+18
-3
18 additions, 3 deletions
windows/defdlg.c
with
19 additions
and
3 deletions
include/dialog.h
+
1
−
0
View file @
e7cdbb05
...
...
@@ -38,6 +38,7 @@ typedef struct
#pragma pack(4)
#define DF_END 0x0001
#define DF_ENDING 0x0002
extern
BOOL32
DIALOG_Init
(
void
);
extern
HWND32
DIALOG_CreateIndirect
(
HINSTANCE32
hInst
,
LPCSTR
dlgTemplate
,
...
...
This diff is collapsed.
Click to expand it.
windows/defdlg.c
+
18
−
3
View file @
e7cdbb05
...
...
@@ -260,11 +260,16 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
dlgInfo
=
(
DIALOGINFO
*
)
&
wndPtr
->
wExtra
;
dlgInfo
->
msgResult
=
0
;
if
(
dlgInfo
->
dlgProc
)
/* Call dialog procedure */
if
(
dlgInfo
->
dlgProc
)
{
/* Call dialog procedure */
result
=
CallWindowProc16
(
(
WNDPROC16
)
dlgInfo
->
dlgProc
,
hwnd
,
msg
,
wParam
,
lParam
);
/* Check if window was destroyed by dialog procedure */
if
(
dlgInfo
->
flags
&
DF_END
&&
!
(
dlgInfo
->
flags
&
DF_ENDING
))
{
dlgInfo
->
flags
|=
DF_ENDING
;
DestroyWindow32
(
hwnd
);
}
}
if
(
!
result
&&
IsWindow32
(
hwnd
))
{
...
...
@@ -315,11 +320,16 @@ LRESULT WINAPI DefDlgProc32A( HWND32 hwnd, UINT32 msg,
dlgInfo
=
(
DIALOGINFO
*
)
&
wndPtr
->
wExtra
;
dlgInfo
->
msgResult
=
0
;
if
(
dlgInfo
->
dlgProc
)
/* Call dialog procedure */
if
(
dlgInfo
->
dlgProc
)
{
/* Call dialog procedure */
result
=
CallWindowProc32A
(
(
WNDPROC32
)
dlgInfo
->
dlgProc
,
hwnd
,
msg
,
wParam
,
lParam
);
/* Check if window was destroyed by dialog procedure */
if
(
dlgInfo
->
flags
&
DF_END
&&
!
(
dlgInfo
->
flags
&
DF_ENDING
))
{
dlgInfo
->
flags
|=
DF_ENDING
;
DestroyWindow32
(
hwnd
);
}
}
if
(
!
result
&&
IsWindow32
(
hwnd
))
{
...
...
@@ -370,11 +380,16 @@ LRESULT WINAPI DefDlgProc32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
dlgInfo
=
(
DIALOGINFO
*
)
&
wndPtr
->
wExtra
;
dlgInfo
->
msgResult
=
0
;
if
(
dlgInfo
->
dlgProc
)
/* Call dialog procedure */
if
(
dlgInfo
->
dlgProc
)
{
/* Call dialog procedure */
result
=
CallWindowProc32W
(
(
WNDPROC32
)
dlgInfo
->
dlgProc
,
hwnd
,
msg
,
wParam
,
lParam
);
/* Check if window was destroyed by dialog procedure */
if
(
dlgInfo
->
flags
&
DF_END
&&
!
(
dlgInfo
->
flags
&
DF_ENDING
))
{
dlgInfo
->
flags
|=
DF_ENDING
;
DestroyWindow32
(
hwnd
);
}
}
if
(
!
result
&&
IsWindow32
(
hwnd
))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment