Andrew Talbot : ole32: Assign to structs instead of using CopyMemory.

Alexandre Julliard julliard at winehq.org
Mon Mar 31 09:15:23 CDT 2008


Module: wine
Branch: master
Commit: c2599478b63e253a4f3651ae9c11a7d6f5790635
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c2599478b63e253a4f3651ae9c11a7d6f5790635

Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date:   Sat Mar 29 11:37:15 2008 +0000

ole32: Assign to structs instead of using CopyMemory.

---

 dlls/ole32/ole2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index b34235b..5cee7a1 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -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);




More information about the wine-cvs mailing list