Andrew Talbot : dmime: Assign to structs instead of using memcpy.
Alexandre Julliard
julliard at winehq.org
Mon Feb 25 06:51:38 CST 2008
Module: wine
Branch: master
Commit: be2f48cdd4ec24fd69ebf3125d334f1948dee80e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2f48cdd4ec24fd69ebf3125d334f1948dee80e
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Sat Feb 23 15:19:10 2008 +0000
dmime: Assign to structs instead of using memcpy.
---
dlls/dmime/segment.c | 22 +++++++++++-----------
dlls/dmime/segtriggertrack.c | 4 ++--
dlls/dmime/seqtrack.c | 4 ++--
dlls/dmime/sysextrack.c | 4 ++--
dlls/dmime/tempotrack.c | 6 +++---
dlls/dmime/timesigtrack.c | 4 ++--
dlls/dmime/wavetrack.c | 4 ++--
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index badc334..64ffb51 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -541,12 +541,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_GetDescriptor
static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) {
ICOM_THIS_MULTI(IDirectMusicSegment8Impl, 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)
@@ -554,9 +554,9 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_SetDescriptor
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));
@@ -579,11 +579,11 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_ParseDescripto
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_DirectMusicSegment, sizeof(CLSID));
-
+ pDesc->guidClass = CLSID_DirectMusicSegment;
+
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) {
@@ -771,7 +771,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_IPersistStream_Release (LPPERSISTST
static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);
TRACE("(%p, %p)\n", This, pClassID);
- memcpy(pClassID, &CLSID_DirectMusicSegment, sizeof(CLSID));
+ *pClassID = CLSID_DirectMusicSegment;
return S_OK;
}
@@ -1302,9 +1302,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppo
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_DirectMusicSegment, sizeof (CLSID));
+ obj->pDesc->guidClass = CLSID_DirectMusicSegment;
obj->ref = 0; /* will be inited by QueryInterface */
list_init (&obj->Tracks);
-
+
return IDirectMusicSegment8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj);
}
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index 06237e0..0e341ae 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -237,7 +237,7 @@ static ULONG WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Release (LPPERSIS
static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);
TRACE("(%p, %p)\n", This, pClassID);
- memcpy(pClassID, &CLSID_DirectMusicSegTriggerTrack, sizeof(CLSID));
+ *pClassID = CLSID_DirectMusicSegTriggerTrack;
return S_OK;
}
@@ -527,7 +527,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegTriggerTrack (LPCGUID lpcGUID, LPVOID
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_DirectMusicSegTriggerTrack, sizeof (CLSID));
+ track->pDesc->guidClass = CLSID_DirectMusicSegTriggerTrack;
track->ref = 0; /* will be inited by QueryInterface */
list_init (&track->Items);
diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c
index e2eaecf..6e8823d 100644
--- a/dlls/dmime/seqtrack.c
+++ b/dlls/dmime/seqtrack.c
@@ -279,8 +279,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSeqTrack (LPCGUID lpcGUID, LPVOID *ppobj,
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_DirectMusicSeqTrack, sizeof (CLSID));
+ track->pDesc->guidClass = CLSID_DirectMusicSeqTrack;
track->ref = 0; /* will be inited by QueryInterface */
-
+
return IDirectMusicSeqTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj);
}
diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c
index 3ec8c6c..d69d9ff 100644
--- a/dlls/dmime/sysextrack.c
+++ b/dlls/dmime/sysextrack.c
@@ -279,8 +279,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSysExTrack (LPCGUID lpcGUID, LPVOID *ppob
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_DirectMusicSysExTrack, sizeof (CLSID));
+ track->pDesc->guidClass = CLSID_DirectMusicSysExTrack;
track->ref = 0; /* will be inited by QueryInterface */
-
+
return IDirectMusicSysExTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj);
}
diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index ea46632..5573a5a 100644
--- a/dlls/dmime/tempotrack.c
+++ b/dlls/dmime/tempotrack.c
@@ -310,7 +310,7 @@ static ULONG WINAPI IDirectMusicTempoTrack_IPersistStream_Release (LPPERSISTSTRE
static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);
TRACE("(%p, %p)\n", This, pClassID);
- memcpy(pClassID, &CLSID_DirectMusicTempoTrack, sizeof(CLSID));
+ *pClassID = CLSID_DirectMusicTempoTrack;
return S_OK;
}
@@ -352,7 +352,7 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA
ERR(": no more memory\n");
return E_OUTOFMEMORY;
}
- memcpy(&pNewItem->item, &item, sizeof(DMUS_IO_TEMPO_ITEM));
+ pNewItem->item = item;
list_add_tail (&This->Items, &pNewItem->entry);
pNewItem = NULL;
StreamCount += sizeof(item);
@@ -414,7 +414,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicTempoTrack (LPCGUID lpcGUID, LPVOID *ppob
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_DirectMusicTempoTrack, sizeof (CLSID));
+ track->pDesc->guidClass = CLSID_DirectMusicTempoTrack;
track->ref = 0; /* will be inited by QueryInterface */
track->enabled = TRUE;
list_init (&track->Items);
diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c
index f64e9e1..2ef1cb2 100644
--- a/dlls/dmime/timesigtrack.c
+++ b/dlls/dmime/timesigtrack.c
@@ -284,8 +284,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicTimeSigTrack (LPCGUID lpcGUID, LPVOID *pp
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_DirectMusicTimeSigTrack, sizeof (CLSID));
+ track->pDesc->guidClass = CLSID_DirectMusicTimeSigTrack;
track->ref = 0; /* will be inited by QueryInterface */
-
+
return IDirectMusicTimeSigTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj);
}
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index fadfafa..f257d12 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -285,8 +285,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicWaveTrack (LPCGUID lpcGUID, LPVOID *ppobj
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_DirectMusicWaveTrack, sizeof (CLSID));
+ track->pDesc->guidClass = CLSID_DirectMusicWaveTrack;
track->ref = 0; /* will be inited by QueryInterface */
-
+
return IDirectMusicWaveTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj);
}
More information about the wine-cvs
mailing list