April 2017 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Avoid potential double free in d3d_texture2d_create().
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 478cc5b2a35ad7e4c8fd0cf169f7e1a83bc1290d URL: http://source.winehq.org/git/wine.git/?a=commit;h=478cc5b2a35ad7e4c8fd0cf16… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:54 2017 +0200 d3d11: Avoid potential double free in d3d_texture2d_create(). The parent is owned by the wined3d_texture object and it is destroyed in the wined3d_object_destroyed() callback. 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/texture.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 92c4cdf..ef2c9a2 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -475,16 +475,23 @@ static BOOL validate_texture2d_desc(const D3D11_TEXTURE2D_DESC *desc) return TRUE; } -static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_device *device, - const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) +HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, + const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture2d **out) { struct wined3d_resource_desc wined3d_desc; + struct d3d_texture2d *texture; unsigned int levels; DWORD flags = 0; HRESULT hr; if (!validate_texture2d_desc(desc)) + { + WARN("Failed to validate texture desc.\n"); return E_INVALIDARG; + } + + if (!(texture = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*texture)))) + return E_OUTOFMEMORY; texture->ID3D11Texture2D_iface.lpVtbl = &d3d11_texture2d_vtbl; texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl; @@ -518,6 +525,7 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi { WARN("Failed to create wined3d texture, hr %#x.\n", hr); wined3d_private_store_cleanup(&texture->private_store); + HeapFree(GetProcessHeap(), 0, texture); wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL) hr = E_INVALIDARG; @@ -543,7 +551,7 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) { - ERR("Failed to create DXGI surface, returning %#x\n", hr); + ERR("Failed to create DXGI surface, returning %#.x\n", hr); texture->dxgi_surface = NULL; wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -552,30 +560,10 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi } wined3d_mutex_unlock(); - texture->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(texture->device); + ID3D11Device_AddRef(texture->device = &device->ID3D11Device_iface); - return S_OK; -} - -HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, - const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture2d **texture) -{ - struct d3d_texture2d *object; - HRESULT hr; - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_texture2d_init(object, device, desc, data))) - { - WARN("Failed to initialize texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - TRACE("Created texture %p.\n", object); - *texture = object; + TRACE("Created texture %p.\n", texture); + *out = texture; return S_OK; }

1 0

Józef Kucia : d3d11/tests: Add more tests for state refcounting.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 469366830ba327c713efcb12dac7f7cc597763e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=469366830ba327c713efcb12d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:51 2017 +0200 d3d11/tests: Add more tests for state refcounting. 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/tests/d3d11.c | 73 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 23fbecf..a595bec 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5226,10 +5226,16 @@ static void test_private_data(void) static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) { + ID3D11RasterizerState *rasterizer_state, *tmp_rasterizer_state; ID3D11SamplerState *sampler, *tmp_sampler; + ID3D11ShaderResourceView *srv, *tmp_srv; + ID3D11RenderTargetView *rtv, *tmp_rtv; + D3D11_RASTERIZER_DESC rasterizer_desc; + D3D11_TEXTURE2D_DESC texture_desc; D3D11_SAMPLER_DESC sampler_desc; struct device_desc device_desc; ID3D11DeviceContext *context; + ID3D11Texture2D *texture; ID3D11Device *device; ULONG refcount; HRESULT hr; @@ -5244,18 +5250,12 @@ static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) ID3D11Device_GetImmediateContext(device, &context); + /* ID3D11SamplerState */ + memset(&sampler_desc, 0, sizeof(sampler_desc)); sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP; sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP; - sampler_desc.MipLODBias = 0.0f; - sampler_desc.MaxAnisotropy = 0; - sampler_desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS; - sampler_desc.BorderColor[0] = 0.0f; - sampler_desc.BorderColor[1] = 1.0f; - sampler_desc.BorderColor[2] = 0.0f; - sampler_desc.BorderColor[3] = 1.0f; - sampler_desc.MinLOD = 0.0f; sampler_desc.MaxLOD = FLT_MAX; hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); @@ -5283,6 +5283,63 @@ static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) refcount = ID3D11SamplerState_Release(tmp_sampler); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + /* ID3D11RasterizerState */ + memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.DepthClipEnable = TRUE; + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rasterizer_state); + refcount = ID3D11RasterizerState_Release(rasterizer_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + ID3D11DeviceContext_RSGetState(context, &tmp_rasterizer_state); + ok(tmp_rasterizer_state == rasterizer_state, "Got rasterizer state %p, expected %p.\n", + tmp_rasterizer_state, rasterizer_state); + refcount = ID3D11RasterizerState_Release(tmp_rasterizer_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + /* ID3D11ShaderResourceView */ + memset(&texture_desc, 0, sizeof(texture_desc)); + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + ID3D11Texture2D_Release(texture); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + refcount = ID3D11ShaderResourceView_Release(srv); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + ID3D11DeviceContext_PSGetShaderResources(context, 0, 1, &tmp_srv); + ok(tmp_srv == srv, "Got SRV %p, expected %p.\n", tmp_srv, srv); + refcount = ID3D11ShaderResourceView_Release(tmp_srv); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + /* ID3D11RenderTargetView */ + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D11Texture2D_Release(texture); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + refcount = ID3D11RenderTargetView_Release(rtv); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + ID3D11DeviceContext_OMGetRenderTargets(context, 1, &tmp_rtv, NULL); + ok(tmp_rtv == rtv, "Got RTV %p, expected %p.\n", tmp_rtv, rtv); + refcount = ID3D11RenderTargetView_Release(tmp_rtv); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + ID3D11DeviceContext_Release(context); refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Michael Stefaniuc : dmloader/tests: Add some IDirectMusicLoader directory tests.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: ae600c0b2c5b63d0c32a19f44629c204d1a0fc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae600c0b2c5b63d0c32a19f44… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 27 19:15:30 2017 +0200 dmloader/tests: Add some IDirectMusicLoader directory tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/tests/loader.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 56f8415..6b2ee3a 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -22,6 +22,8 @@ #include "dmusici.h" #include "wine/test.h" +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ @@ -41,6 +43,44 @@ static BOOL missing_dmloader(void) return TRUE; } +static void test_directory(void) +{ + IDirectMusicLoader8 *loader = NULL; + HRESULT hr; + WCHAR con[] = {'c', 'o', 'n'}; + WCHAR path[MAX_PATH]; + WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0}; + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, + (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); + + /* ScanDirectory without a previous SetSearchDirectory isn't failing */ + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + ok(hr == S_FALSE, "ScanDirectory for \"con\" files failed with %#x\n", hr); + + /* SetSearchDirectory with invalid path */ + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, invalid_path, 0); + ok(hr == DMUS_E_LOADER_BADPATH, "SetSearchDirectory failed with %#x\n", hr); + + /* Two consecutive SetSearchDirectory with the same path */ + GetTempPathW(ARRAY_SIZE(path), path); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0); + todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0); + ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0); + ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0); + ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr); + + /* NULL extension is not an error */ + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectSoundWave, NULL, NULL); + ok(hr == S_FALSE, "ScanDirectory for \"wav\" files failed, received %#x\n", hr); + + IDirectMusicLoader_Release(loader); +} + static void test_release_object(void) { HRESULT hr; @@ -295,6 +335,7 @@ START_TEST(loader) CoUninitialize(); return; } + test_directory(); test_release_object(); test_simple_playing(); test_COM();

1 0

Huw Davies : winemac: Try to read the dpi from the user key first.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: d74348f9b5482cabf68f88f9b92983c53b3e9f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74348f9b5482cabf68f88f9b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 27 11:02:34 2017 +0100 winemac: Try to read the dpi from the user key first. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index e110227..a0f4ee9 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -63,37 +63,51 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION device_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; +static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; +static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; static const struct gdi_dc_funcs macdrv_funcs; - /****************************************************************************** - * get_dpi + * get_reg_dword * - * get the dpi from the registry + * Read a DWORD value from the registry */ -static DWORD get_dpi(void) +static BOOL get_reg_dword(HKEY base, const WCHAR *key_name, const WCHAR *value_name, DWORD *value) { - DWORD dpi = 0; - HKEY hkey; + HKEY key; + DWORD type, data, size = sizeof(data); + BOOL ret = FALSE; - if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyW(base, key_name, &key) == ERROR_SUCCESS) { - DWORD type, size, new_dpi; - - size = sizeof(new_dpi); - if (RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS) + if (RegQueryValueExW(key, value_name, NULL, &type, (void *)&data, &size) == ERROR_SUCCESS && + type == REG_DWORD) { - if (type == REG_DWORD && new_dpi != 0) - dpi = new_dpi; + *value = data; + ret = TRUE; } - RegCloseKey(hkey); + RegCloseKey(key); } - return dpi; + return ret; } +/****************************************************************************** + * get_dpi + * + * get the dpi from the registry + */ +static DWORD get_dpi(void) +{ + DWORD dpi; + + if (get_reg_dword(HKEY_CURRENT_USER, dpi_key_name, dpi_value_name, &dpi)) + return dpi; + if (get_reg_dword(HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name, &dpi)) + return dpi; + return 0; +} /*********************************************************************** * compute_desktop_rect

1 0

Huw Davies : winex11: Try to read the dpi from the user key first.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: d645c6ffacd9871b94f1552515e353d47ffc0865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d645c6ffacd9871b94f155251… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 27 11:02:33 2017 +0100 winex11: Try to read the dpi from the user key first. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 7efd603..3929b55 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -42,35 +42,51 @@ static Pixmap stock_bitmap_pixmap; /* phys bitmap for the default stock bitmap static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; -static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; +static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; +static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; static const struct gdi_dc_funcs x11drv_funcs; static const struct gdi_dc_funcs *xrender_funcs; /****************************************************************************** - * get_dpi + * get_reg_dword * - * get the dpi from the registry + * Read a DWORD value from the registry */ -static DWORD get_dpi( void ) +static BOOL get_reg_dword(HKEY base, const WCHAR *key_name, const WCHAR *value_name, DWORD *value) { - DWORD dpi = 96; - HKEY hkey; + HKEY key; + DWORD type, data, size = sizeof(data); + BOOL ret = FALSE; - if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyW(base, key_name, &key) == ERROR_SUCCESS) { - DWORD type, size, new_dpi; - - size = sizeof(new_dpi); - if(RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS) + if (RegQueryValueExW(key, value_name, NULL, &type, (void *)&data, &size) == ERROR_SUCCESS && + type == REG_DWORD) { - if(type == REG_DWORD && new_dpi != 0) - dpi = new_dpi; + *value = data; + ret = TRUE; } - RegCloseKey(hkey); + RegCloseKey(key); } - return dpi; + return ret; +} + +/****************************************************************************** + * get_dpi + * + * get the dpi from the registry + */ +static DWORD get_dpi(void) +{ + DWORD dpi; + + if (get_reg_dword(HKEY_CURRENT_USER, dpi_key_name, dpi_value_name, &dpi)) + return dpi; + if (get_reg_dword(HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name, &dpi)) + return dpi; + return 0; } /********************************************************************** @@ -92,6 +108,9 @@ static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) /* Initialize device caps */ log_pixels_x = log_pixels_y = get_dpi(); + if (!log_pixels_x) + log_pixels_x = log_pixels_y = USER_DEFAULT_SCREEN_DPI; + return TRUE; }

1 0

Józef Kucia : d3d11: Avoid potential double free in d3d11_device_CreateSamplerState().
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: fb807220c4e81ed9989959998c96cba3d2ea2a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb807220c4e81ed9989959998… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:53 2017 +0200 d3d11: Avoid potential double free in d3d11_device_CreateSamplerState(). The parent is owned by the wined3d_sampler object and it is destroyed in the wined3d_object_destroyed() callback. 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/state.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 2b5a2c0..43dd10f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1257,22 +1257,24 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc); wined3d_desc.srgb_decode = TRUE; - if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, - state, &d3d_sampler_wined3d_parent_ops, &state->wined3d_sampler))) + if (wine_rb_put(&device->sampler_states, desc, &state->entry) == -1) { - WARN("Failed to create wined3d sampler, hr %#x.\n", hr); + ERR("Failed to insert sampler state entry.\n"); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); - return hr; + return E_FAIL; } - if (wine_rb_put(&device->sampler_states, desc, &state->entry) == -1) + /* We cannot fail after creating a wined3d_sampler object. It would lead to + * double free. */ + if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, + state, &d3d_sampler_wined3d_parent_ops, &state->wined3d_sampler))) { - ERR("Failed to insert sampler state entry.\n"); - wined3d_sampler_decref(state->wined3d_sampler); + WARN("Failed to create wined3d sampler, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); + wine_rb_remove(&device->sampler_states, &state->entry); wined3d_mutex_unlock(); - return E_FAIL; + return hr; } wined3d_mutex_unlock();

1 0

Józef Kucia : d3d11: Avoid potential double free in d3d11_device_CreateRasterizerState().
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 45263e3196291f55f44f235a0d3172301050b111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45263e3196291f55f44f235a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:52 2017 +0200 d3d11: Avoid potential double free in d3d11_device_CreateRasterizerState(). The parent is owned by the wined3d_rasterizer_state object and it is destroyed in the wined3d_object_destroyed() callback. 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/state.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f10e713..2b5a2c0 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -882,23 +882,26 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d wined3d_private_store_init(&state->private_store); state->desc = *desc; - wined3d_desc.front_ccw = desc->FrontCounterClockwise; - if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, - state, &d3d_rasterizer_state_wined3d_parent_ops, &state->wined3d_state))) + if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) { - WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); + ERR("Failed to insert rasterizer state entry.\n"); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); - return hr; + return E_FAIL; } - if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) + wined3d_desc.front_ccw = desc->FrontCounterClockwise; + + /* We cannot fail after creating a wined3d_rasterizer_state object. It + * would lead to double free. */ + if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, + state, &d3d_rasterizer_state_wined3d_parent_ops, &state->wined3d_state))) { - ERR("Failed to insert rasterizer state entry.\n"); + WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); - wined3d_rasterizer_state_decref(state->wined3d_state); + wine_rb_remove(&device->rasterizer_states, &state->entry); wined3d_mutex_unlock(); - return E_FAIL; + return hr; } wined3d_mutex_unlock();

1 0

Józef Kucia : d3d11: Delay destroying shader resource view until it is no longer referenced.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 668650335d85bc10c107e59caf211128adfabca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668650335d85bc10c107e59ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:49 2017 +0200 d3d11: Delay destroying shader resource view until it is no longer referenced. 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/view.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index cdd380b..f1478ba 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1891,6 +1891,14 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_shader_resource_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1903,12 +1911,13 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -2127,6 +2136,19 @@ static const struct ID3D10ShaderResourceView1Vtbl d3d10_shader_resource_view_vtb d3d10_shader_resource_view_GetDesc1, }; +static void STDMETHODCALLTYPE d3d_shader_resource_view_wined3d_object_destroyed(void *parent) +{ + struct d3d_shader_resource_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_shader_resource_view_wined3d_parent_ops = +{ + d3d_shader_resource_view_wined3d_object_destroyed, +}; + static unsigned int wined3d_view_flags_from_d3d11_bufferex_flags(unsigned int d3d11_flags) { unsigned int wined3d_flags = d3d11_flags & WINED3D_VIEW_BUFFER_RAW; @@ -2267,7 +2289,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi } if (FAILED(hr = wined3d_shader_resource_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_shader_resource_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Delay destroying rasterizer state until it is no longer referenced.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: ed33c53a0cc102bbbee8501d8fcb4a315af9cd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed33c53a0cc102bbbee8501d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:45 2017 +0200 d3d11: Delay destroying rasterizer state until it is no longer referenced. 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/state.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index fa2e668..f10e713 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -649,6 +649,14 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta TRACE("%p increasing refcount to %u.\n", state, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(state->device); + wined3d_mutex_lock(); + wined3d_rasterizer_state_incref(state->wined3d_state); + wined3d_mutex_unlock(); + } + return refcount; } @@ -661,14 +669,13 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device(state->device); + ID3D11Device *device = state->device; + wined3d_mutex_lock(); - wine_rb_remove(&device->rasterizer_states, &state->entry); wined3d_rasterizer_state_decref(state->wined3d_state); - wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); - ID3D11Device_Release(state->device); - HeapFree(GetProcessHeap(), 0, state); + + ID3D11Device_Release(device); } return refcount; @@ -847,6 +854,21 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; +static void STDMETHODCALLTYPE d3d_rasterizer_state_wined3d_object_destroyed(void *parent) +{ + struct d3d_rasterizer_state *state = parent; + struct d3d_device *device = impl_from_ID3D11Device(state->device); + + wine_rb_remove(&device->rasterizer_states, &state->entry); + wined3d_private_store_cleanup(&state->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_rasterizer_state_wined3d_parent_ops = +{ + d3d_rasterizer_state_wined3d_object_destroyed, +}; + HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { @@ -862,7 +884,7 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d wined3d_desc.front_ccw = desc->FrontCounterClockwise; if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, - state, &d3d_null_wined3d_parent_ops, &state->wined3d_state))) + state, &d3d_rasterizer_state_wined3d_parent_ops, &state->wined3d_state))) { WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store);

1 0

Piotr Caban : dwrite: Don' t fail in opentype_get_font_strings_from_id if any of font strings got decoded.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 0925006822412ea8a9f235b76acfdc89b3c0de35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0925006822412ea8a9f235b76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 17:19:49 2017 +0200 dwrite: Don't fail in opentype_get_font_strings_from_id if any of font strings got decoded. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1651729..5f2de23 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1586,8 +1586,10 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP continue; } - if (!(exists = opentype_decode_namerecord(header, storage_area, i, *strings))) + if (!opentype_decode_namerecord(header, storage_area, i, *strings)) continue; + + exists = TRUE; } if (!exists) {

1 0