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
6806451d
Commit
6806451d
authored
15 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
user: Add icon handle mapping in the Get/SetClassWord/Long functions.
parent
48c8c8d7
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
dlls/user.exe16/window.c
+31
-0
31 additions, 0 deletions
dlls/user.exe16/window.c
with
31 additions
and
0 deletions
dlls/user.exe16/window.c
+
31
−
0
View file @
6806451d
...
...
@@ -747,6 +747,16 @@ void WINAPI ValidateRgn16( HWND16 hwnd, HRGN16 hrgn )
*/
WORD
WINAPI
GetClassWord16
(
HWND16
hwnd
,
INT16
offset
)
{
HICON
icon
;
switch
(
offset
)
{
case
GCLP_HCURSOR
:
case
GCLP_HICON
:
case
GCLP_HICONSM
:
icon
=
(
HICON
)
GetClassLongPtrW
(
WIN_Handle32
(
hwnd
),
offset
);
return
get_icon_16
(
icon
);
}
return
GetClassWord
(
WIN_Handle32
(
hwnd
),
offset
);
}
...
...
@@ -756,6 +766,16 @@ WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset )
*/
WORD
WINAPI
SetClassWord16
(
HWND16
hwnd
,
INT16
offset
,
WORD
newval
)
{
HICON
icon
;
switch
(
offset
)
{
case
GCLP_HCURSOR
:
case
GCLP_HICON
:
case
GCLP_HICONSM
:
icon
=
(
HICON
)
SetClassLongPtrW
(
WIN_Handle32
(
hwnd
),
offset
,
(
ULONG_PTR
)
get_icon_32
(
newval
)
);
return
get_icon_16
(
icon
);
}
return
SetClassWord
(
WIN_Handle32
(
hwnd
),
offset
,
newval
);
}
...
...
@@ -773,6 +793,10 @@ LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset )
return
(
LONG_PTR
)
WINPROC_GetProc16
(
(
WNDPROC
)
ret
,
FALSE
);
case
GCLP_MENUNAME
:
return
MapLS
(
(
void
*
)
ret
);
/* leak */
case
GCLP_HCURSOR
:
case
GCLP_HICON
:
case
GCLP_HICONSM
:
return
get_icon_16
(
(
HICON
)
ret
);
default:
return
ret
;
}
...
...
@@ -784,8 +808,15 @@ LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset )
*/
LONG
WINAPI
SetClassLong16
(
HWND16
hwnd16
,
INT16
offset
,
LONG
newval
)
{
HICON
icon
;
switch
(
offset
)
{
case
GCLP_HCURSOR
:
case
GCLP_HICON
:
case
GCLP_HICONSM
:
icon
=
(
HICON
)
SetClassLongPtrW
(
WIN_Handle32
(
hwnd16
),
offset
,
(
ULONG_PTR
)
get_icon_32
(
newval
)
);
return
get_icon_16
(
icon
);
case
GCLP_WNDPROC
:
{
WNDPROC
new_proc
=
WINPROC_AllocProc16
(
(
WNDPROC16
)
newval
);
...
...
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