ddraw/tests: Use correct ddraw COM macros.
This commit is contained in:
parent
f53d83cf26
commit
cc978c90d4
@ -4607,7 +4607,7 @@ static void test_set_surface_desc(void)
|
|||||||
U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff;
|
U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff;
|
||||||
ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY;
|
ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY;
|
||||||
|
|
||||||
hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL);
|
hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL);
|
||||||
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
|
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
|
||||||
|
|
||||||
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **)&surface3);
|
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **)&surface3);
|
||||||
@ -4826,7 +4826,7 @@ static void test_set_surface_desc(void)
|
|||||||
U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff;
|
U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL);
|
hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL);
|
||||||
ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr);
|
ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
|
@ -5197,7 +5197,7 @@ static void test_set_surface_desc(void)
|
|||||||
window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
|
window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
|
||||||
0, 0, 640, 480, 0, 0, 0, 0);
|
0, 0, 640, 480, 0, 0, 0, 0);
|
||||||
|
|
||||||
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
|
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
|
||||||
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
|
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
|
||||||
|
|
||||||
reset_ddsd(&ddsd);
|
reset_ddsd(&ddsd);
|
||||||
|
@ -5084,7 +5084,7 @@ static void test_set_surface_desc(void)
|
|||||||
window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
|
window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
|
||||||
0, 0, 640, 480, 0, 0, 0, 0);
|
0, 0, 640, 480, 0, 0, 0, 0);
|
||||||
|
|
||||||
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
|
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
|
||||||
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
|
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
|
||||||
|
|
||||||
reset_ddsd(&ddsd);
|
reset_ddsd(&ddsd);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user