Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
7637e49c
Commit
7637e49c
authored
Oct 18, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Return INT_PTR instead of LRESULT in dialog procedures.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
63895aaf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
dialog.c
dlls/user32/tests/dialog.c
+1
-1
msg.c
dlls/user32/tests/msg.c
+3
-3
winproc.c
dlls/user32/winproc.c
+2
-2
No files found.
dlls/user32/tests/dialog.c
View file @
7637e49c
...
...
@@ -488,7 +488,7 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam,
return
DefWindowProcA
(
hwnd
,
uiMsg
,
wParam
,
lParam
);
}
static
LRESULT
CALLBACK
disabled_test_proc
(
HWND
hwnd
,
UINT
uiMsg
,
static
INT_PTR
CALLBACK
disabled_test_proc
(
HWND
hwnd
,
UINT
uiMsg
,
WPARAM
wParam
,
LPARAM
lParam
)
{
switch
(
uiMsg
)
...
...
dlls/user32/tests/msg.c
View file @
7637e49c
...
...
@@ -10110,7 +10110,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam
return
message
==
WM_COMPAREITEM
?
-
1
:
ret
;
}
static
INT_PTR
CALLBACK
StopQuitMsgCheckProcA
(
HWND
hwnd
,
UINT
message
,
WPARAM
wp
,
LPARAM
lp
)
static
LRESULT
CALLBACK
StopQuitMsgCheckProcA
(
HWND
hwnd
,
UINT
message
,
WPARAM
wp
,
LPARAM
lp
)
{
if
(
message
==
WM_CREATE
)
PostMessageA
(
hwnd
,
WM_CLOSE
,
0
,
0
);
...
...
@@ -14381,7 +14381,7 @@ static void test_dialog_messages(void)
cls
.
lpszClassName
=
"MyDialogClass"
;
cls
.
hInstance
=
GetModuleHandleA
(
NULL
);
/* need a cast since a dlgproc is used as a wndproc */
cls
.
lpfnWndProc
=
test_dlg_proc
;
cls
.
lpfnWndProc
=
(
WNDPROC
)
test_dlg_proc
;
if
(
!
RegisterClassA
(
&
cls
))
assert
(
0
);
SetFocus
(
0
);
...
...
@@ -14534,7 +14534,7 @@ static void test_EndDialog(void)
ok
(
GetClassInfoA
(
0
,
"#32770"
,
&
cls
),
"GetClassInfo failed
\n
"
);
cls
.
lpszClassName
=
"MyDialogClass"
;
cls
.
hInstance
=
GetModuleHandleA
(
NULL
);
cls
.
lpfnWndProc
=
test_dlg_proc
;
cls
.
lpfnWndProc
=
(
WNDPROC
)
test_dlg_proc
;
if
(
!
RegisterClassA
(
&
cls
))
assert
(
0
);
flush_sequence
();
...
...
dlls/user32/winproc.c
View file @
7637e49c
...
...
@@ -1046,7 +1046,7 @@ INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam,
if
(
!
func
)
return
0
;
if
(
!
(
proc
=
handle_to_proc
(
func
)))
if
(
!
(
proc
=
handle_to_proc
(
(
WNDPROC
)
func
)))
ret
=
call_dialog_proc
(
hwnd
,
msg
,
wParam
,
lParam
,
&
result
,
func
);
else
if
(
proc
==
WINPROC_PROC16
)
{
...
...
@@ -1071,7 +1071,7 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam,
if
(
!
func
)
return
0
;
if
(
!
(
proc
=
handle_to_proc
(
func
)))
if
(
!
(
proc
=
handle_to_proc
(
(
WNDPROC
)
func
)))
ret
=
call_dialog_proc
(
hwnd
,
msg
,
wParam
,
lParam
,
&
result
,
func
);
else
if
(
proc
==
WINPROC_PROC16
)
{
...
...
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