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

Jacek Caban : winex11: Use unixlib interface for x11drv_is_system_module.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 2f4a338da3fd80a0bffd4bfdafbd81208928b977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4a338da3fd80a0bffd4bfd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 00:45:01 2022 +0200 winex11: Use unixlib interface for x11drv_is_system_module. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 26 ++++++++++++++++++++++++++ dlls/winex11.drv/mouse.c | 25 +++++++++---------------- dlls/winex11.drv/unixlib.h | 10 ++++++++++ 3 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 7ea07647dc9..705503dc37c 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -127,6 +127,30 @@ static NTSTATUS x11drv_clipboard_init( UINT arg ) } +static NTSTATUS WINAPI x11drv_is_system_module( void *arg, ULONG size ) +{ + HMODULE module; + unsigned int i; + + static const WCHAR cursor_modules[][16] = + { + { 'u','s','e','r','3','2','.','d','l','l',0 }, + { 'c','o','m','c','t','l','3','2','.','d','l','l',0 }, + { 'o','l','e','3','2','.','d','l','l',0 }, + { 'r','i','c','h','e','d','2','0','.','d','l','l',0 } + }; + + if (!(module = GetModuleHandleW( arg ))) return system_module_none; + + for (i = 0; i < ARRAYSIZE(cursor_modules); i++) + { + if (GetModuleHandleW( cursor_modules[i] ) == module) return i; + } + + return system_module_none; +} + + typedef NTSTATUS (*callback_func)( UINT arg ); static const callback_func callback_funcs[] = { @@ -157,11 +181,13 @@ static const kernel_callback kernel_callbacks[] = x11drv_dnd_post_drop, x11drv_ime_set_composition_string, x11drv_ime_set_result, + x11drv_is_system_module, x11drv_systray_change_owner, }; C_ASSERT( NtUserDriverCallbackFirst + ARRAYSIZE(kernel_callbacks) == client_func_last ); + BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { void **callback_table; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d080ed5458e..adf23d04450 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -930,16 +930,12 @@ static const struct system_cursors riched20_cursors[] = { 0 } }; -static const struct +static const struct system_cursors *module_cursors[] = { - const struct system_cursors *cursors; - WCHAR name[16]; -} module_cursors[] = -{ - { user32_cursors, {'u','s','e','r','3','2','.','d','l','l',0} }, - { comctl32_cursors, {'c','o','m','c','t','l','3','2','.','d','l','l',0} }, - { ole32_cursors, {'o','l','e','3','2','.','d','l','l',0} }, - { riched20_cursors, {'r','i','c','h','e','d','2','0','.','d','l','l',0} } + user32_cursors, + comctl32_cursors, + ole32_cursors, + riched20_cursors, }; struct cursor_font_fallback @@ -1059,7 +1055,6 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) const struct system_cursors *cursors; unsigned int i; Cursor cursor = 0; - HMODULE module; HKEY key; const char * const *names = NULL; WCHAR *p, name[MAX_PATH * 2]; @@ -1098,13 +1093,11 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) } if (info->szResName[0]) goto done; /* only integer resources are supported here */ - if (!(module = GetModuleHandleW( info->szModName ))) goto done; - - for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) - if (GetModuleHandleW( module_cursors[i].name ) == module) break; - if (i == ARRAY_SIZE( module_cursors )) goto done; + i = x11drv_client_func( client_func_is_system_module, info->szModName, + (lstrlenW( info->szModName ) + 1) * sizeof(WCHAR) ); + if (i == system_module_none) goto done; - cursors = module_cursors[i].cursors; + cursors = module_cursors[i]; for (i = 0; cursors[i].id; i++) if (cursors[i].id == info->wResID) { diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index dc3c74979ca..233a2578b41 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -66,6 +66,15 @@ struct systray_dock_params BOOL *layered; }; +enum system_modules +{ + system_module_user32, + system_module_comctl32, + system_module_ole32, + system_module_riched20, + system_module_none = 0xffff, +}; + /* x11drv_tablet_info params */ struct tablet_info_params { @@ -90,6 +99,7 @@ enum x11drv_client_funcs client_func_dnd_post_drop, client_func_ime_set_composition_string, client_func_ime_set_result, + client_func_is_system_module, client_func_systray_change_owner, client_func_last };

1 0

Jacek Caban : winex11: Move LoadIcon call to dllmain.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 2c1b7c8c170224657aa4ccbc79374c543d6b84f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1b7c8c170224657aa4ccbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 01:31:51 2022 +0200 winex11: Move LoadIcon call to dllmain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 7 +++++++ dlls/winex11.drv/unixlib.h | 1 + dlls/winex11.drv/window.c | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 705503dc37c..2a361c477f4 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -151,6 +151,12 @@ static NTSTATUS WINAPI x11drv_is_system_module( void *arg, ULONG size ) } +static NTSTATUS x11drv_load_icon( UINT id ) +{ + return HandleToUlong( LoadIconW( NULL, UlongToPtr( id ))); +} + + typedef NTSTATUS (*callback_func)( UINT arg ); static const callback_func callback_funcs[] = { @@ -162,6 +168,7 @@ static const callback_func callback_funcs[] = x11drv_ime_set_cursor_pos, x11drv_ime_set_open_status, x11drv_ime_update_association, + x11drv_load_icon, }; C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count ); diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 233a2578b41..f3f6b9b8f06 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -117,6 +117,7 @@ enum client_callback client_ime_set_cursor_pos, client_ime_set_open_status, client_ime_update_association, + client_load_icon, client_funcs_count }; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 161f749a81d..a62a3e84e81 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -627,7 +627,10 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_big) icon_big = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), &ii ); if (!icon_big) - icon_big = get_icon_info( LoadIconW( 0, (LPWSTR)IDI_WINLOGO ), &ii); + { + UINT winlogo = x11drv_client_call( client_load_icon, IDI_WINLOGO ); + icon_big = get_icon_info( UlongToHandle( winlogo ), &ii ); + } } if (!icon_small) {

1 0

Jacek Caban : include: Don't use DECLSPEC_HIDDEN for WINGDIAPI and WINUSERAPI in unuxlibs.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 497f37cf99575191e8a0b4bed40f554c9bb03794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=497f37cf99575191e8a0b4be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 12:23:01 2022 +0200 include: Don't use DECLSPEC_HIDDEN for WINGDIAPI and WINUSERAPI in unuxlibs. Allows win32u.so to expose such functions using unixlib interface. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dde.h | 2 +- include/ddeml.h | 2 +- include/wingdi.h | 2 +- include/winuser.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/dde.h b/include/dde.h index 35623615398..4e0d1176727 100644 --- a/include/dde.h +++ b/include/dde.h @@ -28,7 +28,7 @@ extern "C" { #endif -#ifdef _USER32_ +#if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else #define WINUSERAPI DECLSPEC_HIDDEN diff --git a/include/ddeml.h b/include/ddeml.h index b8d7f00631a..dcac04bfb19 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -26,7 +26,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -#ifdef _USER32_ +#if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else #define WINUSERAPI DECLSPEC_HIDDEN diff --git a/include/wingdi.h b/include/wingdi.h index 7220aff089b..6778c60db79 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -24,7 +24,7 @@ extern "C" { #endif -#ifdef _GDI32_ +#if defined(_GDI32_) || defined(WINE_UNIX_LIB) #define WINGDIAPI #else #define WINGDIAPI DECLSPEC_HIDDEN diff --git a/include/winuser.h b/include/winuser.h index 01660e8a8f7..a227b912e0e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -19,7 +19,7 @@ #ifndef _WINUSER_ #define _WINUSER_ -#if !defined(_USER32_) +#if !defined(_USER32_) && !defined(WINE_UNIX_LIB) #define WINUSERAPI DECLSPEC_HIDDEN #else #define WINUSERAPI

1 0

Jacek Caban : winex11: Use wcsicmp for string comparison.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 6dd08c34dccd491add3528b29726ae684b6be264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dd08c34dccd491add3528b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 23:55:41 2022 +0200 winex11: Use wcsicmp for string comparison. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/settings.c | 8 ++++---- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c335bc5ba2b..20f4063c343 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -90,7 +90,7 @@ static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) { WCHAR primary_adapter[CCHDEVICENAME]; - if (!get_primary_adapter( primary_adapter ) || lstrcmpiW( primary_adapter, device_name )) + if (!get_primary_adapter( primary_adapter ) || wcsicmp( primary_adapter, device_name )) return FALSE; *id = 0; @@ -342,7 +342,7 @@ NTSTATUS x11drv_create_desktop( void *arg ) 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; + if (!wcsicmp( name, rootW )) return FALSE; /* Create window */ win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 6b876c3bee9..ff43939a858 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2203,7 +2203,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) if (name && (vkey == VK_SHIFT || vkey == VK_CONTROL || vkey == VK_MENU)) { char* idx = strrchr(name, '_'); - if (idx && (_strnicmp(idx, "_r", -1) == 0 || _strnicmp(idx, "_l", -1) == 0)) + if (idx && (idx[1] == 'r' || idx[1] == 'R' || idx[1] == 'l' || idx[1] == 'L') && !idx[2]) { pthread_mutex_unlock( &kbd_mutex ); TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 1e8868acc6c..3e83e467c63 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -91,7 +91,7 @@ static BOOL nores_get_id(const WCHAR *device_name, ULONG_PTR *id) if (!get_primary_adapter( primary_adapter )) return FALSE; - *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; return TRUE; } @@ -500,7 +500,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW } pthread_mutex_lock( &settings_mutex ); - if (n == 0 || lstrcmpiW(cached_device_name, name) || cached_flags != flags) + if (n == 0 || wcsicmp(cached_device_name, name) || cached_flags != flags) { if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) { @@ -654,7 +654,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, displays[display_idx].desired_mode = registry_mode; } - else if (!lstrcmpiW(dev_name, display_device.DeviceName)) + else if (!wcsicmp(dev_name, display_device.DeviceName)) { displays[display_idx].desired_mode = *dev_mode; if (!(dev_mode->dmFields & DM_POSITION)) @@ -950,7 +950,7 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (!lstrcmpiW(displays[display_idx].desired_mode.dmDeviceName, devname)) + if (!wcsicmp(displays[display_idx].desired_mode.dmDeviceName, devname)) { full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); if (!full_mode) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 42d9e39b082..5540a6ebbb5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -949,4 +949,6 @@ static inline int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DW return WideCharToMultiByte( CP_UNIXCP, 0, src, srclen, dst, dstlen, NULL, NULL ); } +#define wcsicmp lstrcmpiW + #endif /* __WINE_X11DRV_H */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6ede776d76b..eec7a81a4cb 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -151,7 +151,7 @@ static BOOL xrandr10_get_id( const WCHAR *device_name, ULONG_PTR *id ) /* RandR 1.0 only supports changing the primary adapter settings. * For non-primary adapters, an id is still provided but getting * and changing non-primary adapters' settings will be ignored. */ - *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; return TRUE; } diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 126e2bf2a69..a51ded9fe4a 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -91,7 +91,7 @@ static BOOL xf86vm_get_id(const WCHAR *device_name, ULONG_PTR *id) /* XVidMode only supports changing the primary adapter settings. * For non-primary adapters, an id is still provided but getting * and changing non-primary adapters' settings will be ignored. */ - *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; return TRUE; }

1 0

Jacek Caban : winex11: Move user driver to unixlib.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 10f38c06008a1410bc9a1f7d239d831c6b21749a URL: https://source.winehq.org/git/wine.git/?a=commit;h=10f38c06008a1410bc9a1f7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 12:41:31 2022 +0200 winex11: Move user driver to unixlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/Makefile.in | 3 +- dlls/winex11.drv/bitblt.c | 4 +++ dlls/winex11.drv/brush.c | 4 +++ dlls/winex11.drv/clipboard.c | 4 +++ dlls/winex11.drv/desktop.c | 4 +++ dlls/winex11.drv/display.c | 4 +++ dlls/winex11.drv/dllmain.c | 16 ++++++++++- dlls/winex11.drv/event.c | 12 +++++--- dlls/winex11.drv/graphics.c | 4 +++ dlls/winex11.drv/init.c | 4 +++ dlls/winex11.drv/keyboard.c | 4 +++ dlls/winex11.drv/mouse.c | 4 +++ dlls/winex11.drv/opengl.c | 4 +++ dlls/winex11.drv/palette.c | 4 +++ dlls/winex11.drv/pen.c | 4 +++ dlls/winex11.drv/settings.c | 4 +++ dlls/winex11.drv/systray.c | 2 ++ dlls/winex11.drv/unixlib.h | 11 +++++++- dlls/winex11.drv/vulkan.c | 4 +++ dlls/winex11.drv/window.c | 6 +++- dlls/winex11.drv/wintab.c | 4 +++ dlls/winex11.drv/x11drv.h | 64 ++++++++++++++++++++++++++++++++++-------- dlls/winex11.drv/x11drv_main.c | 29 ++++++++++++++++--- dlls/winex11.drv/xim.c | 4 +++ dlls/winex11.drv/xinerama.c | 4 +++ dlls/winex11.drv/xrandr.c | 4 +++ dlls/winex11.drv/xrender.c | 4 +++ dlls/winex11.drv/xvidmode.c | 4 +++ tools/winewrapper | 4 +-- 29 files changed, 201 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10f38c06008a1410bc9a…

1 0

Jacek Caban : winex11: Build with msvcrt.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: a3d4eefa0d851e79154b5b509434c439cde5e511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3d4eefa0d851e79154b5b50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 01:38:52 2022 +0200 winex11: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/Makefile.in | 2 -- dlls/winex11.drv/dllmain.c | 3 +-- dlls/winex11.drv/ime.c | 11 +--------- dlls/winex11.drv/systray.c | 16 +------------- dlls/winex11.drv/x11drv.h | 19 ---------------- dlls/winex11.drv/x11drv_dll.h | 51 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xdnd.c | 20 +++-------------- 7 files changed, 57 insertions(+), 65 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9de440c35ff..3c653902ef2 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -6,8 +6,6 @@ DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = -lwin32u $(X_LIBS) $(X_EXTRA_LIBS) $(PTHREAD_LIBS) -lm -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ bitblt.c \ brush.c \ diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 1f1d98903bc..b9bf5efd1e3 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "x11drv.h" +#include "x11drv_dll.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index b2b61a17604..5f8bdd8c68b 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -40,19 +40,10 @@ * generate the messages that we want the IMM layer to send to the application. */ -#include "config.h" - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" +#include "x11drv_dll.h" #include "wine/debug.h" #include "imm.h" #include "ddk/imm.h" -#include "winnls.h" -#include "x11drv.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 961ec05a7dc..599240e3672 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -20,25 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <assert.h> -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> - -#include <X11/Xlib.h> - #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include "x11drv_dll.h" #include "commctrl.h" #include "shellapi.h" -#include "x11drv.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 56c141a018d..257146fadcf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -435,7 +435,6 @@ extern int primary_monitor DECLSPEC_HIDDEN; extern int copy_default_colors DECLSPEC_HIDDEN; extern int alloc_system_colors DECLSPEC_HIDDEN; extern int xrender_error_base DECLSPEC_HIDDEN; -extern HMODULE x11drv_module DECLSPEC_HIDDEN; extern char *process_name DECLSPEC_HIDDEN; extern Display *clipboard_display DECLSPEC_HIDDEN; extern WNDPROC client_foreign_window_proc; @@ -841,24 +840,6 @@ 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_dnd_enter_event( void *params, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_dnd_position_event( void *params, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_dnd_post_drop( void *data, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_ime_set_composition_string( void *params, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_ime_set_result( void *params, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_systray_change_owner( void *params, ULONG size ) DECLSPEC_HIDDEN; - -extern NTSTATUS x11drv_dnd_drop_event( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_dnd_leave_event( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_get_cursor_pos( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_set_composition_status( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_set_cursor_pos( UINT pos ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_set_open_status( UINT open ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_update_association( UINT arg ) DECLSPEC_HIDDEN; - -extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, - LPARAM lparam ) DECLSPEC_HIDDEN; - extern NTSTATUS x11drv_client_func( enum x11drv_client_funcs func, const void *params, ULONG size ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_client_call( enum client_callback func, UINT arg ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_dll.h b/dlls/winex11.drv/x11drv_dll.h new file mode 100644 index 00000000000..047bb430d39 --- /dev/null +++ b/dlls/winex11.drv/x11drv_dll.h @@ -0,0 +1,51 @@ +/* + * X11 driver definitions + * + * Copyright 2022 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_X11DRV_DLL_H +#define __WINE_X11DRV_DLL_H + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "ntgdi.h" +#include "unixlib.h" + +extern NTSTATUS WINAPI x11drv_dnd_enter_event( void *params, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_dnd_position_event( void *params, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_dnd_post_drop( void *data, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_ime_set_composition_string( void *params, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_ime_set_result( void *params, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_systray_change_owner( void *params, ULONG size ) DECLSPEC_HIDDEN; + +extern NTSTATUS x11drv_dnd_drop_event( UINT arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_dnd_leave_event( UINT arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_get_cursor_pos( UINT arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_set_composition_status( UINT arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_set_cursor_pos( UINT pos ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_set_open_status( UINT open ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_update_association( UINT arg ) DECLSPEC_HIDDEN; + +extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, + LPARAM lparam ) DECLSPEC_HIDDEN; + +extern BOOL show_systray DECLSPEC_HIDDEN; +extern HMODULE x11drv_module DECLSPEC_HIDDEN; + +#endif /* __WINE_X11DRV_DLL_H */ diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 975fe7a114b..9137f46b5dc 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -19,26 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <string.h> -#include <unistd.h> -#include <stdarg.h> -#include <stdio.h> - +#define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#define COBJMACROS -#include "x11drv.h" +#include "x11drv_dll.h" #include "shellapi.h" -#include "shlobj.h" /* DROPFILES */ -#include "oleidl.h" -#include "objidl.h" +#include "shlobj.h" #include "wine/debug.h" #include "wine/list.h"

1 0

Jacek Caban : winex11: Don't use unicode.h.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: a3132f2906d0f8bdcb150749b3fbe31a63923da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3132f2906d0f8bdcb150749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 01:48:24 2022 +0200 winex11: Don't use unicode.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 3 +-- dlls/winex11.drv/graphics.c | 5 ++--- dlls/winex11.drv/keyboard.c | 5 ++--- dlls/winex11.drv/mouse.c | 9 ++++----- dlls/winex11.drv/settings.c | 5 ++--- dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/wintab.c | 23 +++++++++++------------ dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/x11drv_main.c | 13 ++++++------- dlls/winex11.drv/xim.c | 7 +++---- dlls/winex11.drv/xrandr.c | 3 +-- dlls/winex11.drv/xrender.c | 7 +++---- 12 files changed, 36 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3132f2906d0f8bdcb15…

1 0

Rémi Bernon : dinput: Do not delete static critical section.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 78ecbc4b2d548e4cb57af622d40d0149366a7354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ecbc4b2d548e4cb57af622… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 13:14:31 2022 +0200 dinput: Do not delete static critical section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a7ab3b7a9e2..0cd5eb59588 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1439,7 +1439,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) if (reserved) break; dinput_thread_stop(); unregister_di_em_win_class(); - DeleteCriticalSection(&dinput_hook_crit); break; } return TRUE;

1 0

Zhiyi Zhang : wintypes: Implement IApiInformationStatics stubs.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 1c5d218ffb357cdb6b6dd71359740167352e1d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5d218ffb357cdb6b6dd713… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 6 17:29:28 2022 +0800 wintypes: Implement IApiInformationStatics stubs. Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wintypes/main.c | 207 +++++++++++++++++++ dlls/wintypes/tests/Makefile.in | 5 + dlls/wintypes/tests/wintypes.c | 437 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 651 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5d218ffb357cdb6b6d…

1 0

Alexandre Julliard : Release 7.8.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 3ded60bd1654dc689d24a23305f4a93acce3a6f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ded60bd1654dc689d24a233… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 22:36:51 2022 +0200 Release 7.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1014 +++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 586 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ded60bd1654dc689d24…

1 0