Andrew Talbot : avifil32: Assign to structs instead of using memcpy.

[Alexandre Julliard]

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

Author: Andrew Talbot 
Date:   Mon Feb 11 20:48:51 2008 +0000

avifil32: Assign to structs instead of using memcpy.

---

dlls/avifil32/api.c      |    4 ++--
 dlls/avifil32/avifile.c  |    2 +-
 dlls/avifil32/factory.c  |    2 +-
 dlls/avifil32/getframe.c |    2 +-
 dlls/avifil32/wavfile.c  |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index 465164a..7753e39 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -249,7 +249,7 @@ HRESULT WINAPI AVIFileOpenW(PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode,
     if (! AVIFILE_GetFileHandlerByExtension(szFile, &clsidHandler))
       return AVIERR_UNSUPPORTED;
   } else
-    memcpy(&clsidHandler, lpHandler, sizeof(clsidHandler));
+    clsidHandler = *lpHandler;

/* create instance of handler */
   hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIFile, (LPVOID*)ppfile);
@@ -746,7 +746,7 @@ HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,
     if (AVIFILE_CLSIDFromString(szValue, &clsidHandler) != S_OK)
       return AVIERR_UNSUPPORTED;
   } else
-    memcpy(&clsidHandler, pclsidHandler, sizeof(clsidHandler));
+    clsidHandler = *pclsidHandler;

hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIStream, (LPVOID*)ppsCompressed);
   if (FAILED(hr) || *ppsCompressed == NULL)
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 593cdf9..5becaf4 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -590,7 +590,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface,
   if (pClassID == NULL)
     return AVIERR_BADPARAM;

-  memcpy(pClassID, &CLSID_AVIFile, sizeof(CLSID_AVIFile));
+  *pClassID = CLSID_AVIFile;

return AVIERR_OK;
 }
diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c
index 40e4c68..26a5ae2 100644
--- a/dlls/avifil32/factory.c
+++ b/dlls/avifil32/factory.c
@@ -78,7 +78,7 @@ static HRESULT AVIFILE_CreateClassFactory(const CLSID *pclsid, const IID *riid,

pClassFactory->lpVtbl    = &iclassfact;
   pClassFactory->dwRef     = 0;
-  memcpy(&pClassFactory->clsid, pclsid, sizeof(pClassFactory->clsid));
+  pClassFactory->clsid     = *pclsid;

hr = IClassFactory_QueryInterface((IClassFactory*)pClassFactory, riid, ppv);
   if (FAILED(hr)) {
diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c
index d342b12..fd3ec56 100644
--- a/dlls/avifil32/getframe.c
+++ b/dlls/avifil32/getframe.c
@@ -212,7 +212,7 @@ static LPVOID  WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos)
       if (This->lpOutFormat != NULL) {
    BITMAPINFOHEADER bi;

-	memcpy(&bi, This->lpOutFormat, sizeof(bi));
+	bi = *This->lpOutFormat;
    AVIFILE_CloseCompressor(This);

if (FAILED(IGetFrame_SetFormat(iface, &bi, NULL, 0, 0, -1, -1))) {
diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c
index 2c60bf5..7791a66 100644
--- a/dlls/avifil32/wavfile.c
+++ b/dlls/avifil32/wavfile.c
@@ -540,7 +540,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface,
   if (pClassID == NULL)
     return AVIERR_BADPARAM;

-  memcpy(pClassID, &CLSID_WAVFile, sizeof(CLSID_WAVFile));
+  *pClassID = CLSID_WAVFile;

return AVIERR_OK;
 }