Changeset 1068

Timestamp:

07/14/08 15:50:10 (7 weeks ago)

Author:

jbs

Message:

Ticket 126: Add support for WPS open default & open settings in arccnrs

Location:

trunk/dll

Files:

• arccnrs.c (modified) (9 diffs)
• fm3res.rc (modified) (5 diffs)

trunk/dll/arccnrs.c

@@ -53 +53 @@
   15 Feb 08 SHL Sync with settings menu rework
   29 Feb 08 GKY Use xfree where appropriate
+  14 Jul 08 JBS Ticket 126: Add support for WPS open default & open settings in arccnrs
 
 ***********************************************************************/
@@ -1632 +1633 @@
         case IDM_EXTRACTWDIRS:
         case IDM_EXTRACT:
+        case IDM_OPENDEFAULT:
+        case IDM_OPENSETTINGS:
           {
             CHAR *endofit, *ptr;
             PSZ pszCmdLine;
             INT z;
-
             if ((li->type == IDM_EXTRACT && !li->info->extract) ||
                 ((li->type == IDM_VIEW || li->type == IDM_VIEWTEXT ||
@@ -1707 +1709 @@
                       li->type == IDM_EDIT ||
                       li->type == IDM_EDITTEXT ||
-                      (li->type == IDM_EDITBINARY &&
+                      li->type == IDM_OPENDEFAULT ||
+                      li->type == IDM_OPENSETTINGS ||
+                      (li->type == IDM_EDITBINARY &&            // JBS No way for this () to be true??
                        li->type == IDM_MCIPLAY)) &&
                      !li->info->exwdirs)) ?
@@ -1801 +1805 @@
                      li->type == IDM_VIEWARCHIVE ||
                      li->type == IDM_EDITBINARY ||
+                     li->type == IDM_OPENDEFAULT ||
+                     li->type == IDM_OPENSETTINGS ||
                      li->type == IDM_MCIPLAY || li->type == IDM_PRINT) {
 
               CHAR *temp, *p;
-
               for (x = 0; li->list[x]; x++) {
                 if (!li->info->exwdirs) {
@@ -1895 +1900 @@
                            WINDOWED | SEPARATE, li->targetpath, li->list,
                            NULL, pszSrcFile, __LINE__);
+              }
+              else if (li->type == IDM_OPENDEFAULT ||
+                       li->type == IDM_OPENSETTINGS) {
+                WORKER *wk;
+#               ifdef FORTIFY
+                Fortify_EnterScope();
+#               endif
+                wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__);
+                if (!wk)
+                  FreeListInfo(li);
+                else {
+                  wk->size = sizeof(WORKER);
+                  wk->hwndCnr = dcd->hwndCnr;
+                  wk->hwndParent = dcd->hwndParent;
+                  wk->hwndFrame = dcd->hwndFrame;
+                  wk->hwndClient = dcd->hwndClient;
+                  wk->li = li;
+                  strcpy(wk->directory, dcd->directory);
+                  if (_beginthread(Action, NULL, 122880, (PVOID) wk) == -1) {
+                    Runtime_Error(pszSrcFile, __LINE__,
+                                  GetPString(IDS_COULDNTSTARTTHREADTEXT));
+                    free(wk);
+                    FreeListInfo((LISTINFO *) mp1);
+#                   ifdef FORTIFY
+                    Fortify_LeaveScope();
+#                   endif
+                  }
+        }
+                
               }
               else {
@@ -1982 +2016 @@
         }
       }
-      FreeListInfo(li);
+      if (li->type != IDM_OPENDEFAULT && li->type != IDM_OPENSETTINGS)
+      {
+        FreeListInfo(li);
+      }
     }
     return 0;
@@ -2909 +2946 @@
       case IDM_EXEC:
       case IDM_VIRUSSCAN:
+      case IDM_OPENDEFAULT:
+      case IDM_OPENSETTINGS:
         {
           LISTINFO *li;
@@ -2972 +3011 @@
             case IDM_PRINT:
             case IDM_VIRUSSCAN:
+            case IDM_OPENDEFAULT:
+            case IDM_OPENSETTINGS:
               strcpy(li->targetpath, dcd->workdir);
               break;
@@ -2988 +3029 @@
             else
               free(li);
-#             ifdef FORTIFY
-              Fortify_LeaveScope();
-#              endif
+#           ifdef FORTIFY
+            Fortify_LeaveScope();
+#           endif
           }
         }

trunk/dll/fm3res.rc

@@ -33 +33 @@
   19 Jan 08 GKY Rework Utilities menu
   14 Feb 08 SHL Add settings submenu.  Use new settings submenu definitions
+  14 Jul 08 JBS Ticket 126: Add support for WPS open default & open settings in arccnrs
 
 ***********************************************************************/
@@ -720 +721 @@
   VK_F5,       IDM_DOITYOURSELF,      CONTROL,VIRTUALKEY
   VK_F6,       IDM_OPENDEFAULT,       VIRTUALKEY
+  VK_F7,       IDM_OPENSETTINGS,      VIRTUALKEY
   VK_F7,       IDM_SHOWSORT,          CONTROL,VIRTUALKEY
-  VK_F7,       IDM_OPENSETTINGS,      VIRTUALKEY
   VK_F8,       IDM_SHOWSELECT,        CONTROL,VIRTUALKEY
   VK_F10,      IDM_CONTEXTMENU,       SHIFT,VIRTUALKEY
@@ -878 +879 @@
   VK_F5,       IDM_DOITYOURSELF,      CONTROL,VIRTUALKEY
   VK_F6,       IDM_OPENDEFAULT,       VIRTUALKEY
+  VK_F7,       IDM_OPENSETTINGS,      VIRTUALKEY
   VK_F7,       IDM_SHOWSORT,          CONTROL,VIRTUALKEY
-  VK_F7,       IDM_OPENSETTINGS,      VIRTUALKEY
   VK_F8,       IDM_SHOWSELECT,        CONTROL,VIRTUALKEY
   VK_F10,      IDM_CONTEXTMENU,       SHIFT,VIRTUALKEY
@@ -1694 +1695 @@
   MENUITEM "~Delete\tCtrl + d",         IDM_DELETE
   MENUITEM "~Find\tCtrl + i",           IDM_FIND
+  SUBMENU  "~Open",             IDM_OPENSUBMENU
+  {
+         MENUITEM "Default\tF6",     IDM_OPENDEFAULT
+         MENUITEM "~Settings\tF7",   IDM_OPENSETTINGS
+  }
   MENUITEM "",                    -1,                   MIS_SEPARATOR
   SUBMENU "~Edit",                IDM_EDITSUBMENU
@@ -1764 +1770 @@
   VK_F1,      IDM_HELP,             VIRTUALKEY
   VK_F3,      SC_CLOSE,             SYSCOMMAND,VIRTUALKEY
+  VK_F6,      IDM_OPENDEFAULT,      VIRTUALKEY
+  VK_F7,      IDM_OPENSETTINGS,     VIRTUALKEY
   VK_F7,      IDM_SHOWSORT,         CONTROL,VIRTUALKEY
   VK_F8,      IDM_SHOWSELECT,       CONTROL,VIRTUALKEY