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

[Alexandre Julliard]

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

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

dmusic: Assign to structs instead of using memcpy.

---

dlls/dmusic/collection.c |   20 ++++++++++----------
 dlls/dmusic/port.c       |    6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 06842c5..1fc7bd2 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -192,12 +192,12 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto
 static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) {
    ICOM_THIS_MULTI(IDirectMusicCollectionImpl, 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)
@@ -205,9 +205,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto
    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));
@@ -230,11 +230,11 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip
    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_DirectMusicCollection, sizeof(CLSID));
-	
+	pDesc->guidClass = CLSID_DirectMusicCollection;
+
    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) {	
@@ -770,9 +770,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl (LPCGUID lpcGUID, LPVOID*
    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_DirectMusicCollection, sizeof (CLSID));
+	obj->pDesc->guidClass = CLSID_DirectMusicCollection;
    obj->ref = 0; /* will be inited by QueryInterface */
    list_init (&obj->Instruments);
-	
+
    return IDirectMusicCollectionImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj);
 }
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index fd7bda4..83fda74 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -115,7 +115,7 @@ static HRESULT WINAPI IDirectMusicPortImpl_Compact (LPDIRECTMUSICPORT iface) {
 static HRESULT WINAPI IDirectMusicPortImpl_GetCaps (LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS pPortCaps) {
    IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
    TRACE("(%p, %p)\n", This, pPortCaps);
-	memcpy(pPortCaps, &This->caps, sizeof(DMUS_PORTCAPS));	
+	*pPortCaps = This->caps;
    return S_OK;
 }

@@ -250,8 +250,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj,
    obj->lpVtbl = &DirectMusicPort_Vtbl;
    obj->ref = 0;  /* will be inited by QueryInterface */
    obj->fActive = FALSE;
-	memcpy(&obj->params, pPortParams, sizeof(DMUS_PORTPARAMS));
-	memcpy(&obj->caps, pPortCaps, sizeof(DMUS_PORTCAPS));
+	obj->params = *pPortParams;
+	obj->caps = *pPortCaps;
    obj->pDirectSound = NULL;
    obj->pLatencyClock = NULL;
    hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL);