wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Zebediah Figura : win32u: Move NtUserRegisterRawInputDevices from user32.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 0ce4ed675f927fb7f67e088af810e7e1f500783a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce4ed675f927fb7f67e088a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 17:37:40 2022 -0500 win32u: Move NtUserRegisterRawInputDevices from user32. --- dlls/user32/rawinput.c | 63 ------------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/rawinput.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 40 +++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 8 files changed, 106 insertions(+), 65 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index d6290f08d12..1b02be1398d 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -401,69 +401,6 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return rawinput_devices_count; } -/*********************************************************************** - * RegisterRawInputDevices (USER32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(const RAWINPUTDEVICE *devices, UINT device_count, UINT size) -{ - struct rawinput_device *d; - BOOL ret; - UINT i; - - TRACE("devices %p, device_count %u, size %u.\n", devices, device_count, size); - - if (size != sizeof(*devices)) - { - WARN("Invalid structure size %u.\n", size); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for (i = 0; i < device_count; ++i) - { - if ((devices[i].dwFlags & RIDEV_INPUTSINK) && - (devices[i].hwndTarget == NULL)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if ((devices[i].dwFlags & RIDEV_REMOVE) && - (devices[i].hwndTarget != NULL)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - if (!(d = HeapAlloc( GetProcessHeap(), 0, device_count * sizeof(*d) ))) return FALSE; - - for (i = 0; i < device_count; ++i) - { - TRACE("device %u: page %#x, usage %#x, flags %#lx, target %p.\n", - i, devices[i].usUsagePage, devices[i].usUsage, - devices[i].dwFlags, devices[i].hwndTarget); - if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY|RIDEV_INPUTSINK|RIDEV_DEVNOTIFY)) - FIXME("Unhandled flags %#lx for device %u.\n", devices[i].dwFlags, i); - - d[i].usage_page = devices[i].usUsagePage; - d[i].usage = devices[i].usUsage; - d[i].flags = devices[i].dwFlags; - d[i].target = wine_server_user_handle( devices[i].hwndTarget ); - } - - SERVER_START_REQ( update_rawinput_devices ) - { - wine_server_add_data( req, d, device_count * sizeof(*d) ); - ret = !wine_server_call( req ); - } - SERVER_END_REQ; - - HeapFree( GetProcessHeap(), 0, d ); - - return ret; -} - /*********************************************************************** * GetRawInputDeviceInfoA (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 887394227a3..dbe2a4c1430 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -605,7 +605,7 @@ @ stub RegisterNetworkCapabilities @ stdcall RegisterPointerDeviceNotifications(long long) @ stdcall RegisterPowerSettingNotification(long ptr long) -@ stdcall RegisterRawInputDevices(ptr long long) +@ stdcall RegisterRawInputDevices(ptr long long) NtUserRegisterRawInputDevices @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSuspendResumeNotification(long long) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index d6d4e0c13f7..359faa39083 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -366,3 +366,64 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); return TRUE; } + +/********************************************************************** + * NtUserRegisterRawInputDevices (win32u.@) + */ +BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT device_count, UINT size ) +{ + struct rawinput_device *server_devices; + BOOL ret; + UINT i; + + TRACE( "devices %p, device_count %u, size %u.\n", devices, device_count, size ); + + if (size != sizeof(*devices)) + { + WARN( "Invalid structure size %u.\n", size ); + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + for (i = 0; i < device_count; ++i) + { + if ((devices[i].dwFlags & RIDEV_INPUTSINK) && !devices[i].hwndTarget) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if ((devices[i].dwFlags & RIDEV_REMOVE) && devices[i].hwndTarget) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + } + + if (!(server_devices = malloc( device_count * sizeof(*server_devices) ))) return FALSE; + + for (i = 0; i < device_count; ++i) + { + TRACE( "device %u: page %#x, usage %#x, flags %#x, target %p.\n", + i, devices[i].usUsagePage, devices[i].usUsage, + devices[i].dwFlags, devices[i].hwndTarget ); + if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY|RIDEV_INPUTSINK|RIDEV_DEVNOTIFY)) + FIXME( "Unhandled flags %#x for device %u.\n", devices[i].dwFlags, i ); + + server_devices[i].usage_page = devices[i].usUsagePage; + server_devices[i].usage = devices[i].usUsage; + server_devices[i].flags = devices[i].dwFlags; + server_devices[i].target = wine_server_user_handle( devices[i].hwndTarget ); + } + + SERVER_START_REQ( update_rawinput_devices ) + { + wine_server_add_data( req, server_devices, device_count * sizeof(*server_devices) ); + ret = !wine_server_call( req ); + } + SERVER_END_REQ; + + free( server_devices ); + + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 12af30f6c98..3f2c596f727 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -160,6 +160,7 @@ static void * const syscalls[] = NtUserOpenDesktop, NtUserOpenInputDesktop, NtUserOpenWindowStation, + NtUserRegisterRawInputDevices, NtUserRemoveClipboardFormatListener, NtUserRemoveMenu, NtUserRemoveProp, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c71f0d20429..687ef3af8dc 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1130,7 +1130,7 @@ @ stub NtUserRegisterManipulationThread @ stub NtUserRegisterPointerDeviceNotifications @ stub NtUserRegisterPointerInputTarget -@ stub NtUserRegisterRawInputDevices +@ stdcall -syscall NtUserRegisterRawInputDevices(ptr long long) @ stub NtUserRegisterServicesProcess @ stub NtUserRegisterSessionPort @ stub NtUserRegisterShellPTPListener diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 618a7990554..531f9f7f9cd 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -147,6 +147,7 @@ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ SYSCALL_ENTRY( NtUserOpenWindowStation ) \ + SYSCALL_ENTRY( NtUserRegisterRawInputDevices ) \ SYSCALL_ENTRY( NtUserRemoveClipboardFormatListener ) \ SYSCALL_ENTRY( NtUserRemoveMenu ) \ SYSCALL_ENTRY( NtUserRemoveProp ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 9c6730b24ae..231f6a04a1e 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -64,6 +64,14 @@ typedef struct UINT32 wParam; } RAWINPUTHEADER32; +typedef struct +{ + USHORT usUsagePage; + USHORT usUsage; + DWORD dwFlags; + UINT32 hwndTarget; +} RAWINPUTDEVICE32; + static MSG *msg_32to64( MSG *msg, MSG32 *msg32 ) { if (!msg32) return NULL; @@ -975,3 +983,35 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputBuffer( UINT *args ) * whether it's operating under WoW64 or not. */ return NtUserGetRawInputBuffer( data, data_size, sizeof(RAWINPUTHEADER) ); } + +NTSTATUS WINAPI wow64_NtUserRegisterRawInputDevices( UINT *args ) +{ + const RAWINPUTDEVICE32 *devices32 = get_ptr( &args ); + UINT count = get_ulong( &args ); + UINT size = get_ulong( &args ); + + RAWINPUTDEVICE *devices64; + unsigned int i; + + if (size != sizeof(RAWINPUTDEVICE32)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (!(devices64 = Wow64AllocateTemp( count * sizeof(*devices64) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + for (i = 0; i < count; ++i) + { + devices64[i].usUsagePage = devices32[i].usUsagePage; + devices64[i].usUsage = devices32[i].usUsage; + devices64[i].dwFlags = devices32[i].dwFlags; + devices64[i].hwndTarget = UlongToPtr( devices32[i].hwndTarget ); + } + + return NtUserRegisterRawInputDevices( devices64, count, sizeof(*devices64) ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 18ddbcaa4a4..cb5696ec827 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -663,6 +663,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING * struct client_menu_name *client_menu_name, DWORD fnid, DWORD flags, DWORD *wow ); BOOL WINAPI NtUserRegisterHotKey( HWND hwnd, INT id, UINT modifiers, UINT vk ); +BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT device_count, UINT size ); INT WINAPI NtUserReleaseDC( HWND hwnd, HDC hdc ); BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserRemoveMenu( HMENU menu, UINT id, UINT flags );

1 0

Hugh McMaster : regedit: Use correct printf specifier for UINT64 (QWORD) values.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: e06a62049e8268e7501a9a703e42bfbf7dc9ea42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e06a62049e8268e7501a9a70… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 29 21:32:26 2022 +1000 regedit: Use correct printf specifier for UINT64 (QWORD) values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index e314862ee6f..8e40d488b15 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -122,7 +122,7 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz { UINT64 value = *(UINT64 *)data; WCHAR buf[64]; - swprintf(buf, ARRAY_SIZE(buf), L"0x%08Ix (%Iu)", value, value); + swprintf(buf, ARRAY_SIZE(buf), L"0x%08I64x (%I64u)", value, value); ListView_SetItemTextW(hwndLV, index, 2, buf); break; }

1 0

Hugh McMaster : regedit: Pass correct data size when adding a new value via the GUI.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 9c30f3d97ad2dc8b65409d7f3e70d3e2a159571c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c30f3d97ad2dc8b65409d7f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 29 15:49:24 2022 +1000 regedit: Pass correct data size when adding a new value via the GUI. This bug was exposed by 3b1faf59f60c2e5d91321fd8998dd81d90a13e11 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index c19ef1506fa..47ce233039e 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -443,6 +443,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW LONG lRet = ERROR_SUCCESS; WCHAR newValue[256]; UINT64 value = 0; + DWORD size_bytes; BOOL result = FALSE; int valueNum, index; HKEY hKey; @@ -466,15 +467,34 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } - - lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE *)&value, sizeof(value)); + + switch (valueType) + { + case REG_DWORD: + case REG_DWORD_BIG_ENDIAN: + size_bytes = sizeof(DWORD); + break; + case REG_QWORD: + size_bytes = sizeof(UINT64); + break; + case REG_BINARY: + size_bytes = 0; + break; + case REG_MULTI_SZ: + size_bytes = 2 * sizeof(WCHAR); + break; + default: /* REG_NONE, REG_SZ, REG_EXPAND_SZ */ + size_bytes = sizeof(WCHAR); + } + + lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE *)&value, size_bytes); if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } /* Add the new item to the listview */ - index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&value, sizeof(value), -1); + index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&value, size_bytes, -1); item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, index, (LPARAM)&item);

1 0

Eric Pouech : dbghelp/msc: Support LF_INDEX* in enumeration type definition.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: bb52ed35327bcdc9a85ff6b771c0b04da6cb78c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb52ed35327bcdc9a85ff6b7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 29 14:54:13 2022 +0200 dbghelp/msc: Support LF_INDEX* in enumeration type definition. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1c58b0e9cf6..ce2ad9b4e01 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -907,6 +907,18 @@ static BOOL codeview_add_type_enum_field_list(struct codeview_type_parse* ctp, break; } + case LF_INDEX_V1: + if (!codeview_add_type_enum_field_list(ctp, symt, type->index_v1.ref)) + return FALSE; + ptr += 2 + 2; + break; + + case LF_INDEX_V2: + if (!codeview_add_type_enum_field_list(ctp, symt, type->index_v2.ref)) + return FALSE; + ptr += 2 + 2 + 4; + break; + default: FIXME("Unsupported type %04x in ENUM field list\n", type->generic.id); return FALSE;

1 0

Eric Pouech : winedbg: No longer hide current WineDbg process from 'info proc'.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: f8d3c2b2030b1a59a329e646caeb614167a24b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8d3c2b2030b1a59a329e646… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 29 13:11:40 2022 +0200 winedbg: No longer hide current WineDbg process from 'info proc'. We used to hide current WineDbg instance when displaying processes' list (command 'info proc'). This can potentially generate some "dangling" processes in the hierarchy (related to this WineDbg instance): - conhost.exe - start.exe (when launched from unix shell without full path to winedbg.exe) Also, print a more comprehensive error message when trying to attach to itself (now that debugger's PID is more easily available). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 17 ++++++++++------- programs/winedbg/tgt_active.c | 7 ++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index bb933aeb455..ae0fd90e938 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -498,14 +498,18 @@ static unsigned get_parent(const struct dump_proc* dp, unsigned idx) static void dump_proc_info(const struct dump_proc* dp, unsigned idx, unsigned depth) { struct dump_proc_entry* dpe; + char info; for ( ; idx != -1; idx = dp->entries[idx].sibling) { assert(idx < dp->count); dpe = &dp->entries[idx]; - dbg_printf("%c%08lx %-8ld ", - (dpe->proc.th32ProcessID == (dbg_curr_process ? - dbg_curr_process->pid : 0)) ? '>' : ' ', - dpe->proc.th32ProcessID, dpe->proc.cntThreads); + if (dbg_curr_process && dpe->proc.th32ProcessID == dbg_curr_process->pid) + info = '>'; + else if (dpe->proc.th32ProcessID == GetCurrentProcessId()) + info = '='; + else + info = ' '; + dbg_printf("%c%08lx %-8ld ", info, dpe->proc.th32ProcessID, dpe->proc.cntThreads); if (depth) { unsigned i; @@ -537,11 +541,10 @@ void info_win32_processes(void) dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); ok = Process32First(snap, &dp.entries[dp.count].proc); - /* fetch all process information into dp (skipping this debugger) */ + /* fetch all process information into dp */ while (ok) { - if (dp.entries[dp.count].proc.th32ProcessID != GetCurrentProcessId()) - dp.entries[dp.count++].children = -1; + dp.entries[dp.count++].children = -1; if (dp.count >= dp.alloc) { dp.entries = HeapReAlloc(GetProcessHeap(), 0, dp.entries, sizeof(*dp.entries) * (dp.alloc *= 2)); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c17a6f38290..9e11de69bc9 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -70,9 +70,14 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de); */ BOOL dbg_attach_debuggee(DWORD pid) { + if (pid == GetCurrentProcessId()) + { + dbg_printf("WineDbg can't debug its own process. Please use another process ID.\n"); + return FALSE; + } if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, pid, 0))) return FALSE; - if (!DebugActiveProcess(pid)) + if (!DebugActiveProcess(pid)) { dbg_printf("Can't attach process %04lx: error %lu\n", pid, GetLastError()); dbg_del_process(dbg_curr_process);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: a354bb18fabb9b4aaddac829fb24adb50dc802e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a354bb18fabb9b4aaddac829… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jun 29 00:21:48 2022 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 54 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) diff --git a/po/lt.po b/po/lt.po index 41536a396d8..e5fb27b9654 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-06-25 00:18+0300\n" +"PO-Revision-Date: 2022-06-29 00:21+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15847,56 +15847,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -15980,7 +15930,7 @@ msgstr "" " <tipas> privalo būti vienas iš:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " Jei [/t] nenurodytas, numatytasis duomenų tipas yra REG_SZ.\n" "\n"

1 0

Alexandre Julliard : ntdll: Add memcpy_s and memmove_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: cbf5ad74fcf40a56788933d962cb157a0b3bacb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf5ad74fcf40a56788933d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:52:23 2022 +0200 ntdll: Add memcpy_s and memmove_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0cda13586f4..2a119c9a508 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1581,7 +1581,9 @@ @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) +@ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) +@ cdecl memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) @ cdecl pow(double double) @ cdecl qsort(ptr long long ptr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 1bea000b2bd..c0db6f832ef 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -142,6 +142,42 @@ void * __cdecl memmove( void *dst, const void *src, size_t n ) } +/********************************************************************* + * memcpy_s (MSVCRT.@) + */ +errno_t __cdecl memcpy_s( void *dst, size_t len, const void *src, size_t count ) +{ + if (!count) return 0; + if (!dst) return EINVAL; + if (!src) + { + memset( dst, 0, len ); + return EINVAL; + } + if (count > len) + { + memset( dst, 0, len ); + return ERANGE; + } + memmove( dst, src, count ); + return 0; +} + + +/********************************************************************* + * memmove_s (MSVCRT.@) + */ +errno_t __cdecl memmove_s( void *dst, size_t len, const void *src, size_t count ) +{ + if (!count) return 0; + if (!dst) return EINVAL; + if (!src) return EINVAL; + if (count > len) return ERANGE; + memmove( dst, src, count ); + return 0; +} + + static inline void memset_aligned_32( unsigned char *d, uint64_t v, size_t n ) { unsigned char *end = d + n;

1 0

Alexandre Julliard : ntdll: Add strupr_s and wcsupr_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 25f4760e851a05e3c241e6d9f83f14cca7f1ef4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=25f4760e851a05e3c241e6d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:51:46 2022 +0200 ntdll: Add strupr_s and wcsupr_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 20 +++++++++++++++++++- dlls/ntdll/wcstring.c | 23 ++++++++++++++++++----- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 91c56d4d92c..0cda13586f4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1524,6 +1524,7 @@ @ cdecl _strlwr_s(str long) @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) +@ cdecl _strupr_s(str long) @ cdecl _tolower(long) @ cdecl _toupper(long) @ cdecl _ui64toa(int64 ptr long) @@ -1540,6 +1541,7 @@ @ cdecl _wcslwr_s(wstr long) @ cdecl _wcsnicmp(wstr wstr long) @ cdecl _wcsupr(wstr) +@ cdecl _wcsupr_s(wstr long) @ cdecl _wtoi(wstr) @ cdecl -ret64 _wtoi64(wstr) @ cdecl _wtol(wstr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 8fbce780eb2..1bea000b2bd 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -600,11 +600,29 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) LPSTR __cdecl _strupr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = RtlUpperChar(*str); + for ( ; *str; str++) if (*str >= 'a' && *str <= 'z') *str += 'A' + 'a'; return ret; } +/********************************************************************* + * _strupr_s (NTDLL.@) + */ +errno_t __cdecl _strupr_s( char *str, size_t len ) +{ + if (!str) return EINVAL; + + if (strnlen( str, len ) == len) + { + *str = 0; + return EINVAL; + } + + _strupr( str ); + return 0; +} + + /********************************************************************* * _strlwr (NTDLL.@) * diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index b2662cb9cf1..97d67ee38d0 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -154,13 +154,26 @@ LPWSTR __cdecl _wcsupr( LPWSTR str ) { WCHAR *ret = str; - while (*str) + for ( ; *str; str++) if (*str >= 'a' && *str <= 'z') *str += 'A' - 'a'; + return ret; +} + + +/********************************************************************* + * _wcsupr_s (NTDLL.@) + */ +errno_t __cdecl _wcsupr_s( wchar_t *str, size_t len ) +{ + if (!str) return EINVAL; + + if (wcsnlen( str, len ) == len) { - WCHAR ch = *str; - if (ch >= 'a' && ch <= 'z') ch -= 32; - *str++ = ch; + *str = 0; + return EINVAL; } - return ret; + + _wcsupr( str ); + return 0; }

1 0

Alexandre Julliard : ntdll: Add strlwr_s and wcslwr_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: a15c55e658a0065709ae1b327e0f238cded4d51a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a15c55e658a0065709ae1b32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:51:07 2022 +0200 ntdll: Add strlwr_s and wcslwr_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 21 +++++++++++++++++++-- dlls/ntdll/wcstring.c | 24 ++++++++++++++++++------ 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 18055fe3b9c..91c56d4d92c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1521,6 +1521,7 @@ @ cdecl _strcmpi(str str) _stricmp @ cdecl _stricmp(str str) @ cdecl _strlwr(str) +@ cdecl _strlwr_s(str long) @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) @ cdecl _tolower(long) @@ -1536,6 +1537,7 @@ @ cdecl _vswprintf(ptr wstr ptr) @ cdecl _wcsicmp(wstr wstr) @ cdecl _wcslwr(wstr) +@ cdecl _wcslwr_s(wstr long) @ cdecl _wcsnicmp(wstr wstr long) @ cdecl _wcsupr(wstr) @ cdecl _wtoi(wstr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index d0330f48926..8fbce780eb2 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -444,7 +444,7 @@ errno_t __cdecl strncpy_s( char *dst, size_t len, const char *src, size_t count */ size_t __cdecl strnlen( const char *str, size_t len ) { - const char *s = str; + const char *s; for (s = str; len && *s; s++, len--) ; return s - str; } @@ -620,11 +620,28 @@ LPSTR __cdecl _strupr( LPSTR str ) LPSTR __cdecl _strlwr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = tolower(*str); + for ( ; *str; str++) if (*str >= 'A' && *str <= 'Z') *str += 'a' - 'A'; return ret; } +/********************************************************************* + * _strlwr_s (NTDLL.@) + */ +errno_t __cdecl _strlwr_s( char *str, size_t len ) +{ + if (!str) return EINVAL; + + if (strnlen( str, len ) == len) + { + *str = 0; + return EINVAL; + } + _strlwr( str ); + return 0; +} + + /********************************************************************* * toupper (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index ed9e1612918..b2662cb9cf1 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -108,14 +108,26 @@ int __cdecl _wcsicmp( LPCWSTR str1, LPCWSTR str2 ) LPWSTR __cdecl _wcslwr( LPWSTR str ) { WCHAR *ret = str; + for ( ; *str; str++) if (*str >= 'A' && *str <= 'Z') *str += 'a' - 'A'; + return ret; +} - while (*str) + +/********************************************************************* + * _wcslwr_s (NTDLL.@) + */ +errno_t __cdecl _wcslwr_s( wchar_t *str, size_t len ) +{ + if (!str) return EINVAL; + + if (wcsnlen( str, len ) == len) { - WCHAR ch = *str; - if (ch >= 'A' && ch <= 'Z') ch += 32; - *str++ = ch; + *str = 0; + return EINVAL; } - return ret; + + _wcslwr( str ); + return 0; } @@ -380,7 +392,7 @@ errno_t __cdecl wcsncpy_s( wchar_t *dst, size_t len, const wchar_t *src, size_t */ size_t __cdecl wcsnlen( const WCHAR *str, size_t len ) { - const WCHAR *s = str; + const WCHAR *s; for (s = str; len && *s; s++, len--) ; return s - str; }

1 0

Alexandre Julliard : ntdll: Add strtok_s and wcstok_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: b44ebda3888fbd746a44b745d1f971e1a95a9025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44ebda3888fbd746a44b745… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:50:12 2022 +0200 ntdll: Add strtok_s and wcstok_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 27 +++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e02c4278deb..18055fe3b9c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1604,6 +1604,7 @@ @ cdecl strrchr(str long) @ cdecl strspn(str str) @ cdecl strstr(str str) +@ cdecl strtok_s(str str ptr) @ cdecl strtol(str ptr long) @ cdecl strtoul(str ptr long) @ varargs swprintf(ptr wstr) NTDLL_swprintf @@ -1637,6 +1638,7 @@ @ cdecl wcsspn(wstr wstr) @ cdecl wcsstr(wstr wstr) @ cdecl wcstok(wstr wstr) +@ cdecl wcstok_s(wstr wstr ptr) @ cdecl wcstol(wstr ptr long) @ cdecl wcstombs(ptr ptr long) @ cdecl wcstoul(wstr ptr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 6c4ac47803a..d0330f48926 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -795,6 +795,33 @@ int CDECL _tolower(int c) } +/********************************************************************* + * strtok_s (NTDLL.@) + */ +char * __cdecl strtok_s( char *str, const char *delim, char **ctx ) +{ + char *next; + + if (!delim || !ctx) return NULL; + if (!str) + { + str = *ctx; + if (!str) return NULL; + } + while (*str && strchr( delim, *str )) str++; + if (!*str) + { + *ctx = str; + return NULL; + } + next = str + 1; + while (*next && !strchr( delim, *next )) next++; + if (*next) *next++ = 0; + *ctx = next; + return str; +} + + static int char_to_int( char c ) { if ('0' <= c && c <= '9') return c - '0'; diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index e481c89ca71..ed9e1612918 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -455,6 +455,33 @@ LPWSTR __cdecl wcstok( LPWSTR str, LPCWSTR delim ) } +/********************************************************************* + * wcstok_s (NTDLL.@) + */ +wchar_t * __cdecl wcstok_s( wchar_t *str, const wchar_t *delim, wchar_t **ctx ) +{ + wchar_t *next; + + if (!delim || !ctx) return NULL; + if (!str) + { + str = *ctx; + if (!str) return NULL; + } + while (*str && wcschr( delim, *str )) str++; + if (!*str) + { + *ctx = str; + return NULL; + } + next = str + 1; + while (*next && !wcschr( delim, *next )) next++; + if (*next) *next++ = 0; + *ctx = next; + return str; +} + + /********************************************************************* * wcstombs (NTDLL.@) */

1 0

← Newer
1
2
3
4
5
6
7
8
...
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