October 2022 - Wine-commits

Paul Gofman : msvcrt: Display message box in abort() for specific CRT versions only.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: c698ba86d4d9ff07d72a657c29107196fc971530 URL: https://gitlab.winehq.org/wine/wine/-/commit/c698ba86d4d9ff07d72a657c291071… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 20 14:37:02 2022 -0500 msvcrt: Display message box in abort() for specific CRT versions only. --- dlls/msvcrt/exit.c | 5 +++++ dlls/msvcrtd/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 323d205b1bd..6427b15bece 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -51,7 +51,10 @@ static CRITICAL_SECTION MSVCRT_onexit_cs = { &MSVCRT_onexit_cs_debug, -1, 0, 0, extern int MSVCRT_app_type; extern wchar_t *MSVCRT__wpgmptr; +#if _MSVCR_VER > 0 || defined(_DEBUG) static unsigned int MSVCRT_abort_behavior = _WRITE_ABORT_MSG | _CALL_REPORTFAULT; +#endif + static int MSVCRT_error_mode = _OUT_TO_DEFAULT; void (*CDECL _aexit_rtn)(int) = _exit; @@ -250,6 +253,7 @@ void CDECL abort(void) { TRACE("()\n"); +#if (_MSVCR_VER > 0 && _MSVCR_VER < 100) || _MSVCR_VER == 120 || defined(_DEBUG) if (MSVCRT_abort_behavior & _WRITE_ABORT_MSG) { if ((MSVCRT_error_mode == _OUT_TO_MSGBOX) || @@ -260,6 +264,7 @@ void CDECL abort(void) else _cputs("\nabnormal program termination\n"); } +#endif raise(SIGABRT); /* in case raise() returns */ _exit(3); diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index bd4f78729d0..97743e99062 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -D_CRTIMP= -D_DEBUG= MODULE = msvcrtd.dll IMPORTLIB = msvcrtd IMPORTS = ntdll

1 0

Paul Gofman : wbemprox: Fix string length in get_value_bstr().
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 5f42c9e39db998d4464b1916d8edf8132e915b42 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f42c9e39db998d4464b1916d8edf8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 20 19:14:29 2022 -0500 wbemprox: Fix string length in get_value_bstr(). --- dlls/wbemprox/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 34b09bc872f..ab386efa06b 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -178,7 +178,7 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) if (!val) return NULL; len = lstrlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - swprintf( ret, len, L"\"%s\"", (const WCHAR *)(INT_PTR)val ); + swprintf( ret, len + 1, L"\"%s\"", (const WCHAR *)(INT_PTR)val ); return ret; case CIM_SINT16:

1 0

Connor McAdams : uiautomationcore/tests: Ignore UIA_NativeWindowHandlePropertyId in certain tests.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 59589e11964971864dcc17762c5e1c167ae224bb URL: https://gitlab.winehq.org/wine/wine/-/commit/59589e11964971864dcc17762c5e1c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 16 13:09:03 2022 -0400 uiautomationcore/tests: Ignore UIA_NativeWindowHandlePropertyId in certain tests. Windows versions 10v1507 and below classify a provider as an HWND provider if it returns a value for UIA_NativeWindowHandle. By ignoring this property, we get more consistent behavior in tests between all Windows versions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 84 +++++++++++------------------- 1 file changed, 30 insertions(+), 54 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement UiaRegisterProviderCallback.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 329664392e94e937ca788fcfc641a283fac97758 URL: https://gitlab.winehq.org/wine/wine/-/commit/329664392e94e937ca788fcfc641a2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Oct 13 12:45:57 2022 -0400 uiautomationcore: Implement UiaRegisterProviderCallback. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 845 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 149 ++++- dlls/uiautomationcore/uia_main.c | 5 - 3 files changed, 987 insertions(+), 12 deletions(-)

1 0

Brendan Shanks : sechost: Set the name of internal threads.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 8f6b8e97c2e7f01909df3ae77edef33fac026097 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f6b8e97c2e7f01909df3ae77edef3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 26 14:09:34 2022 -0700 sechost: Set the name of internal threads. --- dlls/sechost/service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 1026f2df851..cb5e140b3cf 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1288,6 +1288,8 @@ static DWORD WINAPI notify_thread(void *user) SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; BOOL dummy; + SetThreadDescription(GetCurrentThread(), L"wine_sechost_notify_service_status"); + __TRY { /* GetNotifyResults blocks until there is an event */ @@ -1585,6 +1587,7 @@ static DWORD WINAPI service_thread( void *arg ) DWORD argc = 0, len = 0; TRACE("%p\n", arg); + SetThreadDescription(GetCurrentThread(), L"wine_sechost_service"); while (str[len]) { @@ -2021,6 +2024,8 @@ static DWORD WINAPI device_notify_proc( void *arg ) unsigned int i, size; BYTE *buf; + SetThreadDescription( GetCurrentThread(), L"wine_sechost_device_notify" ); + if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) { ERR("RpcStringBindingCompose() failed, error %#lx\n", err);

1 0

Piotr Caban : msvcrt: Fix _putenv_s return value on error.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 53acb6e736d6feb10b19fd609771ecfa33f7d1e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/53acb6e736d6feb10b19fd609771ec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 21 13:28:23 2022 +0200 msvcrt: Fix _putenv_s return value on error. --- dlls/msvcrt/environ.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 83a493c1a9a..a35d0877891 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -165,17 +165,22 @@ finish: */ errno_t CDECL _putenv_s(const char *name, const char *value) { - int ret; + errno_t ret = 0; TRACE("%s %s\n", debugstr_a(name), debugstr_a(value)); - if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; - if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; + if (!MSVCRT_CHECK_PMT(name != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; - ret = SetEnvironmentVariableA(name, value[0] ? value : NULL) ? 0 : -1; - - /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ - if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + if (!SetEnvironmentVariableA(name, value[0] ? value : NULL)) + { + /* _putenv returns success on deletion of nonexistent variable */ + if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + msvcrt_set_errno(GetLastError()); + ret = *_errno(); + } + } MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);

1 0

Piotr Caban : msvcrt: Fix _wputenv_s return value on error.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: f0e6447b7fc10c21bf6aa04f70a5094f16a294a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e6447b7fc10c21bf6aa04f70a509… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 21 13:30:19 2022 +0200 msvcrt: Fix _wputenv_s return value on error. --- dlls/msvcrt/environ.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index a35d0877891..9800a1b66b1 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -191,19 +191,24 @@ errno_t CDECL _putenv_s(const char *name, const char *value) /********************************************************************* * _wputenv_s (MSVCRT.@) */ -int CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) +errno_t CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) { - int ret; + errno_t ret = 0; TRACE("%s %s\n", debugstr_w(name), debugstr_w(value)); if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; - ret = SetEnvironmentVariableW(name, value[0] ? value : NULL) ? 0 : -1; - - /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ - if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + if (!SetEnvironmentVariableW(name, value[0] ? value : NULL)) + { + /* _putenv returns success on deletion of nonexistent variable */ + if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + msvcrt_set_errno(GetLastError()); + ret = *_errno(); + } + } MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);

1 0

Eric Pouech : dbghelp: Use heap functions for allocation.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: c5f4874e7b4a5a9e9d3d3ff0665ec25b5161ee8a URL: https://gitlab.winehq.org/wine/wine/-/commit/c5f4874e7b4a5a9e9d3d3ff0665ec2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 21 09:58:47 2022 +0200 dbghelp: Use heap functions for allocation. Create a dedicated heap for each module (as it was done for the private home grown pools). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 6 +-- dlls/dbghelp/storage.c | 86 ++---------------------------------------- 2 files changed, 5 insertions(+), 87 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 5e63d949a43..ceb92aabc4f 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -34,13 +34,9 @@ #include "cvconst.h" -/* #define USE_STATS */ - struct pool /* poor's man */ { - struct list arena_list; - struct list arena_full; - size_t arena_size; + HANDLE heap; }; void pool_init(struct pool* a, size_t arena_size) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 48a43e6bc3d..735fb3bce7e 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -25,100 +25,22 @@ #include "wine/debug.h" #include "dbghelp_private.h" -#ifdef USE_STATS -#include <math.h> -#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -struct pool_arena -{ - struct list entry; - char *current; - char *end; -}; - -void pool_init(struct pool* a, size_t arena_size) +void pool_init(struct pool* pool, size_t arena_size) { - list_init( &a->arena_list ); - list_init( &a->arena_full ); - a->arena_size = arena_size; + pool->heap = HeapCreate(HEAP_NO_SERIALIZE, arena_size, 0); } void pool_destroy(struct pool* pool) { - struct pool_arena* arena; - struct pool_arena* next; - -#ifdef USE_STATS - size_t alloc, used, num; - - alloc = used = num = 0; - LIST_FOR_EACH_ENTRY( arena, &pool->arena_list, struct pool_arena, entry ) - { - alloc += arena->end - (char *)arena; - used += arena->current - (char*)arena; - num++; - } - LIST_FOR_EACH_ENTRY( arena, &pool->arena_full, struct pool_arena, entry ) - { - alloc += arena->end - (char *)arena; - used += arena->current - (char*)arena; - num++; - } - if (alloc == 0) alloc = 1; /* avoid division by zero */ - FIXME("STATS: pool %p has allocated %u kbytes, used %u kbytes in %u arenas, non-allocation ratio: %.2f%%\n", - pool, (unsigned)(alloc >> 10), (unsigned)(used >> 10), (unsigned)num, - 100.0 - (float)used / (float)alloc * 100.0); -#endif - - LIST_FOR_EACH_ENTRY_SAFE( arena, next, &pool->arena_list, struct pool_arena, entry ) - { - list_remove( &arena->entry ); - HeapFree(GetProcessHeap(), 0, arena); - } - LIST_FOR_EACH_ENTRY_SAFE( arena, next, &pool->arena_full, struct pool_arena, entry ) - { - list_remove( &arena->entry ); - HeapFree(GetProcessHeap(), 0, arena); - } + HeapDestroy(pool->heap); } void* pool_alloc(struct pool* pool, size_t len) { - struct pool_arena* arena; - void* ret; - size_t size; - - len = (len + 3) & ~3; /* round up size on DWORD boundary */ - - LIST_FOR_EACH_ENTRY( arena, &pool->arena_list, struct pool_arena, entry ) - { - if (arena->end - arena->current >= len) - { - ret = arena->current; - arena->current += len; - if (arena->current + 16 >= arena->end) - { - list_remove( &arena->entry ); - list_add_tail( &pool->arena_full, &arena->entry ); - } - return ret; - } - } - - size = max( pool->arena_size, len ); - arena = HeapAlloc(GetProcessHeap(), 0, size + sizeof(struct pool_arena)); - if (!arena) return NULL; - - ret = arena + 1; - arena->current = (char*)ret + len; - arena->end = (char*)ret + size; - if (arena->current + 16 >= arena->end) - list_add_tail( &pool->arena_full, &arena->entry ); - else - list_add_head( &pool->arena_list, &arena->entry ); - return ret; + return HeapAlloc(pool->heap, 0, len); } char* pool_strdup(struct pool* pool, const char* str)

1 0

Eric Pouech : dbghelp: Realloc array of buckets inside struct vector.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 363f1f49a8eb3072455358e10dbf040e21e806b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/363f1f49a8eb3072455358e10dbf04… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 21 09:58:48 2022 +0200 dbghelp: Realloc array of buckets inside struct vector. Instead of silently leaking no longer used chunks. Be more robust to OOM conditions. Introducing pool_realloc(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/storage.c | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ceb92aabc4f..daf15732877 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -42,6 +42,7 @@ struct pool /* poor's man */ void pool_init(struct pool* a, size_t arena_size) DECLSPEC_HIDDEN; void pool_destroy(struct pool* a) DECLSPEC_HIDDEN; void* pool_alloc(struct pool* a, size_t len) DECLSPEC_HIDDEN; +void* pool_realloc(struct pool* a, void* ptr, size_t len) DECLSPEC_HIDDEN; char* pool_strdup(struct pool* a, const char* str) DECLSPEC_HIDDEN; struct vector diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 735fb3bce7e..daed3aa8d99 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -43,6 +43,11 @@ void* pool_alloc(struct pool* pool, size_t len) return HeapAlloc(pool->heap, 0, len); } +void* pool_realloc(struct pool* pool, void* ptr, size_t len) +{ + return ptr ? HeapReAlloc(pool->heap, 0, ptr, len) : pool_alloc(pool, len); +} + char* pool_strdup(struct pool* pool, const char* str) { char* ret; @@ -90,32 +95,25 @@ void* vector_at(const struct vector* v, unsigned pos) void* vector_add(struct vector* v, struct pool* pool) { - unsigned ncurr = v->num_elts++; - - /* check that we don't wrap around */ - assert(v->num_elts > ncurr); - if (ncurr == (v->num_buckets << v->shift)) + if (v->num_elts == (v->num_buckets << v->shift)) { - if(v->num_buckets == v->buckets_allocated) + if (v->num_buckets == v->buckets_allocated) { /* Double the bucket cache, so it scales well with big vectors.*/ - unsigned new_reserved; + unsigned new_reserved = v->buckets_allocated ? v->buckets_allocated * 2 : 1; void* new; - new_reserved = 2*v->buckets_allocated; - if(new_reserved == 0) new_reserved = 1; - - /* Don't even try to resize memory. - Pool datastructure is very inefficient with reallocs. */ - new = pool_alloc(pool, new_reserved * sizeof(void*)); - memcpy(new, v->buckets, v->buckets_allocated * sizeof(void*)); + new = pool_realloc(pool, v->buckets, new_reserved * sizeof(void*)); + if (!new) return NULL; v->buckets = new; v->buckets_allocated = new_reserved; } v->buckets[v->num_buckets] = pool_alloc(pool, v->elt_size << v->shift); + if (!v->buckets[v->num_buckets]) return NULL; + v->num_elts++; return v->buckets[v->num_buckets++]; } - return vector_at(v, ncurr); + return vector_at(v, v->num_elts++); } /* We construct the sparse array as two vectors (of equal size)

1 0

Hans Leidekker : crypt32: Parse OCSP responder name.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: d393709fe42bf88a14c52a2f0c8779d73d1a6708 URL: https://gitlab.winehq.org/wine/wine/-/commit/d393709fe42bf88a14c52a2f0c8779… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 21 17:45:43 2022 +0200 crypt32: Parse OCSP responder name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53813 --- dlls/crypt32/decode.c | 102 ++++++++++++++++++++++++++++++++++++++++---- dlls/crypt32/tests/encode.c | 86 ++++++++++++++++++++++++++++++++++--- 2 files changed, 174 insertions(+), 14 deletions(-)

1 0