diff options
Diffstat (limited to 'common/winexe_pe.h')
| -rw-r--r-- | common/winexe_pe.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/common/winexe_pe.h b/common/winexe_pe.h index 6f92cde6dc..79b913043a 100644 --- a/common/winexe_pe.h +++ b/common/winexe_pe.h @@ -37,7 +37,7 @@ class SeekableReadStream; * A class able to load resources from a Windows Portable Executable, such * as cursors, bitmaps, and sounds. */ -class PEResources { +class PEResources : public WinResources { public: PEResources(); ~PEResources(); @@ -46,7 +46,7 @@ public: void clear(); /** Load from an EXE file. */ - bool loadFromEXE(const String &fileName); + using WinResources::loadFromEXE; /** Load from a stream. */ bool loadFromEXE(SeekableReadStream *stream); @@ -54,17 +54,17 @@ public: /** Return a list of resource types. */ const Array<WinResourceID> getTypeList() const; - /** Return a list of names for a given type. */ - const Array<WinResourceID> getNameList(const WinResourceID &type) const; + /** Return a list of IDs for a given type. */ + const Array<WinResourceID> getIDList(const WinResourceID &type) const; - /** Return a list of languages for a given type and name. */ - const Array<WinResourceID> getLangList(const WinResourceID &type, const WinResourceID &name) const; + /** Return a list of languages for a given type and ID. */ + const Array<WinResourceID> getLangList(const WinResourceID &type, const WinResourceID &id) const; /** Return a stream to the specified resource, taking the first language found (or 0 if non-existent). */ - SeekableReadStream *getResource(const WinResourceID &type, const WinResourceID &name); + SeekableReadStream *getResource(const WinResourceID &type, const WinResourceID &id); /** Return a stream to the specified resource (or 0 if non-existent). */ - SeekableReadStream *getResource(const WinResourceID &type, const WinResourceID &name, const WinResourceID &lang); + SeekableReadStream *getResource(const WinResourceID &type, const WinResourceID &id, const WinResourceID &lang); private: struct Section { @@ -78,7 +78,7 @@ private: SeekableReadStream *_exe; void parseResourceLevel(Section §ion, uint32 offset, int level); - WinResourceID _curType, _curName, _curLang; + WinResourceID _curType, _curID, _curLang; struct Resource { uint32 offset; @@ -86,8 +86,8 @@ private: }; typedef HashMap<WinResourceID, Resource, WinResourceID_Hash, WinResourceID_EqualTo> LangMap; - typedef HashMap<WinResourceID, LangMap, WinResourceID_Hash, WinResourceID_EqualTo> NameMap; - typedef HashMap<WinResourceID, NameMap, WinResourceID_Hash, WinResourceID_EqualTo> TypeMap; + typedef HashMap<WinResourceID, LangMap, WinResourceID_Hash, WinResourceID_EqualTo> IDMap; + typedef HashMap<WinResourceID, IDMap, WinResourceID_Hash, WinResourceID_EqualTo> TypeMap; TypeMap _resources; }; |