Apple-2-Tools/ciderpress
1
0
Fork 0
mirror of https://github.com/fadden/ciderpress.git synced 2026-04-21 17:17:02 +00:00
Code Issues Projects Releases Wiki Activity

Large set of changes to restore CiderPress build.

Browse Source 
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.

* Switch from MBCS to UNICODE APIs

Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out.  So it's
time to switch to wide strings.

This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode).  The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.

There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion.  These currently have fixed
place-holder "xyzzy" strings.

All UI strings are now wide.

Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow.  This doesn't play well with gcc, so
only the Windows-specific parts use those.

* Various updates to vcxproj files

The project-file conversion had some cruft that is now largely
gone.  The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.

* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots

The old "prebuilts" directory is now gone.  The libraries are now
built as part of building the apps.

I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).

* Replace symbols used for include guards

Symbols with a leading "__" are reserved.
This commit is contained in:
Andy McFadden
2014-11-10 15:32:55 -08:00
parent 63b9996009
commit 51b5f00f5c
292 changed files with 57242 additions and 7887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diskimg/Win32BlockIO.cpp
+15 -9
View File
@@ -44,7 +44,7 @@
* Open a logical volume.
*/
DIError
Win32VolumeAccess::Open(const char* deviceName, bool readOnly)
Win32VolumeAccess::Open(const WCHAR* deviceName, bool readOnly)
{
DIError dierr = kDIErrNone;
@@ -55,6 +55,7 @@ Win32VolumeAccess::Open(const char* deviceName, bool readOnly)
return kDIErrAlreadyOpen;
}
#ifdef WANT_ASPI
if (strncmp(deviceName, kASPIDev, strlen(kASPIDev)) == 0) {
fpBlockAccess = new ASPIBlockAccess;
if (fpBlockAccess == nil) {
@@ -64,7 +65,9 @@ Win32VolumeAccess::Open(const char* deviceName, bool readOnly)
dierr = fpBlockAccess->Open(deviceName, readOnly);
if (dierr != kDIErrNone)
goto bail;
} else if (deviceName[0] >= 'A' && deviceName[0] <= 'Z') {
} else
#endif
if (deviceName[0] >= 'A' && deviceName[0] <= 'Z') {
fpBlockAccess = new LogicalBlockAccess;
if (fpBlockAccess == nil) {
dierr = kDIErrMalloc;
@@ -1163,7 +1166,7 @@ Win32VolumeAccess::BlockAccess::WriteBlocksWin2K(HANDLE handle,
* Open a logical device. The device name should be of the form "A:\".
*/
DIError
Win32VolumeAccess::LogicalBlockAccess::Open(const char* deviceName, bool readOnly)
Win32VolumeAccess::LogicalBlockAccess::Open(const WCHAR* deviceName, bool readOnly)
{
DIError dierr = kDIErrNone;
const bool kPreferASPI = true;
@@ -1209,7 +1212,7 @@ Win32VolumeAccess::LogicalBlockAccess::Open(const char* deviceName, bool readOnl
if (fIsCDROM)
return kDIErrCDROMNotSupported;
fHandle = CreateFile("\\\\.\\vwin32", 0, 0, NULL,
fHandle = CreateFile(_T("\\\\.\\vwin32"), 0, 0, NULL,
OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL);
if (fHandle == INVALID_HANDLE_VALUE) {
DWORD lastError = GetLastError();
@@ -1233,7 +1236,7 @@ Win32VolumeAccess::LogicalBlockAccess::Open(const char* deviceName, bool readOnl
}
#endif
} else {
char device[7] = "\\\\.\\_:";
WCHAR device[7] = _T("\\\\.\\_:");
device[4] = deviceName[0];
WMSG1("Opening '%s'\n", device);
@@ -1423,7 +1426,7 @@ Win32VolumeAccess::LogicalBlockAccess::ReadBlocksCDROM(HANDLE handle,
* Open a physical device. The device name should be of the form "80:\".
*/
DIError
Win32VolumeAccess::PhysicalBlockAccess::Open(const char* deviceName, bool readOnly)
Win32VolumeAccess::PhysicalBlockAccess::Open(const WCHAR* deviceName, bool readOnly)
{
DIError dierr = kDIErrNone;
@@ -1480,7 +1483,7 @@ Win32VolumeAccess::PhysicalBlockAccess::Open(const char* deviceName, bool readOn
access = GENERIC_READ | GENERIC_WRITE;
if (fIsWin9x) {
fHandle = CreateFile("\\\\.\\vwin32", 0, 0, NULL,
fHandle = CreateFile(_T("\\\\.\\vwin32"), 0, 0, NULL,
OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL);
if (fHandle == INVALID_HANDLE_VALUE) {
DWORD lastError = GetLastError();
@@ -1495,7 +1498,7 @@ Win32VolumeAccess::PhysicalBlockAccess::Open(const char* deviceName, bool readOn
if (dierr != kDIErrNone)
goto bail;
} else {
char device[19] = "\\\\.\\PhysicalDrive_";
WCHAR device[19] = _T("\\\\.\\PhysicalDrive_");
assert(fInt13Unit >= 0x80 && fInt13Unit <= 0x89);
device[17] = fInt13Unit - 0x80 + '0';
WMSG2("Opening '%s' (access=0x%02x)\n", device, access);
@@ -1554,7 +1557,8 @@ Win32VolumeAccess::PhysicalBlockAccess::DetectFloppyGeometry(void)
int status;
/* verify that we can directly index the table with the enum */
for (int chk = 0; chk < NELEM(floppyGeometry); chk++) {
int chk;
for (chk = 0; chk < NELEM(floppyGeometry); chk++) {
assert(floppyGeometry[chk].kind == chk);
}
assert(chk == kFloppyMax);
@@ -1661,6 +1665,7 @@ Win32VolumeAccess::PhysicalBlockAccess::Close(void)
* ASPIBlockAccess
* ===========================================================================
*/
#ifdef WANT_ASPI
/*
* Unpack device name and verify that the device is a CD-ROM drive or
@@ -1971,6 +1976,7 @@ Win32VolumeAccess::ASPIBlockAccess::Close(void)
fpASPI = nil;
return kDIErrNone;
}
#endif
/*