From 7fed738353c201c59e4befa0b891e72c6340956f Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B6rg=20H=C3=B6hle?= <hoehle@users.sourceforge.net>
Date: Wed, 27 Jul 2011 23:44:09 +0200
Subject: [PATCH] winmm: Assign to structs instead of using memcpy.

---
 dlls/winmm/waveform.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index d1c685ed1f1..72eec27dec2 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);
 
-- 
2.11.4.GIT