[PATCH] ddraw: Improve tracing format for unsigned fields.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/ddraw/ddraw.c         |  2 +-
 dlls/ddraw/device.c        |  2 +-
 dlls/ddraw/executebuffer.c | 16 ++++++++--------
 dlls/ddraw/material.c      |  2 +-
 dlls/ddraw/utils.c         | 12 ++++++------
 dlls/ddraw/viewport.c      |  8 ++++----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 10086a1bae7..f6770e59fb6 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -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 %ldx%ldx%ld @%ld\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount,
+            TRACE("Enumerating %lux%lux%lu @%lu\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount,
               callback_sd.u2.dwRefreshRate);
 
             if(cb(&callback_sd, Context) == DDENUMRET_CANCEL)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 0795d0e3552..27b650036cf 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -1350,7 +1350,7 @@ static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIX
 
     *D3DMatHandle = h + 1;
 
-    TRACE(" returning matrix handle %lx\n", *D3DMatHandle);
+    TRACE(" returning matrix handle %#lx\n", *D3DMatHandle);
 
     wined3d_mutex_unlock();
 
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index a6c367bd8ef..2f4c121789d 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -31,17 +31,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
  *****************************************************************************/
 
 static void _dump_executedata(const D3DEXECUTEDATA *lpData) {
-    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);
+    TRACE("dwSize : %lu\n", lpData->dwSize);
+    TRACE("Vertex      Offset : %lu  Count  : %lu\n", lpData->dwVertexOffset, lpData->dwVertexCount);
+    TRACE("Instruction Offset : %lu  Length : %lu\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
+    TRACE("HVertex     Offset : %lu\n", lpData->dwHVertexOffset);
 }
 
 static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) {
-    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("dwSize       : %lu\n", lpDesc->dwSize);
+    TRACE("dwFlags      : %#lx\n", lpDesc->dwFlags);
+    TRACE("dwCaps       : %#lx\n", lpDesc->dwCaps);
+    TRACE("dwBufferSize : %lu\n", lpDesc->dwBufferSize);
     TRACE("lpData       : %p\n", lpDesc->lpData);
 }
 
diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index 755c9923597..5bf2fcc7f9b 100644
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static void dump_material(const D3DMATERIAL *mat)
 {
-    TRACE("  dwSize : %ld\n", mat->dwSize);
+    TRACE("  dwSize : %lu\n", mat->dwSize);
 }
 
 static inline struct d3d_material *impl_from_IDirect3DMaterial(IDirect3DMaterial *iface)
diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c
index 663f97760ef..c2794824e9e 100644
--- a/dlls/ddraw/utils.c
+++ b/dlls/ddraw/utils.c
@@ -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%lx.\n", DDPixelFormat->u1.dwLuminanceBitCount);
+                    WARN("Unknown luminance-only bit depth %lu.\n", DDPixelFormat->u1.dwLuminanceBitCount);
                     return WINED3DFMT_UNKNOWN;
              }
         }
@@ -1138,7 +1138,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
         FE(DDSVCAPS_STEREOSEQUENTIAL),
     };
 
-    TRACE(" - dwSize : %ld\n", lpcaps->dwSize);
+    TRACE(" - dwSize : %lu\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 : %ld\n", lpcaps->dwNumFourCCCodes);
-    TRACE(" - dwCurrVisibleOverlays : %ld\n", lpcaps->dwCurrVisibleOverlays);
-    TRACE(" - dwMinOverlayStretch : %ld\n", lpcaps->dwMinOverlayStretch);
-    TRACE(" - dwMaxOverlayStretch : %ld\n", lpcaps->dwMaxOverlayStretch);
+    TRACE(" - dwNumFourCCCodes : %lu\n", lpcaps->dwNumFourCCCodes);
+    TRACE(" - dwCurrVisibleOverlays : %lu\n", lpcaps->dwCurrVisibleOverlays);
+    TRACE(" - dwMinOverlayStretch : %lu\n", lpcaps->dwMinOverlayStretch);
+    TRACE(" - dwMaxOverlayStretch : %lu\n", lpcaps->dwMaxOverlayStretch);
     TRACE("...\n");
     TRACE(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps);
 }
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 77b85118a4a..83c88f48691 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -181,9 +181,9 @@ void viewport_free_active_light_index(struct d3d_light *light)
  *****************************************************************************/
 static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp)
 {
-    TRACE("    - dwSize = %ld   dwX = %ld   dwY = %ld\n",
+    TRACE("    - dwSize = %lu   dwX = %lu   dwY = %lu\n",
             lpvp->dwSize, lpvp->dwX, lpvp->dwY);
-    TRACE("    - dwWidth = %ld   dwHeight = %ld\n",
+    TRACE("    - dwWidth = %lu   dwHeight = %lu\n",
             lpvp->dwWidth, lpvp->dwHeight);
     TRACE("    - dvScaleX = %f   dvScaleY = %f\n",
             lpvp->dvScaleX, lpvp->dvScaleY);
@@ -195,9 +195,9 @@ static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp)
 
 static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp)
 {
-    TRACE("    - dwSize = %ld   dwX = %ld   dwY = %ld\n",
+    TRACE("    - dwSize = %lu   dwX = %lu   dwY = %lu\n",
             lpvp->dwSize, lpvp->dwX, lpvp->dwY);
-    TRACE("    - dwWidth = %ld   dwHeight = %ld\n",
+    TRACE("    - dwWidth = %lu   dwHeight = %lu\n",
             lpvp->dwWidth, lpvp->dwHeight);
     TRACE("    - dvClipX = %f   dvClipY = %f\n",
             lpvp->dvClipX, lpvp->dvClipY);
-- 
2.35.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=112988

Your paranoid android.


=== debian11 (32 bit Chinese:China report) ===

Report validation errors:
ddraw7: Timeout

=== debian11 (build log) ===

WineRunWineTest.pl:error: The task timed out

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>