January 2018 - Wine-Devel - list.winehq.org

[PATCH 1/3] user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set
by Piotr Caban Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Fixes bug 44286. dlls/user32/combo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH] ddraw/tests: Add another invalid arguments test for surface QI
by Nikolay Sivov Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 1 + dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 1 + dlls/ddraw/tests/dsurface.c | 28 ---------------------------- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 52c5e858f9..38d8c63eef 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1949,6 +1949,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface *surface; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e87244bb14..9400f89de3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2083,6 +2083,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface *surface; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c86fcc5885..224d7b44b8 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2233,6 +2233,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface4 *surface; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f776efaa33..8d460d3c14 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1970,6 +1970,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_NOINTERFACE}, {&IID_IDirectDrawClipper, NULL, E_NOINTERFACE}, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface7 *surface; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 9e022956ce..90e7fcf781 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -61,33 +61,6 @@ static void ReleaseDirectDraw(void) } } -static void QueryInterface(void) -{ - IDirectDrawSurface *dsurface; - DDSURFACEDESC surface; - void *object; - HRESULT ret; - - /* Create a surface */ - ZeroMemory(&surface, sizeof(surface)); - surface.dwSize = sizeof(surface); - surface.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; - surface.dwHeight = 10; - surface.dwWidth = 10; - ret = IDirectDraw_CreateSurface(lpDD, &surface, &dsurface, NULL); - if(ret != DD_OK) - { - ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); - return; - } - - /* Call IUnknown::QueryInterface */ - ret = IDirectDrawSurface_QueryInterface(dsurface, 0, &object); - ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface::QueryInterface returned %x\n", ret); - - IDirectDrawSurface_Release(dsurface); -} - /* The following tests test which interface is returned by IDirectDrawSurfaceX::GetDDInterface. * It uses refcounts to test that and compares the interface addresses. Partially fits here, and * partially in the refcount test @@ -2632,7 +2605,6 @@ START_TEST(dsurface) return; } - QueryInterface(); GetDDInterface_1(); GetDDInterface_2(); GetDDInterface_4(); -- 2.15.1

2 1

[PATCH 2/2] ddraw/tests: Add a depth read-back test.
by Henri Verbeet Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 134 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 132 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 141 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 555 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 52c5e858f91..9a872f830cd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -217,6 +217,20 @@ static void destroy_window_thread(struct create_window_thread_param *p) CloseHandle(p->thread); } +static IDirectDrawSurface *get_depth_stencil(IDirect3DDevice *device) +{ + IDirectDrawSurface *rt, *ret; + DDSCAPS caps = {DDSCAPS_ZBUFFER}; + HRESULT hr; + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(rt); + return ret; +} + static HRESULT set_display_mode(IDirectDraw *ddraw, DWORD width, DWORD height) { if (SUCCEEDED(IDirectDraw_SetDisplayMode(ddraw, width, height, 32))) @@ -10779,6 +10793,125 @@ done: DestroyWindow(window); } +static void test_depth_readback(void) +{ + DWORD depth, expected_depth, max_diff, z_depth, z_mask; + IDirect3DExecuteBuffer *execute_buffer; + IDirect3DMaterial *blue_background; + D3DEXECUTEBUFFERDESC exec_desc; + IDirectDrawSurface *rt, *ds; + IDirect3DViewport *viewport; + DDSURFACEDESC surface_desc; + IDirect3DDevice *device; + IDirectDraw *ddraw; + unsigned int x, y; + UINT inst_length; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.1f}, 0, {0xff00ff00}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, {-1.0f}, {1.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, { 1.0f}, {0.9f}, 0, {0xff00ff00}}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + z_depth = get_device_z_depth(device); + z_mask = 0xffffffff >> (32 - z_depth); + ds = get_depth_stencil(device); + + /* Changing depth buffers is hard in d3d1, so we only test with the + * initial depth buffer here. */ + + blue_background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, blue_background); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + + memcpy(exec_desc.lpData, quad, sizeof(quad)); + ptr = (BYTE *)exec_desc.lpData + sizeof(quad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_TRANSFORM, 0, 4); + emit_tquad(&ptr, 0); + emit_end(&ptr); + + inst_length = ((BYTE *)ptr - sizeof(quad)) - (BYTE *)exec_desc.lpData; + + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 4, sizeof(quad), inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_UNCLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_Lock(ds, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + + for (y = 60; y < 480; y += 120) + { + for (x = 80; x < 640; x += 160) + { + ptr = (BYTE *)surface_desc.lpSurface + + y * U1(surface_desc).lPitch + + x * (z_depth == 16 ? 2 : 4); + depth = *((DWORD *)ptr) & z_mask; + expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * z_mask; + max_diff = ((0.5f * 0.9f) / 640.0f) * z_mask; + ok(abs(expected_depth - depth) <= max_diff, + "z_depth %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + z_depth, depth, expected_depth - depth, expected_depth, max_diff, x, y); + } + } + + hr = IDirectDrawSurface_Unlock(ds, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_viewport(device, viewport); + destroy_material(blue_background); + IDirectDrawSurface_Release(ds); + IDirect3DDevice_Release(device); + refcount = IDirectDrawSurface_Release(rt); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -10877,4 +11010,5 @@ START_TEST(ddraw1) test_surface_desc_size(); test_texture_load(); test_ck_operation(); + test_depth_readback(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e87244bb143..dc74c6998ff 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12155,6 +12155,137 @@ done: DestroyWindow(window); } +static void test_depth_readback(void) +{ + DWORD depth, expected_depth, max_diff; + IDirect3DMaterial2 *blue_background; + IDirectDrawSurface *rt, *ds; + IDirect3DViewport2 *viewport; + DDSURFACEDESC surface_desc; + IDirect3DDevice2 *device; + unsigned int i, x, y; + IDirectDraw2 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.1f}, 0, {0xff00ff00}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, {-1.0f}, {1.0f}, 0, {0xff00ff00}}, + {{ 1.0f}, { 1.0f}, {0.9f}, 0, {0xff00ff00}}, + }; + + static const struct + { + unsigned int z_depth, z_mask; + } + tests[] = + { + {16, 0x0000ffff}, + {24, 0x00ffffff}, + {32, 0xffffffff}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + blue_background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, blue_background); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + ds = get_depth_stencil(device); + hr = IDirectDrawSurface_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(ds); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | DDSCAPS_VIDEOMEMORY; + U2(surface_desc).dwZBufferBitDepth = tests[i].z_depth; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL); + if (FAILED(hr)) + { + skip("Format %u not supported, skipping test.\n", i); + continue; + } + + hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderTarget(device, rt, 0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice2_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_Lock(ds, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + + for (y = 60; y < 480; y += 120) + { + for (x = 80; x < 640; x += 160) + { + ptr = (BYTE *)surface_desc.lpSurface + + y * U1(surface_desc).lPitch + + x * (tests[i].z_depth == 16 ? 2 : 4); + depth = *((DWORD *)ptr) & tests[i].z_mask; + expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; + max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + ok(abs(expected_depth - depth) <= max_diff, + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + } + } + + hr = IDirectDrawSurface_Unlock(ds, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(ds); + } + + destroy_viewport(device, viewport); + destroy_material(blue_background); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -12261,4 +12392,5 @@ START_TEST(ddraw2) test_display_mode_surface_pixel_format(); test_surface_desc_size(); test_ck_operation(); + test_depth_readback(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c86fcc58851..aeac118483f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14207,6 +14207,153 @@ static void test_map_synchronisation(void) DestroyWindow(window); } +static void test_depth_readback(void) +{ + DWORD depth, expected_depth, max_diff; + IDirectDrawSurface4 *rt, *ds; + IDirect3DViewport3 *viewport; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice3 *device; + unsigned int i, x, y; + IDirectDraw4 *ddraw; + IDirect3D3 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + RECT r; + + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.9f}, 0xff00ff00}, + }; + + static const struct + { + unsigned int z_depth, s_depth, z_mask, s_mask; + BOOL todo; + } + tests[] = + { + {16, 0, 0x0000ffff, 0x00000000}, + {24, 0, 0x00ffffff, 0x00000000}, + {32, 0, 0x00ffffff, 0x00000000}, + {32, 8, 0x00ffffff, 0xff000000, TRUE}, + {32, 0, 0xffffffff, 0x00000000}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + ds = get_depth_stencil(device); + hr = IDirectDrawSurface4_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface4_Release(ds); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | DDSCAPS_VIDEOMEMORY; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + if (tests[i].s_depth) + U4(surface_desc).ddpfPixelFormat.dwFlags |= DDPF_STENCILBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = tests[i].z_depth; + U2(U4(surface_desc).ddpfPixelFormat).dwStencilBitDepth = tests[i].s_depth; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = tests[i].z_mask; + U4(U4(surface_desc).ddpfPixelFormat).dwStencilBitMask = tests[i].s_mask; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &ds, NULL); + if (FAILED(hr)) + { + skip("Format %u not supported, skipping test.\n", i); + continue; + } + + hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderTarget(device, rt, 0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, + D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (y = 60; y < 480; y += 120) + { + for (x = 80; x < 640; x += 160) + { + SetRect(&r, x, y, x + 1, y + 1); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface4_Lock(ds, &r, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + + depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; + expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; + max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + todo_wine_if(tests[i].todo) + ok(abs(expected_depth - depth) <= max_diff, + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + + hr = IDirectDrawSurface4_Unlock(ds, &r); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + } + } + + hr = IDirectDrawSurface4_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface4_Release(ds); + } + + destroy_viewport(device, viewport); + IDirectDrawSurface4_Release(rt); + IDirectDraw4_Release(ddraw); + IDirect3D3_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -14326,4 +14473,5 @@ START_TEST(ddraw4) test_vb_refcount(); test_compute_sphere_visibility(); test_map_synchronisation(); + test_depth_readback(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f776efaa33e..ce4117bf35e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13585,6 +13585,146 @@ done: DestroyWindow(window); } +static void test_depth_readback(void) +{ + DWORD depth, expected_depth, max_diff; + IDirectDrawSurface7 *rt, *ds; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice7 *device; + unsigned int i, x, y; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + RECT r; + + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.9f}, 0xff00ff00}, + }; + + static const struct + { + unsigned int z_depth, s_depth, z_mask, s_mask; + BOOL todo; + } + tests[] = + { + {16, 0, 0x0000ffff, 0x00000000}, + {24, 0, 0x00ffffff, 0x00000000}, + {32, 0, 0x00ffffff, 0x00000000}, + {32, 8, 0x00ffffff, 0xff000000, TRUE}, + {32, 0, 0xffffffff, 0x00000000}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + ds = get_depth_stencil(device); + hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface7_Release(ds); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | DDSCAPS_VIDEOMEMORY; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + if (tests[i].s_depth) + U4(surface_desc).ddpfPixelFormat.dwFlags |= DDPF_STENCILBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = tests[i].z_depth; + U2(U4(surface_desc).ddpfPixelFormat).dwStencilBitDepth = tests[i].s_depth; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = tests[i].z_mask; + U4(U4(surface_desc).ddpfPixelFormat).dwStencilBitMask = tests[i].s_mask; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &ds, NULL); + if (FAILED(hr)) + { + skip("Format %u not supported, skipping test.\n", i); + continue; + } + + hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderTarget(device, rt, 0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (y = 60; y < 480; y += 120) + { + for (x = 80; x < 640; x += 160) + { + SetRect(&r, x, y, x + 1, y + 1); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_Lock(ds, &r, &surface_desc, DDLOCK_READONLY, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + + depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; + expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; + max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + todo_wine_if(tests[i].todo) + ok(abs(expected_depth - depth) <= max_diff, + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + + hr = IDirectDrawSurface7_Unlock(ds, &r); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + } + } + + hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface7_Release(ds); + } + + IDirectDrawSurface7_Release(rt); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -13714,4 +13854,5 @@ START_TEST(ddraw7) test_compute_sphere_visibility(); test_clip_planes_limits(); test_map_synchronisation(); + test_depth_readback(); } -- 2.11.0

1 0

[PATCH 1/2] wined3d: Add a download function for WINED3DFMT_X8D24_UNORM.
by Henri Verbeet Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- For bug 43654. --- dlls/wined3d/surface.c | 58 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/texture.c | 10 ++++---- dlls/wined3d/utils.c | 47 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 8 ++++-- 4 files changed, 99 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index da22c7ad9aa..2a90c12353a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -546,7 +546,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct void *mem; /* Only support read back of converted P8 surfaces. */ - if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) + if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT && !format->download) { ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; @@ -556,6 +556,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (surface->texture_target == GL_TEXTURE_2D_ARRAY) { + if (format->download) + { + FIXME("Reading back converted array texture %p is not supported.\n", texture); + return; + } + /* NP2 emulation is not allowed on array textures. */ if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) ERR("Array texture %p uses NP2 emulation.\n", texture); @@ -573,6 +579,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { + if (format->download) + { + FIXME("Reading back converted texture %p with NP2 emulation is not supported.\n", texture); + return; + } + wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, texture->resource.device->surface_alignment, wined3d_texture_get_level_pow2_width(texture, surface->texture_level), @@ -590,6 +602,30 @@ static void surface_download_data(struct wined3d_surface *surface, const struct ERR("Unexpected compressed format for NP2 emulated texture.\n"); } + if (format->download) + { + struct wined3d_format f; + + if (data.buffer_object) + ERR("Converted texture %p uses PBO unexpectedly.\n", texture); + + WARN_(d3d_perf)("Downloading converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); + + f = *format; + f.byte_count = format->conv_byte_count; + wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); + wined3d_format_calculate_pitch(&f, texture->resource.device->surface_alignment, + wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level), + &src_row_pitch, &src_slice_pitch); + + if (!(temporary_mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch))) + { + ERR("Failed to allocate memory.\n"); + return; + } + } + if (temporary_mem) { mem = temporary_mem; @@ -623,7 +659,13 @@ static void surface_download_data(struct wined3d_surface *surface, const struct checkGLcall("glGetTexImage"); } - if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + if (format->download) + { + format->download(mem, data.addr, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, + wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level), 1); + } + else if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; unsigned int h, y; @@ -1261,8 +1303,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr DWORD map_binding; if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized - || !is_identity_fixup(src_format->color_fixup) || src_format->convert - || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert + || !is_identity_fixup(src_format->color_fixup) || src_format->conv_byte_count + || !is_identity_fixup(dst_format->color_fixup) || dst_format->conv_byte_count || (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED))) { FIXME("Cannot find a conversion function from format %s to %s.\n", @@ -2258,7 +2300,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is * getting called. */ - if ((format.convert || conversion) && texture->sub_resources[sub_resource_idx].buffer_object) + if ((format.conv_byte_count || conversion) && texture->sub_resources[sub_resource_idx].buffer_object) { TRACE("Removing the pbo attached to surface %p.\n", surface); @@ -2267,7 +2309,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, } wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); - if (format.convert) + if (format.conv_byte_count) { /* This code is entered for texture formats which need a fixup. */ format.byte_count = format.conv_byte_count; @@ -2281,7 +2323,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, context_release(context); return FALSE; } - format.convert(src_mem, dst_mem, src_row_pitch, src_slice_pitch, + format.upload(src_mem, dst_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, width, height, 1); src_row_pitch = dst_row_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); @@ -3871,7 +3913,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst TRACE("Not doing upload because of scaling.\n"); else if (convert) TRACE("Not doing upload because of format conversion.\n"); - else if (dst_texture->resource.format->convert) + else if (dst_texture->resource.format->conv_byte_count) TRACE("Not doing upload because the destination format needs conversion.\n"); else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ddbe340dc82..4dc739cc4c0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -35,7 +35,7 @@ static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const return texture->resource.pool == WINED3D_POOL_DEFAULT && texture->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] - && !texture->resource.format->convert + && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); } @@ -1668,7 +1668,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); - if (format->convert) + if (format->conv_byte_count) { texture->flags |= WINED3D_TEXTURE_CONVERTED; } @@ -2306,7 +2306,7 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int update_d = box->back - box->front; } - if (format->convert) + if (format->conv_byte_count) { if (data->buffer_object) ERR("Loading a converted texture from a PBO.\n"); @@ -2317,7 +2317,7 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int dst_slice_pitch = dst_row_pitch * update_h; converted_mem = wined3d_calloc(update_d, dst_slice_pitch); - format->convert(data->addr, converted_mem, row_pitch, slice_pitch, + format->upload(data->addr, converted_mem, row_pitch, slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); mem = converted_mem; } @@ -2354,7 +2354,7 @@ static void texture3d_download_data(struct wined3d_texture *texture, unsigned in const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; - if (format->convert) + if (format->conv_byte_count) { FIXME("Attempting to download a converted volume, format %s.\n", debug_d3dformat(format->id)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b3003f13028..8a96a20c117 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -434,8 +434,12 @@ struct wined3d_format_texture_info unsigned int conv_byte_count; unsigned int flags; enum wined3d_gl_extension extension; - void (*convert)(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, - UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth); + void (*upload)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); + void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); }; static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, @@ -839,8 +843,32 @@ static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT src_row_p } } -static void convert_x8_d24_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, - UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) +static void x8_d24_unorm_upload(const BYTE *src, BYTE *dst, + unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + unsigned int x, y, z; + + for (z = 0; z < depth; ++z) + { + for (y = 0; y < height; ++y) + { + const DWORD *source = (const DWORD *)(src + z * src_slice_pitch + y * src_row_pitch); + DWORD *dest = (DWORD *)(dst + z * dst_slice_pitch + y * dst_row_pitch); + + for (x = 0; x < width; ++x) + { + dest[x] = source[x] << 8 | ((source[x] >> 16) & 0xff); + } + } + } +} + +static void x8_d24_unorm_download(const BYTE *src, BYTE *dst, + unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) { unsigned int x, y, z; @@ -853,7 +881,7 @@ static void convert_x8_d24_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, for (x = 0; x < width; ++x) { - dest[x] = source[x] << 8 | source[x] >> 16; + dest[x] = source[x] >> 8; } } } @@ -1088,7 +1116,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* format id gl_internal gl_srgb_internal gl_rt_internal gl_format gl_type conv_byte_count flags - extension convert */ + extension upload download */ /* FourCC formats */ /* GL_APPLE_ycbcr_422 claims that its '2YUV' format, which is supported via the UNSIGNED_SHORT_8_8_REV_APPLE type * is equivalent to 'UYVY' format on Windows, and the 'YUVS' via UNSIGNED_SHORT_8_8_APPLE equates to 'YUY2'. The @@ -1609,12 +1637,12 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, convert_x8_d24_unorm}, + WINED3D_GL_EXT_NONE, x8_d24_unorm_upload, x8_d24_unorm_download}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, convert_x8_d24_unorm}, + ARB_DEPTH_TEXTURE, x8_d24_unorm_upload, x8_d24_unorm_download}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, @@ -2944,8 +2972,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win query_internal_format(adapter, format, &format_texture_info[i], gl_info, srgb_write, FALSE); /* Texture conversion stuff */ - format->convert = format_texture_info[i].convert; format->conv_byte_count = format_texture_info[i].conv_byte_count; + format->upload = format_texture_info[i].upload; + format->download = format_texture_info[i].download; srgb_format = NULL; for (j = 0; j < ARRAY_SIZE(format_srgb_info); ++j) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20f53aa9e96..9f68b0ad30f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4240,8 +4240,12 @@ struct wined3d_format float depth_bias_scale; struct wined3d_rational height_scale; struct color_fixup_desc color_fixup; - void (*convert)(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, - UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth); + void (*upload)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); + void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); enum wined3d_format_id typeless_id; GLenum gl_view_class; -- 2.11.0

1 0

[PATCH 1/2] wininet/test: Add InternetGetSecurityInfoByURLW test
by Wei Xie Jan. 5, 2018

Jan. 5, 2018

------------------ 武汉深之度科技有限公司 Wuhan Deepin Technology Co., Ltd. 　　谢威手机：18038104349 武汉：武汉市光谷大道77号光谷金融港B18栋6楼北京：北京市西城区新街口外大街28号院普天德胜B座603室上海：上海市长宁区愚园路1258号15A01室官网：www.deepin.org　　官博：深度操作系统

2 1

Re: [PATCH] msvcr90/tests: Make test__vsnwprintf() static.
by Piotr Caban Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

[PATCH] msvcrt: Don't include MSVC 8.0+ C++ functions in SOs for older DLLs
by Alex Henrie Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/cpp.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 2e17f62b43..07cde75c98 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -650,6 +650,7 @@ void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int f } #if _MSVCR_VER >= 80 + typedef exception bad_alloc; extern const vtable_ptr MSVCRT_bad_alloc_vtable; @@ -675,9 +676,11 @@ void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) TRACE("(%p)\n", _this); MSVCRT_exception_dtor(_this); } -#endif + +#endif /* _MSVCR_VER >= 80 */ #if _MSVCR_VER >= 100 + typedef struct { exception e; HRESULT hr; @@ -985,7 +988,8 @@ void __thiscall MSVCRT_improper_scheduler_detach_dtor( TRACE("(%p)\n", _this); MSVCRT_exception_dtor(_this); } -#endif + +#endif /* _MSVCR_VER >= 100 */ #ifndef __GNUC__ void __asm_dummy_vtables(void) { @@ -1583,6 +1587,8 @@ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *typ } #endif +#if _MSVCR_VER >= 80 + /********************************************************************* * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z * ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z @@ -1669,7 +1675,7 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) #endif /********************************************************************* - * __clean_type_info_names_internal (MSVCR100.@) + * __clean_type_info_names_internal (MSVCR80.@) */ void CDECL __clean_type_info_names_internal(void *p) { @@ -1688,6 +1694,8 @@ const char * __thiscall type_info_name_internal_method(type_info * _this, struct return MSVCRT_type_info_name(_this); } +#endif /* _MSVCR_VER >= 80 */ + /* std::exception_ptr class helpers */ typedef struct { @@ -1695,6 +1703,8 @@ typedef struct int *ref; /* not binary compatible with native msvcr100 */ } exception_ptr; +#if _MSVCR_VER >= 100 + /********************************************************************* * ?__ExceptionPtrCreate@@YAXPAX(a)Z * ?__ExceptionPtrCreate@@YAXPEAX(a)Z @@ -1781,6 +1791,8 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign InterlockedIncrement(ep->ref); } +#endif /* _MSVCR_VER >= 100 */ + /********************************************************************* * ?__ExceptionPtrRethrow@@YAXPBX(a)Z * ?__ExceptionPtrRethrow@@YAXPEBX(a)Z @@ -1803,6 +1815,8 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) ep->rec->NumberParameters, ep->rec->ExceptionInformation); } +#if _MSVCR_VER >= 100 + #ifdef __i386__ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { @@ -1925,6 +1939,9 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +#endif /* _MSVCR_VER >= 100 */ + +#if _MSVCR_VER >= 110 /********************************************************************* * ?__ExceptionPtrToBool@@YA_NPBX(a)Z * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z @@ -1933,6 +1950,9 @@ MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) { return !!ep->rec; } +#endif + +#if _MSVCR_VER >= 100 /********************************************************************* * ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z @@ -2020,12 +2040,17 @@ MSVCRT_bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const except return ep1->rec == ep2->rec; } +#endif /* _MSVCR_VER >= 100 */ + +#if _MSVCR_VER >= 80 void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj); } +#endif #if _MSVCR_VER >= 140 + typedef struct { char *name; @@ -2139,9 +2164,11 @@ MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti) return hash; } -#endif + +#endif /* _MSVCR_VER >= 140 */ #if _MSVCR_VER >= 100 + enum ConcRT_EventType { CONCRT_EVENT_GENERIC, @@ -2160,4 +2187,5 @@ void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char lev { FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); } -#endif + +#endif /* _MSVCR_VER >= 100 */ -- 2.15.1

2 11

[PATCH] winhttp/tests: Fix resource leak.
by Andrey Gusev Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winhttp/tests/notification.c | 3 +++ dlls/winhttp/tests/winhttp.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index da8f8e9bd9..2a647e3633 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1033,7 +1033,10 @@ START_TEST (notification) ret = WaitForSingleObject( si.event, 10000 ); ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); return; + } test_persistent_connection( si.port ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e06661c31e..4399cf6df4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4475,7 +4475,10 @@ START_TEST (winhttp) ret = WaitForSingleObject(si.event, 10000); ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); return; + } test_IWinHttpRequest(si.port); test_connection_info(si.port); @@ -4495,4 +4498,5 @@ START_TEST (winhttp) test_basic_request(si.port, NULL, quitW); WaitForSingleObject(thread, 3000); + CloseHandle(thread); } -- 2.13.6

2 1

[PATCH] wininet/tests: Fix resource leak.
by Andrey Gusev Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wininet/tests/http.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ca1173e940..efc73e039f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5459,7 +5459,10 @@ static void test_http_connection(void) r = WaitForSingleObject(si.hEvent, 10000); ok (r == WAIT_OBJECT_0, "failed to start wininet test server\n"); if (r != WAIT_OBJECT_0) + { + CloseHandle(hThread); return; + } test_basic_request(si.port, "GET", "/test1"); test_proxy_indirect(si.port); -- 2.13.6

2 1

[PATCH 1/2] mshtml/tests: Test document stream creation failure (Coverity)
by Nikolay Sivov Jan. 5, 2018

Jan. 5, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/tests/activex.c | 7 +++++-- dlls/mshtml/tests/dom.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 78602b7146..8b6a47c391 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2246,6 +2246,7 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) IStream *stream; HGLOBAL mem; SIZE_T len; + HRESULT hr; notif_doc = doc; @@ -2253,9 +2254,11 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hr = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6c0b637a71..b00346759f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10518,6 +10518,7 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) IHTMLDocument2 *doc; HGLOBAL mem; SIZE_T len; + HRESULT hr; notif_doc = doc = create_document(); if(!doc) @@ -10527,9 +10528,11 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hr = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); -- 2.15.1

2 3