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

COMMON: Replace NEResourceType and PEResourceType with a shared enum

Browse source
This commit is contained in:
Cameron Cawley 2019-05-01 17:12:18 +01:00 • committed by Filippos Karapetis
parent 3309c574c0
commit 8c2b09d919
11 changed files with 62 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

25
common/winexe.h
View file

@ -28,6 +28,31 @@
namespace Common {
/** The default Windows resources. */
enum WinResourceType {
kWinCursor = 0x01,
kWinBitmap = 0x02,
kWinIcon = 0x03,
kWinMenu = 0x04,
kWinDialog = 0x05,
kWinString = 0x06,
kWinFontDir = 0x07,
kWinFont = 0x08,
kWinAccelerator = 0x09,
kWinRCData = 0x0A,
kWinMessageTable = 0x0B,
kWinGroupCursor = 0x0C,
kWinGroupIcon = 0x0E,
kWinVersion = 0x10,
kWinDlgInclude = 0x11,
kWinPlugPlay = 0x13,
kWinVXD = 0x14,
kWinAniCursor = 0x15,
kWinAniIcon = 0x16,
kWinHTML = 0x17,
kWinManifest = 0x18
};
class WinResourceID {
public:
WinResourceID() { _idType = kIDTypeNull; }

25
common/winexe_ne.h
View file

@ -32,31 +32,6 @@ namespace Common {
template<class T> class Array;
class SeekableReadStream;
/** The default Windows resources. */
enum NEResourceType {
kNECursor = 0x01,
kNEBitmap = 0x02,
kNEIcon = 0x03,
kNEMenu = 0x04,
kNEDialog = 0x05,
kNEString = 0x06,
kNEFontDir = 0x07,
kNEFont = 0x08,
kNEAccelerator = 0x09,
kNERCData = 0x0A,
kNEMessageTable = 0x0B,
kNEGroupCursor = 0x0C,
kNEGroupIcon = 0x0E,
kNEVersion = 0x10,
kNEDlgInclude = 0x11,
kNEPlugPlay = 0x13,
kNEVXD = 0x14,
kNEAniCursor = 0x15,
kNEAniIcon = 0x16,
kNEHTML = 0x17,
kNEManifest = 0x18
};
/**
* A class able to load resources from a Windows New Executable, such
* as cursors, bitmaps, and sounds.

23
common/winexe_pe.h
View file

@ -33,29 +33,6 @@ namespace Common {
template<class T> class Array;
class SeekableReadStream;
/** The default Windows PE resources. */
enum PEResourceType {
kPECursor = 0x01,
kPEBitmap = 0x02,
kPEIcon = 0x03,
kPEMenu = 0x04,
kPEDialog = 0x05,
kPEString = 0x06,
kPEFontDir = 0x07,
kPEFont = 0x08,
kPEAccelerator = 0x09,
kPERCData = 0x0A,
kPEMessageTable = 0x0B,
kPEGroupCursor = 0x0C,
kPEGroupIcon = 0x0E,
kPEVersion = 0x10,
kPEDlgInclude = 0x11,
kPEPlugPlay = 0x13,
kPEVXD = 0x14,
kPEAniCursor = 0x15,
kPEAniIcon = 0x16
};
/**
* A class able to load resources from a Windows Portable Executable, such
* as cursors, bitmaps, and sounds.

25
devtools/create_titanic/winexe.h
View file

@ -28,6 +28,31 @@
namespace Common {
/** The default Windows resources. */
enum WinResourceType {
kWinCursor = 0x01,
kWinBitmap = 0x02,
kWinIcon = 0x03,
kWinMenu = 0x04,
kWinDialog = 0x05,
kWinString = 0x06,
kWinFontDir = 0x07,
kWinFont = 0x08,
kWinAccelerator = 0x09,
kWinRCData = 0x0A,
kWinMessageTable = 0x0B,
kWinGroupCursor = 0x0C,
kWinGroupIcon = 0x0E,
kWinVersion = 0x10,
kWinDlgInclude = 0x11,
kWinPlugPlay = 0x13,
kWinVXD = 0x14,
kWinAniCursor = 0x15,
kWinAniIcon = 0x16,
kWinHTML = 0x17,
kWinManifest = 0x18
};
class WinResourceID {
public:
WinResourceID() { _idType = kIDTypeNull; }

23
devtools/create_titanic/winexe_pe.h
View file

@ -34,29 +34,6 @@ namespace Common {
template<class T> class Array;
class SeekableReadStream;
/** The default Windows PE resources. */
enum PEResourceType {
kPECursor = 0x01,
kPEBitmap = 0x02,
kPEIcon = 0x03,
kPEMenu = 0x04,
kPEDialog = 0x05,
kPEString = 0x06,
kPEFontDir = 0x07,
kPEFont = 0x08,
kPEAccelerator = 0x09,
kPERCData = 0x0A,
kPEMessageTable = 0x0B,
kPEGroupCursor = 0x0C,
kPEGroupIcon = 0x0E,
kPEVersion = 0x10,
kPEDlgInclude = 0x11,
kPEPlugPlay = 0x13,
kPEVXD = 0x14,
kPEAniCursor = 0x15,
kPEAniIcon = 0x16
};
/**
* A class able to load resources from a Windows Portable Executable, such
* as cursors, bitmaps, and sounds.

2
engines/gnap/gnap.cpp
View file

@ -233,7 +233,7 @@ Common::Error GnapEngine::run() {
error("Could not load ufos.exe");
#ifdef USE_FREETYPE2
Common::SeekableReadStream *stream = _exe->getResource(Common::kPEFont, 2000);
Common::SeekableReadStream *stream = _exe->getResource(Common::kWinFont, 2000);
_font = Graphics::loadTTFFont(*stream, 24);
if (!_font)
warning("Unable to load font");

2
engines/mohawk/cursors.cpp
View file

@ -253,7 +253,7 @@ PECursorManager::PECursorManager(const Common::String &appName) {
return;
}
const Common::Array<Common::WinResourceID> cursorGroups = exe.getNameList(Common::kPEGroupCursor);
const Common::Array<Common::WinResourceID> cursorGroups = exe.getNameList(Common::kWinGroupCursor);
_cursors.resize(cursorGroups.size());
for (uint i = 0; i < cursorGroups.size(); i++) {

2
engines/scumm/he/moonbase/moonbase_fow.cpp
View file

@ -103,7 +103,7 @@ bool Moonbase::setFOWImage(int image) {
error("Cannot open file %s", _fileName.c_str());
}
Common::SeekableReadStream *stream = _exe.getResource(Common::kPERCData, resId);
Common::SeekableReadStream *stream = _exe.getResource(Common::kWinRCData, resId);
if (stream->size()) {
_fowImage = (uint8 *)malloc(stream->size());

8
graphics/fonts/winfont.cpp
View file

@ -92,7 +92,7 @@ bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry &
return false;
// Let's pull out the font directory
Common::SeekableReadStream *fontDirectory = exe.getResource(Common::kNEFontDir, Common::String("FONTDIR"));
Common::SeekableReadStream *fontDirectory = exe.getResource(Common::kWinFontDir, Common::String("FONTDIR"));
if (!fontDirectory) {
warning("No font directory in '%s'", fileName.c_str());
return false;
@ -109,7 +109,7 @@ bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry &
}
// Actually go get our font now...
Common::SeekableReadStream *fontStream = exe.getResource(Common::kNEFont, fontId);
Common::SeekableReadStream *fontStream = exe.getResource(Common::kWinFont, fontId);
if (!fontStream) {
warning("Could not find font %d in %s", fontId, fileName.c_str());
return false;
@ -129,7 +129,7 @@ bool WinFont::loadFromPE(const Common::String &fileName, const WinFontDirEntry &
}
// Let's pull out the font directory
Common::SeekableReadStream *fontDirectory = exe->getResource(Common::kPEFontDir, Common::String("FONTDIR"));
Common::SeekableReadStream *fontDirectory = exe->getResource(Common::kWinFontDir, Common::String("FONTDIR"));
if (!fontDirectory) {
warning("No font directory in '%s'", fileName.c_str());
delete exe;
@ -148,7 +148,7 @@ bool WinFont::loadFromPE(const Common::String &fileName, const WinFontDirEntry &
}
// Actually go get our font now...
Common::SeekableReadStream *fontStream = exe->getResource(Common::kPEFont, fontId);
Common::SeekableReadStream *fontStream = exe->getResource(Common::kWinFont, fontId);
if (!fontStream) {
warning("Could not find font %d in %s", fontId, fileName.c_str());
delete exe;

2
graphics/macgui/macmenu.cpp
View file

@ -183,7 +183,7 @@ static Common::U32String readUnicodeString(Common::SeekableReadStream *stream) {
MacMenu *MacMenu::createMenuFromPEexe(Common::PEResources &exe, MacWindowManager *wm) {
Common::SeekableReadStream *menuData = exe.getResource(Common::kPEMenu, 128);
Common::SeekableReadStream *menuData = exe.getResource(Common::kWinMenu, 128);
if (!menuData)
return nullptr;

8
graphics/wincursor.cpp
View file

@ -243,7 +243,7 @@ WinCursorGroup::~WinCursorGroup() {
}
WinCursorGroup *WinCursorGroup::createCursorGroup(Common::NEResources &exe, const Common::WinResourceID &id) {
Common::ScopedPtr<Common::SeekableReadStream> stream(exe.getResource(Common::kNEGroupCursor, id));
Common::ScopedPtr<Common::SeekableReadStream> stream(exe.getResource(Common::kWinGroupCursor, id));
if (!stream || stream->size() <= 6)
return 0;
@ -276,7 +276,7 @@ WinCursorGroup *WinCursorGroup::createCursorGroup(Common::NEResources &exe, cons
stream->readUint32LE(); // data size
uint32 cursorId = stream->readUint32LE();
Common::ScopedPtr<Common::SeekableReadStream> cursorStream(exe.getResource(Common::kNECursor, cursorId));
Common::ScopedPtr<Common::SeekableReadStream> cursorStream(exe.getResource(Common::kWinCursor, cursorId));
if (!cursorStream) {
delete group;
return 0;
@ -299,7 +299,7 @@ WinCursorGroup *WinCursorGroup::createCursorGroup(Common::NEResources &exe, cons
}
WinCursorGroup *WinCursorGroup::createCursorGroup(Common::PEResources &exe, const Common::WinResourceID &id) {
Common::ScopedPtr<Common::SeekableReadStream> stream(exe.getResource(Common::kPEGroupCursor, id));
Common::ScopedPtr<Common::SeekableReadStream> stream(exe.getResource(Common::kWinGroupCursor, id));
if (!stream || stream->size() <= 6)
return 0;
@ -325,7 +325,7 @@ WinCursorGroup *WinCursorGroup::createCursorGroup(Common::PEResources &exe, cons
stream->readUint32LE(); // data size
uint32 cursorId = stream->readUint16LE();
Common::ScopedPtr<Common::SeekableReadStream> cursorStream(exe.getResource(Common::kPECursor, cursorId));
Common::ScopedPtr<Common::SeekableReadStream> cursorStream(exe.getResource(Common::kWinCursor, cursorId));
if (!cursorStream) {
delete group;
return 0;