Andrew Talbot : quartz: 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: 892c31e4db0f210974bbe9db5b226c6e954477bc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=892c31e4db0f210974bbe9db5b226c6e954477bc

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

quartz: Assign to structs instead of using CopyMemory.

---

 dlls/quartz/enumpins.c   |    2 +-
 dlls/quartz/filesource.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/quartz/enumpins.c b/dlls/quartz/enumpins.c
index 65e6759..61e42b0 100644
--- a/dlls/quartz/enumpins.c
+++ b/dlls/quartz/enumpins.c
@@ -45,7 +45,7 @@ HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** pp
     pEnumPins->lpVtbl = &IEnumPinsImpl_Vtbl;
     pEnumPins->refCount = 1;
     pEnumPins->uIndex = 0;
-    CopyMemory(&pEnumPins->enumPinDetails, pDetails, sizeof(ENUMPINDETAILS));
+    pEnumPins->enumPinDetails = *pDetails;
     *ppEnum = (IEnumPins *)(&pEnumPins->lpVtbl);
 
     TRACE("Created new enumerator (%p)\n", *ppEnum);
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index c75f9a2..d922081 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -237,8 +237,8 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName,
 
     TRACE("(%p, %s, %p, %p)\n", pReader, debugstr_w(pszFileName), majorType, minorType);
 
-    CopyMemory(majorType, &GUID_NULL, sizeof(*majorType));
-    CopyMemory(minorType, &GUID_NULL, sizeof(*minorType));
+    *majorType = GUID_NULL;
+    *minorType = GUID_NULL;
 
     lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &hkeyMediaType);
     hr = HRESULT_FROM_WIN32(lRet);




More information about the wine-cvs mailing list