Skip to content

W
wine-winehq
Commit 8e58cbd8 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Use pf_integer_conv when displaying pointers.

parent 0f9f0a16
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
dlls/msvcrt/printf.h
View file @ 8e58cbd8
...@@ -478,13 +478,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API ...@@ -478,13 +478,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API
i = FUNC_NAME(pf_handle_string)(pf_puts, puts_ctx, &ch, 1, &flags, locale); i = FUNC_NAME(pf_handle_string)(pf_puts, puts_ctx, &ch, 1, &flags, locale);
} else if(flags.Format == 'p') { } else if(flags.Format == 'p') {
void *ptr = pf_args(args_ctx, pos, VT_PTR, &valist).get_ptr; flags.Format = 'X';
flags.PadZero = '0';
i = flags.Precision;
flags.Precision = 2*sizeof(void*);
FUNC_NAME(pf_integer_conv)(buf, sizeof(buf), &flags,
pf_args(args_ctx, pos, VT_INT, &valist).get_int);
flags.PadZero = 0; flags.PadZero = 0;
if(flags.Alternate) flags.Precision = i;
sprintf(buf, "0X%0*lX", 2*(int)sizeof(ptr), (ULONG_PTR)ptr);
else
sprintf(buf, "%0*lX", 2*(int)sizeof(ptr), (ULONG_PTR)ptr);
i = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, buf, -1, &flags, locale); i = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, buf, -1, &flags, locale);
} else if(flags.Format == 'n') { } else if(flags.Format == 'n') {
......
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