wrc: Use BOOL type where appropriate
Frédéric Delanoy
frederic.delanoy at gmail.com
Thu May 8 04:50:19 CDT 2014
---
tools/wrc/genres.c | 2 +-
tools/wrc/newstruc.c | 32 +++---
tools/wrc/parser.y | 6 +-
tools/wrc/readres.c | 8 +-
tools/wrc/translation.c | 293 ++++++++++++++++++++++++------------------------
tools/wrc/utils.c | 21 ++--
tools/wrc/utils.h | 4 +-
7 files changed, 184 insertions(+), 182 deletions(-)
diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c
index 9cea432..dad0011 100644
--- a/tools/wrc/genres.c
+++ b/tools/wrc/genres.c
@@ -353,7 +353,7 @@ static int parse_accel_string( const string_t *key, int flags )
* Remarks :
*****************************************************************************
*/
-static void put_string(res_t *res, const string_t *str, enum str_e type, int isterm,
+static void put_string(res_t *res, const string_t *str, enum str_e type, BOOL isterm,
const language_t *lang)
{
int cnt, codepage;
diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c
index 7213c8e..41f8f94 100644
--- a/tools/wrc/newstruc.c
+++ b/tools/wrc/newstruc.c
@@ -535,12 +535,12 @@ static void split_icons(raw_data_t *rd, icon_group_t *icog, int *nico)
icon_t *ico;
icon_t *list = NULL;
icon_header_t *ih = (icon_header_t *)rd->data;
- int swap = 0;
+ BOOL swap = FALSE;
if(ih->type == 1)
- swap = 0;
+ swap = FALSE;
else if(BYTESWAP_WORD(ih->type) == 1)
- swap = 1;
+ swap = TRUE;
else
parser_error("Icon resource data has invalid type id %d", ih->type);
@@ -630,12 +630,12 @@ static void split_cursors(raw_data_t *rd, cursor_group_t *curg, int *ncur)
cursor_t *cur;
cursor_t *list = NULL;
cursor_header_t *ch = (cursor_header_t *)rd->data;
- int swap = 0;
+ BOOL swap = FALSE;
if(ch->type == 2)
- swap = 0;
+ swap = FALSE;
else if(BYTESWAP_WORD(ch->type) == 2)
- swap = 1;
+ swap = TRUE;
else
parser_error("Cursor resource data has invalid type id %d", ch->type);
cnt = swap ? BYTESWAP_WORD(ch->count) : ch->count;
@@ -802,7 +802,7 @@ static const char seq[4] = "seq ";
#define NEXT_TAG(p) SKIP_TAG(p,(isswapped ? BYTESWAP_DWORD(p->size) : p->size) + sizeof(*p))
-static void handle_ani_icon(riff_tag_t *rtp, enum res_e type, int isswapped)
+static void handle_ani_icon(riff_tag_t *rtp, enum res_e type, BOOL isswapped)
{
cursor_dir_entry_t *cdp;
cursor_header_t *chp;
@@ -858,7 +858,7 @@ static void handle_ani_icon(riff_tag_t *rtp, enum res_e type, int isswapped)
}
}
-static void handle_ani_list(riff_tag_t *lst, enum res_e type, int isswapped)
+static void handle_ani_list(riff_tag_t *lst, enum res_e type, BOOL isswapped)
{
riff_tag_t *rtp = lst+1; /* Skip the "LIST" tag */
@@ -907,8 +907,8 @@ ani_curico_t *new_ani_curico(enum res_e type, raw_data_t *rd, int *memopt)
{
ani_curico_t *ani = xmalloc(sizeof(ani_curico_t));
riff_tag_t *rtp;
- int isswapped = 0;
- int doswap;
+ BOOL isswapped = FALSE;
+ BOOL doswap;
const char *anistr = type == res_aniico ? "icon" : "cursor";
assert(!memcmp(rd->data, riff, sizeof(riff)));
@@ -917,9 +917,9 @@ ani_curico_t *new_ani_curico(enum res_e type, raw_data_t *rd, int *memopt)
rtp = (riff_tag_t *)rd->data;
if(BYTESWAP_DWORD(rtp->size) + 2*sizeof(DWORD) == rd->size)
- isswapped = 1;
+ isswapped = TRUE;
else if(rtp->size + 2*sizeof(DWORD) == rd->size)
- isswapped = 0;
+ isswapped = FALSE;
else
parser_error("Animated %s has an invalid RIFF length", anistr);
@@ -940,10 +940,10 @@ ani_curico_t *new_ani_curico(enum res_e type, raw_data_t *rd, int *memopt)
* When to swap what:
* isswapped | doswap |
* ----------+--------+---------------------------------
- * 0 | 0 | read native; don't convert
- * 1 | 0 | read swapped size; don't convert
- * 0 | 1 | read native; convert
- * 1 | 1 | read swapped size; convert
+ * FALSE | FALSE | read native; don't convert
+ * TRUE | FALSE | read swapped size; don't convert
+ * FALSE | TRUE | read native; convert
+ * TRUE | TRUE | read swapped size; convert
* Reading swapped size if necessary to calculate in native
* format. E.g. a little-endian source on a big-endian
* processor.
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 0005207..a160c80 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -2700,7 +2700,7 @@ static resource_t *build_fontdirs(resource_t *tail)
{
int j;
WORD cnt;
- int isswapped = 0;
+ BOOL isswapped = FALSE;
if(!fnd[i])
continue;
@@ -2718,9 +2718,9 @@ static resource_t *build_fontdirs(resource_t *tail)
cnt = *(WORD *)fnd[i]->res.fnd->data->data;
if(nlanfnt == cnt)
- isswapped = 0;
+ isswapped = FALSE;
else if(nlanfnt == BYTESWAP_WORD(cnt))
- isswapped = 1;
+ isswapped = TRUE;
else
error("FONTDIR for language %d,%d has wrong count (%d, expected %d)\n",
fnd[i]->lan->id, fnd[i]->lan->sub, cnt, nlanfnt);
diff --git a/tools/wrc/readres.c b/tools/wrc/readres.c
index 9e964a6..7fb7eb5 100644
--- a/tools/wrc/readres.c
+++ b/tools/wrc/readres.c
@@ -349,7 +349,7 @@ resource_t *read_resfile(char *inname)
{
FILE *fp;
struct resheader32 rh;
- int is32bit = 1;
+ BOOL is32bit = TRUE;
resource_t *top;
fp = fopen(inname, "rb");
@@ -358,15 +358,15 @@ resource_t *read_resfile(char *inname)
/* Determine 16 or 32 bit .res file */
if(fread(&rh, 1, sizeof(rh), fp) != sizeof(rh))
- is32bit = 0;
+ is32bit = FALSE;
else
{
if(!memcmp(&emptyheader, &rh, sizeof(rh)))
- is32bit = 1;
+ is32bit = TRUE;
else if(!memcmp(&emptyheaderSWAPPED, &rh, sizeof(rh)))
error("Binary .res-file has its byteorder swapped\n");
else
- is32bit = 0;
+ is32bit = FALSE;
}
if(is32bit && !win32)
diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c
index 00ad268..c52229a 100644
--- a/tools/wrc/translation.c
+++ b/tools/wrc/translation.c
@@ -198,67 +198,67 @@ static const char *get_language_name(int lid) {
}
#endif
-static int compare_accelerator(accelerator_t *accelerator1, accelerator_t *accelerator2) {
- int different = 0;
+static BOOL compare_accelerator(accelerator_t *accelerator1, accelerator_t *accelerator2) {
+ BOOL different = FALSE;
event_t *ev1 = NULL, *ev2 = NULL;
if(!different &&
((accelerator1->memopt != accelerator2->memopt) ||
(accelerator1->lvc.version != accelerator2->lvc.version) ||
(accelerator1->lvc.characts != accelerator2->lvc.characts)))
- different = 1;
+ different = TRUE;
ev1 = accelerator1->events;
ev2 = accelerator2->events;
while(!different && ev1 && ev2) {
if(!different &&
((ev1->id != ev2->id) ||
(ev1->flags != ev2->flags)))
- different = 1;
+ different = TRUE;
ev1 = ev1->next;
ev2 = ev2->next;
}
if(!different &&
((ev1 && !ev2) || (!ev1 && ev2)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_bitmap(bitmap_t *bitmap1, bitmap_t *bitmap2) {
- int different = 0;
+static BOOL compare_bitmap(bitmap_t *bitmap1, bitmap_t *bitmap2) {
+ BOOL different = FALSE;
if(!different &&
((bitmap1->memopt != bitmap2->memopt) ||
(bitmap1->data->lvc.version != bitmap2->data->lvc.version) ||
(bitmap1->data->lvc.characts != bitmap2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_cursor(cursor_t *cursor1, cursor_t *cursor2) {
- int different = 0;
+static BOOL compare_cursor(cursor_t *cursor1, cursor_t *cursor2) {
+ BOOL different = FALSE;
if(!different &&
((cursor1->id != cursor2->id) ||
(cursor1->width != cursor2->width) ||
(cursor1->height != cursor2->height) ||
(cursor1->xhot != cursor2->xhot) ||
(cursor1->yhot != cursor2->yhot)))
- different = 1;
+ different = TRUE;
if(!different &&
((cursor1->lvc.version != cursor2->lvc.version) ||
(cursor1->lvc.characts != cursor2->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_cursor_group(cursor_group_t *cursor_group1, cursor_group_t *cursor_group2) {
- int different = 0;
+static BOOL compare_cursor_group(cursor_group_t *cursor_group1, cursor_group_t *cursor_group2) {
+ BOOL different = FALSE;
cursor_t *cursor1 = NULL, *cursor2 = NULL;
if(!different &&
((cursor_group1->memopt != cursor_group2->memopt) ||
(cursor_group1->lvc.version != cursor_group2->lvc.version) ||
(cursor_group1->lvc.characts != cursor_group2->lvc.characts)))
- different = 1;
+ different = TRUE;
if(!different &&
(cursor_group1->ncursor != cursor_group2->ncursor))
- different = 1;
+ different = TRUE;
if(!different) {
cursor1 = cursor_group1->cursorlist;
cursor2 = cursor_group2->cursorlist;
@@ -270,24 +270,24 @@ static int compare_cursor_group(cursor_group_t *cursor_group1, cursor_group_t *c
if(!different &&
((cursor1 && !cursor2) ||
(!cursor1 && cursor2)))
- different = 1;
+ different = TRUE;
}
return different;
}
-static int compare_control(control_t *control1, control_t *control2) {
- int different = 0;
+static BOOL compare_control(control_t *control1, control_t *control2) {
+ BOOL different = FALSE;
char *nameid = NULL;
int ignore_style;
if(!different &&
((control1 && !control2) ||
(!control1 && control2)))
- different = 1;
+ different = TRUE;
if(different || !control1 || !control2)
return different;
nameid = strdup(get_nameid_str(control1->ctlclass));
if(!different && strcmp(nameid, get_nameid_str(control2->ctlclass)))
- different = 1;
+ different = TRUE;
free(nameid);
if (different)
return different;
@@ -299,76 +299,76 @@ static int compare_control(control_t *control1, control_t *control2) {
if(!different &&
(control1->id != control2->id))
- different = 1;
+ different = TRUE;
if(!different && control1->gotstyle && control2->gotstyle) {
if((!control1->style || !control2->style) ||
(control1->style->and_mask || control2->style->and_mask) ||
((control1->style->or_mask & ~ignore_style) != (control2->style->or_mask & ~ignore_style)))
- different = 1;
+ different = TRUE;
} else if(!different &&
((control1->gotstyle && !control2->gotstyle) ||
(!control1->gotstyle && control2->gotstyle)))
- different = 1;
+ different = TRUE;
if(!different && control1->gotexstyle && control2->gotexstyle) {
if((!control1->exstyle || !control2->exstyle) ||
(control1->exstyle->and_mask || control2->exstyle->and_mask) ||
(control1->exstyle->or_mask != control2->exstyle->or_mask))
- different = 1;
+ different = TRUE;
} else if(!different &&
((control1->gotexstyle && !control2->gotexstyle) ||
(!control1->gotexstyle && control2->gotexstyle)))
- different = 1;
+ different = TRUE;
if(!different && control1->gothelpid && control2->gothelpid) {
if(control1->helpid != control2->helpid)
- different = 1;
+ different = TRUE;
} else if(!different &&
((control1->gothelpid && !control2->gothelpid) ||
(!control1->gothelpid && control2->gothelpid)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_dialog(dialog_t *dialog1, dialog_t *dialog2) {
- int different = 0;
+static BOOL compare_dialog(dialog_t *dialog1, dialog_t *dialog2) {
+ BOOL different = FALSE;
char *nameid = NULL;
control_t *ctrl1, *ctrl2;
if(!different &&
((dialog1->memopt != dialog2->memopt) ||
(dialog1->lvc.version != dialog2->lvc.version) ||
(dialog1->lvc.characts != dialog2->lvc.characts)))
- different = 1;
+ different = TRUE;
if(!different && dialog1->gotstyle && dialog2->gotstyle) {
if((!dialog1->style || !dialog2->style) ||
(dialog1->style->and_mask || dialog2->style->and_mask) ||
(dialog1->style->or_mask != dialog2->style->or_mask))
- different = 1;
+ different = TRUE;
} else if(!different &&
((dialog1->gotstyle && !dialog2->gotstyle) ||
(!dialog1->gotstyle && dialog2->gotstyle)))
- different = 1;
+ different = TRUE;
if(!different && dialog1->gotexstyle && dialog2->gotexstyle) {
if((!dialog1->exstyle || !dialog2->exstyle) ||
(dialog1->exstyle->and_mask || dialog2->exstyle->and_mask) ||
(dialog1->exstyle->or_mask != dialog2->exstyle->or_mask))
- different = 1;
+ different = TRUE;
} else if(!different &&
((dialog1->gotexstyle && !dialog2->gotexstyle) ||
(!dialog1->gotexstyle && dialog2->gotexstyle)))
- different = 1;
+ different = TRUE;
if(!different && dialog1->gothelpid && dialog2->gothelpid) {
if(dialog1->helpid != dialog2->helpid)
- different = 1;
+ different = TRUE;
} else if(!different &&
((dialog1->gothelpid && !dialog2->gothelpid) ||
(!dialog1->gothelpid && dialog2->gothelpid)))
- different = 1;
+ different = TRUE;
nameid = strdup(get_nameid_str(dialog1->menu));
if(!different && strcmp(nameid, get_nameid_str(dialog2->menu)))
- different = 1;
+ different = TRUE;
free(nameid);
nameid = strdup(get_nameid_str(dialog1->dlgclass));
if(!different && strcmp(nameid, get_nameid_str(dialog2->dlgclass)))
- different = 1;
+ different = TRUE;
free(nameid);
ctrl1 = dialog1->controls;
@@ -382,51 +382,51 @@ static int compare_dialog(dialog_t *dialog1, dialog_t *dialog2) {
return different;
}
-static int compare_font(font_t *font1, font_t *font2) {
- int different = 0;
+static BOOL compare_font(font_t *font1, font_t *font2) {
+ BOOL different = FALSE;
if(!different &&
((font1->memopt != font2->memopt) ||
(font1->data->lvc.version != font2->data->lvc.version) ||
(font1->data->lvc.characts != font2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_fontdir(fontdir_t *fontdir1, fontdir_t *fontdir2) {
- int different = 0;
+static BOOL compare_fontdir(fontdir_t *fontdir1, fontdir_t *fontdir2) {
+ BOOL different = FALSE;
if(!different &&
((fontdir1->memopt != fontdir2->memopt) ||
(fontdir1->data->lvc.version != fontdir2->data->lvc.version) ||
(fontdir1->data->lvc.characts != fontdir2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_icon(icon_t *icon1, icon_t *icon2) {
- int different = 0;
+static BOOL compare_icon(icon_t *icon1, icon_t *icon2) {
+ BOOL different = FALSE;
if(!different &&
((icon1->id != icon2->id) ||
(icon1->width != icon2->width) ||
(icon1->height != icon2->height)))
- different = 1;
+ different = TRUE;
if(!different &&
((icon1->lvc.version != icon2->lvc.version) ||
(icon1->lvc.characts != icon2->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_icon_group(icon_group_t *icon_group1, icon_group_t *icon_group2) {
- int different = 0;
+static BOOL compare_icon_group(icon_group_t *icon_group1, icon_group_t *icon_group2) {
+ BOOL different = FALSE;
icon_t *icon1 = NULL, *icon2 = NULL;
if(!different &&
((icon_group1->memopt != icon_group2->memopt) ||
(icon_group1->lvc.version != icon_group2->lvc.version) ||
(icon_group1->lvc.characts != icon_group2->lvc.characts)))
- different = 1;
+ different = TRUE;
if(!different &&
(icon_group1->nicon != icon_group2->nicon))
- different = 1;
+ different = TRUE;
if(!different) {
icon1 = icon_group1->iconlist;
icon2 = icon_group2->iconlist;
@@ -438,141 +438,141 @@ static int compare_icon_group(icon_group_t *icon_group1, icon_group_t *icon_grou
if(!different &&
((icon1 && !icon2) ||
(!icon1 && icon2)))
- different = 1;
+ different = TRUE;
}
return different;
}
-static int compare_menu_item(menu_item_t *menu_item1, menu_item_t *menu_item2) {
- int different = 0;
+static BOOL compare_menu_item(menu_item_t *menu_item1, menu_item_t *menu_item2) {
+ BOOL different = FALSE;
while(!different && menu_item1 && menu_item2) {
if(menu_item1->popup && menu_item2->popup) {
if(!different && menu_item1->gotid && menu_item2->gotid) {
if(menu_item1->id != menu_item2->id)
- different = 1;
+ different = TRUE;
} else if(!different &&
((menu_item1->gotid && !menu_item2->gotid) ||
(!menu_item1->gotid && menu_item2->gotid)))
- different = 1;
+ different = TRUE;
if(!different && menu_item1->gottype && menu_item2->gottype) {
if(menu_item1->type != menu_item2->type)
- different = 1;
+ different = TRUE;
} else if(!different &&
((menu_item1->gottype && !menu_item2->gottype) ||
(!menu_item1->gottype && menu_item2->gottype)))
- different = 1;
+ different = TRUE;
if(!different && menu_item1->gotstate && menu_item2->gotstate) {
if(menu_item1->state != menu_item2->state)
- different = 1;
+ different = TRUE;
} else if(!different &&
((menu_item1->gotstate && !menu_item2->gotstate) ||
(!menu_item1->gotstate && menu_item2->gotstate)))
- different = 1;
+ different = TRUE;
if(!different && menu_item1->gothelpid && menu_item2->gothelpid) {
if(menu_item1->helpid != menu_item2->helpid)
- different = 1;
+ different = TRUE;
} else if(!different &&
((menu_item1->gothelpid && !menu_item2->gothelpid) ||
(!menu_item1->gothelpid && menu_item2->gothelpid)))
- different = 1;
+ different = TRUE;
if(!different)
different = compare_menu_item(menu_item1->popup, menu_item2->popup);
} else if(!menu_item1->popup && !menu_item2->popup) {
if(menu_item1->name && menu_item2->name) {
if(!different && menu_item1->gotid && menu_item2->gotid) {
if(menu_item1->id != menu_item2->id)
- different = 1;
+ different = TRUE;
} else if(!different &&
((menu_item1->gotid && !menu_item2->gotid) ||
(!menu_item1->gotid && menu_item2->gotid)))
- different = 1;
+ different = TRUE;
if(!different && menu_item1->gottype && menu_item2->gottype) {
if(menu_item1->type != menu_item2->type)
- different = 1;
+ different = TRUE;
} else if(!different &&
((menu_item1->gottype && !menu_item2->gottype) ||
(!menu_item1->gottype && menu_item2->gottype)))
- different = 1;
+ different = TRUE;
if(!different && menu_item1->gotstate && menu_item2->gotstate) {
if(menu_item1->state != menu_item2->state)
- different = 1;
+ different = TRUE;
} else if(!different &&
((menu_item1->gotstate && !menu_item2->gotstate) ||
(!menu_item1->gotstate && menu_item2->gotstate)))
- different = 1;
+ different = TRUE;
if(!different && menu_item1->gothelpid && menu_item2->gothelpid) {
if(menu_item1->helpid != menu_item2->helpid)
- different = 1;
+ different = TRUE;
} else if(!different &&
((menu_item1->gothelpid && !menu_item2->gothelpid) ||
(!menu_item1->gothelpid && menu_item2->gothelpid)))
- different = 1;
+ different = TRUE;
} else if((menu_item1->name && !menu_item2->name) ||
(!menu_item1->name && menu_item2->name))
- different = 1;
+ different = TRUE;
} else
- different = 1;
+ different = TRUE;
menu_item1 = menu_item1->next;
menu_item2 = menu_item2->next;
}
if(!different &&
((menu_item1 && !menu_item2) ||
(!menu_item1 && menu_item2)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_menu(menu_t *menu1, menu_t *menu2) {
- int different = 0;
+static BOOL compare_menu(menu_t *menu1, menu_t *menu2) {
+ BOOL different = FALSE;
if(!different &&
((menu1->memopt != menu2->memopt) ||
(menu1->lvc.version != menu2->lvc.version) ||
(menu1->lvc.characts != menu2->lvc.characts)))
- different = 1;
+ different = TRUE;
if(!different)
different = compare_menu_item(menu1->items, menu2->items);
return different;
}
-static int compare_rcdata(rcdata_t *rcdata1, rcdata_t *rcdata2) {
- int different = 0;
+static BOOL compare_rcdata(rcdata_t *rcdata1, rcdata_t *rcdata2) {
+ BOOL different = FALSE;
if(!different &&
((rcdata1->memopt != rcdata2->memopt) ||
(rcdata1->data->lvc.version != rcdata2->data->lvc.version) ||
(rcdata1->data->lvc.characts != rcdata2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_html(html_t *rcdata1, html_t *rcdata2) {
- int different = 0;
+static BOOL compare_html(html_t *rcdata1, html_t *rcdata2) {
+ BOOL different = FALSE;
if(!different &&
((rcdata1->memopt != rcdata2->memopt) ||
(rcdata1->data->lvc.version != rcdata2->data->lvc.version) ||
(rcdata1->data->lvc.characts != rcdata2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_stringtable(stringtable_t *stringtable1, stringtable_t *stringtable2) {
- int different = 0;
+static BOOL compare_stringtable(stringtable_t *stringtable1, stringtable_t *stringtable2) {
+ BOOL different = FALSE;
int i;
while(!different && stringtable1 && stringtable2) {
if((stringtable1->memopt != stringtable2->memopt) ||
(stringtable1->lvc.version != stringtable2->lvc.version) ||
(stringtable1->lvc.characts != stringtable2->lvc.characts))
- different = 1;
+ different = TRUE;
if(!different) {
if((stringtable1->nentries != stringtable2->nentries) ||
(stringtable1->idbase != stringtable2->idbase))
- different = 1;
+ different = TRUE;
else
for(i = 0 ; i < stringtable1->nentries; i++)
if((stringtable1->entries[i].id != stringtable2->entries[i].id) ||
(stringtable1->entries[i].memopt != stringtable2->entries[i].memopt) ||
(stringtable1->entries[i].str && !stringtable2->entries[i].str) ||
(!stringtable1->entries[i].str && stringtable2->entries[i].str)) {
- different = 1;
+ different = TRUE;
break;
}
}
@@ -582,52 +582,52 @@ static int compare_stringtable(stringtable_t *stringtable1, stringtable_t *strin
return different;
}
-static int compare_user(user_t *user1, user_t *user2) {
- int different = 0;
+static BOOL compare_user(user_t *user1, user_t *user2) {
+ BOOL different = FALSE;
char *nameid = NULL;
if(!different &&
((user1->memopt != user2->memopt) ||
(user1->data->lvc.version != user2->data->lvc.version) ||
(user1->data->lvc.characts != user2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
nameid = strdup(get_nameid_str(user1->type));
if(!different && strcmp(nameid, get_nameid_str(user2->type)))
- different = 1;
+ different = TRUE;
free(nameid);
return different;
}
-static int compare_messagetable(messagetable_t *messagetable1, messagetable_t *messagetable2) {
- int different = 0;
+static BOOL compare_messagetable(messagetable_t *messagetable1, messagetable_t *messagetable2) {
+ BOOL different = FALSE;
if(!different &&
((messagetable1->memopt != messagetable2->memopt) ||
(messagetable1->data->lvc.version != messagetable2->data->lvc.version) ||
(messagetable1->data->lvc.characts != messagetable2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_string(string_t *string1, string_t *string2) {
- int different = 0;
+static BOOL compare_string(string_t *string1, string_t *string2) {
+ BOOL different = FALSE;
if(!different &&
((string1->size != string2->size) ||
(string1->type != string2->type)))
- different = 1;
+ different = TRUE;
if(!different) {
if(string1->type == str_char)
different = memcmp(string1->str.cstr, string2->str.cstr, string1->size);
else if(string1->type == str_unicode)
different = memcmp(string1->str.wstr, string2->str.wstr, string1->size*sizeof(WCHAR));
else
- different = 1;
+ different = TRUE;
}
return different;
}
-static int compare_ver_block(ver_block_t *ver_block1, ver_block_t *ver_block2);
+static BOOL compare_ver_block(ver_block_t *ver_block1, ver_block_t *ver_block2);
-static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) {
- int different = 0;
+static BOOL compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) {
+ BOOL different = FALSE;
int i = 0;
if(!different &&
(ver_value1->type == ver_value2->type)) {
@@ -638,7 +638,7 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) {
else if(!different &&
((ver_value1->key && !ver_value2->key) ||
(!ver_value1->key && ver_value2->key)))
- different = 1;
+ different = TRUE;
break;
case val_words:
if(!different && ver_value1->key && ver_value2->key)
@@ -646,14 +646,15 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) {
else if(!different &&
((ver_value1->key && !ver_value2->key) ||
(!ver_value1->key && ver_value2->key)))
- different = 1;
+ different = TRUE;
if(!different && ver_value1->value.words && ver_value2->value.words) {
if(!different &&
(ver_value1->value.words->nwords != ver_value2->value.words->nwords))
- different = 1;
+ different = TRUE;
if(!different)
for(i = 0; i < ver_value1->value.words->nwords; i++) {
if(ver_value1->value.words->words[i] != ver_value2->value.words->words[i]) {
+ different = TRUE;
different = 1;
break;
}
@@ -661,7 +662,7 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) {
} else if(!different &&
((ver_value1->value.words && !ver_value2->value.words) ||
(!ver_value1->value.words && ver_value2->value.words)))
- different = 1;
+ different = TRUE;
break;
case val_block:
if(!different && ver_value1->value.block && ver_value2->value.block)
@@ -669,18 +670,18 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) {
else if(!different &&
((ver_value1->value.block && !ver_value2->value.block) ||
(!ver_value1->value.block && ver_value2->value.block)))
- different = 1;
+ different = TRUE;
break;
default:
- different = 1;
+ different = TRUE;
}
} else
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_ver_block(ver_block_t *ver_block1, ver_block_t *ver_block2) {
- int different = 0;
+static BOOL compare_ver_block(ver_block_t *ver_block1, ver_block_t *ver_block2) {
+ BOOL different = FALSE;
ver_value_t *ver_value1 = NULL, *ver_value2 = NULL;
if(!different) {
ver_value1 = ver_block1->values;
@@ -693,74 +694,74 @@ static int compare_ver_block(ver_block_t *ver_block1, ver_block_t *ver_block2) {
if(!different &&
((ver_value1 && !ver_value2) ||
(!ver_value1 && ver_value2)))
- different = 1;
+ different = TRUE;
}
return different;
}
-static int compare_versioninfo(versioninfo_t *versioninfo1, versioninfo_t *versioninfo2) {
- int different = 0;
+static BOOL compare_versioninfo(versioninfo_t *versioninfo1, versioninfo_t *versioninfo2) {
+ BOOL different = FALSE;
ver_block_t *ver_block1 = NULL, *ver_block2 = NULL;
if(!different &&
((versioninfo1->memopt != versioninfo2->memopt) ||
(versioninfo1->lvc.version != versioninfo2->lvc.version) ||
(versioninfo1->lvc.characts != versioninfo2->lvc.characts)))
- different = 1;
+ different = TRUE;
if(!different && versioninfo1->gotit.fv && versioninfo2->gotit.fv) {
if((versioninfo1->filever_maj1 != versioninfo2->filever_maj1) ||
(versioninfo1->filever_maj2 != versioninfo2->filever_maj2) ||
(versioninfo1->filever_min1 != versioninfo2->filever_min1) ||
(versioninfo1->filever_min2 != versioninfo2->filever_min2))
- different = 1;
+ different = TRUE;
} else if(!different &&
((versioninfo1->gotit.fv && !versioninfo2->gotit.fv) ||
(!versioninfo1->gotit.fv && versioninfo2->gotit.fv)))
- different = 1;
+ different = TRUE;
if(!different && versioninfo1->gotit.pv && versioninfo2->gotit.pv) {
if((versioninfo1->prodver_maj1 != versioninfo2->prodver_maj1) ||
(versioninfo1->prodver_maj2 != versioninfo2->prodver_maj2) ||
(versioninfo1->prodver_min1 != versioninfo2->prodver_min1) ||
(versioninfo1->prodver_min2 != versioninfo2->prodver_min2))
- different = 1;
+ different = TRUE;
} else if(!different &&
((versioninfo1->gotit.pv && !versioninfo2->gotit.pv) ||
(!versioninfo1->gotit.pv && versioninfo2->gotit.pv)))
- different = 1;
+ different = TRUE;
if(!different && versioninfo1->gotit.fo && versioninfo2->gotit.fo) {
if(versioninfo1->fileos != versioninfo2->fileos)
- different = 1;
+ different = TRUE;
} else if(!different &&
((versioninfo1->gotit.fo && !versioninfo2->gotit.fo) ||
(!versioninfo1->gotit.fo && versioninfo2->gotit.fo)))
- different = 1;
+ different = TRUE;
if(!different && versioninfo1->gotit.ff && versioninfo2->gotit.ff) {
if(versioninfo1->fileflags != versioninfo2->fileflags)
- different = 1;
+ different = TRUE;
} else if(!different &&
((versioninfo1->gotit.ff && !versioninfo2->gotit.ff) ||
(!versioninfo1->gotit.ff && versioninfo2->gotit.ff)))
- different = 1;
+ different = TRUE;
if(!different && versioninfo1->gotit.ffm && versioninfo2->gotit.ffm) {
if(versioninfo1->fileflagsmask != versioninfo2->fileflagsmask)
- different = 1;
+ different = TRUE;
} else if(!different &&
((versioninfo1->gotit.ffm && !versioninfo2->gotit.ffm) ||
(!versioninfo1->gotit.ffm && versioninfo2->gotit.ffm)))
- different = 1;
+ different = TRUE;
if(!different && versioninfo1->gotit.ft && versioninfo2->gotit.ft) {
if(versioninfo1->filetype != versioninfo2->filetype)
- different = 1;
+ different = TRUE;
} else if(!different &&
((versioninfo1->gotit.ft && !versioninfo2->gotit.ft) ||
(!versioninfo1->gotit.ft && versioninfo2->gotit.ft)))
- different = 1;
+ different = TRUE;
if(!different && versioninfo1->gotit.fst && versioninfo2->gotit.fst) {
if(versioninfo1->filesubtype != versioninfo2->filesubtype)
- different = 1;
+ different = TRUE;
} else if(!different &&
((versioninfo1->gotit.fst && !versioninfo2->gotit.fst) ||
(!versioninfo1->gotit.fst && versioninfo2->gotit.fst)))
- different = 1;
+ different = TRUE;
if(!different) {
ver_block1 = versioninfo1->blocks;
ver_block2 = versioninfo2->blocks;
@@ -772,60 +773,60 @@ static int compare_versioninfo(versioninfo_t *versioninfo1, versioninfo_t *versi
if(!different &&
((ver_block1 && !ver_block2) ||
(!ver_block1 && ver_block2)))
- different = 1;
+ different = TRUE;
}
return different;
}
-static int compare_dlginit(dlginit_t *dlginit1, dlginit_t *dlginit2) {
- int different = 0;
+static BOOL compare_dlginit(dlginit_t *dlginit1, dlginit_t *dlginit2) {
+ BOOL different = FALSE;
if(!different &&
((dlginit1->memopt != dlginit2->memopt) ||
(dlginit1->data->lvc.version != dlginit2->data->lvc.version) ||
(dlginit1->data->lvc.characts != dlginit2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_toolbar_item(toolbar_item_t *toolbar_item1, toolbar_item_t *toolbar_item2) {
- int different = 0;
+static BOOL compare_toolbar_item(toolbar_item_t *toolbar_item1, toolbar_item_t *toolbar_item2) {
+ BOOL different = FALSE;
while(!different && toolbar_item1 && toolbar_item2) {
if((toolbar_item1->id && !toolbar_item2->id) ||
(!toolbar_item1->id && toolbar_item2->id))
- different = 1;
+ different = TRUE;
toolbar_item1 = toolbar_item1->next;
toolbar_item2 = toolbar_item2->next;
}
if(!different &&
((toolbar_item1 && !toolbar_item2) ||
(!toolbar_item1 && toolbar_item2)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare_toolbar(toolbar_t *toolbar1, toolbar_t *toolbar2) {
- int different = 0;
+static BOOL compare_toolbar(toolbar_t *toolbar1, toolbar_t *toolbar2) {
+ BOOL different = FALSE;
if(!different &&
((toolbar1->memopt != toolbar2->memopt) ||
(toolbar1->lvc.version != toolbar2->lvc.version) ||
(toolbar1->lvc.characts != toolbar2->lvc.characts)))
- different = 1;
+ different = TRUE;
if(!different)
different = compare_toolbar_item(toolbar1->items, toolbar2->items);
return different;
}
-static int compare_ani_curico(ani_curico_t *ani_curico1, ani_curico_t *ani_curico2) {
- int different = 0;
+static BOOL compare_ani_curico(ani_curico_t *ani_curico1, ani_curico_t *ani_curico2) {
+ BOOL different = FALSE;
if(!different &&
((ani_curico1->memopt != ani_curico2->memopt) ||
(ani_curico1->data->lvc.version != ani_curico2->data->lvc.version) ||
(ani_curico1->data->lvc.characts != ani_curico2->data->lvc.characts)))
- different = 1;
+ different = TRUE;
return different;
}
-static int compare(resource_t *resource1, resource_t *resource2) {
+static BOOL compare(resource_t *resource1, resource_t *resource2) {
switch(resource1->type) {
case res_acc:
return compare_accelerator(resource1->res.acc, resource2->res.acc);
@@ -870,7 +871,7 @@ static int compare(resource_t *resource1, resource_t *resource2) {
/* Not supposed to reach here */
fprintf(stderr, "Not supposed to reach here (compare())\n");
abort();
- return -1;
+ return FALSE;
}
}
diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c
index 4dc3364..2d956ce 100644
--- a/tools/wrc/utils.c
+++ b/tools/wrc/utils.c
@@ -332,13 +332,12 @@ void free_string(string_t *str)
}
/* check if the string is valid utf8 despite a different codepage being in use */
-int check_valid_utf8( const string_t *str, int codepage )
+BOOL check_valid_utf8( const string_t *str, int codepage )
{
unsigned int i;
- if (!check_utf8) return 0;
- if (!codepage) return 0;
- if (!wine_cp_get_table( codepage )) return 0;
+ if (!check_utf8 || !codepage || !wine_cp_get_table( codepage ))
+ return FALSE;
for (i = 0; i < str->size; i++)
{
@@ -346,18 +345,20 @@ int check_valid_utf8( const string_t *str, int codepage )
if ((unsigned char)str->str.cstr[i] >= 0xc2) break;
if ((unsigned char)str->str.cstr[i] >= 0x80) goto done;
}
- if (i == str->size) return 0; /* no 8-bit chars at all */
+ if (i == str->size)
+ return FALSE; /* no 8-bit chars at all */
- if (wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, str->str.cstr, str->size, NULL, 0 ) >= 0) return 1;
+ if (wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, str->str.cstr, str->size, NULL, 0 ) >= 0)
+ return TRUE;
done:
- check_utf8 = 0; /* at least one 8-bit non-utf8 string found, stop checking */
- return 0;
+ check_utf8 = FALSE; /* at least one 8-bit non-utf8 string found, stop checking */
+ return FALSE;
}
-int check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage )
+BOOL check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage )
{
- int ok;
+ BOOL ok;
string_t *teststr = convert_string( str_w, str_char, codepage );
ok = (teststr->size == str_a->size && !memcmp( teststr->str.cstr, str_a->str.cstr, str_a->size ));
diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h
index 19daa09..639be8f 100644
--- a/tools/wrc/utils.h
+++ b/tools/wrc/utils.h
@@ -46,8 +46,8 @@ char *dup_basename(const char *name, const char *ext);
int compare_name_id(const name_id_t *n1, const name_id_t *n2);
string_t *convert_string(const string_t *str, enum str_e type, int codepage);
void free_string( string_t *str );
-int check_valid_utf8( const string_t *str, int codepage );
-int check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage );
+BOOL check_valid_utf8( const string_t *str, int codepage );
+BOOL check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage );
int get_language_codepage( unsigned short lang, unsigned short sublang );
#endif
--
1.9.2
More information about the wine-patches
mailing list