Skip to content

W
wine-cw
Commit 4ceb3a65 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

ddraw: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent fa7c22e4
Hide whitespace changes
Inline Side-by-side
Showing with 451 additions and 454 deletions
dlls/ddraw/Makefile.in
View file @ 4ceb3a65
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = ddraw.dll
IMPORTLIB = ddraw
IMPORTS = dxguid uuid wined3d user32 gdi32 advapi32
......
dlls/ddraw/clipper.c
View file @ 4ceb3a65
......@@ -86,7 +86,7 @@ static ULONG WINAPI ddraw_clipper_AddRef(IDirectDrawClipper *iface)
}
refcount = InterlockedIncrement(&clipper->ref);
TRACE("%p increasing refcount to %u.\n", clipper, refcount);
TRACE("%p increasing refcount to %lu.\n", clipper, refcount);
return refcount;
}
......@@ -103,7 +103,7 @@ static ULONG WINAPI ddraw_clipper_Release(IDirectDrawClipper *iface)
refcount = InterlockedDecrement(&clipper->ref);
TRACE("%p decreasing refcount to %u.\n", clipper, refcount);
TRACE("%p decreasing refcount to %lu.\n", clipper, refcount);
if (!refcount)
{
......@@ -120,14 +120,14 @@ static HRESULT WINAPI ddraw_clipper_SetHWnd(IDirectDrawClipper *iface, DWORD fla
{
struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface);
TRACE("iface %p, flags %#x, window %p.\n", iface, flags, window);
TRACE("iface %p, flags %#lx, window %p.\n", iface, flags, window);
if (!ddraw_clipper_is_valid(clipper))
return DDERR_INVALIDPARAMS;
if (flags)
{
FIXME("flags %#x, not supported.\n", flags);
FIXME("flags %#lx, not supported.\n", flags);
return DDERR_INVALIDPARAMS;
}
......@@ -280,7 +280,7 @@ static HRESULT WINAPI ddraw_clipper_SetClipList(IDirectDrawClipper *iface, RGNDA
{
struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface);
TRACE("iface %p, region %p, flags %#x.\n", iface, region, flags);
TRACE("iface %p, region %p, flags %#lx.\n", iface, region, flags);
if (!ddraw_clipper_is_valid(clipper))
return DDERR_INVALIDPARAMS;
......@@ -330,7 +330,7 @@ static HRESULT WINAPI ddraw_clipper_Initialize(IDirectDrawClipper *iface,
{
struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface);
TRACE("iface %p, ddraw %p, flags %#x.\n", iface, ddraw, flags);
TRACE("iface %p, ddraw %p, flags %#lx.\n", iface, ddraw, flags);
if (!ddraw_clipper_is_valid(clipper))
return DDERR_INVALIDPARAMS;
......
dlls/ddraw/ddraw.c
View file @ 4ceb3a65
......@@ -292,7 +292,7 @@ static ULONG WINAPI ddraw7_AddRef(IDirectDraw7 *iface)
struct ddraw *This = impl_from_IDirectDraw7(iface);
ULONG ref = InterlockedIncrement(&This->ref7);
TRACE("%p increasing refcount to %u.\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", This, ref);
if(ref == 1) InterlockedIncrement(&This->numIfaces);
......@@ -304,7 +304,7 @@ static ULONG WINAPI ddraw4_AddRef(IDirectDraw4 *iface)
struct ddraw *This = impl_from_IDirectDraw4(iface);
ULONG ref = InterlockedIncrement(&This->ref4);
TRACE("%p increasing refcount to %u.\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", This, ref);
if (ref == 1) InterlockedIncrement(&This->numIfaces);
......@@ -316,7 +316,7 @@ static ULONG WINAPI ddraw2_AddRef(IDirectDraw2 *iface)
struct ddraw *This = impl_from_IDirectDraw2(iface);
ULONG ref = InterlockedIncrement(&This->ref2);
TRACE("%p increasing refcount to %u.\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", This, ref);
if (ref == 1) InterlockedIncrement(&This->numIfaces);
......@@ -328,7 +328,7 @@ static ULONG WINAPI ddraw1_AddRef(IDirectDraw *iface)
struct ddraw *This = impl_from_IDirectDraw(iface);
ULONG ref = InterlockedIncrement(&This->ref1);
TRACE("%p increasing refcount to %u.\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", This, ref);
if (ref == 1) InterlockedIncrement(&This->numIfaces);
......@@ -456,7 +456,7 @@ static ULONG WINAPI ddraw7_Release(IDirectDraw7 *iface)
struct ddraw *This = impl_from_IDirectDraw7(iface);
ULONG ref = InterlockedDecrement(&This->ref7);
TRACE("%p decreasing refcount to %u.\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
ddraw_destroy(This);
......@@ -469,7 +469,7 @@ static ULONG WINAPI ddraw4_Release(IDirectDraw4 *iface)
struct ddraw *This = impl_from_IDirectDraw4(iface);
ULONG ref = InterlockedDecrement(&This->ref4);
TRACE("%p decreasing refcount to %u.\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
ddraw_destroy(This);
......@@ -482,7 +482,7 @@ static ULONG WINAPI ddraw2_Release(IDirectDraw2 *iface)
struct ddraw *This = impl_from_IDirectDraw2(iface);
ULONG ref = InterlockedDecrement(&This->ref2);
TRACE("%p decreasing refcount to %u.\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
ddraw_destroy(This);
......@@ -495,7 +495,7 @@ static ULONG WINAPI ddraw1_Release(IDirectDraw *iface)
struct ddraw *This = impl_from_IDirectDraw(iface);
ULONG ref = InterlockedDecrement(&This->ref1);
TRACE("%p decreasing refcount to %u.\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces))
ddraw_destroy(This);
......@@ -599,7 +599,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window,
NULL, NULL, NULL, NULL);
if (!window)
{
ERR("Failed to create window, last error %#x.\n", GetLastError());
ERR("Failed to create window, last error %#lx.\n", GetLastError());
return E_FAIL;
}
......@@ -654,7 +654,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, DWORD co
if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, cooplevel, &ddraw->wined3d_swapchain)))
{
ERR("Failed to create swapchain, hr %#x.\n", hr);
ERR("Failed to create swapchain, hr %#lx.\n", hr);
return hr;
}
wined3d_swapchain_incref(ddraw->wined3d_swapchain);
......@@ -796,7 +796,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
RECT clip_rect;
HRESULT hr;
TRACE("ddraw %p, window %p, flags %#x, restore_mode_on_normal %x.\n", ddraw, window, cooplevel,
TRACE("ddraw %p, window %p, flags %#lx, restore_mode_on_normal %x.\n", ddraw, window, cooplevel,
restore_mode_on_normal);
DDRAW_dump_cooperativelevel(cooplevel);
......@@ -875,7 +875,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
NULL, NULL, NULL, NULL);
if (!device_window)
{
ERR("Failed to create window, last error %#x.\n", GetLastError());
ERR("Failed to create window, last error %#lx.\n", GetLastError());
hr = E_FAIL;
goto done;
}
......@@ -929,7 +929,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
if (FAILED(hr = wined3d_stateblock_create(ddraw->wined3d_device,
ddraw->state, WINED3D_SBT_ALL, &stateblock)))
{
ERR("Failed to create stateblock, hr %#x.\n", hr);
ERR("Failed to create stateblock, hr %#lx.\n", hr);
goto done;
}
......@@ -948,7 +948,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
}
if (FAILED(hr = ddraw_create_swapchain(ddraw, window, cooplevel)))
ERR("Failed to create swapchain, hr %#x.\n", hr);
ERR("Failed to create swapchain, hr %#lx.\n", hr);
if (restore_state)
{
......@@ -991,7 +991,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
hr = wined3d_device_acquire_focus_window(ddraw->wined3d_device, window);
if (FAILED(hr))
{
ERR("Failed to acquire focus window, hr %#x.\n", hr);
ERR("Failed to acquire focus window, hr %#lx.\n", hr);
goto done;
}
}
......@@ -1032,7 +1032,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND windo
{
struct ddraw *ddraw = impl_from_IDirectDraw7(iface);
TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags);
TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags);
return ddraw_set_cooperative_level(ddraw, window, flags, !(ddraw->flags & DDRAW_SCL_DDRAW1));
}
......@@ -1041,7 +1041,7 @@ static HRESULT WINAPI ddraw4_SetCooperativeLevel(IDirectDraw4 *iface, HWND windo
{
struct ddraw *ddraw = impl_from_IDirectDraw4(iface);
TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags);
TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags);
return ddraw_set_cooperative_level(ddraw, window, flags, !(ddraw->flags & DDRAW_SCL_DDRAW1));
}
......@@ -1050,7 +1050,7 @@ static HRESULT WINAPI ddraw2_SetCooperativeLevel(IDirectDraw2 *iface, HWND windo
{
struct ddraw *ddraw = impl_from_IDirectDraw2(iface);
TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags);
TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags);
return ddraw_set_cooperative_level(ddraw, window, flags, !(ddraw->flags & DDRAW_SCL_DDRAW1));
}
......@@ -1060,7 +1060,7 @@ static HRESULT WINAPI ddraw1_SetCooperativeLevel(IDirectDraw *iface, HWND window
struct ddraw *ddraw = impl_from_IDirectDraw(iface);
HRESULT hr;
TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags);
TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags);
hr = ddraw_set_cooperative_level(ddraw, window, flags, FALSE);
if (SUCCEEDED(hr))
......@@ -1099,12 +1099,12 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW
RECT clip_rect;
HRESULT hr;
TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n",
TRACE("iface %p, width %lu, height %lu, bpp %lu, refresh_rate %lu, flags %#lx.\n",
iface, width, height, bpp, refresh_rate, flags);
if (force_refresh_rate != 0)
{
TRACE("ForceRefreshRate overriding passed-in refresh rate (%u Hz) to %u Hz\n",
TRACE("ForceRefreshRate overriding passed-in refresh rate (%lu Hz) to %lu Hz\n",
refresh_rate, force_refresh_rate);
refresh_rate = force_refresh_rate;
}
......@@ -1150,7 +1150,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW
if (FAILED(hr = wined3d_swapchain_resize_buffers(ddraw->wined3d_swapchain, 0,
surface_desc->dwWidth, surface_desc->dwHeight, mode.format_id, WINED3D_MULTISAMPLE_NONE, 0)))
ERR("Failed to resize buffers, hr %#x.\n", hr);
ERR("Failed to resize buffers, hr %#lx.\n", hr);
else
ddrawformat_from_wined3dformat(&ddraw->primary->surface_desc.u4.ddpfPixelFormat, mode.format_id);
}
......@@ -1175,7 +1175,7 @@ static HRESULT WINAPI ddraw4_SetDisplayMode(IDirectDraw4 *iface, DWORD width, DW
{
struct ddraw *ddraw = impl_from_IDirectDraw4(iface);
TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n",
TRACE("iface %p, width %lu, height %lu, bpp %lu, refresh_rate %lu, flags %#lx.\n",
iface, width, height, bpp, refresh_rate, flags);
return ddraw7_SetDisplayMode(&ddraw->IDirectDraw7_iface, width, height, bpp, refresh_rate, flags);
......@@ -1186,7 +1186,7 @@ static HRESULT WINAPI ddraw2_SetDisplayMode(IDirectDraw2 *iface,
{
struct ddraw *ddraw = impl_from_IDirectDraw2(iface);
TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n",
TRACE("iface %p, width %lu, height %lu, bpp %lu, refresh_rate %lu, flags %#lx.\n",
iface, width, height, bpp, refresh_rate, flags);
return ddraw7_SetDisplayMode(&ddraw->IDirectDraw7_iface, width, height, bpp, refresh_rate, flags);
......@@ -1196,7 +1196,7 @@ static HRESULT WINAPI ddraw1_SetDisplayMode(IDirectDraw *iface, DWORD width, DWO
{
struct ddraw *ddraw = impl_from_IDirectDraw(iface);
TRACE("iface %p, width %u, height %u, bpp %u.\n", iface, width, height, bpp);
TRACE("iface %p, width %lu, height %lu, bpp %lu.\n", iface, width, height, bpp);
return ddraw7_SetDisplayMode(&ddraw->IDirectDraw7_iface, width, height, bpp, 0, 0);
}
......@@ -1271,7 +1271,7 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps)
wined3d_mutex_unlock();
if (FAILED(hr))
{
WARN("Failed to get device caps, hr %#x.\n", hr);
WARN("Failed to get device caps, hr %#lx.\n", hr);
return hr;
}
......@@ -1496,7 +1496,7 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
hr = wined3d_device_get_device_caps(ddraw->wined3d_device, &winecaps);
if (FAILED(hr))
{
WARN("Failed to get device caps, %#x.\n", hr);
WARN("Failed to get device caps, %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
......@@ -1661,7 +1661,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2
if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL)))
{
ERR("Failed to get display mode, hr %#x.\n", hr);
ERR("Failed to get display mode, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
......@@ -1754,7 +1754,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes
if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL)))
{
ERR("Failed to get display mode, hr %#x.\n", hr);
ERR("Failed to get display mode, hr %#lx.\n", hr);
return hr;
}
......@@ -1771,7 +1771,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes
}
}
if(NumCodes) {
TRACE("Returning %u FourCC codes\n", count);
TRACE("Returning %lu FourCC codes\n", count);
*NumCodes = count;
}
......@@ -1818,7 +1818,7 @@ static HRESULT WINAPI ddraw7_GetMonitorFrequency(IDirectDraw7 *iface, DWORD *fre
wined3d_mutex_unlock();
if (FAILED(hr))
{
WARN("Failed to get display mode, hr %#x.\n", hr);
WARN("Failed to get display mode, hr %#lx.\n", hr);
return hr;
}
......@@ -1870,7 +1870,7 @@ static HRESULT WINAPI ddraw7_GetVerticalBlankStatus(IDirectDraw7 *iface, BOOL *s
wined3d_mutex_unlock();
if (FAILED(hr))
{
WARN("Failed to get raster status, hr %#x.\n", hr);
WARN("Failed to get raster status, hr %#lx.\n", hr);
return hr;
}
......@@ -1951,7 +1951,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c
*/
if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL)))
{
WARN("Failed to get display mode, hr %#x.\n", hr);
WARN("Failed to get display mode, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
......@@ -1963,7 +1963,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c
{
free_vidmem = wined3d_device_get_available_texture_mem(ddraw->wined3d_device);
*free = framebuffer_size > free_vidmem ? 0 : free_vidmem - framebuffer_size;
TRACE("Free video memory %#x.\n", *free);
TRACE("Free video memory %#lx.\n", *free);
}
if (total)
......@@ -1973,7 +1973,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c
hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0, &desc);
total_vidmem = min(UINT_MAX, desc.video_memory);
*total = framebuffer_size > total_vidmem ? 0 : total_vidmem - framebuffer_size;
TRACE("Total video memory %#x.\n", *total);
TRACE("Total video memory %#lx.\n", *total);
}
wined3d_mutex_unlock();
......@@ -2095,7 +2095,7 @@ static HRESULT WINAPI ddraw7_FlipToGDISurface(IDirectDraw7 *iface)
if (FAILED(hr = IDirectDraw7_GetGDISurface(iface, &gdi_surface)))
{
WARN("Failed to retrieve GDI surface, hr %#x.\n", hr);
WARN("Failed to retrieve GDI surface, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
......@@ -2160,12 +2160,12 @@ static HRESULT WINAPI ddraw7_WaitForVerticalBlank(IDirectDraw7 *iface, DWORD Fla
{
static BOOL hide;
TRACE("iface %p, flags %#x, event %p.\n", iface, Flags, event);
TRACE("iface %p, flags %#lx, event %p.\n", iface, Flags, event);
/* This function is called often, so print the fixme only once */
if(!hide)
{
FIXME("iface %p, flags %#x, event %p stub!\n", iface, Flags, event);
FIXME("iface %p, flags %#lx, event %p stub!\n", iface, Flags, event);
hide = TRUE;
}
......@@ -2180,7 +2180,7 @@ static HRESULT WINAPI ddraw4_WaitForVerticalBlank(IDirectDraw4 *iface, DWORD fla
{
struct ddraw *ddraw = impl_from_IDirectDraw4(iface);
TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event);
TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event);
return ddraw7_WaitForVerticalBlank(&ddraw->IDirectDraw7_iface, flags, event);
}
......@@ -2189,7 +2189,7 @@ static HRESULT WINAPI ddraw2_WaitForVerticalBlank(IDirectDraw2 *iface, DWORD fla
{
struct ddraw *ddraw = impl_from_IDirectDraw2(iface);
TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event);
TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event);
return ddraw7_WaitForVerticalBlank(&ddraw->IDirectDraw7_iface, flags, event);
}
......@@ -2198,7 +2198,7 @@ static HRESULT WINAPI ddraw1_WaitForVerticalBlank(IDirectDraw *iface, DWORD flag
{
struct ddraw *ddraw = impl_from_IDirectDraw(iface);
TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event);
TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event);
return ddraw7_WaitForVerticalBlank(&ddraw->IDirectDraw7_iface, flags, event);
}
......@@ -2216,7 +2216,7 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline)
wined3d_mutex_unlock();
if (FAILED(hr))
{
WARN("Failed to get raster status, hr %#x.\n", hr);
WARN("Failed to get raster status, hr %#lx.\n", hr);
return hr;
}
......@@ -2431,7 +2431,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags,
WINED3DFMT_P8_UINT,
};
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
TRACE("iface %p, flags %#lx, surface_desc %p, context %p, callback %p.\n",
iface, Flags, DDSD, Context, cb);
if (!cb)
......@@ -2496,7 +2496,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags,
callback_sd.u1.lPitch = (callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount / 8) * mode.width;
callback_sd.u1.lPitch = (callback_sd.u1.lPitch + 3) & ~3;
TRACE("Enumerating %dx%dx%d @%d\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount,
TRACE("Enumerating %ldx%ldx%ld @%ld\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount,
callback_sd.u2.dwRefreshRate);
if(cb(&callback_sd, Context) == DDENUMRET_CANCEL)
......@@ -2537,7 +2537,7 @@ static HRESULT WINAPI ddraw4_EnumDisplayModes(IDirectDraw4 *iface, DWORD flags,
{
struct ddraw *ddraw = impl_from_IDirectDraw4(iface);
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
TRACE("iface %p, flags %#lx, surface_desc %p, context %p, callback %p.\n",
iface, flags, surface_desc, context, callback);
return ddraw7_EnumDisplayModes(&ddraw->IDirectDraw7_iface, flags, surface_desc, context, callback);
......@@ -2550,7 +2550,7 @@ static HRESULT WINAPI ddraw2_EnumDisplayModes(IDirectDraw2 *iface, DWORD flags,
struct displaymodescallback_context cbcontext;
DDSURFACEDESC2 surface_desc2;
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
TRACE("iface %p, flags %#lx, surface_desc %p, context %p, callback %p.\n",
iface, flags, surface_desc, context, callback);
cbcontext.func = callback;
......@@ -2568,7 +2568,7 @@ static HRESULT WINAPI ddraw1_EnumDisplayModes(IDirectDraw *iface, DWORD flags,
struct displaymodescallback_context cbcontext;
DDSURFACEDESC2 surface_desc2;
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
TRACE("iface %p, flags %#lx, surface_desc %p, context %p, callback %p.\n",
iface, flags, surface_desc, context, callback);
cbcontext.func = callback;
......@@ -2597,7 +2597,7 @@ static HRESULT WINAPI ddraw1_EnumDisplayModes(IDirectDraw *iface, DWORD flags,
*****************************************************************************/
static HRESULT WINAPI ddraw7_EvaluateMode(IDirectDraw7 *iface, DWORD Flags, DWORD *Timeout)
{
FIXME("iface %p, flags %#x, timeout %p stub!\n", iface, Flags, Timeout);
FIXME("iface %p, flags %#lx, timeout %p stub!\n", iface, Flags, Timeout);
/* When implementing this, implement it in WineD3D */
......@@ -2626,7 +2626,7 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface,
struct wined3d_adapter_identifier adapter_id;
HRESULT hr = S_OK;
TRACE("iface %p, device_identifier %p, flags %#x.\n", iface, DDDI, Flags);
TRACE("iface %p, device_identifier %p, flags %#lx.\n", iface, DDDI, Flags);
if (!DDDI)
return DDERR_INVALIDPARAMS;
......@@ -2671,7 +2671,7 @@ static HRESULT WINAPI ddraw4_GetDeviceIdentifier(IDirectDraw4 *iface,
DDDEVICEIDENTIFIER2 identifier2;
HRESULT hr;
TRACE("iface %p, identifier %p, flags %#x.\n", iface, identifier, flags);
TRACE("iface %p, identifier %p, flags %#lx.\n", iface, identifier, flags);
hr = ddraw7_GetDeviceIdentifier(&ddraw->IDirectDraw7_iface, &identifier2, flags);
DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(&identifier2, identifier);
......@@ -2803,7 +2803,7 @@ static HRESULT WINAPI ddraw4_RestoreAllSurfaces(IDirectDraw4 *iface)
*****************************************************************************/
static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWORD NumModes, DWORD Flags)
{
FIXME("iface %p, modes %p, mode_count %u, flags %#x partial stub!\n",
FIXME("iface %p, modes %p, mode_count %lu, flags %#lx partial stub!\n",
iface, Modes, NumModes, Flags);
/* This looks sane */
......@@ -3274,7 +3274,7 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD flags,
struct ddraw *ddraw = impl_from_IDirectDraw7(iface);
HRESULT hr = DD_OK;
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
TRACE("iface %p, flags %#lx, surface_desc %p, context %p, callback %p.\n",
iface, flags, surface_desc, context, callback);
if (!callback)
......@@ -3317,7 +3317,7 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD flags,
if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL)))
{
ERR("Failed to get display mode, hr %#x.\n", hr);
ERR("Failed to get display mode, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
......@@ -3372,7 +3372,7 @@ static HRESULT WINAPI ddraw4_EnumSurfaces(IDirectDraw4 *iface, DWORD flags,
struct ddraw *ddraw = impl_from_IDirectDraw4(iface);
struct surfacescallback2_context cbcontext;
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
TRACE("iface %p, flags %#lx, surface_desc %p, context %p, callback %p.\n",
iface, flags, surface_desc, context, callback);
cbcontext.func = callback;
......@@ -3389,7 +3389,7 @@ static HRESULT WINAPI ddraw2_EnumSurfaces(IDirectDraw2 *iface, DWORD flags,
struct surfacescallback_context cbcontext;
DDSURFACEDESC2 surface_desc2;
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
TRACE("iface %p, flags %#lx, surface_desc %p, context %p, callback %p.\n",
iface, flags, surface_desc, context, callback);
cbcontext.func = callback;
......@@ -3407,7 +3407,7 @@ static HRESULT WINAPI ddraw1_EnumSurfaces(IDirectDraw *iface, DWORD flags,
struct surfacescallback_context cbcontext;
DDSURFACEDESC2 surface_desc2;
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
TRACE("iface %p, flags %#lx, surface_desc %p, context %p, callback %p.\n",
iface, flags, surface_desc, context, callback);
cbcontext.func = callback;
......@@ -3438,7 +3438,7 @@ HRESULT WINAPI DirectDrawCreateClipper(DWORD flags, IDirectDrawClipper **clipper
struct ddraw_clipper *object;
HRESULT hr;
TRACE("flags %#x, clipper %p, outer_unknown %p.\n",
TRACE("flags %#lx, clipper %p, outer_unknown %p.\n",
flags, clipper, outer_unknown);
if (outer_unknown)
......@@ -3455,7 +3455,7 @@ HRESULT WINAPI DirectDrawCreateClipper(DWORD flags, IDirectDrawClipper **clipper
hr = ddraw_clipper_init(object);
if (FAILED(hr))
{
WARN("Failed to initialize clipper, hr %#x.\n", hr);
WARN("Failed to initialize clipper, hr %#lx.\n", hr);
heap_free(object);
wined3d_mutex_unlock();
return hr;
......@@ -3477,7 +3477,7 @@ HRESULT WINAPI DirectDrawCreateClipper(DWORD flags, IDirectDrawClipper **clipper
static HRESULT WINAPI ddraw7_CreateClipper(IDirectDraw7 *iface, DWORD Flags,
IDirectDrawClipper **Clipper, IUnknown *UnkOuter)
{
TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n",
TRACE("iface %p, flags %#lx, clipper %p, outer_unknown %p.\n",
iface, Flags, Clipper, UnkOuter);
return DirectDrawCreateClipper(Flags, Clipper, UnkOuter);
......@@ -3488,7 +3488,7 @@ static HRESULT WINAPI ddraw4_CreateClipper(IDirectDraw4 *iface, DWORD flags,
{
struct ddraw *ddraw = impl_from_IDirectDraw4(iface);
TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n",
TRACE("iface %p, flags %#lx, clipper %p, outer_unknown %p.\n",
iface, flags, clipper, outer_unknown);
return ddraw7_CreateClipper(&ddraw->IDirectDraw7_iface, flags, clipper, outer_unknown);
......@@ -3499,7 +3499,7 @@ static HRESULT WINAPI ddraw2_CreateClipper(IDirectDraw2 *iface,
{
struct ddraw *ddraw = impl_from_IDirectDraw2(iface);
TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n",
TRACE("iface %p, flags %#lx, clipper %p, outer_unknown %p.\n",
iface, flags, clipper, outer_unknown);
return ddraw7_CreateClipper(&ddraw->IDirectDraw7_iface, flags, clipper, outer_unknown);
......@@ -3510,7 +3510,7 @@ static HRESULT WINAPI ddraw1_CreateClipper(IDirectDraw *iface,
{
struct ddraw *ddraw = impl_from_IDirectDraw(iface);
TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n",
TRACE("iface %p, flags %#lx, clipper %p, outer_unknown %p.\n",
iface, flags, clipper, outer_unknown);
return ddraw7_CreateClipper(&ddraw->IDirectDraw7_iface, flags, clipper, outer_unknown);
......@@ -3540,7 +3540,7 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags,
struct ddraw_palette *object;
HRESULT hr;
TRACE("iface %p, flags %#x, color_table %p, palette %p, outer_unknown %p.\n",
TRACE("iface %p, flags %#lx, color_table %p, palette %p, outer_unknown %p.\n",
iface, Flags, ColorTable, Palette, pUnkOuter);
if (pUnkOuter)
......@@ -3566,7 +3566,7 @@ static HRESULT WINAPI ddraw7_CreatePalette(IDirectDraw7 *iface, DWORD Flags,
hr = ddraw_palette_init(object, ddraw, Flags, ColorTable);
if (FAILED(hr))
{
WARN("Failed to initialize palette, hr %#x.\n", hr);
WARN("Failed to initialize palette, hr %#lx.\n", hr);
heap_free(object);
wined3d_mutex_unlock();
return hr;
......@@ -3585,7 +3585,7 @@ static HRESULT WINAPI ddraw4_CreatePalette(IDirectDraw4 *iface, DWORD flags, PAL
struct ddraw *ddraw = impl_from_IDirectDraw4(iface);
HRESULT hr;
TRACE("iface %p, flags %#x, entries %p, palette %p, outer_unknown %p.\n",
TRACE("iface %p, flags %#lx, entries %p, palette %p, outer_unknown %p.\n",
iface, flags, entries, palette, outer_unknown);
hr = ddraw7_CreatePalette(&ddraw->IDirectDraw7_iface, flags, entries, palette, outer_unknown);
......@@ -3605,7 +3605,7 @@ static HRESULT WINAPI ddraw2_CreatePalette(IDirectDraw2 *iface, DWORD flags,
struct ddraw *ddraw = impl_from_IDirectDraw2(iface);
HRESULT hr;
TRACE("iface %p, flags %#x, entries %p, palette %p, outer_unknown %p.\n",
TRACE("iface %p, flags %#lx, entries %p, palette %p, outer_unknown %p.\n",
iface, flags, entries, palette, outer_unknown);
hr = ddraw7_CreatePalette(&ddraw->IDirectDraw7_iface, flags, entries, palette, outer_unknown);
......@@ -3625,7 +3625,7 @@ static HRESULT WINAPI ddraw1_CreatePalette(IDirectDraw *iface, DWORD flags,
struct ddraw *ddraw = impl_from_IDirectDraw(iface);
HRESULT hr;
TRACE("iface %p, flags %#x, entries %p, palette %p, outer_unknown %p.\n",
TRACE("iface %p, flags %#lx, entries %p, palette %p, outer_unknown %p.\n",
iface, flags, entries, palette, outer_unknown);
hr = ddraw7_CreatePalette(&ddraw->IDirectDraw7_iface, flags, entries, palette, outer_unknown);
......@@ -4169,7 +4169,7 @@ static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH
unsigned int i;
HRESULT hr;
TRACE("ddraw %p, fds %p, fdr %p, guid_count %u, guids %p, device_desc_size %u.\n",
TRACE("ddraw %p, fds %p, fdr %p, guid_count %u, guids %p, device_desc_size %lu.\n",
ddraw, fds, fdr, guid_count, guids, device_desc_size);
if (!fds || !fdr)
......@@ -4177,18 +4177,18 @@ static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH
if (fds->dwSize != sizeof(*fds))
{
WARN("Got invalid search structure size %u.\n", fds->dwSize);
WARN("Got invalid search structure size %lu.\n", fds->dwSize);
return DDERR_INVALIDPARAMS;
}
if (fdr->dwSize != sizeof(*fdr) && fdr->dwSize != sizeof(*fdr2) && fdr->dwSize != sizeof(*fdr1))
{
WARN("Got invalid result structure size %u.\n", fdr->dwSize);
WARN("Got invalid result structure size %lu.\n", fdr->dwSize);
return DDERR_INVALIDPARAMS;
}
if (fds->dwFlags & D3DFDS_COLORMODEL)
WARN("Ignoring colour model %#x.\n", fds->dcmColorModel);
WARN("Ignoring colour model %#lx.\n", fds->dcmColorModel);
if (fds->dwFlags & D3DFDS_GUID)
{
......@@ -4344,7 +4344,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
}
else
{
WARN("Failed to create device, hr %#x.\n", hr);
WARN("Failed to create device, hr %#lx.\n", hr);
*device = NULL;
}
wined3d_mutex_unlock();
......@@ -4373,7 +4373,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
}
else
{
WARN("Failed to create device, hr %#x.\n", hr);
WARN("Failed to create device, hr %#lx.\n", hr);
*device = NULL;
}
wined3d_mutex_unlock();
......@@ -4399,7 +4399,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
}
else
{
WARN("Failed to create device, hr %#x.\n", hr);
WARN("Failed to create device, hr %#lx.\n", hr);
*device = NULL;
}
wined3d_mutex_unlock();
......@@ -4433,7 +4433,7 @@ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFER
struct d3d_vertex_buffer *object;
HRESULT hr;
TRACE("iface %p, desc %p, vertex_buffer %p, flags %#x.\n",
TRACE("iface %p, desc %p, vertex_buffer %p, flags %#lx.\n",
iface, desc, vertex_buffer, flags);
if (!vertex_buffer || !desc) return DDERR_INVALIDPARAMS;
......@@ -4445,7 +4445,7 @@ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFER
*vertex_buffer = &object->IDirect3DVertexBuffer7_iface;
}
else
WARN("Failed to create vertex buffer, hr %#x.\n", hr);
WARN("Failed to create vertex buffer, hr %#lx.\n", hr);
return hr;
}
......@@ -4457,7 +4457,7 @@ static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFER
struct d3d_vertex_buffer *object;
HRESULT hr;
TRACE("iface %p, desc %p, vertex_buffer %p, flags %#x, outer_unknown %p.\n",
TRACE("iface %p, desc %p, vertex_buffer %p, flags %#lx, outer_unknown %p.\n",
iface, desc, vertex_buffer, flags, outer_unknown);
if (outer_unknown)
......@@ -4472,7 +4472,7 @@ static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFER
*vertex_buffer = (IDirect3DVertexBuffer *)&object->IDirect3DVertexBuffer7_iface;
}
else
WARN("Failed to create vertex buffer, hr %#x.\n", hr);
WARN("Failed to create vertex buffer, hr %#lx.\n", hr);
return hr;
}
......@@ -4558,7 +4558,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device
* can get. */
if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL)))
{
ERR("Failed to get display mode, hr %#x.\n", hr);
ERR("Failed to get display mode, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
......@@ -4883,7 +4883,7 @@ struct wined3d_vertex_declaration *ddraw_find_decl(struct ddraw *This, DWORD fvf
int p, low, high; /* deliberately signed */
struct FvfToDecl *convertedDecls = This->decls;
TRACE("Searching for declaration for fvf %08x... ", fvf);
TRACE("Searching for declaration for fvf %08lx... ", fvf);
low = 0;
high = This->numConvertedDecls - 1;
......@@ -5073,7 +5073,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic
const struct wined3d_parent_ops *parent_ops;
HRESULT hr;
TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#x, texture %p.\n",
TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#lx, texture %p.\n",
device_parent, container_parent, desc, texture_flags, texture);
if (!ddraw->wined3d_frontbuffer)
......@@ -5084,7 +5084,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic
if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, desc, 1, 1,
texture_flags, NULL, ddraw, parent_ops, texture)))
{
WARN("Failed to create texture, hr %#x.\n", hr);
WARN("Failed to create texture, hr %#lx.\n", hr);
return hr;
}
......@@ -5155,7 +5155,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de
if (FAILED(hr = wined3d_get_device_caps(ddraw->wined3d_adapter, device_type, &caps)))
{
ERR("Failed to get device caps, hr %#x.\n", hr);
ERR("Failed to get device caps, hr %#lx.\n", hr);
wined3d_decref(ddraw->wined3d);
return E_FAIL;
}
......@@ -5170,7 +5170,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de
NULL, 0, DDRAW_STRIDE_ALIGNMENT, feature_levels, ARRAY_SIZE(feature_levels),
&ddraw->device_parent, &ddraw->wined3d_device)))
{
WARN("Failed to create a wined3d device, hr %#x.\n", hr);
WARN("Failed to create a wined3d device, hr %#lx.\n", hr);
wined3d_decref(ddraw->wined3d);
return hr;
}
......@@ -5180,7 +5180,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de
if (FAILED(hr = wined3d_stateblock_create(ddraw->wined3d_device, NULL, WINED3D_SBT_PRIMARY, &ddraw->state)))
{
ERR("Failed to create the primary stateblock, hr %#x.\n", hr);
ERR("Failed to create the primary stateblock, hr %#lx.\n", hr);
wined3d_device_decref(ddraw->wined3d_device);
wined3d_decref(ddraw->wined3d);
return hr;
......
dlls/ddraw/device.c
View file @ 4ceb3a65
......@@ -216,7 +216,7 @@ static ULONG WINAPI d3d_device_inner_AddRef(IUnknown *iface)
struct d3d_device *device = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&device->ref);
TRACE("%p increasing refcount to %u.\n", device, ref);
TRACE("%p increasing refcount to %lu.\n", device, ref);
return ref;
}
......@@ -263,7 +263,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
ULONG ref = InterlockedDecrement(&This->ref);
IUnknown *rt_iface;
TRACE("%p decreasing refcount to %u.\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", This, ref);
/* This method doesn't destroy the wined3d device, because it's still in
* use for 2D rendering. IDirectDrawSurface7::Release will destroy the
......@@ -308,7 +308,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
case DDRAW_HANDLE_MATERIAL:
{
struct d3d_material *m = entry->object;
FIXME("Material handle %#x (%p) not unset properly.\n", i + 1, m);
FIXME("Material handle %#lx (%p) not unset properly.\n", i + 1, m);
m->Handle = 0;
break;
}
......@@ -316,7 +316,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
case DDRAW_HANDLE_MATRIX:
{
/* No FIXME here because this might happen because of sloppy applications. */
WARN("Leftover matrix handle %#x (%p), deleting.\n", i + 1, entry->object);
WARN("Leftover matrix handle %#lx (%p), deleting.\n", i + 1, entry->object);
IDirect3DDevice_DeleteMatrix(&This->IDirect3DDevice_iface, i + 1);
break;
}
......@@ -324,7 +324,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
case DDRAW_HANDLE_STATEBLOCK:
{
/* No FIXME here because this might happen because of sloppy applications. */
WARN("Leftover stateblock handle %#x (%p), deleting.\n", i + 1, entry->object);
WARN("Leftover stateblock handle %#lx (%p), deleting.\n", i + 1, entry->object);
IDirect3DDevice7_DeleteStateBlock(&This->IDirect3DDevice7_iface, i + 1);
break;
}
......@@ -332,13 +332,13 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
case DDRAW_HANDLE_SURFACE:
{
struct ddraw_surface *surf = entry->object;
FIXME("Texture handle %#x (%p) not unset properly.\n", i + 1, surf);
FIXME("Texture handle %#lx (%p) not unset properly.\n", i + 1, surf);
surf->Handle = 0;
break;
}
default:
FIXME("Handle %#x (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type);
FIXME("Handle %#lx (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type);
break;
}
}
......@@ -525,7 +525,7 @@ static HRESULT WINAPI d3d_device3_GetCaps(IDirect3DDevice3 *iface,
}
if (!check_d3ddevicedesc_size(HWDesc->dwSize))
{
WARN("HWDesc->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", HWDesc->dwSize);
WARN("HWDesc->dwSize is %lu, returning DDERR_INVALIDPARAMS.\n", HWDesc->dwSize);
return DDERR_INVALIDPARAMS;
}
if (!HelDesc)
......@@ -535,7 +535,7 @@ static HRESULT WINAPI d3d_device3_GetCaps(IDirect3DDevice3 *iface,
}
if (!check_d3ddevicedesc_size(HelDesc->dwSize))
{
WARN("HelDesc->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", HelDesc->dwSize);
WARN("HelDesc->dwSize is %lu, returning DDERR_INVALIDPARAMS.\n", HelDesc->dwSize);
return DDERR_INVALIDPARAMS;
}
......@@ -714,7 +714,7 @@ static HRESULT WINAPI d3d_device1_CreateExecuteBuffer(IDirect3DDevice *iface,
hr = d3d_execute_buffer_init(object, device, buffer_desc);
if (FAILED(hr))
{
WARN("Failed to initialize execute buffer, hr %#x.\n", hr);
WARN("Failed to initialize execute buffer, hr %#lx.\n", hr);
heap_free(object);
return hr;
}
......@@ -749,7 +749,7 @@ static HRESULT WINAPI d3d_device1_Execute(IDirect3DDevice *iface,
struct d3d_viewport *viewport_impl = unsafe_impl_from_IDirect3DViewport(viewport);
HRESULT hr;
TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, viewport, flags);
TRACE("iface %p, buffer %p, viewport %p, flags %#lx.\n", iface, ExecuteBuffer, viewport, flags);
if(!buffer)
return DDERR_INVALIDPARAMS;
......@@ -930,7 +930,7 @@ static HRESULT WINAPI d3d_device3_NextViewport(IDirect3DDevice3 *iface,
struct d3d_viewport *next;
struct list *entry;
TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
TRACE("iface %p, viewport %p, next %p, flags %#lx.\n",
iface, Viewport3, lplpDirect3DViewport3, flags);
if(!vp)
......@@ -956,7 +956,7 @@ static HRESULT WINAPI d3d_device3_NextViewport(IDirect3DDevice3 *iface,
break;
default:
WARN("Invalid flags %#x.\n", flags);
WARN("Invalid flags %#lx.\n", flags);
*lplpDirect3DViewport3 = NULL;
wined3d_mutex_unlock();
return DDERR_INVALIDPARAMS;
......@@ -983,7 +983,7 @@ static HRESULT WINAPI d3d_device2_NextViewport(IDirect3DDevice2 *iface,
IDirect3DViewport3 *res;
HRESULT hr;
TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
TRACE("iface %p, viewport %p, next %p, flags %#lx.\n",
iface, viewport, next, flags);
hr = d3d_device3_NextViewport(&device->IDirect3DDevice3_iface,
......@@ -1000,7 +1000,7 @@ static HRESULT WINAPI d3d_device1_NextViewport(IDirect3DDevice *iface,
IDirect3DViewport3 *res;
HRESULT hr;
TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
TRACE("iface %p, viewport %p, next %p, flags %#lx.\n",
iface, viewport, next, flags);
hr = d3d_device3_NextViewport(&device->IDirect3DDevice3_iface,
......@@ -1033,7 +1033,7 @@ static HRESULT WINAPI d3d_device1_NextViewport(IDirect3DDevice *iface,
static HRESULT WINAPI d3d_device1_Pick(IDirect3DDevice *iface, IDirect3DExecuteBuffer *buffer,
IDirect3DViewport *viewport, DWORD flags, D3DRECT *rect)
{
FIXME("iface %p, buffer %p, viewport %p, flags %#x, rect %s stub!\n",
FIXME("iface %p, buffer %p, viewport %p, flags %#lx, rect %s stub!\n",
iface, buffer, viewport, flags, wine_dbgstr_rect((RECT *)rect));
return D3D_OK;
......@@ -1130,7 +1130,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface,
if (FAILED(hr = wined3d_output_get_display_mode(device->ddraw->wined3d_output, &mode, NULL)))
{
wined3d_mutex_unlock();
WARN("Failed to get output display mode, hr %#x.\n", hr);
WARN("Failed to get output display mode, hr %#lx.\n", hr);
return hr;
}
......@@ -1259,7 +1259,7 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface,
if (FAILED(hr = wined3d_output_get_display_mode(device->ddraw->wined3d_output, &mode, NULL)))
{
wined3d_mutex_unlock();
WARN("Failed to get output display mode, hr %#x.\n", hr);
WARN("Failed to get output display mode, hr %#lx.\n", hr);
return hr;
}
......@@ -1350,7 +1350,7 @@ static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIX
*D3DMatHandle = h + 1;
TRACE(" returning matrix handle %d\n", *D3DMatHandle);
TRACE(" returning matrix handle %lx\n", *D3DMatHandle);
wined3d_mutex_unlock();
......@@ -1381,7 +1381,7 @@ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface,
struct d3d_device *device = impl_from_IDirect3DDevice(iface);
D3DMATRIX *m;
TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, matrix_handle, matrix);
TRACE("iface %p, matrix_handle %#lx, matrix %p.\n", iface, matrix_handle, matrix);
if (!matrix)
return DDERR_INVALIDPARAMS;
......@@ -1440,7 +1440,7 @@ static HRESULT WINAPI d3d_device1_GetMatrix(IDirect3DDevice *iface,
struct d3d_device *device = impl_from_IDirect3DDevice(iface);
D3DMATRIX *m;
TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, D3DMatHandle, D3DMatrix);
TRACE("iface %p, matrix_handle %#lx, matrix %p.\n", iface, D3DMatHandle, D3DMatrix);
if (!D3DMatrix) return DDERR_INVALIDPARAMS;
......@@ -1481,7 +1481,7 @@ static HRESULT WINAPI d3d_device1_DeleteMatrix(IDirect3DDevice *iface, D3DMATRIX
struct d3d_device *device = impl_from_IDirect3DDevice(iface);
D3DMATRIX *m;
TRACE("iface %p, matrix_handle %#x.\n", iface, D3DMatHandle);
TRACE("iface %p, matrix_handle %#lx.\n", iface, D3DMatHandle);
wined3d_mutex_lock();
......@@ -1882,7 +1882,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags);
TRACE("iface %p, target %p, flags %#lx.\n", iface, target, flags);
wined3d_mutex_lock();
......@@ -1948,7 +1948,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
HRESULT hr;
TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags);
TRACE("iface %p, target %p, flags %#lx.\n", iface, target, flags);
wined3d_mutex_lock();
......@@ -1998,7 +1998,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
HRESULT hr;
TRACE("iface %p, target %p, flags %#x.\n", iface, target, flags);
TRACE("iface %p, target %p, flags %#lx.\n", iface, target, flags);
wined3d_mutex_lock();
......@@ -2139,7 +2139,7 @@ static HRESULT WINAPI d3d_device3_Begin(IDirect3DDevice3 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, primitive_type %#x, fvf %#x, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, fvf %#lx, flags %#lx.\n",
iface, primitive_type, fvf, flags);
wined3d_mutex_lock();
......@@ -2159,7 +2159,7 @@ static HRESULT WINAPI d3d_device2_Begin(IDirect3DDevice2 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
DWORD fvf;
TRACE("iface %p, primitive_type %#x, vertex_type %#x, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, vertex_type %#x, flags %#lx.\n",
iface, primitive_type, vertex_type, flags);
switch (vertex_type)
......@@ -2198,7 +2198,7 @@ static HRESULT WINAPI d3d_device3_BeginIndexed(IDirect3DDevice3 *iface,
D3DPRIMITIVETYPE primitive_type, DWORD fvf,
void *vertices, DWORD vertex_count, DWORD flags)
{
FIXME("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x stub!\n",
FIXME("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, flags %#lx stub!\n",
iface, primitive_type, fvf, vertices, vertex_count, flags);
return D3D_OK;
......@@ -2212,7 +2212,7 @@ static HRESULT WINAPI d3d_device2_BeginIndexed(IDirect3DDevice2 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
DWORD fvf;
TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, flags %#x stub!\n",
TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %lu, flags %#lx.\n",
iface, primitive_type, vertex_type, vertices, vertex_count, flags);
switch (vertex_type)
......@@ -2548,7 +2548,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr = D3D_OK;
TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
TRACE("iface %p, state %#x, value %#lx.\n", iface, state, value);
wined3d_mutex_lock();
/* Some render states need special care */
......@@ -2585,7 +2585,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface,
break;
default:
tex_mag = WINED3D_TEXF_POINT;
FIXME("Unhandled texture mag %#x.\n", value);
FIXME("Unhandled texture mag %#lx.\n", value);
break;
}
......@@ -2626,7 +2626,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface,
break;
default:
FIXME("Unhandled texture min %#x.\n",value);
FIXME("Unhandled texture min %#lx.\n",value);
tex_min = WINED3D_TEXF_POINT;
tex_mip = WINED3D_TEXF_NONE;
break;
......@@ -2747,7 +2747,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
HRESULT hr;
TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
TRACE("iface %p, state %#x, value %#lx.\n", iface, state, value);
if (state >= D3DSTATE_OVERRIDE_BIAS)
{
......@@ -2868,7 +2868,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface,
break;
default:
FIXME("Unhandled texture environment %#x.\n", value);
FIXME("Unhandled texture environment %#lx.\n", value);
}
hr = D3D_OK;
break;
......@@ -2894,7 +2894,7 @@ static HRESULT WINAPI d3d_device2_SetRenderState(IDirect3DDevice2 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
TRACE("iface %p, state %#x, value %#lx.\n", iface, state, value);
return IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, state, value);
}
......@@ -2923,7 +2923,7 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
HRESULT hr;
TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
TRACE("iface %p, state %#x, value %#lx.\n", iface, state, value);
if (!state || (state > D3DLIGHTSTATE_COLORVERTEX))
{
......@@ -3010,7 +3010,7 @@ static HRESULT WINAPI d3d_device2_SetLightState(IDirect3DDevice2 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
TRACE("iface %p, state %#x, value %#lx.\n", iface, state, value);
return d3d_device3_SetLightState(&device->IDirect3DDevice3_iface, state, value);
}
......@@ -3415,7 +3415,7 @@ static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_device *device, UINT
if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc,
NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer)))
{
ERR("Failed to create vertex buffer, hr %#x.\n", hr);
ERR("Failed to create vertex buffer, hr %#lx.\n", hr);
return hr;
}
......@@ -3481,7 +3481,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface,
struct wined3d_resource *vb;
HRESULT hr;
TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, flags %#lx.\n",
iface, primitive_type, fvf, vertices, vertex_count, flags);
if (!vertex_count)
......@@ -3572,7 +3572,7 @@ static HRESULT WINAPI d3d_device3_DrawPrimitive(IDirect3DDevice3 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, flags %#lx.\n",
iface, primitive_type, fvf, vertices, vertex_count, flags);
setup_lighting(device, fvf, flags);
......@@ -3588,7 +3588,7 @@ static HRESULT WINAPI d3d_device2_DrawPrimitive(IDirect3DDevice2 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
DWORD fvf;
TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %lu, flags %#lx.\n",
iface, primitive_type, vertex_type, vertices, vertex_count, flags);
switch (vertex_type)
......@@ -3651,7 +3651,7 @@ static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT m
if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc,
NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer)))
{
ERR("Failed to create index buffer, hr %#x.\n", hr);
ERR("Failed to create index buffer, hr %#lx.\n", hr);
return hr;
}
......@@ -3677,8 +3677,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface,
struct wined3d_resource *ib, *vb;
UINT vb_pos, ib_pos, align;
TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, "
"indices %p, index_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, "
"indices %p, index_count %lu, flags %#lx.\n",
iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags);
if (!vertex_count || !index_count)
......@@ -3776,8 +3776,8 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitive(IDirect3DDevice3 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, "
"indices %p, index_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, "
"indices %p, index_count %lu, flags %#lx.\n",
iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags);
setup_lighting(device, fvf, flags);
......@@ -3793,8 +3793,8 @@ static HRESULT WINAPI d3d_device2_DrawIndexedPrimitive(IDirect3DDevice2 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
DWORD fvf;
TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, "
"indices %p, index_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %lu, "
"indices %p, index_count %lu, flags %#lx.\n",
iface, primitive_type, vertex_type, vertices, vertex_count, indices, index_count, flags);
switch (vertex_type)
......@@ -3833,7 +3833,7 @@ static HRESULT WINAPI d3d_device3_End(IDirect3DDevice3 *iface, DWORD flags)
{
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return d3d_device3_DrawPrimitive(&device->IDirect3DDevice3_iface, device->primitive_type,
device->vertex_type, device->sysmem_vertex_buffer, device->nb_vertices, device->render_flags);
......@@ -3843,7 +3843,7 @@ static HRESULT WINAPI d3d_device2_End(IDirect3DDevice2 *iface, DWORD flags)
{
struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return d3d_device3_End(&device->IDirect3DDevice3_iface, flags);
}
......@@ -4027,7 +4027,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM
struct wined3d_resource *vb;
UINT vb_pos, align;
TRACE("iface %p, primitive_type %#x, fvf %#x, strided_data %p, vertex_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, fvf %#lx, strided_data %p, vertex_count %lu, flags %#lx.\n",
iface, primitive_type, fvf, strided_data, vertex_count, flags);
if (!vertex_count)
......@@ -4104,7 +4104,7 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveStrided(IDirect3DDevice3 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, FVF %#lx, strided_data %p, vertex_count %lu, flags %#lx.\n",
iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
setup_lighting(device, VertexType, Flags);
......@@ -4144,8 +4144,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface,
UINT ib_pos;
HRESULT hr;
TRACE("iface %p, primitive_type %#x, fvf %#x, strided_data %p, "
"vertex_count %u, indices %p, index_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, fvf %#lx, strided_data %p, "
"vertex_count %lu, indices %p, index_count %lu, flags %#lx.\n",
iface, primitive_type, fvf, strided_data, vertex_count, indices, index_count, flags);
if (!vertex_count || !index_count)
......@@ -4245,7 +4245,7 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveStrided(IDirect3DDevice3 *
{
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, FVF %#lx, strided_data %p, vertex_count %lu, indices %p, index_count %lu, flags %#lx.\n",
iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
setup_lighting(device, VertexType, Flags);
......@@ -4284,7 +4284,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE
DWORD stride;
HRESULT hr;
TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %lu, vertex_count %lu, flags %#lx.\n",
iface, primitive_type, vb, start_vertex, vertex_count, flags);
if (!vertex_count)
......@@ -4322,7 +4322,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE
if (FAILED(hr = wined3d_stateblock_set_stream_source(device->state,
0, vb_impl->wined3d_buffer, 0, stride)))
{
WARN("Failed to set stream source, hr %#x.\n", hr);
WARN("Failed to set stream source, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
......@@ -4364,7 +4364,7 @@ static HRESULT WINAPI d3d_device3_DrawPrimitiveVB(IDirect3DDevice3 *iface, D3DPR
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
struct d3d_vertex_buffer *vb = unsafe_impl_from_IDirect3DVertexBuffer7((IDirect3DVertexBuffer7 *)D3DVertexBuf);
TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %lu, vertex_count %lu, flags %#lx.\n",
iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
setup_lighting(device, vb->fvf, Flags);
......@@ -4404,8 +4404,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
HRESULT hr;
UINT ib_pos;
TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, "
"vertex_count %u, indices %p, index_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %lu, "
"vertex_count %lu, indices %p, index_count %lu, flags %#lx.\n",
iface, primitive_type, vb, start_vertex, vertex_count, indices, index_count, flags);
if (!vertex_count || !index_count)
......@@ -4465,7 +4465,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box,
WINED3D_MAP_WRITE | (ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))))
{
ERR("Failed to map buffer, hr %#x.\n", hr);
ERR("Failed to map buffer, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
......@@ -4480,7 +4480,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
if (FAILED(hr = wined3d_stateblock_set_stream_source(device->state,
0, vb_impl->wined3d_buffer, 0, stride)))
{
ERR("(%p) IDirect3DDevice::SetStreamSource failed with hr = %08x\n", device, hr);
ERR("Failed to set stream source for device %p, hr %#lx.\n", device, hr);
wined3d_mutex_unlock();
return hr;
}
......@@ -4529,7 +4529,7 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
DWORD stride;
TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n",
TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %lu, flags %#lx.\n",
iface, primitive_type, vertex_buffer, indices, index_count, flags);
setup_lighting(device, vb->fvf, flags);
......@@ -4667,7 +4667,7 @@ static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *ifac
DWORD user_clip_planes;
UINT j;
TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n",
TRACE("iface %p, centers %p, radii %p, sphere_count %lu, flags %#lx, return_values %p.\n",
iface, centers, radii, sphere_count, flags, return_values);
prepare_clip_space_planes(impl_from_IDirect3DDevice7(iface), plane);
......@@ -4688,7 +4688,7 @@ static HRESULT WINAPI d3d_device3_ComputeSphereVisibility(IDirect3DDevice3 *ifac
struct wined3d_vec4 plane[6];
unsigned int i, j;
TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n",
TRACE("iface %p, centers %p, radii %p, sphere_count %lu, flags %#lx, return_values %p.\n",
iface, centers, radii, sphere_count, flags, return_values);
prepare_clip_space_planes(impl_from_IDirect3DDevice3(iface), plane);
......@@ -4749,14 +4749,14 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface,
struct wined3d_texture *wined3d_texture;
struct ddraw_texture *ddraw_texture;
TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture);
TRACE("iface %p, stage %lu, texture %p.\n", iface, stage, texture);
if (!texture)
return DDERR_INVALIDPARAMS;
if (stage >= DDRAW_MAX_TEXTURES)
{
WARN("Invalid stage %u.\n", stage);
WARN("Invalid stage %lu.\n", stage);
*texture = NULL;
return D3D_OK;
}
......@@ -4803,7 +4803,7 @@ static HRESULT WINAPI d3d_device3_GetTexture(IDirect3DDevice3 *iface, DWORD stag
HRESULT ret;
IDirectDrawSurface7 *ret_val;
TRACE("iface %p, stage %u, texture %p.\n", iface, stage, Texture2);
TRACE("iface %p, stage %lu, texture %p.\n", iface, stage, Texture2);
ret = IDirect3DDevice7_GetTexture(&device->IDirect3DDevice7_iface, stage, &ret_val);
......@@ -4837,7 +4837,7 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture);
struct wined3d_texture *wined3d_texture = NULL;
TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture);
TRACE("iface %p, stage %lu, texture %p.\n", iface, stage, texture);
if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
wined3d_texture = surf->draw_texture ? surf->draw_texture : surf->wined3d_texture;
......@@ -4875,7 +4875,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture);
struct wined3d_texture *wined3d_texture = NULL;
TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture);
TRACE("iface %p, stage %lu, texture %p.\n", iface, stage, texture);
wined3d_mutex_lock();
......@@ -4952,7 +4952,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface,
const struct wined3d_stateblock_state *device_state;
const struct tss_lookup *l;
TRACE("iface %p, stage %u, state %#x, value %p.\n",
TRACE("iface %p, stage %lu, state %#x, value %p.\n",
iface, stage, state, value);
if (!value)
......@@ -4966,7 +4966,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface,
if (stage >= DDRAW_MAX_TEXTURES)
{
WARN("Invalid stage %u.\n", stage);
WARN("Invalid stage %lu.\n", stage);
*value = 0;
return D3D_OK;
}
......@@ -4998,7 +4998,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface,
*value = D3DTFP_LINEAR;
break;
default:
ERR("Unexpected mipfilter value %#x.\n", *value);
ERR("Unexpected mipfilter value %#lx.\n", *value);
*value = D3DTFP_NONE;
break;
}
......@@ -5026,7 +5026,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface,
*value = D3DTFG_GAUSSIANCUBIC;
break;
default:
ERR("Unexpected wined3d mag filter value %#x.\n", *value);
ERR("Unexpected wined3d mag filter value %#lx.\n", *value);
*value = D3DTFG_POINT;
break;
}
......@@ -5071,7 +5071,7 @@ static HRESULT WINAPI d3d_device3_GetTextureStageState(IDirect3DDevice3 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, stage %u, state %#x, value %p.\n",
TRACE("iface %p, stage %lu, state %#x, value %p.\n",
iface, stage, state, value);
return IDirect3DDevice7_GetTextureStageState(&device->IDirect3DDevice7_iface, stage, state, value);
......@@ -5100,7 +5100,7 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface,
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
const struct tss_lookup *l;
TRACE("iface %p, stage %u, state %#x, value %#x.\n",
TRACE("iface %p, stage %lu, state %#x, value %#lx.\n",
iface, stage, state, value);
if (state > D3DTSS_TEXTURETRANSFORMFLAGS)
......@@ -5133,7 +5133,7 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface,
value = WINED3D_TEXF_LINEAR;
break;
default:
ERR("Unexpected mipfilter value %#x.\n", value);
ERR("Unexpected mipfilter value %#lx.\n", value);
value = WINED3D_TEXF_NONE;
break;
}
......@@ -5161,7 +5161,7 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface,
value = WINED3D_TEXF_ANISOTROPIC;
break;
default:
ERR("Unexpected d3d7 mag filter value %#x.\n", value);
ERR("Unexpected d3d7 mag filter value %#lx.\n", value);
value = WINED3D_TEXF_POINT;
break;
}
......@@ -5212,7 +5212,7 @@ static HRESULT WINAPI d3d_device3_SetTextureStageState(IDirect3DDevice3 *iface,
DWORD old_value;
HRESULT hr;
TRACE("iface %p, stage %u, state %#x, value %#x.\n",
TRACE("iface %p, stage %lu, state %#x, value %#lx.\n",
iface, stage, state, value);
/* Tests show that legacy texture blending is not reset if the texture stage state
......@@ -5323,12 +5323,12 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count,
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n",
TRACE("iface %p, count %lu, rects %p, flags %#lx, color 0x%08lx, z %.8e, stencil %#lx.\n",
iface, count, rects, flags, color, z, stencil);
if (count && !rects)
{
WARN("count %u with NULL rects.\n", count);
WARN("count %lu with NULL rects.\n", count);
count = 0;
}
......@@ -5576,7 +5576,7 @@ static HRESULT d3d_device7_SetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
TRACE("iface %p, light_idx %u, light %p.\n", iface, light_idx, light);
TRACE("iface %p, light_idx %lu, light %p.\n", iface, light_idx, light);
wined3d_mutex_lock();
/* Note: D3DLIGHT7 is compatible with struct wined3d_light. */
......@@ -5622,7 +5622,7 @@ static HRESULT d3d_device7_GetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3
BOOL enabled;
HRESULT hr;
TRACE("iface %p, light_idx %u, light %p.\n", iface, light_idx, light);
TRACE("iface %p, light_idx %lu, light %p.\n", iface, light_idx, light);
wined3d_mutex_lock();
/* Note: D3DLIGHT7 is compatible with struct wined3d_light. */
......@@ -5839,7 +5839,7 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_stateblock *wined3d_sb;
TRACE("iface %p, stateblock %#x.\n", iface, stateblock);
TRACE("iface %p, stateblock %#lx.\n", iface, stateblock);
wined3d_mutex_lock();
if (device->recording)
......@@ -5899,7 +5899,7 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_stateblock *wined3d_sb;
TRACE("iface %p, stateblock %#x.\n", iface, stateblock);
TRACE("iface %p, stateblock %#lx.\n", iface, stateblock);
wined3d_mutex_lock();
if (device->recording)
......@@ -5960,7 +5960,7 @@ static HRESULT d3d_device7_DeleteStateBlock(IDirect3DDevice7 *iface, DWORD state
struct wined3d_stateblock *wined3d_sb;
ULONG ref;
TRACE("iface %p, stateblock %#x.\n", iface, stateblock);
TRACE("iface %p, stateblock %#lx.\n", iface, stateblock);
wined3d_mutex_lock();
......@@ -5974,7 +5974,7 @@ static HRESULT d3d_device7_DeleteStateBlock(IDirect3DDevice7 *iface, DWORD state
if ((ref = wined3d_stateblock_decref(wined3d_sb)))
{
ERR("Something is still holding stateblock %p (refcount %u).\n", wined3d_sb, ref);
ERR("Something is still holding stateblock %p (refcount %lu).\n", wined3d_sb, ref);
}
wined3d_mutex_unlock();
......@@ -6048,7 +6048,7 @@ static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface,
if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device,
device->state, wined3d_stateblock_type_from_ddraw(type), &wined3d_sb)))
{
WARN("Failed to create stateblock, hr %#x.\n", hr);
WARN("Failed to create stateblock, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
......@@ -6192,7 +6192,7 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d
ddraw_surface_get_any_texture(dst_level, DDRAW_SURFACE_RW), dst_level->sub_resource_idx, &dst_rect,
ddraw_surface_get_any_texture(src_level, DDRAW_SURFACE_READ),
src_level->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT)))
ERR("Blit failed, hr %#x.\n", hr);
ERR("Blit failed, hr %#lx.\n", hr);
ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
ddsd.ddsCaps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL;
......@@ -6260,7 +6260,7 @@ static HRESULT d3d_device7_Load(IDirect3DDevice7 *iface, IDirectDrawSurface7 *ds
POINT destpoint;
RECT srcrect;
TRACE("iface %p, dst_texture %p, dst_pos %s, src_texture %p, src_rect %s, flags %#x.\n",
TRACE("iface %p, dst_texture %p, dst_pos %s, src_texture %p, src_rect %s, flags %#lx.\n",
iface, dst_texture, wine_dbgstr_point(dst_pos), src_texture, wine_dbgstr_rect(src_rect), flags);
if( (!src) || (!dest) )
......@@ -6455,7 +6455,7 @@ static HRESULT d3d_device7_LightEnable(IDirect3DDevice7 *iface, DWORD light_idx,
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
TRACE("iface %p, light_idx %u, enabled %#x.\n", iface, light_idx, enabled);
TRACE("iface %p, light_idx %lu, enabled %#x.\n", iface, light_idx, enabled);
wined3d_mutex_lock();
hr = wined3d_stateblock_set_light_enable(device->update_state, light_idx, enabled);
......@@ -6503,7 +6503,7 @@ static HRESULT d3d_device7_GetLightEnable(IDirect3DDevice7 *iface, DWORD light_i
struct wined3d_light light;
HRESULT hr;
TRACE("iface %p, light_idx %u, enabled %p.\n", iface, light_idx, enabled);
TRACE("iface %p, light_idx %lu, enabled %p.\n", iface, light_idx, enabled);
if (!enabled)
return DDERR_INVALIDPARAMS;
......@@ -6554,7 +6554,7 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV
const struct wined3d_vec4 *wined3d_plane;
HRESULT hr;
TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane);
TRACE("iface %p, idx %lu, plane %p.\n", iface, idx, plane);
if (!plane)
return DDERR_INVALIDPARAMS;
......@@ -6568,7 +6568,7 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV
device->user_clip_planes[idx] = *wined3d_plane;
if (hr == WINED3DERR_INVALIDCALL)
{
WARN("Clip plane %u is not supported.\n", idx);
WARN("Clip plane %lu is not supported.\n", idx);
hr = D3D_OK;
}
}
......@@ -6612,7 +6612,7 @@ static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV
{
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane);
TRACE("iface %p, idx %lu, plane %p.\n", iface, idx, plane);
if (!plane)
return DDERR_INVALIDPARAMS;
......@@ -6622,7 +6622,7 @@ static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV
memcpy(plane, &device->stateblock_state->clip_planes[idx], sizeof(struct wined3d_vec4));
else
{
WARN("Clip plane %u is not supported.\n", idx);
WARN("Clip plane %lu is not supported.\n", idx);
if (idx < ARRAY_SIZE(device->user_clip_planes))
memcpy(plane, &device->user_clip_planes[idx], sizeof(struct wined3d_vec4));
}
......@@ -6666,7 +6666,7 @@ static HRESULT WINAPI d3d_device7_GetClipPlane_FPUPreserve(IDirect3DDevice7 *ifa
*****************************************************************************/
static HRESULT WINAPI d3d_device7_GetInfo(IDirect3DDevice7 *iface, DWORD info_id, void *info, DWORD info_size)
{
TRACE("iface %p, info_id %#x, info %p, info_size %u.\n",
TRACE("iface %p, info_id %#lx, info %p, info_size %lu.\n",
iface, info_id, info, info_size);
if (TRACE_ON(ddraw))
......@@ -7056,7 +7056,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, c
rtv = ddraw_surface_get_rendertarget_view(target);
if (FAILED(hr = wined3d_device_context_set_rendertarget_views(device->immediate_context, 0, 1, &rtv, TRUE)))
{
ERR("Failed to set render target, hr %#x.\n", hr);
ERR("Failed to set render target, hr %#lx.\n", hr);
wined3d_stateblock_decref(device->state);
ddraw_handle_table_destroy(&device->handle_table);
return hr;
......@@ -7128,7 +7128,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_su
if (FAILED(hr = d3d_device_init(object, ddraw, guid, target, rt_iface, version, outer_unknown)))
{
WARN("Failed to initialize device, hr %#x.\n", hr);
WARN("Failed to initialize device, hr %#lx.\n", hr);
heap_free(object);
return hr;
}
......
dlls/ddraw/executebuffer.c
View file @ 4ceb3a65
......@@ -31,17 +31,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
*****************************************************************************/
static void _dump_executedata(const D3DEXECUTEDATA *lpData) {
TRACE("dwSize : %d\n", lpData->dwSize);
TRACE("Vertex Offset : %d Count : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount);
TRACE("Instruction Offset : %d Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
TRACE("HVertex Offset : %d\n", lpData->dwHVertexOffset);
TRACE("dwSize : %ld\n", lpData->dwSize);
TRACE("Vertex Offset : %ld Count : %ld\n", lpData->dwVertexOffset, lpData->dwVertexCount);
TRACE("Instruction Offset : %ld Length : %ld\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
TRACE("HVertex Offset : %ld\n", lpData->dwHVertexOffset);
}
static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) {
TRACE("dwSize : %d\n", lpDesc->dwSize);
TRACE("dwFlags : %x\n", lpDesc->dwFlags);
TRACE("dwCaps : %x\n", lpDesc->dwCaps);
TRACE("dwBufferSize : %d\n", lpDesc->dwBufferSize);
TRACE("dwSize : %ld\n", lpDesc->dwSize);
TRACE("dwFlags : %lx\n", lpDesc->dwFlags);
TRACE("dwCaps : %lx\n", lpDesc->dwCaps);
TRACE("dwBufferSize : %ld\n", lpDesc->dwBufferSize);
TRACE("lpData : %p\n", lpDesc->lpData);
}
......@@ -215,7 +215,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
if (!a || !b || !c)
{
ERR("Invalid matrix handle (a %#x -> %p, b %#x -> %p, c %#x -> %p).\n",
ERR("Invalid matrix handle (a %#lx -> %p, b %#lx -> %p, c %#lx -> %p).\n",
ci->hDestMatrix, a, ci->hSrcMatrix1, b, ci->hSrcMatrix2, c);
}
else
......@@ -238,7 +238,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
m = ddraw_get_object(&device->handle_table, ci->u2.dwArg[0] - 1, DDRAW_HANDLE_MATRIX);
if (!m)
{
ERR("Invalid matrix handle %#x.\n", ci->u2.dwArg[0]);
ERR("Invalid matrix handle %#lx.\n", ci->u2.dwArg[0]);
}
else
{
......@@ -292,7 +292,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
D3DPROCESSVERTICES *ci = (D3DPROCESSVERTICES *)instr;
DWORD op = ci->dwFlags & D3DPROCESSVERTICES_OPMASK;
TRACE(" start %u, dest %u, count %u, flags %#x.\n",
TRACE(" start %u, dest %u, count %lu, flags %#lx.\n",
ci->wStart, ci->wDest, ci->dwCount, ci->dwFlags);
if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS)
......@@ -329,7 +329,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
break;
default:
FIXME("Unhandled vertex processing op %#x.\n", op);
FIXME("Unhandled vertex processing op %#lx.\n", op);
break;
}
......@@ -350,13 +350,13 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
if (!(dst = ddraw_get_object(&device->handle_table,
ci->hDestTexture - 1, DDRAW_HANDLE_SURFACE)))
{
WARN("Invalid destination texture handle %#x.\n", ci->hDestTexture);
WARN("Invalid destination texture handle %#lx.\n", ci->hDestTexture);
continue;
}
if (!(src = ddraw_get_object(&device->handle_table,
ci->hSrcTexture - 1, DDRAW_HANDLE_SURFACE)))
{
WARN("Invalid source texture handle %#x.\n", ci->hSrcTexture);
WARN("Invalid source texture handle %#lx.\n", ci->hSrcTexture);
continue;
}
......@@ -379,7 +379,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
{
if (!ci->bNegate)
{
TRACE(" Branch to %d\n", ci->dwOffset);
TRACE(" Branch to %ld\n", ci->dwOffset);
if (ci->dwOffset) {
instr = (char*)current + ci->dwOffset;
break;
......@@ -390,7 +390,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d
{
if (ci->bNegate)
{
TRACE(" Branch to %d\n", ci->dwOffset);
TRACE(" Branch to %ld\n", ci->dwOffset);
if (ci->dwOffset) {
instr = (char*)current + ci->dwOffset;
break;
......@@ -464,7 +464,7 @@ static ULONG WINAPI d3d_execute_buffer_AddRef(IDirect3DExecuteBuffer *iface)
struct d3d_execute_buffer *buffer = impl_from_IDirect3DExecuteBuffer(iface);
ULONG ref = InterlockedIncrement(&buffer->ref);
TRACE("%p increasing refcount to %u.\n", buffer, ref);
TRACE("%p increasing refcount to %lu.\n", buffer, ref);
return ref;
}
......@@ -483,7 +483,7 @@ static ULONG WINAPI d3d_execute_buffer_Release(IDirect3DExecuteBuffer *iface)
struct d3d_execute_buffer *buffer = impl_from_IDirect3DExecuteBuffer(iface);
ULONG ref = InterlockedDecrement(&buffer->ref);
TRACE("%p decreasing refcount to %u.\n", buffer, ref);
TRACE("%p decreasing refcount to %lu.\n", buffer, ref);
if (!ref)
{
......@@ -593,7 +593,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer *
if (data->dwSize != sizeof(*data))
{
WARN("data->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", data->dwSize);
WARN("data->dwSize is %lu, returning DDERR_INVALIDPARAMS.\n", data->dwSize);
return DDERR_INVALIDPARAMS;
}
......@@ -714,7 +714,7 @@ static HRESULT WINAPI d3d_execute_buffer_GetExecuteData(IDirect3DExecuteBuffer *
static HRESULT WINAPI d3d_execute_buffer_Validate(IDirect3DExecuteBuffer *iface,
DWORD *offset, LPD3DVALIDATECALLBACK callback, void *context, DWORD reserved)
{
TRACE("iface %p, offset %p, callback %p, context %p, reserved %#x.\n",
TRACE("iface %p, offset %p, callback %p, context %p, reserved %#lx.\n",
iface, offset, callback, context, reserved);
WARN("Not implemented.\n");
......@@ -737,7 +737,7 @@ static HRESULT WINAPI d3d_execute_buffer_Validate(IDirect3DExecuteBuffer *iface,
*****************************************************************************/
static HRESULT WINAPI d3d_execute_buffer_Optimize(IDirect3DExecuteBuffer *iface, DWORD reserved)
{
TRACE("iface %p, reserved %#x.\n", iface, reserved);
TRACE("iface %p, reserved %#lx.\n", iface, reserved);
WARN("Not implemented.\n");
......
dlls/ddraw/light.c
View file @ 4ceb3a65
......@@ -123,7 +123,7 @@ static ULONG WINAPI d3d_light_AddRef(IDirect3DLight *iface)
struct d3d_light *light = impl_from_IDirect3DLight(iface);
ULONG ref = InterlockedIncrement(&light->ref);
TRACE("%p increasing refcount to %u.\n", light, ref);
TRACE("%p increasing refcount to %lu.\n", light, ref);
return ref;
}
......@@ -133,7 +133,7 @@ static ULONG WINAPI d3d_light_Release(IDirect3DLight *iface)
struct d3d_light *light = impl_from_IDirect3DLight(iface);
ULONG ref = InterlockedDecrement(&light->ref);
TRACE("%p decreasing refcount to %u.\n", light, ref);
TRACE("%p decreasing refcount to %lu.\n", light, ref);
if (!ref)
{
......
dlls/ddraw/main.c
View file @ 4ceb3a65
......@@ -79,7 +79,7 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC
wined3d_mutex_lock();
if (FAILED(hr = wined3d_adapter_get_identifier(wined3d_adapter, 0x0, &adapter_id)))
{
WARN("Failed to get adapter identifier, hr %#x.\n", hr);
WARN("Failed to get adapter identifier, hr %#lx.\n", hr);
wined3d_mutex_unlock();
break;
}
......@@ -91,7 +91,7 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC
wined3d_mutex_lock();
if (FAILED(hr = wined3d_output_get_desc(wined3d_output, &output_desc)))
{
WARN("Failed to get output description, hr %#x.\n", hr);
WARN("Failed to get output description, hr %#lx.\n", hr);
wined3d_mutex_unlock();
break;
}
......@@ -144,7 +144,7 @@ DWORD ddraw_allocate_handle(struct ddraw_handle_table *t, void *object, enum ddr
entry = t->free_entries;
if (entry->type != DDRAW_HANDLE_FREE)
{
ERR("Handle %#x (%p) is in the free list, but has type %#x.\n", idx, entry->object, entry->type);
ERR("Handle %#lx (%p) is in the free list, but has type %#x.\n", idx, entry->object, entry->type);
return DDRAW_INVALID_HANDLE;
}
t->free_entries = entry->object;
......@@ -183,14 +183,14 @@ void *ddraw_free_handle(struct ddraw_handle_table *t, DWORD handle, enum ddraw_h
if (handle == DDRAW_INVALID_HANDLE || handle >= t->entry_count)
{
WARN("Invalid handle %#x passed.\n", handle);
WARN("Invalid handle %#lx passed.\n", handle);
return NULL;
}
entry = &t->entries[handle];
if (entry->type != type)
{
WARN("Handle %#x (%p) is not of type %#x.\n", handle, entry->object, type);
WARN("Handle %#lx (%p) is not of type %#x.\n", handle, entry->object, type);
return NULL;
}
......@@ -208,14 +208,14 @@ void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_ha
if (handle == DDRAW_INVALID_HANDLE || handle >= t->entry_count)
{
WARN("Invalid handle %#x passed.\n", handle);
WARN("Invalid handle %#lx passed.\n", handle);
return NULL;
}
entry = &t->entries[handle];
if (entry->type != type)
{
WARN("Handle %#x (%p) is not of type %#x.\n", handle, entry->object, type);
WARN("Handle %#lx (%p) is not of type %#x.\n", handle, entry->object, type);
return NULL;
}
......@@ -319,7 +319,7 @@ static HRESULT DDRAW_Create(const GUID *guid, void **out, IUnknown *outer_unknow
if (FAILED(hr = ddraw_init(ddraw, flags, device_type)))
{
WARN("Failed to initialize ddraw object, hr %#x.\n", hr);
WARN("Failed to initialize ddraw object, hr %#lx.\n", hr);
heap_free(ddraw);
return hr;
}
......@@ -442,7 +442,7 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex
{
struct wined3d *wined3d;
TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags);
TRACE("callback %p, context %p, flags %#lx.\n", callback, context, flags);
if (flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES |
DDENUM_DETACHEDSECONDARYDEVICES |
......@@ -450,7 +450,7 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex
return DDERR_INVALIDPARAMS;
if (flags & ~DDENUM_ATTACHEDSECONDARYDEVICES)
FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES);
FIXME("flags %#lx not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES);
TRACE("Enumerating ddraw interfaces\n");
if (!(wined3d = wined3d_create(DDRAW_WINED3D_FLAGS)))
......@@ -516,7 +516,7 @@ HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW callback, void *context)
***********************************************************************/
HRESULT WINAPI DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW callback, void *context, DWORD flags)
{
TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags);
TRACE("callback %p, context %p, flags %#lx.\n", callback, context, flags);
return DDERR_UNSUPPORTED;
}
......@@ -658,7 +658,7 @@ static ULONG WINAPI ddraw_class_factory_AddRef(IClassFactory *iface)
struct ddraw_class_factory *factory = impl_from_IClassFactory(iface);
ULONG ref = InterlockedIncrement(&factory->ref);
TRACE("%p increasing refcount to %u.\n", factory, ref);
TRACE("%p increasing refcount to %lu.\n", factory, ref);
return ref;
}
......@@ -678,7 +678,7 @@ static ULONG WINAPI ddraw_class_factory_Release(IClassFactory *iface)
struct ddraw_class_factory *factory = impl_from_IClassFactory(iface);
ULONG ref = InterlockedDecrement(&factory->ref);
TRACE("%p decreasing refcount to %u.\n", factory, ref);
TRACE("%p decreasing refcount to %lu.\n", factory, ref);
if (!ref)
heap_free(factory);
......@@ -811,7 +811,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
wc.lpszClassName = DDRAW_WINDOW_CLASS_NAME;
if (!RegisterClassA(&wc))
{
ERR("Failed to register ddraw window class, last error %#x.\n", GetLastError());
ERR("Failed to register ddraw window class, last error %#lx.\n", GetLastError());
return FALSE;
}
......@@ -842,7 +842,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
size = sizeof(data);
if (!RegQueryValueExA(hkey, "ForceRefreshRate", NULL, &type, (BYTE *)&data, &size) && type == REG_DWORD)
{
TRACE("ForceRefreshRate set; overriding refresh rate to %d Hz\n", data);
TRACE("ForceRefreshRate set; overriding refresh rate to %ld Hz\n", data);
force_refresh_rate = data;
}
RegCloseKey( hkey );
......@@ -871,7 +871,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{
struct ddraw_surface *surface;
WARN("DirectDraw object %p has reference counts {%u, %u, %u, %u, %u}.\n",
WARN("DirectDraw object %p has reference counts {%lu, %lu, %lu, %lu, %lu}.\n",
ddraw, ddraw->ref7, ddraw->ref4, ddraw->ref3, ddraw->ref2, ddraw->ref1);
if (ddraw->d3ddevice)
......@@ -879,7 +879,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
LIST_FOR_EACH_ENTRY(surface, &ddraw->surface_list, struct ddraw_surface, surface_list_entry)
{
WARN("Surface %p has reference counts {%u, %u, %u, %u, %u, %u}.\n",
WARN("Surface %p has reference counts {%lu, %lu, %lu, %lu, %lu, %lu}.\n",
surface, surface->ref7, surface->ref4, surface->ref3,
surface->ref2, surface->ref1, surface->gamma_count);
}
......
dlls/ddraw/material.c
View file @ 4ceb3a65
......@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
static void dump_material(const D3DMATERIAL *mat)
{
TRACE(" dwSize : %d\n", mat->dwSize);
TRACE(" dwSize : %ld\n", mat->dwSize);
}
static inline struct d3d_material *impl_from_IDirect3DMaterial(IDirect3DMaterial *iface)
......@@ -116,7 +116,7 @@ static ULONG WINAPI d3d_material3_AddRef(IDirect3DMaterial3 *iface)
struct d3d_material *material = impl_from_IDirect3DMaterial3(iface);
ULONG ref = InterlockedIncrement(&material->ref);
TRACE("%p increasing refcount to %u.\n", material, ref);
TRACE("%p increasing refcount to %lu.\n", material, ref);
return ref;
}
......@@ -136,7 +136,7 @@ static ULONG WINAPI d3d_material3_Release(IDirect3DMaterial3 *iface)
struct d3d_material *material = impl_from_IDirect3DMaterial3(iface);
ULONG ref = InterlockedDecrement(&material->ref);
TRACE("%p decreasing refcount to %u.\n", material, ref);
TRACE("%p decreasing refcount to %lu.\n", material, ref);
if (!ref)
{
......@@ -311,7 +311,7 @@ static HRESULT WINAPI d3d_material3_GetHandle(IDirect3DMaterial3 *iface,
material->Handle = h + 1;
}
*handle = material->Handle;
TRACE(" returning handle %08x.\n", *handle);
TRACE(" returning handle %#lx.\n", *handle);
wined3d_mutex_unlock();
return D3D_OK;
......
dlls/ddraw/palette.c
View file @ 4ceb3a65
......@@ -66,7 +66,7 @@ static ULONG WINAPI ddraw_palette_AddRef(IDirectDrawPalette *iface)
struct ddraw_palette *This = impl_from_IDirectDrawPalette(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("%p increasing refcount to %u.\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", This, ref);
return ref;
}
......@@ -85,7 +85,7 @@ static ULONG WINAPI ddraw_palette_Release(IDirectDrawPalette *iface)
struct ddraw_palette *palette = impl_from_IDirectDrawPalette(iface);
ULONG ref = InterlockedDecrement(&palette->ref);
TRACE("%p decreasing refcount to %u.\n", palette, ref);
TRACE("%p decreasing refcount to %lu.\n", palette, ref);
if (ref == 0)
{
......@@ -121,7 +121,7 @@ static ULONG WINAPI ddraw_palette_Release(IDirectDrawPalette *iface)
static HRESULT WINAPI ddraw_palette_Initialize(IDirectDrawPalette *iface,
IDirectDraw *ddraw, DWORD flags, PALETTEENTRY *entries)
{
TRACE("iface %p, ddraw %p, flags %#x, entries %p.\n",
TRACE("iface %p, ddraw %p, flags %#lx, entries %p.\n",
iface, ddraw, flags, entries);
return DDERR_ALREADYINITIALIZED;
......@@ -163,7 +163,7 @@ static HRESULT WINAPI ddraw_palette_SetEntries(IDirectDrawPalette *iface,
struct ddraw_palette *palette = impl_from_IDirectDrawPalette(iface);
HRESULT hr;
TRACE("iface %p, flags %#x, start %u, count %u, entries %p.\n",
TRACE("iface %p, flags %#lx, start %lu, count %lu, entries %p.\n",
iface, flags, start, count, entries);
if (!entries)
......@@ -202,7 +202,7 @@ static HRESULT WINAPI ddraw_palette_GetEntries(IDirectDrawPalette *iface,
struct ddraw_palette *palette = impl_from_IDirectDrawPalette(iface);
HRESULT hr;
TRACE("iface %p, flags %#x, start %u, count %u, entries %p.\n",
TRACE("iface %p, flags %#lx, start %lu, count %lu, entries %p.\n",
iface, flags, start, count, entries);
if (!entries)
......@@ -262,7 +262,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette,
if ((entry_count = palette_size(flags)) == ~0u)
{
WARN("Invalid flags %#x.\n", flags);
WARN("Invalid flags %#lx.\n", flags);
return DDERR_INVALIDPARAMS;
}
......@@ -280,7 +280,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette,
if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device,
wined3d_flags, entry_count, entries, &palette->wined3d_palette)))
{
WARN("Failed to create wined3d palette, hr %#x.\n", hr);
WARN("Failed to create wined3d palette, hr %#lx.\n", hr);
return hr;
}
......
dlls/ddraw/surface.c
View file @ 4ceb3a65
......@@ -130,7 +130,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface,
if (FAILED(hr = wined3d_texture_get_dc(wined3d_texture, surface->sub_resource_idx, &surface_dc)))
{
ERR("Failed to get surface DC, hr %#x.\n", hr);
ERR("Failed to get surface DC, hr %#lx.\n", hr);
return hr;
}
if (surface->palette)
......@@ -268,7 +268,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
{
This->device1 = NULL;
wined3d_mutex_unlock();
WARN("Failed to create device, hr %#x.\n", hr);
WARN("Failed to create device, hr %#lx.\n", hr);
return hr;
}
}
......@@ -369,7 +369,7 @@ static HRESULT WINAPI d3d_texture1_QueryInterface(IDirect3DTexture *iface, REFII
static void ddraw_surface_add_iface(struct ddraw_surface *surface)
{
ULONG iface_count = InterlockedIncrement(&surface->iface_count);
TRACE("%p increasing iface count to %u.\n", surface, iface_count);
TRACE("%p increasing iface count to %lu.\n", surface, iface_count);
if (iface_count == 1)
{
......@@ -397,7 +397,7 @@ static ULONG WINAPI ddraw_surface7_AddRef(IDirectDrawSurface7 *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface);
ULONG refcount = InterlockedIncrement(&This->ref7);
TRACE("iface %p increasing refcount to %u.\n", iface, refcount);
TRACE("iface %p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1)
{
......@@ -412,7 +412,7 @@ static ULONG WINAPI ddraw_surface4_AddRef(IDirectDrawSurface4 *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface4(iface);
ULONG refcount = InterlockedIncrement(&This->ref4);
TRACE("iface %p increasing refcount to %u.\n", iface, refcount);
TRACE("iface %p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1)
{
......@@ -427,7 +427,7 @@ static ULONG WINAPI ddraw_surface3_AddRef(IDirectDrawSurface3 *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface3(iface);
ULONG refcount = InterlockedIncrement(&This->ref3);
TRACE("iface %p increasing refcount to %u.\n", iface, refcount);
TRACE("iface %p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1)
{
......@@ -442,7 +442,7 @@ static ULONG WINAPI ddraw_surface2_AddRef(IDirectDrawSurface2 *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface2(iface);
ULONG refcount = InterlockedIncrement(&This->ref2);
TRACE("iface %p increasing refcount to %u.\n", iface, refcount);
TRACE("iface %p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1)
{
......@@ -457,7 +457,7 @@ static ULONG WINAPI ddraw_surface1_AddRef(IDirectDrawSurface *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface(iface);
ULONG refcount = InterlockedIncrement(&This->ref1);
TRACE("iface %p increasing refcount to %u.\n", iface, refcount);
TRACE("iface %p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1)
{
......@@ -472,7 +472,7 @@ static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface)
struct ddraw_surface *This = impl_from_IDirectDrawGammaControl(iface);
ULONG refcount = InterlockedIncrement(&This->gamma_count);
TRACE("iface %p increasing refcount to %u.\n", iface, refcount);
TRACE("iface %p increasing refcount to %lu.\n", iface, refcount);
if (refcount == 1)
{
......@@ -584,7 +584,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface)
/* This can happen when a complex surface is destroyed, because the
* 2nd surface was addref()ed when the app called
* GetAttachedSurface(). */
WARN("Destroying surface %p with refcounts 7: %u 4: %u 3: %u 2: %u 1: %u.\n",
WARN("Destroying surface %p with refcounts 7: %lu 4: %lu 3: %lu 2: %lu 1: %lu.\n",
surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1);
}
......@@ -603,7 +603,7 @@ static ULONG ddraw_surface_release_iface(struct ddraw_surface *This)
IUnknown_AddRef(This->attached_iface);
iface_count = InterlockedDecrement(&This->iface_count);
TRACE("%p decreasing iface count to %u.\n", This, iface_count);
TRACE("%p decreasing iface count to %lu.\n", This, iface_count);
if (iface_count == 0)
{
......@@ -666,7 +666,7 @@ static ULONG WINAPI ddraw_surface7_Release(IDirectDrawSurface7 *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface);
ULONG refcount = InterlockedDecrement(&This->ref7);
TRACE("iface %p decreasing refcount to %u.\n", iface, refcount);
TRACE("iface %p decreasing refcount to %lu.\n", iface, refcount);
if (refcount == 0)
{
......@@ -681,7 +681,7 @@ static ULONG WINAPI ddraw_surface4_Release(IDirectDrawSurface4 *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface4(iface);
ULONG refcount = InterlockedDecrement(&This->ref4);
TRACE("iface %p decreasing refcount to %u.\n", iface, refcount);
TRACE("iface %p decreasing refcount to %lu.\n", iface, refcount);
if (refcount == 0)
{
......@@ -696,7 +696,7 @@ static ULONG WINAPI ddraw_surface3_Release(IDirectDrawSurface3 *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface3(iface);
ULONG refcount = InterlockedDecrement(&This->ref3);
TRACE("iface %p decreasing refcount to %u.\n", iface, refcount);
TRACE("iface %p decreasing refcount to %lu.\n", iface, refcount);
if (refcount == 0)
{
......@@ -711,7 +711,7 @@ static ULONG WINAPI ddraw_surface2_Release(IDirectDrawSurface2 *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface2(iface);
ULONG refcount = InterlockedDecrement(&This->ref2);
TRACE("iface %p decreasing refcount to %u.\n", iface, refcount);
TRACE("iface %p decreasing refcount to %lu.\n", iface, refcount);
if (refcount == 0)
{
......@@ -726,7 +726,7 @@ static ULONG WINAPI ddraw_surface1_Release(IDirectDrawSurface *iface)
struct ddraw_surface *This = impl_from_IDirectDrawSurface(iface);
ULONG refcount = InterlockedDecrement(&This->ref1);
TRACE("iface %p decreasing refcount to %u.\n", iface, refcount);
TRACE("iface %p decreasing refcount to %lu.\n", iface, refcount);
if (refcount == 0)
{
......@@ -741,7 +741,7 @@ static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface)
struct ddraw_surface *This = impl_from_IDirectDrawGammaControl(iface);
ULONG refcount = InterlockedDecrement(&This->gamma_count);
TRACE("iface %p decreasing refcount to %u.\n", iface, refcount);
TRACE("iface %p decreasing refcount to %lu.\n", iface, refcount);
if (refcount == 0)
{
......@@ -829,7 +829,7 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa
our_caps = *caps;
}
TRACE("head_surface %p, looking for caps %#x, %#x, %#x, %#x.\n", head_surface, our_caps.dwCaps,
TRACE("head_surface %p, looking for caps %#lx, %#lx, %#lx, %#lx.\n", head_surface, our_caps.dwCaps,
our_caps.dwCaps2, our_caps.dwCaps3, our_caps.u1.dwCaps4); /* FIXME: Better debugging */
for(i = 0; i < MAX_COMPLEX_ATTACHED; i++)
......@@ -837,7 +837,7 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa
surf = head_surface->complex_array[i];
if(!surf) break;
TRACE("Surface %p, caps %#x, %#x, %#x, %#x.\n", surf,
TRACE("Surface %p, caps %#lx, %#lx, %#lx, %#lx.\n", surf,
surf->surface_desc.ddsCaps.dwCaps,
surf->surface_desc.ddsCaps.dwCaps2,
surf->surface_desc.ddsCaps.dwCaps3,
......@@ -866,7 +866,7 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa
while( (surf = surf->next_attached) )
{
TRACE("Surface %p, caps %#x, %#x, %#x, %#x.\n", surf,
TRACE("Surface %p, caps %#lx, %#lx, %#lx, %#lx.\n", surf,
surf->surface_desc.ddsCaps.dwCaps,
surf->surface_desc.ddsCaps.dwCaps2,
surf->surface_desc.ddsCaps.dwCaps3,
......@@ -1034,7 +1034,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface,
struct wined3d_box box;
HRESULT hr = DD_OK;
TRACE("surface %p, rect %s, surface_desc %p, surface_desc_size %u, flags %#x, h %p.\n",
TRACE("surface %p, rect %s, surface_desc %p, surface_desc_size %u, flags %#lx, h %p.\n",
surface, wine_dbgstr_rect(rect), surface_desc, surface_desc_size, flags, h);
/* surface->surface_desc.dwWidth and dwHeight are changeable, thus lock */
......@@ -1133,7 +1133,7 @@ static BOOL surface_validate_lock_desc(struct ddraw_surface *surface,
return TRUE;
}
WARN("Invalid structure size %u.\n", desc->dwSize);
WARN("Invalid structure size %lu.\n", desc->dwSize);
return FALSE;
}
......@@ -1143,7 +1143,7 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface,
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
unsigned int surface_desc_size;
TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n",
TRACE("iface %p, rect %s, surface_desc %p, flags %#lx, h %p.\n",
iface, wine_dbgstr_rect(rect), surface_desc, flags, h);
if (!surface_validate_lock_desc(surface, (DDSURFACEDESC *)surface_desc, &surface_desc_size))
......@@ -1164,7 +1164,7 @@ static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
unsigned int surface_desc_size;
TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n",
TRACE("iface %p, rect %s, surface_desc %p, flags %#lx, h %p.\n",
iface, wine_dbgstr_rect(rect), surface_desc, flags, h);
if (!surface_validate_lock_desc(surface, (DDSURFACEDESC *)surface_desc, &surface_desc_size))
......@@ -1208,7 +1208,7 @@ static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n",
TRACE("iface %p, rect %s, surface_desc %p, flags %#lx, h %p.\n",
iface, wine_dbgstr_rect(rect), surface_desc, flags, h);
return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h);
......@@ -1219,7 +1219,7 @@ static HRESULT WINAPI ddraw_surface2_Lock(IDirectDrawSurface2 *iface, RECT *rect
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n",
TRACE("iface %p, rect %s, surface_desc %p, flags %#lx, h %p.\n",
iface, wine_dbgstr_rect(rect), surface_desc, flags, h);
return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h);
......@@ -1230,7 +1230,7 @@ static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect,
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n",
TRACE("iface %p, rect %s, surface_desc %p, flags %#lx, h %p.\n",
iface, wine_dbgstr_rect(rect), surface_desc, flags, h);
return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h);
......@@ -1324,7 +1324,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *
void *texture_memory;
HRESULT hr;
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
TRACE("iface %p, src %p, flags %#lx.\n", iface, src, flags);
if (src == iface || !(dst_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY)))
return DDERR_NOTFLIPPABLE;
......@@ -1450,9 +1450,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *
{
static UINT once;
if (!once++)
FIXME("Ignoring flags %#x.\n", flags);
FIXME("Ignoring flags %#lx.\n", flags);
else
WARN("Ignoring flags %#x.\n", flags);
WARN("Ignoring flags %#lx.\n", flags);
}
if (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
......@@ -1471,7 +1471,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src);
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
TRACE("iface %p, src %p, flags %#lx.\n", iface, src, flags);
return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface,
src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags);
......@@ -1483,7 +1483,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface4(src);
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
TRACE("iface %p, src %p, flags %#lx.\n", iface, src, flags);
return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface,
src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags);
......@@ -1495,7 +1495,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface3(src);
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
TRACE("iface %p, src %p, flags %#lx.\n", iface, src, flags);
return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface,
src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags);
......@@ -1507,7 +1507,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface2(src);
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
TRACE("iface %p, src %p, flags %#lx.\n", iface, src, flags);
return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface,
src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags);
......@@ -1559,7 +1559,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT *
wined3d_flags = flags & ~DDBLT_ASYNC;
if (wined3d_flags & ~WINED3D_BLT_MASK)
{
FIXME("Unhandled flags %#x.\n", flags);
FIXME("Unhandled flags %#lx.\n", flags);
return E_NOTIMPL;
}
......@@ -1579,7 +1579,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons
RECT src_rect, dst_rect;
float scale_x, scale_y;
const RECT *clip_rect;
UINT clip_list_size;
DWORD clip_list_size;
RGNDATA *clip_list;
HRESULT hr = DD_OK;
UINT i;
......@@ -1633,7 +1633,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons
if (FAILED(hr = IDirectDrawClipper_GetClipList(&dst_surface->clipper->IDirectDrawClipper_iface,
&dst_rect, NULL, &clip_list_size)))
{
WARN("Failed to get clip list size, hr %#x.\n", hr);
WARN("Failed to get clip list size, hr %#lx.\n", hr);
return hr;
}
......@@ -1646,7 +1646,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons
if (FAILED(hr = IDirectDrawClipper_GetClipList(&dst_surface->clipper->IDirectDrawClipper_iface,
&dst_rect, clip_list, &clip_list_size)))
{
WARN("Failed to get clip list, hr %#x.\n", hr);
WARN("Failed to get clip list, hr %#lx.\n", hr);
heap_free(clip_list);
return hr;
}
......@@ -1698,7 +1698,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *i
HRESULT hr = DD_OK;
DDBLTFX rop_fx;
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx);
unsupported_flags = DDBLT_ALPHADEST
......@@ -1717,7 +1717,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *i
| DDBLT_ZBUFFERSRCOVERRIDE;
if (flags & unsupported_flags)
{
WARN("Ignoring unsupported flags %#x.\n", flags & unsupported_flags);
WARN("Ignoring unsupported flags %#lx.\n", flags & unsupported_flags);
flags &= ~unsupported_flags;
}
......@@ -1737,7 +1737,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *i
{
FIXME("DDBLT_DDROPS not implemented.\n");
if (fx)
FIXME(" rop %#x, pattern %p.\n", fx->dwDDROP, fx->u5.lpDDSPattern);
FIXME(" rop %#lx, pattern %p.\n", fx->dwDDROP, fx->u5.lpDDSPattern);
return DDERR_NORASTEROPHW;
}
......@@ -1824,7 +1824,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *i
default:
wined3d_mutex_unlock();
WARN("Unsupported ROP %#x used, returning DDERR_NORASTEROPHW.\n", fx->dwROP);
WARN("Unsupported ROP %#lx used, returning DDERR_NORASTEROPHW.\n", fx->dwROP);
return DDERR_NORASTEROPHW;
}
}
......@@ -1876,7 +1876,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *
struct ddraw_surface *dst = impl_from_IDirectDrawSurface7(iface);
struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface7(src_surface);
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx);
return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect,
......@@ -1889,7 +1889,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 *
struct ddraw_surface *dst = impl_from_IDirectDrawSurface4(iface);
struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface4(src_surface);
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx);
return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect,
......@@ -1902,7 +1902,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Blt(IDirectDrawSurface3 *
struct ddraw_surface *dst = impl_from_IDirectDrawSurface3(iface);
struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface3(src_surface);
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx);
return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect,
......@@ -1915,7 +1915,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Blt(IDirectDrawSurface2 *
struct ddraw_surface *dst = impl_from_IDirectDrawSurface2(iface);
struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface2(src_surface);
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx);
return ddraw_surface1_Blt(&dst->IDirectDrawSurface_iface, dst_rect,
......@@ -2014,7 +2014,7 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa
if(!(attachment_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER))
{
WARN("Application tries to attach a non Z buffer surface. caps %08x\n",
WARN("Application tries to attach a non Z buffer surface. caps %#lx.\n",
attachment_impl->surface_desc.ddsCaps.dwCaps);
return DDERR_CANNOTATTACHSURFACE;
}
......@@ -2207,7 +2207,7 @@ static HRESULT WINAPI ddraw_surface7_DeleteAttachedSurface(IDirectDrawSurface7 *
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface7(attachment);
TRACE("iface %p, flags %#x, attachment %p.\n", iface, flags, attachment);
TRACE("iface %p, flags %#lx, attachment %p.\n", iface, flags, attachment);
return ddraw_surface_delete_attached_surface(surface, attachment_impl, (IUnknown *)attachment);
}
......@@ -2218,7 +2218,7 @@ static HRESULT WINAPI ddraw_surface4_DeleteAttachedSurface(IDirectDrawSurface4 *
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface4(attachment);
TRACE("iface %p, flags %#x, attachment %p.\n", iface, flags, attachment);
TRACE("iface %p, flags %#lx, attachment %p.\n", iface, flags, attachment);
return ddraw_surface_delete_attached_surface(surface, attachment_impl, (IUnknown *)attachment);
}
......@@ -2229,7 +2229,7 @@ static HRESULT WINAPI ddraw_surface3_DeleteAttachedSurface(IDirectDrawSurface3 *
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment);
TRACE("iface %p, flags %#x, attachment %p.\n", iface, flags, attachment);
TRACE("iface %p, flags %#lx, attachment %p.\n", iface, flags, attachment);
return ddraw_surface_delete_attached_surface(surface, attachment_impl, (IUnknown *)attachment);
}
......@@ -2240,7 +2240,7 @@ static HRESULT WINAPI ddraw_surface2_DeleteAttachedSurface(IDirectDrawSurface2 *
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface2(attachment);
TRACE("iface %p, flags %#x, attachment %p.\n", iface, flags, attachment);
TRACE("iface %p, flags %#lx, attachment %p.\n", iface, flags, attachment);
return ddraw_surface_delete_attached_surface(surface, attachment_impl, (IUnknown *)attachment);
}
......@@ -2251,7 +2251,7 @@ static HRESULT WINAPI ddraw_surface1_DeleteAttachedSurface(IDirectDrawSurface *i
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface(attachment);
TRACE("iface %p, flags %#x, attachment %p.\n", iface, flags, attachment);
TRACE("iface %p, flags %#lx, attachment %p.\n", iface, flags, attachment);
return ddraw_surface_delete_attached_surface(surface, attachment_impl, (IUnknown *)attachment);
}
......@@ -2573,7 +2573,7 @@ static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWO
HRESULT hr;
struct wined3d_resource *resource;
TRACE("iface %p, priority %u.\n", iface, priority);
TRACE("iface %p, priority %lu.\n", iface, priority);
wined3d_mutex_lock();
/* No need to check for offscreen plain surfaces or mipmap sublevels. SetPriority
......@@ -2650,7 +2650,7 @@ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface,
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
HRESULT hr;
TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n",
TRACE("iface %p, tag %s, data %p, data_size %lu, flags %#lx.\n",
iface, debugstr_guid(tag), data, size, flags);
if (!data)
......@@ -2670,7 +2670,7 @@ static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface,
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n",
TRACE("iface %p, tag %s, data %p, data_size %lu, flags %#lx.\n",
iface, debugstr_guid(tag), data, size, flags);
return ddraw_surface7_SetPrivateData(&surface->IDirectDrawSurface7_iface, tag, data, size, flags);
......@@ -2799,7 +2799,7 @@ static HRESULT WINAPI ddraw_surface4_FreePrivateData(IDirectDrawSurface4 *iface,
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_PageLock(IDirectDrawSurface7 *iface, DWORD Flags)
{
TRACE("iface %p, flags %#x.\n", iface, Flags);
TRACE("iface %p, flags %#lx.\n", iface, Flags);
/* This is Windows memory management related - we don't need this */
return DD_OK;
......@@ -2809,7 +2809,7 @@ static HRESULT WINAPI ddraw_surface4_PageLock(IDirectDrawSurface4 *iface, DWORD
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_PageLock(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -2818,7 +2818,7 @@ static HRESULT WINAPI ddraw_surface3_PageLock(IDirectDrawSurface3 *iface, DWORD
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_PageLock(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -2827,7 +2827,7 @@ static HRESULT WINAPI ddraw_surface2_PageLock(IDirectDrawSurface2 *iface, DWORD
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_PageLock(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -2846,7 +2846,7 @@ static HRESULT WINAPI ddraw_surface2_PageLock(IDirectDrawSurface2 *iface, DWORD
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_PageUnlock(IDirectDrawSurface7 *iface, DWORD Flags)
{
TRACE("iface %p, flags %#x.\n", iface, Flags);
TRACE("iface %p, flags %#lx.\n", iface, Flags);
return DD_OK;
}
......@@ -2855,7 +2855,7 @@ static HRESULT WINAPI ddraw_surface4_PageUnlock(IDirectDrawSurface4 *iface, DWOR
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_PageUnlock(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -2864,7 +2864,7 @@ static HRESULT WINAPI ddraw_surface3_PageUnlock(IDirectDrawSurface3 *iface, DWOR
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_PageUnlock(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -2873,7 +2873,7 @@ static HRESULT WINAPI ddraw_surface2_PageUnlock(IDirectDrawSurface2 *iface, DWOR
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_PageUnlock(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -2892,7 +2892,7 @@ static HRESULT WINAPI ddraw_surface2_PageUnlock(IDirectDrawSurface2 *iface, DWOR
*****************************************************************************/
static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags)
{
TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, Batch, Count, Flags);
TRACE("iface %p, batch %p, count %lu, flags %#lx.\n", iface, Batch, Count, Flags);
/* MSDN: "not currently implemented" */
return DDERR_UNSUPPORTED;
......@@ -2902,7 +2902,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_BltBatch(IDirectDrawSurfa
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, batch, count, flags);
TRACE("iface %p, batch %p, count %lu, flags %#lx.\n", iface, batch, count, flags);
return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags);
}
......@@ -2911,7 +2911,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_BltBatch(IDirectDrawSurfa
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, batch, count, flags);
TRACE("iface %p, batch %p, count %lu, flags %#lx.\n", iface, batch, count, flags);
return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags);
}
......@@ -2920,7 +2920,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_BltBatch(IDirectDrawSurfa
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, batch, count, flags);
TRACE("iface %p, batch %p, count %lu, flags %#lx.\n", iface, batch, count, flags);
return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags);
}
......@@ -2929,7 +2929,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltBatch(IDirectDrawSurfa
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, batch, count, flags);
TRACE("iface %p, batch %p, count %lu, flags %#lx.\n", iface, batch, count, flags);
return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags);
}
......@@ -3111,7 +3111,7 @@ static HRESULT WINAPI ddraw_surface1_EnumAttachedSurfaces(IDirectDrawSurface *if
static HRESULT WINAPI ddraw_surface7_EnumOverlayZOrders(IDirectDrawSurface7 *iface,
DWORD Flags, void *context, LPDDENUMSURFACESCALLBACK7 cb)
{
FIXME("iface %p, flags %#x, context %p, callback %p stub!\n", iface, Flags, context, cb);
FIXME("iface %p, flags %#lx, context %p, callback %p stub!\n", iface, Flags, context, cb);
return DD_OK;
}
......@@ -3122,7 +3122,7 @@ static HRESULT WINAPI ddraw_surface4_EnumOverlayZOrders(IDirectDrawSurface4 *ifa
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
struct callback_info2 info;
TRACE("iface %p, flags %#x, context %p, callback %p.\n", iface, flags, context, callback);
TRACE("iface %p, flags %#lx, context %p, callback %p.\n", iface, flags, context, callback);
info.callback = callback;
info.context = context;
......@@ -3137,7 +3137,7 @@ static HRESULT WINAPI ddraw_surface3_EnumOverlayZOrders(IDirectDrawSurface3 *ifa
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
struct callback_info info;
TRACE("iface %p, flags %#x, context %p, callback %p.\n", iface, flags, context, callback);
TRACE("iface %p, flags %#lx, context %p, callback %p.\n", iface, flags, context, callback);
info.callback = callback;
info.context = context;
......@@ -3152,7 +3152,7 @@ static HRESULT WINAPI ddraw_surface2_EnumOverlayZOrders(IDirectDrawSurface2 *ifa
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
struct callback_info info;
TRACE("iface %p, flags %#x, context %p, callback %p.\n", iface, flags, context, callback);
TRACE("iface %p, flags %#lx, context %p, callback %p.\n", iface, flags, context, callback);
info.callback = callback;
info.context = context;
......@@ -3167,7 +3167,7 @@ static HRESULT WINAPI ddraw_surface1_EnumOverlayZOrders(IDirectDrawSurface *ifac
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
struct callback_info info;
TRACE("iface %p, flags %#x, context %p, callback %p.\n", iface, flags, context, callback);
TRACE("iface %p, flags %#lx, context %p, callback %p.\n", iface, flags, context, callback);
info.callback = callback;
info.context = context;
......@@ -3187,7 +3187,7 @@ static HRESULT WINAPI ddraw_surface1_EnumOverlayZOrders(IDirectDrawSurface *ifac
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_GetBltStatus(IDirectDrawSurface7 *iface, DWORD Flags)
{
TRACE("iface %p, flags %#x.\n", iface, Flags);
TRACE("iface %p, flags %#lx.\n", iface, Flags);
switch (Flags)
{
......@@ -3204,7 +3204,7 @@ static HRESULT WINAPI ddraw_surface4_GetBltStatus(IDirectDrawSurface4 *iface, DW
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_GetBltStatus(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -3213,7 +3213,7 @@ static HRESULT WINAPI ddraw_surface3_GetBltStatus(IDirectDrawSurface3 *iface, DW
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_GetBltStatus(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -3222,7 +3222,7 @@ static HRESULT WINAPI ddraw_surface2_GetBltStatus(IDirectDrawSurface2 *iface, DW
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_GetBltStatus(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -3231,7 +3231,7 @@ static HRESULT WINAPI ddraw_surface1_GetBltStatus(IDirectDrawSurface *iface, DWO
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_GetBltStatus(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -3254,7 +3254,7 @@ static HRESULT WINAPI ddraw_surface7_GetColorKey(IDirectDrawSurface7 *iface, DWO
{
struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, Flags, CKey);
if(!CKey)
return DDERR_INVALIDPARAMS;
......@@ -3313,7 +3313,7 @@ static HRESULT WINAPI ddraw_surface4_GetColorKey(IDirectDrawSurface4 *iface, DWO
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
return ddraw_surface7_GetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key);
}
......@@ -3322,7 +3322,7 @@ static HRESULT WINAPI ddraw_surface3_GetColorKey(IDirectDrawSurface3 *iface, DWO
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
return ddraw_surface7_GetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key);
}
......@@ -3331,7 +3331,7 @@ static HRESULT WINAPI ddraw_surface2_GetColorKey(IDirectDrawSurface2 *iface, DWO
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
return ddraw_surface7_GetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key);
}
......@@ -3340,7 +3340,7 @@ static HRESULT WINAPI ddraw_surface1_GetColorKey(IDirectDrawSurface *iface, DWOR
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
return ddraw_surface7_GetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key);
}
......@@ -3356,7 +3356,7 @@ static HRESULT WINAPI ddraw_surface1_GetColorKey(IDirectDrawSurface *iface, DWOR
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_GetFlipStatus(IDirectDrawSurface7 *iface, DWORD Flags)
{
TRACE("iface %p, flags %#x.\n", iface, Flags);
TRACE("iface %p, flags %#lx.\n", iface, Flags);
/* XXX: DDERR_INVALIDSURFACETYPE */
......@@ -3375,7 +3375,7 @@ static HRESULT WINAPI ddraw_surface4_GetFlipStatus(IDirectDrawSurface4 *iface, D
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_GetFlipStatus(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -3384,7 +3384,7 @@ static HRESULT WINAPI ddraw_surface3_GetFlipStatus(IDirectDrawSurface3 *iface, D
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_GetFlipStatus(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -3393,7 +3393,7 @@ static HRESULT WINAPI ddraw_surface2_GetFlipStatus(IDirectDrawSurface2 *iface, D
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_GetFlipStatus(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -3402,7 +3402,7 @@ static HRESULT WINAPI ddraw_surface1_GetFlipStatus(IDirectDrawSurface *iface, DW
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_GetFlipStatus(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -3551,25 +3551,24 @@ static HRESULT WINAPI ddraw_surface1_GetPixelFormat(IDirectDrawSurface *iface, D
* DDERR_INVALIDPARAMS if DDSD is NULL
*
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_GetSurfaceDesc(IDirectDrawSurface7 *iface, DDSURFACEDESC2 *DDSD)
static HRESULT WINAPI ddraw_surface7_GetSurfaceDesc(IDirectDrawSurface7 *iface, DDSURFACEDESC2 *surface_desc)
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
TRACE("iface %p, surface_desc %p.\n", iface, DDSD);
TRACE("iface %p, surface_desc %p.\n", iface, surface_desc);
if(!DDSD)
return DDERR_INVALIDPARAMS;
if (!surface_desc) return DDERR_INVALIDPARAMS;
if (DDSD->dwSize != sizeof(DDSURFACEDESC2))
if (surface_desc->dwSize != sizeof(DDSURFACEDESC2))
{
WARN("Incorrect struct size %d, returning DDERR_INVALIDPARAMS\n",DDSD->dwSize);
WARN("Incorrect struct size %lu.\n", surface_desc->dwSize);
return DDERR_INVALIDPARAMS;
}
wined3d_mutex_lock();
DD_STRUCT_COPY_BYSIZE(DDSD, &surface->surface_desc);
DD_STRUCT_COPY_BYSIZE(surface_desc, &surface->surface_desc);
TRACE("Returning surface desc:\n");
if (TRACE_ON(ddraw)) DDRAW_dump_surface_desc(DDSD);
if (TRACE_ON(ddraw)) DDRAW_dump_surface_desc(surface_desc);
wined3d_mutex_unlock();
return DD_OK;
......@@ -3594,7 +3593,7 @@ static HRESULT WINAPI ddraw_surface3_GetSurfaceDesc(IDirectDrawSurface3 *iface,
if (surface_desc->dwSize != sizeof(DDSURFACEDESC))
{
WARN("Incorrect structure size %u, returning DDERR_INVALIDPARAMS.\n", surface_desc->dwSize);
WARN("Incorrect structure size %lu.\n", surface_desc->dwSize);
return DDERR_INVALIDPARAMS;
}
......@@ -3801,13 +3800,13 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface)
if (FAILED(hr = wined3d_swapchain_get_display_mode(swapchain, &mode, NULL)))
{
WARN("Failed to get display mode, hr %#x.\n", hr);
WARN("Failed to get display mode, hr %#lx.\n", hr);
return hr;
}
if (FAILED(hr = wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, 0, &wined3d_desc)))
{
WARN("Failed to get resource desc, hr %#x.\n", hr);
WARN("Failed to get resource desc, hr %#lx.\n", hr);
return hr;
}
......@@ -3895,7 +3894,7 @@ static HRESULT WINAPI ddraw_surface7_SetOverlayPosition(IDirectDrawSurface7 *ifa
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
HRESULT hr;
TRACE("iface %p, x %d, y %d.\n", iface, x, y);
TRACE("iface %p, x %ld, y %ld.\n", iface, x, y);
wined3d_mutex_lock();
hr = wined3d_texture_set_overlay_position(surface->wined3d_texture,
......@@ -3909,7 +3908,7 @@ static HRESULT WINAPI ddraw_surface4_SetOverlayPosition(IDirectDrawSurface4 *ifa
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, x %d, y %d.\n", iface, x, y);
TRACE("iface %p, x %ld, y %ld.\n", iface, x, y);
return ddraw_surface7_SetOverlayPosition(&surface->IDirectDrawSurface7_iface, x, y);
}
......@@ -3918,7 +3917,7 @@ static HRESULT WINAPI ddraw_surface3_SetOverlayPosition(IDirectDrawSurface3 *ifa
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, x %d, y %d.\n", iface, x, y);
TRACE("iface %p, x %ld, y %ld.\n", iface, x, y);
return ddraw_surface7_SetOverlayPosition(&surface->IDirectDrawSurface7_iface, x, y);
}
......@@ -3927,7 +3926,7 @@ static HRESULT WINAPI ddraw_surface2_SetOverlayPosition(IDirectDrawSurface2 *ifa
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, x %d, y %d.\n", iface, x, y);
TRACE("iface %p, x %ld, y %ld.\n", iface, x, y);
return ddraw_surface7_SetOverlayPosition(&surface->IDirectDrawSurface7_iface, x, y);
}
......@@ -3936,7 +3935,7 @@ static HRESULT WINAPI ddraw_surface1_SetOverlayPosition(IDirectDrawSurface *ifac
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
TRACE("iface %p, x %d, y %d.\n", iface, x, y);
TRACE("iface %p, x %ld, y %ld.\n", iface, x, y);
return ddraw_surface7_SetOverlayPosition(&surface->IDirectDrawSurface7_iface, x, y);
}
......@@ -3965,7 +3964,7 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlay(IDirectDrawSurface7 *iface, R
unsigned int dst_sub_resource_idx = 0;
HRESULT hr;
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx);
if (fx)
......@@ -3990,7 +3989,7 @@ static HRESULT WINAPI ddraw_surface4_UpdateOverlay(IDirectDrawSurface4 *iface, R
struct ddraw_surface *src_impl = impl_from_IDirectDrawSurface4(iface);
struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst_surface);
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx);
return ddraw_surface7_UpdateOverlay(&src_impl->IDirectDrawSurface7_iface, src_rect,
......@@ -4003,7 +4002,7 @@ static HRESULT WINAPI ddraw_surface3_UpdateOverlay(IDirectDrawSurface3 *iface, R
struct ddraw_surface *src_impl = impl_from_IDirectDrawSurface3(iface);
struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst_surface);
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx);
return ddraw_surface7_UpdateOverlay(&src_impl->IDirectDrawSurface7_iface, src_rect,
......@@ -4016,7 +4015,7 @@ static HRESULT WINAPI ddraw_surface2_UpdateOverlay(IDirectDrawSurface2 *iface, R
struct ddraw_surface *src_impl = impl_from_IDirectDrawSurface2(iface);
struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface2(dst_surface);
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx);
return ddraw_surface7_UpdateOverlay(&src_impl->IDirectDrawSurface7_iface, src_rect,
......@@ -4029,7 +4028,7 @@ static HRESULT WINAPI ddraw_surface1_UpdateOverlay(IDirectDrawSurface *iface, RE
struct ddraw_surface *src_impl = impl_from_IDirectDrawSurface(iface);
struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface(dst_surface);
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n",
TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#lx, fx %p.\n",
iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx);
return ddraw_surface7_UpdateOverlay(&src_impl->IDirectDrawSurface7_iface, src_rect,
......@@ -4049,7 +4048,7 @@ static HRESULT WINAPI ddraw_surface1_UpdateOverlay(IDirectDrawSurface *iface, RE
*****************************************************************************/
static HRESULT WINAPI ddraw_surface7_UpdateOverlayDisplay(IDirectDrawSurface7 *iface, DWORD Flags)
{
TRACE("iface %p, flags %#x.\n", iface, Flags);
TRACE("iface %p, flags %#lx.\n", iface, Flags);
return DDERR_UNSUPPORTED;
}
......@@ -4058,7 +4057,7 @@ static HRESULT WINAPI ddraw_surface4_UpdateOverlayDisplay(IDirectDrawSurface4 *i
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_UpdateOverlayDisplay(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -4067,7 +4066,7 @@ static HRESULT WINAPI ddraw_surface3_UpdateOverlayDisplay(IDirectDrawSurface3 *i
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_UpdateOverlayDisplay(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -4076,7 +4075,7 @@ static HRESULT WINAPI ddraw_surface2_UpdateOverlayDisplay(IDirectDrawSurface2 *i
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_UpdateOverlayDisplay(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -4085,7 +4084,7 @@ static HRESULT WINAPI ddraw_surface1_UpdateOverlayDisplay(IDirectDrawSurface *if
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
TRACE("iface %p, flags %#x.\n", iface, flags);
TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddraw_surface7_UpdateOverlayDisplay(&surface->IDirectDrawSurface7_iface, flags);
}
......@@ -4108,7 +4107,7 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlayZOrder(IDirectDrawSurface7 *if
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
FIXME("iface %p, flags %#x, reference %p stub!\n", iface, flags, reference);
FIXME("iface %p, flags %#lx, reference %p stub!\n", iface, flags, reference);
wined3d_mutex_lock();
if (!(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_OVERLAY))
......@@ -4128,7 +4127,7 @@ static HRESULT WINAPI ddraw_surface4_UpdateOverlayZOrder(IDirectDrawSurface4 *if
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
struct ddraw_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface4(reference);
TRACE("iface %p, flags %#x, reference %p.\n", iface, flags, reference);
TRACE("iface %p, flags %#lx, reference %p.\n", iface, flags, reference);
return ddraw_surface7_UpdateOverlayZOrder(&surface->IDirectDrawSurface7_iface, flags,
reference_impl ? &reference_impl->IDirectDrawSurface7_iface : NULL);
......@@ -4140,7 +4139,7 @@ static HRESULT WINAPI ddraw_surface3_UpdateOverlayZOrder(IDirectDrawSurface3 *if
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
struct ddraw_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface3(reference);
TRACE("iface %p, flags %#x, reference %p.\n", iface, flags, reference);
TRACE("iface %p, flags %#lx, reference %p.\n", iface, flags, reference);
return ddraw_surface7_UpdateOverlayZOrder(&surface->IDirectDrawSurface7_iface, flags,
reference_impl ? &reference_impl->IDirectDrawSurface7_iface : NULL);
......@@ -4152,7 +4151,7 @@ static HRESULT WINAPI ddraw_surface2_UpdateOverlayZOrder(IDirectDrawSurface2 *if
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
struct ddraw_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface2(reference);
TRACE("iface %p, flags %#x, reference %p.\n", iface, flags, reference);
TRACE("iface %p, flags %#lx, reference %p.\n", iface, flags, reference);
return ddraw_surface7_UpdateOverlayZOrder(&surface->IDirectDrawSurface7_iface, flags,
reference_impl ? &reference_impl->IDirectDrawSurface7_iface : NULL);
......@@ -4164,7 +4163,7 @@ static HRESULT WINAPI ddraw_surface1_UpdateOverlayZOrder(IDirectDrawSurface *ifa
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
struct ddraw_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface(reference);
TRACE("iface %p, flags %#x, reference %p.\n", iface, flags, reference);
TRACE("iface %p, flags %#lx, reference %p.\n", iface, flags, reference);
return ddraw_surface7_UpdateOverlayZOrder(&surface->IDirectDrawSurface7_iface, flags,
reference_impl ? &reference_impl->IDirectDrawSurface7_iface : NULL);
......@@ -4296,7 +4295,7 @@ static HRESULT WINAPI ddraw_surface7_SetLOD(IDirectDrawSurface7 *iface, DWORD Ma
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
HRESULT hr;
TRACE("iface %p, lod %u.\n", iface, MaxLOD);
TRACE("iface %p, lod %lu.\n", iface, MaxLOD);
wined3d_mutex_lock();
if (!(surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE))
......@@ -4375,7 +4374,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac
HRESULT hr = DD_OK;
RECT dst_rect, s;
TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n",
TRACE("iface %p, dst_x %lu, dst_y %lu, src_surface %p, src_rect %s, flags %#lx.\n",
iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), trans);
dst_w = dst_impl->surface_desc.dwWidth;
......@@ -4438,7 +4437,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_BltFast(IDirectDrawSurfac
struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface4(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface4(src_surface);
TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n",
TRACE("iface %p, dst_x %lu, dst_y %lu, src_surface %p, src_rect %s, flags %#lx.\n",
iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), flags);
return ddraw_surface7_BltFast(&dst_impl->IDirectDrawSurface7_iface, dst_x, dst_y,
......@@ -4451,7 +4450,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_BltFast(IDirectDrawSurfac
struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface3(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface3(src_surface);
TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n",
TRACE("iface %p, dst_x %lu, dst_y %lu, src_surface %p, src_rect %s, flags %#lx.\n",
iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), flags);
return ddraw_surface7_BltFast(&dst_impl->IDirectDrawSurface7_iface, dst_x, dst_y,
......@@ -4464,7 +4463,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_BltFast(IDirectDrawSurfac
struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface2(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface2(src_surface);
TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n",
TRACE("iface %p, dst_x %lu, dst_y %lu, src_surface %p, src_rect %s, flags %#lx.\n",
iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), flags);
return ddraw_surface7_BltFast(&dst_impl->IDirectDrawSurface7_iface, dst_x, dst_y,
......@@ -4477,7 +4476,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurfac
struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface);
TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n",
TRACE("iface %p, dst_x %lu, dst_y %lu, src_surface %p, src_rect %s, flags %#lx.\n",
iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), flags);
return ddraw_surface7_BltFast(&dst_impl->IDirectDrawSurface7_iface, dst_x, dst_y,
......@@ -4666,7 +4665,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
enum wined3d_format_id format_id;
UINT pitch, width, height;
TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags);
TRACE("iface %p, surface_desc %p, flags %#lx.\n", iface, DDSD, Flags);
if (!DDSD)
{
......@@ -4675,7 +4674,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
}
if (Flags)
{
WARN("Flags is %x, returning DDERR_INVALIDPARAMS\n", Flags);
WARN("Flags is %lx, returning DDERR_INVALIDPARAMS\n", Flags);
return DDERR_INVALIDPARAMS;
}
if (!(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)
......@@ -4690,7 +4689,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
* for PIXELFORMAT to work */
if (DDSD->dwFlags & ~allowed_flags)
{
WARN("Invalid flags (0x%08x) set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags);
WARN("Invalid flags %#lx set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags);
return DDERR_INVALIDPARAMS;
}
if (!(DDSD->dwFlags & DDSD_LPSURFACE) || !DDSD->lpSurface)
......@@ -4712,14 +4711,14 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
}
if (!DDSD->dwWidth || DDSD->u1.lPitch <= 0 || DDSD->u1.lPitch & 0x3)
{
WARN("Pitch is %d, width is %u, returning DDERR_INVALIDPARAMS.\n",
WARN("Pitch is %ld, width is %lu, returning DDERR_INVALIDPARAMS.\n",
DDSD->u1.lPitch, DDSD->dwWidth);
return DDERR_INVALIDPARAMS;
}
if (DDSD->dwWidth != surface->surface_desc.dwWidth)
TRACE("Surface width changed from %u to %u.\n", surface->surface_desc.dwWidth, DDSD->dwWidth);
TRACE("Surface width changed from %lu to %lu.\n", surface->surface_desc.dwWidth, DDSD->dwWidth);
if (DDSD->u1.lPitch != surface->surface_desc.u1.lPitch)
TRACE("Surface pitch changed from %u to %u.\n", surface->surface_desc.u1.lPitch, DDSD->u1.lPitch);
TRACE("Surface pitch changed from %lu to %lu.\n", surface->surface_desc.u1.lPitch, DDSD->u1.lPitch);
pitch = DDSD->u1.lPitch;
width = DDSD->dwWidth;
}
......@@ -4742,7 +4741,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
return DDERR_INVALIDPARAMS;
}
if (DDSD->dwHeight != surface->surface_desc.dwHeight)
TRACE("Surface height changed from %u to %u.\n", surface->surface_desc.dwHeight, DDSD->dwHeight);
TRACE("Surface height changed from %lu to %lu.\n", surface->surface_desc.dwHeight, DDSD->dwHeight);
height = DDSD->dwHeight;
}
else
......@@ -4774,7 +4773,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
if (FAILED(hr = wined3d_texture_update_desc(surface->wined3d_texture, surface->sub_resource_idx,
width, height, format_id, WINED3D_MULTISAMPLE_NONE, 0, DDSD->lpSurface, pitch)))
{
WARN("Failed to update surface desc, hr %#x.\n", hr);
WARN("Failed to update surface desc, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
......@@ -4782,7 +4781,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface,
if (surface->draw_texture && FAILED(hr = wined3d_texture_update_desc(surface->draw_texture,
surface->sub_resource_idx, width, height, format_id, WINED3D_MULTISAMPLE_NONE, 0, NULL, 0)))
{
ERR("Failed to update surface desc for draw_texture, hr %#x.\n", hr);
ERR("Failed to update surface desc for draw_texture, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
......@@ -4806,7 +4805,7 @@ static HRESULT WINAPI ddraw_surface4_SetSurfaceDesc(IDirectDrawSurface4 *iface,
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, surface_desc, flags);
TRACE("iface %p, surface_desc %p, flags %#lx.\n", iface, surface_desc, flags);
return ddraw_surface7_SetSurfaceDesc(&surface->IDirectDrawSurface7_iface,
surface_desc, flags);
......@@ -4818,7 +4817,7 @@ static HRESULT WINAPI ddraw_surface3_SetSurfaceDesc(IDirectDrawSurface3 *iface,
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
DDSURFACEDESC2 surface_desc2;
TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, surface_desc, flags);
TRACE("iface %p, surface_desc %p, flags %#lx.\n", iface, surface_desc, flags);
if (surface_desc) DDSD_to_DDSD2(surface_desc, &surface_desc2);
return ddraw_surface7_SetSurfaceDesc(&surface->IDirectDrawSurface7_iface,
......@@ -4991,7 +4990,7 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)
return DDERR_NOTONMIPMAPSUBLEVEL;
......@@ -5003,7 +5002,7 @@ static HRESULT WINAPI ddraw_surface4_SetColorKey(IDirectDrawSurface4 *iface, DWO
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
return ddraw_surface_set_color_key(surface, flags, color_key);
}
......@@ -5012,7 +5011,7 @@ static HRESULT WINAPI ddraw_surface3_SetColorKey(IDirectDrawSurface3 *iface, DWO
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
return ddraw_surface_set_color_key(surface, flags, color_key);
}
......@@ -5021,7 +5020,7 @@ static HRESULT WINAPI ddraw_surface2_SetColorKey(IDirectDrawSurface2 *iface, DWO
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
return ddraw_surface_set_color_key(surface, flags, color_key);
}
......@@ -5030,7 +5029,7 @@ static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWOR
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key);
TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key);
return ddraw_surface_set_color_key(surface, flags, color_key);
}
......@@ -5131,7 +5130,7 @@ static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl *
{
struct ddraw_surface *surface = impl_from_IDirectDrawGammaControl(iface);
TRACE("iface %p, flags %#x, gamma_ramp %p.\n", iface, flags, gamma_ramp);
TRACE("iface %p, flags %#lx, gamma_ramp %p.\n", iface, flags, gamma_ramp);
if (!gamma_ramp)
{
......@@ -5173,7 +5172,7 @@ static HRESULT WINAPI ddraw_gamma_control_SetGammaRamp(IDirectDrawGammaControl *
{
struct ddraw_surface *surface = impl_from_IDirectDrawGammaControl(iface);
TRACE("iface %p, flags %#x, gamma_ramp %p.\n", iface, flags, gamma_ramp);
TRACE("iface %p, flags %#lx, gamma_ramp %p.\n", iface, flags, gamma_ramp);
if (!gamma_ramp)
{
......@@ -5212,7 +5211,7 @@ static HRESULT WINAPI ddraw_gamma_control_SetGammaRamp(IDirectDrawGammaControl *
*****************************************************************************/
static HRESULT WINAPI d3d_texture2_PaletteChanged(IDirect3DTexture2 *iface, DWORD start, DWORD count)
{
FIXME("iface %p, start %u, count %u stub!\n", iface, start, count);
FIXME("iface %p, start %lu, count %lu stub!\n", iface, start, count);
return D3D_OK;
}
......@@ -5221,7 +5220,7 @@ static HRESULT WINAPI d3d_texture1_PaletteChanged(IDirect3DTexture *iface, DWORD
{
struct ddraw_surface *surface = impl_from_IDirect3DTexture(iface);
TRACE("iface %p, start %u, count %u.\n", iface, start, count);
TRACE("iface %p, start %lu, count %lu.\n", iface, start, count);
return d3d_texture2_PaletteChanged(&surface->IDirect3DTexture2_iface, start, count);
}
......@@ -5279,7 +5278,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface,
surface->Handle = h + 1;
}
TRACE("Returning handle %08x.\n", surface->Handle);
TRACE("Returning handle %08lx.\n", surface->Handle);
*handle = surface->Handle;
wined3d_mutex_unlock();
......@@ -5419,7 +5418,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
if (FAILED(hr = wined3d_resource_map(src_resource,
src_surface->sub_resource_idx, &src_map_desc, NULL, WINED3D_MAP_READ)))
{
ERR("Failed to lock source surface, hr %#x.\n", hr);
ERR("Failed to lock source surface, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return D3DERR_TEXTURE_LOAD_FAILED;
}
......@@ -5427,7 +5426,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
if (FAILED(hr = wined3d_resource_map(dst_resource,
dst_surface->sub_resource_idx, &dst_map_desc, NULL, WINED3D_MAP_WRITE)))
{
ERR("Failed to lock destination surface, hr %#x.\n", hr);
ERR("Failed to lock destination surface, hr %#lx.\n", hr);
wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx);
wined3d_mutex_unlock();
return D3DERR_TEXTURE_LOAD_FAILED;
......@@ -6003,7 +6002,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(DDSURFACEDESC2 *desc, struct
if (FAILED(hr = wined3d_texture_create(wined3d_device, &draw_texture_desc, layers,
levels, 0, NULL, texture, &ddraw_texture_wined3d_parent_ops, &draw_texture)))
{
WARN("Failed to create draw texture, hr %#x.\n", hr);
WARN("Failed to create draw texture, hr %#lx.\n", hr);
goto no_draw_texture;
}
wined3d_texture_decref(draw_texture);
......@@ -6170,7 +6169,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
if ((desc->ddsCaps.dwCaps & (DDSCAPS_ALLOCONLOAD | DDSCAPS_MIPMAP))
&& !(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE))
{
WARN("Caps %#x require DDSCAPS_TEXTURE.\n", desc->ddsCaps.dwCaps);
WARN("Caps %#lx require DDSCAPS_TEXTURE.\n", desc->ddsCaps.dwCaps);
heap_free(texture);
return DDERR_INVALIDCAPS;
}
......@@ -6222,7 +6221,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
if (FAILED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL)))
{
ERR("Failed to get display mode, hr %#x.\n", hr);
ERR("Failed to get display mode, hr %#lx.\n", hr);
heap_free(texture);
return hr_ddraw_from_wined3d(hr);
}
......@@ -6488,7 +6487,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
&& desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter,
wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4))
{
WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize);
WARN("Invalid linear size %lu specified.\n", desc->u1.dwLinearSize);
heap_free(texture);
return DDERR_INVALIDPARAMS;
}
......@@ -6505,7 +6504,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter,
wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3)
{
WARN("Invalid pitch %u specified.\n", desc->u1.lPitch);
WARN("Invalid pitch %lu specified.\n", desc->u1.lPitch);
heap_free(texture);
return DDERR_INVALIDPARAMS;
}
......@@ -6550,7 +6549,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
if (FAILED(hr = ddraw_surface_create_wined3d_texture(desc, ddraw->wined3d_device, &wined3d_desc, layers, levels,
texture, &wined3d_texture)))
{
WARN("Failed to create wined3d texture, hr %#x.\n", hr);
WARN("Failed to create wined3d texture, hr %#lx.\n", hr);
heap_free(texture);
return hr_ddraw_from_wined3d(hr);
}
......@@ -6640,7 +6639,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
wined3d_desc.width, wined3d_desc.height, wined3d_desc.format,
WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch)))
{
ERR("Failed to set surface memory, hr %#x.\n", hr);
ERR("Failed to set surface memory, hr %#lx.\n", hr);
goto fail;
}
......@@ -6650,7 +6649,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture, layers * levels)))
{
ERR("Failed to reserve surface memory, hr %#x.\n", hr);
ERR("Failed to reserve surface memory, hr %#lx.\n", hr);
goto fail;
}
......@@ -6839,7 +6838,7 @@ struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddr
if (FAILED(hr = wined3d_rendertarget_view_create_from_sub_resource(wined3d_texture,
surface->sub_resource_idx, surface, &ddraw_view_wined3d_parent_ops, &surface->wined3d_rtv)))
{
ERR("Failed to create rendertarget view, hr %#x.\n", hr);
ERR("Failed to create rendertarget view, hr %#lx.\n", hr);
return NULL;
}
......
dlls/ddraw/utils.c
View file @ 4ceb3a65
......@@ -469,7 +469,7 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix
return WINED3DFMT_L8_UNORM;
default:
WARN("Unknown luminance-only bit depth 0x%x.\n", DDPixelFormat->u1.dwLuminanceBitCount);
WARN("Unknown luminance-only bit depth 0x%lx.\n", DDPixelFormat->u1.dwLuminanceBitCount);
return WINED3DFMT_UNKNOWN;
}
}
......@@ -483,19 +483,19 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix
{
case 16:
if (DDPixelFormat->u2.dwStencilBitDepth == 1) return WINED3DFMT_S1_UINT_D15_UNORM;
WARN("Unknown depth stencil format: 16 z bits, %u stencil bits.\n",
WARN("Unknown depth stencil format: 16 z bits, %lu stencil bits.\n",
DDPixelFormat->u2.dwStencilBitDepth);
return WINED3DFMT_UNKNOWN;
case 32:
if (DDPixelFormat->u2.dwStencilBitDepth == 8) return WINED3DFMT_D24_UNORM_S8_UINT;
else if (DDPixelFormat->u2.dwStencilBitDepth == 4) return WINED3DFMT_S4X4_UINT_D24_UNORM;
WARN("Unknown depth stencil format: 32 z bits, %u stencil bits.\n",
WARN("Unknown depth stencil format: 32 z bits, %lu stencil bits.\n",
DDPixelFormat->u2.dwStencilBitDepth);
return WINED3DFMT_UNKNOWN;
default:
WARN("Unknown depth stencil format: %u z bits, %u stencil bits.\n",
WARN("Unknown depth stencil format: %lu z bits, %lu stencil bits.\n",
DDPixelFormat->u1.dwZBufferBitDepth, DDPixelFormat->u2.dwStencilBitDepth);
return WINED3DFMT_UNKNOWN;
}
......@@ -514,12 +514,12 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix
if (DDPixelFormat->u3.dwZBitMask == 0x00FFFFFF) return WINED3DFMT_X8D24_UNORM;
else if (DDPixelFormat->u3.dwZBitMask == 0xFFFFFF00) return WINED3DFMT_X8D24_UNORM;
else if (DDPixelFormat->u3.dwZBitMask == 0xFFFFFFFF) return WINED3DFMT_D32_UNORM;
WARN("Unknown depth-only format: 32 z bits, mask 0x%08x\n",
WARN("Unknown depth-only format: 32 z bits, mask 0x%08lx\n",
DDPixelFormat->u3.dwZBitMask);
return WINED3DFMT_UNKNOWN;
default:
WARN("Unknown depth-only format: %u z bits, mask 0x%08x\n",
WARN("Unknown depth-only format: %lu z bits, mask 0x%08lx\n",
DDPixelFormat->u1.dwZBufferBitDepth, DDPixelFormat->u3.dwZBitMask);
return WINED3DFMT_UNKNOWN;
}
......@@ -678,7 +678,7 @@ fail:
static void
DDRAW_dump_DWORD(const void *in)
{
TRACE("%d\n", *((const DWORD *) in));
TRACE("%ld\n", *((const DWORD *) in));
}
static void
DDRAW_dump_PTR(const void *in)
......@@ -688,7 +688,7 @@ DDRAW_dump_PTR(const void *in)
static void
DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck)
{
TRACE("Low : 0x%08x - High : 0x%08x\n", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue);
TRACE("Low : 0x%08lx - High : 0x%08lx\n", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue);
}
static void DDRAW_dump_flags_nolf(DWORD flags, const struct flag_info *names, size_t num_names)
......@@ -826,7 +826,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
TRACE("( ");
DDRAW_dump_pixelformat_flag(pf->dwFlags);
if (pf->dwFlags & DDPF_FOURCC)
TRACE(", dwFourCC code '%c%c%c%c' (0x%08x) - %u bits per pixel",
TRACE(", dwFourCC code '%c%c%c%c' (0x%08lx) - %lu bits per pixel",
(unsigned char)( pf->dwFourCC &0xff),
(unsigned char)((pf->dwFourCC>> 8)&0xff),
(unsigned char)((pf->dwFourCC>>16)&0xff),
......@@ -835,22 +835,22 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
pf->u1.dwYUVBitCount);
if (pf->dwFlags & DDPF_RGB)
{
TRACE(", RGB bits: %u, R 0x%08x G 0x%08x B 0x%08x",
TRACE(", RGB bits: %lu, R 0x%08lx G 0x%08lx B 0x%08lx",
pf->u1.dwRGBBitCount,
pf->u2.dwRBitMask,
pf->u3.dwGBitMask,
pf->u4.dwBBitMask);
if (pf->dwFlags & DDPF_ALPHAPIXELS)
TRACE(" A 0x%08x", pf->u5.dwRGBAlphaBitMask);
TRACE(" A 0x%08lx", pf->u5.dwRGBAlphaBitMask);
if (pf->dwFlags & DDPF_ZPIXELS)
TRACE(" Z 0x%08x", pf->u5.dwRGBZBitMask);
TRACE(" Z 0x%08lx", pf->u5.dwRGBZBitMask);
}
if (pf->dwFlags & DDPF_ZBUFFER)
TRACE(", Z bits: %u", pf->u1.dwZBufferBitDepth);
TRACE(", Z bits: %lu", pf->u1.dwZBufferBitDepth);
if (pf->dwFlags & DDPF_ALPHA)
TRACE(", Alpha bits: %u", pf->u1.dwAlphaBitDepth);
TRACE(", Alpha bits: %lu", pf->u1.dwAlphaBitDepth);
if (pf->dwFlags & DDPF_BUMPDUDV)
TRACE(", Bump bits: %u, U 0x%08x V 0x%08x L 0x%08x",
TRACE(", Bump bits: %lu, U 0x%08lx V 0x%08lx L 0x%08lx",
pf->u1.dwBumpBitCount,
pf->u2.dwBumpDuBitMask,
pf->u3.dwBumpDvBitMask,
......@@ -1138,7 +1138,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
FE(DDSVCAPS_STEREOSEQUENTIAL),
};
TRACE(" - dwSize : %d\n", lpcaps->dwSize);
TRACE(" - dwSize : %ld\n", lpcaps->dwSize);
TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, ARRAY_SIZE(flags1));
TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, ARRAY_SIZE(flags2));
TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, ARRAY_SIZE(flags3));
......@@ -1147,10 +1147,10 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, ARRAY_SIZE(flags6));
TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, ARRAY_SIZE(flags7));
TRACE("...\n");
TRACE(" - dwNumFourCCCodes : %d\n", lpcaps->dwNumFourCCCodes);
TRACE(" - dwCurrVisibleOverlays : %d\n", lpcaps->dwCurrVisibleOverlays);
TRACE(" - dwMinOverlayStretch : %d\n", lpcaps->dwMinOverlayStretch);
TRACE(" - dwMaxOverlayStretch : %d\n", lpcaps->dwMaxOverlayStretch);
TRACE(" - dwNumFourCCCodes : %ld\n", lpcaps->dwNumFourCCCodes);
TRACE(" - dwCurrVisibleOverlays : %ld\n", lpcaps->dwCurrVisibleOverlays);
TRACE(" - dwMinOverlayStretch : %ld\n", lpcaps->dwMinOverlayStretch);
TRACE(" - dwMaxOverlayStretch : %ld\n", lpcaps->dwMaxOverlayStretch);
TRACE("...\n");
TRACE(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps);
}
......
dlls/ddraw/vertexbuffer.c
View file @ 4ceb3a65
......@@ -66,7 +66,7 @@ static ULONG WINAPI d3d_vertex_buffer7_AddRef(IDirect3DVertexBuffer7 *iface)
struct d3d_vertex_buffer *buffer = impl_from_IDirect3DVertexBuffer7(iface);
ULONG ref = InterlockedIncrement(&buffer->ref);
TRACE("%p increasing refcount to %u.\n", buffer, ref);
TRACE("%p increasing refcount to %lu.\n", buffer, ref);
return ref;
}
......@@ -76,7 +76,7 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface)
struct d3d_vertex_buffer *buffer = impl_from_IDirect3DVertexBuffer7(iface);
ULONG ref = InterlockedDecrement(&buffer->ref);
TRACE("%p decreasing refcount to %u.\n", buffer, ref);
TRACE("%p decreasing refcount to %lu.\n", buffer, ref);
if (!ref)
{
......@@ -154,7 +154,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface,
struct wined3d_map_desc wined3d_map_desc;
HRESULT hr;
TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, flags, data, data_size);
TRACE("iface %p, flags %#lx, data %p, data_size %p.\n", iface, flags, data, data_size);
if (buffer->version != 7)
flags &= ~(DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS);
......@@ -257,7 +257,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7
const struct wined3d_stateblock_state *state;
HRESULT hr;
TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n",
TRACE("iface %p, vertex_op %#lx, dst_idx %lu, count %lu, src_buffer %p, src_idx %lu, device %p, flags %#lx.\n",
iface, vertex_op, dst_idx, count, src_buffer, src_idx, device, flags);
/* Vertex operations:
......@@ -369,11 +369,11 @@ static HRESULT WINAPI d3d_vertex_buffer7_Optimize(IDirect3DVertexBuffer7 *iface,
struct d3d_vertex_buffer *buffer = impl_from_IDirect3DVertexBuffer7(iface);
static BOOL hide = FALSE;
TRACE("iface %p, device %p, flags %#x.\n", iface, device, flags);
TRACE("iface %p, device %p, flags %#lx.\n", iface, device, flags);
if (!hide)
{
FIXME("iface %p, device %p, flags %#x stub!\n", iface, device, flags);
FIXME("iface %p, device %p, flags %#lx stub!\n", iface, device, flags);
hide = TRUE;
}
......@@ -413,7 +413,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVerticesStrided(IDirect3DVertexB
DWORD vertex_op, DWORD dst_idx, DWORD count, D3DDRAWPRIMITIVESTRIDEDDATA *data,
DWORD fvf, IDirect3DDevice7 *device, DWORD flags)
{
FIXME("iface %p, vertex_op %#x, dst_idx %u, count %u, data %p, fvf %#x, device %p, flags %#x stub!\n",
FIXME("iface %p, vertex_op %#lx, dst_idx %lu, count %lu, data %p, fvf %#lx, device %p, flags %#lx stub!\n",
iface, vertex_op, dst_idx, count, data, fvf, device, flags);
return DD_OK;
......@@ -443,10 +443,10 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf,
HRESULT hr = D3D_OK;
TRACE("Vertex buffer description:\n");
TRACE(" dwSize %u\n", desc->dwSize);
TRACE(" dwCaps %#x\n", desc->dwCaps);
TRACE(" FVF %#x\n", desc->dwFVF);
TRACE(" dwNumVertices %u\n", desc->dwNumVertices);
TRACE(" dwSize %lu\n", desc->dwSize);
TRACE(" dwCaps %#lx\n", desc->dwCaps);
TRACE(" FVF %#lx\n", desc->dwFVF);
TRACE(" dwNumVertices %lu\n", desc->dwNumVertices);
if (!(buffer = heap_alloc_zero(sizeof(*buffer))))
return DDERR_OUTOFMEMORY;
......@@ -465,7 +465,7 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf,
if (FAILED(hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wined3d_buffer)))
{
WARN("Failed to create wined3d vertex buffer, hr %#x.\n", hr);
WARN("Failed to create wined3d vertex buffer, hr %#lx.\n", hr);
if (hr == WINED3DERR_INVALIDCALL)
hr = DDERR_INVALIDPARAMS;
goto end;
......@@ -473,7 +473,7 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf,
if (!(buffer->wined3d_declaration = ddraw_find_decl(ddraw, desc->dwFVF)))
{
ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF);
ERR("Failed to find vertex declaration for fvf %#lx.\n", desc->dwFVF);
wined3d_buffer_decref(buffer->wined3d_buffer);
hr = DDERR_INVALIDPARAMS;
goto end;
......
dlls/ddraw/viewport.c
View file @ 4ceb3a65
......@@ -121,10 +121,9 @@ void viewport_deactivate(struct d3d_viewport *viewport)
void viewport_alloc_active_light_index(struct d3d_light *light)
{
struct d3d_viewport *vp = light->active_viewport;
unsigned int i;
DWORD map;
unsigned int i, map;
TRACE("vp %p, light %p, index %u, active_lights_count %u.\n",
TRACE("vp %p, light %p, index %lu, active_lights_count %lu.\n",
vp, light, light->active_light_index, vp->active_lights_count);
if (light->active_light_index)
......@@ -161,7 +160,7 @@ void viewport_free_active_light_index(struct d3d_light *light)
{
struct d3d_viewport *vp = light->active_viewport;
TRACE("vp %p, light %p, index %u, active_lights_count %u, map_lights %#x.\n",
TRACE("vp %p, light %p, index %lu, active_lights_count %lu, map_lights %#lx.\n",
vp, light, light->active_light_index, vp->active_lights_count, vp->map_lights);
if (!light->active_light_index)
......@@ -182,9 +181,9 @@ void viewport_free_active_light_index(struct d3d_light *light)
*****************************************************************************/
static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp)
{
TRACE(" - dwSize = %d dwX = %d dwY = %d\n",
TRACE(" - dwSize = %ld dwX = %ld dwY = %ld\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY);
TRACE(" - dwWidth = %d dwHeight = %d\n",
TRACE(" - dwWidth = %ld dwHeight = %ld\n",
lpvp->dwWidth, lpvp->dwHeight);
TRACE(" - dvScaleX = %f dvScaleY = %f\n",
lpvp->dvScaleX, lpvp->dvScaleY);
......@@ -196,9 +195,9 @@ static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp)
static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp)
{
TRACE(" - dwSize = %d dwX = %d dwY = %d\n",
TRACE(" - dwSize = %ld dwX = %ld dwY = %ld\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY);
TRACE(" - dwWidth = %d dwHeight = %d\n",
TRACE(" - dwWidth = %ld dwHeight = %ld\n",
lpvp->dwWidth, lpvp->dwHeight);
TRACE(" - dvClipX = %f dvClipY = %f\n",
lpvp->dvClipX, lpvp->dvClipY);
......@@ -267,7 +266,7 @@ static ULONG WINAPI d3d_viewport_AddRef(IDirect3DViewport3 *iface)
struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface);
ULONG ref = InterlockedIncrement(&viewport->ref);
TRACE("%p increasing refcount to %u.\n", viewport, ref);
TRACE("%p increasing refcount to %lu.\n", viewport, ref);
return ref;
}
......@@ -286,7 +285,7 @@ static ULONG WINAPI d3d_viewport_Release(IDirect3DViewport3 *iface)
struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface);
ULONG ref = InterlockedDecrement(&viewport->ref);
TRACE("%p decreasing refcount to %u.\n", viewport, ref);
TRACE("%p decreasing refcount to %lu.\n", viewport, ref);
if (!ref)
heap_free(viewport);
......@@ -386,7 +385,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE
if (vp->dwSize != sizeof(*vp))
{
WARN("Invalid D3DVIEWPORT size %u.\n", vp->dwSize);
WARN("Invalid D3DVIEWPORT size %lu.\n", vp->dwSize);
return DDERR_INVALIDPARAMS;
}
......@@ -493,7 +492,7 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface,
struct d3d_device *device = viewport->active_device;
BOOL activate = device->current_viewport != viewport;
TRACE("iface %p, vertex_count %u, data %p, flags %#x, offscreen %p.\n",
TRACE("iface %p, vertex_count %lu, data %p, flags %#lx, offscreen %p.\n",
iface, dwVertexCount, data, dwFlags, offscreen);
/* Tests on windows show that Windows crashes when this occurs,
......@@ -614,7 +613,7 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface,
static HRESULT WINAPI d3d_viewport_LightElements(IDirect3DViewport3 *iface,
DWORD element_count, D3DLIGHTDATA *data)
{
TRACE("iface %p, element_count %u, data %p.\n", iface, element_count, data);
TRACE("iface %p, element_count %lu, data %p.\n", iface, element_count, data);
return DDERR_UNSUPPORTED;
}
......@@ -624,13 +623,13 @@ static HRESULT WINAPI d3d_viewport_SetBackground(IDirect3DViewport3 *iface, D3DM
struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface);
struct d3d_material *m;
TRACE("iface %p, material %#x.\n", iface, material);
TRACE("iface %p, material %#lx.\n", iface, material);
wined3d_mutex_lock();
if (!(m = ddraw_get_object(&viewport->ddraw->d3ddevice->handle_table, material - 1, DDRAW_HANDLE_MATERIAL)))
{
WARN("Invalid material handle %#x.\n", material);
WARN("Invalid material handle %#lx.\n", material);
wined3d_mutex_unlock();
return DDERR_INVALIDPARAMS;
}
......@@ -742,11 +741,11 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface,
IDirect3DViewport3 *current_viewport;
IDirect3DDevice3 *d3d_device3;
TRACE("iface %p, rect_count %u, rects %p, flags %#x.\n", iface, rect_count, rects, flags);
TRACE("iface %p, rect_count %lu, rects %p, flags %#lx.\n", iface, rect_count, rects, flags);
if (!rects || !rect_count)
{
WARN("rect_count = %u, rects = %p, ignoring clear\n", rect_count, rects);
WARN("rect_count = %lu, rects = %p, ignoring clear\n", rect_count, rects);
return D3D_OK;
}
......@@ -891,7 +890,7 @@ static HRESULT WINAPI d3d_viewport_NextLight(IDirect3DViewport3 *iface,
struct list *entry;
HRESULT hr;
TRACE("iface %p, light %p, next_light %p, flags %#x.\n",
TRACE("iface %p, light %p, next_light %p, flags %#lx.\n",
iface, lpDirect3DLight, lplpDirect3DLight, flags);
if (!lplpDirect3DLight)
......@@ -922,7 +921,7 @@ static HRESULT WINAPI d3d_viewport_NextLight(IDirect3DViewport3 *iface,
default:
entry = NULL;
WARN("Invalid flags %#x.\n", flags);
WARN("Invalid flags %#lx.\n", flags);
break;
}
......@@ -1015,7 +1014,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI
if (vp->dwSize != sizeof(*vp))
{
WARN("Invalid D3DVIEWPORT2 size %u.\n", vp->dwSize);
WARN("Invalid D3DVIEWPORT2 size %lu.\n", vp->dwSize);
return DDERR_INVALIDPARAMS;
}
......@@ -1136,12 +1135,12 @@ static HRESULT WINAPI d3d_viewport_Clear2(IDirect3DViewport3 *iface, DWORD rect_
IDirect3DViewport3 *current_viewport;
IDirect3DDevice3 *d3d_device3;
TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, depth %.8e, stencil %u.\n",
TRACE("iface %p, rect_count %lu, rects %p, flags %#lx, color 0x%08lx, depth %.8e, stencil %lu.\n",
iface, rect_count, rects, flags, color, depth, stencil);
if (!rects || !rect_count)
{
WARN("rect_count = %u, rects = %p, ignoring clear\n", rect_count, rects);
WARN("rect_count = %lu, rects = %p, ignoring clear\n", rect_count, rects);
return D3D_OK;
}
......
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