wine-devel

wine-devel@winehq.org

2 participants
84483 discussions

[PATCH 08/10] win32u: Move DrawMenuBar implementation from user32.
by Jacek Caban 15 Apr '22

15 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 23 ++--------------------- dlls/win32u/menu.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 3 +++ include/ntuser.h | 6 ++++++ 5 files changed, 40 insertions(+), 21 deletions(-)

2 1

[PATCH 07/10] win32u: Move NtUserEnableMenuItem implementation from user32.
by Jacek Caban 15 Apr '22

15 Apr '22

2 1

[PATCH 06/10] win32u: Move NtUserCheckMenuItem implementation from user32.
by Jacek Caban 15 Apr '22

15 Apr '22

2 1

[PATCH 05/10] win32u: Move CreatePopupMenu implementation from user32.
by Jacek Caban 15 Apr '22

15 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 10 ++-------- dlls/win32u/menu.c | 5 +++-- dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u_private.h | 2 +- include/ntuser.h | 12 ++++++------ 5 files changed, 15 insertions(+), 20 deletions(-)

2 1

[PATCH 04/10] win32u: Move NtUserTranslateMessage implementation from user32.
by Jacek Caban 15 Apr '22

15 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 46 +---------------------------- dlls/user32/user_main.c | 2 ++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 57 ++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ include/ntuser.h | 2 ++ 9 files changed, 72 insertions(+), 46 deletions(-)

2 1

[PATCH 03/10] winex11: Directly use win32u in more places.
by Jacek Caban 15 Apr '22

15 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 24 ++++++++++++------------ dlls/winex11.drv/display.c | 5 +++-- dlls/winex11.drv/keyboard.c | 18 +++++++++--------- dlls/winex11.drv/vulkan.c | 4 ++-- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 10 ++++++++++ dlls/winex11.drv/xrandr.c | 2 +- 7 files changed, 39 insertions(+), 28 deletions(-)

2 1

[PATCH 02/10] winex11: Directly use win32u for user functions in event.c.
by Jacek Caban 15 Apr '22

15 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/event.c | 169 +++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 7 ++ 2 files changed, 92 insertions(+), 84 deletions(-)

2 1

[PATCH 01/10] winex11: Directly use win32u for user functions in settings.c.
by Jacek Caban 15 Apr '22

15 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)

2 1

[PATCH 1/6] user.exe: Implement SetSystemTimer() using SetTimer().
by Zebediah Figura 15 Apr '22

15 Apr '22

Avoid passing a callback to SetSystemTimer(); it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user.exe16/message.c | 4 ++++ dlls/user.exe16/user_private.h | 2 ++ dlls/user.exe16/window.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 819d9d9b837..8d9e5404b09 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1292,6 +1292,10 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT lParam = MAKELPARAM( 0, convert_handle_32_to_16( lParam, GMEM_DDESHARE )); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_TIMER: + if (wParam & SYSTEM_TIMER_FLAG) + msg = WM_SYSTIMER; + break; case SBM_SETRANGE: ret = callback( HWND_16(hwnd), SBM_SETRANGE16, 0, MAKELPARAM(wParam, lParam), result, arg ); break; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 8a325cf9fb2..0805997246b 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -95,6 +95,8 @@ extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPAR #define WM_SYSTIMER 0x0118 +#define SYSTEM_TIMER_FLAG 0x10000 + /* Dialog info structure (must match the user32 one) */ typedef struct tagDIALOGINFO { diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 590b8ae9f7c..e54dd6a803e 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -111,7 +111,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 pr UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 proc ) { TIMERPROC proc32 = (TIMERPROC)WINPROC_AllocProc16( (WNDPROC16)proc ); - return SetSystemTimer( WIN_Handle32(hwnd), id, timeout, proc32 ); + return SetTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG, timeout, proc32 ); } @@ -1087,7 +1087,7 @@ void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore ) */ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id ) { - return KillSystemTimer( WIN_Handle32(hwnd), id ); + return KillTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG ); } -- 2.35.1

3 7

[PATCH v2] supersede 232632
by Eric Pouech 15 Apr '22

15 Apr '22

dlls/kernel32/tests: correctly handle shell_no_window console in process.c should fix testbot daily failures for kernel32:process V1 -> V2: the FreeConsole() call under windows leads to children crashes in test_parent_process_attribute(), so I took the simple path of only calling FreeConsole() when testing under Wine Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8f18a0d37a7..ef2f1e45843 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1543,6 +1543,8 @@ static void test_Console(void) /* first, we need to be sure we're attached to a console */ if (!is_console(startup.hStdInput) || !is_console(startup.hStdOutput)) { + /* could be attached to a Wine shell_no_window console, so detach */ + if (!strcmp(winetest_platform, "wine")) FreeConsole(); /* we're not attached to a console, let's do it */ AllocConsole(); startup.hStdInput = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0);

2 1

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-devel