November 2024 - Wine-gitlab

[PATCH v2 0/3] MR6830: icmui: Add SetupColorMatchingW() stub.
by Mohamad Al-Jaf (＠maljaf) 21 Nov '24

21 Nov '24

Needed by ProSelect. -- v2: icmui/tests: Add some SetupColorMatchingW() tests. icmui: Add SetupColorMatchingW() stub. icmui: Add stub DLL. https://gitlab.winehq.org/wine/wine/-/merge_requests/6830

4 7

[PATCH 0/2] MR6868: win32u: Fix a couple of raw monitor DPI issues.
by Rémi Bernon 21 Nov '24

21 Nov '24

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

1 2

[PATCH v9 0/6] MR6640: propsys: Support converting to BSTR for PropVariantToVariant.
by Ziqing Hui (＠zhui) 21 Nov '24

21 Nov '24

This is based on top of !6526, will mark ready after !6526 is merged. -- v9: propsys: Support converting to BSTR for PropVariantToVariant. propsys: Use debugstr_variant for the trace in VariantToPropVariant. propsys: Implement PropVariantToBSTR. propsys/tests: Test truncating for PropVariantToString. propsys/tests: Test PropVariantToBSTR. propsys: Add PropVariantToBSTR stub. https://gitlab.winehq.org/wine/wine/-/merge_requests/6640

4 11

[PATCH v4 0/2] MR6787: wineps.drv: Use locale aware variants _sprintf_l and _sscanf_l. (ASan)
by Bernhard Übelacker 21 Nov '24

21 Nov '24

The pointer in tmplocale gets freed in the second setlocale call. Therefore ASan triggers when trying to restore the locale the the already freed pointer in tmplocale in the third call to setlocale. This appeared with a notepad.exe built with (a yet patched) llvm-mingw with ASan enabled, when opening the Printer Setup dialog. The stack traces seem to have utilized an in the wineprefix installed LLVM/llvm-symbolizer.exe. ``` wine64 notepad_asan.exe ================================================================= ==300==ERROR: AddressSanitizer: heap-use-after-free on address 0x7eeab5c60290 at pc 0x6ffffa80279f bp 0x7ffffe1fb570 sp 0x7ffffe1fb5b0 READ of size 2 at 0x7eeab5c60290 thread T0 0130:fixme:dbghelp:elf_search_auxv can't find symbol in module #0 0x6ffffa80279e in strchr+0x28e (C:\x86_64\libclang_rt.asan_dynamic-x86_64.dll+0x18004279e) #1 0x6ffffeb1666c in locale_to_sname Z:\home\bernhard\wine\dlls\msvcrt\locale.c:351 #2 0x6ffffeb16ce5 in create_locinfo Z:\home\bernhard\wine\dlls\msvcrt\locale.c:1357 #3 0x6ffffeb1a170 in setlocale Z:\home\bernhard\wine\dlls\msvcrt\locale.c:2054 #4 0x6ffffa1bf8c9 in PSDRV_ParsePPD Z:\home\bernhard\wine\dlls\wineps.drv\ppd.c:890 #5 0x6ffffa1bc0b7 in PSDRV_FindPrinterInfo Z:\home\bernhard\wine\dlls\wineps.drv\init.c:575 #6 0x6ffffa1b66b1 in DrvDocumentPropertySheets Z:\home\bernhard\wine\dlls\wineps.drv\driver.c:491 #7 0x6ffffc60b314 in DocumentPropertiesW Z:\home\bernhard\wine\dlls\winspool.drv\info.c:1854 #8 0x6ffffc611f97 in OpenPrinter2W Z:\home\bernhard\wine\dlls\winspool.drv\info.c:2057 #9 0x6ffffd666153 in PRINTDLG_ChangePrinterW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:1298 #10 0x6ffffd66786d in PRINTDLG_WMInitDialogW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:1660 #11 0x6ffffd667987 in PrintDlgProcW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:2126 #12 0x6ffffdc08d48 in call_dialog_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:129 #13 0x6ffffdc0b13b in WINPROC_CallDlgProcW Z:\home\bernhard\wine\dlls\user32\winproc.c:948 #14 0x6ffffdbcf528 in USER_DefDlgProc Z:\home\bernhard\wine\dlls\user32\defdlg.c:372 #15 0x6ffffdbcf7b4 in DefDlgProcW Z:\home\bernhard\wine\dlls\user32\defdlg.c:438 #16 0x6ffffdc08c2a in call_window_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:108 #17 0x6ffffdc0ac43 in dispatch_win_proc_params Z:\home\bernhard\wine\dlls\user32\winproc.c:725 #18 0x6ffffdbf179c in dispatch_send_message Z:\home\bernhard\wine\dlls\user32\message.c:580 #19 0x6ffffdbf32ee in SendMessageW Z:\home\bernhard\wine\dlls\user32\message.c:599 #20 0x6ffffdbd2d1a in DIALOG_CreateIndirect Z:\home\bernhard\wine\dlls\user32\dialog.c:676 #21 0x6ffffdbd4d1c in DialogBoxIndirectParamW Z:\home\bernhard\wine\dlls\user32\dialog.c:899 #22 0x6ffffd6692a7 in PrintDlgW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:2546 #23 0x000140007f9b in DIALOG_FilePrinterSetup Z:\home\bernhard\wine\programs\notepad\dialog.c:1019 #24 0x00014000e118 in NOTEPAD_WndProc Z:\home\bernhard\wine\programs\notepad\main.c:640 #25 0x6ffffdc08c2a in call_window_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:108 #26 0x6ffffdc0ac43 in dispatch_win_proc_params Z:\home\bernhard\wine\dlls\user32\winproc.c:725 #27 0x6ffffdbf1850 in dispatch_message Z:\home\bernhard\wine\dlls\user32\message.c:854 #28 0x6ffffdbf3afc in DispatchMessageW Z:\home\bernhard\wine\dlls\user32\message.c:940 #29 0x00014000c4ef in WinMain Z:\home\bernhard\wine\programs\notepad\main.c:888 #30 0x00014000ea3e in main+0x20e (C:\x86_64\notepad.exe_asan.exe+0x14000ea3e) #31 0x00014000e75a in mainCRTStartup Z:\home\bernhard\wine\dlls\msvcrt\crt_main.c:58 #32 0x6fffffa98d58 in BaseThreadInitThunk Z:\home\bernhard\wine\dlls\kernel32\thread.c:61 #33 0x6fffffc95afa (C:\windows\system32\ntdll.dll+0x170055afa) 0x7eeab5c60290 is located 0 bytes inside of 2-byte region [0x7eeab5c60290,0x7eeab5c60292) freed by thread T0 here: #0 0x6ffffa809ff1 in free+0x81 (C:\x86_64\libclang_rt.asan_dynamic-x86_64.dll+0x180049ff1) #1 0x6ffffeb1563c in free_locinfo Z:\home\bernhard\wine\dlls\msvcrt\locale.c:1071 #2 0x6ffffeb1591a in update_thread_locale Z:\home\bernhard\wine\dlls\msvcrt\locale.c:611 #3 0x6ffffeb1a301 in setlocale Z:\home\bernhard\wine\dlls\msvcrt\locale.c:2085 #4 0x6ffffa1bf890 in PSDRV_ParsePPD Z:\home\bernhard\wine\dlls\wineps.drv\ppd.c:887 #5 0x6ffffa1bc0b7 in PSDRV_FindPrinterInfo Z:\home\bernhard\wine\dlls\wineps.drv\init.c:575 #6 0x6ffffa1b66b1 in DrvDocumentPropertySheets Z:\home\bernhard\wine\dlls\wineps.drv\driver.c:491 #7 0x6ffffc60b314 in DocumentPropertiesW Z:\home\bernhard\wine\dlls\winspool.drv\info.c:1854 #8 0x6ffffc611f97 in OpenPrinter2W Z:\home\bernhard\wine\dlls\winspool.drv\info.c:2057 #9 0x6ffffd666153 in PRINTDLG_ChangePrinterW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:1298 #10 0x6ffffd66786d in PRINTDLG_WMInitDialogW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:1660 #11 0x6ffffd667987 in PrintDlgProcW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:2126 #12 0x6ffffdc08d48 in call_dialog_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:129 #13 0x6ffffdc0b13b in WINPROC_CallDlgProcW Z:\home\bernhard\wine\dlls\user32\winproc.c:948 #14 0x6ffffdbcf528 in USER_DefDlgProc Z:\home\bernhard\wine\dlls\user32\defdlg.c:372 #15 0x6ffffdbcf7b4 in DefDlgProcW Z:\home\bernhard\wine\dlls\user32\defdlg.c:438 #16 0x6ffffdc08c2a in call_window_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:108 #17 0x6ffffdc0ac43 in dispatch_win_proc_params Z:\home\bernhard\wine\dlls\user32\winproc.c:725 #18 0x6ffffdbf179c in dispatch_send_message Z:\home\bernhard\wine\dlls\user32\message.c:580 #19 0x6ffffdbf32ee in SendMessageW Z:\home\bernhard\wine\dlls\user32\message.c:599 #20 0x6ffffdbd2d1a in DIALOG_CreateIndirect Z:\home\bernhard\wine\dlls\user32\dialog.c:676 #21 0x6ffffdbd4d1c in DialogBoxIndirectParamW Z:\home\bernhard\wine\dlls\user32\dialog.c:899 #22 0x6ffffd6692a7 in PrintDlgW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:2546 #23 0x000140007f9b in DIALOG_FilePrinterSetup Z:\home\bernhard\wine\programs\notepad\dialog.c:1019 #24 0x00014000e118 in NOTEPAD_WndProc Z:\home\bernhard\wine\programs\notepad\main.c:640 #25 0x6ffffdc08c2a in call_window_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:108 #26 0x6ffffdc0ac43 in dispatch_win_proc_params Z:\home\bernhard\wine\dlls\user32\winproc.c:725 #27 0x6ffffdbf1850 in dispatch_message Z:\home\bernhard\wine\dlls\user32\message.c:854 previously allocated by thread T0 here: #0 0x6ffffa80a111 in malloc+0x81 (C:\x86_64\libclang_rt.asan_dynamic-x86_64.dll+0x18004a111) #1 0x6ffffeb154f9 in init_category_name Z:\home\bernhard\wine\dlls\msvcrt\locale.c:474 #2 0x6ffffeb18ad9 in create_locinfo Z:\home\bernhard\wine\dlls\msvcrt\locale.c:1930 #3 0x6ffffeb1a170 in setlocale Z:\home\bernhard\wine\dlls\msvcrt\locale.c:2054 #4 0x6ffffa1bf8c9 in PSDRV_ParsePPD Z:\home\bernhard\wine\dlls\wineps.drv\ppd.c:890 #5 0x6ffffa1bc0b7 in PSDRV_FindPrinterInfo Z:\home\bernhard\wine\dlls\wineps.drv\init.c:575 #6 0x6ffffa1b66b1 in DrvDocumentPropertySheets Z:\home\bernhard\wine\dlls\wineps.drv\driver.c:491 #7 0x6ffffc60b314 in DocumentPropertiesW Z:\home\bernhard\wine\dlls\winspool.drv\info.c:1854 #8 0x6ffffc611f97 in OpenPrinter2W Z:\home\bernhard\wine\dlls\winspool.drv\info.c:2057 #9 0x6ffffd666153 in PRINTDLG_ChangePrinterW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:1298 #10 0x6ffffd66786d in PRINTDLG_WMInitDialogW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:1660 #11 0x6ffffd667987 in PrintDlgProcW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:2126 #12 0x6ffffdc08d48 in call_dialog_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:129 #13 0x6ffffdc0b13b in WINPROC_CallDlgProcW Z:\home\bernhard\wine\dlls\user32\winproc.c:948 #14 0x6ffffdbcf528 in USER_DefDlgProc Z:\home\bernhard\wine\dlls\user32\defdlg.c:372 #15 0x6ffffdbcf7b4 in DefDlgProcW Z:\home\bernhard\wine\dlls\user32\defdlg.c:438 #16 0x6ffffdc08c2a in call_window_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:108 #17 0x6ffffdc0ac43 in dispatch_win_proc_params Z:\home\bernhard\wine\dlls\user32\winproc.c:725 #18 0x6ffffdbf179c in dispatch_send_message Z:\home\bernhard\wine\dlls\user32\message.c:580 #19 0x6ffffdbf32ee in SendMessageW Z:\home\bernhard\wine\dlls\user32\message.c:599 #20 0x6ffffdbd2d1a in DIALOG_CreateIndirect Z:\home\bernhard\wine\dlls\user32\dialog.c:676 #21 0x6ffffdbd4d1c in DialogBoxIndirectParamW Z:\home\bernhard\wine\dlls\user32\dialog.c:899 #22 0x6ffffd6692a7 in PrintDlgW Z:\home\bernhard\wine\dlls\comdlg32\printdlg.c:2546 #23 0x000140007f9b in DIALOG_FilePrinterSetup Z:\home\bernhard\wine\programs\notepad\dialog.c:1019 #24 0x00014000e118 in NOTEPAD_WndProc Z:\home\bernhard\wine\programs\notepad\main.c:640 #25 0x6ffffdc08c2a in call_window_proc Z:\home\bernhard\wine\dlls\user32\winproc.c:108 #26 0x6ffffdc0ac43 in dispatch_win_proc_params Z:\home\bernhard\wine\dlls\user32\winproc.c:725 #27 0x6ffffdbf1850 in dispatch_message Z:\home\bernhard\wine\dlls\user32\message.c:854 SUMMARY: AddressSanitizer: heap-use-after-free Z:\home\bernhard\wine\dlls\msvcrt\locale.c:351 in locale_to_sname Shadow bytes around the buggy address: 0x7eeab5c60000: fa fa 00 00 fa fa 00 06 fa fa 00 fa fa fa 00 00 0x7eeab5c60080: fa fa fd fa fa fa fd fa fa fa fd fa fa fa fd fa 0x7eeab5c60100: fa fa fd fa fa fa fd fa fa fa fd fa fa fa fd fa 0x7eeab5c60180: fa fa fd fa fa fa fd fa fa fa fd fa fa fa fd fa 0x7eeab5c60200: fa fa fd fa fa fa fd fa fa fa fd fa fa fa fd fa =>0x7eeab5c60280: fa fa[fd]fa fa fa fd fa fa fa fd fa fa fa fd fa 0x7eeab5c60300: fa fa 02 fa fa fa 04 fa fa fa 02 fa fa fa 04 fa 0x7eeab5c60380: fa fa 02 fa fa fa 04 fa fa fa 02 fa fa fa 04 fa 0x7eeab5c60400: fa fa 02 fa fa fa 04 fa fa fa 00 fa fa fa fd fd 0x7eeab5c60480: fa fa fd fd fa fa fd fd fa fa fd fd fa fa fd fd 0x7eeab5c60500: fa fa fd fd fa fa fd fd fa fa fd fd fa fa fd fd 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 ==300==ABORTING ``` -- v4: wineps.drv: Use locale aware variants _sprintf_l and _sscanf_l. (ASan) stdio.h: Add ucrt _sprintf_l declaration. https://gitlab.winehq.org/wine/wine/-/merge_requests/6787

2 3

[PATCH 0/1] MR6867: kernel32: Add GetCurrentPackageInfo() stub.
by Zhiyi Zhang (＠zhiyi) 21 Nov '24

21 Nov '24

For React Native. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6867

3 2

[PATCH 0/1] MR6735: msxml3: Undo removal of xmlThrDefTreeIndentString
by Fabian Maurer (＠DarkShadow44) 21 Nov '24

21 Nov '24

Fixes regression by 9d34c44d8464722c333fdde5313b341504d3ea44. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57325 Not sure why this was removed, but it breaks the office installer. If this is not the right course of action, please tell me and I'll try to find a different solution. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6735

7 21

Re: [PATCH v4 0/4] MR6835: wintrust: Implement support for CryptCATAdminAcquireContext2 and CryptCATAdminCalcHashFromFileHandle2
by Hans Leidekker (＠hans) 21 Nov '24

21 Nov '24

Thanks, looks good overall. Could you address the minor issues I pointed out? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6835#note_88258

1 0

Re: [PATCH v4 0/4] MR6835: wintrust: Implement support for CryptCATAdminAcquireContext2 and CryptCATAdminCalcHashFromFileHandle2
by Hans Leidekker (＠hans) 21 Nov '24

21 Nov '24

Hans Leidekker (@hans) commented about dlls/wintrust/crypt.c: > + ALG_ID alg; > + const WCHAR *providerName; > + DWORD providerType; > > - TRACE("%p %s %lx\n", catAdmin, debugstr_guid(sys), dwFlags); > + TRACE("%p %s %s %p %lx\n", catAdmin, debugstr_guid(sys), debugstr_w(algorithm), policy, dwFlags); > > if (!catAdmin || dwFlags) > { > SetLastError(ERROR_INVALID_PARAMETER); > return FALSE; > } > + > + if (policy != NULL) { > + FIXME("strong policy parameter is unimplemented\n"); > + } Please put opening braces on a new line like in the rest of the file. Here you can omit the braces. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6835#note_88256

1 0

Re: [PATCH v4 0/4] MR6835: wintrust: Implement support for CryptCATAdminAcquireContext2 and CryptCATAdminCalcHashFromFileHandle2
by Hans Leidekker (＠hans) 21 Nov '24

21 Nov '24

Hans Leidekker (@hans) commented about dlls/wintrust/crypt.c: > -/*********************************************************************** > - * CryptCATAdminCalcHashFromFileHandle (WINTRUST.@) > - */ > -BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD *pcbHash, BYTE *pbHash, DWORD dwFlags) > +static BOOL catadmin_calc_hash_from_filehandle(HCATADMIN catAdmin, HANDLE hFile, DWORD *pcbHash, > + BYTE *pbHash, DWORD dwFlags) > { > BOOL ret = FALSE; > - > - TRACE("%p %p %p %lx\n", hFile, pcbHash, pbHash, dwFlags); > + struct catadmin *ca = catAdmin; > + ALG_ID alg = CALG_SHA1; > + const WCHAR *providerName = MS_DEF_PROV_W; > + DWORD providerType = PROV_RSA_FULL; > + DWORD hashLength = 20; > No need to initialize hashLength here. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6835#note_88255

1 0

Re: [PATCH v4 0/4] MR6835: wintrust: Implement support for CryptCATAdminAcquireContext2 and CryptCATAdminCalcHashFromFileHandle2
by Hans Leidekker (＠hans) 21 Nov '24

21 Nov '24

Hans Leidekker (@hans) commented about dlls/wintrust/tests/crypt.c: > DeleteFileA(temp); > } > > +static void test_calchash2(void) > +{ Please merge added tests with test_calchash(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6835#note_88257

1 0