November 2022 - Wine-Commits

Jacek Caban : winevulkan: Remove no longer used Direction.INPUT_OUTPUT.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: e8af92ac160105ce9b26a347944587d70bcf9326 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8af92ac160105ce9b26a347944587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 22:26:04 2022 +0100 winevulkan: Remove no longer used Direction.INPUT_OUTPUT. --- dlls/winevulkan/make_vulkan | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index dcdf2c4ab10..783b781ff41 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -279,7 +279,6 @@ class Direction(Enum): """ Parameter direction: input, output, input_output. """ INPUT = 1 OUTPUT = 2 - INPUT_OUTPUT = 3 class VkBaseType(object):

1 0

Jacek Caban : winevulkan: Drop "static_array" from conversion function names.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 0bfad6584ff5389115904a68cb77cb09ec802c0f URL: https://gitlab.winehq.org/wine/wine/-/commit/0bfad6584ff5389115904a68cb77cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 20:20:22 2022 +0100 winevulkan: Drop "static_array" from conversion function names. Static arrays need only output conversion and output conversion is the same for static and dynamic arrays. --- dlls/winevulkan/make_vulkan | 6 ++---- dlls/winevulkan/vulkan_thunks.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0125831dc84..5949cea9543 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1323,7 +1323,7 @@ class VkMember(VkVariable): count = self.array_len if direction == Direction.OUTPUT: # Needed by VkMemoryHeap.memoryHeaps - return "convert_{0}_static_array_host_to_{5}({2}{1}, {3}{1}, {4});\n".format(self.type, self.name, input, output, count, win_type) + return "convert_{0}_array_host_to_{5}({2}{1}, {3}{1}, {4});\n".format(self.type, self.name, input, output, count, win_type) else: # Nothing needed this yet. LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name)) @@ -2148,9 +2148,7 @@ class ConversionFunction(object): def _set_name(self): name = "convert_{0}_".format(self.type) - if self.array: - name += "static_array_" - elif self.dyn_array: + if self.array or self.dyn_array: name += "array_" win_type = "win32" if self.conv else "win64" diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 18039ca3c6f..cd00aa0b6fb 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2024,7 +2024,7 @@ static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageF #endif /* USE_STRUCT_CONVERSION */ #if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkMemoryHeap_static_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap *out, uint32_t count) +static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap *out, uint32_t count) { unsigned int i; @@ -2046,7 +2046,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const out->memoryTypeCount = in->memoryTypeCount; memcpy(out->memoryTypes, in->memoryTypes, VK_MAX_MEMORY_TYPES * sizeof(VkMemoryType)); out->memoryHeapCount = in->memoryHeapCount; - convert_VkMemoryHeap_static_array_host_to_win32(in->memoryHeaps, out->memoryHeaps, VK_MAX_MEMORY_HEAPS); + convert_VkMemoryHeap_array_host_to_win32(in->memoryHeaps, out->memoryHeaps, VK_MAX_MEMORY_HEAPS); } #endif /* USE_STRUCT_CONVERSION */

1 0

Jacek Caban : winevulkan: Use separated classes for struct and array conversions.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: a242422e954eef7d1c1e73ccc6ef32fc5dcb082d URL: https://gitlab.winehq.org/wine/wine/-/commit/a242422e954eef7d1c1e73ccc6ef32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 20:45:05 2022 +0100 winevulkan: Use separated classes for struct and array conversions. --- dlls/winevulkan/make_vulkan | 232 +++++++++++++++++++++++++------------------- 1 file changed, 130 insertions(+), 102 deletions(-)

1 0

Zhiyi Zhang : uxtheme: Support drawing themed menu buttons.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 736ae290c93fc933ca9707b59e973777b49d8424 URL: https://gitlab.winehq.org/wine/wine/-/commit/736ae290c93fc933ca9707b59e9737… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Oct 23 22:36:47 2022 +0800 uxtheme: Support drawing themed menu buttons. --- dlls/uxtheme/window.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/window.c b/dlls/uxtheme/window.c index d94bd8425c7..d059a85b297 100644 --- a/dlls/uxtheme/window.c +++ b/dlls/uxtheme/window.c @@ -22,11 +22,70 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "uxthemedll.h" +#include "vssym32.h" + +static void uxtheme_draw_menu_button(HTHEME theme, HWND hwnd, HDC hdc, enum NONCLIENT_BUTTON_TYPE type, + RECT rect, BOOL down, BOOL grayed) +{ + int part, state; + + switch (type) + { + case MENU_CLOSE_BUTTON: + part = WP_MDICLOSEBUTTON; + break; + case MENU_MIN_BUTTON: + part = WP_MDIMINBUTTON; + break; + case MENU_RESTORE_BUTTON: + part = WP_MDIRESTOREBUTTON; + break; + case MENU_HELP_BUTTON: + part = WP_MDIHELPBUTTON; + break; + /* There is no WP_MDIMAXBUTTON */ + default: + user_api.pNonClientButtonDraw(hwnd, hdc, type, rect, down, grayed); + return; + } + + if (grayed) + state = MINBS_DISABLED; + else if (down) + state = MINBS_PUSHED; + else + state = MINBS_NORMAL; + + if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) + DrawThemeParentBackground(hwnd, hdc, &rect); + DrawThemeBackground(theme, hdc, part, state, &rect, NULL); +} void WINAPI UXTHEME_NonClientButtonDraw(HWND hwnd, HDC hdc, enum NONCLIENT_BUTTON_TYPE type, RECT rect, BOOL down, BOOL grayed) { - user_api.pNonClientButtonDraw(hwnd, hdc, type, rect, down, grayed); + HTHEME theme; + + theme = OpenThemeDataForDpi(NULL, L"Window", GetDpiForWindow(hwnd)); + if (!theme) + { + user_api.pNonClientButtonDraw(hwnd, hdc, type, rect, down, grayed); + return; + } + + switch (type) + { + case MENU_CLOSE_BUTTON: + case MENU_MIN_BUTTON: + case MENU_MAX_BUTTON: + case MENU_RESTORE_BUTTON: + case MENU_HELP_BUTTON: + uxtheme_draw_menu_button(theme, hwnd, hdc, type, rect, down, grayed); + break; + } + + CloseThemeData(theme); }

1 0

Zhiyi Zhang : user32: Hook drawing menu buttons.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: c196d2462dc306fb427c3e61e570011480b30dab URL: https://gitlab.winehq.org/wine/wine/-/commit/c196d2462dc306fb427c3e61e57001… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Oct 23 17:58:41 2022 +0800 user32: Hook drawing menu buttons. --- dlls/user32/hook.c | 1 + dlls/user32/nonclient.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user_main.c | 8 ++++++++ dlls/user32/user_private.h | 1 + dlls/uxtheme/Makefile.in | 3 ++- dlls/uxtheme/system.c | 1 + dlls/uxtheme/uxthemedll.h | 2 ++ dlls/uxtheme/window.c | 32 +++++++++++++++++++++++++++++ dlls/win32u/defwnd.c | 16 +++++++++++++++ dlls/win32u/menu.c | 25 +++++++++++++---------- dlls/win32u/win32u_private.h | 2 +- dlls/wow64win/user.c | 23 +++++++++++++++++++++ include/ntuser.h | 12 +++++++++++ include/winuser.h | 10 +++++++++ 14 files changed, 171 insertions(+), 13 deletions(-)

1 0

Rémi Bernon : opengl32: Move some WGL functions to unix_wgl.c.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 494251add7da73496311936b54f5c1a4383e95d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/494251add7da73496311936b54f5c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 11:31:05 2022 +0200 opengl32: Move some WGL functions to unix_wgl.c. --- dlls/opengl32/Makefile.in | 1 + dlls/opengl32/make_opengl | 14 ++ dlls/opengl32/opengl_ext.h | 56 +++++ dlls/opengl32/unix_wgl.c | 459 +++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 14 ++ dlls/opengl32/wgl.c | 588 +-------------------------------------------- 6 files changed, 550 insertions(+), 582 deletions(-)

1 0

Rémi Bernon : opengl32: Use the unixlib interface for more WGL functions.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 077c46261a3abb55648adc8b753d1f40ccfdd83e URL: https://gitlab.winehq.org/wine/wine/-/commit/077c46261a3abb55648adc8b753d1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:34:09 2022 +0200 opengl32: Use the unixlib interface for more WGL functions. --- dlls/opengl32/make_opengl | 90 +++++++++++++---------- dlls/opengl32/thunks.c | 172 ++++++++++++++++++++++++++++++++++++++++---- dlls/opengl32/unix_thunks.c | 166 +++++------------------------------------- dlls/opengl32/unix_wgl.c | 168 +++++++++++++++++++++++++++++++++++++------ 4 files changed, 374 insertions(+), 222 deletions(-)

1 0

Zhiyi Zhang : user32/tests: Test creating a fullscreen window spanning multiple monitors.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 3dd68caab3d39fd5cd4d3a223b696ae7d5f7e9e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dd68caab3d39fd5cd4d3a223b696a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/tests: Test creating a fullscreen window spanning multiple monitors. --- dlls/user32/tests/win.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d9b1d9c2665..a99163860f4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9113,12 +9113,12 @@ static void test_fullscreen(void) static const DWORD t_ex_style[] = { 0, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW }; + RECT rc, virtual_rect, expected_rect; WNDCLASSA cls; int timeout; HWND hwnd; int i, j; POINT pt; - RECT rc; HMONITOR hmon; LRESULT ret; @@ -9265,6 +9265,48 @@ static void test_fullscreen(void) DestroyWindow(hwnd); UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); + + /* Test fullscreen windows spanning multiple monitors */ + if (GetSystemMetrics(SM_CMONITORS) > 1) + { + /* Test windows covering all monitors */ + virtual_rect.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + virtual_rect.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + virtual_rect.right = virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + virtual_rect.bottom = virtual_rect.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); + + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, virtual_rect.left, + virtual_rect.top, virtual_rect.right - virtual_rect.left, + virtual_rect.bottom - virtual_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#lx.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + + /* Test windows covering one monitor and 1 pixel larger on available sides */ + expected_rect = mi.rcMonitor; + InflateRect(&expected_rect, 1, 1); + IntersectRect(&expected_rect, &expected_rect, &virtual_rect); + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, expected_rect.left, + expected_rect.top, expected_rect.right - expected_rect.left, + expected_rect.bottom - expected_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#lx.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &expected_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&expected_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + } + else + { + skip("This test requires at least two monitors.\n"); + } } static BOOL test_thick_child_got_minmax;

1 0

Zhiyi Zhang : winex11.drv: Support _NET_WM_FULLSCREEN_MONITORS.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: bd8ec8f264b5403f90bca6ecb26ae3170995ccd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd8ec8f264b5403f90bca6ecb26ae3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 winex11.drv: Support _NET_WM_FULLSCREEN_MONITORS. Support _NET_WM_FULLSCREEN_MONITORS for fullscreen windows spanning multiple monitors. This property is used to hint window managers about which monitor a fullscreen window should cover. Window managers make a fullscreen window spanning multiple monitors cover only one monitor when this property is missing. Fix Project Cars 2/3 incorrect game window size when the triple-screen mode is on. --- dlls/user32/tests/win.c | 3 +- dlls/winex11.drv/display.c | 6 +++ dlls/winex11.drv/window.c | 42 +++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 3 ++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 83 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrandr.c | 5 +++ 7 files changed, 142 insertions(+), 1 deletion(-)

1 0

Rémi Bernon : opengl32: Introduce a new NtUserCallOpenGLDebugMessageCallback callback.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: dec91f063122ce08c25eade1d51f2e36a59326aa URL: https://gitlab.winehq.org/wine/wine/-/commit/dec91f063122ce08c25eade1d51f2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 03:55:54 2022 +0200 opengl32: Introduce a new NtUserCallOpenGLDebugMessageCallback callback. --- dlls/opengl32/wgl.c | 57 +++++++++++++++++++++++++++++++++++++++++++--------- dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 2 ++ 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 987fa36ce2a..cf0b8e0330f 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -22,25 +22,19 @@ #include <stdarg.h> #include <stdlib.h> -#include <string.h> -#include <sys/types.h> #include <math.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "winuser.h" #include "winreg.h" -#include "wingdi.h" -#include "winternl.h" -#include "winnt.h" +#include "ntuser.h" #include "opengl_ext.h" #include "unixlib.h" -#include "wine/gdi_driver.h" #include "wine/glu.h" #include "wine/debug.h" @@ -1714,12 +1708,50 @@ const GLubyte * WINAPI glGetString( GLenum name ) } /* wrapper for glDebugMessageCallback* functions */ +typedef void (WINAPI *gl_debug_cb)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *, const void *); + +struct wine_gl_debug_message_params +{ + gl_debug_cb user_callback; + const void *user_data; + + GLenum source; + GLenum type; + GLuint id; + GLenum severity; + GLsizei length; + const GLchar *message; +}; + +static BOOL WINAPI call_opengl_debug_message_callback( struct wine_gl_debug_message_params *params, ULONG size ) +{ + params->user_callback( params->source, params->type, params->id, params->severity, + params->length, params->message, params->user_data ); + return TRUE; +} + static void gl_debug_message_callback( GLenum source, GLenum type, GLuint id, GLenum severity, - GLsizei length, const GLchar *message,const void *userParam ) + GLsizei length, const GLchar *message, const void *userParam ) { + struct wine_gl_debug_message_params params = + { + .source = source, + .type = type, + .id = id, + .severity = severity, + .length = length, + .message = message, + }; + void **kernel_callback_table; + BOOL (WINAPI *callback)( struct wine_gl_debug_message_params *params, ULONG size ); + struct wgl_handle *ptr = (struct wgl_handle *)userParam; - if (!ptr->u.context->debug_callback) return; - ptr->u.context->debug_callback( source, type, id, severity, length, message, ptr->u.context->debug_user ); + if (!(params.user_callback = ptr->u.context->debug_callback)) return; + params.user_data = ptr->u.context->debug_user; + + kernel_callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; + callback = kernel_callback_table[NtUserCallOpenGLDebugMessageCallback]; + callback( &params, sizeof(params) ); } /*********************************************************************** @@ -1772,10 +1804,15 @@ void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *user */ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { + void **kernel_callback_table; + switch(reason) { case DLL_PROCESS_ATTACH: NtCurrentTeb()->glTable = &null_opengl_funcs; + + kernel_callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; + kernel_callback_table[NtUserCallOpenGLDebugMessageCallback] = call_opengl_debug_message_callback; break; case DLL_THREAD_ATTACH: NtCurrentTeb()->glTable = &null_opengl_funcs; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index e1454347ecf..79f85d45834 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1008,6 +1008,12 @@ static NTSTATUS WINAPI wow64_NtUserCallVulkanDebugUtilsCallback( void *arg, ULON return 0; } +static NTSTATUS WINAPI wow64_NtUserCallOpenGLDebugMessageCallback( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst0( void *arg, ULONG size ) { return dispatch_callback( NtUserDriverCallbackFirst + 0, arg, size ); @@ -1085,6 +1091,8 @@ user_callback user_callbacks[] = /* Vulkan support */ wow64_NtUserCallVulkanDebugReportCallback, wow64_NtUserCallVulkanDebugUtilsCallback, + /* OpenGL support */ + wow64_NtUserCallOpenGLDebugMessageCallback, /* Driver-specific callbacks */ wow64_NtUserDriverCallbackFirst0, wow64_NtUserDriverCallbackFirst1, diff --git a/include/ntuser.h b/include/ntuser.h index 7759f2b3174..0e14ee3ccb0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -52,6 +52,8 @@ enum /* Vulkan support */ NtUserCallVulkanDebugReportCallback, NtUserCallVulkanDebugUtilsCallback, + /* OpenGL support */ + NtUserCallOpenGLDebugMessageCallback, /* Driver-specific callbacks */ NtUserDriverCallbackFirst, NtUserDriverCallbackLast = NtUserDriverCallbackFirst + 9,

1 0