André Hentschel : d3drm: Fix memcpy arguments for matrix transformations (coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2a42410e7c104bc8532a39b1fa0e69772b804593
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a42410e7c104bc8532a39b1fa...

Author: André Hentschel 
Date:   Fri Oct 19 00:06:12 2012 +0200

d3drm: Fix memcpy arguments for matrix transformations (coverity).

---

dlls/d3drm/frame.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
index 6cab5fa..e4c7cfc 100644
--- a/dlls/d3drm/frame.c
+++ b/dlls/d3drm/frame.c
@@ -813,7 +813,7 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetTransform(IDirect3DRMFrame2* ifac

TRACE("(%p/%p)->(%p)\n", iface, This, return_matrix);

-    memcpy(&return_matrix[0][0], &This->transform[0][0], sizeof(D3DRMMATRIX4D));
+    memcpy(return_matrix, This->transform, sizeof(D3DRMMATRIX4D));

return D3DRM_OK;
 }
@@ -1639,7 +1639,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddTransform(IDirect3DRMFrame3* ifac
     switch (type)
     {
         case D3DRMCOMBINE_REPLACE:
-            memcpy(&This->transform[0][0], &matrix[0][0], sizeof(D3DRMMATRIX4D));
+            memcpy(This->transform, matrix, sizeof(D3DRMMATRIX4D));
             break;

case D3DRMCOMBINE_BEFORE:
@@ -1905,7 +1905,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetTransform(IDirect3DRMFrame3* ifac
     if (reference)
         FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n");

-    memcpy(&return_matrix[0][0], &This->transform[0][0], sizeof(D3DRMMATRIX4D));
+    memcpy(return_matrix, This->transform, sizeof(D3DRMMATRIX4D));

return D3DRM_OK;
 }
@@ -2694,7 +2694,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa
     object->ref = 1;
     object->scenebackground = D3DCOLOR_ARGB(0xff, 0, 0, 0);

-    memcpy(&object->transform[0][0], &identity[0][0], sizeof(D3DRMMATRIX4D));
+    memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D));

if (parent)
     {