Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
ddc60c85
Commit
ddc60c85
authored
Mar 20, 2006
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x11drv: Clear new bitmaps if they don't contain any data.
parent
5c1b27a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
gdiobj.c
dlls/gdi/tests/gdiobj.c
+0
-2
bitmap.c
dlls/x11drv/bitmap.c
+11
-0
No files found.
dlls/gdi/tests/gdiobj.c
View file @
ddc60c85
...
...
@@ -1034,9 +1034,7 @@ static void test_bitmap(void)
memset
(
buf
,
0xAA
,
sizeof
(
buf
));
ret
=
GetBitmapBits
(
hbmp
,
sizeof
(
buf
),
buf
);
ok
(
ret
==
bm
.
bmWidthBytes
*
bm
.
bmHeight
,
"%d != %d
\n
"
,
ret
,
bm
.
bmWidthBytes
*
bm
.
bmHeight
);
todo_wine
{
ok
(
!
memcmp
(
buf
,
buf_cmp
,
sizeof
(
buf
)),
"buffers do not match
\n
"
);
}
hbmp_old
=
SelectObject
(
hdc
,
hbmp_old
);
ok
(
hbmp_old
==
hbmp
,
"wrong old bitmap %p
\n
"
,
hbmp_old
);
...
...
dlls/x11drv/bitmap.c
View file @
ddc60c85
...
...
@@ -146,7 +146,18 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
}
if
(
bitmap
.
bmBits
)
/* Set bitmap bits */
{
X11DRV_SetBitmapBits
(
hbitmap
,
bitmap
.
bmBits
,
bitmap
.
bmHeight
*
bitmap
.
bmWidthBytes
);
}
else
/* else clear the bitmap */
{
wine_tsx11_lock
();
XSetFunction
(
gdi_display
,
BITMAP_GC
(
physBitmap
),
GXclear
);
XFillRectangle
(
gdi_display
,
physBitmap
->
pixmap
,
BITMAP_GC
(
physBitmap
),
0
,
0
,
bitmap
.
bmWidth
,
bitmap
.
bmHeight
);
XSetFunction
(
gdi_display
,
BITMAP_GC
(
physBitmap
),
GXcopy
);
wine_tsx11_unlock
();
}
return
TRUE
;
}
...
...
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