Move the GetDeviceCaps into the wined3d library and call from d3d9.

dlls/d3d9/directx.c

@@ -156,8 +156,7 @@ HRESULT  WINAPI  IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3D9 iface, U
 
 HRESULT  WINAPI  IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) {
     IDirect3D9Impl *This = (IDirect3D9Impl *)iface;
-    FIXME("(%p): stub\n", This);
-    return D3D_OK;
+    return IWineD3D_GetDeviceCaps(This->WineD3D, Adapter, DeviceType, (void *)pCaps);
 }
 
 HMONITOR WINAPI  IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9 iface, UINT Adapter) {

dlls/wined3d/wined3d_private.h

@@ -68,6 +68,13 @@ extern int num_lock;
  */
 #define GL_SUPPORT(ExtName)           (This->gl_info.supported[ExtName] != 0)
 
+
+#define MAX_STREAMS  16  /* Maximum possible streams - used for fixed size arrays
+                            See MaxStreams in MSDN under GetDeviceCaps */
+
+#define WINED3D_VSHADER_MAX_CONSTANTS  96   
+                         /* Maximum number of constants provided to the shaders */
+
 /*****************************************************************************
  * IWineD3D implementation structure
  */

include/wine/wined3d_gl.h

@@ -44,8 +44,6 @@
 
 #undef APIENTRY
 #define APIENTRY
-#undef CALLBACK
-#undef WINAPI
 
 /****************************************************
  * OpenGL Extensions (EXT and ARB)
@@ -795,6 +793,15 @@ typedef enum _GL_SupportedExt {
     USE_GL_FUNC(PGLXFNGLXMAKECONTEXTCURRENTPROC,     glXMakeContextCurrent); \
     USE_GL_FUNC(PGLXFNGLXCHOOSEFBCONFIGPROC,         glXChooseFBConfig); \
 
+#undef APIENTRY
+#undef CALLBACK
+#undef WINAPI
+
+/* Redefines the constants */
+#define CALLBACK    __stdcall
+#define WINAPI      __stdcall
+#define APIENTRY    WINAPI
+
 /****************************************************
  * Structures       
  ****************************************************/
@@ -840,15 +847,6 @@ typedef struct _WineD3D_GLContext {
   DWORD        ref;
 } WineD3D_Context;
 
-#undef APIENTRY
-#undef CALLBACK
-#undef WINAPI
-
-/* Redefines the constants */
-#define CALLBACK    __stdcall
-#define WINAPI      __stdcall
-#define APIENTRY    WINAPI
-
 #endif /* HAVE_OPENGL */
 
 #endif /* __WINE_WINED3D_GL */

include/wine/wined3d_interface.h

@@ -80,6 +80,7 @@ DECLARE_INTERFACE_(IWineD3D,IUnknown)
     STDMETHOD(CheckDeviceType)(THIS_ UINT  Adapter, D3DDEVTYPE  CheckType, D3DFORMAT  DisplayFormat, D3DFORMAT  BackBufferFormat, BOOL  Windowed) PURE;
     STDMETHOD(CheckDeviceFormat)(THIS_ UINT  Adapter, D3DDEVTYPE  DeviceType, D3DFORMAT  AdapterFormat, DWORD  Usage, D3DRESOURCETYPE  RType, D3DFORMAT  CheckFormat) PURE;
     STDMETHOD(CheckDeviceFormatConversion)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat) PURE;
+    STDMETHOD(GetDeviceCaps)(THIS_ UINT  Adapter, D3DDEVTYPE  DeviceType, void * pCaps) PURE;
 };
 #undef INTERFACE
 
@@ -101,6 +102,7 @@ DECLARE_INTERFACE_(IWineD3D,IUnknown)
 #define IWineD3D_CheckDeviceType(p,a,b,c,d,e)             (p)->lpVtbl->CheckDeviceType(p,a,b,c,d,e)
 #define IWineD3D_CheckDeviceFormat(p,a,b,c,d,e,f)         (p)->lpVtbl->CheckDeviceFormat(p,a,b,c,d,e,f)
 #define IWineD3D_CheckDeviceFormatConversion(p,a,b,c,d)   (p)->lpVtbl->CheckDeviceFormatConversion(p,a,b,c,d)
+#define IWineD3D_GetDeviceCaps(p,a,b,c)                   (p)->lpVtbl->GetDeviceCaps(p,a,b,c)
 #endif
 
 /* Define the main WineD3D entrypoint */