Commit 1f1d9e7b authored by Alexandre Julliard's avatar Alexandre Julliard

user32/tests: Use the correct type for the bits pointer in CreateDIBSection calls.

parent 86860cc9
...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment