Module: wine Branch: master Commit: 7142754820ce0174776c45ee47af41cfa5ba807e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7142754820ce0174776c45ee47...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Oct 23 16:37:10 2008 +0200
wined3d: Remove the SDKVersion parameter to WineDirect3DCreate().
---
dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d9/d3d9_main.c | 2 +- dlls/ddraw/main.c | 2 +- dlls/wined3d/wined3d_main.c | 2 +- include/wine/wined3d_interface.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 56de60d..8e32dc3 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -53,7 +53,7 @@ IDirect3D8* WINAPI Direct3DCreate8(UINT SDKVersion) {
object->lpVtbl = &Direct3D8_Vtbl; object->ref = 1; - object->WineD3D = WineDirect3DCreate(SDKVersion, 8, (IUnknown *)object); + object->WineD3D = WineDirect3DCreate(8, (IUnknown *)object);
TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); LeaveCriticalSection(&d3d8_cs); diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 03c75a4..40d73a5 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -48,7 +48,7 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { object->lpVtbl = &Direct3D9_Vtbl; object->ref = 1; EnterCriticalSection(&d3d9_cs); - object->WineD3D = WineDirect3DCreate(SDKVersion, 9, (IUnknown *)object); + object->WineD3D = WineDirect3DCreate(9, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs);
TRACE("SDKVersion = %x, Created Direct3D object @ %p, WineObj @ %p\n", SDKVersion, object, object->WineD3D); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 07c1708..21cd272 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -206,7 +206,7 @@ DDRAW_Create(const GUID *guid, * but DirectDraw specific management, like DDSURFACEDESC and DDPIXELFORMAT * structure handling is handled in this lib. */ - wineD3D = pWineDirect3DCreate(0 /* SDKVersion */, 7 /* DXVersion */, (IUnknown *) This /* Parent */); + wineD3D = pWineDirect3DCreate(7 /* DXVersion */, (IUnknown *) This /* Parent */); if(!wineD3D) { ERR("Failed to initialise WineD3D\n"); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 355f7db..fa1d028 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -48,7 +48,7 @@ wined3d_settings_t wined3d_settings = FALSE /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ };
-IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *parent) { +IWineD3D* WINAPI WineDirect3DCreate(UINT dxVersion, IUnknown *parent) { IWineD3DImpl* object;
if (!InitAdapters()) { diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 3330ebc..79c94bc 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -343,7 +343,7 @@ DECLARE_INTERFACE_(IWineD3D, IWineD3DBase) #endif
/* Define the main WineD3D entrypoint */ -IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *parent); +IWineD3D* WINAPI WineDirect3DCreate(UINT dxVersion, IUnknown *parent);
/***************************************************************************** * IWineD3DDevice interface