Changeset 1451

Timestamp:

Aug 8, 2009, 10:12:04 PM (16 years ago)

Author:

Gregg Young

Message:

Change WM_USER numbers to account for the fact that some values have been used by the toolkit; Fix unexpected behavior when doubleclick on dircnr dir icon; Provide option to tun off the drive exclude dialogg on startup.

Location:

trunk/dll

Files:

• dircnrs.c (modified) (1 diff)
• filldir.c (modified) (3 diffs)
• fm3dll2.h (modified) (5 diffs)
• fm3res.rc (modified) (1 diff)
• init.c (modified) (2 diffs)
• init.h (modified) (1 diff)

trunk/dll/dircnrs.c

@@ -367 +367 @@
       NOTIFYRECORDENTER nr;
 
-      memset(&nr, 0, sizeof(NOTIFYRECORDENTER));
-      nr.hwndCnr = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), DIR_CNR);
-      WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
-                 WM_CONTROL, MPFROM2SHORT(DIR_CNR, CN_ENTER), MPFROMP(&nr));
+      if (WinQueryWindowUShort(hwnd, QWS_ID) != DIR_FOLDERICON) {
+        memset(&nr, 0, sizeof(NOTIFYRECORDENTER));
+        nr.hwndCnr = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), DIR_CNR);
+        WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
+                   WM_CONTROL, MPFROM2SHORT(DIR_CNR, CN_ENTER), MPFROMP(&nr));
+      }
     }
     break;

trunk/dll/filldir.c

@@ -1646 +1646 @@
 
     // 10 Jan 08 SHL fixme to understand fFirstTime
-    if (*suggest || (!(driveflags[1] & DRIVE_IGNORE) && fFirstTime)) {
+    if (!fDontSuggestAgain &&(*suggest || (!(driveflags[1] & DRIVE_IGNORE) && fFirstTime))) {
       if (!DosDevConfig(&info, DEVINFO_FLOPPY) && info == 1) {
         if (!*suggest) {
@@ -1665 +1665 @@
       }
       strcat(suggest, " %*");
-      if (saymsg(MB_YESNO | MB_ICONEXCLAMATION,
-                 (hwndParent) ? hwndParent : hwndCnr,
-                 GetPString(IDS_SUGGESTTITLETEXT),
-                 GetPString(IDS_SUGGEST1TEXT),
-                 (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
-                 suggest) == MBID_YES) {
+      saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
+             (hwndParent) ? hwndParent : hwndCnr,
+             GetPString(IDS_SUGGESTTITLETEXT),
+             GetPString(IDS_SUGGEST1TEXT),
+             (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
+             suggest);
+      if (MBID_YES) {
         char s[64];
 
@@ -1689 +1690 @@
         WinCreateObject(WPProgram, "Databar", s, FM3Tools, CO_UPDATEIFEXISTS);
       }
+      else if (MBID_CANCEL) {
+        fDontSuggestAgain = TRUE;
+        PrfWriteProfileData(fmprof, appname, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL));
+      }
     }
   }

trunk/dll/fm3dll2.h

@@ -666 +666 @@
 
 // User messages
-#define UM_PAINT            (WM_USER)
-#define UM_SETUP            (WM_USER + 1)
+// WM_USER used in AVSSHELL.H & ODRES.H (IBM Toolkit)
+// WM_USER +1 used in ODRES.H (IBM Toolkit)
 #define UM_RESCAN           (WM_USER + 2)
 #define UM_INITIALSIZE      (WM_USER + 3)
@@ -676 +676 @@
 #define UM_FIXEDITNAME      (WM_USER + 8)
 #define UM_UPDATERECORD     (WM_USER + 9)
-#define UM_SETDIR           (WM_USER + 10)
+// WM_USER +10 used in DSRES.H (IBM Toolkit)
 #define UM_CONTAINER_FILLED (WM_USER + 11)
 #define UM_STRETCH          (WM_USER + 12)
@@ -706 +706 @@
 #define UM_SETUP3           (WM_USER + 38)
 #define UM_CONTEXTMENU      (WM_USER + 39)
-#define UM_FILLUSERLIST     (WM_USER + 40)
-#define UM_CONTAINERDIR     (WM_USER + 41)
-#define UM_SETUP4           (WM_USER + 42)
+// WM_USER + 40-42 used in PMSTDDLG.h (IBM TOOLKIT and Open Watcom)
 #define UM_FILLSETUPLIST    (WM_USER + 43)
 #define UM_ARRANGEICONS     (WM_USER + 44)
@@ -716 +714 @@
 #define UM_ADDTOMENU        (WM_USER + 48)
 #define UM_COLLECT          (WM_USER + 49)
-#define UM_RESTOREDC        (WM_USER + 50)
-#define UM_MINIMIZE         (WM_USER + 51)
-#define UM_MAXIMIZE         (WM_USER + 52)
-#define UM_BUTTON1MOTIONSTART (WM_USER + 53)
-#define UM_SETUP6           (WM_USER + 54)
-#define UM_FILLBUTTONLIST   (WM_USER + 55)
+// WM_USER + 50-55 used in PMSTDDLG.h (IBM TOOLKIT and Open Watcom)
 #define UM_SETUSERLISTNAME  (WM_USER + 56)
 #define UM_FILTER           (WM_USER + 57)
@@ -741 +734 @@
 #define UM_HIDENOTSELECTED  (WM_USER + 73)
 #define UM_FIRSTTIME        (WM_USER + 74)
+#define UM_FILLUSERLIST     (WM_USER + 75)
+#define UM_CONTAINERDIR     (WM_USER + 76)
+#define UM_SETUP4           (WM_USER + 77)
+#define UM_RESTOREDC        (WM_USER + 78)
+#define UM_MINIMIZE         (WM_USER + 79)
+#define UM_MAXIMIZE         (WM_USER + 80)
+#define UM_BUTTON1MOTIONSTART (WM_USER + 81)
+#define UM_SETUP6           (WM_USER + 82)
+#define UM_FILLBUTTONLIST   (WM_USER + 83)
+#define UM_PAINT            (WM_USER + 84)
+#define UM_SETUP            (WM_USER + 85)
+#define UM_SETDIR           (WM_USER + 86)
+// WM_USER + 1000 used in FTPAPI.H (IBM Toolkit)
 
 #define COLR_WHITE          0

trunk/dll/fm3res.rc

@@ -3288 +3288 @@
 
     // Add strings that need to be combined by GetPString here
-    IDS_SUGGEST1TEXT1                     "Based on what I've seen while scanning your drives, I would like to suggest the following Parameters for your FM/2 program object (explanation:  each letter following the '/' character is a drive that probably should be excluded from viewing by FM/2"
-    IDS_SUGGEST1TEXT2                     " (see READ.ME), and the '%%*' on the end just enables drag-and-drop to the program object%s):\r\r""%s""\r\rWould you like me to automagically place this in the Parameters field of the FM/2 program objects (note:  existing Parameters will be replaced)?"
+    IDS_SUGGEST1TEXT1                     "Based on this scan of your drives, I would like to suggest the following parameters for your FM/2 program object (each letter following the '/' character is a drive that probably should be excluded from viewing by FM/2 (see README), and the '%%*' on the"
+    IDS_SUGGEST1TEXT2                     " end enables drag-and-drop to the program object%s):\r\r""%s""\r\rWould you like me to automatically place this in the parameters field of the FM/2 program objects (note: existing Parameters will be replaced)? Cancel = don't show this message again."
     IDS_ARCHIVERBB2TEXT1                  ";format for this archiver.bb2 file (each entry has 21 lines):\n;\n; 1st line:  ID of archiver (like ARC, LHARC, PKZIP, etc.; human consumption)\n; 2nd line:  normal extension for archives (like ZIP, ARC, LZH; note no period)\n; 3rd line:  offset into"
     IDS_ARCHIVERBB2TEXT2                  " file to signature\n; 4th line:  list command\n; 5th line:  extract command\n; 6th line:  extract w/ directories command\n; 7th line:  test archive command\n; 8th line:  add/create command\n; 9th line: add/create w/ paths command\n;10th line: add/create"

trunk/dll/init.c

@@ -192 +192 @@
 ULONG ulTimeFmt;
 ULONG ulDateFmt;
+BOOL fDontSuggestAgain;
 BOOL fInitialDriveScan;
 BOOL fAmAV2;
@@ -1240 +1241 @@
     return 0; //already complained
   size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, "DontSuggestAgain", &fDontSuggestAgain, &size);
+  size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ShowTarget", &fShowTarget, &size);
   size = sizeof(BOOL);

trunk/dll/init.h

@@ -169 +169 @@
 extern PCSZ WC_TREESTATUS;
 extern PCSZ WC_VIEWSTATUS;
+extern BOOL fDontSuggestAgain;
 extern BOOL fInitialDriveScan;
 extern BOOL fAmAV2;