wineconsole: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Mon Oct 2 16:22:34 CDT 2006
---
programs/wineconsole/Makefile.in | 2 +-
programs/wineconsole/registry.c | 2 +-
programs/wineconsole/user.c | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index 28a036b..335dd4b 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DUNICODE -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -DUNICODE
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c
index ed8a607..67f7577 100644
--- a/programs/wineconsole/registry.c
+++ b/programs/wineconsole/registry.c
@@ -48,7 +48,7 @@ static const WCHAR wszWindowSize[]
void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg)
{
- WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02lx font=%s/%lu hist=%lu/%d flags=%c%c msk=%08lx sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n",
+ WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n",
pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr,
wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2,
cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x',
diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c
index 9053055..2afd47a 100644
--- a/programs/wineconsole/user.c
+++ b/programs/wineconsole/user.c
@@ -277,8 +277,8 @@ static void WCUSER_SetTitle(const struct
void WCUSER_DumpLogFont(const char* pfx, const LOGFONT* lf, DWORD ft)
{
WINE_TRACE_(wc_font)("%s %s%s%s%s\n"
- "\tlf.lfHeight=%ld lf.lfWidth=%ld lf.lfEscapement=%ld lf.lfOrientation=%ld\n"
- "\tlf.lfWeight=%ld lf.lfItalic=%u lf.lfUnderline=%u lf.lfStrikeOut=%u\n"
+ "\tlf.lfHeight=%d lf.lfWidth=%d lf.lfEscapement=%d lf.lfOrientation=%d\n"
+ "\tlf.lfWeight=%d lf.lfItalic=%u lf.lfUnderline=%u lf.lfStrikeOut=%u\n"
"\tlf.lfCharSet=%u lf.lfOutPrecision=%u lf.lfClipPrecision=%u lf.lfQuality=%u\n"
"\tlf->lfPitchAndFamily=%u lf.lfFaceName=%s\n",
pfx,
@@ -295,9 +295,9 @@ void WCUSER_DumpLogFont(const char* pfx,
void WCUSER_DumpTextMetric(const TEXTMETRIC* tm, DWORD ft)
{
WINE_TRACE_(wc_font)("%s%s%s%s\n"
- "\ttmHeight=%ld tmAscent=%ld tmDescent=%ld tmInternalLeading=%ld tmExternalLeading=%ld\n"
- "\ttmAveCharWidth=%ld tmMaxCharWidth=%ld tmWeight=%ld tmOverhang=%ld\n"
- "\ttmDigitizedAspectX=%ld tmDigitizedAspectY=%ld\n"
+ "\ttmHeight=%d tmAscent=%d tmDescent=%d tmInternalLeading=%d tmExternalLeading=%d\n"
+ "\ttmAveCharWidth=%d tmMaxCharWidth=%d tmWeight=%d tmOverhang=%d\n"
+ "\ttmDigitizedAspectX=%d tmDigitizedAspectY=%d\n"
"\ttmFirstChar=%d tmLastChar=%d tmDefaultChar=%d tmBreakChar=%d\n"
"\ttmItalic=%u tmUnderlined=%u tmStruckOut=%u tmPitchAndFamily=%u tmCharSet=%u\n",
(ft & RASTER_FONTTYPE) ? "raster" : "",
--
1.4.2.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061002/e2905240/attachment-0001.pgp
More information about the wine-patches
mailing list