March 2020 - Wine-commits - list.winehq.org

Jefferson Carpenter : kernelbase: Zero out retkey in the ERROR_INVALID_HANDLE case in RegOpenKeyExW.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: f070d040ebb587f117ac14492a96882c6bd164e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f070d040ebb587f117ac1449… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Tue Mar 24 08:02:34 2020 +0000 kernelbase: Zero out retkey in the ERROR_INVALID_HANDLE case in RegOpenKeyExW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48798 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 5 +++++ dlls/kernelbase/registry.c | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index e4d4893bd4..1f335b1c9f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1081,6 +1081,11 @@ static void test_reg_open_key(void) ok(!RegCloseKey(hkResult), "got invalid hkey\n"); /* empty subkey of NULL */ + hkResult = hkPreserve; + ret = RegOpenKeyExW(NULL, L"", 0, KEY_QUERY_VALUE, &hkResult); + ok(ret == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", ret); + ok(hkResult == NULL || broken(hkResult == hkPreserve /* Windows XP */), "expected hkResult == NULL\n"); + hkResult = hkPreserve; ret = RegOpenKeyExA(NULL, "", 0, KEY_QUERY_VALUE, &hkResult); ok(ret == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", ret); diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index e6f3722f70..f8afb94f8d 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -479,6 +479,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD o if (HandleToUlong(hkey) == HandleToUlong(HKEY_CLASSES_ROOT) && name && *name == '\\') name++; if (!retkey) return ERROR_INVALID_PARAMETER; + *retkey = NULL; if (!(hkey = get_special_root_hkey( hkey, access ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr);

1 0

Alex Henrie : wine.inf: Add Winlogon keys.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 27d1ef75c4fd5d47b5566e365caf0d3e5abc70ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=27d1ef75c4fd5d47b5566e36… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Mar 22 00:44:26 2020 -0600 wine.inf: Add Winlogon keys. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48611 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6e0cb21253..ad79c084dd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -524,6 +524,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d [CurrentVersion] HKCU,%CurrentVersion%\Run,,16 +HKCU,%CurrentVersionNT%\Winlogon,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%" HKLM,%CurrentVersion%,"FirstInstallDateTime",1,21,81,7c,23 HKLM,%CurrentVersion%,"ProductId",,"12345-oem-0000001-54321" @@ -549,7 +550,6 @@ HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Setup\WindowsFeatures\WindowsMediaVersion,,,"12.0.7601.18840" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 -HKLM,%CurrentVersion%\Winlogon,,16 HKLM,%CurrentVersionNT%,"InstallDate",0x10003,1273299354 HKLM,%CurrentVersionNT%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" @@ -572,6 +572,7 @@ HKLM,%CurrentVersionNT%\Perflib,,16 HKLM,%CurrentVersionNT%\Ports,,16 HKLM,%CurrentVersionNT%\Print,,16 HKLM,%CurrentVersionNT%\ProfileList,,16 +HKLM,%CurrentVersionNT%\Winlogon,"Shell",,"explorer.exe" [CurrentVersionWow64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%"

1 0

Serge Gautherie : kernelbase: Handle RegGetValue() RRF_SUBKEY_WOW64??KEY flags.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 7c0ba9007a6a54c8429745a81038678bdfc2ff13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0ba9007a6a54c8429745a8… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 21 16:21:29 2020 +0100 kernelbase: Handle RegGetValue() RRF_SUBKEY_WOW64??KEY flags. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/registry.c | 22 ++++++++++++++++++++-- include/winreg.h | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index f8afb94f8d..d1588d0b26 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1699,13 +1699,22 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; + if ((dwFlags & RRF_WOW64_MASK) == RRF_WOW64_MASK) + return ERROR_INVALID_PARAMETER; + if (pszSubKey && pszSubKey[0]) { - ret = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + REGSAM samDesired = KEY_QUERY_VALUE; + + if (dwFlags & RRF_WOW64_MASK) + samDesired |= (dwFlags & RRF_SUBKEY_WOW6432KEY) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + + ret = RegOpenKeyExW(hKey, pszSubKey, 0, samDesired, &hKey); if (ret != ERROR_SUCCESS) return ret; } @@ -1795,13 +1804,22 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; + if ((dwFlags & RRF_WOW64_MASK) == RRF_WOW64_MASK) + return ERROR_INVALID_PARAMETER; + if (pszSubKey && pszSubKey[0]) { - ret = RegOpenKeyExA(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + REGSAM samDesired = KEY_QUERY_VALUE; + + if (dwFlags & RRF_WOW64_MASK) + samDesired |= (dwFlags & RRF_SUBKEY_WOW6432KEY) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + + ret = RegOpenKeyExA(hKey, pszSubKey, 0, samDesired, &hKey); if (ret != ERROR_SUCCESS) return ret; } diff --git a/include/winreg.h b/include/winreg.h index c00379150a..00bc8c02dc 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -81,6 +81,9 @@ typedef LONG LSTATUS; #define RRF_RT_DWORD (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD) #define RRF_RT_QWORD (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD) #define RRF_RT_ANY 0xffff +#define RRF_SUBKEY_WOW6464KEY (1 << 16) +#define RRF_SUBKEY_WOW6432KEY (1 << 17) +#define RRF_WOW64_MASK (RRF_SUBKEY_WOW6432KEY | RRF_SUBKEY_WOW6464KEY) #define RRF_NOEXPAND (1 << 28) #define RRF_ZEROONFAILURE (1 << 29)

1 0

Serge Gautherie : advapi32/tests: Check RegGetValueA() RRF_SUBKEY_WOW64??KEY validation.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: c7a12a851beaf639563914fd1ff664434a7b860f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a12a851beaf639563914fd… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Mar 21 16:21:46 2020 +0100 advapi32/tests: Check RegGetValueA() RRF_SUBKEY_WOW64??KEY validation. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1f335b1c9f..c8f9adf773 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -772,10 +772,28 @@ static void test_get_value(void) ok(type == REG_DWORD, "type=%d\n", type); ok(dw == 0x12345678, "dw=%d\n", dw); + /* Check RRF_SUBKEY_WOW64*KEY validation on a case without a subkey */ + ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY | RRF_SUBKEY_WOW6432KEY, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER || broken(ret == ERROR_SUCCESS), /* Before Win10 */ + "ret=%d\n", ret); + ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6432KEY, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* Query by subkey-name */ ret = pRegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "DWORD", RRF_RT_REG_DWORD, NULL, NULL, NULL); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* Check RRF_SUBKEY_WOW64*KEY validation on a case with a subkey */ + ret = pRegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY | RRF_SUBKEY_WOW6432KEY, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER || broken(ret == ERROR_SUCCESS), /* Before Win10 */ + "ret=%d\n", ret); + ret = pRegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + ret = pRegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\Test", "DWORD", RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6432KEY, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* Query REG_DWORD using RRF_RT_REG_BINARY (restricted) */ size = type = dw = 0xdeadbeef; ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_BINARY, &type, &dw, &size);

1 0

Rémi Bernon : server: Implement DBG_REPLY_LATER handling.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: e2a1f00a3850dbce89ec0f85bc46fcd858f9a798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a1f00a3850dbce89ec0f85… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 24 16:05:50 2020 +0100 server: Implement DBG_REPLY_LATER handling. This flag causes the debug event to be replayed after the target thread continues. It can be used, after suspending the thread, to resume other threads and later return to the breaking. This will help implementing gdb continue/step packets correctly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 4 +-- server/debugger.c | 73 ++++++++++++++++++++++++++++++++++++++++-- server/object.h | 1 + server/thread.c | 3 +- 4 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 8062c29461..33e18d82e6 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1278,7 +1278,7 @@ static void test_debugger(const char *argv0) ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); if ((skip_reply_later = !ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER))) - todo_wine win_skip("Skipping unsupported DBG_REPLY_LATER tests\n"); + win_skip("Skipping unsupported DBG_REPLY_LATER tests\n"); else { DEBUG_EVENT de; @@ -1402,7 +1402,7 @@ static void test_debugger(const char *argv0) else win_skip("call_debug_service_code not supported on this architecture\n"); if (skip_reply_later) - todo_wine win_skip("Skipping unsupported DBG_REPLY_LATER tests\n"); + win_skip("Skipping unsupported DBG_REPLY_LATER tests\n"); else if (sizeof(loop_code) > 1) { HANDLE thread_a, thread_b; diff --git a/server/debugger.c b/server/debugger.c index 5b06b73b4b..5ff63b92b9 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -38,7 +38,7 @@ #include "thread.h" #include "request.h" -enum debug_event_state { EVENT_QUEUED, EVENT_SENT, EVENT_CONTINUED }; +enum debug_event_state { EVENT_QUEUED, EVENT_SENT, EVENT_DELAYED, EVENT_CONTINUED }; /* debug event */ struct debug_event @@ -265,6 +265,31 @@ static void link_event( struct debug_event *event ) } } +/* resume a delayed debug event already in the queue */ +static void resume_event( struct debug_event *event ) +{ + struct debug_ctx *debug_ctx = event->debugger->debug_ctx; + + assert( debug_ctx ); + event->state = EVENT_QUEUED; + if (!event->sender->process->debug_event) + { + grab_object( debug_ctx ); + wake_up( &debug_ctx->obj, 0 ); + release_object( debug_ctx ); + } +} + +/* delay a debug event already in the queue to be replayed when thread wakes up */ +static void delay_event( struct debug_event *event ) +{ + struct debug_ctx *debug_ctx = event->debugger->debug_ctx; + + assert( debug_ctx ); + event->state = EVENT_DELAYED; + if (event->sender->process->debug_event == event) event->sender->process->debug_event = NULL; +} + /* find the next event that we can send to the debugger */ static struct debug_event *find_event_to_send( struct debug_ctx *debug_ctx ) { @@ -273,6 +298,7 @@ static struct debug_event *find_event_to_send( struct debug_ctx *debug_ctx ) LIST_FOR_EACH_ENTRY( event, &debug_ctx->event_queue, struct debug_event, entry ) { if (event->state == EVENT_SENT) continue; /* already sent */ + if (event->state == EVENT_DELAYED) continue; /* delayed until thread resumes */ if (event->sender->process->debug_event) continue; /* process busy with another one */ return event; } @@ -365,6 +391,29 @@ static int continue_debug_event( struct process *process, struct thread *thread, { struct debug_event *event; + if (status == DBG_REPLY_LATER) + { + /* if thread is suspended, delay all its events and resume process + * if not, reset the event for immediate replay */ + LIST_FOR_EACH_ENTRY( event, &debug_ctx->event_queue, struct debug_event, entry ) + { + if (event->sender != thread) continue; + if (thread->suspend) + { + delay_event( event ); + resume_process( process ); + } + else if (event->state == EVENT_SENT) + { + assert( event->sender->process->debug_event == event ); + event->sender->process->debug_event = NULL; + resume_event( event ); + return 1; + } + } + return 1; + } + /* find the event in the queue */ LIST_FOR_EACH_ENTRY( event, &debug_ctx->event_queue, struct debug_event, entry ) { @@ -372,7 +421,6 @@ static int continue_debug_event( struct process *process, struct thread *thread, if (event->sender == thread) { assert( event->sender->process->debug_event == event ); - event->status = status; event->state = EVENT_CONTINUED; wake_up( &event->obj, 0 ); @@ -430,6 +478,24 @@ void generate_debug_event( struct thread *thread, int code, const void *arg ) } } +void resume_delayed_debug_events( struct thread *thread ) +{ + struct thread *debugger = thread->process->debugger; + struct debug_event *event; + + if (debugger) + { + assert( debugger->debug_ctx ); + LIST_FOR_EACH_ENTRY( event, &debugger->debug_ctx->event_queue, struct debug_event, entry ) + { + if (event->sender != thread) continue; + if (event->state != EVENT_DELAYED) continue; + resume_event( event ); + suspend_process( thread->process ); + } + } +} + /* attach a process to a debugger thread and suspend it */ static int debugger_attach( struct process *process, struct thread *debugger ) { @@ -615,7 +681,8 @@ DECL_HANDLER(continue_debug_event) struct process *process; if (req->status != DBG_EXCEPTION_NOT_HANDLED && - req->status != DBG_CONTINUE) + req->status != DBG_CONTINUE && + req->status != DBG_REPLY_LATER) { set_error( STATUS_INVALID_PARAMETER ); return; diff --git a/server/object.h b/server/object.h index 8114a8fb6b..3144eb5667 100644 --- a/server/object.h +++ b/server/object.h @@ -207,6 +207,7 @@ extern void sock_init(void); extern int set_process_debugger( struct process *process, struct thread *debugger ); extern void generate_debug_event( struct thread *thread, int code, const void *arg ); +extern void resume_delayed_debug_events( struct thread *thread ); extern void generate_startup_debug_events( struct process *process, client_ptr_t entry ); extern void debug_exit_thread( struct thread *thread ); diff --git a/server/thread.c b/server/thread.c index edf70c61bd..6e677c8cf2 100644 --- a/server/thread.c +++ b/server/thread.c @@ -612,7 +612,8 @@ int resume_thread( struct thread *thread ) int old_count = thread->suspend; if (thread->suspend > 0) { - if (!(--thread->suspend + thread->process->suspend)) wake_thread( thread ); + if (!(--thread->suspend)) resume_delayed_debug_events( thread ); + if (!(thread->suspend + thread->process->suspend)) wake_thread( thread ); } return old_count; }

1 0

Francois Gouget : shell32/tests: Fix the temporary directory creation in shlexec.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: fd7e5741aeb35f8c55869a9a8379712e85672c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd7e5741aeb35f8c55869a9a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 26 21:53:06 2020 +0100 shell32/tests: Fix the temporary directory creation in shlexec. Since the test no longer uses a random directory name, the directory is more likely to exist already. So use it even if it already exists. Also on some Windows versions (e.g. Windos 2008) GetLongPathName() does not return the long name if the path does not exist. So do the conversion before appending the new directory name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b49297bb41..8ee662321d 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2693,16 +2693,17 @@ static void init_test(void) strcpy(tmpdir, "c:\\"); else GetTempPathA(sizeof(tmpdir), tmpdir); + GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); /* In case of a failure it is necessary to show the path that was passed to * ShellExecute(). That means the paths must not be randomized so as not to * prevent the TestBot from detecting new failures. */ strcat(tmpdir, "wtShlexecDir"); - GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL ); - ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); + ok( rc || GetLastError() == ERROR_ALREADY_EXISTS, + "failed to create %s err %u\n", tmpdir, GetLastError() ); /* Set %TMPDIR% for the tests */ SetEnvironmentVariableA("TMPDIR", tmpdir);

1 0

Alexandre Julliard : ntdll: Update some string functions prototypes to match msvcrt.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 6226be3656e706d3d389cdcbf63a2ad19d861e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6226be3656e706d3d389cdcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:36:05 2020 +0100 ntdll: Update some string functions prototypes to match msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 27 +++++++++++++++++++++++++-- dlls/ntdll/wcstring.c | 21 +++++++++++---------- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3ed0e1002c..1e83478ce6 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -271,6 +271,29 @@ NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); /* string functions */ -int __cdecl NTDLL_tolower( int c ); -int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); +int __cdecl NTDLL_tolower( int c ); +int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); +int __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ); +int __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, size_t n ); +int __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 ); +int __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, size_t n ); +WCHAR __cdecl NTDLL_towlower( WCHAR ch ); +WCHAR __cdecl NTDLL_towupper( WCHAR ch ); +LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str ); +LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ); +LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src ); +LPWSTR __cdecl NTDLL_wcscat( LPWSTR dst, LPCWSTR src ); +LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch ); +size_t __cdecl NTDLL_wcslen( LPCWSTR str ); +size_t __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject ); +LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, size_t n ); +LPWSTR __cdecl NTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ); +LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept ); +LPWSTR __cdecl NTDLL_wcsrchr( LPCWSTR str, WCHAR ch ); +size_t __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept ); +LPWSTR __cdecl NTDLL_wcsstr( LPCWSTR str, LPCWSTR sub ); +LPWSTR __cdecl NTDLL_wcstok( LPWSTR str, LPCWSTR delim ); +LONG __cdecl NTDLL_wcstol( LPCWSTR s, LPWSTR *end, INT base ); +ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); + #endif diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 858c6fc538..1a6d9c1c97 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -32,6 +32,7 @@ #include "winbase.h" #include "winnls.h" #include "winternl.h" +#include "ntdll_misc.h" static const unsigned short wctypes[256] = { @@ -89,7 +90,7 @@ static const unsigned short wctypes[256] = /********************************************************************* * _wcsicmp (NTDLL.@) */ -INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ) +int __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ) { for (;;) { @@ -122,7 +123,7 @@ LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str ) /********************************************************************* * _wcsnicmp (NTDLL.@) */ -INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) +int __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, size_t n ) { int ret = 0; for ( ; n > 0; n--, str1++, str2++) @@ -166,7 +167,7 @@ LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src ) /*********************************************************************** * wcslen (NTDLL.@) */ -INT __cdecl NTDLL_wcslen( LPCWSTR str ) +size_t __cdecl NTDLL_wcslen( LPCWSTR str ) { const WCHAR *s = str; while (*s) s++; @@ -197,7 +198,7 @@ LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch ) /********************************************************************* * wcscmp (NTDLL.@) */ -INT __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 ) +int __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 ) { while (*str1 && (*str1 == *str2)) { str1++; str2++; } return *str1 - *str2; @@ -207,7 +208,7 @@ INT __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 ) /********************************************************************* * wcscspn (NTDLL.@) */ -INT __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject ) +size_t __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject ) { const WCHAR *ptr; for (ptr = str; *ptr; ptr++) if (NTDLL_wcschr( reject, *ptr )) break; @@ -218,7 +219,7 @@ INT __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject ) /********************************************************************* * wcsncat (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, INT n ) +LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, size_t n ) { LPWSTR ret = s1; while (*s1) s1++; @@ -231,7 +232,7 @@ LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, INT n ) /********************************************************************* * wcsncmp (NTDLL.@) */ -INT __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) +int __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, size_t n ) { if (n <= 0) return 0; while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } @@ -242,7 +243,7 @@ INT __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) /********************************************************************* * wcsncpy (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, INT n ) +LPWSTR __cdecl NTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) { WCHAR *ret = s1; while (n-- > 0) if (!(*s1++ = *s2++)) break; @@ -264,7 +265,7 @@ LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept ) /********************************************************************* * wcsrchr (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcsrchr( LPWSTR str, WCHAR ch ) +LPWSTR __cdecl NTDLL_wcsrchr( LPCWSTR str, WCHAR ch ) { WCHAR *ret = NULL; do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); @@ -275,7 +276,7 @@ LPWSTR __cdecl NTDLL_wcsrchr( LPWSTR str, WCHAR ch ) /********************************************************************* * wcsspn (NTDLL.@) */ -INT __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept ) +size_t __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept ) { const WCHAR *ptr; for (ptr = str; *ptr; ptr++) if (!NTDLL_wcschr( accept, *ptr )) break;

1 0

Alexandre Julliard : ntdll: Use wcsicmp() instead of strcmpiW() where possible.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 3e049b6b962b8e6f048101b9910c09d5b1d8f167 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e049b6b962b8e6f048101b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:38:09 2020 +0100 ntdll: Use wcsicmp() instead of strcmpiW() where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 2 +- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/loadorder.c | 2 +- dlls/ntdll/locale.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/path.c | 2 +- dlls/ntdll/process.c | 2 +- dlls/ntdll/relay.c | 4 ++-- dlls/ntdll/version.c | 6 +++--- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 17f9cad084..236adf6c00 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3101,7 +3101,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) unsigned int data_pos = 0, data_len; char buffer[8192]; - if (!lang || !strcmpiW( lang, neutralW )) lang = wildcardW; + if (!lang || !wcsicmp( lang, neutralW )) lang = wildcardW; if (!(lookup = RtlAllocateHeap( GetProcessHeap(), 0, (strlenW(ai->arch) + strlenW(ai->name) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1b641f1b9d..7aef68e39e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -951,7 +951,7 @@ static BOOL is_dll_native_subsystem( LDR_MODULE *mod, const IMAGE_NT_HEADERS *nt DWORD len = strlen(name); if (len * sizeof(WCHAR) >= sizeof(buffer)) continue; ascii_to_unicode( buffer, name, len + 1 ); - if (!strcmpiW( buffer, ntdllW ) || !strcmpiW( buffer, kernel32W )) + if (!wcsicmp( buffer, ntdllW ) || !wcsicmp( buffer, kernel32W )) { TRACE( "%s imports %s, assuming not native\n", debugstr_w(filename), debugstr_w(buffer) ); return FALSE; @@ -1761,7 +1761,7 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING p++; for (i = 0; i < len; i++) if (tolowerW(p[i]) != tolowerW( (WCHAR)filename[i]) ) break; - if (i == len && (!p[len] || !strcmpiW( p + len, soW ))) + if (i == len && (!p[len] || !wcsicmp( p + len, soW ))) { /* the filename matches, use path as the full path */ len += p - path->Buffer; @@ -2768,7 +2768,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); p++; - if (!dirlen || strncmpiW( p, info->lpAssemblyDirectoryName, dirlen ) || strcmpiW( p + dirlen, dotManifestW )) + if (!dirlen || strncmpiW( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, dotManifestW )) { /* manifest name does not match directory name, so it's not a global * windows/winsxs manifest; use the manifest directory name instead */ diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index b965b96011..2d82b12a7a 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -65,7 +65,7 @@ static struct loadorder_list env_list; */ static int cmp_sort_func(const void *s1, const void *s2) { - return strcmpiW(((const module_loadorder_t *)s1)->modulename, ((const module_loadorder_t *)s2)->modulename); + return wcsicmp(((const module_loadorder_t *)s1)->modulename, ((const module_loadorder_t *)s2)->modulename); } diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 1be3086a1e..ea629e8393 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1703,13 +1703,13 @@ NTSTATUS WINAPI RtlLocaleNameToLcid( const WCHAR *name, LCID *lcid, ULONG flags if (PRIMARYLANGID(id) == LANG_NEUTRAL) continue; - if (!load_string( LOCALE_SNAME, id, buf, ARRAY_SIZE(buf) ) && !strcmpiW( name, buf )) + if (!load_string( LOCALE_SNAME, id, buf, ARRAY_SIZE(buf) ) && !wcsicmp( name, buf )) { *lcid = MAKELCID( id, SORT_DEFAULT ); /* FIXME: handle sort order */ goto found; } - if (load_string( LOCALE_SISO639LANGNAME, id, buf, ARRAY_SIZE(buf) ) || strcmpiW( lang, buf )) + if (load_string( LOCALE_SISO639LANGNAME, id, buf, ARRAY_SIZE(buf) ) || wcsicmp( lang, buf )) continue; if (script) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1e83478ce6..c22b32a5b7 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -296,4 +296,6 @@ LPWSTR __cdecl NTDLL_wcstok( LPWSTR str, LPCWSTR delim ); LONG __cdecl NTDLL_wcstol( LPCWSTR s, LPWSTR *end, INT base ); ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); +#define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2) + #endif diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 610646be85..adbfb4f526 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -280,7 +280,7 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) case UNC_PATH: return 0; case DEVICE_PATH: - if (!strcmpiW( dos_name, consoleW )) + if (!wcsicmp( dos_name, consoleW )) return MAKELONG( sizeof(conW), 4 * sizeof(WCHAR) ); /* 4 is length of \\.\ prefix */ return 0; case ABSOLUTE_DRIVE_PATH: diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 78e112bd3a..2290d5d186 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1579,7 +1579,7 @@ NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) /* check for .com or .pif extension */ if (status == STATUS_INVALID_IMAGE_NOT_MZ && (p = strrchrW( params->ImagePathName.Buffer, '.' )) && - (!strcmpiW( p, comW ) || !strcmpiW( p, pifW ))) + (!wcsicmp( p, comW ) || !wcsicmp( p, pifW ))) status = STATUS_INVALID_IMAGE_WIN_16; switch (status) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 04957acf7b..b5db930e12 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -292,9 +292,9 @@ static BOOL check_from_module( const WCHAR **includelist, const WCHAR **excludel { int len; - if (!strcmpiW( *listitem, module )) return !show; + if (!wcsicmp( *listitem, module )) return !show; len = strlenW( *listitem ); - if (!strncmpiW( *listitem, module, len ) && !strcmpiW( module + len, dllW )) + if (!strncmpiW( *listitem, module, len ) && !wcsicmp( module + len, dllW )) return !show; } return show; diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 61e48f6fbd..4994dbbb5e 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -343,9 +343,9 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) { WCHAR *str = (WCHAR *)info->Data; str[info->DataLength / sizeof(WCHAR)] = 0; - if (!strcmpiW( str, WinNTW )) version->wProductType = VER_NT_WORKSTATION; - else if (!strcmpiW( str, LanmanNTW )) version->wProductType = VER_NT_DOMAIN_CONTROLLER; - else if (!strcmpiW( str, ServerNTW )) version->wProductType = VER_NT_SERVER; + if (!wcsicmp( str, WinNTW )) version->wProductType = VER_NT_WORKSTATION; + else if (!wcsicmp( str, LanmanNTW )) version->wProductType = VER_NT_DOMAIN_CONTROLLER; + else if (!wcsicmp( str, ServerNTW )) version->wProductType = VER_NT_SERVER; } NtClose( hkey2 ); }

1 0

Alexandre Julliard : ntdll: Use wcsnicmp() instead of strncmpiW() where possible.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: f831b3bd3d6b013893be7645df3a9cd05289c415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f831b3bd3d6b013893be7645… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:38:33 2020 +0100 ntdll: Use wcsnicmp() instead of strncmpiW() where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 12 ++++++------ dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/env.c | 4 ++-- dlls/ntdll/loadorder.c | 2 +- dlls/ntdll/locale.c | 2 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 12 ++++++------ dlls/ntdll/process.c | 4 ++-- dlls/ntdll/relay.c | 2 +- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 236adf6c00..9f2d6ffeb0 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -759,7 +759,7 @@ static inline BOOL xmlstr_cmp(const xmlstr_t* xmlstr, const WCHAR *str) static inline BOOL xmlstr_cmpi(const xmlstr_t* xmlstr, const WCHAR *str) { - return !strncmpiW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len]; + return !wcsnicmp(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len]; } static BOOL xml_attr_cmp( const struct xml_attr *attr, const WCHAR *str ) @@ -1843,13 +1843,13 @@ static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) start = str; while (*str != ',' && (i++ < value->len)) str++; - if (!strncmpiW(start, restrictedW, str-start)) + if (!wcsnicmp(start, restrictedW, str-start)) *flags |= LIBFLAG_FRESTRICTED; - else if (!strncmpiW(start, controlW, str-start)) + else if (!wcsnicmp(start, controlW, str-start)) *flags |= LIBFLAG_FCONTROL; - else if (!strncmpiW(start, hiddenW, str-start)) + else if (!wcsnicmp(start, hiddenW, str-start)) *flags |= LIBFLAG_FHIDDEN; - else if (!strncmpiW(start, hasdiskimageW, str-start)) + else if (!wcsnicmp(start, hasdiskimageW, str-start)) *flags |= LIBFLAG_FHASDISKIMAGE; else { @@ -3146,7 +3146,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) tmp = strchrW(tmp, '_') + 1; tmp = strchrW(tmp, '_') + 1; if (dir_info->FileNameLength - (tmp - dir_info->FileName) * sizeof(WCHAR) == sizeof(wine_trailerW) && - !strncmpiW( tmp, wine_trailerW, ARRAY_SIZE( wine_trailerW ))) + !wcsnicmp( tmp, wine_trailerW, ARRAY_SIZE( wine_trailerW ))) { /* prefer a non-Wine manifest if we already have one */ /* we'll still load the builtin dll if specified through DllOverrides */ diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 7b0627cd3d..c3da7347d7 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2160,7 +2160,7 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i { WCHAR short_nameW[12]; ret = hash_short_file_name( &str, short_nameW ); - if (ret == length && !strncmpiW( short_nameW, name, length )) + if (ret == length && !wcsnicmp( short_nameW, name, length )) { strcpy( unix_name + pos, de->d_name ); closedir( dir ); @@ -2409,7 +2409,7 @@ static inline int get_dos_prefix_len( const UNICODE_STRING *name ) return ARRAY_SIZE( nt_prefixW ); if (name->Length >= sizeof(dosdev_prefixW) && - !strncmpiW( name->Buffer, dosdev_prefixW, ARRAY_SIZE( dosdev_prefixW ))) + !wcsnicmp( name->Buffer, dosdev_prefixW, ARRAY_SIZE( dosdev_prefixW ))) return ARRAY_SIZE( dosdev_prefixW ); return 0; diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 9005544f55..c8098e2d59 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -144,7 +144,7 @@ static void set_registry_variables( WCHAR **env, HANDLE hkey, ULONG type ) } /* PATH is magic */ if (env_name.Length == sizeof(pathW) && - !strncmpiW( env_name.Buffer, pathW, ARRAY_SIZE( pathW )) && + !wcsnicmp( env_name.Buffer, pathW, ARRAY_SIZE( pathW )) && !RtlQueryEnvironmentVariable_U( *env, &env_name, &tmp )) { RtlAppendUnicodeToString( &tmp, sep ); @@ -662,7 +662,7 @@ static inline BOOL is_path_prefix( const WCHAR *prefix, const WCHAR *path, const { DWORD len = strlenW( prefix ); - if (strncmpiW( path, prefix, len )) return FALSE; + if (wcsnicmp( path, prefix, len )) return FALSE; while (path[len] == '\\') len++; return path + len == file; } diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 2d82b12a7a..8469f487d3 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -447,7 +447,7 @@ enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_n /* Strip path information if the module resides in the system directory */ - if (!strncmpiW( system_dir, path, strlenW( system_dir ))) + if (!wcsnicmp( system_dir, path, strlenW( system_dir ))) { const WCHAR *p = path + strlenW( system_dir ); while (*p == '\\' || *p == '/') p++; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index ea629e8393..123b8985b1 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1719,7 +1719,7 @@ NTSTATUS WINAPI RtlLocaleNameToLcid( const WCHAR *name, LCID *lcid, ULONG flags p = buf; while (*p) { - if (!strncmpiW( p, script, len ) && (!p[len] || p[len] == ';')) break; + if (!wcsnicmp( p, script, len ) && (!p[len] || p[len] == ';')) break; if (!(p = strchrW( p, ';'))) break; p++; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c22b32a5b7..45ca35442f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -297,5 +297,6 @@ LONG __cdecl NTDLL_wcstol( LPCWSTR s, LPWSTR *end, INT base ); ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); #define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2) +#define wcsnicmp(s1,s2,n) NTDLL__wcsnicmp(s1,s2,n) #endif diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index adbfb4f526..65539fa018 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -306,13 +306,13 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) switch(end - start + 1) { case 3: - if (strncmpiW( start, auxW, 3 ) && - strncmpiW( start, conW, 3 ) && - strncmpiW( start, nulW, 3 ) && - strncmpiW( start, prnW, 3 )) break; + if (wcsnicmp( start, auxW, 3 ) && + wcsnicmp( start, conW, 3 ) && + wcsnicmp( start, nulW, 3 ) && + wcsnicmp( start, prnW, 3 )) break; return MAKELONG( 3 * sizeof(WCHAR), (start - dos_name) * sizeof(WCHAR) ); case 4: - if (strncmpiW( start, comW, 3 ) && strncmpiW( start, lptW, 3 )) break; + if (wcsnicmp( start, comW, 3 ) && wcsnicmp( start, lptW, 3 )) break; if (*end <= '0' || *end > '9') break; return MAKELONG( 4 * sizeof(WCHAR), (start - dos_name) * sizeof(WCHAR) ); default: /* can't match anything */ @@ -1045,7 +1045,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) if (size && ptr[size - 1] != '\\') ptr[size++] = '\\'; /* convert \??\UNC\ path to \\ prefix */ - if (size >= 4 && !strncmpiW(ptr, UncPfxW, 4)) + if (size >= 4 && !wcsnicmp(ptr, UncPfxW, 4)) { ptr += 2; size -= 2; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 2290d5d186..0f24837884 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1244,13 +1244,13 @@ static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) 's','y','s','w','o','w','6','4'}; *is_64bit = is_win64; - if (path->Length > sizeof(systemW) && !strncmpiW( path->Buffer, systemW, ARRAY_SIZE(systemW) )) + if (path->Length > sizeof(systemW) && !wcsnicmp( path->Buffer, systemW, ARRAY_SIZE(systemW) )) { if (is_wow64 && !ntdll_get_thread_data()->wow64_redir) *is_64bit = TRUE; return TRUE; } if ((is_win64 || is_wow64) && path->Length > sizeof(wow64W) && - !strncmpiW( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) + !wcsnicmp( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) { *is_64bit = FALSE; return TRUE; diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index b5db930e12..9ebb973e9a 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -294,7 +294,7 @@ static BOOL check_from_module( const WCHAR **includelist, const WCHAR **excludel if (!wcsicmp( *listitem, module )) return !show; len = strlenW( *listitem ); - if (!strncmpiW( *listitem, module, len ) && !wcsicmp( module + len, dllW )) + if (!wcsnicmp( *listitem, module, len ) && !wcsicmp( module + len, dllW )) return !show; } return show;

1 0

Alexandre Julliard : ntdll: Use RtlEqualUnicodeString() instead of strcmpiW().
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 4d93bafe961ed53488ff0fb4b44cb1ad085531fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d93bafe961ed53488ff0fb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:39:20 2020 +0100 ntdll: Use RtlEqualUnicodeString() instead of strcmpiW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 18 ++++++++++-------- dlls/ntdll/loader.c | 7 +++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 9f2d6ffeb0..d5f376f224 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1002,7 +1002,7 @@ static void free_entity_array(struct entity_array *array) static BOOL is_matching_string( const WCHAR *str1, const WCHAR *str2 ) { if (!str1) return !str2; - return str2 && !strcmpiW( str1, str2 ); + return str2 && !RtlCompareUnicodeStrings( str1, strlenW(str1), str2, strlenW(str2), TRUE ); } static BOOL is_matching_identity( const struct assembly_identity *id1, @@ -1012,7 +1012,7 @@ static BOOL is_matching_identity( const struct assembly_identity *id1, if (!is_matching_string( id1->arch, id2->arch )) return FALSE; if (!is_matching_string( id1->public_key, id2->public_key )) return FALSE; - if (id1->language && id2->language && strcmpiW( id1->language, id2->language )) + if (id1->language && id2->language && !is_matching_string( id1->language, id2->language )) { if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language )) return FALSE; @@ -3479,6 +3479,7 @@ static NTSTATUS build_dllredirect_section(ACTIVATION_CONTEXT* actctx, struct str static struct string_index *find_string_index(const struct strsection_header *section, const UNICODE_STRING *name) { struct string_index *iter, *index = NULL; + UNICODE_STRING str; ULONG hash = 0, i; RtlHashUnicodeString(name, TRUE, HASH_STRING_ALGORITHM_X65599, &hash); @@ -3488,9 +3489,9 @@ static struct string_index *find_string_index(const struct strsection_header *se { if (iter->hash == hash) { - const WCHAR *nameW = (WCHAR*)((BYTE*)section + iter->name_offset); - - if (!strcmpiW(nameW, name->Buffer)) + str.Buffer = (WCHAR *)((BYTE *)section + iter->name_offset); + str.Length = iter->name_len; + if (RtlEqualUnicodeString( &str, name, TRUE )) { index = iter; break; @@ -3724,6 +3725,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI { struct string_index *iter, *index = NULL; struct wndclass_redirect_data *class; + UNICODE_STRING str; ULONG hash; int i; @@ -3748,9 +3750,9 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI { if (iter->hash == hash) { - const WCHAR *nameW = (WCHAR*)((BYTE*)actctx->wndclass_section + iter->name_offset); - - if (!strcmpiW(nameW, name->Buffer)) + str.Buffer = (WCHAR *)((BYTE *)actctx->wndclass_section + iter->name_offset); + str.Length = iter->name_len; + if (RtlEqualUnicodeString( &str, name, TRUE )) { index = iter; break; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7aef68e39e..735a7d21fc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -491,15 +491,18 @@ static WINE_MODREF *get_modref( HMODULE hmod ) static WINE_MODREF *find_basename_module( LPCWSTR name ) { PLIST_ENTRY mark, entry; + UNICODE_STRING name_str; + + RtlInitUnicodeString( &name_str, name ); - if (cached_modref && !strcmpiW( name, cached_modref->ldr.BaseDllName.Buffer )) + if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE )) return cached_modref; mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; for (entry = mark->Flink; entry != mark; entry = entry->Flink) { LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList); - if (!strcmpiW( name, mod->BaseDllName.Buffer )) + if (RtlEqualUnicodeString( &name_str, &mod->BaseDllName, TRUE )) { cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr); return cached_modref;

1 0