wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Rémi Bernon : winebus.sys: Move bus_event list entry to an internal structure.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 3b1354ff4a42595745b9925ab72625e634075c48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b1354ff4a42595745b9925a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 8 23:23:25 2021 +0100 winebus.sys: Move bus_event list entry to an internal structure. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/unixlib.c | 81 +++++++++++++++++++++++++--------------------- dlls/winebus.sys/unixlib.h | 2 -- 2 files changed, 44 insertions(+), 39 deletions(-) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 1edd90627e5..8fd43d3dff5 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -355,93 +355,100 @@ void bus_event_cleanup(struct bus_event *event) unix_device_decref(event->device); } +struct bus_event_entry +{ + struct list entry; + struct bus_event event; +}; + void bus_event_queue_destroy(struct list *queue) { - struct bus_event *event, *next; + struct bus_event_entry *entry, *next; - LIST_FOR_EACH_ENTRY_SAFE(event, next, queue, struct bus_event, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, next, queue, struct bus_event_entry, entry) { - bus_event_cleanup(event); - free(event); + bus_event_cleanup(&entry->event); + list_remove(&entry->entry); + free(entry); } } BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *device) { - ULONG size = sizeof(struct bus_event); - struct bus_event *event = malloc(size); - if (!event) return FALSE; + ULONG size = sizeof(struct bus_event_entry); + struct bus_event_entry *entry = malloc(size); + if (!entry) return FALSE; if (unix_device_incref(device) == 1) /* being destroyed */ { - free(event); + free(entry); return FALSE; } - event->type = BUS_EVENT_TYPE_DEVICE_REMOVED; - event->device = device; - list_add_tail(queue, &event->entry); + entry->event.type = BUS_EVENT_TYPE_DEVICE_REMOVED; + entry->event.device = device; + list_add_tail(queue, &entry->entry); return TRUE; } BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) { - ULONG size = sizeof(struct bus_event); - struct bus_event *event = malloc(size); - if (!event) return FALSE; + ULONG size = sizeof(struct bus_event_entry); + struct bus_event_entry *entry = malloc(size); + if (!entry) return FALSE; if (unix_device_incref(device) == 1) /* being destroyed */ { - free(event); + free(entry); return FALSE; } - event->type = BUS_EVENT_TYPE_DEVICE_CREATED; - event->device = device; - event->device_created.desc = *desc; - list_add_tail(queue, &event->entry); + entry->event.type = BUS_EVENT_TYPE_DEVICE_CREATED; + entry->event.device = device; + entry->event.device_created.desc = *desc; + list_add_tail(queue, &entry->entry); return TRUE; } BOOL bus_event_queue_input_report(struct list *queue, struct unix_device *device, BYTE *report, USHORT length) { - ULONG size = offsetof(struct bus_event, input_report.buffer[length]); - struct bus_event *event = malloc(size); - if (!event) return FALSE; + ULONG size = offsetof(struct bus_event_entry, event.input_report.buffer[length]); + struct bus_event_entry *entry = malloc(size); + if (!entry) return FALSE; if (unix_device_incref(device) == 1) /* being destroyed */ { - free(event); + free(entry); return FALSE; } - event->type = BUS_EVENT_TYPE_INPUT_REPORT; - event->device = device; - event->input_report.length = length; - memcpy(event->input_report.buffer, report, length); - list_add_tail(queue, &event->entry); + entry->event.type = BUS_EVENT_TYPE_INPUT_REPORT; + entry->event.device = device; + entry->event.input_report.length = length; + memcpy(entry->event.input_report.buffer, report, length); + list_add_tail(queue, &entry->entry); return TRUE; } BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) { - struct list *entry = list_head(queue); - struct bus_event *tmp; + struct list *head = list_head(queue); + struct bus_event_entry *entry; ULONG size; - if (!entry) return FALSE; + if (!head) return FALSE; - tmp = LIST_ENTRY(entry, struct bus_event, entry); - list_remove(entry); + entry = LIST_ENTRY(head, struct bus_event_entry, entry); + list_remove(&entry->entry); - if (tmp->type != BUS_EVENT_TYPE_INPUT_REPORT) size = sizeof(*tmp); - else size = offsetof(struct bus_event, input_report.buffer[tmp->input_report.length]); + if (entry->event.type != BUS_EVENT_TYPE_INPUT_REPORT) size = sizeof(entry->event); + else size = offsetof(struct bus_event, input_report.buffer[entry->event.input_report.length]); - memcpy(event, tmp, size); - free(tmp); + memcpy(event, &entry->event, size); + free(entry); return TRUE; } diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index f43cd03c89a..532cb92a2f4 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -77,8 +77,6 @@ enum bus_event_type struct bus_event { enum bus_event_type type; - struct list entry; - struct unix_device *device; union {

1 0

Robert Wilhelm : vbscript: Use return_null in more places.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 82d27a0d3c34c6c785c70cf9de6d7c444086e21e URL: https://source.winehq.org/git/wine.git/?a=commit;h=82d27a0d3c34c6c785c70cf9… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Jun 27 14:17:06 2022 +0200 vbscript: Use return_null in more places. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9bc9349dd55..4b5dee6ebc3 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -848,9 +848,7 @@ static HRESULT Global_Hex(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA n = (WORD)V_I2(arg); break; case VT_NULL: - if(res) - V_VT(res) = VT_NULL; - return S_OK; + return return_null(res); default: hres = to_int(arg, &ret); if(FAILED(hres)) @@ -889,9 +887,7 @@ static HRESULT Global_Oct(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA n = (WORD)V_I2(arg); break; case VT_NULL: - if(res) - V_VT(res) = VT_NULL; - return S_OK; + return return_null(res); default: hres = to_int(arg, &ret); if(FAILED(hres)) @@ -1430,9 +1426,7 @@ static HRESULT Global_LCase(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); if(V_VT(arg) == VT_NULL) { - if(res) - V_VT(res) = VT_NULL; - return S_OK; + return return_null(res); } hres = to_string(arg, &str); @@ -1461,9 +1455,7 @@ static HRESULT Global_UCase(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); if(V_VT(arg) == VT_NULL) { - if(res) - V_VT(res) = VT_NULL; - return S_OK; + return return_null(res); } hres = to_string(arg, &str);

1 0

Jacek Caban : user32: Remove no longer needed helpers.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 9546953bfaa0db0dd2d054ff5205cf8ef660a721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9546953bfaa0db0dd2d054ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 27 11:57:19 2022 +0200 user32: Remove no longer needed helpers. --- dlls/user32/sysparams.c | 19 ------------------- dlls/user32/win.c | 37 ++++++++++++------------------------- dlls/user32/win.h | 9 +-------- 3 files changed, 13 insertions(+), 52 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 738186afb89..26259ab76e9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -669,15 +669,6 @@ BOOL WINAPI EnumDisplaySettingsExW( const WCHAR *device, DWORD mode, return NtUserEnumDisplaySettings( &str, mode, dev_mode, flags ); } -/********************************************************************** - * get_monitor_dpi - */ -UINT get_monitor_dpi( HMONITOR monitor ) -{ - /* FIXME: use the monitor DPI instead */ - return system_dpi; -} - /********************************************************************** * get_win_monitor_dpi */ @@ -729,16 +720,6 @@ static POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) return map_dpi_point( pt, get_win_monitor_dpi( hwnd ), GetDpiForWindow( hwnd )); } -/********************************************************************** - * point_win_to_thread_dpi - */ -POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) -{ - UINT dpi = get_thread_dpi(); - if (!dpi) dpi = get_win_monitor_dpi( hwnd ); - return map_dpi_point( pt, GetDpiForWindow( hwnd ), dpi ); -} - /********************************************************************** * map_dpi_rect */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9d19376fe44..d1b25da0e68 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -37,25 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -/*********************************************************************** - * get_user_handle_ptr - */ -void *get_user_handle_ptr( HANDLE handle, unsigned int type ) -{ - return (void *)NtUserCallTwoParam( HandleToUlong(handle), type, NtUserGetHandlePtr ); -} - - -/*********************************************************************** - * release_user_handle_ptr - */ -void release_user_handle_ptr( void *ptr ) -{ - assert( ptr && ptr != OBJ_OTHER_PROCESS ); - NtUserCallOneParam( 1, NtUserLock ); -} - - /******************************************************************* * list_window_children * @@ -149,16 +130,22 @@ BOOL is_desktop_window( HWND hwnd ) */ WND *WIN_GetPtr( HWND hwnd ) { - WND *ptr; - - if ((ptr = get_user_handle_ptr( hwnd, NTUSER_OBJ_WINDOW )) == WND_OTHER_PROCESS) - { - if (is_desktop_window( hwnd )) ptr = WND_DESKTOP; - } + WND *ptr = (void *)NtUserCallTwoParam( HandleToUlong(hwnd), NTUSER_OBJ_WINDOW, NtUserGetHandlePtr ); + if (ptr == WND_OTHER_PROCESS && is_desktop_window( hwnd )) ptr = WND_DESKTOP; return ptr; } +/*********************************************************************** + * WIN_ReleasePtr + */ +void WIN_ReleasePtr( WND *ptr ) +{ + assert( ptr && ptr != OBJ_OTHER_PROCESS ); + NtUserCallOneParam( 1, NtUserLock ); +} + + /*********************************************************************** * WIN_IsCurrentProcess * diff --git a/dlls/user32/win.h b/dlls/user32/win.h index bce93617d3f..59a7e0e2e38 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -37,6 +37,7 @@ struct tagDIALOGINFO; extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; +extern void WIN_ReleasePtr( WND *ptr ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN; @@ -48,20 +49,12 @@ extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN; extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ) DECLSPEC_HIDDEN; extern HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK access ) DECLSPEC_HIDDEN; -/* to release pointers retrieved by WIN_GetPtr */ -static inline void WIN_ReleasePtr( WND *ptr ) -{ - release_user_handle_ptr( ptr ); -} - extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; -extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; -extern POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : win32u: Move menu object declarations to menu.c.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 290a5314c8bc43344b781a903b5791b8b0ffb9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=290a5314c8bc43344b781a90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 27 10:59:51 2022 +0200 win32u: Move menu object declarations to menu.c. And drop typedefs. --- dlls/win32u/menu.c | 289 +++++++++++++++++++++++++------------------ dlls/win32u/ntuser_private.h | 49 -------- 2 files changed, 167 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=290a5314c8bc43344b78…

1 0

Jacek Caban : win32u: Move NtUserGetSystemMenu implementation from user32.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: e411b9815546e2127aacbef7129ab40f833be7c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e411b9815546e2127aacbef7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 00:54:36 2022 +0200 win32u: Move NtUserGetSystemMenu implementation from user32. --- dlls/user32/controls.h | 6 -- dlls/user32/menu.c | 124 ----------------------------------------- dlls/user32/user_main.c | 8 ++- dlls/win32u/menu.c | 129 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 1 - include/ntuser.h | 7 +++ 6 files changed, 140 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e411b9815546e2127aac…

1 0

Jacek Caban : user32: Use IsMenu in MENU_mnu2mnuii.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: fee6acf337f127b9fe57fd7d2651d1e7390af1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fee6acf337f127b9fe57fd7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 27 00:37:10 2022 +0200 user32: Use IsMenu in MENU_mnu2mnuii. --- dlls/user32/menu.c | 3 ++- dlls/user32/tests/menu.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index afbf4d2fcea..52dc6369e3a 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -489,7 +489,8 @@ static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, pmii->fMask |= MIIM_DATA; pmii->dwItemData = (ULONG_PTR) str; } - if( flags & MF_POPUP && MENU_GetMenu((HMENU)id)) { + if ((flags & MF_POPUP) && IsMenu( UlongToHandle( id ))) + { pmii->fMask |= MIIM_SUBMENU; pmii->hSubMenu = (HMENU)id; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index c7a20e1b8e9..6862f13c6b1 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3013,6 +3013,7 @@ static void test_InsertMenu(void) { MF_HELP, 1, MAKEINTRESOURCEA(1) } }; HMENU hmenu; + BOOL ret; #define create_menu(a) create_menu_from_data((a), ARRAY_SIZE(a)) #define create_menuitem(a) create_menuitem_from_data((a), ARRAY_SIZE(a)) @@ -3054,6 +3055,16 @@ static void test_InsertMenu(void) #undef create_menu #undef create_menuitem #undef compare_menu + + hmenu = CreateMenu(); + + SetLastError(0xdeadbeef); + ret = InsertMenuW(hmenu, -1, MF_BYPOSITION | MF_POPUP, 0xdeadbeef, L"test"); + ok(ret && GetLastError() == ERROR_INVALID_MENU_HANDLE, + "InsertMenuW returned %x %lu\n", ret, GetLastError()); + ok(GetMenuItemCount(hmenu) == 1, "GetMenuItemCount() = %d\n", GetMenuItemCount(hmenu)); + + DestroyMenu(hmenu); } static void test_menu_getmenuinfo(void)

1 0

Jacek Caban : win32u: Move GetMenuDefaultItem implementation from user32.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 2bd0c8727875ed001068f91299511ce58f5a1c2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd0c8727875ed001068f912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 26 14:58:27 2022 +0200 win32u: Move GetMenuDefaultItem implementation from user32. --- dlls/user32/menu.c | 37 ++----------------------------------- dlls/win32u/menu.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 45 insertions(+), 35 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6fb381ea617..afbf4d2fcea 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -911,42 +911,9 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, /********************************************************************** * GetMenuDefaultItem (USER32.@) */ -UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags) +UINT WINAPI GetMenuDefaultItem( HMENU menu, UINT bypos, UINT flags ) { - POPUPMENU *menu; - MENUITEM * item; - UINT i = 0; - - TRACE("(%p,%d,%d)\n", hmenu, bypos, flags); - - if (!(menu = MENU_GetMenu(hmenu))) return -1; - - /* find default item */ - item = menu->items; - - /* empty menu */ - if (! item) return -1; - - while ( !( item->fState & MFS_DEFAULT ) ) - { - i++; item++; - if (i >= menu->nItems ) return -1; - } - - /* default: don't return disabled items */ - if ( (!(GMDI_USEDISABLED & flags)) && (item->fState & MFS_DISABLED )) return -1; - - /* search rekursiv when needed */ - if ( (item->fType & MF_POPUP) && (flags & GMDI_GOINTOPOPUPS) ) - { - UINT ret; - ret = GetMenuDefaultItem( item->hSubMenu, bypos, flags ); - if ( -1 != ret ) return ret; - - /* when item not found in submenu, return the popup item */ - } - return ( bypos ) ? i : item->wID; - + return NtUserThunkedMenuItemInfo( menu, bypos, flags, NtUserGetMenuDefaultItem, NULL, NULL ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 598576437c6..cf755c57a15 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1170,6 +1170,45 @@ static HMENU get_sub_menu( HMENU handle, INT pos ) return submenu; } +/* see GetMenuDefaultItem */ +static UINT get_menu_default_item( HMENU handle, UINT bypos, UINT flags ) +{ + MENUITEM *item = NULL; + POPUPMENU *menu; + UINT i; + + TRACE( "(%p,%d,%d)\n", handle, bypos, flags ); + + if (!(menu = grab_menu_ptr( handle ))) return -1; + + for (i = 0; i < menu->nItems; i++) + { + if (!(menu->items[i].fState & MFS_DEFAULT)) continue; + item = &menu->items[i]; + break; + } + + /* default: don't return disabled items */ + if (item && (!(GMDI_USEDISABLED & flags)) && (item->fState & MFS_DISABLED)) item = NULL; + + /* search submenu when needed */ + if (item && (item->fType & MF_POPUP) && (flags & GMDI_GOINTOPOPUPS)) + { + UINT ret = get_menu_default_item( item->hSubMenu, bypos, flags ); + if (ret != -1) + { + release_menu_ptr( menu ); + return ret; + } + /* when item not found in submenu, return the popup item */ + } + + if (!item) i = -1; + else if (!bypos) i = item->wID; + release_menu_ptr( menu ); + return i; +} + /********************************************************************** * NtUserThunkedMenuItemInfo (win32u.@) */ @@ -1185,6 +1224,9 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT case NtUserCheckMenuRadioItem: return check_menu_radio_item( handle, pos, info->cch, info->fMask, flags ); + case NtUserGetMenuDefaultItem: + return get_menu_default_item( handle, pos, flags ); + case NtUserGetMenuItemID: if (!(menu = find_menu_item( handle, pos, flags, &i ))) return -1; ret = menu->items[i].fType & MF_POPUP ? -1 : menu->items[i].wID; diff --git a/include/ntuser.h b/include/ntuser.h index bf4e9f4b13a..e1435bc2626 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -225,6 +225,7 @@ enum NtUserInsertMenuItem, /* Wine extensions */ NtUserCheckMenuRadioItem, + NtUserGetMenuDefaultItem, NtUserGetMenuItemID, NtUserGetMenuItemInfoA, NtUserGetMenuItemInfoW,

1 0

Nikolay Sivov : reg: Add REG_QWORD support to 'add'.
by Alexandre Julliard 27 Jun '22

27 Jun '22

1 0

Alexandre Julliard : msvcrt: Unify the strncat_s() and wcsncat_s() implementations.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 50aaedffc9ffe024c804d93ed169ba2e2e357c7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=50aaedffc9ffe024c804d93e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 27 10:50:52 2022 +0200 msvcrt: Unify the strncat_s() and wcsncat_s() implementations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 42 +++++++++++++++++-------------- dlls/msvcrt/tests/string.c | 62 +++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/wcs.c | 51 ++++++++++++++++---------------------- 3 files changed, 107 insertions(+), 48 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 276bbd5684e..dd392abd203 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1393,32 +1393,38 @@ int CDECL strncat_s( char* dst, size_t elem, const char* src, size_t count ) if (!MSVCRT_CHECK_PMT(dst != 0)) return EINVAL; if (!MSVCRT_CHECK_PMT(elem != 0)) return EINVAL; - if (!MSVCRT_CHECK_PMT(src != 0)) + if (count == 0) return 0; + + if (!MSVCRT_CHECK_PMT(src != NULL)) { - dst[0] = '\0'; + *dst = 0; return EINVAL; } - for(i = 0; i < elem; i++) + for (i = 0; i < elem; i++) if (!dst[i]) break; + + if (i == elem) { - if(dst[i] == '\0') + MSVCRT_INVALID_PMT("dst[elem] is not NULL terminated\n", EINVAL); + *dst = 0; + return EINVAL; + } + + for (j = 0; (j + i) < elem; j++) + { + if(count == _TRUNCATE && j + i == elem - 1) { - for(j = 0; (j + i) < elem; j++) - { - if(count == _TRUNCATE && j + i == elem - 1) - { - dst[j + i] = '\0'; - return STRUNCATE; - } - if(j == count || (dst[j + i] = src[j]) == '\0') - { - dst[j + i] = '\0'; - return 0; - } - } + dst[j + i] = '\0'; + return STRUNCATE; + } + if(j == count || (dst[j + i] = src[j]) == '\0') + { + dst[j + i] = '\0'; + return 0; } } - /* Set the first element to 0, not the first element after the skipped part */ + + MSVCRT_INVALID_PMT("dst[elem] is too small", ERANGE); dst[0] = '\0'; return ERANGE; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6a07e7cb99e..4b224bd1a17 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -65,6 +65,7 @@ static int (__cdecl *p_strcpy)(char *dst, const char *src); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_strncpy_s)(char *dst, size_t size, const char *src, size_t count); +static int (__cdecl *p_strncat_s)(char *dst, size_t elem, const char *src, size_t count); static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); @@ -2603,6 +2604,53 @@ static void test__strlwr_s(void) ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret); } +static void test_strncat_s(void) +{ + int ret; + char dst[4]; + char src[4]; + + if (!p_wcsncat_s) + { + win_skip("skipping wcsncat_s tests\n"); + return; + } + + strcpy(src, "abc"); + strcpy(dst, "a"); + ret = p_strncat_s(NULL, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + ret = p_strncat_s(dst, 0, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); + ret = p_strncat_s(dst, 0, src, _TRUNCATE); + ok(ret == EINVAL, "err = %d\n", ret); + ret = p_strncat_s(dst, 4, NULL, 1); + ok(ret == EINVAL, "err = %d\n", ret); + ok(!dst[0], "dst %x\n", dst[0]); + ret = p_strncat_s(NULL, 4, src, 0); + ok(ret == EINVAL, "err = %d\n", ret); + strcpy(dst, "a"); + ret = p_strncat_s(dst, 4, NULL, 0); + ok(ret == 0, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); + + dst[0] = 0; + ret = p_strncat_s(dst, 2, src, 4); + ok(ret == ERANGE, "err = %d\n", ret); + + dst[0] = 0; + ret = p_strncat_s(dst, 2, src, _TRUNCATE); + ok(ret == STRUNCATE, "err = %d\n", ret); + ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_a(dst)); + + strcpy(dst, "abc"); + dst[3] = 'd'; + ret = p_strncat_s(dst, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + ok(!dst[0], "dst %x\n", dst[0]); +} + static void test_wcsncat_s(void) { int ret; @@ -2616,15 +2664,24 @@ static void test_wcsncat_s(void) } wcscpy(src, L"abc"); - dst[0] = 0; + wcscpy(dst, L"a"); ret = p_wcsncat_s(NULL, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); ret = p_wcsncat_s(dst, 0, src, 4); ok(ret == EINVAL, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); ret = p_wcsncat_s(dst, 0, src, _TRUNCATE); ok(ret == EINVAL, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); + ret = p_wcsncat_s(dst, 4, NULL, 1); + ok(ret == EINVAL, "err = %d\n", ret); + ok(!dst[0], "dst %x\n", dst[0]); + ret = p_wcsncat_s(NULL, 4, src, 0); + ok(ret == EINVAL, "err = %d\n", ret); + wcscpy(dst, L"a"); ret = p_wcsncat_s(dst, 4, NULL, 0); ok(ret == 0, "err = %d\n", ret); + ok(dst[0] == 'a', "dst %x\n", dst[0]); dst[0] = 0; ret = p_wcsncat_s(dst, 2, src, 4); @@ -2639,6 +2696,7 @@ static void test_wcsncat_s(void) dst[3] = 'd'; ret = p_wcsncat_s(dst, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); + ok(!dst[0], "dst %x\n", dst[0]); } static void test__mbsnbcat_s(void) @@ -4549,6 +4607,7 @@ START_TEST(string) pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_strncpy_s = (void *)GetProcAddress( hMsvcrt, "strncpy_s" ); + p_strncat_s = (void *)GetProcAddress( hMsvcrt, "strncat_s" ); p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); @@ -4623,6 +4682,7 @@ START_TEST(string) test_memcpy_s(); test_memmove_s(); test_strcat_s(); + test_strncat_s(); test__mbscat_s(); test__mbsnbcpy_s(); test__mbscpy_s(); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index be601ffeba2..a438449342e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2451,51 +2451,44 @@ wchar_t* __cdecl wcscat( wchar_t *dst, const wchar_t *src ) } /********************************************************************* - * wcsncat_s (MSVCRT.@) - * + * wcsncat_s (MSVCRT.@) */ -INT CDECL wcsncat_s(wchar_t *dst, size_t elem, - const wchar_t *src, size_t count) +INT CDECL wcsncat_s(wchar_t *dst, size_t elem, const wchar_t *src, size_t count) { - size_t srclen; - wchar_t dststart; - INT ret = 0; + size_t i, j; if (!MSVCRT_CHECK_PMT(dst != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(elem > 0)) return EINVAL; - if (!MSVCRT_CHECK_PMT(src != NULL || count == 0)) return EINVAL; - - if (count == 0) - return 0; - - for (dststart = 0; dststart < elem; dststart++) + if (count == 0) return 0; + if (!MSVCRT_CHECK_PMT(src != NULL)) { - if (dst[dststart] == '\0') - break; + *dst = 0; + return EINVAL; } - if (dststart == elem) + + for (i = 0; i < elem; i++) if (!dst[i]) break; + + if (i == elem) { MSVCRT_INVALID_PMT("dst[elem] is not NULL terminated\n", EINVAL); + *dst = 0; return EINVAL; } - if (count == _TRUNCATE) + for (j = 0; (j + i) < elem; j++) { - srclen = wcslen(src); - if (srclen >= (elem - dststart)) + if(count == _TRUNCATE && j + i == elem - 1) { - srclen = elem - dststart - 1; - ret = STRUNCATE; + dst[j + i] = '\0'; + return STRUNCATE; + } + if(j == count || (dst[j + i] = src[j]) == '\0') + { + dst[j + i] = '\0'; + return 0; } } - else - srclen = min(wcslen(src), count); - if (srclen < (elem - dststart)) - { - memcpy(&dst[dststart], src, srclen*sizeof(wchar_t)); - dst[dststart+srclen] = '\0'; - return ret; - } + MSVCRT_INVALID_PMT("dst[elem] is too small", ERANGE); dst[0] = '\0'; return ERANGE;

1 0

Alexandre Julliard : msvcrt: Unify the strncpy_s() and wcsncpy_s() implementations.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: fdcf03fb72484871c031728a08d2308f9d9326ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdcf03fb72484871c031728a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 27 10:49:52 2022 +0200 msvcrt: Unify the strncpy_s() and wcsncpy_s() implementations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 56 +++++++++++++++++++++++++--------------------- dlls/msvcrt/tests/string.c | 51 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 34 ++++++++++++++-------------- 3 files changed, 99 insertions(+), 42 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f0bfcbd591b..276bbd5684e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1271,39 +1271,45 @@ char* __cdecl strncpy(char *dst, const char *src, size_t len) /****************************************************************** * strncpy_s (MSVCRT.@) */ -int CDECL strncpy_s(char *dest, size_t numberOfElements, - const char *src, size_t count) +int __cdecl strncpy_s( char *dst, size_t elem, const char *src, size_t count ) { - size_t i, end; + char *p = dst; + BOOL truncate = (count == _TRUNCATE); - TRACE("(%p %Iu %s %Iu)\n", dest, numberOfElements, debugstr_a(src), count); + TRACE("(%p %Iu %s %Iu)\n", dst, elem, debugstr_a(src), count); - if(!count) { - if(dest && numberOfElements) - *dest = 0; + if (!count) + { + if (dst && elem) *dst = 0; return 0; } - if (!MSVCRT_CHECK_PMT(dest != NULL)) return EINVAL; - if (!MSVCRT_CHECK_PMT(src != NULL)) return EINVAL; - if (!MSVCRT_CHECK_PMT(numberOfElements != 0)) return EINVAL; - - if(count!=_TRUNCATE && count<numberOfElements) - end = count; - else - end = numberOfElements-1; - - for(i=0; i<end && src[i]; i++) - dest[i] = src[i]; - - if(!src[i] || end==count || count==_TRUNCATE) { - dest[i] = '\0'; - return 0; + if (!MSVCRT_CHECK_PMT(dst != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(elem != 0)) return EINVAL; + if (!MSVCRT_CHECK_PMT(src != NULL)) + { + *dst = 0; + return EINVAL; } - MSVCRT_INVALID_PMT("dest[numberOfElements] is too small", EINVAL); - dest[0] = '\0'; - return EINVAL; + while (elem && count && *src) + { + *p++ = *src++; + elem--; + count--; + } + if (!elem && truncate) + { + *(p-1) = 0; + return STRUNCATE; + } + else if (!elem) + { + *dst = 0; + return ERANGE; + } + *p = 0; + return 0; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9835a8b265d..6a07e7cb99e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -64,6 +64,7 @@ static int (__cdecl *p_strncmp)(const char *, const char *, size_t); static int (__cdecl *p_strcpy)(char *dst, const char *src); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); +static int (__cdecl *p_strncpy_s)(char *dst, size_t size, const char *src, size_t count); static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); @@ -738,6 +739,55 @@ static void test_strcpy_s(void) dest[4] == 'l' && dest[5] == '\0' && dest[6] == '\0' && dest[7] == 'X', "Unexpected return data from strcpy: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + if(!p_strncpy_s) + { + win_skip("strncpy_s not found\n"); + return; + } + + ret = p_strncpy_s(NULL, 18, big, ARRAY_SIZE(big)); + ok(ret == EINVAL, "p_strncpy_s expect EINVAL got %d\n", ret); + + dest[0] = 'A'; + ret = p_strncpy_s(dest, 8, NULL, 1); + ok(ret == EINVAL, "expected EINVAL got %d\n", ret); + ok(dest[0] == 0, "dest[0] not 0\n"); + + dest[0] = 'A'; + ret = p_strncpy_s(dest, 8, NULL, 0); + ok(ret == 0, "expected ERROR_SUCCESS got %d\n", ret); + ok(dest[0] == 0, "dest[0] not 0\n"); + + dest[0] = 'A'; + ret = p_strncpy_s(dest, 0, big, ARRAY_SIZE(big)); + ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(dest[0] == 0 || ret == EINVAL, "dest[0] not 0\n"); + + ret = p_strncpy_s(dest, 8, small, ARRAY_SIZE(small)); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(!strcmp(dest, small), "dest != small\n"); + + dest[0] = 'A'; + ret = p_strncpy_s(dest, 8, big, ARRAY_SIZE(big)); + ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(dest[0] == 0, "dest[0] not 0\n"); + + dest[0] = 'A'; + ret = p_strncpy_s(dest, 5, big, -1); + ok(ret == STRUNCATE, "expected STRUNCATE got %d\n", ret); + ok(dest[4] == 0, "dest[4] not 0\n"); + ok(!memcmp(dest, big, 4), "dest = %s\n", wine_dbgstr_a(dest)); + + ret = p_strncpy_s(NULL, 0, (void*)0xdeadbeef, 0); + ok(ret == 0, "ret = %d\n", ret); + + dest[0] = '1'; + dest[1] = 0; + ret = p_strncpy_s(dest+1, 4, dest, -1); + ok(ret == STRUNCATE, "expected ERROR_SUCCESS got %d\n", ret); + ok(dest[0]=='1' && dest[1]=='1' && dest[2]=='1' && dest[3]=='1', + "dest = %s\n", wine_dbgstr_a(dest)); } #define okchars(dst, b0, b1, b2, b3, b4, b5, b6, b7) \ @@ -4498,6 +4548,7 @@ START_TEST(string) SET(p_strncmp, "strncmp"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); + p_strncpy_s = (void *)GetProcAddress( hMsvcrt, "strncpy_s" ); p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 86875954551..be601ffeba2 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2376,41 +2376,41 @@ wchar_t* __cdecl wcsncpy( wchar_t* s1, const wchar_t *s2, size_t n ) /****************************************************************** * wcsncpy_s (MSVCRT.@) */ -INT CDECL wcsncpy_s( wchar_t* wcDest, size_t numElement, const wchar_t *wcSrc, - size_t count ) +INT CDECL wcsncpy_s( wchar_t *dst, size_t elem, const wchar_t *src, size_t count ) { - WCHAR *p = wcDest; + WCHAR *p = dst; BOOL truncate = (count == _TRUNCATE); - if(!wcDest && !numElement && !count) + if (!count) + { + if (dst && elem) *dst = 0; return 0; + } - if (!wcDest || !numElement) - return EINVAL; - - if (!wcSrc) + if (!MSVCRT_CHECK_PMT(dst != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(elem != 0)) return EINVAL; + if (!MSVCRT_CHECK_PMT(src != NULL)) { - *wcDest = 0; - return count ? EINVAL : 0; + *dst = 0; + return EINVAL; } - while (numElement && count && *wcSrc) + while (elem && count && *src) { - *p++ = *wcSrc++; - numElement--; + *p++ = *src++; + elem--; count--; } - if (!numElement && truncate) + if (!elem && truncate) { *(p-1) = 0; return STRUNCATE; } - else if (!numElement) + else if (!elem) { - *wcDest = 0; + *dst = 0; return ERANGE; } - *p = 0; return 0; }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022