Jörg Höhle : winmm: Assign to structs instead of using memcpy.
Alexandre Julliard
julliard at winehq.org
Fri Aug 5 10:20:49 CDT 2011
Module: wine
Branch: master
Commit: 7fed738353c201c59e4befa0b891e72c6340956f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fed738353c201c59e4befa0b891e72c6340956f
Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date: Wed Jul 27 23:44:09 2011 +0200
winmm: Assign to structs instead of using memcpy.
---
dlls/winmm/waveform.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index d1c685e..72eec27 100644
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -1445,7 +1445,7 @@ static void WOD_PushData(WINMM_Device *device)
device->played_frames += avail_frames;
exit:
- memcpy(&cb_info, &device->cb_info, sizeof(cb_info));
+ cb_info = device->cb_info;
LeaveCriticalSection(&device->lock);
@@ -1625,7 +1625,7 @@ static void WID_PullData(WINMM_Device *device)
}
exit:
- memcpy(&cb_info, &device->cb_info, sizeof(cb_info));
+ cb_info = device->cb_info;
LeaveCriticalSection(&device->lock);
@@ -1718,7 +1718,7 @@ static LRESULT WINMM_Reset(HWAVE hwave)
device->loop_counter = 0;
device->last_clock_pos = 0;
- memcpy(&cb_info, &device->cb_info, sizeof(cb_info));
+ cb_info = device->cb_info;
LeaveCriticalSection(&device->lock);
@@ -2367,7 +2367,7 @@ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut)
if(!WINMM_ValidateAndLock(device))
return MMSYSERR_INVALHANDLE;
- memcpy(&cb_info, &device->cb_info, sizeof(cb_info));
+ cb_info = device->cb_info;
LeaveCriticalSection(&device->lock);
@@ -3015,7 +3015,7 @@ UINT WINAPI waveInClose(HWAVEIN hWaveIn)
if(!WINMM_ValidateAndLock(device))
return MMSYSERR_INVALHANDLE;
- memcpy(&cb_info, &device->cb_info, sizeof(cb_info));
+ cb_info = device->cb_info;
LeaveCriticalSection(&device->lock);
@@ -3169,7 +3169,7 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn)
}else
buf = NULL;
- memcpy(&cb_info, &device->cb_info, sizeof(cb_info));
+ cb_info = device->cb_info;
LeaveCriticalSection(&device->lock);
More information about the wine-cvs
mailing list