Alexandre Julliard : ntdll: Avoid using memrchrW().

Alexandre Julliard julliard at winehq.org
Mon Mar 30 16:24:26 CDT 2020


Module: wine
Branch: master
Commit: 6fc90887895c0a03b36f69110a7f6ad426f9b2fb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6fc90887895c0a03b36f69110a7f6ad426f9b2fb

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Mar 30 12:09:38 2020 +0200

ntdll: Avoid using memrchrW().

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/loader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 0e2e3f7dd1..4d4d806d45 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3379,8 +3379,8 @@ NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LP
     attr.SecurityDescriptor = NULL;
     attr.SecurityQualityOfService = NULL;
 
-    if ((p = memrchrW( key->Buffer, '\\', key->Length / sizeof(WCHAR) ))) p++;
-    else p = key->Buffer;
+    p = key->Buffer + key->Length / sizeof(WCHAR);
+    while (p > key->Buffer && p[-1] != '\\') p--;
     len = key->Length - (p - key->Buffer) * sizeof(WCHAR);
     name_str.Buffer = path;
     name_str.Length = sizeof(optionsW) + len;




More information about the wine-cvs mailing list