November 2019 - Wine-commits

Andrey Gusev : d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: f990ce86524629dbcb8ad0f74038f1c8c07b10b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f990ce86524629dbcb8ad0f7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 30 22:41:49 2019 +0200 d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42078 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8bf63a4c37e534d02b0eeebf91135d99b8ee4a88) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_43/d3dx11_43.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 76a3916e71..dde8821a30 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) +@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr)

1 0

Jeff Smith : d3drm: Fix reference leak in d3drm_viewport2_Clear().
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 1d787b707b8d52291cba7d788581d0b0d3b6da30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d787b707b8d52291cba7d78… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 1 12:17:29 2019 -0500 d3drm: Fix reference leak in d3drm_viewport2_Clear(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8fb032916d6bfc1d0006392904b9dc5344b8e1a3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5157952d63..987e3896c4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6342,10 +6342,12 @@ static void test_viewport_clear1(void) ret_color = IDirect3DRMFrame_GetSceneBackground(camera1); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMViewport_Clear(viewport1); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f); ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr); @@ -6545,10 +6547,12 @@ static void test_viewport_clear2(void) ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 5c0e24bc42..cabffc512c 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -53,6 +53,7 @@ static HRESULT d3drm_update_background_material(struct d3drm_viewport *viewport) if (FAILED(hr = IDirect3DRMFrame_GetScene(viewport->camera, &root_frame))) return hr; color = IDirect3DRMFrame_GetSceneBackground(root_frame); + IDirect3DRMFrame_Release(root_frame); memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat);

1 0

Sven Baars : comctl32: Always free the tooltip text before setting it (Valgrind).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 8a6f5f958f71924db878a05620f93dfa89b8f99a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a6f5f958f71924db878a056… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 18 18:49:51 2019 +0200 comctl32: Always free the tooltip text before setting it (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2b32bac5cf62d88b6297a054a4306a368ac94a2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tooltips.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 1aa55d12e3..b1e8f5147a 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1660,6 +1660,13 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->rect = ti->rect; toolPtr->hinst = ti->hinst; + if ( (toolPtr->lpszText) && + !IS_INTRESOURCE(toolPtr->lpszText) ) { + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); + toolPtr->lpszText = NULL; + } + if (IS_INTRESOURCE(ti->lpszText)) { TRACE("set string id %x\n", LOWORD(ti->lpszText)); toolPtr->lpszText = ti->lpszText; @@ -1668,12 +1675,6 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) if (ti->lpszText == LPSTR_TEXTCALLBACKW) toolPtr->lpszText = LPSTR_TEXTCALLBACKW; else { - if ( (toolPtr->lpszText) && - !IS_INTRESOURCE(toolPtr->lpszText) ) { - if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) - Free (toolPtr->lpszText); - toolPtr->lpszText = NULL; - } if (ti->lpszText) { if (isW) { INT len = lstrlenW (ti->lpszText);

1 0

Sven Baars : d3dx9: Release the full parameter name when a parameter is released (Valgrind).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 40f829865904c33184bb5e7bd0d2e9b330397033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f829865904c33184bb5e7b… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 25 13:59:49 2019 +0200 d3dx9: Release the full parameter name when a parameter is released (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 63443f249f4dfe748ce3872e74ecf5c1d8aa55d9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 33197de9bd..8bc9ba8f5e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -592,6 +592,9 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil HeapFree(GetProcessHeap(), 0, param->members); } + if (param->full_name) + heap_free(param->full_name); + free_parameter_data(param, child); /* only the parent has to release name and semantic */

1 0

Sven Baars : d3dx9: Always free samplers (Valgrind).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 026af56dbab78fc7fae7e825beca06136bcbcb0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=026af56dbab78fc7fae7e825… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 25 13:59:50 2019 +0200 d3dx9: Always free samplers (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7dc42119b40ad39165d881dd8d0e410d3e84fe5a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8bc9ba8f5e..5ebc0c261d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -530,6 +530,7 @@ static void free_sampler(struct d3dx_sampler *sampler) free_state(&sampler->states[i]); } HeapFree(GetProcessHeap(), 0, sampler->states); + HeapFree(GetProcessHeap(), 0, sampler); } static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param); @@ -562,7 +563,7 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) case D3DXPT_SAMPLER3D: case D3DXPT_SAMPLERCUBE: free_sampler((struct d3dx_sampler *)param->data); - break; + return; default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type));

1 0

Sven Baars : shell32: Fix a use after free (Coverity).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 9b2afce2b77853cdd2c663cc639448083553272c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b2afce2b77853cdd2c663cc… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 28 23:51:04 2019 +0200 shell32: Fix a use after free (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e6ce281d30e6a63fb5c84e0b9df72c35476e63f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shellitem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index fc95e7c227..b9e4903a97 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1289,9 +1289,11 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, ppsiItemArray); - heap_free(array); if(SUCCEEDED(ret)) + { + heap_free(array); return ret; + } } /* Something failed, clean up. */

1 0

Alistair Leslie-Hughes : dinput: Ensure buffer doesn't overflow (Coverity).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 39f5c0ff2b1e87329202ba430a2772edc2fa1665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f5c0ff2b1e87329202ba43… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 16 06:50:02 2019 +0000 dinput: Ensure buffer doesn't overflow (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 55edfc8837a26ced87964014c6e62e1be7dcc5e3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 2 +- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0b2ee1a1fe..935b3aead6 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -659,7 +659,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; snprintf(pdidi->tszInstanceName, MAX_PATH, "Joystick %d", index); - strcpy(pdidi->tszProductName, This->name); + lstrcpynA(pdidi->tszProductName, This->name, MAX_PATH); if (pdidi->dwSize > sizeof(DIDEVICEINSTANCE_DX3A)) { pdidi->guidFFDriver = GUID_NULL; pdidi->wUsagePage = 0; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b4c38fa377..b86821a4d6 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -391,8 +391,8 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->guidInstance = lpddiW.guidInstance; lpddi->guidProduct = lpddiW.guidProduct; lpddi->dwDevType = lpddiW.dwDevType; - strcpy(lpddi->tszInstanceName, joydevs[id].name); - strcpy(lpddi->tszProductName, joydevs[id].name); + lstrcpynA(lpddi->tszInstanceName, joydevs[id].name, MAX_PATH); + lstrcpynA(lpddi->tszProductName, joydevs[id].name, MAX_PATH); lpddi->guidFFDriver = lpddiW.guidFFDriver; lpddi->wUsagePage = lpddiW.wUsagePage; lpddi->wUsage = lpddiW.wUsage;

1 0

Alistair Leslie-Hughes : advapi32: Don't read a value that might be uninitialized (Coverity).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: be4553a8074499b7ea586f84132056921ff6bf67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4553a8074499b7ea586f84… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 17 06:28:43 2019 +0000 advapi32: Don't read a value that might be uninitialized (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1b714ca0886aed265f85f6a661e3058f9f7c56a1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 14604e010e..bb5c6d32ed 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2097,7 +2097,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret; @@ -2193,7 +2193,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD dwFlags, LPDWORD pdwType, PVOID pvData, LPDWORD pcbData ) { - DWORD dwType, cbData = pcbData ? *pcbData : 0; + DWORD dwType, cbData = (pvData && pcbData) ? *pcbData : 0; PVOID pvBuf = NULL; LONG ret;

1 0

Ken Thomases : winemac: Fix failure to render OpenGL on macOS 10.14 (Mojave).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: add7aa1a3c2028ba59944d4dd0c5d458f7e11115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=add7aa1a3c2028ba59944d4d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 7 13:57:22 2019 -0600 winemac: Fix failure to render OpenGL on macOS 10.14 (Mojave). For programs linked against the macOS 10.14 SDK, Mojave makes all view hierarchies layer-backed. For views to which OpenGL contexts have been attached this caused a regression where they sometimes failed to render and just remain black. Updating the OpenGL context after the framework has assigned a layer to our view works around the problem. Thanks to Elviss Strazdins on Stack Overflow for the solution <https://stackoverflow.com/a/52938517/1312143>. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 654b27823d6b1aa23ca22290cb1d88194cb980d4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e405cda2d2..f43b26b8e3 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -747,6 +747,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super willRemoveSubview:subview]; } + - (void) setLayer:(CALayer*)newLayer + { + [super setLayer:newLayer]; + [self updateGLContexts]; + } + /* * ---------- NSTextInputClient methods ---------- */

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name in Tatar locale.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 83b75de9c5ad67e58e90cc5b83eacf2eadbe495f URL: https://source.winehq.org/git/wine.git/?a=commit;h=83b75de9c5ad67e58e90cc5b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 10:59:16 2019 +0200 kernel/nls: Fix country name in Tatar locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c45bfc7da6a1ff5bea1cfe5372c5eeacf6e0edb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/ttt.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls index 43b6fe54fd..86236d91e3 100644 --- a/dlls/kernel32/nls/ttt.nls +++ b/dlls/kernel32/nls/ttt.nls @@ -102,7 +102,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SENGLANGUAGE "Tatar" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "RUR" - LOCALE_SISO3166CTRYNAME "TA" + LOCALE_SISO3166CTRYNAME "RU" LOCALE_SISO639LANGNAME "tt" LOCALE_SLANGUAGE "Tatar" LOCALE_SLIST ";" @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SMONTHNAME12 "Декабрь" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "tt-TA" + LOCALE_SNAME "tt-RU" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Татарстан" LOCALE_SNATIVECURRNAME "рубль"

1 0