Henri Verbeet : wined3d: Compare and copy the actual palette in palette9_changed() (Valgrind).

Alexandre Julliard julliard at winehq.org
Fri Oct 23 10:19:01 CDT 2009


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Oct 23 10:26:12 2009 +0200

wined3d: Compare and copy the actual palette in palette9_changed() (Valgrind).

---

 dlls/wined3d/surface.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 7e69d7d..a3043cd 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2516,14 +2516,16 @@ BOOL palette9_changed(IWineD3DSurfaceImpl *This) {
         return FALSE;
     }
 
-    if(This->palette9) {
-        if(memcmp(This->palette9, &device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256) == 0) {
+    if (This->palette9)
+    {
+        if (!memcmp(This->palette9, device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256))
+        {
             return FALSE;
         }
     } else {
         This->palette9 = HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * 256);
     }
-    memcpy(This->palette9, &device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256);
+    memcpy(This->palette9, device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256);
     return TRUE;
 }
 




More information about the wine-cvs mailing list