Changeset 1803

Timestamp:

May 2, 2015, 11:56:39 PM (10 years ago)

Author:

Gregg Young

Message:

Changes to allow a JAVA executable object to be created using "Real object" menu item on a jar file. (Ticket [37]) Eliminate redundant prompts and error messages when telling FM/2 not to delete a R/O file. (Ticket [548]) Limit attempts to unlock files to exes and dlls. (Ticket [549])

Location:

trunk/dll

Files:

• collect.c (modified) (4 diffs)
• copyf.c (modified) (3 diffs)
• dircnrs.c (modified) (4 diffs)
• fm3dll2.h (modified) (2 diffs)
• fm3res.rc (modified) (5 diffs)
• ipf/Trouble.ipf (modified) (2 diffs)
• ipf/shadow.ipf (modified) (3 diffs)
• seeall.c (modified) (4 diffs)
• shadow.c (modified) (8 diffs)
• treecnr.c (modified) (2 diffs)
• worker.c (modified) (4 diffs)

trunk/dll/collect.c

@@ -87 +87 @@
                 a trap when FM2 is shutdown or the container is closed while collector
                 container is still populating
+  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+                menu item on a jar file.
 
 ***********************************************************************/
@@ -637 +639 @@
       case IDM_SHADOW:
       case IDM_SHADOW2:
+      case IDM_JAVAEXE:
       case IDM_PRINT:
       case IDM_ATTRS:
@@ -2328 +2331 @@
       case IDM_SHADOW:
       case IDM_SHADOW2:
+      case IDM_JAVAEXE:
       case IDM_DELETE:
       case IDM_PERMDELETE:
@@ -2388 +2392 @@
               case IDM_PRINT:
               case IDM_SHADOW:
-              case IDM_SHADOW2:
+              case IDM_SHADOW2:
+              case IDM_JAVAEXE:
               case IDM_OBJECT:
               case IDM_VIEW:

trunk/dll/copyf.c

@@ -41 +41 @@
   22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
   19 Jul 14 GKY Fix redundant error message following selection of no for unlocking a file
+  02 May 15 GKY Changes to R/O check to eliminate redundant checks and error messages
+  02 May 15 GKY Limit unlock attempts to exes and dlls.
 
 ***********************************************************************/
@@ -689 +691 @@
   APIRET rc;
   INT ret = -1;
-  INT retrn;
+  INT retrn = SM2_YES;
   FILESTATUS3 fsi;
 
@@ -715 +717 @@
         DosError(FERR_DISABLEHARDERR);
         if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
-          ret = 0;
-      }
-    }
-  }
-  if (error ==  ERROR_SHARING_VIOLATION && fUnlock) {
+          ret = SM2_YES;
+      }
+    }
+  }
+  if (error ==  ERROR_SHARING_VIOLATION && fUnlock &&
+      (retrn == SM2_YES || retrn == SM2_DONTASK)   &&
+      (strstr(strlwr(filename), ".dll") || strstr(strlwr(filename), ".exe"))) {
     retrn = saymsg(MB_YESNO | MB_DEFBUTTON2,
                  HWND_DESKTOP,

trunk/dll/dircnrs.c

@@ -88 +88 @@
   30 Aug 14 GKY Add semaphore hmtxFiltering to prevent freeing dcd while filtering. Prevents
                 a trap when FM2 is shutdown while directory containers are still populating
+  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+                menu item on a jar file.
 
 ***********************************************************************/
@@ -982 +984 @@
       case IDM_SHADOW:
       case IDM_SHADOW2:
+      case IDM_JAVAEXE:
       case IDM_PRINT:
       case IDM_ATTRS:
@@ -2607 +2610 @@
       case IDM_SHADOW:
       case IDM_SHADOW2:
+      case IDM_JAVAEXE:
       case IDM_DELETE:
       case IDM_PERMDELETE:
@@ -2707 +2711 @@
               case IDM_PRINT:
               case IDM_SHADOW:
-              case IDM_SHADOW2:
+              case IDM_SHADOW2:
+              case IDM_JAVAEXE:
               case IDM_OBJECT:
               case IDM_VIEW:

trunk/dll/fm3dll2.h

@@ -39 +39 @@
   16 Feb 14 GKY Rework readonly check on delete code so it actually works in a logical way
                 and so it works with move to trashcan inabled.
+  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+                menu item on a jar file.
 
   Align with spaces only - no tabs please
@@ -408 +410 @@
 #define IDM_OPENDIRWINDOW   1169
 #define IDM_UNLOCKFILE      1170
+#define IDM_JAVAEXE         1171
 
 #define SM2_DIALOG          1234

trunk/dll/fm3res.rc

@@ -76 +76 @@
                 Enhance the error message. Ticket 502
   30 Aug 14 GKY Use saymsg2 for Suggest dialog
+  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+                menu item on a jar file.
   
 ***********************************************************************/
@@ -1272 +1274 @@
          MENUITEM "~Real objects...",IDM_OBJECT
          MENUITEM "~Shadows in folder...",IDM_SHADOW2
+         MENUITEM "~Change JAVA executable", IDM_JAVAEXE
   }
   SUBMENU "Save Lists to clipboard/file",         IDM_SAVESUBMENU
@@ -1568 +1571 @@
          MENUITEM "~Real objects...",IDM_OBJECT
          MENUITEM "~Shadows in folder...",IDM_SHADOW2
+         MENUITEM "~Change JAVA executable", IDM_JAVAEXE
   }
   SUBMENU "Save Lists to clipboard/file",         IDM_SAVESUBMENU
@@ -2199 +2203 @@
                 MENUITEM "~Shadows...",         IDM_SHADOW
                 MENUITEM "~Real objects...",    IDM_OBJECT
+                MENUITEM "~Change JAVA executable", IDM_JAVAEXE
          }
          MENUITEM "~Hide selected",        IDM_HIDEALL
@@ -2280 +2285 @@
          MENUITEM "~Shadows...",         IDM_SHADOW
          MENUITEM "~Real objects...",    IDM_OBJECT
+         MENUITEM "~Change JAVA executable", IDM_JAVAEXE
   }
   MENUITEM "~Hide selected",        IDM_HIDEALL

trunk/dll/ipf/Trouble.ipf

@@ -6 +6 @@
 .*
 .* Copyright (c) 1993-98 M. Kimes
-.* Copyright (c) 2002-2014 Steven H.Levine
+.* Copyright (c) 2002-2015 Steven H.Levine
 .*
 .* 06 Apr 07 GKY Added drag limit information
@@ -16 +16 @@
 .* 01 Jan 13 GKY Removed reference to install.cmd which is no longer in the FM/2 package
 .* 23 Mar 14 GKY Add known problems with starting with redirection and inability to copy
-.*               from "completed" windows. Fixed some typos
+.*             from "completed" windows. Fixed some typos
 .*
 .***********************************************************************

trunk/dll/ipf/shadow.ipf

@@ +1 @@
+.***********************************************************************
+.*
+.* $Id$
+.*
+.* fm/2 help - Objects and shadows
+.*
+.* Copyright (c) 1993-98 M. Kimes
+.* Copyright (c) 2002-2015 Steven H.Levine
+.*
+.* 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+.*                menu item on a jar file.
+.*
+.***********************************************************************
+.*
 :h2 res=93600 name=PANEL_SHADOW.Shadow
 :i1 id=aboutShadow.Shadow
@@ -13 +27 @@
 on the desktop and the shadows are placed inside that folder. You can
 move the shadows or folder elsewhere after that.
-
 :h2 res=91700 name=PANEL_OBJECTS.Real Objects
 :i1 id=aboutObjects.Real Objects
@@ -28 +41 @@
 on the desktop and the objects are placed inside that folder. You can
 move the objects or folder elsewhere after that.
+:p.
+FM/2 handles JAVA jar files in a way that creates an executable program
+object. The first time you use it you must select the JAVA executable
+you wish to use. I recommend PATH\OPENJDK6\bin\javaw.exe. 
+Your selection is saved in the FM/2 ini file for future
+use. It can be changed by selecting the :hp1.Change JAVA executable:ehp1. 
+from a context menu or the Files pulldown submenu (Create Objects submenu)
+You will be prompted to select an icon file for the object. Some JAVA 
+programs will need additional command line switches (e.g. SmartSVN requires
+-Dsmartsvn.checkIncompatibleJava=false). You can add these by opening the
+object properties and editing the parameters box. You should restart your
+desktop before doing so since the object tends to lose its icon when opening
+in properties view if you don't
 

trunk/dll/seeall.c

@@ -62 +62 @@
                 and so it works with move to trashcan inabled.
   22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
+  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+                menu item on a jar file.
 
 ***********************************************************************/
@@ -4251 +4253 @@
     case IDM_SHADOW:
     case IDM_OBJECT:
+    case IDM_JAVAEXE:
     case IDM_OPENSETTINGS:
     case IDM_OPENDEFAULT:
@@ -4305 +4308 @@
         case IDM_EXTRACT:
         case IDM_SHADOW:
-        case IDM_OBJECT:
+        case IDM_OBJECT:
+        case IDM_JAVAEXE:
         case IDM_OPENSETTINGS:
         case IDM_OPENDEFAULT:
@@ -4344 +4348 @@
               case IDM_UNLOCKFILE:
               case IDM_OBJECT:
-              case IDM_SHADOW:
+              case IDM_SHADOW:
+              case IDM_JAVAEXE:
               case IDM_OPENSETTINGS:
               case IDM_OPENDEFAULT:

trunk/dll/shadow.c

@@ -17 +17 @@
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   28 Jun 14 GKY Fix errors identified with CPPCheck;
+  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+                menu item on a jar file.
 
 ***********************************************************************/
@@ -43 +45 @@
 #include "fortify.h"
 #include "init.h"                       // Data declaration(s)
+#include "notebook.h"                   // Data declaration(s)
+#include "getnames.h"                   // insert_filename
+#include "srchpath.h"                   // SearchMultiplePathsForFile
 
 #pragma data_seg(DATA1)
@@ -53 +58 @@
 
 static HOBJECT CreateProgramObject(CHAR * objtitle, CHAR * location, CHAR * path,
+                                   CHAR * cnr);
+static HOBJECT CreateJAVAProgramObject(CHAR * objtitle, CHAR * location, CHAR * path,
                             CHAR * cnr);
 static HOBJECT CreateShadowObject(CHAR * objtitle, CHAR * location, CHAR * path,
@@ -62 +69 @@
   HOBJECT obj = (HOBJECT) 0;
   CHAR *s;
-
-  if (!cnr)
-    return obj;
+  CHAR objecttmp[CCHMAXPATH];
+
+  if (!cnr)
+    return obj;
+  strcpy(objecttmp, objtitle);
+  s = strchr(objecttmp, '.');
+  if (s)
+    *s = 0;
   obj = WinCreateObject((CHAR *) WPProgram,
-                        objtitle,
+                        objecttmp,
                         "NODELETE=NO;TEMPLATE=NO;NOCOPY=NO;NOMOVE=NO",
                         (location) ? location : cnr, CO_FAILIFEXISTS);
@@ -85 +97 @@
 }
 
+HOBJECT CreateJAVAProgramObject(CHAR * objtitle, CHAR * location, CHAR * path,
+                            CHAR * cnr)
+{
+  HOBJECT obj = (HOBJECT) 0;
+  CHAR *s;
+  CHAR objecttmp[CCHMAXPATH];
+  CHAR javaexe[CCHMAXPATH] = {0};
+  CHAR icon[CCHMAXPATH] = {0};
+  //PSZ env = 0;
+  //FILESTATUS3 fsa;
+
+  if (!cnr)
+    return obj;
+  if (!PrfQueryProfileString(fmprof, appname, "JavaExe", NULL, javaexe, CCHMAXPATH - 1)) {
+    strcpy(javaexe, PCSZ_STARDOTEXE);
+    if (insert_filename(HWND_DESKTOP, javaexe, TRUE, FALSE) &&
+        *javaexe && !strchr(javaexe, '*') && !strchr(javaexe, '?'))
+      PrfWriteProfileString(fmprof, appname, "JavaExe", javaexe);
+    else
+      return obj;
+  }
+  strcpy(objecttmp, objtitle);
+  s = strchr(objecttmp, '.');
+  if (s)
+    *s = 0;
+  strcpy(icon, path);
+  strcat(icon, "\\*.ico");
+  insert_filename(HWND_DESKTOP, icon, TRUE, FALSE);
+  obj = WinCreateObject((CHAR *) WPProgram,
+                        objecttmp,
+                        "NOPRINT=YES;DEFAULTVIEW=RUNNING",
+                        (location) ? location : cnr, CO_FAILIFEXISTS);
+  if (obj) {
+    s = xmalloc(5192, pszSrcFile, __LINE__);
+    if (s) {
+      sprintf(s,
+              "%s%s;EXENAME=%s%s%s;PARAMETERS= %s%s%s%s %%*;%sOBJECTID=<FM2_%s>",
+              "ICONFILE=",
+              icon,
+              javaexe,
+              (path) ? ";STARTUPDIR=" : NullStr,
+              (path) ? path : NullStr,
+              "-jar ",
+              (path) ? path : NullStr,
+              (path) ? PCSZ_BACKSLASH : NullStr,
+              objtitle,
+              "PROGTYPE=PM;",
+              objecttmp);
+      WinSetObjectData(obj, s);
+      free(s);
+    }
+  }
+  return obj;
+}
+
 HOBJECT CreateDataObject(CHAR * objtitle, CHAR * location, CHAR * path,
                          CHAR * cnr)
@@ -189 +256 @@
   HOBJECT obj = (HOBJECT) 0;
   FILESTATUS3 fsa;
+  BOOL JAVA = FALSE;
 
   *szBuff = 0;
@@ -233 +301 @@
           if (!stricmp(p, PCSZ_DOTBAT) || !stricmp(p, PCSZ_DOTCMD) ||
               !stricmp(p, PCSZ_DOTBTM))
-            apt |= FAPPTYP_BOUND;
+            apt |= FAPPTYP_BOUND;
+          else if(!stricmp(p, ".jar"))
+            JAVA = TRUE;
         }
         *szBuffer = 0;
@@ -262 +332 @@
           *szBuffer = 0;
         if ((fsa.attrFile & FILE_DIRECTORY) || Shadows)
-          CreateShadowObject(p, (obj) ? szBuffer : NULL, szDir, 0, cnr);
+          CreateShadowObject(p, (obj) ? szBuffer : NULL, szDir, 0, cnr);
+        else if (JAVA)
+          if (CreateJAVAProgramObject(p, (obj) ? szBuffer : NULL, szDir, cnr))
+            apt |= FAPPTYP_BOUND;
         else if (!(apt & (FAPPTYP_NOTWINDOWCOMPAT | FAPPTYP_WINDOWCOMPAT | FAPPTYP_WINDOWAPI |
                           FAPPTYP_BOUND | FAPPTYP_DOS | FAPPTYP_WINDOWSREAL |

trunk/dll/treecnr.c

@@ -97 +97 @@
                 a trap when FM2 is shutdown or the container is closed while tree
                 container is still populating
+  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+                menu item on a jar file.
 
 ***********************************************************************/
@@ -909 +911 @@
       case IDM_SHADOW:
       case IDM_SHADOW2:
+      case IDM_JAVAEXE:
       case IDM_PRINT:
       case IDM_ATTRS:

trunk/dll/worker.c

@@ -64 +64 @@
                 delete and eliminated the check on additional temp file deletes
   22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
+  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
+                menu item on a jar file.
 
 ***********************************************************************/
@@ -129 +131 @@
 #include "fortify.h"
 #include "excputil.h"                   // 06 May 08 SHL added
+#include "getnames.h"                   // insert_filename
 
 // Data definitions
@@ -1560 +1563 @@
               AddNote(GetPString(IDS_MADEOBJSTEXT));
             }
-            break;
+            break;
+
+          case IDM_JAVAEXE:
+            {
+            CHAR javaexe[CCHMAXPATH] = {0};
+
+            strcpy(javaexe, PCSZ_STARDOTEXE);
+            if (insert_filename(HWND_DESKTOP, javaexe, TRUE, FALSE) &&
+                *javaexe && !strchr(javaexe, '*') && !strchr(javaexe, '?'))
+              PrfWriteProfileString(fmprof, appname, "JavaExe", javaexe);
+            }
+            break;
 
           case IDM_PRINT:
@@ -1794 +1808 @@
                 //DbgMsg(pszSrcFile, __LINE__, "error %i retrn %i", error, retrn);
                 if (fWarnReadOnly && error ==  ERROR_FILE_EXISTS) {
-                  error = ERROR_ACCESS_DENIED;
                   retrn = SM2_NO;
                 }
-                if (error && (error != ERROR_ACCESS_DENIED ||
-                              (error == ERROR_ACCESS_DENIED &&
-                               (retrn == SM2_YES || retrn == SM2_DONTASK || retrn == 0)))) {
+                if (error && (retrn == SM2_YES || retrn == SM2_DONTASK))  {
                   if (LogFileHandle)
                     fprintf(LogFileHandle,