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
1f261160
Commit
1f261160
authored
Nov 01, 2009
by
Gerald Pfeifer
Committed by
Alexandre Julliard
Nov 03, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Handle error situation earlier in X11DRV_GetDIBits().
parent
de1b4489
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
dib.c
dlls/winex11.drv/dib.c
+5
-5
No files found.
dlls/winex11.drv/dib.c
View file @
1f261160
...
...
@@ -4096,6 +4096,11 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start
if
(
!
(
obj_size
=
GetObjectW
(
hbitmap
,
sizeof
(
dib
),
&
dib
)))
return
0
;
bitmap_type
=
DIB_GetBitmapInfo
(
(
BITMAPINFOHEADER
*
)
info
,
&
width
,
&
tempHeight
,
&
descr
.
infoBpp
,
&
descr
.
compression
);
if
(
bitmap_type
==
-
1
)
{
ERR
(
"Invalid bitmap
\n
"
);
return
0
;
}
if
(
physBitmap
->
pixmap_depth
>
1
)
{
...
...
@@ -4107,11 +4112,6 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start
palette
[
1
]
=
peWhite
;
}
if
(
bitmap_type
==
-
1
)
{
ERR
(
"Invalid bitmap
\n
"
);
return
0
;
}
descr
.
lines
=
tempHeight
;
core_header
=
(
bitmap_type
==
0
);
colorPtr
=
(
LPBYTE
)
info
+
(
WORD
)
info
->
bmiHeader
.
biSize
;
...
...
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