Allow image list tests to compile and run on old platforms.
This commit is contained in:
parent
7ed44d529a
commit
0aa22f989b
|
@ -24,7 +24,9 @@
|
||||||
|
|
||||||
#include "wine/test.h"
|
#include "wine/test.h"
|
||||||
|
|
||||||
HDC desktopDC;
|
static typeof(ImageList_DrawIndirect) * pImageList_DrawIndirect = NULL;
|
||||||
|
|
||||||
|
static HDC desktopDC;
|
||||||
|
|
||||||
static HIMAGELIST createImageList(cx, cy)
|
static HIMAGELIST createImageList(cx, cy)
|
||||||
{
|
{
|
||||||
|
@ -233,6 +235,17 @@ static BOOL DoTest3(void)
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
HWND hwndfortest;
|
HWND hwndfortest;
|
||||||
|
|
||||||
|
if (!pImageList_DrawIndirect)
|
||||||
|
{
|
||||||
|
HMODULE hComCtl32 = LoadLibraryA("comctl32.dll");
|
||||||
|
pImageList_DrawIndirect = GetProcAddress(hComCtl32, "ImageList_DrawIndirect");
|
||||||
|
if (!pImageList_DrawIndirect)
|
||||||
|
{
|
||||||
|
trace("ImageList_DrawIndirect not available, skipping test\n");
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
hwndfortest = create_a_window();
|
hwndfortest = create_a_window();
|
||||||
hdc = GetDC(hwndfortest);
|
hdc = GetDC(hwndfortest);
|
||||||
ok(hdc!=NULL, "couldn't get DC\n");
|
ok(hdc!=NULL, "couldn't get DC\n");
|
||||||
|
@ -262,25 +275,25 @@ static BOOL DoTest3(void)
|
||||||
|
|
||||||
Rectangle(hdc, 100, 100, 74, 74);
|
Rectangle(hdc, 100, 100, 74, 74);
|
||||||
memset(&imldp, 0, sizeof imldp);
|
memset(&imldp, 0, sizeof imldp);
|
||||||
ok(!ImageList_DrawIndirect(&imldp), "zero data succeeded!");
|
ok(!pImageList_DrawIndirect(&imldp), "zero data succeeded!");
|
||||||
imldp.cbSize = sizeof imldp;
|
imldp.cbSize = sizeof imldp;
|
||||||
ok(!ImageList_DrawIndirect(&imldp), "zero hdc succeeded!");
|
ok(!pImageList_DrawIndirect(&imldp), "zero hdc succeeded!");
|
||||||
imldp.hdcDst = hdc;
|
imldp.hdcDst = hdc;
|
||||||
ok(!ImageList_DrawIndirect(&imldp),"zero himl succeeded!");
|
ok(!pImageList_DrawIndirect(&imldp),"zero himl succeeded!");
|
||||||
imldp.himl = himl;
|
imldp.himl = himl;
|
||||||
ok(ImageList_DrawIndirect(&imldp),"should succeeded");
|
ok(pImageList_DrawIndirect(&imldp),"should succeeded");
|
||||||
imldp.fStyle = SRCCOPY;
|
imldp.fStyle = SRCCOPY;
|
||||||
imldp.rgbBk = CLR_DEFAULT;
|
imldp.rgbBk = CLR_DEFAULT;
|
||||||
imldp.rgbFg = CLR_DEFAULT;
|
imldp.rgbFg = CLR_DEFAULT;
|
||||||
imldp.y = 100;
|
imldp.y = 100;
|
||||||
imldp.x = 100;
|
imldp.x = 100;
|
||||||
ok(ImageList_DrawIndirect(&imldp),"should succeeded");
|
ok(pImageList_DrawIndirect(&imldp),"should succeeded");
|
||||||
imldp.i ++;
|
imldp.i ++;
|
||||||
ok(ImageList_DrawIndirect(&imldp),"should succeeded");
|
ok(pImageList_DrawIndirect(&imldp),"should succeeded");
|
||||||
imldp.i ++;
|
imldp.i ++;
|
||||||
ok(ImageList_DrawIndirect(&imldp),"should succeeded");
|
ok(pImageList_DrawIndirect(&imldp),"should succeeded");
|
||||||
imldp.i ++;
|
imldp.i ++;
|
||||||
ok(!ImageList_DrawIndirect(&imldp),"should fail");
|
ok(!pImageList_DrawIndirect(&imldp),"should fail");
|
||||||
|
|
||||||
/* remove three */
|
/* remove three */
|
||||||
ok(ImageList_Remove(himl, 0), "removing 1st bitmap");
|
ok(ImageList_Remove(himl, 0), "removing 1st bitmap");
|
||||||
|
|
Loading…
Reference in New Issue