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
1f1d9e7b
Commit
1f1d9e7b
authored
Apr 02, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32/tests: Use the correct type for the bits pointer in CreateDIBSection calls.
parent
86860cc9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
cursoricon.c
dlls/user32/tests/cursoricon.c
+8
-8
No files found.
dlls/user32/tests/cursoricon.c
View file @
1f1d9e7b
...
@@ -963,7 +963,7 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp,
...
@@ -963,7 +963,7 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp,
{
{
ICONINFO
iconInfo
;
ICONINFO
iconInfo
;
BITMAPINFO
bitmapInfo
;
BITMAPINFO
bitmapInfo
;
UINT32
*
buffer
=
NULL
;
void
*
buffer
=
NULL
;
UINT32
mask
=
maskvalue
?
0xFFFFFFFF
:
0x00000000
;
UINT32
mask
=
maskvalue
?
0xFFFFFFFF
:
0x00000000
;
memset
(
&
bitmapInfo
,
0
,
sizeof
(
bitmapInfo
));
memset
(
&
bitmapInfo
,
0
,
sizeof
(
bitmapInfo
));
...
@@ -982,7 +982,7 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp,
...
@@ -982,7 +982,7 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp,
iconInfo
.
hbmMask
=
CreateBitmap
(
width
,
height
,
1
,
1
,
&
mask
);
iconInfo
.
hbmMask
=
CreateBitmap
(
width
,
height
,
1
,
1
,
&
mask
);
if
(
!
iconInfo
.
hbmMask
)
return
NULL
;
if
(
!
iconInfo
.
hbmMask
)
return
NULL
;
iconInfo
.
hbmColor
=
CreateDIBSection
(
hdc
,
&
bitmapInfo
,
DIB_RGB_COLORS
,
(
void
**
)
&
buffer
,
NULL
,
0
);
iconInfo
.
hbmColor
=
CreateDIBSection
(
hdc
,
&
bitmapInfo
,
DIB_RGB_COLORS
,
&
buffer
,
NULL
,
0
);
if
(
!
iconInfo
.
hbmColor
||
!
buffer
)
if
(
!
iconInfo
.
hbmColor
||
!
buffer
)
{
{
DeleteObject
(
iconInfo
.
hbmMask
);
DeleteObject
(
iconInfo
.
hbmMask
);
...
@@ -1074,7 +1074,7 @@ static void test_DrawIcon(void)
...
@@ -1074,7 +1074,7 @@ static void test_DrawIcon(void)
HDC
hdcDst
=
NULL
;
HDC
hdcDst
=
NULL
;
HBITMAP
bmpDst
=
NULL
;
HBITMAP
bmpDst
=
NULL
;
HBITMAP
bmpOld
=
NULL
;
HBITMAP
bmpOld
=
NULL
;
UINT32
*
bits
=
0
;
void
*
bits
=
0
;
hdcDst
=
CreateCompatibleDC
(
0
);
hdcDst
=
CreateCompatibleDC
(
0
);
ok
(
hdcDst
!=
0
,
"CreateCompatibleDC(0) failed to return a valid DC
\n
"
);
ok
(
hdcDst
!=
0
,
"CreateCompatibleDC(0) failed to return a valid DC
\n
"
);
...
@@ -1096,7 +1096,7 @@ static void test_DrawIcon(void)
...
@@ -1096,7 +1096,7 @@ static void test_DrawIcon(void)
bitmapInfo
.
bmiHeader
.
biCompression
=
BI_RGB
;
bitmapInfo
.
bmiHeader
.
biCompression
=
BI_RGB
;
bitmapInfo
.
bmiHeader
.
biSizeImage
=
sizeof
(
UINT32
);
bitmapInfo
.
bmiHeader
.
biSizeImage
=
sizeof
(
UINT32
);
bmpDst
=
CreateDIBSection
(
hdcDst
,
&
bitmapInfo
,
DIB_RGB_COLORS
,
(
void
**
)
&
bits
,
NULL
,
0
);
bmpDst
=
CreateDIBSection
(
hdcDst
,
&
bitmapInfo
,
DIB_RGB_COLORS
,
&
bits
,
NULL
,
0
);
ok
(
bmpDst
&&
bits
,
"CreateDIBSection failed to return a valid bitmap and buffer
\n
"
);
ok
(
bmpDst
&&
bits
,
"CreateDIBSection failed to return a valid bitmap and buffer
\n
"
);
if
(
!
bmpDst
||
!
bits
)
if
(
!
bmpDst
||
!
bits
)
goto
cleanup
;
goto
cleanup
;
...
@@ -1158,7 +1158,7 @@ static void test_DrawIconEx(void)
...
@@ -1158,7 +1158,7 @@ static void test_DrawIconEx(void)
HDC
hdcDst
=
NULL
;
HDC
hdcDst
=
NULL
;
HBITMAP
bmpDst
=
NULL
;
HBITMAP
bmpDst
=
NULL
;
HBITMAP
bmpOld
=
NULL
;
HBITMAP
bmpOld
=
NULL
;
UINT32
bits
=
0
;
void
*
bits
=
0
;
hdcDst
=
CreateCompatibleDC
(
0
);
hdcDst
=
CreateCompatibleDC
(
0
);
ok
(
hdcDst
!=
0
,
"CreateCompatibleDC(0) failed to return a valid DC
\n
"
);
ok
(
hdcDst
!=
0
,
"CreateCompatibleDC(0) failed to return a valid DC
\n
"
);
...
@@ -1179,7 +1179,7 @@ static void test_DrawIconEx(void)
...
@@ -1179,7 +1179,7 @@ static void test_DrawIconEx(void)
bitmapInfo
.
bmiHeader
.
biPlanes
=
1
;
bitmapInfo
.
bmiHeader
.
biPlanes
=
1
;
bitmapInfo
.
bmiHeader
.
biCompression
=
BI_RGB
;
bitmapInfo
.
bmiHeader
.
biCompression
=
BI_RGB
;
bitmapInfo
.
bmiHeader
.
biSizeImage
=
sizeof
(
UINT32
);
bitmapInfo
.
bmiHeader
.
biSizeImage
=
sizeof
(
UINT32
);
bmpDst
=
CreateDIBSection
(
hdcDst
,
&
bitmapInfo
,
DIB_RGB_COLORS
,
(
void
**
)
&
bits
,
NULL
,
0
);
bmpDst
=
CreateDIBSection
(
hdcDst
,
&
bitmapInfo
,
DIB_RGB_COLORS
,
&
bits
,
NULL
,
0
);
ok
(
bmpDst
&&
bits
,
"CreateDIBSection failed to return a valid bitmap and buffer
\n
"
);
ok
(
bmpDst
&&
bits
,
"CreateDIBSection failed to return a valid bitmap and buffer
\n
"
);
if
(
!
bmpDst
||
!
bits
)
if
(
!
bmpDst
||
!
bits
)
goto
cleanup
;
goto
cleanup
;
...
@@ -1310,7 +1310,7 @@ static void test_DrawState(void)
...
@@ -1310,7 +1310,7 @@ static void test_DrawState(void)
HDC
hdcDst
=
NULL
;
HDC
hdcDst
=
NULL
;
HBITMAP
bmpDst
=
NULL
;
HBITMAP
bmpDst
=
NULL
;
HBITMAP
bmpOld
=
NULL
;
HBITMAP
bmpOld
=
NULL
;
UINT32
bits
=
0
;
void
*
bits
=
0
;
hdcDst
=
CreateCompatibleDC
(
0
);
hdcDst
=
CreateCompatibleDC
(
0
);
ok
(
hdcDst
!=
0
,
"CreateCompatibleDC(0) failed to return a valid DC
\n
"
);
ok
(
hdcDst
!=
0
,
"CreateCompatibleDC(0) failed to return a valid DC
\n
"
);
...
@@ -1331,7 +1331,7 @@ static void test_DrawState(void)
...
@@ -1331,7 +1331,7 @@ static void test_DrawState(void)
bitmapInfo
.
bmiHeader
.
biPlanes
=
1
;
bitmapInfo
.
bmiHeader
.
biPlanes
=
1
;
bitmapInfo
.
bmiHeader
.
biCompression
=
BI_RGB
;
bitmapInfo
.
bmiHeader
.
biCompression
=
BI_RGB
;
bitmapInfo
.
bmiHeader
.
biSizeImage
=
sizeof
(
UINT32
);
bitmapInfo
.
bmiHeader
.
biSizeImage
=
sizeof
(
UINT32
);
bmpDst
=
CreateDIBSection
(
hdcDst
,
&
bitmapInfo
,
DIB_RGB_COLORS
,
(
void
**
)
&
bits
,
NULL
,
0
);
bmpDst
=
CreateDIBSection
(
hdcDst
,
&
bitmapInfo
,
DIB_RGB_COLORS
,
&
bits
,
NULL
,
0
);
ok
(
bmpDst
&&
bits
,
"CreateDIBSection failed to return a valid bitmap and buffer
\n
"
);
ok
(
bmpDst
&&
bits
,
"CreateDIBSection failed to return a valid bitmap and buffer
\n
"
);
if
(
!
bmpDst
||
!
bits
)
if
(
!
bmpDst
||
!
bits
)
goto
cleanup
;
goto
cleanup
;
...
...
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