Changeset 1803
- Timestamp:
- May 2, 2015, 11:56:39 PM (10 years ago)
- Location:
- trunk/dll
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/collect.c
r1799 r1803 87 87 a trap when FM2 is shutdown or the container is closed while collector 88 88 container is still populating 89 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 90 menu item on a jar file. 89 91 90 92 ***********************************************************************/ … … 637 639 case IDM_SHADOW: 638 640 case IDM_SHADOW2: 641 case IDM_JAVAEXE: 639 642 case IDM_PRINT: 640 643 case IDM_ATTRS: … … 2328 2331 case IDM_SHADOW: 2329 2332 case IDM_SHADOW2: 2333 case IDM_JAVAEXE: 2330 2334 case IDM_DELETE: 2331 2335 case IDM_PERMDELETE: … … 2388 2392 case IDM_PRINT: 2389 2393 case IDM_SHADOW: 2390 case IDM_SHADOW2: 2394 case IDM_SHADOW2: 2395 case IDM_JAVAEXE: 2391 2396 case IDM_OBJECT: 2392 2397 case IDM_VIEW: -
trunk/dll/copyf.c
r1785 r1803 41 41 22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories. 42 42 19 Jul 14 GKY Fix redundant error message following selection of no for unlocking a file 43 02 May 15 GKY Changes to R/O check to eliminate redundant checks and error messages 44 02 May 15 GKY Limit unlock attempts to exes and dlls. 43 45 44 46 ***********************************************************************/ … … 689 691 APIRET rc; 690 692 INT ret = -1; 691 INT retrn ;693 INT retrn = SM2_YES; 692 694 FILESTATUS3 fsi; 693 695 … … 715 717 DosError(FERR_DISABLEHARDERR); 716 718 if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0)) 717 ret = 0; 718 } 719 } 720 } 721 if (error == ERROR_SHARING_VIOLATION && fUnlock) { 719 ret = SM2_YES; 720 } 721 } 722 } 723 if (error == ERROR_SHARING_VIOLATION && fUnlock && 724 (retrn == SM2_YES || retrn == SM2_DONTASK) && 725 (strstr(strlwr(filename), ".dll") || strstr(strlwr(filename), ".exe"))) { 722 726 retrn = saymsg(MB_YESNO | MB_DEFBUTTON2, 723 727 HWND_DESKTOP, -
trunk/dll/dircnrs.c
r1793 r1803 88 88 30 Aug 14 GKY Add semaphore hmtxFiltering to prevent freeing dcd while filtering. Prevents 89 89 a trap when FM2 is shutdown while directory containers are still populating 90 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 91 menu item on a jar file. 90 92 91 93 ***********************************************************************/ … … 982 984 case IDM_SHADOW: 983 985 case IDM_SHADOW2: 986 case IDM_JAVAEXE: 984 987 case IDM_PRINT: 985 988 case IDM_ATTRS: … … 2607 2610 case IDM_SHADOW: 2608 2611 case IDM_SHADOW2: 2612 case IDM_JAVAEXE: 2609 2613 case IDM_DELETE: 2610 2614 case IDM_PERMDELETE: … … 2707 2711 case IDM_PRINT: 2708 2712 case IDM_SHADOW: 2709 case IDM_SHADOW2: 2713 case IDM_SHADOW2: 2714 case IDM_JAVAEXE: 2710 2715 case IDM_OBJECT: 2711 2716 case IDM_VIEW: -
trunk/dll/fm3dll2.h
r1722 r1803 39 39 16 Feb 14 GKY Rework readonly check on delete code so it actually works in a logical way 40 40 and so it works with move to trashcan inabled. 41 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 42 menu item on a jar file. 41 43 42 44 Align with spaces only - no tabs please … … 408 410 #define IDM_OPENDIRWINDOW 1169 409 411 #define IDM_UNLOCKFILE 1170 412 #define IDM_JAVAEXE 1171 410 413 411 414 #define SM2_DIALOG 1234 -
trunk/dll/fm3res.rc
r1800 r1803 76 76 Enhance the error message. Ticket 502 77 77 30 Aug 14 GKY Use saymsg2 for Suggest dialog 78 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 79 menu item on a jar file. 78 80 79 81 ***********************************************************************/ … … 1272 1274 MENUITEM "~Real objects...",IDM_OBJECT 1273 1275 MENUITEM "~Shadows in folder...",IDM_SHADOW2 1276 MENUITEM "~Change JAVA executable", IDM_JAVAEXE 1274 1277 } 1275 1278 SUBMENU "Save Lists to clipboard/file", IDM_SAVESUBMENU … … 1568 1571 MENUITEM "~Real objects...",IDM_OBJECT 1569 1572 MENUITEM "~Shadows in folder...",IDM_SHADOW2 1573 MENUITEM "~Change JAVA executable", IDM_JAVAEXE 1570 1574 } 1571 1575 SUBMENU "Save Lists to clipboard/file", IDM_SAVESUBMENU … … 2199 2203 MENUITEM "~Shadows...", IDM_SHADOW 2200 2204 MENUITEM "~Real objects...", IDM_OBJECT 2205 MENUITEM "~Change JAVA executable", IDM_JAVAEXE 2201 2206 } 2202 2207 MENUITEM "~Hide selected", IDM_HIDEALL … … 2280 2285 MENUITEM "~Shadows...", IDM_SHADOW 2281 2286 MENUITEM "~Real objects...", IDM_OBJECT 2287 MENUITEM "~Change JAVA executable", IDM_JAVAEXE 2282 2288 } 2283 2289 MENUITEM "~Hide selected", IDM_HIDEALL -
trunk/dll/ipf/Trouble.ipf
r1794 r1803 6 6 .* 7 7 .* Copyright (c) 1993-98 M. Kimes 8 .* Copyright (c) 2002-201 4Steven H.Levine8 .* Copyright (c) 2002-2015 Steven H.Levine 9 9 .* 10 10 .* 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 17 17 .* 23 Mar 14 GKY Add known problems with starting with redirection and inability to copy 18 .* 18 .* from "completed" windows. Fixed some typos 19 19 .* 20 20 .*********************************************************************** -
trunk/dll/ipf/shadow.ipf
r268 r1803 1 .*********************************************************************** 2 .* 3 .* $Id$ 4 .* 5 .* fm/2 help - Objects and shadows 6 .* 7 .* Copyright (c) 1993-98 M. Kimes 8 .* Copyright (c) 2002-2015 Steven H.Levine 9 .* 10 .* 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 11 .* menu item on a jar file. 12 .* 13 .*********************************************************************** 14 .* 1 15 :h2 res=93600 name=PANEL_SHADOW.Shadow 2 16 :i1 id=aboutShadow.Shadow … … 13 27 on the desktop and the shadows are placed inside that folder. You can 14 28 move the shadows or folder elsewhere after that. 15 16 29 :h2 res=91700 name=PANEL_OBJECTS.Real Objects 17 30 :i1 id=aboutObjects.Real Objects … … 28 41 on the desktop and the objects are placed inside that folder. You can 29 42 move the objects or folder elsewhere after that. 43 :p. 44 FM/2 handles JAVA jar files in a way that creates an executable program 45 object. The first time you use it you must select the JAVA executable 46 you wish to use. I recommend PATH\OPENJDK6\bin\javaw.exe. 47 Your selection is saved in the FM/2 ini file for future 48 use. It can be changed by selecting the :hp1.Change JAVA executable:ehp1. 49 from a context menu or the Files pulldown submenu (Create Objects submenu) 50 You will be prompted to select an icon file for the object. Some JAVA 51 programs will need additional command line switches (e.g. SmartSVN requires 52 -Dsmartsvn.checkIncompatibleJava=false). You can add these by opening the 53 object properties and editing the parameters box. You should restart your 54 desktop before doing so since the object tends to lose its icon when opening 55 in properties view if you don't 30 56 -
trunk/dll/seeall.c
r1741 r1803 62 62 and so it works with move to trashcan inabled. 63 63 22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories. 64 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 65 menu item on a jar file. 64 66 65 67 ***********************************************************************/ … … 4251 4253 case IDM_SHADOW: 4252 4254 case IDM_OBJECT: 4255 case IDM_JAVAEXE: 4253 4256 case IDM_OPENSETTINGS: 4254 4257 case IDM_OPENDEFAULT: … … 4305 4308 case IDM_EXTRACT: 4306 4309 case IDM_SHADOW: 4307 case IDM_OBJECT: 4310 case IDM_OBJECT: 4311 case IDM_JAVAEXE: 4308 4312 case IDM_OPENSETTINGS: 4309 4313 case IDM_OPENDEFAULT: … … 4344 4348 case IDM_UNLOCKFILE: 4345 4349 case IDM_OBJECT: 4346 case IDM_SHADOW: 4350 case IDM_SHADOW: 4351 case IDM_JAVAEXE: 4347 4352 case IDM_OPENSETTINGS: 4348 4353 case IDM_OPENDEFAULT: -
trunk/dll/shadow.c
r1782 r1803 17 17 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *. 18 18 28 Jun 14 GKY Fix errors identified with CPPCheck; 19 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 20 menu item on a jar file. 19 21 20 22 ***********************************************************************/ … … 43 45 #include "fortify.h" 44 46 #include "init.h" // Data declaration(s) 47 #include "notebook.h" // Data declaration(s) 48 #include "getnames.h" // insert_filename 49 #include "srchpath.h" // SearchMultiplePathsForFile 45 50 46 51 #pragma data_seg(DATA1) … … 53 58 54 59 static HOBJECT CreateProgramObject(CHAR * objtitle, CHAR * location, CHAR * path, 60 CHAR * cnr); 61 static HOBJECT CreateJAVAProgramObject(CHAR * objtitle, CHAR * location, CHAR * path, 55 62 CHAR * cnr); 56 63 static HOBJECT CreateShadowObject(CHAR * objtitle, CHAR * location, CHAR * path, … … 62 69 HOBJECT obj = (HOBJECT) 0; 63 70 CHAR *s; 64 65 if (!cnr) 66 return obj; 71 CHAR objecttmp[CCHMAXPATH]; 72 73 if (!cnr) 74 return obj; 75 strcpy(objecttmp, objtitle); 76 s = strchr(objecttmp, '.'); 77 if (s) 78 *s = 0; 67 79 obj = WinCreateObject((CHAR *) WPProgram, 68 obj title,80 objecttmp, 69 81 "NODELETE=NO;TEMPLATE=NO;NOCOPY=NO;NOMOVE=NO", 70 82 (location) ? location : cnr, CO_FAILIFEXISTS); … … 85 97 } 86 98 99 HOBJECT CreateJAVAProgramObject(CHAR * objtitle, CHAR * location, CHAR * path, 100 CHAR * cnr) 101 { 102 HOBJECT obj = (HOBJECT) 0; 103 CHAR *s; 104 CHAR objecttmp[CCHMAXPATH]; 105 CHAR javaexe[CCHMAXPATH] = {0}; 106 CHAR icon[CCHMAXPATH] = {0}; 107 //PSZ env = 0; 108 //FILESTATUS3 fsa; 109 110 if (!cnr) 111 return obj; 112 if (!PrfQueryProfileString(fmprof, appname, "JavaExe", NULL, javaexe, CCHMAXPATH - 1)) { 113 strcpy(javaexe, PCSZ_STARDOTEXE); 114 if (insert_filename(HWND_DESKTOP, javaexe, TRUE, FALSE) && 115 *javaexe && !strchr(javaexe, '*') && !strchr(javaexe, '?')) 116 PrfWriteProfileString(fmprof, appname, "JavaExe", javaexe); 117 else 118 return obj; 119 } 120 strcpy(objecttmp, objtitle); 121 s = strchr(objecttmp, '.'); 122 if (s) 123 *s = 0; 124 strcpy(icon, path); 125 strcat(icon, "\\*.ico"); 126 insert_filename(HWND_DESKTOP, icon, TRUE, FALSE); 127 obj = WinCreateObject((CHAR *) WPProgram, 128 objecttmp, 129 "NOPRINT=YES;DEFAULTVIEW=RUNNING", 130 (location) ? location : cnr, CO_FAILIFEXISTS); 131 if (obj) { 132 s = xmalloc(5192, pszSrcFile, __LINE__); 133 if (s) { 134 sprintf(s, 135 "%s%s;EXENAME=%s%s%s;PARAMETERS= %s%s%s%s %%*;%sOBJECTID=<FM2_%s>", 136 "ICONFILE=", 137 icon, 138 javaexe, 139 (path) ? ";STARTUPDIR=" : NullStr, 140 (path) ? path : NullStr, 141 "-jar ", 142 (path) ? path : NullStr, 143 (path) ? PCSZ_BACKSLASH : NullStr, 144 objtitle, 145 "PROGTYPE=PM;", 146 objecttmp); 147 WinSetObjectData(obj, s); 148 free(s); 149 } 150 } 151 return obj; 152 } 153 87 154 HOBJECT CreateDataObject(CHAR * objtitle, CHAR * location, CHAR * path, 88 155 CHAR * cnr) … … 189 256 HOBJECT obj = (HOBJECT) 0; 190 257 FILESTATUS3 fsa; 258 BOOL JAVA = FALSE; 191 259 192 260 *szBuff = 0; … … 233 301 if (!stricmp(p, PCSZ_DOTBAT) || !stricmp(p, PCSZ_DOTCMD) || 234 302 !stricmp(p, PCSZ_DOTBTM)) 235 apt |= FAPPTYP_BOUND; 303 apt |= FAPPTYP_BOUND; 304 else if(!stricmp(p, ".jar")) 305 JAVA = TRUE; 236 306 } 237 307 *szBuffer = 0; … … 262 332 *szBuffer = 0; 263 333 if ((fsa.attrFile & FILE_DIRECTORY) || Shadows) 264 CreateShadowObject(p, (obj) ? szBuffer : NULL, szDir, 0, cnr); 334 CreateShadowObject(p, (obj) ? szBuffer : NULL, szDir, 0, cnr); 335 else if (JAVA) 336 if (CreateJAVAProgramObject(p, (obj) ? szBuffer : NULL, szDir, cnr)) 337 apt |= FAPPTYP_BOUND; 265 338 else if (!(apt & (FAPPTYP_NOTWINDOWCOMPAT | FAPPTYP_WINDOWCOMPAT | FAPPTYP_WINDOWAPI | 266 339 FAPPTYP_BOUND | FAPPTYP_DOS | FAPPTYP_WINDOWSREAL | -
trunk/dll/treecnr.c
r1799 r1803 97 97 a trap when FM2 is shutdown or the container is closed while tree 98 98 container is still populating 99 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 100 menu item on a jar file. 99 101 100 102 ***********************************************************************/ … … 909 911 case IDM_SHADOW: 910 912 case IDM_SHADOW2: 913 case IDM_JAVAEXE: 911 914 case IDM_PRINT: 912 915 case IDM_ATTRS: -
trunk/dll/worker.c
r1780 r1803 64 64 delete and eliminated the check on additional temp file deletes 65 65 22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories. 66 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 67 menu item on a jar file. 66 68 67 69 ***********************************************************************/ … … 129 131 #include "fortify.h" 130 132 #include "excputil.h" // 06 May 08 SHL added 133 #include "getnames.h" // insert_filename 131 134 132 135 // Data definitions … … 1560 1563 AddNote(GetPString(IDS_MADEOBJSTEXT)); 1561 1564 } 1562 break; 1565 break; 1566 1567 case IDM_JAVAEXE: 1568 { 1569 CHAR javaexe[CCHMAXPATH] = {0}; 1570 1571 strcpy(javaexe, PCSZ_STARDOTEXE); 1572 if (insert_filename(HWND_DESKTOP, javaexe, TRUE, FALSE) && 1573 *javaexe && !strchr(javaexe, '*') && !strchr(javaexe, '?')) 1574 PrfWriteProfileString(fmprof, appname, "JavaExe", javaexe); 1575 } 1576 break; 1563 1577 1564 1578 case IDM_PRINT: … … 1794 1808 //DbgMsg(pszSrcFile, __LINE__, "error %i retrn %i", error, retrn); 1795 1809 if (fWarnReadOnly && error == ERROR_FILE_EXISTS) { 1796 error = ERROR_ACCESS_DENIED;1797 1810 retrn = SM2_NO; 1798 1811 } 1799 if (error && (error != ERROR_ACCESS_DENIED || 1800 (error == ERROR_ACCESS_DENIED && 1801 (retrn == SM2_YES || retrn == SM2_DONTASK || retrn == 0)))) { 1812 if (error && (retrn == SM2_YES || retrn == SM2_DONTASK)) { 1802 1813 if (LogFileHandle) 1803 1814 fprintf(LogFileHandle,
Note:
See TracChangeset
for help on using the changeset viewer.