March 2024 - Wine-Commits - list.winehq.org

Noah Berner : advapi32/tests: Add todo_wine to tests that are currently failing.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 898892d5f04c47c8c47add3ebb9462ba31349c75 URL: https://gitlab.winehq.org/wine/wine/-/commit/898892d5f04c47c8c47add3ebb9462… Author: Noah Berner <noah(a)berner.io> Date: Thu Mar 14 12:05:39 2024 +0100 advapi32/tests: Add todo_wine to tests that are currently failing. --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e2823fea63a..2669c13748b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8502,12 +8502,12 @@ static void test_elevation(void) type = TokenElevationTypeLimited; ret = SetTokenInformation(token, TokenElevationType, &type, sizeof(type)); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); elevation.TokenIsElevated = FALSE; ret = SetTokenInformation(token, TokenElevation, &elevation, sizeof(elevation)); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); } else {

1 0

Dmitry Timoshkov : comctl32/tests: Add more tests for IImageList2 interface.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: fedcd4bb0e3c4d77f581caee7a06f8ec603c2b30 URL: https://gitlab.winehq.org/wine/wine/-/commit/fedcd4bb0e3c4d77f581caee7a06f8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 14 13:45:17 2024 +0300 comctl32/tests: Add more tests for IImageList2 interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/imagelist.c | 47 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 8033a33e9cd..6caea741df8 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1672,6 +1672,8 @@ static void test_iimagelist(void) HIMAGELIST himl; HRESULT hr; ULONG ret; + HBITMAP hbm; + int ret2; if (!pHIMAGELIST_QueryInterface) { @@ -1741,7 +1743,50 @@ static void test_iimagelist(void) win_skip("IImageList2 is not supported.\n"); return; } - ok(hr == S_OK, "got 0x%08lx\n", hr); + + hr = IImageList2_Initialize(imagelist, BMP_CX, BMP_CX, ILC_COLOR24, 1, 1); + todo_wine + ok(hr == S_OK, "got %#lx\n", hr); + if (hr != S_OK) return; + + check_iml_data((HIMAGELIST)imagelist, BMP_CX, BMP_CX, 0, 2, 1, ILC_COLOR24, "IImageList2 0"); + + hr = IImageList2_Remove(imagelist, 0); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + hr = IImageList2_Remove(imagelist, -1); + ok(hr == S_OK, "got %#lx\n", hr); + + hbm = CreateBitmap(BMP_CX, BMP_CX, 1, 1, NULL); + + ret2 = -1; + hr = IImageList2_Add(imagelist, hbm, 0, &ret2); + ok(hr == S_OK, "got %#lx\n", hr); + ok(ret2 == 0, "got %d\n", ret2); + + check_iml_data((HIMAGELIST)imagelist, BMP_CX, BMP_CX, 1, 2, 4, ILC_COLOR24, "IImageList2 1"); + + ret2 = -1; + hr = IImageList2_Add(imagelist, hbm, 0, &ret2); + ok(hr == S_OK, "got %#lx\n", hr); + ok(ret2 == 1, "got %d\n", ret2); + + check_iml_data((HIMAGELIST)imagelist, BMP_CX, BMP_CX, 2, 7, 4, ILC_COLOR24, "IImageList2 2"); + + hr = IImageList2_Remove(imagelist, 0); + ok(hr == S_OK, "got %#lx\n", hr); + + check_iml_data((HIMAGELIST)imagelist, BMP_CX, BMP_CX, 1, 7, 4, ILC_COLOR24, "IImageList2 1"); + + hr = IImageList2_Remove(imagelist, -1); + ok(hr == S_OK, "got %#lx\n", hr); + + check_iml_data((HIMAGELIST)imagelist, BMP_CX, BMP_CX, 0, 4, 1, ILC_COLOR24, "IImageList2 0"); + + hr = IImageList2_Remove(imagelist, 0); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + + DeleteObject(hbm); + IImageList2_Release(imagelist); }

1 0

Rémi Bernon : win32u: Fix incorrect ascii key name in get_config_key.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 3944b36b9853598fe3ae83b63fc26c5c1c4eb8ca URL: https://gitlab.winehq.org/wine/wine/-/commit/3944b36b9853598fe3ae83b63fc26c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 14 15:19:45 2024 +0100 win32u: Fix incorrect ascii key name in get_config_key. Fixes 6b8b35f9507f61e435d0b4582e31584c9244fa70 which incorrectly replaced it with string literal, leading to the default setting being used all the time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56435 --- dlls/win32u/sysparams.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index efcf8f64841..7cefb3822a3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4665,13 +4665,10 @@ static union sysparam_all_entry * const default_entries[] = static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, WCHAR *buffer, DWORD size ) { - WCHAR nameW[128]; char buf[2048]; KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buf; - asciiz_to_unicode( nameW, name ); - - if (appkey && query_reg_ascii_value( appkey, "Name", info, sizeof(buf) )) + if (appkey && query_reg_ascii_value( appkey, name, info, sizeof(buf) )) { size = min( info->DataLength, size - sizeof(WCHAR) ); memcpy( buffer, info->Data, size ); @@ -4679,7 +4676,7 @@ static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, return 0; } - if (defkey && query_reg_ascii_value( defkey, "Name", info, sizeof(buf) )) + if (defkey && query_reg_ascii_value( defkey, name, info, sizeof(buf) )) { size = min( info->DataLength, size - sizeof(WCHAR) ); memcpy( buffer, info->Data, size );

1 0

Eric Pouech : dbghelp: Don't write minidump from running thread.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: f799bf025b2ac5db7e51db134facdf9b60c03593 URL: https://gitlab.winehq.org/wine/wine/-/commit/f799bf025b2ac5db7e51db134facdf… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Mar 11 16:04:05 2024 +0100 dbghelp: Don't write minidump from running thread. In case a minidump is written from current process, create a dedicated thread to write the minidump (and hide that thread from the minidump). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/minidump.c | 248 +++++++++++++++++++++++------------------ dlls/dbghelp/tests/minidump.c | 8 +- 3 files changed, 144 insertions(+), 116 deletions(-)

1 0

Eric Pouech : dbghelp: Simplify thread info generation in minidump.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 7f10145a91425490784a8b2480c845ced21ed410 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f10145a91425490784a8b2480c845… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Mar 11 10:53:48 2024 +0100 dbghelp: Simplify thread info generation in minidump. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/minidump.c | 43 ++++++++++--------------------------------- dlls/dbghelp/tests/minidump.c | 11 +++-------- 2 files changed, 13 insertions(+), 41 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 50a062b11e9..5a2b27f7632 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -119,7 +119,6 @@ static void fetch_thread_stack(struct dump_context* dc, const void* teb_addr, * fetches some information about thread of id 'tid' */ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, - const MINIDUMP_EXCEPTION_INFORMATION* except, MINIDUMP_THREAD* mdThd, CONTEXT* ctx) { DWORD tid = dc->threads[thd_idx].tid; @@ -144,44 +143,22 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, FIXME("Couldn't open thread %lu (%lu)\n", tid, GetLastError()); return FALSE; } - + if (NtQueryInformationThread(hThread, ThreadBasicInformation, &tbi, sizeof(tbi), NULL) == STATUS_SUCCESS) { mdThd->Teb = (ULONG_PTR)tbi.TebBaseAddress; if (tbi.ExitStatus == STILL_ACTIVE) { - if (tid != GetCurrentThreadId() && - (mdThd->SuspendCount = SuspendThread(hThread)) != (DWORD)-1) - { - ctx->ContextFlags = CONTEXT_FULL; - if (!GetThreadContext(hThread, ctx)) - memset(ctx, 0, sizeof(*ctx)); - - fetch_thread_stack(dc, tbi.TebBaseAddress, ctx, &mdThd->Stack); - ResumeThread(hThread); - } - else if (tid == GetCurrentThreadId() && except) - { - CONTEXT lctx, *pctx; - mdThd->SuspendCount = 1; - if (except->ClientPointers) - { - EXCEPTION_POINTERS ep; - - ReadProcessMemory(dc->process->handle, except->ExceptionPointers, - &ep, sizeof(ep), NULL); - ReadProcessMemory(dc->process->handle, ep.ContextRecord, - &lctx, sizeof(lctx), NULL); - pctx = &lctx; - } - else pctx = except->ExceptionPointers->ContextRecord; - - *ctx = *pctx; - fetch_thread_stack(dc, tbi.TebBaseAddress, pctx, &mdThd->Stack); - } - else mdThd->SuspendCount = 0; + mdThd->SuspendCount = SuspendThread(hThread); + ctx->ContextFlags = CONTEXT_ALL; + if (!GetThreadContext(hThread, ctx)) + memset(ctx, 0, sizeof(*ctx)); + fetch_thread_stack(dc, tbi.TebBaseAddress, ctx, &mdThd->Stack); + ResumeThread(hThread); } + else + mdThd->SuspendCount = (DWORD)-1; } CloseHandle(hThread); return TRUE; @@ -733,7 +710,7 @@ static unsigned dump_threads(struct dump_context* dc) for (i = 0; i < dc->num_threads; i++) { - fetch_thread_info(dc, i, dc->except_param, &mdThd, &ctx); + fetch_thread_info(dc, i, &mdThd, &ctx); flags_out = ThreadWriteThread | ThreadWriteStack | ThreadWriteContext | ThreadWriteInstructionWindow; diff --git a/dlls/dbghelp/tests/minidump.c b/dlls/dbghelp/tests/minidump.c index f315308ac46..3e07911bae6 100644 --- a/dlls/dbghelp/tests/minidump.c +++ b/dlls/dbghelp/tests/minidump.c @@ -192,7 +192,7 @@ static unsigned minidump_get_number_of_threads(void *data) return thread_list->NumberOfThreads; } -static void minidump_check_threads(void *data, unsigned todo_flags) +static void minidump_check_threads(void *data) { MINIDUMP_THREAD_LIST *thread_list; ULONG stream_size; @@ -208,17 +208,12 @@ static void minidump_check_threads(void *data, unsigned todo_flags) const MINIDUMP_THREAD *thread = &thread_list->Threads[i]; const CONTEXT *ctx; - todo_wine_if(todo_flags & 4) ok(thread->SuspendCount == 0, "Unexpected value\n"); - todo_wine_if(todo_flags & 1) ok(thread->Stack.StartOfMemoryRange, "Unexpected value %I64x\n", thread->Stack.StartOfMemoryRange); - todo_wine_if(todo_flags & 1) ok(thread->Stack.Memory.DataSize, "Unexpected value %x\n", thread->Stack.Memory.DataSize); ok(thread->Teb, "Unexpected value\n"); - todo_wine_if(todo_flags & 8) ok(thread->ThreadContext.DataSize >= sizeof(CONTEXT), "Unexpected value\n"); ctx = RVA_TO_ADDR(data, thread->ThreadContext.Rva); - todo_wine_if(todo_flags & 2) ok((ctx->ContextFlags & CONTEXT_ALL) == CONTEXT_ALL, "Unexpected value\n"); } } @@ -463,7 +458,7 @@ static void test_current_process(void) num_threads = minidump_get_number_of_threads(data); ok(num_threads > 0, "Unexpected number of threads\n"); - minidump_check_threads(data, 2); + minidump_check_threads(data); md = minidump_get_memory_description(data, (DWORD_PTR)&i); ok(md.kind == MD_STACK, "Couldn't find automatic variable\n"); @@ -807,7 +802,7 @@ static void test_exception(void) ok(except_info->ThreadContext.Rva, "Unexpected value\n"); mctx = RVA_TO_ADDR(data, except_info->ThreadContext.Rva); ok(!memcmp(mctx, &ctx, sizeof(ctx)), "Unexpected value\n"); - minidump_check_threads(data, 2); + minidump_check_threads(data); minidump_close_for_read(data); DeleteFileA("foo.mdmp"); winetest_pop_context();

1 0

Rémi Bernon : mfreadwrite/reader: Handle MF_E_TRANSFORM_STREAM_CHANGE results.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 14743b0ffb0ce2e788801b27364790c5ac55d7f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/14743b0ffb0ce2e788801b27364790… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 29 15:08:51 2024 +0100 mfreadwrite/reader: Handle MF_E_TRANSFORM_STREAM_CHANGE results. --- dlls/mfreadwrite/reader.c | 48 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 5538739fe6b..b77b5f9c538 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -76,6 +76,7 @@ struct transform_entry struct list entry; IMFTransform *transform; unsigned int min_buffer_size; + UINT32 pending_flags; GUID category; BOOL hidden; }; @@ -484,14 +485,14 @@ static HRESULT source_reader_queue_response(struct source_reader *reader, struct } static HRESULT source_reader_queue_sample(struct source_reader *reader, struct media_stream *stream, - IMFSample *sample) + UINT flags, IMFSample *sample) { LONGLONG timestamp = 0; if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) WARN("Sample time wasn't set.\n"); - return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); + return source_reader_queue_response(reader, stream, S_OK, flags, timestamp, sample); } static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream) @@ -785,6 +786,7 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader while (SUCCEEDED(hr)) { MFT_OUTPUT_DATA_BUFFER out_buffer = {0}; + IMFMediaType *output_type, *media_type; if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES)) && FAILED(hr = source_reader_allocate_stream_sample(&stream_info, &out_buffer.pSample))) @@ -792,10 +794,46 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader if (SUCCEEDED(hr = IMFTransform_ProcessOutput(entry->transform, 0, 1, &out_buffer, &status))) { - if (next) + if ((entry->pending_flags & MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED) + && SUCCEEDED(hr = IMFTransform_GetOutputCurrentType(entry->transform, 0, &output_type))) + { + if (!next) + hr = IMFMediaType_CopyAllItems(output_type, (IMFAttributes *)stream->current); + else if (SUCCEEDED(hr = IMFTransform_SetInputType(next->transform, 0, output_type, 0))) + { + /* check if transform output type is still valid or if we need to reset it as well */ + if (FAILED(hr = IMFTransform_GetOutputCurrentType(next->transform, 0, &media_type)) + && SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(next->transform, 0, 0, &output_type))) + { + next->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED; + hr = IMFTransform_SetOutputType(entry->transform, 0, media_type, 0); + IMFMediaType_Release(media_type); + } + } + IMFMediaType_Release(output_type); + } + + if (FAILED(hr)) + source_reader_queue_response(reader, stream, hr, MF_SOURCE_READERF_ERROR, 0, NULL); + else if (next) hr = source_reader_push_transform_samples(reader, stream, next, out_buffer.pSample); else - hr = source_reader_queue_sample(reader, stream, out_buffer.pSample); + hr = source_reader_queue_sample(reader, stream, entry->pending_flags, out_buffer.pSample); + + entry->pending_flags = 0; + } + + if (hr == MF_E_TRANSFORM_STREAM_CHANGE && SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(entry->transform, 0, 0, &output_type))) + { + hr = IMFTransform_SetOutputType(entry->transform, 0, output_type, 0); + IMFMediaType_Release(output_type); + + if (SUCCEEDED(hr)) + { + hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info); + stream_info.cbSize = max(stream_info.cbSize, entry->min_buffer_size); + entry->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED; + } } if (out_buffer.pSample) @@ -850,7 +888,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct HRESULT hr; if (!(ptr = list_head(&stream->transforms))) - return source_reader_queue_sample(reader, stream, sample); + return source_reader_queue_sample(reader, stream, 0, sample); entry = LIST_ENTRY(ptr, struct transform_entry, entry); /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */

1 0

Eric Pouech : dbghelp/tests: Add tests for function table lookup.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: da22ef6c0d4c430cedace7d3075cecbc178d09c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/da22ef6c0d4c430cedace7d3075cec… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Mar 5 10:18:51 2024 +0100 dbghelp/tests: Add tests for function table lookup. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index d1c2f219533..1ba4ecb6b30 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -1492,6 +1492,45 @@ static void test_live_modules(void) } } +#define test_function_table_main_module(b) _test_function_table_entry(__LINE__, NULL, #b, (DWORD64)(DWORD_PTR)&(b)) +#define test_function_table_module(a, b) _test_function_table_entry(__LINE__, a, #b, (DWORD64)(DWORD_PTR)GetProcAddress(GetModuleHandleA(a), (b))) +static void *_test_function_table_entry(unsigned lineno, const char *modulename, const char *name, DWORD64 addr) +{ + DWORD64 base_module = (DWORD64)(DWORD_PTR)GetModuleHandleA(modulename); + + if (RtlImageNtHeader(GetModuleHandleW(NULL))->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) + { + IMAGE_AMD64_RUNTIME_FUNCTION_ENTRY *func; + + func = SymFunctionTableAccess64(GetCurrentProcess(), addr); + ok_(__FILE__, lineno)(func != NULL, "Couldn't find function table for %s\n", name); + if (func) + { + ok_(__FILE__, lineno)(func->BeginAddress == addr - base_module, "Unexpected start of function\n"); + ok_(__FILE__, lineno)(func->BeginAddress < func->EndAddress, "Unexpected end of function\n"); + ok_(__FILE__, lineno)((func->UnwindData & 1) == 0, "Unexpected chained runtime function\n"); + } + + return func; + } + return NULL; +} + +static void test_function_tables(void) +{ + void *ptr1, *ptr2; + + SymInitialize(GetCurrentProcess(), NULL, TRUE); + ptr1 = test_function_table_main_module(test_live_modules); + ptr2 = test_function_table_main_module(test_function_tables); + todo_wine_if(ptr1) + ok(ptr1 == ptr2, "Expecting unique storage area\n"); + ptr2 = test_function_table_module("kernel32.dll", "CreateFileMappingA"); + todo_wine_if(ptr1) + ok(ptr1 == ptr2, "Expecting unique storage area\n"); + SymCleanup(GetCurrentProcess()); +} + START_TEST(dbghelp) { BOOL ret; @@ -1523,4 +1562,5 @@ START_TEST(dbghelp) test_loaded_modules(); test_live_modules(); } + test_function_tables(); }

1 0

Eric Pouech : dbghelp: Use an intermediate buffer in SymFunctionTableAccess (x86_64).
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 56193155a01cbdace7bad303a472f07fe0e2d5c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/56193155a01cbdace7bad303a472f0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Mar 5 17:52:26 2024 +0100 dbghelp: Use an intermediate buffer in SymFunctionTableAccess (x86_64). This mainly allows to release internal resources bound to image. Also follow chained RUNTIME_FUNCTION entries (if any). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/cpu_x86_64.c | 49 +++++++++++++++++++++++++++--------------- dlls/dbghelp/dbghelp_private.h | 3 +++ dlls/dbghelp/pe_module.c | 46 +++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/tests/dbghelp.c | 2 -- 4 files changed, 81 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index eeae1f042b2..5193faee825 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -729,31 +729,46 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk *csw, STACKFRAME64 *frame, static void* x86_64_find_runtime_function(struct module* module, DWORD64 addr) { #ifdef __x86_64__ - RUNTIME_FUNCTION* rtf; - ULONG size; - int min, max; + RUNTIME_FUNCTION *func = NULL; + const RUNTIME_FUNCTION *rtf; + ULONG size; - rtf = (RUNTIME_FUNCTION*)pe_map_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size); - if (rtf) for (min = 0, max = size / sizeof(*rtf); min <= max; ) + rtf = (const RUNTIME_FUNCTION*)pe_map_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size); + if (rtf) { - int pos = (min + max) / 2; - if (addr < module->module.BaseOfImage + rtf[pos].BeginAddress) max = pos - 1; - else if (addr >= module->module.BaseOfImage + rtf[pos].EndAddress) min = pos + 1; - else + int lo, hi; + + for (lo = 0, hi = size / sizeof(*rtf); lo <= hi; ) { - rtf += pos; - while (rtf->UnwindData & 1) /* follow chained entry */ + int pos = (lo + hi) / 2; + if (addr < module->module.BaseOfImage + rtf[pos].BeginAddress) hi = pos - 1; + else if (addr >= module->module.BaseOfImage + rtf[pos].EndAddress) lo = pos + 1; + else if ((func = fetch_buffer(module->process, sizeof(*func)))) { - FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n"); - return NULL; - /* we need to read into the other process */ - /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */ + *func = rtf[pos]; + while (func && (func->UnwindData & 1)) + { + const BYTE *next = pe_lock_region_from_rva(module, func->UnwindData & ~1, sizeof(*func), NULL); + if (next) + { + *func = *(const RUNTIME_FUNCTION *)next; + pe_unlock_region(module, next); + } + else + { + WARN("Couldn't find chained RUNTIME_FUNCTION\n"); + func = NULL; + } + } + break; } - return rtf; } + pe_unmap_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, (const char*)rtf); } -#endif + return func; +#else return NULL; +#endif } static unsigned x86_64_map_dwarf_register(unsigned regno, const struct module* module, BOOL eh_frame) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 5677f6bfdb3..791f5ad6e14 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -781,7 +781,10 @@ extern struct module* extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module); extern const char* pe_map_directory(struct module* module, int dirno, DWORD* size); +extern BOOL pe_unmap_directory(struct module* module, int dirno, const char*); extern DWORD pe_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info); +extern const BYTE* pe_lock_region_from_rva(struct module *module, DWORD rva, DWORD size, DWORD *length); +extern BOOL pe_unlock_region(struct module *module, const BYTE* region); /* source.c */ extern unsigned source_new(struct module* module, const char* basedir, const char* source); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 255c9f1832d..ebb4cf38db3 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -341,6 +341,52 @@ const char* pe_map_directory(struct module* module, int dirno, DWORD* size) nth->OptionalHeader.DataDirectory[dirno].VirtualAddress, NULL); } +BOOL pe_unmap_directory(struct module* module, int dirno, const char *dir) +{ + if (module->type != DMT_PE || !module->format_info[DFI_PE]) return FALSE; + if (dirno >= IMAGE_NUMBEROF_DIRECTORY_ENTRIES) return FALSE; + pe_unmap_full(&module->format_info[DFI_PE]->u.pe_info->fmap); + return TRUE; +} + +/* Locks a region from a mapped PE file, from its RVA, and for at least 'size' bytes. + * Region must fit entirely inside a PE section. + * 'length', upon success, gets the size from RVA until end of PE section. + */ +const BYTE* pe_lock_region_from_rva(struct module *module, DWORD rva, DWORD size, DWORD *length) +{ + IMAGE_NT_HEADERS* nth; + void* mapping; + IMAGE_SECTION_HEADER *section; + const BYTE *ret; + + if (module->type != DMT_PE || !module->format_info[DFI_PE]) return NULL; + if (!(mapping = pe_map_full(&module->format_info[DFI_PE]->u.pe_info->fmap, &nth))) + return NULL; + section = NULL; + ret = RtlImageRvaToVa(nth, mapping, rva, &section); + if (ret) + { + if (rva + size <= section->VirtualAddress + section->SizeOfRawData) + { + if (length) + *length = section->VirtualAddress + section->SizeOfRawData - rva; + return ret; + } + if (rva + size <= section->VirtualAddress + section->Misc.VirtualSize) + FIXME("Not able to lock regions not present on file\n"); + } + pe_unmap_full(&module->format_info[DFI_PE]->u.pe_info->fmap); + return NULL; +} + +BOOL pe_unlock_region(struct module *module, const BYTE* region) +{ + if (module->type != DMT_PE || !module->format_info[DFI_PE] || !region) return FALSE; + pe_unmap_full(&module->format_info[DFI_PE]->u.pe_info->fmap); + return TRUE; +} + static void pe_module_remove(struct process* pcs, struct module_format* modfmt) { image_unmap_file(&modfmt->u.pe_info->fmap); diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 1ba4ecb6b30..ae757e1ae08 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -1523,10 +1523,8 @@ static void test_function_tables(void) SymInitialize(GetCurrentProcess(), NULL, TRUE); ptr1 = test_function_table_main_module(test_live_modules); ptr2 = test_function_table_main_module(test_function_tables); - todo_wine_if(ptr1) ok(ptr1 == ptr2, "Expecting unique storage area\n"); ptr2 = test_function_table_module("kernel32.dll", "CreateFileMappingA"); - todo_wine_if(ptr1) ok(ptr1 == ptr2, "Expecting unique storage area\n"); SymCleanup(GetCurrentProcess()); }

1 0

Rémi Bernon : win32u: Get rid of the monitor flags.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: b4e4921cb6fc43dbf4d7256762badde181751e08 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4e4921cb6fc43dbf4d7256762badd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 12:40:27 2024 +0100 win32u: Get rid of the monitor flags. --- dlls/win32u/sysparams.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index cf1af54275d..fe1c77afe79 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -137,7 +137,6 @@ struct monitor struct adapter *adapter; HANDLE handle; unsigned int id; - unsigned int flags; unsigned int output_id; RECT rc_monitor; RECT rc_work; @@ -157,7 +156,6 @@ BOOL enable_thunk_lock = FALSE; static struct monitor virtual_monitor = { .handle = VIRTUAL_HMONITOR, - .flags = MONITORINFOF_PRIMARY, .rc_monitor.right = 1024, .rc_monitor.bottom = 768, .rc_work.right = 1024, @@ -663,15 +661,12 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct monitor *monitor ) { char buffer[4096]; - BOOL is_primary = !!(adapter->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; WCHAR *value_str = (WCHAR *)value->Data; HKEY hkey, subkey; DWORD size; UINT i; - monitor->flags = is_primary ? MONITORINFOF_PRIMARY : 0; - if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) return FALSE; @@ -1530,6 +1525,14 @@ static BOOL is_monitor_active( struct monitor *monitor ) return !IsRectEmpty( &monitor->rc_monitor ); } +static BOOL is_monitor_primary( struct monitor *monitor ) +{ + struct adapter *adapter; + /* services do not have any adapters, only a virtual monitor */ + if (!(adapter = monitor->adapter)) return TRUE; + return !!(adapter->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); +} + static void enum_device_keys( const char *root, const WCHAR *classW, UINT class_size, void (*callback)(const char *) ) { char buffer[1024]; @@ -2304,7 +2307,7 @@ RECT get_primary_monitor_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!(monitor->flags & MONITORINFOF_PRIMARY)) continue; + if (!is_monitor_primary( monitor )) continue; rect = monitor->rc_monitor; break; } @@ -3471,7 +3474,7 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) /* FIXME: map dpi */ info->rcMonitor = monitor->rc_monitor; info->rcWork = monitor->rc_work; - info->dwFlags = monitor->flags; + info->dwFlags = is_monitor_primary( monitor ) ? MONITORINFOF_PRIMARY : 0; if (info->cbSize >= sizeof(MONITORINFOEXW)) { char buffer[CCHDEVICENAME]; @@ -3550,7 +3553,7 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) } } - if (monitor->flags & MONITORINFOF_PRIMARY) primary = monitor->handle; + if (is_monitor_primary( monitor )) primary = monitor->handle; } unlock_display_devices(); @@ -5120,7 +5123,7 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT w LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { - if (!(monitor->flags & MONITORINFOF_PRIMARY)) continue; + if (!is_monitor_primary( monitor )) continue; work_area = monitor->rc_work; break; }

1 0

Rémi Bernon : win32u: Enumerate monitors from their device keys.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: b59619d2e4df7bf2db4889cf7c80b9147627b975 URL: https://gitlab.winehq.org/wine/wine/-/commit/b59619d2e4df7bf2db4889cf7c80b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 14:33:21 2024 +0100 win32u: Enumerate monitors from their device keys. --- dlls/win32u/sysparams.c | 135 ++++++++++++++++++++++++++++++------------------ 1 file changed, 85 insertions(+), 50 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index fe1c77afe79..efcf8f64841 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -74,6 +74,9 @@ static const WCHAR guid_devclass_displayW[] = {'{','4','D','3','6','E','9','6','8','-','E','3','2','5','-','1','1','C','E','-', 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; static const char guid_devclass_monitorA[] = "{4D36E96E-E325-11CE-BFC1-08002BE10318}"; +static const WCHAR guid_devclass_monitorW[] = + {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-', + 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; static const char guid_devinterface_display_adapterA[] = "{5B45201D-F2F2-4F3B-85BB-30FF1F953599}"; static const char guid_display_device_arrivalA[] = "{1CA05180-A699-450A-9A0C-DE4FBE3DDD89}"; @@ -658,28 +661,14 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i return TRUE; } -static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct monitor *monitor ) +static BOOL read_monitor_from_registry( struct monitor *monitor ) { char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; - WCHAR *value_str = (WCHAR *)value->Data; HKEY hkey, subkey; DWORD size; - UINT i; - - if (!(hkey = reg_open_key( config_key, adapter->config_key, - lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) - return FALSE; - - /* Interface name */ - sprintf( buffer, "MonitorID%u", index ); - size = query_reg_ascii_value( hkey, buffer, value, sizeof(buffer) ); - NtClose( hkey ); - if (!size || value->Type != REG_SZ) return FALSE; - for (i = 0; i < value->DataLength / sizeof(WCHAR); i++) monitor->path[i] = value_str[i]; - if (!(hkey = reg_open_key( enum_key, value_str, value->DataLength - sizeof(WCHAR) ))) - return FALSE; + if (!(hkey = reg_open_ascii_key( enum_key, monitor->path ))) return FALSE; /* Output ID */ size = query_reg_subkey_value( hkey, devpropkey_monitor_output_idA, @@ -723,6 +712,22 @@ static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct m return TRUE; } +static BOOL read_adapter_monitor_path( HKEY hkey, UINT index, char *path ) +{ + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + WCHAR *value_str = (WCHAR *)value->Data; + DWORD size; + UINT i; + + sprintf( buffer, "MonitorID%u", index ); + size = query_reg_ascii_value( hkey, buffer, value, sizeof(buffer) ); + if (!size || value->Type != REG_SZ) return FALSE; + + for (i = 0; i < value->DataLength / sizeof(WCHAR); i++) path[i] = value_str[i]; + return TRUE; +} + static void reg_empty_key( HKEY root, const char *key_name ) { char buffer[4096]; @@ -1598,16 +1603,36 @@ static struct gpu *find_gpu_from_path( const char *path ) return NULL; } +static void enum_monitors( const char *path ) +{ + struct monitor *monitor; + if (!(monitor = calloc( 1, sizeof(*monitor) ))) return; + strcpy( monitor->path, path ); + list_add_tail( &monitors, &monitor->entry ); +} + +static struct monitor *find_monitor_from_path( const char *path ) +{ + struct monitor *monitor; + + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + if (!strcmp( monitor->path, path )) return monitor; + + ERR( "Failed to find monitor with path %s\n", debugstr_a(path) ); + return NULL; +} + static BOOL update_display_cache_from_registry(void) { char path[MAX_PATH]; DWORD adapter_id, monitor_id, monitor_count = 0, size; KEY_BASIC_INFORMATION key; struct adapter *adapter; - struct monitor *monitor, *monitor2; + struct monitor *monitor; HANDLE mutex = NULL; NTSTATUS status; struct gpu *gpu; + HKEY hkey; BOOL ret; /* If user driver did initialize the registry, then exit */ @@ -1629,6 +1654,7 @@ static BOOL update_display_cache_from_registry(void) clear_display_devices(); enum_device_keys( "PCI", guid_devclass_displayW, sizeof(guid_devclass_displayW), enum_gpus ); + enum_device_keys( "DISPLAY", guid_devclass_monitorW, sizeof(guid_devclass_monitorW), enum_monitors ); LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) { @@ -1636,6 +1662,12 @@ static BOOL update_display_cache_from_registry(void) WARN( "Failed to read gpu from registry\n" ); } + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + { + if (!read_monitor_from_registry( monitor )) + WARN( "Failed to read monitor from registry\n" ); + } + for (adapter_id = 0;; adapter_id++) { if (!(adapter = calloc( 1, sizeof(*adapter) ))) break; @@ -1651,34 +1683,24 @@ static BOOL update_display_cache_from_registry(void) } list_add_tail( &adapters, &adapter->entry ); + + size = lstrlenW( adapter->config_key ) * sizeof(WCHAR); + if (!(hkey = reg_open_key( config_key, adapter->config_key, size ))) continue; + for (monitor_id = 0;; monitor_id++) { - if (!(monitor = calloc( 1, sizeof(*monitor) ))) break; - if (!read_monitor_settings( adapter, monitor_id, monitor )) - { - free( monitor ); - break; - } + struct monitor *monitor; + + if (!read_adapter_monitor_path( hkey, monitor_id, path )) break; + if (!(monitor = find_monitor_from_path( path ))) continue; monitor->id = monitor_id; monitor->adapter = adapter_acquire( adapter ); - - if (adapter->state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) - { - LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) - { - if (!is_monitor_active( monitor2 )) continue; - if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) - { - monitor->is_clone = TRUE; - break; - } - } - } - monitor->handle = UlongToHandle( ++monitor_count ); - list_add_tail( &monitors, &monitor->entry ); + if (adapter->monitor_count++) monitor->is_clone = TRUE; } + + NtClose( hkey ); } if ((ret = !list_empty( &adapters ) && !list_empty( &monitors ))) @@ -3378,6 +3400,18 @@ INT get_display_depth( UNICODE_STRING *name ) return depth; } +static BOOL should_enumerate_monitor( struct monitor *monitor, const POINT *origin, + const RECT *limit, RECT *rect ) +{ + if (!is_monitor_active( monitor )) return FALSE; + if (monitor->is_clone) return FALSE; + + *rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), + get_thread_dpi() ); + OffsetRect( rect, -origin->x, -origin->y ); + return intersect_rect( rect, rect, limit ); +} + /*********************************************************************** * NtUserEnumDisplayMonitors (win32u.@) */ @@ -3419,21 +3453,22 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc } count = 0; + + /* enumerate primary monitors first */ LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - RECT monrect; - - if (!is_monitor_active( monitor )) continue; - - monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), - get_thread_dpi() ); - OffsetRect( &monrect, -origin.x, -origin.y ); - if (!intersect_rect( &monrect, &monrect, &limit )) continue; - if (monitor->is_clone) continue; + if (!is_monitor_primary( monitor )) continue; + if (should_enumerate_monitor( monitor, &origin, &limit, &enum_info[count].rect )) + enum_info[count++].handle = monitor->handle; + break; + } - enum_info[count].handle = monitor->handle; - enum_info[count].rect = monrect; - count++; + /* then non-primary monitors */ + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) + { + if (is_monitor_primary( monitor )) continue; + if (should_enumerate_monitor( monitor, &origin, &limit, &enum_info[count].rect )) + enum_info[count++].handle = monitor->handle; } unlock_display_devices();

1 0