winejack.drv: Assign to structs instead of using memcpy

Andrew Talbot andrew.talbot at talbotville.com
Wed Mar 26 16:56:33 CDT 2008


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

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);



More information about the wine-patches mailing list