[PATCH 2/4] user32: Put 0 to output string even for 1 char buffer in LoadStringW().

[Paul Gofman]

From: Paul Gofman

---
 dlls/user32/resource.c       | 6 +-----
 dlls/user32/tests/resource.c | 9 +++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c
index a634d79948b..c09ee9bb65c 100644
--- a/dlls/user32/resource.c
+++ b/dlls/user32/resource.c
@@ -187,12 +187,8 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id,
     if (i > 0) {
    memcpy(buffer, p + 1, i * sizeof (WCHAR));
         buffer[i] = 0;
-    } else {
-	if (buflen > 1) {
-            buffer[0] = 0;
-	    return 0;
-	}
     }
+    else goto error;

TRACE("%s loaded !\n", debugstr_w(buffer));
     return i;
diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c
index 033065d6044..5e7aebe06a9 100644
--- a/dlls/user32/tests/resource.c
+++ b/dlls/user32/tests/resource.c
@@ -145,6 +145,15 @@ static void test_LoadStringW(void)
     ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "got %lu.\n", GetLastError());
     ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]);
     ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]);
+
+    /* Test short buffer */
+    SetLastError(0xdeadbeef);
+    memset(returnedstringw, 0xcc, sizeof(returnedstringw));
+    length1 = LoadStringW(hInst, 2, returnedstringw, 1); /* get resource string */
+    ok(!length1, "got %d.\n", length1);
+    ok(GetLastError() == 0xdeadbeef, "got %lu.\n", GetLastError());
+    ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]);
+    ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]);
 }

static void test_LoadStringA (void)