June 2023 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp/tests: Don't call SymSetExtendedOption() directly.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 1d281c620d3062c2f30cdf533fe4ac06905a07b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d281c620d3062c2f30cdf533fe4ac… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 26 18:34:46 2023 +0200 dbghelp/tests: Don't call SymSetExtendedOption() directly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55128 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 575b9f76d20..c456a99d370 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -318,10 +318,17 @@ static unsigned get_module_count(HANDLE proc) static unsigned get_native_module_count(HANDLE proc) { + static BOOL (*WINAPI pSymSetExtendedOption)(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value); unsigned count = 0; BOOL old, ret; - old = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + if (!pSymSetExtendedOption) + { + pSymSetExtendedOption = (void*)GetProcAddress(GetModuleHandleA("dbghelp.dll"), "SymSetExtendedOption"); + ok(pSymSetExtendedOption != NULL, "SymSetExtendedOption should be present on Wine\n"); + } + + old = pSymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); ret = SymEnumerateModules64(proc, count_native_module_cb, &count); ok(ret, "SymEnumerateModules64 failed: %lu\n", GetLastError()); SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, old);

1 0

Maarten De Braekeleer : cmd: Fix 'if exist' with a directory/ as a parameter.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 5e2f9996baedbe389df93255a4dd1188cbdb6c56 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e2f9996baedbe389df93255a4dd11… Author: Maarten De Braekeleer <maarten.debraekeleer(a)gmail.com> Date: Sat Jun 24 20:02:53 2023 +0200 cmd: Fix 'if exist' with a directory/ as a parameter. 'if exists' takes a parameter which can be directory, directory/, directory/. directory\ or directory\. for example, and should equate to true if the directory exists. The syntax directory\ is explicitly rejected by FindFirstFile and hence was not working - look for this specific case, and if found append a '.'. Follow-up commit of bc9d68bcbee5c9d4f4582f766a4f552870385361 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55130#add_comment --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 19 +++++++++++++++++-- programs/cmd/tests/test_builtins.cmd.exp | 5 ++++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3b2a192c828..badf41c17f6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2844,8 +2844,8 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) int len = lstrlenW(param); if (!len) goto syntax_err; - /* FindFirstFile does not like a directory path ending in '\', append a '.' */ - if (param[len-1] == '\\') lstrcatW(param, L"."); + /* FindFirstFile does not like a directory path ending in '\' or '/', append a '.' */ + if (param[len-1] == '\\' || param[len-1] == '/') lstrcatW(param, L"."); hff = FindFirstFileW(param, &fd); *test = (hff != INVALID_HANDLE_VALUE ); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index fe7bedb1362..eaee2900bc9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1138,9 +1138,9 @@ if exist subdir ( echo ERROR exist subdir not working ) if exist subdir\. ( - echo exist subdir with . ok + echo exist subdir with \. ok ) else ( - echo ERROR exist subdir with . not working + echo ERROR exist subdir with \. not working ) if exist subdir\ ( echo exist subdir with \ ok @@ -1152,6 +1152,21 @@ if exist "subdir\" ( ) else ( echo ERROR exist subdir with \ and quotes not working ) +if exist subdir/. ( + echo exist subdir with /. ok +) else ( + echo ERROR exist subdir with /. not working +) +if exist subdir/ ( + echo exist subdir with / ok +) else ( + echo ERROR exist subdir with / not working +) +if exist "subdir/" ( + echo exist subdir with / and quotes ok +) else ( + echo ERROR exist subdir with / and quotes not working +) del foo subdir\bar rd subdir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 91570a7990f..411eae303ac 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -821,9 +821,12 @@ exist wildcard works negate exist wildcard works exist wildcard bad subdir broken works exist subdir ok -exist subdir with . ok +exist subdir with \. ok exist subdir with \ ok exist subdir with \ and quotes ok +exist subdir with /. ok +exist subdir with / ok +exist subdir with / and quotes ok ------ for numbers negative numbers handled negative numbers handled

1 0

Rémi Bernon : explorer: Use CRT allocation functions.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 240bdd5772aaf1acac7d420114788509ffd67ce1 URL: https://gitlab.winehq.org/wine/wine/-/commit/240bdd5772aaf1acac7d4201147885… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 22 08:26:28 2023 +0200 explorer: Use CRT allocation functions. --- programs/explorer/appbar.c | 4 ++-- programs/explorer/desktop.c | 41 ++++++++++++++++++++--------------------- programs/explorer/explorer.c | 15 ++++++--------- programs/explorer/startmenu.c | 12 ++++++------ programs/explorer/systray.c | 12 +++++------- 5 files changed, 39 insertions(+), 45 deletions(-)

1 0

Rémi Bernon : explorer: Use unprefixed debug macros.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 43fd81b3a59fdf72a11a9c89afd89af561f3a56a URL: https://gitlab.winehq.org/wine/wine/-/commit/43fd81b3a59fdf72a11a9c89afd89a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 22 08:30:04 2023 +0200 explorer: Use unprefixed debug macros. --- programs/explorer/appbar.c | 35 ++++++++++++++++------------------- programs/explorer/desktop.c | 26 ++++++++++++-------------- programs/explorer/explorer.c | 30 ++++++++++++++---------------- programs/explorer/startmenu.c | 4 ++-- programs/explorer/systray.c | 22 +++++++++++----------- 5 files changed, 55 insertions(+), 62 deletions(-)

1 0

Rémi Bernon : explorer: Use wide string literals.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 5b11157ecf787e545062000ab6afd1c55ee8dacc URL: https://gitlab.winehq.org/wine/wine/-/commit/5b11157ecf787e545062000ab6afd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 22 08:50:40 2023 +0200 explorer: Use wide string literals. --- programs/explorer/appbar.c | 5 ++-- programs/explorer/desktop.c | 66 ++++++++++++-------------------------------- programs/explorer/explorer.c | 23 +++++++-------- programs/explorer/systray.c | 5 ++-- 4 files changed, 31 insertions(+), 68 deletions(-)

1 0

Tim Clem : winemac.drv: Don't expect an internal driver message to set last error.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 98748075647820da9a10079061c1748b6a16047f URL: https://gitlab.winehq.org/wine/wine/-/commit/98748075647820da9a10079061c174… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Jun 23 13:00:49 2023 -0700 winemac.drv: Don't expect an internal driver message to set last error. NtUserMessageCall(..., NtUserSendDriverMessage) does not ensure the validity of the hwnd, so this check will incorrectly fail if the last error was ERROR_INVALID_WINDOW_HANDLE by coincidence. The notify_owner call immediately following this code will catch a destroyed owner hwnd. --- dlls/winemac.drv/systray.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 8b3452e7540..42ffe49f563 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -342,13 +342,7 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) else if (event->status_item_mouse_button.count % 2 == 0) msg += WM_LBUTTONDBLCLK - WM_LBUTTONDOWN; - if (!send_message(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && - RtlGetLastWin32Error() == ERROR_INVALID_WINDOW_HANDLE) - { - WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); - delete_icon(icon); - return; - } + send_message(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0); if (!notify_owner(icon, msg, event->status_item_mouse_button.x, event->status_item_mouse_button.y)) return;

1 0

Eric Pouech : dbghelp: Add tests for SymSrvGetFileIndexInfo() for PDB files.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: f4c1860480c4d2a3eadd2be0ee9207df6942e386 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4c1860480c4d2a3eadd2be0ee9207… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 23 18:39:32 2023 +0200 dbghelp: Add tests for SymSrvGetFileIndexInfo() for PDB files. Add infrastructure to generate fake .PDB files. Only done in DS format. I'm not sure we care about JG anymore, DS format has been introduced by MS in early 2000 to supersede JG, and is still mainstream today). For the record, LLVM in its PDB handling doesn't support JG format. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 385 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 383 insertions(+), 2 deletions(-)

1 0

Eric Pouech : dbghelp: Implement SymSrvGetFileIndexInfo for PDB files.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: bbc2a9ab5bd2bc21dd5a324025a554534a3904ad URL: https://gitlab.winehq.org/wine/wine/-/commit/bbc2a9ab5bd2bc21dd5a324025a554… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 23 18:39:32 2023 +0200 dbghelp: Implement SymSrvGetFileIndexInfo for PDB files. Only done for DS format. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/msc.c | 70 ++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/path.c | 3 +- dlls/dbghelp/tests/path.c | 3 -- 4 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f91e2784b15..1ceefcdbde6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -772,6 +772,7 @@ struct pdb_cmd_pair { }; extern BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, union ctx *context, struct pdb_cmd_pair *cpair) DECLSPEC_HIDDEN; +extern DWORD pdb_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info); /* path.c */ extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index f6b681cb4ae..63c3f530bf5 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3615,6 +3615,76 @@ static BOOL pdb_process_internal(const struct process* pcs, struct pdb_module_info* pdb_module_info, unsigned module_index); +DWORD pdb_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info) +{ + /* check the file header, and if ok, load the TOC */ + TRACE("PDB: %.40s\n", debugstr_an(image, 40)); + + if (!memcmp(image, PDB_JG_IDENT, sizeof(PDB_JG_IDENT))) + { + FIXME("Unsupported for PDB files in JG format\n"); + return ERROR_FILE_CORRUPT; + } + if (!memcmp(image, PDB_DS_IDENT, sizeof(PDB_DS_IDENT))) + { + const struct PDB_DS_HEADER* pdb = (const struct PDB_DS_HEADER*)image; + struct PDB_DS_TOC* ds_toc; + struct PDB_DS_ROOT* root; + DWORD ec = ERROR_SUCCESS; + + ds_toc = pdb_ds_read(pdb, (const UINT*)((const char*)pdb + pdb->toc_block * pdb->block_size), + pdb->toc_size); + root = pdb_read_ds_stream(pdb, ds_toc, 1); + if (!root) + { + pdb_free(ds_toc); + return ERROR_FILE_CORRUPT; + } + switch (root->Version) + { + case 20000404: + break; + default: + ERR("-Unknown root block version %u\n", root->Version); + ec = ERROR_FILE_CORRUPT; + } + /* The age field is present twice (in PDB_ROOT and in PDB_SYMBOLS ), + * It's the one in PDB_SYMBOLS which is reported. + */ + if (ec == ERROR_SUCCESS) + { + PDB_SYMBOLS* symbols = pdb_read_ds_stream(pdb, ds_toc, 3); + + if (symbols && symbols->version == 19990903) + { + info->age = symbols->age; + } + else + { + if (symbols) + ERR("-Unknown symbol info version %u %08x\n", symbols->version, symbols->version); + ec = ERROR_FILE_CORRUPT; + } + pdb_free(symbols); + } + if (ec == ERROR_SUCCESS) + { + info->dbgfile[0] = '\0'; + info->guid = root->guid; + info->pdbfile[0] = '\0'; + info->sig = 0; + info->size = 0; + info->stripped = FALSE; + info->timestamp = 0; + } + + pdb_free(ds_toc); + pdb_free(root); + return ec; + } + return ERROR_BAD_FORMAT; +} + static void pdb_process_symbol_imports(const struct process* pcs, const struct msc_debug_info* msc_dbg, const PDB_SYMBOLS* symbols, diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 5c53e3f857d..dce700b34e7 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -906,7 +906,8 @@ BOOL WINAPI SymSrvGetFileIndexInfoW(const WCHAR *file, SYMSRV_INDEX_INFOW* info, fsize = GetFileSize(hFile, NULL); /* try PE module first */ ret = pe_get_file_indexinfo(image, fsize, info); - /* handle (ret == ERROR_BAD_FORMAT) with .dbg and .pdb format */ + if (ret == ERROR_BAD_FORMAT) + ret = pdb_get_file_indexinfo(image, fsize, info); } else ret = ERROR_FILE_NOT_FOUND; diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 78e357d812f..54189c7ed5c 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -828,10 +828,8 @@ static void test_srvgetindexes_pdb(void) memset(&ssii, 0x45, sizeof(ssii)); ssii.sizeofstruct = sizeof(ssii); ret = SymSrvGetFileIndexInfo(filename, &ssii, 0); - todo_wine ok(ret, "SymSrvGetFileIndexInfo failed: %lu\n", GetLastError()); - if (ret) { ok(ssii.age == 240 + i, "Mismatch in age: %lx\n", ssii.age); ok(!memcmp(&ssii.guid, indexes[i].guid, sizeof(GUID)), "Mismatch in guid: guid=%s\n", wine_dbgstr_guid(&ssii.guid)); @@ -844,7 +842,6 @@ static void test_srvgetindexes_pdb(void) ok(!strcmp(ssii.file, filename), "Mismatch in file: %s\n", ssii.file); ok(!ssii.pdbfile[0], "Mismatch in pdbfile: %s\n", ssii.pdbfile); ok(!ssii.dbgfile[0], "Mismatch in dbgfile: %s\n", ssii.dbgfile); - } DeleteFileA(filename); winetest_pop_context();

1 0

Rémi Bernon : mfplat: Use QueryPerformanceCounter in MFGetSystemTime.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: 7cc24be079e6d4e44a3e9f12f600d0ffc9ca1ecd URL: https://gitlab.winehq.org/wine/wine/-/commit/7cc24be079e6d4e44a3e9f12f600d0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 13 09:08:34 2023 +0100 mfplat: Use QueryPerformanceCounter in MFGetSystemTime. --- dlls/mfplat/main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7027b4f9516..8aaf9f93cdc 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -974,11 +974,14 @@ HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) MFTIME WINAPI MFGetSystemTime(void) { - MFTIME mf; + static LARGE_INTEGER frequency; + LARGE_INTEGER counter; - GetSystemTimeAsFileTime( (FILETIME*)&mf ); + if (!frequency.QuadPart) + QueryPerformanceFrequency(&frequency); + QueryPerformanceCounter(&counter); - return mf; + return counter.QuadPart * 10000000 / frequency.QuadPart; } static BOOL mft_is_type_info_match(struct mft_registration *mft, const GUID *category, UINT32 flags,

1 0

Davide Beatrici : winealsa: Use standard allocator in AudioClient's Initialize.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: fbb1e1852993cb3aecba0eb1f5a0fe0d70f2212f URL: https://gitlab.winehq.org/wine/wine/-/commit/fbb1e1852993cb3aecba0eb1f5a0fe… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Jun 25 00:35:27 2023 +0200 winealsa: Use standard allocator in AudioClient's Initialize. --- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 497ea04cecb..3bd2d2698a5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -421,7 +421,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) list_remove(&This->entry); sessions_unlock(); } - HeapFree(GetProcessHeap(), 0, This->vols); + free(This->vols); if (This->stream) stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); @@ -610,7 +610,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - This->vols = HeapAlloc(GetProcessHeap(), 0, channel_count * sizeof(float)); + This->vols = malloc(channel_count * sizeof(float)); if(!This->vols){ params.result = E_OUTOFMEMORY; goto exit; @@ -627,7 +627,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: if(FAILED(params.result)){ stream_release(stream, NULL); - HeapFree(GetProcessHeap(), 0, This->vols); + free(This->vols); This->vols = NULL; }else{ This->stream = stream;

1 0