August 2022 - Wine-commits - list.winehq.org

Stefan Dösinger : ddraw: Don't account video memory for sysmem surfaces' draw textures.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 8bddb9808eb5b79bc03a06c20a9b23fc34537d5e URL: https://gitlab.winehq.org/wine/wine/-/commit/8bddb9808eb5b79bc03a06c20a9b23… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 25 10:09:29 2022 +0300 ddraw: Don't account video memory for sysmem surfaces' draw textures. Star Trek Starfleet Academy does not like it when available video memory goes down after creating a system memory resource. It destroys all its textures and recreates them, and in some sitations forgets to recreate one or another texture, resulting in rendering bugs. I suspect the game is trying to detect focus loss by monitoring for unexpected video memory changes. --- dlls/ddraw/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 421ce68fa1c..afba0d5ac4b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5998,6 +5998,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(DDSURFACEDESC2 *desc, struct draw_texture_desc = *wined3d_desc; draw_texture_desc.bind_flags = bind_flags; draw_texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + draw_texture_desc.usage = WINED3DUSAGE_PRIVATE; if (FAILED(hr = wined3d_texture_create(wined3d_device, &draw_texture_desc, layers, levels, 0, NULL, texture, &ddraw_texture_wined3d_parent_ops, &draw_texture)))

1 0

Stefan Dösinger : ddraw/tests: Add some video memory accounting tests.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 7fa1259823c7a07ca51930578f00acd6a9657229 URL: https://gitlab.winehq.org/wine/wine/-/commit/7fa1259823c7a07ca51930578f00ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 26 15:50:03 2022 +0300 ddraw/tests: Add some video memory accounting tests. --- dlls/ddraw/tests/ddraw1.c | 52 ++++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw2.c | 54 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw4.c | 54 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw7.c | 54 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 202 insertions(+), 12 deletions(-)

1 0

Brendan Shanks : ntdll: Use correct mcontext struct on macOS under Wow64.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: eb64d4a9adcc0765a6b9e64eb443a08778c8b039 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb64d4a9adcc0765a6b9e64eb443a0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 29 10:17:33 2022 -0700 ntdll: Use correct mcontext struct on macOS under Wow64. --- dlls/ntdll/unix/signal_x86_64.c | 54 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d6f19dbfa84..8d85525b224 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -210,6 +210,42 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, #include <i386/user_ldt.h> +/* The 'full' structs were added in the macOS 10.14.6 SDK/Xcode 10.3. */ +#ifndef _STRUCT_X86_THREAD_FULL_STATE64 +#define _STRUCT_X86_THREAD_FULL_STATE64 struct __darwin_x86_thread_full_state64 +_STRUCT_X86_THREAD_FULL_STATE64 +{ + _STRUCT_X86_THREAD_STATE64 __ss64; + __uint64_t __ds; + __uint64_t __es; + __uint64_t __ss; + __uint64_t __gsbase; +}; + +#define _STRUCT_MCONTEXT64_FULL struct __darwin_mcontext64_full +_STRUCT_MCONTEXT64_FULL +{ + _STRUCT_X86_EXCEPTION_STATE64 __es; + _STRUCT_X86_THREAD_FULL_STATE64 __ss; + _STRUCT_X86_FLOAT_STATE64 __fs; +}; + +#define _STRUCT_MCONTEXT_AVX64_FULL struct __darwin_mcontext_avx64_full +_STRUCT_MCONTEXT_AVX64_FULL +{ + _STRUCT_X86_EXCEPTION_STATE64 __es; + _STRUCT_X86_THREAD_FULL_STATE64 __ss; + _STRUCT_X86_AVX_STATE64 __fs; +}; +#endif + +/* AVX512 structs were added in the macOS 10.13 SDK/Xcode 9. */ +#ifdef _STRUCT_MCONTEXT_AVX512_64_FULL +#define SIZEOF_STRUCT_MCONTEXT_AVX512_64_FULL sizeof(_STRUCT_MCONTEXT_AVX512_64_FULL) +#else +#define SIZEOF_STRUCT_MCONTEXT_AVX512_64_FULL 2664 +#endif + #define RAX_sig(context) ((context)->uc_mcontext->__ss.__rax) #define RBX_sig(context) ((context)->uc_mcontext->__ss.__rbx) #define RCX_sig(context) ((context)->uc_mcontext->__ss.__rcx) @@ -233,7 +269,23 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, #define RSP_sig(context) ((context)->uc_mcontext->__ss.__rsp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) -#define FPU_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw) + +/* Once a custom LDT is installed (i.e. Wow64), mcontext will point to a + * larger '_full' struct which includes DS, ES, SS, and GSbase. + * This changes the offset of the FPU state. + * Checking mcsize is the only way to determine which mcontext is in use. + */ +static inline XMM_SAVE_AREA32 *FPU_sig( const ucontext_t *context ) +{ + if (context->uc_mcsize == sizeof(_STRUCT_MCONTEXT64_FULL) || + context->uc_mcsize == sizeof(_STRUCT_MCONTEXT_AVX64_FULL) || + context->uc_mcsize == SIZEOF_STRUCT_MCONTEXT_AVX512_64_FULL) + { + return (XMM_SAVE_AREA32 *)&((_STRUCT_MCONTEXT64_FULL *)context->uc_mcontext)->__fs.__fpu_fcw; + } + return (XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw; +} + #define XState_sig(context) NULL #else

1 0

Zebediah Figura : wined3d: Factor out mode_matches_filter().
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 9f79a79e957f1a3124073808329404132192b59f URL: https://gitlab.winehq.org/wine/wine/-/commit/9f79a79e957f1a3124073808329404… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 26 17:47:11 2022 -0500 wined3d: Factor out mode_matches_filter(). --- dlls/wined3d/directx.c | 72 +++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 85405eaa6b5..9eac1a04c42 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1228,6 +1228,34 @@ HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output, /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes of the same bpp but different resolutions */ +static bool mode_matches_filter(const DEVMODEW *mode, const struct wined3d_format *format, + enum wined3d_scanline_ordering scanline_ordering) +{ + if (mode->dmFields & DM_DISPLAYFLAGS) + { + if (scanline_ordering == WINED3D_SCANLINE_ORDERING_PROGRESSIVE + && (mode->u2.dmDisplayFlags & DM_INTERLACED)) + return false; + + if (scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED + && !(mode->u2.dmDisplayFlags & DM_INTERLACED)) + return false; + } + + if (format->id == WINED3DFMT_UNKNOWN) + { + /* This is for d3d8, do not enumerate P8 here. */ + if (mode->dmBitsPerPel != 32 && mode->dmBitsPerPel != 16) + return false; + } + else if (mode->dmBitsPerPel != format->byte_count * CHAR_BIT) + { + return false; + } + + return true; +} + /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ unsigned int CDECL wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering) @@ -1236,7 +1264,6 @@ unsigned int CDECL wined3d_output_get_mode_count(const struct wined3d_output *ou const struct wined3d_format *format; unsigned int i = 0; unsigned int j = 0; - UINT format_bits; DEVMODEW mode; TRACE("output %p, format %s, scanline_ordering %#x.\n", @@ -1244,33 +1271,14 @@ unsigned int CDECL wined3d_output_get_mode_count(const struct wined3d_output *ou adapter = output->adapter; format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); - format_bits = format->byte_count * CHAR_BIT; memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); while (EnumDisplaySettingsExW(output->device_name, j++, &mode, 0)) { - if (mode.dmFields & DM_DISPLAYFLAGS) - { - if (scanline_ordering == WINED3D_SCANLINE_ORDERING_PROGRESSIVE - && (mode.u2.dmDisplayFlags & DM_INTERLACED)) - continue; - - if (scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED - && !(mode.u2.dmDisplayFlags & DM_INTERLACED)) - continue; - } - - if (format_id == WINED3DFMT_UNKNOWN) - { - /* This is for d3d8, do not enumerate P8 here. */ - if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; - } - else if (mode.dmBitsPerPel == format_bits) - { + if (mode_matches_filter(&mode, format, scanline_ordering)) ++i; - } } TRACE("Returning %u matching modes (out of %u total) for output %p.\n", i, j, output); @@ -1285,7 +1293,6 @@ HRESULT CDECL wined3d_output_get_mode(const struct wined3d_output *output, { const struct wined3d_adapter *adapter; const struct wined3d_format *format; - UINT format_bits; DEVMODEW m; UINT i = 0; int j = 0; @@ -1298,7 +1305,6 @@ HRESULT CDECL wined3d_output_get_mode(const struct wined3d_output *output, adapter = output->adapter; format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); - format_bits = format->byte_count * CHAR_BIT; memset(&m, 0, sizeof(m)); m.dmSize = sizeof(m); @@ -1311,26 +1317,8 @@ HRESULT CDECL wined3d_output_get_mode(const struct wined3d_output *output, return WINED3DERR_INVALIDCALL; } - if (m.dmFields & DM_DISPLAYFLAGS) - { - if (scanline_ordering == WINED3D_SCANLINE_ORDERING_PROGRESSIVE - && (m.u2.dmDisplayFlags & DM_INTERLACED)) - continue; - - if (scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED - && !(m.u2.dmDisplayFlags & DM_INTERLACED)) - continue; - } - - if (format_id == WINED3DFMT_UNKNOWN) - { - /* This is for d3d8, do not enumerate P8 here. */ - if (m.dmBitsPerPel == 32 || m.dmBitsPerPel == 16) ++i; - } - else if (m.dmBitsPerPel == format_bits) - { + if (mode_matches_filter(&m, format, scanline_ordering)) ++i; - } } mode->width = m.dmPelsWidth;

1 0

Zebediah Figura : wined3d: Build a list of wined3d_display_mode structures in wined3d_output_get_mode[_count]().
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 95352c096f0bbb0c2be3dc09c972792894d5315e URL: https://gitlab.winehq.org/wine/wine/-/commit/95352c096f0bbb0c2be3dc09c97279… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 26 18:15:28 2022 -0500 wined3d: Build a list of wined3d_display_mode structures in wined3d_output_get_mode[_count](). --- dlls/wined3d/directx.c | 136 +++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 3 + include/wine/wined3d.h | 8 +-- 3 files changed, 83 insertions(+), 64 deletions(-)

1 0

Zebediah Figura : d3d9: Cache the output mode list.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 0ee74e9f815fbab8ef61eac724ba311b9f775b60 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ee74e9f815fbab8ef61eac724ba31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 26 18:28:42 2022 -0500 d3d9: Cache the output mode list. Garou: Mark of the Wolves calls IDirect3D9::GetAdapterModeCount() on every frame. This results in calling EnumDisplaySettingsExW() once per available mode, which is a very slow operation, both on Windows and Wine. Manual testing shows that Windows caches the mode list (as well as the adapter list, which is already cached in Wine) in Direct3D 9 and lower. Calls to GetAdapterModeCount() and EnumAdapterDisplayModes() are fast, and they also do not change if monitors are added or removed. DXGI behaves differently, however. The list of outputs attached to an adapter is cached—that is, calls to IDXGIAdapter::EnumOutputs() are fast, and return stale data. However, at least some other calls are slow and do not seem to be cached, including IDXGIOutput::GetDisplayModeList() and IDXGIOutput::GetDesc(). ddraw is also slow and uncached. Since all testing was done on Windows 10 (for lack of available older hardware to test with) it is not unlikely that ddraw was reimplemented over dxgi on newer Windows, and that older Windows versions would be fast and cached, but this is speculation. In any case I have not included patches to cache ddraw modes. Tests were done on Windows 10 21H2, both on real hardware with NVidia drivers and on software drivers via qemu/KVM. In the latter case only speed could be tested, but this was consistent with the results from the NVidia machine. --- dlls/d3d8/directx.c | 4 ++-- dlls/d3d9/directx.c | 11 +++++------ dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/output.c | 4 ++-- dlls/wined3d/directx.c | 21 +++++++++++++-------- dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 4 ++-- 8 files changed, 28 insertions(+), 23 deletions(-)

1 0

Zebediah Figura : d3d8: Cache the output mode list.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: b42aa9b87bec35c36c3ee3c16a0b82e79b935834 URL: https://gitlab.winehq.org/wine/wine/-/commit/b42aa9b87bec35c36c3ee3c16a0b82… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 26 19:02:57 2022 -0500 d3d8: Cache the output mode list. --- dlls/d3d8/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 6fcd53abbdd..365a99216aa 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -152,7 +152,7 @@ static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter) wined3d_mutex_lock(); count = wined3d_output_get_mode_count(d3d8->wined3d_outputs[output_idx], - WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN, false); + WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN, true); wined3d_mutex_unlock(); return count; @@ -174,7 +174,7 @@ static HRESULT WINAPI d3d8_EnumAdapterModes(IDirect3D8 *iface, UINT adapter, UIN wined3d_mutex_lock(); hr = wined3d_output_get_mode(d3d8->wined3d_outputs[output_idx], WINED3DFMT_UNKNOWN, - WINED3D_SCANLINE_ORDERING_UNKNOWN, mode_idx, &wined3d_mode, false); + WINED3D_SCANLINE_ORDERING_UNKNOWN, mode_idx, &wined3d_mode, true); wined3d_mutex_unlock(); if (SUCCEEDED(hr))

1 0

Zebediah Figura : dxgi: Build the device list only once in dxgi_output_get_display_mode_list().
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: a601930a9115ed2b08eb313becc14f22062dc4ed URL: https://gitlab.winehq.org/wine/wine/-/commit/a601930a9115ed2b08eb313becc14f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 26 19:04:42 2022 -0500 dxgi: Build the device list only once in dxgi_output_get_display_mode_list(). --- dlls/dxgi/output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 7c8431ffcd5..067488399d2 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -144,7 +144,7 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, for (i = 0; i < *mode_count; ++i) { if (FAILED(hr = wined3d_output_get_mode(output->wined3d_output, wined3d_format, - WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode, false))) + WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode, true))) { WARN("Failed to get output mode %u, hr %#lx.\n", i, hr); wined3d_mutex_unlock();

1 0

Zebediah Figura : wined3d: Build the device list only once in wined3d_output_find_closest_matching_mode().
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: a43da37637e5f80b73d2478022d0f7e62a8b90c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a43da37637e5f80b73d2478022d0f7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 26 19:05:23 2022 -0500 wined3d: Build the device list only once in wined3d_output_find_closest_matching_mode(). --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b3310d43fe..0444f76a5c6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1394,7 +1394,7 @@ HRESULT CDECL wined3d_output_find_closest_matching_mode(struct wined3d_output *o for (i = 0; i < mode_count; ++i) { if (FAILED(hr = wined3d_output_get_mode(output, mode->format_id, - WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i], false))) + WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i], true))) { heap_free(matching_modes); heap_free(modes);

1 0

Jacek Caban : user32: Forward more scroll bar messages to win32u.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 7e2beeec911b0c8b8180f0e25bb8f5d9bb9a5b71 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e2beeec911b0c8b8180f0e25bb8f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 14:34:19 2022 +0200 user32: Forward more scroll bar messages to win32u. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53364 --- dlls/user32/scroll.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 9e17424a8de..9750d6276df 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -259,6 +259,14 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA case WM_KEYDOWN: case WM_KEYUP: case WM_ENABLE: + case WM_LBUTTONDBLCLK: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: + case WM_MOUSEMOVE: + case WM_MOUSELEAVE: + case WM_SYSTIMER: case WM_SETFOCUS: case WM_KILLFOCUS: case WM_CREATE:

1 0