ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw/tests: Use the correct version of DirectDraw calls. 

These are typos cumulated over the years.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2020-10-20 15:42:07 +08:00 committed by Alexandre Julliard
parent 103cd9f2f2
commit e89c85118b
8 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ddraw/tests/d3d.c
View File

@ -105,7 +105,7 @@ static BOOL CreateDirect3D(void)
return FALSE;
}
rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL);
rc = IDirectDraw7_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL);
ok(rc==DD_OK, "SetCooperativeLevel returned: %x\n", rc);
rc = IDirectDraw7_QueryInterface(lpDD, &IID_IDirect3D7, (void**) &lpD3D);
@ -196,7 +196,7 @@ static void ReleaseDirect3D(void)
if (lpDD != NULL)
{
IDirectDraw_Release(lpDD);
IDirectDraw7_Release(lpDD);
lpDD = NULL;
}
}

8
dlls/ddraw/tests/ddraw1.c
View File

@ -2012,7 +2012,7 @@ static void test_ck_complex(void)
{
skip("Failed to create a 3D device, skipping test.\n");
DestroyWindow(window);
IDirectDraw2_Release(ddraw);
IDirectDraw_Release(ddraw);
return;
}
IDirect3DDevice_Release(device);
@ -11205,7 +11205,7 @@ static void test_surface_desc_size(void)
}
}
refcount = IDirectDraw7_Release(ddraw);
refcount = IDirectDraw_Release(ddraw);
ok(!refcount, "DirectDraw has %u references left.\n", refcount);
}
@ -11529,9 +11529,9 @@ static void test_ck_operation(void)
U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00;
U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff;
U5(surface_desc.ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000;
hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst, NULL);
hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &dst, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src, NULL);
hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &src, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
ckey.dwColorSpaceLowValue = 0x0000ff00;

14
dlls/ddraw/tests/ddraw2.c
View File

@ -1492,7 +1492,7 @@ static void test_viewport_object(void)
if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
{
skip("Failed to create a 3D device, skipping test.\n");
IDirectDraw_Release(ddraw);
IDirectDraw2_Release(ddraw);
DestroyWindow(window);
return;
}
@ -3138,7 +3138,7 @@ static void test_coop_level_mode_set(void)
hr = IDirectDrawSurface_IsLost(primary);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirectDraw_RestoreDisplayMode(ddraw);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
hr = IDirectDrawSurface_IsLost(primary);
ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr);
@ -6069,7 +6069,7 @@ static void test_surface_attachment(void)
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
@ -6584,7 +6584,7 @@ static void test_create_surface_pitch(void)
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((63 * 4) + 8) * 63);
@ -7833,7 +7833,7 @@ static void test_palette_gdi(void)
surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat);
surface_desc.ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB;
U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 8;
hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL);
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
/* Avoid colors from the Windows default palette. */
@ -10070,7 +10070,7 @@ static void test_shademode(void)
IDirectDrawSurface_Release(rt);
refcount = IDirect3DDevice2_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
IDirectDraw_Release(ddraw);
IDirectDraw2_Release(ddraw);
DestroyWindow(window);
}
@ -13914,7 +13914,7 @@ static void test_killfocus(void)
surface_desc.dwSize = sizeof(surface_desc);
surface_desc.dwFlags = DDSD_CAPS;
surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
hr = IDirectDraw_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL);
hr = IDirectDraw2_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
SetForegroundWindow(GetDesktopWindow());

12
dlls/ddraw/tests/ddraw4.c
View File

@ -7779,7 +7779,7 @@ static void test_surface_attachment(void)
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
@ -8099,7 +8099,7 @@ static void test_private_data(void)
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
reset_ddsd(&surface_desc);
@ -8214,7 +8214,7 @@ static void test_private_data(void)
memset(&hal_caps, 0, sizeof(hal_caps));
hal_caps.dwSize = sizeof(hal_caps);
hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL);
hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, NULL);
ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr);
if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) == (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP))
{
@ -8515,7 +8515,7 @@ static void test_create_surface_pitch(void)
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((63 * 4) + 8) * 63);
@ -11468,7 +11468,7 @@ static void test_texcoordindex(void)
destroy_viewport(device, viewport);
IDirectDrawSurface4_Release(rt);
IDirectDraw_Release(ddraw);
IDirectDraw4_Release(ddraw);
refcount = IDirect3DDevice3_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
DestroyWindow(window);
@ -16531,7 +16531,7 @@ static void test_killfocus(void)
surface_desc.dwSize = sizeof(surface_desc);
surface_desc.dwFlags = DDSD_CAPS;
surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
hr = IDirectDraw7_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL);
hr = IDirectDraw4_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
SetForegroundWindow(GetDesktopWindow());

8
dlls/ddraw/tests/ddraw7.c
View File

@ -7645,7 +7645,7 @@ static void test_surface_attachment(void)
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
@ -7947,7 +7947,7 @@ static void test_private_data(void)
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
reset_ddsd(&surface_desc);
@ -8364,7 +8364,7 @@ static void test_create_surface_pitch(void)
window = create_window();
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((63 * 4) + 8) * 63);
@ -11470,7 +11470,7 @@ static void test_texcoordindex(void)
IDirectDrawSurface7_Release(texture2);
IDirectDrawSurface7_Release(rt);
IDirectDraw_Release(ddraw);
IDirectDraw7_Release(ddraw);
refcount = IDirect3DDevice7_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
DestroyWindow(window);

50
dlls/ddraw/tests/dsurface.c
View File

@ -99,11 +99,11 @@ static void GetDDInterface_1(void)
ret = IDirectDrawSurface_QueryInterface(dsurface, &IID_IDirectDrawSurface2, (void **) &dsurface2);
ok(ret == DD_OK, "IDirectDrawSurface_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ref1 = getref((IUnknown *) lpDD);
ok(ref1 == 1, "IDirectDraw refcount is %d\n", ref1);
@ -129,9 +129,9 @@ static void GetDDInterface_1(void)
ret = IDirectDrawSurface2_GetDDInterface(dsurface2, NULL);
ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_GetDDInterface returned %08x\n", ret);
IDirectDraw_Release(dd2);
IDirectDraw_Release(dd4);
IDirectDraw_Release(dd7);
IDirectDraw2_Release(dd2);
IDirectDraw4_Release(dd4);
IDirectDraw7_Release(dd7);
IDirectDrawSurface2_Release(dsurface2);
IDirectDrawSurface_Release(dsurface);
}
@ -149,11 +149,11 @@ static void GetDDInterface_2(void)
void *dd;
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
/* Create a surface */
ZeroMemory(&surface, sizeof(surface));
@ -190,9 +190,9 @@ static void GetDDInterface_2(void)
ok(dd == dd2, "Returned interface pointer is not equal to the creation interface\n");
IUnknown_Release((IUnknown *) dd);
IDirectDraw_Release(dd2);
IDirectDraw_Release(dd4);
IDirectDraw_Release(dd7);
IDirectDraw2_Release(dd2);
IDirectDraw4_Release(dd4);
IDirectDraw7_Release(dd7);
IDirectDrawSurface2_Release(dsurface2);
IDirectDrawSurface_Release(dsurface);
}
@ -210,11 +210,11 @@ static void GetDDInterface_4(void)
void *dd;
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
/* Create a surface */
ZeroMemory(&surface, sizeof(surface));
@ -261,9 +261,9 @@ static void GetDDInterface_4(void)
ok(dd == dd4, "Returned interface pointer is not equal to the creation interface\n");
IUnknown_Release((IUnknown *) dd);
IDirectDraw_Release(dd2);
IDirectDraw_Release(dd4);
IDirectDraw_Release(dd7);
IDirectDraw2_Release(dd2);
IDirectDraw4_Release(dd4);
IDirectDraw7_Release(dd7);
IDirectDrawSurface4_Release(dsurface4);
IDirectDrawSurface2_Release(dsurface2);
}
@ -281,11 +281,11 @@ static void GetDDInterface_7(void)
void *dd;
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7);
ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret);
ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret);
/* Create a surface */
ZeroMemory(&surface, sizeof(surface));
@ -332,9 +332,9 @@ static void GetDDInterface_7(void)
ok(dd == dd7, "Returned interface pointer is not equal to the creation interface\n");
IUnknown_Release((IUnknown *) dd);
IDirectDraw_Release(dd2);
IDirectDraw_Release(dd4);
IDirectDraw_Release(dd7);
IDirectDraw2_Release(dd2);
IDirectDraw4_Release(dd4);
IDirectDraw7_Release(dd7);
IDirectDrawSurface4_Release(dsurface4);
IDirectDrawSurface7_Release(dsurface7);
}
@ -2494,7 +2494,7 @@ START_TEST(dsurface)
ReleaseDirectDraw();
return;
}
IDirectDraw_Release(dd4);
IDirectDraw4_Release(dd4);
if(!can_create_primary_surface())
{

6
dlls/ddraw/tests/refcount.c
View File

@ -379,7 +379,7 @@ static void test_d3d_ifaces(void)
IDirect3D_Release(D3D1);
hr = IDirectDraw2_QueryInterface(DDraw2, &IID_IDirect3D2, (void **) &D3D2);
ok(hr == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", hr);
ok(hr == DD_OK, "IDirectDraw2_QueryInterface returned %08x\n", hr);
ref = getRefcount( (IUnknown *) DDraw4);
ok(ref == 1, "IDirectDraw4 reference count is %ld\n", ref);
ref = getRefcount( (IUnknown *) DDraw2);
@ -389,7 +389,7 @@ static void test_d3d_ifaces(void)
IDirect3D2_Release(D3D2);
hr = IDirectDraw4_QueryInterface(DDraw4, &IID_IDirect3D3, (void **) &D3D3);
ok(hr == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", hr);
ok(hr == DD_OK, "IDirectDraw4_QueryInterface returned %08x\n", hr);
ref = getRefcount( (IUnknown *) DDraw4);
ok(ref == 1, "IDirectDraw4 reference count is %ld\n", ref);
ref = getRefcount( (IUnknown *) DDraw2);
@ -418,7 +418,7 @@ static void test_d3d_ifaces(void)
/* It is possible to query any IDirect3D interfaces from any IDirectDraw interface,
* Except IDirect3D7, it can only be returned by IDirectDraw7(which can't return older ifaces)
*/
hr = IDirectDraw_QueryInterface(DDraw2, &IID_IDirect3D, (void **) &D3D1);
hr = IDirectDraw2_QueryInterface(DDraw2, &IID_IDirect3D, (void **) &D3D1);
ok(hr == DD_OK, "IDirectDraw2_QueryInterface returned %08x\n", hr);
IDirect3D_Release(D3D1);
hr = IDirectDraw4_QueryInterface(DDraw4, &IID_IDirect3D, (void **) &D3D1);

6
dlls/ddraw/tests/visual.c
View File

@ -890,7 +890,7 @@ static DWORD D3D3_getPixelColor(IDirectDraw4 *DirectDraw, IDirectDrawSurface4 *S
ddsd.dwHeight = 480;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
hr = IDirectDraw4_CreateSurface(DirectDraw, &ddsd, &surf, NULL);
ok(hr == DD_OK, "IDirectDraw_CreateSurface failed with %08x\n", hr);
ok(hr == DD_OK, "IDirectDraw4_CreateSurface failed with %08x\n", hr);
if(!surf)
{
trace("cannot create helper surface\n");
@ -1002,8 +1002,8 @@ static void D3D3_ViewportClearTest(void)
ddsd.dwFlags = DDSD_CAPS;
ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(DirectDraw4, &ddsd, &Primary, NULL);
ok(hr==DD_OK, "IDirectDraw_CreateSurface returned: %08x\n", hr);
hr = IDirectDraw4_CreateSurface(DirectDraw4, &ddsd, &Primary, NULL);
ok(hr==DD_OK, "IDirectDraw4_CreateSurface returned: %08x\n", hr);
if(FAILED(hr)) goto out;
hr = IDirectDraw4_QueryInterface(DirectDraw4, &IID_IDirect3D3, (void**)&Direct3D3);