Skip to content

W
wine-cw
Commit 2465fcb3 authored by H. Verbeet's avatar H. Verbeet Committed by Alexandre Julliard
Browse files
Options

ddraw: Win64 printf format warning fixes.

parent 93ec41fd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 160 deletions
dlls/ddraw/Makefile.in
View file @ 2465fcb3
...@@ -7,7 +7,6 @@ IMPORTLIB = libddraw.$(IMPLIBEXT) ...@@ -7,7 +7,6 @@ IMPORTLIB = libddraw.$(IMPLIBEXT)
IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll
EXTRAINCL = @X_CFLAGS@ EXTRAINCL = @X_CFLAGS@
EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
clipper.c \ clipper.c \
......
dlls/ddraw/clipper.c
View file @ 2465fcb3
...@@ -86,7 +86,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_AddRef( LPDIRECTDRAWCLIPPER iface ) ...@@ -86,7 +86,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_AddRef( LPDIRECTDRAWCLIPPER iface )
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() incrementing from %lu.\n", This, ref - 1); TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
return ref; return ref;
} }
...@@ -102,7 +102,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) { ...@@ -102,7 +102,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) {
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() decrementing from %lu.\n", This, ref + 1); TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
if (ref == 0) if (ref == 0)
{ {
...@@ -132,9 +132,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd( ...@@ -132,9 +132,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd(
) { ) {
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
TRACE("(%p)->(0x%08lx,0x%08lx)\n", This, dwFlags, (DWORD)hWnd); TRACE("(%p)->(0x%08x,0x%08x)\n", This, dwFlags, (DWORD)hWnd);
if( dwFlags ) { if( dwFlags ) {
FIXME("dwFlags = 0x%08lx, not supported.\n",dwFlags); FIXME("dwFlags = 0x%08x, not supported.\n",dwFlags);
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
} }
...@@ -227,7 +227,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList( ...@@ -227,7 +227,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList(
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
static int warned = 0; static int warned = 0;
if (warned++ < 10 || lprgn == NULL) if (warned++ < 10 || lprgn == NULL)
FIXME("(%p,%p,%ld),stub!\n",This,lprgn,dwFlag); FIXME("(%p,%p,%d),stub!\n",This,lprgn,dwFlag);
return DD_OK; return DD_OK;
} }
...@@ -272,7 +272,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_Initialize( ...@@ -272,7 +272,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_Initialize(
) { ) {
IDirectDrawImpl* pOwner; IDirectDrawImpl* pOwner;
IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface;
TRACE("(%p)->(%p,0x%08lx)\n", This, lpDD, dwFlags); TRACE("(%p)->(%p,0x%08x)\n", This, lpDD, dwFlags);
if (This->ddraw_owner != NULL) return DDERR_ALREADYINITIALIZED; if (This->ddraw_owner != NULL) return DDERR_ALREADYINITIALIZED;
......
dlls/ddraw/ddraw.c
View file @ 2465fcb3
...@@ -221,7 +221,7 @@ IDirectDrawImpl_AddRef(IDirectDraw7 *iface) ...@@ -221,7 +221,7 @@ IDirectDrawImpl_AddRef(IDirectDraw7 *iface)
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
ULONG ref = InterlockedIncrement(&This->ref7); ULONG ref = InterlockedIncrement(&This->ref7);
TRACE("(%p) : incrementing IDirectDraw7 refcount from %lu.\n", This, ref -1); TRACE("(%p) : incrementing IDirectDraw7 refcount from %u.\n", This, ref -1);
if(ref == 1) InterlockedIncrement(&This->numIfaces); if(ref == 1) InterlockedIncrement(&This->numIfaces);
...@@ -280,7 +280,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface) ...@@ -280,7 +280,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface)
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
ULONG ref = InterlockedDecrement(&This->ref7); ULONG ref = InterlockedDecrement(&This->ref7);
TRACE("(%p)->() decrementing IDirectDraw7 refcount from %lu.\n", This, ref +1); TRACE("(%p)->() decrementing IDirectDraw7 refcount from %u.\n", This, ref +1);
if(ref == 0) if(ref == 0)
{ {
...@@ -336,7 +336,7 @@ IDirectDrawImpl_SetupFullscreenWindow(IDirectDrawImpl *This, ...@@ -336,7 +336,7 @@ IDirectDrawImpl_SetupFullscreenWindow(IDirectDrawImpl *This,
/* Make sure the window is managed, otherwise we won't get keyboard input */ /* Make sure the window is managed, otherwise we won't get keyboard input */
style |= WS_POPUP | WS_SYSMENU; style |= WS_POPUP | WS_SYSMENU;
TRACE("Old style was %08lx,%08lx, setting to %08lx,%08lx\n", TRACE("Old style was %08x,%08x, setting to %08x,%08x\n",
This->style, This->exStyle, style, exStyle); This->style, This->exStyle, style, exStyle);
SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_STYLE, style);
...@@ -372,7 +372,7 @@ IDirectDrawImpl_RestoreWindow(IDirectDrawImpl *This, ...@@ -372,7 +372,7 @@ IDirectDrawImpl_RestoreWindow(IDirectDrawImpl *This,
*/ */
return; return;
} }
TRACE("(%p): Restoring window settings of window %p to %08lx, %08lx\n", TRACE("(%p): Restoring window settings of window %p to %08x, %08x\n",
This, window, This->style, This->exStyle); This, window, This->style, This->exStyle);
SetWindowLongW(window, GWL_STYLE, This->style); SetWindowLongW(window, GWL_STYLE, This->style);
...@@ -441,14 +441,14 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, ...@@ -441,14 +441,14 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface,
HWND window; HWND window;
HRESULT hr; HRESULT hr;
FIXME("(%p)->(%p,%08lx)\n",This,hwnd,cooplevel); FIXME("(%p)->(%p,%08x)\n",This,hwnd,cooplevel);
DDRAW_dump_cooperativelevel(cooplevel); DDRAW_dump_cooperativelevel(cooplevel);
/* Get the old window */ /* Get the old window */
hr = IWineD3DDevice_GetHWND(This->wineD3DDevice, &window); hr = IWineD3DDevice_GetHWND(This->wineD3DDevice, &window);
if(hr != D3D_OK) if(hr != D3D_OK)
{ {
ERR("IWineD3DDevice::GetHWND failed, hr = %08lx\n", hr); ERR("IWineD3DDevice::GetHWND failed, hr = %08x\n", hr);
return hr; return hr;
} }
...@@ -649,11 +649,11 @@ IDirectDrawImpl_SetDisplayMode(IDirectDraw7 *iface, ...@@ -649,11 +649,11 @@ IDirectDrawImpl_SetDisplayMode(IDirectDraw7 *iface,
{ {
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
WINED3DDISPLAYMODE Mode; WINED3DDISPLAYMODE Mode;
TRACE("(%p)->(%ld,%ld,%ld,%ld,%lx: Relay!\n", This, Width, Height, BPP, RefreshRate, Flags); TRACE("(%p)->(%d,%d,%d,%d,%x: Relay!\n", This, Width, Height, BPP, RefreshRate, Flags);
if( !Width || !Height ) if( !Width || !Height )
{ {
ERR("Width=%ld, Height=%ld, what to do?\n", Width, Height); ERR("Width=%d, Height=%d, what to do?\n", Width, Height);
/* It looks like Need for Speed Porsche Unleashed expects DD_OK here */ /* It looks like Need for Speed Porsche Unleashed expects DD_OK here */
return DD_OK; return DD_OK;
} }
...@@ -835,7 +835,7 @@ IDirectDrawImpl_GetDisplayMode(IDirectDraw7 *iface, ...@@ -835,7 +835,7 @@ IDirectDrawImpl_GetDisplayMode(IDirectDraw7 *iface,
&Mode); &Mode);
if( hr != D3D_OK ) if( hr != D3D_OK )
{ {
ERR(" (%p) IWineD3DDevice::GetDisplayMode returned %08lx\n", This, hr); ERR(" (%p) IWineD3DDevice::GetDisplayMode returned %08x\n", This, hr);
return hr; return hr;
} }
...@@ -1064,7 +1064,7 @@ IDirectDrawImpl_WaitForVerticalBlank(IDirectDraw7 *iface, ...@@ -1064,7 +1064,7 @@ IDirectDrawImpl_WaitForVerticalBlank(IDirectDraw7 *iface,
HANDLE h) HANDLE h)
{ {
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
FIXME("(%p)->(%lx,%p): Stub\n", This, Flags, h); FIXME("(%p)->(%x,%p): Stub\n", This, Flags, h);
/* MSDN says DDWAITVB_BLOCKBEGINEVENT is not supported */ /* MSDN says DDWAITVB_BLOCKBEGINEVENT is not supported */
if(Flags & DDWAITVB_BLOCKBEGINEVENT) if(Flags & DDWAITVB_BLOCKBEGINEVENT)
...@@ -1164,7 +1164,7 @@ IDirectDrawImpl_TestCooperativeLevel(IDirectDraw7 *iface) ...@@ -1164,7 +1164,7 @@ IDirectDrawImpl_TestCooperativeLevel(IDirectDraw7 *iface)
case WINED3DERR_DRIVERINTERNALERROR: case WINED3DERR_DRIVERINTERNALERROR:
default: default:
ERR("(%p) Unexpected return value %08lx from wineD3D, " \ ERR("(%p) Unexpected return value %08x from wineD3D, " \
" returning DD_OK\n", This, hr); " returning DD_OK\n", This, hr);
} }
...@@ -1226,7 +1226,7 @@ IDirectDrawImpl_GetGDISurface(IDirectDraw7 *iface, ...@@ -1226,7 +1226,7 @@ IDirectDrawImpl_GetGDISurface(IDirectDraw7 *iface,
GDISurface); GDISurface);
if(hr != DD_OK) if(hr != DD_OK)
{ {
ERR("IDirectDrawSurface7::GetAttachedSurface failed, hr = %lx\n", hr); ERR("IDirectDrawSurface7::GetAttachedSurface failed, hr = %x\n", hr);
} }
/* The AddRef is OK this time */ /* The AddRef is OK this time */
...@@ -1354,7 +1354,7 @@ IDirectDrawImpl_EvaluateMode(IDirectDraw7 *iface, ...@@ -1354,7 +1354,7 @@ IDirectDrawImpl_EvaluateMode(IDirectDraw7 *iface,
DWORD *Timeout) DWORD *Timeout)
{ {
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
FIXME("(%p)->(%ld,%p): Stub!\n", This, Flags, Timeout); FIXME("(%p)->(%d,%p): Stub!\n", This, Flags, Timeout);
/* When implementing this, implement it in WineD3D */ /* When implementing this, implement it in WineD3D */
...@@ -1382,7 +1382,7 @@ IDirectDrawImpl_GetDeviceIdentifier(IDirectDraw7 *iface, ...@@ -1382,7 +1382,7 @@ IDirectDrawImpl_GetDeviceIdentifier(IDirectDraw7 *iface,
DWORD Flags) DWORD Flags)
{ {
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
TRACE("(%p)->(%p,%08lx)\n", This, DDDI, Flags); TRACE("(%p)->(%p,%08x)\n", This, DDDI, Flags);
if(!DDDI) if(!DDDI)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
...@@ -1477,7 +1477,7 @@ IDirectDrawImpl_StartModeTest(IDirectDraw7 *iface, ...@@ -1477,7 +1477,7 @@ IDirectDrawImpl_StartModeTest(IDirectDraw7 *iface,
DWORD Flags) DWORD Flags)
{ {
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
WARN("(%p)->(%p, %ld, %lx): Semi-Stub, most likely harmless\n", This, Modes, NumModes, Flags); WARN("(%p)->(%p, %d, %x): Semi-Stub, most likely harmless\n", This, Modes, NumModes, Flags);
/* This looks sane */ /* This looks sane */
if( (!Modes) || (NumModes == 0) ) return DDERR_INVALIDPARAMS; if( (!Modes) || (NumModes == 0) ) return DDERR_INVALIDPARAMS;
...@@ -1888,7 +1888,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, ...@@ -1888,7 +1888,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This,
if(hr != D3D_OK) if(hr != D3D_OK)
{ {
ERR("IWineD3DDevice::CreateSurface failed. hr = %08lx\n", hr); ERR("IWineD3DDevice::CreateSurface failed. hr = %08x\n", hr);
return hr; return hr;
} }
...@@ -2237,7 +2237,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, ...@@ -2237,7 +2237,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
(rect.bottom - rect.top) <= 1 ) (rect.bottom - rect.top) <= 1 )
{ {
FIXME("Wanted to get surface dimensions from window %p, but it has only \ FIXME("Wanted to get surface dimensions from window %p, but it has only \
a size of %ldx%ld. Using full screen dimensions\n", a size of %dx%d. Using full screen dimensions\n",
window, rect.right - rect.left, rect.bottom - rect.top); window, rect.right - rect.left, rect.bottom - rect.top);
} }
else else
...@@ -2245,7 +2245,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, ...@@ -2245,7 +2245,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
/* Not sure if this is correct */ /* Not sure if this is correct */
desc2.dwWidth = rect.right - rect.left; desc2.dwWidth = rect.right - rect.left;
desc2.dwHeight = rect.bottom - rect.top; desc2.dwHeight = rect.bottom - rect.top;
TRACE("Using window %p's dimensions: %ldx%ld\n", window, desc2.dwWidth, desc2.dwHeight); TRACE("Using window %p's dimensions: %dx%d\n", window, desc2.dwWidth, desc2.dwHeight);
} }
} }
} }
...@@ -2297,7 +2297,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, ...@@ -2297,7 +2297,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
hr = IDirectDrawImpl_CreateNewSurface(This, &desc2, &object, 0); hr = IDirectDrawImpl_CreateNewSurface(This, &desc2, &object, 0);
if( hr != DD_OK) if( hr != DD_OK)
{ {
ERR("IDirectDrawImpl_CreateNewSurface failed with %08lx\n", hr); ERR("IDirectDrawImpl_CreateNewSurface failed with %08x\n", hr);
return hr; return hr;
} }
...@@ -2398,7 +2398,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, ...@@ -2398,7 +2398,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
hr = IDirectDrawImpl_AttachD3DDevice(This, target->first_complex); hr = IDirectDrawImpl_AttachD3DDevice(This, target->first_complex);
if(hr != D3D_OK) if(hr != D3D_OK)
{ {
ERR("IDirectDrawImpl_AttachD3DDevice failed, hr = %lx\n", hr); ERR("IDirectDrawImpl_AttachD3DDevice failed, hr = %x\n", hr);
} }
} }
...@@ -2605,7 +2605,7 @@ IDirectDrawImpl_EnumSurfaces(IDirectDraw7 *iface, ...@@ -2605,7 +2605,7 @@ IDirectDrawImpl_EnumSurfaces(IDirectDraw7 *iface,
all = Flags & DDENUMSURFACES_ALL; all = Flags & DDENUMSURFACES_ALL;
nomatch = Flags & DDENUMSURFACES_NOMATCH; nomatch = Flags & DDENUMSURFACES_NOMATCH;
TRACE("(%p)->(%lx,%p,%p,%p)\n", This, Flags, DDSD, Context, Callback); TRACE("(%p)->(%x,%p,%p,%p)\n", This, Flags, DDSD, Context, Callback);
if(!Callback) if(!Callback)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
...@@ -2722,7 +2722,7 @@ D3D7CB_CreateDepthStencilSurface(IUnknown *device, ...@@ -2722,7 +2722,7 @@ D3D7CB_CreateDepthStencilSurface(IUnknown *device,
This->depthstencil = FALSE; This->depthstencil = FALSE;
if(FAILED(hr)) if(FAILED(hr))
{ {
ERR(" (%p) Creating a DepthStencil Surface failed, result = %lx\n", This, hr); ERR(" (%p) Creating a DepthStencil Surface failed, result = %x\n", This, hr);
return hr; return hr;
} }
*ppSurface = This->DepthStencilBuffer->WineD3DSurface; *ppSurface = This->DepthStencilBuffer->WineD3DSurface;
...@@ -2921,7 +2921,7 @@ DirectDrawCreateClipper(DWORD Flags, ...@@ -2921,7 +2921,7 @@ DirectDrawCreateClipper(DWORD Flags,
IUnknown *UnkOuter) IUnknown *UnkOuter)
{ {
IDirectDrawClipperImpl* object; IDirectDrawClipperImpl* object;
TRACE("(%08lx,%p,%p)\n", Flags, Clipper, UnkOuter); TRACE("(%08x,%p,%p)\n", Flags, Clipper, UnkOuter);
if (UnkOuter != NULL) return CLASS_E_NOAGGREGATION; if (UnkOuter != NULL) return CLASS_E_NOAGGREGATION;
...@@ -2951,7 +2951,7 @@ IDirectDrawImpl_CreateClipper(IDirectDraw7 *iface, ...@@ -2951,7 +2951,7 @@ IDirectDrawImpl_CreateClipper(IDirectDraw7 *iface,
IUnknown *UnkOuter) IUnknown *UnkOuter)
{ {
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
TRACE("(%p)->(%lx,%p,%p)\n", This, Flags, Clipper, UnkOuter); TRACE("(%p)->(%x,%p,%p)\n", This, Flags, Clipper, UnkOuter);
return DirectDrawCreateClipper(Flags, Clipper, UnkOuter); return DirectDrawCreateClipper(Flags, Clipper, UnkOuter);
} }
...@@ -2982,7 +2982,7 @@ IDirectDrawImpl_CreatePalette(IDirectDraw7 *iface, ...@@ -2982,7 +2982,7 @@ IDirectDrawImpl_CreatePalette(IDirectDraw7 *iface,
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface);
IDirectDrawPaletteImpl *object; IDirectDrawPaletteImpl *object;
HRESULT hr = DDERR_GENERIC; HRESULT hr = DDERR_GENERIC;
TRACE("(%p)->(%lx,%p,%p,%p)\n", This, Flags, ColorTable, Palette, pUnkOuter); TRACE("(%p)->(%x,%p,%p,%p)\n", This, Flags, ColorTable, Palette, pUnkOuter);
if(pUnkOuter != NULL) if(pUnkOuter != NULL)
{ {
......
dlls/ddraw/ddraw_thunks.c
View file @ 2465fcb3
...@@ -78,7 +78,7 @@ IDirectDrawImpl_AddRef(LPDIRECTDRAW iface) ...@@ -78,7 +78,7 @@ IDirectDrawImpl_AddRef(LPDIRECTDRAW iface)
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw, iface);
ULONG ref = InterlockedIncrement(&This->ref1); ULONG ref = InterlockedIncrement(&This->ref1);
TRACE("(%p) : incrementing IDirectDraw refcount from %lu.\n", This, ref -1); TRACE("(%p) : incrementing IDirectDraw refcount from %u.\n", This, ref -1);
if(ref == 1) InterlockedIncrement(&This->numIfaces); if(ref == 1) InterlockedIncrement(&This->numIfaces);
...@@ -91,7 +91,7 @@ IDirectDraw2Impl_AddRef(LPDIRECTDRAW2 iface) ...@@ -91,7 +91,7 @@ IDirectDraw2Impl_AddRef(LPDIRECTDRAW2 iface)
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw2, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw2, iface);
ULONG ref = InterlockedIncrement(&This->ref2); ULONG ref = InterlockedIncrement(&This->ref2);
TRACE("(%p) : incrementing IDirectDraw2 refcount from %lu.\n", This, ref -1); TRACE("(%p) : incrementing IDirectDraw2 refcount from %u.\n", This, ref -1);
if(ref == 1) InterlockedIncrement(&This->numIfaces); if(ref == 1) InterlockedIncrement(&This->numIfaces);
...@@ -104,7 +104,7 @@ IDirectDraw4Impl_AddRef(LPDIRECTDRAW4 iface) ...@@ -104,7 +104,7 @@ IDirectDraw4Impl_AddRef(LPDIRECTDRAW4 iface)
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw4, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw4, iface);
ULONG ref = InterlockedIncrement(&This->ref4); ULONG ref = InterlockedIncrement(&This->ref4);
TRACE("(%p) : incrementing IDirectDraw4 refcount from %lu.\n", This, ref -1); TRACE("(%p) : incrementing IDirectDraw4 refcount from %u.\n", This, ref -1);
if(ref == 1) InterlockedIncrement(&This->numIfaces); if(ref == 1) InterlockedIncrement(&This->numIfaces);
...@@ -117,7 +117,7 @@ IDirectDrawImpl_Release(LPDIRECTDRAW iface) ...@@ -117,7 +117,7 @@ IDirectDrawImpl_Release(LPDIRECTDRAW iface)
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw, iface);
ULONG ref = InterlockedDecrement(&This->ref1); ULONG ref = InterlockedDecrement(&This->ref1);
TRACE_(ddraw)("(%p)->() decrementing IDirectDraw refcount from %lu.\n", This, ref +1); TRACE_(ddraw)("(%p)->() decrementing IDirectDraw refcount from %u.\n", This, ref +1);
if(ref == 0) if(ref == 0)
{ {
...@@ -134,7 +134,7 @@ IDirectDraw2Impl_Release(LPDIRECTDRAW2 iface) ...@@ -134,7 +134,7 @@ IDirectDraw2Impl_Release(LPDIRECTDRAW2 iface)
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw2, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw2, iface);
ULONG ref = InterlockedDecrement(&This->ref2); ULONG ref = InterlockedDecrement(&This->ref2);
TRACE_(ddraw)("(%p)->() decrementing IDirectDraw2 refcount from %lu.\n", This, ref +1); TRACE_(ddraw)("(%p)->() decrementing IDirectDraw2 refcount from %u.\n", This, ref +1);
if(ref == 0) if(ref == 0)
{ {
...@@ -151,7 +151,7 @@ IDirectDraw4Impl_Release(LPDIRECTDRAW4 iface) ...@@ -151,7 +151,7 @@ IDirectDraw4Impl_Release(LPDIRECTDRAW4 iface)
ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw4, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw4, iface);
ULONG ref = InterlockedDecrement(&This->ref4); ULONG ref = InterlockedDecrement(&This->ref4);
TRACE_(ddraw)("(%p)->() decrementing IDirectDraw4 refcount from %lu.\n", This, ref +1); TRACE_(ddraw)("(%p)->() decrementing IDirectDraw4 refcount from %u.\n", This, ref +1);
if(ref == 0) if(ref == 0)
{ {
......
dlls/ddraw/direct3d.c
View file @ 2465fcb3
...@@ -851,7 +851,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, ...@@ -851,7 +851,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface,
This->d3d_target->WineD3DSurface, This->d3d_target->WineD3DSurface,
target->WineD3DSurface); target->WineD3DSurface);
if(hr != D3D_OK) if(hr != D3D_OK)
ERR("(%p) Error %08lx setting the front and back buffer\n", This, hr); ERR("(%p) Error %08x setting the front and back buffer\n", This, hr);
object->OffScreenTarget = TRUE; object->OffScreenTarget = TRUE;
} }
...@@ -946,13 +946,13 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface, ...@@ -946,13 +946,13 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface,
ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D7, iface);
IDirect3DVertexBufferImpl *object; IDirect3DVertexBufferImpl *object;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p,%p,%08lx)\n", This, Desc, VertexBuffer, Flags); TRACE("(%p)->(%p,%p,%08x)\n", This, Desc, VertexBuffer, Flags);
TRACE("(%p) Vertex buffer description:\n", This); TRACE("(%p) Vertex buffer description:\n", This);
TRACE("(%p) dwSize=%ld\n", This, Desc->dwSize); TRACE("(%p) dwSize=%d\n", This, Desc->dwSize);
TRACE("(%p) dwCaps=%08lx\n", This, Desc->dwCaps); TRACE("(%p) dwCaps=%08x\n", This, Desc->dwCaps);
TRACE("(%p) FVF=%08lx\n", This, Desc->dwFVF); TRACE("(%p) FVF=%08x\n", This, Desc->dwFVF);
TRACE("(%p) dwNumVertices=%ld\n", This, Desc->dwNumVertices); TRACE("(%p) dwNumVertices=%d\n", This, Desc->dwNumVertices);
/* D3D7 SDK: "No Flags are currently defined for this method. This /* D3D7 SDK: "No Flags are currently defined for this method. This
* parameter must be 0" * parameter must be 0"
...@@ -993,7 +993,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface, ...@@ -993,7 +993,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface,
(IUnknown *) ICOM_INTERFACE(object, IDirect3DVertexBuffer7)); (IUnknown *) ICOM_INTERFACE(object, IDirect3DVertexBuffer7));
if(hr != D3D_OK) if(hr != D3D_OK)
{ {
ERR("(%p) IWineD3DDevice::CreateVertexBuffer failed with hr=%08lx\n", This, hr); ERR("(%p) IWineD3DDevice::CreateVertexBuffer failed with hr=%08x\n", This, hr);
HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, object);
if (hr == WINED3DERR_INVALIDCALL) if (hr == WINED3DERR_INVALIDCALL)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
...@@ -1017,7 +1017,7 @@ Thunk_IDirect3DImpl_3_CreateVertexBuffer(IDirect3D3 *iface, ...@@ -1017,7 +1017,7 @@ Thunk_IDirect3DImpl_3_CreateVertexBuffer(IDirect3D3 *iface,
{ {
ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%p,%p,%08lx,%p): Relaying to IDirect3D7\n", This, Desc, VertexBuffer, Flags, UnkOuter); TRACE("(%p)->(%p,%p,%08x,%p): Relaying to IDirect3D7\n", This, Desc, VertexBuffer, Flags, UnkOuter);
if(UnkOuter != NULL) return CLASS_E_NOAGGREGATION; if(UnkOuter != NULL) return CLASS_E_NOAGGREGATION;
......
dlls/ddraw/executebuffer.c
View file @ 2465fcb3
...@@ -56,17 +56,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7); ...@@ -56,17 +56,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
*****************************************************************************/ *****************************************************************************/
static void _dump_executedata(LPD3DEXECUTEDATA lpData) { static void _dump_executedata(LPD3DEXECUTEDATA lpData) {
DPRINTF("dwSize : %ld\n", lpData->dwSize); DPRINTF("dwSize : %d\n", lpData->dwSize);
DPRINTF("Vertex Offset : %ld Count : %ld\n", lpData->dwVertexOffset, lpData->dwVertexCount); DPRINTF("Vertex Offset : %d Count : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount);
DPRINTF("Instruction Offset : %ld Length : %ld\n", lpData->dwInstructionOffset, lpData->dwInstructionLength); DPRINTF("Instruction Offset : %d Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
DPRINTF("HVertex Offset : %ld\n", lpData->dwHVertexOffset); DPRINTF("HVertex Offset : %d\n", lpData->dwHVertexOffset);
} }
static void _dump_D3DEXECUTEBUFFERDESC(LPD3DEXECUTEBUFFERDESC lpDesc) { static void _dump_D3DEXECUTEBUFFERDESC(LPD3DEXECUTEBUFFERDESC lpDesc) {
DPRINTF("dwSize : %ld\n", lpDesc->dwSize); DPRINTF("dwSize : %d\n", lpDesc->dwSize);
DPRINTF("dwFlags : %lx\n", lpDesc->dwFlags); DPRINTF("dwFlags : %x\n", lpDesc->dwFlags);
DPRINTF("dwCaps : %lx\n", lpDesc->dwCaps); DPRINTF("dwCaps : %x\n", lpDesc->dwCaps);
DPRINTF("dwBufferSize : %ld\n", lpDesc->dwBufferSize); DPRINTF("dwBufferSize : %d\n", lpDesc->dwBufferSize);
DPRINTF("lpData : %p\n", lpDesc->lpData); DPRINTF("lpData : %p\n", lpDesc->lpData);
} }
...@@ -225,9 +225,9 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, ...@@ -225,9 +225,9 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
if(!ci->u2.dwArg[0]) { if(!ci->u2.dwArg[0]) {
ERR("Setting a NULL matrix handle, what should I do?\n"); ERR("Setting a NULL matrix handle, what should I do?\n");
} else if(ci->u2.dwArg[0] > lpDevice->numHandles) { } else if(ci->u2.dwArg[0] > lpDevice->numHandles) {
ERR("Handle %ld is out of bounds\n", ci->u2.dwArg[0]); ERR("Handle %d is out of bounds\n", ci->u2.dwArg[0]);
} else if(lpDevice->Handles[ci->u2.dwArg[0] - 1].type != DDrawHandle_Matrix) { } else if(lpDevice->Handles[ci->u2.dwArg[0] - 1].type != DDrawHandle_Matrix) {
ERR("Handle %ld is not a matrix handle\n", ci->u2.dwArg[0]); ERR("Handle %d is not a matrix handle\n", ci->u2.dwArg[0]);
} else { } else {
IDirect3DDevice7_SetTransform(ICOM_INTERFACE(lpDevice, IDirect3DDevice7), IDirect3DDevice7_SetTransform(ICOM_INTERFACE(lpDevice, IDirect3DDevice7),
ci->u1.drstRenderStateType, (LPD3DMATRIX) lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr); ci->u1.drstRenderStateType, (LPD3DMATRIX) lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr);
...@@ -243,7 +243,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, ...@@ -243,7 +243,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
LPD3DSTATE ci = (LPD3DSTATE) instr; LPD3DSTATE ci = (LPD3DSTATE) instr;
TRACE("(%08x,%08lx)\n",ci->u1.dlstLightStateType, ci->u2.dwArg[0]); TRACE("(%08x,%08x)\n",ci->u1.dlstLightStateType, ci->u2.dwArg[0]);
if (!ci->u1.dlstLightStateType && (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) if (!ci->u1.dlstLightStateType && (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX))
ERR("Unexpected Light State Type\n"); ERR("Unexpected Light State Type\n");
...@@ -340,7 +340,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, ...@@ -340,7 +340,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
LPD3DPROCESSVERTICES ci = (LPD3DPROCESSVERTICES) instr; LPD3DPROCESSVERTICES ci = (LPD3DPROCESSVERTICES) instr;
TRACE(" Start : %d Dest : %d Count : %ld\n", TRACE(" Start : %d Dest : %d Count : %d\n",
ci->wStart, ci->wDest, ci->dwCount); ci->wStart, ci->wDest, ci->dwCount);
TRACE(" Flags : "); TRACE(" Flags : ");
if (TRACE_ON(d3d7)) { if (TRACE_ON(d3d7)) {
...@@ -512,13 +512,13 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, ...@@ -512,13 +512,13 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
if ((This->data.dsStatus.dwStatus & ci->dwMask) == ci->dwValue) { if ((This->data.dsStatus.dwStatus & ci->dwMask) == ci->dwValue) {
if (!ci->bNegate) { if (!ci->bNegate) {
TRACE(" Branch to %ld\n", ci->dwOffset); TRACE(" Branch to %d\n", ci->dwOffset);
instr = (char*)current + ci->dwOffset; instr = (char*)current + ci->dwOffset;
break; break;
} }
} else { } else {
if (ci->bNegate) { if (ci->bNegate) {
TRACE(" Branch to %ld\n", ci->dwOffset); TRACE(" Branch to %d\n", ci->dwOffset);
instr = (char*)current + ci->dwOffset; instr = (char*)current + ci->dwOffset;
break; break;
} }
...@@ -617,7 +617,7 @@ IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface) ...@@ -617,7 +617,7 @@ IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface)
ICOM_THIS_FROM(IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer, iface); ICOM_THIS_FROM(IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer, iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
FIXME("(%p)->()incrementing from %lu.\n", This, ref - 1); FIXME("(%p)->()incrementing from %u.\n", This, ref - 1);
return ref; return ref;
} }
...@@ -637,7 +637,7 @@ IDirect3DExecuteBufferImpl_Release(IDirect3DExecuteBuffer *iface) ...@@ -637,7 +637,7 @@ IDirect3DExecuteBufferImpl_Release(IDirect3DExecuteBuffer *iface)
ICOM_THIS_FROM(IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer, iface); ICOM_THIS_FROM(IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->()decrementing from %lu.\n", This, ref + 1); TRACE("(%p)->()decrementing from %u.\n", This, ref + 1);
if (!ref) { if (!ref) {
if (This->need_free) if (This->need_free)
...@@ -811,7 +811,7 @@ IDirect3DExecuteBufferImpl_Validate(IDirect3DExecuteBuffer *iface, ...@@ -811,7 +811,7 @@ IDirect3DExecuteBufferImpl_Validate(IDirect3DExecuteBuffer *iface,
DWORD Reserved) DWORD Reserved)
{ {
ICOM_THIS_FROM(IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer, iface); ICOM_THIS_FROM(IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer, iface);
TRACE("(%p)->(%p,%p,%p,%08lx): Unimplemented!\n", This, Offset, Func, UserArg, Reserved); TRACE("(%p)->(%p,%p,%p,%08x): Unimplemented!\n", This, Offset, Func, UserArg, Reserved);
return DDERR_UNSUPPORTED; /* Unchecked */ return DDERR_UNSUPPORTED; /* Unchecked */
} }
...@@ -833,7 +833,7 @@ IDirect3DExecuteBufferImpl_Optimize(IDirect3DExecuteBuffer *iface, ...@@ -833,7 +833,7 @@ IDirect3DExecuteBufferImpl_Optimize(IDirect3DExecuteBuffer *iface,
DWORD Dummy) DWORD Dummy)
{ {
ICOM_THIS_FROM(IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer, iface); ICOM_THIS_FROM(IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer, iface);
TRACE("(%p)->(%08lx): Unimplemented\n", This, Dummy); TRACE("(%p)->(%08x): Unimplemented\n", This, Dummy);
return DDERR_UNSUPPORTED; /* Unchecked */ return DDERR_UNSUPPORTED; /* Unchecked */
} }
......
dlls/ddraw/gamma.c
View file @ 2465fcb3
...@@ -134,7 +134,7 @@ IDirectDrawGammaControlImpl_GetGammaRamp(IDirectDrawGammaControl *iface, ...@@ -134,7 +134,7 @@ IDirectDrawGammaControlImpl_GetGammaRamp(IDirectDrawGammaControl *iface,
DDGAMMARAMP *GammaRamp) DDGAMMARAMP *GammaRamp)
{ {
ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawGammaControl, iface); ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawGammaControl, iface);
TRACE("(%p)->(%08lx,%p)\n", This,Flags,GammaRamp); TRACE("(%p)->(%08x,%p)\n", This,Flags,GammaRamp);
/* This looks sane */ /* This looks sane */
if(!GammaRamp) if(!GammaRamp)
...@@ -178,7 +178,7 @@ IDirectDrawGammaControlImpl_SetGammaRamp(IDirectDrawGammaControl *iface, ...@@ -178,7 +178,7 @@ IDirectDrawGammaControlImpl_SetGammaRamp(IDirectDrawGammaControl *iface,
DDGAMMARAMP *GammaRamp) DDGAMMARAMP *GammaRamp)
{ {
ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawGammaControl, iface); ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawGammaControl, iface);
TRACE("(%p)->(%08lx,%p)\n", This,Flags,GammaRamp); TRACE("(%p)->(%08x,%p)\n", This,Flags,GammaRamp);
/* This looks sane */ /* This looks sane */
if(!GammaRamp) if(!GammaRamp)
......
dlls/ddraw/light.c
View file @ 2465fcb3
...@@ -88,7 +88,7 @@ IDirect3DLightImpl_AddRef(IDirect3DLight *iface) ...@@ -88,7 +88,7 @@ IDirect3DLightImpl_AddRef(IDirect3DLight *iface)
ICOM_THIS_FROM(IDirect3DLightImpl, IDirect3DLight, iface); ICOM_THIS_FROM(IDirect3DLightImpl, IDirect3DLight, iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() incrementing from %lu.\n", This, ref - 1); TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
return ref; return ref;
} }
...@@ -109,7 +109,7 @@ IDirect3DLightImpl_Release(IDirect3DLight *iface) ...@@ -109,7 +109,7 @@ IDirect3DLightImpl_Release(IDirect3DLight *iface)
ICOM_THIS_FROM(IDirect3DLightImpl, IDirect3DLight, iface); ICOM_THIS_FROM(IDirect3DLightImpl, IDirect3DLight, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() decrementing from %lu.\n", This, ref + 1); TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -160,7 +160,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface, ...@@ -160,7 +160,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface,
*****************************************************************************/ *****************************************************************************/
static void dump_light(LPD3DLIGHT2 light) static void dump_light(LPD3DLIGHT2 light)
{ {
DPRINTF(" - dwSize : %ld\n", light->dwSize); DPRINTF(" - dwSize : %d\n", light->dwSize);
} }
static const float zero_value[] = { static const float zero_value[] = {
......
dlls/ddraw/main.c
View file @ 2465fcb3
...@@ -222,7 +222,7 @@ DDRAW_Create(GUID *guid, ...@@ -222,7 +222,7 @@ DDRAW_Create(GUID *guid,
(IUnknown *) ICOM_INTERFACE(This, IDirectDraw7)); (IUnknown *) ICOM_INTERFACE(This, IDirectDraw7));
if(FAILED(hr)) if(FAILED(hr))
{ {
ERR("Failed to create a wineD3DDevice, result = %lx\n", hr); ERR("Failed to create a wineD3DDevice, result = %x\n", hr);
goto err_out; goto err_out;
} }
This->wineD3DDevice = wineD3DDevice; This->wineD3DDevice = wineD3DDevice;
...@@ -592,7 +592,7 @@ IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) ...@@ -592,7 +592,7 @@ IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface)
ICOM_THIS_FROM(IClassFactoryImpl, IClassFactory, iface); ICOM_THIS_FROM(IClassFactoryImpl, IClassFactory, iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() incrementing from %ld.\n", This, ref - 1); TRACE("(%p)->() incrementing from %d.\n", This, ref - 1);
return ref; return ref;
} }
...@@ -612,7 +612,7 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) ...@@ -612,7 +612,7 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface)
{ {
ICOM_THIS_FROM(IClassFactoryImpl, IClassFactory, iface); ICOM_THIS_FROM(IClassFactoryImpl, IClassFactory, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() decrementing from %ld.\n", This, ref+1); TRACE("(%p)->() decrementing from %d.\n", This, ref+1);
if (ref == 0) if (ref == 0)
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -768,7 +768,7 @@ DestroyCallback(IDirectDrawSurface7 *surf, ...@@ -768,7 +768,7 @@ DestroyCallback(IDirectDrawSurface7 *surf,
ULONG ref; ULONG ref;
ref = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ ref = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */
WARN("Surface %p has an reference count of %ld\n", Impl, ref); WARN("Surface %p has an reference count of %d\n", Impl, ref);
/* Skip surfaces which are attached somewhere or which are /* Skip surfaces which are attached somewhere or which are
* part of a complex compound. They will get released when destroying * part of a complex compound. They will get released when destroying
...@@ -812,7 +812,7 @@ DllMain(HINSTANCE hInstDLL, ...@@ -812,7 +812,7 @@ DllMain(HINSTANCE hInstDLL,
DWORD Reason, DWORD Reason,
void *lpv) void *lpv)
{ {
TRACE("(%p,%lx,%p)\n", hInstDLL, Reason, lpv); TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv);
if (Reason == DLL_PROCESS_ATTACH) if (Reason == DLL_PROCESS_ATTACH)
{ {
char buffer[MAX_PATH+10]; char buffer[MAX_PATH+10];
...@@ -879,7 +879,7 @@ DllMain(HINSTANCE hInstDLL, ...@@ -879,7 +879,7 @@ DllMain(HINSTANCE hInstDLL,
int i; int i;
IDirectDrawImpl *ddraw = LIST_ENTRY(entry, IDirectDrawImpl, ddraw_list_entry); IDirectDrawImpl *ddraw = LIST_ENTRY(entry, IDirectDrawImpl, ddraw_list_entry);
WARN("DDraw %p has a refcount of %ld\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref2 + ddraw->ref1); WARN("DDraw %p has a refcount of %d\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref2 + ddraw->ref1);
/* Add references to each interface to avoid freeing them unexpectadely */ /* Add references to each interface to avoid freeing them unexpectadely */
IDirectDraw_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw)); IDirectDraw_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw));
...@@ -915,7 +915,7 @@ DllMain(HINSTANCE hInstDLL, ...@@ -915,7 +915,7 @@ DllMain(HINSTANCE hInstDLL,
/* Check the surface count */ /* Check the surface count */
if(ddraw->surfaces > 0) if(ddraw->surfaces > 0)
ERR("DDraw %p still has %ld surfaces attached\n", ddraw, ddraw->surfaces); ERR("DDraw %p still has %d surfaces attached\n", ddraw, ddraw->surfaces);
/* Release all hanging references to destroy the objects. This /* Release all hanging references to destroy the objects. This
* restores the screen mode too * restores the screen mode too
......
dlls/ddraw/material.c
View file @ 2465fcb3
...@@ -49,7 +49,7 @@ WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); ...@@ -49,7 +49,7 @@ WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);
static void dump_material(LPD3DMATERIAL mat) static void dump_material(LPD3DMATERIAL mat)
{ {
DPRINTF(" dwSize : %ld\n", mat->dwSize); DPRINTF(" dwSize : %d\n", mat->dwSize);
} }
/***************************************************************************** /*****************************************************************************
...@@ -124,7 +124,7 @@ IDirect3DMaterialImpl_AddRef(IDirect3DMaterial3 *iface) ...@@ -124,7 +124,7 @@ IDirect3DMaterialImpl_AddRef(IDirect3DMaterial3 *iface)
ICOM_THIS_FROM(IDirect3DMaterialImpl, IDirect3DMaterial3, iface); ICOM_THIS_FROM(IDirect3DMaterialImpl, IDirect3DMaterial3, iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() incrementing from %lu.\n", This, ref - 1); TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
return ref; return ref;
} }
...@@ -145,7 +145,7 @@ IDirect3DMaterialImpl_Release(IDirect3DMaterial3 *iface) ...@@ -145,7 +145,7 @@ IDirect3DMaterialImpl_Release(IDirect3DMaterial3 *iface)
ICOM_THIS_FROM(IDirect3DMaterialImpl, IDirect3DMaterial3, iface); ICOM_THIS_FROM(IDirect3DMaterialImpl, IDirect3DMaterial3, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() decrementing from %lu.\n", This, ref + 1); TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
if (!ref) if (!ref)
{ {
...@@ -324,7 +324,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, ...@@ -324,7 +324,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface,
device->Handles[This->Handle - 1].type = DDrawHandle_Material; device->Handles[This->Handle - 1].type = DDrawHandle_Material;
} }
*lpHandle = This->Handle; *lpHandle = This->Handle;
TRACE(" returning handle %08lx.\n", *lpHandle); TRACE(" returning handle %08x.\n", *lpHandle);
return D3D_OK; return D3D_OK;
} }
......
dlls/ddraw/palette.c
View file @ 2465fcb3
...@@ -81,7 +81,7 @@ IDirectDrawPaletteImpl_AddRef(IDirectDrawPalette *iface) ...@@ -81,7 +81,7 @@ IDirectDrawPaletteImpl_AddRef(IDirectDrawPalette *iface)
ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface); ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() incrementing from %lu.\n", This, ref - 1); TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
return ref; return ref;
} }
...@@ -101,7 +101,7 @@ IDirectDrawPaletteImpl_Release(IDirectDrawPalette *iface) ...@@ -101,7 +101,7 @@ IDirectDrawPaletteImpl_Release(IDirectDrawPalette *iface)
ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface); ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() decrementing from %lu.\n", This, ref + 1); TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
if (ref == 0) if (ref == 0)
{ {
...@@ -137,7 +137,7 @@ IDirectDrawPaletteImpl_Initialize(IDirectDrawPalette *iface, ...@@ -137,7 +137,7 @@ IDirectDrawPaletteImpl_Initialize(IDirectDrawPalette *iface,
DWORD Flags, DWORD Flags,
PALETTEENTRY *ColorTable) PALETTEENTRY *ColorTable)
{ {
TRACE("(%p)->(%p,%lx,%p)\n", iface, DD, Flags, ColorTable); TRACE("(%p)->(%p,%x,%p)\n", iface, DD, Flags, ColorTable);
return DDERR_ALREADYINITIALIZED; return DDERR_ALREADYINITIALIZED;
} }
...@@ -191,7 +191,7 @@ IDirectDrawPaletteImpl_SetEntries(IDirectDrawPalette *iface, ...@@ -191,7 +191,7 @@ IDirectDrawPaletteImpl_SetEntries(IDirectDrawPalette *iface,
PALETTEENTRY *PalEnt) PALETTEENTRY *PalEnt)
{ {
ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface); ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface);
TRACE("(%p)->(%lx,%ld,%ld,%p): Relay\n", This, Flags, Start, Count, PalEnt); TRACE("(%p)->(%x,%d,%d,%p): Relay\n", This, Flags, Start, Count, PalEnt);
if(!PalEnt) if(!PalEnt)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
...@@ -224,7 +224,7 @@ IDirectDrawPaletteImpl_GetEntries(IDirectDrawPalette *iface, ...@@ -224,7 +224,7 @@ IDirectDrawPaletteImpl_GetEntries(IDirectDrawPalette *iface,
PALETTEENTRY *PalEnt) PALETTEENTRY *PalEnt)
{ {
ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface); ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface);
TRACE("(%p)->(%lx,%ld,%ld,%p): Relay\n", This, Flags, Start, Count, PalEnt); TRACE("(%p)->(%x,%d,%d,%p): Relay\n", This, Flags, Start, Count, PalEnt);
if(!PalEnt) if(!PalEnt)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
......
dlls/ddraw/parent.c
View file @ 2465fcb3
...@@ -103,7 +103,7 @@ IParentImpl_AddRef(IParent *iface) ...@@ -103,7 +103,7 @@ IParentImpl_AddRef(IParent *iface)
ICOM_THIS_FROM(IParentImpl, IParent, iface); ICOM_THIS_FROM(IParentImpl, IParent, iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) : AddRef from %ld\n", This, ref - 1); TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref; return ref;
} }
...@@ -128,7 +128,7 @@ IParentImpl_Release(IParent *iface) ...@@ -128,7 +128,7 @@ IParentImpl_Release(IParent *iface)
ICOM_THIS_FROM(IParentImpl, IParent, iface); ICOM_THIS_FROM(IParentImpl, IParent, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) : ReleaseRef to %ld\n", This, ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) if (ref == 0)
{ {
......
dlls/ddraw/texture.c
View file @ 2465fcb3
...@@ -159,7 +159,7 @@ IDirect3DTextureImpl_PaletteChanged(IDirect3DTexture2 *iface, ...@@ -159,7 +159,7 @@ IDirect3DTextureImpl_PaletteChanged(IDirect3DTexture2 *iface,
DWORD Count) DWORD Count)
{ {
ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirect3DTexture2, iface); ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirect3DTexture2, iface);
FIXME("(%p)->(%08lx,%08lx): stub!\n", This, Start, Count); FIXME("(%p)->(%08x,%08x): stub!\n", This, Start, Count);
return D3D_OK; return D3D_OK;
} }
...@@ -169,7 +169,7 @@ Thunk_IDirect3DTextureImpl_1_PaletteChanged(IDirect3DTexture *iface, ...@@ -169,7 +169,7 @@ Thunk_IDirect3DTextureImpl_1_PaletteChanged(IDirect3DTexture *iface,
DWORD Count) DWORD Count)
{ {
ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirect3DTexture, iface); ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirect3DTexture, iface);
TRACE("(%p)->(%08lx,%08lx) thunking to IDirect3DTexture2 interface.\n", This, Start, Count); TRACE("(%p)->(%08x,%08x) thunking to IDirect3DTexture2 interface.\n", This, Start, Count);
return IDirect3DTexture2_PaletteChanged(COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirect3DTexture, IDirect3DTexture2, iface), return IDirect3DTexture2_PaletteChanged(COM_INTERFACE_CAST(IDirectDrawSurfaceImpl, IDirect3DTexture, IDirect3DTexture2, iface),
Start, Start,
...@@ -230,7 +230,7 @@ IDirect3DTextureImpl_GetHandle(IDirect3DTexture2 *iface, ...@@ -230,7 +230,7 @@ IDirect3DTextureImpl_GetHandle(IDirect3DTexture2 *iface,
} }
*lpHandle = This->Handle; *lpHandle = This->Handle;
TRACE(" returning handle %08lx.\n", *lpHandle); TRACE(" returning handle %08x.\n", *lpHandle);
return D3D_OK; return D3D_OK;
} }
......
dlls/ddraw/utils.c
View file @ 2465fcb3
...@@ -437,7 +437,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat) ...@@ -437,7 +437,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
case 1: case 1:
case 2: case 2:
case 4: case 4:
ERR("Unsupported Alpha-Only bit depth 0x%lx\n", DDPixelFormat->u1.dwAlphaBitDepth); ERR("Unsupported Alpha-Only bit depth 0x%x\n", DDPixelFormat->u1.dwAlphaBitDepth);
case 8: case 8:
return WINED3DFMT_A8; return WINED3DFMT_A8;
...@@ -484,7 +484,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat) ...@@ -484,7 +484,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
return WINED3DFMT_L8; return WINED3DFMT_L8;
default: default:
ERR("Unknown luminance-only bit depth 0x%lx\n", DDPixelFormat->u1.dwLuminanceBitCount); ERR("Unknown luminance-only bit depth 0x%x\n", DDPixelFormat->u1.dwLuminanceBitCount);
return WINED3DFMT_UNKNOWN; return WINED3DFMT_UNKNOWN;
} }
} }
...@@ -505,7 +505,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat) ...@@ -505,7 +505,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
if(DDPixelFormat->u2.dwStencilBitDepth == 1) if(DDPixelFormat->u2.dwStencilBitDepth == 1)
return WINED3DFMT_D15S1; return WINED3DFMT_D15S1;
ERR("Don't know how to handle a 16 bit Z buffer with %ld bit stencil buffer pixelformat\n", DDPixelFormat->u2.dwStencilBitDepth); ERR("Don't know how to handle a 16 bit Z buffer with %d bit stencil buffer pixelformat\n", DDPixelFormat->u2.dwStencilBitDepth);
return WINED3DFMT_UNKNOWN; return WINED3DFMT_UNKNOWN;
case 24: case 24:
...@@ -519,7 +519,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat) ...@@ -519,7 +519,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
return WINED3DFMT_D24X4S4; return WINED3DFMT_D24X4S4;
default: default:
ERR("Unknown Z buffer depth %ld\n", DDPixelFormat->u1.dwZBufferBitDepth); ERR("Unknown Z buffer depth %d\n", DDPixelFormat->u1.dwZBufferBitDepth);
return WINED3DFMT_UNKNOWN; return WINED3DFMT_UNKNOWN;
} }
} }
...@@ -541,7 +541,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat) ...@@ -541,7 +541,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
return WINED3DFMT_D32; return WINED3DFMT_D32;
default: default:
ERR("Unsupported Z buffer depth %ld\n", DDPixelFormat->u1.dwZBufferBitDepth); ERR("Unsupported Z buffer depth %d\n", DDPixelFormat->u1.dwZBufferBitDepth);
return WINED3DFMT_UNKNOWN; return WINED3DFMT_UNKNOWN;
} }
} }
...@@ -617,7 +617,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat) ...@@ -617,7 +617,7 @@ PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
static void static void
DDRAW_dump_DWORD(const void *in) DDRAW_dump_DWORD(const void *in)
{ {
DPRINTF("%ld", *((const DWORD *) in)); DPRINTF("%d", *((const DWORD *) in));
} }
static void static void
DDRAW_dump_PTR(const void *in) DDRAW_dump_PTR(const void *in)
...@@ -627,7 +627,7 @@ DDRAW_dump_PTR(const void *in) ...@@ -627,7 +627,7 @@ DDRAW_dump_PTR(const void *in)
void void
DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck) DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck)
{ {
DPRINTF(" Low : %ld - High : %ld", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); DPRINTF(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue);
} }
void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in)
{ {
...@@ -769,7 +769,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) ...@@ -769,7 +769,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
DDRAW_dump_pixelformat_flag(pf->dwFlags); DDRAW_dump_pixelformat_flag(pf->dwFlags);
if (pf->dwFlags & DDPF_FOURCC) if (pf->dwFlags & DDPF_FOURCC)
{ {
DPRINTF(", dwFourCC code '%c%c%c%c' (0x%08lx) - %ld bits per pixel", DPRINTF(", dwFourCC code '%c%c%c%c' (0x%08x) - %d bits per pixel",
(unsigned char)( pf->dwFourCC &0xff), (unsigned char)( pf->dwFourCC &0xff),
(unsigned char)((pf->dwFourCC>> 8)&0xff), (unsigned char)((pf->dwFourCC>> 8)&0xff),
(unsigned char)((pf->dwFourCC>>16)&0xff), (unsigned char)((pf->dwFourCC>>16)&0xff),
...@@ -781,7 +781,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) ...@@ -781,7 +781,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
if (pf->dwFlags & DDPF_RGB) if (pf->dwFlags & DDPF_RGB)
{ {
const char *cmd; const char *cmd;
DPRINTF(", RGB bits: %ld, ", pf->u1.dwRGBBitCount); DPRINTF(", RGB bits: %d, ", pf->u1.dwRGBBitCount);
switch (pf->u1.dwRGBBitCount) switch (pf->u1.dwRGBBitCount)
{ {
case 4: cmd = "%1lx"; break; case 4: cmd = "%1lx"; break;
...@@ -805,16 +805,16 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) ...@@ -805,16 +805,16 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
} }
if (pf->dwFlags & DDPF_ZBUFFER) if (pf->dwFlags & DDPF_ZBUFFER)
{ {
DPRINTF(", Z bits : %ld", pf->u1.dwZBufferBitDepth); DPRINTF(", Z bits : %d", pf->u1.dwZBufferBitDepth);
} }
if (pf->dwFlags & DDPF_ALPHA) if (pf->dwFlags & DDPF_ALPHA)
{ {
DPRINTF(", Alpha bits : %ld", pf->u1.dwAlphaBitDepth); DPRINTF(", Alpha bits : %d", pf->u1.dwAlphaBitDepth);
} }
if (pf->dwFlags & DDPF_BUMPDUDV) if (pf->dwFlags & DDPF_BUMPDUDV)
{ {
const char *cmd = "%08lx"; const char *cmd = "%08lx";
DPRINTF(", Bump bits: %ld, ", pf->u1.dwBumpBitCount); DPRINTF(", Bump bits: %d, ", pf->u1.dwBumpBitCount);
DPRINTF(" U "); DPRINTF(cmd, pf->u2.dwBumpDuBitMask); DPRINTF(" U "); DPRINTF(cmd, pf->u2.dwBumpDuBitMask);
DPRINTF(" V "); DPRINTF(cmd, pf->u3.dwBumpDvBitMask); DPRINTF(" V "); DPRINTF(cmd, pf->u3.dwBumpDvBitMask);
DPRINTF(" L "); DPRINTF(cmd, pf->u4.dwBumpLuminanceBitMask); DPRINTF(" L "); DPRINTF(cmd, pf->u4.dwBumpLuminanceBitMask);
...@@ -1098,7 +1098,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) ...@@ -1098,7 +1098,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
FE(DDSVCAPS_STEREOSEQUENTIAL), FE(DDSVCAPS_STEREOSEQUENTIAL),
}; };
DPRINTF(" - dwSize : %ld\n", lpcaps->dwSize); DPRINTF(" - dwSize : %d\n", lpcaps->dwSize);
DPRINTF(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, sizeof(flags1)/sizeof(flags1[0])); DPRINTF(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, sizeof(flags1)/sizeof(flags1[0]));
DPRINTF(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); DPRINTF(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0]));
DPRINTF(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, sizeof(flags3)/sizeof(flags3[0])); DPRINTF(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, sizeof(flags3)/sizeof(flags3[0]));
...@@ -1107,10 +1107,10 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) ...@@ -1107,10 +1107,10 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
DPRINTF(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, sizeof(flags6)/sizeof(flags6[0])); DPRINTF(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, sizeof(flags6)/sizeof(flags6[0]));
DPRINTF(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, sizeof(flags7)/sizeof(flags7[0])); DPRINTF(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, sizeof(flags7)/sizeof(flags7[0]));
DPRINTF("...\n"); DPRINTF("...\n");
DPRINTF(" - dwNumFourCCCodes : %ld\n", lpcaps->dwNumFourCCCodes); DPRINTF(" - dwNumFourCCCodes : %d\n", lpcaps->dwNumFourCCCodes);
DPRINTF(" - dwCurrVisibleOverlays : %ld\n", lpcaps->dwCurrVisibleOverlays); DPRINTF(" - dwCurrVisibleOverlays : %d\n", lpcaps->dwCurrVisibleOverlays);
DPRINTF(" - dwMinOverlayStretch : %ld\n", lpcaps->dwMinOverlayStretch); DPRINTF(" - dwMinOverlayStretch : %d\n", lpcaps->dwMinOverlayStretch);
DPRINTF(" - dwMaxOverlayStretch : %ld\n", lpcaps->dwMaxOverlayStretch); DPRINTF(" - dwMaxOverlayStretch : %d\n", lpcaps->dwMaxOverlayStretch);
DPRINTF("...\n"); DPRINTF("...\n");
DPRINTF(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps); DPRINTF("\n"); DPRINTF(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps); DPRINTF("\n");
} }
......
dlls/ddraw/vertexbuffer.c
View file @ 2465fcb3
...@@ -130,7 +130,7 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface) ...@@ -130,7 +130,7 @@ IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface)
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p/%p)->() incrementing from %lu.\n", This, iface, ref - 1); TRACE("(%p/%p)->() incrementing from %u.\n", This, iface, ref - 1);
return ref; return ref;
} }
...@@ -160,7 +160,7 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface) ...@@ -160,7 +160,7 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface)
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() decrementing from %lu.\n", This, ref + 1); TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
if (ref == 0) if (ref == 0)
{ {
...@@ -212,7 +212,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, ...@@ -212,7 +212,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface,
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
WINED3DVERTEXBUFFER_DESC Desc; WINED3DVERTEXBUFFER_DESC Desc;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%08lx,%p,%p)\n", This, Flags, Data, Size); TRACE("(%p)->(%08x,%p,%p)\n", This, Flags, Data, Size);
if(Size) if(Size)
{ {
...@@ -221,7 +221,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, ...@@ -221,7 +221,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface,
&Desc); &Desc);
if(hr != D3D_OK) if(hr != D3D_OK)
{ {
ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr=%08lx\n", This, hr); ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr=%08x\n", This, hr);
return hr; return hr;
} }
*Size = Desc.Size; *Size = Desc.Size;
...@@ -241,7 +241,7 @@ Thunk_IDirect3DVertexBufferImpl_1_Lock(IDirect3DVertexBuffer *iface, ...@@ -241,7 +241,7 @@ Thunk_IDirect3DVertexBufferImpl_1_Lock(IDirect3DVertexBuffer *iface,
DWORD *Size) DWORD *Size)
{ {
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, iface); ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, iface);
TRACE_(ddraw_thunk)("(%p)->(%08lx,%p,%p) thunking to IDirect3DVertexBuffer7 interface.\n", This, Flags, Data, Size); TRACE_(ddraw_thunk)("(%p)->(%08x,%p,%p) thunking to IDirect3DVertexBuffer7 interface.\n", This, Flags, Data, Size);
return IDirect3DVertexBuffer7_Lock(ICOM_INTERFACE(This, IDirect3DVertexBuffer7), return IDirect3DVertexBuffer7_Lock(ICOM_INTERFACE(This, IDirect3DVertexBuffer7),
Flags, Flags,
...@@ -316,7 +316,7 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, ...@@ -316,7 +316,7 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface,
BOOL oldClip, doClip; BOOL oldClip, doClip;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%08lx,%ld,%ld,%p,%ld,%p,%08lx)\n", This, VertexOp, DestIndex, Count, Src, SrcIndex, D3D, Flags); TRACE("(%p)->(%08x,%d,%d,%p,%d,%p,%08x)\n", This, VertexOp, DestIndex, Count, Src, SrcIndex, D3D, Flags);
/* Vertex operations: /* Vertex operations:
* D3DVOP_CLIP: Clips vertices outside the viewing frustrum. Needs clipping information * D3DVOP_CLIP: Clips vertices outside the viewing frustrum. Needs clipping information
...@@ -376,7 +376,7 @@ Thunk_IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface, ...@@ -376,7 +376,7 @@ Thunk_IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface,
IDirect3DVertexBufferImpl *Src = ICOM_OBJECT(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, SrcBuffer); IDirect3DVertexBufferImpl *Src = ICOM_OBJECT(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, SrcBuffer);
IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice3, D3DDevice); IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice3, D3DDevice);
TRACE_(ddraw_thunk)("(%p)->(%08lx,%08lx,%08lx,%p,%08lx,%p,%08lx) thunking to IDirect3DVertexBuffer7 interface.\n", This, VertexOp, DestIndex, Count, Src, SrcIndex, D3D, Flags); TRACE_(ddraw_thunk)("(%p)->(%08x,%08x,%08x,%p,%08x,%p,%08x) thunking to IDirect3DVertexBuffer7 interface.\n", This, VertexOp, DestIndex, Count, Src, SrcIndex, D3D, Flags);
return IDirect3DVertexBuffer7_ProcessVertices(ICOM_INTERFACE(This, IDirect3DVertexBuffer7), return IDirect3DVertexBuffer7_ProcessVertices(ICOM_INTERFACE(This, IDirect3DVertexBuffer7),
VertexOp, VertexOp,
...@@ -417,7 +417,7 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, ...@@ -417,7 +417,7 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface,
&WDesc); &WDesc);
if(hr != D3D_OK) if(hr != D3D_OK)
{ {
ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr=%08lx\n", This, hr); ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr=%08x\n", This, hr);
return hr; return hr;
} }
...@@ -466,7 +466,7 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface, ...@@ -466,7 +466,7 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface,
{ {
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice7, D3DDevice); IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice7, D3DDevice);
FIXME("(%p)->(%p,%08lx): stub!\n", This, D3D, Flags); FIXME("(%p)->(%p,%08x): stub!\n", This, D3D, Flags);
/* We could forward this call to WineD3D and take advantage /* We could forward this call to WineD3D and take advantage
* of it once we use OpenGL vertex buffers * of it once we use OpenGL vertex buffers
...@@ -483,7 +483,7 @@ Thunk_IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface, ...@@ -483,7 +483,7 @@ Thunk_IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface,
{ {
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, iface); ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, iface);
IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice3, D3DDevice); IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice3, D3DDevice);
TRACE_(ddraw_thunk)("(%p)->(%p,%08lx) thunking to IDirect3DVertexBuffer7 interface.\n", This, D3D, Flags); TRACE_(ddraw_thunk)("(%p)->(%p,%08x) thunking to IDirect3DVertexBuffer7 interface.\n", This, D3D, Flags);
return IDirect3DVertexBuffer7_Optimize(ICOM_INTERFACE(This, IDirect3DVertexBuffer7), return IDirect3DVertexBuffer7_Optimize(ICOM_INTERFACE(This, IDirect3DVertexBuffer7),
ICOM_INTERFACE(D3D, IDirect3DDevice7), ICOM_INTERFACE(D3D, IDirect3DDevice7),
...@@ -524,7 +524,7 @@ IDirect3DVertexBufferImpl_ProcessVerticesStrided(IDirect3DVertexBuffer7 *iface, ...@@ -524,7 +524,7 @@ IDirect3DVertexBufferImpl_ProcessVerticesStrided(IDirect3DVertexBuffer7 *iface,
{ {
ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface);
IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice7, D3DDevice); IDirect3DDeviceImpl *D3D = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice7, D3DDevice);
FIXME("(%p)->(%08lx,%08lx,%08lx,%p,%08lx,%p,%08lx): stub!\n", This, VertexOp, DestIndex, Count, StrideData, VertexTypeDesc, D3D, Flags); FIXME("(%p)->(%08x,%08x,%08x,%p,%08x,%p,%08x): stub!\n", This, VertexOp, DestIndex, Count, StrideData, VertexTypeDesc, D3D, Flags);
return DD_OK; return DD_OK;
} }
......
dlls/ddraw/viewport.c
View file @ 2465fcb3
...@@ -97,9 +97,9 @@ void viewport_activate(IDirect3DViewportImpl* This) { ...@@ -97,9 +97,9 @@ void viewport_activate(IDirect3DViewportImpl* This) {
*****************************************************************************/ *****************************************************************************/
static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp) static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp)
{ {
TRACE(" - dwSize = %ld dwX = %ld dwY = %ld\n", TRACE(" - dwSize = %d dwX = %d dwY = %d\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY); lpvp->dwSize, lpvp->dwX, lpvp->dwY);
TRACE(" - dwWidth = %ld dwHeight = %ld\n", TRACE(" - dwWidth = %d dwHeight = %d\n",
lpvp->dwWidth, lpvp->dwHeight); lpvp->dwWidth, lpvp->dwHeight);
TRACE(" - dvScaleX = %f dvScaleY = %f\n", TRACE(" - dvScaleX = %f dvScaleY = %f\n",
lpvp->dvScaleX, lpvp->dvScaleY); lpvp->dvScaleX, lpvp->dvScaleY);
...@@ -111,9 +111,9 @@ static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp) ...@@ -111,9 +111,9 @@ static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp)
static void _dump_D3DVIEWPORT2(D3DVIEWPORT2 *lpvp) static void _dump_D3DVIEWPORT2(D3DVIEWPORT2 *lpvp)
{ {
TRACE(" - dwSize = %ld dwX = %ld dwY = %ld\n", TRACE(" - dwSize = %d dwX = %d dwY = %d\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY); lpvp->dwSize, lpvp->dwX, lpvp->dwY);
TRACE(" - dwWidth = %ld dwHeight = %ld\n", TRACE(" - dwWidth = %d dwHeight = %d\n",
lpvp->dwWidth, lpvp->dwHeight); lpvp->dwWidth, lpvp->dwHeight);
TRACE(" - dvClipX = %f dvClipY = %f\n", TRACE(" - dvClipX = %f dvClipY = %f\n",
lpvp->dvClipX, lpvp->dvClipY); lpvp->dvClipX, lpvp->dvClipY);
...@@ -181,7 +181,7 @@ IDirect3DViewportImpl_AddRef(IDirect3DViewport3 *iface) ...@@ -181,7 +181,7 @@ IDirect3DViewportImpl_AddRef(IDirect3DViewport3 *iface)
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() incrementing from %lu.\n", This, ref - 1); TRACE("(%p)->() incrementing from %u.\n", This, ref - 1);
return ref; return ref;
} }
...@@ -201,7 +201,7 @@ IDirect3DViewportImpl_Release(IDirect3DViewport3 *iface) ...@@ -201,7 +201,7 @@ IDirect3DViewportImpl_Release(IDirect3DViewport3 *iface)
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() decrementing from %lu.\n", This, ref + 1); TRACE("(%p)->() decrementing from %u.\n", This, ref + 1);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -339,7 +339,7 @@ IDirect3DViewportImpl_TransformVertices(IDirect3DViewport3 *iface, ...@@ -339,7 +339,7 @@ IDirect3DViewportImpl_TransformVertices(IDirect3DViewport3 *iface,
DWORD *lpOffScreen) DWORD *lpOffScreen)
{ {
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
FIXME("(%p)->(%08lx,%p,%08lx,%p): stub!\n", This, dwVertexCount, lpData, dwFlags, lpOffScreen); FIXME("(%p)->(%08x,%p,%08x,%p): stub!\n", This, dwVertexCount, lpData, dwFlags, lpOffScreen);
if (lpOffScreen) if (lpOffScreen)
*lpOffScreen = 0; *lpOffScreen = 0;
return DD_OK; return DD_OK;
...@@ -363,7 +363,7 @@ IDirect3DViewportImpl_LightElements(IDirect3DViewport3 *iface, ...@@ -363,7 +363,7 @@ IDirect3DViewportImpl_LightElements(IDirect3DViewport3 *iface,
LPD3DLIGHTDATA lpData) LPD3DLIGHTDATA lpData)
{ {
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
TRACE("(%p)->(%08lx,%p): Unimplemented!\n", This, dwElementCount, lpData); TRACE("(%p)->(%08x,%p): Unimplemented!\n", This, dwElementCount, lpData);
return DDERR_UNSUPPORTED; return DDERR_UNSUPPORTED;
} }
...@@ -384,16 +384,16 @@ IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface, ...@@ -384,16 +384,16 @@ IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface,
D3DMATERIALHANDLE hMat) D3DMATERIALHANDLE hMat)
{ {
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
TRACE("(%p)->(%ld)\n", This, (DWORD) hMat); TRACE("(%p)->(%d)\n", This, (DWORD) hMat);
if(hMat && hMat > This->ddraw->d3ddevice->numHandles) if(hMat && hMat > This->ddraw->d3ddevice->numHandles)
{ {
WARN("Specified Handle %ld out of range\n", hMat); WARN("Specified Handle %d out of range\n", hMat);
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
} }
else if(hMat && This->ddraw->d3ddevice->Handles[hMat - 1].type != DDrawHandle_Material) else if(hMat && This->ddraw->d3ddevice->Handles[hMat - 1].type != DDrawHandle_Material)
{ {
WARN("Handle %ld is not a material handle\n", hMat); WARN("Handle %d is not a material handle\n", hMat);
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
} }
...@@ -526,7 +526,7 @@ IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, ...@@ -526,7 +526,7 @@ IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface,
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
DWORD color = 0x00000000; DWORD color = 0x00000000;
TRACE("(%p/%p)->(%08lx,%p,%08lx)\n", This, iface, dwCount, lpRects, dwFlags); TRACE("(%p/%p)->(%08x,%p,%08x)\n", This, iface, dwCount, lpRects, dwFlags);
if (This->active_device == NULL) { if (This->active_device == NULL) {
ERR(" Trying to clear a viewport not attached to a device !\n"); ERR(" Trying to clear a viewport not attached to a device !\n");
return D3DERR_VIEWPORTHASNODEVICE; return D3DERR_VIEWPORTHASNODEVICE;
...@@ -664,7 +664,7 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, ...@@ -664,7 +664,7 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface,
DWORD dwFlags) DWORD dwFlags)
{ {
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
FIXME("(%p)->(%p,%p,%08lx): stub!\n", This, lpDirect3DLight, lplpDirect3DLight, dwFlags); FIXME("(%p)->(%p,%p,%08x): stub!\n", This, lpDirect3DLight, lplpDirect3DLight, dwFlags);
return D3D_OK; return D3D_OK;
} }
...@@ -824,7 +824,7 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, ...@@ -824,7 +824,7 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface,
DWORD dwStencil) DWORD dwStencil)
{ {
ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface);
TRACE("(%p)->(%08lx,%p,%08lx,%08lx,%f,%08lx)\n", This, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil); TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x)\n", This, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil);
if (This->active_device == NULL) { if (This->active_device == NULL) {
ERR(" Trying to clear a viewport not attached to a device !\n"); ERR(" Trying to clear a viewport not attached to a device !\n");
return D3DERR_VIEWPORTHASNODEVICE; return D3DERR_VIEWPORTHASNODEVICE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment