Commit Graph

207 Commits

Author SHA1 Message Date
Andy McFadden 814872966e Rewrote "open archive" logic
The previous code was a stickler for only opening files whose type
matched what was selected in the filter pop-up.  The original goal
was to allow you to choose whether a BXY or SDK file was interpreted
as Binary II, ShrinkIt, or disk image, since they could go either
way.  Unfortunately, its refusal to consider types other than what
was selected made it kind of annoying.

The new code will start by trying to open the file with the selected
filter, so that it's still possible to choose how SDK and BXY files
are opened.  However, it now continues on, trying all other types
before finally giving up.

If the generic ("*.*") filter is selected, CiderPress will start by
trying to open the file as a disk image.

This seems to produce good results with a variety of known and
unknown files.
2015-01-13 15:54:10 -08:00
Andy McFadden 432b1c4cc6 Fix overwrite dialog
Was setting the original pathname improperly, so when attempting
to add a file to a NuFX archive the "do you want to overwrite
existing entry?" dialog contained gibberish.
2015-01-13 15:47:18 -08:00
Andy McFadden 1d6736fd92 Add "future trouble spots" section 2015-01-13 14:10:39 -08:00
Andy McFadden b3780261c4 Minor tweaks 2015-01-13 13:43:48 -08:00
Andy McFadden ed2d16a016 Nudge 2015-01-13 13:28:02 -08:00
Andy McFadden fd37bfd261 Reimplement ChooseDirDialog
The previous version was written to work on Win98+, and used the
rather gnarly ShellTree class.  Since we no longer support Win98,
we can now use CShellManager::BrowseForFolder(), which does exactly
what we want without all the ugly code (and it looks nicer, and it
integrates better with the rest of the system).

We can also get rid of NewFolderDialog, which only existed to allow
the user to create a folder when trudging through ShellTree.

This required "upgrading" the main app object from CWinApp to
CWinAppEx, but that appears to be benign.  Tested on WinXP and it
all seems fine.
2015-01-13 13:25:34 -08:00
Andy McFadden 7cd92a7fdd Version bump to 4.0.0b1 2015-01-12 18:18:28 -08:00
Andy McFadden b409d613fa Placate EOL hobgoblins 2015-01-12 18:06:38 -08:00
Andy McFadden 5946481b4e Add AppleSingle support
This handles version 1 and 2, and copes with the broken files
created by the Mac OS X "applesingle" command-line tool (which is
unable to decode the broken files it creates).

I get the sense that many AppleSingle files don't end with ".AS", so
the filespec includes "*.*" as well.

Some AppleSingle files don't include a filename.  In that case, we
use the file's name as the entry name, minus any ".as" extension.
The current implementation doesn't convert from Unicode to Mac OS
Roman, so non-ASCII characters are mishandled unless the file was
generated by GS/ShrinkIt.  (We assume version 1 AppleSingle files
use MOR name strings.)

Also, version bump to 4.0.0d3.
2015-01-12 17:49:59 -08:00
Andy McFadden 84ba460957 Minor cleanup 2015-01-11 16:11:44 -08:00
Andy McFadden 0d5bfa593f Don't enable fields when archive is read-only
"Edit attributes" on a read-only archive was enabling the file and
aux type fields inappropriately as part of the ProDOS vs. HFS file
type handling.
2015-01-11 15:50:55 -08:00
Andy McFadden 900b4c7757 Address gcc complaint 2015-01-09 22:28:41 -08:00
Andy McFadden 3d3c19d67f Fixes for Gutenberg, Jr. disks
Also added some observations about the file format.
2015-01-09 22:25:14 -08:00
Andy McFadden 125d128b36 Show Gutenberg files as "Gutenb" in the content list 2015-01-09 18:36:05 -08:00
Andy McFadden 1362c73a7e Gutenberg tweaks
Changed the catalog scan offset so we don't overrun the buffer.

Changed a strcpy() to strncpy().

Added Gutenberg to the list of formats MDC outputs.
2015-01-09 18:24:09 -08:00
Andy McFadden 090797a76f Change tabs to spaces, use Linux EOL
No substantative changes (unless the tabs-to-spaces messed
something up).
2015-01-09 17:52:16 -08:00
Andy McFadden 683eb05a82 Change sprintf() to snprintf() 2015-01-09 17:49:27 -08:00
Andy McFadden b95575595f Merge in NufxLib v3.0.0 changes
A couple of minor fix-ups for the NufxLib snapshot.
2015-01-09 16:58:13 -08:00
Andy McFadden b97584eeb6 Update Linux build
Fix some %ld message in log messages, and update the Linux sample
code to match recent changes in NufxLib and DiskImgLib.

Also, bump MDC version to 3.0.0 to match Windows version.
2015-01-08 18:27:09 -08:00
Andy McFadden e620d054bb It's not Win9x
Changed the two IsWin9x() functions to always return false.

Eventually we'll want to roll this up, removing the Win9x branch
of the code that called these.
2015-01-08 18:04:09 -08:00
Andy McFadden 00e6b3ab5e Improve filename handling when reading from archives
This updates GenericEntry's filename handling to be more careful
about Mac OS Roman vs. Unicode.  Most of the work is still done with
a CP-1252 conversion instead of MOR, but we now do a proper
conversion on the "display name", so we see the right thing in the
content list and file viewer.

Copy & paste, disk-to-file-archive, and file-archive-to-disk
conversions should work (correctly) as before.  Extracted files will
still have "_" or "%AA" instead of a Unicode TRADE MARK SIGN, but
that's fine for now -- we can extract and re-add the files losslessly.

The filenames are now stored in CStrings rather than WCHAR*.

Also, fixed a bad initializer in the file-archive-to-disk conversion
dialog.
2015-01-08 17:57:20 -08:00
Andy McFadden b79498da50 Improve filename handling when adding files
Most of this change is a conversion of the old FileDetails struct
into a new LocalFileDetails class.  The new class keeps the
members private, and keeps the Unicode and MOR representations of
the string separate.

The NuFX and DiskImg libraries don't support UTF-16 filenames,
so we stil can't add files with non-CP-1252 filenames, but we're
a step closer.

Also, update NufxLib with a couple of fixes from the main project.

Also, fix handling of "%00" when adding files.

Also, mark most of the A2FileDOS fields private.  Not sure why
they weren't.
2015-01-08 14:16:20 -08:00
Andy McFadden d94b707489 Use more integers with explicit widths
Updated some structs and a few DiskImg APIs, primarily file type,
aux type, and access flags.
2015-01-04 18:20:59 -08:00
Andy McFadden 84706d7ea4 Update NufxLib snapshot to v3.0.0d2
This integrates the latest NufxLib sources, and updates CiderPress
to work with the API changes.
2015-01-04 11:29:51 -08:00
Andy McFadden e7512f5f07 Tweak AWGS/Teach output
Officially the \u value is signed 16-bit decimal, but we were treating
it as unsigned.  The Windows parsers handled it anyway, but it's best
to do what the spec says.
2014-12-18 18:35:30 -08:00
Andy McFadden 4dd0c9339d Quick stab at Unicode for AWGS/Teach
This tweaks the output for AWGS and Teach Text to convert from Mac
OS Roman to Unicode, rather than Windows code page 1252.

It would be slightly more efficient (and possibly a bit more legible
in the RTF file) if we left the "good" conversions alone, e.g.
continue to use the CP1252 character for "E with acute", instead of
converting to U+00C9.  That might leave us at the mercy of the code
page converter in some random RTF reader, though, so it's probably
best to just use the official Unicode values.
2014-12-18 17:33:09 -08:00
Andy McFadden 13c38be4aa Tweak error reporting 2014-12-17 15:45:28 -08:00
Andy McFadden 7b70767a1f Better error message when extracting files
The file extraction dialog allows you to select file parts, so you
can choose to exclude resource forks or just extract disk images.  If
you don't choose any parts, nothing will extract, and you get a
confusingly generic message about nothing matching the criteria.

This adds a specific error message for the case where no parts are
selected.
2014-12-17 13:31:50 -08:00
Andy McFadden 3ab2e95867 Merge branch 'master' of https://github.com/fadden/ciderpress 2014-12-17 11:46:32 -08:00
Andy McFadden f7c9c500b0 Merge pull request #4 from salfter/master
updated fix for build issues
2014-12-17 11:45:48 -08:00
Andy McFadden 00e353e696 Merge branch 'salfter-master' 2014-12-17 11:43:55 -08:00
Andy McFadden ac721baf2b Merge branch 'master' of https://github.com/salfter/ciderpress into salfter-master 2014-12-17 11:33:37 -08:00
Scott Alfter 30c28eb690 Merge branch 'master' of https://github.com/salfter/ciderpress 2014-12-17 11:18:54 -08:00
Scott Alfter 0960e23f47 found where nlist.data.txt was hiding; updated postbuild.bat accordingly 2014-12-17 11:17:23 -08:00
Scott Alfter 2751f5e79a Merge branch 'master' of https://github.com/salfter/ciderpress 2014-12-17 09:28:15 -08:00
Scott Alfter 022c88dfad fix post-build, add missing file 2014-12-17 09:27:37 -08:00
U-CATHOLICCHARITI\salfter e6a7a8d9f7 fix post-build, add missing file 2014-12-17 09:24:26 -08:00
Andy McFadden a902beb6ba Specify a custom class name for main frame
DeployMaster can detect whether or not CiderPress is currently
running by checking for the presence of a window with a specific class
name.  The default class name is generated differently each time, so
we need to set a custom class name.

Also, bumped version to 4.0.0d2.
2014-12-17 08:55:20 -08:00
Andy McFadden 48ab56f808 Update README.md 2014-12-16 15:55:16 -08:00
Andy McFadden 1a298af2c9 Merge branch 'master' of https://github.com/fadden/ciderpress 2014-12-16 15:52:46 -08:00
Andy McFadden 2e230918fe Tweaks for 4.0.0d1 release 2014-12-16 15:52:12 -08:00
Andy McFadden bf33db11ee Update README.md 2014-12-16 14:07:53 -08:00
Andy McFadden d42b9c6dc0 Add CheckedLoadString
The static analyzer was annoyed that the return value from calls to
CString::LoadString() was being ignored.  This adds a wrapper
function that checks the value and logs a failure message if the
string can't be found.
2014-12-16 11:04:31 -08:00
Andy McFadden 9a7283fa49 Fix build complaint
For some reason there was a "minimum version" with no "subsystem".
I'm not really sure what this is all about, but all the other
projects have this value, and it seems happier now.
2014-12-15 22:00:26 -08:00
Andy McFadden ef708f563e Move file association handling back into the app
The DeployMaster installer issue prevents the user from seeing more
than nine of the 18 file extensions that CiderPress wants to handle,
and I don't want to go stomping on file associations without some
way to disable the behavior.  So this returns to the previous behavior,
where CiderPress directly manages the file associations.

The CiderPress app is not able to modify HKEY_LOCAL_MACHINE (which
it used to do via HKEY_CLASSES_ROOT) on recent versions of Windows --
tested in Win7, but it probably broke with Vista.  So now we do
everything in HKEY_CURRENT_USER.  This works, more or less.

We're not looking at the Windows shell overrides, which are made
in yet another set of registry entries, so there are multiple
reasons why the values reported by the Edit Associations dialog may
now be inaccurate.  I still favor eliminating the dialog as a
long-term strategy.

I took the opportunity to do some code cleanup in the registry code.
I also added calls to SHChangeNotify() to tell the Windows shell when
file associations change, so Windows Explorer windows get updated
promptly.
2014-12-15 21:57:09 -08:00
Andy McFadden 8e53955045 Quick experiment
The Gutenberg_Jr1_f1.dsk image wasn't recognized, so I fiddled with
the code a bit.  Still doesn't look quite right, and I don't really
know anything about Gutenberg disks, so I'm leaving the new version
disabled for the moment.
2014-12-12 21:39:35 -08:00
Andy McFadden 04087a94e8 ".dsk" --> ".sdk" 2014-12-12 17:39:46 -08:00
Andy McFadden c8f8018721 Separate and expand the DiskImg docs
Move DiskImg info out of the main README, and expand upon it.
2014-12-12 14:17:22 -08:00
Andy McFadden 2709efe53b Fix up version number 2014-12-12 10:31:16 -08:00
Andy McFadden d1d2ada1cd Update README.md 2014-12-11 20:24:19 -08:00