Andrew Talbot : winecoreaudio.drv: Assign to structs instead of using memcpy.
Alexandre Julliard
julliard at winehq.org
Wed Mar 26 09:16:05 CDT 2008
Module: wine
Branch: master
Commit: 11f198df0bb54fbf918d025a4dcadb91602a2a05
URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f198df0bb54fbf918d025a4dcadb91602a2a05
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Tue Mar 25 22:22:16 2008 +0000
winecoreaudio.drv: Assign to structs instead of using memcpy.
---
dlls/winecoreaudio.drv/audio.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c
index 33a5c4f..90d664f 100644
--- a/dlls/winecoreaudio.drv/audio.c
+++ b/dlls/winecoreaudio.drv/audio.c
@@ -855,12 +855,12 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
}
wwo->state = WINE_WS_STOPPED;
-
+
wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
-
- memcpy(&wwo->waveDesc, lpDesc, sizeof(WAVEOPENDESC));
+
+ wwo->waveDesc = *lpDesc;
memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
-
+
if (wwo->format.wBitsPerSample == 0) {
WARN("Resetting zeroed wBitsPerSample\n");
wwo->format.wBitsPerSample = 8 *
@@ -1450,7 +1450,7 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc)
* DirectSound clients. However, it only does this if we respond
* successfully to the DRV_QUERYDSOUNDDESC message. It's enough to fill in
* the driver and device names of the description output parameter. */
- memcpy(desc, &(WOutDev[wDevID].cadev->ds_desc), sizeof(DSDRIVERDESC));
+ *desc = WOutDev[wDevID].cadev->ds_desc;
return MMSYSERR_NOERROR;
}
@@ -1837,7 +1837,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
wwi->state = WINE_WS_STOPPED;
wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
- memcpy(&wwi->waveDesc, lpDesc, sizeof(WAVEOPENDESC));
+ wwi->waveDesc = *lpDesc;
memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
if (wwi->format.wBitsPerSample == 0)
More information about the wine-cvs
mailing list