December 2021 - Wine-Commits

Esme Povirk : dwrite: Avoid calling memcpy with NULL source.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 412b36e45a7d086747b6ef42b9b9b0e432ac4d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=412b36e45a7d086747b6ef42… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Dec 11 14:04:26 2021 -0600 dwrite: Avoid calling memcpy with NULL source. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52187 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7112ca71932..8ecfad5f3a5 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -868,7 +868,8 @@ static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 pos *buff = malloc(length * sizeof(WCHAR)); if (!*buff) return E_OUTOFMEMORY; - memcpy(*buff, *text, len*sizeof(WCHAR)); + if (*text) + memcpy(*buff, *text, len*sizeof(WCHAR)); read = len; while (read < length && *text) { @@ -880,6 +881,8 @@ static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 pos free(*buff); return hr; } + if (!*text) + break; memcpy(*buff + read, *text, min(len, length-read)*sizeof(WCHAR)); read += len; } @@ -1009,7 +1012,8 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeLineBreakpoints(IDWriteTextAnaly if (!(buff = calloc(length, sizeof(*buff)))) return E_OUTOFMEMORY; - memcpy(buff, text, len*sizeof(WCHAR)); + if (text) + memcpy(buff, text, len*sizeof(WCHAR)); read = len; while (read < length && text) { @@ -1018,6 +1022,8 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeLineBreakpoints(IDWriteTextAnaly hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, &text, &len); if (FAILED(hr)) goto done; + if (!text) + break; memcpy(&buff[read], text, min(len, length-read)*sizeof(WCHAR)); read += len; }

1 0

Hans Leidekker : configure: Check for libldap instead of libldap_r.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 11b15054e74e3af62e4e851c272071dfd8c23775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11b15054e74e3af62e4e851c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 13 11:24:02 2021 +0100 configure: Check for libldap instead of libldap_r. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52140 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 20 ++++++++++---------- configure.ac | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index d57fc6cf43b..88c0c612444 100755 --- a/configure +++ b/configure @@ -20212,7 +20212,7 @@ then : fi fi -LDAP_LIBS=${LDAP_LIBS:-"-lldap_r -llber"} +LDAP_LIBS=${LDAP_LIBS:-"-lldap -llber"} printf "%s\n" "$as_me:${as_lineno-$LINENO}: openldap cflags: $LDAP_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: openldap libs: $LDAP_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS @@ -20236,14 +20236,14 @@ fi " if test "x$ac_cv_type_LDAPSortKey" = xyes then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap_r" >&5 -printf %s "checking for ldap_initialize in -lldap_r... " >&6; } -if test ${ac_cv_lib_ldap_r_ldap_initialize+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5 +printf %s "checking for ldap_initialize in -lldap... " >&6; } +if test ${ac_cv_lib_ldap_ldap_initialize+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap_r $PTHREAD_LIBS $LDAP_LIBS $LIBS" +LIBS="-lldap $PTHREAD_LIBS $LDAP_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20261,17 +20261,17 @@ return ldap_initialize (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_ldap_r_ldap_initialize=yes + ac_cv_lib_ldap_ldap_initialize=yes else $as_nop - ac_cv_lib_ldap_r_ldap_initialize=no + ac_cv_lib_ldap_ldap_initialize=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_r_ldap_initialize" >&5 -printf "%s\n" "$ac_cv_lib_ldap_r_ldap_initialize" >&6; } -if test "x$ac_cv_lib_ldap_r_ldap_initialize" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5 +printf "%s\n" "$ac_cv_lib_ldap_ldap_initialize" >&6; } +if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ber_init in -llber" >&5 printf %s "checking for ber_init in -llber... " >&6; } diff --git a/configure.ac b/configure.ac index de79b47ea2a..c1eb2f99a8c 100644 --- a/configure.ac +++ b/configure.ac @@ -2017,12 +2017,12 @@ dnl **** Check for OpenLDAP *** if test "x$with_ldap" != "xno" then dnl Actually there's no pkg-config support for ldap, but this way we can still override the flags - WINE_PACKAGE_FLAGS(LDAP,[openldap],[-lldap_r -llber],,, + WINE_PACKAGE_FLAGS(LDAP,[openldap],[-lldap -llber],,, [AC_CHECK_HEADERS([ldap.h lber.h]) if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" then AC_CHECK_TYPE(LDAPSortKey, - [AC_CHECK_LIB(ldap_r, ldap_initialize, + [AC_CHECK_LIB(ldap, ldap_initialize, [AC_CHECK_LIB(lber, ber_init, [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment])], [LDAP_LIBS=""],

1 0

Piotr Caban : concrt140/tests: Fix race in _Timer tests.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: a4f86cbf3d1887869758621da7789bb08a046252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4f86cbf3d1887869758621d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 13 16:56:06 2021 +0100 concrt140/tests: Fix race in _Timer tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/tests/concrt140.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/concrt140/tests/concrt140.c b/dlls/concrt140/tests/concrt140.c index a6cfe4a809a..55b200c6c78 100644 --- a/dlls/concrt140/tests/concrt140.c +++ b/dlls/concrt140/tests/concrt140.c @@ -190,6 +190,7 @@ static void test_Timer(void) call_func1(p__Timer__Stop, &timer); ok(!timer.timer, "timer != NULL\n"); call_func1(p__Timer_dtor, &timer); + ResetEvent(callback_called); call_func3(p__Timer_ctor, &timer, 1, FALSE); timer.vtable = vtable;

1 0

Alistair Leslie-Hughes : dbghelp: Fix use after free.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: e19b18dd8249c7b35c6a275e9e4223763607100b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19b18dd8249c7b35c6a275e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 9 07:33:58 2021 +1100 dbghelp: Fix use after free. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 5614c575cd0..def7b799d73 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1058,7 +1058,6 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) if (!pcs) return FALSE; module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); if (!module) return FALSE; - if (!module_remove(pcs, module)) return FALSE; /* remove local scope if defined inside this module */ if (pcs->localscope_pc >= module->module.BaseOfImage && pcs->localscope_pc < module->module.BaseOfImage + module->module.ImageSize) @@ -1066,6 +1065,7 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) pcs->localscope_pc = 0; pcs->localscope_symt = NULL; } + module_remove(pcs, module); return TRUE; }

1 0

Esme Povirk : dwrite: Account for position != 0 in fetch loops.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: fad8d49606adf1ff1d9aa658ef56fbe1f0034c56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fad8d49606adf1ff1d9aa658… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Dec 11 14:04:28 2021 -0600 dwrite: Account for position != 0 in fetch loops. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 92a02f8d3aa..13ccf8e4434 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -875,7 +875,7 @@ static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 pos while (read < length && *text) { *text = NULL; len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, text, &len); + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position+read, text, &len); if (FAILED(hr)) { free(*buff); @@ -1019,7 +1019,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeLineBreakpoints(IDWriteTextAnaly while (read < length && text) { text = NULL; len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, &text, &len); + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position+read, &text, &len); if (FAILED(hr)) goto done; if (!text)

1 0

Alex Henrie : comctl32/tests: Permit larger propsheet buffers.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 56a6a039180053dac12305a3aecae3c77b3119ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=56a6a039180053dac12305a3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 12 19:04:10 2021 -0700 comctl32/tests: Permit larger propsheet buffers. Fixes a testbot failure on Windows 10 Hebrew. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 6cc29a8b6f1..b4696112500 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -92,7 +92,8 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) size = SizeofResource(module, hrsrc); ok(size != 0, "Failed to get size of propsheet dialog resource\n"); buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); - ok(buffer_size == 2 * size, "Unexpected template buffer size %u, resource size %u\n", + /* Hebrew Windows 10 allocates 2 * size + 8, all others allocate 2 * size */ + ok(buffer_size >= 2 * size, "Unexpected template buffer size %u, resource size %u\n", buffer_size, size); break; }

1 0

Esme Povirk : dwrite: Fix possible use of uninitialized memory.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 07fd82cdbddc03da2095882fa4fdaf7928c90fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=07fd82cdbddc03da2095882f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Dec 11 14:04:27 2021 -0600 dwrite: Fix possible use of uninitialized memory. If the text source returns fewer than length character, part of the buffer will be uninitialized. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8ecfad5f3a5..92a02f8d3aa 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -865,7 +865,7 @@ static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 pos if (len < length) { UINT32 read; - *buff = malloc(length * sizeof(WCHAR)); + *buff = calloc(length, sizeof(WCHAR)); if (!*buff) return E_OUTOFMEMORY; if (*text)

1 0

Alexandre Julliard : ntdll/tests: Mark a failing test as todo.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 40d706caba24a3a3de8ec4d5c80f9866fc8415de URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d706caba24a3a3de8ec4d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 12 15:41:02 2021 +0100 ntdll/tests: Mark a failing test as todo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51380 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index dd4f4a35344..1a7993c75de 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1231,7 +1231,7 @@ static void test_debugger(DWORD cont_status) __asm__( "movw %%ss,%0" : "=r" (ss) ); ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss ); ok( ctx.SegFs != ctx.SegSs, "wrong fs %04x / %04x\n", ctx.SegFs, ctx.SegSs ); - if (is_wow64) + if (is_wow64) todo_wine { ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs ); ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs );

1 0

Piotr Caban : msvcrt: Fix _strtime implementation in Hindi locale.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 2f2891e5d59dcec5810ca6809eb857bcfc29aae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2891e5d59dcec5810ca680… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 13 17:19:14 2021 +0100 msvcrt: Fix _strtime implementation in Hindi locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index c246c9a42fd..fb91aa2b1ec 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -611,7 +611,18 @@ int CDECL _wstrdate_s(wchar_t* date, size_t size) */ char* CDECL _strtime(char* time) { - GetTimeFormatA(LOCALE_NEUTRAL, 0, NULL, "HH':'mm':'ss", time, 9); + SYSTEMTIME st; + + GetLocalTime(&st); + time[0] = '0' + st.wHour / 10; + time[1] = '0' + st.wHour % 10; + time[2] = ':'; + time[3] = '0' + st.wMinute / 10; + time[4] = '0' + st.wMinute % 10; + time[5] = ':'; + time[6] = '0' + st.wSecond / 10; + time[7] = '0' + st.wSecond % 10; + time[8] = 0; return time; }

1 0

Piotr Caban : msvcrt: Fix _strdate implementation in Hindi locale.
by Alexandre Julliard Dec. 13, 2021

Dec. 13, 2021

Module: wine Branch: master Commit: 0e9431b809fd12d1055baa99bee07a02af2d7a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9431b809fd12d1055baa99… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 13 17:19:10 2021 +0100 msvcrt: Fix _strdate implementation in Hindi locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 9abd1f5555b..c246c9a42fd 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -538,7 +538,18 @@ struct tm* CDECL _gmtime32(const __time32_t* secs) */ char* CDECL _strdate(char* date) { - GetDateFormatA(LOCALE_NEUTRAL, 0, NULL, "MM'/'dd'/'yy", date, 9); + SYSTEMTIME st; + + GetLocalTime(&st); + date[0] = '0' + st.wMonth / 10; + date[1] = '0' + st.wMonth % 10; + date[2] = '/'; + date[3] = '0' + st.wDay / 10; + date[4] = '0' + st.wDay % 10; + date[5] = '/'; + date[6] = '0' + st.wYear / 10 % 10; + date[7] = '0' + st.wYear % 10; + date[8] = 0; return date; }

1 0