November 2018 - Wine-devel - list.winehq.org

[PATCH 02/10] d3d9/tests: Add a resource access test.
by Henri Verbeet 18 Nov '18

18 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 427 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 427 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index aba083c7754..aca578db16c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12612,6 +12612,432 @@ static void test_device_caps(void) DestroyWindow(window); } +static void test_resource_access(void) +{ + IDirect3DSurface9 *backbuffer, *depth_stencil; + D3DFORMAT colour_format, depth_format, format; + BOOL depth_2d, depth_cube, depth_plain; + struct device_desc device_desc; + D3DSURFACE_DESC surface_desc; + IDirect3DDevice9 *device; + unsigned int i, j; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + enum surface_type + { + SURFACE_2D, + SURFACE_CUBE, + SURFACE_RT, + SURFACE_DS, + SURFACE_PLAIN, + }; + + enum resource_format + { + FORMAT_COLOUR, + FORMAT_ATI2, + FORMAT_DEPTH, + }; + + static const struct + { + D3DPOOL pool; + enum resource_format format; + DWORD usage; + BOOL valid; + } + tests[] = + { + /* 0 */ + {D3DPOOL_DEFAULT, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, TRUE}, + /* 7 */ + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_ATI2, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC | D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC | D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC | D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC | D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 14 */ + {D3DPOOL_MANAGED, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_MANAGED, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_MANAGED, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_MANAGED, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 21 */ + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_SYSTEMMEM, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 28 */ + {D3DPOOL_SCRATCH, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_SCRATCH, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + }; + static const struct + { + const char *name; + enum surface_type type; + } + surface_types[] = + { + {"2D", SURFACE_2D}, + {"CUBE", SURFACE_CUBE}, + {"RT", SURFACE_RT}, + {"DS", SURFACE_DS}, + {"PLAIN", SURFACE_PLAIN}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.width = 16; + device_desc.height = 16; + device_desc.flags = 0; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_GetDesc(backbuffer, &surface_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour_format = surface_desc.Format; + + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &depth_stencil); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_GetDesc(depth_stencil, &surface_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + depth_format = surface_desc.Format; + + depth_2d = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, depth_format)); + depth_cube = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_CUBETEXTURE, depth_format)); + depth_plain = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, depth_format)); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(surface_types); ++i) + { + for (j = 0; j < ARRAY_SIZE(tests); ++j) + { + IDirect3DCubeTexture9 *texture_cube; + IDirect3DBaseTexture9 *texture; + IDirect3DTexture9 *texture_2d; + IDirect3DSurface9 *surface; + HRESULT expected_hr; + D3DLOCKED_RECT lr; + + if (tests[j].format == FORMAT_ATI2) + format = MAKEFOURCC('A','T','I','2'); + else if (tests[j].format == FORMAT_DEPTH) + format = depth_format; + else + format = colour_format; + + if (tests[j].format == FORMAT_ATI2 && FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, format))) + { + skip("ATI2N texture not supported.\n"); + continue; + } + + switch (surface_types[i].type) + { + case SURFACE_2D: + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, + tests[j].usage, format, tests[j].pool, &texture_2d, NULL); + todo_wine_if(j == 10 || j == 13 || j == 16 || j == 17 || j == 20 || j == 23 || j == 24 + || j == 27 || j == 30 || j == 31 || j == 32 || j == 33 || j == 34) + ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DTexture9_GetSurfaceLevel(texture_2d, 0, &surface); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DTexture9_Release(texture_2d); + break; + + case SURFACE_CUBE: + hr = IDirect3DDevice9_CreateCubeTexture(device, 16, 1, + tests[j].usage, format, tests[j].pool, &texture_cube, NULL); + todo_wine_if(j == 10 || j == 13 || j == 16 || j == 17 || j == 20 || j == 23 || j == 24 + || j == 27 || j == 30 || j == 31 || j == 32 || j == 33 || j == 34) + ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DCubeTexture9_GetCubeMapSurface(texture_cube, + D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DCubeTexture9_Release(texture_cube); + break; + + case SURFACE_RT: + hr = IDirect3DDevice9_CreateRenderTarget(device, 16, 16, format, + D3DMULTISAMPLE_NONE, 0, tests[j].usage & D3DUSAGE_DYNAMIC, &surface, NULL); + ok(hr == (tests[j].format == FORMAT_COLOUR ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_DS: + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 16, 16, format, + D3DMULTISAMPLE_NONE, 0, tests[j].usage & D3DUSAGE_DYNAMIC, &surface, NULL); + ok(hr == (tests[j].format == FORMAT_DEPTH ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_PLAIN: + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, + 16, 16, format, tests[j].pool, &surface, NULL); + todo_wine_if(tests[j].format == FORMAT_ATI2 && tests[j].pool != D3DPOOL_MANAGED + && tests[j].pool != D3DPOOL_SCRATCH) + ok(hr == (tests[j].pool != D3DPOOL_MANAGED && (tests[j].format != FORMAT_DEPTH || depth_plain) + && (tests[j].format != FORMAT_ATI2 || tests[j].pool == D3DPOOL_SCRATCH) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + default: + ok(0, "Invalid surface type %#x.\n", surface_types[i].type); + continue; + } + + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (surface_types[i].type == SURFACE_RT) + { + ok(surface_desc.Usage == D3DUSAGE_RENDERTARGET, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == D3DPOOL_DEFAULT, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else if (surface_types[i].type == SURFACE_DS) + { + ok(surface_desc.Usage == D3DUSAGE_DEPTHSTENCIL, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == D3DPOOL_DEFAULT, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else if (surface_types[i].type == SURFACE_PLAIN) + { + ok(!surface_desc.Usage, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == tests[j].pool, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else + { + ok(surface_desc.Usage == tests[j].usage, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == tests[j].pool, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + + hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); + if (surface_desc.Pool != D3DPOOL_DEFAULT || surface_desc.Usage & D3DUSAGE_DYNAMIC + || (surface_types[i].type == SURFACE_RT && tests[j].usage & D3DUSAGE_DYNAMIC) + || surface_types[i].type == SURFACE_PLAIN + || tests[j].format == FORMAT_ATI2) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + todo_wine_if(expected_hr != D3D_OK) + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DSurface9_UnlockRect(surface); + todo_wine_if(expected_hr != D3D_OK) + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture))) + { + hr = IDirect3DDevice9_SetTexture(device, 0, texture); + todo_wine_if(surface_desc.Pool == D3DPOOL_SCRATCH) + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DBaseTexture9_Release(texture); + } + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); + ok(hr == (surface_desc.Usage & D3DUSAGE_RENDERTARGET ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); + todo_wine_if(!(surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL)) + ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, depth_stencil); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + IDirect3DSurface9_Release(surface); + } + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + IDirect3DVolumeTexture9 *texture; + D3DVOLUME_DESC volume_desc; + IDirect3DVolume9 *volume; + HRESULT expected_hr; + D3DLOCKED_BOX lb; + + if (tests[j].format == FORMAT_DEPTH) + continue; + + if (tests[j].format == FORMAT_ATI2) + format = MAKEFOURCC('A','T','I','2'); + else + format = colour_format; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, + tests[i].usage, format, tests[i].pool, &texture, NULL); + todo_wine_if((tests[i].usage & D3DUSAGE_DEPTHSTENCIL && tests[i].pool == D3DPOOL_SCRATCH) + || tests[i].usage & D3DUSAGE_RENDERTARGET) + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(texture, 0, &volume); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DVolume9_GetDesc(volume, &volume_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(volume_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, volume_desc.Usage); + ok(volume_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, volume_desc.Pool); + + hr = IDirect3DVolume9_LockBox(volume, &lb, NULL, 0); + if (volume_desc.Pool != D3DPOOL_DEFAULT || volume_desc.Usage & D3DUSAGE_DYNAMIC) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DVolume9_UnlockBox(volume); + ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + todo_wine_if(volume_desc.Pool == D3DPOOL_SCRATCH) + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DVolume9_Release(volume); + IDirect3DVolumeTexture9_Release(texture); + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + D3DINDEXBUFFER_DESC ib_desc; + IDirect3DIndexBuffer9 *ib; + void *data; + + hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, tests[i].usage, + tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL); + todo_wine_if(tests[i].pool == D3DPOOL_SCRATCH || tests[i].usage & ~D3DUSAGE_DYNAMIC) + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DIndexBuffer9_GetDesc(ib, &ib_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) + ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage); + ok(ib_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, ib_desc.Pool); + + hr = IDirect3DIndexBuffer9_Lock(ib, 0, 0, &data, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_SetIndices(device, NULL); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DIndexBuffer9_Release(ib); + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + D3DVERTEXBUFFER_DESC vb_desc; + IDirect3DVertexBuffer9 *vb; + void *data; + + hr = IDirect3DDevice9_CreateVertexBuffer(device, 16, tests[i].usage, + tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb, NULL); + todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DVertexBuffer9_GetDesc(vb, &vb_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) + ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); + ok(vb_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, vb_desc.Pool); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, 0, &data, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 16); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DVertexBuffer9_Release(vb); + } + + IDirect3DSurface9_Release(depth_stencil); + IDirect3DSurface9_Release(backbuffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -12736,6 +13162,7 @@ START_TEST(device) test_swapchain_multisample_reset(); test_stretch_rect(); test_device_caps(); + test_resource_access(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.11.0

2 1

[PATCH 01/10] d3d8/tests: Add a resource access tests.
by Henri Verbeet 18 Nov '18

18 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 424 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 424 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1bcbcf1b9a5..9f1d8167af9 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8782,6 +8782,429 @@ static void test_get_info(void) DestroyWindow(window); } +static void test_resource_access(void) +{ + IDirect3DSurface8 *backbuffer, *depth_stencil; + D3DFORMAT colour_format, depth_format, format; + BOOL depth_2d, depth_cube, depth_plain; + struct device_desc device_desc; + D3DSURFACE_DESC surface_desc; + IDirect3DDevice8 *device; + unsigned int i, j; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + enum surface_type + { + SURFACE_2D, + SURFACE_CUBE, + SURFACE_RT, + SURFACE_DS, + SURFACE_IMAGE, + }; + + enum resource_format + { + FORMAT_COLOUR, + FORMAT_ATI2, + FORMAT_DEPTH, + }; + + static const struct + { + D3DPOOL pool; + enum resource_format format; + DWORD usage; + BOOL valid; + } + tests[] = + { + /* 0 */ + {D3DPOOL_DEFAULT, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, TRUE}, + /* 7 */ + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_ATI2, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC | D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC | D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC | D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC | D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 14 */ + {D3DPOOL_MANAGED, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_MANAGED, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_MANAGED, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_MANAGED, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 21 */ + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_SYSTEMMEM, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 28 */ + {D3DPOOL_SCRATCH, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_SCRATCH, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + }; + static const struct + { + const char *name; + enum surface_type type; + } + surface_types[] = + { + {"2D", SURFACE_2D}, + {"CUBE", SURFACE_CUBE}, + {"RT", SURFACE_RT}, + {"DS", SURFACE_DS}, + {"IMAGE", SURFACE_IMAGE}, + }; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.width = 16; + device_desc.height = 16; + device_desc.flags = 0; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(backbuffer, &surface_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour_format = surface_desc.Format; + + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &depth_stencil); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(depth_stencil, &surface_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + depth_format = surface_desc.Format; + + depth_2d = SUCCEEDED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, depth_format)); + depth_cube = SUCCEEDED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_CUBETEXTURE, depth_format)); + depth_plain = SUCCEEDED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, depth_format)); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(surface_types); ++i) + { + for (j = 0; j < ARRAY_SIZE(tests); ++j) + { + IDirect3DCubeTexture8 *texture_cube; + IDirect3DBaseTexture8 *texture; + IDirect3DTexture8 *texture_2d; + IDirect3DSurface8 *surface; + HRESULT expected_hr; + D3DLOCKED_RECT lr; + + if (tests[j].format == FORMAT_ATI2) + format = MAKEFOURCC('A','T','I','2'); + else if (tests[j].format == FORMAT_DEPTH) + format = depth_format; + else + format = colour_format; + + if (tests[j].format == FORMAT_ATI2 && FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, format))) + { + skip("ATI2N texture not supported.\n"); + continue; + } + + switch (surface_types[i].type) + { + case SURFACE_2D: + hr = IDirect3DDevice8_CreateTexture(device, 16, 16, 1, + tests[j].usage, format, tests[j].pool, &texture_2d); + todo_wine_if(j == 10 || j == 13 || j == 16 || j == 17 || j == 20 || j == 23 || j == 24 + || j == 27 || j == 30 || j == 31 || j == 32 || j == 33 || j == 34) + ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DTexture8_GetSurfaceLevel(texture_2d, 0, &surface); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DTexture8_Release(texture_2d); + break; + + case SURFACE_CUBE: + hr = IDirect3DDevice8_CreateCubeTexture(device, 16, 1, + tests[j].usage, format, tests[j].pool, &texture_cube); + todo_wine_if(j == 10 || j == 13 || j == 16 || j == 17 || j == 20 || j == 23 || j == 24 + || j == 27 || j == 30 || j == 31 || j == 32 || j == 33 || j == 34) + ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DCubeTexture8_GetCubeMapSurface(texture_cube, + D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DCubeTexture8_Release(texture_cube); + break; + + case SURFACE_RT: + hr = IDirect3DDevice8_CreateRenderTarget(device, 16, 16, format, + D3DMULTISAMPLE_NONE, tests[j].usage & D3DUSAGE_DYNAMIC, &surface); + ok(hr == (tests[j].format == FORMAT_COLOUR ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_DS: + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, + 16, 16, format, D3DMULTISAMPLE_NONE, &surface); + todo_wine_if(tests[j].format == FORMAT_ATI2) + ok(hr == (tests[j].format != FORMAT_COLOUR ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_IMAGE: + hr = IDirect3DDevice8_CreateImageSurface(device, 16, 16, format, &surface); + ok(hr == ((tests[j].format != FORMAT_DEPTH || depth_plain) ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + default: + ok(0, "Invalid surface type %#x.\n", surface_types[i].type); + continue; + } + + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (surface_types[i].type == SURFACE_RT) + { + ok(surface_desc.Usage == D3DUSAGE_RENDERTARGET, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == D3DPOOL_DEFAULT, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else if (surface_types[i].type == SURFACE_DS) + { + ok(surface_desc.Usage == D3DUSAGE_DEPTHSTENCIL, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == D3DPOOL_DEFAULT, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else if (surface_types[i].type == SURFACE_IMAGE) + { + ok(!surface_desc.Usage, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == D3DPOOL_SYSTEMMEM, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else + { + ok(surface_desc.Usage == tests[j].usage, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == tests[j].pool, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + + hr = IDirect3DSurface8_LockRect(surface, &lr, NULL, 0); + if (surface_desc.Pool != D3DPOOL_DEFAULT || surface_desc.Usage & D3DUSAGE_DYNAMIC + || (surface_types[i].type == SURFACE_RT && tests[j].usage & D3DUSAGE_DYNAMIC) + || surface_types[i].type == SURFACE_IMAGE + || tests[j].format == FORMAT_ATI2) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + todo_wine_if(j == 1 && surface_types[i].type != SURFACE_IMAGE) + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DSurface8_UnlockRect(surface); + todo_wine_if((expected_hr != D3D_OK && surface_types[i].type == SURFACE_2D) + || (j == 1 && surface_types[i].type == SURFACE_CUBE)) + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + if (SUCCEEDED(IDirect3DSurface8_GetContainer(surface, &IID_IDirect3DBaseTexture8, (void **)&texture))) + { + hr = IDirect3DDevice8_SetTexture(device, 0, texture); + todo_wine_if(surface_desc.Pool == D3DPOOL_SCRATCH) + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DBaseTexture8_Release(texture); + } + + hr = IDirect3DDevice8_SetRenderTarget(device, surface, depth_stencil); + ok(hr == (surface_desc.Usage & D3DUSAGE_RENDERTARGET ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, surface); + todo_wine_if(!(surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL)) + ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + IDirect3DSurface8_Release(surface); + } + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + IDirect3DVolumeTexture8 *texture; + D3DVOLUME_DESC volume_desc; + IDirect3DVolume8 *volume; + HRESULT expected_hr; + D3DLOCKED_BOX lb; + + if (tests[j].format == FORMAT_DEPTH) + continue; + + if (tests[j].format == FORMAT_ATI2) + format = MAKEFOURCC('A','T','I','2'); + else + format = colour_format; + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, + tests[i].usage, format, tests[i].pool, &texture); + todo_wine_if((tests[i].usage & D3DUSAGE_DEPTHSTENCIL && tests[i].pool == D3DPOOL_SCRATCH) + || tests[i].usage & D3DUSAGE_RENDERTARGET) + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(texture, 0, &volume); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(volume_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, volume_desc.Usage); + ok(volume_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, volume_desc.Pool); + + hr = IDirect3DVolume8_LockBox(volume, &lb, NULL, 0); + if (volume_desc.Pool != D3DPOOL_DEFAULT || volume_desc.Usage & D3DUSAGE_DYNAMIC) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DVolume8_UnlockBox(volume); + ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + todo_wine_if(volume_desc.Pool == D3DPOOL_SCRATCH) + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DVolume8_Release(volume); + IDirect3DVolumeTexture8_Release(texture); + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + D3DINDEXBUFFER_DESC ib_desc; + IDirect3DIndexBuffer8 *ib; + BYTE *data; + + hr = IDirect3DDevice8_CreateIndexBuffer(device, 16, tests[i].usage, + tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib); + todo_wine_if(tests[i].pool == D3DPOOL_SCRATCH || tests[i].usage & ~D3DUSAGE_DYNAMIC) + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DIndexBuffer8_GetDesc(ib, &ib_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) + ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage); + ok(ib_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, ib_desc.Pool); + + hr = IDirect3DIndexBuffer8_Lock(ib, 0, 0, &data, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DIndexBuffer8_Unlock(ib); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_SetIndices(device, ib, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice8_SetIndices(device, NULL, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DIndexBuffer8_Release(ib); + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + D3DVERTEXBUFFER_DESC vb_desc; + IDirect3DVertexBuffer8 *vb; + BYTE *data; + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 16, tests[i].usage, + tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb); + todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DVertexBuffer8_GetDesc(vb, &vb_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) + ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); + ok(vb_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, vb_desc.Pool); + + hr = IDirect3DVertexBuffer8_Lock(vb, 0, 0, &data, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DVertexBuffer8_Unlock(vb); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, 16); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, NULL, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DVertexBuffer8_Release(vb); + } + + IDirect3DSurface8_Release(depth_stencil); + IDirect3DSurface8_Release(backbuffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -8894,6 +9317,7 @@ START_TEST(device) test_swapchain_multisample_reset(); test_device_caps(); test_get_info(); + test_resource_access(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.11.0

2 1

[PATCH] winegcc: add -I for the prefix's include dir
by Andre Heider 18 Nov '18

18 Nov '18

This allows external projects to e.g. "#include <wine/debug.h>" for non-standard prefixes, like winehq's distro packages residing in /opt. Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- tools/winegcc/Makefile.in | 2 +- tools/winegcc/winegcc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 6de23b0495..daeb91be1e 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -9,7 +9,7 @@ C_SRCS = \ winegcc.c winegcc_EXTRADEFS = \ - -DINCLUDEDIR="\"${includedir}/wine\"" \ + -DINCLUDEDIR="\"${includedir}\"" \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 76442d8122..6b3b4b6aab 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -672,10 +672,11 @@ no_compat_defines: { if (opts->use_msvcrt) { - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/msvcrt" : "-I" INCLUDEDIR "/msvcrt" ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/windows" : "-I" INCLUDEDIR "/windows" ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR : "-I" INCLUDEDIR ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); } else if (opts->wine_objdir) strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) ); -- 2.19.1

1 0

[PATCH] winedbg: Remove unused packet_reply_cat.
by Gerald Pfeifer 18 Nov '18

18 Nov '18

Confirmed by inspecting the output of grep packet_reply_cat gdbproxy.c | grep -v packet_reply_catc which only has this one hit, and since it's static I cannot have escaped. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- programs/winedbg/gdbproxy.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 025cb38131..0a897f24c2 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -740,11 +740,6 @@ static inline void packet_reply_add(struct gdb_context* gdbctx, const char* str, gdbctx->out_len += len; } -static inline void packet_reply_cat(struct gdb_context* gdbctx, const char* str) -{ - packet_reply_add(gdbctx, str, strlen(str)); -} - static inline void packet_reply_catc(struct gdb_context* gdbctx, char ch) { packet_reply_add(gdbctx, &ch, 1); -- 2.17.0

1 0

[PATCH V2] Translation: Review po/pt_BR translation messages
by Roberto Pungartnik 18 Nov '18

18 Nov '18

Resending

1 0

[PATCH v2 1/3] ntdll: Only wait on the completion port if no entries were returned.
by Zebediah Figura 18 Nov '18

18 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/sync.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a00a159d24..3037e58463 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1371,9 +1371,10 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT if (i++ >= count) break; } - if (i && ret == STATUS_PENDING) + if (i || ret != STATUS_PENDING) { - ret = STATUS_SUCCESS; + if (ret == STATUS_PENDING) + ret = STATUS_SUCCESS; break; } -- 2.19.1

1 2

[PATCH 1/3] ntdll: Don't write more IOCP entries than requested.
by Zebediah Figura 17 Nov '18

17 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a00a159d24..59c58d552d 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1351,7 +1351,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT for (;;) { - for (;;) + while (i < count) { SERVER_START_REQ( remove_completion ) { @@ -1368,7 +1368,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT if (ret != STATUS_SUCCESS) break; - if (i++ >= count) break; + ++i; } if (i && ret == STATUS_PENDING) -- 2.19.1

2 3

[PATCH 1/2] mfplat: Add NULL pointer checks to IMFMediaEvent get methods.
by Sven Baars 17 Nov '18

17 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mfplat/main.c | 12 ++++++++++++ dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 46a697538c..b84f93ad2d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2094,6 +2094,9 @@ static HRESULT WINAPI mfmediaevent_GetType(IMFMediaEvent *iface, MediaEventType TRACE("%p, %p\n", This, type); + if (!type) + return E_INVALIDARG; + *type = This->type; return S_OK; @@ -2105,6 +2108,9 @@ static HRESULT WINAPI mfmediaevent_GetExtendedType(IMFMediaEvent *iface, GUID *e TRACE("%p, %p\n", This, extended_type); + if (!extended_type) + return E_INVALIDARG; + *extended_type = This->extended_type; return S_OK; @@ -2116,6 +2122,9 @@ static HRESULT WINAPI mfmediaevent_GetStatus(IMFMediaEvent *iface, HRESULT *stat TRACE("%p, %p\n", This, status); + if (!status) + return E_INVALIDARG; + *status = This->status; return S_OK; @@ -2125,6 +2134,9 @@ static HRESULT WINAPI mfmediaevent_GetValue(IMFMediaEvent *iface, PROPVARIANT *v { mfmediaevent *This = impl_from_IMFMediaEvent(iface); + if (!value) + return E_INVALIDARG; + PropVariantCopy(value, &This->value); return S_OK; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 48a8d0d361..8b6dd4523f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -278,6 +278,20 @@ static void test_MFCreateMediaEvent(void) hr = MFCreateMediaEvent(MEError, &GUID_NULL, E_FAIL, &value, &mediaevent); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFMediaEvent_GetType(mediaevent, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaEvent_GetExtendedType(mediaevent, NULL); + ok(hr == E_INVALIDARG || + /* wvistau64 */ + broken(hr == S_OK), "got 0x%08x\n", hr); + + hr = IMFMediaEvent_GetStatus(mediaevent, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaEvent_GetValue(mediaevent, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + PropVariantClear(&value); hr = IMFMediaEvent_GetType(mediaevent, &type); -- 2.17.1

2 2

[PATCH v2] kernel32: Ignore FileIoPriorityHintInfo return success
by Greg Smith 17 Nov '18

17 Nov '18

There is no requirement to act on FileIoPriorityHintInfo Return success when this is passed to SetFileInformationByHandle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46130 Signed-off-by: Greg Smith <codedonewell(a)gmail.com> --- v2: Updated test to move the file test before the file is marked for deletion, and reset last error before testing. --- dlls/kernel32/file.c | 5 ++++- dlls/kernel32/tests/file.c | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index eeccf67e15..80f4a2190d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1103,7 +1103,6 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c case FileStreamInfo: case FileIdBothDirectoryInfo: case FileIdBothDirectoryRestartInfo: - case FileIoPriorityHintInfo: case FileFullDirectoryInfo: case FileFullDirectoryRestartInfo: case FileStorageInfo: @@ -1119,6 +1118,10 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation ); break; + case FileIoPriorityHintInfo: + FIXME( "Ignoring file IO priority hint: %p, %u, %p, %u\n", file, class, info, size ); + return TRUE; + case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo: diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 168bdd5e7b..4b95c95a7f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4914,6 +4914,7 @@ static void test_SetFileInformationByHandle(void) FILE_STANDARD_INFO stdinfo = { {{0}},{{0}},0,FALSE,FALSE }; FILE_COMPRESSION_INFO compressinfo; FILE_DISPOSITION_INFO dispinfo; + FILE_IO_PRIORITY_HINT_INFO hintinfo; char tempFileName[MAX_PATH]; char tempPath[MAX_PATH]; HANDLE file; @@ -4957,6 +4958,13 @@ static void test_SetFileInformationByHandle(void) ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo)); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + /* FileIoPriorityHintInfo: Star Citizen installer fails when this call does not return sucess */ + SetLastError(0xdeadbeef); + memset(&hintinfo,0,sizeof(hintinfo)); + hintinfo.PriorityHint = IoPriorityHintNormal; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(ret, "setting FileIoPriorityHintInfo got %d, error %d\n", ret, GetLastError()); + /* test FileDispositionInfo, additional details already covered by ntdll tests */ SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, 0); -- 2.17.1

5 6

[PATCH] slc: Add SLOpen stub.
by Andrey Gusev 17 Nov '18

17 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46156 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/slc/slc.c | 7 +++++++ dlls/slc/slc.spec | 2 +- include/slpublic.h | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index a0d8999f5a..7b7a6c6f77 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -62,6 +62,13 @@ HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwVa return status ? E_FAIL : S_OK; } +HRESULT WINAPI SLOpen(HSLC *handle) +{ + FIXME("(%p) stub\n", handle ); + + return S_OK; +} + /*********************************************************************** * DllMain (CLUSAPI.@) * diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index af5545c673..e4289d3ae1 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -30,7 +30,7 @@ @ stub SLInstallLicense @ stub SLInstallProofOfPurchase @ stub SLInstallSAMLicense -@ stub SLOpen +@ stdcall SLOpen(ptr) @ stub SLReArmWindows @ stub SLRegisterEvent @ stub SLRegisterWindowsEvent diff --git a/include/slpublic.h b/include/slpublic.h index c8bb559d2f..dc02f3ce08 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -29,6 +29,8 @@ extern "C" { #define SLCAPI DECLSPEC_IMPORT #endif +typedef PVOID HSLC; + typedef enum _tagSLDATATYPE { SL_DATA_NONE = REG_NONE, @@ -41,7 +43,7 @@ typedef enum _tagSLDATATYPE SLCAPI HRESULT WINAPI SLGetWindowsInformation(LPCWSTR, SLDATATYPE*, UINT*, LPBYTE*); SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR, LPDWORD); - +SLCAPI HRESULT WINAPI SLOpen(HSLC*); #ifdef __cplusplus } -- 2.17.2

1 0