commit 9978cc9c56f7ec09be2d2a22c2e7fb5d5d1f07be
author Christopher Berner <raccoonone@procyongames.com> Wed Mar 05 12:28:54 2008 -0800
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 11 15:30:15 2008 +0100
tree 220b81695fc302749b50972e27aecdb73e1ed39d
parent 17bf0d916439d310471b22ad0ca1e8b5e1afce4d

user32: Make LoadStringW pass tests.

dlls/hhctrl.ocx/help.c

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index 3f6a080..3ee522e 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -51,13 +51,14 @@
 static LPWSTR HH_LoadString(DWORD dwID)
 {
     LPWSTR string = NULL;
+    LPCWSTR stringresource;
     int iSize;
 
-    iSize = LoadStringW(hhctrl_hinstance, dwID, NULL, 0);
-    iSize += 2; /* some strings (tab text) needs double-null termination */
+    iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0);
 
-    string = heap_alloc(iSize * sizeof(WCHAR));
-    LoadStringW(hhctrl_hinstance, dwID, string, iSize);
+    string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */
+    memcpy(string, stringresource, iSize*sizeof(WCHAR));
+    string[iSize] = 0;
 
     return string;
 }