Changeset 1749 for trunk/dll


Ignore:
Timestamp:
Feb 28, 2014, 5:46:26 PM (12 years ago)
Author:
John Small
Message:

Ticket #522: Ensure use of wrapper functions where needed

Location:
trunk/dll
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/arccnrs.c

    r1741 r1749  
    9393  09 Feb 14 GKY Fix trap on opening a file without an extention
    9494  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
     95  28 Apr 14 JBS Ticket #522: Ensure use of wrapper functions where needed
    9596
    9697***********************************************************************/
    … …  
    572573  HFILE oldstdout;
    573574  HFILE newstdout;
    574   CHAR s[CCHMAXPATH * 2], lonename[CCHMAXPATH + 2],
     575  CHAR lonename[CCHMAXPATH + 2],
    575576       *nsize, *osize, *fdate, *fname, *p, *pp, *arctemp;
     577  // Change the DosQueryAppType call below to xDosQueryAppType if "s" is no longer in low memory
     578  CHAR s[CCHMAXPATH * 2];
    576579  BOOL gotstart;
    577580  BOOL gotend;

  • trunk/dll/cmdline.c

    r1673 r1749  
    2929  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
    3030  23 Oct 10 GKY Changes to populate and utilize a HELPTABLE for context specific help
     31  28 Apr 14 JBS Ticket #522: Ensure use of wrapper functions where needed
    3132
    3233***********************************************************************/
    … …  
    404405    {
    405406      ULONG apptype = 0L;
     407      // Change DosQueryAppType to xDosQueryAppType if "executable"is no longer local
    406408      CHAR executable[CCHMAXPATH], commandline[1001], *p;
    407409

  • trunk/dll/info.c

    r1687 r1749  
    3838  20 Apr 13 GKY Double click on directory in Info listbox opens directory object instead of
    3939                causing an error message from DefaultView
     40  28 Apr 14 JBS Ticket #522: Ensure use of wrapper functions where needed
    4041
    4142***********************************************************************/
    … …  
    764765        WinCheckButton(hwnd, FLE_SYSTEM, ((fs.attrFile & FILE_SYSTEM) != 0));
    765766        DosError(FERR_DISABLEHARDERR);
    766         if (!DosQueryAppType(pfs->szFileName, &apptype)) {
     767        if (!xDosQueryAppType(pfs->szFileName, &apptype)) {
    767768          WinEnableWindow(WinWindowFromID(hwnd, FLE_OS2FS), TRUE);
    768769          WinEnableWindow(WinWindowFromID(hwnd, FLE_OS2WIN), TRUE);

  • trunk/dll/systemf.c

    r1742 r1749  
    4444  23 Feb 14 GKY Undated one of the error messages in runemf2 to provide the calling line
    4545                and file.
     46  28 Apr 14 JBS Ticket #522: Ensure use of wrapper functions where needed
    4647
    4748***********************************************************************/
    … …  
    8182static PSZ pszSrcFile = __FILE__;
    8283
    83      
     84
    8485//static HAPP Exec(HWND hwndNotify, BOOL child, char *startdir, char *env,
    8586//          PROGTYPE * progt, ULONG fl, char *formatstring, ...);
    … …  
    886887          switch_to(pszDirectory);
    887888        }
    888         rc = DosQueryAppType(pszPgm,&ulAppType);
     889        rc = xDosQueryAppType(pszPgm, &ulAppType);
    889890        if (!strchr(pszPgm, '\\') &&
    890891            !strchr(pszPgm, ':') &&
    … …  
    10361037        switch_to(pszDirectory);
    10371038      }
    1038       rc = DosQueryAppType(pszPgm,&ulAppType);
     1039      rc = xDosQueryAppType(pszPgm, &ulAppType);
    10391040      if (!strchr(pszPgm, '\\') &&
    10401041          !strchr(pszPgm, ':') &&

  • trunk/dll/valid.c

    r1691 r1749  
    4343  26 Aug 11 GKY Add a low mem version of xDosAlloc* wrappers; move error checking into all the
    4444                xDosAlloc* wrappers.
     45  28 Apr 14 JBS Ticket #522: Ensure use of wrapper functions where needed
    4546
    4647***********************************************************************/
    … …  
    275276  ULONG clDataBytes;
    276277  HFILE hDev;
    277   EASIZEBUF easize = {0};
    278   ULONG   ulDataLen        = sizeof(EASIZEBUF); 
    279   ULONG   ulParmLen        = 0;
     278  EASIZEBUF easize      = {0};
     279  ULONG   ulDataLen     = sizeof(EASIZEBUF);
     280  ULONG   ulParmLen     = 0;
    280281
    281282# pragma pack(1)
    … …  
    352353        *pulType |= DRIVE_RAMDISK;
    353354    }
    354   if (((PFSQBUFFER2) pvBuffer)->iType == FSAT_REMOTEDRV) { 
     355  if (((PFSQBUFFER2) pvBuffer)->iType == FSAT_REMOTEDRV) {
    355356    if (pulType)
    356357      *pulType |= DRIVE_REMOTE;
    … …  
    612613    p = strrchr(filename, '.');
    613614    if (p)
    614       ret = DosQueryAppType(filename, &apptype);
     615      ret = xDosQueryAppType(filename, &apptype);
    615616    else {
    616617
    … …  
    619620      strcpy(fname, filename);
    620621      strcat(fname, ".");
    621       ret = DosQueryAppType(fname, &apptype);
     622      ret = xDosQueryAppType(fname, &apptype);
    622623    }
    623624    if (apptype & (FAPPTYP_DLL |
    … …  
    738739{
    739740  INT removable;
    740   CHAR szDrive[] = " :\\"; 
     741  CHAR szDrive[] = " :\\";
    741742  ULONG drvtype;
    742743
    … …  
    760761      }
    761762      volserl;
    762  
     763
    763764      DosError(FERR_DISABLEHARDERR);
    764765      if (!DosQueryFSInfo((ULONG) x + 1, FSIL_VOLSER, &volserl, sizeof(volserl)))
Note: See TracChangeset for help on using the changeset viewer.