Changeset 1480


Ignore:
Timestamp:
Nov 22, 2009, 11:58:49 PM (16 years ago)
Author:
Gregg Young
Message:

Fix failure to correctly check for large file support in FindSwapperDat fall back code minor streamling. Add LVM.EXE to partition submenu. Stop using xDosQueryAppType where the file name it is passed is already a local stack variable. Correct a typo in several file header comments.

Location:
trunk/dll
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/arccnrs.c

    r1439 r1480  
    7676  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
    7777  12 Mar 09 SHL Use common SearchContainer
    78   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
    7978
    8079***********************************************************************/
    … …  
    632631      *p = 0;
    633632    DosError(FERR_DISABLEHARDERR);
    634     if (!xDosQueryAppType(s, &apptype) &&
     633    if (!DosQueryAppType(s, &apptype) &&
    635634        (apptype & FAPPTYP_DOS ||
    636635         apptype & FAPPTYP_WINDOWSREAL ||

  • trunk/dll/autoview.c

    r1439 r1480  
    2929  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
    3030  08 Mar 09 GKY Renamed commafmt.h i18nutil.h
    31   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     31  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    3232
    3333***********************************************************************/

  • trunk/dll/avv.c

    r1439 r1480  
    2929  23 Nov 08 JBS Support use of CMD files in archiver definitions
    3030  11 Jan 08 GKY Replace "ARCHIVER.BB2" in string file with global set at compile in init.c
    31   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
    3231
    3332***********************************************************************/
    … …  
    404403    *error = 1;
    405404  else {
    406     ret = (INT) xDosQueryAppType(p, &apptype);
     405    ret = (INT) DosQueryAppType(p, &apptype);
    407406    apptype &= (~FAPPTYP_32BIT);
    408407    if (!apptype ||

  • trunk/dll/cmdline.c

    r1439 r1480  
    2121  24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
    2222  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
    23   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
    2423
    2524***********************************************************************/
    … …  
    435434        }
    436435      }
    437       if (xDosQueryAppType(executable, &apptype) ||
     436      if (DosQueryAppType(executable, &apptype) ||
    438437          (apptype && !(apptype &
    439438                        (FAPPTYP_NOTWINDOWCOMPAT |

  • trunk/dll/copyf.c

    r1472 r1480  
    2222  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
    2323  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
    24   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     24  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    2525  13 Jul 09 SHL Drop obsolete code
    2626  22 Jul 09 GKY Delete .LONGNAME EA if it becomes the filename on a copy or move.

  • trunk/dll/datamin.c

    r1439 r1480  
    2828  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
    2929  08 Mar 09 GKY Renamed commafmt.h i18nutil.h
    30   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     30  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    3131
    3232***********************************************************************/

  • trunk/dll/eas.c

    r1439 r1480  
    2323  29 Feb 08 GKY Use xfree where appropriate
    2424  07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
    25   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     25  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    2626
    2727***********************************************************************/

  • trunk/dll/fm3dll2.h

    r1459 r1480  
    3030  14 Sep 09 SHL Drop experimental code
    3131  15 Sep 09 SHL Add rescan progress timer
     32  22 Nov 09 GKY Add LVM.EXE to partition submenu
    3233
    3334  Align with spaces only - no tabs please
    … …  
    390391#define IDM_APPENDTOCLIPFILENAME 1162
    391392#define IDM_DATABAR         1163
     393#define IDM_PARTITIONLVM    1164
    392394
    393395#define IDM_UTILITIESMENU   2000

  • trunk/dll/fm3res.rc

    r1479 r1480  
    4747  27 Sep 09 SHL Add more items to COMP_MENU
    4848  15 Nov 09 GKY Add ZEROBYTETEXT
     49  22 Nov 09 GKY Add LVM.EXE to partition submenu
    4950
    5051***********************************************************************/
    … …  
    469470                  MENUITEM "~DFSee",   IDM_PARTITIONDF
    470471                  MENUITEM "~LVMGUI", IDM_PARTITIONLVMG
     472                  MENUITEM "~LVMEXE", IDM_PARTITIONLVM
    471473                  MENUITEM "~FDisk", IDM_PARTITIONFD
    472474}
    … …  
    10771079                  MENUITEM "~DFSee",   IDM_PARTITIONDF
    10781080                  MENUITEM "~LVMGUI", IDM_PARTITIONLVMG
     1081                  MENUITEM "~LVMEXE", IDM_PARTITIONLVM
    10791082                  MENUITEM "~FDisk", IDM_PARTITIONFD
    10801083                }
    … …  
    13651368                MENUITEM "~DFSee",   IDM_PARTITIONDF
    13661369                MENUITEM "~LVMGUI", IDM_PARTITIONLVMG
     1370                MENUITEM "~LVMEXE", IDM_PARTITIONLVM
    13671371                MENUITEM "~FDisk", IDM_PARTITIONFD
    13681372         }

  • trunk/dll/info.c

    r1444 r1480  
    3232  07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
    3333  08 Mar 09 GKY Renamed commafmt.h i18nutil.h
    34   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
    3534  12 Jul 09 GKY Remove code to update recursive scan setting which isn't user setable
    3635  22 Jul 09 GKY Check if drives support EAs add driveflag for this
    … …  
    760759        WinCheckButton(hwnd, FLE_SYSTEM, ((fs.attrFile & FILE_SYSTEM) != 0));
    761760        DosError(FERR_DISABLEHARDERR);
    762         if (!xDosQueryAppType(pfs->szFileName, &apptype)) {
     761        if (!DosQueryAppType(pfs->szFileName, &apptype)) {
    763762          WinEnableWindow(WinWindowFromID(hwnd, FLE_OS2FS), TRUE);
    764763          WinEnableWindow(WinWindowFromID(hwnd, FLE_OS2WIN), TRUE);

  • trunk/dll/init.c

    r1479 r1480  
    8181  06 Jun 09 GKY Add option to show file system type or drive label in tree
    8282  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
    83   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     83  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    8484  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
    8585  22 Jul 09 GKY Fix failure to restore the notebook setting for saving container states or not
    … …  
    8888                that has a broken MDOS install.
    8989  15 Nov 09 GKY Add more PCSZs
     90  22 Nov 09 GKY Fix FindSwapperDat so the check for large file support actually occurs if the
     91                fall back to config.sys is used to find it; use bstripcr to streamline code.
    9092
    9193***********************************************************************/
    … …  
    429431          if (*p == '=') {
    430432            p++;
    431             stripcr(p);
    432             rstrip(p);
    433             while (*p == ' ')
    434               p++;
     433            bstripcr(p);
    435434            if (*p == '\"') {
    436435              p++;
    … …  
    456455                                FILE_NORMAL | FILE_ARCHIVED |
    457456                                FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
    458                                 &ffb, sizeof(ffb), &nm, FIL_STANDARD);
     457                                &ffb, sizeof(ffb), &nm, FIL_STANDARDL);
    459458              if (rc){
    460459                FILEFINDBUF3 ffb;

  • trunk/dll/instant.c

    r1439 r1480  
    1313  22 Mar 07 GKY Use QWL_USER
    1414  20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
    15   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     15  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    1616
    1717***********************************************************************/

  • trunk/dll/killproc.c

    r1439 r1480  
    2121  10 Dec 08 SHL Integrate exception handler support
    2222  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
    23   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     23  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    2424
    2525***********************************************************************/

  • trunk/dll/misc.c

    r1444 r1480  
    6060  28 Mar 09 GKY Add RemoveOldCnrSwitches to remove pre 3.16 style ini keys;
    6161                add State.version key for check
    62   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     62  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    6363  22 Jul 09 GKY Check if drives support EAs add driveflag for this
    6464  22 Jul 09 GKY Allow .LONGNAME to be displayed for FAT drives.

  • trunk/dll/mle.c

    r1439 r1480  
    2323  10 Dec 08 SHL Integrate exception handler support
    2424  08 Mar 09 GKY Additional strings move to PCSZs in init.c
    25   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     25  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    2626
    2727***********************************************************************/

  • trunk/dll/pathutil.c

    r1439 r1480  
    1616                close DosFind.
    1717  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code
    18   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     18  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    1919
    2020***********************************************************************/

  • trunk/dll/saveclip.c

    r1438 r1480  
    3030  08 Mar 09 GKY Renamed commafmt.h i18nutil.h
    3131  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
     32  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    3233
    3334***********************************************************************/

  • trunk/dll/shadow.c

    r1439 r1480  
    1414  20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
    1515  08 Mar 09 GKY Additional strings move to PCSZs declare change
    16   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     16  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    1717
    1818***********************************************************************/

  • trunk/dll/subj.c

    r1439 r1480  
    1515  01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
    1616  08 Mar 09 GKY Additional strings move to PCSZs
    17   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     17  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    1818
    1919***********************************************************************/

  • trunk/dll/systemf.c

    r1475 r1480  
    688688# define TERMQ_BASE_NAME "\\QUEUES\\FM3WAIT"
    689689  static char szTermQName[30];
     690  char szTermTemp[30];
    690691  static HQUEUE hTermQ;
    691692  static HEV hTermQSem;
    … …  
    10761077        useTermQ = FALSE;
    10771078      else {
    1078 # ifdef HIMEM
    1079         useTermQ = FALSE;
    1080 # else
    10811079        rc = 0;
    10821080        DosEnterCritSec();
    … …  
    11051103        if (!rc)
    11061104          DosExitCritSec();
    1107 # endif
    11081105      } // if wait
    11091106
    … …  
    11171114      if (*pszArgs)
    11181115        sdata.PgmInputs = (PBYTE)pszArgs;
    1119       if (useTermQ)
    1120         sdata.TermQ = (PBYTE)szTermQName;
     1116      if (useTermQ) {
     1117        strcpy(szTermTemp, szTermQName);
     1118        sdata.TermQ = (PBYTE)szTermTemp;
     1119      }
    11211120      sdata.Environment = (PBYTE)pszEnvironment;
    11221121      sdata.InheritOpt = SSF_INHERTOPT_PARENT;

  • trunk/dll/treecnr.c

    r1477 r1480  
    7979  15 Nov 09 GKY Add semaphore to fix double names in tree container caused by UM_SHOWME
    8080                before scan completes
     81  22 Nov 09 GKY Add LVM.EXE to partition submenu
    8182
    8283***********************************************************************/
    … …  
    22072208            WinEnableMenuItem((HWND) mp2, IDM_PARTITION, fMiniLVM);
    22082209            WinEnableMenuItem((HWND) mp2, IDM_PARTITIONDF, fDFSee);
    2209             WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVMG, fLVMGui);
     2210            WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVMG, fLVMGui);
     2211            WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVM, fLVM);
    22102212            WinEnableMenuItem((HWND) mp2, IDM_PARTITIONFD, fFDisk);
    22112213
    … …  
    22372239        WinEnableMenuItem((HWND) mp2, IDM_PARTITION, fMiniLVM);
    22382240        WinEnableMenuItem((HWND) mp2, IDM_PARTITIONDF, fDFSee);
    2239         WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVMG, fLVMGui);
     2241        WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVMG, fLVMGui);
     2242        WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVM, fLVM);
    22402243        WinEnableMenuItem((HWND) mp2, IDM_PARTITIONFD, fFDisk);
    22412244        break;
    … …  
    25832586                NULL, NULL,
    25842587                "%s", PCSZ_LVMGUICMD);
     2588        break;
     2589
     2590      case IDM_PARTITIONLVM:
     2591        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
     2592                NULL, NULL,
     2593                "%s", PCSZ_LVMEXE);
    25852594        break;
    25862595

  • trunk/dll/valid.c

    r1444 r1480  
    3535                When these high codes were it text files they showed as hex in new view.
    3636  08 Mar 09 GKY Additional strings move to PCSZs
    37   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
     37  12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
    3838  22 Jul 09 GKY Consolidated driveflag setting code in DriveFlagsOne
    3939  22 Jul 09 GKY Check if drives support EAs add driveflag for this
    … …  
    600600}
    601601
    602 BOOL IsExecutable(CHAR * filename)
     602BOOL IsExecutable(CHAR *filename)
    603603{
    604604  register CHAR *p;
    … …  
    610610    p = strrchr(filename, '.');
    611611    if (p)
    612       ret = xDosQueryAppType(filename, &apptype);
     612      ret = DosQueryAppType(filename, &apptype);
    613613    else {
    614614
    … …  
    617617      strcpy(fname, filename);
    618618      strcat(fname, ".");
    619       ret = xDosQueryAppType(fname, &apptype);
     619      ret = DosQueryAppType(fname, &apptype);
    620620    }
    621621    if (apptype & (FAPPTYP_DLL |
Note: See TracChangeset for help on using the changeset viewer.