November 2019 - Wine-Commits

Enol Puente : wrc: Add Asturian locale.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 113f49c38eb93f93e64b09c1755968f0585c9acd URL: https://source.winehq.org/git/wine.git/?a=commit;h=113f49c38eb93f93e64b09c1… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:34 2019 -0600 wrc: Add Asturian locale. Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ec3181633b0e5d2d2b66cab711eacc6241c2597a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/winnt.rh | 1 + tools/wrc/po.c | 2 ++ tools/wrc/utils.c | 1 + 3 files changed, 4 insertions(+) diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1d96..59791bc996 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c58c062cbb..5774546dfa 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -239,6 +239,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" }, diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 633ec57d86..1369a1ee71 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -426,6 +426,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 },

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: ec1d0af95c719a16bf9e45b2b05b6d4f10664b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec1d0af95c719a16bf9e45b2… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 15:31:14 2019 +0200 kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57d6c541b93bf82919a9862cd36f038a24e6a80b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/srb.nls | 2 +- dlls/kernel32/nls/srl.nls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 4d1049be44..86642443f7 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "пон" LOCALE_SABBREVDAYNAME2 "уто" LOCALE_SABBREVDAYNAME3 "сре" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index fb6ba8b178..0c4b2f527f 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME3 "sre"

1 0

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

Nov. 25, 2019

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

Vijay Kiran Kamuju : kernel32: Add implementation for CAL_SMONTHDAY.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 5ff99b30a67fe87abf40859c86380059ea726be8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff99b30a67fe87abf40859c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 11:17:24 2019 +0200 kernel32: Add implementation for CAL_SMONTHDAY. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ed363a1fe7ab6fc8c6564de690f387f34bee1dd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/time.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 7807f99a6c..4a4c494b4f 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1067,6 +1067,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME11: case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: + case CAL_SMONTHDAY: case CAL_SYEARMONTH: case CAL_SSHORTESTDAYNAME1: case CAL_SSHORTESTDAYNAME2: @@ -1097,9 +1098,6 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; - case CAL_SMONTHDAY: - FIXME("Unimplemented caltype %d\n", calinfo); - return 0; case CAL_SABBREVERASTRING: FIXME("Unimplemented caltype %d\n", calinfo); return 0;

1 0

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

Nov. 25, 2019

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 Nov. 25, 2019

Nov. 25, 2019

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 : advapi32: Don't read a value that might be uninitialized (Coverity).
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

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

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

Nov. 25, 2019

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

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

Nov. 25, 2019

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

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic).
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 84868a0adb4d5ac8f9bf93878c6ca82943cd790d URL: https://source.winehq.org/git/wine.git/?a=commit;h=84868a0adb4d5ac8f9bf9387… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 11:27:55 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ba7144bfae205b4c8a4cd8442eaf31bfea5dbd0a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/aze.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls index cb8d384a97..bc2db0d0c7 100644 --- a/dlls/kernel32/nls/aze.nls +++ b/dlls/kernel32/nls/aze.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_SMONTHNAME12 "Декабр" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "az-AZ" + LOCALE_SNAME "az-Cyrl-AZ" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME L"\x0410\x0437\x04d9\x0440\x0431\x0430\x0458\x04b9\x0430\x043d" LOCALE_SNATIVECURRNAME "рубль"

1 0