wined3d: Move some swapchain code into a base class.

dlls/wined3d/Makefile.in

@@ -30,6 +30,7 @@ C_SRCS = \
 	surface.c \
 	surface_gdi.c \
 	swapchain.c \
+	swapchain_base.c \
 	texture.c \
 	utils.c \
 	vertexbuffer.c \

dlls/wined3d/swapchain.c

@@ -4,7 +4,7 @@
  *Copyright 2002-2003 Jason Edmeades
  *Copyright 2002-2003 Raphael Junqueira
  *Copyright 2005 Oliver Stieber
- *Copyright 2007 Stefan Dsinger for CodeWeavers
+ *Copyright 2007-2008 Stefan Dösinger for CodeWeavers
  *
  *This library is free software; you can redistribute it and/or
  *modify it under the terms of the GNU Lesser General Public
@@ -35,53 +35,6 @@ WINE_DECLARE_DEBUG_CHANNEL(fps);
 
 #define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info
 
-/* IDirect3DSwapChain IUnknown parts follow: */
-static ULONG WINAPI IWineD3DSwapChainImpl_AddRef(IWineD3DSwapChain *iface) {
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    DWORD refCount = InterlockedIncrement(&This->ref);
-    TRACE("(%p) : AddRef increasing from %d\n", This, refCount - 1);
-    return refCount;
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, LPVOID *ppobj)
-{
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj);
-    if (IsEqualGUID(riid, &IID_IUnknown)
-        || IsEqualGUID(riid, &IID_IWineD3DBase)
-        || IsEqualGUID(riid, &IID_IWineD3DSwapChain)){
-        IWineD3DSwapChainImpl_AddRef(iface);
-        if(ppobj == NULL){
-            ERR("Query interface called but now data allocated\n");
-            return E_NOINTERFACE;
-        }
-        *ppobj = This;
-        return WINED3D_OK;
-    }
-    *ppobj = NULL;
-    return E_NOINTERFACE;
-}
-
-
-static ULONG WINAPI IWineD3DSwapChainImpl_Release(IWineD3DSwapChain *iface) {
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    DWORD refCount;
-    refCount = InterlockedDecrement(&This->ref);
-    TRACE("(%p) : ReleaseRef to %d\n", This, refCount);
-    if (refCount == 0) {
-        IWineD3DSwapChain_Destroy(iface, D3DCB_DefaultDestroySurface);
-    }
-    return refCount;
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_GetParent(IWineD3DSwapChain *iface, IUnknown ** ppParent){
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    *ppParent = This->parent;
-    IUnknown_AddRef(*ppParent);
-    TRACE("(%p) returning %p\n", This , *ppParent);
-    return WINED3D_OK;
-}
-
 /*IWineD3DSwapChain parts follow: */
 static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroyRenderTarget) {
     IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
@@ -380,134 +333,24 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
     return WINED3D_OK;
 }
 
-static HRESULT WINAPI IWineD3DSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain *iface, IWineD3DSurface *pDestSurface) {
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    POINT start;
-
-    TRACE("(%p) : iface(%p) pDestSurface(%p)\n", This, iface, pDestSurface);
-
-    start.x = 0;
-    start.y = 0;
-
-    if (This->presentParms.Windowed) {
-        MapWindowPoints(This->win_handle, NULL, &start, 1);
-    }
-
-    IWineD3DSurface_BltFast(pDestSurface, start.x, start.y, This->frontBuffer, NULL, 0);
-    return WINED3D_OK;
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, UINT iBackBuffer, WINED3DBACKBUFFER_TYPE Type, IWineD3DSurface **ppBackBuffer) {
-
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-
-    if (iBackBuffer > This->presentParms.BackBufferCount - 1) {
-        TRACE("Back buffer count out of range\n");
-        /* Native d3d9 doesn't set NULL here, just as wine's d3d9. But set it here
-         * in wined3d to avoid problems in other libs
-         */
-        *ppBackBuffer = NULL;
-        return WINED3DERR_INVALIDCALL;
-    }
-
-    *ppBackBuffer = This->backBuffer[iBackBuffer];
-    TRACE("(%p) : BackBuf %d Type %d  returning %p\n", This, iBackBuffer, Type, *ppBackBuffer);
-
-    /* Note inc ref on returned surface */
-    if(*ppBackBuffer) IWineD3DSurface_AddRef(*ppBackBuffer);
-    return WINED3D_OK;
-
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) {
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    static BOOL showFixmes = TRUE;
-    pRasterStatus->InVBlank = TRUE;
-    pRasterStatus->ScanLine = 0;
-    /* No openGL equivalent */
-    if(showFixmes) {
-        FIXME("(%p) : stub (once)\n", This);
-        showFixmes = FALSE;
-    }
-    return WINED3D_OK;
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface, WINED3DDISPLAYMODE*pMode) {
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    HRESULT hr;
-
-    TRACE("(%p)->(%p): Calling GetAdapterDisplayMode\n", This, pMode);
-    hr = IWineD3D_GetAdapterDisplayMode(This->wineD3DDevice->wineD3D, This->wineD3DDevice->adapter->num, pMode);
-
-    TRACE("(%p) : returning w(%d) h(%d) rr(%d) fmt(%u,%s)\n", This, pMode->Width, pMode->Height, pMode->RefreshRate,
-    pMode->Format, debug_d3dformat(pMode->Format));
-    return hr;
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_GetDevice(IWineD3DSwapChain *iface, IWineD3DDevice**ppDevice) {
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-
-    *ppDevice = (IWineD3DDevice *) This->wineD3DDevice;
-
-    /* Note  Calling this method will increase the internal reference count
-       on the IDirect3DDevice9 interface. */
-    IWineD3DDevice_AddRef(*ppDevice);
-    TRACE("(%p) : returning %p\n", This, *ppDevice);
-    return WINED3D_OK;
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_GetPresentParameters(IWineD3DSwapChain *iface, WINED3DPRESENT_PARAMETERS *pPresentationParameters) {
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    TRACE("(%p)\n", This);
-
-    *pPresentationParameters = This->presentParms;
-
-    return WINED3D_OK;
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, DWORD Flags, CONST WINED3DGAMMARAMP *pRamp){
-
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    HDC hDC;
-    TRACE("(%p) : pRamp@%p flags(%d)\n", This, pRamp, Flags);
-    hDC = GetDC(This->win_handle);
-    SetDeviceGammaRamp(hDC, (LPVOID)pRamp);
-    ReleaseDC(This->win_handle, hDC);
-    return WINED3D_OK;
-
-}
-
-static HRESULT WINAPI IWineD3DSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, WINED3DGAMMARAMP *pRamp){
-
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    HDC hDC;
-    TRACE("(%p) : pRamp@%p\n", This, pRamp);
-    hDC = GetDC(This->win_handle);
-    GetDeviceGammaRamp(hDC, pRamp);
-    ReleaseDC(This->win_handle, hDC);
-    return WINED3D_OK;
-
-}
-
-
 const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl =
 {
     /* IUnknown */
-    IWineD3DSwapChainImpl_QueryInterface,
-    IWineD3DSwapChainImpl_AddRef,
-    IWineD3DSwapChainImpl_Release,
+    IWineD3DBaseSwapChainImpl_QueryInterface,
+    IWineD3DBaseSwapChainImpl_AddRef,
+    IWineD3DBaseSwapChainImpl_Release,
     /* IWineD3DSwapChain */
-    IWineD3DSwapChainImpl_GetParent,
+    IWineD3DBaseSwapChainImpl_GetParent,
     IWineD3DSwapChainImpl_Destroy,
-    IWineD3DSwapChainImpl_GetDevice,
+    IWineD3DBaseSwapChainImpl_GetDevice,
     IWineD3DSwapChainImpl_Present,
-    IWineD3DSwapChainImpl_GetFrontBufferData,
-    IWineD3DSwapChainImpl_GetBackBuffer,
-    IWineD3DSwapChainImpl_GetRasterStatus,
-    IWineD3DSwapChainImpl_GetDisplayMode,
-    IWineD3DSwapChainImpl_GetPresentParameters,
-    IWineD3DSwapChainImpl_SetGammaRamp,
-    IWineD3DSwapChainImpl_GetGammaRamp
+    IWineD3DBaseSwapChainImpl_GetFrontBufferData,
+    IWineD3DBaseSwapChainImpl_GetBackBuffer,
+    IWineD3DBaseSwapChainImpl_GetRasterStatus,
+    IWineD3DBaseSwapChainImpl_GetDisplayMode,
+    IWineD3DBaseSwapChainImpl_GetPresentParameters,
+    IWineD3DBaseSwapChainImpl_SetGammaRamp,
+    IWineD3DBaseSwapChainImpl_GetGammaRamp
 };
 
 WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain *iface) {

dlls/wined3d/swapchain_base.c

+/*
+ *IDirect3DSwapChain9 implementation
+ *
+ *Copyright 2002-2003 Jason Edmeades
+ *Copyright 2002-2003 Raphael Junqueira
+ *Copyright 2005 Oliver Stieber
+ *Copyright 2007-2008 Stefan Dsinger for CodeWeavers
+ *
+ *This library is free software; you can redistribute it and/or
+ *modify it under the terms of the GNU Lesser General Public
+ *License as published by the Free Software Foundation; either
+ *version 2.1 of the License, or (at your option) any later version.
+ *
+ *This library is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *Lesser General Public License for more details.
+ *
+ *You should have received a copy of the GNU Lesser General Public
+ *License along with this library; if not, write to the Free Software
+ *Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+#include "wined3d_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(d3d);
+
+/* IDirect3DSwapChain IUnknown parts follow: */
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, LPVOID *ppobj)
+{
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj);
+    if (IsEqualGUID(riid, &IID_IUnknown)
+        || IsEqualGUID(riid, &IID_IWineD3DBase)
+        || IsEqualGUID(riid, &IID_IWineD3DSwapChain)){
+        IWineD3DSwapChain_AddRef(iface);
+        if(ppobj == NULL){
+            ERR("Query interface called but now data allocated\n");
+            return E_NOINTERFACE;
+        }
+        *ppobj = This;
+        return WINED3D_OK;
+        }
+        *ppobj = NULL;
+        return E_NOINTERFACE;
+}
+
+ULONG WINAPI IWineD3DBaseSwapChainImpl_AddRef(IWineD3DSwapChain *iface) {
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    DWORD refCount = InterlockedIncrement(&This->ref);
+    TRACE("(%p) : AddRef increasing from %d\n", This, refCount - 1);
+    return refCount;
+}
+
+ULONG WINAPI IWineD3DBaseSwapChainImpl_Release(IWineD3DSwapChain *iface) {
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    DWORD refCount;
+    refCount = InterlockedDecrement(&This->ref);
+    TRACE("(%p) : ReleaseRef to %d\n", This, refCount);
+    if (refCount == 0) {
+        IWineD3DSwapChain_Destroy(iface, D3DCB_DefaultDestroySurface);
+    }
+    return refCount;
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetParent(IWineD3DSwapChain *iface, IUnknown ** ppParent){
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    *ppParent = This->parent;
+    IUnknown_AddRef(*ppParent);
+    TRACE("(%p) returning %p\n", This , *ppParent);
+    return WINED3D_OK;
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain *iface, IWineD3DSurface *pDestSurface) {
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    POINT start;
+
+    TRACE("(%p) : iface(%p) pDestSurface(%p)\n", This, iface, pDestSurface);
+
+    start.x = 0;
+    start.y = 0;
+
+    if (This->presentParms.Windowed) {
+        MapWindowPoints(This->win_handle, NULL, &start, 1);
+    }
+
+    IWineD3DSurface_BltFast(pDestSurface, start.x, start.y, This->frontBuffer, NULL, 0);
+    return WINED3D_OK;
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, UINT iBackBuffer, WINED3DBACKBUFFER_TYPE Type, IWineD3DSurface **ppBackBuffer) {
+
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+
+    if (iBackBuffer > This->presentParms.BackBufferCount - 1) {
+        TRACE("Back buffer count out of range\n");
+        /* Native d3d9 doesn't set NULL here, just as wine's d3d9. But set it here
+        * in wined3d to avoid problems in other libs
+        */
+        *ppBackBuffer = NULL;
+        return WINED3DERR_INVALIDCALL;
+    }
+
+    *ppBackBuffer = This->backBuffer[iBackBuffer];
+    TRACE("(%p) : BackBuf %d Type %d  returning %p\n", This, iBackBuffer, Type, *ppBackBuffer);
+
+    /* Note inc ref on returned surface */
+    if(*ppBackBuffer) IWineD3DSurface_AddRef(*ppBackBuffer);
+    return WINED3D_OK;
+
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) {
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    static BOOL showFixmes = TRUE;
+    pRasterStatus->InVBlank = TRUE;
+    pRasterStatus->ScanLine = 0;
+    /* No openGL equivalent */
+    if(showFixmes) {
+        FIXME("(%p) : stub (once)\n", This);
+        showFixmes = FALSE;
+    }
+    return WINED3D_OK;
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface, WINED3DDISPLAYMODE*pMode) {
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    HRESULT hr;
+
+    TRACE("(%p)->(%p): Calling GetAdapterDisplayMode\n", This, pMode);
+    hr = IWineD3D_GetAdapterDisplayMode(This->wineD3DDevice->wineD3D, This->wineD3DDevice->adapter->num, pMode);
+
+    TRACE("(%p) : returning w(%d) h(%d) rr(%d) fmt(%u,%s)\n", This, pMode->Width, pMode->Height, pMode->RefreshRate,
+          pMode->Format, debug_d3dformat(pMode->Format));
+    return hr;
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDevice(IWineD3DSwapChain *iface, IWineD3DDevice**ppDevice) {
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+
+    *ppDevice = (IWineD3DDevice *) This->wineD3DDevice;
+
+    /* Note  Calling this method will increase the internal reference count
+    on the IDirect3DDevice9 interface. */
+    IWineD3DDevice_AddRef(*ppDevice);
+    TRACE("(%p) : returning %p\n", This, *ppDevice);
+    return WINED3D_OK;
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetPresentParameters(IWineD3DSwapChain *iface, WINED3DPRESENT_PARAMETERS *pPresentationParameters) {
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    TRACE("(%p)\n", This);
+
+    *pPresentationParameters = This->presentParms;
+
+    return WINED3D_OK;
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, DWORD Flags, CONST WINED3DGAMMARAMP *pRamp){
+
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    HDC hDC;
+    TRACE("(%p) : pRamp@%p flags(%d)\n", This, pRamp, Flags);
+    hDC = GetDC(This->win_handle);
+    SetDeviceGammaRamp(hDC, (LPVOID)pRamp);
+    ReleaseDC(This->win_handle, hDC);
+    return WINED3D_OK;
+
+}
+
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, WINED3DGAMMARAMP *pRamp){
+
+    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
+    HDC hDC;
+    TRACE("(%p) : pRamp@%p\n", This, pRamp);
+    hDC = GetDC(This->win_handle);
+    GetDeviceGammaRamp(hDC, pRamp);
+    ReleaseDC(This->win_handle, hDC);
+    return WINED3D_OK;
+
+}

dlls/wined3d/wined3d_private.h

@@ -1746,6 +1746,19 @@ typedef struct IWineD3DSwapChainImpl
 
 extern const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl;
 
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, LPVOID *ppobj);
+ULONG WINAPI IWineD3DBaseSwapChainImpl_AddRef(IWineD3DSwapChain *iface);
+ULONG WINAPI IWineD3DBaseSwapChainImpl_Release(IWineD3DSwapChain *iface);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetParent(IWineD3DSwapChain *iface, IUnknown ** ppParent);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain *iface, IWineD3DSurface *pDestSurface);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, UINT iBackBuffer, WINED3DBACKBUFFER_TYPE Type, IWineD3DSurface **ppBackBuffer);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface, WINED3DDISPLAYMODE*pMode);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDevice(IWineD3DSwapChain *iface, IWineD3DDevice**ppDevice);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetPresentParameters(IWineD3DSwapChain *iface, WINED3DPRESENT_PARAMETERS *pPresentationParameters);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, DWORD Flags, CONST WINED3DGAMMARAMP *pRamp);
+HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, WINED3DGAMMARAMP *pRamp);
+
 WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain *iface);
 
 /*****************************************************************************