Changeset 1754

Timestamp:

Mar 2, 2014, 10:05:02 PM (12 years ago)

Author:

Gregg Young

Message:

!didone for fFirstTime so the suggest code works again. Also clear out the garbage that was appearing in the string. Ticket 527.

File:

• trunk/dll/filldir.c (modified) (6 diffs)

trunk/dll/filldir.c

@@ -99 +99 @@
   12 Jun 11 GKY Replaced SleepIfNeeded with IdleIfNeeded in the container loade loop
   22 Oct 11 GKY Removing unneeded UnFlesh call from StubbyScanThread appears to significantly speed opening of FM/2
+  02 Mar 14 GKY !didone for fFirstTime so the suggest code works again. Also clear out the
+                garbage that was appearing in the string.
 
 ***********************************************************************/
@@ -149 +151 @@
 // Data definitions
 static PSZ pszSrcFile = __FILE__;
-static BOOL fFirstTime;
 INT FixedVolume = 0;
 
@@ -1279 +1280 @@
   UINT iDrvNum;
   ULONG ulDriveMapMask;
-  CHAR szSuggest[32];                   // Suggested startup command line parameters
+  CHAR szSuggest[32] = {0};                     // Suggested startup command line parameters
   CHAR szDrive[CCHMAXPATH] = " :\\";    // 13 Oct 09 SHL
   CHAR szFSType[CCHMAXPATH];
@@ -1714 +1715 @@
     BOOL includesyours = FALSE;
 
-    // 10 Jan 08 SHL fixme to understand fFirstTime - looks obsolete to me - probably mean didonce?
-    if (*szSuggest || ~driveflags[1] & DRIVE_IGNORE && fFirstTime) {
+    // 02 Mar 14 GKY !didone for fFirstTime so it works again
+   if (*szSuggest || ~driveflags[1] & DRIVE_IGNORE && !didonce) {
       if (!DosDevConfig(&info, DEVINFO_FLOPPY) && info == 1) {
         if (!*szSuggest) {
@@ -1726 +1727 @@
       }
     }
+    //DbgMsg(pszSrcFile, __LINE__, "szSuggest %x info %x", *szSuggest, info);
     if (*szSuggest) {
       APIRET rc;
@@ -1736 +1738 @@
       strcat(szSuggest, " %*");
       rc = saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
-             hwndParent ? hwndParent : hwndCnr,
-             GetPString(IDS_SUGGESTTITLETEXT),
-             GetPString(IDS_SUGGEST1TEXT),
-             (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
-             szSuggest);
+                  hwndParent ? hwndParent : hwndCnr,
+                  GetPString(IDS_SUGGESTTITLETEXT),
+                  GetPString(IDS_SUGGEST1TEXT),
+                  (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
+                  szSuggest);
       if (rc == MBID_YES) {
         HOBJECT hFM2Object;