Piotr Caban : ntdll: Fix 64-bit values printing in relay.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1d093acc1fb17d2125076180578b2ab3b2fdef3e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1d093acc1fb17d21250761805...

Author: Piotr Caban 
Date:   Mon Jul  6 15:01:02 2020 +0200

ntdll: Fix 64-bit values printing in relay.

Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard

---

dlls/ntdll/relay.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c
index ffc4a71925..e159631249 100644
--- a/dlls/ntdll/relay.c
+++ b/dlls/ntdll/relay.c
@@ -305,14 +305,14 @@ static const char *func_name( struct relay_private_data *data, unsigned int ordi

static void trace_string_a( INT_PTR ptr )
 {
-    if (!IS_INTARG( ptr )) TRACE( "%08lx %s", ptr, debugstr_a( (char *)ptr ));
-    else TRACE( "%08lx", ptr );
+    if (!IS_INTARG( ptr )) TRACE( "%08Ix %s", ptr, debugstr_a( (char *)ptr ));
+    else TRACE( "%08Ix", ptr );
 }

static void trace_string_w( INT_PTR ptr )
 {
-    if (!IS_INTARG( ptr )) TRACE( "%08lx %s", ptr, debugstr_w( (WCHAR *)ptr ));
-    else TRACE( "%08lx", ptr );
+    if (!IS_INTARG( ptr )) TRACE( "%08Ix %s", ptr, debugstr_w( (WCHAR *)ptr ));
+    else TRACE( "%08Ix", ptr );
 }

#ifdef __i386__
@@ -635,13 +635,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
             break;
         case 'i': /* long */
         default:
-            TRACE( "%08lx", stack[i] );
+            TRACE( "%08zx", stack[i] );
             break;
         }
         if (!is_ret_val( arg_types[i + 1] )) TRACE( "," );
     }
     *nb_args = i;
-    TRACE( ") ret=%08lx\n", stack[-1] );
+    TRACE( ") ret=%08zx\n", stack[-1] );
     return entry_point->orig_func;
 }

@@ -651,7 +651,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
 DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx,
                                               INT_PTR retaddr, INT_PTR retval )
 {
-    TRACE( "\1Ret  %s() retval=%08lx ret=%08lx\n",
+    TRACE( "\1Ret  %s() retval=%08zx ret=%08zx\n",
            func_name( descr->private, LOWORD(idx) ), retval, retaddr );
 }

@@ -741,13 +741,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
             break;
         case 'i': /* long */
         default:
-            TRACE( "%08lx", stack[i] );
+            TRACE( "%08zx", stack[i] );
             break;
         }
         if (!is_ret_val( arg_types[i+1] )) TRACE( "," );
     }
     *nb_args = i;
-    TRACE( ") ret=%08lx\n", stack[-1] );
+    TRACE( ") ret=%08zx\n", stack[-1] );
     return entry_point->orig_func;
 }

@@ -757,7 +757,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
 DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx,
                                               INT_PTR retaddr, INT_PTR retval )
 {
-    TRACE( "\1Ret  %s() retval=%08lx ret=%08lx\n",
+    TRACE( "\1Ret  %s() retval=%08zx ret=%08zx\n",
            func_name( descr->private, LOWORD(idx) ), retval, retaddr );
 }