ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix up opening roms from archives

This commit is contained in:
zeromus 2010-05-19 16:26:26 +00:00
parent 642ef6e568
commit bca41a8c4b
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/drivers/win/archive.cpp
View File

@ -25,9 +25,7 @@ class OutStream : public IArchiveExtractCallback
{ {
class SeqStream : public ISequentialOutStream class SeqStream : public ISequentialOutStream
{ {
uint8* const output; EMUFILE_MEMORY* ms;
uint32 pos;
const uint32 size;
ULONG refCount; ULONG refCount;
HRESULT STDMETHODCALLTYPE QueryInterface(REFGUID,void**) HRESULT STDMETHODCALLTYPE QueryInterface(REFGUID,void**)
@ -37,18 +35,12 @@ class OutStream : public IArchiveExtractCallback
HRESULT STDMETHODCALLTYPE Write(const void* data,UInt32 length,UInt32* save) HRESULT STDMETHODCALLTYPE Write(const void* data,UInt32 length,UInt32* save)
{ {
if (data != NULL || size == 0) if (data != NULL)
{ {
//NST_VERIFY( length <= size - pos ); //NST_VERIFY( length <= size - pos );
if (length > size - pos) ms->fwrite(data,length);
length = size - pos; if(save) *save = length;
std::memcpy( output + pos, data, length );
pos += length;
if (save)
*save = length;
return S_OK; return S_OK;
} }
@ -70,12 +62,13 @@ class OutStream : public IArchiveExtractCallback
public: public:
SeqStream(void* d,uint32 s) SeqStream(EMUFILE_MEMORY* dest,uint32 s)
: output(static_cast<uint8*>(d)), pos(0), size(s), refCount(0) {} : ms(dest)
, refCount(0) {}
uint32 Size() const uint32 Size() const
{ {
return pos; return ms->size();
} }
}; };
@ -140,7 +133,7 @@ class OutStream : public IArchiveExtractCallback
public: public:
OutStream(uint32 index,void* data,uint32 size) OutStream(uint32 index,EMUFILE_MEMORY* data,uint32 size)
: seqStream(data,size), index(index), refCount(0) {} : seqStream(data,size), index(index), refCount(0) {}
uint32 Size() const uint32 Size() const
@ -540,7 +533,7 @@ static FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, s
{ {
FCEUARCHIVEFILEINFO_ITEM& item = (*currFileSelectorContext)[ret]; FCEUARCHIVEFILEINFO_ITEM& item = (*currFileSelectorContext)[ret];
EMUFILE_MEMORY* ms = new EMUFILE_MEMORY(item.size); EMUFILE_MEMORY* ms = new EMUFILE_MEMORY(item.size);
OutStream outStream( item.index, ms->buf(), item.size); OutStream outStream( item.index, ms, item.size);
const uint32 indices[1] = {item.index}; const uint32 indices[1] = {item.index};
HRESULT hr = object->Extract(indices,1,0,&outStream); HRESULT hr = object->Extract(indices,1,0,&outStream);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
@ -555,6 +548,7 @@ static FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, s
fp->size = item.size; fp->size = item.size;
fp->stream = ms; fp->stream = ms;
fp->archiveCount = (int)asr.numFilesInArchive; fp->archiveCount = (int)asr.numFilesInArchive;
ms->fseek(0,SEEK_SET); //rewind so that the rom analyzer sees a freshly opened file
} }
else else
{ {

7
src/emufile.h
View File

@ -104,10 +104,13 @@ protected:
public: public:
EMUFILE_MEMORY(std::vector<u8> *underlying) : vec(underlying), ownvec(false), pos(0), len(underlying->size()) { } EMUFILE_MEMORY(std::vector<u8> *underlying) : vec(underlying), ownvec(false), pos(0), len(underlying->size()) { }
EMUFILE_MEMORY(u32 preallocate) : vec(new std::vector<u8>()), ownvec(true), pos(0), len(0) { vec->reserve(preallocate); } EMUFILE_MEMORY(u32 preallocate) : vec(new std::vector<u8>()), ownvec(true), pos(0), len(0) {
vec->resize(preallocate);
len = preallocate;
}
EMUFILE_MEMORY() : vec(new std::vector<u8>()), ownvec(true), pos(0), len(0) { vec->reserve(1024); } EMUFILE_MEMORY() : vec(new std::vector<u8>()), ownvec(true), pos(0), len(0) { vec->reserve(1024); }
EMUFILE_MEMORY(void* buf, s32 size) : vec(new std::vector<u8>()), ownvec(true), pos(0), len(size) { EMUFILE_MEMORY(void* buf, s32 size) : vec(new std::vector<u8>()), ownvec(true), pos(0), len(size) {
vec->reserve(size); vec->resize(size);
if(size != 0) if(size != 0)
memcpy(&vec[0],buf,size); memcpy(&vec[0],buf,size);
} }