May 2025 - Wine-gitlab - list.winehq.org

Re: [PATCH v2 0/1] MR8060: include: Add ID3D11FunctionLinkingGraph.
by Zhiyi Zhang (＠zhiyi) 19 May '25

19 May '25

On Sun May 18 07:29:08 2025 +0000, Biswapriyo Nath wrote: > This causes error in C++ > ``` > error: invalid parameter name: 'namespace' is a keyword > ``` I will send a fix. Thanks for spotting this. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8060#note_103770

1 0

[PATCH v3 0/1] MR8072: oledb32: Skip whitespaces around properties names and values in datainit_GetDataSource.
by Piotr Caban (＠piotr) 18 May '25

18 May '25

-- v3: oledb32: Remove leading whitespaces from property name in datainit_GetDataSource. https://gitlab.winehq.org/wine/wine/-/merge_requests/8072

2 1

[PATCH 0/1] MR8071: ucrtbase/tests: Avoid reading behind buffer in test_swprintf (ASan).
by Bernhard Übelacker 18 May '25

18 May '25

The test `test_swprintf` creates an un-terminated buffer and calls `WideCharToMultiByte` without explicit srclen on it. This patch wraps the buffer into a struct providing a termination without modifying the test itself. <details> <summary>ASan output:</summary> ``` ================================================================= ==ucrtbase_test.exe==532==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ffffe1ffac0 at pc 0x6ffffe845638 bp 0x7ffffe1ff030 sp 0x7ffffe1ff078 READ of size 24 at 0x7ffffe1ffac0 thread T0 #0 0x6ffffe845637 in wcslen C:/llvm-mingw/llvm-mingw/llvm-project/compiler-rt/lib/asan/../sanitizer_common\sanitizer_common_interceptors.inc:7215:3 #1 0x6fffff7d1eff in lstrlenW .../wine/include/winbase.h:2574:5 #2 0x6fffff7d2a33 in WideCharToMultiByte .../wine/dlls/kernelbase/locale.c:7382:30 #3 0x000140016e6c in test_swprintf .../wine/dlls/ucrtbase/tests/printf.c:196:9 #4 0x000140015f3e in func_printf .../wine/dlls/ucrtbase/tests/printf.c:891:5 #5 0x00014002da0e in run_test .../wine/include/wine/test.h:765:5 #6 0x00014002d53a in main .../wine/include/wine/test.h:884:12 #7 0x00014002f005 in mainCRTStartup .../wine/dlls/msvcrt/crt_main.c:58:11 #8 0x6fffffc355be in BaseThreadInitThunk .../wine/dlls/kernel32/thread.c:61:24 #9 0x6fffffdbbcc2 in RtlUserThreadStart (C:\windows\system32\ntdll.dll+0x17004bcc2) Address 0x7ffffe1ffac0 is located in stack of thread T0 at offset 256 in frame #0 0x000140016b6f in test_swprintf .../wine/dlls/ucrtbase/tests/printf.c:176 This frame has 8 object(s): [32, 44) 'str_short' (line 177) [64, 80) 'str_justfit' (line 178) [96, 114) 'str_justfits' (line 179) [160, 182) 'str_muchlonger' (line 180) [224, 226) 'str_empty' (line 181) [240, 256) 'buffer' (line 184) [272, 280) 'narrow' (line 185) <== Memory access at offset 256 partially underflows this variable [304, 320) 'narrow_fmt' (line 185) HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork (longjmp, SEH and C++ exceptions *are* supported) SUMMARY: AddressSanitizer: stack-buffer-overflow .../wine/include/winbase.h:2574:5 in lstrlenW Shadow bytes around the buggy address: 0x7ffffe1ff800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x7ffffe1ff880: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x7ffffe1ff900: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x7ffffe1ff980: 00 00 00 00 00 00 00 00 f1 f1 f1 f1 00 04 f2 f2 0x7ffffe1ffa00: 00 00 f2 f2 00 00 02 f2 f2 f2 f2 f2 00 00 06 f2 =>0x7ffffe1ffa80: f2 f2 f2 f2 02 f2 00 00[f2]f2 00 f2 f2 f2 00 00 0x7ffffe1ffb00: f3 f3 f3 f3 00 00 00 00 00 00 00 00 00 00 00 00 0x7ffffe1ffb80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x7ffffe1ffc00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x7ffffe1ffc80: 00 00 00 00 00 00 00 00 f1 f1 f1 f1 f8 f8 f8 f8 0x7ffffe1ffd00: f8 f8 f8 f8 f3 f3 f3 f3 00 00 00 00 00 00 00 00 Shadow byte legend (one shadow byte represents 8 application bytes): Addressable: 00 Partially addressable: 01 02 03 04 05 06 07 Heap left redzone: fa Freed heap region: fd Stack left redzone: f1 Stack mid redzone: f2 Stack right redzone: f3 Stack after return: f5 Stack use after scope: f8 Global redzone: f9 Global init order: f6 Poisoned by user: f7 Container overflow: fc Array cookie: ac Intra object redzone: bb ASan internal: fe Left alloca redzone: ca Right alloca redzone: cb ``` </details> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8071

2 2

[PATCH 0/1] MR8072: oledb32: Skip whitespaces around properties names and values in datainit_GetDataSource.
by Piotr Caban (＠piotr) 18 May '25

18 May '25

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8072

2 1

[PATCH 0/5] MR8070: msado15: Recordset ActiveConnection related changes.
by Piotr Caban (＠piotr) 18 May '25

18 May '25

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8070

2 5

Re: [PATCH v43 0/1] MR7843: cmd: Implement tab completion for command line entry.
by eric pouech (＠epo) 18 May '25

18 May '25

eric pouech (@epo) commented about programs/cmd/wcmdmain.c: > + > +static void build_search_string(WCHAR *inputBuffer, int len, SEARCH_CONTEXT *sc) > +{ > + int cc = 0, nn = 0; > + WCHAR *param = NULL, *last_param, *stripped_copy = NULL; > + WCHAR last_stripped_copy[MAX_PATH] = L"\0"; > + BOOL need_wildcard = TRUE; > + > + sc->searchstr[0] = L'\0'; > + > + /* If inputBuffer ends in a space then the user hit tab beyond the last > + * parameter, so use that as the search pos (i.e. a wildcard search). > + * Otherwise, parse the buffer to find the last parameter in the buffer, > + * where tab was pressed. > + */ > + if (inputBuffer[len-1] == L' ') { len can be zero here (if \<tab\> is pressed at beg of line) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7843#note_103749

1 0

Re: [PATCH v43 0/1] MR7843: cmd: Implement tab completion for command line entry.
by eric pouech (＠epo) 18 May '25

18 May '25

eric pouech (@epo) commented about programs/cmd/wcmdmain.c: > + clear_console_characters(hOutput, maxLen - len, lastConsoleInfo.dwSize.X); /* width at time of last console update */ > + } > + set_cursor_visible(hOutput, TRUE); > + > + /* Remember current dimensions in case user resizes console window. */ > + GetConsoleScreenBufferInfo(hOutput, &lastConsoleInfo); > + > + inputControl.nLength = sizeof(inputControl); > + inputControl.nInitialChars = len; > + inputControl.dwCtrlWakeupMask = (1 << '\t'); > + inputControl.dwControlKeyState = 0; > + > + /* Allow room for NULL terminator. inputBufferLength is at least 1 due to check above. */ > + ret = ReadConsoleW(hInput, inputBuffer, inputBufferLength - 1, numRead, &inputControl); > + > + if (ret) { I'd rather do `if (!ret) break;` so that you gain an indentation level afterwards -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7843#note_103748

1 0

Re: [PATCH v43 0/1] MR7843: cmd: Implement tab completion for command line entry.
by eric pouech (＠epo) 18 May '25

18 May '25

eric pouech (@epo) commented about programs/cmd/wcmdmain.c: > + sc.have_quotes = FALSE; > + sc.user_specified_quotes = FALSE; > + sc.search_pos = 0; > + sc.insert_pos = 0; > + > + build_search_string(inputBuffer, curPos, &sc); > + TRACE("***** New search: [%s]\n", wine_dbgstr_w(sc.searchstr)); > + > + sc.is_dir_search = is_directory_operation(inputBuffer); > + > + free_directory_entry_list(&sc); > + build_directory_entry_list(&sc); > + } > + > + if (sc.entry_count) { > + get_next_matching_directory_entry(&sc, (inputControl.dwControlKeyState & SHIFT_PRESSED) ? TRUE : FALSE); when starting a new iteration ,you start on second element (index 1) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7843#note_103747

1 0

Re: [PATCH v43 0/1] MR7843: cmd: Implement tab completion for command line entry.
by eric pouech (＠epo) 18 May '25

18 May '25

eric pouech (@epo) commented about include/consoleapi.h: > ULONG nLength; > ULONG nInitialChars; > ULONG dwCtrlWakeupMask; > - ULONG dwConsoleKeyState; this change (and the other ones using the correct field name) should be in a separate patch (inside the same merge request) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7843#note_103751

1 0

Re: [PATCH v43 0/1] MR7843: cmd: Implement tab completion for command line entry.
by eric pouech (＠epo) 18 May '25

18 May '25

eric pouech (@epo) commented about programs/cmd/wcmdmain.c: > + > +static void set_cursor_visible(const HANDLE hOutput, const BOOL visible) > +{ > + CONSOLE_CURSOR_INFO cursorInfo; > + > + if (GetConsoleCursorInfo(hOutput, &cursorInfo)) { > + cursorInfo.bVisible = visible; > + SetConsoleCursorInfo(hOutput, &cursorInfo); > + } > +} > + > +static void build_search_string(WCHAR *inputBuffer, int len, SEARCH_CONTEXT *sc) > +{ > + int cc = 0, nn = 0; > + WCHAR *param = NULL, *last_param, *stripped_copy = NULL; > + WCHAR last_stripped_copy[MAX_PATH] = L"\0"; you likely want MAXSTRING here (native definitively works on strings longer than 260 chars) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7843#note_103750

1 0