Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-25 03:17:53 +00:00
Code Issues Projects Releases Wiki Activity

Changes to ease code compilation in gcc. (#541)

Browse Source 
Changes to ease code compilation in GCC.

Disk_t and HDD contain a std::string and for this reason they need a proper constructor, ZeroMemory is not guaranteed to work.
This commit is contained in:
Andrea
2018-02-24 15:12:40 +00:00
committed by TomCh
parent 20022d999d
commit 6051bc55d0
65 changed files with 253 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/DiskImageHelper.cpp
+18 -22
View File
@@ -27,12 +27,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "stdafx.h"
#include "StdAfx.h"
#include "Common.h"
#include "zlib.h"
#include "unzip.h"
#include "iowin32.h"
#include "CPU.h"
#include "Disk.h"
@@ -650,8 +649,8 @@ public:
virtual UINT GetImageSizeForCreate(void) { return TRACK_DENIBBLIZED_SIZE * TRACKS_STANDARD; }
virtual eImageType GetType(void) { return eImageDO; }
virtual char* GetCreateExtensions(void) { return ".do;.dsk"; }
virtual char* GetRejectExtensions(void) { return ".nib;.iie;.po;.prg"; }
virtual const char* GetCreateExtensions(void) { return ".do;.dsk"; }
virtual const char* GetRejectExtensions(void) { return ".nib;.iie;.po;.prg"; }
};
//-------------------------------------
@@ -713,8 +712,8 @@ public:
}
virtual eImageType GetType(void) { return eImagePO; }
virtual char* GetCreateExtensions(void) { return ".po"; }
virtual char* GetRejectExtensions(void) { return ".do;.iie;.nib;.prg"; }
virtual const char* GetCreateExtensions(void) { return ".po"; }
virtual const char* GetRejectExtensions(void) { return ".do;.iie;.nib;.prg"; }
};
//-------------------------------------
@@ -753,8 +752,8 @@ public:
virtual UINT GetImageSizeForCreate(void) { return NIB1_TRACK_SIZE * TRACKS_STANDARD; }
virtual eImageType GetType(void) { return eImageNIB1; }
virtual char* GetCreateExtensions(void) { return ".nib"; }
virtual char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg"; }
virtual const char* GetCreateExtensions(void) { return ".nib"; }
virtual const char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg"; }
};
//-------------------------------------
@@ -790,8 +789,8 @@ public:
}
virtual eImageType GetType(void) { return eImageNIB2; }
virtual char* GetCreateExtensions(void) { return ".nb2"; }
virtual char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg;.2mg;.2img"; }
virtual const char* GetCreateExtensions(void) { return ".nb2"; }
virtual const char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg;.2mg;.2img"; }
};
//-------------------------------------
@@ -831,8 +830,8 @@ public:
}
virtual eImageType GetType(void) { return eImageHDV; }
virtual char* GetCreateExtensions(void) { return ".hdv"; }
virtual char* GetRejectExtensions(void) { return ".do;.iie;.prg"; }
virtual const char* GetCreateExtensions(void) { return ".hdv"; }
virtual const char* GetRejectExtensions(void) { return ".do;.iie;.prg"; }
};
//-------------------------------------
@@ -900,8 +899,8 @@ public:
}
virtual eImageType GetType(void) { return eImageIIE; }
virtual char* GetCreateExtensions(void) { return ".iie"; }
virtual char* GetRejectExtensions(void) { return ".do.;.nib;.po;.prg;.2mg;.2img"; }
virtual const char* GetCreateExtensions(void) { return ".iie"; }
virtual const char* GetRejectExtensions(void) { return ".do.;.nib;.po;.prg;.2mg;.2img"; }
private:
void ConvertSectorOrder(LPBYTE sourceorder)
@@ -974,8 +973,8 @@ public:
virtual bool AllowRW(void) { return false; }
virtual eImageType GetType(void) { return eImageAPL; }
virtual char* GetCreateExtensions(void) { return ".apl"; }
virtual char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; }
virtual const char* GetCreateExtensions(void) { return ".apl"; }
virtual const char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; }
};
//-------------------------------------
@@ -1025,8 +1024,8 @@ public:
virtual bool AllowRW(void) { return false; }
virtual eImageType GetType(void) { return eImagePRG; }
virtual char* GetCreateExtensions(void) { return ".prg"; }
virtual char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; }
virtual const char* GetCreateExtensions(void) { return ".prg"; }
virtual const char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; }
};
//-----------------------------------------------------------------------------
@@ -1208,10 +1207,7 @@ ImageError_e CImageHelperBase::CheckGZipFile(LPCTSTR pszImageFilename, ImageInfo
ImageError_e CImageHelperBase::CheckZipFile(LPCTSTR pszImageFilename, ImageInfo* pImageInfo, std::string& strFilenameInZip)
{
zlib_filefunc_def ffunc;
fill_win32_filefunc(&ffunc); // TODO: Ditch this and use unzOpen() instead?
unzFile hZipFile = unzOpen2(pszImageFilename, &ffunc);
unzFile hZipFile = unzOpen(pszImageFilename);
if (hZipFile == NULL)
return eIMAGE_ERROR_UNABLE_TO_OPEN_ZIP;