Changeset 447 for trunk/dll/mainwnd.c

Timestamp:

Aug 24, 2006, 6:52:11 AM (19 years ago)

Author:

root

Message:

Complain nicer if state name does not exist

File:

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

trunk/dll/mainwnd.c

@@ -23 +23 @@
   29 May 06 SHL IDM_EDITANYARCHIVER: sanitize code
   17 Jul 06 SHL Use Runtime_Error
+  17 Aug 06 SHL Complain nicer if state name does not exist
 
 ***********************************************************************/
@@ -320 +321 @@
       while ((hwndC = WinGetNextWindow(henum)) != NULLHANDLE)
       {
-// saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu",hwndTree,exclude,hwndC);
+        // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu",hwndTree,exclude,hwndC);
         if (hwndC != exclude &&
             hwndC != hwndTree)
@@ -349 +350 @@
                 {
                   MakeValidDir(ret);
-// saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu\r\"%s\"",hwndTree,exclude,hwndC,ret);
+                  // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu\r\"%s\"",hwndTree,exclude,hwndC,ret);
                   WinEndEnumWindows(henum);
                   return hwndC;
@@ -715 +716 @@
   case WM_BEGINDRAG:
     id = WinQueryWindowUShort(hwnd, QWS_ID);
-// saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%u %s %u",id,(id == CBID_EDIT) ? "TRUE" : "FALSE",WinQueryWindowUShort(WinQueryWindow(hwnd,QW_PARENT),QWS_ID) == MAIN_USERLIST);
+    // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%u %s %u",id,(id == CBID_EDIT) ? "TRUE" : "FALSE",WinQueryWindowUShort(WinQueryWindow(hwnd,QW_PARENT),QWS_ID) == MAIN_USERLIST);
     if (id == CBID_EDIT &&
         WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
@@ -726 +727 @@
       WinQueryWindowText(hwnd, CCHMAXPATH, path);
       bstrip(path);
-// saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Dragging: %s",path);
+      // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Dragging: %s",path);
       if (*path && !IsRoot(path))
         DragOne(hwnd, (HWND)0, path, FALSE);
@@ -1454 +1455 @@
     if (tool && (tool -> flags & T_DROPABLE) != 0)
     {
-
       LISTINFO *li;
       CNRDRAGINFO cdi;
@@ -1464 +1464 @@
       }
       memset(&cdi, 0, sizeof(cdi));
-      cdi.pRecord = NULL;
       cdi.pDragInfo = mp1;
       li = DoFileDrop(hwnd,
@@ -1478 +1477 @@
         else
         {
-
           HWND hwndActive;
 
@@ -5045 +5043 @@
       if (*name)
       {
-        if (SHORT1FROMMP(mp1) == IDM_SAVEDIRCNRSTATE)
-        {
+        if (SHORT1FROMMP(mp1) == IDM_SAVEDIRCNRSTATE) {
+          // Save
           if (SaveDirCnrState(hwnd, name))
           {
@@ -5057 +5055 @@
             }
           }
-          WinSetWindowText(hwndStatelist,
-                           GetPString(IDS_STATETEXT));
-        }
-        else
-        {
-
+          WinSetWindowText(hwndStatelist,GetPString(IDS_STATETEXT));
+        }
+        else {
+          // Delete
           ULONG numsaves = 0, size, x;
           CHAR s[120];
@@ -5070 +5066 @@
           sprintf(s, "%s.NumDirsLastTime", name);
           size = sizeof(ULONG);
-          if (!PrfQueryProfileData(fmprof, FM3Str, s, (PVOID)&numsaves, &size))
-            Win_Error2(hwnd,hwnd,__FILE__,__LINE__,IDS_PRFQUERYPROFILEDATA);
+          if (!PrfQueryProfileData(fmprof, FM3Str, s, (PVOID)&numsaves, &size)) {
+            saymsg(MB_ENTER | MB_ICONASTERISK,
+                   hwnd,
+                   GetPString(IDS_WARNINGTEXT),
+                   GetPString(IDS_DOESNTEXISTTEXT), name);
+          }
           else if (!size)
             Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);