[PATCH v2 3/4] kernelbase: Return empty string from LoadStringW() if resource is not found.

[Paul Gofman]

From: Paul Gofman

---
 dlls/kernelbase/string.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c
index 798bc1f3d63..1a792dcadb1 100644
--- a/dlls/kernelbase/string.c
+++ b/dlls/kernelbase/string.c
@@ -1231,9 +1231,9 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, L

/* Use loword (incremented by 1) as resourceid */
     hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING);
-    if (!hrsrc) return 0;
+    if (!hrsrc) goto error;
     hmem = LoadResource(instance, hrsrc);
-    if (!hmem) return 0;
+    if (!hmem) goto error;

p = LockResource(hmem);
     string_num = resource_id & 0x000f;
@@ -1267,6 +1267,11 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, L

TRACE("returning %s\n", debugstr_w(buffer));
     return i;
+
+error:
+    TRACE( "Failed to load string.\n" );
+    if (buflen > 0) buffer[0] = 0;
+    return 0;
 }

INT WINAPI DECLSPEC_HOTPATCH LoadStringA(HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen)