[PATCH 1/3] ddrawex: Build without -DWINE_NO_LONG_TYPES.
Nikolay Sivov
nsivov at codeweavers.com
Wed Apr 13 00:53:28 CDT 2022
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/ddrawex/Makefile.in | 1 -
dlls/ddrawex/ddraw.c | 64 ++++++++++++++++-----------------
dlls/ddrawex/main.c | 8 ++---
dlls/ddrawex/surface.c | 78 ++++++++++++++++++++--------------------
4 files changed, 75 insertions(+), 76 deletions(-)
diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in
index 1f467777c7b..0d67f9eb07e 100644
--- a/dlls/ddrawex/Makefile.in
+++ b/dlls/ddrawex/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = ddrawex.dll
IMPORTS = dxguid uuid ddraw ole32 advapi32
diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c
index 2bb7e90fa42..736cb585eb9 100644
--- a/dlls/ddrawex/ddraw.c
+++ b/dlls/ddrawex/ddraw.c
@@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex4_AddRef(IDirectDraw4 *iface)
struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface);
ULONG refcount = InterlockedIncrement(&ddrawex->ref);
- TRACE("%p increasing refcount to %u.\n", iface, refcount);
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
@@ -161,7 +161,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface)
struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface);
ULONG refcount = InterlockedDecrement(&ddrawex->ref);
- TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
{
@@ -240,7 +240,7 @@ static HRESULT WINAPI ddrawex4_CreateClipper(IDirectDraw4 *iface, DWORD flags,
{
struct ddrawex *ddrawex = 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);
/* This may require a wrapper interface for clippers too which handles this. */
@@ -255,7 +255,7 @@ static HRESULT WINAPI ddrawex3_CreateClipper(IDirectDraw3 *iface, DWORD flags,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw3(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 ddrawex4_CreateClipper(&ddrawex->IDirectDraw4_iface, flags, clipper, outer_unknown);
@@ -266,7 +266,7 @@ static HRESULT WINAPI ddrawex2_CreateClipper(IDirectDraw2 *iface, DWORD flags,
{
struct ddrawex *ddrawex = 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 ddrawex4_CreateClipper(&ddrawex->IDirectDraw4_iface, flags, clipper, outer_unknown);
@@ -277,7 +277,7 @@ static HRESULT WINAPI ddrawex1_CreateClipper(IDirectDraw *iface, DWORD flags,
{
struct ddrawex *ddrawex = 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 ddrawex4_CreateClipper(&ddrawex->IDirectDraw4_iface, flags, clipper, outer_unknown);
@@ -288,7 +288,7 @@ static HRESULT WINAPI ddrawex4_CreatePalette(IDirectDraw4 *iface, DWORD flags,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface);
- 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);
/* This may require a wrapper interface for palettes too which handles this. */
@@ -303,7 +303,7 @@ static HRESULT WINAPI ddrawex3_CreatePalette(IDirectDraw3 *iface, DWORD flags,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw3(iface);
- 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);
return ddrawex4_CreatePalette(&ddrawex->IDirectDraw4_iface, flags, entries, palette, outer_unknown);
@@ -314,7 +314,7 @@ static HRESULT WINAPI ddrawex2_CreatePalette(IDirectDraw2 *iface, DWORD flags,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface);
- 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);
return ddrawex4_CreatePalette(&ddrawex->IDirectDraw4_iface, flags, entries, palette, outer_unknown);
@@ -325,7 +325,7 @@ static HRESULT WINAPI ddrawex1_CreatePalette(IDirectDraw *iface, DWORD flags,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw(iface);
- 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);
return ddrawex4_CreatePalette(&ddrawex->IDirectDraw4_iface, flags, entries, palette, outer_unknown);
@@ -546,7 +546,7 @@ static HRESULT WINAPI ddrawex4_EnumDisplayModes(IDirectDraw4 *iface, DWORD flags
{
struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface);
- TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
+ TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
return IDirectDraw4_EnumDisplayModes(ddrawex->parent, flags, desc, ctx, cb);
}
@@ -574,7 +574,7 @@ static HRESULT WINAPI ddrawex3_EnumDisplayModes(IDirectDraw3 *iface, DWORD flags
struct enummodes_ctx cb_ctx;
DDSURFACEDESC2 ddsd2;
- TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
+ TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
DDSD_to_DDSD2(desc, &ddsd2);
cb_ctx.orig_cb = cb;
@@ -587,7 +587,7 @@ static HRESULT WINAPI ddrawex2_EnumDisplayModes(IDirectDraw2 *iface, DWORD flags
{
struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface);
- TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
+ TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
return ddrawex3_EnumDisplayModes(&ddrawex->IDirectDraw3_iface, flags, desc, ctx, cb);
}
@@ -597,7 +597,7 @@ static HRESULT WINAPI ddrawex1_EnumDisplayModes(IDirectDraw *iface, DWORD flags,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw(iface);
- TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
+ TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
return ddrawex3_EnumDisplayModes(&ddrawex->IDirectDraw3_iface, flags, desc, ctx, cb);
}
@@ -625,7 +625,7 @@ static HRESULT WINAPI ddrawex4_EnumSurfaces(IDirectDraw4 *iface, DWORD flags,
struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface);
struct enumsurfaces4_ctx cb_ctx;
- TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
+ TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
cb_ctx.orig_cb = cb;
cb_ctx.orig_ctx = ctx;
@@ -661,7 +661,7 @@ static HRESULT WINAPI ddrawex3_EnumSurfaces(IDirectDraw3 *iface, DWORD flags,
DDSURFACEDESC2 ddsd2;
struct enumsurfaces_ctx cb_ctx;
- TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
+ TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
DDSD_to_DDSD2(desc, &ddsd2);
cb_ctx.orig_cb = cb;
@@ -674,7 +674,7 @@ static HRESULT WINAPI ddrawex2_EnumSurfaces(IDirectDraw2 *iface, DWORD flags,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface);
- TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
+ TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
return ddrawex3_EnumSurfaces(&ddrawex->IDirectDraw3_iface, flags, desc, ctx, cb);
}
@@ -684,7 +684,7 @@ static HRESULT WINAPI ddrawex1_EnumSurfaces(IDirectDraw *iface, DWORD flags,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw(iface);
- TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
+ TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb);
return ddrawex3_EnumSurfaces(&ddrawex->IDirectDraw3_iface, flags, desc, ctx, cb);
}
@@ -1079,7 +1079,7 @@ static HRESULT WINAPI ddrawex4_SetCooperativeLevel(IDirectDraw4 *iface, HWND win
{
struct ddrawex *ddrawex = 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 IDirectDraw4_SetCooperativeLevel(ddrawex->parent, window, flags);
}
@@ -1088,7 +1088,7 @@ static HRESULT WINAPI ddrawex3_SetCooperativeLevel(IDirectDraw3 *iface, HWND win
{
struct ddrawex *ddrawex = impl_from_IDirectDraw3(iface);
- TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags);
+ TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags);
return ddrawex4_SetCooperativeLevel(&ddrawex->IDirectDraw4_iface, window, flags);
}
@@ -1097,7 +1097,7 @@ static HRESULT WINAPI ddrawex2_SetCooperativeLevel(IDirectDraw2 *iface, HWND win
{
struct ddrawex *ddrawex = 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 ddrawex4_SetCooperativeLevel(&ddrawex->IDirectDraw4_iface, window, flags);
}
@@ -1106,7 +1106,7 @@ static HRESULT WINAPI ddrawex1_SetCooperativeLevel(IDirectDraw *iface, HWND wind
{
struct ddrawex *ddrawex = impl_from_IDirectDraw(iface);
- TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags);
+ TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags);
return ddrawex4_SetCooperativeLevel(&ddrawex->IDirectDraw4_iface, window, flags);
}
@@ -1116,7 +1116,7 @@ static HRESULT WINAPI ddrawex4_SetDisplayMode(IDirectDraw4 *iface, DWORD width,
{
struct ddrawex *ddrawex = 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 IDirectDraw4_SetDisplayMode(ddrawex->parent, width, height, bpp, refresh_rate, flags);
@@ -1127,7 +1127,7 @@ static HRESULT WINAPI ddrawex3_SetDisplayMode(IDirectDraw3 *iface, DWORD width,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw3(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 ddrawex4_SetDisplayMode(&ddrawex->IDirectDraw4_iface, width, height, bpp, refresh_rate, flags);
@@ -1138,7 +1138,7 @@ static HRESULT WINAPI ddrawex2_SetDisplayMode(IDirectDraw2 *iface, DWORD width,
{
struct ddrawex *ddrawex = 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 ddrawex4_SetDisplayMode(&ddrawex->IDirectDraw4_iface, width, height, bpp, refresh_rate, flags);
@@ -1149,7 +1149,7 @@ static HRESULT WINAPI ddrawex1_SetDisplayMode(IDirectDraw *iface, DWORD width,
{
struct ddrawex *ddrawex = 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 ddrawex4_SetDisplayMode(&ddrawex->IDirectDraw4_iface, width, height, bpp, 0, 0);
}
@@ -1158,7 +1158,7 @@ static HRESULT WINAPI ddrawex4_WaitForVerticalBlank(IDirectDraw4 *iface, DWORD f
{
struct ddrawex *ddrawex = 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 IDirectDraw4_WaitForVerticalBlank(ddrawex->parent, flags, event);
}
@@ -1167,7 +1167,7 @@ static HRESULT WINAPI ddrawex3_WaitForVerticalBlank(IDirectDraw3 *iface, DWORD f
{
struct ddrawex *ddrawex = impl_from_IDirectDraw3(iface);
- TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event);
+ TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event);
return ddrawex4_WaitForVerticalBlank(&ddrawex->IDirectDraw4_iface, flags, event);
}
@@ -1176,7 +1176,7 @@ static HRESULT WINAPI ddrawex2_WaitForVerticalBlank(IDirectDraw2 *iface, DWORD f
{
struct ddrawex *ddrawex = 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 ddrawex4_WaitForVerticalBlank(&ddrawex->IDirectDraw4_iface, flags, event);
}
@@ -1185,7 +1185,7 @@ static HRESULT WINAPI ddrawex1_WaitForVerticalBlank(IDirectDraw *iface, DWORD fl
{
struct ddrawex *ddrawex = 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 ddrawex4_WaitForVerticalBlank(&ddrawex->IDirectDraw4_iface, flags, event);
}
@@ -1292,7 +1292,7 @@ static HRESULT WINAPI ddrawex4_GetDeviceIdentifier(IDirectDraw4 *iface,
{
struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface);
- TRACE("iface %p, identifier %p, flags %#x.\n", iface, identifier, flags);
+ TRACE("iface %p, identifier %p, flags %#lx.\n", iface, identifier, flags);
return IDirectDraw4_GetDeviceIdentifier(ddrawex->parent, identifier, flags);
}
@@ -1420,7 +1420,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID
struct ddrawex *object;
HRESULT hr;
- TRACE("iface %p, guid %s, window %p, coop_level %#x, reserved %#x, outer_unknown %p, ddraw %p.\n",
+ TRACE("iface %p, guid %s, window %p, coop_level %#lx, reserved %#lx, outer_unknown %p, ddraw %p.\n",
iface, debugstr_guid(guid), window, coop_level, reserved, outer_unknown, ddraw);
if (outer_unknown)
diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c
index 8ecc24f824c..fd6d7219c12 100644
--- a/dlls/ddrawex/main.c
+++ b/dlls/ddrawex/main.c
@@ -69,7 +69,7 @@ static ULONG WINAPI ddrawex_class_factory_AddRef(IClassFactory *iface)
struct ddrawex_class_factory *factory = impl_from_IClassFactory(iface);
ULONG refcount = InterlockedIncrement(&factory->ref);
- TRACE("%p increasing refcount to %u.\n", iface, refcount);
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
@@ -79,7 +79,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface)
struct ddrawex_class_factory *factory = impl_from_IClassFactory(iface);
ULONG refcount = InterlockedDecrement(&factory->ref);
- TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
heap_free(factory);
@@ -148,7 +148,7 @@ static ULONG WINAPI ddrawex_factory_AddRef(IDirectDrawFactory *iface)
struct ddrawex_factory *factory = impl_from_IDirectDrawFactory(iface);
ULONG refcount = InterlockedIncrement(&factory->ref);
- TRACE("%p increasing refcount to %u.\n", iface, refcount);
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
@@ -158,7 +158,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface)
struct ddrawex_factory *factory = impl_from_IDirectDrawFactory(iface);
ULONG refcount = InterlockedDecrement(&factory->ref);
- TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
heap_free(factory);
diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c
index 9fcda86979f..cc18494905c 100644
--- a/dlls/ddrawex/surface.c
+++ b/dlls/ddrawex/surface.c
@@ -99,7 +99,7 @@ static ULONG WINAPI ddrawex_surface4_AddRef(IDirectDrawSurface4 *iface)
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
ULONG refcount = InterlockedIncrement(&surface->ref);
- TRACE("%p increasing refcount to %u.\n", iface, refcount);
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
@@ -118,7 +118,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface)
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
ULONG refcount = InterlockedDecrement(&surface->ref);
- TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
{
@@ -186,7 +186,7 @@ static HRESULT WINAPI ddrawex_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst
struct ddrawex_surface *dst = impl_from_IDirectDrawSurface4(iface);
struct ddrawex_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 IDirectDrawSurface4_Blt(dst->parent, dst_rect, src ? src->parent : NULL, src_rect, flags, fx);
@@ -198,7 +198,7 @@ static HRESULT WINAPI ddrawex_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst
struct ddrawex_surface *dst = impl_from_IDirectDrawSurface3(iface);
struct ddrawex_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 ddrawex_surface4_Blt(&dst->IDirectDrawSurface4_iface, dst_rect,
@@ -210,7 +210,7 @@ static HRESULT WINAPI ddrawex_surface4_BltBatch(IDirectDrawSurface4 *iface,
{
struct ddrawex_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 IDirectDrawSurface4_BltBatch(surface->parent, batch, count, flags);
}
@@ -220,7 +220,7 @@ static HRESULT WINAPI ddrawex_surface3_BltBatch(IDirectDrawSurface3 *iface,
{
struct ddrawex_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 ddrawex_surface4_BltBatch(&surface->IDirectDrawSurface4_iface, batch, count, flags);
}
@@ -231,7 +231,7 @@ static HRESULT WINAPI ddrawex_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD
struct ddrawex_surface *dst = impl_from_IDirectDrawSurface4(iface);
struct ddrawex_surface *src = 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 IDirectDrawSurface4_BltFast(dst->parent, dst_x, dst_y,
@@ -244,7 +244,7 @@ static HRESULT WINAPI ddrawex_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD
struct ddrawex_surface *dst = impl_from_IDirectDrawSurface3(iface);
struct ddrawex_surface *src = 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 ddrawex_surface4_BltFast(&dst->IDirectDrawSurface4_iface, dst_x, dst_y,
@@ -257,7 +257,7 @@ static HRESULT WINAPI ddrawex_surface4_DeleteAttachedSurface(IDirectDrawSurface4
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
struct ddrawex_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 IDirectDrawSurface4_DeleteAttachedSurface(surface->parent,
flags, attachment_impl ? attachment_impl->parent : NULL);
@@ -269,7 +269,7 @@ static HRESULT WINAPI ddrawex_surface3_DeleteAttachedSurface(IDirectDrawSurface3
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
struct ddrawex_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 ddrawex_surface4_DeleteAttachedSurface(&surface->IDirectDrawSurface4_iface,
flags, attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL);
@@ -345,7 +345,7 @@ static HRESULT WINAPI ddrawex_surface4_EnumOverlayZOrders(IDirectDrawSurface4 *i
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
struct enumsurfaces_wrap cb_ctx;
- TRACE("iface %p, flags %#x, ctx %p, cb %p.\n", iface, flags, ctx, cb);
+ TRACE("iface %p, flags %#lx, ctx %p, cb %p.\n", iface, flags, ctx, cb);
cb_ctx.orig_cb = cb;
cb_ctx.orig_ctx = ctx;
@@ -358,7 +358,7 @@ static HRESULT WINAPI ddrawex_surface3_EnumOverlayZOrders(IDirectDrawSurface3 *i
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
struct enumsurfaces_thunk cb_ctx;
- TRACE("iface %p, flags %#x, ctx %p, cb %p.\n", iface, flags, ctx, cb);
+ TRACE("iface %p, flags %#lx, ctx %p, cb %p.\n", iface, flags, ctx, cb);
cb_ctx.orig_cb = cb;
cb_ctx.orig_ctx = ctx;
@@ -371,7 +371,7 @@ static HRESULT WINAPI ddrawex_surface4_Flip(IDirectDrawSurface4 *iface, IDirectD
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
struct ddrawex_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst);
- TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags);
+ TRACE("iface %p, dst %p, flags %#lx.\n", iface, dst, flags);
return IDirectDrawSurface4_Flip(surface->parent, dst_impl ? dst_impl->parent : NULL, flags);
}
@@ -381,7 +381,7 @@ static HRESULT WINAPI ddrawex_surface3_Flip(IDirectDrawSurface3 *iface, IDirectD
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
struct ddrawex_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst);
- TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags);
+ TRACE("iface %p, dst %p, flags %#lx.\n", iface, dst, flags);
return ddrawex_surface4_Flip(&surface->IDirectDrawSurface4_iface,
dst_impl ? &dst_impl->IDirectDrawSurface4_iface : NULL, flags);
@@ -437,7 +437,7 @@ static HRESULT WINAPI ddrawex_surface4_GetBltStatus(IDirectDrawSurface4 *iface,
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return IDirectDrawSurface4_GetBltStatus(surface->parent, flags);
}
@@ -446,7 +446,7 @@ static HRESULT WINAPI ddrawex_surface3_GetBltStatus(IDirectDrawSurface3 *iface,
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddrawex_surface4_GetBltStatus(&surface->IDirectDrawSurface4_iface, flags);
}
@@ -497,7 +497,7 @@ static HRESULT WINAPI ddrawex_surface4_GetColorKey(IDirectDrawSurface4 *iface, D
{
struct ddrawex_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 IDirectDrawSurface4_GetColorKey(surface->parent, flags, color_key);
}
@@ -506,7 +506,7 @@ static HRESULT WINAPI ddrawex_surface3_GetColorKey(IDirectDrawSurface3 *iface, D
{
struct ddrawex_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 ddrawex_surface4_GetColorKey(&surface->IDirectDrawSurface4_iface, flags, color_key);
}
@@ -540,7 +540,7 @@ static HRESULT WINAPI ddrawex_surface4_GetFlipStatus(IDirectDrawSurface4 *iface,
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return IDirectDrawSurface4_GetFlipStatus(surface->parent, flags);
}
@@ -549,7 +549,7 @@ static HRESULT WINAPI ddrawex_surface3_GetFlipStatus(IDirectDrawSurface3 *iface,
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddrawex_surface4_GetFlipStatus(&surface->IDirectDrawSurface4_iface, flags);
}
@@ -697,7 +697,7 @@ static HRESULT WINAPI ddrawex_surface4_Lock(IDirectDrawSurface4 *iface, RECT *re
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
HRESULT hr;
- TRACE("iface %p, rect %s, desc %p, flags %#x, h %p.\n",
+ TRACE("iface %p, rect %s, desc %p, flags %#lx, h %p.\n",
iface, wine_dbgstr_rect(rect), desc, flags, h);
if (SUCCEEDED(hr = IDirectDrawSurface4_Lock(surface->parent, rect, desc, flags, h))
@@ -717,7 +717,7 @@ static HRESULT WINAPI ddrawex_surface3_Lock(IDirectDrawSurface3 *iface, RECT *re
DDSURFACEDESC2 ddsd2;
HRESULT hr;
- TRACE("iface %p, rect %s, desc %p, flags %#x, h %p.\n",
+ TRACE("iface %p, rect %s, desc %p, flags %#lx, h %p.\n",
iface, wine_dbgstr_rect(rect), desc, flags, h);
memset(&ddsd2, 0, sizeof(ddsd2));
@@ -793,7 +793,7 @@ static HRESULT WINAPI ddrawex_surface4_SetColorKey(IDirectDrawSurface4 *iface,
{
struct ddrawex_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 IDirectDrawSurface4_SetColorKey(surface->parent, flags, color_key);
}
@@ -803,7 +803,7 @@ static HRESULT WINAPI ddrawex_surface3_SetColorKey(IDirectDrawSurface3 *iface,
{
struct ddrawex_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 ddrawex_surface4_SetColorKey(&surface->IDirectDrawSurface4_iface, flags, color_key);
}
@@ -812,7 +812,7 @@ static HRESULT WINAPI ddrawex_surface4_SetOverlayPosition(IDirectDrawSurface4 *i
{
struct ddrawex_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 IDirectDrawSurface4_SetOverlayPosition(surface->parent, x, y);
}
@@ -821,7 +821,7 @@ static HRESULT WINAPI ddrawex_surface3_SetOverlayPosition(IDirectDrawSurface3 *i
{
struct ddrawex_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 ddrawex_surface4_SetOverlayPosition(&surface->IDirectDrawSurface4_iface, x, y);
}
@@ -868,7 +868,7 @@ static HRESULT WINAPI ddrawex_surface4_UpdateOverlay(IDirectDrawSurface4 *iface,
struct ddrawex_surface *src_impl = impl_from_IDirectDrawSurface4(iface);
struct ddrawex_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 IDirectDrawSurface4_UpdateOverlay(src_impl->parent, src_rect,
@@ -881,7 +881,7 @@ static HRESULT WINAPI ddrawex_surface3_UpdateOverlay(IDirectDrawSurface3 *iface,
struct ddrawex_surface *src_impl = impl_from_IDirectDrawSurface3(iface);
struct ddrawex_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 ddrawex_surface4_UpdateOverlay(&src_impl->IDirectDrawSurface4_iface, src_rect,
@@ -892,7 +892,7 @@ static HRESULT WINAPI ddrawex_surface4_UpdateOverlayDisplay(IDirectDrawSurface4
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return IDirectDrawSurface4_UpdateOverlayDisplay(surface->parent, flags);
}
@@ -901,7 +901,7 @@ static HRESULT WINAPI ddrawex_surface3_UpdateOverlayDisplay(IDirectDrawSurface3
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddrawex_surface4_UpdateOverlayDisplay(&surface->IDirectDrawSurface4_iface, flags);
}
@@ -912,7 +912,7 @@ static HRESULT WINAPI ddrawex_surface4_UpdateOverlayZOrder(IDirectDrawSurface4 *
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
struct ddrawex_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 IDirectDrawSurface4_UpdateOverlayZOrder(surface->parent,
flags, reference_impl ? reference_impl->parent : NULL);
@@ -924,7 +924,7 @@ static HRESULT WINAPI ddrawex_surface3_UpdateOverlayZOrder(IDirectDrawSurface3 *
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
struct ddrawex_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 ddrawex_surface4_UpdateOverlayZOrder(&surface->IDirectDrawSurface4_iface,
flags, reference_impl ? &reference_impl->IDirectDrawSurface4_iface : NULL);
@@ -957,7 +957,7 @@ static HRESULT WINAPI ddrawex_surface4_PageLock(IDirectDrawSurface4 *iface, DWOR
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return IDirectDrawSurface4_PageLock(surface->parent, flags);
}
@@ -966,7 +966,7 @@ static HRESULT WINAPI ddrawex_surface3_PageLock(IDirectDrawSurface3 *iface, DWOR
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddrawex_surface4_PageLock(&surface->IDirectDrawSurface4_iface, flags);
}
@@ -975,7 +975,7 @@ static HRESULT WINAPI ddrawex_surface4_PageUnlock(IDirectDrawSurface4 *iface, DW
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return IDirectDrawSurface4_PageUnlock(surface->parent, flags);
}
@@ -984,7 +984,7 @@ static HRESULT WINAPI ddrawex_surface3_PageUnlock(IDirectDrawSurface3 *iface, DW
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
- TRACE("iface %p, flags %#x.\n", iface, flags);
+ TRACE("iface %p, flags %#lx.\n", iface, flags);
return ddrawex_surface4_PageUnlock(&surface->IDirectDrawSurface4_iface, flags);
}
@@ -994,7 +994,7 @@ static HRESULT WINAPI ddrawex_surface4_SetSurfaceDesc(IDirectDrawSurface4 *iface
{
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface);
- TRACE("iface %p, desc %p, flags %#x.\n", iface, desc, flags);
+ TRACE("iface %p, desc %p, flags %#lx.\n", iface, desc, flags);
return IDirectDrawSurface4_SetSurfaceDesc(surface->parent, desc, flags);
}
@@ -1005,7 +1005,7 @@ static HRESULT WINAPI ddrawex_surface3_SetSurfaceDesc(IDirectDrawSurface3 *iface
struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface);
DDSURFACEDESC2 ddsd;
- TRACE("iface %p, desc %p, flags %#x.\n", iface, desc, flags);
+ TRACE("iface %p, desc %p, flags %#lx.\n", iface, desc, flags);
DDSD_to_DDSD2(desc, &ddsd);
return ddrawex_surface4_SetSurfaceDesc(&surface->IDirectDrawSurface4_iface, &ddsd, flags);
@@ -1016,7 +1016,7 @@ static HRESULT WINAPI ddrawex_surface4_SetPrivateData(IDirectDrawSurface4 *iface
{
struct ddrawex_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, data_size, flags);
/* To completely avoid this we'd have to clone the private data API in
--
2.35.1
More information about the wine-devel
mailing list