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

[Alexandre Julliard]

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

Author: Andrew Talbot 
Date:   Wed Mar 26 21:56:33 2008 +0000

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

---

dlls/winejack.drv/audio.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c
index 00daf80..0e742f4 100644
--- a/dlls/winejack.drv/audio.c
+++ b/dlls/winejack.drv/audio.c
@@ -1307,9 +1307,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)

dwFlags &= ~WAVE_DIRECTSOUND;  /* direct sound not supported, ignore the flag */

-    wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
-    
-    memcpy(&wwo->waveDesc, lpDesc, 	     sizeof(WAVEOPENDESC));
+
+    wwo->waveDesc = *lpDesc;
     memcpy(&wwo->format,   lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));

/* open up jack ports for this device */
@@ -2111,8 +2110,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
     dwFlags &= ~WAVE_DIRECTSOUND;  /* direct sound not supported, ignore the flag */

wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
-    
-    memcpy(&wwi->waveDesc, lpDesc, 	     sizeof(WAVEOPENDESC));
+
+    wwi->waveDesc = *lpDesc;
     memcpy(&wwi->format,   lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));

LeaveCriticalSection(&wwi->access_crst);