wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Józef Kucia : d3d8/tests: Add test for stale render target views regression.
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: 6b1fe5f6d2641ae391ebd9a1d3f82e2fa1b21c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1fe5f6d2641ae391ebd9a1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:53 2017 +0100 d3d8/tests: Add test for stale render target views regression. This test exercises a regression introduced by commit b005ad6f905dc0051b17ea45b3690e0662e48481. 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/d3d8/tests/visual.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fa3d4f3..0fb85d3 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9684,6 +9684,108 @@ static void test_max_index16(void) DestroyWindow(window); } +/* This test exercises a regression in Wine d3d8 implementation. */ +static void test_backbuffer_resize(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DSurface8 *backbuffer; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(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.\n"); + goto done; + } + + /* In order to exercise the regression the backbuffer surface has to be + * unreferenced when SetRenderTarget() is called. */ + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + refcount = IDirect3DSurface8_Release(backbuffer); + ok(!refcount, "Surface has %u references left.\n", refcount); + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + present_parameters.BackBufferWidth = 800; + present_parameters.BackBufferHeight = 600; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = NULL; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(SUCCEEDED(hr), "Failed to reset, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface8_Release(backbuffer); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 700, 500); + todo_wine ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 700, 500); + todo_wine ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9753,4 +9855,5 @@ START_TEST(visual) test_color_clamping(); test_edge_antialiasing_blending(); test_max_index16(); + test_backbuffer_resize(); }

1 0

Józef Kucia : d3d8/tests: Do not assume surface size and format in get_rt_readback().
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: 73cb1b01d51667cf8767c3df5266c2ba0dfb658c URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cb1b01d51667cf8767c3df5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:52 2017 +0100 d3d8/tests: Do not assume surface size and format in get_rt_readback(). 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/d3d8/tests/visual.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index bf7058c..fa3d4f3 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -65,13 +65,17 @@ struct surface_readback static void get_rt_readback(IDirect3DSurface8 *surface, struct surface_readback *rb) { - IDirect3DDevice8 *device; IDirect3DTexture8 *tex = NULL; + IDirect3DDevice8 *device; + D3DSURFACE_DESC desc; HRESULT hr; memset(rb, 0, sizeof(*rb)); - IDirect3DSurface8_GetDevice(surface, &device); - hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &tex); + hr = IDirect3DSurface8_GetDevice(surface, &device); + ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, desc.Width, desc.Height, 1, 0, desc.Format, D3DPOOL_SYSTEMMEM, &tex); if (FAILED(hr) || !tex) { trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr);

1 0

Józef Kucia : d3d9/tests: Add test for stale render target views regression.
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: a7918817d408eaacea8e5810d170e3f8e9f6cfab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7918817d408eaacea8e5810d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:51 2017 +0100 d3d9/tests: Add test for stale render target views regression. This test exercises a regression introduced by commit b005ad6f905dc0051b17ea45b3690e0662e48481. 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 | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d65649..d23be17 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22223,6 +22223,107 @@ static void test_max_index16(void) DestroyWindow(window); } +/* This test exercises a regression in Wine d3d9 implementation. */ +static void test_backbuffer_resize(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DSurface9 *backbuffer; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + + 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.\n"); + goto done; + } + + /* In order to exercise the regression the backbuffer surface has to be + * unreferenced when SetRenderTarget() is called. */ + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + refcount = IDirect3DSurface9_Release(backbuffer); + ok(!refcount, "Surface has %u references left.\n", refcount); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + present_parameters.BackBufferWidth = 800; + present_parameters.BackBufferHeight = 600; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = NULL; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3DDevice9_Reset(device, &present_parameters); + ok(SUCCEEDED(hr), "Failed to reset, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + IDirect3DSurface9_Release(backbuffer); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 700, 500); + todo_wine ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + 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); + color = getPixelColor(device, 1, 1); + ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 700, 500); + todo_wine ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22350,4 +22451,5 @@ START_TEST(visual) test_dsy(); test_evict_bound_resources(); test_max_index16(); + test_backbuffer_resize(); }

1 0

Józef Kucia : d3d9/tests: Do not assume surface size and format in get_rt_readback().
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: c6795afcddb8dc6f0e310a242525b6dbd649bd88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6795afcddb8dc6f0e310a242… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:50 2017 +0100 d3d9/tests: Do not assume surface size and format in get_rt_readback(). 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b1916c4..4d65649 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -129,12 +129,16 @@ struct surface_readback static void get_rt_readback(IDirect3DSurface9 *surface, struct surface_readback *rb) { IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; HRESULT hr; memset(rb, 0, sizeof(*rb)); - IDirect3DSurface9_GetDevice(surface, &device); - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 640, 480, - D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); + hr = IDirect3DSurface9_GetDevice(surface, &device); + ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); if (FAILED(hr) || !rb->surface) { trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr);

1 0

André Hentschel : hlink/tests: Test skipped data.
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: b5ad6a44801e39eb7e0b4a6056d93b68de68c8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ad6a44801e39eb7e0b4a605… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 4 16:49:43 2017 +0100 hlink/tests: Test skipped data. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 42fe6cb..22cfd10 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -404,7 +404,10 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, (expected_data_alt == expected_hlink_data2_ie7 && i == 109) /* Win10 */ || (expected_data_alt == expected_hlink_data3_ie7 && i == 109) /* Win10 */ || (expected_data_alt == expected_hlink_data5_ie7 && i == 107) /* Win10 */) + { + ok(data[i] == 0 || broken(data[i] == 1), "Expected 0 or 1, got %d", data[i]); continue; + } if ((expected_data_alt[i] != data[i]) && (((expected_data_alt != expected_hlink_data2) && (expected_data_alt != expected_hlink_data3)) ||

1 0

Jactry Zeng : quartz/tests: Skip test_render_run() if test file doesn' t exist.
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: adabe844b212acaa5c969e84efb1ff8b943d1ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adabe844b212acaa5c969e84e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jan 4 22:15:58 2017 +0800 quartz/tests: Skip test_render_run() if test file doesn't exist. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 9db1c72..e5671d2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -354,25 +354,26 @@ static void test_render_run(const WCHAR *file) HANDLE h; HRESULT hr; + h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + if (h == INVALID_HANDLE_VALUE) { + skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(file)); + return; + } + CloseHandle(h); + if (!createfiltergraph()) return; - h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); - if (h != INVALID_HANDLE_VALUE) { - CloseHandle(h); - hr = IGraphBuilder_RenderFile(pgraph, file, NULL); - ok(hr==S_OK, "RenderFile returned: %x\n", hr); - rungraph(); - } + hr = IGraphBuilder_RenderFile(pgraph, file, NULL); + ok(hr == S_OK, "RenderFile returned: %x\n", hr); + rungraph(); releasefiltergraph(); - if (h != INVALID_HANDLE_VALUE) { - /* check reference leaks */ - h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); - CloseHandle(h); - } + /* check reference leaks */ + h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); + CloseHandle(h); } static void test_graph_builder(void)

1 0

Alistair Leslie-Hughes : include: Correct misspelt GCPCLASS_PREBOUNDRTL define.
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: 3bf6923728fa4197dceeee317af1c4547034008c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf6923728fa4197dceeee317… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 4 06:55:54 2017 +0000 include: Correct misspelt GCPCLASS_PREBOUNDRTL define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index 548269e..1851654 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1415,7 +1415,7 @@ typedef struct #define GCPCLASS_LATINNUMERICSEPARATOR 8 #define GCPCLASS_NUMERICSEPARATOR 9 #define GCPCLASS_PREBOUNDLTR 0x80 -#define GCPCLASS_PREBOUNDRLT 0x40 +#define GCPCLASS_PREBOUNDRTL 0x40 #define GCPCLASS_POSTBOUNDLTR 0x20 #define GCPCLASS_POSTBOUNDRTL 0x10

1 0

Henri Verbeet : d2d1: Update "p0" after inserting a vertex in d2d_geometry_resolve_beziers().
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: df63a7f89032e37d766b82dcb250a9beab37e067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df63a7f89032e37d766b82dcb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 00:04:50 2017 +0100 d2d1: Update "p0" after inserting a vertex in d2d_geometry_resolve_beziers(). This fixes a failure in the d2d1 tests when run with warn+heap. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index f0e1d08..35b1aef 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1942,6 +1942,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) { sign = 1.0f; d2d_figure_insert_vertex(figure, j + 1, *p1); + /* Inserting a vertex potentially invalidates p0. */ + p0 = &figure->vertices[j]; ++j; }

1 0

Henri Verbeet : wined3d: Pass GL_SYNC_FLUSH_COMMANDS_BIT to glClientWaitSync() if WINED3DGETDATA_FLUSH was specified.
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: 5d470a6e7f8847fdae939dde064566cc8a877e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d470a6e7f8847fdae939dde0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 00:04:49 2017 +0100 wined3d: Pass GL_SYNC_FLUSH_COMMANDS_BIT to glClientWaitSync() if WINED3DGETDATA_FLUSH was specified. Otherwise the application may keep spinning on wined3d_query_get_data() in case the query wasn't submitted to the GPU yet when wined3d_query_get_data() was called. This issue was exposed by commit 70889d68664c1211caf5a845014953dfee66c8f4. Note that this won't fix the issue if the query was created in a different GL context. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 27 ++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 77dad45..9f75a49 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -66,14 +66,14 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) } static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, - const struct wined3d_device *device) + const struct wined3d_device *device, DWORD flags) { struct wined3d_context *context; const struct wined3d_gl_info *gl_info; enum wined3d_event_query_result ret; BOOL fence_result; - TRACE("(%p) : device %p\n", query, device); + TRACE("query %p, device %p, flags %#x.\n", query, device, flags); if (!query->context) { @@ -92,7 +92,8 @@ static enum wined3d_event_query_result wined3d_event_query_test(const struct win if (gl_info->supported[ARB_SYNC]) { - GLenum gl_ret = GL_EXTCALL(glClientWaitSync(query->object.sync, 0, 0)); + GLenum gl_ret = GL_EXTCALL(glClientWaitSync(query->object.sync, + (flags & WINED3DGETDATA_FLUSH) ? GL_SYNC_FLUSH_COMMANDS_BIT : 0, 0)); checkGLcall("glClientWaitSync"); switch (gl_ret) @@ -330,7 +331,7 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, if (query->state == QUERY_CREATED) WARN("Query wasn't started yet.\n"); - else if (!query->query_ops->query_poll(query)) + else if (!query->query_ops->query_poll(query, flags)) return S_FALSE; if (data) @@ -360,7 +361,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) return WINED3D_OK; } -static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query) +static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; @@ -368,7 +369,7 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query) struct wined3d_context *context; GLuint available; - TRACE("query %p.\n", query); + TRACE("query %p, flags %#x.\n", query, flags); if (oq->context->tid != GetCurrentThreadId()) { @@ -408,14 +409,14 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query) return available; } -static BOOL wined3d_event_query_ops_poll(struct wined3d_query *query) +static BOOL wined3d_event_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); enum wined3d_event_query_result ret; - TRACE("query %p.\n", query); + TRACE("query %p, flags %#x.\n", query, flags); - ret = wined3d_event_query_test(event_query, query->device); + ret = wined3d_event_query_test(event_query, query->device, flags); switch (ret) { case WINED3D_EVENT_QUERY_OK: @@ -538,7 +539,7 @@ static void wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD } } -static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query) +static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); struct wined3d_device *device = query->device; @@ -547,7 +548,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query) GLuint64 timestamp; GLuint available; - TRACE("query %p.\n", query); + TRACE("query %p, flags %#x.\n", query, flags); if (tq->context->tid != GetCurrentThreadId()) { @@ -601,9 +602,9 @@ static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD } } -static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *query) +static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *query, DWORD flags) { - TRACE("query %p.\n", query); + TRACE("query %p, flags %#x.\n", query, flags); return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35e60c6..09fbb70 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1437,7 +1437,7 @@ enum wined3d_query_state struct wined3d_query_ops { - BOOL (*query_poll)(struct wined3d_query *query); + BOOL (*query_poll)(struct wined3d_query *query, DWORD flags); void (*query_issue)(struct wined3d_query *query, DWORD flags); };

1 0

Henri Verbeet : wined3d: Only check rtv and dsv bindings in device_resource_released() when D3D is initialised.
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: 9a789feb81f49c75b168d1f6a6406b2ede74cb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a789feb81f49c75b168d1f6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 00:04:48 2017 +0100 wined3d: Only check rtv and dsv bindings in device_resource_released() when D3D is initialised. This fixes a regression introduced by commit 4a9304305ae2940288e9382926a6931dd46982d5. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 785ea6b..3a24e29 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4958,14 +4958,17 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + if (device->d3d_initialized) { - if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) - ERR("Resource %p is still in use as render target %u.\n", resource, i); - } + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + { + if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) + ERR("Resource %p is still in use as render target %u.\n", resource, i); + } - if ((rtv = device->fb.depth_stencil) && rtv->resource == resource) - ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + if ((rtv = device->fb.depth_stencil) && rtv->resource == resource) + ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + } switch (type) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017