Andrew Talbot : winealsa.drv: Assign to structs instead of using memcpy.

[Alexandre Julliard]

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

Author: Andrew Talbot 
Date:   Mon Mar 24 21:37:37 2008 +0000

winealsa.drv: Assign to structs instead of using memcpy.

---

dlls/winealsa.drv/dscapture.c |    4 ++--
 dlls/winealsa.drv/dsoutput.c  |    6 +++---
 dlls/winealsa.drv/midi.c      |    8 ++++----
 dlls/winealsa.drv/wavein.c    |    2 +-
 dlls/winealsa.drv/waveout.c   |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c
index 168fc91..98fe195 100644
--- a/dlls/winealsa.drv/dscapture.c
+++ b/dlls/winealsa.drv/dscapture.c
@@ -850,7 +850,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_GetDriverDesc(PIDSCDRIVER iface, PDSD
 {
     IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface;
     TRACE("(%p,%p)\n",iface,pDesc);
-    memcpy(pDesc, &(WInDev[This->wDevID].ds_desc), sizeof(DSDRIVERDESC));
+    *pDesc			= WInDev[This->wDevID].ds_desc;
     pDesc->dwFlags		= 0;
     pDesc->dnDevNode		= WInDev[This->wDevID].waveDesc.dnDevNode;
     pDesc->wVxdId		= 0;
@@ -1026,7 +1026,7 @@ DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv)
  */
 DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc)
 {
-    memcpy(desc, &(WInDev[wDevID].ds_desc), sizeof(DSDRIVERDESC));
+    *desc = WInDev[wDevID].ds_desc;
     return MMSYSERR_NOERROR;
 }

diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c
index 8d91abf..130e181 100644
--- a/dlls/winealsa.drv/dsoutput.c
+++ b/dlls/winealsa.drv/dsoutput.c
@@ -661,7 +661,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES
 {
     IDsDriverImpl *This = (IDsDriverImpl *)iface;
     TRACE("(%p,%p)\n",iface,pDesc);
-    memcpy(pDesc, &(WOutDev[This->wDevID].ds_desc), sizeof(DSDRIVERDESC));
+    *pDesc			= WOutDev[This->wDevID].ds_desc;
     pDesc->dwFlags		= DSDDESC_DONTNEEDSECONDARYLOCK | DSDDESC_DONTNEEDWRITELEAD;
     pDesc->dnDevNode		= WOutDev[This->wDevID].waveDesc.dnDevNode;
     pDesc->wVxdId		= 0;
@@ -730,7 +730,7 @@ static HRESULT WINAPI IDsDriverImpl_GetCaps(PIDSDRIVER iface, PDSDRIVERCAPS pCap
 {
     IDsDriverImpl *This = (IDsDriverImpl *)iface;
     TRACE("(%p,%p)\n",iface,pCaps);
-    memcpy(pCaps, &(WOutDev[This->wDevID].ds_caps), sizeof(DSDRIVERCAPS));
+    *pCaps = WOutDev[This->wDevID].ds_caps;
     return DS_OK;
 }

@@ -844,7 +844,7 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv)

DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc)
 {
-    memcpy(desc, &(WOutDev[wDevID].ds_desc), sizeof(DSDRIVERDESC));
+    *desc = WOutDev[wDevID].ds_desc;
     return MMSYSERR_NOERROR;
 }

diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 9667736..3e791d5 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -1128,8 +1128,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t*
    if (!type)
             return;

-	memcpy(&MidiOutDev[MODM_NumDevs].addr, snd_seq_port_info_get_addr(pinfo), sizeof(snd_seq_addr_t));
-		
+	MidiOutDev[MODM_NumDevs].addr = *snd_seq_port_info_get_addr(pinfo);
+
    /* Manufac ID. We do not have access to this with soundcard.h
     * Does not seem to be a problem, because in mmsystem.h only
     * Microsoft's ID is listed.
@@ -1184,8 +1184,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t*
    if (!type)
        return;

-	memcpy(&MidiInDev[MIDM_NumDevs].addr, snd_seq_port_info_get_addr(pinfo), sizeof(snd_seq_addr_t));
-		
+	MidiInDev[MIDM_NumDevs].addr = *snd_seq_port_info_get_addr(pinfo);
+
    /* Manufac ID. We do not have access to this with soundcard.h
     * Does not seem to be a problem, because in mmsystem.h only
     * Microsoft's ID is listed.
diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c
index 2c574f1..9c89fde 100644
--- a/dlls/winealsa.drv/wavein.c
+++ b/dlls/winealsa.drv/wavein.c
@@ -385,7 +385,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)

wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);

-    memcpy(&wwi->waveDesc, lpDesc, sizeof(WAVEOPENDESC));
+    wwi->waveDesc = *lpDesc;
     ALSA_copyFormat(lpDesc->lpFormat, &wwi->format);

if (wwi->format.Format.wBitsPerSample == 0) {
diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index 516aa3f..f4452e5 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -640,7 +640,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)

wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);

-    memcpy(&wwo->waveDesc, lpDesc, sizeof(WAVEOPENDESC));
+    wwo->waveDesc = *lpDesc;
     ALSA_copyFormat(lpDesc->lpFormat, &wwo->format);

TRACE("Requested this format: %dx%dx%d %s\n",