[Scummvm-cvs-logs] SF.net SVN: scummvm: [25497] scummvm/trunk/engines/scumm/he
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Feb 11 23:37:47 CET 2007
Revision: 25497
http://scummvm.svn.sourceforge.net/scummvm/?rev=25497&view=rev
Author: fingolfin
Date: 2007-02-11 14:37:47 -0800 (Sun, 11 Feb 2007)
Log Message:
-----------
Code cleanup: Removing unused code for handling OS/2 (NE header) binaries
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/resource_he.cpp
scummvm/trunk/engines/scumm/he/resource_he.h
Modified: scummvm/trunk/engines/scumm/he/resource_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.cpp 2007-02-11 21:17:37 UTC (rev 25496)
+++ scummvm/trunk/engines/scumm/he/resource_he.cpp 2007-02-11 22:37:47 UTC (rev 25497)
@@ -149,7 +149,6 @@
char *arg_language = NULL;
const char *arg_type = resType;
char *arg_name = resName;
- int arg_action = ACTION_LIST;
int ressize = 0;
_arg_raw = false;
@@ -197,11 +196,8 @@
goto cleanup;
}
- // verbose_printf("file is a %s\n",
- // fi.is_PE_binary ? "Windows NT `PE' binary" : "Windows 3.1 `NE' binary");
-
/* errors will be printed by the callback */
- ressize = do_resources(&fi, arg_type, arg_name, arg_language, arg_action, data);
+ ressize = do_resources(&fi, arg_type, arg_name, arg_language, data);
/* free stuff and close file */
cleanup:
@@ -495,7 +491,7 @@
/* do_resources:
* Do something for each resource matching type, name and lang.
*/
-int Win32ResExtractor::do_resources(WinLibrary *fi, const char *type, char *name, char *lang, int action, byte **data) {
+int Win32ResExtractor::do_resources(WinLibrary *fi, const char *type, char *name, char *lang, byte **data) {
WinResource *type_wr;
WinResource *name_wr;
WinResource *lang_wr;
@@ -505,7 +501,7 @@
name_wr = type_wr + 1;
lang_wr = type_wr + 2;
- size = do_resources_recurs(fi, NULL, type_wr, name_wr, lang_wr, type, name, lang, action, data);
+ size = do_resources_recurs(fi, NULL, type_wr, name_wr, lang_wr, type, name, lang, data);
free(type_wr);
@@ -520,7 +516,7 @@
int Win32ResExtractor::do_resources_recurs(WinLibrary *fi, WinResource *base,
WinResource *type_wr, WinResource *name_wr, WinResource *lang_wr,
- const char *type, char *name, char *lang, int action, byte **data) {
+ const char *type, char *name, char *lang, byte **data) {
int c, rescnt;
WinResource *wr;
uint32 size = 0;
@@ -541,7 +537,7 @@
/* go deeper unless there is something that does NOT match */
if (LEVEL_MATCHES(type) && LEVEL_MATCHES(name) && LEVEL_MATCHES(lang)) {
if (wr->is_directory)
- size = do_resources_recurs(fi, wr+c, type_wr, name_wr, lang_wr, type, name, lang, action, data);
+ size = do_resources_recurs(fi, wr+c, type_wr, name_wr, lang_wr, type, name, lang, data);
else
size = extract_resources(fi, wr+c, type_wr, name_wr, lang_wr, data);
}
@@ -603,53 +599,19 @@
byte *Win32ResExtractor::get_resource_entry(WinLibrary *fi, WinResource *wr, int *size) {
byte *result;
- if (fi->is_PE_binary) {
- Win32ImageResourceDataEntry *dataent;
+ Win32ImageResourceDataEntry *dataent;
- dataent = (Win32ImageResourceDataEntry *) wr->children;
- RETURN_IF_BAD_POINTER(NULL, *dataent);
- *size = FROM_LE_32(dataent->size);
+ dataent = (Win32ImageResourceDataEntry *) wr->children;
+ RETURN_IF_BAD_POINTER(NULL, *dataent);
+ *size = FROM_LE_32(dataent->size);
- result = fi->memory + FROM_LE_32(dataent->offset_to_data);
- } else {
- Win16NENameInfo *nameinfo;
- int sizeshift;
+ result = fi->memory + FROM_LE_32(dataent->offset_to_data);
- nameinfo = (Win16NENameInfo *) wr->children;
- sizeshift = *((uint16 *) fi->first_resource - 1);
- *size = FROM_LE_16(nameinfo->length) << sizeshift;
-
- result = fi->memory + (FROM_LE_16(nameinfo->offset) << sizeshift);
- }
-
RETURN_IF_BAD_OFFSET(NULL, result, *size);
return result;
}
-bool Win32ResExtractor::decode_ne_resource_id(WinLibrary *fi, WinResource *wr, uint16 value) {
- if (value & NE_RESOURCE_NAME_IS_NUMERIC) { /* numeric id */
- /* translate id into a string */
- snprintf(wr->id, WINRES_ID_MAXLEN, "%d", value & ~NE_RESOURCE_NAME_IS_NUMERIC);
- wr->numeric_id = true;
- } else { /* ASCII string id */
- int len;
- char *mem = (char *)NE_HEADER(fi->memory)
- + NE_HEADER(fi->memory)->rsrctab
- + value;
-
- /* copy each char of the string, and terminate it */
- RETURN_IF_BAD_POINTER(false, *mem);
- len = FROM_LE_16(mem[0]);
- RETURN_IF_BAD_OFFSET(false, &mem[1], sizeof(char) * len);
- memcpy(wr->id, &mem[1], len);
- wr->id[len] = '\0';
- wr->numeric_id = false;
- }
-
- return true;
-}
-
Win32ResExtractor::WinResource *Win32ResExtractor::list_pe_resources(WinLibrary *fi, Win32ImageResourceDirectory *pe_res, int level, int *count) {
WinResource *wr;
int c, rescnt;
@@ -680,70 +642,7 @@
return wr;
}
-Win32ResExtractor::WinResource *Win32ResExtractor::list_ne_name_resources(WinLibrary *fi, WinResource *typeres, int *count) {
- int c, rescnt;
- WinResource *wr;
- Win16NETypeInfo *typeinfo = (Win16NETypeInfo *) typeres->this_;
- Win16NENameInfo *nameinfo = (Win16NENameInfo *) typeres->children;
- /* count number of `type' resources */
- RETURN_IF_BAD_POINTER(NULL, typeinfo->count);
- *count = rescnt = FROM_LE_16(typeinfo->count);
-
- /* allocate WinResource's */
- wr = (WinResource *)malloc(sizeof(WinResource) * rescnt);
-
- /* fill in the WinResource's */
- for (c = 0 ; c < rescnt ; c++) {
- RETURN_IF_BAD_POINTER(NULL, nameinfo[c]);
- wr[c].this_ = nameinfo+c;
- wr[c].is_directory = false;
- wr[c].children = nameinfo+c;
- wr[c].level = 1;
-
- /* fill in wr->id, wr->numeric_id */
- if (!decode_ne_resource_id(fi, wr + c, FROM_LE_16(nameinfo[c].id)))
- return NULL;
- }
-
- return wr;
-}
-
-Win32ResExtractor::WinResource *Win32ResExtractor::list_ne_type_resources(WinLibrary *fi, int *count) {
- int c, rescnt;
- WinResource *wr;
- Win16NETypeInfo *typeinfo;
-
- /* count number of `type' resources */
- typeinfo = (Win16NETypeInfo *) fi->first_resource;
- RETURN_IF_BAD_POINTER(NULL, *typeinfo);
- for (rescnt = 0 ; typeinfo->type_id != 0 ; rescnt++) {
- typeinfo = NE_TYPEINFO_NEXT(typeinfo);
- RETURN_IF_BAD_POINTER(NULL, *typeinfo);
- }
- *count = rescnt;
-
- /* allocate WinResource's */
- wr = (WinResource *)malloc(sizeof(WinResource) * rescnt);
-
- /* fill in the WinResource's */
- typeinfo = (Win16NETypeInfo *) fi->first_resource;
- for (c = 0 ; c < rescnt ; c++) {
- wr[c].this_ = typeinfo;
- wr[c].is_directory = (typeinfo->count != 0);
- wr[c].children = typeinfo+1;
- wr[c].level = 0;
-
- /* fill in wr->id, wr->numeric_id */
- if (!decode_ne_resource_id(fi, wr + c, FROM_LE_16(typeinfo->type_id)))
- return NULL;
-
- typeinfo = NE_TYPEINFO_NEXT(typeinfo);
- }
-
- return wr;
-}
-
/* list_resources:
* Return an array of WinResource's in the current
* resource level specified by _res->
@@ -752,16 +651,10 @@
if (res != NULL && !res->is_directory)
return NULL;
- if (fi->is_PE_binary) {
- return list_pe_resources(fi, (Win32ImageResourceDirectory *)
- (res == NULL ? fi->first_resource : res->children),
- (res == NULL ? 0 : res->level+1),
- count);
- } else {
- return (res == NULL
- ? list_ne_type_resources(fi, count)
- : list_ne_name_resources(fi, res, count));
- }
+ return list_pe_resources(fi, (Win32ImageResourceDirectory *)
+ (res == NULL ? fi->first_resource : res->children),
+ (res == NULL ? 0 : res->level+1),
+ count);
}
/* read_library:
@@ -787,30 +680,6 @@
}
}
- /* check for OS2 (Win16) header signature `NE' */
- RETURN_IF_BAD_POINTER(false, NE_HEADER(fi->memory)->magic);
- if (FROM_LE_16(NE_HEADER(fi->memory)->magic) == IMAGE_OS2_SIGNATURE) {
- OS2ImageHeader *header = NE_HEADER(fi->memory);
-
- RETURN_IF_BAD_POINTER(false, header->rsrctab);
- RETURN_IF_BAD_POINTER(false, header->restab);
-
- if (FROM_LE_16(header->rsrctab) >= FROM_LE_16(header->restab)) {
- error("%s: no resource directory found", fi->file->name());
- return false;
- }
-
- // Apply endian fix
- fix_os2_image_header_endian(header);
-
- fi->is_PE_binary = false;
- fi->first_resource = (byte *) NE_HEADER(fi->memory)
- + header->rsrctab + sizeof(uint16);
- RETURN_IF_BAD_POINTER(false, *(Win16NETypeInfo *) fi->first_resource);
-
- return true;
- }
-
/* check for NT header signature `PE' */
RETURN_IF_BAD_POINTER(false, PE_HEADER(fi->memory)->signature);
if (FROM_LE_32(PE_HEADER(fi->memory)->signature) == IMAGE_NT_SIGNATURE) {
@@ -862,7 +731,6 @@
fix_win32_image_data_directory(dir);
fi->first_resource = fi->memory + dir->virtual_address;
- fi->is_PE_binary = true;
return true;
}
@@ -1221,35 +1089,6 @@
LE32(obj->characteristics);
}
-void Win32ResExtractor::fix_os2_image_header_endian(OS2ImageHeader *obj) {
- LE16(obj->magic);
- LE16(obj->enttab);
- LE16(obj->cbenttab);
- LE32(obj->crc);
- LE16(obj->flags);
- LE16(obj->autodata);
- LE16(obj->heap);
- LE16(obj->stack);
- LE32(obj->csip);
- LE32(obj->sssp);
- LE16(obj->cseg);
- LE16(obj->cmod);
- LE16(obj->cbnrestab);
- LE16(obj->segtab);
- LE16(obj->rsrctab);
- LE16(obj->restab);
- LE16(obj->modtab);
- LE16(obj->imptab);
- LE32(obj->nrestab);
- LE16(obj->cmovent);
- LE16(obj->align);
- LE16(obj->cres);
- LE16(obj->fastload_offset);
- LE16(obj->fastload_length);
- LE16(obj->swaparea);
- LE16(obj->expver);
-}
-
/* fix_win32_image_header_endian:
* NOTE: This assumes that the optional header is always available.
*/
Modified: scummvm/trunk/engines/scumm/he/resource_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.h 2007-02-11 21:17:37 UTC (rev 25496)
+++ scummvm/trunk/engines/scumm/he/resource_he.h 2007-02-11 22:37:47 UTC (rev 25497)
@@ -35,17 +35,7 @@
* Definitions
*/
-#define ACTION_LIST 1 /* command: list resources */
-#define ACTION_EXTRACT 2 /* command: extract resources */
-#define CALLBACK_STOP 0 /* results of ResourceCallback */
-#define CALLBACK_CONTINUE 1
-#define CALLBACK_CONTINUE_RECURS 2
-
#define MZ_HEADER(x) ((DOSImageHeader *)(x))
-#define NE_HEADER(x) ((OS2ImageHeader *)PE_HEADER(x))
-#define NE_TYPEINFO_NEXT(x) ((Win16NETypeInfo *)((byte *)(x) + sizeof(Win16NETypeInfo) + \
- FROM_LE_16(((Win16NETypeInfo *)x)->count) * sizeof(Win16NENameInfo)))
-#define NE_RESOURCE_NAME_IS_NUMERIC (0x8000)
#define STRIP_RES_ID_FORMAT(x) (x != NULL && (x[0] == '-' || x[0] == '+') ? ++x : x)
@@ -64,10 +54,6 @@
PE_HEADER(module)->file_header.size_of_optional_header))
#define IMAGE_DOS_SIGNATURE 0x5A4D /* MZ */
-#define IMAGE_OS2_SIGNATURE 0x454E /* NE */
-#define IMAGE_OS2_SIGNATURE_LE 0x454C /* LE */
-#define IMAGE_OS2_SIGNATURE_LX 0x584C /* LX */
-#define IMAGE_VXD_SIGNATURE 0x454C /* LE */
#define IMAGE_NT_SIGNATURE 0x00004550 /* PE00 */
#if !defined (WIN32)
@@ -76,6 +62,7 @@
#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080
#endif
+// Only IMAGE_DIRECTORY_ENTRY_RESOURCE is used:
#define IMAGE_DIRECTORY_ENTRY_EXPORT 0
#define IMAGE_DIRECTORY_ENTRY_IMPORT 1
#define IMAGE_DIRECTORY_ENTRY_RESOURCE 2
@@ -92,6 +79,7 @@
#define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13
#define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14
+// Only RT_GROUP_CURSOR and RT_GROUP_ICON are used
#if !defined (WIN32)
#define RT_CURSOR 1
#define RT_BITMAP 2
@@ -178,7 +166,6 @@
Common::File *file;
byte *memory;
byte *first_resource;
- bool is_PE_binary;
int total_size;
};
@@ -274,48 +261,6 @@
uint32 resloader; // FARPROC16 - smaller? uint16?
};
- struct Win16NENameInfo {
- uint16 offset;
- uint16 length;
- uint16 flags;
- uint16 id;
- uint16 handle;
- uint16 usage;
- };
-
- struct OS2ImageHeader {
- uint16 magic;
- byte ver;
- byte rev;
- uint16 enttab;
- uint16 cbenttab;
- int32 crc;
- uint16 flags;
- uint16 autodata;
- uint16 heap;
- uint16 stack;
- uint32 csip;
- uint32 sssp;
- uint16 cseg;
- uint16 cmod;
- uint16 cbnrestab;
- uint16 segtab;
- uint16 rsrctab;
- uint16 restab;
- uint16 modtab;
- uint16 imptab;
- uint32 nrestab;
- uint16 cmovent;
- uint16 align;
- uint16 cres;
- byte exetyp;
- byte flagsothers;
- uint16 fastload_offset;
- uint16 fastload_length;
- uint16 swaparea;
- uint16 expver;
- };
-
struct DOSImageHeader {
uint16 magic;
uint16 cblp;
@@ -435,7 +380,7 @@
bool read_library(WinLibrary *);
WinResource *find_resource(WinLibrary *, const char *, const char *, const char *, int *);
byte *get_resource_entry(WinLibrary *, WinResource *, int *);
- int do_resources(WinLibrary *, const char *, char *, char *, int, byte **);
+ int do_resources(WinLibrary *, const char *, char *, char *, byte **);
bool compare_resource_id(WinResource *, const char *);
const char *res_type_string_to_id(const char *);
@@ -447,12 +392,9 @@
byte *extract_group_icon_cursor_resource(WinLibrary *, WinResource *, char *, int *, bool);
bool decode_pe_resource_id(WinLibrary *, WinResource *, uint32);
- bool decode_ne_resource_id(WinLibrary *, WinResource *, uint16);
- WinResource *list_ne_type_resources(WinLibrary *, int *);
- WinResource *list_ne_name_resources(WinLibrary *, WinResource *, int *);
WinResource *list_pe_resources(WinLibrary *, Win32ImageResourceDirectory *, int, int *);
int calc_vma_size(WinLibrary *);
- int do_resources_recurs(WinLibrary *, WinResource *, WinResource *, WinResource *, WinResource *, const char *, char *, char *, int, byte **);
+ int do_resources_recurs(WinLibrary *, WinResource *, WinResource *, WinResource *, WinResource *, const char *, char *, char *, byte **);
WinResource *find_with_resource_array(WinLibrary *, WinResource *, const char *);
bool check_offset(byte *, int, const char *, void *, int);
@@ -463,7 +405,6 @@
void fix_win32_bitmap_info_header_endian(Win32BitmapInfoHeader *obj);
void fix_win32_cursor_icon_file_dir_entry_endian(Win32CursorIconFileDirEntry *obj);
void fix_win32_image_section_header(Win32ImageSectionHeader *obj);
- void fix_os2_image_header_endian(OS2ImageHeader *obj);
void fix_win32_image_header_endian(Win32ImageNTHeaders *obj);
void fix_win32_image_data_directory(Win32ImageDataDirectory *obj);
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list