Commit f100b142 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

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

parent ddf96974
...@@ -1307,9 +1307,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) ...@@ -1307,9 +1307,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */ dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */
wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
wwo->waveDesc = *lpDesc;
memcpy(&wwo->waveDesc, lpDesc, sizeof(WAVEOPENDESC));
memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
/* open up jack ports for this device */ /* open up jack ports for this device */
...@@ -2111,8 +2110,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) ...@@ -2111,8 +2110,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */ dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */
wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
memcpy(&wwi->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); wwi->waveDesc = *lpDesc;
memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
LeaveCriticalSection(&wwi->access_crst); LeaveCriticalSection(&wwi->access_crst);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment