commit a8616b7fcb75e694b45c15c48a4d9550c8aca9dc
author Ričardas Barkauskas <miegalius@gmail.com> Mon Oct 03 17:14:08 2011 -0500
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 04 15:24:20 2011 -0500
tree 4b8d8c52c15d450ba8f2f3ff1ac19d03d14b93d7
parent 07decea8721e8cb9098f02e4b6d93d6c435d270f

ddraw: Use unsafe_impl_from_IDirectDrawPalette for application provided interfaces.

dlls/ddraw/ddraw_private.h

diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 0572172..7898d28 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -369,6 +369,8 @@
     IUnknown                  *ifaceToRelease;
 };
 
+IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) DECLSPEC_HIDDEN;
+
 HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette,
         IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) DECLSPEC_HIDDEN;
 

dlls/ddraw/palette.c

diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c
index b68cf82..ff78411 100644
--- a/dlls/ddraw/palette.c
+++ b/dlls/ddraw/palette.c
@@ -258,6 +258,13 @@
     IDirectDrawPaletteImpl_SetEntries
 };
 
+IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface)
+{
+    if (!iface) return NULL;
+    assert(iface->lpVtbl == &ddraw_palette_vtbl);
+    return CONTAINING_RECORD(iface, IDirectDrawPaletteImpl, lpVtbl);
+}
+
 HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette,
         IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries)
 {

dlls/ddraw/surface.c

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 4cd1452..7c70f0f 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -4288,7 +4288,7 @@
     IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface);
     IDirectDrawPalette *oldPal;
     IDirectDrawSurfaceImpl *surf;
-    IDirectDrawPaletteImpl *PalImpl = (IDirectDrawPaletteImpl *)Pal;
+    IDirectDrawPaletteImpl *PalImpl = unsafe_impl_from_IDirectDrawPalette(Pal);
     HRESULT hr;
 
     TRACE("iface %p, palette %p.\n", iface, Pal);