Commit Graph

186 Commits

Author SHA1 Message Date
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
Andy McFadden
205e3003f8 Update the ReadMe files
This ports the contents of ReadMe.htm to Markdown, splitting the Linux
information out into a separate file.  Specific instructions for
building the Linux utilities are now included.
2014-12-11 20:14:31 -08:00
Andy McFadden
29e64011e1 Don't use %zd format
Visual Studio still doesn't support it.
2014-12-11 17:34:25 -08:00
Andy McFadden
8e910b23ca gcc/linux updates
Many updates to format strings, largely as a result of changing
various "long" variables to uint32_t.

Fixed the diskimg debug macros for gcc, which requires an extra
"##" to remove the "," when there are no arguments.  (Apparently
Visual Studio just strips this away for you.)

Stripped out a couple of dead variables spotted by gcc.  Return
the actual error in a couple of HFS file functions.
2014-12-11 16:36:40 -08:00
Andy McFadden
4638d03d6c Shift responsibility for file associations to the installer
In the past, CiderPress managed its own file associations.  This is
the feature that launches CiderPress when you double-click on a ".shk"
file.  The installer ran "CiderPress -install" and "-uninstall" during
installation and removal to give CP a chance to establish and clean
up the necessary registry entries.

The code built with VS6 works fine.  The code built with VS2013 fails
with an access denied error.  It appears there have been some access
policy changes, and the older code is getting "grandfathered in".  This
is really something that the installer ought to be handling, though,
so rather than figure out how to fix CiderPress, I'm removing the
file type association code from CiderPress and letting DeployMaster
handle it.

This may be slightly less convenient for anyone who had reason to
change type associations frequently.  Modern versions of Windows have
relatively easy to use control panel UIs for adjusting types, and
the "advanced installation" feature of DeployMaster allows you to
un-check the types that you don't want to have associated with
CiderPress.

(...with one minor hitch: DeployMaster 4.2.2 only shows the first 9
associations, and CiderPress has 18.)

This change renders most of the registry-handling code obsolete, as
well as the "-install" / "-uninstall" handling.  I'm 99% sure I want
to go this way, but I'm keeping things #ifdefed rather than deleted
for the moment.
2014-12-11 14:22:39 -08:00
Andy McFadden
a5fa12b332 Fix copy & paste
Some of the code was mis-handling wide character filenames.

A direct copy & paste should be using the 8-bit form of the filename,
but that's a deeper fix.

Also, changed some types to use explicit integer width specifiers.
2014-12-10 17:10:13 -08:00
Andy McFadden
be8d3a4911 WinXP compatibility update
This changes the Platform Toolset configuration from "Visual Studio
2013 (v120)" to "Visual Studio 2013 - Windows XP (v120_xp)".  Without
this change, executables built by VS2013 will not run on WinXP.

To actually run on WinXP, we also need to install the redistributable
msvcr120.dll and mfc120u.dll, both of which are fairly large.  The
installation package has more than doubled in size.

At some point we may want to drop WinXP support -- Microsoft declared
end-of-life on April 8 2014 -- but if the only penalty is a 2MB increase
in installer size, we might as well keep supporting WinXP users.
2014-12-10 11:57:41 -08:00
Andy McFadden
4827cc2417 Update DeployMaster configuration script
Bumped version number and copyright dates.  Updated help to use CHM
file, and updated DLL file names.
2014-12-09 17:33:16 -08:00
Andy McFadden
759f0d820f WinHelp to HtmlHelp conversion, part 2
This updates the various dialogs to use the new functions.  The help
system should be fully functional now.
2014-12-09 14:10:52 -08:00
Andy McFadden
1a26be65e7 Merge branch 'master' of https://github.com/fadden/ciderpress 2014-12-08 22:51:51 -08:00
Andy McFadden
250d1043e3 WinHelp to HtmlHelp conversion, part 1
The original version of CiderPress used a WinHelp help file, built
with an application called HelpMatic Pro.  This app used a proprietary
format, and had no facility for exporting to "raw" HPJ + RTF files, so
I decompiled the HLP and imported it into HelpScribble.

Using HelpScribble, I cleaned up the help file formatting a little,
fixed up the table of contents, and exported as "raw" HtmlHelp (HHP,
HHK, HHC, and a whole bunch of HTML).  I also split the pop-up help
text, which isn't supported by HelpScribble, into a separate text file
that Microsoft's HTML Help Workshop understands.

I'm checking in the files that HTML Help Workshop needs to generate a
CHM, so anyone can update the help text.  I'm also checking in the CHM
file, rather than adding the help workshop to the build, so that it's
not necessary to download and configure the help workshop to build
CiderPress.

This change adds all of the updated help, but only updates the Help and
question mark button actions for one specific dialog.  A subsequent
change will update the rest of the dialogs.

This change is essentially upgrading us from a totally obsolete help
system to a nearly-obsolete help system, but the systems are similar
enough to make this a useful half-step on the way to something else.
The code will centralize help activation in a pair of functions in the
main app class, so any future improvements should be more limited in
scope.

This also adds a build step to copy the CHM to the execution directory.
2014-12-08 22:40:56 -08:00
Andy McFadden
7a12ed5ded Update README.md 2014-12-07 09:01:30 -08:00
Andy McFadden
d23a3b1ad8 Replace place-holder strings
The NufxLib and diskimg libraries want narrow strings for certain
things, notably for the "storage name", i.e. how the name will appear
on the disk image or in the file archive.  We need to convert from
Windows UTF-16 to an Apple II filesystem-specific 8-bit character
representation.

We used to just pass narrow strings all the way through, so we didn't
need any intermediate storage to hold the conversion.  Now we do.  In
some cases there's nowhere good to put it.  The initial UTF-16
conversion changes just dropped in some place-holder strings.

This corrects the behavior, though in a couple of cases we're adding
kluges on top of code that was already badly bent from its original
intent (as initially conceived, CiderPress wasn't going to handle disk
images, just ShrinkIt archives).  It's not pretty, but it should work
for now.
2014-12-04 17:05:48 -08:00
Andy McFadden
66660a1fe4 Add DECLARE_COPY_AND_OPEQ to util classes
Make operator= and the copy constructor private in all of the classes
in the utility library and the base classes in reformat.
2014-12-04 11:18:12 -08:00
Andy McFadden
94beec0639 File selection dialog update, part 2
This updates the main app to use the new dialog, and removes the
old code.
2014-12-03 16:10:03 -08:00
Andy McFadden
2f136fd5ab Fix some static analyzer quibbles 2014-12-02 17:55:19 -08:00
Andy McFadden
b2cd857031 File selection dialog update, part 1
This adds a replacement for the SelectFilesDialog class.  It has
been updated to use Explorer-style dialogs, which are a bit nicer
than the old-style dialogs.  Hopefully this will eliminate some of the
brain damage, like the disappearing Accept button.

This change only updates MDC.  A second change will update the main
app and remove the old code.

Also, updated the MDC version to 3.0.0, and changed the web site
linked in the Help menu from faddensoft.com to a2ciderpress.com.
2014-12-02 17:39:56 -08:00
Andy McFadden
c78017b1d2 More source code shuffling
Moved comments and return types, switched to uint types, added
"override" keyword.
2014-11-25 14:34:14 -08:00
Andy McFadden
aa3145856c Use types with explicit sizes
Focusing on the diskimg library this time, which deals with a lot of
filesystem structures that have specific widths.

This is still a bit lax in places, e.g. using "long" for lengths.
Should either specify a bit width or use di_off_t.

Also, added "override" keyword where appropriate.

Also, bumped library version to 5.0.0.
2014-11-24 15:57:25 -08:00
Andy McFadden
edb7c13120 Fix diskimg OpenImage
The OpenImage method had an overload that took void*.  This turns out
to be a bad idea, because void* matches any pointer type that didn't
match something else.  So the WCHAR* filenames were going to the "open
from buffer" method rather than the "open from file" variant.

A less important issue is whether open-from-buffer should take a const
or non-const pointer.  If the "readOnly" boolean flag is not set, then
the contents can be altered and const is inappropriate.  The best course
seems to be to drop the boolean flag as an argument, and just have two
different methods.
2014-11-23 10:34:57 -08:00
Andy McFadden
d8223dbcfd Relocate method comments
This moves method comments from the .cpp file to the .h file,
where users of the methods can find them.  This also makes it
possible for the IDE to show the comments when you mouse-hover over
the method name, though Visual Studio is a bit weak in this regard.

Also, added "override" keywords on overridden methods.  Reasonably
current versions of popular compilers seem to support this.

Also, don't have the return type on a separate line in the .cpp file.
The motivation for the practice -- quickly finding a method definition
with "^name" -- is less useful in C++ than C, and modern IDEs provide
more convenient ways to do the same thing.

Also, do some more conversion from unsigned types to uintXX_t.

This commit is primarily for the "app" directory.
2014-11-21 22:33:39 -08:00
Andy McFadden
30b44d98eb Minor tweaks 2014-11-20 18:32:06 -08:00