Stefan Dösinger : wined3d: Add the remaining DirectDraw methods to WineD3DSurface.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 42b9221f51683563774dbda52215c14a473792df
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=42b9221f51683563774dbda5...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Mon Apr 17 17:25:55 2006 +0200

wined3d: Add the remaining DirectDraw methods to WineD3DSurface.

---

 dlls/wined3d/surface.c           |   68 +++++++++++++++++++++++++++++++++++++-
 include/wine/wined3d_interface.h |   22 ++++++++++++
 2 files changed, 89 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 2f16f54..374e262 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1455,6 +1455,61 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Blt(I
     return WINED3DERR_INVALIDCALL;
 }
 
+HRESULT WINAPI IWineD3DSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_IsLost(IWineD3DSurface *iface) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_Restore(IWineD3DSurface *iface) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_SetPixelFormat(IWineD3DSurface *iface, WINED3DFORMAT Format, BYTE *Surface, DWORD Size) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD3DPalette **Pal) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD3DPalette *Pal) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, DDCOLORKEY *CKey) {
+    FIXME("This is unimplemented for now(d3d7 merge)\n");
+    return WINED3DERR_INVALIDCALL;
+}
+
+HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) {
+    /* Nothing to do for now */
+    return WINED3D_OK;
+}
+
 const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
 {
     /* IUnknown */
@@ -1481,6 +1536,16 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac
     IWineD3DSurfaceImpl_ReleaseDC,
     IWineD3DSurfaceImpl_Flip,
     IWineD3DSurfaceImpl_Blt,
+    IWineD3DSurfaceImpl_GetBltStatus,
+    IWineD3DSurfaceImpl_GetFlipStatus,
+    IWineD3DSurfaceImpl_IsLost,
+    IWineD3DSurfaceImpl_Restore,
+    IWineD3DSurfaceImpl_BltFast,
+    IWineD3DSurfaceImpl_SetPixelFormat,
+    IWineD3DSurfaceImpl_GetPalette,
+    IWineD3DSurfaceImpl_SetPalette,
+    IWineD3DSurfaceImpl_RealizePalette,
+    IWineD3DSurfaceImpl_SetColorKey,
     /* Internal use: */
     IWineD3DSurfaceImpl_CleanDirtyRect,
     IWineD3DSurfaceImpl_AddDirtyRect,
@@ -1491,5 +1556,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac
     IWineD3DSurfaceImpl_SetGlTextureDesc,
     IWineD3DSurfaceImpl_GetGlDesc,
     IWineD3DSurfaceImpl_GetData,
-    IWineD3DSurfaceImpl_SetFormat
+    IWineD3DSurfaceImpl_SetFormat,
+    IWineD3DSurfaceImpl_PrivateSetup
 };
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index 2c590eb..0f4054c 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -1140,6 +1140,16 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine
     STDMETHOD(ReleaseDC)(THIS_ HDC hdc) PURE;
     STDMETHOD(Flip)(THIS_ IWineD3DSurface *Override, DWORD FLAGS) PURE;
     STDMETHOD(Blt)(THIS_ RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx) PURE;
+    STDMETHOD(GetBltStatus)(THIS_ DWORD Flags) PURE;
+    STDMETHOD(GetFlipStatus)(THIS_ DWORD Flags) PURE;
+    STDMETHOD(IsLost)(THIS) PURE;
+    STDMETHOD(Restore)(THIS) PURE;
+    STDMETHOD(BltFast)(THIS_ DWORD dstx, DWORD dsty, IWineD3DSurface *src, RECT *rsrc, DWORD trans) PURE;
+    STDMETHOD(SetPixelFormat)(THIS_ WINED3DFORMAT Format, BYTE *Surface, DWORD Size) PURE;
+    STDMETHOD(GetPalette)(THIS_ struct IWineD3DPalette **Palette) PURE;
+    STDMETHOD(SetPalette)(THIS_ struct IWineD3DPalette *Palette) PURE;
+    STDMETHOD(RealizePalette)(THIS) PURE;
+    STDMETHOD(SetColorKey)(THIS_ DWORD Flags, DDCOLORKEY *CKey) PURE;
     /* Internally used methods */
     STDMETHOD(CleanDirtyRect)(THIS) PURE;
     STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE;
@@ -1151,6 +1161,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine
     STDMETHOD_(void,GetGlDesc)(THIS_ glDescriptor **glDescription) PURE;
     STDMETHOD_(CONST void *, GetData)(THIS) PURE;
     STDMETHOD(SetFormat)(THIS_ WINED3DFORMAT format) PURE;
+    STDMETHOD(PrivateSetup)(THIS) PURE;
 };
 #undef INTERFACE
 
@@ -1180,6 +1191,16 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine
 #define IWineD3DSurface_ReleaseDC(p,a)               (p)->lpVtbl->ReleaseDC(p,a)
 #define IWineD3DSurface_Flip(p,a,b)                  (p)->lpVtbl->Flip(p,a,b)
 #define IWineD3DSurface_Blt(p,a,b,c,d,e)             (p)->lpVtbl->Blt(p,a,b,c,d,e)
+#define IWineD3DSurface_GetBltStatus(p,a)            (p)->lpVtbl->GetBltStatus(p,a)
+#define IWineD3DSurface_GetFlipStatus(p,a)           (p)->lpVtbl->GetFlipStatus(p,a)
+#define IWineD3DSurface_IsLost(p)                    (p)->lpVtbl->IsLost(p)
+#define IWineD3DSurface_Restore(p)                   (p)->lpVtbl->Restore(p)
+#define IWineD3DSurface_BltFast(p,a,b,c,d,e)         (p)->lpVtbl->BltFast(p,a,b,c,d,e)
+#define IWineD3DSurface_SetPixelFormat(p,a,b,c)      (p)->lpVtbl->SetPixelFormat(p,a,b,c)
+#define IWineD3DSurface_GetPalette(p, a)             (p)->lpVtbl->GetPalette(p, a)
+#define IWineD3DSurface_SetPalette(p, a)             (p)->lpVtbl->SetPalette(p, a)
+#define IWineD3DSurface_RealizePalette(p)            (p)->lpVtbl->RealizePalette(p)
+#define IWineD3DSurface_SetColorKey(p, a, b)         (p)->lpVtbl->SetColorKey(p, a, b)
 /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/
 #define IWineD3DSurface_CleanDirtyRect(p)            (p)->lpVtbl->CleanDirtyRect(p)
 #define IWineD3DSurface_AddDirtyRect(p,a)            (p)->lpVtbl->AddDirtyRect(p,a)
@@ -1191,6 +1212,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine
 #define IWineD3DSurface_GetGlDesc(p,a)               (p)->lpVtbl->GetGlDesc(p,a)
 #define IWineD3DSurface_GetData(p)                   (p)->lpVtbl->GetData(p)
 #define IWineD3DSurface_SetFormat(p,a)               (p)->lpVtbl->SetFormat(p,a)
+#define IWineD3DSurface_PrivateSetup(p)              (p)->lpVtbl->PrivateSetup(p)
 #endif
 
 /*****************************************************************************