Changeset 618 for trunk/dll/mainwnd.c

Timestamp:

Apr 20, 2007, 9:19:03 PM (18 years ago)

Author:

Steven Levine

Message:

Add more drag/drop error checking
Use FreeDragInfoData
Sync with NumItemsToUnhilite AcceptOneDrop GetOneDrop mods

File:

• trunk/dll/mainwnd.c (modified) (16 diffs)

trunk/dll/mainwnd.c

@@ -30 +30 @@
   06 Apr 07 GKY Work around PM DragInfo and DrgFreeDISH limits
   06 Apr 07 GKY Add some error checking in drag/drop
+  15 Apr 07 SHL mainwnd MAIN_SETUPLIST restore state not found reporting
+  19 Apr 07 SHL Sync with AcceptOneDrop GetOneDrop mods
+  20 Apr 07 SHL Avoid spurious add_udir error reports
 
 ***********************************************************************/
@@ -35 +38 @@
 #define INCL_DOS
 #define INCL_WIN
+// #define INCL_WINERRORS
+#define INCL_SHLERRORS
 #define INCL_WINHELP
 #define INCL_GPI
@@ -628 +633 @@
         DrawTargetEmphasis(hwnd, emphasized);
       }
-      if (AcceptOneDrop(mp1, mp2))
+      if (AcceptOneDrop(hwnd, mp1, mp2))
         return MRFROM2SHORT(DOR_DROP, DO_MOVE);
       return MRFROM2SHORT(DOR_NEVERDROP, 0);
@@ -662 +667 @@
         DrawTargetEmphasis(hwnd, emphasized);
       }
-      if (GetOneDrop(mp1, mp2, szFrom, sizeof(szFrom))) {
+      if (GetOneDrop(hwnd, mp1, mp2, szFrom, sizeof(szFrom))) {
         MakeValidDir(szFrom);
         WinSetWindowText(hwnd, szFrom);
@@ -1233 +1238 @@
       cdi.pDragInfo = mp1;
       li = DoFileDrop(hwnd, NULL, FALSE, mp1, MPFROMP(&cdi));
-      if (fExceedPMDrgLimit)
+      if (NumItemsToUnhilite)
         saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
                              hwnd,
@@ -1752 +1757 @@
         DrawTargetEmphasis(hwnd, emphasized);
       }
-      if (AcceptOneDrop(mp1, mp2))
+      if (AcceptOneDrop(hwnd, mp1, mp2))
         return MRFROM2SHORT(DOR_DROP, DO_MOVE);
       return MRFROM2SHORT(DOR_NEVERDROP, 0);
@@ -1806 +1811 @@
                       NULL,
                       TRUE, MPFROM2SHORT(TREE_CNR, CN_DROP), MPFROMP(&cnd));
-      if (fExceedPMDrgLimit)
+      if (NumItemsToUnhilite)
         saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
                              hwnd,
@@ -3456 +3461 @@
         DrawTargetEmphasis(hwnd, emphasized);
       }
-      if (AcceptOneDrop(mp1, mp2))
+      if (AcceptOneDrop(hwnd, mp1, mp2))
         return MRFROM2SHORT(DOR_DROP, DO_MOVE);
     }
@@ -3480 +3485 @@
         DrawTargetEmphasis(hwnd, emphasized);
       }
-      if (GetOneDrop(mp1, mp2, szFrom, sizeof(szFrom))) {
+      if (GetOneDrop(hwnd, mp1, mp2, szFrom, sizeof(szFrom))) {
         if (MakeValidDir(szFrom) && !FindDirCnrByName(szFrom, TRUE)) {
           OpenDirCnr((HWND) 0, hwndMain, hwndTree, FALSE, szFrom);
@@ -4151 +4156 @@
           !DosQueryPathInfo(temp, FIL_QUERYFULLNAME, path, sizeof(path))) {
         if (SHORT1FROMMP(mp1) == IDM_ADDTOUSERLIST) {
-          if (!add_udir(TRUE, path))
-            Runtime_Error(pszSrcFile, __LINE__, "add_udir");
-          else {
-            if (fUdirsChanged)
-              save_udirs();
-            WinSendMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
-          }
+          add_udir(TRUE, path);
+          if (fUdirsChanged)
+            save_udirs();
+          WinSendMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
         }
         else {
@@ -4180 +4182 @@
       WinQueryWindowText(hwndStatelist, 13, szStateName);
       bstrip(szStateName);
-      if (*szStateName) {
+      // Ignore request if blank or attempting to using illegal name
+      if (*szStateName && stricmp(szStateName, GetPString(IDS_STATETEXT))) {
         if (SHORT1FROMMP(mp1) == IDM_SAVEDIRCNRSTATE) {
           // Save
@@ -4189 +4192 @@
               save_setups();
             }
+            else {
+              saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+                     GetPString(IDS_WARNINGTEXT),
+                     GetPString(IDS_EXISTSASATEXT), szStateName, "state name");
+              WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+            }
           }
-          WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+          else {
+            saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+                   GetPString(IDS_WARNINGTEXT),
+                   "\"%s\" state save failed", szStateName);    // 15 Apr 07 SHL failed
+            WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+          }
         }
         else {
@@ -5307 +5321 @@
                          (CHAR *) mp1);
       if (add_udir(FALSE, (CHAR *) mp1)) {
-        if (fUserComboBox) {
-          if (fAutoAddDirs)
-            WinSendMsg(hwndUserlist, LM_INSERTITEM,
-                       MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                       MPFROMP((CHAR *) mp1));
+        if (fUserComboBox && fAutoAddDirs) {
+          WinSendMsg(hwndUserlist, LM_INSERTITEM,
+                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                     MPFROMP((CHAR *) mp1));
         }
       }
@@ -5434 +5447 @@
     WinSendMsg(hwndStatelist, LM_DELETEALL, MPVOID, MPVOID);
     if (fUserComboBox) {
-
       INT x;
 
@@ -5704 +5716 @@
               SetShiftState();
               size = sizeof(ULONG);
-              sprintf(s, "%s.NumDirsLastTime", path);
+              sprintf(s, "%s.NumDirsLastTime", path);   // path is state name
               if (!PrfQueryProfileData
                   (fmprof, FM3Str, s, (PVOID) & numsaves, &size))
-                Win_Error2(hwnd, hwnd, __FILE__, __LINE__,
-                           IDS_PRFQUERYPROFILEDATA);
+              {
+                if ((WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) == PMERR_NOT_IN_IDX) {
+                  saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+                         GetPString(IDS_WARNINGTEXT),
+                         GetPString(IDS_DOESNTEXISTTEXT), path);
+                }
+                else {
+                  Win_Error2(hwnd, hwnd, __FILE__, __LINE__,
+                             IDS_PRFQUERYPROFILEDATA);
+                }
+              }
               else if (!numsaves)
                 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
@@ -5730 +5751 @@
                 }
               }
-              WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+              // fixme to hold restored state name for a while
+              // WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));    // 15 Apr 07 SHL
             }
             else if (SHORT1FROMMP(mp1) == MAIN_CMDLIST) {