ole32: Assign to structs instead of using CopyMemory.
authorAndrew Talbot <andrew.talbot@talbotville.com>
Sat, 29 Mar 2008 11:37:15 +0000 (11:37 +0000)
committerAlexandre Julliard <julliard@winehq.org>
Mon, 31 Mar 2008 10:50:41 +0000 (12:50 +0200)
dlls/ole32/ole2.c

index b34235b198b0a32f6dcaf0d145ea6f8cca5da7e9..5cee7a1e9fe8b423154fa10aeb02f56d9dc23f93 100644 (file)
@@ -2811,7 +2811,7 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest,      /* [out] */
         return hr;
 
     /* this will deal with most cases */
-    CopyMemory(pvarDest, pvarSrc, sizeof(*pvarDest));
+    *pvarDest = *pvarSrc;
 
     switch(pvarSrc->vt)
     {
@@ -2825,7 +2825,7 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest,      /* [out] */
         break;
     case VT_CLSID:
         pvarDest->u.puuid = CoTaskMemAlloc(sizeof(CLSID));
-        CopyMemory(pvarDest->u.puuid, pvarSrc->u.puuid, sizeof(CLSID));
+        *pvarDest->u.puuid = *pvarSrc->u.puuid;
         break;
     case VT_LPSTR:
         len = strlen(pvarSrc->u.pszVal);