Module: wine Branch: master Commit: d2d330174f542058ce155f1737030508aca72b58 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2d330174f542058ce155f17...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Sep 29 21:32:48 2006 +0200
wrc: Win64 printf format warning fixes.
---
tools/wrc/Makefile.in | 1 - tools/wrc/dumpres.c | 30 +++++++++++++++--------------- tools/wrc/newstruc.c | 10 +++++----- 3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 5b30f48..e0efa18 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -4,7 +4,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ -DEFS = -DWINE_NO_LONG_AS_INT
PROGRAMS = wrc$(EXEEXT) MANPAGES = wrc.man diff --git a/tools/wrc/dumpres.c b/tools/wrc/dumpres.c index afc757d..fdaecb0 100644 --- a/tools/wrc/dumpres.c +++ b/tools/wrc/dumpres.c @@ -203,12 +203,12 @@ static void dump_lvc(const lvc_t *l) printf("LANGUAGE <not set>\n");
if(l->version) - printf("VERSION %08lx\n", *(l->version)); + printf("VERSION %08x\n", *(l->version)); else printf("VERSION <not set>\n");
if(l->characts) - printf("CHARACTERISTICS %08lx\n", *(l->characts)); + printf("CHARACTERISTICS %08x\n", *(l->characts)); else printf("CHARACTERISTICS <not set>\n"); } @@ -537,16 +537,16 @@ static void dump_control(const control_t { assert(ctrl->style != NULL); assert(ctrl->style->and_mask == 0); - printf("\tStyle: %08lx\n", ctrl->style->or_mask); + printf("\tStyle: %08x\n", ctrl->style->or_mask); } if(ctrl->gotexstyle) { assert(ctrl->exstyle != NULL); assert(ctrl->exstyle->and_mask == 0); - printf("\tExStyle: %08lx\n", ctrl->exstyle->or_mask); + printf("\tExStyle: %08x\n", ctrl->exstyle->or_mask); } if(ctrl->gothelpid) - printf("\tHelpid: %ld\n", ctrl->helpid); + printf("\tHelpid: %d\n", ctrl->helpid); if(ctrl->extra) { printf("\t"); @@ -577,14 +577,14 @@ static void dump_dialog(const dialog_t * { assert(dlg->style != NULL); assert(dlg->style->and_mask == 0); - printf("Style: %08lx\n", dlg->style->or_mask); + printf("Style: %08x\n", dlg->style->or_mask);
} if(dlg->gotexstyle) { assert(dlg->exstyle != NULL); assert(dlg->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlg->exstyle->or_mask); + printf("ExStyle: %08x\n", dlg->exstyle->or_mask); } printf("Menu: %s\n", get_nameid_str(dlg->menu)); printf("Class: %s\n", get_nameid_str(dlg->dlgclass)); @@ -627,16 +627,16 @@ static void dump_dialogex(const dialogex { assert(dlgex->style != NULL); assert(dlgex->style->and_mask == 0); - printf("Style: %08lx\n", dlgex->style->or_mask); + printf("Style: %08x\n", dlgex->style->or_mask); } if(dlgex->gotexstyle) { assert(dlgex->exstyle != NULL); assert(dlgex->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlgex->exstyle->or_mask); + printf("ExStyle: %08x\n", dlgex->exstyle->or_mask); } if(dlgex->gothelpid) - printf("Helpid: %ld\n", dlgex->helpid); + printf("Helpid: %d\n", dlgex->helpid); printf("Menu: %s\n", get_nameid_str(dlgex->menu)); printf("Class: %s\n", get_nameid_str(dlgex->dlgclass)); printf("Title: "); print_string(dlgex->title); printf("\n"); @@ -683,7 +683,7 @@ static void dump_menu_item(const menu_it if(item->name) { print_string(item->name); - printf(", %d, %08lx", item->id, item->state); + printf(", %d, %08x", item->id, item->state); } else printf("SEPARATOR"); @@ -732,9 +732,9 @@ static void dump_menuex_item(const menue if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%d", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); printf("\n"); @@ -749,9 +749,9 @@ static void dump_menuex_item(const menue if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%d", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); } diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 4df8c9d..9c215e4 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -327,7 +327,7 @@ #endif type |= FL_SIZEBE | FL_OS2; } else - parser_error("Invalid bitmap format, bih->biSize = %ld", bih->biSize); + parser_error("Invalid bitmap format, bih->biSize = %d", bih->biSize);
switch(type) { @@ -1043,7 +1043,7 @@ #endif for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) { if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - parser_error("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + parser_error("Messagetable's data for block %d, ID 0x%08x is outside of defined data", i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1051,7 +1051,7 @@ #endif int n;
if(mep->length & 1) - parser_error("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + parser_error("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]);
@@ -1096,7 +1096,7 @@ #endif mep->flags = BYTESWAP_WORD(mep->flags);
if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - parser_error("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + parser_error("Messagetable's data for block %d, ID 0x%08x is outside of defined data", i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1104,7 +1104,7 @@ #endif int n;
if(mep->length & 1) - parser_error("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + parser_error("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]);