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

Jason Millard : oleaut32: Fix VarAbs function for BSTR with positive values.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 5dec0c134d12913b035837848e92c9217176d87d URL: https://gitlab.winehq.org/wine/wine/-/commit/5dec0c134d12913b035837848e92c9… Author: Jason Millard <jsm174(a)gmail.com> Date: Tue Feb 14 13:22:56 2023 -0500 oleaut32: Fix VarAbs function for BSTR with positive values. (cherry picked from commit 72b86f967e0282be60b3507194ba01a7e1cf66b5) --- dlls/oleaut32/tests/vartest.c | 8 ++++++++ dlls/oleaut32/variant.c | 4 +--- dlls/vbscript/tests/api.vbs | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4e9c892e37e..d31df67d084 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3145,6 +3145,14 @@ static void test_VarAbs(void) hres = pVarAbs(&v,&vDst); ok(hres == S_OK && V_VT(&vDst) == VT_R8 && V_R8(&vDst) == 1.1, "VarAbs: expected 0x0,%d,%g, got 0x%lX,%d,%g\n", VT_R8, 1.1, hres, V_VT(&vDst), V_R8(&vDst)); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"30000"); + memset(&vDst,0,sizeof(vDst)); + hres = pVarAbs(&v,&vDst); + ok(hres == S_OK && V_VT(&vDst) == VT_R8 && V_R8(&vDst) == 30000.0, + "VarAbs: expected 0x0,%d,%g, got 0x%lX,%d,%g\n", VT_R8, 30000.0, hres, V_VT(&vDst), V_R8(&vDst)); + SysFreeString(V_BSTR(&v)); } static HRESULT (WINAPI *pVarNot)(LPVARIANT,LPVARIANT); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bbfc1b2d952..8c2aa3b729d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4329,7 +4329,6 @@ VarOr_Exit: */ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) { - VARIANT varIn; HRESULT hRet = S_OK; VARIANT temp; @@ -4373,11 +4372,10 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) if (V_R4(pVarOut) < 0.0) V_R4(pVarOut) = -V_R4(pVarOut); break; case VT_BSTR: - hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(&varIn)); + hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(pVarOut)); if (FAILED(hRet)) break; V_VT(pVarOut) = VT_R8; - pVarIn = &varIn; /* Fall through ... */ case VT_DATE: case VT_R8: diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 903593ebd60..5c7b1ecabee 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1646,6 +1646,7 @@ Call ok(Abs(True) = 1, "Abs(True) = " & Abs(True)) Call ok(getVT(Abs(True)) = "VT_I2", "getVT(Abs(True)) = " & getVT(Abs(True))) Call ok(Abs(CByte(1)) = 1, "Abs(CByte(1)) = " & Abs(CByte(1))) Call ok(getVT(Abs(CByte(1))) = "VT_UI1", "getVT(Abs(CByte(1))) = " & getVT(Abs(CByte(1)))) +Call ok(Abs("30000") = 30000, "Abs(""30000"") = " & Abs("30000")) Sub testAbsError(strings, error_num1, error_num2) on error resume next

1 0

Piotr Caban : msvcrt: Improve error handling in getenv_s.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 07d01fdeba65d032a9d6dc95199528a690264d6f URL: https://gitlab.winehq.org/wine/wine/-/commit/07d01fdeba65d032a9d6dc95199528… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 15 13:35:14 2023 +0100 msvcrt: Improve error handling in getenv_s. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54486 (cherry picked from commit b7a586771b96cd38e4afb727fefcab3a9deef3c5) --- dlls/msvcrt/environ.c | 41 ++++++++++++++++++++++------------------- dlls/msvcrt/tests/environ.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index a2626a85c30..39a2f6b4e09 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -25,15 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/********************************************************************* - * getenv (MSVCRT.@) - */ -char * CDECL getenv(const char *name) +static char * getenv_helper(const char *name) { char **env; size_t len; - if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + if (!name) return NULL; len = strlen(name); for (env = MSVCRT__environ; *env; env++) @@ -49,6 +46,16 @@ char * CDECL getenv(const char *name) return NULL; } +/********************************************************************* + * getenv (MSVCRT.@) + */ +char * CDECL getenv(const char *name) +{ + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + + return getenv_helper(name); +} + /********************************************************************* * _wgetenv (MSVCRT.@) */ @@ -278,24 +285,20 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements, /****************************************************************** * getenv_s (MSVCRT.@) */ -int CDECL getenv_s(size_t *pReturnValue, char* buffer, size_t numberOfElements, const char *varname) +int CDECL getenv_s(size_t *ret_len, char* buffer, size_t len, const char *varname) { char *e; - if (!MSVCRT_CHECK_PMT(pReturnValue != NULL)) return EINVAL; - if (!MSVCRT_CHECK_PMT(!(buffer == NULL && numberOfElements > 0))) return EINVAL; - if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(ret_len != NULL)) return EINVAL; + *ret_len = 0; + if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; + if (buffer) buffer[0] = 0; + + if (!(e = getenv_helper(varname))) return 0; + *ret_len = strlen(e) + 1; + if (!len) return 0; + if (len < *ret_len) return ERANGE; - if (!(e = getenv(varname))) - { - *pReturnValue = 0; - return *_errno() = EINVAL; - } - *pReturnValue = strlen(e) + 1; - if (numberOfElements < *pReturnValue) - { - return *_errno() = ERANGE; - } strcpy(buffer, e); return 0; } diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 03129dcbf14..3d6b55dffa8 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -50,6 +50,7 @@ static void (__cdecl *p_get_environ)(char ***); static void (__cdecl *p_get_wenviron)(WCHAR ***); static errno_t (__cdecl *p_putenv_s)(const char*, const char*); static errno_t (__cdecl *p_wputenv_s)(const wchar_t*, const wchar_t*); +static errno_t (__cdecl *p_getenv_s)(size_t*, char*, size_t, const char*); static char ***p_environ; static WCHAR ***p_wenviron; @@ -66,6 +67,7 @@ static void init(void) p_get_wenviron = (void *)GetProcAddress(hmod, "_get_wenviron"); p_putenv_s = (void *)GetProcAddress(hmod, "_putenv_s"); p_wputenv_s = (void *)GetProcAddress(hmod, "_wputenv_s"); + p_getenv_s = (void *)GetProcAddress(hmod, "getenv_s"); } static void test_system(void) @@ -242,11 +244,20 @@ static void test__wenviron(void) static void test_environment_manipulation(void) { + char buf[256]; errno_t ret; + size_t len; ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); ok( strcmp(getenv("cat"), "dog") == 0, "getenv did not return 'dog'\n" ); + if (p_getenv_s) + { + ret = p_getenv_s(&len, buf, sizeof(buf), "cat"); + ok( !ret, "getenv_s returned %d\n", ret ); + ok( len == 4, "getenv_s returned length is %Id\n", len); + ok( !strcmp(buf, "dog"), "getenv_s did not return 'dog'\n"); + } ok( _putenv("cat=") == 0, "failed deleting cat\n" ); ok( _putenv("=") == -1, "should not accept '=' as input\n" ); @@ -282,6 +293,27 @@ static void test_environment_manipulation(void) ret = p_wputenv_s(L"cat", L""); ok( !ret, "_wputenv_s returned %d\n", ret); } + + if (p_getenv_s) + { + buf[0] = 'x'; + len = 1; + errno = 0xdeadbeef; + ret = p_getenv_s(&len, buf, sizeof(buf), "nonexistent"); + ok( !ret, "_getenv_s returned %d\n", ret); + ok( !len, "getenv_s returned length is %Id\n", len); + ok( !buf[0], "buf = %s\n", buf); + ok( errno == 0xdeadbeef, "errno = %d\n", errno); + + buf[0] = 'x'; + len = 1; + errno = 0xdeadbeef; + ret = p_getenv_s(&len, buf, sizeof(buf), NULL); + ok( !ret, "_getenv_s returned %d\n", ret); + ok( !len, "getenv_s returned length is %Id\n", len); + ok( !buf[0], "buf = %s\n", buf); + ok( errno == 0xdeadbeef, "errno = %d\n", errno); + } } START_TEST(environ)

1 0

Piotr Caban : msvcrt: Improve error handling in _wgetenv_s.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 18448aa290a84638c9dc6585a6a3dd626c4afce2 URL: https://gitlab.winehq.org/wine/wine/-/commit/18448aa290a84638c9dc6585a6a3dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 15 13:35:48 2023 +0100 msvcrt: Improve error handling in _wgetenv_s. (cherry picked from commit 667d889d3a33bae635b6a63b356fa8485a83e6d2) --- dlls/msvcrt/environ.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 39a2f6b4e09..729eb0560bd 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -56,15 +56,12 @@ char * CDECL getenv(const char *name) return getenv_helper(name); } -/********************************************************************* - * _wgetenv (MSVCRT.@) - */ -wchar_t * CDECL _wgetenv(const wchar_t *name) +static wchar_t * wgetenv_helper(const wchar_t *name) { wchar_t **env; size_t len; - if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + if (!name) return NULL; len = wcslen(name); /* Initialize the _wenviron array if it's not already created. */ @@ -84,6 +81,16 @@ wchar_t * CDECL _wgetenv(const wchar_t *name) return NULL; } +/********************************************************************* + * _wgetenv (MSVCRT.@) + */ +wchar_t * CDECL _wgetenv(const wchar_t *name) +{ + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + + return wgetenv_helper(name); +} + /********************************************************************* * _putenv (MSVCRT.@) */ @@ -306,25 +313,21 @@ int CDECL getenv_s(size_t *ret_len, char* buffer, size_t len, const char *varnam /****************************************************************** * _wgetenv_s (MSVCRT.@) */ -int CDECL _wgetenv_s(size_t *pReturnValue, wchar_t *buffer, size_t numberOfElements, +int CDECL _wgetenv_s(size_t *ret_len, wchar_t *buffer, size_t len, const wchar_t *varname) { wchar_t *e; - if (!MSVCRT_CHECK_PMT(pReturnValue != NULL)) return EINVAL; - if (!MSVCRT_CHECK_PMT(!(buffer == NULL && numberOfElements > 0))) return EINVAL; - if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(ret_len != NULL)) return EINVAL; + *ret_len = 0; + if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; + if (buffer) buffer[0] = 0; + + if (!(e = wgetenv_helper(varname))) return 0; + *ret_len = wcslen(e) + 1; + if (!len) return 0; + if (len < *ret_len) return ERANGE; - if (!(e = _wgetenv(varname))) - { - *pReturnValue = 0; - return *_errno() = EINVAL; - } - *pReturnValue = wcslen(e) + 1; - if (numberOfElements < *pReturnValue) - { - return *_errno() = ERANGE; - } wcscpy(buffer, e); return 0; }

1 0

Jacek Caban : oleaut32: Remove overflow check for VT_R4 and VT_R8 in VarAbs.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 873e41ba1aea526ea8a3afb82abd98a5b2a7416e URL: https://gitlab.winehq.org/wine/wine/-/commit/873e41ba1aea526ea8a3afb82abd98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 14 16:56:40 2023 +0100 oleaut32: Remove overflow check for VT_R4 and VT_R8 in VarAbs. (cherry picked from commit 23f0df42016011535f19ffff40f0a0393a8e6cd8) --- dlls/oleaut32/tests/vartest.c | 2 ++ dlls/oleaut32/variant.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index cdbb836b041..4e9c892e37e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3121,6 +3121,8 @@ static void test_VarAbs(void) VARABS(R4,-1,R4,1); VARABS(R8,1,R8,1); VARABS(R8,-1,R8,1); + VARABS(R4,1.40129846432481707e-45,R4,1.40129846432481707e-45); + VARABS(R8,4.94065645841246544e-324,R8,4.94065645841246544e-324); VARABS(DATE,1,DATE,1); VARABS(DATE,-1,DATE,1); V_VT(&v) = VT_CY; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 885082cc659..bbfc1b2d952 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4369,7 +4369,9 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) case VT_INT: ABS_CASE(I4,I4_MIN); ABS_CASE(I8,I8_MIN); - ABS_CASE(R4,R4_MIN); + case VT_R4: + if (V_R4(pVarOut) < 0.0) V_R4(pVarOut) = -V_R4(pVarOut); + break; case VT_BSTR: hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(&varIn)); if (FAILED(hRet)) @@ -4378,7 +4380,9 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) pVarIn = &varIn; /* Fall through ... */ case VT_DATE: - ABS_CASE(R8,R8_MIN); + case VT_R8: + if (V_R8(pVarOut) < 0.0) V_R8(pVarOut) = -V_R8(pVarOut); + break; case VT_CY: hRet = VarCyAbs(V_CY(pVarIn), & V_CY(pVarOut)); break;

1 0

Jason Millard : vbscript: Fix memory leak in owned safearray iterator.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: a6d75af391592b75d8f25ff95baef6ee31284d79 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6d75af391592b75d8f25ff95baef6… Author: Jason Millard <jsm174(a)gmail.com> Date: Thu Feb 9 13:11:56 2023 -0500 vbscript: Fix memory leak in owned safearray iterator. (cherry picked from commit a8c319cad691a53cfd333ab72dbbeac4558f7c75) --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/utils.c | 9 +++++++-- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b3be3bea6cf..12b7af4aef9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1480,7 +1480,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) case VT_VARIANT|VT_ARRAY|VT_BYREF: { IEnumVARIANT *iter; - hres = create_safearray_iter(V_ISBYREF(v.v) ? *V_ARRAYREF(v.v) : V_ARRAY(v.v), &iter); + hres = create_safearray_iter(V_ISBYREF(v.v) ? *V_ARRAYREF(v.v) : V_ARRAY(v.v), v.owned && !V_ISBYREF(v.v), &iter); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c index 03b1abde481..4bfc2c65a0a 100644 --- a/dlls/vbscript/utils.c +++ b/dlls/vbscript/utils.c @@ -28,6 +28,7 @@ typedef struct { LONG ref; SAFEARRAY *sa; + BOOL owned; ULONG i, size; } safearray_iter; @@ -75,8 +76,11 @@ static ULONG WINAPI safearray_iter_IEnumVARIANT_Release(IEnumVARIANT *iface) TRACE("(%p) ref=%ld\n", iface, ref); if(!ref) { - if(This->sa) + if(This->sa) { SafeArrayUnlock(This->sa); + if(This->owned) + SafeArrayDestroy(This->sa); + } free(This); } @@ -160,7 +164,7 @@ static ULONG get_safearray_size(SAFEARRAY *sa) return ret; } -HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) { safearray_iter *iter; HRESULT hres; @@ -185,6 +189,7 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) iter->IEnumVARIANT_iface.lpVtbl = &safearray_iter_EnumVARIANTVtbl; iter->ref = 1; iter->sa = sa; + iter->owned = owned; iter->i = 0; iter->size = get_safearray_size(sa); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 8286b37bbab..dca8fb5061a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -404,7 +404,7 @@ BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN; void map_vbs_exception(EXCEPINFO *) DECLSPEC_HIDDEN; -HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN; +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) DECLSPEC_HIDDEN; #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code)

1 0

Jason Millard : vbscript: Fix memory leak in Split().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: ba3d20f779fb15c3950d7f3b6bf061d695cf1954 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba3d20f779fb15c3950d7f3b6bf061… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 8 13:06:08 2023 -0500 vbscript: Fix memory leak in Split(). (cherry picked from commit a6847dd9fb3d9ce876e59e776b2a17f6b26bdf3f) --- dlls/vbscript/interp.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 12b7af4aef9..eb1dcab5f01 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1375,24 +1375,31 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) if(array == NULL || array->cDims == 0) { /* can initially allocate the array */ array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); - VariantClear(v); - V_VT(v) = VT_ARRAY|VT_VARIANT; - V_ARRAY(v) = array; - return S_OK; + if(!array) + hres = E_OUTOFMEMORY; + else { + VariantClear(v); + V_VT(v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(v) = array; + } } else if(array->cDims != dim_cnt) { /* can't otherwise change the number of dimensions */ TRACE("Can't resize %s, cDims %d != %d\n", debugstr_w(identifier), array->cDims, dim_cnt); - return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + hres = MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); } else { /* can resize the last dimensions (if others match */ for(i = 0; i+1 < dim_cnt; ++i) { if(array->rgsabound[array->cDims - 1 - i].cElements != bounds[i].cElements) { TRACE("Can't resize %s, bound[%d] %ld != %ld\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements); - return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + hres = MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + break; } } - return SafeArrayRedim(array, &bounds[dim_cnt-1]); + if(SUCCEEDED(hres)) + hres = SafeArrayRedim(array, &bounds[dim_cnt-1]); } + free(bounds); + return hres; } static HRESULT interp_step(exec_ctx_t *ctx)

1 0

Jason Millard : vbscript: Fix memory leak in Split().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 53d7327c047a9e05eb736111989592f1bd792d46 URL: https://gitlab.winehq.org/wine/wine/-/commit/53d7327c047a9e05eb736111989592… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 8 11:06:24 2023 -0500 vbscript: Fix memory leak in Split(). (cherry picked from commit f8b76d3da549f8f08a0413de438f929702a380af) --- dlls/vbscript/global.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9eac80218fd..af87e4dfb14 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2572,12 +2572,12 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR str, string, delimiter = NULL; + BSTR string, delimiter = NULL; int count, max, mode, len, start, end, ret, delimiterlen = 1; int i, *indices = NULL, *new_indices, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; - VARIANT *data, var; + VARIANT *data; HRESULT hres = S_OK; TRACE("%s %u...\n", debugstr_variant(args), args_cnt); @@ -2685,19 +2685,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, start = 0; for (i = 0; i < count; i++) { - str = SysAllocStringLen(string + start, indices[i] - start); - if (!str) { + V_VT(&data[i]) = VT_BSTR; + V_BSTR(&data[i]) = SysAllocStringLen(string + start, indices[i] - start); + + if (!V_BSTR(&data[i])) { hres = E_OUTOFMEMORY; break; } - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = str; - - hres = VariantCopyInd(data+i, &var); - if(FAILED(hres)) { - SafeArrayUnaccessData(sa); - goto error; - } start = indices[i]+delimiterlen; } SafeArrayUnaccessData(sa);

1 0

Piotr Caban : msvcrt: Don't crash on NULL argument in getenv.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 8d2a7f6b64d68229f826a11caaa1f9e76afe5249 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d2a7f6b64d68229f826a11caaa1f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 15 13:37:52 2023 +0100 msvcrt: Don't crash on NULL argument in getenv. (cherry picked from commit 86fb5c7ba639de2cd0357fa2e259971494a9cc13) --- dlls/msvcrt/environ.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index e541bd5bff0..145f7d0640f 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -26,18 +26,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************* - * getenv (MSVCRT.@) + * getenv (MSVCRT.@) */ char * CDECL getenv(const char *name) { char **env; - unsigned int length=strlen(name); + size_t len; + + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + len = strlen(name); for (env = MSVCRT__environ; *env; env++) { char *str = *env; char *pos = strchr(str,'='); - if (pos && ((pos - str) == length) && !_strnicmp(str,name,length)) + if (pos && ((pos - str) == len) && !_strnicmp(str, name, len)) { TRACE("(%s): got %s\n", debugstr_a(name), debugstr_a(pos + 1)); return pos + 1;

1 0

Piotr Caban : msvcrt: Don't crash on NULL argument in _wgetenv.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 93f99fba05d7775f4975a562ad50a7de22617f2b URL: https://gitlab.winehq.org/wine/wine/-/commit/93f99fba05d7775f4975a562ad50a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 15 13:38:38 2023 +0100 msvcrt: Don't crash on NULL argument in _wgetenv. (cherry picked from commit d812af3f12434a4671f1aa98fcc5fb11ffa9826b) --- dlls/msvcrt/environ.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 145f7d0640f..a2626a85c30 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -50,12 +50,15 @@ char * CDECL getenv(const char *name) } /********************************************************************* - * _wgetenv (MSVCRT.@) + * _wgetenv (MSVCRT.@) */ wchar_t * CDECL _wgetenv(const wchar_t *name) { wchar_t **env; - unsigned int length=wcslen(name); + size_t len; + + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + len = wcslen(name); /* Initialize the _wenviron array if it's not already created. */ if (!MSVCRT__wenviron) @@ -65,7 +68,7 @@ wchar_t * CDECL _wgetenv(const wchar_t *name) { wchar_t *str = *env; wchar_t *pos = wcschr(str,'='); - if (pos && ((pos - str) == length) && !_wcsnicmp(str,name,length)) + if (pos && ((pos - str) == len) && !_wcsnicmp(str, name, len)) { TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1)); return pos + 1;

1 0

Jinoh Kang : riched20: Obtain the composition start index after deleting selection.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 676d15ad15396f6bdbdf3d87b18793f87c001ec6 URL: https://gitlab.winehq.org/wine/wine/-/commit/676d15ad15396f6bdbdf3d87b18793… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jan 24 01:08:10 2023 +0900 riched20: Obtain the composition start index after deleting selection. Today, the Rich Edit control handles the WM_IME_STARTCOMPOSITION message by the computing the composition start position (imeStartIndex) _before_ calling ME_DeleteSelection(), which shifts the character positions after the range of deletion. If the selection were not empty, imeStartIndex immediately becomes stale, since it does not take into account the number of deleted characters before it. Fix this by computing imeStartIndex after the ME_DeleteSelection() call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54318 (cherry picked from commit 8c43577f0f9b4422d3641457c595c3998bd54a18) --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 57601745ab2..7b4f4b3cdf3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4099,8 +4099,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0;

1 0