May 2022 - Wine-Commits - list.winehq.org

Jeremy White : Add blank lines to pacify flake8.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: tools Branch: master Commit: 05e11de3dd776015ede06872971f9108fc38c2f5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=05e11de3dd776015ede0687… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 15:23:44 2022 -0500 Add blank lines to pacify flake8. This reduces the concerns it raises. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index db74b5b..2b0b111 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -531,6 +531,7 @@ def cover_subject(mr_version, nr_patches, mr_iid, title): vstring = f" v{mr_version}" return f"[PATCH{BRIDGE_TAG_INFIX}{vstring} 0/{nr_patches}] MR{mr_iid}: {title}" + def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): author_name = f"{mr['author']['name']} (@{mr['author']['username']})" title = mr['title']

1 0

Jeremy White : Add a 100ms delay when sending patches.
by Alexandre Julliard May 5, 2022

May 5, 2022

Module: tools Branch: master Commit: 80005171b3d0b727d8dc2a394b3ab41d8152b29c URL: https://source.winehq.org/git/tools.git/?a=commit;h=80005171b3d0b727d8dc2a3… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 15:21:36 2022 -0500 Add a 100ms delay when sending patches. The hope is that this will cause the timing of message arrival to work out well for naive mail display programs, such as the winehq patch tracker. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 15fa5dd..db74b5b 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -7,6 +7,7 @@ import re import sys import datetime import dateutil.parser +import time import requests import mailbox import smtplib @@ -615,6 +616,8 @@ def process_mr(mr, update_db): send_email(cover) if nr_patches <= settings.MAXIMUM_PATCHES: for nr, mail in enumerate(patches): + # The hope is that a slight delay will allow receivers to order the patches correctly. + time.sleep(0.1) fixup_patch(mail, iid, version, nr+1) date = date + datetime.timedelta(seconds=1) fixup_date(mail, date)

1 0

Zebediah Figura : ws2_32/tests: Add some more tests for reset TCP connections.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: d280e8b9b78914a4509df426ede115ae8dabbd92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d280e8b9b78914a4509df426… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:28 2022 -0500 ws2_32/tests: Add some more tests for reset TCP connections. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 114 +++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 155 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 237 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d280e8b9b78914a4509d…

1 0

Jacek Caban : winex11: Move x11drv_post_drop to xdnd.c.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: fce3f9c323feaf257859d1a037f16818a11eb105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fce3f9c323feaf257859d1a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 14:42:24 2022 +0200 winex11: Move x11drv_post_drop to xdnd.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 12 ++---------- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xdnd.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a6499400283..105caab5deb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1478,16 +1478,8 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) static void post_drop( HWND hwnd, DROPFILES *drop, ULONG size ) { - HDROP handle; - - if ((handle = GlobalAlloc( GMEM_SHARE, size ))) - { - DROPFILES *ptr = GlobalLock( handle ); - memcpy( ptr, drop, size ); - ptr->fWide = TRUE; - GlobalUnlock( handle ); - PostMessageW( hwnd, WM_DROPFILES, (WPARAM)handle, 0 ); - } + drop->fWide = HandleToUlong( hwnd ); /* abuse fWide to pass window handle */ + x11drv_post_drop( drop, size ); } /********************************************************************** diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b763a7aa345..4dc251b9ac2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -846,6 +846,8 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) extern NTSTATUS x11drv_init( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_clipboard_message( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_post_drop( void *data, ULONG size ) DECLSPEC_HIDDEN; + /* GDI helpers */ static inline BOOL lp_to_dp( HDC hdc, POINT *points, INT count ) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index d5ae510db49..45205c836be 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -748,3 +748,21 @@ UINT handle_dnd_event( void *params ) return 0; } } + +NTSTATUS WINAPI x11drv_post_drop( void *data, ULONG size ) +{ + HDROP handle; + + if ((handle = GlobalAlloc( GMEM_SHARE, size ))) + { + DROPFILES *ptr = GlobalLock( handle ); + HWND hwnd; + memcpy( ptr, data, size ); + hwnd = UlongToHandle( ptr->fWide ); + ptr->fWide = TRUE; + GlobalUnlock( handle ); + PostMessageW( hwnd, WM_DROPFILES, (WPARAM)handle, 0 ); + } + + return 0; +}

1 0

Jacek Caban : winex11: Avoid using kernel32 functions in user driver.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: a34669b238b121313b6c3aecdcb1a1fbc231e8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a34669b238b121313b6c3aec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 20:00:27 2022 +0200 winex11: Avoid using kernel32 functions in user driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 6 +++--- dlls/winex11.drv/x11drv_main.c | 3 ++- dlls/winex11.drv/xim.c | 25 +++++++++++++------------ dlls/winex11.drv/xrender.c | 6 +++--- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index edd6fb8d271..44d9c7698aa 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -736,7 +736,7 @@ NTSTATUS x11drv_tablet_load_info( void *hwnd ) Button = (XButtonInfoPtr) any; TRACE(" ButtonInput %d: [class %d|length %d|num_buttons %d]\n", class_loop, (int) Button->class, Button->length, Button->num_buttons); - cursor.BTNNAMES = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*cchBuf); + cursor.BTNNAMES = malloc( sizeof(WCHAR) * cchBuf ); for (i = 0; i < cursor.BUTTONS; i++) { /* FIXME - these names are probably incorrect */ @@ -744,14 +744,14 @@ NTSTATUS x11drv_tablet_load_info( void *hwnd ) while (cch > cchBuf - cchPos - 1) /* we want one extra byte for the last NUL */ { cchBuf *= 2; - cursor.BTNNAMES = HeapReAlloc(GetProcessHeap(), 0, cursor.BTNNAMES, sizeof(WCHAR)*cchBuf); + cursor.BTNNAMES = realloc( cursor.BTNNAMES, sizeof(WCHAR) * cchBuf ); } strcpyW(cursor.BTNNAMES + cchPos, cursor.NAME); cchPos += cch; } cursor.BTNNAMES[cchPos++] = 0; - cursor.BTNNAMES = HeapReAlloc(GetProcessHeap(), 0, cursor.BTNNAMES, sizeof(WCHAR)*cchPos); + cursor.BTNNAMES = realloc( cursor.BTNNAMES, sizeof(WCHAR)*cchPos ); cursor.cchBTNNAMES = cchPos; } break; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f05885c316a..5347bc7c1a5 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -28,6 +28,7 @@ #include <string.h> #include <sys/time.h> #include <unistd.h> +#include <assert.h> #include <dlfcn.h> #include <X11/cursorfont.h> #include <X11/Xlib.h> @@ -293,7 +294,7 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) { ERR( "X protocol error: serial=%ld, request_code=%d - breaking into debugger\n", error_evt->serial, error_evt->request_code ); - DebugBreak(); /* force an entry in the debugger */ + assert( 0 ); } old_error_handler( display, error_evt ); return 0; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 81f420891ad..4b63a24cccf 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -72,13 +72,7 @@ static void X11DRV_ImmSetInternalString(DWORD dwOffset, if (byte_expansion + dwCompStringLength >= dwCompStringSize) { - if (CompositionString) - ptr_new = HeapReAlloc(GetProcessHeap(), 0, CompositionString, - dwCompStringSize + byte_expansion); - else - ptr_new = HeapAlloc(GetProcessHeap(), 0, - dwCompStringSize + byte_expansion); - + ptr_new = realloc( CompositionString, dwCompStringSize + byte_expansion ); if (ptr_new == NULL) { ERR("Couldn't expand composition string buffer\n"); @@ -150,7 +144,7 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d TRACE("PreeditDoneCallback %p\n",ic); ximInComposeMode = FALSE; if (dwCompStringSize) - HeapFree(GetProcessHeap(), 0, CompositionString); + free( CompositionString ); dwCompStringSize = 0; dwCompStringLength = 0; CompositionString = NULL; @@ -464,17 +458,24 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XIC xic; XICCallback destroy = {(XPointer)data, X11DRV_DestroyIC}; XICCallback P_StateNotifyCB, P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; - LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); + LCID lcid; Window win = data->whole_window; XFontSet fontSet = x11drv_thread_data()->font_set; TRACE("xim = %p\n", xim); + lcid = NtCurrentTeb()->CurrentLocale; + if (!lcid) NtQueryDefaultLocale( TRUE, &lcid ); + /* use complex and slow XIC initialization method only for CJK */ - if (langid != LANG_CHINESE && - langid != LANG_JAPANESE && - langid != LANG_KOREAN) + switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { + case LANG_CHINESE: + case LANG_JAPANESE: + case LANG_KOREAN: + break; + + default: xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNClientWindow, win, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2a694794397..33725338f60 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -774,7 +774,7 @@ static AA_Type aa_type_from_flags( UINT aa_flags ) static UINT get_xft_aa_flags( const LOGFONTW *lf ) { - char *value; + char *value, *p; UINT ret = 0; switch (lf->lfQuality) @@ -785,8 +785,8 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) default: if (!(value = XGetDefault( gdi_display, "Xft", "antialias" ))) break; TRACE( "got antialias '%s'\n", value ); - if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || - value[0] == '0' || !_strnicmp( value, "off", -1 )) + for (p = value; *p; p++) if ('A' <= *p && *p <= 'Z') *p += 'a' - 'A'; /* to lower */ + if (value[0] == 'f' || value[0] == 'n' || value[0] == '0' || !strcmp( value, "off" )) { ret = GGO_BITMAP; break;

1 0

Jacek Caban : winex11: Use X11DRV_CALL for XIM calls.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: bf1d5d286b2c05ed6ba4db060ca905872fa3f621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1d5d286b2c05ed6ba4db06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 21:47:43 2022 +0200 winex11: Use X11DRV_CALL for XIM calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 9 ++++++--- dlls/winex11.drv/unixlib.h | 9 +++++++++ dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/x11drv_main.c | 2 ++ dlls/winex11.drv/xim.c | 13 ++++++++----- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..1656601577d 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -637,6 +637,7 @@ UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { + struct xim_preedit_state_params preedit_params; BOOL bRet = FALSE; LPINPUTCONTEXT lpIMC; @@ -680,7 +681,9 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) TRACE("IMC_SETOPENSTATUS\n"); bRet = TRUE; - X11DRV_SetPreeditState(lpIMC->hWnd, lpIMC->fOpen); + preedit_params.hwnd = lpIMC->hWnd; + preedit_params.open = lpIMC->fOpen; + X11DRV_CALL( xim_preedit_state, &preedit_params ); if (!lpIMC->fOpen) { LPIMEPRIVATE myPrivate; @@ -688,7 +691,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (myPrivate->bInComposition) { - X11DRV_ForceXIMReset(lpIMC->hWnd); + X11DRV_CALL( xim_reset, lpIMC->hWnd ); GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); myPrivate->bInComposition = FALSE; } @@ -764,7 +767,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) TRACE("CPS_CANCEL\n"); - X11DRV_ForceXIMReset(lpIMC->hWnd); + X11DRV_CALL( xim_reset, lpIMC->hWnd ); if (lpIMC->hCompStr) ImmDestroyIMCC(lpIMC->hCompStr); diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 062bb59c663..2a957af0f56 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -28,6 +28,8 @@ enum x11drv_funcs unix_tablet_get_packet, unix_tablet_info, unix_tablet_load_info, + unix_xim_preedit_state, + unix_xim_reset, unix_funcs_count, }; @@ -59,6 +61,13 @@ struct tablet_info_params void *output; }; +/* x11drv_xim_preedit_state params */ +struct xim_preedit_state_params +{ + HWND hwnd; + BOOL open; +}; + /* DnD support */ struct format_entry diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 08bfa6dd1d5..c6e5044c110 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -827,8 +827,6 @@ extern BOOL X11DRV_InitXIM( const WCHAR *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; -extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; -extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; #define XEMBED_MAPPED (1 << 0) @@ -849,6 +847,8 @@ extern NTSTATUS x11drv_tablet_attach_queue( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_get_packet( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_load_info( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_info( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_xim_preedit_state( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_xim_reset( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI x11drv_post_drop( void *data, ULONG size ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index cc565bd30a7..22f0f0a729f 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -962,6 +962,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = x11drv_tablet_get_packet, x11drv_tablet_info, x11drv_tablet_load_info, + x11drv_xim_preedit_state, + x11drv_xim_reset, }; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index ec4be2e0c5d..81f420891ad 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -241,7 +241,7 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, TRACE("Finished\n"); } -void X11DRV_ForceXIMReset(HWND hwnd) +NTSTATUS x11drv_xim_reset( void *hwnd ) { XIC ic = X11DRV_get_ic(hwnd); if (ic) @@ -251,19 +251,21 @@ void X11DRV_ForceXIMReset(HWND hwnd) leftover = XmbResetIC(ic); XFree(leftover); } + return 0; } -void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) +NTSTATUS x11drv_xim_preedit_state( void *arg ) { + struct xim_preedit_state_params *params = arg; XIC ic; XIMPreeditState state; XVaNestedList attr; - ic = X11DRV_get_ic(hwnd); + ic = X11DRV_get_ic( params->hwnd ); if (!ic) - return; + return 0; - if (fOpen) + if (params->open) state = XIMPreeditEnable; else state = XIMPreeditDisable; @@ -274,6 +276,7 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) XSetICValues(ic, XNPreeditAttributes, attr, NULL); XFree(attr); } + return 0; }

1 0

Jacek Caban : winex11: Introduce X11DRV_CALL macro.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 095773b36a5822a0a6752741073765bdd23d69c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=095773b36a5822a0a6752741… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 21:15:10 2022 +0200 winex11: Introduce X11DRV_CALL macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 14 +++++++------- dlls/winex11.drv/unixlib.h | 16 ++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 24 +++++++++++++++++++++++- 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 84c20217c78..6a9f4a57273 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -76,7 +76,7 @@ static LRESULT CALLBACK clipboard_wndproc( HWND hwnd, UINT msg, WPARAM wp, LPARA params.msg = msg; params.wparam = wp; params.lparam = lp; - return x11drv_clipboard_message( &params ); + return X11DRV_CALL( clipboard_message, &params ); } return DefWindowProcW( hwnd, msg, wp, lp ); @@ -132,7 +132,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) DisableThreadLibraryCalls( instance ); x11drv_module = instance; - return !x11drv_init( NULL ); + return !X11DRV_CALL( init, NULL ); } @@ -142,7 +142,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) BOOL CDECL wine_create_desktop( UINT width, UINT height ) { struct create_desktop_params params = { .width = width, .height = height }; - return x11drv_create_desktop( &params ); + return X11DRV_CALL( create_desktop, &params ); } /*********************************************************************** @@ -150,7 +150,7 @@ BOOL CDECL wine_create_desktop( UINT width, UINT height ) */ int CDECL X11DRV_AttachEventQueueToTablet( HWND owner ) { - return x11drv_tablet_attach_queue( owner ); + return X11DRV_CALL( tablet_attach_queue, owner ); } /*********************************************************************** @@ -158,7 +158,7 @@ int CDECL X11DRV_AttachEventQueueToTablet( HWND owner ) */ int CDECL X11DRV_GetCurrentPacket( void *packet ) { - return x11drv_tablet_get_packet( packet ); + return X11DRV_CALL( tablet_get_packet, packet ); } /*********************************************************************** @@ -166,7 +166,7 @@ int CDECL X11DRV_GetCurrentPacket( void *packet ) */ BOOL CDECL X11DRV_LoadTabletInfo( HWND hwnd ) { - return x11drv_tablet_load_info( hwnd ); + return X11DRV_CALL( tablet_load_info, hwnd ); } /*********************************************************************** @@ -178,5 +178,5 @@ UINT CDECL X11DRV_WTInfoW( UINT category, UINT index, void *output ) params.category = category; params.index = index; params.output = output; - return x11drv_tablet_info( &params ); + return X11DRV_CALL( tablet_info, &params ); } diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 231beb055dc..062bb59c663 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -19,6 +19,22 @@ #include "ntuser.h" #include "wine/unixlib.h" +enum x11drv_funcs +{ + unix_clipboard_message, + unix_create_desktop, + unix_init, + unix_tablet_attach_queue, + unix_tablet_get_packet, + unix_tablet_info, + unix_tablet_load_info, + unix_funcs_count, +}; + +/* FIXME: Use __wine_unix_call when the rest of the stack is ready */ +extern NTSTATUS x11drv_unix_call( enum x11drv_funcs code, void *params ) DECLSPEC_HIDDEN; +#define X11DRV_CALL(func, params) x11drv_unix_call( unix_ ## func, params ) + /* x11drv_clipboard_message params */ struct clipboard_message_params { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5f49f609e1e..08bfa6dd1d5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -843,7 +843,6 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) /* unixlib interface */ -extern NTSTATUS x11drv_init( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_clipboard_message( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_create_desktop( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_attach_queue( void *arg ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index eb11b532af7..cc565bd30a7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -629,7 +629,7 @@ static void init_visuals( Display *display, int screen ) /*********************************************************************** * X11DRV process initialisation routine */ -NTSTATUS x11drv_init( void *arg ) +static NTSTATUS x11drv_init( void *arg ) { Display *display; void *libx11 = dlopen( SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL ); @@ -951,3 +951,25 @@ NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDP pthread_mutex_unlock( &d3dkmt_mutex ); return STATUS_SUCCESS; } + + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + x11drv_clipboard_message, + x11drv_create_desktop, + x11drv_init, + x11drv_tablet_attach_queue, + x11drv_tablet_get_packet, + x11drv_tablet_info, + x11drv_tablet_load_info, +}; + + +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + + +/* FIXME: Use __wine_unix_call instead */ +NTSTATUS x11drv_unix_call( enum x11drv_funcs code, void *params ) +{ + return __wine_unix_call_funcs[code]( params ); +}

1 0

Jacek Caban : winex11: Move wintab entry points to dllmain.c.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 27b151763dcd23c17f0f30958288f42dabeea912 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b151763dcd23c17f0f3095… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 20:12:01 2022 +0200 winex11: Move wintab entry points to dllmain.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/unixlib.h | 8 ++++++++ dlls/winex11.drv/wintab.c | 45 +++++++++++++++++++++++++-------------------- dlls/winex11.drv/x11drv.h | 4 ++++ 4 files changed, 73 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index f5e829d73af..84c20217c78 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -144,3 +144,39 @@ BOOL CDECL wine_create_desktop( UINT width, UINT height ) struct create_desktop_params params = { .width = width, .height = height }; return x11drv_create_desktop( &params ); } + +/*********************************************************************** + * AttachEventQueueToTablet (winex11.@) + */ +int CDECL X11DRV_AttachEventQueueToTablet( HWND owner ) +{ + return x11drv_tablet_attach_queue( owner ); +} + +/*********************************************************************** + * GetCurrentPacket (winex11.@) + */ +int CDECL X11DRV_GetCurrentPacket( void *packet ) +{ + return x11drv_tablet_get_packet( packet ); +} + +/*********************************************************************** + * LoadTabletInfo (winex11.@) + */ +BOOL CDECL X11DRV_LoadTabletInfo( HWND hwnd ) +{ + return x11drv_tablet_load_info( hwnd ); +} + +/*********************************************************************** + * WTInfoW (winex11.@) + */ +UINT CDECL X11DRV_WTInfoW( UINT category, UINT index, void *output ) +{ + struct tablet_info_params params; + params.category = category; + params.index = index; + params.output = output; + return x11drv_tablet_info( &params ); +} diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 43a00b619c1..231beb055dc 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -35,6 +35,14 @@ struct create_desktop_params UINT height; }; +/* x11drv_tablet_info params */ +struct tablet_info_params +{ + UINT category; + UINT index; + void *output; +}; + /* DnD support */ struct format_entry diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index aa0d7be2fd0..edd6fb8d271 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -481,9 +481,9 @@ static void disable_system_cursors(void) /*********************************************************************** - * X11DRV_LoadTabletInfo (X11DRV.@) + * x11drv_tablet_load_info */ -BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) +NTSTATUS x11drv_tablet_load_info( void *hwnd ) { static const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; static const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; @@ -509,7 +509,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) return FALSE; } - hwndTabletDefault = hwnddefault; + hwndTabletDefault = hwnd; /* Do base initialization */ strcpyW(gSysContext.lcName, SZ_CONTEXT_NAME); @@ -1001,9 +1001,9 @@ static BOOL proximity_event( HWND hwnd, XEvent *event ) } /*********************************************************************** - * X11DRV_AttachEventQueueToTablet (X11DRV.@) + * x11drv_tablet_attach_queue */ -int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) +NTSTATUS x11drv_tablet_attach_queue( void *owner ) { struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; @@ -1013,11 +1013,11 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) XDeviceInfo *target = NULL; XDevice *the_device; XEventClass event_list[7]; - Window win = X11DRV_get_whole_window( hOwner ); + Window win = X11DRV_get_whole_window( owner ); if (!win || !xinput_handle) return 0; - TRACE("Creating context for window %p (%lx) %i cursors\n", hOwner, win, gNumCursors); + TRACE("Creating context for window %p (%lx) %i cursors\n", owner, win, gNumCursors); devices = pXListInputDevices(data->display, &num_devices); @@ -1093,11 +1093,11 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) } /*********************************************************************** - * X11DRV_GetCurrentPacket (X11DRV.@) + * x11drv_tablet_get_packet */ -int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet) +NTSTATUS x11drv_tablet_get_packet( void *packet ) { - *packet = gMsgPacket; + *(WTPACKET *)packet = gMsgPacket; return 1; } @@ -1114,10 +1114,15 @@ static inline int CopyTabletData(LPVOID target, LPCVOID src, INT size) } /*********************************************************************** - * X11DRV_WTInfoW (X11DRV.@) + * x11drv_tablet_info */ -UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) +NTSTATUS x11drv_tablet_info( void *arg ) { + struct tablet_info_params *params = arg; + UINT wCategory = params->category; + UINT nIndex = params->index; + void *lpOutput = params->output; + /* * It is valid to call WTInfoA with lpOutput == NULL, as per standard. * lpOutput == NULL signifies the user only wishes @@ -1546,33 +1551,33 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) #else /* SONAME_LIBXI */ /*********************************************************************** - * AttachEventQueueToTablet (X11DRV.@) + * x11drv_tablet_attach_queue */ -int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) +NTSTATUS x11drv_tablet_attach_queue( void *owner ) { return 0; } /*********************************************************************** - * GetCurrentPacket (X11DRV.@) + * x11drv_tablet_get_packet */ -int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet) +NTSTATUS x11drv_tablet_get_packet( void *arg ) { return 0; } /*********************************************************************** - * LoadTabletInfo (X11DRV.@) + * x11drv_tablet_load_info */ -BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) +NTSTATUS x11drv_tablet_load_info( void *arg ) { return FALSE; } /*********************************************************************** - * WTInfoW (X11DRV.@) + * x11drv_tablet_info */ -UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) +NTSTATUS x11drv_tablet_info( void *arg ) { return 0; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index bda4322d26b..5f49f609e1e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -846,6 +846,10 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) extern NTSTATUS x11drv_init( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_clipboard_message( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_create_desktop( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_tablet_attach_queue( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_tablet_get_packet( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_tablet_load_info( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_tablet_info( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI x11drv_post_drop( void *data, ULONG size ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winex11: Move create_desktop implementation to dllmain.c.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 0062917fdf195160bf6872dc90c60834738ae044 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0062917fdf195160bf6872dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 00:07:10 2022 +0200 winex11: Move create_desktop implementation to dllmain.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 13 +++++++------ dlls/winex11.drv/dllmain.c | 10 ++++++++++ dlls/winex11.drv/unixlib.h | 7 +++++++ dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/x11drv.h | 1 + 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index f8c44549fc1..61fe5578e8b 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -321,13 +321,14 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) /*********************************************************************** - * X11DRV_create_desktop + * x11drv_create_desktop * * Create the X11 desktop window for the desktop mode. */ -BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) +NTSTATUS x11drv_create_desktop( void *arg ) { static const WCHAR rootW[] = {'r','o','o','t',0}; + const struct create_desktop_params *params = arg; XSetWindowAttributes win_attr; Window win; Display *display = thread_init_display(); @@ -337,7 +338,7 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) UOI_NAME, name, sizeof(name), NULL )) name[0] = 0; - TRACE( "%s %ux%u\n", debugstr_w(name), width, height ); + TRACE( "%s %ux%u\n", debugstr_w(name), params->width, params->height ); /* magic: desktop "root" means use the root window */ if (!lstrcmpiW( name, rootW )) return FALSE; @@ -354,12 +355,12 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) win_attr.colormap = None; win = XCreateWindow( display, DefaultRootWindow(display), - 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, - CWEventMask | CWCursor | CWColormap, &win_attr ); + 0, 0, params->width, params->height, 0, default_visual.depth, InputOutput, + default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); if (!win) return FALSE; if (!create_desktop_win_data( win )) return FALSE; - X11DRV_init_desktop( win, width, height ); + X11DRV_init_desktop( win, params->width, params->height ); if (is_desktop_fullscreen()) { TRACE("setting desktop to fullscreen\n"); diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 49db5e3d2a5..f5e829d73af 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -134,3 +134,13 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) x11drv_module = instance; return !x11drv_init( NULL ); } + + +/*********************************************************************** + * wine_create_desktop (winex11.@) + */ +BOOL CDECL wine_create_desktop( UINT width, UINT height ) +{ + struct create_desktop_params params = { .width = width, .height = height }; + return x11drv_create_desktop( &params ); +} diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 3865ecab7a0..43a00b619c1 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -28,6 +28,13 @@ struct clipboard_message_params LPARAM lparam; }; +/* x11drv_create_desktop params */ +struct create_desktop_params +{ + UINT width; + UINT height; +}; + /* DnD support */ struct format_entry diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 6e0ccfab4b0..77e4a6285de 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -5,7 +5,7 @@ @ cdecl WTInfoW(long long ptr) X11DRV_WTInfoW # Desktop -@ cdecl wine_create_desktop(long long) X11DRV_create_desktop +@ cdecl wine_create_desktop(long long) # System tray @ cdecl wine_notify_icon(long ptr) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4dc251b9ac2..bda4322d26b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -845,6 +845,7 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) extern NTSTATUS x11drv_init( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_clipboard_message( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_create_desktop( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI x11drv_post_drop( void *data, ULONG size ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winex11: Move X11DRV_InitClipboard to dllmain.c.
by Alexandre Julliard May 4, 2022

May 4, 2022

Module: wine Branch: master Commit: 7cc4d83fec3f13ebb0d2b79a860527d8b4e55dec URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cc4d83fec3f13ebb0d2b79a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 22:47:30 2022 +0200 winex11: Move X11DRV_InitClipboard to dllmain.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 141 +++++++++++++------------------------------ dlls/winex11.drv/dllmain.c | 102 +++++++++++++++++++++++++++++++ dlls/winex11.drv/unixlib.h | 9 +++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 153 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cc4d83fec3f13ebb0d2…

1 0