[PATCH 8/8] ddraw: Add / improve TRACEs.
Henri Verbeet
hverbeet at codeweavers.com
Thu Aug 19 11:57:50 CDT 2010
---
dlls/ddraw/clipper.c | 25 ++-
dlls/ddraw/ddraw.c | 112 +++++----
dlls/ddraw/device.c | 598 +++++++++++++++++++++++++++-----------------
dlls/ddraw/executebuffer.c | 122 +++++-----
dlls/ddraw/light.c | 40 ++--
dlls/ddraw/main.c | 65 +++---
dlls/ddraw/material.c | 70 +++---
dlls/ddraw/palette.c | 22 +-
dlls/ddraw/parent.c | 6 +-
dlls/ddraw/surface.c | 157 +++++++-----
dlls/ddraw/vertexbuffer.c | 78 +++---
dlls/ddraw/viewport.c | 78 ++++---
12 files changed, 807 insertions(+), 566 deletions(-)
diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c
index a7ec624..11ba667 100644
--- a/dlls/ddraw/clipper.c
+++ b/dlls/ddraw/clipper.c
@@ -49,6 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
static HRESULT WINAPI IDirectDrawClipperImpl_QueryInterface(
LPDIRECTDRAWCLIPPER iface, REFIID riid, LPVOID* ppvObj
) {
+
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppvObj);
+
if (IsEqualGUID(&IID_IUnknown, riid)
|| IsEqualGUID(&IID_IDirectDrawClipper, riid))
{
@@ -73,7 +76,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_AddRef( LPDIRECTDRAWCLIPPER iface )
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -89,7 +92,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) {
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (ref == 0)
{
@@ -122,7 +125,8 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd(
) {
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%p)\n", This, dwFlags, hWnd);
+
+ TRACE("iface %p, flags %#x, window %p.\n", iface, dwFlags, hWnd);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DClipper_SetHWnd(This->wineD3DClipper,
@@ -160,7 +164,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList(
{
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
HRESULT hr;
- TRACE("(%p,%p,%p,%p)\n", This, lpRect, lpClipList, lpdwSize);
+
+ TRACE("iface %p, rect %s, clip_list %p, clip_list_size %p.\n",
+ iface, wine_dbgstr_rect(lpRect), lpClipList, lpdwSize);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DClipper_GetClipList(This->wineD3DClipper,
@@ -191,6 +197,8 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList(
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
HRESULT hr;
+ TRACE("iface %p, clip_list %p, flags %#x.\n", iface, lprgn, dwFlag);
+
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DClipper_SetClipList(This->wineD3DClipper,
lprgn,
@@ -215,7 +223,8 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd(
) {
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p)\n", This, hWndPtr);
+
+ TRACE("iface %p, window %p.\n", iface, hWndPtr);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DClipper_GetHWnd(This->wineD3DClipper,
@@ -242,7 +251,8 @@ static HRESULT WINAPI IDirectDrawClipperImpl_Initialize(
LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags
) {
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
- TRACE("(%p)->(%p,0x%08x)\n", This, lpDD, dwFlags);
+
+ TRACE("iface %p, ddraw %p, flags %#x.\n", iface, lpDD, dwFlags);
EnterCriticalSection(&ddraw_cs);
if (This->initialized)
@@ -271,8 +281,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_Initialize(
static HRESULT WINAPI IDirectDrawClipperImpl_IsClipListChanged(
LPDIRECTDRAWCLIPPER iface, BOOL* lpbChanged
) {
- IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
- FIXME("(%p)->(%p),stub!\n",This,lpbChanged);
+ FIXME("iface %p, changed %p stub!\n", iface, lpbChanged);
/* XXX What is safest? */
*lpbChanged = FALSE;
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 032b15c..73b88b6 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -94,7 +94,7 @@ static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid,
{
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(refiid), obj);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(refiid), obj);
/* Can change surface impl type */
EnterCriticalSection(&ddraw_cs);
@@ -293,7 +293,7 @@ static ULONG WINAPI ddraw7_AddRef(IDirectDraw7 *iface)
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref7);
- TRACE("(%p) : incrementing IDirectDraw7 refcount from %u.\n", This, ref -1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces);
@@ -423,7 +423,7 @@ static ULONG WINAPI ddraw7_Release(IDirectDraw7 *iface)
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref7);
- TRACE("(%p)->() decrementing IDirectDraw7 refcount from %u.\n", This, ref +1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
ddraw_destroy(This);
@@ -564,7 +564,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd,
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
HWND window;
- TRACE("(%p)->(%p,%08x)\n",This,hwnd,cooplevel);
+ TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, cooplevel);
DDRAW_dump_cooperativelevel(cooplevel);
EnterCriticalSection(&ddraw_cs);
@@ -783,12 +783,14 @@ static HRESULT ddraw_set_display_mode(IDirectDraw7 *iface, DWORD Width, DWORD He
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
WINED3DDISPLAYMODE Mode;
HRESULT hr;
- TRACE("(%p)->(%d,%d,%d,%d,%x): Relay!\n", This, Width, Height, BPP, RefreshRate, Flags);
+
+ TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n",
+ iface, Width, Height, BPP, RefreshRate, Flags);
EnterCriticalSection(&ddraw_cs);
if( !Width || !Height )
{
- ERR("Width=%d, Height=%d, what to do?\n", Width, Height);
+ ERR("Width %u, Height %u, what to do?\n", Width, Height);
/* It looks like Need for Speed Porsche Unleashed expects DD_OK here */
LeaveCriticalSection(&ddraw_cs);
return DD_OK;
@@ -857,9 +859,13 @@ static HRESULT ddraw_set_display_mode(IDirectDraw7 *iface, DWORD Width, DWORD He
static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD Width, DWORD Height,
DWORD BPP, DWORD RefreshRate, DWORD Flags)
{
+ TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n",
+ iface, Width, Height, BPP, RefreshRate, Flags);
+
if (force_refresh_rate != 0)
{
- TRACE("ForceRefreshRate overriding passed-in refresh rate (%d Hz) to %d Hz\n", RefreshRate, force_refresh_rate);
+ TRACE("ForceRefreshRate overriding passed-in refresh rate (%u Hz) to %u Hz\n",
+ RefreshRate, force_refresh_rate);
RefreshRate = force_refresh_rate;
}
@@ -927,7 +933,8 @@ static HRESULT WINAPI ddraw1_SetDisplayMode(IDirectDraw *iface, DWORD width, DWO
static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface)
{
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)\n", This);
+
+ TRACE("iface %p.\n", iface);
return ddraw_set_display_mode(iface, This->orig_width, This->orig_height, This->orig_bpp, 0, 0);
}
@@ -982,7 +989,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
WINED3DCAPS winecaps;
HRESULT hr;
DDSCAPS2 ddscaps = {0, 0, 0, 0};
- TRACE("(%p)->(%p,%p)\n", This, DriverCaps, HELCaps);
+
+ TRACE("iface %p, driver_caps %p, hel_caps %p.\n", iface, DriverCaps, HELCaps);
/* One structure must be != NULL */
if( (!DriverCaps) && (!HELCaps) )
@@ -1099,8 +1107,7 @@ static HRESULT WINAPI ddraw1_GetCaps(IDirectDraw *iface, DDCAPS *driver_caps, DD
*****************************************************************************/
static HRESULT WINAPI ddraw7_Compact(IDirectDraw7 *iface)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)\n", This);
+ TRACE("iface %p.\n", iface);
return DD_OK;
}
@@ -1153,7 +1160,8 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2
HRESULT hr;
WINED3DDISPLAYMODE Mode;
DWORD Size;
- TRACE("(%p)->(%p): Relay\n", This, DDSD);
+
+ TRACE("iface %p, surface_desc %p.\n", iface, DDSD);
EnterCriticalSection(&ddraw_cs);
/* This seems sane */
@@ -1256,7 +1264,8 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes
HRESULT hr;
WINED3DDISPLAYMODE d3ddm;
WINED3DSURFTYPE type = This->ImplType;
- TRACE("(%p)->(%p, %p)\n", This, NumCodes, Codes);
+
+ TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes);
IWineD3DDevice_GetDisplayMode(This->wineD3DDevice,
0 /* swapchain 0 */,
@@ -1334,8 +1343,7 @@ static HRESULT WINAPI ddraw1_GetFourCCCodes(IDirectDraw *iface, DWORD *codes_cou
*****************************************************************************/
static HRESULT WINAPI ddraw7_GetMonitorFrequency(IDirectDraw7 *iface, DWORD *Freq)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)->(%p)\n", This, Freq);
+ FIXME("iface %p, frequency %p stub!\n", iface, Freq);
/* Ideally this should be in WineD3D, as it concerns the screen setup,
* but for now this should make the games happy
@@ -1389,7 +1397,8 @@ static HRESULT WINAPI ddraw1_GetMonitorFrequency(IDirectDraw *iface, DWORD *freq
static HRESULT WINAPI ddraw7_GetVerticalBlankStatus(IDirectDraw7 *iface, BOOL *status)
{
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)->(%p)\n", This, status);
+
+ TRACE("iface %p, status %p.\n", iface, status);
/* This looks sane, the MSDN suggests it too */
EnterCriticalSection(&ddraw_cs);
@@ -1451,7 +1460,8 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st
static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total, DWORD *free)
{
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)->(%p, %p, %p)\n", This, Caps, total, free);
+
+ TRACE("iface %p, caps %p, total %p, free %p.\n", iface, Caps, total, free);
if(TRACE_ON(ddraw))
{
@@ -1525,7 +1535,8 @@ static HRESULT WINAPI ddraw2_GetAvailableVidMem(IDirectDraw2 *iface,
static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *Guid)
{
IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)->(%s): No-op\n", This, debugstr_guid(Guid));
+
+ TRACE("iface %p, guid %s.\n", iface, debugstr_guid(Guid));
if(This->initialized)
{
@@ -1587,8 +1598,7 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid)
*****************************************************************************/
static HRESULT WINAPI ddraw7_FlipToGDISurface(IDirectDraw7 *iface)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)\n", This);
+ FIXME("iface %p stub!\n", iface);
return DD_OK;
}
@@ -1638,15 +1648,16 @@ static HRESULT WINAPI ddraw1_FlipToGDISurface(IDirectDraw *iface)
* Always returns DD_OK
*
*****************************************************************************/
-static HRESULT WINAPI ddraw7_WaitForVerticalBlank(IDirectDraw7 *iface, DWORD Flags, HANDLE h)
+static HRESULT WINAPI ddraw7_WaitForVerticalBlank(IDirectDraw7 *iface, DWORD Flags, HANDLE event)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- static BOOL hide = FALSE;
+ static BOOL hide;
+
+ TRACE("iface %p, flags %#x, event %p.\n", iface, Flags, event);
/* This function is called often, so print the fixme only once */
if(!hide)
{
- FIXME("(%p)->(%x,%p): Stub\n", This, Flags, h);
+ FIXME("iface %p, flags %#x, event %p stub!\n", iface, Flags, event);
hide = TRUE;
}
@@ -1703,11 +1714,13 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline)
static BOOL hide = FALSE;
WINED3DDISPLAYMODE Mode;
+ TRACE("iface %p, line %p.\n", iface, Scanline);
+
/* This function is called often, so print the fixme only once */
EnterCriticalSection(&ddraw_cs);
if(!hide)
{
- FIXME("(%p)->(%p): Semi-Stub\n", This, Scanline);
+ FIXME("iface %p, line %p partial stub!\n", iface, Scanline);
hide = TRUE;
}
@@ -1801,7 +1814,8 @@ static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurfa
IDirectDrawSurface7 *ddsurf;
HRESULT hr;
DDSCAPS2 ddsCaps;
- TRACE("(%p)->(%p)\n", This, GDISurface);
+
+ TRACE("iface %p, surface %p.\n", iface, GDISurface);
/* Get the back buffer from the wineD3DDevice and search its
* attached surfaces for the front buffer
@@ -1941,7 +1955,8 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags,
WINED3DFMT_P8_UINT,
};
- TRACE("(%p)->(%p,%p,%p): Relay\n", This, DDSD, Context, cb);
+ TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
+ iface, Flags, DDSD, Context, cb);
EnterCriticalSection(&ddraw_cs);
/* This looks sane */
@@ -2146,8 +2161,7 @@ static HRESULT WINAPI ddraw1_EnumDisplayModes(IDirectDraw *iface, DWORD flags,
*****************************************************************************/
static HRESULT WINAPI ddraw7_EvaluateMode(IDirectDraw7 *iface, DWORD Flags, DWORD *Timeout)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- FIXME("(%p)->(%d,%p): Stub!\n", This, Flags, Timeout);
+ FIXME("iface %p, flags %#x, timeout %p stub!\n", iface, Flags, Timeout);
/* When implementing this, implement it in WineD3D */
@@ -2172,8 +2186,7 @@ static HRESULT WINAPI ddraw7_EvaluateMode(IDirectDraw7 *iface, DWORD Flags, DWOR
static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface,
DDDEVICEIDENTIFIER2 *DDDI, DWORD Flags)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)->(%p,%08x)\n", This, DDDI, Flags);
+ TRACE("iface %p, device_identifier %p, flags %#x.\n", iface, DDDI, Flags);
if(!DDDI)
return DDERR_INVALIDPARAMS;
@@ -2276,8 +2289,7 @@ static HRESULT WINAPI ddraw3_GetSurfaceFromDC(IDirectDraw3 *iface, HDC dc, IDire
*****************************************************************************/
static HRESULT WINAPI ddraw7_RestoreAllSurfaces(IDirectDraw7 *iface)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- FIXME("(%p): Stub\n", This);
+ FIXME("iface %p stub!\n", iface);
/* This isn't hard to implement: Enumerate all WineD3D surfaces,
* get their parent and call their restore method. Do not implement
@@ -2318,8 +2330,8 @@ static HRESULT WINAPI ddraw4_RestoreAllSurfaces(IDirectDraw4 *iface)
*****************************************************************************/
static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWORD NumModes, DWORD Flags)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- WARN("(%p)->(%p, %d, %x): Semi-Stub, most likely harmless\n", This, Modes, NumModes, Flags);
+ FIXME("iface %p, modes %p, mode_count %u, flags %#x partial stub!\n",
+ iface, Modes, NumModes, Flags);
/* This looks sane */
if( (!Modes) || (NumModes == 0) ) return DDERR_INVALIDPARAMS;
@@ -2362,7 +2374,8 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE
UINT Width;
UINT Height;
- TRACE("(%p): Enumerated Surface %p\n", This, surfImpl);
+ TRACE("surface %p, surface_desc %p, context %p.\n",
+ surf, desc, Context);
/* For the enumeration */
IDirectDrawSurface7_Release(surf);
@@ -2463,7 +2476,8 @@ static HRESULT ddraw_recreate_surfaces(IDirectDrawImpl *This)
ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) {
IUnknown* swapChainParent;
- TRACE("(%p) call back\n", pSwapChain);
+
+ TRACE("swapchain %p.\n", pSwapChain);
IWineD3DSwapChain_GetParent(pSwapChain, &swapChainParent);
IUnknown_Release(swapChainParent);
@@ -2490,6 +2504,9 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD
WINED3DSURFTYPE ImplType = This->ImplType;
HRESULT hr;
+ TRACE("ddraw %p, surface_desc %p, surface %p, level %u.\n",
+ This, pDDSD, ppSurf, level);
+
if (TRACE_ON(ddraw))
{
TRACE(" (%p) Requesting surface desc :\n", This);
@@ -2880,7 +2897,8 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface,
WINED3DDISPLAYMODE Mode;
const DWORD sysvidmem = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY;
- TRACE("(%p)->(%p,%p,%p)\n", This, DDSD, Surf, UnkOuter);
+ TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n",
+ iface, DDSD, Surf, UnkOuter);
/* Some checks before we start */
if (TRACE_ON(ddraw))
@@ -3562,10 +3580,12 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags,
DDSURFACEDESC2 desc;
struct list *entry, *entry2;
+ TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
+ iface, Flags, DDSD, Context, Callback);
+
all = Flags & DDENUMSURFACES_ALL;
nomatch = Flags & DDENUMSURFACES_NOMATCH;
- TRACE("(%p)->(%x,%p,%p,%p)\n", This, Flags, DDSD, Context, Callback);
EnterCriticalSection(&ddraw_cs);
if(!Callback)
@@ -3671,7 +3691,8 @@ DirectDrawCreateClipper(DWORD Flags,
IDirectDrawClipperImpl* object;
HRESULT hr;
- TRACE("(%08x,%p,%p)\n", Flags, Clipper, UnkOuter);
+ TRACE("flags %#x, clipper %p, outer_unknown %p.\n",
+ Flags, Clipper, UnkOuter);
EnterCriticalSection(&ddraw_cs);
if (UnkOuter != NULL)
@@ -3718,8 +3739,9 @@ DirectDrawCreateClipper(DWORD Flags,
static HRESULT WINAPI ddraw7_CreateClipper(IDirectDraw7 *iface, DWORD Flags,
IDirectDrawClipper **Clipper, IUnknown *UnkOuter)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
- TRACE("(%p)->(%x,%p,%p)\n", This, Flags, Clipper, UnkOuter);
+ TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n",
+ iface, Flags, Clipper, UnkOuter);
+
return DirectDrawCreateClipper(Flags, Clipper, UnkOuter);
}
@@ -3783,7 +3805,8 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags,
IDirectDrawPaletteImpl *object;
HRESULT hr;
- TRACE("(%p)->(%x,%p,%p,%p)\n", This, Flags, ColorTable, Palette, pUnkOuter);
+ TRACE("iface %p, flags %#x, color_table %p, palette %p, outer_unknown %p.\n",
+ iface, Flags, ColorTable, Palette, pUnkOuter);
EnterCriticalSection(&ddraw_cs);
if(pUnkOuter != NULL)
@@ -3925,10 +3948,9 @@ static HRESULT WINAPI ddraw1_CreatePalette(IDirectDraw *iface, DWORD flags,
static HRESULT WINAPI ddraw7_DuplicateSurface(IDirectDraw7 *iface,
IDirectDrawSurface7 *Src, IDirectDrawSurface7 **Dest)
{
- IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
IDirectDrawSurfaceImpl *Surf = (IDirectDrawSurfaceImpl *)Src;
- FIXME("(%p)->(%p,%p)\n", This, Surf, Dest);
+ FIXME("iface %p, src %p, dst %p partial stub!\n", iface, Src, Dest);
/* For now, simply create a new, independent surface */
return IDirectDraw7_CreateSurface(iface,
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index d674e82..bfd98a7 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -32,8 +32,7 @@
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
-WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
/* The device ID */
const GUID IID_D3DDEVICE_WineD3D = {
@@ -103,7 +102,8 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface,
void **obj)
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
- TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(refiid), obj);
+
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(refiid), obj);
/* According to COM docs, if the QueryInterface fails, obj should be set to NULL */
*obj = NULL;
@@ -196,9 +196,9 @@ Thunk_IDirect3DDeviceImpl_3_QueryInterface(IDirect3DDevice3 *iface,
REFIID riid,
void **obj)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%s,%p) thunking to IDirect3DDevice7 interface.\n", This, debugstr_guid(riid), obj);
- return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)This, riid, obj);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
+
+ return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)device_from_device3(iface), riid, obj);
}
static HRESULT WINAPI
@@ -206,9 +206,9 @@ Thunk_IDirect3DDeviceImpl_2_QueryInterface(IDirect3DDevice2 *iface,
REFIID riid,
void **obj)
{
- IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%s,%p) thunking to IDirect3DDevice7 interface.\n", This, debugstr_guid(riid), obj);
- return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)This, riid, obj);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
+
+ return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)device_from_device2(iface), riid, obj);
}
static HRESULT WINAPI
@@ -216,9 +216,9 @@ Thunk_IDirect3DDeviceImpl_1_QueryInterface(IDirect3DDevice *iface,
REFIID riid,
void **obp)
{
- IDirect3DDeviceImpl *This = device_from_device1(iface);
- TRACE_(ddraw_thunk)("(%p)->(%s,%p) thunking to IDirect3DDevice7 interface.\n", This, debugstr_guid(riid), obp);
- return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)This, riid, obp);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp);
+
+ return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)device_from_device1(iface), riid, obp);
}
/*****************************************************************************
@@ -239,7 +239,7 @@ IDirect3DDeviceImpl_7_AddRef(IDirect3DDevice7 *iface)
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : incrementing from %u.\n", This, ref -1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -247,23 +247,24 @@ IDirect3DDeviceImpl_7_AddRef(IDirect3DDevice7 *iface)
static ULONG WINAPI
Thunk_IDirect3DDeviceImpl_3_AddRef(IDirect3DDevice3 *iface)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)device_from_device3(iface));
}
static ULONG WINAPI
Thunk_IDirect3DDeviceImpl_2_AddRef(IDirect3DDevice2 *iface)
{
- IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)device_from_device2(iface));
}
static ULONG WINAPI
Thunk_IDirect3DDeviceImpl_1_AddRef(IDirect3DDevice *iface)
{
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", iface);
+ TRACE("iface %p.\n", iface);
+
return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)device_from_device1(iface));
}
@@ -285,7 +286,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface)
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() decrementing from %u.\n", This, ref +1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
/* This method doesn't destroy the WineD3DDevice, because it's still in use for
* 2D rendering. IDirectDrawSurface7::Release will destroy the WineD3DDevice
@@ -420,25 +421,25 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface)
static ULONG WINAPI
Thunk_IDirect3DDeviceImpl_3_Release(IDirect3DDevice3 *iface)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_Release((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_Release((IDirect3DDevice7 *)device_from_device3(iface));
}
static ULONG WINAPI
Thunk_IDirect3DDeviceImpl_2_Release(IDirect3DDevice2 *iface)
{
- IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_Release((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_Release((IDirect3DDevice7 *)device_from_device2(iface));
}
static ULONG WINAPI
Thunk_IDirect3DDeviceImpl_1_Release(IDirect3DDevice *iface)
{
- IDirect3DDeviceImpl *This = device_from_device1(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_Release((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_Release((IDirect3DDevice7 *)device_from_device1(iface));
}
/*****************************************************************************
@@ -464,12 +465,10 @@ IDirect3DDeviceImpl_1_Initialize(IDirect3DDevice *iface,
IDirect3D *Direct3D, GUID *guid,
D3DDEVICEDESC *Desc)
{
- IDirect3DDeviceImpl *This = device_from_device1(iface);
-
/* It shouldn't be crucial, but print a FIXME, I'm interested if
- * any game calls it and when
- */
- FIXME("(%p)->(%p,%p,%p): No-op!\n", This, Direct3D, guid, Desc);
+ * any game calls it and when. */
+ FIXME("iface %p, d3d %p, guid %s, device_desc %p nop!\n",
+ iface, Direct3D, debugstr_guid(guid), Desc);
return D3D_OK;
}
@@ -496,7 +495,8 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
D3DDEVICEDESC OldDesc;
- TRACE("(%p)->(%p)\n", This, Desc);
+
+ TRACE("iface %p, device_desc %p.\n", iface, Desc);
/* Call the same function used by IDirect3D, this saves code */
return IDirect3DImpl_GetCaps(This->ddraw->wineD3D, &OldDesc, Desc);
@@ -547,7 +547,8 @@ IDirect3DDeviceImpl_3_GetCaps(IDirect3DDevice3 *iface,
IDirect3DDeviceImpl *This = device_from_device3(iface);
D3DDEVICEDESC7 newDesc;
HRESULT hr;
- TRACE("(%p)->(%p,%p)\n", iface, HWDesc, HelDesc);
+
+ TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, HWDesc, HelDesc);
hr = IDirect3DImpl_GetCaps(This->ddraw->wineD3D, HWDesc, &newDesc);
if(hr != D3D_OK) return hr;
@@ -562,7 +563,7 @@ Thunk_IDirect3DDeviceImpl_2_GetCaps(IDirect3DDevice2 *iface,
D3DDEVICEDESC *D3DHELDevDesc)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p,%p) thunking to IDirect3DDevice3 interface.\n", This, D3DHWDevDesc, D3DHELDevDesc);
+ TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, D3DHWDevDesc, D3DHELDevDesc);
return IDirect3DDevice3_GetCaps((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, D3DHWDevDesc, D3DHELDevDesc);
}
@@ -572,7 +573,7 @@ Thunk_IDirect3DDeviceImpl_1_GetCaps(IDirect3DDevice *iface,
D3DDEVICEDESC *D3DHELDevDesc)
{
IDirect3DDeviceImpl *This = device_from_device1(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p,%p) thunking to IDirect3DDevice3 interface.\n", This, D3DHWDevDesc, D3DHELDevDesc);
+ TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, D3DHWDevDesc, D3DHELDevDesc);
return IDirect3DDevice3_GetCaps((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, D3DHWDevDesc, D3DHELDevDesc);
}
@@ -598,7 +599,7 @@ IDirect3DDeviceImpl_2_SwapTextureHandles(IDirect3DDevice2 *iface,
IDirectDrawSurfaceImpl *surf2 = surface_from_texture2(Tex2);
DWORD h1, h2;
- TRACE("(%p)->(%p,%p)\n", This, surf1, surf2);
+ TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, Tex1, Tex2);
EnterCriticalSection(&ddraw_cs);
@@ -624,7 +625,9 @@ Thunk_IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice *iface,
IDirectDrawSurfaceImpl *surf2 = surface_from_texture1(D3DTex2);
IDirect3DTexture2 *t1 = surf1 ? (IDirect3DTexture2 *)&surf1->IDirect3DTexture2_vtbl : NULL;
IDirect3DTexture2 *t2 = surf2 ? (IDirect3DTexture2 *)&surf2->IDirect3DTexture2_vtbl : NULL;
- TRACE_(ddraw_thunk)("(%p)->(%p,%p) thunking to IDirect3DDevice2 interface.\n", This, surf1, surf2);
+
+ TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, D3DTex1, D3DTex2);
+
return IDirect3DDevice2_SwapTextureHandles((IDirect3DDevice2 *)&This->IDirect3DDevice2_vtbl, t1, t2);
}
@@ -650,8 +653,7 @@ static HRESULT WINAPI
IDirect3DDeviceImpl_3_GetStats(IDirect3DDevice3 *iface,
D3DSTATS *Stats)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- FIXME("(%p)->(%p): Stub!\n", This, Stats);
+ FIXME("iface %p, stats %p stub!\n", iface, Stats);
if(!Stats)
return DDERR_INVALIDPARAMS;
@@ -671,7 +673,9 @@ Thunk_IDirect3DDeviceImpl_2_GetStats(IDirect3DDevice2 *iface,
D3DSTATS *Stats)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, Stats);
+
+ TRACE("iface %p, stats %p.\n", iface, Stats);
+
return IDirect3DDevice3_GetStats((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, Stats);
}
@@ -680,7 +684,9 @@ Thunk_IDirect3DDeviceImpl_1_GetStats(IDirect3DDevice *iface,
D3DSTATS *Stats)
{
IDirect3DDeviceImpl *This = device_from_device1(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, Stats);
+
+ TRACE("iface %p, stats %p.\n", iface, Stats);
+
return IDirect3DDevice3_GetStats((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, Stats);
}
@@ -714,7 +720,8 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface,
IDirect3DExecuteBufferImpl* object;
HRESULT hr;
- TRACE("(%p)->(%p,%p,%p)!\n", This, Desc, ExecuteBuffer, UnkOuter);
+ TRACE("iface %p, buffer_desc %p, buffer %p, outer_unknown %p.\n",
+ iface, Desc, ExecuteBuffer, UnkOuter);
if(UnkOuter)
return CLASS_E_NOAGGREGATION;
@@ -767,7 +774,7 @@ IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface,
IDirect3DExecuteBufferImpl *Direct3DExecuteBufferImpl = (IDirect3DExecuteBufferImpl *)ExecuteBuffer;
IDirect3DViewportImpl *Direct3DViewportImpl = (IDirect3DViewportImpl *)Viewport;
- TRACE("(%p)->(%p,%p,%08x)\n", This, Direct3DExecuteBufferImpl, Direct3DViewportImpl, Flags);
+ TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags);
if(!Direct3DExecuteBufferImpl)
return DDERR_INVALIDPARAMS;
@@ -804,7 +811,7 @@ IDirect3DDeviceImpl_3_AddViewport(IDirect3DDevice3 *iface,
IDirect3DDeviceImpl *This = device_from_device3(iface);
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport;
- TRACE("(%p)->(%p)\n", This, vp);
+ TRACE("iface %p, viewport %p.\n", iface, Viewport);
/* Sanity check */
if(!vp)
@@ -826,7 +833,9 @@ Thunk_IDirect3DDeviceImpl_2_AddViewport(IDirect3DDevice2 *iface,
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, vp);
+
+ TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2);
+
return IDirect3DDevice3_AddViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp);
}
@@ -836,7 +845,9 @@ Thunk_IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface,
{
IDirect3DDeviceImpl *This = device_from_device1(iface);
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, vp);
+
+ TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport);
+
return IDirect3DDevice3_AddViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp);
}
@@ -864,7 +875,7 @@ IDirect3DDeviceImpl_3_DeleteViewport(IDirect3DDevice3 *iface,
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *) Viewport;
IDirect3DViewportImpl *cur_viewport, *prev_viewport = NULL;
- TRACE("(%p)->(%p)\n", This, vp);
+ TRACE("iface %p, viewport %p.\n", iface, Viewport);
EnterCriticalSection(&ddraw_cs);
cur_viewport = This->viewport_list;
@@ -892,7 +903,9 @@ Thunk_IDirect3DDeviceImpl_2_DeleteViewport(IDirect3DDevice2 *iface,
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, vp);
+
+ TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2);
+
return IDirect3DDevice3_DeleteViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp);
}
@@ -902,7 +915,9 @@ Thunk_IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *iface,
{
IDirect3DDeviceImpl *This = device_from_device1(iface);
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, vp);
+
+ TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport);
+
return IDirect3DDevice3_DeleteViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp);
}
@@ -934,7 +949,8 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface,
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport3;
IDirect3DViewportImpl *res = NULL;
- TRACE("(%p)->(%p,%p,%08x)\n", This, vp, lplpDirect3DViewport3, Flags);
+ TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
+ iface, Viewport3, lplpDirect3DViewport3, Flags);
if(!vp)
{
@@ -987,7 +1003,10 @@ Thunk_IDirect3DDeviceImpl_2_NextViewport(IDirect3DDevice2 *iface,
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport2;
IDirect3DViewport3 *res;
HRESULT hr;
- TRACE_(ddraw_thunk)("(%p)->(%p,%p,%08x) thunking to IDirect3DDevice3 interface.\n", This, vp, lplpDirect3DViewport2, Flags);
+
+ TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
+ iface, Viewport2, lplpDirect3DViewport2, Flags);
+
hr = IDirect3DDevice3_NextViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl,
(IDirect3DViewport3 *)vp, &res, Flags);
*lplpDirect3DViewport2 = (IDirect3DViewport2 *)res;
@@ -1004,7 +1023,10 @@ Thunk_IDirect3DDeviceImpl_1_NextViewport(IDirect3DDevice *iface,
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport;
IDirect3DViewport3 *res;
HRESULT hr;
- TRACE_(ddraw_thunk)("(%p)->(%p,%p,%08x) thunking to IDirect3DDevice3 interface.\n", This, vp, lplpDirect3DViewport, Flags);
+
+ TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
+ iface, Viewport, lplpDirect3DViewport, Flags);
+
hr = IDirect3DDevice3_NextViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl,
(IDirect3DViewport3 *)vp, &res, Flags);
*lplpDirect3DViewport = (IDirect3DViewport *)res;
@@ -1039,10 +1061,8 @@ IDirect3DDeviceImpl_1_Pick(IDirect3DDevice *iface,
DWORD Flags,
D3DRECT *Rect)
{
- IDirect3DDeviceImpl *This = device_from_device1(iface);
- IDirect3DExecuteBufferImpl *execbuf = (IDirect3DExecuteBufferImpl *)ExecuteBuffer;
- IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport;
- FIXME("(%p)->(%p,%p,%08x,%p): stub!\n", This, execbuf, vp, Flags, Rect);
+ FIXME("iface %p, buffer %p, viewport %p, flags %#x, rect %s stub!\n",
+ iface, ExecuteBuffer, Viewport, Flags, wine_dbgstr_rect((RECT *)Rect));
return D3D_OK;
}
@@ -1068,8 +1088,7 @@ IDirect3DDeviceImpl_1_GetPickRecords(IDirect3DDevice *iface,
DWORD *Count,
D3DPICKRECORD *D3DPickRec)
{
- IDirect3DDeviceImpl *This = device_from_device1(iface);
- FIXME("(%p)->(%p,%p): stub!\n", This, Count, D3DPickRec);
+ FIXME("iface %p, count %p, records %p stub!\n", iface, Count, D3DPickRec);
return D3D_OK;
}
@@ -1133,7 +1152,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
WINED3DFMT_R10G10B10_SNORM_A2_UNORM
};
- TRACE("(%p)->(%p,%p): Relay\n", This, Callback, Arg);
+ TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg);
if(!Callback)
return DDERR_INVALIDPARAMS;
@@ -1241,7 +1260,9 @@ Thunk_IDirect3DDeviceImpl_3_EnumTextureFormats(IDirect3DDevice3 *iface,
void *Arg)
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p,%p) thunking to IDirect3DDevice7 interface.\n", This, Callback, Arg);
+
+ TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg);
+
return IDirect3DDevice7_EnumTextureFormats((IDirect3DDevice7 *)This, Callback, Arg);
}
@@ -1282,7 +1303,7 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface,
/* FOURCC codes - Not in this version*/
};
- TRACE("(%p)->(%p,%p): Relay\n", This, Callback, Arg);
+ TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg);
if(!Callback)
return DDERR_INVALIDPARAMS;
@@ -1341,7 +1362,9 @@ Thunk_IDirect3DDeviceImpl_1_EnumTextureFormats(IDirect3DDevice *iface,
void *Arg)
{
IDirect3DDeviceImpl *This = device_from_device1(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p,%p) thunking to IDirect3DDevice2 interface.\n", This, Callback, Arg);
+
+ TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg);
+
return IDirect3DDevice2_EnumTextureFormats((IDirect3DDevice2 *)&This->IDirect3DDevice2_vtbl, Callback, Arg);
}
@@ -1368,7 +1391,7 @@ IDirect3DDeviceImpl_1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DM
D3DMATRIX *Matrix;
DWORD h;
- TRACE("(%p)->(%p)\n", This, D3DMatHandle);
+ TRACE("iface %p, matrix_handle %p.\n", iface, D3DMatHandle);
if(!D3DMatHandle)
return DDERR_INVALIDPARAMS;
@@ -1425,7 +1448,7 @@ IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface,
IDirect3DDeviceImpl *This = device_from_device1(iface);
D3DMATRIX *m;
- TRACE("(%p)->(%08x,%p)\n", This, D3DMatHandle, D3DMatrix);
+ TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, D3DMatHandle, D3DMatrix);
if (!D3DMatrix) return DDERR_INVALIDPARAMS;
@@ -1439,7 +1462,7 @@ IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface,
return DDERR_INVALIDPARAMS;
}
- if (TRACE_ON(d3d7))
+ if (TRACE_ON(ddraw))
dump_D3DMATRIX(D3DMatrix);
*m = *D3DMatrix;
@@ -1468,7 +1491,7 @@ IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface,
}
/*****************************************************************************
- * IDirect3DDevice::SetMatrix
+ * IDirect3DDevice::GetMatrix
*
* Returns the content of a D3DMATRIX handle
*
@@ -1491,7 +1514,7 @@ IDirect3DDeviceImpl_1_GetMatrix(IDirect3DDevice *iface,
IDirect3DDeviceImpl *This = device_from_device1(iface);
D3DMATRIX *m;
- TRACE("(%p)->(%08x,%p)\n", This, D3DMatHandle, D3DMatrix);
+ TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, D3DMatHandle, D3DMatrix);
if (!D3DMatrix) return DDERR_INVALIDPARAMS;
@@ -1533,7 +1556,7 @@ IDirect3DDeviceImpl_1_DeleteMatrix(IDirect3DDevice *iface,
IDirect3DDeviceImpl *This = device_from_device1(iface);
D3DMATRIX *m;
- TRACE("(%p)->(%08x)\n", This, D3DMatHandle);
+ TRACE("iface %p, matrix_handle %#x.\n", iface, D3DMatHandle);
EnterCriticalSection(&ddraw_cs);
@@ -1571,7 +1594,8 @@ IDirect3DDeviceImpl_7_BeginScene(IDirect3DDevice7 *iface)
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p): Relay\n", This);
+
+ TRACE("iface %p.\n", iface);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DDevice_BeginScene(This->wineD3DDevice);
@@ -1602,25 +1626,25 @@ IDirect3DDeviceImpl_7_BeginScene_FPUPreserve(IDirect3DDevice7 *iface)
static HRESULT WINAPI
Thunk_IDirect3DDeviceImpl_3_BeginScene(IDirect3DDevice3 *iface)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)device_from_device3(iface));
}
static HRESULT WINAPI
Thunk_IDirect3DDeviceImpl_2_BeginScene(IDirect3DDevice2 *iface)
{
- IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)device_from_device2(iface));
}
static HRESULT WINAPI
Thunk_IDirect3DDeviceImpl_1_BeginScene(IDirect3DDevice *iface)
{
- IDirect3DDeviceImpl *This = device_from_device1(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)device_from_device1(iface));
}
/*****************************************************************************
@@ -1642,7 +1666,8 @@ IDirect3DDeviceImpl_7_EndScene(IDirect3DDevice7 *iface)
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p): Relay\n", This);
+
+ TRACE("iface %p.\n", iface);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DDevice_EndScene(This->wineD3DDevice);
@@ -1673,25 +1698,25 @@ IDirect3DDeviceImpl_7_EndScene_FPUPreserve(IDirect3DDevice7 *iface)
static HRESULT WINAPI DECLSPEC_HOTPATCH
Thunk_IDirect3DDeviceImpl_3_EndScene(IDirect3DDevice3 *iface)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)device_from_device3(iface));
}
static HRESULT WINAPI DECLSPEC_HOTPATCH
Thunk_IDirect3DDeviceImpl_2_EndScene(IDirect3DDevice2 *iface)
{
- IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)device_from_device2(iface));
}
static HRESULT WINAPI DECLSPEC_HOTPATCH
Thunk_IDirect3DDeviceImpl_1_EndScene(IDirect3DDevice *iface)
{
- IDirect3DDeviceImpl *This = device_from_device1(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DDevice7 interface.\n", This);
- return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This);
+ TRACE("iface %p.\n", iface);
+
+ return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)device_from_device1(iface));
}
/*****************************************************************************
@@ -1713,7 +1738,8 @@ IDirect3DDeviceImpl_7_GetDirect3D(IDirect3DDevice7 *iface,
IDirect3D7 **Direct3D7)
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
- TRACE("(%p)->(%p)\n", This, Direct3D7);
+
+ TRACE("iface %p, d3d %p.\n", iface, Direct3D7);
if(!Direct3D7)
return DDERR_INVALIDPARAMS;
@@ -1733,7 +1759,8 @@ Thunk_IDirect3DDeviceImpl_3_GetDirect3D(IDirect3DDevice3 *iface,
HRESULT ret;
IDirect3D7 *ret_ptr;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, Direct3D3);
+ TRACE("iface %p, d3d %p.\n", iface, Direct3D3);
+
ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr);
if(ret != D3D_OK)
return ret;
@@ -1750,7 +1777,8 @@ Thunk_IDirect3DDeviceImpl_2_GetDirect3D(IDirect3DDevice2 *iface,
HRESULT ret;
IDirect3D7 *ret_ptr;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, Direct3D2);
+ TRACE("iface %p, d3d %p.\n", iface, Direct3D2);
+
ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr);
if(ret != D3D_OK)
return ret;
@@ -1767,7 +1795,8 @@ Thunk_IDirect3DDeviceImpl_1_GetDirect3D(IDirect3DDevice *iface,
HRESULT ret;
IDirect3D7 *ret_ptr;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, Direct3D);
+ TRACE("iface %p, d3d %p.\n", iface, Direct3D);
+
ret = IDirect3DDevice7_GetDirect3D((IDirect3DDevice7 *)This, &ret_ptr);
if(ret != D3D_OK)
return ret;
@@ -1798,7 +1827,8 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface,
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport3;
- TRACE("(%p)->(%p)\n", This, Direct3DViewport3);
+
+ TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3);
EnterCriticalSection(&ddraw_cs);
/* Do nothing if the specified viewport is the same as the current one */
@@ -1836,7 +1866,9 @@ Thunk_IDirect3DDeviceImpl_2_SetCurrentViewport(IDirect3DDevice2 *iface,
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, vp);
+
+ TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2);
+
return IDirect3DDevice3_SetCurrentViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl,
(IDirect3DViewport3 *)vp);
}
@@ -1861,7 +1893,8 @@ IDirect3DDeviceImpl_3_GetCurrentViewport(IDirect3DDevice3 *iface,
IDirect3DViewport3 **Direct3DViewport3)
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE("(%p)->(%p)\n", This, Direct3DViewport3);
+
+ TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3);
if(!Direct3DViewport3)
return DDERR_INVALIDPARAMS;
@@ -1884,7 +1917,9 @@ Thunk_IDirect3DDeviceImpl_2_GetCurrentViewport(IDirect3DDevice2 *iface,
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
HRESULT hr;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, Direct3DViewport2);
+
+ TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2);
+
hr = IDirect3DDevice3_GetCurrentViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl,
(IDirect3DViewport3 **)Direct3DViewport2);
if(hr != D3D_OK) return hr;
@@ -1917,7 +1952,8 @@ IDirect3DDeviceImpl_7_SetRenderTarget(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
IDirectDrawSurfaceImpl *Target = (IDirectDrawSurfaceImpl *)NewTarget;
HRESULT hr;
- TRACE("(%p)->(%p,%08x): Relay\n", This, NewTarget, Flags);
+
+ TRACE("iface %p, target %p, flags %#x.\n", iface, NewTarget, Flags);
EnterCriticalSection(&ddraw_cs);
/* Flags: Not used */
@@ -1976,7 +2012,9 @@ Thunk_IDirect3DDeviceImpl_3_SetRenderTarget(IDirect3DDevice3 *iface,
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
IDirectDrawSurfaceImpl *Target = (IDirectDrawSurfaceImpl *)NewRenderTarget;
- TRACE_(ddraw_thunk)("(%p)->(%p,%08x) thunking to IDirect3DDevice7 interface.\n", This, Target, Flags);
+
+ TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags);
+
return IDirect3DDevice7_SetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 *)Target, Flags);
}
@@ -1987,7 +2025,9 @@ Thunk_IDirect3DDeviceImpl_2_SetRenderTarget(IDirect3DDevice2 *iface,
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
IDirectDrawSurfaceImpl *Target = (IDirectDrawSurfaceImpl *)NewRenderTarget;
- TRACE_(ddraw_thunk)("(%p)->(%p,%08x) thunking to IDirect3DDevice7 interface.\n", This, Target, Flags);
+
+ TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags);
+
return IDirect3DDevice7_SetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 *)Target, Flags);
}
@@ -2013,7 +2053,8 @@ IDirect3DDeviceImpl_7_GetRenderTarget(IDirect3DDevice7 *iface,
IDirectDrawSurface7 **RenderTarget)
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
- TRACE("(%p)->(%p): Relay\n", This, RenderTarget);
+
+ TRACE("iface %p, target %p.\n", iface, RenderTarget);
if(!RenderTarget)
return DDERR_INVALIDPARAMS;
@@ -2032,7 +2073,9 @@ Thunk_IDirect3DDeviceImpl_3_GetRenderTarget(IDirect3DDevice3 *iface,
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
HRESULT hr;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, RenderTarget);
+
+ TRACE("iface %p, target %p.\n", iface, RenderTarget);
+
hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 **)RenderTarget);
if(hr != D3D_OK) return hr;
return D3D_OK;
@@ -2044,7 +2087,9 @@ Thunk_IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *iface,
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
HRESULT hr;
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, RenderTarget);
+
+ TRACE("iface %p, target %p.\n", iface, RenderTarget);
+
hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 **)RenderTarget);
if(hr != D3D_OK) return hr;
*RenderTarget = *RenderTarget ?
@@ -2077,7 +2122,9 @@ IDirect3DDeviceImpl_3_Begin(IDirect3DDevice3 *iface,
DWORD Flags)
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE("(%p)->(%d,%d,%08x)\n", This, PrimitiveType, VertexTypeDesc, Flags);
+
+ TRACE("iface %p, primitive_type %#x, FVF %#x, flags %#x.\n",
+ iface, PrimitiveType, VertexTypeDesc, Flags);
EnterCriticalSection(&ddraw_cs);
This->primitive_type = PrimitiveType;
@@ -2098,7 +2145,9 @@ Thunk_IDirect3DDeviceImpl_2_Begin(IDirect3DDevice2 *iface,
{
DWORD FVF;
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p/%p)->(%08x,%08x,%08x): Thunking to IDirect3DDevice3\n", This, iface, d3dpt, dwVertexTypeDesc, dwFlags);
+
+ TRACE("iface %p, primitive_type %#x, vertex_type %#x, flags %#x.\n",
+ iface, d3dpt, dwVertexTypeDesc, dwFlags);
switch(dwVertexTypeDesc)
{
@@ -2140,8 +2189,9 @@ IDirect3DDeviceImpl_3_BeginIndexed(IDirect3DDevice3 *iface,
DWORD NumVertices,
DWORD Flags)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- FIXME("(%p)->(%08x,%08x,%p,%08x,%08x): stub!\n", This, PrimitiveType, VertexType, Vertices, NumVertices, Flags);
+ FIXME("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, flags %#x stub!\n",
+ iface, PrimitiveType, VertexType, Vertices, NumVertices, Flags);
+
return D3D_OK;
}
@@ -2156,7 +2206,9 @@ Thunk_IDirect3DDeviceImpl_2_BeginIndexed(IDirect3DDevice2 *iface,
{
DWORD FVF;
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p/%p)->(%08x,%08x,%p,%08x,%08x): Thunking to IDirect3DDevice3\n", This, iface, d3dptPrimitiveType, d3dvtVertexType, lpvVertices, dwNumVertices, dwFlags);
+
+ TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, flags %#x stub!\n",
+ iface, d3dptPrimitiveType, d3dvtVertexType, lpvVertices, dwNumVertices, dwFlags);
switch(d3dvtVertexType)
{
@@ -2194,7 +2246,8 @@ IDirect3DDeviceImpl_3_Vertex(IDirect3DDevice3 *iface,
void *Vertex)
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE("(%p)->(%p)\n", This, Vertex);
+
+ TRACE("iface %p, vertex %p.\n", iface, Vertex);
if(!Vertex)
return DDERR_INVALIDPARAMS;
@@ -2224,7 +2277,9 @@ Thunk_IDirect3DDeviceImpl_2_Vertex(IDirect3DDevice2 *iface,
void *lpVertexType)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, lpVertexType);
+
+ TRACE("iface %p, vertex %p.\n", iface, lpVertexType);
+
return IDirect3DDevice3_Vertex((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, lpVertexType);
}
@@ -2245,8 +2300,8 @@ static HRESULT WINAPI
IDirect3DDeviceImpl_3_Index(IDirect3DDevice3 *iface,
WORD VertexIndex)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- FIXME("(%p)->(%04x): stub!\n", This, VertexIndex);
+ FIXME("iface %p, index %#x stub!\n", iface, VertexIndex);
+
return D3D_OK;
}
@@ -2255,7 +2310,9 @@ Thunk_IDirect3DDeviceImpl_2_Index(IDirect3DDevice2 *iface,
WORD wVertexIndex)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%04x) thunking to IDirect3DDevice3 interface.\n", This, wVertexIndex);
+
+ TRACE("iface %p, index %#x.\n", iface, wVertexIndex);
+
return IDirect3DDevice3_Index((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, wVertexIndex);
}
@@ -2282,7 +2339,8 @@ IDirect3DDeviceImpl_3_End(IDirect3DDevice3 *iface,
DWORD Flags)
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE("(%p)->(%08x)\n", This, Flags);
+
+ TRACE("iface %p, flags %#x.\n", iface, Flags);
return IDirect3DDevice7_DrawPrimitive((IDirect3DDevice7 *)This, This->primitive_type,
This->vertex_type, This->vertex_buffer, This->nb_vertices, This->render_flags);
@@ -2293,7 +2351,9 @@ Thunk_IDirect3DDeviceImpl_2_End(IDirect3DDevice2 *iface,
DWORD dwFlags)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x) thunking to IDirect3DDevice3 interface.\n", This, dwFlags);
+
+ TRACE("iface %p, flags %#x.\n", iface, dwFlags);
+
return IDirect3DDevice3_End((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, dwFlags);
}
@@ -2321,7 +2381,8 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%p): Relay\n", This, RenderStateType, Value);
+
+ TRACE("iface %p, state %#x, value %p.\n", iface, RenderStateType, Value);
if(!Value)
return DDERR_INVALIDPARAMS;
@@ -2477,7 +2538,8 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface,
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
HRESULT hr;
- TRACE("(%p)->(%08x,%p)\n", This, dwRenderStateType, lpdwRenderState);
+
+ TRACE("iface %p, state %#x, value %p.\n", iface, dwRenderStateType, lpdwRenderState);
switch(dwRenderStateType)
{
@@ -2601,7 +2663,9 @@ Thunk_IDirect3DDeviceImpl_2_GetRenderState(IDirect3DDevice2 *iface,
DWORD *lpdwRenderState)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice3 interface.\n", This, dwRenderStateType, lpdwRenderState);
+
+ TRACE("iface %p, state %#x, value %p.\n", iface, dwRenderStateType, lpdwRenderState);
+
return IDirect3DDevice3_GetRenderState((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl,
dwRenderStateType, lpdwRenderState);
}
@@ -2630,7 +2694,8 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%d): Relay\n", This, RenderStateType, Value);
+
+ TRACE("iface %p, state %#x, value %#x.\n", iface, RenderStateType, Value);
EnterCriticalSection(&ddraw_cs);
/* Some render states need special care */
@@ -2815,7 +2880,8 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface,
HRESULT hr;
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE("(%p)->(%08x,%d)\n", This, RenderStateType, Value);
+
+ TRACE("iface %p, state %#x, value %#x.\n", iface, RenderStateType, Value);
EnterCriticalSection(&ddraw_cs);
@@ -2946,7 +3012,9 @@ Thunk_IDirect3DDeviceImpl_2_SetRenderState(IDirect3DDevice2 *iface,
DWORD Value)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%d) thunking to IDirect3DDevice3 interface.\n", This, RenderStateType, Value);
+
+ TRACE("iface %p, state %#x, value %#x.\n", iface, RenderStateType, Value);
+
return IDirect3DDevice3_SetRenderState((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, RenderStateType, Value);
}
@@ -2976,7 +3044,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
IDirect3DDeviceImpl *This = device_from_device3(iface);
HRESULT hr;
- TRACE("(%p)->(%08x,%08x)\n", This, LightStateType, Value);
+ TRACE("iface %p, state %#x, value %#x.\n", iface, LightStateType, Value);
if (!LightStateType || (LightStateType > D3DLIGHTSTATE_COLORVERTEX))
{
@@ -3061,7 +3129,9 @@ Thunk_IDirect3DDeviceImpl_2_SetLightState(IDirect3DDevice2 *iface,
DWORD Value)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x) thunking to IDirect3DDevice3 interface.\n", This, LightStateType, Value);
+
+ TRACE("iface %p, state %#x, value %#x.\n", iface, LightStateType, Value);
+
return IDirect3DDevice3_SetLightState((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, LightStateType, Value);
}
@@ -3091,7 +3161,7 @@ IDirect3DDeviceImpl_3_GetLightState(IDirect3DDevice3 *iface,
IDirect3DDeviceImpl *This = device_from_device3(iface);
HRESULT hr;
- TRACE("(%p)->(%08x,%p)\n", This, LightStateType, Value);
+ TRACE("iface %p, state %#x, value %p.\n", iface, LightStateType, Value);
if (!LightStateType || (LightStateType > D3DLIGHTSTATE_COLORVERTEX))
{
@@ -3155,7 +3225,9 @@ Thunk_IDirect3DDeviceImpl_2_GetLightState(IDirect3DDevice2 *iface,
DWORD *Value)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice3 interface.\n", This, LightStateType, Value);
+
+ TRACE("iface %p, state %#x, value %p.\n", iface, LightStateType, Value);
+
return IDirect3DDevice3_GetLightState((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, LightStateType, Value);
}
@@ -3188,7 +3260,8 @@ IDirect3DDeviceImpl_7_SetTransform(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
D3DTRANSFORMSTATETYPE type;
HRESULT hr;
- TRACE("(%p)->(%08x,%p): Relay\n", This, TransformStateType, Matrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, Matrix);
switch(TransformStateType)
{
@@ -3240,7 +3313,9 @@ Thunk_IDirect3DDeviceImpl_3_SetTransform(IDirect3DDevice3 *iface,
D3DMATRIX *D3DMatrix)
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, TransformStateType, D3DMatrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+
return IDirect3DDevice7_SetTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix);
}
@@ -3250,7 +3325,9 @@ Thunk_IDirect3DDeviceImpl_2_SetTransform(IDirect3DDevice2 *iface,
D3DMATRIX *D3DMatrix)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, TransformStateType, D3DMatrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+
return IDirect3DDevice7_SetTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix);
}
@@ -3279,7 +3356,8 @@ IDirect3DDeviceImpl_7_GetTransform(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
D3DTRANSFORMSTATETYPE type;
HRESULT hr;
- TRACE("(%p)->(%08x,%p): Relay\n", This, TransformStateType, Matrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, Matrix);
switch(TransformStateType)
{
@@ -3329,7 +3407,9 @@ Thunk_IDirect3DDeviceImpl_3_GetTransform(IDirect3DDevice3 *iface,
D3DMATRIX *D3DMatrix)
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, TransformStateType, D3DMatrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+
return IDirect3DDevice7_GetTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix);
}
@@ -3339,7 +3419,9 @@ Thunk_IDirect3DDeviceImpl_2_GetTransform(IDirect3DDevice2 *iface,
D3DMATRIX *D3DMatrix)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, TransformStateType, D3DMatrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+
return IDirect3DDevice7_GetTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix);
}
@@ -3369,7 +3451,8 @@ IDirect3DDeviceImpl_7_MultiplyTransform(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
D3DTRANSFORMSTATETYPE type;
- TRACE("(%p)->(%08x,%p): Relay\n", This, TransformStateType, D3DMatrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
switch(TransformStateType)
{
@@ -3418,7 +3501,9 @@ Thunk_IDirect3DDeviceImpl_3_MultiplyTransform(IDirect3DDevice3 *iface,
D3DMATRIX *D3DMatrix)
{
IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, TransformStateType, D3DMatrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+
return IDirect3DDevice7_MultiplyTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix);
}
@@ -3428,7 +3513,9 @@ Thunk_IDirect3DDeviceImpl_2_MultiplyTransform(IDirect3DDevice2 *iface,
D3DMATRIX *D3DMatrix)
{
IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, TransformStateType, D3DMatrix);
+
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+
return IDirect3DDevice7_MultiplyTransform((IDirect3DDevice7 *)This, TransformStateType, D3DMatrix);
}
@@ -3464,7 +3551,9 @@ IDirect3DDeviceImpl_7_DrawPrimitive(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
UINT stride;
HRESULT hr;
- TRACE("(%p)->(%08x,%08x,%p,%08x,%08x): Relay!\n", This, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+
+ TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
if(!Vertices)
return DDERR_INVALIDPARAMS;
@@ -3525,9 +3614,10 @@ Thunk_IDirect3DDeviceImpl_3_DrawPrimitive(IDirect3DDevice3 *iface,
DWORD VertexCount,
DWORD Flags)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%p,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
- return IDirect3DDevice7_DrawPrimitive((IDirect3DDevice7 *)This,
+ TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+
+ return IDirect3DDevice7_DrawPrimitive((IDirect3DDevice7 *)device_from_device3(iface),
PrimitiveType, VertexType, Vertices, VertexCount, Flags);
}
@@ -3539,9 +3629,10 @@ Thunk_IDirect3DDeviceImpl_2_DrawPrimitive(IDirect3DDevice2 *iface,
DWORD VertexCount,
DWORD Flags)
{
- IDirect3DDeviceImpl *This = device_from_device2(iface);
DWORD FVF;
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%p,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+
+ TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
switch(VertexType)
{
@@ -3553,7 +3644,8 @@ Thunk_IDirect3DDeviceImpl_2_DrawPrimitive(IDirect3DDevice2 *iface,
return DDERR_INVALIDPARAMS; /* Should never happen */
}
- return IDirect3DDevice7_DrawPrimitive((IDirect3DDevice7 *)This, PrimitiveType, FVF, Vertices, VertexCount, Flags);
+ return IDirect3DDevice7_DrawPrimitive((IDirect3DDevice7 *)device_from_device2(iface),
+ PrimitiveType, FVF, Vertices, VertexCount, Flags);
}
/*****************************************************************************
@@ -3592,7 +3684,9 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitive(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x): Relay!\n", This, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+
+ TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
/* Set the D3DDevice's FVF */
EnterCriticalSection(&ddraw_cs);
@@ -3654,9 +3748,10 @@ Thunk_IDirect3DDeviceImpl_3_DrawIndexedPrimitive(IDirect3DDevice3 *iface,
DWORD IndexCount,
DWORD Flags)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
- return IDirect3DDevice7_DrawIndexedPrimitive((IDirect3DDevice7 *)This,
+ TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+
+ return IDirect3DDevice7_DrawIndexedPrimitive((IDirect3DDevice7 *)device_from_device3(iface),
PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
}
@@ -3671,8 +3766,9 @@ Thunk_IDirect3DDeviceImpl_2_DrawIndexedPrimitive(IDirect3DDevice2 *iface,
DWORD Flags)
{
DWORD FVF;
- IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+
+ TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
switch(VertexType)
{
@@ -3684,7 +3780,7 @@ Thunk_IDirect3DDeviceImpl_2_DrawIndexedPrimitive(IDirect3DDevice2 *iface,
return DDERR_INVALIDPARAMS; /* Should never happen */
}
- return IDirect3DDevice7_DrawIndexedPrimitive((IDirect3DDevice7 *)This,
+ return IDirect3DDevice7_DrawIndexedPrimitive((IDirect3DDevice7 *)device_from_device2(iface),
PrimitiveType, FVF, Vertices, VertexCount, Indices, IndexCount, Flags);
}
@@ -3708,8 +3804,7 @@ static HRESULT WINAPI
IDirect3DDeviceImpl_7_SetClipStatus(IDirect3DDevice7 *iface,
D3DCLIPSTATUS *ClipStatus)
{
- IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
- FIXME("(%p)->(%p): Stub!\n", This, ClipStatus);
+ FIXME("iface %p, clip_status %p stub!\n", iface, ClipStatus);
/* D3DCLIPSTATUS and WINED3DCLIPSTATUS are different. I don't know how to convert them
* Perhaps this needs a new data type and an additional IWineD3DDevice method
@@ -3722,18 +3817,18 @@ static HRESULT WINAPI
Thunk_IDirect3DDeviceImpl_3_SetClipStatus(IDirect3DDevice3 *iface,
D3DCLIPSTATUS *ClipStatus)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, ClipStatus);
- return IDirect3DDevice7_SetClipStatus((IDirect3DDevice7 *)This, ClipStatus);
+ TRACE("iface %p, clip_status %p.\n", iface, ClipStatus);
+
+ return IDirect3DDevice7_SetClipStatus((IDirect3DDevice7 *)device_from_device3(iface), ClipStatus);
}
static HRESULT WINAPI
Thunk_IDirect3DDeviceImpl_2_SetClipStatus(IDirect3DDevice2 *iface,
D3DCLIPSTATUS *ClipStatus)
{
- IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, ClipStatus);
- return IDirect3DDevice7_SetClipStatus((IDirect3DDevice7 *)This, ClipStatus);
+ TRACE("iface %p, clip_status %p.\n", iface, ClipStatus);
+
+ return IDirect3DDevice7_SetClipStatus((IDirect3DDevice7 *)device_from_device2(iface), ClipStatus);
}
/*****************************************************************************
@@ -3752,8 +3847,7 @@ static HRESULT WINAPI
IDirect3DDeviceImpl_7_GetClipStatus(IDirect3DDevice7 *iface,
D3DCLIPSTATUS *ClipStatus)
{
- IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
- FIXME("(%p)->(%p): Stub!\n", This, ClipStatus);
+ FIXME("iface %p, clip_status %p stub!\n", iface, ClipStatus);
/* D3DCLIPSTATUS and WINED3DCLIPSTATUS are different. I don't know how to convert them */
/* return IWineD3DDevice_GetClipStatus(This->wineD3DDevice, ClipStatus);*/
@@ -3764,18 +3858,18 @@ static HRESULT WINAPI
Thunk_IDirect3DDeviceImpl_3_GetClipStatus(IDirect3DDevice3 *iface,
D3DCLIPSTATUS *ClipStatus)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, ClipStatus);
- return IDirect3DDevice7_GetClipStatus((IDirect3DDevice7 *)This, ClipStatus);
+ TRACE("iface %p, clip_status %p.\n", iface, ClipStatus);
+
+ return IDirect3DDevice7_GetClipStatus((IDirect3DDevice7 *)device_from_device3(iface), ClipStatus);
}
static HRESULT WINAPI
Thunk_IDirect3DDeviceImpl_2_GetClipStatus(IDirect3DDevice2 *iface,
D3DCLIPSTATUS *ClipStatus)
{
- IDirect3DDeviceImpl *This = device_from_device2(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, ClipStatus);
- return IDirect3DDevice7_GetClipStatus((IDirect3DDevice7 *)This, ClipStatus);
+ TRACE("iface %p, clip_status %p.\n", iface, ClipStatus);
+
+ return IDirect3DDevice7_GetClipStatus((IDirect3DDevice7 *)device_from_device2(iface), ClipStatus);
}
/*****************************************************************************
@@ -3812,7 +3906,8 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrided(IDirect3DDevice7 *iface,
DWORD i;
HRESULT hr;
- TRACE("(%p)->(%08x,%08x,%p,%08x,%08x): stub!\n", This, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
memset(&WineD3DStrided, 0, sizeof(WineD3DStrided));
/* Get the strided data right. the wined3d structure is a bit bigger
@@ -3915,9 +4010,10 @@ Thunk_IDirect3DDeviceImpl_3_DrawPrimitiveStrided(IDirect3DDevice3 *iface,
DWORD VertexCount,
DWORD Flags)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%p,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
- return IDirect3DDevice7_DrawPrimitiveStrided((IDirect3DDevice7 *)This,
+ TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
+
+ return IDirect3DDevice7_DrawPrimitiveStrided((IDirect3DDevice7 *)device_from_device3(iface),
PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
}
@@ -3953,7 +4049,8 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface,
DWORD i;
HRESULT hr;
- TRACE("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x)\n", This, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
memset(&WineD3DStrided, 0, sizeof(WineD3DStrided));
/* Get the strided data right. the wined3d structure is a bit bigger
@@ -4063,10 +4160,11 @@ Thunk_IDirect3DDeviceImpl_3_DrawIndexedPrimitiveStrided(IDirect3DDevice3 *iface,
DWORD IndexCount,
DWORD Flags)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
- return IDirect3DDevice7_DrawIndexedPrimitiveStrided((IDirect3DDevice7 *)This, PrimitiveType,
- VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
+ iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
+
+ return IDirect3DDevice7_DrawIndexedPrimitiveStrided((IDirect3DDevice7 *)device_from_device3(iface),
+ PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
}
/*****************************************************************************
@@ -4101,7 +4199,8 @@ IDirect3DDeviceImpl_7_DrawPrimitiveVB(IDirect3DDevice7 *iface,
HRESULT hr;
DWORD stride;
- TRACE("(%p)->(%08x,%p,%08x,%08x,%08x)\n", This, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
+ TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n",
+ iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
/* Sanity checks */
if(!vb)
@@ -4178,11 +4277,13 @@ Thunk_IDirect3DDeviceImpl_3_DrawPrimitiveVB(IDirect3DDevice3 *iface,
DWORD NumVertices,
DWORD Flags)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
IDirect3DVertexBufferImpl *vb = D3DVertexBuf ? vb_from_vb1(D3DVertexBuf) : NULL;
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p,%08x,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, PrimitiveType, vb, StartVertex, NumVertices, Flags);
- return IDirect3DDevice7_DrawPrimitiveVB((IDirect3DDevice7 *)This, PrimitiveType,
- (IDirect3DVertexBuffer7 *)vb, StartVertex, NumVertices, Flags);
+
+ TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n",
+ iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
+
+ return IDirect3DDevice7_DrawPrimitiveVB((IDirect3DDevice7 *)device_from_device3(iface),
+ PrimitiveType, (IDirect3DVertexBuffer7 *)vb, StartVertex, NumVertices, Flags);
}
@@ -4220,7 +4321,8 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
HRESULT hr;
WINED3DBUFFER_DESC desc;
- TRACE("(%p)->(%08x,%p,%d,%d,%p,%d,%08x)\n", This, PrimitiveType, vb, StartVertex, NumVertices, Indices, IndexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
+ iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags);
/* Steps:
* 1) Upload the Indices to the index buffer
@@ -4364,12 +4466,13 @@ Thunk_IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface,
DWORD IndexCount,
DWORD Flags)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
IDirect3DVertexBufferImpl *VB = vb_from_vb1(D3DVertexBuf);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p,%p,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, PrimitiveType, VB, Indices, IndexCount, Flags);
- return IDirect3DDevice7_DrawIndexedPrimitiveVB((IDirect3DDevice7 *)This, PrimitiveType,
- (IDirect3DVertexBuffer7 *)VB, 0, IndexCount, Indices, IndexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n",
+ iface, PrimitiveType, D3DVertexBuf, Indices, IndexCount, Flags);
+
+ return IDirect3DDevice7_DrawIndexedPrimitiveVB((IDirect3DDevice7 *)device_from_device3(iface),
+ PrimitiveType, (IDirect3DVertexBuffer7 *)VB, 0, IndexCount, Indices, IndexCount, Flags);
}
/*****************************************************************************
@@ -4425,7 +4528,8 @@ IDirect3DDeviceImpl_7_ComputeSphereVisibility(IDirect3DDevice7 *iface,
HRESULT hr;
UINT i, j;
- TRACE("(%p)->(%p,%p,%08x,%08x,%p)\n", iface, Centers, Radii, NumSpheres, Flags, ReturnValues);
+ TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n",
+ iface, Centers, Radii, NumSpheres, Flags, ReturnValues);
hr = IDirect3DDeviceImpl_7_GetTransform(iface, D3DTRANSFORMSTATE_WORLD, &m);
if ( hr != DD_OK ) return DDERR_INVALIDPARAMS;
@@ -4490,9 +4594,10 @@ Thunk_IDirect3DDeviceImpl_3_ComputeSphereVisibility(IDirect3DDevice3 *iface,
DWORD Flags,
DWORD *ReturnValues)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p,%p,%08x,%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, Centers, Radii, NumSpheres, Flags, ReturnValues);
- return IDirect3DDevice7_ComputeSphereVisibility((IDirect3DDevice7 *)This,
+ TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n",
+ iface, Centers, Radii, NumSpheres, Flags, ReturnValues);
+
+ return IDirect3DDevice7_ComputeSphereVisibility((IDirect3DDevice7 *)device_from_device3(iface),
Centers, Radii, NumSpheres, Flags, ReturnValues);
}
@@ -4523,7 +4628,8 @@ IDirect3DDeviceImpl_7_GetTexture(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
IWineD3DBaseTexture *Surf;
HRESULT hr;
- TRACE("(%p)->(%d,%p): Relay\n", This, Stage, Texture);
+
+ TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture);
if(!Texture)
{
@@ -4577,16 +4683,16 @@ Thunk_IDirect3DDeviceImpl_3_GetTexture(IDirect3DDevice3 *iface,
DWORD Stage,
IDirect3DTexture2 **Texture2)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
HRESULT ret;
IDirectDrawSurface7 *ret_val;
- TRACE_(ddraw_thunk)("(%p)->(%d,%p) thunking to IDirect3DDevice7 interface.\n", This, Stage, Texture2);
- ret = IDirect3DDevice7_GetTexture((IDirect3DDevice7 *)This, Stage, &ret_val);
+ TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture2);
+
+ ret = IDirect3DDevice7_GetTexture((IDirect3DDevice7 *)device_from_device3(iface), Stage, &ret_val);
*Texture2 = ret_val ? (IDirect3DTexture2 *)&((IDirectDrawSurfaceImpl *)ret_val)->IDirect3DTexture2_vtbl : NULL;
- TRACE_(ddraw_thunk)(" returning interface %p.\n", *Texture2);
+ TRACE("Returning texture %p.\n", *Texture2);
return ret;
}
@@ -4615,7 +4721,8 @@ IDirect3DDeviceImpl_7_SetTexture(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
IDirectDrawSurfaceImpl *surf = (IDirectDrawSurfaceImpl *)Texture;
HRESULT hr;
- TRACE("(%p)->(%08x,%p): Relay!\n", This, Stage, surf);
+
+ TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture);
/* Texture may be NULL here */
EnterCriticalSection(&ddraw_cs);
@@ -4658,7 +4765,8 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface,
IDirectDrawSurfaceImpl *tex = Texture2 ? surface_from_texture2(Texture2) : NULL;
DWORD texmapblend;
HRESULT hr;
- TRACE("(%p)->(%d,%p)\n", This, Stage, tex);
+
+ TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture2);
EnterCriticalSection(&ddraw_cs);
@@ -4768,7 +4876,9 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
const struct tss_lookup *l = &tss_lookup[TexStageStateType];
- TRACE("(%p)->(%08x,%08x,%p): Relay!\n", This, Stage, TexStageStateType, State);
+
+ TRACE("iface %p, stage %u, state %#x, value %p.\n",
+ iface, Stage, TexStageStateType, State);
if(!State)
return DDERR_INVALIDPARAMS;
@@ -4866,9 +4976,11 @@ Thunk_IDirect3DDeviceImpl_3_GetTextureStageState(IDirect3DDevice3 *iface,
D3DTEXTURESTAGESTATETYPE TexStageStateType,
DWORD *State)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, Stage, TexStageStateType, State);
- return IDirect3DDevice7_GetTextureStageState((IDirect3DDevice7 *)This, Stage, TexStageStateType, State);
+ TRACE("iface %p, stage %u, state %#x, value %p.\n",
+ iface, Stage, TexStageStateType, State);
+
+ return IDirect3DDevice7_GetTextureStageState((IDirect3DDevice7 *)device_from_device3(iface),
+ Stage, TexStageStateType, State);
}
/*****************************************************************************
@@ -4898,7 +5010,9 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
const struct tss_lookup *l = &tss_lookup[TexStageStateType];
HRESULT hr;
- TRACE("(%p)->(%08x,%08x,%08x): Relay!\n", This, Stage, TexStageStateType, State);
+
+ TRACE("iface %p, stage %u, state %#x, value %#x.\n",
+ iface, Stage, TexStageStateType, State);
if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS)
{
@@ -4997,9 +5111,11 @@ Thunk_IDirect3DDeviceImpl_3_SetTextureStageState(IDirect3DDevice3 *iface,
D3DTEXTURESTAGESTATETYPE TexStageStateType,
DWORD State)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, Stage, TexStageStateType, State);
- return IDirect3DDevice7_SetTextureStageState((IDirect3DDevice7 *)This, Stage, TexStageStateType, State);
+ TRACE("iface %p, stage %u, state %#x, value %#x.\n",
+ iface, Stage, TexStageStateType, State);
+
+ return IDirect3DDevice7_SetTextureStageState((IDirect3DDevice7 *)device_from_device3(iface),
+ Stage, TexStageStateType, State);
}
/*****************************************************************************
@@ -5026,7 +5142,8 @@ IDirect3DDeviceImpl_7_ValidateDevice(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p): Relay\n", This, NumPasses);
+
+ TRACE("iface %p, pass_count %p.\n", iface, NumPasses);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DDevice_ValidateDevice(This->wineD3DDevice, NumPasses);
@@ -5059,9 +5176,9 @@ static HRESULT WINAPI
Thunk_IDirect3DDeviceImpl_3_ValidateDevice(IDirect3DDevice3 *iface,
DWORD *Passes)
{
- IDirect3DDeviceImpl *This = device_from_device3(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice7 interface.\n", This, Passes);
- return IDirect3DDevice7_ValidateDevice((IDirect3DDevice7 *)This, Passes);
+ TRACE("iface %p, pass_count %p.\n", iface, Passes);
+
+ return IDirect3DDevice7_ValidateDevice((IDirect3DDevice7 *)device_from_device3(iface), Passes);
}
/*****************************************************************************
@@ -5096,7 +5213,9 @@ IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x): Relay\n", This, Count, Rects, Flags, Color, Z, Stencil);
+
+ TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n",
+ iface, Count, Rects, Flags, Color, Z, Stencil);
/* Note; D3DRECT is compatible with WINED3DRECT */
EnterCriticalSection(&ddraw_cs);
@@ -5159,7 +5278,8 @@ IDirect3DDeviceImpl_7_SetViewport(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p) Relay!\n", This, Data);
+
+ TRACE("iface %p, viewport %p.\n", iface, Data);
if(!Data)
return DDERR_INVALIDPARAMS;
@@ -5215,7 +5335,8 @@ IDirect3DDeviceImpl_7_GetViewport(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p) Relay!\n", This, Data);
+
+ TRACE("iface %p, viewport %p.\n", iface, Data);
if(!Data)
return DDERR_INVALIDPARAMS;
@@ -5272,7 +5393,8 @@ IDirect3DDeviceImpl_7_SetMaterial(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p): Relay!\n", This, Mat);
+
+ TRACE("iface %p, material %p.\n", iface, Mat);
if (!Mat) return DDERR_INVALIDPARAMS;
/* Note: D3DMATERIAL7 is compatible with WINED3DMATERIAL */
@@ -5326,7 +5448,8 @@ IDirect3DDeviceImpl_7_GetMaterial(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p): Relay!\n", This, Mat);
+
+ TRACE("iface %p, material %p.\n", iface, Mat);
EnterCriticalSection(&ddraw_cs);
/* Note: D3DMATERIAL7 is compatible with WINED3DMATERIAL */
@@ -5380,7 +5503,8 @@ IDirect3DDeviceImpl_7_SetLight(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%p): Relay!\n", This, LightIndex, Light);
+
+ TRACE("iface %p, light_idx %u, light %p.\n", iface, LightIndex, Light);
EnterCriticalSection(&ddraw_cs);
/* Note: D3DLIGHT7 is compatible with WINED3DLIGHT */
@@ -5435,7 +5559,8 @@ IDirect3DDeviceImpl_7_GetLight(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT rc;
- TRACE("(%p)->(%08x,%p): Relay!\n", This, LightIndex, Light);
+
+ TRACE("iface %p, light_idx %u, light %p.\n", iface, LightIndex, Light);
EnterCriticalSection(&ddraw_cs);
/* Note: D3DLIGHT7 is compatible with WINED3DLIGHT */
@@ -5488,7 +5613,8 @@ IDirect3DDeviceImpl_7_BeginStateBlock(IDirect3DDevice7 *iface)
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(): Relay!\n", This);
+
+ TRACE("iface %p.\n", iface);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DDevice_BeginStateBlock(This->wineD3DDevice);
@@ -5541,7 +5667,7 @@ IDirect3DDeviceImpl_7_EndStateBlock(IDirect3DDevice7 *iface,
HRESULT hr;
DWORD h;
- TRACE("(%p)->(%p): Relay!\n", This, BlockHandle);
+ TRACE("iface %p, stateblock %p.\n", iface, BlockHandle);
if(!BlockHandle)
{
@@ -5618,10 +5744,9 @@ static HRESULT
IDirect3DDeviceImpl_7_PreLoad(IDirect3DDevice7 *iface,
IDirectDrawSurface7 *Texture)
{
- IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
IDirectDrawSurfaceImpl *surf = (IDirectDrawSurfaceImpl *)Texture;
- TRACE("(%p)->(%p): Relay!\n", This, surf);
+ TRACE("iface %p, texture %p.\n", iface, Texture);
if(!Texture)
return DDERR_INVALIDPARAMS;
@@ -5673,7 +5798,8 @@ IDirect3DDeviceImpl_7_ApplyStateBlock(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
IWineD3DStateBlock *wined3d_sb;
HRESULT hr;
- TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle);
+
+ TRACE("iface %p, stateblock %#x.\n", iface, BlockHandle);
EnterCriticalSection(&ddraw_cs);
@@ -5735,7 +5861,8 @@ IDirect3DDeviceImpl_7_CaptureStateBlock(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
IWineD3DStateBlock *wined3d_sb;
HRESULT hr;
- TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle);
+
+ TRACE("iface %p, stateblock %#x.\n", iface, BlockHandle);
EnterCriticalSection(&ddraw_cs);
@@ -5795,7 +5922,8 @@ IDirect3DDeviceImpl_7_DeleteStateBlock(IDirect3DDevice7 *iface,
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
IWineD3DStateBlock *wined3d_sb;
ULONG ref;
- TRACE("(%p)->(%08x): Relay!\n", This, BlockHandle);
+
+ TRACE("iface %p, stateblock %#x.\n", iface, BlockHandle);
EnterCriticalSection(&ddraw_cs);
@@ -5863,7 +5991,7 @@ IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface,
HRESULT hr;
DWORD h;
- TRACE("(%p)->(%08x,%p)!\n", This, Type, BlockHandle);
+ TRACE("iface %p, type %#x, stateblock %p.\n", iface, Type, BlockHandle);
if(!BlockHandle)
{
@@ -6118,7 +6246,9 @@ IDirect3DDeviceImpl_7_Load(IDirect3DDevice7 *iface,
IDirectDrawSurfaceImpl *src = (IDirectDrawSurfaceImpl *)SrcTex;
POINT destpoint;
RECT srcrect;
- TRACE("(%p)->(%p,%p,%p,%p,%08x)\n", This, dest, DestPoint, src, SrcRect, Flags);
+
+ TRACE("iface %p, dst_texture %p, dst_pos %s, src_texture %p, src_rect %s, flags %#x.\n",
+ iface, DestTex, wine_dbgstr_point(DestPoint), SrcTex, wine_dbgstr_rect(SrcRect), Flags);
if( (!src) || (!dest) )
return DDERR_INVALIDPARAMS;
@@ -6328,7 +6458,8 @@ IDirect3DDeviceImpl_7_LightEnable(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%d): Relay!\n", This, LightIndex, Enable);
+
+ TRACE("iface %p, light_idx %u, enabled %#x.\n", iface, LightIndex, Enable);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DDevice_SetLightEnable(This->wineD3DDevice, LightIndex, Enable);
@@ -6383,7 +6514,8 @@ IDirect3DDeviceImpl_7_GetLightEnable(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%p): Relay\n", This, LightIndex, Enable);
+
+ TRACE("iface %p, light_idx %u, enabled %p.\n", iface, LightIndex, Enable);
if(!Enable)
return DDERR_INVALIDPARAMS;
@@ -6441,7 +6573,8 @@ IDirect3DDeviceImpl_7_SetClipPlane(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%08x,%p): Relay!\n", This, Index, PlaneEquation);
+
+ TRACE("iface %p, idx %u, plane %p.\n", iface, Index, PlaneEquation);
if(!PlaneEquation)
return DDERR_INVALIDPARAMS;
@@ -6497,7 +6630,8 @@ IDirect3DDeviceImpl_7_GetClipPlane(IDirect3DDevice7 *iface,
{
IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%d,%p): Relay!\n", This, Index, PlaneEquation);
+
+ TRACE("iface %p, idx %u, plane %p.\n", iface, Index, PlaneEquation);
if(!PlaneEquation)
return DDERR_INVALIDPARAMS;
@@ -6553,10 +6687,10 @@ IDirect3DDeviceImpl_7_GetInfo(IDirect3DDevice7 *iface,
void *DevInfoStruct,
DWORD Size)
{
- IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface;
- TRACE("(%p)->(%08x,%p,%08x)\n", This, DevInfoID, DevInfoStruct, Size);
+ TRACE("iface %p, info_id %#x, info %p, info_size %u.\n",
+ iface, DevInfoID, DevInfoStruct, Size);
- if (TRACE_ON(d3d7))
+ if (TRACE_ON(ddraw))
{
TRACE(" info requested : ");
switch (DevInfoID)
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index b637022..d4d2dd0 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -25,7 +25,7 @@
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
/*****************************************************************************
* _dump_executedata
@@ -88,7 +88,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
viewport_activate(lpViewport, FALSE);
TRACE("ExecuteData :\n");
- if (TRACE_ON(d3d7))
+ if (TRACE_ON(ddraw))
_dump_executedata(&(This->data));
while (1) {
@@ -124,27 +124,28 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
for (i = 0; i < count; i++) {
LPD3DTRIANGLE ci = (LPD3DTRIANGLE) instr;
- TRACE_(d3d7)(" v1: %d v2: %d v3: %d\n",ci->u1.v1, ci->u2.v2, ci->u3.v3);
- TRACE_(d3d7)(" Flags : ");
- if (TRACE_ON(d3d7)) {
- /* Wireframe */
- if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1)
- TRACE_(d3d7)("EDGEENABLE1 ");
- if (ci->wFlags & D3DTRIFLAG_EDGEENABLE2)
- TRACE_(d3d7)("EDGEENABLE2 ");
- if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1)
- TRACE_(d3d7)("EDGEENABLE3 ");
- /* Strips / Fans */
- if (ci->wFlags == D3DTRIFLAG_EVEN)
- TRACE_(d3d7)("EVEN ");
- if (ci->wFlags == D3DTRIFLAG_ODD)
- TRACE_(d3d7)("ODD ");
- if (ci->wFlags == D3DTRIFLAG_START)
- TRACE_(d3d7)("START ");
- if ((ci->wFlags > 0) && (ci->wFlags < 30))
- TRACE_(d3d7)("STARTFLAT(%d) ", ci->wFlags);
- TRACE_(d3d7)("\n");
- }
+ TRACE(" v1: %d v2: %d v3: %d\n",ci->u1.v1, ci->u2.v2, ci->u3.v3);
+ TRACE(" Flags : ");
+ if (TRACE_ON(ddraw))
+ {
+ /* Wireframe */
+ if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1)
+ TRACE("EDGEENABLE1 ");
+ if (ci->wFlags & D3DTRIFLAG_EDGEENABLE2)
+ TRACE("EDGEENABLE2 ");
+ if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1)
+ TRACE("EDGEENABLE3 ");
+ /* Strips / Fans */
+ if (ci->wFlags == D3DTRIFLAG_EVEN)
+ TRACE("EVEN ");
+ if (ci->wFlags == D3DTRIFLAG_ODD)
+ TRACE("ODD ");
+ if (ci->wFlags == D3DTRIFLAG_START)
+ TRACE("START ");
+ if ((ci->wFlags > 0) && (ci->wFlags < 30))
+ TRACE("STARTFLAT(%u) ", ci->wFlags);
+ TRACE("\n");
+ }
This->indices[(i * 3) ] = ci->u1.v1;
This->indices[(i * 3) + 1] = ci->u2.v2;
This->indices[(i * 3) + 2] = ci->u3.v3;
@@ -334,7 +335,8 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
TRACE(" Start : %d Dest : %d Count : %d\n",
ci->wStart, ci->wDest, ci->dwCount);
TRACE(" Flags : ");
- if (TRACE_ON(d3d7)) {
+ if (TRACE_ON(ddraw))
+ {
if (ci->dwFlags & D3DPROCESSVERTICES_COPY)
TRACE("COPY ");
if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR)
@@ -384,7 +386,8 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
D3DMATRIX mat;
D3DVIEWPORT* Viewport = &lpViewport->viewports.vp1;
- if (TRACE_ON(d3d7)) {
+ if (TRACE_ON(ddraw))
+ {
TRACE(" Projection Matrix : (%p)\n", &proj_mat);
dump_D3DMATRIX(&proj_mat);
TRACE(" View Matrix : (%p)\n", &view_mat);
@@ -428,7 +431,8 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
D3DMATRIX mat;
D3DVIEWPORT* Viewport = &lpViewport->viewports.vp1;
- if (TRACE_ON(d3d7)) {
+ if (TRACE_ON(ddraw))
+ {
TRACE(" Projection Matrix : (%p)\n", &proj_mat);
dump_D3DMATRIX(&proj_mat);
TRACE(" View Matrix : (%p)\n",&view_mat);
@@ -571,7 +575,7 @@ IDirect3DExecuteBufferImpl_QueryInterface(IDirect3DExecuteBuffer *iface,
REFIID riid,
void **obj)
{
- TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obj);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
*obj = NULL;
@@ -607,7 +611,7 @@ IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface)
IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- FIXME("(%p)->()incrementing from %u.\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -627,7 +631,7 @@ IDirect3DExecuteBufferImpl_Release(IDirect3DExecuteBuffer *iface)
IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->()decrementing from %u.\n", This, ref + 1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (!ref) {
if (This->need_free)
@@ -651,13 +655,11 @@ IDirect3DExecuteBufferImpl_Release(IDirect3DExecuteBuffer *iface)
* D3D_OK
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DExecuteBufferImpl_Initialize(IDirect3DExecuteBuffer *iface,
- IDirect3DDevice *lpDirect3DDevice,
- D3DEXECUTEBUFFERDESC *lpDesc)
+static HRESULT WINAPI IDirect3DExecuteBufferImpl_Initialize(IDirect3DExecuteBuffer *iface,
+ IDirect3DDevice *device, D3DEXECUTEBUFFERDESC *desc)
{
- IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
- TRACE("(%p)->(%p,%p) no-op....\n", This, lpDirect3DDevice, lpDesc);
+ TRACE("iface %p, device %p, desc %p.\n", iface, device, desc);
+
return D3D_OK;
}
@@ -680,12 +682,14 @@ IDirect3DExecuteBufferImpl_Lock(IDirect3DExecuteBuffer *iface,
{
IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
DWORD dwSize;
- TRACE("(%p)->(%p)\n", This, lpDesc);
+
+ TRACE("iface %p, desc %p.\n", iface, lpDesc);
dwSize = lpDesc->dwSize;
memcpy(lpDesc, &This->desc, dwSize);
- if (TRACE_ON(d3d7)) {
+ if (TRACE_ON(ddraw))
+ {
TRACE(" Returning description :\n");
_dump_D3DEXECUTEBUFFERDESC(lpDesc);
}
@@ -701,11 +705,10 @@ IDirect3DExecuteBufferImpl_Lock(IDirect3DExecuteBuffer *iface,
* This implementation always returns D3D_OK
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DExecuteBufferImpl_Unlock(IDirect3DExecuteBuffer *iface)
+static HRESULT WINAPI IDirect3DExecuteBufferImpl_Unlock(IDirect3DExecuteBuffer *iface)
{
- IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
- TRACE("(%p)->() no-op...\n", This);
+ TRACE("iface %p.\n", iface);
+
return D3D_OK;
}
@@ -729,7 +732,8 @@ IDirect3DExecuteBufferImpl_SetExecuteData(IDirect3DExecuteBuffer *iface,
{
IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
DWORD nbvert;
- TRACE("(%p)->(%p)\n", This, lpData);
+
+ TRACE("iface %p, data %p.\n", iface, lpData);
memcpy(&This->data, lpData, lpData->dwSize);
@@ -740,9 +744,8 @@ IDirect3DExecuteBufferImpl_SetExecuteData(IDirect3DExecuteBuffer *iface,
HeapFree(GetProcessHeap(), 0, This->vertex_data);
This->vertex_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbvert * sizeof(D3DTLVERTEX));
- if (TRACE_ON(d3d7)) {
+ if (TRACE_ON(ddraw))
_dump_executedata(lpData);
- }
return D3D_OK;
}
@@ -765,12 +768,14 @@ IDirect3DExecuteBufferImpl_GetExecuteData(IDirect3DExecuteBuffer *iface,
{
IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
DWORD dwSize;
- TRACE("(%p)->(%p): stub!\n", This, lpData);
+
+ TRACE("iface %p, data %p.\n", iface, lpData);
dwSize = lpData->dwSize;
memcpy(lpData, &This->data, dwSize);
- if (TRACE_ON(d3d7)) {
+ if (TRACE_ON(ddraw))
+ {
TRACE("Returning data :\n");
_dump_executedata(lpData);
}
@@ -791,15 +796,14 @@ IDirect3DExecuteBufferImpl_GetExecuteData(IDirect3DExecuteBuffer *iface,
* DDERR_UNSUPPORTED, because it's not implemented in Windows.
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DExecuteBufferImpl_Validate(IDirect3DExecuteBuffer *iface,
- DWORD *Offset,
- LPD3DVALIDATECALLBACK Func,
- void *UserArg,
- DWORD Reserved)
+static HRESULT WINAPI IDirect3DExecuteBufferImpl_Validate(IDirect3DExecuteBuffer *iface,
+ DWORD *offset, LPD3DVALIDATECALLBACK callback, void *context, DWORD reserved)
{
- IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
- TRACE("(%p)->(%p,%p,%p,%08x): Unimplemented!\n", This, Offset, Func, UserArg, Reserved);
+ TRACE("iface %p, offset %p, callback %p, context %p, reserved %#x.\n",
+ iface, offset, callback, context, reserved);
+
+ WARN("Not implemented.\n");
+
return DDERR_UNSUPPORTED; /* Unchecked */
}
@@ -816,12 +820,12 @@ IDirect3DExecuteBufferImpl_Validate(IDirect3DExecuteBuffer *iface,
* DDERR_UNSUPPORTED, because it's not implemented in Windows.
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DExecuteBufferImpl_Optimize(IDirect3DExecuteBuffer *iface,
- DWORD Dummy)
+static HRESULT WINAPI IDirect3DExecuteBufferImpl_Optimize(IDirect3DExecuteBuffer *iface, DWORD reserved)
{
- IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface;
- TRACE("(%p)->(%08x): Unimplemented\n", This, Dummy);
+ TRACE("iface %p, reserved %#x.\n", iface, reserved);
+
+ WARN("Not implemented.\n");
+
return DDERR_UNSUPPORTED; /* Unchecked */
}
diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c
index 3cf26b5..1a568f6 100644
--- a/dlls/ddraw/light.c
+++ b/dlls/ddraw/light.c
@@ -24,7 +24,7 @@
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
/*****************************************************************************
* light_update
@@ -108,14 +108,11 @@ void light_deactivate(IDirect3DLightImpl *light)
* Returns:
* E_NOINTERFACE, because it's a stub
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DLightImpl_QueryInterface(IDirect3DLight *iface,
- REFIID riid,
- void **obp)
+static HRESULT WINAPI IDirect3DLightImpl_QueryInterface(IDirect3DLight *iface, REFIID riid, void **object)
{
- IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface;
- FIXME("(%p)->(%s,%p): stub!\n", This, debugstr_guid(riid), obp);
- *obp = NULL;
+ FIXME("iface %p, riid %s, object %p stub!\n", iface, debugstr_guid(riid), object);
+
+ *object = NULL;
return E_NOINTERFACE;
}
@@ -134,7 +131,7 @@ IDirect3DLightImpl_AddRef(IDirect3DLight *iface)
IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -155,7 +152,7 @@ IDirect3DLightImpl_Release(IDirect3DLight *iface)
IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (!ref) {
HeapFree(GetProcessHeap(), 0, This);
@@ -181,13 +178,10 @@ IDirect3DLightImpl_Release(IDirect3DLight *iface)
* D3D_OK
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DLightImpl_Initialize(IDirect3DLight *iface,
- IDirect3D *lpDirect3D)
+static HRESULT WINAPI IDirect3DLightImpl_Initialize(IDirect3DLight *iface, IDirect3D *d3d)
{
- IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface;
- IDirectDrawImpl *d3d = lpDirect3D ? ddraw_from_d3d1(lpDirect3D) : NULL;
- TRACE("(%p)->(%p) no-op...\n", This, d3d);
+ TRACE("iface %p, d3d %p.\n", iface, d3d);
+
return D3D_OK;
}
@@ -219,8 +213,11 @@ IDirect3DLightImpl_SetLight(IDirect3DLight *iface,
{
IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface;
LPD3DLIGHT7 light7 = &(This->light7);
- TRACE("(%p)->(%p)\n", This, lpLight);
- if (TRACE_ON(d3d7)) {
+
+ TRACE("iface %p, light %p.\n", iface, lpLight);
+
+ if (TRACE_ON(ddraw))
+ {
TRACE(" Light definition :\n");
dump_light((LPD3DLIGHT2) lpLight);
}
@@ -274,8 +271,11 @@ IDirect3DLightImpl_GetLight(IDirect3DLight *iface,
D3DLIGHT *lpLight)
{
IDirect3DLightImpl *This = (IDirect3DLightImpl *)iface;
- TRACE("(%p/%p)->(%p)\n", This, iface, lpLight);
- if (TRACE_ON(d3d7)) {
+
+ TRACE("iface %p, light %p.\n", iface, lpLight);
+
+ if (TRACE_ON(ddraw))
+ {
TRACE(" Returning light definition :\n");
dump_light(&This->light);
}
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 0a33e31..13729e2 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -225,7 +225,8 @@ DDRAW_Create(const GUID *guid,
IDirectDrawImpl *This;
HRESULT hr;
- TRACE("(%s,%p,%p)\n", debugstr_guid(guid), DD, UnkOuter);
+ TRACE("driver_guid %s, ddraw %p, outer_unknown %p, interface_iid %s.\n",
+ debugstr_guid(guid), DD, UnkOuter, debugstr_guid(iid));
*DD = NULL;
@@ -292,7 +293,9 @@ DirectDrawCreate(GUID *GUID,
IUnknown *UnkOuter)
{
HRESULT hr;
- TRACE("(%s,%p,%p)\n", debugstr_guid(GUID), DD, UnkOuter);
+
+ TRACE("driver_guid %s, ddraw %p, outer_unknown %p.\n",
+ debugstr_guid(GUID), DD, UnkOuter);
EnterCriticalSection(&ddraw_cs);
hr = DDRAW_Create(GUID, (void **) DD, UnkOuter, &IID_IDirectDraw);
@@ -316,7 +319,9 @@ DirectDrawCreateEx(GUID *GUID,
IUnknown *UnkOuter)
{
HRESULT hr;
- TRACE("(%s,%p,%s,%p)\n", debugstr_guid(GUID), DD, debugstr_guid(iid), UnkOuter);
+
+ TRACE("driver_guid %s, ddraw %p, interface_iid %s, outer_unknown %p.\n",
+ debugstr_guid(GUID), DD, debugstr_guid(iid), UnkOuter);
if (!IsEqualGUID(iid, &IID_IDirectDraw7))
return DDERR_INVALIDPARAMS;
@@ -347,11 +352,9 @@ DirectDrawCreateEx(GUID *GUID,
*
*
***********************************************************************/
-HRESULT WINAPI
-DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback,
- LPVOID Context)
+HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, void *Context)
{
- TRACE("(%p, %p)\n", Callback, Context);
+ TRACE("callback %p, context %p.\n", Callback, Context);
TRACE(" Enumerating default DirectDraw HAL interface\n");
/* We only have one driver */
@@ -381,12 +384,9 @@ DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback,
* The Flag member is not supported right now.
*
***********************************************************************/
-HRESULT WINAPI
-DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback,
- LPVOID Context,
- DWORD Flags)
+HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, void *Context, DWORD Flags)
{
- TRACE("(%p, %p, 0x%08x)\n", Callback, Context, Flags);
+ TRACE("callback %p, context %p, flags %#x.\n", Callback, Context, Flags);
if (Flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES |
DDENUM_DETACHEDSECONDARYDEVICES |
@@ -424,13 +424,11 @@ DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback,
* This function is not implemented on Windows.
*
***********************************************************************/
-HRESULT WINAPI
-DirectDrawEnumerateW(LPDDENUMCALLBACKW Callback,
- LPVOID Context)
+HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW callback, void *context)
{
- TRACE("(%p, %p)\n", Callback, Context);
+ TRACE("callback %p, context %p.\n", callback, context);
- if (!Callback)
+ if (!callback)
return DDERR_INVALIDPARAMS;
else
return DDERR_UNSUPPORTED;
@@ -443,12 +441,9 @@ DirectDrawEnumerateW(LPDDENUMCALLBACKW Callback,
* This function is not implemented on Windows.
*
***********************************************************************/
-HRESULT WINAPI
-DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW Callback,
- LPVOID Context,
- DWORD Flags)
+HRESULT WINAPI DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW callback, void *context, DWORD flags)
{
- TRACE("(%p, %p, 0x%x)\n", Callback, Context, Flags);
+ TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags);
return DDERR_UNSUPPORTED;
}
@@ -477,7 +472,7 @@ CF_CreateDirectDraw(IUnknown* UnkOuter, REFIID iid,
{
HRESULT hr;
- TRACE("(%p,%s,%p)\n", UnkOuter, debugstr_guid(iid), obj);
+ TRACE("outer_unknown %p, riid %s, object %p.\n", UnkOuter, debugstr_guid(iid), obj);
EnterCriticalSection(&ddraw_cs);
hr = DDRAW_Create(NULL, obj, UnkOuter, iid);
@@ -506,6 +501,8 @@ CF_CreateDirectDrawClipper(IUnknown* UnkOuter, REFIID riid,
HRESULT hr;
IDirectDrawClipper *Clip;
+ TRACE("outer_unknown %p, riid %s, object %p.\n", UnkOuter, debugstr_guid(riid), obj);
+
EnterCriticalSection(&ddraw_cs);
hr = DirectDrawCreateClipper(0, &Clip, UnkOuter);
if (hr != DD_OK)
@@ -549,7 +546,7 @@ IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface,
{
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
- TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IClassFactory))
@@ -578,7 +575,7 @@ IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface)
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() incrementing from %d.\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -598,7 +595,8 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface)
{
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() decrementing from %d.\n", This, ref+1);
+
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (ref == 0)
HeapFree(GetProcessHeap(), 0, This);
@@ -627,7 +625,8 @@ IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface,
{
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
- TRACE("(%p)->(%p,%s,%p)\n",This,UnkOuter,debugstr_guid(riid),obj);
+ TRACE("iface %p, outer_unknown %p, riid %s, object %p.\n",
+ iface, UnkOuter, debugstr_guid(riid), obj);
return This->pfnCreateInstance(UnkOuter, riid, obj);
}
@@ -644,11 +643,10 @@ IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface,
* S_OK, because it's a stub
*
*******************************************************************************/
-static HRESULT WINAPI
-IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface,BOOL dolock)
+static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock)
{
- IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
- FIXME("(%p)->(%d),stub!\n",This,dolock);
+ FIXME("iface %p, dolock %#x stub!\n", iface, dolock);
+
return S_OK;
}
@@ -686,7 +684,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
unsigned int i;
IClassFactoryImpl *factory;
- TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
+ TRACE("rclsid %s, riid %s, object %p.\n",
+ debugstr_guid(rclsid), debugstr_guid(riid), ppv);
if ( !IsEqualGUID( &IID_IClassFactory, riid )
&& ! IsEqualGUID( &IID_IUnknown, riid) )
@@ -726,6 +725,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllCanUnloadNow(void)
{
+ TRACE("\n");
+
return S_FALSE;
}
diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index 10f4ab5..96e62e1 100644
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -24,8 +24,7 @@
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
-WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
static void dump_material(const D3DMATERIAL *mat)
{
@@ -67,7 +66,8 @@ IDirect3DMaterialImpl_QueryInterface(IDirect3DMaterial3 *iface,
LPVOID* obp)
{
IDirect3DMaterialImpl *This = (IDirect3DMaterialImpl *)iface;
- TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obp);
+
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp);
*obp = NULL;
@@ -114,7 +114,7 @@ IDirect3DMaterialImpl_AddRef(IDirect3DMaterial3 *iface)
IDirect3DMaterialImpl *This = (IDirect3DMaterialImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -135,7 +135,7 @@ IDirect3DMaterialImpl_Release(IDirect3DMaterial3 *iface)
IDirect3DMaterialImpl *This = (IDirect3DMaterialImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (!ref)
{
@@ -172,9 +172,7 @@ static HRESULT WINAPI
IDirect3DMaterialImpl_Initialize(IDirect3DMaterial *iface,
IDirect3D *Direct3D)
{
- IDirect3DMaterialImpl *This = material_from_material1(iface);
-
- TRACE("(%p)->(%p) no-op...!\n", This, Direct3D);
+ TRACE("iface %p, d3d %p.\n", iface, Direct3D);
return D3D_OK;
}
@@ -192,8 +190,7 @@ IDirect3DMaterialImpl_Initialize(IDirect3DMaterial *iface,
static HRESULT WINAPI
IDirect3DMaterialImpl_Reserve(IDirect3DMaterial *iface)
{
- IDirect3DMaterialImpl *This = material_from_material1(iface);
- TRACE("(%p)->() not implemented\n", This);
+ TRACE("iface %p.\n", iface);
return DDERR_UNSUPPORTED;
}
@@ -210,8 +207,7 @@ IDirect3DMaterialImpl_Reserve(IDirect3DMaterial *iface)
static HRESULT WINAPI
IDirect3DMaterialImpl_Unreserve(IDirect3DMaterial *iface)
{
- IDirect3DMaterialImpl *This = material_from_material1(iface);
- TRACE("(%p)->() not implemented.\n", This);
+ TRACE("iface %p.\n", iface);
return DDERR_UNSUPPORTED;
}
@@ -234,8 +230,9 @@ IDirect3DMaterialImpl_SetMaterial(IDirect3DMaterial3 *iface,
D3DMATERIAL *lpMat)
{
IDirect3DMaterialImpl *This = (IDirect3DMaterialImpl *)iface;
- TRACE("(%p)->(%p)\n", This, lpMat);
- if (TRACE_ON(d3d7))
+
+ TRACE("iface %p, material %p.\n", iface, lpMat);
+ if (TRACE_ON(ddraw))
dump_material(lpMat);
/* Stores the material */
@@ -266,8 +263,10 @@ IDirect3DMaterialImpl_GetMaterial(IDirect3DMaterial3 *iface,
{
IDirect3DMaterialImpl *This = (IDirect3DMaterialImpl *)iface;
DWORD dwSize;
- TRACE("(%p)->(%p)\n", This, lpMat);
- if (TRACE_ON(d3d7)) {
+
+ TRACE("iface %p, material %p.\n", iface, lpMat);
+ if (TRACE_ON(ddraw))
+ {
TRACE(" Returning material : ");
dump_material(&This->mat);
}
@@ -303,7 +302,8 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface,
{
IDirect3DMaterialImpl *This = (IDirect3DMaterialImpl *)iface;
IDirect3DDeviceImpl *device = device_from_device3(lpDirect3DDevice3);
- TRACE("(%p/%p)->(%p,%p)\n", This, iface, device, lpHandle);
+
+ TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice3, lpHandle);
EnterCriticalSection(&ddraw_cs);
This->active_device = device;
@@ -331,7 +331,8 @@ Thunk_IDirect3DMaterialImpl_2_GetHandle(LPDIRECT3DMATERIAL2 iface,
LPDIRECT3DDEVICE2 lpDirect3DDevice2,
LPD3DMATERIALHANDLE lpHandle)
{
- TRACE_(ddraw_thunk)("(%p)->(%p,%p) thunking to IDirect3DMaterial3 interface.\n", iface, lpDirect3DDevice2, lpHandle);
+ TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice2, lpHandle);
+
return IDirect3DMaterial3_GetHandle((IDirect3DMaterial3 *)material_from_material2(iface), lpDirect3DDevice2 ?
(IDirect3DDevice3 *)&device_from_device2(lpDirect3DDevice2)->IDirect3DDevice3_vtbl : NULL, lpHandle);
}
@@ -341,7 +342,8 @@ Thunk_IDirect3DMaterialImpl_1_GetHandle(LPDIRECT3DMATERIAL iface,
LPDIRECT3DDEVICE lpDirect3DDevice,
LPD3DMATERIALHANDLE lpHandle)
{
- TRACE_(ddraw_thunk)("(%p)->(%p,%p) thunking to IDirect3DMaterial3 interface.\n", iface, lpDirect3DDevice, lpHandle);
+ TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice, lpHandle);
+
return IDirect3DMaterial3_GetHandle((IDirect3DMaterial3 *)material_from_material1(iface), lpDirect3DDevice ?
(IDirect3DDevice3 *)&device_from_device1(lpDirect3DDevice)->IDirect3DDevice3_vtbl : NULL, lpHandle);
}
@@ -351,7 +353,8 @@ Thunk_IDirect3DMaterialImpl_2_QueryInterface(LPDIRECT3DMATERIAL2 iface,
REFIID riid,
LPVOID* obp)
{
- TRACE_(ddraw_thunk)("(%p)->(%s,%p) thunking to IDirect3DMaterial3 interface.\n", iface, debugstr_guid(riid), obp);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp);
+
return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)material_from_material2(iface), riid, obp);
}
@@ -360,35 +363,40 @@ Thunk_IDirect3DMaterialImpl_1_QueryInterface(LPDIRECT3DMATERIAL iface,
REFIID riid,
LPVOID* obp)
{
- TRACE_(ddraw_thunk)("(%p)->(%s,%p) thunking to IDirect3DMaterial3 interface.\n", iface, debugstr_guid(riid), obp);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp);
+
return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)material_from_material1(iface), riid, obp);
}
static ULONG WINAPI
Thunk_IDirect3DMaterialImpl_2_AddRef(LPDIRECT3DMATERIAL2 iface)
{
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DMaterial3 interface.\n", iface);
+ TRACE("iface %p.\n", iface);
+
return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)material_from_material2(iface));
}
static ULONG WINAPI
Thunk_IDirect3DMaterialImpl_1_AddRef(LPDIRECT3DMATERIAL iface)
{
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DMaterial3 interface.\n", iface);
+ TRACE("iface %p.\n", iface);
+
return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)material_from_material1(iface));
}
static ULONG WINAPI
Thunk_IDirect3DMaterialImpl_2_Release(LPDIRECT3DMATERIAL2 iface)
{
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DMaterial3 interface.\n", iface);
+ TRACE("iface %p.\n", iface);
+
return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)material_from_material2(iface));
}
static ULONG WINAPI
Thunk_IDirect3DMaterialImpl_1_Release(LPDIRECT3DMATERIAL iface)
{
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DMaterial3 interface.\n", iface);
+ TRACE("iface %p.\n", iface);
+
return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)material_from_material1(iface));
}
@@ -396,7 +404,8 @@ static HRESULT WINAPI
Thunk_IDirect3DMaterialImpl_2_SetMaterial(LPDIRECT3DMATERIAL2 iface,
LPD3DMATERIAL lpMat)
{
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DMaterial3 interface.\n", iface, lpMat);
+ TRACE("iface %p, material %p.\n", iface, lpMat);
+
return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)material_from_material2(iface), lpMat);
}
@@ -404,7 +413,8 @@ static HRESULT WINAPI
Thunk_IDirect3DMaterialImpl_1_SetMaterial(LPDIRECT3DMATERIAL iface,
LPD3DMATERIAL lpMat)
{
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DMaterial3 interface.\n", iface, lpMat);
+ TRACE("iface %p, material %p.\n", iface, lpMat);
+
return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)material_from_material1(iface), lpMat);
}
@@ -412,7 +422,8 @@ static HRESULT WINAPI
Thunk_IDirect3DMaterialImpl_2_GetMaterial(LPDIRECT3DMATERIAL2 iface,
LPD3DMATERIAL lpMat)
{
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DMaterial3 interface.\n", iface, lpMat);
+ TRACE("iface %p, material %p.\n", iface, lpMat);
+
return IDirect3DMaterial3_GetMaterial((IDirect3DMaterial3 *)material_from_material2(iface), lpMat);
}
@@ -420,7 +431,8 @@ static HRESULT WINAPI
Thunk_IDirect3DMaterialImpl_1_GetMaterial(LPDIRECT3DMATERIAL iface,
LPD3DMATERIAL lpMat)
{
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DMaterial3 interface.\n", iface, lpMat);
+ TRACE("iface %p, material %p.\n", iface, lpMat);
+
return IDirect3DMaterial3_GetMaterial((IDirect3DMaterial3 *)material_from_material1(iface), lpMat);
}
diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c
index 7b9dcc2..f922774 100644
--- a/dlls/ddraw/palette.c
+++ b/dlls/ddraw/palette.c
@@ -43,8 +43,7 @@ IDirectDrawPaletteImpl_QueryInterface(IDirectDrawPalette *iface,
REFIID refiid,
void **obj)
{
- IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface;
- TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(refiid), obj);
if (IsEqualGUID(refiid, &IID_IUnknown)
|| IsEqualGUID(refiid, &IID_IDirectDrawPalette))
@@ -75,7 +74,7 @@ IDirectDrawPaletteImpl_AddRef(IDirectDrawPalette *iface)
IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -95,7 +94,7 @@ IDirectDrawPaletteImpl_Release(IDirectDrawPalette *iface)
IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (ref == 0)
{
@@ -133,7 +132,9 @@ IDirectDrawPaletteImpl_Initialize(IDirectDrawPalette *iface,
DWORD Flags,
PALETTEENTRY *ColorTable)
{
- TRACE("(%p)->(%p,%x,%p)\n", iface, DD, Flags, ColorTable);
+ TRACE("iface %p, ddraw %p, flags %#x, entries %p.\n",
+ iface, DD, Flags, ColorTable);
+
return DDERR_ALREADYINITIALIZED;
}
@@ -157,7 +158,8 @@ IDirectDrawPaletteImpl_GetCaps(IDirectDrawPalette *iface,
{
IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p): Relay\n", This, Caps);
+
+ TRACE("iface %p, caps %p.\n", iface, Caps);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DPalette_GetCaps(This->wineD3DPalette, Caps);
@@ -192,7 +194,9 @@ IDirectDrawPaletteImpl_SetEntries(IDirectDrawPalette *iface,
{
IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%x,%d,%d,%p): Relay\n", This, Flags, Start, Count, PalEnt);
+
+ TRACE("iface %p, flags %#x, start %u, count %u, entries %p.\n",
+ iface, Flags, Start, Count, PalEnt);
if(!PalEnt)
return DDERR_INVALIDPARAMS;
@@ -229,7 +233,9 @@ IDirectDrawPaletteImpl_GetEntries(IDirectDrawPalette *iface,
{
IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%x,%d,%d,%p): Relay\n", This, Flags, Start, Count, PalEnt);
+
+ TRACE("iface %p, flags %#x, start %u, count %u, entries %p.\n",
+ iface, Flags, Start, Count, PalEnt);
if(!PalEnt)
return DDERR_INVALIDPARAMS;
diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c
index 705d587..871f066 100644
--- a/dlls/ddraw/parent.c
+++ b/dlls/ddraw/parent.c
@@ -51,7 +51,7 @@ IParentImpl_QueryInterface(IParent *iface,
REFIID riid,
void **obj)
{
- TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obj);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
*obj = NULL;
if ( IsEqualGUID( &IID_IUnknown, riid ) ||
@@ -81,7 +81,7 @@ IParentImpl_AddRef(IParent *iface)
IParentImpl *This = (IParentImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %d\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -105,7 +105,7 @@ static ULONG WINAPI IParentImpl_Release(IParent *iface)
IParentImpl *This = (IParentImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %d\n", This, ref);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (ref == 0)
{
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index a4d6c3c..6b6b257 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -62,13 +62,14 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
+
/* According to COM docs, if the QueryInterface fails, obj should be set to NULL */
*obj = NULL;
if(!riid)
return DDERR_INVALIDPARAMS;
- TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),obj);
if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IDirectDrawSurface7)
|| IsEqualGUID(riid, &IID_IDirectDrawSurface4) )
@@ -176,6 +177,8 @@ static ULONG WINAPI ddraw_surface7_AddRef(IDirectDrawSurface7 *iface)
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
+ TRACE("%p increasing refcount to %u.\n", This, refCount);
+
if (refCount == 1 && This->WineD3DSurface)
{
EnterCriticalSection(&ddraw_cs);
@@ -183,7 +186,6 @@ static ULONG WINAPI ddraw_surface7_AddRef(IDirectDrawSurface7 *iface)
LeaveCriticalSection(&ddraw_cs);
}
- TRACE("(%p) : AddRef increasing from %d\n", This, refCount - 1);
return refCount;
}
@@ -229,7 +231,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface)
*****************************************************************************/
void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This)
{
- TRACE("(%p)\n", This);
+ TRACE("surface %p.\n", This);
/* Check the refcount and give a warning */
if(This->ref > 1)
@@ -322,9 +324,9 @@ void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This)
static ULONG WINAPI ddraw_surface7_Release(IDirectDrawSurface7 *iface)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- ULONG ref;
- TRACE("(%p) : Releasing from %d\n", This, This->ref);
- ref = InterlockedDecrement(&This->ref);
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (ref == 0)
{
@@ -506,7 +508,8 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa
DDSCAPS2 our_caps;
int i;
- TRACE("(%p)->(%p,%p)\n", This, Caps, Surface);
+ TRACE("iface %p, caps %p, attachment %p.\n", iface, Caps, Surface);
+
EnterCriticalSection(&ddraw_cs);
if(This->version < 7)
@@ -634,7 +637,9 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface,
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
WINED3DLOCKED_RECT LockedRect;
HRESULT hr;
- TRACE("(%p)->(%p,%p,%x,%p)\n", This, Rect, DDSD, Flags, h);
+
+ TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n",
+ iface, wine_dbgstr_rect(Rect), DDSD, Flags, h);
if(!DDSD)
return DDERR_INVALIDPARAMS;
@@ -735,7 +740,8 @@ static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pR
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p)\n", This, pRect);
+
+ TRACE("iface %p, rect %s.\n", iface, wine_dbgstr_rect(pRect));
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_UnlockRect(This->WineD3DSurface);
@@ -780,7 +786,8 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra
IDirectDrawSurfaceImpl *Override = (IDirectDrawSurfaceImpl *)DestOverride;
IDirectDrawSurface7 *Override7;
HRESULT hr;
- TRACE("(%p)->(%p,%x)\n", This, DestOverride, Flags);
+
+ TRACE("iface %p, dst %p, flags %#x.\n", iface, DestOverride, Flags);
/* Flip has to be called from a front buffer
* What about overlay surfaces, AFAIK they can flip too?
@@ -848,7 +855,9 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
IDirectDrawSurfaceImpl *Src = (IDirectDrawSurfaceImpl *)SrcSurface;
HRESULT hr;
- TRACE("(%p)->(%p,%p,%p,%x,%p)\n", This, DestRect, Src, SrcRect, Flags, DDBltFx);
+
+ TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %p, flags %#x, fx %p.\n",
+ iface, wine_dbgstr_rect(DestRect), SrcSurface, wine_dbgstr_rect(SrcRect), Flags, DDBltFx);
/* Check for validity of the flags here. WineD3D Has the software-opengl selection path and would have
* to check at 2 places, and sometimes do double checks. This also saves the call to wined3d :-)
@@ -971,7 +980,7 @@ static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_r
*****************************************************************************/
static HRESULT WINAPI ddraw_surface_attach_surface(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *Surf)
{
- TRACE("(%p)->(%p)\n", This, Surf);
+ TRACE("surface %p, attachment %p.\n", This, Surf);
if(Surf == This)
return DDERR_CANNOTATTACHSURFACE; /* unchecked */
@@ -1011,6 +1020,8 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
IDirectDrawSurfaceImpl *Surf = (IDirectDrawSurfaceImpl *)Attach;
+ TRACE("iface %p, attachment %p.\n", iface, Attach);
+
/* Version 7 of this interface seems to refuse everything except z buffers, as per msdn */
if(!(Surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER))
{
@@ -1082,7 +1093,8 @@ static HRESULT WINAPI ddraw_surface7_DeleteAttachedSurface(IDirectDrawSurface7 *
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
IDirectDrawSurfaceImpl *Surf = (IDirectDrawSurfaceImpl *)Attach;
IDirectDrawSurfaceImpl *Prev = This;
- TRACE("(%p)->(%08x,%p)\n", This, Flags, Surf);
+
+ TRACE("iface %p, flags %#x, attachment %p.\n", iface, Flags, Attach);
EnterCriticalSection(&ddraw_cs);
if (!Surf || (Surf->first_attached != This) || (Surf == This) )
@@ -1149,16 +1161,8 @@ static HRESULT WINAPI ddraw_surface3_DeleteAttachedSurface(IDirectDrawSurface3 *
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_AddOverlayDirtyRect(IDirectDrawSurface7 *iface, RECT *Rect)
{
- IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p)\n",This,Rect);
+ TRACE("iface %p, rect %s.\n", iface, wine_dbgstr_rect(Rect));
- /* MSDN says it's not implemented. I could forward it to WineD3D,
- * then we'd implement it, but I don't think that's a good idea
- * (Stefan Dösinger)
- */
-#if 0
- return IWineD3DSurface_AddOverlayDirtyRect(This->WineD3DSurface, pRect);
-#endif
return DDERR_UNSUPPORTED; /* unchecked */
}
@@ -1187,7 +1191,8 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p): Relay\n", This, hdc);
+
+ TRACE("iface %p, dc %p.\n", iface, hdc);
if(!hdc)
return DDERR_INVALIDPARAMS;
@@ -1233,7 +1238,8 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p): Relay\n", This, hdc);
+
+ TRACE("iface %p, dc %p.\n", iface, hdc);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_ReleaseDC(This->WineD3DSurface, hdc);
@@ -1264,7 +1270,8 @@ static HRESULT WINAPI ddraw_surface3_ReleaseDC(IDirectDrawSurface3 *iface, HDC d
static HRESULT WINAPI ddraw_surface7_GetCaps(IDirectDrawSurface7 *iface, DDSCAPS2 *Caps)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p)\n",This,Caps);
+
+ TRACE("iface %p, caps %p.\n", iface, Caps);
if(!Caps)
return DDERR_INVALIDPARAMS;
@@ -1304,7 +1311,8 @@ static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWO
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%d): Relay!\n",This,Priority);
+
+ TRACE("iface %p, priority %u.\n", iface, Priority);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_SetPriority(This->WineD3DSurface, Priority);
@@ -1329,7 +1337,8 @@ static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWO
static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWORD *Priority)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p): Relay\n",This,Priority);
+
+ TRACE("iface %p, priority %p.\n", iface, Priority);
if(!Priority)
{
@@ -1364,7 +1373,9 @@ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface,
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%s,%p,%d,%x): Relay\n", This, debugstr_guid(tag), Data, Size, Flags);
+
+ TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n",
+ iface, debugstr_guid(tag), Data, Size, Flags);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_SetPrivateData(This->WineD3DSurface,
@@ -1400,7 +1411,9 @@ static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface,
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%s,%p,%p): Relay\n", This, debugstr_guid(tag), Data, Size);
+
+ TRACE("iface %p, tag %s, data %p, data_size %p.\n",
+ iface, debugstr_guid(tag), Data, Size);
if(!Data)
return DDERR_INVALIDPARAMS;
@@ -1431,7 +1444,8 @@ static HRESULT WINAPI ddraw_surface7_FreePrivateData(IDirectDrawSurface7 *iface,
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%s): Relay\n", This, debugstr_guid(tag));
+
+ TRACE("iface %p, tag %s.\n", iface, debugstr_guid(tag));
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_FreePrivateData(This->WineD3DSurface, tag);
@@ -1453,7 +1467,7 @@ static HRESULT WINAPI ddraw_surface7_FreePrivateData(IDirectDrawSurface7 *iface,
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_PageLock(IDirectDrawSurface7 *iface, DWORD Flags)
{
- TRACE("(%p)->(%x)\n", iface, Flags);
+ TRACE("iface %p, flags %#x.\n", iface, Flags);
/* This is Windows memory management related - we don't need this */
return DD_OK;
@@ -1480,7 +1494,7 @@ static HRESULT WINAPI ddraw_surface3_PageLock(IDirectDrawSurface3 *iface, DWORD
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_PageUnlock(IDirectDrawSurface7 *iface, DWORD Flags)
{
- TRACE("(%p)->(%x)\n", iface, Flags);
+ TRACE("iface %p, flags %#x.\n", iface, Flags);
return DD_OK;
}
@@ -1506,7 +1520,7 @@ static HRESULT WINAPI ddraw_surface3_PageUnlock(IDirectDrawSurface3 *iface, DWOR
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags)
{
- TRACE("(%p)->(%p,%d,%08x)\n",iface,Batch,Count,Flags);
+ TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, Batch, Count, Flags);
/* MSDN: "not currently implemented" */
return DDERR_UNSUPPORTED;
@@ -1542,7 +1556,7 @@ static HRESULT WINAPI ddraw_surface7_EnumAttachedSurfaces(IDirectDrawSurface7 *i
int i;
/* Attached surfaces aren't handled in WineD3D */
- TRACE("(%p)->(%p,%p)\n",This,context,cb);
+ TRACE("iface %p, context %p, callback %p.\n", iface, context, cb);
if(!cb)
return DDERR_INVALIDPARAMS;
@@ -1626,7 +1640,7 @@ static HRESULT WINAPI ddraw_surface3_EnumAttachedSurfaces(IDirectDrawSurface3 *i
static HRESULT WINAPI ddraw_surface7_EnumOverlayZOrders(IDirectDrawSurface7 *iface,
DWORD Flags, void *context, LPDDENUMSURFACESCALLBACK7 cb)
{
- FIXME("(%p)->(%x,%p,%p): Stub!\n", iface, Flags, context, cb);
+ FIXME("iface %p, flags %#x, context %p, callback %p stub!\n", iface, Flags, context, cb);
return DD_OK;
}
@@ -1661,7 +1675,8 @@ static HRESULT WINAPI ddraw_surface7_GetBltStatus(IDirectDrawSurface7 *iface, DW
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%x): Relay\n", This, Flags);
+
+ TRACE("iface %p, flags %#x.\n", iface, Flags);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_GetBltStatus(This->WineD3DSurface, Flags);
@@ -1697,7 +1712,8 @@ static HRESULT WINAPI ddraw_surface3_GetBltStatus(IDirectDrawSurface3 *iface, DW
static HRESULT WINAPI ddraw_surface7_GetColorKey(IDirectDrawSurface7 *iface, DWORD Flags, DDCOLORKEY *CKey)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%08x,%p)\n", This, Flags, CKey);
+
+ TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey);
if(!CKey)
return DDERR_INVALIDPARAMS;
@@ -1774,7 +1790,8 @@ static HRESULT WINAPI ddraw_surface7_GetFlipStatus(IDirectDrawSurface7 *iface, D
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%x): Relay\n", This, Flags);
+
+ TRACE("iface %p, flags %#x.\n", iface, Flags);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_GetFlipStatus(This->WineD3DSurface, Flags);
@@ -1809,7 +1826,8 @@ static HRESULT WINAPI ddraw_surface7_GetOverlayPosition(IDirectDrawSurface7 *ifa
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%p,%p): Relay\n", This, X, Y);
+
+ TRACE("iface %p, x %p, y %p.\n", iface, X, Y);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_GetOverlayPosition(This->WineD3DSurface,
@@ -1844,7 +1862,8 @@ static HRESULT WINAPI ddraw_surface7_GetPixelFormat(IDirectDrawSurface7 *iface,
{
/* What is DDERR_INVALIDSURFACETYPE for here? */
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p)\n",This,PixelFormat);
+
+ TRACE("iface %p, pixel_format %p.\n", iface, PixelFormat);
if(!PixelFormat)
return DDERR_INVALIDPARAMS;
@@ -1881,7 +1900,7 @@ static HRESULT WINAPI ddraw_surface7_GetSurfaceDesc(IDirectDrawSurface7 *iface,
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p)\n",This,DDSD);
+ TRACE("iface %p, surface_desc %p.\n", iface, DDSD);
if(!DDSD)
return DDERR_INVALIDPARAMS;
@@ -1993,7 +2012,8 @@ static HRESULT WINAPI ddraw_surface7_IsLost(IDirectDrawSurface7 *iface)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)\n", This);
+
+ TRACE("iface %p.\n", iface);
EnterCriticalSection(&ddraw_cs);
/* We lose the surface if the implementation was changed */
@@ -2042,7 +2062,8 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)\n", This);
+
+ TRACE("iface %p.\n", iface);
EnterCriticalSection(&ddraw_cs);
if(This->ImplType != This->ddraw->ImplType)
@@ -2079,7 +2100,8 @@ static HRESULT WINAPI ddraw_surface7_SetOverlayPosition(IDirectDrawSurface7 *ifa
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%d,%d): Relay\n", This, X, Y);
+
+ TRACE("iface %p, x %d, y %d.\n", iface, X, Y);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_SetOverlayPosition(This->WineD3DSurface,
@@ -2117,7 +2139,9 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlay(IDirectDrawSurface7 *iface, R
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
IDirectDrawSurfaceImpl *Dst = (IDirectDrawSurfaceImpl *)DstSurface;
HRESULT hr;
- TRACE("(%p)->(%p,%p,%p,%x,%p): Relay\n", This, SrcRect, Dst, DstRect, Flags, FX);
+
+ TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n",
+ iface, wine_dbgstr_rect(SrcRect), DstSurface, wine_dbgstr_rect(DstRect), Flags, FX);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_UpdateOverlay(This->WineD3DSurface,
@@ -2159,8 +2183,8 @@ static HRESULT WINAPI ddraw_surface3_UpdateOverlay(IDirectDrawSurface3 *iface, R
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_UpdateOverlayDisplay(IDirectDrawSurface7 *iface, DWORD Flags)
{
- IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%x)\n", This, Flags);
+ TRACE("iface %p, flags %#x.\n", iface, Flags);
+
return DDERR_UNSUPPORTED;
}
@@ -2191,7 +2215,8 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlayZOrder(IDirectDrawSurface7 *if
IDirectDrawSurfaceImpl *Ref = (IDirectDrawSurfaceImpl *)DDSRef;
HRESULT hr;
- TRACE("(%p)->(%x,%p): Relay\n", This, Flags, Ref);
+ TRACE("iface %p, flags %#x, reference %p.\n", iface, Flags, DDSRef);
+
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DSurface_UpdateOverlayZOrder(This->WineD3DSurface,
Flags,
@@ -2227,7 +2252,7 @@ static HRESULT WINAPI ddraw_surface7_GetDDInterface(IDirectDrawSurface7 *iface,
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p)\n",This,DD);
+ TRACE("iface %p, ddraw %p.\n", iface, DD);
if(!DD)
return DDERR_INVALIDPARAMS;
@@ -2269,7 +2294,8 @@ static HRESULT WINAPI ddraw_surface7_ChangeUniquenessValue(IDirectDrawSurface7 *
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
volatile IDirectDrawSurfaceImpl* vThis = This;
- TRACE("(%p)\n",This);
+ TRACE("iface %p.\n", iface);
+
EnterCriticalSection(&ddraw_cs);
/* A uniqueness value of 0 is apparently special.
* This needs to be checked.
@@ -2297,7 +2323,8 @@ static HRESULT WINAPI ddraw_surface7_GetUniquenessValue(IDirectDrawSurface7 *ifa
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p)\n",This,pValue);
+ TRACE("iface %p, value %p.\n", iface, pValue);
+
EnterCriticalSection(&ddraw_cs);
*pValue = This->uniqueness_value;
LeaveCriticalSection(&ddraw_cs);
@@ -2321,7 +2348,8 @@ static HRESULT WINAPI ddraw_surface7_SetLOD(IDirectDrawSurface7 *iface, DWORD Ma
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
HRESULT hr;
- TRACE("(%p)->(%d)\n", This, MaxLOD);
+
+ TRACE("iface %p, lod %u.\n", iface, MaxLOD);
EnterCriticalSection(&ddraw_cs);
if (!(This->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE))
@@ -2360,7 +2388,8 @@ static HRESULT WINAPI ddraw_surface7_SetLOD(IDirectDrawSurface7 *iface, DWORD Ma
static HRESULT WINAPI ddraw_surface7_GetLOD(IDirectDrawSurface7 *iface, DWORD *MaxLOD)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p)\n", This, MaxLOD);
+
+ TRACE("iface %p, lod %p.\n", iface, MaxLOD);
if(!MaxLOD)
return DDERR_INVALIDPARAMS;
@@ -2401,7 +2430,9 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d
IDirectDrawSurfaceImpl *src = (IDirectDrawSurfaceImpl *)Source;
DWORD src_w, src_h, dst_w, dst_h;
HRESULT hr;
- TRACE("(%p)->(%d,%d,%p,%p,%d): Relay\n", This, dstx, dsty, Source, rsrc, trans);
+
+ TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n",
+ iface, dstx, dsty, Source, wine_dbgstr_rect(rsrc), trans);
dst_w = This->surface_desc.dwWidth;
dst_h = This->surface_desc.dwHeight;
@@ -2478,7 +2509,8 @@ static HRESULT WINAPI ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD d
static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **Clipper)
{
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
- TRACE("(%p)->(%p)\n", This, Clipper);
+
+ TRACE("iface %p, clipper %p.\n", iface, Clipper);
if(!Clipper)
{
@@ -2524,7 +2556,8 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, IDir
IDirectDrawClipperImpl *oldClipper = This->clipper;
HWND clipWindow;
HRESULT hr;
- TRACE("(%p)->(%p)\n",This,Clipper);
+
+ TRACE("iface %p, clipper %p.\n", iface, Clipper);
EnterCriticalSection(&ddraw_cs);
if ((IDirectDrawClipperImpl *)Clipper == This->clipper)
@@ -2589,7 +2622,8 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
WINED3DFORMAT newFormat = WINED3DFMT_UNKNOWN;
HRESULT hr;
- TRACE("(%p)->(%p,%x)\n", This, DDSD, Flags);
+
+ TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags);
if(!DDSD)
return DDERR_INVALIDPARAMS;
@@ -2691,7 +2725,8 @@ static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDir
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
IWineD3DPalette *wPal;
HRESULT hr;
- TRACE("(%p)->(%p): Relay\n", This, Pal);
+
+ TRACE("iface %p, palette %p.\n", iface, Pal);
if(!Pal)
return DDERR_INVALIDPARAMS;
@@ -2784,7 +2819,8 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO
IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
DDCOLORKEY FixedCKey;
struct SCKContext ctx = { DD_OK, (WINEDDCOLORKEY *) (CKey ? &FixedCKey : NULL), Flags };
- TRACE("(%p)->(%x,%p)\n", This, Flags, CKey);
+
+ TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey);
EnterCriticalSection(&ddraw_cs);
if (CKey)
@@ -2882,7 +2918,8 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir
IDirectDrawSurfaceImpl *surf;
IDirectDrawPaletteImpl *PalImpl = (IDirectDrawPaletteImpl *)Pal;
HRESULT hr;
- TRACE("(%p)->(%p)\n", This, Pal);
+
+ TRACE("iface %p, palette %p.\n", iface, Pal);
if (!(This->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 |
DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) {
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index c25aad5..48e9ae7 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -24,8 +24,7 @@
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
-WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
/*****************************************************************************
* IUnknown Methods
@@ -52,7 +51,8 @@ IDirect3DVertexBufferImpl_QueryInterface(IDirect3DVertexBuffer7 *iface,
void **obj)
{
IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface;
- TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj);
+
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
/* By default, set the object pointer to NULL */
*obj = NULL;
@@ -87,10 +87,9 @@ Thunk_IDirect3DVertexBufferImpl_1_QueryInterface(IDirect3DVertexBuffer *iface,
REFIID riid,
void **obj)
{
- IDirect3DVertexBufferImpl *This = vb_from_vb1(iface);
- TRACE_(ddraw_thunk)("(%p)->(%s,%p) thunking to IDirect3DVertexBuffer7 interface.\n", This, debugstr_guid(riid), obj);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj);
- return IDirect3DVertexBuffer7_QueryInterface((IDirect3DVertexBuffer7 *)This, riid, obj);
+ return IDirect3DVertexBuffer7_QueryInterface((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), riid, obj);
}
/*****************************************************************************
@@ -108,7 +107,7 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface)
IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p/%p)->() incrementing from %u.\n", This, iface, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -116,10 +115,9 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface)
static ULONG WINAPI
Thunk_IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface)
{
- IDirect3DVertexBufferImpl *This = vb_from_vb1(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DVertexBuffer7 interface.\n", This);
+ TRACE("iface %p.\n", iface);
- return IDirect3DVertexBuffer7_AddRef((IDirect3DVertexBuffer7 *)This);
+ return IDirect3DVertexBuffer7_AddRef((IDirect3DVertexBuffer7 *)vb_from_vb1(iface));
}
@@ -138,7 +136,7 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface)
IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (ref == 0)
{
@@ -181,10 +179,9 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface)
static ULONG WINAPI
Thunk_IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface)
{
- IDirect3DVertexBufferImpl *This = vb_from_vb1(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DVertexBuffer7 interface.\n", This);
+ TRACE("iface %p.\n", iface);
- return IDirect3DVertexBuffer7_Release((IDirect3DVertexBuffer7 *)This);
+ return IDirect3DVertexBuffer7_Release((IDirect3DVertexBuffer7 *)vb_from_vb1(iface));
}
/*****************************************************************************
@@ -220,7 +217,8 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface,
WINED3DBUFFER_DESC Desc;
HRESULT hr;
DWORD wined3d_flags = 0;
- TRACE("(%p)->(%08x,%p,%p)\n", This, Flags, Data, Size);
+
+ TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, Flags, Data, Size);
/* Writeonly: Pointless. Event: Unsupported by native according to the sdk
* nosyslock: Not applicable
@@ -256,10 +254,9 @@ Thunk_IDirect3DVertexBufferImpl_1_Lock(IDirect3DVertexBuffer *iface,
void **Data,
DWORD *Size)
{
- IDirect3DVertexBufferImpl *This = vb_from_vb1(iface);
- TRACE_(ddraw_thunk)("(%p)->(%08x,%p,%p) thunking to IDirect3DVertexBuffer7 interface.\n", This, Flags, Data, Size);
+ TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, Flags, Data, Size);
- return IDirect3DVertexBuffer7_Lock((IDirect3DVertexBuffer7 *)This, Flags, Data, Size);
+ return IDirect3DVertexBuffer7_Lock((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), Flags, Data, Size);
}
/*****************************************************************************
@@ -276,7 +273,8 @@ IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface)
{
IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface;
HRESULT hr;
- TRACE("(%p)->()\n", This);
+
+ TRACE("iface %p.\n", iface);
EnterCriticalSection(&ddraw_cs);
hr = IWineD3DBuffer_Unmap(This->wineD3DVertexBuffer);
@@ -288,10 +286,9 @@ IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface)
static HRESULT WINAPI
Thunk_IDirect3DVertexBufferImpl_1_Unlock(IDirect3DVertexBuffer *iface)
{
- IDirect3DVertexBufferImpl *This = vb_from_vb1(iface);
- TRACE_(ddraw_thunk)("(%p)->() thunking to IDirect3DVertexBuffer7 interface.\n", This);
+ TRACE("iface %p.\n", iface);
- return IDirect3DVertexBuffer7_Unlock((IDirect3DVertexBuffer7 *)This);
+ return IDirect3DVertexBuffer7_Unlock((IDirect3DVertexBuffer7 *)vb_from_vb1(iface));
}
@@ -333,7 +330,8 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface,
BOOL oldClip, doClip;
HRESULT hr;
- TRACE("(%p)->(%08x,%d,%d,%p,%d,%p,%08x)\n", This, VertexOp, DestIndex, Count, Src, SrcIndex, D3D, Flags);
+ TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n",
+ iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, D3DDevice, Flags);
/* Vertex operations:
* D3DVOP_CLIP: Clips vertices outside the viewing frustrum. Needs clipping information
@@ -398,14 +396,14 @@ Thunk_IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface,
IDirect3DDevice3 *D3DDevice,
DWORD Flags)
{
- IDirect3DVertexBufferImpl *This = vb_from_vb1(iface);
IDirect3DVertexBufferImpl *Src = SrcBuffer ? vb_from_vb1(SrcBuffer) : NULL;
IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL;
- TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%08x,%p,%08x,%p,%08x) thunking to IDirect3DVertexBuffer7 interface.\n", This, VertexOp, DestIndex, Count, Src, SrcIndex, D3D, Flags);
+ TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n",
+ iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, D3DDevice, Flags);
- return IDirect3DVertexBuffer7_ProcessVertices((IDirect3DVertexBuffer7 *)This, VertexOp, DestIndex,
- Count, (IDirect3DVertexBuffer7 *)Src, SrcIndex, (IDirect3DDevice7 *)D3D, Flags);
+ return IDirect3DVertexBuffer7_ProcessVertices((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), VertexOp,
+ DestIndex, Count, (IDirect3DVertexBuffer7 *)Src, SrcIndex, (IDirect3DDevice7 *)D3D, Flags);
}
/*****************************************************************************
@@ -428,7 +426,8 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface,
IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface;
WINED3DBUFFER_DESC WDesc;
HRESULT hr;
- TRACE("(%p)->(%p)\n", This, Desc);
+
+ TRACE("iface %p, desc %p.\n", iface, Desc);
if(!Desc) return DDERR_INVALIDPARAMS;
@@ -454,10 +453,9 @@ static HRESULT WINAPI
Thunk_IDirect3DVertexBufferImpl_1_GetVertexBufferDesc(IDirect3DVertexBuffer *iface,
D3DVERTEXBUFFERDESC *Desc)
{
- IDirect3DVertexBufferImpl *This = vb_from_vb1(iface);
- TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DVertexBuffer7 interface.\n", This, Desc);
+ TRACE("iface %p, desc %p.\n", iface, Desc);
- return IDirect3DVertexBuffer7_GetVertexBufferDesc((IDirect3DVertexBuffer7 *)This, Desc);
+ return IDirect3DVertexBuffer7_GetVertexBufferDesc((IDirect3DVertexBuffer7 *)vb_from_vb1(iface), Desc);
}
@@ -480,12 +478,13 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface,
DWORD Flags)
{
IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface;
- IDirect3DDeviceImpl *D3D = (IDirect3DDeviceImpl *)D3DDevice;
static BOOL hide = FALSE;
+ TRACE("iface %p, device %p, flags %#x.\n", iface, D3DDevice, Flags);
+
if (!hide)
{
- FIXME("(%p)->(%p,%08x): stub!\n", This, D3D, Flags);
+ FIXME("iface %p, device %p, flags %#x stub!\n", iface, D3DDevice, Flags);
hide = TRUE;
}
@@ -504,11 +503,12 @@ Thunk_IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface,
IDirect3DDevice3 *D3DDevice,
DWORD Flags)
{
- IDirect3DVertexBufferImpl *This = vb_from_vb1(iface);
IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL;
- TRACE_(ddraw_thunk)("(%p)->(%p,%08x) thunking to IDirect3DVertexBuffer7 interface.\n", This, D3D, Flags);
- return IDirect3DVertexBuffer7_Optimize((IDirect3DVertexBuffer7 *)This, (IDirect3DDevice7 *)D3D, Flags);
+ TRACE("iface %p, device %p, flags %#x.\n", iface, D3DDevice, Flags);
+
+ return IDirect3DVertexBuffer7_Optimize((IDirect3DVertexBuffer7 *)vb_from_vb1(iface),
+ (IDirect3DDevice7 *)D3D, Flags);
}
/*****************************************************************************
@@ -543,9 +543,9 @@ IDirect3DVertexBufferImpl_ProcessVerticesStrided(IDirect3DVertexBuffer7 *iface,
IDirect3DDevice7 *D3DDevice,
DWORD Flags)
{
- IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface;
- IDirect3DDeviceImpl *D3D = (IDirect3DDeviceImpl *)D3DDevice;
- FIXME("(%p)->(%08x,%08x,%08x,%p,%08x,%p,%08x): stub!\n", This, VertexOp, DestIndex, Count, StrideData, VertexTypeDesc, D3D, Flags);
+ FIXME("iface %p, vertex_op %#x, dst_idx %u, count %u, data %p, vertex_type %#x, device %p, flags %#x stub!\n",
+ iface, VertexOp, DestIndex, Count, StrideData, VertexTypeDesc, D3DDevice, Flags);
+
return DD_OK;
}
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 118e03a..918b002 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -24,7 +24,7 @@
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
/*****************************************************************************
* Helper functions
@@ -131,7 +131,7 @@ IDirect3DViewportImpl_QueryInterface(IDirect3DViewport3 *iface,
REFIID riid,
void **obp)
{
- TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obp);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp);
*obp = NULL;
@@ -163,7 +163,7 @@ IDirect3DViewportImpl_AddRef(IDirect3DViewport3 *iface)
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", This, ref);
return ref;
}
@@ -183,7 +183,7 @@ IDirect3DViewportImpl_Release(IDirect3DViewport3 *iface)
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
+ TRACE("%p decreasing refcount to %u.\n", This, ref);
if (!ref) {
HeapFree(GetProcessHeap(), 0, This);
@@ -212,7 +212,8 @@ static HRESULT WINAPI
IDirect3DViewportImpl_Initialize(IDirect3DViewport3 *iface,
IDirect3D *Direct3D)
{
- TRACE("(%p)->(%p) no-op...\n", iface, Direct3D);
+ TRACE("iface %p, d3d %p.\n", iface, Direct3D);
+
return DDERR_ALREADYINITIALIZED;
}
@@ -235,7 +236,8 @@ IDirect3DViewportImpl_GetViewport(IDirect3DViewport3 *iface,
{
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
DWORD dwSize;
- TRACE("(%p/%p)->(%p)\n", This, iface, lpData);
+
+ TRACE("iface %p, data %p.\n", iface, lpData);
EnterCriticalSection(&ddraw_cs);
dwSize = lpData->dwSize;
@@ -258,7 +260,8 @@ IDirect3DViewportImpl_GetViewport(IDirect3DViewport3 *iface,
memcpy(lpData, &vp1, dwSize);
}
- if (TRACE_ON(d3d7)) {
+ if (TRACE_ON(ddraw))
+ {
TRACE(" returning D3DVIEWPORT :\n");
_dump_D3DVIEWPORT(lpData);
}
@@ -286,9 +289,11 @@ IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface,
{
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
LPDIRECT3DVIEWPORT3 current_viewport;
- TRACE("(%p/%p)->(%p)\n", This, iface, lpData);
- if (TRACE_ON(d3d7)) {
+ TRACE("iface %p, data %p.\n", iface, lpData);
+
+ if (TRACE_ON(ddraw))
+ {
TRACE(" getting D3DVIEWPORT :\n");
_dump_D3DVIEWPORT(lpData);
}
@@ -360,7 +365,9 @@ IDirect3DViewportImpl_TransformVertices(IDirect3DViewport3 *iface,
unsigned int i;
D3DVIEWPORT vp = This->viewports.vp1;
D3DHVERTEX *outH;
- TRACE("(%p)->(%08x,%p,%08x,%p)\n", This, dwVertexCount, lpData, dwFlags, lpOffScreen);
+
+ TRACE("iface %p, vertex_count %u, vertex_data %p, flags %#x, clip_plane %p.\n",
+ iface, dwVertexCount, lpData, dwFlags, lpOffScreen);
/* Tests on windows show that Windows crashes when this occurs,
* so don't return the (intuitive) return value
@@ -491,8 +498,8 @@ IDirect3DViewportImpl_LightElements(IDirect3DViewport3 *iface,
DWORD dwElementCount,
LPD3DLIGHTDATA lpData)
{
- IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
- TRACE("(%p)->(%08x,%p): Unimplemented!\n", This, dwElementCount, lpData);
+ TRACE("iface %p, element_count %u, data %p.\n", iface, dwElementCount, lpData);
+
return DDERR_UNSUPPORTED;
}
@@ -515,7 +522,7 @@ IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface,
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
IDirect3DMaterialImpl *m;
- TRACE("(%p)->(%d)\n", This, hMat);
+ TRACE("iface %p, material %#x.\n", iface, hMat);
EnterCriticalSection(&ddraw_cs);
@@ -563,7 +570,8 @@ IDirect3DViewportImpl_GetBackground(IDirect3DViewport3 *iface,
BOOL *lpValid)
{
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
- TRACE("(%p)->(%p,%p)\n", This, lphMat, lpValid);
+
+ TRACE("iface %p, material %p, valid %p.\n", iface, lphMat, lpValid);
EnterCriticalSection(&ddraw_cs);
if(lpValid)
@@ -602,8 +610,8 @@ static HRESULT WINAPI
IDirect3DViewportImpl_SetBackgroundDepth(IDirect3DViewport3 *iface,
IDirectDrawSurface *lpDDSurface)
{
- IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
- FIXME("(%p)->(%p): stub!\n", This, lpDDSurface);
+ FIXME("iface %p, surface %p stub!\n", iface, lpDDSurface);
+
return D3D_OK;
}
@@ -626,8 +634,8 @@ IDirect3DViewportImpl_GetBackgroundDepth(IDirect3DViewport3 *iface,
IDirectDrawSurface **lplpDDSurface,
LPBOOL lpValid)
{
- IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
- FIXME("(%p)->(%p,%p): stub!\n", This, lplpDDSurface, lpValid);
+ FIXME("iface %p, surface %p, valid %p stub!\n", iface, lplpDDSurface, lpValid);
+
return DD_OK;
}
@@ -657,7 +665,8 @@ static HRESULT WINAPI IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface,
LPDIRECT3DVIEWPORT3 current_viewport;
IDirect3DDevice3 *d3d_device3;
- TRACE("(%p/%p)->(%08x,%p,%08x)\n", This, iface, dwCount, lpRects, dwFlags);
+ TRACE("iface %p, rect_count %u, rects %p, flags %#x.\n", iface, dwCount, lpRects, dwFlags);
+
if (This->active_device == NULL) {
ERR(" Trying to clear a viewport not attached to a device !\n");
return D3DERR_VIEWPORTHASNODEVICE;
@@ -719,7 +728,7 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface,
DWORD i = 0;
DWORD map = This->map_lights;
- TRACE("(%p)->(%p)\n", This, lpDirect3DLight);
+ TRACE("iface %p, light %p.\n", iface, lpDirect3DLight);
EnterCriticalSection(&ddraw_cs);
if (This->num_lights >= 8)
@@ -774,7 +783,7 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface,
IDirect3DLightImpl *lpDirect3DLightImpl = (IDirect3DLightImpl *)lpDirect3DLight;
IDirect3DLightImpl *cur_light, *prev_light = NULL;
- TRACE("(%p)->(%p)\n", This, lpDirect3DLight);
+ TRACE("iface %p, light %p.\n", iface, lpDirect3DLight);
EnterCriticalSection(&ddraw_cs);
cur_light = This->lights;
@@ -822,7 +831,8 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface,
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
IDirect3DLightImpl *cur_light, *prev_light = NULL;
- TRACE("(%p)->(%p,%p,%08x)\n", This, lpDirect3DLight, lplpDirect3DLight, dwFlags);
+ TRACE("iface %p, light %p, next_light %p, flags %#x.\n",
+ iface, lpDirect3DLight, lplpDirect3DLight, dwFlags);
if (!lplpDirect3DLight)
return DDERR_INVALIDPARAMS;
@@ -896,7 +906,8 @@ IDirect3DViewportImpl_GetViewport2(IDirect3DViewport3 *iface,
{
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
DWORD dwSize;
- TRACE("(%p)->(%p)\n", This, lpData);
+
+ TRACE("iface %p, data %p.\n", iface, lpData);
EnterCriticalSection(&ddraw_cs);
dwSize = lpData->dwSize;
@@ -919,7 +930,8 @@ IDirect3DViewportImpl_GetViewport2(IDirect3DViewport3 *iface,
memcpy(lpData, &vp2, dwSize);
}
- if (TRACE_ON(d3d7)) {
+ if (TRACE_ON(ddraw))
+ {
TRACE(" returning D3DVIEWPORT2 :\n");
_dump_D3DVIEWPORT2(lpData);
}
@@ -946,9 +958,11 @@ IDirect3DViewportImpl_SetViewport2(IDirect3DViewport3 *iface,
{
IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
LPDIRECT3DVIEWPORT3 current_viewport;
- TRACE("(%p/%p)->(%p)\n", This, iface, lpData);
- if (TRACE_ON(d3d7)) {
+ TRACE("iface %p, data %p.\n", iface, lpData);
+
+ if (TRACE_ON(ddraw))
+ {
TRACE(" getting D3DVIEWPORT2 :\n");
_dump_D3DVIEWPORT2(lpData);
}
@@ -992,8 +1006,8 @@ static HRESULT WINAPI
IDirect3DViewportImpl_SetBackgroundDepth2(IDirect3DViewport3 *iface,
IDirectDrawSurface4 *lpDDS)
{
- IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
- FIXME("(%p)->(%p): stub!\n", This, lpDDS);
+ FIXME("iface %p, surface %p stub!\n", iface, lpDDS);
+
return D3D_OK;
}
@@ -1015,8 +1029,8 @@ IDirect3DViewportImpl_GetBackgroundDepth2(IDirect3DViewport3 *iface,
IDirectDrawSurface4 **lplpDDS,
BOOL *lpValid)
{
- IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface;
- FIXME("(%p/%p)->(%p,%p): stub!\n", This, iface, lplpDDS, lpValid);
+ FIXME("iface %p, surface %p, valid %p stub!\n", iface, lplpDDS, lpValid);
+
return D3D_OK;
}
@@ -1049,7 +1063,9 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface,
HRESULT hr;
LPDIRECT3DVIEWPORT3 current_viewport;
IDirect3DDevice3 *d3d_device3;
- TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x)\n", This, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil);
+
+ TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, depth %.8e, stencil %u.\n",
+ iface, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil);
EnterCriticalSection(&ddraw_cs);
if (This->active_device == NULL) {
--
1.7.1
More information about the wine-patches
mailing list