Skip to content

W
wine-cw
Commit d2d33017 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

wrc: Win64 printf format warning fixes.

parent 5664b8ee
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 21 deletions
tools/wrc/Makefile.in
View file @ d2d33017
...@@ -4,7 +4,6 @@ TOPOBJDIR = ../.. ...@@ -4,7 +4,6 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
DEFS = -DWINE_NO_LONG_AS_INT
PROGRAMS = wrc$(EXEEXT) PROGRAMS = wrc$(EXEEXT)
MANPAGES = wrc.man MANPAGES = wrc.man
......
tools/wrc/dumpres.c
View file @ d2d33017
...@@ -203,12 +203,12 @@ static void dump_lvc(const lvc_t *l) ...@@ -203,12 +203,12 @@ static void dump_lvc(const lvc_t *l)
printf("LANGUAGE <not set>\n"); printf("LANGUAGE <not set>\n");
if(l->version) if(l->version)
printf("VERSION %08lx\n", *(l->version)); printf("VERSION %08x\n", *(l->version));
else else
printf("VERSION <not set>\n"); printf("VERSION <not set>\n");
if(l->characts) if(l->characts)
printf("CHARACTERISTICS %08lx\n", *(l->characts)); printf("CHARACTERISTICS %08x\n", *(l->characts));
else else
printf("CHARACTERISTICS <not set>\n"); printf("CHARACTERISTICS <not set>\n");
} }
...@@ -537,16 +537,16 @@ static void dump_control(const control_t *ctrl) ...@@ -537,16 +537,16 @@ static void dump_control(const control_t *ctrl)
{ {
assert(ctrl->style != NULL); assert(ctrl->style != NULL);
assert(ctrl->style->and_mask == 0); 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) if(ctrl->gotexstyle)
{ {
assert(ctrl->exstyle != NULL); assert(ctrl->exstyle != NULL);
assert(ctrl->exstyle->and_mask == 0); 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) if(ctrl->gothelpid)
printf("\tHelpid: %ld\n", ctrl->helpid); printf("\tHelpid: %d\n", ctrl->helpid);
if(ctrl->extra) if(ctrl->extra)
{ {
printf("\t"); printf("\t");
...@@ -577,14 +577,14 @@ static void dump_dialog(const dialog_t *dlg) ...@@ -577,14 +577,14 @@ static void dump_dialog(const dialog_t *dlg)
{ {
assert(dlg->style != NULL); assert(dlg->style != NULL);
assert(dlg->style->and_mask == 0); 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) if(dlg->gotexstyle)
{ {
assert(dlg->exstyle != NULL); assert(dlg->exstyle != NULL);
assert(dlg->exstyle->and_mask == 0); 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("Menu: %s\n", get_nameid_str(dlg->menu));
printf("Class: %s\n", get_nameid_str(dlg->dlgclass)); printf("Class: %s\n", get_nameid_str(dlg->dlgclass));
...@@ -627,16 +627,16 @@ static void dump_dialogex(const dialogex_t *dlgex) ...@@ -627,16 +627,16 @@ static void dump_dialogex(const dialogex_t *dlgex)
{ {
assert(dlgex->style != NULL); assert(dlgex->style != NULL);
assert(dlgex->style->and_mask == 0); 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) if(dlgex->gotexstyle)
{ {
assert(dlgex->exstyle != NULL); assert(dlgex->exstyle != NULL);
assert(dlgex->exstyle->and_mask == 0); 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) 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("Menu: %s\n", get_nameid_str(dlgex->menu));
printf("Class: %s\n", get_nameid_str(dlgex->dlgclass)); printf("Class: %s\n", get_nameid_str(dlgex->dlgclass));
printf("Title: "); print_string(dlgex->title); printf("\n"); printf("Title: "); print_string(dlgex->title); printf("\n");
...@@ -683,7 +683,7 @@ static void dump_menu_item(const menu_item_t *item) ...@@ -683,7 +683,7 @@ static void dump_menu_item(const menu_item_t *item)
if(item->name) if(item->name)
{ {
print_string(item->name); print_string(item->name);
printf(", %d, %08lx", item->id, item->state); printf(", %d, %08x", item->id, item->state);
} }
else else
printf("SEPARATOR"); printf("SEPARATOR");
...@@ -732,9 +732,9 @@ static void dump_menuex_item(const menuex_item_t *item) ...@@ -732,9 +732,9 @@ static void dump_menuex_item(const menuex_item_t *item)
if(item->gotid) if(item->gotid)
printf(", Id=%d", item->id); printf(", Id=%d", item->id);
if(item->gottype) if(item->gottype)
printf(", Type=%ld", item->type); printf(", Type=%d", item->type);
if(item->gotstate) if(item->gotstate)
printf(", State=%08lx", item->state); printf(", State=%08x", item->state);
if(item->gothelpid) if(item->gothelpid)
printf(", HelpId=%d", item->helpid); printf(", HelpId=%d", item->helpid);
printf("\n"); printf("\n");
...@@ -749,9 +749,9 @@ static void dump_menuex_item(const menuex_item_t *item) ...@@ -749,9 +749,9 @@ static void dump_menuex_item(const menuex_item_t *item)
if(item->gotid) if(item->gotid)
printf(", Id=%d", item->id); printf(", Id=%d", item->id);
if(item->gottype) if(item->gottype)
printf(", Type=%ld", item->type); printf(", Type=%d", item->type);
if(item->gotstate) if(item->gotstate)
printf(", State=%08lx", item->state); printf(", State=%08x", item->state);
if(item->gothelpid) if(item->gothelpid)
printf(", HelpId=%d", item->helpid); printf(", HelpId=%d", item->helpid);
} }
......
tools/wrc/newstruc.c
View file @ d2d33017
...@@ -327,7 +327,7 @@ static int convert_bitmap(char *data, int size) ...@@ -327,7 +327,7 @@ static int convert_bitmap(char *data, int size)
type |= FL_SIZEBE | FL_OS2; type |= FL_SIZEBE | FL_OS2;
} }
else else
parser_error("Invalid bitmap format, bih->biSize = %ld", bih->biSize); parser_error("Invalid bitmap format, bih->biSize = %d", bih->biSize);
switch(type) switch(type)
{ {
...@@ -1043,7 +1043,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt) ...@@ -1043,7 +1043,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) for(id = mbp[i].idlo; id <= mbp[i].idhi; id++)
{ {
if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) 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 */ if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */
{ {
WORD *wp = (WORD *)&mep[1]; WORD *wp = (WORD *)&mep[1];
...@@ -1051,7 +1051,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt) ...@@ -1051,7 +1051,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
int n; int n;
if(mep->length & 1) 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++) for(n = 0; n < l; n++)
wp[n] = BYTESWAP_WORD(wp[n]); wp[n] = BYTESWAP_WORD(wp[n]);
...@@ -1096,7 +1096,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt) ...@@ -1096,7 +1096,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
mep->flags = BYTESWAP_WORD(mep->flags); mep->flags = BYTESWAP_WORD(mep->flags);
if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) 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 */ if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */
{ {
WORD *wp = (WORD *)&mep[1]; WORD *wp = (WORD *)&mep[1];
...@@ -1104,7 +1104,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt) ...@@ -1104,7 +1104,7 @@ messagetable_t *new_messagetable(raw_data_t *rd, int *memopt)
int n; int n;
if(mep->length & 1) 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++) for(n = 0; n < l; n++)
wp[n] = BYTESWAP_WORD(wp[n]); wp[n] = BYTESWAP_WORD(wp[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