[PATCH 5/5] wined3d: Compare and copy the actual palette in palette9_changed() (Valgrind).

Henri Verbeet hverbeet at codeweavers.com
Fri Oct 23 03:26:12 CDT 2009


---
 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;
 }
 
-- 
1.6.4.4




More information about the wine-patches mailing list