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/crypt32/oid.c

diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c
index 5d17997..980c750 100644
--- a/dlls/crypt32/oid.c
+++ b/dlls/crypt32/oid.c
@@ -1402,8 +1402,9 @@
         }
         else
         {
+            LPCWSTR stringresource;
             int len = LoadStringW(hinst, (UINT_PTR)oidInfoConstructors[i].pwszName,
-             NULL, 0);
+             (LPWSTR)&stringresource, 0);
 
             if (len)
             {
@@ -1415,12 +1416,11 @@
                     memset(info, 0, sizeof(*info));
                     info->info.cbSize = sizeof(CRYPT_OID_INFO);
                     info->info.pszOID = oidInfoConstructors[i].pszOID;
-                    info->info.pwszName =
-                     (LPWSTR)((LPBYTE)info + sizeof(struct OIDInfo));
+                    info->info.pwszName = (LPWSTR)(info + 1);
                     info->info.dwGroupId = oidInfoConstructors[i].dwGroupId;
                     info->info.u.Algid = oidInfoConstructors[i].Algid;
-                    LoadStringW(hinst, (UINT_PTR)oidInfoConstructors[i].pwszName,
-                     (LPWSTR)info->info.pwszName, len + 1);
+                    memcpy(info + 1, stringresource, len*sizeof(WCHAR));
+                    ((LPWSTR)(info + 1))[len] = 0;
                     if (oidInfoConstructors[i].blob)
                     {
                         info->info.ExtraInfo.cbData =