February 2018 - Wine-Commits

Matteo Bruni : d3d9/tests: Add a test for GenerateMipSubLevels().
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 4477231ab13dd6f7f3ec743f3e059c3a74a48ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4477231ab13dd6f7f3ec743f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:54 2018 +0100 d3d9/tests: Add a test for GenerateMipSubLevels(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0439ebd..b5e260d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5864,6 +5864,136 @@ done: DestroyWindow(window); } +static void test_generate_mipmap(void) +{ + static const RECT r1 = {256, 256, 512, 512}; + static const RECT r2 = {512, 256, 768, 512}; + static const RECT r3 = {256, 512, 512, 768}; + static const RECT r4 = {512, 512, 768, 768}; + static const float quad[] = + { + -0.5f, -0.5f, 0.1f, 0.0f, 0.0f, + -0.5f, 0.5f, 0.1f, 0.0f, 1.0f, + 0.5f, -0.5f, 0.1f, 1.0f, 0.0f, + 0.5f, 0.5f, 0.1f, 1.0f, 1.0f, + }; + IDirect3DTexture9 *texture, *texture2; + IDirect3DSurface9 *surface, *surface2; + IDirect3DDevice9 *device; + unsigned int x, y; + D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Make the texture big enough that a mipmap level > 0 is used. */ + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 0, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture, 0); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 0, 0, + D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &texture2, 0); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture2, 0, &surface2); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surface2, &lr, NULL, 0); + ok(SUCCEEDED(hr), "Failed to map surface, hr %#x.\n", hr); + for (y = 0; y < 1024; ++y) + { + for(x = 0; x < 1024; ++x) + { + DWORD *dst = (DWORD *)((BYTE *)lr.pBits + y * lr.Pitch + x * 4); + POINT pt; + + pt.x = x; + pt.y = y; + if (PtInRect(&r1, pt)) + *dst = 0xffff0000; + else if (PtInRect(&r2, pt)) + *dst = 0xff00ff00; + else if (PtInRect(&r3, pt)) + *dst = 0xff0000ff; + else if (PtInRect(&r4, pt)) + *dst = 0xff000000; + else + *dst = 0xffffffff; + } + } + hr = IDirect3DSurface9_UnlockRect(surface2); + ok(SUCCEEDED(hr), "Failed to unmap surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, surface2, NULL, surface, NULL); + ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface2); + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture2); + + hr = IDirect3DTexture9_SetAutoGenFilterType(texture, D3DTEXF_LINEAR); + ok(SUCCEEDED(hr), "Failed to set mipmap autogen filter type, hr %#x.\n", hr); + + IDirect3DTexture9_GenerateMipSubLevels(texture); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mipmap filtering, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + + color = getPixelColor(device, 200, 200); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 200); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 200); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 200); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 200, 270); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 270); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 270); + ok(!color, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 270); + ok(!color, "Unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void test_mipmap_autogen(void) { IDirect3DSurface9 *surface, *surface2, *surface3, *backbuffer; @@ -23533,6 +23663,7 @@ START_TEST(visual) g16r16_texture_test(); pixelshader_blending_test(); texture_transform_flags_test(); + test_generate_mipmap(); test_mipmap_autogen(); fixed_function_decl_test(); conditional_np2_repeat_test();

1 0

Józef Kucia : d3d11: Add DXGI_FORMAT_B4G4R4A4_UNORM format.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 0c1658907641f61e0e92d9e47d051145fcf14324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c1658907641f61e0e92d9e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:31 2018 +0100 d3d11: Add DXGI_FORMAT_B4G4R4A4_UNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 3885078..3a48907 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -150,6 +150,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_D3D_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); + WINE_D3D_TO_STR(DXGI_FORMAT_B4G4R4A4_UNORM); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); return "unrecognized"; @@ -311,6 +312,7 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; + case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: FIXME("Unhandled wined3d format %#x.\n", format); return DXGI_FORMAT_UNKNOWN; @@ -421,6 +423,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; + case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN;

1 0

Józef Kucia : d3d9/tests: Add basic test for StretchRect() with multisample resources.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 10e7f7ca47f77762baa661ee7337087907cb3f1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e7f7ca47f77762baa661ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:32 2018 +0100 d3d9/tests: Add basic test for StretchRect() with multisample resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b5e260d..23fd1fb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4072,6 +4072,135 @@ done: DestroyWindow(window); } +static void test_multisample_stretch_rect(void) +{ + static const D3DTEXTUREFILTERTYPE filters[] = + { + D3DTEXF_NONE, + D3DTEXF_POINT, + D3DTEXF_LINEAR, + }; + IDirect3DSurface9 *rt, *ms_rt, *rt_r5g6b5; + struct surface_readback rb; + IDirect3DDevice9 *device; + DWORD quality_levels; + IDirect3D9 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + DWORD color; + HRESULT hr; + RECT rect; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, &quality_levels) == D3DERR_NOTAVAILABLE) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(hr == S_OK, "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, quality_levels - 1, FALSE, &ms_rt, NULL); + ok(hr == S_OK, "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, ms_rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + + for (i = 0; i < sizeof(filters) / sizeof(*filters); ++i) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + color = getPixelColor(device, 64, 64); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + } + + /* Scaling */ + SetRect(&rect, 0, 0, 64, 64); + for (i = 0; i < sizeof(filters) / sizeof(*filters); ++i) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, &rect, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 32, 32); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 64, 64); + ok(color == 0xffffffff, "Test %u: Got color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 96, 96); + ok(color == 0xffffffff, "Test %u: Got color 0x%08x.\n", i, color); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, &rect, rt, NULL, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 32, 32); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 64, 64); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 96, 96); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + release_surface_readback(&rb); + } + + /* Format conversion */ + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_R5G6B5, D3DMULTISAMPLE_NONE, 0, FALSE, &rt_r5g6b5, NULL); + if (FAILED(hr)) + { + skip("Failed to create D3DFMT_R5G6B5 render target.\n"); + goto done; + } + + for (i = 0; i < sizeof(filters) / sizeof(*filters); ++i) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt_r5g6b5, NULL, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, rt_r5g6b5, NULL, rt, NULL, filters[i]); + ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + color = getPixelColor(device, 64, 64); + ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + } + + IDirect3DSurface9_Release(rt_r5g6b5); + +done: + IDirect3DSurface9_Release(ms_rt); + IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void maxmip_test(void) { IDirect3DTexture9 *texture; @@ -23645,6 +23774,7 @@ START_TEST(visual) test_sanity(); depth_clamp_test(); stretchrect_test(); + test_multisample_stretch_rect(); lighting_test(); test_specular_lighting(); clear_test();

1 0

Matteo Bruni : d3d9/tests: Add a test for cube texture mipmap autogeneration.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 0d8dc0c0b72a81ef002b2917448c58d77525e6d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d8dc0c0b72a81ef002b2917… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:52 2018 +0100 d3d9/tests: Add a test for cube texture mipmap autogeneration. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c745c1b..0439ebd 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5868,8 +5868,9 @@ static void test_mipmap_autogen(void) { IDirect3DSurface9 *surface, *surface2, *surface3, *backbuffer; IDirect3DTexture9 *texture, *texture2, *texture3; + IDirect3DCubeTexture9 *cube_texture; IDirect3DDevice9 *device; - unsigned int x, y; + unsigned int i, x, y; D3DLOCKED_RECT lr; IDirect3D9 *d3d; D3DCOLOR color; @@ -6130,6 +6131,77 @@ static void test_mipmap_autogen(void) IDirect3DTexture9_Release(texture3); IDirect3DTexture9_Release(texture2); IDirect3DTexture9_Release(texture); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("No cube textures support.\n"); + IDirect3DSurface9_Release(backbuffer); + IDirect3DDevice9_Release(device); + goto done; + } + hr = IDirect3DDevice9_CreateCubeTexture(device, 1024, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &cube_texture, 0); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + for (i = 0; i < 6; ++i) + { + hr = IDirect3DCubeTexture9_LockRect(cube_texture, i, 0, &lr, NULL, 0); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + + for (y = 0; y < 1024; ++y) + { + for (x = 0; x < 1024; ++x) + { + DWORD *dst = (DWORD *)((BYTE *)lr.pBits + y * lr.Pitch + x * 4); + POINT pt; + + pt.x = x; + pt.y = y; + if (PtInRect(&r1, pt)) + *dst = 0xffff0000; + else if (PtInRect(&r2, pt)) + *dst = 0xff00ff00; + else if (PtInRect(&r3, pt)) + *dst = 0xff0000ff; + else if (PtInRect(&r4, pt)) + *dst = 0xff000000; + else + *dst = 0xffffffff; + } + } + hr = IDirect3DCubeTexture9_UnlockRect(cube_texture, i, 0); + ok(SUCCEEDED(hr), "Failed to unmap texture, hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)cube_texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + IDirect3DCubeTexture9_Release(cube_texture); + + color = getPixelColor(device, 200, 200); + ok(color == 0x00000000, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 200, 270); + ok(color == 0x00000000, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 270); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 270); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 270); + ok(color == 0x0000ff00, "Unexpected color 0x%08x.\n", color); + IDirect3DSurface9_Release(backbuffer); refcount = IDirect3DDevice9_Release(device);

1 0

Matteo Bruni : d3d9: Introduce a d3d9_texture_cleanup() function.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 280ea40aab59189edc733b7dbee475054055390d URL: https://source.winehq.org/git/wine.git/?a=commit;h=280ea40aab59189edc733b7d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:50 2018 +0100 d3d9: Introduce a d3d9_texture_cleanup() function. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 66 ++++++++++++++++------------------------------------- 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index d3662f8..ec00776 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -78,6 +78,23 @@ static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource return texture->wined3d_srv; } +static void d3d9_texture_cleanup(struct d3d9_texture *texture) +{ + IDirect3DDevice9Ex *parent_device = texture->parent_device; + struct d3d9_surface *surface; + + wined3d_mutex_lock(); + if (texture->wined3d_srv) + wined3d_shader_resource_view_decref(texture->wined3d_srv); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) + wined3d_rendertarget_view_decref(surface->wined3d_rtv); + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parent_device); +} + /* wined3d critical section must be taken by the caller. */ void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture) { @@ -146,23 +163,7 @@ static ULONG WINAPI d3d9_texture_2d_Release(IDirect3DTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - struct d3d9_surface *surface; - - wined3d_mutex_lock(); - if (texture->wined3d_srv) - wined3d_shader_resource_view_decref(texture->wined3d_srv); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; } @@ -560,25 +561,7 @@ static ULONG WINAPI d3d9_texture_cube_Release(IDirect3DCubeTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - struct d3d9_surface *surface; - - TRACE("Releasing child %p.\n", texture->wined3d_texture); - - wined3d_mutex_lock(); - if (texture->wined3d_srv) - wined3d_shader_resource_view_decref(texture->wined3d_srv); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; } @@ -996,16 +979,7 @@ static ULONG WINAPI d3d9_texture_3d_Release(IDirect3DVolumeTexture9 *iface) TRACE("%p decreasing refcount to %u.\n", iface, ref); if (!ref) - { - IDirect3DDevice9Ex *parent_device = texture->parent_device; - - wined3d_mutex_lock(); - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice9Ex_Release(parent_device); - } + d3d9_texture_cleanup(texture); return ref; }

1 0

Nikolay Sivov : user32/tests: Test auto-registration for more redirected builtin classes.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: f31cb68fc3efe4ae04821772037f19f85634f8cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f31cb68fc3efe4ae04821772… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 16 16:23:01 2018 +0300 user32/tests: Test auto-registration for more redirected builtin classes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 7701f25..a9eee41 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1237,6 +1237,9 @@ static void test_comctl32_classes(void) "!Button", "!Edit", "!Static", + "!Listbox", + "!ComboBox", + "!ComboLBox", }; winetest_get_mainargs( &argv );

1 0

Matteo Bruni : server: Avoid writing out of bounds in get_selector_entry() .
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 1f006f075d3db4a1dec55e6183519480d81ce961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f006f075d3db4a1dec55e61… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 16 00:47:55 2018 +0100 server: Avoid writing out of bounds in get_selector_entry(). Fixes c6dfce272309c1ad869886a0fce186c795f3e5b7. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 704b17d..4eda8eb 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -289,7 +289,7 @@ static int suspend_for_ptrace( struct thread *thread ) } /* read a long from a thread address space */ -static long read_thread_long( struct thread *thread, long *addr, long *data ) +static int read_thread_long( struct thread *thread, void *addr, unsigned long *data ) { errno = 0; *data = ptrace( PTRACE_PEEKDATA, get_ptrace_pid(thread), (caddr_t)addr, 0 ); @@ -301,14 +301,26 @@ static long read_thread_long( struct thread *thread, long *addr, long *data ) return 0; } +static int read_thread_int( struct thread *thread, void *addr, unsigned int *data ) +{ + unsigned long long_data; + int ret; + + ret = read_thread_long( thread, addr, &long_data ); + *data = long_data; + return ret; +} + /* write a long to a thread address space */ -static long write_thread_long( struct thread *thread, long *addr, long data, unsigned long mask ) +static long write_thread_long( struct thread *thread, void *addr, unsigned long data, unsigned long mask ) { - long res; + unsigned long old_data; + int res; + if (mask != ~0ul) { - if (read_thread_long( thread, addr, &res ) == -1) return -1; - data = (data & mask) | (res & ~mask); + if (read_thread_long( thread, addr, &old_data ) == -1) return -1; + data = (data & mask) | (old_data & ~mask); } if ((res = ptrace( PTRACE_POKEDATA, get_ptrace_pid(thread), (caddr_t)addr, data )) == -1) file_set_error(); @@ -333,7 +345,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t { struct thread *thread = get_ptrace_thread( process ); unsigned int first_offset, last_offset, len; - long data, *addr; + unsigned long data, *addr; if (!thread) return 0; @@ -347,7 +359,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t last_offset = (size + first_offset) % sizeof(long); if (!last_offset) last_offset = sizeof(long); - addr = (long *)(unsigned long)(ptr - first_offset); + addr = (unsigned long *)(unsigned long)(ptr - first_offset); len = (size + first_offset + sizeof(long) - 1) / sizeof(long); if (suspend_for_ptrace( thread )) @@ -517,13 +529,14 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } if (suspend_for_ptrace( thread )) { - unsigned char flags_buf[4]; + unsigned int flags_buf; unsigned long addr = (unsigned long)thread->process->ldt_copy + (entry * 4); - if (read_thread_long( thread, (long *)addr, (long *)base ) == -1) goto done; - if (read_thread_long( thread, (long *)(addr + (8192 * 4)), (long *)limit ) == -1) goto done; + + if (read_thread_int( thread, (void *)addr, base ) == -1) goto done; + if (read_thread_int( thread, (void *)(addr + (8192 * 4)), limit ) == -1) goto done; addr = (unsigned long)thread->process->ldt_copy + (2 * 8192 * 4) + (entry & ~3); - if (read_thread_long( thread, (long *)addr, (long *)flags_buf ) == -1) goto done; - *flags = flags_buf[entry % 4]; + if (read_thread_int( thread, (void *)addr, &flags_buf ) == -1) goto done; + *flags = flags_buf >> (entry & 3) * 8; done: resume_after_ptrace( thread ); }

1 0

Józef Kucia : wined3d: Use renderbuffers when resolving multisample textures with conversion.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: de9ebcff70a41d1600c26734b3b0f2b3935992d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9ebcff70a41d1600c26734… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 16 15:13:33 2018 +0100 wined3d: Use renderbuffers when resolving multisample textures with conversion. Direct3D 9 allows blits from multisample resources to non-multisample resources with scaling or format conversion. In OpenGL, we resolve multisample texture to the renderbuffer associated with the texture before doing the actual blit with scaling/format conversion. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1f5a98a..5cb9cda 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -350,6 +350,15 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, context_release(context); } +static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD location) +{ + if (location == WINED3D_LOCATION_RB_MULTISAMPLE) + return TRUE; + if (location != WINED3D_LOCATION_TEXTURE_RGB && location != WINED3D_LOCATION_TEXTURE_SRGB) + return FALSE; + return texture->target == GL_TEXTURE_2D_MULTISAMPLE || texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY; +} + /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ static void surface_blt_fbo(const struct wined3d_device *device, @@ -392,7 +401,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, } /* Resolve the source surface first if needed. */ - if (src_location == WINED3D_LOCATION_RB_MULTISAMPLE + if (is_multisample_location(src_texture, src_location) && (src_texture->resource.format->id != dst_texture->resource.format->id || abs(src_rect.bottom - src_rect.top) != abs(dst_rect.bottom - dst_rect.top) || abs(src_rect.right - src_rect.left) != abs(dst_rect.right - dst_rect.left)))

1 0

Jacek Caban : mshtml: Added IDOMKeyboardEvent::which and IDOMMouseEvent:: which properties implementation.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: abd27e0926f01ca3a82f18ba6e00ad08cb046544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abd27e0926f01ca3a82f18ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 16 16:36:14 2018 +0100 mshtml: Added IDOMKeyboardEvent::which and IDOMMouseEvent::which properties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/events.js | 4 ++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 413ca2d..3a83e47 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1619,8 +1619,17 @@ static HRESULT WINAPI DOMMouseEvent_get_layerY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_which(IDOMMouseEvent *iface, USHORT *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetWhich(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static const IDOMMouseEventVtbl DOMMouseEventVtbl = { @@ -1874,8 +1883,17 @@ static HRESULT WINAPI DOMKeyboardEvent_get_charCode(IDOMKeyboardEvent *iface, LO static HRESULT WINAPI DOMKeyboardEvent_get_which(IDOMKeyboardEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetWhich(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_char(IDOMKeyboardEvent *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index c5030d0..f645e37 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -628,6 +628,7 @@ function test_mouse_event() { ok(e.buttons === 0, "buttons = " + e.buttons); ok(e.pageX === 0, "pageX = " + e.pageX); ok(e.pageY === 0, "pageY = " + e.pageY); + ok(e.which === 1, "which = " + e.which); e.initMouseEvent("test", true, true, window, 1, 2, 3, 4, 5, false, false, false, false, 1, document); ok(e.type === "test", "type = " + e.type); @@ -646,6 +647,7 @@ function test_mouse_event() { ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.button === 1, "button = " + e.button); ok(e.buttons === 0, "buttons = " + e.buttons); + ok(e.which === 2, "which = " + e.which); e.initMouseEvent("test", false, false, window, 9, 8, 7, 6, 5, true, true, true, true, 127, document); ok(e.type === "test", "type = " + e.type); @@ -661,6 +663,7 @@ function test_mouse_event() { ok(e.shiftKey === true, "shiftKey = " + e.shiftKey); ok(e.metaKey === true, "metaKey = " + e.metaKey); ok(e.button === 127, "button = " + e.button); + ok(e.which === 128, "which = " + e.which); e.initEvent("testevent", true, true); ok(e.type === "testevent", "type = " + e.type); @@ -728,6 +731,7 @@ function test_keyboard_event() { ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.location === 0, "location = " + e.location); ok(e.detail === 0, "detail = " + e.detail); + ok(e.which === 0, "which = " + e.which); next_test(); }

1 0

Henri Verbeet : d3d8: Explicitly translate resource map flags.
by Alexandre Julliard Feb. 16, 2018

Feb. 16, 2018

Module: wine Branch: master Commit: 8a1a94cd200cc5894a2953211ce37d9b7fd02771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1a94cd200cc5894a295321… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 16 09:57:06 2018 +0330 d3d8: Explicitly translate resource map flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 18 ++++++++++++++++++ dlls/d3d8/surface.c | 2 +- dlls/d3d8/volume.c | 3 ++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 772a233..d4d73ad 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -193,7 +193,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o wined3d_box.right = offset + size; wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, flags); + 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 5e59065..ecde77a 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -273,6 +273,7 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDEN; void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a6363d2..fc40026 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -141,6 +141,24 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) } } +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) +{ + static const unsigned int handled = D3DLOCK_READONLY + | D3DLOCK_NOSYSLOCK + | D3DLOCK_NOOVERWRITE + | D3DLOCK_DISCARD + | D3DLOCK_NO_DIRTY_UPDATE; + unsigned int wined3d_flags; + + wined3d_flags = flags & handled; + flags &= ~handled; + + if (flags) + FIXME("Unhandled flags %#x.\n", flags); + + return wined3d_flags; +} + static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, UINT primitive_count) { switch (primitive_type) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 6ad43a4..fff47f5 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -244,7 +244,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, } hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, flags); + &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags)); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index e8ff74b..89aa84f 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -147,7 +147,8 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface, wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), - volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags))) + volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, + wined3dmapflags_from_d3dmapflags(flags)))) map_desc.data = NULL; wined3d_mutex_unlock();

1 0