- Bugfix: Corrected a SEGV in the rawdata handling. Mistakingly took the
address of a pointer instead of its value. This probably slipped in
during the merge of my tree into the winetree.
Lesson learned: always double check.
- Verified most resources so that win16 compile also generates correct
output for reversed endian.
- Implemented byte-ordering for resources. All resources can be forced
to be little-, big- or native endian with command-line option -B.
- Reading resources from .res-files are only accepted in native byte-
ordering so that no additional semantic analysis is required.
- Resource directory is still written in native-only format, including
the strings.
- Wrc is now installed through the makefile with 'make install' and also
uninstalled with 'make uninstall'.
- Wrote a man-page for better reference. The manpage also gets installed
and uninstalled.
- Cleaned up the namespace a bit by more agressive use of static.
diff --git a/tools/wrc/dumpres.c b/tools/wrc/dumpres.c
index 70b7a37..32b93e7 100644
--- a/tools/wrc/dumpres.c
+++ b/tools/wrc/dumpres.c
@@ -152,7 +152,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_memopt(DWORD memopt)
+static void dump_memopt(DWORD memopt)
{
printf("Memory/load options: ");
if(memopt & 0x0040)
@@ -183,7 +183,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_lvc(lvc_t *l)
+static void dump_lvc(lvc_t *l)
{
if(l->language)
printf("LANGUAGE %04x, %04x\n", l->language->id, l->language->sub);
@@ -212,7 +212,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_raw_data(raw_data_t *d)
+static void dump_raw_data(raw_data_t *d)
{
int n;
int i;
@@ -263,7 +263,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_accelerator(accelerator_t *acc)
+static void dump_accelerator(accelerator_t *acc)
{
event_t *ev = acc->events;
@@ -297,7 +297,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_cursor(cursor_t *cur)
+static void dump_cursor(cursor_t *cur)
{
printf("Id: %d\n", cur->id);
printf("Width: %d\n", cur->width);
@@ -318,7 +318,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_cursor_group(cursor_group_t *curg)
+static void dump_cursor_group(cursor_group_t *curg)
{
dump_memopt(curg->memopt);
printf("There are %d cursors in this group\n", curg->ncursor);
@@ -335,7 +335,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_icon(icon_t *ico)
+static void dump_icon(icon_t *ico)
{
printf("Id: %d\n", ico->id);
printf("Width: %d\n", ico->width);
@@ -357,7 +357,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_icon_group(icon_group_t *icog)
+static void dump_icon_group(icon_group_t *icog)
{
dump_memopt(icog->memopt);
printf("There are %d icons in this group\n", icog->nicon);
@@ -374,7 +374,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_font(font_t *fnt)
+static void dump_font(font_t *fnt)
{
dump_memopt(fnt->memopt);
dump_raw_data(fnt->data);
@@ -391,7 +391,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_bitmap(bitmap_t *bmp)
+static void dump_bitmap(bitmap_t *bmp)
{
dump_memopt(bmp->memopt);
dump_raw_data(bmp->data);
@@ -408,7 +408,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_rcdata(rcdata_t *rdt)
+static void dump_rcdata(rcdata_t *rdt)
{
dump_memopt(rdt->memopt);
dump_raw_data(rdt->data);
@@ -425,7 +425,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_user(user_t *usr)
+static void dump_user(user_t *usr)
{
dump_memopt(usr->memopt);
printf("Class %s\n", get_nameid_str(usr->type));
@@ -443,7 +443,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_messagetable(messagetable_t *msg)
+static void dump_messagetable(messagetable_t *msg)
{
dump_raw_data(msg->data);
}
@@ -459,7 +459,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_stringtable(stringtable_t *stt)
+static void dump_stringtable(stringtable_t *stt)
{
int i;
for(; stt; stt = stt->next)
@@ -491,7 +491,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_control(control_t *ctrl)
+static void dump_control(control_t *ctrl)
{
printf("Control {\n\tClass: %s\n", get_nameid_str(ctrl->ctlclass));
printf("\tText: "); get_nameid_str(ctrl->title); printf("\n");
@@ -530,7 +530,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_dialog(dialog_t *dlg)
+static void dump_dialog(dialog_t *dlg)
{
control_t *c = dlg->controls;
@@ -580,7 +580,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_dialogex(dialogex_t *dlgex)
+static void dump_dialogex(dialogex_t *dlgex)
{
control_t *c = dlgex->controls;
@@ -630,7 +630,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_menu_item(menu_item_t *item)
+static void dump_menu_item(menu_item_t *item)
{
while(item)
{
@@ -668,7 +668,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_menu(menu_t *men)
+static void dump_menu(menu_t *men)
{
dump_memopt(men->memopt);
dump_lvc(&(men->lvc));
@@ -685,7 +685,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_menuex_item(menuex_item_t *item)
+static void dump_menuex_item(menuex_item_t *item)
{
while(item)
{
@@ -738,7 +738,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_menuex(menuex_t *menex)
+static void dump_menuex(menuex_t *menex)
{
dump_memopt(menex->memopt);
dump_lvc(&(menex->lvc));
@@ -755,9 +755,10 @@
* Remarks :
*****************************************************************************
*/
-void dump_ver_value(ver_value_t *val)
+static void dump_ver_block(ver_block_t *); /* Forward ref */
+
+static void dump_ver_value(ver_value_t *val)
{
- extern void dump_ver_block(ver_block_t *);
if(val->type == val_str)
{
printf("VALUE ");
@@ -791,7 +792,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_ver_block(ver_block_t *blk)
+static void dump_ver_block(ver_block_t *blk)
{
ver_value_t *val = blk->values;
printf("BLOCK ");
@@ -816,7 +817,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_versioninfo(versioninfo_t *ver)
+static void dump_versioninfo(versioninfo_t *ver)
{
ver_block_t *blk = ver->blocks;
@@ -859,7 +860,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_toolbar_items(toolbar_item_t *items)
+static void dump_toolbar_items(toolbar_item_t *items)
{
while(items)
{
@@ -885,7 +886,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_toolbar(toolbar_t *toolbar)
+static void dump_toolbar(toolbar_t *toolbar)
{
dump_memopt(toolbar->memopt);
dump_lvc(&(toolbar->lvc));
@@ -903,7 +904,7 @@
* Remarks :
*****************************************************************************
*/
-void dump_dlginit(dlginit_t *dit)
+static void dump_dlginit(dlginit_t *dit)
{
dump_memopt(dit->memopt);
dump_lvc(&(dit->lvc));
