kernelbase: Return empty string from LoadStringW() if resource is not found.

d93e2899 · Paul Gofman · Alexandre Julliard · ad9303d8 · d93e2899
Commit d93e2899 authored Nov 08, 2023 by Paul Gofman Committed by Alexandre Julliard Nov 09, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

string.c dlls/kernelbase/string.c +7 -5

No files found.
--- a/dlls/kernelbase/string.c
+++ b/dlls/kernelbase/string.c
@@ -1229,11 +1229,13 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, L
    if (!buffer)
        return 0;
-    /* Use loword (incremented by 1) as resourceid */
+    if (!(hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING)) ||
-    hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING);
+        !(hmem = LoadResource(instance, hrsrc)))
-    if (!hrsrc) return 0;
+    {
-    hmem = LoadResource(instance, hrsrc);
+        TRACE( "Failed to load string.\n" );
-    if (!hmem) return 0;
+        if (buflen > 0) buffer[0] = 0;
+        return 0;
+    }
    p = LockResource(hmem);
    string_num = resource_id & 0x000f;