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
047ab406
Commit
047ab406
authored
23 years ago
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix sign extension in message mapping routines.
parent
4705b8a6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
windows/winproc.c
+16
-4
16 additions, 4 deletions
windows/winproc.c
with
16 additions
and
4 deletions
windows/winproc.c
+
16
−
4
View file @
047ab406
...
...
@@ -696,7 +696,7 @@ INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM *plpara
case
WM_SYSDEADCHAR
:
case
EM_SETPASSWORDCHAR
:
{
char
ch
=
LOWORD
(
*
pwparam
);
BYTE
ch
=
LOWORD
(
*
pwparam
);
WCHAR
wch
;
MultiByteToWideChar
(
CP_ACP
,
0
,
&
ch
,
1
,
&
wch
,
1
);
*
pwparam
=
MAKEWPARAM
(
wch
,
HIWORD
(
*
pwparam
)
);
...
...
@@ -953,7 +953,7 @@ INT WINPROC_MapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM *plpara
case
EM_SETPASSWORDCHAR
:
{
WCHAR
wch
=
LOWORD
(
*
pwparam
);
char
ch
;
BYTE
ch
;
WideCharToMultiByte
(
CP_ACP
,
0
,
&
wch
,
1
,
&
ch
,
1
,
NULL
,
NULL
);
*
pwparam
=
MAKEWPARAM
(
ch
,
HIWORD
(
*
pwparam
)
);
}
...
...
@@ -1464,7 +1464,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
INT
WINPROC_MapMsg16To32W
(
HWND
hwnd
,
UINT16
msg16
,
WPARAM16
wParam16
,
UINT
*
pmsg32
,
WPARAM
*
pwparam32
,
LPARAM
*
plparam
)
{
char
ch
;
BYTE
ch
;
WCHAR
wch
;
*
pmsg32
=
(
UINT
)
msg16
;
...
...
@@ -2246,7 +2246,7 @@ INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, WPARAM wParam32,
UINT16
*
pmsg16
,
WPARAM16
*
pwparam16
,
LPARAM
*
plparam
)
{
char
ch
;
BYTE
ch
;
WCHAR
wch
;
*
pmsg16
=
LOWORD
(
msg32
);
...
...
@@ -2429,6 +2429,9 @@ static LRESULT WINPROC_CallProc32ATo32W( WNDPROC func, HWND hwnd,
LRESULT
result
;
int
unmap
;
TRACE_
(
msg
)(
"func %p (hwnd=%08x,msg=%s,wp=%08x,lp=%08lx)
\n
"
,
func
,
hwnd
,
SPY_GetMsgName
(
msg
,
hwnd
),
wParam
,
lParam
);
if
(
(
unmap
=
WINPROC_MapMsg32ATo32W
(
hwnd
,
msg
,
&
wParam
,
&
lParam
))
==
-
1
)
{
ERR_
(
msg
)(
"Message translation failed. (msg=%s,wp=%08x,lp=%08lx)
\n
"
,
SPY_GetMsgName
(
msg
,
hwnd
),
wParam
,
lParam
);
...
...
@@ -2452,6 +2455,9 @@ static LRESULT WINPROC_CallProc32WTo32A( WNDPROC func, HWND hwnd,
LRESULT
result
;
int
unmap
;
TRACE_
(
msg
)(
"func %p (hwnd=%08x,msg=%s,wp=%08x,lp=%08lx)
\n
"
,
func
,
hwnd
,
SPY_GetMsgName
(
msg
,
hwnd
),
wParam
,
lParam
);
if
((
unmap
=
WINPROC_MapMsg32WTo32A
(
hwnd
,
msg
,
&
wParam
,
&
lParam
))
==
-
1
)
{
ERR_
(
msg
)(
"Message translation failed. (msg=%s,wp=%08x,lp=%08lx)
\n
"
,
SPY_GetMsgName
(
msg
,
hwnd
),
wParam
,
lParam
);
...
...
@@ -2511,6 +2517,9 @@ static LRESULT WINAPI WINPROC_CallProc32ATo16( WNDPROC16 func, HWND hwnd,
UINT16
msg16
;
MSGPARAM16
mp16
;
TRACE_
(
msg
)(
"func %p (hwnd=%08x,msg=%s,wp=%08x,lp=%08lx)
\n
"
,
func
,
hwnd
,
SPY_GetMsgName
(
msg
,
hwnd
),
wParam
,
lParam
);
mp16
.
lParam
=
lParam
;
if
(
WINPROC_MapMsg32ATo16
(
hwnd
,
msg
,
wParam
,
&
msg16
,
&
mp16
.
wParam
,
&
mp16
.
lParam
)
==
-
1
)
return
0
;
...
...
@@ -2533,6 +2542,9 @@ static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd,
UINT16
msg16
;
MSGPARAM16
mp16
;
TRACE_
(
msg
)(
"func %p (hwnd=%08x,msg=%s,wp=%08x,lp=%08lx)
\n
"
,
func
,
hwnd
,
SPY_GetMsgName
(
msg
,
hwnd
),
wParam
,
lParam
);
mp16
.
lParam
=
lParam
;
if
(
WINPROC_MapMsg32WTo16
(
hwnd
,
msg
,
wParam
,
&
msg16
,
&
mp16
.
wParam
,
&
mp16
.
lParam
)
==
-
1
)
...
...
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