May 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Don't output thread traces to the seh channel.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: e85dee1fb789407cfcb3026e3a3d7d01153da902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e85dee1fb789407cfcb3026e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 14:28:13 2021 +0200 ntdll: Don't output thread traces to the seh channel. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 193a7b2274e..a2b9569a7b9 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -69,7 +69,8 @@ #include "wine/exception.h" #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DEFAULT_DEBUG_CHANNEL(thread); +WINE_DECLARE_DEBUG_CHANNEL(seh); #ifndef PTHREAD_STACK_MIN #define PTHREAD_STACK_MIN 16384 @@ -443,12 +444,12 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (first_chance) call_user_exception_dispatcher( rec, context, pKiUserExceptionDispatcher ); if (rec->ExceptionFlags & EH_STACK_INVALID) - ERR("Exception frame is not in stack limits => unable to dispatch exception.\n"); + ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) - ERR("Process attempted to continue execution after noncontinuable exception.\n"); + ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); else - ERR("Unhandled exception code %x flags %x addr %p\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); + ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); return STATUS_SUCCESS;

1 0

Qian Hong : atl: Implement AtlAxDialogBox().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: f987d8ac3b6bf2fb027196162985477c8daf27d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f987d8ac3b6bf2fb02719616… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat May 1 21:47:55 2021 -0500 atl: Implement AtlAxDialogBox(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32749 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 69d42f55813..fe70d0a3229 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1404,22 +1404,52 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) * AtlAxDialogBoxW [atl100.35] * */ -INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE instance, const WCHAR *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + HRSRC resource; + HGLOBAL global; + DLGTEMPLATE *template; + INT_PTR ret; + + TRACE("instance %p, name %s, owner %p, proc %p, param %#Ix\n", + instance, debugstr_w(name), owner, proc, param); + + if (!(resource = FindResourceW(instance, name, (const WCHAR *)RT_DIALOG))) + return 0; + + if (!(global = LoadResource(instance, resource))) + return 0; + + if (!(template = AX_ConvertDialogTemplate(LockResource(global)))) + return 0; + + ret = DialogBoxIndirectParamW(instance, template, owner, proc, param); + HeapFree(GetProcessHeap(), 0, template); + return ret; } /*********************************************************************** * AtlAxDialogBoxA [atl100.36] * */ -INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE instance, const char *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + WCHAR *nameW; + int len; + INT_PTR ret; + + if (IS_INTRESOURCE(name)) + return AtlAxDialogBoxW(instance, (const WCHAR *)name, owner, proc, param); + + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + if (!(nameW = malloc(len * sizeof(WCHAR)))) + return 0; + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + ret = AtlAxDialogBoxW(instance, nameW, owner, proc, param); + free(nameW); + return ret; } /***********************************************************************

1 0

Zebediah Figura : include: Introduce winetest_push_context() and winetest_pop_context().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: af39a1b0bce0622ed8df0e64f9c794380eb30c45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af39a1b0bce0622ed8df0e64… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 25 15:09:32 2021 -0500 include: Introduce winetest_push_context() and winetest_pop_context(). Based on vkd3d's vkd3d_test_set_context(), but adding support for a stack of context prefixes, to more easily accomodate tests with nested loops. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 25a3222664b..f2aacaff592 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -96,6 +96,9 @@ extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __WINE_PRINTF extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +extern void __winetest_cdecl winetest_push_context( const char *fmt, ... ) __WINE_PRINTF_ATTR(1, 2); +extern void winetest_pop_context(void); + #ifdef WINETEST_NO_LINE_NUMBERS # define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest # define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions @@ -246,6 +249,8 @@ struct tls_data int todo_do_loop; char *str_pos; /* position in debug buffer */ char strings[2000]; /* buffer for debug strings */ + char context[8][128]; /* data to print before messages */ + unsigned int context_count; /* number of context prefixes */ }; static DWORD tls_index; @@ -298,8 +303,11 @@ const char *winetest_elapsed(void) static void winetest_vprintf( const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); + unsigned int i; printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); + for (i = 0; i < data->context_count; ++i) + printf( "%s: ", data->context[i] ); vprintf( msg, args ); } @@ -484,6 +492,29 @@ void winetest_end_todo(void) data->todo_level >>= 1; } +void __winetest_cdecl winetest_push_context( const char *fmt, ... ) +{ + struct tls_data *data = get_tls_data(); + __winetest_va_list valist; + + if (data->context_count < ARRAY_SIZE(data->context)) + { + __winetest_va_start(valist, fmt); + vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); + __winetest_va_end(valist); + data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; + } + ++data->context_count; +} + +void winetest_pop_context(void) +{ + struct tls_data *data = get_tls_data(); + + if (data->context_count) + --data->context_count; +} + int winetest_get_mainargs( char*** pargv ) { *pargv = winetest_argv;

1 0

Arkadiusz Hiler : msvcrt/tests: Add CREATE_SUSPENDED test for _beginthreadex().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: d3ba02f35c08a879be5aeaf59fd010209098a073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ba02f35c08a879be5aeaf5… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue May 4 14:49:36 2021 +0300 msvcrt/tests: Add CREATE_SUSPENDED test for _beginthreadex(). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index e262983e7e6..b38915596df 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -587,6 +587,19 @@ static void test_thread_handle_close(void) ok(ret, "ret = %d\n", ret); } +static void test_thread_suspended(void) +{ + HANDLE hThread; + DWORD ret; + + hThread = (HANDLE)_beginthreadex(NULL, 0, test_thread_func_ex, NULL, CREATE_SUSPENDED, NULL); + ok(hThread != NULL, "_beginthreadex failed (%d)\n", errno); + ret = ResumeThread(hThread); + ok(ret == 1, "suspend count = %d\n", ret); + ret = WaitForSingleObject(hThread, 200); + ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret); +} + static int __cdecl _lfind_s_comp(void *ctx, const void *l, const void *r) { *(int *)ctx = 0xdeadc0de; @@ -684,5 +697,6 @@ START_TEST(misc) test_qsort_s(); test_math_functions(); test_thread_handle_close(); + test_thread_suspended(); test__lfind_s(); }

1 0

Arkadiusz Hiler : msvcrt: Remove return after _endthread().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: a4af8bb0506e679bcf215af6905784f917881c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4af8bb0506e679bcf215af6… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue May 4 14:49:35 2021 +0300 msvcrt: Remove return after _endthread(). Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 650afdc08af..c2fc863dd33 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -103,7 +103,6 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) local_trampoline.start_address(local_trampoline.arglist); _endthread(); - return 0; } /*********************************************************************

1 0

Nikolay Sivov : mfplat: Trace I8 propvariant values.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: f4aae6255b26899cbf443c18391eec5e5808c63c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4aae6255b26899cbf443c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 4 13:22:03 2021 +0300 mfplat: Trace I8 propvariant values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 8c968fe6fba..117907bb1a9 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -132,6 +132,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {VT_UI4: %d}", v, v->ulVal); case VT_UI8: return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); + case VT_I8: + return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); case VT_CLSID:

1 0

Jan Sikorski : wined3d: Make sure scissor offsets are not negative.
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: ef7b2180cf55651035a8251abb2e5669346a7e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7b2180cf55651035a8251a… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue May 4 12:43:56 2021 +0200 wined3d: Make sure scissor offsets are not negative. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fbc1e294fcd..83b1d081514 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2204,6 +2204,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->scissor.extent.width = key->viewport.width; key->scissor.extent.height = key->viewport.height; } + /* Scissor offsets need to be non-negative (VUID-VkPipelineViewportStateCreateInfo-x-02821) */ + if (key->scissor.offset.x < 0) + key->scissor.offset.x = 0; + if (key->scissor.offset.y < 0) + key->scissor.offset.y = 0; key->viewport.y += key->viewport.height; key->viewport.height = -key->viewport.height;

1 0

Alexandre Julliard : dnsapi/tests: Avoid wcsncpy().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: 60da2f877d89ba833f2f05e9404e6b298e43e52c URL: https://source.winehq.org/git/wine.git/?a=commit;h=60da2f877d89ba833f2f05e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 21:18:43 2021 +0200 dnsapi/tests: Avoid wcsncpy(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/tests/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index d68e9383204..bee3353e1b9 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -75,7 +75,7 @@ static void test_DnsQuery(void) trace("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); - wcsncpy(name, rec->Data.Srv.pNameTarget, ARRAY_SIZE(name)); + lstrcpynW(name, rec->Data.Srv.pNameTarget, ARRAY_SIZE(name)); DnsRecordListFree(rec, DnsFreeRecordList); /* IPv4 */

1 0

Alexandre Julliard : mmdevapi: Avoid wcsncpy().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: c45d792de31b9f685d20340dfce4cfa327dc04fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c45d792de31b9f685d20340d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 21:10:20 2021 +0200 mmdevapi: Avoid wcsncpy(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 15270e76d61..9cc0aad6105 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -404,8 +404,7 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev } else if (!memcmp(path, MMDEV_PATH_PREFIX, sizeof(MMDEV_PATH_PREFIX) - sizeof(WCHAR))) { WCHAR device_id[56]; /* == strlen("{0.0.1.00000000}.{fd47d9cc-4218-4135-9ce2-0c195c87405b}") + 1 */ - wcsncpy(device_id, path + (ARRAY_SIZE(MMDEV_PATH_PREFIX) - 1), ARRAY_SIZE(device_id)); - device_id[ARRAY_SIZE(device_id) - 1] = 0; + lstrcpynW(device_id, path + (ARRAY_SIZE(MMDEV_PATH_PREFIX) - 1), ARRAY_SIZE(device_id)); hr = IMMDeviceEnumerator_GetDevice(devenum, device_id, mmdev); } else {

1 0

Alexandre Julliard : amstream: Avoid wcsncpy().
by Alexandre Julliard May 4, 2021

May 4, 2021

Module: wine Branch: master Commit: af34af7bac879ee4b832bf4e24d395ec8b980c92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af34af7bac879ee4b832bf4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 21:10:02 2021 +0200 amstream: Avoid wcsncpy(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 081e6b29ed5..91a9ef4bb8a 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -517,7 +517,7 @@ static HRESULT WINAPI filter_JoinFilterGraph(IMediaStreamFilter *iface, EnterCriticalSection(&filter->cs); if (name) - wcsncpy(filter->name, name, ARRAY_SIZE(filter->name)); + lstrcpynW(filter->name, name, ARRAY_SIZE(filter->name)); else filter->name[0] = 0; filter->graph = graph;

1 0