- Wine-Devel - list.winehq.org

[RFC PATCH v4 0/7] gdi32/win32u: Enhanced Metafile generation enhancements
by Jinoh Kang Oct. 18, 2021

Oct. 18, 2021

The following commits modify the behaviours of the following GDI functions: - StretchDIBits - SetDIBitsToDevice To match more closely to that of Windows 10, build 2108, subject to the following constraints: - The source image is not a JPEG (BI_JPEG) or a PNG (BI_PNG) image. - The source image is a *bottom-up* device-independent bitmap. Changelog: - v1 -> v2: add more tests, do extra work so that EMF outputs match - v2 -> v3: emf_parse_user_bitmapinfo: zero out *dst (BITMAPINFOHEADER) (gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.) - v3 -> v4: no changes (resend due to borked up patch orders) Jinoh Kang (7): gdi32/tests: Add tests for recording StretchDIBits in EMFs. gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs. win32u: fix return value of StretchDIBits for EMF DC. win32u: fix return value of SetDIBitsToDevice for EMF DC. gdi32: fix bounding box calculation for EMR_STRETCHDIBITS. gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC. gdi32: calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE. dlls/gdi32/emfdc.c | 224 ++- dlls/gdi32/tests/metafile.c | 2803 +++++++++++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 11 +- 3 files changed, 3019 insertions(+), 19 deletions(-) -- 2.31.1

1 8

[PATCH] winebus.sys: Include dev/evdev/input.h
by Gerald Pfeifer Oct. 18, 2021

Oct. 18, 2021

Commit de7032816bd71d0edda30a78721e79b5b6af735c added the use of BUS_BLUETOOTH which on GNU/Linux comes from linux/input.h. Also check for dev/evdev/input.h to support other platforms such as FreeBSD. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- configure | 1 + configure.ac | 1 + dlls/winebus.sys/bus_udev.c | 4 ++++ include/config.h.in | 3 +++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index d1edbdc684a..93bf6571d56 100755 --- a/configure +++ b/configure @@ -7475,6 +7475,7 @@ for ac_header in \ arpa/nameser.h \ asm/types.h \ asm/user.h \ + dev/evdev/input.h \ dirent.h \ elf.h \ float.h \ diff --git a/configure.ac b/configure.ac index da6ecf5a7a8..b281bb274b2 100644 --- a/configure.ac +++ b/configure.ac @@ -445,6 +445,7 @@ AC_CHECK_HEADERS(\ arpa/nameser.h \ asm/types.h \ asm/user.h \ + dev/evdev/input.h \ dirent.h \ elf.h \ float.h \ diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b857ba25df8..10b4b4eadd6 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -59,6 +59,10 @@ # endif #endif +#ifdef HAVE_DEV_EVDEV_INPUT_H +#include <dev/evdev/input.h> +#endif + #include <pthread.h> #include "ntstatus.h" diff --git a/include/config.h.in b/include/config.h.in index f899dc27459..9bbf400e550 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -49,6 +49,9 @@ /* Define to 1 if you have the <cups/ppd.h> header file. */ #undef HAVE_CUPS_PPD_H +/* Define to 1 if you have the <dev/evdev/input.h> header file. */ +#undef HAVE_DEV_EVDEV_INPUT_H + /* Define to 1 if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H -- 2.32.0

2 4

[PATCH] winebus.sys: Define BUS_BLUETOOTH if it is missing.
by Rémi Bernon Oct. 18, 2021

Oct. 18, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- We are using it for the hidraw backend too, even if linux/input.h has not been found (and it may also very well be missing there, like on FreeBSD). dlls/winebus.sys/bus_udev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b857ba25df8..e137299df77 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -59,6 +59,10 @@ # endif #endif +#ifndef BUS_BLUETOOTH +# define BUS_BLUETOOTH 5 +#endif + #include <pthread.h> #include "ntstatus.h" -- 2.33.0

1 0

[PATCH 0/8] winedbg: polish a few rough edges in gdbproxy
by Jinoh Kang Oct. 18, 2021

Oct. 18, 2021

Jinoh Kang (8): winedbg: crash when allocation fails in packet_realloc(). winedbg: free buffer and return NULL if size==0 in packet_realloc(). winedbg: generalise packet_realloc(), rename to buffer_realloc(). winedbg: Use unsigned int for offset/length in GDB qXfer handler. winedbg: escape special characters in GDB packet reply. winedbg: buffer and escape output of GDB qXfer commands. winedbg: cache GDB qXfer command result for chunked fetching and define handler table. winedbg: Implement GDB qXfer object annex exec-file. programs/winedbg/gdbproxy.c | 565 ++++++++++++++++++++++++++++-------- 1 file changed, 452 insertions(+), 113 deletions(-) -- 2.31.1

2 10

[PATCH v2 00/21] Introduce FIXME_ONCE macro
by David Kahurani Oct. 18, 2021

Oct. 18, 2021

The following patches introduce the FIXME_ONCE macro which suppresses repeated FIXMEs into WARNings. The current FIXME macro tends to be insufficient in cases where a developer wishes to suppresses fixmes other than the first. It is based on the vkd3d version. v2: Fix programming mistakes, fixed a test and some formating David Kahurani (21): include/wine: suppress subsequent FIXMEs into WARNINGs dlls/kernelbase: Use FIXME_ONCE dlls/ntdll: Use FIXME_ONCE dlls/gdiplus: Use FIXME_ONCE dlls/kernel32: Use FIXME_ONCE dlls/msvcrt: Use FIXME_ONCE dlls/dwrite: Use FIXME_ONCE dlls/gdi32: Use FIXME_ONCE dlls/advapi32: Use FIXME_ONCE dlls/dxgi: Use FIXME_ONCE dlls/iphlpapi: Use FIXME_ONCE dlls/jscript: Use FIXME_ONCE dlls/msctf: Use FIXME_ONCE dlls/ntoskrnl.exe: Use FIXME_ONCE dlls/rpcrt4: Use FIXME_ONCE dlls/sechost: Use FIXME_ONCE dlls/wbemprox: Use FIXME_ONCE dlls/winecoreaudio.drv: Use FIXME_ONCE dlls/wined3d: Use FIXME_ONCE dlls/wtsapi32: Use FIXME_ONCE dlls/xinput1_3: Use FIXME_ONCE dlls/advapi32/eventlog.c | 3 +-- dlls/dwrite/analyzer.c | 5 +---- dlls/dwrite/font.c | 5 +---- dlls/dxgi/adapter.c | 4 +--- dlls/gdi32/uniscribe/opentype.c | 20 +++++--------------- dlls/gdi32/uniscribe/usp10.c | 6 ++---- dlls/gdiplus/graphics.c | 26 +++++++------------------- dlls/gdiplus/graphicspath.c | 4 +--- dlls/gdiplus/metafile.c | 9 ++------- dlls/iphlpapi/iphlpapi_main.c | 4 +--- dlls/jscript/global.c | 4 +--- dlls/kernel32/console.c | 4 +--- dlls/kernel32/process.c | 3 +-- dlls/kernelbase/locale.c | 10 ++++------ dlls/kernelbase/main.c | 5 +---- dlls/kernelbase/process.c | 3 +-- dlls/kernelbase/sync.c | 3 +-- dlls/kernelbase/thread.c | 3 +-- dlls/msctf/inputprocessor.c | 9 ++------- dlls/msvcrt/concurrency.c | 3 +-- dlls/msvcrt/cpp.c | 3 +-- dlls/ntdll/misc.c | 4 +--- dlls/ntdll/unix/socket.c | 19 ++++--------------- dlls/ntdll/unix/system.c | 8 +++----- dlls/ntdll/unix/thread.c | 3 +-- dlls/ntdll/unix/virtual.c | 9 +++------ dlls/ntoskrnl.exe/ntoskrnl.c | 3 +-- dlls/rpcrt4/ndr_marshall.c | 10 ++-------- dlls/sechost/trace.c | 3 +-- dlls/wbemprox/class.c | 6 ++---- dlls/winecoreaudio.drv/audiounit.c | 6 ++---- dlls/wined3d/state.c | 4 +--- dlls/wtsapi32/wtsapi32.c | 3 +-- dlls/xinput1_3/main.c | 4 +--- include/wine/debug.h | 29 +++++++++++++++++++++++++++++ 35 files changed, 89 insertions(+), 158 deletions(-) -- 2.33.0

3 26

[PATCH 3/3] ucrtbase: Avoid bool optimization in __std_exception_copy.
by Piotr Caban Oct. 18, 2021

Oct. 18, 2021

Otherwise GCC changes do_free = 1 assignment to *dst = *src which breaks ucrtbase/cpp tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/3] ucrtbase: Change _isblank_l return value for '\t'.
by Piotr Caban Oct. 18, 2021

Oct. 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 5 ++++- dlls/ucrtbase/tests/misc.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-)

1 0

[PATCH 1/3] ucrtbase: Fix fopen x mode test failures.
by Piotr Caban Oct. 18, 2021

Oct. 18, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51894 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH] dwrite: Add properties for new Unicode 13 scripts.
by Nikolay Sivov Oct. 18, 2021

Oct. 18, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 4 ++++ dlls/dwrite/scripts.h | 6 +++++- tools/make_unicode | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 89c76da0bb9..e8a30a7ae45 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -198,6 +198,10 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Hmnp */ { 0x706e6d48, 451, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('h','m','n','p') } }, { /* Nand */ { 0x646e614e, 311, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, { _OT('n','a','n','d') } }, { /* Wcho */ { 0x6f686357, 283, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('w','c','h','o') } }, + { /* Chrs */ { 0x73726843, 109, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 }, { _OT('c','h','r','s') } }, + { /* Diak */ { 0x6b616944, 342, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('d','i','a','k') } }, + { /* Kits */ { 0x7374694b, 288, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 }, { _OT('k','i','t','s') } }, + { /* Yezi */ { 0x697a6559, 192, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('y','e','z','i') } }, }; #undef _OT diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index 594d9edea87..fbc467c38bb 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -156,5 +156,9 @@ enum unicode_script_id { Script_Nyiakeng_Puachue_Hmong = 150, Script_Nandinagari = 151, Script_Wancho = 152, - Script_LastId = 152 + Script_Chorasmian = 153, + Script_Dives_Akuru = 154, + Script_Khitan_Small_Script = 155, + Script_Yezidi = 156, + Script_LastId = 156 }; diff --git a/tools/make_unicode b/tools/make_unicode index 4c9d3d6d988..2bfe6f9bb32 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1512,6 +1512,11 @@ my %scripts = "Nyiakeng_Puachue_Hmong" => 150, "Nandinagari" => 151, "Wancho" => 152, + # Win11 + "Chorasmian" => 153, + "Dives_Akuru" => 154, + "Khitan_Small_Script" => 155, + "Yezidi" => 156, ); ################################################################ -- 2.33.0

1 0

[PATCH 1/2] ntdll: Store module check sum in WINE_MODREF.
by Paul Gofman Oct. 18, 2021

Oct. 18, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/loader.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 797d72aedb6..dd41d6b66d2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -136,6 +136,7 @@ typedef struct _wine_modref int alloc_deps; int nDeps; struct _wine_modref **deps; + ULONG CheckSum; } WINE_MODREF; static UINT tls_module_count; /* number of modules with TLS directory */ @@ -220,16 +221,17 @@ static RTL_UNLOAD_EVENT_TRACE unload_traces[RTL_UNLOAD_EVENT_TRACE_NUMBER]; static RTL_UNLOAD_EVENT_TRACE *unload_trace_ptr; static unsigned int unload_trace_seq; -static void module_push_unload_trace( const LDR_DATA_TABLE_ENTRY *ldr ) +static void module_push_unload_trace( const WINE_MODREF *wm ) { RTL_UNLOAD_EVENT_TRACE *ptr = &unload_traces[unload_trace_seq]; + const LDR_DATA_TABLE_ENTRY *ldr = &wm->ldr; unsigned int len = min(sizeof(ptr->ImageName) - sizeof(WCHAR), ldr->BaseDllName.Length); ptr->BaseAddress = ldr->DllBase; ptr->SizeOfImage = ldr->SizeOfImage; ptr->Sequence = unload_trace_seq; ptr->TimeDateStamp = ldr->TimeDateStamp; - ptr->CheckSum = ldr->CheckSum; + ptr->CheckSum = wm->CheckSum; memcpy(ptr->ImageName, ldr->BaseDllName.Buffer, len); ptr->ImageName[len / sizeof(*ptr->ImageName)] = 0; @@ -1222,7 +1224,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_INTERNAL : 0); wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; - wm->ldr.CheckSum = nt->OptionalHeader.CheckSum; + wm->CheckSum = nt->OptionalHeader.CheckSum; wm->ldr.TimeDateStamp = nt->FileHeader.TimeDateStamp; if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, nt_name->Length - 3 * sizeof(WCHAR) ))) @@ -2350,7 +2352,8 @@ static WINE_MODREF *find_existing_module( HMODULE module ) { mod = CONTAINING_RECORD( entry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks ); if (mod->TimeDateStamp != nt->FileHeader.TimeDateStamp) continue; - if (mod->CheckSum != nt->OptionalHeader.CheckSum) continue; + wm = CONTAINING_RECORD( mod, WINE_MODREF, ldr ); + if (wm->CheckSum != nt->OptionalHeader.CheckSum) continue; if (NtAreMappedFilesTheSame( mod->DllBase, module ) != STATUS_SUCCESS) continue; return CONTAINING_RECORD( mod, WINE_MODREF, ldr ); } @@ -3592,7 +3595,7 @@ static void MODULE_DecRefCount( WINE_MODREF *wm ) wm->ldr.Flags &= ~LDR_UNLOAD_IN_PROGRESS; - module_push_unload_trace( &wm->ldr ); + module_push_unload_trace( wm ); } } -- 2.31.1

1 1