June 2023 - Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Add a clipping_reset member to user_thread_info.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 89a7c05ad91e7ba92326205593918fec2c75e7bc URL: https://gitlab.winehq.org/wine/wine/-/commit/89a7c05ad91e7ba92326205593918f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 8 00:31:45 2023 +0200 win32u: Add a clipping_reset member to user_thread_info. --- dlls/win32u/input.c | 7 ++++++- dlls/win32u/ntuser_private.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index cea18b89920..2b951576c57 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2499,11 +2499,16 @@ BOOL get_clip_cursor( RECT *rect ) BOOL process_wine_clipcursor( BOOL empty, BOOL reset ) { + struct user_thread_info *thread_info = get_user_thread_info(); RECT rect; TRACE( "empty %u, reset %u\n", empty, reset ); - if (reset) return user_driver->pClipCursor( NULL, TRUE ); + if (reset) + { + thread_info->clipping_reset = NtGetTickCount(); + return user_driver->pClipCursor( NULL, TRUE ); + } if (!grab_pointer) return TRUE; if (empty) return user_driver->pClipCursor( NULL, reset ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 0e7d84e3faa..88e644d2522 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -130,6 +130,7 @@ struct user_thread_info UINT kbd_layout_id; /* Current keyboard layout ID */ struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */ UINT spy_indent; /* Current spy indent */ + DWORD clipping_reset; /* time when clipping was last reset */ }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) );

1 0

Rémi Bernon : winex11: Remove now unnecessary WM_X11DRV_CLIP_CURSOR_NOTIFY.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: bb043fb63eeec5346588762178f0bae8be0f51a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb043fb63eeec5346588762178f0ba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 23:15:40 2023 +0200 winex11: Remove now unnecessary WM_X11DRV_CLIP_CURSOR_NOTIFY. --- dlls/winex11.drv/mouse.c | 49 +++++++---------------------------------------- dlls/winex11.drv/window.c | 2 -- dlls/winex11.drv/x11drv.h | 2 -- 3 files changed, 7 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 4d94a97f3c8..3820e98ed18 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -442,7 +442,6 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data->clip_hwnd) sync_window_cursor( clip_window ); InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd ); data->clip_hwnd = msg_hwnd; - send_notify_message( NtUserGetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, (LPARAM)msg_hwnd ); return TRUE; #else WARN( "XInput2 was not available at compile time\n" ); @@ -457,16 +456,19 @@ static BOOL grab_clipping_window( const RECT *clip ) */ static void ungrab_clipping_window(void) { - Display *display = thread_init_display(); + struct x11drv_thread_data *data = x11drv_init_thread_data(); Window clip_window = init_clip_window(); if (!clip_window) return; TRACE( "no longer clipping\n" ); - XUnmapWindow( display, clip_window ); - if (clipping_cursor) XUngrabPointer( display, CurrentTime ); + XUnmapWindow( data->display, clip_window ); + if (clipping_cursor) XUngrabPointer( data->display, CurrentTime ); clipping_cursor = FALSE; - send_notify_message( NtUserGetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, 0 ); + NtUserDestroyWindow( data->clip_hwnd ); + data->clip_hwnd = 0; + data->clip_reset = NtGetTickCount(); + disable_xinput2(); } /*********************************************************************** @@ -483,43 +485,6 @@ void retry_grab_clipping_window(void) NtUserClipCursor( &last_clip_rect ); } -/*********************************************************************** - * clip_cursor_notify - * - * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR_NOTIFY. - */ -LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) -{ - struct x11drv_thread_data *data = x11drv_init_thread_data(); - - if (hwnd == NtUserGetDesktopWindow()) /* change the clip window stored in the desktop process */ - { - static HWND clip_hwnd; - - HWND prev = clip_hwnd; - clip_hwnd = new_clip_hwnd; - if (prev || new_clip_hwnd) TRACE( "clip hwnd changed from %p to %p\n", prev, new_clip_hwnd ); - if (prev) send_notify_message( prev, WM_X11DRV_CLIP_CURSOR_NOTIFY, (WPARAM)prev, 0 ); - } - else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ - { - TRACE( "clip hwnd reset from %p\n", hwnd ); - data->clip_hwnd = 0; - data->clip_reset = NtGetTickCount(); - disable_xinput2(); - NtUserDestroyWindow( hwnd ); - } - else if (prev_clip_hwnd) - { - /* This is a notification send by the desktop window to an old - * dangling clip window. - */ - TRACE( "destroying old clip hwnd %p\n", prev_clip_hwnd ); - NtUserDestroyWindow( prev_clip_hwnd ); - } - return 0; -} - /*********************************************************************** * clip_fullscreen_window * diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2e290295860..3705d337101 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -3085,8 +3085,6 @@ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) } return 0; } - case WM_X11DRV_CLIP_CURSOR_NOTIFY: - return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); case WM_X11DRV_CLIP_CURSOR_REQUEST: return clip_cursor_request( hwnd, (BOOL)wp, (BOOL)lp ); case WM_X11DRV_DELETE_TAB: diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index aea62c90b7c..e366cab4977 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -589,7 +589,6 @@ enum x11drv_window_messages WM_X11DRV_SET_WIN_REGION, WM_X11DRV_DESKTOP_RESIZED, WM_X11DRV_SET_CURSOR, - WM_X11DRV_CLIP_CURSOR_NOTIFY, WM_X11DRV_CLIP_CURSOR_REQUEST, WM_X11DRV_DELETE_TAB, WM_X11DRV_ADD_TAB @@ -684,7 +683,6 @@ extern XContext cursor_context DECLSPEC_HIDDEN; extern void X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; -extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : win32u: Move grab_pointer registry option from winex11.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: f47ed2926037b96942bd40f6140601987a3025cb URL: https://gitlab.winehq.org/wine/wine/-/commit/f47ed2926037b96942bd40f6140601… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 8 08:44:31 2023 +0200 win32u: Move grab_pointer registry option from winex11. --- dlls/win32u/input.c | 7 ++-- dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++++-- dlls/win32u/win32u_private.h | 1 + dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 4 --- 6 files changed, 80 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index c26660319df..cea18b89920 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -406,7 +406,7 @@ static const KBDTABLES kbdus_tables = LONG global_key_state_counter = 0; - +BOOL grab_pointer = TRUE; static void kbd_tables_init_vsc2vk( const KBDTABLES *tables, BYTE vsc2vk[0x300] ) { @@ -2503,7 +2503,10 @@ BOOL process_wine_clipcursor( BOOL empty, BOOL reset ) TRACE( "empty %u, reset %u\n", empty, reset ); - if (empty || reset) return user_driver->pClipCursor( NULL, reset ); + if (reset) return user_driver->pClipCursor( NULL, TRUE ); + + if (!grab_pointer) return TRUE; + if (empty) return user_driver->pClipCursor( NULL, reset ); get_clip_cursor( &rect ); return user_driver->pClipCursor( &rect, FALSE ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 99042c85923..1ffb040ae75 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4099,13 +4099,47 @@ static union sysparam_all_entry * const default_entries[] = (union sysparam_all_entry *)&entry_AUDIODESC_ON, }; -void sysparams_init(void) +/*********************************************************************** + * get_config_key + * + * Get a config key from either the app-specific or the default config + */ +static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, + WCHAR *buffer, DWORD size ) { + WCHAR nameW[128]; + char buf[2048]; + KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buf; + + asciiz_to_unicode( nameW, name ); + + if (appkey && query_reg_value( appkey, nameW, info, sizeof(buf) )) + { + size = min( info->DataLength, size - sizeof(WCHAR) ); + memcpy( buffer, info->Data, size ); + buffer[size / sizeof(WCHAR)] = 0; + return 0; + } + + if (defkey && query_reg_value( defkey, nameW, info, sizeof(buf) )) + { + size = min( info->DataLength, size - sizeof(WCHAR) ); + memcpy( buffer, info->Data, size ); + buffer[size / sizeof(WCHAR)] = 0; + return 0; + } + + return ERROR_FILE_NOT_FOUND; +} +void sysparams_init(void) +{ + WCHAR buffer[MAX_PATH+16], *p, *appname; DWORD i, dispos, dpi_scaling; WCHAR layout[KL_NAMELENGTH]; pthread_mutexattr_t attr; - HKEY hkey; + HKEY hkey, appkey = 0; + DWORD len; static const WCHAR software_wineW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e'}; static const WCHAR temporary_system_parametersW[] = @@ -4114,6 +4148,7 @@ void sysparams_init(void) static const WCHAR oneW[] = {'1',0}; static const WCHAR kl_preloadW[] = {'K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','\\','P','r','e','l','o','a','d'}; + static const WCHAR x11driverW[] = {'\\','X','1','1',' ','D','r','i','v','e','r',0}; pthread_mutexattr_init( &attr ); pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); @@ -4173,6 +4208,42 @@ void sysparams_init(void) for (i = 0; i < ARRAY_SIZE( default_entries ); i++) default_entries[i]->hdr.init( default_entries[i] ); } + + /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ + hkey = reg_open_hkcu_key( "Software\\Wine\\X11 Driver" ); + + /* open the app-specific key */ + + appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if ((p = wcsrchr( appname, '/' ))) appname = p + 1; + if ((p = wcsrchr( appname, '\\' ))) appname = p + 1; + len = lstrlenW( appname ); + + if (len && len < MAX_PATH) + { + HKEY tmpkey; + int i; + + for (i = 0; appname[i]; i++) buffer[i] = RtlDowncaseUnicodeChar( appname[i] ); + buffer[i] = 0; + appname = buffer; + memcpy( appname + i, x11driverW, sizeof(x11driverW) ); + + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\X11 Driver */ + if ((tmpkey = reg_open_hkcu_key( "Software\\Wine\\AppDefaults" ))) + { + appkey = reg_open_key( tmpkey, appname, lstrlenW( appname ) * sizeof(WCHAR) ); + NtClose( tmpkey ); + } + } + +#define IS_OPTION_TRUE(ch) \ + ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + + if (!get_config_key( hkey, appkey, "GrabPointer", buffer, sizeof(buffer) )) + grab_pointer = IS_OPTION_TRUE( buffer[0] ); + +#undef IS_OPTION_TRUE } static BOOL update_desktop_wallpaper(void) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 45e58093ba4..3cb5eef6fb1 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -86,6 +86,7 @@ extern BOOL register_imm_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void unregister_imm_window( HWND hwnd ) DECLSPEC_HIDDEN; /* input.c */ +extern BOOL grab_pointer DECLSPEC_HIDDEN; extern BOOL destroy_caret(void) DECLSPEC_HIDDEN; extern LONG global_key_state_counter DECLSPEC_HIDDEN; extern HWND get_active_window(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 3820e98ed18..fd03f03f0dd 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1526,7 +1526,7 @@ BOOL X11DRV_ClipCursor( const RECT *clip, BOOL reset ) { TRACE( "clip %p, reset %u\n", clip, reset ); - if (!reset && grab_pointer) + if (!reset) { RECT virtual_rect = NtUserGetVirtualScreenRect(); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e366cab4977..7cbf40079d2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -443,7 +443,6 @@ extern BOOL use_take_focus DECLSPEC_HIDDEN; extern BOOL use_primary_selection DECLSPEC_HIDDEN; extern BOOL use_system_cursors DECLSPEC_HIDDEN; extern BOOL show_systray DECLSPEC_HIDDEN; -extern BOOL grab_pointer DECLSPEC_HIDDEN; extern BOOL grab_fullscreen DECLSPEC_HIDDEN; extern BOOL usexcomposite DECLSPEC_HIDDEN; extern BOOL managed_mode DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 929be92ff7a..c4d537d6ada 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -74,7 +74,6 @@ BOOL use_take_focus = TRUE; BOOL use_primary_selection = FALSE; BOOL use_system_cursors = TRUE; BOOL show_systray = TRUE; -BOOL grab_pointer = TRUE; BOOL grab_fullscreen = FALSE; BOOL managed_mode = TRUE; BOOL decorated_mode = TRUE; @@ -498,9 +497,6 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "ShowSystray", buffer, sizeof(buffer) )) show_systray = IS_OPTION_TRUE( buffer[0] ); - if (!get_config_key( hkey, appkey, "GrabPointer", buffer, sizeof(buffer) )) - grab_pointer = IS_OPTION_TRUE( buffer[0] ); - if (!get_config_key( hkey, appkey, "GrabFullscreen", buffer, sizeof(buffer) )) grab_fullscreen = IS_OPTION_TRUE( buffer[0] );

1 0

Rémi Bernon : imm32: Avoid resizing IMCC to zero-size buffer.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 5911f36cfff1b48047042f2848b59a626258b29c URL: https://gitlab.winehq.org/wine/wine/-/commit/5911f36cfff1b48047042f2848b59a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 12 10:37:56 2023 +0200 imm32: Avoid resizing IMCC to zero-size buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55027 --- dlls/imm32/ime.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index fa8e94acb21..b5c4fc5b2e1 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -366,7 +366,9 @@ static UINT ime_set_comp_string( HIMC himc, LPARAM lparam ) if (!(ctx = ImmLockIMC( himc ))) return 0; count = ImeToAsciiEx( VK_PROCESSKEY, lparam, NULL, &buffer.list, 0, himc ); - if (count >= buffer.uMsgCount) + if (!count) + TRACE( "ImeToAsciiEx returned no messages\n" ); + else if (count >= buffer.uMsgCount) WARN( "ImeToAsciiEx returned %#x messages\n", count ); else if (!(himcc = ImmReSizeIMCC( ctx->hMsgBuf, (ctx->dwNumMsgBuf + count) * sizeof(*msgs) ))) WARN( "Failed to resize input context message buffer\n" ); @@ -534,7 +536,7 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs, if (!(ctx = ImmLockIMC( himc ))) return 0; if (!(compstr = ImmLockIMCC( ctx->hCompStr ))) goto done; - size = compstr->dwSize; + size = max( compstr->dwSize, sizeof(COMPOSITIONSTRING) ); do {

1 0

Huw Davies : winepulse: Return E_NOTIMPL when the property is not found.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: b012bed6ff92a7716cd61647aea63772f5351fec URL: https://gitlab.winehq.org/wine/wine/-/commit/b012bed6ff92a7716cd61647aea637… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 12 10:23:53 2023 +0100 winepulse: Return E_NOTIMPL when the property is not found. Fixes a regression caused by 13fa7a57df0d. --- dlls/winepulse.drv/pulse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index d259902c8b5..be540a4da2c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2489,7 +2489,6 @@ static NTSTATUS pulse_get_prop_value(void *args) struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; PhysDevice *dev; - params->result = S_OK; LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { if (strcmp(params->device, dev->pulse_name)) continue; @@ -2501,18 +2500,19 @@ static NTSTATUS pulse_get_prop_value(void *args) case 0: /* FormFactor */ params->value->vt = VT_UI4; params->value->ulVal = dev->form; + params->result = S_OK; return STATUS_SUCCESS; case 3: /* PhysicalSpeakers */ if (!dev->channel_mask) goto fail; params->value->vt = VT_UI4; params->value->ulVal = dev->channel_mask; + params->result = S_OK; return STATUS_SUCCESS; - default: - params->result = E_NOTIMPL; } } + params->result = E_NOTIMPL; return STATUS_SUCCESS; }

1 0

Alexandre Julliard : wow64: Don't force wow64 dlls to load at low addresses.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: b5a0dd8ca3300102ef02ebae7403427261a354f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5a0dd8ca3300102ef02ebae740342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 11:12:02 2023 +0200 wow64: Don't force wow64 dlls to load at low addresses. --- dlls/wow64/Makefile.in | 2 +- dlls/wow64cpu/Makefile.in | 2 +- dlls/wow64win/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index eebf9e8e53a..156bc8acd36 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -2,7 +2,7 @@ MODULE = wow64.dll IMPORTLIB = wow64 IMPORTS = ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f000000 +EXTRADLLFLAGS = -nodefaultlibs C_SRCS = \ file.c \ diff --git a/dlls/wow64cpu/Makefile.in b/dlls/wow64cpu/Makefile.in index a4a43fc85cd..75132c90792 100644 --- a/dlls/wow64cpu/Makefile.in +++ b/dlls/wow64cpu/Makefile.in @@ -1,6 +1,6 @@ MODULE = wow64cpu.dll IMPORTS = wow64 ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f400000 +EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7a400000 C_SRCS = cpu.c diff --git a/dlls/wow64win/Makefile.in b/dlls/wow64win/Makefile.in index ce8c42f06f6..160fea8b1a4 100644 --- a/dlls/wow64win/Makefile.in +++ b/dlls/wow64win/Makefile.in @@ -1,7 +1,7 @@ MODULE = wow64win.dll IMPORTS = wow64 win32u ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f200000 +EXTRADLLFLAGS = -nodefaultlibs C_SRCS = \ gdi.c \

1 0

Huw Davies : winepulse: Don't overwrite the result in the insufficient buffer case.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 2586652e1674213208f17402f15805730f1d1c8f URL: https://gitlab.winehq.org/wine/wine/-/commit/2586652e1674213208f17402f15805… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 12 10:10:27 2023 +0100 winepulse: Don't overwrite the result in the insufficient buffer case. Fixes a regression caused by 13fa7a57df0d. --- dlls/winepulse.drv/pulse.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 5ba66a8aa1d..d259902c8b5 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2494,8 +2494,7 @@ static NTSTATUS pulse_get_prop_value(void *args) if (strcmp(params->device, dev->pulse_name)) continue; if (IsEqualPropertyKey(*params->prop, devicepath_key)) { - if (!get_device_path(dev, params)) - break; + get_device_path(dev, params); return STATUS_SUCCESS; } else if (IsEqualGUID(&params->prop->fmtid, &PKEY_AudioEndpoint_GUID)) { switch (params->prop->pid) {

1 0

Alexandre Julliard : makefiles: Define WINE_UNIX_LIB for all files that are built for Unix.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 912fd620db3794efb3167f6b22582917e29ff0a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/912fd620db3794efb3167f6b225829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 11:11:44 2023 +0200 makefiles: Define WINE_UNIX_LIB for all files that are built for Unix. --- configure | 2 +- configure.ac | 2 +- include/windef.h | 6 +++++- tools/makedep.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure b/configure index fc78d87aebf..bbdf04b67d5 100755 --- a/configure +++ b/configure @@ -23023,7 +23023,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 wine_fn_output_makedep () { as_dir=tools; as_fn_mkdir_p - $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS + $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS } wine_fn_output_makefile () { diff --git a/configure.ac b/configure.ac index e571c32bcdf..58efc37296c 100644 --- a/configure.ac +++ b/configure.ac @@ -3462,7 +3462,7 @@ then [wine_fn_output_makedep () { AS_MKDIR_P(tools) - $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS + $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS }]) fi diff --git a/include/windef.h b/include/windef.h index 28aa7d6a237..b5f8f3d0b4c 100644 --- a/include/windef.h +++ b/include/windef.h @@ -54,11 +54,13 @@ extern "C" { # endif #endif +#if !defined(_MSC_VER) && !defined(__MINGW32__) + #ifdef WINE_UNIX_LIB # define __stdcall # define __cdecl # define __fastcall -#elif !defined(_MSC_VER) && !defined(__MINGW32__) +#else # undef __stdcall # ifdef __i386__ # ifdef __GNUC__ @@ -99,6 +101,8 @@ extern "C" { # ifndef __thiscall # define __thiscall __stdcall # endif +#endif /* WINE_UNIX_LIB */ + #endif /* _MSC_VER || __MINGW32__ */ #ifndef __ms_va_list diff --git a/tools/makedep.c b/tools/makedep.c index 00ebfa27e8f..3322e825617 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2351,7 +2351,6 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi } strarray_addall( &ret, make->define_args ); strarray_addall( &ret, get_expanded_file_local_var( make, obj, "EXTRADEFS" )); - if (source->file->flags & FLAG_C_UNIX) strarray_add( &ret, "-DWINE_UNIX_LIB" ); return ret; } @@ -4247,6 +4246,7 @@ static void load_sources( struct makefile *make ) make->define_args = empty_strarray; make->unix_cflags = empty_strarray; if (!make->extlib) strarray_add( &make->define_args, "-D__WINESRC__" ); + strarray_add( &make->unix_cflags, "-DWINE_UNIX_LIB" ); value = get_expanded_make_var_array( make, "EXTRAINCL" ); for (i = 0; i < value.count; i++)

1 0

Alexandre Julliard : loader: Make the loader position-independent on 64-bit.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: cc2cfb9b792bee681b96c5859084fd6d4d0bbed7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc2cfb9b792bee681b96c5859084fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 11:13:03 2023 +0200 loader: Make the loader position-independent on 64-bit. --- configure | 32 +++++++++++++++++++++++++++++++- configure.ac | 6 +++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bbdf04b67d5..9f06d6193eb 100755 --- a/configure +++ b/configure @@ -10244,7 +10244,7 @@ fi WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" case $host_cpu in - *i[3456789]86* | x86_64 | *aarch64* | arm*) + *i[3456789]86* | arm*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } if test ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+y} @@ -10335,6 +10335,36 @@ printf "%s\n" "$ac_cv_cflags__Wl__z_max_page_size_0x1000" >&6; } if test "x$ac_cv_cflags__Wl__z_max_page_size_0x1000" = xyes then : WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000" +fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 +printf %s "checking whether the compiler supports -Wl,-pie... " >&6; } +if test ${ac_cv_cflags__Wl__pie+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-pie" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__Wl__pie=yes +else $as_nop + ac_cv_cflags__Wl__pie=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 +printf "%s\n" "$ac_cv_cflags__Wl__pie" >&6; } +if test "x$ac_cv_cflags__Wl__pie" = xyes +then : + WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie" fi ;; esac diff --git a/configure.ac b/configure.ac index 58efc37296c..7a4af2d454e 100644 --- a/configure.ac +++ b/configure.ac @@ -770,7 +770,7 @@ case $host_os in WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" case $host_cpu in - *i[[3456789]]86* | x86_64 | *aarch64* | arm*) + *i[[3456789]]86* | arm*) WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; @@ -784,6 +784,10 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) ;; + *) + WINE_TRY_CFLAGS([-Wl,-pie], + [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"]) + ;; esac ;; esac

1 0

Alexandre Julliard : winegcc: Fix an uninitialized variable warning in the PE build.
by Alexandre Julliard June 12, 2023

June 12, 2023

Module: wine Branch: master Commit: 834f7b23667e169a0a20ba732b88d8e29f6cf668 URL: https://gitlab.winehq.org/wine/wine/-/commit/834f7b23667e169a0a20ba732b88d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:20:18 2023 +0200 winegcc: Fix an uninitialized variable warning in the PE build. --- tools/winegcc/winegcc.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c0f881df0a2..b6a6c42068d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -305,24 +305,18 @@ static struct strarray build_tool_name( struct options *opts, enum tool tool ) static struct strarray get_translator(struct options *opts) { - enum tool tool; - switch(opts->processor) { case proc_cpp: - tool = TOOL_CPP; - break; + return build_tool_name( opts, TOOL_CPP ); case proc_cc: case proc_as: - tool = TOOL_CC; - break; + return build_tool_name( opts, TOOL_CC ); case proc_cxx: - tool = TOOL_CXX; - break; - default: - assert(0); + return build_tool_name( opts, TOOL_CXX ); } - return build_tool_name( opts, tool ); + assert(0); + return empty_strarray; } static int try_link( struct strarray prefix, struct strarray link_tool, const char *cflags )

1 0