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

[Alexandre Julliard]

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

Author: Andrew Talbot 
Date:   Mon Feb 25 19:48:22 2008 +0000

dmscript: Assign to structs instead of using memcpy.

---

dlls/dmscript/script.c      |   24 ++++++++++++------------
 dlls/dmscript/scripttrack.c |    4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index a294249..3d9ae42 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -224,12 +224,12 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor (L
 static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) {
   ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface);
   TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc));
-	
+
   /* According to MSDN, we should copy only given values, not whole struct */	
   if (pDesc->dwValidData & DMUS_OBJ_OBJECT)
-    memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject));
+    This->pDesc->guidObject = pDesc->guidObject;
   if (pDesc->dwValidData & DMUS_OBJ_CLASS)
-    memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass));		
+    This->pDesc->guidClass = pDesc->guidClass;
   if (pDesc->dwValidData & DMUS_OBJ_NAME)
     lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME);
   if (pDesc->dwValidData & DMUS_OBJ_CATEGORY)
@@ -237,9 +237,9 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (L
   if (pDesc->dwValidData & DMUS_OBJ_FILENAME)
     lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME);
   if (pDesc->dwValidData & DMUS_OBJ_VERSION)
-    memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion));				
+    This->pDesc->vVersion = pDesc->vVersion;
   if (pDesc->dwValidData & DMUS_OBJ_DATE)
-    memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate));				
+    This->pDesc->ftDate = pDesc->ftDate;
   if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
     memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength));				
     memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
@@ -260,13 +260,13 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor
   DMUS_PRIVATE_CHUNK Chunk;
   DWORD StreamSize, StreamCount, ListSize[1], ListCount[1];
   LARGE_INTEGER liMove; /* used when skipping chunks */
-  
+
    TRACE("(%p, %p, %p)\n", This, pStream, pDesc);
-	
+
    /* FIXME: should this be determined from stream? */
    pDesc->dwValidData |= DMUS_OBJ_CLASS;
-	memcpy (&pDesc->guidClass, &CLSID_DirectMusicScript, sizeof(CLSID));
-	
+	pDesc->guidClass = CLSID_DirectMusicScript;
+
    IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
    TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
    switch (Chunk.fccID) {	
@@ -431,7 +431,7 @@ static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTRE
 static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
   ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
   TRACE("(%p, %p)\n", This, pClassID);
-  memcpy(pClassID, &CLSID_DirectMusicScript, sizeof(CLSID));
+  *pClassID = CLSID_DirectMusicScript;
   return S_OK;
 }

@@ -704,8 +704,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppob
   obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
   DM_STRUCT_INIT(obj->pDesc);
   obj->pDesc->dwValidData |= DMUS_OBJ_CLASS;
-  memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicScript, sizeof (CLSID));
+  obj->pDesc->guidClass = CLSID_DirectMusicScript;
   obj->ref = 0; /* will be inited by QueryInterface */
-  
+
   return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj);
 }
diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c
index f50ff10..d8a4697 100644
--- a/dlls/dmscript/scripttrack.c
+++ b/dlls/dmscript/scripttrack.c
@@ -284,8 +284,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID *ppo
    track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
    DM_STRUCT_INIT(track->pDesc);
    track->pDesc->dwValidData |= DMUS_OBJ_CLASS;
-	memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicScriptTrack, sizeof (CLSID));
+	track->pDesc->guidClass = CLSID_DirectMusicScriptTrack;
    track->ref = 0; /* will be inited by QueryInterface */
-	
+
    return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj);
 }