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

Rémi Bernon : win32u: Move fullscreen window cursor clipping from winex11.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: af902c188ebaf7d6dda3b628409d8c390ab410d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/af902c188ebaf7d6dda3b628409d8c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 8 08:51:47 2023 +0200 win32u: Move fullscreen window cursor clipping from winex11. --- dlls/win32u/input.c | 70 ++++++++++++++++++++++++++++++---- dlls/win32u/message.c | 8 +++- dlls/win32u/ntgdi_private.h | 9 ----- dlls/win32u/sysparams.c | 4 ++ dlls/win32u/win32u_private.h | 16 +++++++- dlls/win32u/winstation.c | 13 +++++++ dlls/winex11.drv/desktop.c | 3 -- dlls/winex11.drv/event.c | 6 +-- dlls/winex11.drv/mouse.c | 89 +------------------------------------------- dlls/winex11.drv/window.c | 2 - dlls/winex11.drv/x11drv.h | 4 -- 11 files changed, 103 insertions(+), 121 deletions(-)

1 0

Tatsuyuki Ishi : win32u: Move QueryDisplayConfig from user32.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: c2c9112bf8896d49a6af1ca1f73e563c5a7f909c URL: https://gitlab.winehq.org/wine/wine/-/commit/c2c9112bf8896d49a6af1ca1f73e56… Author: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> Date: Fri Jun 2 19:25:38 2023 +0900 win32u: Move QueryDisplayConfig from user32. Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> --- dlls/user32/sysparams.c | 277 ------------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 224 +++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 12 +++ include/ntuser.h | 3 + 8 files changed, 243 insertions(+), 279 deletions(-)

1 0

Tatsuyuki Ishi : win32u: Cleanup naming and log messages for QueryDisplayConfig.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: d24dcb1ec56ffed7da36f13805678e024c6f4fc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d24dcb1ec56ffed7da36f13805678e… Author: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> Date: Sun Jun 11 12:22:29 2023 +0900 win32u: Cleanup naming and log messages for QueryDisplayConfig. Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki(a)gmail.com> --- dlls/win32u/sysparams.c | 51 +++++++++++++++++++++++++------------------------ include/ntuser.h | 6 +++--- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 416b3f34de6..a8d9a4f9a10 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2239,7 +2239,7 @@ static void set_path_target_info( DISPLAYCONFIG_PATH_TARGET_INFO *info, const LU static void set_mode_source_info( DISPLAYCONFIG_MODE_INFO *info, const LUID *gpu_luid, UINT32 source_id, const DEVMODEW *devmode ) { - DISPLAYCONFIG_SOURCE_MODE *mode = &(info->sourceMode); + DISPLAYCONFIG_SOURCE_MODE *mode = &info->sourceMode; info->infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE; info->adapterId = *gpu_luid; @@ -2268,15 +2268,15 @@ static void set_path_source_info( DISPLAYCONFIG_PATH_SOURCE_INFO *info, const LU info->statusFlags = DISPLAYCONFIG_SOURCE_IN_USE; } -static BOOL source_mode_exists( const DISPLAYCONFIG_MODE_INFO *modeinfo, UINT32 num_modes, +static BOOL source_mode_exists( const DISPLAYCONFIG_MODE_INFO *modes, UINT32 modes_count, UINT32 source_id, UINT32 *found_mode_index ) { UINT32 i; - for (i = 0; i < num_modes; i++) + for (i = 0; i < modes_count; i++) { - if (modeinfo[i].infoType == DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE && - modeinfo[i].id == source_id) + if (modes[i].infoType == DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE && + modes[i].id == source_id) { *found_mode_index = i; return TRUE; @@ -2288,9 +2288,9 @@ static BOOL source_mode_exists( const DISPLAYCONFIG_MODE_INFO *modeinfo, UINT32 /*********************************************************************** * NtUserQueryDisplayConfig (win32u.@) */ -LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, - UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, - DISPLAYCONFIG_TOPOLOGY_ID *topologyid ) +LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *paths_count, DISPLAYCONFIG_PATH_INFO *paths, + UINT32 *modes_count, DISPLAYCONFIG_MODE_INFO *modes, + DISPLAYCONFIG_TOPOLOGY_ID *topology_id ) { ULONG adapter_index; LONG ret; @@ -2299,12 +2299,13 @@ LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *numpathelements, DIS DEVMODEW devmode; struct monitor *monitor; - FIXME( "(%08x %p %p %p %p %p): semi-stub\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid ); + FIXME( "flags %#x, paths_count %p, paths %p, modes_count %p, modes %p, topology_id %p semi-stub\n", + flags, paths_count, paths, modes_count, modes, topology_id ); - if (!numpathelements || !numinfoelements) + if (!paths_count || !modes_count) return ERROR_INVALID_PARAMETER; - if (!*numpathelements || !*numinfoelements) + if (!*paths_count || !*modes_count) return ERROR_INVALID_PARAMETER; if (flags != QDC_ALL_PATHS && @@ -2312,17 +2313,17 @@ LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *numpathelements, DIS flags != QDC_DATABASE_CURRENT) return ERROR_INVALID_PARAMETER; - if (((flags == QDC_DATABASE_CURRENT) && !topologyid) || - ((flags != QDC_DATABASE_CURRENT) && topologyid)) + if (((flags == QDC_DATABASE_CURRENT) && !topology_id) || + ((flags != QDC_DATABASE_CURRENT) && topology_id)) return ERROR_INVALID_PARAMETER; if (flags != QDC_ONLY_ACTIVE_PATHS) FIXME( "only returning active paths\n" ); - if (topologyid) + if (topology_id) { FIXME( "setting toplogyid to DISPLAYCONFIG_TOPOLOGY_INTERNAL\n" ); - *topologyid = DISPLAYCONFIG_TOPOLOGY_INTERNAL; + *topology_id = DISPLAYCONFIG_TOPOLOGY_INTERNAL; } if (!lock_display_devices()) @@ -2346,18 +2347,18 @@ LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *numpathelements, DIS goto done; } - if (path_index == *numpathelements || mode_index == *numinfoelements) + if (path_index == *paths_count || mode_index == *modes_count) { ret = ERROR_INSUFFICIENT_BUFFER; goto done; } - pathinfo[path_index].flags = DISPLAYCONFIG_PATH_ACTIVE; - set_mode_target_info( &modeinfo[mode_index], gpu_luid, output_id, flags, &devmode ); - set_path_target_info( &(pathinfo[path_index].targetInfo), gpu_luid, output_id, mode_index, &devmode ); + paths[path_index].flags = DISPLAYCONFIG_PATH_ACTIVE; + set_mode_target_info( &modes[mode_index], gpu_luid, output_id, flags, &devmode ); + set_path_target_info( &paths[path_index].targetInfo, gpu_luid, output_id, mode_index, &devmode ); mode_index++; - if (mode_index == *numinfoelements) + if (mode_index == *modes_count) { ret = ERROR_INSUFFICIENT_BUFFER; goto done; @@ -2366,18 +2367,18 @@ LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *numpathelements, DIS /* Multiple targets can be driven by the same source, ensure a mode * hasn't already been added for this source. */ - if (!source_mode_exists( modeinfo, mode_index, adapter_index, &source_mode_index )) + if (!source_mode_exists( modes, mode_index, adapter_index, &source_mode_index )) { - set_mode_source_info( &modeinfo[mode_index], gpu_luid, adapter_index, &devmode ); + set_mode_source_info( &modes[mode_index], gpu_luid, adapter_index, &devmode ); source_mode_index = mode_index; mode_index++; } - set_path_source_info( &(pathinfo[path_index].sourceInfo), gpu_luid, adapter_index, source_mode_index ); + set_path_source_info( &paths[path_index].sourceInfo, gpu_luid, adapter_index, source_mode_index ); path_index++; } - *numpathelements = path_index; - *numinfoelements = mode_index; + *paths_count = path_index; + *modes_count = mode_index; ret = ERROR_SUCCESS; done: diff --git a/include/ntuser.h b/include/ntuser.h index 50317834084..13c0147f9a4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -843,9 +843,9 @@ BOOL WINAPI NtUserPerMonitorDPIPhysicalToLogicalPoint( HWND hwnd, POINT *pt ) BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ); BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ); BOOL WINAPI NtUserPrintWindow( HWND hwnd, HDC hdc, UINT flags ); -LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, - UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, - DISPLAYCONFIG_TOPOLOGY_ID *topologyid); +LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *paths_count, DISPLAYCONFIG_PATH_INFO *paths, + UINT32 *modes_count, DISPLAYCONFIG_MODE_INFO *modes, + DISPLAYCONFIG_TOPOLOGY_ID *topology_id); UINT_PTR WINAPI NtUserQueryInputContext( HIMC handle, UINT attr ); HWND WINAPI NtUserRealChildWindowFromPoint( HWND parent, LONG x, LONG y ); BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags );

1 0

Fabian Maurer : wineps.drv: Use afm FamilyName instead of FullName.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: 9b12065fc5b04d661b97f63586e2b43f25afcfd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b12065fc5b04d661b97f63586e2b4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 10 00:43:03 2023 +0200 wineps.drv: Use afm FamilyName instead of FullName. Fixes a regression introduced by a6cb10bba2d05ceca6ba5b1411c450d38defdbb4 The old logic also used FamilyName, and some applications depend on that Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54993 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54980 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wineps.drv/init.c | 6 +++--- dlls/wineps.drv/unixlib.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 7119e9d4f2d..8537ba287d1 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -206,7 +206,7 @@ static BOOL convert_afm_to_ntf(void) off = size; metrics_size = sizeof(IFIMETRICS) + - (wcslen(afmle->afm->FullName) + 1) * sizeof(WCHAR); + (wcslen(afmle->afm->FamilyName) + 1) * sizeof(WCHAR); list = (void *)(data + header->font_mtx_off + sizeof(*list) * count); list->name_off = off + sizeof(*font_mtx); list->size = sizeof(*font_mtx) + strlen(afmle->afm->FontName) + 1 + @@ -237,7 +237,7 @@ static BOOL convert_afm_to_ntf(void) strcpy(data + off + font_mtx->glyph_set_name_off, glyph_set_name); metrics = (void *)(data + off + font_mtx->metrics_off); metrics->cjThis = metrics_size; - metrics->dpwszFaceName = sizeof(*metrics); + metrics->dpwszFamilyName = sizeof(*metrics); if (afmle->afm->IsFixedPitch) metrics->jWinPitchAndFamily |= FIXED_PITCH; metrics->usWinWeight = afmle->afm->Weight; @@ -256,7 +256,7 @@ static BOOL convert_afm_to_ntf(void) metrics->rclFontBox.top = afmle->afm->FontBBox.ury; metrics->rclFontBox.right = afmle->afm->FontBBox.urx; metrics->rclFontBox.bottom = afmle->afm->FontBBox.lly; - wcscpy((WCHAR *)((char *)metrics + metrics->dpwszFaceName), afmle->afm->FullName); + wcscpy((WCHAR *)((char *)metrics + metrics->dpwszFamilyName), afmle->afm->FamilyName); width_range = (void *)(data + off + font_mtx->width_off); for (i = 0; i < font_mtx->width_count; i++) { diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 575ab49c49b..e9b009b0e87 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1027,7 +1027,7 @@ static struct font_data *find_builtin_font(const PSDRV_DEVMODE *devmode, cur = find_font_data(installed_font[i].name); if (!cur) continue; - name = (WCHAR *)((char *)cur->metrics + cur->metrics->dpwszFaceName); + name = (WCHAR *)((char *)cur->metrics + cur->metrics->dpwszFamilyName); cur_it = !!(cur->metrics->fsSelection & FM_SEL_ITALIC); cur_bd = !!(cur->metrics->fsSelection & FM_SEL_BOLD); @@ -1084,7 +1084,7 @@ static BOOL select_builtin_font(PSDRV_PDEVICE *pdev, HFONT hfont, LOGFONTW *plf) font_data = find_builtin_font(pdev->devmode, NULL, it, bd); TRACE("Got family %s font '%s'\n", debugstr_w((WCHAR *)((char *)font_data->metrics + - font_data->metrics->dpwszFaceName)), font_data->name); + font_data->metrics->dpwszFamilyName)), font_data->name); pdev->builtin = TRUE; pdev->font = NULL; @@ -1218,7 +1218,7 @@ static UINT get_font_metric(const struct font_data *font, lf->lfPitchAndFamily = font->metrics->jWinPitchAndFamily & FIXED_PITCH ? FIXED_PITCH : VARIABLE_PITCH; - lstrcpynW(lf->lfFaceName, (WCHAR *)((char *)font->metrics + font->metrics->dpwszFaceName), LF_FACESIZE); + lstrcpynW(lf->lfFaceName, (WCHAR *)((char *)font->metrics + font->metrics->dpwszFamilyName), LF_FACESIZE); return DEVICE_FONTTYPE; } @@ -1253,7 +1253,7 @@ static BOOL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, font_enum_proc proc, LPARAM cur = find_font_data(installed_font[i].name); if (!cur) continue; - name = (WCHAR *)((char *)cur->metrics + cur->metrics->dpwszFaceName); + name = (WCHAR *)((char *)cur->metrics + cur->metrics->dpwszFamilyName); if (wcsncmp(plf->lfFaceName, name, wcslen(name))) continue; @@ -1272,7 +1272,7 @@ static BOOL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, font_enum_proc proc, LPARAM cur = find_font_data(installed_font[i].name); if (!cur) continue; - name = (WCHAR *)((char *)cur->metrics + cur->metrics->dpwszFaceName); + name = (WCHAR *)((char *)cur->metrics + cur->metrics->dpwszFamilyName); TRACE("Got '%s'\n", cur->name); fm = get_font_metric(cur, &tm, &lf); if (!(ret = (*proc)(&lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp)))

1 0

Rémi Bernon : server: Pass the message code to get_hardware_msg_bit.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: 3ae2dc46484712cd2454b5aab4e82bd2c63d9ef4 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ae2dc46484712cd2454b5aab4e82b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 10 15:17:28 2023 +0200 server: Pass the message code to get_hardware_msg_bit. --- server/queue.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/queue.c b/server/queue.c index 1e2647aac27..c3c3d595d00 100644 --- a/server/queue.c +++ b/server/queue.c @@ -574,12 +574,12 @@ static inline int filter_contains_hw_range( unsigned int first, unsigned int las } /* get the QS_* bit corresponding to a given hardware message */ -static inline int get_hardware_msg_bit( struct message *msg ) +static inline int get_hardware_msg_bit( unsigned int message ) { - if (msg->msg == WM_INPUT_DEVICE_CHANGE || msg->msg == WM_INPUT) return QS_RAWINPUT; - if (msg->msg == WM_MOUSEMOVE || msg->msg == WM_NCMOUSEMOVE) return QS_MOUSEMOVE; - if (msg->msg >= WM_KEYFIRST && msg->msg <= WM_KEYLAST) return QS_KEY; - if (msg->msg == WM_WINE_CLIPCURSOR) return QS_RAWINPUT; + if (message == WM_INPUT_DEVICE_CHANGE || message == WM_INPUT) return QS_RAWINPUT; + if (message == WM_MOUSEMOVE || message == WM_NCMOUSEMOVE) return QS_MOUSEMOVE; + if (message >= WM_KEYFIRST && message <= WM_KEYLAST) return QS_KEY; + if (message == WM_WINE_CLIPCURSOR) return QS_RAWINPUT; return QS_MOUSEBUTTON; } @@ -1494,10 +1494,10 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (&msg->entry == &input->msg_list) return; /* not found */ /* clear the queue bit for that message */ - clr_bit = get_hardware_msg_bit( msg ); + clr_bit = get_hardware_msg_bit( msg->msg ); LIST_FOR_EACH_ENTRY( other, &input->msg_list, struct message, entry ) { - if (other != msg && get_hardware_msg_bit( other ) == clr_bit) + if (other != msg && get_hardware_msg_bit( other->msg ) == clr_bit) { clr_bit = 0; break; @@ -1556,7 +1556,7 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru *thread = NULL; *msg_code = msg->msg; - switch (get_hardware_msg_bit( msg )) + switch (get_hardware_msg_bit( msg->msg )) { case QS_RAWINPUT: if (!(win = msg->win) && input) win = input->focus; @@ -1620,7 +1620,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg last_input_time = get_tick_count(); if (msg->msg != WM_MOUSEMOVE) always_queue = 1; - switch (get_hardware_msg_bit( msg )) + switch (get_hardware_msg_bit( msg->msg )) { case QS_KEY: if (queue_hotkey_message( desktop, msg )) return; @@ -1669,7 +1669,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg { msg->unique_id = 0; /* will be set once we return it to the app */ list_add_tail( &input->msg_list, &msg->entry ); - set_queue_bits( thread->queue, get_hardware_msg_bit(msg) ); + set_queue_bits( thread->queue, get_hardware_msg_bit( msg->msg ) ); } release_object( thread ); } @@ -2195,7 +2195,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user if (win_thread->queue->input == input) { /* wake the other thread */ - set_queue_bits( win_thread->queue, get_hardware_msg_bit(msg) ); + set_queue_bits( win_thread->queue, get_hardware_msg_bit( msg->msg ) ); got_one = 1; } else @@ -2214,7 +2214,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user * match the filter we skip it */ if (got_one || !check_hw_message_filter( win, msg_code, filter_win, first, last )) { - clear_bits &= ~get_hardware_msg_bit( msg ); + clear_bits &= ~get_hardware_msg_bit( msg->msg ); continue; } @@ -2238,7 +2238,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if (get_hardware_msg_bit( msg ) == QS_RAWINPUT && (flags & PM_REMOVE)) + if (get_hardware_msg_bit( msg->msg ) == QS_RAWINPUT && (flags & PM_REMOVE)) release_hardware_message( current->queue, data->hw_id ); return 1; }

1 0

Rémi Bernon : server: Use hardware message category when checking filter.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: 6ac82b2a24a8dc9c4547ba896c9313c5864795a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ac82b2a24a8dc9c4547ba896c9313… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 10 15:17:41 2023 +0200 server: Use hardware message category when checking filter. --- server/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index c3c3d595d00..57067dd6f51 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2114,19 +2114,19 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, user_handle_t filter_win, unsigned int first, unsigned int last ) { - if (msg_code >= WM_KEYFIRST && msg_code <= WM_KEYLAST) + switch (get_hardware_msg_bit( msg_code )) { + case QS_KEY: /* we can only test the window for a keyboard message since the * dest window for a mouse message depends on hittest */ if (filter_win && win != filter_win && !is_child_window( filter_win, win )) return 0; /* the message code is final for a keyboard message, we can simply check it */ return check_msg_filter( msg_code, first, last ); - } - else /* mouse message */ - { - /* we need to check all possible values that the message can have in the end */ + case QS_MOUSEMOVE: + case QS_MOUSEBUTTON: + /* we need to check all possible values that the message can have in the end */ if (check_msg_filter( msg_code, first, last )) return 1; if (msg_code == WM_MOUSEWHEEL) return 0; /* no other possible value for this one */ @@ -2141,6 +2141,9 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, if (check_msg_filter( msg_code + (WM_NCLBUTTONDBLCLK - WM_LBUTTONDOWN), first, last )) return 1; } return 0; + + default: + return check_msg_filter( msg_code, first, last ); } }

1 0

Alex Henrie : windows.media.speech: Fix memory leak on error path in session_worker_thread_cb (scan-build).
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: adccd96c2bb38e14afcb6569748027ab26da3a7b URL: https://gitlab.winehq.org/wine/wine/-/commit/adccd96c2bb38e14afcb6569748027… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 12 00:03:09 2023 -0600 windows.media.speech: Fix memory leak on error path in session_worker_thread_cb (scan-build). --- dlls/windows.media.speech/recognizer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index c2f386206b8..790d127fc64 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -193,7 +193,7 @@ static DWORD CALLBACK session_worker_thread_cb( void *args ) struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface); BOOLEAN running = TRUE, paused = FALSE; UINT32 frame_count, tmp_buf_size; - BYTE *audio_buf, *tmp_buf; + BYTE *audio_buf, *tmp_buf = NULL; DWORD flags, status; HANDLE events[2]; HRESULT hr; @@ -285,6 +285,7 @@ static DWORD CALLBACK session_worker_thread_cb( void *args ) error: ERR("The recognition session worker encountered a serious error and needs to stop. hr: %lx.\n", hr); + free(tmp_buf); return 1; }

1 0

Alexandre Julliard : include: Remove redundant __WINE_USE_MSVCRT checks.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: 93630ce14ebf16333fda8481b5ede6f587eb32ca URL: https://gitlab.winehq.org/wine/wine/-/commit/93630ce14ebf16333fda8481b5ede6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 12:06:33 2023 +0200 include: Remove redundant __WINE_USE_MSVCRT checks. --- dlls/dinput/tests/driver_hid.h | 2 +- dlls/msi/tests/custom.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- include/msvcrt/corecrt.h | 2 +- include/winternl.h | 4 ---- programs/services/tests/service.c | 6 ------ 6 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 10a5c4c90cf..e97b4e3493b 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -177,7 +177,7 @@ static inline const char *debugstr_ioctl( ULONG code ) #ifndef __WINE_WINE_TEST_H -#if !defined( __WINE_USE_MSVCRT ) || defined( __MINGW32__ ) +#ifdef __MINGW32__ #define __WINE_PRINTF_ATTR( fmt, args ) __attribute__((format( printf, fmt, args ))) #else #define __WINE_PRINTF_ATTR( fmt, args ) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 5b81deb2c94..30b9040acff 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -32,7 +32,7 @@ #include <msiquery.h> #include <msidefs.h> -#if defined(__MINGW32__) || (!defined(__WINE_USE_MSVCRT) && (defined(__GNUC__) || defined(__clang__))) +#ifdef __MINGW32__ #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #else #define __WINE_PRINTF_ATTR(fmt,args) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 28fbe10c8e1..023f78b5318 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -30,7 +30,7 @@ #include <ddk/wdm.h> -#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#ifdef __MINGW32__ #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #else #define __WINE_PRINTF_ATTR(fmt,args) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 9ad707824ff..945d8ac4055 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -323,7 +323,7 @@ typedef struct threadlocaleinfostruct { #define _THREADLOCALEINFO #endif -#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#ifdef __MINGW32__ #define __WINE_CRT_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #define __WINE_CRT_SCANF_ATTR(fmt,args) __attribute__((format (scanf,fmt,args))) #else diff --git a/include/winternl.h b/include/winternl.h index df0f8dc1f84..455e199f3e1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4823,10 +4823,6 @@ NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); -#ifndef __WINE_USE_MSVCRT -NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); -#endif - /* 32-bit or 64-bit only functions */ #ifdef _WIN64 diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 99cf0838bf0..530f551b1ee 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -26,12 +26,6 @@ #include "wine/test.h" -#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) -#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) -#else -#define __WINE_PRINTF_ATTR(fmt,args) -#endif - static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); static HANDLE pipe_handle = INVALID_HANDLE_VALUE;

1 0

Alexandre Julliard : makefiles: Define WINE_UNIX_LIB for all files that are built for Unix.
by Alexandre Julliard 12 Jun '23

12 Jun '23

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 12 Jun '23

12 Jun '23

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