thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Add a function to simplify loading Windows executables

Browse source
This commit is contained in:
Cameron Cawley 2020-01-04 15:00:40 +00:00 • committed by Filippos Karapetis
parent 532f382602
commit a692905eb2
3 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
common/winexe.cpp
View file

@ -24,6 +24,8 @@
#include "common/memstream.h"
#include "common/str.h"
#include "common/winexe.h"
#include "common/winexe_ne.h"
#include "common/winexe_pe.h"
namespace Common {
@ -160,4 +162,25 @@ bool WinResources::loadFromCompressedEXE(const String &fileName) {
return loadFromEXE(stream);
}
WinResources *WinResources::createFromEXE(const String &fileName) {
WinResources *exe;
// First try loading via the NE code
exe = new Common::NEResources();
if (exe->loadFromEXE(fileName)) {
return exe;
}
delete exe;
// Then try loading via the PE code
exe = new Common::PEResources();
if (exe->loadFromEXE(fileName)) {
return exe;
}
delete exe;
return nullptr;
}
} // End of namespace Common

2
common/winexe.h
View file

@ -128,6 +128,8 @@ public:
virtual SeekableReadStream *getResource(const WinResourceID &type, const WinResourceID &id, const WinResourceID &lang) {
return getResource(type, id);
}
static WinResources *createFromEXE(const String &fileName);
};
} // End of namespace Common

26
graphics/fonts/winfont.cpp
View file

@ -77,27 +77,13 @@ static WinFontDirEntry readDirEntry(Common::SeekableReadStream &stream) {
}
bool WinFont::loadFromFON(const Common::String &fileName, const WinFontDirEntry &dirEntry) {
Common::WinResources *exe;
// First try loading via the NE code
exe = new Common::NEResources();
if (exe->loadFromEXE(fileName)) {
bool ok = loadFromEXE(exe, fileName, dirEntry);
delete exe;
return ok;
}
delete exe;
// Then try loading via the PE code
exe = new Common::PEResources();
if (exe->loadFromEXE(fileName)) {
bool ok = loadFromEXE(exe, fileName, dirEntry);
delete exe;
return ok;
}
delete exe;
Common::WinResources *exe = Common::WinResources::createFromEXE(fileName);
if (!exe)
return false;
bool ok = loadFromEXE(exe, fileName, dirEntry);
delete exe;
return ok;
}
bool WinFont::loadFromEXE(Common::WinResources *exe, const Common::String &fileName, const WinFontDirEntry &dirEntry) {