Changeset 1803 for trunk/dll/worker.c


Ignore:
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])

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/worker.c

    r1780 r1803  
    6464                delete and eliminated the check on additional temp file deletes
    6565  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.
    6668
    6769***********************************************************************/
     
    129131#include "fortify.h"
    130132#include "excputil.h"                   // 06 May 08 SHL added
     133#include "getnames.h"                   // insert_filename
    131134
    132135// Data definitions
     
    15601563              AddNote(GetPString(IDS_MADEOBJSTEXT));
    15611564            }
    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;
    15631577
    15641578          case IDM_PRINT:
     
    17941808                //DbgMsg(pszSrcFile, __LINE__, "error %i retrn %i", error, retrn);
    17951809                if (fWarnReadOnly && error ==  ERROR_FILE_EXISTS) {
    1796                   error = ERROR_ACCESS_DENIED;
    17971810                  retrn = SM2_NO;
    17981811                }
    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))  {
    18021813                  if (LogFileHandle)
    18031814                    fprintf(LogFileHandle,
Note: See TracChangeset for help on using the changeset viewer.