[PATCH 4/5] d3d8: Move D3D8CB_DestroySwapChain() to device.c.
Henri Verbeet
hverbeet at codeweavers.com
Tue Nov 17 02:43:15 CST 2009
---
dlls/d3d8/d3d8_private.h | 3 ---
dlls/d3d8/device.c | 11 +++++++++++
dlls/d3d8/directx.c | 10 ----------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index 8464190..141aa92 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -622,7 +622,4 @@ UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elem
WINED3DVERTEXELEMENT **wined3d_elements) DECLSPEC_HIDDEN;
size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN;
-/* Callbacks */
-extern ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN;
-
#endif /* __WINE_D3DX8_PRIVATE_H */
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index a20b9f4..eb26d73 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -253,6 +253,17 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d
return entry->object;
}
+static ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *swapchain)
+{
+ IUnknown *parent;
+
+ TRACE("swapchain %p.\n", swapchain);
+
+ IWineD3DSwapChain_GetParent(swapchain, &parent);
+ IUnknown_Release(parent);
+ return IUnknown_Release(parent);
+}
+
/* IDirect3D IUnknown parts follow: */
static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(LPDIRECT3DDEVICE8 iface,REFIID riid,LPVOID *ppobj)
{
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index f9b8c45..8bcd5ab 100644
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -331,16 +331,6 @@ static HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT
return ret;
}
-ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) {
- IUnknown* swapChainParent;
-
- TRACE("swapchain %p.\n", pSwapChain);
-
- IWineD3DSwapChain_GetParent(pSwapChain, &swapChainParent);
- IUnknown_Release(swapChainParent);
- return IUnknown_Release(swapChainParent);
-}
-
static HRESULT WINAPI IDirect3D8Impl_CreateDevice(IDirect3D8 *iface, UINT adapter, D3DDEVTYPE device_type,
HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, IDirect3DDevice8 **device)
{
--
1.6.4.4
More information about the wine-patches
mailing list