wine-commits December 2022

wine-commits@winehq.org

1 participants
539 discussions

Alex Henrie : include: Annotate WSDAllocateLinkedMemory with __WINE_(ALLOC_SIZE|MALLOC).
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 803c616f7e9ed99353bc6729627e72c26d59756a URL: https://gitlab.winehq.org/wine/wine/-/commit/803c616f7e9ed99353bc6729627e72… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 7 00:23:57 2022 -0700 include: Annotate WSDAllocateLinkedMemory with __WINE_(ALLOC_SIZE|MALLOC). --- include/wsdutil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wsdutil.h b/include/wsdutil.h index 402a4130bbc..b118fcf7861 100644 --- a/include/wsdutil.h +++ b/include/wsdutil.h @@ -19,7 +19,7 @@ #ifndef WSDUTIL_H #define WSDUTIL_H -void * WINAPI WSDAllocateLinkedMemory(void *pParent, SIZE_T cbSize); +void * WINAPI WSDAllocateLinkedMemory(void *parent, SIZE_T size) __WINE_ALLOC_SIZE(2) __WINE_MALLOC; void WINAPI WSDAttachLinkedMemory(void *pParent, void *pChild); void WINAPI WSDDetachLinkedMemory(void *pVoid); void WINAPI WSDFreeLinkedMemory(void *pVoid);

1 0

Zebediah Figura : wined3d: Require depth clip control to create a feature level 10.0 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 5f89b343b06314c2b213f94b67b3ca90afec507b URL: https://gitlab.winehq.org/wine/wine/-/commit/5f89b343b06314c2b213f94b67b3ca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:39:35 2022 -0600 wined3d: Require depth clip control to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index da70a1b3183..d38882ff5ab 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2257,6 +2257,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info return shader_model >= 4 && info->features2.features.multiViewport && info->features2.features.geometryShader + && info->features2.features.depthClamp && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Require indirect draw first instance support to create a feature level 11.0 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: d7f7790ae8bc783c7eee1c67ff8a53703d6b42c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7f7790ae8bc783c7eee1c67ff8a53… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:32:07 2022 -0600 wined3d: Require indirect draw first instance support to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5a1a183ee0d..da70a1b3183 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2270,6 +2270,7 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info { return shader_model >= 5 && info->features2.features.multiDrawIndirect + && info->features2.features.drawIndirectFirstInstance && info->features2.features.tessellationShader; }

1 0

Zebediah Figura : wined3d: Require multiple indirect draw support to create a feature level 11.0 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: c59b674ed8d851fa4fe7425e5a78ea92a45735c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c59b674ed8d851fa4fe7425e5a78ea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 13 20:39:07 2022 -0500 wined3d: Require multiple indirect draw support to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d5c21b06a53..5a1a183ee0d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2269,6 +2269,7 @@ static bool feature_level_10_1_supported(const struct wined3d_physical_device_in static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 5 + && info->features2.features.multiDrawIndirect && info->features2.features.tessellationShader; }

1 0

Zebediah Figura : wined3d: Require texture cube array support to create a feature level 10.1 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: ca6bac9079d6a37e9c64edd9dd21243710d789fd URL: https://gitlab.winehq.org/wine/wine/-/commit/ca6bac9079d6a37e9c64edd9dd2124… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 13 20:24:20 2022 -0500 wined3d: Require texture cube array support to create a feature level 10.1 device. --- dlls/wined3d/adapter_vk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 376f162cb8c..d5c21b06a53 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2261,6 +2261,11 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; } +static bool feature_level_10_1_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) +{ + return info->features2.features.imageCubeArray; +} + static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 5 @@ -2289,6 +2294,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (!feature_level_10_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_3; + if (!feature_level_10_1_supported(info, shader_model)) + return WINED3D_FEATURE_LEVEL_10; + if (!feature_level_11_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_10_1;

1 0

Zebediah Figura : wined3d: Require tessellation shaders to create a feature level 11.0 device.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: bc6907ee5862a2536c8d07f75257c32c2dfaf01c URL: https://gitlab.winehq.org/wine/wine/-/commit/bc6907ee5862a2536c8d07f75257c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 13 19:00:57 2022 -0500 wined3d: Require tessellation shaders to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 45b29e8dd97..376f162cb8c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2261,6 +2261,12 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; } +static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) +{ + return shader_model >= 5 + && info->features2.features.tessellationShader; +} + static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_physical_device_info *info, const struct shader_caps *shader_caps) { @@ -2283,7 +2289,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (!feature_level_10_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_3; - if (shader_model <= 4) + if (!feature_level_11_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_10_1; return WINED3D_FEATURE_LEVEL_11_1;

1 0

Sven Baars : win32u: Pass the client instance to NtUserCreateWindowEx.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: f8a0716111d01c36613a3fcc221353efd8f7ca1e URL: https://gitlab.winehq.org/wine/wine/-/commit/f8a0716111d01c36613a3fcc221353… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Dec 6 18:32:01 2022 +0100 win32u: Pass the client instance to NtUserCreateWindowEx. On 16-bit the module instance and client instance are different. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53568 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53646 --- dlls/user32/win.c | 2 +- dlls/win32u/window.c | 4 ++-- dlls/wow64win/user.c | 4 ++-- include/ntuser.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d8869b2b9db..150c334b9d8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -399,7 +399,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, hwnd = NtUserCreateWindowEx( cs->dwExStyle, &class, NULL, &window_name, cs->style, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, menu, module, - cs->lpCreateParams, 0, NULL, 0, !unicode ); + cs->lpCreateParams, 0, cs->hInstance, 0, !unicode ); if (!hwnd && menu && menu != cs->hMenu) NtUserDestroyMenu( menu ); if (!unicode && window_name.Buffer != name_buf) RtlFreeUnicodeString( &window_name ); return hwnd; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index d6fabff2cf1..9a8963ce2a1 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5022,7 +5022,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, UNICODE_STRING *version, UNICODE_STRING *window_name, DWORD style, INT x, INT y, INT cx, INT cy, HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *client_cbtc, DWORD unk, BOOL ansi ) + DWORD flags, HINSTANCE client_instance, DWORD unk, BOOL ansi ) { UINT win_dpi, thread_dpi = get_thread_dpi(); DPI_AWARENESS_CONTEXT context; @@ -5036,7 +5036,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; cs.lpCreateParams = params; - cs.hInstance = instance; + cs.hInstance = client_instance ? client_instance : instance; cs.hMenu = menu; cs.hwndParent = parent; cs.style = style; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 447e8f84495..afc73ca1322 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1471,7 +1471,7 @@ NTSTATUS WINAPI wow64_NtUserCreateWindowEx( UINT *args ) HINSTANCE instance = get_handle( &args ); void *params = get_ptr( &args ); DWORD flags = get_ulong( &args ); - void *cbtc = get_ptr( &args ); + HINSTANCE client_instance = get_handle( &args ); DWORD unk = get_ulong( &args ); BOOL ansi = get_ulong( &args ); @@ -1483,7 +1483,7 @@ NTSTATUS WINAPI wow64_NtUserCreateWindowEx( UINT *args ) unicode_str_32to64( &version, version32 ), unicode_str_32to64( &window_name, window_name32 ), style, x, y, width, height, parent, menu, - instance, params, flags, cbtc, unk, ansi ); + instance, params, flags, client_instance, unk, ansi ); return HandleToUlong( ret ); } diff --git a/include/ntuser.h b/include/ntuser.h index b83ae2418d3..3c41e435712 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -678,7 +678,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, UNICODE_STRING *version, UNICODE_STRING *window_name, DWORD style, INT x, INT y, INT cx, INT cy, HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ); + DWORD flags, HINSTANCE client_instance, DWORD unk, BOOL ansi ); HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK mask, ULONG arg3, ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y,

1 0

Zhiyi Zhang : Revert "ntdll: Call usleep() instead of NtYieldExecution() in NtDelayExecution().".
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: fc3b2ebaf4d92a77025f5c532a2415ada8de69c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc3b2ebaf4d92a77025f5c532a2415… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 7 10:17:25 2022 +0800 Revert "ntdll: Call usleep() instead of NtYieldExecution() in NtDelayExecution().". Manual tests on Windows 10 show that calling Sleep(0) or NtDelayExecution() with zero timeout in a loop do consume 100% of a CPU core, which is closer to the behavior of NtYieldExecution() than usleep(0). usleep(0) gives up the remaining timeslices even if there are no other threads to switch to, causing low utilization of CPU and performance issues. The original patch is b1a79c6 and the idea is to use usleep(0) to avoid a thread taking 100% of a CPU core for StarCraft 2 and Shadow of the Tomb Raider. However with wine-7.22, reverting the usleep(0) patch causes no behavior changes. For Shadow of the Tomb Raider, the 100% CPU issue is gone with or without the patch. For StarCraft 2, there is always a thread taking 100% CPU even with the patch. After discussing with Matteo, we decided it's better to revert the patch. Fix Mortal Kombat X performance drop during tower selection and Ragnarok Online bad performance. This reverts commit e86b4015ff405d4c054b8a5bc855ee655e1a833c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53327 --- dlls/ntdll/unix/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 650e32a7d41..a0905963562 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1494,7 +1494,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou } /* Note that we yield after establishing the desired timeout */ - usleep(0); + NtYieldExecution(); if (!when) return STATUS_SUCCESS; for (;;)

1 0

Piotr Caban : wineps: Support parsing EMRI_METAFILE_EXT records.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 2c76c73ade2606162fbea4b9bcebd0e5f2245052 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c76c73ade2606162fbea4b9bcebd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 18:41:49 2022 +0100 wineps: Support parsing EMRI_METAFILE_EXT records. --- dlls/wineps.drv/printproc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index d671035fcb9..b7b4749afcd 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -127,6 +127,55 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } +static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, + const ENHMETARECORD *rec, int n, LPARAM arg) +{ + FIXME("unsupported record: %ld\n", rec->iType); + return 1; +} + +static BOOL print_metafile(struct pp_data *data, HANDLE hdata) +{ + record_hdr header; + HENHMETAFILE hmf; + BYTE *buf; + BOOL ret; + DWORD r; + + if (!ReadPrinter(hdata, &header, sizeof(header), &r)) + return FALSE; + if (r != sizeof(header)) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + buf = malloc(header.cjSize); + if (!buf) + return FALSE; + + if (!ReadPrinter(hdata, buf, header.cjSize, &r)) + { + free(buf); + return FALSE; + } + if (r != header.cjSize) + { + free(buf); + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + hmf = SetEnhMetaFileBits(header.cjSize, buf); + free(buf); + if (!hmf) + return FALSE; + + ret = EnumEnhMetaFile(NULL, hmf, hmf_proc, NULL, NULL); + DeleteEnhMetaFile(hmf); + return ret; +} + BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) { @@ -197,9 +246,9 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) { struct pp_data *data = get_handle_data(pp); emfspool_header header; + LARGE_INTEGER pos, cur; record_hdr record; HANDLE spool_data; - LARGE_INTEGER pos; DOC_INFO_1W info; BOOL ret; DWORD r; @@ -261,6 +310,30 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) if (!ret) goto cleanup; break; + case EMRI_METAFILE_EXT: + case EMRI_BW_METAFILE_EXT: + pos.QuadPart = 0; + ret = SeekPrinter(spool_data, pos, &cur, FILE_CURRENT, FALSE); + if (ret) + { + cur.QuadPart += record.cjSize; + ret = ReadPrinter(spool_data, &pos, sizeof(pos), &r); + if (r != sizeof(pos)) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + } + pos.QuadPart = -pos.QuadPart - 2 * sizeof(record); + if (ret) + ret = SeekPrinter(spool_data, pos, NULL, FILE_CURRENT, FALSE); + if (ret) + ret = print_metafile(data, spool_data); + if (ret) + ret = SeekPrinter(spool_data, cur, NULL, FILE_BEGIN, FALSE); + if (!ret) + goto cleanup; + break; default: FIXME("%s not supported, skipping\n", debugstr_rec_type(record.ulID)); pos.QuadPart = record.cjSize;

1 0

Piotr Caban : wineps: Skip EMRI_METAFILE_DATA record silently.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 659b4e511d538feab02390f294ce91a959bb753f URL: https://gitlab.winehq.org/wine/wine/-/commit/659b4e511d538feab02390f294ce91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 17:57:03 2022 +0100 wineps: Skip EMRI_METAFILE_DATA record silently. --- dlls/wineps.drv/printproc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 8b9048c673e..d671035fcb9 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -255,6 +255,12 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) switch (record.ulID) { + case EMRI_METAFILE_DATA: + pos.QuadPart = record.cjSize; + ret = SeekPrinter(spool_data, pos, NULL, FILE_CURRENT, FALSE); + if (!ret) + goto cleanup; + break; default: FIXME("%s not supported, skipping\n", debugstr_rec_type(record.ulID)); pos.QuadPart = record.cjSize;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2022