January 2017 - Wine-commits

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

05 Jan '17

Module: wine Branch: master Commit: 0cf81686b6c66b2ba5d874cba7399fff1fe86a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf81686b6c66b2ba5d874cba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:54 2017 +0100 d3d9/tests: Do not assume surface size and format in get_pixel_color(). 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/d3d9ex.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 54699ca..b40a979 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -63,25 +63,28 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) static DWORD get_pixel_color(IDirect3DDevice9Ex *device, unsigned int x, unsigned int y) { - DWORD ret; IDirect3DSurface9 *surf = NULL, *target = NULL; - HRESULT hr; - D3DLOCKED_RECT locked_rect; RECT rect = {x, y, x + 1, y + 1}; - - hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 640, 480, - D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); - if (FAILED(hr) || !surf) - { - trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr); - return 0xdeadbeef; - } + D3DLOCKED_RECT locked_rect; + D3DSURFACE_DESC desc; + HRESULT hr; + DWORD ret; hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &target); if (FAILED(hr)) { trace("Can't get the render target, hr %#x.\n", hr); - ret = 0xdeadbeed; + return 0xdeadbeed; + } + + hr = IDirect3DSurface9_GetDesc(target, &desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + desc.Format, D3DPOOL_SYSTEMMEM, &surf, NULL); + if (FAILED(hr) || !surf) + { + trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr); + ret = 0xdeadbeef; goto out; }

1 0

Józef Kucia : d3d9/tests: Add d3d9ex test for backbuffer resize.
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: 7e616af6ea8e0e310e7d08611f63069d87af11e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e616af6ea8e0e310e7d08611… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 5 11:50:55 2017 +0100 d3d9/tests: Add d3d9ex test for backbuffer resize. 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/d3d9ex.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index b40a979..f949f5c 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3600,6 +3600,107 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } +static void test_backbuffer_resize(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DSurface9 *backbuffer, *old_backbuffer; + D3DSURFACE_DESC surface_desc; + IDirect3DDevice9Ex *device; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + static const struct + { + float position[3]; + 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(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(window); + return; + } + + 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); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_pixel_color(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); + + old_backbuffer = backbuffer; + hr = IDirect3DSurface9_GetDesc(old_backbuffer, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + todo_wine ok(surface_desc.Width == 640, "Got unexpected width %u.\n", surface_desc.Width); + todo_wine ok(surface_desc.Height == 480, "Got unexpected height %u.\n", surface_desc.Height); + refcount = IDirect3DSurface9_Release(old_backbuffer); + ok(!refcount, "Surface has %u references left.\n", refcount); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + todo_wine ok(backbuffer != old_backbuffer, "Expected new backbuffer surface.\n"); + + 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, 0xffffff00, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_pixel_color(device, 1, 1); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x.\n", color); + color = get_pixel_color(device, 700, 500); + 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 = get_pixel_color(device, 1, 1); + ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + color = get_pixel_color(device, 700, 500); + ok(color == 0x0000ff00, "Got unexpected color 0x%08x.\n", color); + + IDirect3DSurface9_Release(backbuffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -3647,4 +3748,5 @@ START_TEST(d3d9ex) test_wndproc_windowed(); test_window_style(); test_swapchain_parameters(); + test_backbuffer_resize(); }

1 0

Hugh McMaster : regedit/tests: Add tests for quotes and slashes in keys, values and data.
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: 061c4bce06780b982d0a2a13a1af3bde0d00ae02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061c4bce06780b982d0a2a13a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jan 5 11:49:29 2017 +0000 regedit/tests: Add tests for quotes and slashes in keys, values and data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 445efb7..dc49cad 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -167,7 +167,7 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam static void test_basic_import(void) { - HKEY hkey; + HKEY hkey, subkey; DWORD dword = 0x17; char exp_binary[] = {0xAA,0xBB,0xCC,0x11}; WCHAR wide_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', @@ -278,6 +278,36 @@ static void test_basic_import(void) verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" + "\"single'quote\"=dword:00000008\n\n"); + verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); + dword = 0x00000008; + verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" + "\"Wine\\\\31\"=\"Test value\"\n\n"); + lr = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); + lr = RegCloseKey(subkey); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" + "\"123/\\\"4;'5\"=\"Random value name\"\n\n"); + lr = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); + lr = RegCloseKey(subkey); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Add tests for quotes and slashes in keys, values and data.
by Alexandre Julliard 05 Jan '17

05 Jan '17

Module: wine Branch: master Commit: da5a0b76117f938aaeca3471ed69c5e50b73c19c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5a0b76117f938aaeca3471e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jan 5 11:49:41 2017 +0000 reg/tests: Add tests for quotes and slashes in keys, values and data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index edc3b08..8786b0f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -774,7 +774,7 @@ static void test_import(void) char test1_reg[MAX_PATH], test2_reg[MAX_PATH]; char cmdline[MAX_PATH]; char test_string[] = "Test string"; - HKEY hkey; + HKEY hkey, subkey; LONG err; run_reg_exe("reg import", &r); @@ -1082,6 +1082,39 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" + "\"single'quote\"=dword:00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); + dword = 0x00000008; + todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" + "\"Wine\\\\31\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); + err = RegCloseKey(subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" + "\"123/\\\"4;'5\"=\"Random value name\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + todo_wine verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); + err = RegCloseKey(subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1358,6 +1391,39 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" + "\"single'quote\"=dword:00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); + dword = 0x00000008; + todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" + "\"Wine\\\\31\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); + err = RegCloseKey(subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" + "\"123/\\\"4;'5\"=\"Random value name\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + todo_wine verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); + err = RegCloseKey(subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Henri Verbeet : ddraw: Keep an explicit reference to the wined3d device in surfaces.
by Alexandre Julliard 04 Jan '17

04 Jan '17

Module: wine Branch: master Commit: c7c0415689c69f355605f50f6547cbcf198c58df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c0415689c69f355605f50f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 4 00:04:47 2017 +0100 ddraw: Keep an explicit reference to the wined3d device in surfaces. Version 1 and version 2 surfaces don't keep references to the ddraw interface that created them, so such surfaces may get destroyed after the corresponding ddraw object was destroyed. Wined3d requires that the device is destroyed after all its resources are destroyed. In principle this issue always existed, but it was probably made worse by changes in the texture cleanup code. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 7 +++++++ dlls/wined3d/device.c | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 731d441..1133bbd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -206,6 +206,7 @@ struct ddraw_texture DDSURFACEDESC2 surface_desc; struct ddraw_surface *root; + struct wined3d_device *wined3d_device; }; HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2989988..4b53ac3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -543,6 +543,8 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) if (iface_count == 0) { + struct ddraw_texture *texture = wined3d_texture_get_parent(This->wined3d_texture); + struct wined3d_device *wined3d_device = texture->wined3d_device; IUnknown *release_iface = This->ifaceToRelease; /* Complex attached surfaces are destroyed implicitly when the root is released */ @@ -558,6 +560,9 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) if (release_iface) IUnknown_Release(release_iface); + /* Release the device only after anything that may reference it (the + * wined3d texture and rendertarget view in particular) is released. */ + wined3d_device_decref(wined3d_device); } return iface_count; @@ -6142,6 +6147,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_texture_decref(wined3d_texture); root->is_complex_root = TRUE; texture->root = root; + wined3d_device_incref(texture->wined3d_device = ddraw->wined3d_device); if (desc->dwFlags & DDSD_CKDESTOVERLAY) wined3d_texture_set_color_key(wined3d_texture, DDCKEY_DESTOVERLAY, @@ -6260,6 +6266,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ last = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); wined3d_texture_decref(wined3d_texture); texture->root = last; + wined3d_device_incref(texture->wined3d_device = ddraw->wined3d_device); if (desc->dwFlags & DDSD_CKDESTOVERLAY) wined3d_texture_set_color_key(wined3d_texture, DDCKEY_DESTOVERLAY, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8de282..785ea6b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -547,7 +547,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) wined3d_cs_destroy(device->cs); if (device->recording && wined3d_stateblock_decref(device->recording)) - FIXME("Something's still holding the recording stateblock.\n"); + ERR("Something's still holding the recording stateblock.\n"); device->recording = NULL; state_cleanup(&device->state); @@ -562,11 +562,11 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { struct wined3d_resource *resource; - FIXME("Device released with resources still bound, acceptable but unexpected.\n"); + ERR("Device released with resources still bound.\n"); LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) { - FIXME("Leftover resource %p with type %s (%#x).\n", + ERR("Leftover resource %p with type %s (%#x).\n", resource, debug_d3dresourcetype(resource->type), resource->type); } }

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

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 : 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

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

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