Changeset 25949 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/device.c

Timestamp:

Jan 21, 2010 9:26:23 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: update to wine 1.1.36 and disable unnecessary fbo state poll

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/device.c (modified) (107 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/device.c

@@ -84 +84 @@
         case WINED3DFMT_D32_UNORM: return D3DFMT_D32;
         case WINED3DFMT_S1_UINT_D15_UNORM: return D3DFMT_D15S1;
-        case WINED3DFMT_S8_UINT_D24_UNORM: return D3DFMT_D24S8;
+        case WINED3DFMT_D24_UNORM_S8_UINT: return D3DFMT_D24S8;
         case WINED3DFMT_X8D24_UNORM: return D3DFMT_D24X8;
         case WINED3DFMT_S4X4_UINT_D24_UNORM: return D3DFMT_D24X4S4;
@@ -135 +135 @@
         case D3DFMT_D32: return WINED3DFMT_D32_UNORM;
         case D3DFMT_D15S1: return WINED3DFMT_S1_UINT_D15_UNORM;
-        case D3DFMT_D24S8: return WINED3DFMT_S8_UINT_D24_UNORM;
+        case D3DFMT_D24S8: return WINED3DFMT_D24_UNORM_S8_UINT;
         case D3DFMT_D24X8: return WINED3DFMT_X8D24_UNORM;
         case D3DFMT_D24X4S4: return WINED3DFMT_S4X4_UINT_D24_UNORM;
@@ -263 +263 @@
 }
 
+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)
 {
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
+
+    TRACE("iface %p, riid %s, object %p.\n",
+            iface, debugstr_guid(riid), ppobj);
 
     if (IsEqualGUID(riid, &IID_IUnknown)
@@ -291 +305 @@
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) : AddRef from %d\n", This, ref - 1);
+    TRACE("%p increasing refcount to %u.\n", iface, ref);
 
     return ref;
@@ -303 +317 @@
     ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) : ReleaseRef to %d\n", This, ref);
+    TRACE("%p decreasing refcount to %u.\n", iface, ref);
 
     if (ref == 0) {
@@ -330 +344 @@
 
 /* IDirect3DDevice Interface follow: */
-static HRESULT WINAPI IDirect3DDevice8Impl_TestCooperativeLevel(LPDIRECT3DDEVICE8 iface) {
-    IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    HRESULT hr;
-
-    TRACE("(%p) : Relay\n", This);
-
-    wined3d_mutex_lock();
-    hr = IWineD3DDevice_TestCooperativeLevel(This->WineD3DDevice);
-    wined3d_mutex_unlock();
-
-    return hr;
+static HRESULT WINAPI IDirect3DDevice8Impl_TestCooperativeLevel(IDirect3DDevice8 *iface)
+{
+    TRACE("iface %p.\n", iface);
+
+    return D3D_OK;
 }
 
@@ -347 +355 @@
     HRESULT hr;
 
-    TRACE("(%p) Relay\n", This);
+    TRACE("iface %p.\n", iface);
 
     wined3d_mutex_lock();
@@ -360 +368 @@
     HRESULT hr;
 
-    TRACE("(%p) : Relay bytes(%d)\n", This, Bytes);
+    TRACE("iface %p, byte_count %u.\n", iface, Bytes);
+    FIXME("Byte count ignored.\n");
 
     wined3d_mutex_lock();
@@ -374 +383 @@
     IWineD3D* pWineD3D;
 
-    TRACE("(%p) Relay\n", This);
+    TRACE("iface %p, d3d8 %p.\n", iface, ppD3D8);
 
     if (NULL == ppD3D8) {
@@ -402 +411 @@
     WINED3DCAPS *pWineCaps;
 
-    TRACE("(%p) : Relay pCaps %p\n", This, pCaps);
+    TRACE("iface %p, caps %p.\n", iface, pCaps);
+
     if(NULL == pCaps){
         return D3DERR_INVALIDCALL;
@@ -426 +436 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, mode %p.\n", iface, pMode);
 
     wined3d_mutex_lock();
@@ -440 +451 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, parameters %p.\n", iface, pParameters);
 
     wined3d_mutex_lock();
@@ -453 +465 @@
     IDirect3DSurface8Impl *pSurface = (IDirect3DSurface8Impl*)pCursorBitmap;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n",
+            iface, XHotSpot, YHotSpot, pCursorBitmap);
+
     if(!pCursorBitmap) {
         WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n");
@@ -468 +483 @@
 static void WINAPI IDirect3DDevice8Impl_SetCursorPosition(LPDIRECT3DDEVICE8 iface, UINT XScreenSpace, UINT YScreenSpace, DWORD Flags) {
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, x %u, y %u, flags %#x.\n",
+            iface, XScreenSpace, YScreenSpace, Flags);
 
     wined3d_mutex_lock();
@@ -478 +495 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     BOOL ret;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, show %#x.\n", iface, bShow);
 
     wined3d_mutex_lock();
@@ -487 +505 @@
 }
 
-static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain8** pSwapChain) {
-    IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    IDirect3DSwapChain8Impl* object;
-    HRESULT hrc = D3D_OK;
+static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(IDirect3DDevice8 *iface,
+        D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain8 **swapchain)
+{
+    IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
+    IDirect3DSwapChain8Impl *object;
+    HRESULT hr;
+
+    TRACE("iface %p, present_parameters %p, swapchain %p.\n",
+            iface, present_parameters, swapchain);
+
+    object = HeapAlloc(GetProcessHeap(),  HEAP_ZERO_MEMORY, sizeof(*object));
+    if (!object)
+    {
+        ERR("Failed to allocate swapchain memory.\n");
+        return E_OUTOFMEMORY;
+    }
+
+    hr = swapchain_init(object, This, present_parameters);
+    if (FAILED(hr))
+    {
+        WARN("Failed to initialize swapchain, hr %#x.\n", hr);
+        HeapFree(GetProcessHeap(), 0, object);
+        return hr;
+    }
+
+    TRACE("Created swapchain %p.\n", object);
+    *swapchain = (IDirect3DSwapChain8 *)object;
+
+    return D3D_OK;
+}
+
+static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) {
+    IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     WINED3DPRESENT_PARAMETERS localParameters;
-
-    TRACE("(%p) Relay\n", This);
-
-    /* Fix the back buffer count */
-    if(pPresentationParameters->BackBufferCount == 0) {
-        pPresentationParameters->BackBufferCount = 1;
-    }
-
-    object = HeapAlloc(GetProcessHeap(),  HEAP_ZERO_MEMORY, sizeof(*object));
-    if (NULL == object) {
-        FIXME("Allocation of memory failed\n");
-        *pSwapChain = NULL;
-        return D3DERR_OUTOFVIDEOMEMORY;
-    }
-    object->ref = 1;
-    object->lpVtbl = &Direct3DSwapChain8_Vtbl;
-
-    /* Allocate an associated WineD3DDevice object */
+    HRESULT hr;
+
+    TRACE("iface %p, present_parameters %p.\n", iface, pPresentationParameters);
+
     localParameters.BackBufferWidth                             = pPresentationParameters->BackBufferWidth;
     localParameters.BackBufferHeight                            = pPresentationParameters->BackBufferHeight;
@@ -527 +560 @@
 
     wined3d_mutex_lock();
-    hrc = IWineD3DDevice_CreateSwapChain(This->WineD3DDevice, &localParameters,
-            &object->wineD3DSwapChain, (IUnknown *)object, SURFACE_OPENGL);
+    hr = IWineD3DDevice_Reset(This->WineD3DDevice, &localParameters);
+    if(SUCCEEDED(hr)) {
+        hr = IWineD3DDevice_SetRenderState(This->WineD3DDevice, WINED3DRS_POINTSIZE_MIN, 0);
+    }
     wined3d_mutex_unlock();
 
@@ -545 +580 @@
     pPresentationParameters->FullScreen_PresentationInterval    = localParameters.PresentationInterval;
 
-    if (hrc != D3D_OK) {
-        FIXME("(%p) call to IWineD3DDevice_CreateSwapChain failed\n", This);
-        HeapFree(GetProcessHeap(), 0 , object);
-        *pSwapChain = NULL;
-    }else{
-        IUnknown_AddRef(iface);
-        object->parentDevice = iface;
-        *pSwapChain = (IDirect3DSwapChain8 *)object;
-    }
-    TRACE("(%p) returning %p\n", This, *pSwapChain);
-    return hrc;
-}
-
-static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) {
-    IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    WINED3DPRESENT_PARAMETERS localParameters;
-    HRESULT hr;
-
-    TRACE("(%p) Relay pPresentationParameters(%p)\n", This, pPresentationParameters);
-
-    localParameters.BackBufferWidth                             = pPresentationParameters->BackBufferWidth;
-    localParameters.BackBufferHeight                            = pPresentationParameters->BackBufferHeight;
-    localParameters.BackBufferFormat                            = wined3dformat_from_d3dformat(pPresentationParameters->BackBufferFormat);
-    localParameters.BackBufferCount                             = pPresentationParameters->BackBufferCount;
-    localParameters.MultiSampleType                             = pPresentationParameters->MultiSampleType;
-    localParameters.MultiSampleQuality                          = 0; /* d3d9 only */
-    localParameters.SwapEffect                                  = pPresentationParameters->SwapEffect;
-    localParameters.hDeviceWindow                               = pPresentationParameters->hDeviceWindow;
-    localParameters.Windowed                                    = pPresentationParameters->Windowed;
-    localParameters.EnableAutoDepthStencil                      = pPresentationParameters->EnableAutoDepthStencil;
-    localParameters.AutoDepthStencilFormat                      = wined3dformat_from_d3dformat(pPresentationParameters->AutoDepthStencilFormat);
-    localParameters.Flags                                       = pPresentationParameters->Flags;
-    localParameters.FullScreen_RefreshRateInHz                  = pPresentationParameters->FullScreen_RefreshRateInHz;
-    localParameters.PresentationInterval                        = pPresentationParameters->FullScreen_PresentationInterval;
-    localParameters.AutoRestoreDisplayMode                      = TRUE;
-
-    wined3d_mutex_lock();
-    hr = IWineD3DDevice_Reset(This->WineD3DDevice, &localParameters);
-    wined3d_mutex_unlock();
-
-    pPresentationParameters->BackBufferWidth                    = localParameters.BackBufferWidth;
-    pPresentationParameters->BackBufferHeight                   = localParameters.BackBufferHeight;
-    pPresentationParameters->BackBufferFormat                   = d3dformat_from_wined3dformat(localParameters.BackBufferFormat);
-    pPresentationParameters->BackBufferCount                    = localParameters.BackBufferCount;
-    pPresentationParameters->MultiSampleType                    = localParameters.MultiSampleType;
-    pPresentationParameters->SwapEffect                         = localParameters.SwapEffect;
-    pPresentationParameters->hDeviceWindow                      = localParameters.hDeviceWindow;
-    pPresentationParameters->Windowed                           = localParameters.Windowed;
-    pPresentationParameters->EnableAutoDepthStencil             = localParameters.EnableAutoDepthStencil;
-    pPresentationParameters->AutoDepthStencilFormat             = d3dformat_from_wined3dformat(localParameters.AutoDepthStencilFormat);
-    pPresentationParameters->Flags                              = localParameters.Flags;
-    pPresentationParameters->FullScreen_RefreshRateInHz         = localParameters.FullScreen_RefreshRateInHz;
-    pPresentationParameters->FullScreen_PresentationInterval    = localParameters.PresentationInterval;
-
     return hr;
 }
@@ -605 +586 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n",
+            iface, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion);
 
     wined3d_mutex_lock();
@@ -619 +602 @@
     HRESULT rc = D3D_OK;
 
-    TRACE("(%p) Relay\n", This);
+    TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n",
+            iface, BackBuffer, Type, ppBackBuffer);
 
     wined3d_mutex_lock();
@@ -635 +619 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus);
 
     wined3d_mutex_lock();
@@ -646 +631 @@
 static void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DWORD Flags, CONST D3DGAMMARAMP* pRamp) {
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, flags %#x, ramp %p.\n", iface, Flags, pRamp);
 
     /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */
@@ -656 +642 @@
 static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DGAMMARAMP* pRamp) {
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, ramp %p.\n", iface, pRamp);
 
     /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */
@@ -829 +816 @@
     HRESULT hr;
 
-    TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface);
+    TRACE("iface %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p,\n"
+            "\tusage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n",
+            iface, Width, Height, Format, Lockable, Discard, Level, ppSurface,
+            Usage, Pool, MultiSample, MultisampleQuality);
 
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl));
@@ -855 +845 @@
 static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, IDirect3DSurface8** ppSurface) {
     HRESULT hr;
-    TRACE("Relay\n");
+
+    TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, lockable %#x, surface %p.\n",
+            iface, Width, Height, Format, MultiSample, Lockable, ppSurface);
 
     hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */,
@@ -865 +857 @@
 static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, IDirect3DSurface8** ppSurface) {
     HRESULT hr;
-    TRACE("Relay\n");
+
+    TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, surface %p.\n",
+            iface, Width, Height, Format, MultiSample, ppSurface);
 
     /* TODO: Verify that Discard is false */
@@ -877 +871 @@
 static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) {
     HRESULT hr;
-    TRACE("Relay\n");
+
+    TRACE("iface %p, width %u, height %u, format %#x, surface %p.\n",
+            iface, Width, Height, Format, ppSurface);
 
     hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE /* Discard */,
@@ -892 +888 @@
     HRESULT              hr = WINED3D_OK;
     WINED3DFORMAT        srcFormat, destFormat;
-    UINT                 srcWidth,  destWidth;
-    UINT                 srcHeight, destHeight;
-    UINT                 srcSize;
     WINED3DSURFACE_DESC  winedesc;
 
-    TRACE("(%p) pSrcSur=%p, pSourceRects=%p, cRects=%d, pDstSur=%p, pDestPtsArr=%p\n", iface,
-          pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints);
-
-
-    /* Check that the source texture is in WINED3DPOOL_SYSTEMMEM and the destination texture is in WINED3DPOOL_DEFAULT */
+    TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n",
+            iface, pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints);
+
+    /* Check that the source texture is in WINED3DPOOL_SYSTEMMEM and the
+     * destination texture is in WINED3DPOOL_DEFAULT. */
 
     wined3d_mutex_lock();
     IWineD3DSurface_GetDesc(Source->wineD3DSurface, &winedesc);
     srcFormat = winedesc.format;
-    srcWidth = winedesc.width;
-    srcHeight = winedesc.height;
-    srcSize = winedesc.size;
 
     IWineD3DSurface_GetDesc(Dest->wineD3DSurface, &winedesc);
     destFormat = winedesc.format;
-    destWidth = winedesc.width;
-    destHeight = winedesc.height;
 
     /* Check that the source and destination formats match */
@@ -923 +911 @@
         TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface);
         IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat);
-        destFormat = srcFormat;
     }
 
@@ -950 +937 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, src_texture %p, dst_texture %p.\n", iface, pSourceTexture, pDestinationTexture);
 
     wined3d_mutex_lock();
@@ -964 +952 @@
     HRESULT hr;
 
-    TRACE("(%p) Relay\n" , This);
+    TRACE("iface %p, dst_surface %p.\n", iface, pDestSurface);
 
     if (pDestSurface == NULL) {
@@ -984 +972 @@
     IWineD3DSurface *original_ds = NULL;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, render_target %p, depth_stencil %p.\n", iface, pRenderTarget, pNewZStencil);
 
     wined3d_mutex_lock();
@@ -993 +982 @@
         hr = IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, pZSurface ? pZSurface->wineD3DSurface : NULL);
         if (SUCCEEDED(hr) && pSurface)
-            hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface->wineD3DSurface);
+            hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface->wineD3DSurface, TRUE);
         if (FAILED(hr)) IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, original_ds);
     }
@@ -1008 +997 @@
     IWineD3DSurface *pRenderTarget;
 
-    TRACE("(%p) Relay\n" , This);
+    TRACE("iface %p, render_target %p.\n", iface, ppRenderTarget);
 
     if (ppRenderTarget == NULL) {
@@ -1034 +1023 @@
     IWineD3DSurface *pZStencilSurface;
 
-    TRACE("(%p) Relay\n" , This);
+    TRACE("iface %p, depth_stencil %p.\n", iface, ppZStencilSurface);
+
     if(ppZStencilSurface == NULL){
         return D3DERR_INVALIDCALL;
@@ -1057 +1047 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p.\n", iface);
 
     wined3d_mutex_lock();
@@ -1066 +1057 @@
 }
 
-static HRESULT WINAPI IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) {
-    IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) {
+    IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
+    HRESULT hr;
+
+    TRACE("iface %p.\n", iface);
 
     wined3d_mutex_lock();
@@ -1081 +1073 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n",
+            iface, Count, pRects, Flags, Color, Z, Stencil);
 
     /* Note: D3DRECT is compatible with WINED3DRECT */
@@ -1094 +1088 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, state %#x, matrix %p.\n", iface, State, lpMatrix);
 
     /* Note: D3DMATRIX is compatible with WINED3DMATRIX */
@@ -1107 +1102 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, state %#x, matrix %p.\n", iface, State, pMatrix);
 
     /* Note: D3DMATRIX is compatible with WINED3DMATRIX */
@@ -1120 +1116 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, state %#x, matrix %p.\n", iface, State, pMatrix);
 
     /* Note: D3DMATRIX is compatible with WINED3DMATRIX */
@@ -1133 +1130 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, viewport %p.\n", iface, pViewport);
 
     /* Note: D3DVIEWPORT8 is compatible with WINED3DVIEWPORT */
@@ -1146 +1144 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, viewport %p.\n", iface, pViewport);
 
     /* Note: D3DVIEWPORT8 is compatible with WINED3DVIEWPORT */
@@ -1159 +1158 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, material %p.\n", iface, pMaterial);
 
     /* Note: D3DMATERIAL8 is compatible with WINED3DMATERIAL */
@@ -1172 +1172 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, material %p.\n", iface, pMaterial);
 
     /* Note: D3DMATERIAL8 is compatible with WINED3DMATERIAL */
@@ -1185 +1186 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, index %u, light %p.\n", iface, Index, pLight);
 
     /* Note: D3DLIGHT8 is compatible with WINED3DLIGHT */
@@ -1198 +1200 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, index %u, light %p.\n", iface, Index, pLight);
 
     /* Note: D3DLIGHT8 is compatible with WINED3DLIGHT */
@@ -1211 +1214 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, index %u, enable %#x.\n", iface, Index, Enable);
 
     wined3d_mutex_lock();
@@ -1223 +1227 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, index %u, enable %p.\n", iface, Index, pEnable);
 
     wined3d_mutex_lock();
@@ -1235 +1240 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, index %u, plane %p.\n", iface, Index, pPlane);
 
     wined3d_mutex_lock();
@@ -1247 +1253 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, index %u, plane %p.\n", iface, Index, pPlane);
 
     wined3d_mutex_lock();
@@ -1259 +1266 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, state %#x, value %#x.\n", iface, State, Value);
 
     wined3d_mutex_lock();
@@ -1271 +1279 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, state %#x, value %p.\n", iface, State, pValue);
 
     wined3d_mutex_lock();
@@ -1283 +1292 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p)\n", This);
+
+    TRACE("iface %p.\n", iface);
 
     wined3d_mutex_lock();
@@ -1294 +1304 @@
 static HRESULT WINAPI IDirect3DDevice8Impl_EndStateBlock(LPDIRECT3DDEVICE8 iface, DWORD* pToken) {
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    HRESULT hr;
-    IWineD3DStateBlock* wineD3DStateBlock;
-    IDirect3DStateBlock8Impl* object;
-
-    TRACE("(%p) Relay\n", This);
+    IWineD3DStateBlock *stateblock;
+    HRESULT hr;
+
+    TRACE("iface %p, token %p.\n", iface, pToken);
 
     /* Tell wineD3D to endstateblock before anything else (in case we run out
@@ -1304 +1313 @@
      */
     wined3d_mutex_lock();
-    hr = IWineD3DDevice_EndStateBlock(This->WineD3DDevice , &wineD3DStateBlock);
+    hr = IWineD3DDevice_EndStateBlock(This->WineD3DDevice , &stateblock);
     if (hr != D3D_OK) {
         WARN("IWineD3DDevice_EndStateBlock returned an error\n");
@@ -1311 +1320 @@
     }
 
-    /* allocate a new IDirectD3DStateBlock */
-    object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY ,sizeof(IDirect3DStateBlock8Impl));
-    object->ref = 1;
-    object->lpVtbl = &Direct3DStateBlock8_Vtbl;
-
-    object->wineD3DStateBlock = wineD3DStateBlock;
-
-    *pToken = d3d8_allocate_handle(&This->handle_table, object, D3D8_HANDLE_SB);
+    *pToken = d3d8_allocate_handle(&This->handle_table, stateblock, D3D8_HANDLE_SB);
     wined3d_mutex_unlock();
 
@@ -1324 +1326 @@
     {
         ERR("Failed to create a handle\n");
-        IDirect3DStateBlock8_Release((IDirect3DStateBlock8 *)object);
+        wined3d_mutex_lock();
+        IWineD3DStateBlock_Release(stateblock);
+        wined3d_mutex_unlock();
         return E_FAIL;
     }
     ++*pToken;
 
-    TRACE("Returning %#x (%p).\n", *pToken, object);
+    TRACE("Returning %#x (%p).\n", *pToken, stateblock);
 
     return hr;
@@ -1336 +1340 @@
 static HRESULT WINAPI IDirect3DDevice8Impl_ApplyStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) {
     IDirect3DDevice8Impl     *This = (IDirect3DDevice8Impl *)iface;
-    IDirect3DStateBlock8Impl *pSB;
-    HRESULT hr;
-
-    TRACE("(%p) %#x Relay\n", This, Token);
-
-    wined3d_mutex_lock();
-    pSB = d3d8_get_object(&This->handle_table, Token - 1, D3D8_HANDLE_SB);
-    if (!pSB)
+    IWineD3DStateBlock *stateblock;
+    HRESULT hr;
+
+    TRACE("iface %p, token %#x.\n", iface, Token);
+
+    wined3d_mutex_lock();
+    stateblock = d3d8_get_object(&This->handle_table, Token - 1, D3D8_HANDLE_SB);
+    if (!stateblock)
     {
         WARN("Invalid handle (%#x) passed.\n", Token);
@@ -1349 +1353 @@
         return D3DERR_INVALIDCALL;
     }
-    hr = IWineD3DStateBlock_Apply(pSB->wineD3DStateBlock);
+    hr = IWineD3DStateBlock_Apply(stateblock);
     wined3d_mutex_unlock();
 
@@ -1357 +1361 @@
 static HRESULT WINAPI IDirect3DDevice8Impl_CaptureStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) {
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    IDirect3DStateBlock8Impl *pSB;
-    HRESULT hr;
-
-    TRACE("(%p) %#x Relay\n", This, Token);
-
-    wined3d_mutex_lock();
-    pSB = d3d8_get_object(&This->handle_table, Token - 1, D3D8_HANDLE_SB);
-    if (!pSB)
+    IWineD3DStateBlock *stateblock;
+    HRESULT hr;
+
+    TRACE("iface %p, token %#x.\n", iface, Token);
+
+    wined3d_mutex_lock();
+    stateblock = d3d8_get_object(&This->handle_table, Token - 1, D3D8_HANDLE_SB);
+    if (!stateblock)
     {
         WARN("Invalid handle (%#x) passed.\n", Token);
@@ -1370 +1374 @@
         return D3DERR_INVALIDCALL;
     }
-    hr = IWineD3DStateBlock_Capture(pSB->wineD3DStateBlock);
+    hr = IWineD3DStateBlock_Capture(stateblock);
     wined3d_mutex_unlock();
 
@@ -1378 +1382 @@
 static HRESULT WINAPI IDirect3DDevice8Impl_DeleteStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) {
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    IDirect3DStateBlock8Impl *pSB;
-
-    TRACE("(%p) Relay\n", This);
-
-    wined3d_mutex_lock();
-    pSB = d3d8_free_handle(&This->handle_table, Token - 1, D3D8_HANDLE_SB);
-    wined3d_mutex_unlock();
-
-    if (!pSB)
+    IWineD3DStateBlock *stateblock;
+
+    TRACE("iface %p, token %#x.\n", iface, Token);
+
+    wined3d_mutex_lock();
+    stateblock = d3d8_free_handle(&This->handle_table, Token - 1, D3D8_HANDLE_SB);
+
+    if (!stateblock)
     {
         WARN("Invalid handle (%#x) passed.\n", Token);
+        wined3d_mutex_unlock();
         return D3DERR_INVALIDCALL;
     }
 
-    if (IUnknown_Release((IUnknown *)pSB))
-    {
-        ERR("Stateblock %p has references left, this shouldn't happen.\n", pSB);
-    }
+    if (IWineD3DStateBlock_Release((IUnknown *)stateblock))
+    {
+        ERR("Stateblock %p has references left, this shouldn't happen.\n", stateblock);
+    }
+    wined3d_mutex_unlock();
 
     return D3D_OK;
@@ -1404 +1409 @@
 {
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    IDirect3DStateBlock8Impl *object;
-    HRESULT hr;
-
-    TRACE("(%p) Relay\n", This);
+    IWineD3DStateBlock *stateblock;
+    HRESULT hr;
+
+    TRACE("iface %p, type %#x, handle %p.\n", iface, Type, handle);
 
     if (Type != D3DSBT_ALL
@@ -1417 +1422 @@
     }
 
-    object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock8Impl));
-    if (!object)
-    {
-        ERR("Failed to allocate memory.\n");
-        return E_OUTOFMEMORY;
-    }
-
-    object->lpVtbl = &Direct3DStateBlock8_Vtbl;
-    object->ref = 1;
-
     wined3d_mutex_lock();
     hr = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type,
-            &object->wineD3DStateBlock, (IUnknown *)object);
+            &stateblock, NULL);
     if (FAILED(hr))
     {
         wined3d_mutex_unlock();
         ERR("IWineD3DDevice_CreateStateBlock failed, hr %#x\n", hr);
-        HeapFree(GetProcessHeap(), 0, object);
         return hr;
     }
 
-    *handle = d3d8_allocate_handle(&This->handle_table, object, D3D8_HANDLE_SB);
+    *handle = d3d8_allocate_handle(&This->handle_table, stateblock, D3D8_HANDLE_SB);
     wined3d_mutex_unlock();
 
@@ -1444 +1438 @@
     {
         ERR("Failed to allocate a handle.\n");
-        IDirect3DStateBlock8_Release((IDirect3DStateBlock8 *)object);
+        wined3d_mutex_lock();
+        IWineD3DStateBlock_Release(stateblock);
+        wined3d_mutex_unlock();
         return E_FAIL;
     }
     ++*handle;
 
-    TRACE("Returning %#x (%p).\n", *handle, object);
+    TRACE("Returning %#x (%p).\n", *handle, stateblock);
 
     return hr;
@@ -1457 +1453 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, clip_status %p.\n", iface, pClipStatus);
 /* FIXME: Verify that D3DCLIPSTATUS8 ~= WINED3DCLIPSTATUS */
 
@@ -1470 +1467 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, clip_status %p.\n", iface, pClipStatus);
 
     wined3d_mutex_lock();
@@ -1484 +1482 @@
     HRESULT hr;
 
-    TRACE("(%p) Relay\n" , This);
+    TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture);
 
     if(ppTexture == NULL){
@@ -1517 +1515 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay %d %p\n" , This, Stage, pTexture);
+
+    TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, pTexture);
 
     wined3d_mutex_lock();
@@ -1569 +1568 @@
     const struct tss_lookup *l = &tss_lookup[Type];
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, Type, pValue);
 
     wined3d_mutex_lock();
@@ -1583 +1583 @@
     const struct tss_lookup *l = &tss_lookup[Type];
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, Stage, Type, Value);
 
     wined3d_mutex_lock();
@@ -1596 +1597 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, pass_count %p.\n", iface, pNumPasses);
 
     wined3d_mutex_lock();
@@ -1605 +1607 @@
 }
 
-static HRESULT WINAPI IDirect3DDevice8Impl_GetInfo(LPDIRECT3DDEVICE8 iface, DWORD DevInfoID, void* pDevInfoStruct, DWORD DevInfoStructSize) {
-    IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
-    FIXME("(%p) : stub\n", This);
+static HRESULT WINAPI IDirect3DDevice8Impl_GetInfo(IDirect3DDevice8 *iface,
+        DWORD info_id, void *info, DWORD info_size)
+{
+    FIXME("iface %p, info_id %#x, info %p, info_size %u stub!\n", iface, info_id, info, info_size);
+
     return D3D_OK;
 }
@@ -1614 +1618 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries);
 
     wined3d_mutex_lock();
@@ -1626 +1631 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries);
 
     wined3d_mutex_lock();
@@ -1638 +1644 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, palette_idx %u.\n", iface, PaletteNumber);
 
     wined3d_mutex_lock();
@@ -1650 +1657 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, palette_idx %p.\n", iface, PaletteNumber);
 
     wined3d_mutex_lock();
@@ -1664 +1672 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n",
+            iface, PrimitiveType, StartVertex, PrimitiveCount);
 
     wined3d_mutex_lock();
@@ -1679 +1689 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, start_idx %u, primitive_count %u.\n",
+            iface, PrimitiveType, MinVertexIndex, NumVertices, startIndex, primCount);
 
     wined3d_mutex_lock();
@@ -1693 +1705 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n",
+            iface, PrimitiveType, PrimitiveCount, pVertexStreamZeroData, VertexStreamZeroStride);
 
     wined3d_mutex_lock();
@@ -1711 +1725 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, index_count %u, primitive_count %u,\n"
+            "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n",
+            iface, PrimitiveType, MinVertexIndex, NumVertexIndices, PrimitiveCount,
+            pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride);
 
     wined3d_mutex_lock();
@@ -1727 +1745 @@
     HRESULT hr;
     IDirect3DVertexBuffer8Impl *dest = (IDirect3DVertexBuffer8Impl *) pDestBuffer;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, flags %#x.\n",
+            iface, SrcStartIndex, DestIndex, VertexCount, pDestBuffer, Flags);
 
     wined3d_mutex_lock();
@@ -1854 +1874 @@
     HRESULT hr;
 
-    TRACE("(%p) : Relay\n", This);
+    TRACE("iface %p, shader %#x.\n", iface, pShader);
 
     if (VS_HIGHESTFIXEDFXF >= pShader) {
@@ -1896 +1916 @@
     HRESULT hrc;
 
-    TRACE("(%p) : Relay  device@%p\n", This, This->WineD3DDevice);
+    TRACE("iface %p, shader %p.\n", iface, ppShader);
 
     wined3d_mutex_lock();
@@ -1934 +1954 @@
     IWineD3DVertexShader *cur = NULL;
 
-    TRACE("(%p) : pShader %#x\n", This, pShader);
+    TRACE("iface %p, shader %#x.\n", iface, pShader);
 
     wined3d_mutex_lock();
@@ -1967 +1987 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) : Relay\n", This);
+
+    TRACE("iface %p, register %u, data %p, count %u.\n",
+            iface, Register, pConstantData, ConstantCount);
 
     if(Register + ConstantCount > D3D8_MAX_VERTEX_SHADER_CONSTANTF) {
@@ -1985 +2007 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) : Relay\n", This);
+
+    TRACE("iface %p, register %u, data %p, count %u.\n",
+            iface, Register, pConstantData, ConstantCount);
 
     if(Register + ConstantCount > D3D8_MAX_VERTEX_SHADER_CONSTANTF) {
@@ -2005 +2029 @@
     IDirect3DVertexShader8Impl *shader;
 
-    TRACE("(%p) : pVertexShader 0x%08x, pData %p, *pSizeOfData %u\n", This, pVertexShader, pData, *pSizeOfData);
+    TRACE("iface %p, shader %#x, data %p, data_size %p.\n",
+            iface, pVertexShader, pData, pSizeOfData);
 
     wined3d_mutex_lock();
@@ -2041 +2066 @@
     HRESULT hr;
 
-    TRACE("(%p) : pVertexShader %#x, pData %p, pSizeOfData %p\n", This, pVertexShader, pData, pSizeOfData);
+    TRACE("iface %p, shader %#x, data %p, data_size %p.\n",
+            iface, pVertexShader, pData, pSizeOfData);
 
     wined3d_mutex_lock();
@@ -2070 +2096 @@
     HRESULT hr;
     IDirect3DIndexBuffer8Impl *ib = (IDirect3DIndexBuffer8Impl *)pIndexData;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, buffer %p, base_vertex_idx %u.\n", iface, pIndexData, baseVertexIndex);
 
     /* WineD3D takes an INT(due to d3d9), but d3d8 uses UINTs. Do I have to add a check here that
@@ -2093 +2120 @@
     HRESULT rc = D3D_OK;
 
-    TRACE("(%p) Relay\n", This);
+    TRACE("iface %p, buffer %p, base_vertex_index %p.\n", iface, ppIndexData, pBaseVertexIndex);
 
     if(ppIndexData == NULL){
@@ -2174 +2201 @@
     HRESULT hr;
 
-    TRACE("(%p) : pShader %#x\n", This, pShader);
+    TRACE("iface %p, shader %#x.\n", iface, pShader);
 
     wined3d_mutex_lock();
@@ -2203 +2230 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     IWineD3DPixelShader *object;
-
     HRESULT hrc = D3D_OK;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, shader %p.\n", iface, ppShader);
+
     if (NULL == ppShader) {
         TRACE("(%p) Invalid call\n", This);
@@ -2234 +2262 @@
     IWineD3DPixelShader *cur = NULL;
 
-    TRACE("(%p) : pShader %#x\n", This, pShader);
+    TRACE("iface %p, shader %#x.\n", iface, pShader);
 
     wined3d_mutex_lock();
@@ -2243 +2271 @@
         WARN("Invalid handle (%#x) passed.\n", pShader);
         wined3d_mutex_unlock();
-        return D3D_OK;
+        return D3DERR_INVALIDCALL;
     }
 
@@ -2267 +2295 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, register %u, data %p, count %u.\n",
+            iface, Register, pConstantData, ConstantCount);
 
     wined3d_mutex_lock();
@@ -2279 +2309 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, register %u, data %p, count %u.\n",
+            iface, Register, pConstantData, ConstantCount);
 
     wined3d_mutex_lock();
@@ -2293 +2325 @@
     HRESULT hr;
 
-    TRACE("(%p) : pPixelShader %#x, pData %p, pSizeOfData %p\n", This, pPixelShader, pData, pSizeOfData);
+    TRACE("iface %p, shader %#x, data %p, data_size %p.\n",
+            iface, pPixelShader, pData, pSizeOfData);
 
     wined3d_mutex_lock();
@@ -2314 +2347 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, handle %#x, segment_count %p, patch_info %p.\n",
+            iface, Handle, pNumSegs, pRectPatchInfo);
 
     wined3d_mutex_lock();
@@ -2326 +2361 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, handle %#x, segment_count %p, patch_info %p.\n",
+            iface, Handle, pNumSegs, pTriPatchInfo);
 
     wined3d_mutex_lock();
@@ -2338 +2375 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n", This);
+
+    TRACE("iface %p, handle %#x.\n", iface, Handle);
 
     wined3d_mutex_lock();
@@ -2350 +2388 @@
     IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
     HRESULT hr;
-    TRACE("(%p) Relay\n" , This);
+
+    TRACE("iface %p, stream_idx %u, buffer %p, stride %u.\n",
+            iface, StreamNumber, pStreamData, Stride);
 
     wined3d_mutex_lock();
@@ -2366 +2406 @@
     HRESULT rc = D3D_OK;
 
-    TRACE("(%p) Relay\n" , This);
+    TRACE("iface %p, stream_idx %u, buffer %p, stride %p.\n",
+            iface, StreamNumber, pStream, pStride);
 
     if(pStream == NULL){
@@ -2388 +2429 @@
 }
 
-
-const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl =
+static const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl =
 {
     IDirect3DDevice8Impl_QueryInterface,
@@ -2717 +2757 @@
 }
 
-const IWineD3DDeviceParentVtbl d3d8_wined3d_device_parent_vtbl =
+static const IWineD3DDeviceParentVtbl d3d8_wined3d_device_parent_vtbl =
 {
     /* IUnknown methods */
@@ -2731 +2771 @@
     device_parent_CreateSwapChain,
 };
+
+HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapter,
+        D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters)
+{
+    WINED3DPRESENT_PARAMETERS wined3d_parameters;
+    HRESULT hr;
+
+    device->lpVtbl = &Direct3DDevice8_Vtbl;
+    device->device_parent_vtbl = &d3d8_wined3d_device_parent_vtbl;
+    device->ref = 1;
+    device->handle_table.entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+            D3D8_INITIAL_HANDLE_TABLE_SIZE * sizeof(*device->handle_table.entries));
+    if (!device->handle_table.entries)
+    {
+        ERR("Failed to allocate handle table memory.\n");
+        return E_OUTOFMEMORY;
+    }
+    device->handle_table.table_size = D3D8_INITIAL_HANDLE_TABLE_SIZE;
+
+    wined3d_mutex_lock();
+    hr = IWineD3D_CreateDevice(wined3d, adapter, device_type, focus_window, flags, (IUnknown *)device,
+            (IWineD3DDeviceParent *)&device->device_parent_vtbl, &device->WineD3DDevice);
+    if (FAILED(hr))
+    {
+        WARN("Failed to create wined3d device, hr %#x.\n", hr);
+        wined3d_mutex_unlock();
+        HeapFree(GetProcessHeap(), 0, device->handle_table.entries);
+        return hr;
+    }
+
+    if (flags & D3DCREATE_MULTITHREADED) IWineD3DDevice_SetMultithreaded(device->WineD3DDevice);
+
+    wined3d_parameters.BackBufferWidth = parameters->BackBufferWidth;
+    wined3d_parameters.BackBufferHeight = parameters->BackBufferHeight;
+    wined3d_parameters.BackBufferFormat = wined3dformat_from_d3dformat(parameters->BackBufferFormat);
+    wined3d_parameters.BackBufferCount = parameters->BackBufferCount;
+    wined3d_parameters.MultiSampleType = parameters->MultiSampleType;
+    wined3d_parameters.MultiSampleQuality = 0; /* d3d9 only */
+    wined3d_parameters.SwapEffect = parameters->SwapEffect;
+    wined3d_parameters.hDeviceWindow = parameters->hDeviceWindow;
+    wined3d_parameters.Windowed = parameters->Windowed;
+    wined3d_parameters.EnableAutoDepthStencil = parameters->EnableAutoDepthStencil;
+    wined3d_parameters.AutoDepthStencilFormat = wined3dformat_from_d3dformat(parameters->AutoDepthStencilFormat);
+    wined3d_parameters.Flags = parameters->Flags;
+    wined3d_parameters.FullScreen_RefreshRateInHz = parameters->FullScreen_RefreshRateInHz;
+    wined3d_parameters.PresentationInterval = parameters->FullScreen_PresentationInterval;
+    wined3d_parameters.AutoRestoreDisplayMode = TRUE;
+
+    hr = IWineD3DDevice_Init3D(device->WineD3DDevice, &wined3d_parameters);
+    if (FAILED(hr))
+    {
+        WARN("Failed to initialize 3D, hr %#x.\n", hr);
+        IWineD3DDevice_Release(device->WineD3DDevice);
+        wined3d_mutex_unlock();
+        HeapFree(GetProcessHeap(), 0, device->handle_table.entries);
+        return hr;
+    }
+
+    hr = IWineD3DDevice_SetRenderState(device->WineD3DDevice, WINED3DRS_POINTSIZE_MIN, 0);
+    wined3d_mutex_unlock();
+    if (FAILED(hr))
+    {
+        ERR("Failed to set minimum pointsize, hr %#x.\n", hr);
+        goto err;
+    }
+
+    parameters->BackBufferWidth = wined3d_parameters.BackBufferWidth;
+    parameters->BackBufferHeight = wined3d_parameters.BackBufferHeight;
+    parameters->BackBufferFormat = d3dformat_from_wined3dformat(wined3d_parameters.BackBufferFormat);
+    parameters->BackBufferCount = wined3d_parameters.BackBufferCount;
+    parameters->MultiSampleType = wined3d_parameters.MultiSampleType;
+    parameters->SwapEffect = wined3d_parameters.SwapEffect;
+    parameters->hDeviceWindow = wined3d_parameters.hDeviceWindow;
+    parameters->Windowed = wined3d_parameters.Windowed;
+    parameters->EnableAutoDepthStencil = wined3d_parameters.EnableAutoDepthStencil;
+    parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(wined3d_parameters.AutoDepthStencilFormat);
+    parameters->Flags = wined3d_parameters.Flags;
+    parameters->FullScreen_RefreshRateInHz = wined3d_parameters.FullScreen_RefreshRateInHz;
+    parameters->FullScreen_PresentationInterval = wined3d_parameters.PresentationInterval;
+
+    device->declArraySize = 16;
+    device->decls = HeapAlloc(GetProcessHeap(), 0, device->declArraySize * sizeof(*device->decls));
+    if (!device->decls)
+    {
+        ERR("Failed to allocate FVF vertex delcaration map memory.\n");
+        hr = E_OUTOFMEMORY;
+        goto err;
+    }
+
+    return D3D_OK;
+
+err:
+    wined3d_mutex_lock();
+    IWineD3DDevice_Uninit3D(device->WineD3DDevice, D3D8CB_DestroySwapChain);
+    IWineD3DDevice_Release(device->WineD3DDevice);
+    wined3d_mutex_unlock();
+    HeapFree(GetProcessHeap(), 0, device->handle_table.entries);
+    return hr;
+}