Tidy up d3d9 and finalize passing d3d9 calls to wined3d for now.

dlls/d3d9/cubetexture.c

@@ -209,9 +209,11 @@ HRESULT  WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE9 if
 
 const IDirect3DCubeTexture9Vtbl Direct3DCubeTexture9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DCubeTexture9Impl_QueryInterface,
     IDirect3DCubeTexture9Impl_AddRef,
     IDirect3DCubeTexture9Impl_Release,
+    /* IDirect3DResource9 */
     IDirect3DCubeTexture9Impl_GetDevice,
     IDirect3DCubeTexture9Impl_SetPrivateData,
     IDirect3DCubeTexture9Impl_GetPrivateData,
@@ -220,6 +222,7 @@ const IDirect3DCubeTexture9Vtbl Direct3DCubeTexture9_Vtbl =
     IDirect3DCubeTexture9Impl_GetPriority,
     IDirect3DCubeTexture9Impl_PreLoad,
     IDirect3DCubeTexture9Impl_GetType,
+    /* IDirect3DBaseTexture9 */
     IDirect3DCubeTexture9Impl_SetLOD,
     IDirect3DCubeTexture9Impl_GetLOD,
     IDirect3DCubeTexture9Impl_GetLevelCount,

dlls/d3d9/d3d9.spec

 @ stdcall D3D9GetSWInfo()
 @ stdcall DebugSetMute()
 @ stdcall Direct3DCreate9(long)
-@ stdcall ValidatePixelShader(ptr ptr)
-@ stdcall ValidateVertexShader(ptr ptr)
+@ stdcall ValidatePixelShader(ptr long long ptr)
+@ stdcall ValidateVertexShader(ptr long long ptr)

dlls/d3d9/d3d9_main.c

@@ -2,7 +2,8 @@
  * Direct3D 9
  *
  * Copyright 2002-2003 Jason Edmeades
- *                     Raphael Junqueira
+ * Copyright 2002-2003 Raphael Junqueira
+ * Copyright 2005 Oliver Stieber
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,7 +25,7 @@
 #include "initguid.h"
 #include "d3d9_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(d3d);
+WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 void (*wine_tsx11_lock_ptr)(void) = NULL;
 void (*wine_tsx11_unlock_ptr)(void) = NULL;
@@ -72,15 +73,15 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) {
 /***********************************************************************
  *		ValidateVertexShader (D3D9.@)
  */
-BOOL WINAPI ValidateVertexShader(LPVOID what, LPVOID toto) {
-  FIXME("(void): stub: %p %p\n", what, toto);
+BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int param1, int param2, LPVOID toto/* result? */) {
+  FIXME("(void): stub: %p %d %d %p\n", pFunction, param1, param2, toto);
   return TRUE;
 }
 
 /***********************************************************************
  *		ValidatePixelShader (D3D9.@)
  */
-BOOL WINAPI ValidatePixelShader(LPVOID what, LPVOID toto) {
-  FIXME("(void): stub: %p %p\n", what, toto);
+BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int param1, int param2, LPVOID toto/* result?*/) {
+  FIXME("(void): stub: %p %d %d %p\n", pFunction, param1, param2, toto);
   return TRUE;
 }

dlls/d3d9/device.c

@@ -32,7 +32,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(LPDIRECT3DDEVICE9 iface, REFI
 
     if (IsEqualGUID(riid, &IID_IUnknown)
         || IsEqualGUID(riid, &IID_IDirect3DDevice9)) {
-        IDirect3DDevice9Impl_AddRef(iface);
+        IUnknown_AddRef(iface);
         *ppobj = This;
         return D3D_OK;
     }
@@ -168,7 +168,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9 iface, D3DPRESENT_
         
     localParameters.BackBufferWidth                = &pPresentationParameters->BackBufferWidth;
     localParameters.BackBufferHeight               = &pPresentationParameters->BackBufferHeight;           
-    localParameters.BackBufferFormat               = &pPresentationParameters->BackBufferFormat;           
+    localParameters.BackBufferFormat               = (WINED3DFORMAT *)&pPresentationParameters->BackBufferFormat;
     localParameters.BackBufferCount                = &pPresentationParameters->BackBufferCount;            
     localParameters.MultiSampleType                = &pPresentationParameters->MultiSampleType;            
     localParameters.MultiSampleQuality             = &pPresentationParameters->MultiSampleQuality;         
@@ -176,7 +176,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9 iface, D3DPRESENT_
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;              
     localParameters.Windowed                       = &pPresentationParameters->Windowed;                   
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;     
-    localParameters.AutoDepthStencilFormat         = &pPresentationParameters->AutoDepthStencilFormat;     
+    localParameters.AutoDepthStencilFormat         = (WINED3DFORMAT *)&pPresentationParameters->AutoDepthStencilFormat;     
     localParameters.Flags                          = &pPresentationParameters->Flags;                      
     localParameters.FullScreen_RefreshRateInHz     = &pPresentationParameters->FullScreen_RefreshRateInHz; 
     localParameters.PresentationInterval           = &pPresentationParameters->PresentationInterval;       
@@ -813,9 +813,11 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT
 
 const IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DDevice9Impl_QueryInterface,
     IDirect3DDevice9Impl_AddRef,
     IDirect3DDevice9Impl_Release,
+    /* IDirect3DDevice9 */
     IDirect3DDevice9Impl_TestCooperativeLevel,
     IDirect3DDevice9Impl_GetAvailableTextureMem,
     IDirect3DDevice9Impl_EvictManagedResources,

dlls/d3d9/directx.c

@@ -22,7 +22,7 @@
 #include "config.h"
 #include "d3d9_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(d3d);
+WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 /* IDirect3D9 IUnknown parts follow: */
 HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppobj)
@@ -31,7 +31,7 @@ HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPV
 
     if (IsEqualGUID(riid, &IID_IUnknown)
         || IsEqualGUID(riid, &IID_IDirect3D9)) {
-        IDirect3D9Impl_AddRef(iface);
+        IUnknown_AddRef(iface);
         *ppobj = This;
         return D3D_OK;
     }
@@ -294,7 +294,7 @@ HRESULT  WINAPI  IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3
     /* Allocate an associated WineD3DDevice object */
     localParameters.BackBufferWidth                = &pPresentationParameters->BackBufferWidth;
     localParameters.BackBufferHeight               = &pPresentationParameters->BackBufferHeight;
-    localParameters.BackBufferFormat               = &pPresentationParameters->BackBufferFormat;
+    localParameters.BackBufferFormat               = (WINED3DFORMAT *)&pPresentationParameters->BackBufferFormat;
     localParameters.BackBufferCount                = &pPresentationParameters->BackBufferCount;
     localParameters.MultiSampleType                = &pPresentationParameters->MultiSampleType;
     localParameters.MultiSampleQuality             = &pPresentationParameters->MultiSampleQuality;
@@ -302,7 +302,7 @@ HRESULT  WINAPI  IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;
     localParameters.Windowed                       = &pPresentationParameters->Windowed;
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;
-    localParameters.AutoDepthStencilFormat         = &pPresentationParameters->AutoDepthStencilFormat;
+    localParameters.AutoDepthStencilFormat         = (WINED3DFORMAT *)&pPresentationParameters->AutoDepthStencilFormat;
     localParameters.Flags                          = &pPresentationParameters->Flags;
     localParameters.FullScreen_RefreshRateInHz     = &pPresentationParameters->FullScreen_RefreshRateInHz; 
     localParameters.PresentationInterval           = &pPresentationParameters->PresentationInterval;
@@ -323,9 +323,11 @@ HRESULT  WINAPI  IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3
 
 const IDirect3D9Vtbl Direct3D9_Vtbl =
 {
+    /* IUnknown */
     IDirect3D9Impl_QueryInterface,
     IDirect3D9Impl_AddRef,
     IDirect3D9Impl_Release,
+    /* IDirect3D9 */
     IDirect3D9Impl_RegisterSoftwareDevice,
     IDirect3D9Impl_GetAdapterCount,
     IDirect3D9Impl_GetAdapterIdentifier,

dlls/d3d9/indexbuffer.c

@@ -133,9 +133,11 @@ HRESULT  WINAPI        IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXBUFFER9
 
 const IDirect3DIndexBuffer9Vtbl Direct3DIndexBuffer9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DIndexBuffer9Impl_QueryInterface,
     IDirect3DIndexBuffer9Impl_AddRef,
     IDirect3DIndexBuffer9Impl_Release,
+    /* IDirect3DResource9 */
     IDirect3DIndexBuffer9Impl_GetDevice,
     IDirect3DIndexBuffer9Impl_SetPrivateData,
     IDirect3DIndexBuffer9Impl_GetPrivateData,
@@ -144,6 +146,7 @@ const IDirect3DIndexBuffer9Vtbl Direct3DIndexBuffer9_Vtbl =
     IDirect3DIndexBuffer9Impl_GetPriority,
     IDirect3DIndexBuffer9Impl_PreLoad,
     IDirect3DIndexBuffer9Impl_GetType,
+    /* IDirect3DIndexBuffer9 */
     IDirect3DIndexBuffer9Impl_Lock,
     IDirect3DIndexBuffer9Impl_Unlock,
     IDirect3DIndexBuffer9Impl_GetDesc

dlls/d3d9/pixelshader.c

@@ -22,7 +22,7 @@
 #include "config.h"
 #include "d3d9_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
+WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 /* IDirect3DPixelShader9 IUnknown parts follow: */
 HRESULT WINAPI IDirect3DPixelShader9Impl_QueryInterface(LPDIRECT3DPIXELSHADER9 iface, REFIID riid, LPVOID* ppobj) {
@@ -84,9 +84,11 @@ HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPIXELSHADER9 ifac
 
 const IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DPixelShader9Impl_QueryInterface,
     IDirect3DPixelShader9Impl_AddRef,
     IDirect3DPixelShader9Impl_Release,
+    /* IDirect3DPixelShader9 */
     IDirect3DPixelShader9Impl_GetDevice,
     IDirect3DPixelShader9Impl_GetFunction
 };
@@ -101,24 +103,24 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(LPDIRECT3DDEVICE9 iface, C
     FIXME("(%p) Relay (disabled)\n", This);
     *ppShader = NULL;
     return D3D_OK;
-    if(ppShader == NULL){
+    if (ppShader == NULL) {
         TRACE("(%p) Invalid call\n", This);
         return D3DERR_INVALIDCALL;
     }
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
 
-    if(NULL == object){
+    if (NULL == object) {
         return E_OUTOFMEMORY;
-    }else{
+    } else {
 
         object->ref    = 1;
         object->lpVtbl = &Direct3DPixelShader9_Vtbl;
         hrc = IWineD3DDevice_CreatePixelShader(This->WineD3DDevice, pFunction, &object->wineD3DPixelShader , (IUnknown *)object);
-        if(hrc != D3D_OK){
+        if (hrc != D3D_OK) {
             FIXME("(%p) call to IWineD3DDevice_CreatePixelShader failed\n", This);
             HeapFree(GetProcessHeap(), 0 , object);
             *ppShader = NULL;
-        }else{
+        } else {
             *ppShader = (IDirect3DPixelShader9*) object;
         }
 
@@ -142,15 +144,17 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDir
 
     HRESULT hrc = D3D_OK;
     TRACE("(%p) Relay\n", This);
-    if(ppShader == NULL){
+    if (ppShader == NULL) {
         TRACE("(%p) Invalid call\n", This);
         return D3DERR_INVALIDCALL;
     }
 
     hrc = IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &object);
-    if(hrc == D3D_OK && object != NULL){
+    if (hrc == D3D_OK && object != NULL) {
        hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)ppShader);
        IWineD3DPixelShader_Release(object);
+    } else {
+        *ppShader = NULL;
     }
 
     TRACE("(%p) : returning %p\n", This, *ppShader);

dlls/d3d9/stateblock.c

@@ -23,7 +23,7 @@
 #include "config.h"
 #include "d3d9_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(d3d);
+WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 /* IDirect3DStateBlock9 IUnknown parts follow: */
 HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLOCK9 iface, REFIID riid, LPVOID* ppobj) {
@@ -112,7 +112,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9 iface, D3
    object->lpVtbl = &Direct3DStateBlock9_Vtbl;
    object->ref = 1;
    
-   hrc=IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, &object->wineD3DStateBlock, (IUnknown*)object);
+   hrc = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, &object->wineD3DStateBlock, (IUnknown*)object);
    if(hrc != D3D_OK){
        FIXME("(%p) Call to IWineD3DDevice_CreateStateBlock failed.\n", This);
        HeapFree(GetProcessHeap(), 0, object);

dlls/d3d9/surface.c

@@ -137,7 +137,7 @@ HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 iface, REFI
             IUnknown_Release(myContainer);
         } else
         if(D3D_OK == IUnknown_QueryInterface(IWineContainer, &IID_IWineD3DSwapChain, (void **)&myContainer)){
-            IWineD3DBaseTexture_GetParent((IWineD3DBaseTexture *)IWineContainer, &IUnknownParent);
+            IWineD3DSwapChain_GetParent((IWineD3DSwapChain *)IWineContainer, &IUnknownParent);
             IUnknown_Release(myContainer);
         }else{
             FIXME("Container is of unknown interface\n");
@@ -206,9 +206,11 @@ HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, HDC hdc
 
 const IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DSurface9Impl_QueryInterface,
     IDirect3DSurface9Impl_AddRef,
     IDirect3DSurface9Impl_Release,
+    /* IDirect3DResource9 */
     IDirect3DSurface9Impl_GetDevice,
     IDirect3DSurface9Impl_SetPrivateData,
     IDirect3DSurface9Impl_GetPrivateData,
@@ -217,6 +219,7 @@ const IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl =
     IDirect3DSurface9Impl_GetPriority,
     IDirect3DSurface9Impl_PreLoad,
     IDirect3DSurface9Impl_GetType,
+    /* IDirect3DSurface9 */
     IDirect3DSurface9Impl_GetContainer,
     IDirect3DSurface9Impl_GetDesc,
     IDirect3DSurface9Impl_LockRect,

dlls/d3d9/swapchain.c

@@ -57,6 +57,7 @@ ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) {
     TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
 
     if (ref == 0) {
+        IWineD3DSwapChain_Release(This->wineD3DSwapChain);
         HeapFree(GetProcessHeap(), 0, This);
     }
     return ref;
@@ -160,7 +161,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE
     /* Allocate an associated WineD3DDevice object */
     localParameters.BackBufferWidth                = &pPresentationParameters->BackBufferWidth;
     localParameters.BackBufferHeight               = &pPresentationParameters->BackBufferHeight;
-    localParameters.BackBufferFormat               = &pPresentationParameters->BackBufferFormat;
+    localParameters.BackBufferFormat               = (WINED3DFORMAT *)&pPresentationParameters->BackBufferFormat;
     localParameters.BackBufferCount                = &pPresentationParameters->BackBufferCount;
     localParameters.MultiSampleType                = &pPresentationParameters->MultiSampleType;
     localParameters.MultiSampleQuality             = &pPresentationParameters->MultiSampleQuality;
@@ -168,7 +169,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;
     localParameters.Windowed                       = &pPresentationParameters->Windowed;
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;
-    localParameters.AutoDepthStencilFormat         = &pPresentationParameters->AutoDepthStencilFormat;
+    localParameters.AutoDepthStencilFormat         = (WINED3DFORMAT *)&pPresentationParameters->AutoDepthStencilFormat;
     localParameters.Flags                          = &pPresentationParameters->Flags;
     localParameters.FullScreen_RefreshRateInHz     = &pPresentationParameters->FullScreen_RefreshRateInHz;
     localParameters.PresentationInterval           = &pPresentationParameters->PresentationInterval;
@@ -183,7 +184,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE
         *pSwapChain = (IDirect3DSwapChain9 *)object;
     }
     TRACE("(%p) returning %p\n", This, *pSwapChain);
-    return D3D_OK;
+    return hrc;
 }
 
 HRESULT  WINAPI  IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) {

dlls/d3d9/texture.c

@@ -206,9 +206,11 @@ HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONS
 
 const IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DTexture9Impl_QueryInterface,
     IDirect3DTexture9Impl_AddRef,
     IDirect3DTexture9Impl_Release,
+     /* IDirect3DResource9 */
     IDirect3DTexture9Impl_GetDevice,
     IDirect3DTexture9Impl_SetPrivateData,
     IDirect3DTexture9Impl_GetPrivateData,
@@ -217,13 +219,14 @@ const IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl =
     IDirect3DTexture9Impl_GetPriority,
     IDirect3DTexture9Impl_PreLoad,
     IDirect3DTexture9Impl_GetType,
-    
+    /* IDirect3dBaseTexture9 */
     IDirect3DTexture9Impl_SetLOD,
     IDirect3DTexture9Impl_GetLOD,
     IDirect3DTexture9Impl_GetLevelCount,
     IDirect3DTexture9Impl_SetAutoGenFilterType,
     IDirect3DTexture9Impl_GetAutoGenFilterType,
     IDirect3DTexture9Impl_GenerateMipSubLevels,
+    /* IDirect3DTexture9 */
     IDirect3DTexture9Impl_GetLevelDesc,
     IDirect3DTexture9Impl_GetSurfaceLevel,
     IDirect3DTexture9Impl_LockRect,

dlls/d3d9/vertexbuffer.c

@@ -134,9 +134,11 @@ HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 iface,
 
 const IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DVertexBuffer9Impl_QueryInterface,
     IDirect3DVertexBuffer9Impl_AddRef,
     IDirect3DVertexBuffer9Impl_Release,
+    /* IDirect3DResource9 */
     IDirect3DVertexBuffer9Impl_GetDevice,
     IDirect3DVertexBuffer9Impl_SetPrivateData,
     IDirect3DVertexBuffer9Impl_GetPrivateData,
@@ -145,6 +147,7 @@ const IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl =
     IDirect3DVertexBuffer9Impl_GetPriority,
     IDirect3DVertexBuffer9Impl_PreLoad,
     IDirect3DVertexBuffer9Impl_GetType,
+    /* IDirect3DVertexBuffer9 */
     IDirect3DVertexBuffer9Impl_Lock,
     IDirect3DVertexBuffer9Impl_Unlock,
     IDirect3DVertexBuffer9Impl_GetDesc

dlls/d3d9/vertexshader.c

@@ -91,8 +91,8 @@ const IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl =
     /* IUnknown */
     IDirect3DVertexShader9Impl_QueryInterface,
     IDirect3DVertexShader9Impl_AddRef,
-    IDirect3DVertexShader9Impl_Release
-    /* IDirect3DVertexShader9 */,
+    IDirect3DVertexShader9Impl_Release,
+    /* IDirect3DVertexShader9 */
     IDirect3DVertexShader9Impl_GetDevice,
     IDirect3DVertexShader9Impl_GetFunction
 };

dlls/d3d9/volume.c

@@ -115,7 +115,7 @@ HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DVOLUME_D
     TRACE("(%p) Relay\n", This);
 
     /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */
-    wined3ddesc.Format              = (WINED3DFORMAT*) &pDesc->Format;
+    wined3ddesc.Format              = (WINED3DFORMAT *)&pDesc->Format;
     wined3ddesc.Type                = &pDesc->Type;
     wined3ddesc.Usage               = &pDesc->Usage;
     wined3ddesc.Pool                = &pDesc->Pool;
@@ -141,9 +141,11 @@ HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) {
 
 const IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DVolume9Impl_QueryInterface,
     IDirect3DVolume9Impl_AddRef,
     IDirect3DVolume9Impl_Release,
+    /* IDirect3DVolume9 */
     IDirect3DVolume9Impl_GetDevice,
     IDirect3DVolume9Impl_SetPrivateData,
     IDirect3DVolume9Impl_GetPrivateData,

dlls/d3d9/volumetexture.c

@@ -158,7 +158,7 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE9
     TRACE("(%p) Relay\n", This);
 
     /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */
-    wined3ddesc.Format              = (WINED3DFORMAT*) &pDesc->Format;
+    wined3ddesc.Format              = (WINED3DFORMAT *)&pDesc->Format;
     wined3ddesc.Type                = &pDesc->Type;
     wined3ddesc.Usage               = &pDesc->Usage;
     wined3ddesc.Pool                = &pDesc->Pool;
@@ -206,9 +206,11 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE9
 
 const IDirect3DVolumeTexture9Vtbl Direct3DVolumeTexture9_Vtbl =
 {
+    /* IUnknown */
     IDirect3DVolumeTexture9Impl_QueryInterface,
     IDirect3DVolumeTexture9Impl_AddRef,
     IDirect3DVolumeTexture9Impl_Release,
+    /* IDirect3DResource9 */
     IDirect3DVolumeTexture9Impl_GetDevice,
     IDirect3DVolumeTexture9Impl_SetPrivateData,
     IDirect3DVolumeTexture9Impl_GetPrivateData,
@@ -217,12 +219,14 @@ const IDirect3DVolumeTexture9Vtbl Direct3DVolumeTexture9_Vtbl =
     IDirect3DVolumeTexture9Impl_GetPriority,
     IDirect3DVolumeTexture9Impl_PreLoad,
     IDirect3DVolumeTexture9Impl_GetType,
+    /* IDirect3DBaseTexture9 */
     IDirect3DVolumeTexture9Impl_SetLOD,
     IDirect3DVolumeTexture9Impl_GetLOD,
     IDirect3DVolumeTexture9Impl_GetLevelCount,
     IDirect3DVolumeTexture9Impl_SetAutoGenFilterType,
     IDirect3DVolumeTexture9Impl_GetAutoGenFilterType,
     IDirect3DVolumeTexture9Impl_GenerateMipSubLevels,
+    /* IDirect3DVolumeTexture9 */
     IDirect3DVolumeTexture9Impl_GetLevelDesc,
     IDirect3DVolumeTexture9Impl_GetVolumeLevel,
     IDirect3DVolumeTexture9Impl_LockBox,

include/wine/wined3d_types.h

@@ -401,7 +401,7 @@ typedef struct _WINED3DADAPTER_IDENTIFIER {
 typedef struct _WINED3DPRESENT_PARAMETERS {
     UINT                *BackBufferWidth;
     UINT                *BackBufferHeight;
-    D3DFORMAT           *BackBufferFormat;
+    WINED3DFORMAT       *BackBufferFormat;
     UINT                *BackBufferCount;
     D3DMULTISAMPLE_TYPE *MultiSampleType;
     DWORD               *MultiSampleQuality;
@@ -409,7 +409,7 @@ typedef struct _WINED3DPRESENT_PARAMETERS {
     HWND                *hDeviceWindow;
     BOOL                *Windowed;
     BOOL                *EnableAutoDepthStencil;
-    D3DFORMAT           *AutoDepthStencilFormat;
+    WINED3DFORMAT       *AutoDepthStencilFormat;
     DWORD               *Flags;
     UINT                *FullScreen_RefreshRateInHz;
     UINT                *PresentationInterval;