[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 50a17ebdb1a506088383b84b8124865207ec5a03
Author: Rico Schüller <kgbricola at web.de>
Date:   Wed Apr 18 09:33:35 2012 +0200

    d3dx9: Use param->bytes for copying the data in ID3DXBaseEffect::SetValue().
    (cherry picked from commit fcb5b6c32cd40e8a6383a091a94f124cd7b360a0)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index fa28ae0..92feb13 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1625,7 +1625,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXH
         return E_FAIL;
     }
 
-    if (data && param->bytes >= bytes)
+    if (data && param->bytes <= bytes)
     {
         switch (param->type)
         {
@@ -1633,8 +1633,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXH
             case D3DXPT_BOOL:
             case D3DXPT_INT:
             case D3DXPT_FLOAT:
-                TRACE("Copy %u bytes\n", bytes);
-                memcpy(param->data, data, bytes);
+                TRACE("Copy %u bytes\n", param->bytes);
+                memcpy(param->data, data, param->bytes);
                 break;
 
             default:
@@ -3584,7 +3584,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX
     TRACE("iface %p, manager %p\n", This, manager);
 
     if (manager) IUnknown_AddRef(manager);
-    if (This->manager) IUnknown_Release(This->manager);    
+    if (This->manager) IUnknown_Release(This->manager);
 
     This->manager = manager;
 

-- 
Debian Wine packaging