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
09dc6019
Commit
09dc6019
authored
Apr 22, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Don't set a hint for the small icon if it has the same size as the large one.
parent
9ff982f2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
window.c
dlls/winex11.drv/window.c
+3
-2
No files found.
dlls/winex11.drv/window.c
View file @
09dc6019
...
@@ -929,7 +929,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data,
...
@@ -929,7 +929,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data,
unsigned
int
size_small
;
unsigned
int
size_small
;
unsigned
long
*
bits_small
,
*
new
;
unsigned
long
*
bits_small
,
*
new
;
if
((
bits_small
=
get_bitmap_argb
(
hDC
,
ii
.
hbmColor
,
ii
.
hbmMask
,
&
size_small
)))
if
((
bits_small
=
get_bitmap_argb
(
hDC
,
ii
.
hbmColor
,
ii
.
hbmMask
,
&
size_small
))
&&
(
bits_small
[
0
]
!=
bits
[
0
]
||
bits_small
[
1
]
!=
bits
[
1
]))
/* size must be different */
{
{
if
((
new
=
HeapReAlloc
(
GetProcessHeap
(),
0
,
bits
,
if
((
new
=
HeapReAlloc
(
GetProcessHeap
(),
0
,
bits
,
(
size
+
size_small
)
*
sizeof
(
unsigned
long
)
)))
(
size
+
size_small
)
*
sizeof
(
unsigned
long
)
)))
...
@@ -938,8 +939,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data,
...
@@ -938,8 +939,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data,
memcpy
(
bits
+
size
,
bits_small
,
size_small
*
sizeof
(
unsigned
long
)
);
memcpy
(
bits
+
size
,
bits_small
,
size_small
*
sizeof
(
unsigned
long
)
);
size
+=
size_small
;
size
+=
size_small
;
}
}
HeapFree
(
GetProcessHeap
(),
0
,
bits_small
);
}
}
HeapFree
(
GetProcessHeap
(),
0
,
bits_small
);
DeleteObject
(
ii
.
hbmColor
);
DeleteObject
(
ii
.
hbmColor
);
DeleteObject
(
ii
.
hbmMask
);
DeleteObject
(
ii
.
hbmMask
);
}
}
...
...
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