August 2018 - Wine-commits - list.winehq.org

Józef Kucia : d3d12/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM swapchain.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: be3b3ad3ad117a5a4d23dcdc508a21e19d774c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3b3ad3ad117a5a4d23dcdc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 13:50:25 2018 +0200 d3d12/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM swapchain. 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/d3d12/tests/d3d12.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 2e2e69b..7b610c0 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -47,6 +47,7 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_R10G10B10A2_UNORM: return 4; default: trace("Unhandled format %#x.\n", format); @@ -832,10 +833,12 @@ static void test_swapchain_draw(void) } tests[] = { - {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, - {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, - {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, - {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R10G10B10A2_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xc00003ff}, + {DXGI_FORMAT_R10G10B10A2_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xc00ffc00}, }; desc.no_pipeline = TRUE;

1 0

Józef Kucia : dxgi: Return actual swap effect for D3D11 swapchains.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 25c3d9938a8acdb10ad537c7559cd112e654ea66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25c3d9938a8acdb10ad537c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 13:50:26 2018 +0200 dxgi: Return actual swap effect for D3D11 swapchains. 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/dxgi/swapchain.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 6eda235..f8e4f80 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -37,6 +37,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DECLARE_DEBUG_CHANNEL(winediag); +static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect swap_effect) +{ + switch (swap_effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return DXGI_SWAP_EFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return DXGI_SWAP_EFFECT_SEQUENTIAL; + case WINED3D_SWAP_EFFECT_FLIP_DISCARD: + return DXGI_SWAP_EFFECT_FLIP_DISCARD; + case WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL: + return DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; + default: + FIXME("Invalid swap effect %#x.\n", swap_effect); + return DXGI_SWAP_EFFECT_DISCARD; + } +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -297,7 +315,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring ScanlineOrdering, Scaling and SwapEffect.\n"); + FIXME("Ignoring ScanlineOrdering and Scaling.\n"); desc->BufferDesc.Width = wined3d_desc.backbuffer_width; desc->BufferDesc.Height = wined3d_desc.backbuffer_height; @@ -312,7 +330,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; - desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); return S_OK; @@ -457,7 +475,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring Stereo, Scaling, SwapEffect and AlphaMode.\n"); + FIXME("Ignoring Stereo, Scaling and AlphaMode.\n"); desc->Width = wined3d_desc.backbuffer_width; desc->Height = wined3d_desc.backbuffer_height; @@ -468,7 +486,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); desc->BufferCount = wined3d_desc.backbuffer_count; desc->Scaling = DXGI_SCALING_STRETCH; - desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); desc->AlphaMode = DXGI_ALPHA_MODE_IGNORE; desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags);

1 0

Józef Kucia : wined3d: Move formats from gl_info to wined3d_adapter.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 5080d3c1c1e6ae05d549c13adcb666b9abc3d3e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5080d3c1c1e6ae05d549c13a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:54:49 2018 +0200 wined3d: Move formats from gl_info to wined3d_adapter. 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/directx.c | 5 +- dlls/wined3d/texture.c | 1 - dlls/wined3d/utils.c | 236 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 6 +- 4 files changed, 127 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5080d3c1c1e6ae05d549…

1 0

Józef Kucia : wined3d: Use get_format_internal() in apply_format_fixups().
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: a301ba64d52e7e26c6e4d4cb1f7ffaed71490398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a301ba64d52e7e26c6e4d4cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:54:50 2018 +0200 wined3d: Use get_format_internal() in apply_format_fixups(). 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/utils.c | 198 +++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a301ba64d52e7e26c6e4…

1 0

Józef Kucia : wined3d: Use get_format_internal() in init_format_filter_info().
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 6edf38c205a6f5db369bf24a7edd4623ee6e32f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6edf38c205a6f5db369bf24a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:54:51 2018 +0200 wined3d: Use get_format_internal() in init_format_filter_info(). 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/utils.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5720cab..d75cbc1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3330,7 +3330,7 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, { enum wined3d_pci_vendor vendor = adapter->driver_info.vendor; struct wined3d_format *format; - unsigned int fmt_idx, i; + unsigned int i; static const enum wined3d_format_id fmts16[] = { WINED3DFMT_R16_FLOAT, @@ -3339,8 +3339,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, }; BOOL filtered; + /* This was already handled by init_format_texture_info(). */ if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) - /* This was already handled by init_format_texture_info(). */ return; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -3367,8 +3367,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, { for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { - fmt_idx = get_format_idx(fmts16[i]); - format_set_flag(&adapter->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); + format = get_format_internal(adapter, fmts16[i]); + format_set_flag(format, WINED3DFMT_FLAG_FILTERING); } } return; @@ -3376,19 +3376,19 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { - fmt_idx = get_format_idx(fmts16[i]); - format = &adapter->formats[fmt_idx]; - if (!format->glInternal) continue; /* Not supported by GL */ + format = get_format_internal(adapter, fmts16[i]); + if (!format->glInternal) + continue; /* Not supported by GL */ - filtered = check_filter(gl_info, adapter->formats[fmt_idx].glInternal); + filtered = check_filter(gl_info, format->glInternal); if (filtered) { - TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i])); + TRACE("Format %s supports filtering.\n", debug_d3dformat(format->id)); format_set_flag(format, WINED3DFMT_FLAG_FILTERING); } else { - TRACE("Format %s does not support filtering\n", debug_d3dformat(fmts16[i])); + TRACE("Format %s does not support filtering.\n", debug_d3dformat(format->id)); } } }

1 0

Piotr Caban : jsproxy: Fix parameters validation in InternetInitializeAutoProxyDll.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 36649d083f6c85ecb5d2d79023893d1c8be93e51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36649d083f6c85ecb5d2d790… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 29 15:59:48 2018 +0200 jsproxy: Fix parameters validation in InternetInitializeAutoProxyDll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 11 +++-------- dlls/jsproxy/tests/jsproxy.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index d1ac903..26f43c5 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -179,20 +179,15 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer) { - DWORD i, len = 0; - for (i = 0; i < buffer->dwScriptBufferSize; i++) - { - if (!buffer->lpszScriptBuffer[i]) break; - len++; - } - if (len == buffer->dwScriptBufferSize) + if (!buffer->dwScriptBufferSize) { SetLastError( ERROR_INVALID_PARAMETER ); LeaveCriticalSection( &cs_jsproxy ); return FALSE; } heap_free( global_script->text ); - if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, len ))) ret = TRUE; + if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, + buffer->dwScriptBufferSize ))) ret = TRUE; } else { diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c index 67a2988..d1c905c 100644 --- a/dlls/jsproxy/tests/jsproxy.c +++ b/dlls/jsproxy/tests/jsproxy.c @@ -24,6 +24,8 @@ #include "wine/test.h" +static BOOL old_jsproxy; + static BOOL (WINAPI *pInternetInitializeAutoProxyDll) (DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, AUTO_PROXY_SCRIPT_BUFFER *); static BOOL (WINAPI *pInternetDeInitializeAutoProxyDll)(LPSTR, DWORD); @@ -34,6 +36,7 @@ static void test_InternetInitializeAutoProxyDll(void) const char url[] = "http://localhost"; char script[] = "function FindProxyForURL(url, host) {return \"DIRECT\";}\0test"; char script2[] = "function FindProxyForURL(url, host) {return \"PROXY 10.0.0.1:8080\";}\0test"; + char script3[] = "function FindProxyForURL(url, host) {return \"DIRECT\";}"; char *proxy, host[] = "localhost"; AUTO_PROXY_SCRIPT_BUFFER buf; DWORD err, len; @@ -76,6 +79,16 @@ static void test_InternetInitializeAutoProxyDll(void) ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); GlobalFree( proxy ); + buf.lpszScriptBuffer = script3; + buf.dwScriptBufferSize = strlen(script3); + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret || broken(old_jsproxy && !ret), "got %u\n", GetLastError() ); + + buf.dwScriptBufferSize = 1; + script3[0] = 0; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); ok( ret, "got %u\n", GetLastError() ); } @@ -150,6 +163,10 @@ START_TEST(jsproxy) return; } + old_jsproxy = !GetProcAddress( module, "InternetGetProxyInfoEx" ); + if (old_jsproxy) + trace( "InternetGetProxyInfoEx not available\n" ); + test_InternetInitializeAutoProxyDll(); test_InternetGetProxyInfo(); }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Don' t crash when there's another AutoComplete object on the same edit control.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 9c2217216cbf9a56a5090c848119d84fac9b65ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c2217216cbf9a56a5090c84… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 27 20:10:46 2018 +0300 shell32/autocomplete: Don't crash when there's another AutoComplete object on the same edit control. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22333 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 99ce23d..cf8da50 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,14 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static void destroy_autocomplete_object(IAutoCompleteImpl *ac) +{ + ac->hwndEdit = NULL; + if (ac->hwndListBox) + DestroyWindow(ac->hwndListBox); + IAutoComplete2_Release(&ac->IAutoComplete2_iface); +} + /* Window procedure for autocompletion */ @@ -276,10 +284,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, RemovePropW(hwnd, autocomplete_propertyW); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)proc); - This->hwndEdit = NULL; - if (This->hwndListBox) - DestroyWindow(This->hwndListBox); - IAutoComplete2_Release(&This->IAutoComplete2_iface); + destroy_autocomplete_object(This); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } default: @@ -434,7 +439,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) { - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + IAutoCompleteImpl *prev, *This = impl_from_IAutoComplete2(iface); TRACE("(%p)->(%p, %p, %s, %s)\n", This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -461,10 +466,22 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->initialized = TRUE; This->hwndEdit = hwndEdit; - This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - /* Keep at least one reference to the object until the edit window is destroyed. */ + + /* If another AutoComplete object was previously assigned to this edit control, + release it but keep the same callback on the control, to avoid an infinite + recursive loop in ACEditSubclassProc while the property is set to this object */ + prev = GetPropW(hwndEdit, autocomplete_propertyW); + SetPropW(hwndEdit, autocomplete_propertyW, This); + + if (prev && prev->initialized) { + This->wpOrigEditProc = prev->wpOrigEditProc; + destroy_autocomplete_object(prev); + } + else + This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); + + /* Keep at least one reference to the object until the edit window is destroyed */ IAutoComplete2_AddRef(&This->IAutoComplete2_iface); - SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) create_listbox(This);

1 0

Gabriel Ivăncescu : shell32/tests: Add a test for binding a different AutoComplete object to the same edit control.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 6f3e83f7fc66fa3a66a0acdc990aaab572a8d283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3e83f7fc66fa3a66a0acdc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 27 20:10:47 2018 +0300 shell32/tests: Add a test for binding a different AutoComplete object to the same edit control. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 1c51e51..3c8de88 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -141,7 +141,7 @@ if (0) static IAutoComplete *test_init(void) { HRESULT r; - IAutoComplete *ac; + IAutoComplete *ac, *ac2; IUnknown *acSource; LONG_PTR user_data; @@ -176,6 +176,15 @@ static IAutoComplete *test_init(void) user_data = GetWindowLongPtrA(hEdit, GWLP_USERDATA); ok(user_data == 0, "Expected the edit control user data to be zero\n"); + /* bind a different object to the same edit control */ + r = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, + &IID_IAutoComplete, (LPVOID*)&ac2); + ok(r == S_OK, "no IID_IAutoComplete (0x%08x)\n", r); + + r = IAutoComplete_Init(ac2, hEdit, acSource, NULL, NULL); + ok(r == S_OK, "Init returned 0x%08x\n", r); + IAutoComplete_Release(ac2); + IUnknown_Release(acSource); return ac;

1 0

Józef Kucia : winevulkan: Wrap VkCommandPools.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 6f8d02b0f3099651928afd609dc4ed3fc84d7a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8d02b0f3099651928afd60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 12:22:31 2018 +0200 winevulkan: Wrap VkCommandPools. We need to wrap VkCommandPools to track allocated VkCommandBuffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 50 +++++++++++++++-------------- dlls/winevulkan/vulkan.c | 68 +++++++++++++++++++++++++++++++++------- dlls/winevulkan/vulkan_private.h | 15 +++++++++ dlls/winevulkan/vulkan_thunks.c | 18 ++--------- dlls/winevulkan/vulkan_thunks.h | 2 ++ 5 files changed, 103 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f8d02b0f3099651928a…

1 0

Józef Kucia : winevulkan: Fix potential memory leaks when a command pool is destroyed.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 079d2ec40d0587a886390585408a172c0a8a7b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=079d2ec40d0587a886390585… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 12:22:32 2018 +0200 winevulkan: Fix potential memory leaks when a command pool is destroyed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 22 ++++++++++++++++++---- dlls/winevulkan/vulkan_private.h | 5 +++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 886ef0b..f500602 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -165,6 +165,7 @@ static void wine_vk_free_command_buffers(struct VkDevice_T *device, continue; device->funcs.p_vkFreeCommandBuffers(device->device, pool->command_pool, 1, &buffers[i]->command_buffer); + list_remove(&buffers[i]->pool_link); heap_free(buffers[i]); } } @@ -528,9 +529,8 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, allocate_info_host.level = allocate_info->level; allocate_info_host.commandBufferCount = 1; - TRACE("Creating command buffer %u, pool 0x%s, level %#x\n", i, - wine_dbgstr_longlong(allocate_info_host.commandPool), - allocate_info_host.level); + TRACE("Allocating command buffer %u from pool 0x%s.\n", + i, wine_dbgstr_longlong(allocate_info_host.commandPool)); if (!(buffers[i] = heap_alloc_zero(sizeof(**buffers)))) { @@ -544,9 +544,11 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, &allocate_info_host, &buffers[i]->command_buffer); if (res != VK_SUCCESS) { - ERR("Failed to allocate command buffer, res=%d\n", res); + ERR("Failed to allocate command buffer, res=%d.\n", res); break; } + + list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); } if (res != VK_SUCCESS) @@ -1132,6 +1134,8 @@ VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCre if (!(object = heap_alloc_zero(sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; + list_init(&object->command_buffers); + res = device->funcs.p_vkCreateCommandPool(device->device, info, NULL, &object->command_pool); if (res == VK_SUCCESS) @@ -1146,6 +1150,7 @@ void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const VkAllocationCallbacks *allocator) { struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(handle); + struct VkCommandBuffer_T *buffer, *cursor; TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(handle), allocator); @@ -1155,6 +1160,15 @@ void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); + /* The Vulkan spec says: + * + * "When a pool is destroyed, all command buffers allocated from the pool are freed." + */ + LIST_FOR_EACH_ENTRY_SAFE(buffer, cursor, &pool->command_buffers, struct VkCommandBuffer_T, pool_link) + { + heap_free(buffer); + } + device->funcs.p_vkDestroyCommandPool(device->device, pool->command_pool, NULL); heap_free(pool); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index f31d4d5..17072d2 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -27,6 +27,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" #define VK_NO_PROTOTYPES #include "wine/vulkan.h" #include "wine/vulkan_driver.h" @@ -62,6 +63,8 @@ struct VkCommandBuffer_T struct wine_vk_base base; struct VkDevice_T *device; /* parent */ VkCommandBuffer command_buffer; /* native command buffer */ + + struct list pool_link; }; struct VkDevice_T @@ -113,6 +116,8 @@ struct VkQueue_T struct wine_cmd_pool { VkCommandPool command_pool; + + struct list command_buffers; }; static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool handle)

1 0