Changeset 841
- Timestamp:
- Sep 23, 2007, 6:27:51 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 54 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/av2.c ¶
r551 r841 1 1 #define INCL_DOS 2 2 #define INCL_WIN 3 #define INCL_LONGLONG 3 4 4 5 #include <os2.h> … … 26 27 HDIR search_handle; 27 28 ULONG num_matches; 28 static FILEFINDBUF3 f;29 static FILEFINDBUF3L f; 29 30 30 31 save_dir(s); … … 36 37 strcat(s, "*"); 37 38 search_handle = HDIR_CREATE; 38 num_matches = 1 L;39 if (! DosFindFirst(s,39 num_matches = 1; 40 if (!xDosFindFirst(s, 40 41 &search_handle, 41 42 FILE_NORMAL | FILE_DIRECTORY | … … 43 44 FILE_ARCHIVED, 44 45 &f, 45 sizeof(FILEFINDBUF3 ), &num_matches, FIL_STANDARD)) {46 sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) { 46 47 do { 47 48 strcpy(enddir, f.achName); … … 52 53 else 53 54 unlinkf("%s", s); 54 } while (! DosFindNext(search_handle,55 &f, sizeof(FILEFINDBUF3 ), &num_matches));55 } while (!xDosFindNext(search_handle, 56 &f, sizeof(FILEFINDBUF3L), &num_matches)); 56 57 DosFindClose(search_handle); 57 58 } … … 99 100 strchr(fullname, '*') || !strchr(fullname, '.'))) { 100 101 101 static FILEFINDBUF3 ffb;102 static FILEFINDBUF3L ffb; 102 103 ULONG nm; 103 104 HDIR hdir; … … 110 111 enddir++; 111 112 hdir = HDIR_CREATE; 112 nm = 1 L;113 if (! DosFindFirst(fullname,113 nm = 1; 114 if (!xDosFindFirst(fullname, 114 115 &hdir, 115 116 FILE_NORMAL | FILE_SYSTEM | 116 117 FILE_READONLY | FILE_HIDDEN | FILE_ARCHIVED, 117 &ffb, sizeof(FILEFINDBUF3 ), &nm, FIL_STANDARD)) {118 &ffb, sizeof(FILEFINDBUF3L), &nm, FIL_STANDARDL)) { 118 119 strcpy(enddir, ffb.achName); 119 120 DosFindClose(hdir); … … 129 130 static CHAR path[CCHMAXPATH]; 130 131 CHAR *env; 131 FILESTATUS3 fs;132 FILESTATUS3L fs; 132 133 133 134 env = getenv("FM3INI"); … … 137 138 DosError(FERR_DISABLEHARDERR); 138 139 if (!DosQueryPathInfo(path, 139 FIL_STANDARD , &fs, (ULONG) sizeof(fs))) {140 FIL_STANDARDL, &fs, (ULONG) sizeof(fs))) { 140 141 if (!(fs.attrFile & FILE_DIRECTORY)) { 141 142 env = strrchr(path, '\\'); … … 145 146 DosError(FERR_DISABLEHARDERR); 146 147 if (!DosQueryPathInfo(path, 147 FIL_STANDARD , &fs, (ULONG) sizeof(fs))) {148 FIL_STANDARDL, &fs, (ULONG) sizeof(fs))) { 148 149 if (fs.attrFile & FILE_DIRECTORY) 149 150 switch_to(path); -
TabularUnified trunk/dll/attribs.c ¶
r827 r841 17 17 #define INCL_DOS 18 18 #define INCL_WIN 19 #define INCL_LONGLONG 19 20 #include <os2.h> 20 21 … … 90 91 case UM_UNDO: 91 92 { 92 FILESTATUS3 fi;93 FILESTATUS3L fi; 93 94 long ro = 2, hi = 2, sy = 2, ar = 2; 94 95 BOOL allgrey; … … 100 101 li = INSTDATA(hwnd); 101 102 if (li && li->list[0] && (allgrey || mp1) && 102 !DosQueryPathInfo(li->list[0], FIL_STANDARD , &fi,103 !DosQueryPathInfo(li->list[0], FIL_STANDARDL, &fi, 103 104 (ULONG) sizeof(fi))) { 104 105 ro = ((fi.attrFile & FILE_READONLY) != 0); … … 279 280 } 280 281 { 281 ULONG temp = 0 L;282 FILESTATUS3 fi;282 ULONG temp = 0; 283 FILESTATUS3L fi; 283 284 SHORT x; 284 285 APIRET rc; … … 326 327 for (x = 0; li->list[x]; x++) { 327 328 DosError(FERR_DISABLEHARDERR); 328 rc = DosQueryPathInfo(li->list[x], FIL_STANDARD , &fi,329 rc = DosQueryPathInfo(li->list[x], FIL_STANDARDL, &fi, 329 330 (ULONG) sizeof(fi)); 330 331 if (rc) … … 333 334 WinSendDlgItemMsg(hwnd, ATR_YEAR, SPBM_QUERYVALUE, MPFROMP(&temp), 334 335 MPFROM2SHORT(0, SPBQ_DONOTUPDATE)); 335 fi.fdateLastWrite.year = temp - 1980 L;336 fi.fdateLastWrite.year = temp - 1980; 336 337 WinSendDlgItemMsg(hwnd, ATR_MONTH, SPBM_QUERYVALUE, 337 338 MPFROMP(&temp), MPFROM2SHORT(0, … … 378 379 else if (state == 1) 379 380 fi.attrFile |= FILE_ARCHIVED; 380 xDosSetPathInfo(li->list[x], FIL_STANDARD , &fi, sizeof(fi), 0);381 xDosSetPathInfo(li->list[x], FIL_STANDARDL, &fi, sizeof(fi), 0); 381 382 } 382 383 WinDismissDlg(hwnd, 1); -
TabularUnified trunk/dll/autoview.c ¶
r838 r841 26 26 #define INCL_WIN 27 27 #define INCL_GPI 28 #define INCL_LONGLONG 28 29 #include <os2.h> 29 30 … … 193 194 memset(&eaop, 0, sizeof(eaop)); 194 195 eaop.fpFEA2List = pfealist; 195 pfealist->cbList = 13 L+ (ULONG) pfealist->list[0].cbName +196 pfealist->cbList = 13 + (ULONG) pfealist->list[0].cbName + 196 197 (ULONG) pfealist->list[0].cbValue; 197 198 rc = xDosSetPathInfo(filename, FIL_QUERYEASIZE, … … 299 300 300 301 HFILE handle; 301 ULONG action, olen, ibufflen, obufflen, l;302 ULONG olen, ibufflen, action, obufflen, l; 302 303 CHAR *ibuff, *obuff, *p, buffer[80]; 303 304 ARC_TYPE *info; 304 305 305 if (!DosOpen ((CHAR *) mp1,306 &handle,307 &action,308 0L,309 0L,310 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,311 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |312 OPEN_FLAGS_RANDOMSEQUENTIAL | OPEN_SHARE_DENYNONE |313 OPEN_ACCESS_READONLY, 0L)) {306 if (!DosOpenL((CHAR *) mp1, 307 &handle, 308 &action, 309 0, 310 0, 311 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS, 312 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT | 313 OPEN_FLAGS_RANDOMSEQUENTIAL | OPEN_SHARE_DENYNONE | 314 OPEN_ACCESS_READONLY, 0)) { 314 315 ibufflen = (AutoviewHeight < 96) ? 512 : 3072; 315 316 ibuff = xmalloc(ibufflen + 2, pszSrcFile, __LINE__); … … 410 411 else if (!IsFile(currfile)) { 411 412 412 static FILEFINDBUF4 ffb[130];413 static FILEFINDBUF4L ffb[130]; 413 414 CHAR fullname[CCHMAXPATH + 4]; 414 415 HDIR hdir = HDIR_CREATE; 415 416 ULONG x, nm, ml, mc, bufflen; 416 417 PBYTE fb; 417 PFILEFINDBUF4 pffbFile;418 PFILEFINDBUF4L pffbFile; 418 419 PSZ pszBuf; 419 420 PSZ p; … … 426 427 // (currfile[strlen(currfile) - 1] == '\\') ? "" : "\\"); 427 428 DosError(FERR_DISABLEHARDERR); 428 nm = sizeof(ffb) / sizeof(FILEFINDBUF4 );429 nm = sizeof(ffb) / sizeof(FILEFINDBUF4L); 429 430 if (AutoviewHeight < 96) 430 431 nm /= 2; … … 434 435 FILE_READONLY | FILE_ARCHIVED | 435 436 FILE_SYSTEM | FILE_HIDDEN, 436 &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZE );437 &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZEL); 437 438 if (!rc && nm) { 438 439 fb = (PBYTE) & ffb; 439 440 x = ml = 0; 440 441 while (x < nm) { 441 pffbFile = (PFILEFINDBUF4 ) fb;442 pffbFile = (PFILEFINDBUF4L) fb; 442 443 mc = (ULONG) pffbFile->cchName + 443 444 ((pffbFile->attrFile & FILE_DIRECTORY) != 0); … … 456 457 x = 0; 457 458 while (x < nm) { 458 pffbFile = (PFILEFINDBUF4 ) fb;459 pffbFile = (PFILEFINDBUF4L) fb; 459 460 if (!(!*pffbFile->achName || 460 461 (((pffbFile->attrFile & FILE_DIRECTORY) && -
TabularUnified trunk/dll/avl.c ¶
r832 r841 36 36 #define INCL_WINSTDDRAG 37 37 #define INCL_DOS 38 #define INCL_LONGLONG 38 39 #include <os2.h> 39 40 … … 168 169 topsig = arcsighead; 169 170 DosError(FERR_DISABLEHARDERR); 170 if (DosOpen (filespec,171 &handle,172 &action,173 0,174 0,175 OPEN_ACTION_FAIL_IF_NEW |176 OPEN_ACTION_OPEN_IF_EXISTS,177 OPEN_FLAGS_FAIL_ON_ERROR |178 OPEN_FLAGS_NOINHERIT |179 OPEN_FLAGS_RANDOMSEQUENTIAL |180 OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, 0))171 if (DosOpenL(filespec, 172 &handle, 173 &action, 174 0, 175 0, 176 OPEN_ACTION_FAIL_IF_NEW | 177 OPEN_ACTION_OPEN_IF_EXISTS, 178 OPEN_FLAGS_FAIL_ON_ERROR | 179 OPEN_FLAGS_NOINHERIT | 180 OPEN_FLAGS_RANDOMSEQUENTIAL | 181 OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, 0)) 181 182 return NULL; 182 183 // Scan signatures -
TabularUnified trunk/dll/chklist.c ¶
r793 r841 19 19 #define INCL_WIN 20 20 #define INCL_GPI 21 #define INCL_LONGLONG 21 22 #include <os2.h> 22 23 … … 430 431 431 432 FILEDLG fdlg; 432 FILESTATUS3 fs3;433 FILESTATUS3L fs3; 433 434 CHAR drive[3], *pdrive = drive, filename[CCHMAXPATH], *p; 434 435 … … 459 460 filename, sizeof(filename))) { 460 461 if (!DosQueryPathInfo(filename, 461 FIL_STANDARD , &fs3, sizeof(fs3))) {462 FIL_STANDARDL, &fs3, sizeof(fs3))) { 462 463 p = filename; 463 464 while (*p) { … … 469 470 PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID); 470 471 } 471 // else saymsg(MB_ENTER,hwnd,DEBUG_STRING,"DosQueryPathInfo FIL_STANDARD failed");472 // else saymsg(MB_ENTER,hwnd,DEBUG_STRING,"DosQueryPathInfo FIL_STANDARDL failed"); 472 473 } 473 474 // else saymsg(MB_ENTER,hwnd,DEBUG_STRING,"DosQueryPathInfo FIL_QUERYFULLNAME failed"); -
TabularUnified trunk/dll/collect.c ¶
r838 r841 547 547 LISTINFO *li = (LISTINFO *) mp1; 548 548 INT x; 549 FILEFINDBUF4 fb4;549 FILEFINDBUF4L fb4; 550 550 HDIR hdir; 551 551 ULONG nm; … … 590 590 FILE_ARCHIVED | FILE_SYSTEM | 591 591 FILE_HIDDEN | FILE_READONLY, 592 &fb4, sizeof(fb4), &nm, FIL_QUERYEASIZE )) {592 &fb4, sizeof(fb4), &nm, FIL_QUERYEASIZEL)) { 593 593 DosFindClose(hdir); 594 594 priority_normal(); … … 638 638 dcd = WinQueryWindowPtr(hwnd, QWL_USER); 639 639 if (dcd && mp1) { 640 FILESTATUS4 fs4;640 FILESTATUS4L fs4; 641 641 PCNRITEM pci; 642 642 RECORDINSERT ri; … … 683 683 !IsRoot(fullname) && 684 684 !DosQueryPathInfo(fullname, 685 FIL_QUERYEASIZE ,685 FIL_QUERYEASIZEL, 686 686 &fs4, 687 687 sizeof(fs4)) && … … 2508 2508 if (mp2) { 2509 2509 PCNRITEM pci = (PCNRITEM) ((PNOTIFYRECORDENTER) mp2)->pRecord; 2510 FILEFINDBUF3 ffb;2510 FILEFINDBUF3L ffb; 2511 2511 HDIR hDir = HDIR_CREATE; 2512 2512 ULONG nm = 1; … … 2522 2522 FILE_ARCHIVED | FILE_READONLY | 2523 2523 FILE_HIDDEN | FILE_SYSTEM, 2524 &ffb, sizeof(ffb), &nm, FIL_STANDARD );2524 &ffb, sizeof(ffb), &nm, FIL_STANDARDL); 2525 2525 priority_bumped(); 2526 2526 if (!status) { -
TabularUnified trunk/dll/common.c ¶
r809 r841 27 27 #define INCL_WIN 28 28 #define INCL_GPI 29 #define INCL_LONGLONG 29 30 #include <os2.h> 30 31 … … 272 273 273 274 BYTE parm[4] = { "CD01" }; 274 ULONG dlen, plen; 275 ULONGLONG dlen; 276 ULONG plen; 275 277 HFILE hfile; 276 278 APIRET rc; 277 279 278 280 dv[2] = 0; 279 rc = DosOpen (dv,280 &hfile,281 &dlen,282 0,283 0,284 OPEN_ACTION_OPEN_IF_EXISTS |285 OPEN_ACTION_CREATE_IF_NEW,286 OPEN_FLAGS_DASD |287 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_SHARE_DENYNONE, NULL);281 rc = DosOpenL(dv, 282 &hfile, 283 &dlen, 284 0, 285 0, 286 OPEN_ACTION_OPEN_IF_EXISTS | 287 OPEN_ACTION_CREATE_IF_NEW, 288 OPEN_FLAGS_DASD | 289 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_SHARE_DENYNONE, NULL); 288 290 if (rc) 289 Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__, "DosOpen ");291 Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__, "DosOpenL"); 290 292 else { 291 293 dlen = 0; -
TabularUnified trunk/dll/comp.c ¶
r838 r841 94 94 static VOID SnapShot(char *path, FILE *fp, BOOL recurse) 95 95 { 96 PFILEFINDBUF4 pffb;96 PFILEFINDBUF4L pffb; 97 97 char *mask, *enddir; 98 98 HDIR hdir = HDIR_CREATE; … … 100 100 101 101 // 13 Aug 07 SHL fimxe to use FileToGet 102 pffb = xmalloc(sizeof(FILEFINDBUF4 ), pszSrcFile, __LINE__);102 pffb = xmalloc(sizeof(FILEFINDBUF4L), pszSrcFile, __LINE__); 103 103 if (pffb) { 104 104 mask = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__); … … 117 117 FILE_ARCHIVED | FILE_READONLY | FILE_HIDDEN | 118 118 FILE_SYSTEM, 119 pffb, sizeof(FILEFINDBUF4 ), &ulFindCnt, FIL_QUERYEASIZE)) {119 pffb, sizeof(FILEFINDBUF4L), &ulFindCnt, FIL_QUERYEASIZEL)) { 120 120 do { 121 121 strcpy(enddir, pffb->achName); … … 141 141 } 142 142 ulFindCnt = 1; 143 } while (!xDosFindNext(hdir, pffb, sizeof(FILEFINDBUF4 ), &ulFindCnt));143 } while (!xDosFindNext(hdir, pffb, sizeof(FILEFINDBUF4L), &ulFindCnt)); 144 144 DosFindClose(hdir); 145 145 } … … 190 190 HMQ hmq2; 191 191 FILE *fp1, *fp2; 192 ULONG len1, len2, offset = 0L; 192 ULONGLONG len1, len2; 193 ULONG offset = 0; 193 194 LONG numread1, numread2; 194 195 CHAR s[1024], ss[1024], *p1, *p2; … … 236 237 } 237 238 else { 238 len1 = filelength(fileno(fp1));239 len2 = filelength(fileno(fp2));239 len1 = _filelengthi64(fileno(fp1)); 240 len2 = _filelengthi64(fileno(fp2)); 240 241 if (len1 != len2) { 241 242 strcpy(s, GetPString(IDS_COMPDIFSIZESTEXT)); … … 738 739 ULONG x; 739 740 CHAR *maskstr; 740 PFILEFINDBUF4 pffbArray;741 PFILEFINDBUF4 pffbFile;741 PFILEFINDBUF4L pffbArray; 742 PFILEFINDBUF4L pffbFile; 742 743 HDIR hDir; 743 744 ULONG ulFindCnt; 744 ULONG ulBufBytes = sizeof(FILEFINDBUF4 ) * FilesToGet;745 ULONG ulBufBytes = sizeof(FILEFINDBUF4L) * FilesToGet; 745 746 APIRET rc; 746 747 … … 775 776 FILE_SYSTEM | FILE_HIDDEN | 776 777 (recurse ? FILE_DIRECTORY : 0), 777 pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZE );778 pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZEL); 778 779 if (!rc) { 779 780 do { … … 805 806 } 806 807 } 807 pffbFile = (PFILEFINDBUF4 )((PBYTE)pffbFile + pffbFile->oNextEntryOffset);808 pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + pffbFile->oNextEntryOffset); 808 809 } // for 809 810 DosError(FERR_DISABLEHARDERR); … … 928 929 // Use snapshot file 929 930 FILE *fp; 930 FILEFINDBUF4 fb4;931 FILEFINDBUF4L fb4; 931 932 CHAR str[CCHMAXPATH * 2], *p; 932 933 -
TabularUnified trunk/dll/copyf.c ¶
r838 r841 24 24 #define INCL_DOSERRORS 25 25 #define INCL_WIN 26 #define INCL_LONGLONG 26 27 #include <os2.h> 27 28 … … 50 51 char *MakeTempName(char *buffer) 51 52 { 52 FILESTATUS3 fs3;53 FILESTATUS3L fs3; 53 54 APIRET rc; 54 55 char *p, *o; … … 59 60 for (;;) { 60 61 DosError(FERR_DISABLEHARDERR); 61 rc = DosQueryPathInfo(buffer, FIL_STANDARD , &fs3, (ULONG) sizeof(fs3));62 rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3)); 62 63 if (rc == ERROR_DISK_CHANGE) { 63 64 DosError(FERR_ENABLEHARDERR); 64 rc = DosQueryPathInfo(buffer, FIL_STANDARD , &fs3, (ULONG) sizeof(fs3));65 rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3)); 65 66 } 66 67 if (rc) … … 90 91 { 91 92 CHAR *p, *f, *s, *o; 92 FILESTATUS3 fs3;93 FILESTATUS3L fs3; 93 94 APIRET rc; 94 95 … … 153 154 for (;;) { 154 155 DosError(FERR_DISABLEHARDERR); 155 rc = DosQueryPathInfo(buffer, FIL_STANDARD , &fs3, (ULONG) sizeof(fs3));156 rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3)); 156 157 if (rc == ERROR_DISK_CHANGE) { 157 158 DosError(FERR_ENABLEHARDERR); 158 rc = DosQueryPathInfo(buffer, FIL_STANDARD , &fs3, (ULONG) sizeof(fs3));159 rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3)); 159 160 } 160 161 if (rc) … … 281 282 memset(pfealist, 0, ealen + 1); 282 283 pfealist->cbList = ealen; 283 pfealist->list[0].oNextEntryOffset = 0 L;284 pfealist->list[0].oNextEntryOffset = 0; 284 285 pfealist->list[0].fEA = 0; 285 286 pfealist->list[0].cbName = 9; … … 352 353 APIRET docopyallf(INT type, CHAR * oldname, CHAR * newname, ...) 353 354 { 354 FILEFINDBUF3 fb;355 FILEFINDBUF3L fb; 355 356 ULONG nm; 356 357 HDIR hdir; … … 408 409 CHAR olddisk, newdisk, dir[CCHMAXPATH], *p, *pp; 409 410 APIRET ret = -1, rc; 410 FILESTATUS3 st, st2, dummy;411 FILESTATUS3L st, st2, dummy; 411 412 BOOL diskchange = FALSE, zaplong = FALSE; 412 413 va_list ap; … … 422 423 423 424 DosError(FERR_DISABLEHARDERR); 424 if (DosQueryPathInfo(oldname, FIL_STANDARD , &st, sizeof(FILESTATUS3)))425 if (DosQueryPathInfo(oldname, FIL_STANDARDL, &st, sizeof(FILESTATUS3L))) 425 426 return (APIRET) - 2; /* no source */ 426 427 … … 585 586 DosError(FERR_DISABLEHARDERR); 586 587 rc = DosQueryPathInfo(fullnewname, 587 FIL_STANDARD , &st2, sizeof(FILESTATUS3));588 FIL_STANDARDL, &st2, sizeof(FILESTATUS3L)); 588 589 if (rc == ERROR_DISK_CHANGE) { 589 590 DosError(FERR_ENABLEHARDERR); 590 591 rc = DosQueryPathInfo(fullnewname, 591 FIL_STANDARD , &st2, sizeof(FILESTATUS3));592 FIL_STANDARDL, &st2, sizeof(FILESTATUS3L)); 592 593 } 593 594 if (!rc && st2.cbFile == st.cbFile) { /* seems to have worked... */ … … 595 596 if (diskchange) { 596 597 DosError(FERR_ENABLEHARDERR); 597 DosQueryPathInfo(oldname, FIL_STANDARD , &dummy, sizeof(FILESTATUS3)); /* force disk change */598 DosQueryPathInfo(oldname, FIL_STANDARDL, &dummy, sizeof(FILESTATUS3L)); /* force disk change */ 598 599 } 599 600 if (!(st2.attrFile & FILE_DIRECTORY)) /* erase file */ … … 661 662 { 662 663 INT ret = -1; 663 FILESTATUS3 fsi;664 FILESTATUS3L fsi; 664 665 665 666 DosError(FERR_DISABLEHARDERR); 666 if (!DosQueryPathInfo(filename, FIL_STANDARD , &fsi, sizeof(fsi))) {667 if (!DosQueryPathInfo(filename, FIL_STANDARDL, &fsi, sizeof(fsi))) { 667 668 fsi.attrFile = 0; 668 669 DosError(FERR_DISABLEHARDERR); 669 if (!xDosSetPathInfo(filename, FIL_STANDARD , &fsi, sizeof(fsi), 0))670 if (!xDosSetPathInfo(filename, FIL_STANDARDL, &fsi, sizeof(fsi), 0)) 670 671 ret = 0; 671 672 } … … 677 678 /* unlink everything from directory on down... */ 678 679 679 FILEFINDBUF3 *f;680 FILEFINDBUF3L *f; 680 681 HDIR search_handle; 681 682 ULONG num_matches; … … 735 736 736 737 ss = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__); 737 f = xmalloc(sizeof(FILEFINDBUF3 ), pszSrcFile, __LINE__);738 f = xmalloc(sizeof(FILEFINDBUF3L), pszSrcFile, __LINE__); 738 739 if (!ss || !f) { 739 740 xfree(ss); … … 744 745 745 746 search_handle = HDIR_CREATE; 746 num_matches = 1 L;747 num_matches = 1; 747 748 748 749 DosError(FERR_DISABLEHARDERR); 749 750 if (!xDosFindFirst(str, &search_handle, FILE_NORMAL | FILE_DIRECTORY | 750 751 FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN | FILE_ARCHIVED, 751 f, sizeof(FILEFINDBUF3 ), &num_matches, FIL_STANDARD)) {752 f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) { 752 753 753 754 strcpy(ss, s); … … 779 780 num_matches = 1L; 780 781 DosError(FERR_DISABLEHARDERR); 781 } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3 ),782 } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3L), 782 783 &num_matches)); 783 784 DosFindClose(search_handle); … … 794 795 /* wildcard delete */ 795 796 796 FILEFINDBUF3 *f;797 FILEFINDBUF3L *f; 797 798 HDIR search_handle; 798 799 ULONG num_matches; … … 829 830 830 831 ss = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__); 831 f = xmalloc(sizeof(FILEFINDBUF3 ), pszSrcFile, __LINE__);832 f = xmalloc(sizeof(FILEFINDBUF3L), pszSrcFile, __LINE__); 832 833 if (!ss || !f) { 833 834 xfree(ss); … … 842 843 DosError(FERR_DISABLEHARDERR); 843 844 if (!xDosFindFirst(str, &search_handle, FILE_NORMAL, f, 844 sizeof(FILEFINDBUF3 ), &num_matches, FIL_STANDARD)) {845 sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) { 845 846 846 847 strcpy(ss, s); … … 852 853 num_matches = 1; 853 854 DosError(FERR_DISABLEHARDERR); 854 } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3 ),855 } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3L), 855 856 &num_matches)); 856 857 DosFindClose(search_handle); -
TabularUnified trunk/dll/datamin.c ¶
r838 r841 742 742 { 743 743 CHAR s[134], szFileQty[38], szFreeQty[38]; 744 FILEFINDBUF3 ffb;744 FILEFINDBUF3L ffb; 745 745 ULONG nm = 1; 746 746 ULONGLONG ullFreeQty; … … 752 752 if (!xDosFindFirst(SwapperDat, &hdir, FILE_NORMAL | FILE_HIDDEN | 753 753 FILE_SYSTEM | FILE_ARCHIVED | FILE_READONLY, 754 &ffb, sizeof(ffb), &nm, FIL_STANDARD )) {754 &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) { 755 755 priority_bumped(); 756 756 DosFindClose(hdir); -
TabularUnified trunk/dll/dircnrs.c ¶
r838 r841 3127 3127 3128 3128 PCNRITEM pci = (PCNRITEM) ((PNOTIFYRECORDENTER) mp2)->pRecord; 3129 FILEFINDBUF3 ffb;3129 FILEFINDBUF3L ffb; 3130 3130 HDIR hDir = HDIR_CREATE; 3131 3131 ULONG nm = 1; … … 3142 3142 FILE_ARCHIVED | FILE_READONLY | 3143 3143 FILE_HIDDEN | FILE_SYSTEM, 3144 &ffb, sizeof(ffb), &nm, FIL_STANDARD );3144 &ffb, sizeof(ffb), &nm, FIL_STANDARDL); 3145 3145 priority_bumped(); 3146 3146 if (!status) { … … 3182 3182 DosExitCritSec(); 3183 3183 if (!PostMsg(dcd->hwndObject, 3184 UM_RESCAN, MPVOID, MPFROMLONG(1 L))) {3184 UM_RESCAN, MPVOID, MPFROMLONG(1))) { 3185 3185 DosEnterCritSec(); 3186 3186 dcd->stopflag--; -
TabularUnified trunk/dll/dirs.c ¶
r793 r841 17 17 #define INCL_DOS 18 18 #define INCL_DOSERRORS 19 #define INCL_LONGLONG 19 20 20 21 #include <os2.h> … … 68 69 69 70 APIRET ret; 70 FILESTATUS3 fsa;71 FILESTATUS3L fsa; 71 72 CHAR path[CCHMAXPATH + 1], *p; 72 73 73 74 strcpy(path, s); 74 75 while (*path) { 75 ret = DosQueryPathInfo(path, FIL_STANDARD , &fsa,76 (ULONG) sizeof(FILESTATUS3 ));76 ret = DosQueryPathInfo(path, FIL_STANDARDL, &fsa, 77 (ULONG) sizeof(FILESTATUS3L)); 77 78 if (ret || !(fsa.attrFile & FILE_DIRECTORY)) { 78 79 p = strrchr(path, '\\'); -
TabularUnified trunk/dll/dirsize.c ¶
r838 r841 100 100 ULONGLONG ull; 101 101 HDIR hdir; 102 PFILEFINDBUF4 pffbArray;102 PFILEFINDBUF4L pffbArray; 103 103 APIRET rc; 104 104 RECORDINSERT ri; … … 108 108 *pullTotalBytes = 0; // In case we fail 109 109 110 ulBufBytes = sizeof(FILEFINDBUF4 ) * FilesToGet;110 ulBufBytes = sizeof(FILEFINDBUF4L) * FilesToGet; 111 111 pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__); 112 112 if (!pffbArray) … … 121 121 hdir = HDIR_CREATE; 122 122 ulFindCnt = 1; 123 // memset(pffbArray, 0, sizeof(FILEFINDBUF4 )); // 11 Aug 07 SHL bypass memset123 // memset(pffbArray, 0, sizeof(FILEFINDBUF4L)); // 11 Aug 07 SHL bypass memset 124 124 DosError(FERR_DISABLEHARDERR); 125 125 // Check directory exists … … 127 127 FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED | 128 128 FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY, 129 pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZE );129 pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZEL); 130 130 131 131 if (!rc) … … 216 216 FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED | 217 217 FILE_SYSTEM | FILE_HIDDEN | FILE_DIRECTORY, 218 pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZE );218 pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZEL); 219 219 if (!rc) { 220 PFILEFINDBUF4 pffbFile;220 PFILEFINDBUF4L pffbFile; 221 221 ULONG x; 222 222 … … 257 257 if (!pffbFile->oNextEntryOffset) 258 258 break; 259 pffbFile = (PFILEFINDBUF4 )((PBYTE)pffbFile + pffbFile->oNextEntryOffset);259 pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + pffbFile->oNextEntryOffset); 260 260 261 261 #if 0 // 13 Aug 07 SHL fixme to be gone -
TabularUnified trunk/dll/draglist.c ¶
r793 r841 27 27 #define INCL_WIN 28 28 #define INCL_SHLERRORS 29 #define INCL_LONGLONG 29 30 #include <os2.h> 30 31 … … 114 115 DRAGIMAGE fakeicon; 115 116 PDRAGINFO pDInfo; 116 FILESTATUS3 fs3;117 FILESTATUS3L fs3; 117 118 CHAR szDir[CCHMAXPATH], szFile[CCHMAXPATH], *p; 118 119 119 120 if (filename && *filename) { 120 121 if ((IsRoot(filename) && IsValidDrive(*filename)) || 121 !DosQueryPathInfo(filename, FIL_STANDARD , &fs3, sizeof(fs3))) {122 !DosQueryPathInfo(filename, FIL_STANDARDL, &fs3, sizeof(fs3))) { 122 123 strcpy(szDir, filename); 123 124 p = szDir; … … 587 588 CHAR szFile[CCHMAXPATH], szBuffer[CCHMAXPATH]; 588 589 DRAGIMAGE *paDImgIcons = NULL, *pDImg; 589 FILESTATUS3 fs3;590 FILESTATUS3L fs3; 590 591 BOOL ok; 591 592 DIRCNRDATA *dcd; … … 598 599 for (ulSelect = 0; list[ulSelect]; ulSelect++) { 599 600 if ((!IsRoot(list[ulSelect]) || !IsValidDrive(*list[ulSelect])) && 600 DosQueryPathInfo(list[ulSelect], FIL_STANDARD , &fs3, sizeof(fs3)))601 DosQueryPathInfo(list[ulSelect], FIL_STANDARDL, &fs3, sizeof(fs3))) 601 602 continue; 602 603 strcpy(szBuffer, list[ulSelect]); -
TabularUnified trunk/dll/droplist.c ¶
r793 r841 26 26 #define INCL_DOS 27 27 #define INCL_WIN 28 #define INCL_LONGLONG 28 29 #include <os2.h> 29 30 … … 96 97 } 97 98 { /* be sure that file/directory is accessible */ 98 FILESTATUS3 fsa3;99 FILESTATUS3L fsa3; 99 100 100 101 DosError(FERR_DISABLEHARDERR); 101 102 if (DosQueryPathInfo(buffer1, 102 FIL_STANDARD ,103 FIL_STANDARDL, 103 104 &fsa3, 104 105 sizeof(fsa3)) || … … 165 166 } 166 167 { /* be sure that file/directory is accessible */ 167 FILESTATUS3 fsa3;168 169 rc = DosQueryPathInfo(buffer, FIL_STANDARD , &fsa3, sizeof(fsa3));168 FILESTATUS3L fsa3; 169 170 rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fsa3, sizeof(fsa3)); 170 171 if (!rc) 171 172 ret = TRUE; … … 287 288 CHAR **files = NULL; 288 289 UINT numfiles = 0, numalloc = 0; 289 ULONG curitem, numitems, *cbFile = NULL, *ulitemID = NULL; 290 ULONG curitem, numitems; 291 PULONGLONG pcbFile = NULL; 292 PULONG pulitemID = NULL; 290 293 LISTINFO *li = NULL; 291 294 ARC_TYPE *arcinfo = NULL; … … 416 419 417 420 CHAR **test; 418 ULONG *ltest; 421 PULONG pltest; 422 PULONGLONG plltest; 419 423 420 424 numalloc += 12; … … 424 428 break; 425 429 files = test; 426 ltest =427 xrealloc( cbFile, numalloc * sizeof(ULONG), pszSrcFile, __LINE__);428 if (! ltest)430 plltest = 431 xrealloc(pcbFile, numalloc * sizeof(ULONGLONG), pszSrcFile, __LINE__); 432 if (!plltest) 429 433 break; 430 cbFile =ltest;431 ltest =432 xrealloc( ulitemID, numalloc * sizeof(ULONG), pszSrcFile, __LINE__);433 if (! ltest)434 pcbFile = plltest; 435 pltest = 436 xrealloc(pulitemID, numalloc * sizeof(ULONG), pszSrcFile, __LINE__); 437 if (!pltest) 434 438 break; 435 ulitemID =ltest;436 } 437 cbFile[numfiles] = 0;439 pulitemID = pltest; 440 } 441 pcbFile[numfiles] = 0; 438 442 if (!isArc) { 439 443 440 FILESTATUS4 fsa4;441 442 if (!DosQueryPathInfo(szFrom, FIL_QUERYEASIZE , &fsa4, sizeof(fsa4)))443 cbFile[numfiles] = fsa4.cbFile + CBLIST_TO_EASIZE(fsa4.cbList);444 } 445 ulitemID[numfiles] = pDItem->ulItemID;444 FILESTATUS4L fsa4; 445 446 if (!DosQueryPathInfo(szFrom, FIL_QUERYEASIZEL, &fsa4, sizeof(fsa4))) 447 pcbFile[numfiles] = fsa4.cbFile + CBLIST_TO_EASIZE(fsa4.cbList); 448 } 449 pulitemID[numfiles] = pDItem->ulItemID; 446 450 files[numfiles] = xstrdup(szFrom, pszSrcFile, __LINE__); 447 451 files[numfiles + 1] = NULL; … … 464 468 } // for curitem 465 469 466 if (files && numfiles && files[0] && cbFile &&ulitemID) {470 if (files && numfiles && files[0] && pcbFile && pulitemID) { 467 471 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 468 472 if (li) { … … 470 474 li->hwnd = hwndCnr; 471 475 li->list = files; 472 li->cbFile = cbFile;473 li->ulitemID = ulitemID;476 li->cbFile = pcbFile; 477 li->ulitemID = pulitemID; 474 478 li->hwndS = pDInfo->hwndSource; 475 479 if (!pci && directory) … … 484 488 } 485 489 else { 486 if (cbFile) 487 free(cbFile); 488 if (ulitemID) 489 free(ulitemID); 490 xfree(pcbFile); 491 xfree(pulitemID); 490 492 if (files) 491 493 FreeList(files); … … 493 495 } 494 496 else { 495 if (cbFile) 496 free(cbFile); 497 if (ulitemID) 498 free(ulitemID); 497 xfree(pcbFile); 498 xfree(pulitemID); 499 499 if (files) 500 500 FreeList(files); -
TabularUnified trunk/dll/eas.c ¶
r827 r841 27 27 #define INCL_DOS 28 28 #define INCL_DOSERRORS 29 #define INCL_LONGLONG 29 30 #include <os2.h> 30 31 … … 1185 1186 1186 1187 HOLDFEA *head = NULL, *info, *last = NULL; 1187 FILESTATUS4 fsa4;1188 FILESTATUS4L fsa4; 1188 1189 HFILE handle; 1189 1190 ULONG action; … … 1192 1193 if (!filename) 1193 1194 return head; 1194 if (ishandle || !DosOpen (filename, &handle, &action, 0, 0,1195 OPEN_ACTION_FAIL_IF_NEW |1196 OPEN_ACTION_OPEN_IF_EXISTS,1197 OPEN_FLAGS_NOINHERIT |1198 OPEN_SHARE_DENYREADWRITE |1199 OPEN_ACCESS_READWRITE, (PEAOP2)0)) {1195 if (ishandle || !DosOpenL(filename, &handle, &action, 0, 0, 1196 OPEN_ACTION_FAIL_IF_NEW | 1197 OPEN_ACTION_OPEN_IF_EXISTS, 1198 OPEN_FLAGS_NOINHERIT | 1199 OPEN_SHARE_DENYREADWRITE | 1200 OPEN_ACCESS_READWRITE, (PEAOP2)0)) { 1200 1201 if (ishandle) 1201 1202 handle = *(HFILE *) filename; 1202 if (!DosQueryFileInfo(handle, FIL_QUERYEASIZE , (PVOID)&fsa4,1203 if (!DosQueryFileInfo(handle, FIL_QUERYEASIZEL, (PVOID)&fsa4, 1203 1204 (ULONG) sizeof(fsa4)) && 1204 1205 fsa4.cbList > 4) … … 1290 1291 //03 AUG 07 GKY This isn't an error it is for processing Readonly files 1291 1292 /* try it without opening it */ 1292 if (!DosQueryPathInfo(filename, FIL_QUERYEASIZE , (PVOID) & fsa4,1293 if (!DosQueryPathInfo(filename, FIL_QUERYEASIZEL, (PVOID) & fsa4, 1293 1294 (ULONG) sizeof(fsa4)) && 1294 1295 fsa4.cbList > 4) -
TabularUnified trunk/dll/filldir.c ¶
r838 r841 235 235 PCNRITEM pci, 236 236 const PSZ pszDirectory, 237 const PFILEFINDBUF4 pffb,237 const PFILEFINDBUF4L pffb, 238 238 const BOOL partial, 239 239 DIRCNRDATA *dcd) 240 240 { 241 // fill in a container record from a FILEFINDBUF4 structure241 // fill in a container record from a FILEFINDBUF4L structure 242 242 243 243 CHAR *p; … … 477 477 } // FillInRecordFromFFB 478 478 479 ULONGLONG FillInRecordFromFSA(HWND hwndCnr, PCNRITEM pci, const PSZ pszFileName, const PFILESTATUS4 pfsa4, const BOOL partial, DIRCNRDATA * dcd) // Optional 479 ULONGLONG FillInRecordFromFSA(HWND hwndCnr, PCNRITEM pci, 480 const PSZ pszFileName, 481 const PFILESTATUS4L pfsa4, 482 const BOOL partial, DIRCNRDATA * dcd) // Optional 480 483 { 481 484 HPOINTER hptr; 482 485 CHAR *p; 483 486 484 // fill in a container record from a FILESTATUS4 structure487 // fill in a container record from a FILESTATUS4L structure 485 488 486 489 pci->hwndCnr = hwndCnr; … … 490 493 // load the object's Subject, if required 491 494 pci->pszSubject = NullStr; 492 if (pfsa4->cbList > 4 L&&495 if (pfsa4->cbList > 4 && 493 496 dcd && 494 497 fLoadSubject && … … 701 704 PSZ pszFileSpec; 702 705 INT t; 703 PFILEFINDBUF4 paffbFound;704 PFILEFINDBUF4 *papffbSelected;705 PFILEFINDBUF4 pffbFile;706 PFILEFINDBUF4 paffbTotal = NULL;707 PFILEFINDBUF4 paffbTemp;706 PFILEFINDBUF4L paffbFound; 707 PFILEFINDBUF4L *papffbSelected; 708 PFILEFINDBUF4L pffbFile; 709 PFILEFINDBUF4L paffbTotal = NULL; 710 PFILEFINDBUF4L paffbTemp; 708 711 HDIR hdir = HDIR_CREATE; 709 712 ULONG ulFindCnt; … … 736 739 } 737 740 if (OS2ver[0] == 20 && OS2ver[1] < 30) 738 ulFindMax = min(ulFindMax, (65535 / sizeof(FILEFINDBUF4 )));739 740 ulBufBytes = ulFindMax * sizeof(FILEFINDBUF4 );741 ulFindMax = min(ulFindMax, (65535 / sizeof(FILEFINDBUF4L))); 742 743 ulBufBytes = ulFindMax * sizeof(FILEFINDBUF4L); 741 744 742 745 pszFileSpec = xmalloc(CCHMAXPATH + 2, pszSrcFile, __LINE__); 743 746 paffbFound = xmalloc(ulBufBytes, pszSrcFile, __LINE__); 744 papffbSelected = xmalloc(sizeof(PFILEFINDBUF4 ) * ulFindMax, pszSrcFile, __LINE__);747 papffbSelected = xmalloc(sizeof(PFILEFINDBUF4L) * ulFindMax, pszSrcFile, __LINE__); 745 748 746 749 if (paffbFound && papffbSelected && pszFileSpec) { … … 763 766 ulBufBytes, 764 767 &ulFindCnt, 765 FIL_QUERYEASIZE );768 FIL_QUERYEASIZEL); 766 769 priority_normal(); 767 770 *pchEndPath = 0; … … 804 807 break; 805 808 } 806 pffbFile = (PFILEFINDBUF4 )((PBYTE)pffbFile + pffbFile->oNextEntryOffset);809 pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + pffbFile->oNextEntryOffset); 807 810 } // for 808 811 if (ulSelCnt) { … … 868 871 // Append newly selected entries to aggregate list 869 872 paffbTemp = xrealloc(paffbTotal, 870 sizeof(FILEFINDBUF4 ) * (ulSelCnt + ulTotal),873 sizeof(FILEFINDBUF4L) * (ulSelCnt + ulTotal), 871 874 pszSrcFile, __LINE__); 872 875 if (paffbTemp) { … … 929 932 ullTotalBytes += ullBytes; 930 933 // Can not use offset since we have merged lists - this should be equivalent 931 pffbFile = (PFILEFINDBUF4 )((PBYTE)pffbFile + sizeof(FILEFINDBUF4));934 pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L)); 932 935 } 933 936 if (ulTotal) { … … 1037 1040 CHAR szDrive[] = " :\\"; 1038 1041 CHAR szFileSystem[CCHMAXPATH]; 1039 FILESTATUS4 fsa4;1042 FILESTATUS4L fsa4; 1040 1043 APIRET rc; 1041 1044 BOOL drivesbuilt = FALSE; … … 1130 1133 driveflags[x] |= DRIVE_INVALID; 1131 1134 1132 memset(&fsa4, 0, sizeof(FILESTATUS4 ));1135 memset(&fsa4, 0, sizeof(FILESTATUS4L)); 1133 1136 driveflags[x] |= removable == -1 || removable == 1 ? 1134 1137 DRIVE_REMOVABLE : 0; … … 1181 1184 DosError(FERR_DISABLEHARDERR); 1182 1185 rc = DosQueryPathInfo(szDrive, 1183 FIL_QUERYEASIZE ,1184 &fsa4, (ULONG) sizeof(FILESTATUS4 ));1186 FIL_QUERYEASIZEL, 1187 &fsa4, (ULONG) sizeof(FILESTATUS4L)); 1185 1188 // ERROR_BAD_NET_RSP = 58 1186 1189 if (rc == 58) { 1187 1190 DosError(FERR_DISABLEHARDERR); 1188 1191 rc = DosQueryPathInfo(szDrive, 1189 FIL_STANDARD ,1190 &fsa4, (ULONG) sizeof(FILESTATUS3 ));1192 FIL_STANDARDL, 1193 &fsa4, (ULONG) sizeof(FILESTATUS3L)); 1191 1194 fsa4.cbList = 0; 1192 1195 } -
TabularUnified trunk/dll/flesh.c ¶
r838 r841 26 26 #define INCL_DOSERRORS 27 27 #define INCL_WIN 28 #define INCL_LONGLONG 28 29 #include <os2.h> 29 30 … … 226 227 227 228 BOOL ret = FALSE; 228 FILEFINDBUF3 ffb[DDEPTH];229 PFILEFINDBUF3 pffb;229 FILEFINDBUF3L ffb[DDEPTH]; 230 PFILEFINDBUF3L pffb; 230 231 HDIR hDir = HDIR_CREATE; 231 232 ULONG nm, ulM = 1, total = 0, fl = MUST_HAVE_DIRECTORY; … … 289 290 FILE_READONLY | FILE_ARCHIVED | 290 291 FILE_SYSTEM | FILE_HIDDEN, 291 &ffb, ulM * sizeof(FILEFINDBUF3 ), &nm, FIL_STANDARD);292 &ffb, ulM * sizeof(FILEFINDBUF3L), &nm, FIL_STANDARDL); 292 293 if (ulM == 1 && !rc) { 293 294 do { … … 336 337 } while (++total < ddepth && !(rc = (xDosFindNext(hDir, 337 338 &ffb, 338 sizeof(FILEFINDBUF3 ),339 sizeof(FILEFINDBUF3L), 339 340 &nm)))); 340 341 DosFindClose(hDir); … … 364 365 365 366 for (len = 0; len < nm; len++) { 366 pffb = (PFILEFINDBUF3 ) fb;367 pffb = (PFILEFINDBUF3L) fb; 367 368 if (!includefiles && !(pffb->attrFile & FILE_DIRECTORY)) { 368 369 if (!isbroken) { -
TabularUnified trunk/dll/fm3dll.def ¶
r828 r841 284 284 _FM3DllHandle .266, 285 285 RootName_ .267, 286 RunFM2Util_ .268 286 RunFM2Util_ .268, 287 xDosFindFirst_ .269, 288 xDosFindNext_ .270 289 -
TabularUnified trunk/dll/fm3dll.h ¶
r838 r841 352 352 CHAR **list; 353 353 ULONG *ulitemID; 354 ULONG *cbFile;354 ULONGLONG *cbFile; 355 355 CHAR targetpath[CCHMAXPATH + 6]; 356 356 CHAR arcname[CCHMAXPATH]; … … 412 412 #define ARCFLAGS_PSEUDODIR 0x00000002 413 413 414 #define CBLIST_TO_EASIZE(cb) ((cb) > 4 ? (cb) / 2 : 0) // FILEFINDBUF4 .cbList to logical EA size414 #define CBLIST_TO_EASIZE(cb) ((cb) > 4 ? (cb) / 2 : 0) // FILEFINDBUF4L.cbList to logical EA size 415 415 416 416 typedef struct _CNRITEM … … 446 446 CDATE date; // if we know date format 447 447 CTIME time; // if we know time format 448 ULONG cbFile;// File's original size449 ULONG cbComp;// File's compressed size448 ULONGLONG cbFile; // File's original size 449 ULONGLONG cbComp; // File's compressed size 450 450 ULONG flags; 451 451 } … … 457 457 { 458 458 ULONG attrFile; 459 ULONG cbFile;460 ULONG easize;459 ULONGLONG cbFile; 460 ULONGLONG easize; 461 461 FDATE date; 462 462 FTIME time; … … 643 643 ULONGLONG FillInRecordFromFFB(HWND hwndCnr, PCNRITEM pci, 644 644 const PSZ pszDirectory, 645 const PFILEFINDBUF4 pffb, const BOOL partial,645 const PFILEFINDBUF4L pffb, const BOOL partial, 646 646 DIRCNRDATA *pdcd); 647 647 ULONGLONG FillInRecordFromFSA(HWND hwndCnr, PCNRITEM pci, 648 const PSZ pszFileName, const PFILESTATUS4 pfsa4,648 const PSZ pszFileName, const PFILESTATUS4L pfsa4, 649 649 const BOOL partial, DIRCNRDATA *pdcd); 650 650 VOID FreeCnrItem(HWND hwnd, PCNRITEM pci); … … 932 932 /* makelist.c */ 933 933 INT AddToList(CHAR * string, CHAR *** list, INT * numfiles, INT * numalloced); 934 INT AddToFileList(CHAR * string, FILEFINDBUF4 * ffb4, FILELIST *** list,934 INT AddToFileList(CHAR * string, FILEFINDBUF4L * ffb4, FILELIST *** list, 935 935 INT * numfiles, INT * numalloced); 936 936 CHAR **BuildList(HWND hwndCnr); … … 1318 1318 1319 1319 /* wrappers.c */ 1320 APIRET APIENTRY xDosFindFirst(PSZpszFileSpec,1321 PHDIRphdir,1322 1323 1324 1325 1326 1327 APIRET APIENTRYxDosFindNext(HDIR hDir,1328 1329 1330 1331 APIRET APIENTRYxDosSetPathInfo(PSZ pszPathName,1332 1333 1334 1335 1320 APIRET xDosFindFirst(PSZ pszFileSpec, 1321 PHDIR phdir, 1322 ULONG flAttribute, 1323 PVOID pfindbuf, 1324 ULONG cbBuf, 1325 PULONG pcFileNames, 1326 ULONG ulInfoLevel); 1327 APIRET xDosFindNext(HDIR hDir, 1328 PVOID pfindbuf, 1329 ULONG cbfindbuf, 1330 PULONG pcFilenames); 1331 APIRET xDosSetPathInfo(PSZ pszPathName, 1332 ULONG ulInfoLevel, 1333 PVOID pInfoBuf, 1334 ULONG cbInfoBuf, 1335 ULONG flOptions); 1336 1336 PSZ xfgets(PSZ pszBuf, size_t cMaxBytes, FILE * fp, PCSZ pszSrcFile, 1337 1337 UINT uiLineNumber); -
TabularUnified trunk/dll/fsopen.c ¶
r689 r841 18 18 #define INCL_WIN 19 19 #define INCL_DOS 20 #define INCL_LONGLONG 20 21 21 22 #include <os2.h> … … 33 34 { 34 35 35 ULONG openflag = OPEN_ACTION_OPEN_IF_EXISTS, openmode = 0, action = 0; 36 ULONG openflag = OPEN_ACTION_OPEN_IF_EXISTS, openmode = 0; 37 ULONGLONG action = 0; 36 38 HFILE handle; 37 39 FILE *fp; … … 66 68 else 67 69 openmode |= OPEN_FLAGS_RANDOMSEQUENTIAL; 68 if (DosOpen (filename, &handle, &action, 0L, FILE_NORMAL, openflag, openmode,69 (PEAOP2) 0))70 if (DosOpenL(filename, &handle, &action, 0, FILE_NORMAL, openflag, openmode, 71 (PEAOP2) 0)) 70 72 return NULL; 71 73 if (mode[strlen(mode) - 1] == 't') -
TabularUnified trunk/dll/getnames.c ¶
r838 r841 16 16 #define INCL_DOS 17 17 #define INCL_WIN 18 #define INCL_LONGLONG 18 19 #include <os2.h> 19 20 … … 39 40 ULONG ulDriveNum, ulDriveMap; 40 41 ULONG ulSearchCount; 41 FILEFINDBUF3 findbuf;42 FILEFINDBUF3L findbuf; 42 43 HDIR hDir; 43 44 APIRET rc; … … 58 59 MUST_HAVE_DIRECTORY | FILE_READONLY | 59 60 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 60 &findbuf, sizeof(FILEFINDBUF3 ),61 &ulSearchCount, FIL_STANDARD );61 &findbuf, sizeof(FILEFINDBUF3L), 62 &ulSearchCount, FIL_STANDARDL); 62 63 else { 63 64 rc = 0; … … 209 210 { 210 211 FILEDLG fdlg; 211 FILESTATUS3 fsa;212 FILESTATUS3L fsa; 212 213 CHAR drive[3], *pdrive = drive, *p; 213 214 APIRET rc; … … 277 278 return FALSE; 278 279 MakeFullName(filename); 279 if (!DosQueryPathInfo(filename, FIL_STANDARD , &fsa, sizeof(fsa))) {280 if (!DosQueryPathInfo(filename, FIL_STANDARDL, &fsa, sizeof(fsa))) { 280 281 if (fsa.attrFile & FILE_DIRECTORY) { 281 282 /* device or directory */ … … 284 285 return FALSE; 285 286 } 286 else if (fsa.cbFile == 0 L) {287 else if (fsa.cbFile == 0) { 287 288 saymsg(MB_CANCEL, 288 289 hwnd, filename, GetPString(IDS_ISZEROLENGTHTEXT), filename); … … 315 316 { 316 317 FILEDLG fdlg; 317 FILESTATUS3 fsa;318 FILESTATUS3L fsa; 318 319 CHAR drive[3], *pdrive = drive, *p; 319 320 static CHAR lastfilename[CCHMAXPATH] = ""; … … 368 369 return FALSE; 369 370 MakeFullName(filename); 370 if (!DosQueryPathInfo(filename, FIL_STANDARD , &fsa, sizeof(fsa))) {371 if (!DosQueryPathInfo(filename, FIL_STANDARDL, &fsa, sizeof(fsa))) { 371 372 if (fsa.attrFile & FILE_DIRECTORY) { /* device or directory */ 372 373 saymsg(MB_CANCEL | MB_ICONEXCLAMATION, -
TabularUnified trunk/dll/grep.c ¶
r839 r841 53 53 char **fle, int numfls); 54 54 static INT domatchingfiles(GREP *grep, CHAR *path, char **fle, int numfls); 55 static BOOL doonefile(GREP *grep, CHAR *fileName, FILEFINDBUF4 *pffb);55 static BOOL doonefile(GREP *grep, CHAR *fileName, FILEFINDBUF4L *pffb); 56 56 static BOOL doinsertion(GREP *grep); 57 static BOOL InsertDupe(GREP *grep, CHAR *dir, FILEFINDBUF4 *pffb);57 static BOOL InsertDupe(GREP *grep, CHAR *dir, FILEFINDBUF4L *pffb); 58 58 static VOID FillDupes(GREP *grep); 59 59 static VOID FreeDupes(GREP *grep); … … 68 68 ULONG SecsSince1980(FDATE * date, FTIME * time) 69 69 { 70 ULONG total = 0 L;70 ULONG total = 0; 71 71 register int x; 72 72 73 73 for (x = 1980; x < date->year + 1980; x++) { 74 74 if (isleap(x)) 75 total += (366 L * (24L * 60L * 60L));75 total += (366 * (24 * 60 * 60)); 76 76 else 77 total += (365 L * (24L * 60L * 60L));77 total += (365 * (24 * 60 * 60)); 78 78 } 79 79 for (x = 1; x < date->month; x++) { 80 80 if (x == 2 && isleap(date->year + 1980)) 81 total += (29 L * (24L * 60L * 60L));81 total += (29 * (24 * 60 * 60)); 82 82 else 83 total += ((long)monthdays[x - 1] * (24 L * 60L * 60L));84 } 85 total += (((long)date->day - 1 L) * (24L * 60L * 60L));86 total += ((long)time->hours * (60 L * 60L));87 total += ((long)time->minutes * 60 L);88 total += ((long)time->twosecs * 2 L);83 total += ((long)monthdays[x - 1] * (24 * 60 * 60)); 84 } 85 total += (((long)date->day - 1) * (24 * 60 * 60)); 86 total += ((long)time->hours * (60 * 60)); 87 total += ((long)time->minutes * 60); 88 total += ((long)time->twosecs * 2); 89 89 return total; 90 90 } … … 401 401 // process all subdirectories 402 402 403 FILEFINDBUF4 ffb;403 FILEFINDBUF4L ffb; 404 404 HDIR findHandle = HDIR_CREATE; 405 405 LONG ulFindCnt = 1; … … 415 415 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN | FILE_READONLY), 416 416 &ffb, (ULONG) sizeof(ffb), 417 (PULONG) & ulFindCnt, FIL_QUERYEASIZE )) {417 (PULONG) & ulFindCnt, FIL_QUERYEASIZEL)) { 418 418 419 419 // get rid of mask portion, save end-of-directory … … 454 454 // process all matching files in a directory 455 455 456 PFILEFINDBUF4 pffbArray;457 PFILEFINDBUF4 pffbFile;456 PFILEFINDBUF4L pffbArray; 457 PFILEFINDBUF4L pffbFile; 458 458 ULONG x; 459 459 HDIR findHandle = HDIR_CREATE; … … 462 462 PSZ p; 463 463 APIRET rc; 464 ULONG ulBufBytes = FilesToGet * sizeof(FILEFINDBUF4 );464 ULONG ulBufBytes = FilesToGet * sizeof(FILEFINDBUF4L); 465 465 static BOOL fDone; 466 466 … … 494 494 ulBufBytes, 495 495 &ulFindCnt, 496 FIL_QUERYEASIZE );496 FIL_QUERYEASIZEL); 497 497 if (!rc) { 498 498 do { … … 506 506 (pffbFile->achName[1] && pffbFile->achName[1] != '.')) { 507 507 strcpy(p, pffbFile->achName); // build filename 508 if (strlen(szFindPath) > 256){ //21 Sep GKY check for pathnames that exceed maxpath508 if (strlen(szFindPath) > CCHMAXPATH){ //21 Sep GKY check for pathnames that exceed maxpath 509 509 DosFindClose(findHandle); 510 510 free(pffbArray); … … 530 530 if (!pffbFile->oNextEntryOffset) 531 531 break; 532 pffbFile = (PFILEFINDBUF4 )((PBYTE)pffbFile + pffbFile->oNextEntryOffset);532 pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + pffbFile->oNextEntryOffset); 533 533 } // for 534 534 if (*grep->stopflag) … … 621 621 } 622 622 623 static BOOL insert_grepfile(GREP *grep, CHAR *filename, PFILEFINDBUF4 pffb)623 static BOOL insert_grepfile(GREP *grep, CHAR *filename, PFILEFINDBUF4L pffb) 624 624 { 625 625 PSZ p; … … 636 636 if (!grep->insertffb) { 637 637 // Allocate 1 extra for end marker? 638 grep->insertffb = xmallocz(sizeof(PFILEFINDBUF4 ) * (FilesToGet + 1),638 grep->insertffb = xmallocz(sizeof(PFILEFINDBUF4L) * (FilesToGet + 1), 639 639 pszSrcFile, __LINE__); 640 640 if (!grep->insertffb) … … 648 648 } 649 649 grep->insertffb[grep->toinsert] = 650 xmalloc(sizeof(FILEFINDBUF4 ), pszSrcFile, __LINE__);650 xmalloc(sizeof(FILEFINDBUF4L), pszSrcFile, __LINE__); 651 651 if (!grep->insertffb[grep->toinsert]) 652 652 return FALSE; 653 memcpy(grep->insertffb[grep->toinsert], pffb, sizeof(FILEFINDBUF4 ));653 memcpy(grep->insertffb[grep->toinsert], pffb, sizeof(FILEFINDBUF4L)); 654 654 grep->dir[grep->toinsert] = xstrdup(szDirectory, pszSrcFile, __LINE__); 655 655 if (!grep->dir) { … … 669 669 } 670 670 671 static BOOL doonefile(GREP *grep, CHAR *filename, FILEFINDBUF4 * pffb)671 static BOOL doonefile(GREP *grep, CHAR *filename, FILEFINDBUF4L * pffb) 672 672 { 673 673 // process a single file … … 1406 1406 } 1407 1407 1408 static BOOL InsertDupe(GREP *grep, CHAR *dir, FILEFINDBUF4 *pffb)1408 static BOOL InsertDupe(GREP *grep, CHAR *dir, FILEFINDBUF4L *pffb) 1409 1409 { 1410 1410 DUPES *info; -
TabularUnified trunk/dll/grep.h ¶
r785 r841 62 62 CHAR *stopflag; 63 63 ULONG toinsert; 64 ULONG insertedbytes;65 FILEFINDBUF4 **insertffb;64 ULONGLONG insertedbytes; 65 FILEFINDBUF4L **insertffb; 66 66 CHAR **dir; 67 67 ULONG attrFile; -
TabularUnified trunk/dll/info.c ¶
r838 r841 623 623 if (pfs && *pfs->szFileName) { 624 624 CHAR s[97]; 625 FILEFINDBUF4 fs;625 FILEFINDBUF4L fs; 626 626 HDIR hdir = HDIR_CREATE; 627 ULONG apptype = 1 L;627 ULONG apptype = 1; 628 628 FILE *fp; 629 629 HPOINTER hptr; … … 636 636 FILE_DIRECTORY | FILE_READONLY | FILE_HIDDEN | 637 637 FILE_SYSTEM, 638 &fs, sizeof(fs), &apptype, FIL_QUERYEASIZE )) {638 &fs, sizeof(fs), &apptype, FIL_QUERYEASIZEL)) { 639 639 // Not found 640 640 SHORT sSelect, numitems; -
TabularUnified trunk/dll/inis.c ¶
r838 r841 27 27 #define INCL_DOS 28 28 #define INCL_DOSERRORS 29 #define INCL_LONGLONG 29 30 #include <os2.h> 30 31 … … 516 517 WinSetWindowText(hwndMLE, lasttext); 517 518 { 518 FILEFINDBUF3 ffb;519 FILEFINDBUF3L ffb; 519 520 ULONG nm; 520 521 HDIR hdir; … … 526 527 &hdir, 527 528 FILE_NORMAL | FILE_ARCHIVED, 528 &ffb, sizeof(ffb), &nm, FIL_STANDARD )) {529 &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) { 529 530 do { 530 531 priority_bumped(); … … 1618 1619 CHAR szFrom[CCHMAXPATH + 2], szDir[CCHMAXPATH + 1], 1619 1620 szTemp[CCHMAXPATH + 2]; 1620 FILESTATUS3 fsa;1621 FILESTATUS3L fsa; 1621 1622 INIREC inirec; 1622 1623 … … 1637 1638 else { 1638 1639 if (FullDrgName(pDItem, szFrom, sizeof(szFrom)) && 1639 !DosQueryPathInfo(szFrom, FIL_STANDARD , &fsa,1640 (ULONG) sizeof(FILESTATUS3 )))1640 !DosQueryPathInfo(szFrom, FIL_STANDARDL, &fsa, 1641 (ULONG) sizeof(FILESTATUS3L))) 1641 1642 WinSendMsg(WinQueryWindow(hwnd, QW_PARENT), WM_COMMAND, 1642 1643 MPFROM2SHORT(IDM_COMPARE, 0), MPFROMP(szFrom)); … … 2487 2488 2488 2489 CHAR filename[CCHMAXPATH + 81], *p; 2489 FILESTATUS3 fsa;2490 FILESTATUS3L fsa; 2490 2491 HINI hINI; 2491 2492 … … 2510 2511 TRUE) && 2511 2512 *filename && 2512 !DosQueryPathInfo(filename, FIL_STANDARD , &fsa, sizeof(fsa))) {2513 !DosQueryPathInfo(filename, FIL_STANDARDL, &fsa, sizeof(fsa))) { 2513 2514 hINI = PrfOpenProfile(WinQueryAnchorBlock(hwnd), filename); 2514 2515 if (!hINI) { -
TabularUnified trunk/dll/init.c ¶
r838 r841 52 52 #define INCL_GPI 53 53 #define INCL_DOSERRORS 54 #define INCL_LONGLONG 54 55 #include <os2.h> 55 56 #include <os2me.h> … … 81 82 CHAR *pp; 82 83 FILE *fp; 83 FILEFINDBUF3 ffb;84 FILEFINDBUF3L ffb; 84 85 ULONG nm; 85 86 ULONG size = sizeof(SwapperDat); … … 96 97 FILE_NORMAL | FILE_ARCHIVED | 97 98 FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY, 98 &ffb, sizeof(ffb), &nm, FIL_STANDARD );99 &ffb, sizeof(ffb), &nm, FIL_STANDARDL); 99 100 if (!rc) { 100 101 DosFindClose(hdir); … … 157 158 FILE_NORMAL | FILE_ARCHIVED | 158 159 FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY, 159 &ffb, sizeof(ffb), &nm, FIL_STANDARD )) {160 &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) { 160 161 DosFindClose(hdir); 161 162 PrfWriteProfileString(fmprof, … … 181 182 CHAR *env; 182 183 CHAR stringfile[CCHMAXPATH]; 183 FILESTATUS3 fsa;184 FILESTATUS3L fsa; 184 185 APIRET rc; 185 186 … … 194 195 if (env) { 195 196 DosError(FERR_DISABLEHARDERR); 196 rc = DosQueryPathInfo(env, FIL_STANDARD , &fsa, sizeof(fsa));197 rc = DosQueryPathInfo(env, FIL_STANDARDL, &fsa, sizeof(fsa)); 197 198 if (!rc) { 198 199 if (fsa.attrFile & FILE_DIRECTORY) { 199 200 BldFullPathName(stringfile, env, "FM3RES.STR"); 200 201 DosError(FERR_DISABLEHARDERR); 201 if (DosQueryPathInfo(stringfile, FIL_STANDARD , &fsa, sizeof(fsa)))202 if (DosQueryPathInfo(stringfile, FIL_STANDARDL, &fsa, sizeof(fsa))) 202 203 strcpy(stringfile, "FM3RES.STR"); 203 204 } … … 295 296 CHAR *env; 296 297 CHAR stringfile[CCHMAXPATH]; 297 FILESTATUS3 fsa;298 FILESTATUS3L fsa; 298 299 APIRET rc; 299 300 … … 307 308 if (env) { 308 309 DosError(FERR_DISABLEHARDERR); 309 rc = DosQueryPathInfo(env, FIL_STANDARD , &fsa, sizeof(fsa));310 rc = DosQueryPathInfo(env, FIL_STANDARDL, &fsa, sizeof(fsa)); 310 311 if (!rc) { 311 312 if (fsa.attrFile & FILE_DIRECTORY) { 312 313 BldFullPathName(stringfile, env, "FM3RES.STR"); 313 314 DosError(FERR_DISABLEHARDERR); 314 if (DosQueryPathInfo(stringfile, FIL_STANDARD , &fsa, sizeof(fsa)))315 if (DosQueryPathInfo(stringfile, FIL_STANDARDL, &fsa, sizeof(fsa))) 315 316 strcpy(stringfile, "FM3RES.STR"); 316 317 } … … 409 410 HDIR search_handle; 410 411 ULONG num_matches; 411 static FILEFINDBUF3 f;412 static FILEFINDBUF3L f; 412 413 413 414 StopTimer(); … … 449 450 FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN | 450 451 FILE_ARCHIVED, 451 &f, sizeof(FILEFINDBUF3 ), &num_matches, FIL_STANDARD)) {452 &f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) { 452 453 do { 453 454 strcpy(enddir, f.achName); … … 460 461 } 461 462 while (!xDosFindNext(search_handle, 462 &f, sizeof(FILEFINDBUF3 ), &num_matches));463 &f, sizeof(FILEFINDBUF3L), &num_matches)); 463 464 DosFindClose(search_handle); 464 465 } … … 478 479 FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN | 479 480 FILE_ARCHIVED, 480 &f, sizeof(FILEFINDBUF3 ), &num_matches, FIL_STANDARD)) {481 &f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) { 481 482 do { 482 483 if (!(f.attrFile & FILE_DIRECTORY)) { … … 486 487 } 487 488 while (!xDosFindNext(search_handle, 488 &f, sizeof(FILEFINDBUF3 ), &num_matches));489 &f, sizeof(FILEFINDBUF3L), &num_matches)); 489 490 DosFindClose(search_handle); 490 491 } … … 515 516 ULONG RVMinor = 0; 516 517 ULONG ret = 0; 517 FILESTATUS3 fs3; // 25 Aug 07 SHL518 FILESTATUS3L fs3; // 25 Aug 07 SHL 518 519 PSZ env; 519 520 CHAR dllfile[CCHMAXPATH]; … … 533 534 if (env) { 534 535 DosError(FERR_DISABLEHARDERR); 535 rc = DosQueryPathInfo(env, FIL_STANDARD , &fs3, sizeof(fs3));536 rc = DosQueryPathInfo(env, FIL_STANDARDL, &fs3, sizeof(fs3)); 536 537 if (!rc) { 537 538 if (fs3.attrFile & FILE_DIRECTORY) { 538 539 BldFullPathName(dllfile, env, "FM3RES"); // 23 Aug 07 SHL 539 540 DosError(FERR_DISABLEHARDERR); 540 if (DosQueryPathInfo(dllfile, FIL_STANDARD , (PVOID)&fs3, (ULONG)sizeof(fs3)))541 if (DosQueryPathInfo(dllfile, FIL_STANDARDL, (PVOID)&fs3, (ULONG)sizeof(fs3))) 541 542 strcpy(dllfile, "FM3RES"); 542 543 } … … 648 649 strcpy(inipath, env); 649 650 DosError(FERR_DISABLEHARDERR); 650 rc = DosQueryPathInfo(inipath, FIL_STANDARD , &fs3, sizeof(fs3));651 rc = DosQueryPathInfo(inipath, FIL_STANDARDL, &fs3, sizeof(fs3)); 651 652 if (!rc) { 652 653 if (fs3.attrFile & FILE_DIRECTORY) … … 667 668 DosError(FERR_DISABLEHARDERR); 668 669 669 if (!DosQueryPathInfo(inipath, FIL_STANDARD , &fs3, sizeof(fs3))) {670 if (!DosQueryPathInfo(inipath, FIL_STANDARDL, &fs3, sizeof(fs3))) { 670 671 fIniExisted = TRUE; 671 672 if (fs3.attrFile & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM)) { 672 673 fs3.attrFile &= ~(FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM); 673 rc = xDosSetPathInfo(inipath, FIL_STANDARD , &fs3, sizeof(fs3), 0);674 rc = xDosSetPathInfo(inipath, FIL_STANDARDL, &fs3, sizeof(fs3), 0); 674 675 if (rc) { 675 676 Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, … … 724 725 strcpy(helppath, env); 725 726 DosError(FERR_DISABLEHARDERR); 726 rc = DosQueryPathInfo(helppath, FIL_STANDARD , &fs3, sizeof(fs3));727 rc = DosQueryPathInfo(helppath, FIL_STANDARDL, &fs3, sizeof(fs3)); 727 728 if (!rc) { 728 729 if (fs3.attrFile & FILE_DIRECTORY) { -
TabularUnified trunk/dll/mainwnd.c ¶
r838 r841 5593 5593 ULONG ulSearchCount; 5594 5594 SHORT sSelect; 5595 FILEFINDBUF3 findbuf;5595 FILEFINDBUF3L findbuf; 5596 5596 HDIR hDir; 5597 5597 CHAR *p; … … 5601 5601 ulSearchCount = 1; 5602 5602 if (!xDosFindFirst("*.TLS", &hDir, FILE_READONLY | FILE_ARCHIVED, 5603 &findbuf, sizeof(FILEFINDBUF3 ),5604 &ulSearchCount, FIL_STANDARD )) {5603 &findbuf, sizeof(FILEFINDBUF3L), 5604 &ulSearchCount, FIL_STANDARDL)) { 5605 5605 do { 5606 5606 priority_bumped(); … … 5627 5627 } 5628 5628 } 5629 while (!xDosFindNext(hDir, &findbuf, sizeof(FILEFINDBUF3 ),5629 while (!xDosFindNext(hDir, &findbuf, sizeof(FILEFINDBUF3L), 5630 5630 &ulSearchCount)); 5631 5631 DosFindClose(hDir); … … 5642 5642 ULONG ulDriveMap; 5643 5643 ULONG ulSearchCount; 5644 FILEFINDBUF3 findbuf;5644 FILEFINDBUF3L findbuf; 5645 5645 HDIR hDir; 5646 5646 APIRET rc; … … 5664 5664 MUST_HAVE_DIRECTORY | FILE_READONLY | 5665 5665 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 5666 &findbuf, sizeof(FILEFINDBUF3 ),5667 &ulSearchCount, FIL_STANDARD );5666 &findbuf, sizeof(FILEFINDBUF3L), 5667 &ulSearchCount, FIL_STANDARDL); 5668 5668 else { 5669 5669 rc = 0; … … 5706 5706 MUST_HAVE_DIRECTORY | FILE_READONLY | 5707 5707 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 5708 &findbuf, sizeof(FILEFINDBUF3 ),5709 &ulSearchCount, FIL_STANDARD );5708 &findbuf, sizeof(FILEFINDBUF3L), 5709 &ulSearchCount, FIL_STANDARDL); 5710 5710 else { 5711 5711 rc = 0; -
TabularUnified trunk/dll/mainwnd2.c ¶
r793 r841 26 26 #define INCL_WIN 27 27 #define INCL_GPI 28 #define INCL_LONGLONG 28 29 #include <os2.h> 29 30 … … 1362 1363 { 1363 1364 CHAR inipath[CCHMAXPATH], fullpath[CCHMAXPATH]; 1364 FILESTATUS3 fsa;1365 FILESTATUS3L fsa; 1365 1366 1366 1367 if (PrfQueryProfileString(HINI_USERPROFILE, 1367 1368 FM2Str, 1368 1369 "Home", NULL, inipath, sizeof(inipath))) { 1369 if (!DosQueryPathInfo(inipath, FIL_STANDARD , &fsa, (ULONG) sizeof(fsa))) {1370 if (!DosQueryPathInfo(inipath, FIL_STANDARDL, &fsa, (ULONG) sizeof(fsa))) { 1370 1371 if (fsa.attrFile & FILE_DIRECTORY) { 1371 1372 if (DosQueryPathInfo(inipath, -
TabularUnified trunk/dll/makefile ¶
r833 r841 32 32 # 26 Aug 07 SHL Clean *.lrf 33 33 # 05 Sep 07 SHL Correct USE_WRC logic 34 # 22 Sep 07 SHL Switch to 4 byte packing (-zp4) 34 35 35 36 # Environment: … … 99 100 100 101 !ifdef DEBUG 101 CFLAGS = -bt=os2 -mf -bd -bm -hd -d2 -olirs -s -sg -j -wx -zfp -zgp -z q102 CFLAGS = -bt=os2 -mf -bd -bm -hd -d2 -s -sg -j -wx -zfp -zgp -z q103 !else 104 CFLAGS = -bt=os2 -mf -bd -bm -hd -d1 -olirs -s -sg -j -wx -zfp -zgp -z q102 CFLAGS = -bt=os2 -mf -bd -bm -hd -d2 -olirs -s -sg -j -wx -zfp -zgp -zp4 -zq 103 CFLAGS = -bt=os2 -mf -bd -bm -hd -d2 -s -sg -j -wx -zfp -zgp -zp4 -zq 104 !else 105 CFLAGS = -bt=os2 -mf -bd -bm -hd -d1 -olirs -s -sg -j -wx -zfp -zgp -zp4 -zq 105 106 !endif 106 107 107 108 # for fm3res only 108 CFLAGSR = -bt=os2 -mf -bd -bm -olirs -s -j -wx -zfp -zgp -z q109 CFLAGSR = -bt=os2 -mf -bd -bm -olirs -s -j -wx -zfp -zgp -zp4 -zq 109 110 110 111 !ifdef DEBUG -
TabularUnified trunk/dll/makelist.c ¶
r793 r841 19 19 #define INCL_DOS 20 20 #define INCL_WIN 21 #define INCL_LONGLONG 21 22 #include <os2.h> 22 23 … … 95 96 } 96 97 97 INT AddToFileList(CHAR * string, FILEFINDBUF4 * ffb4, FILELIST *** list,98 INT AddToFileList(CHAR * string, FILEFINDBUF4L * ffb4, FILELIST *** list, 98 99 INT * numfiles, INT * numalloced) 99 100 { -
TabularUnified trunk/dll/misc.c ¶
r827 r841 40 40 #define INCL_WIN 41 41 #define INCL_GPI 42 #define INCL_LONGLONG 42 43 #include <os2.h> 43 44 -
TabularUnified trunk/dll/mle.c ¶
r814 r841 22 22 #define INCL_DOS 23 23 #define INCL_WIN 24 #define INCL_LONGLONG 24 25 #include <os2.h> 25 26 … … 429 430 HAB hab; 430 431 CHAR *buffer = NULL, *hexbuff = NULL; 431 IPT iptOffset = -1 L;432 ULONG numread, howmuch, numimport, action, len, left = 0 L;432 IPT iptOffset = -1; 433 ULONG numread, howmuch, numimport, action, len, left = 0; 433 434 BOOL ret = TRUE, first = TRUE; 434 435 CHAR titletext[512]; … … 446 447 *titletext = 0; 447 448 WinQueryWindowText(grandpa, 512, titletext); 448 rc = DosOpen (filename, &handle, &action, 0L, 0L,449 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,450 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |451 OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |452 OPEN_ACCESS_READONLY, 0L);449 rc = DosOpenL(filename, &handle, &action, 0, 0, 450 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS, 451 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT | 452 OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE | 453 OPEN_ACCESS_READONLY, 0); 453 454 if (rc) { 454 455 ret = FALSE; 455 456 } 456 457 else { 457 DosChgFilePtr(handle, 0 L, FILE_END, &len);458 DosChgFilePtr(handle, 0 L, FILE_BEGIN, &action);458 DosChgFilePtr(handle, 0, FILE_END, &len); 459 DosChgFilePtr(handle, 0, FILE_BEGIN, &action); 459 460 if (len) { 460 rc = DosAllocMem((PVOID) & hexbuff, 50001 L,461 rc = DosAllocMem((PVOID) & hexbuff, 50001, 461 462 PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE); 462 463 if (rc || !hexbuff) { … … 774 775 */ 775 776 776 FILESTATUS3 fsa;777 FILESTATUS3L fsa; 777 778 BOOL ret; 778 779 779 if (!DosQueryPathInfo(filename, FIL_STANDARD , &fsa, (ULONG) sizeof(fsa)) &&780 if (!DosQueryPathInfo(filename, FIL_STANDARDL, &fsa, (ULONG) sizeof(fsa)) && 780 781 !(fsa.attrFile & FILE_DIRECTORY)) { 781 782 MLEclearall(h); -
TabularUnified trunk/dll/newview.c ¶
r819 r841 31 31 #define INCL_WIN 32 32 #define INCL_GPI 33 #define INCL_LONGLONG 33 34 #include <os2.h> 34 35 … … 1257 1258 VIEWDATA *ad; 1258 1259 HFILE handle; 1259 ULONG action, len; 1260 ULONG action; 1261 ULONG len; 1260 1262 APIRET rc; 1261 1263 BOOL error = TRUE; … … 1289 1291 MPFROMLONG(FCF_SIZEBORDER), MPVOID); 1290 1292 WinSetFocus(HWND_DESKTOP, hwnd); 1291 rc = DosOpen (ad->filename, &handle, &action, 0L, 0L,1292 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,1293 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |1294 OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |1295 OPEN_ACCESS_READONLY, 0L);1293 rc = DosOpenL(ad->filename, &handle, &action, 0, 0, 1294 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS, 1295 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT | 1296 OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE | 1297 OPEN_ACCESS_READONLY, 0); 1296 1298 if (rc) { 1297 1299 Dos_Error(MB_CANCEL, … … 1303 1305 } 1304 1306 else { 1305 DosChgFilePtr(handle, 0 L, FILE_END, &len);1306 DosChgFilePtr(handle, 0 L, FILE_BEGIN, &action);1307 DosChgFilePtr(handle, 0, FILE_END, &len); 1308 DosChgFilePtr(handle, 0, FILE_BEGIN, &action); 1307 1309 if (!len) { 1308 1310 saymsg(MB_CANCEL, -
TabularUnified trunk/dll/objcnr.c ¶
r838 r841 27 27 #define INCL_WIN 28 28 #define INCL_DOSERRORS 29 #define INCL_LONGLONG 29 30 #include <os2.h> 30 31 … … 71 72 ULONG ulBufBytes; 72 73 HDIR hdir; 73 PFILEFINDBUF3 pffbArray;74 PFILEFINDBUF3L pffbArray; 74 75 APIRET rc; 75 76 RECORDINSERT ri; … … 77 78 HPOINTER hptr; 78 79 79 ulBufBytes = sizeof(FILEFINDBUF3 ) * FilesToGet;80 ulBufBytes = sizeof(FILEFINDBUF3L) * FilesToGet; 80 81 pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__); 81 82 if (!pffbArray) … … 91 92 FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED | 92 93 FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY, 93 pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARD );94 pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARDL); 94 95 if (!rc) 95 96 DosFindClose(hdir); … … 164 165 FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED | 165 166 FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY, 166 pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARD );167 pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARDL); 167 168 if (!rc) { 168 PFILEFINDBUF3 pffbFile;169 PFILEFINDBUF3L pffbFile; 169 170 ULONG x; 170 171 … … 184 185 if (!pffbFile->oNextEntryOffset) 185 186 break; 186 pffbFile = (PFILEFINDBUF3 )((PBYTE)pffbFile + pffbFile->oNextEntryOffset);187 pffbFile = (PFILEFINDBUF3L)((PBYTE)pffbFile + pffbFile->oNextEntryOffset); 187 188 } // for 188 189 DosSleep(0); // Let's others at same priority get some work done -
TabularUnified trunk/dll/printer.c ¶
r793 r841 20 20 #define INCL_DOS 21 21 #define INCL_WIN 22 #define INCL_LONGLONG 22 23 23 24 #include <os2.h> … … 96 97 FILE *fpi, *fpo; 97 98 CHAR s[CCHMAXPATH + 80]; 98 FILESTATUS3 fs3;99 FILESTATUS3L fs3; 99 100 LONG cols, lines, pages, z, lmargin, rmargin; 100 101 BOOL endline, endpage, startpage, skipping, firstpass; … … 125 126 DosError(FERR_DISABLEHARDERR); 126 127 if (DosQueryPathInfo 127 (li->list[x], FIL_STANDARD , &fs3, (ULONG) sizeof(fs3))128 (li->list[x], FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3)) 128 129 || (fs3.attrFile & FILE_DIRECTORY) || !fs3.cbFile) 129 130 continue; -
TabularUnified trunk/dll/rename.c ¶
r793 r841 16 16 #define INCL_DOS 17 17 #define INCL_WIN 18 #define INCL_LONGLONG 18 19 19 20 #include <os2.h> … … 76 77 if (mv) { 77 78 78 FILESTATUS3 fs1, fs2;79 FILESTATUS3L fs1, fs2; 79 80 CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH]; 80 81 INT sourceexists = 0, targetexists = 0, … … 91 92 if (!MakeFullName(mv->source)) 92 93 WinSetDlgItemText(hwnd, REN_SOURCE, mv->source); 93 if (!DosQueryPathInfo(mv->source, FIL_STANDARD , &fs1, sizeof(fs1))) {94 if (!DosQueryPathInfo(mv->source, FIL_STANDARDL, &fs1, sizeof(fs1))) { 94 95 sprintf(s, 95 96 " %s%lu %ss %04u/%02u/%02u %02u:%02u:%02u", … … 118 119 strcpy(chkname, mv->target); 119 120 } 120 if (!DosQueryPathInfo(chkname, FIL_STANDARD , &fs2, sizeof(fs2))) {121 if (!DosQueryPathInfo(chkname, FIL_STANDARDL, &fs2, sizeof(fs2))) { 121 122 sprintf(s, 122 123 " %s%lu %ss %04u/%02u/%02u %02u:%02u:%02u", -
TabularUnified trunk/dll/saveclip.c ¶
r838 r841 23 23 #define INCL_DOS 24 24 #define INCL_WIN 25 #define INCL_LONGLONG 25 26 #include <os2.h> 26 27 … … 432 433 fseek(fp, 0, SEEK_SET); 433 434 if (WinQueryButtonCheckstate(hwnd, SAV_APPEND) == 0) 434 DosSetFileSize ((HFILE) fileno(fp), 0);435 DosSetFileSizeL((HFILE) fileno(fp), 0); 435 436 else 436 437 fseek(fp, 0, SEEK_END); … … 711 712 INT x = 0; 712 713 SHORT sSelect; 713 FILEFINDBUF4 ffb4;714 FILEFINDBUF4L ffb4; 714 715 ULONG nm; 715 716 HDIR hdir; … … 781 782 fseek(fp, 0, SEEK_SET); 782 783 if (WinQueryButtonCheckstate(hwnd, SAV_APPEND) == 0) 783 DosSetFileSize ((HFILE) fileno(fp), 0);784 DosSetFileSizeL((HFILE) fileno(fp), 0); 784 785 else 785 786 fseek(fp, 0, SEEK_END); … … 792 793 FILE_READONLY | FILE_ARCHIVED | 793 794 FILE_HIDDEN | FILE_SYSTEM, 794 &ffb4, sizeof(ffb4), &nm, FIL_QUERYEASIZE )) {795 &ffb4, sizeof(ffb4), &nm, FIL_QUERYEASIZEL)) { 795 796 /* load the object's Subject, if required */ 796 797 if (ffb4.cbList > 4) { -
TabularUnified trunk/dll/seeall.c ¶
r838 r841 60 60 FDATE date; 61 61 FTIME time; 62 ULONG cbFile, CRC; 62 ULONGLONG cbFile; 63 ULONG CRC; 63 64 } 64 65 ALLFILES; … … 463 464 x = 0; 464 465 while (list[x]) { 465 FILESTATUS3 fsa;466 FILESTATUS3L fsa; 466 467 // BOOL spaces; 467 468 // if (needs_quoting(list[x])) { … … 474 475 memset(&fsa, 0, sizeof(fsa)); 475 476 DosError(FERR_DISABLEHARDERR); 476 DosQueryPathInfo(list[x], FIL_STANDARD , &fsa, sizeof(fsa));477 DosQueryPathInfo(list[x], FIL_STANDARDL, &fsa, sizeof(fsa)); 477 478 if (fsa.attrFile & FILE_DIRECTORY) { 478 479 BldQuotedFullPathName(szBuffer + strlen(szBuffer), … … 564 565 APIRET rc; 565 566 INT type; 566 FILESTATUS4 fs4;567 FILESTATUS4L fs4; 567 568 BOOL isnewer, existed; 568 569 … … 706 707 !(driveflags[toupper(*newname) - 'A'] & DRIVE_NOTWRITEABLE) 707 708 && toupper(*newname) != toupper(*list[x]) 708 && !DosQueryPathInfo(list[x], FIL_QUERYEASIZE , &fs4,709 && !DosQueryPathInfo(list[x], FIL_QUERYEASIZEL, &fs4, 709 710 sizeof(fs4)) 710 711 && !(fs4.attrFile & FILE_DIRECTORY)) { … … 728 729 DosError(FERR_DISABLEHARDERR); 729 730 if (!DosQueryPathInfo(list[cntr], 730 FIL_QUERYEASIZE ,731 FIL_QUERYEASIZEL, 731 732 &fs4, sizeof(fs4)) && 732 733 !(fs4.attrFile & FILE_DIRECTORY) && … … 886 887 CHECKLIST cl; 887 888 INT isdir = 0, sysdir = 0, ro = 0, hs = 0; 888 FILESTATUS3 fsa;889 FILESTATUS3L fsa; 889 890 CHAR prompt[CCHMAXPATH * 3]; 890 891 APIRET error; … … 899 900 } 900 901 DosError(FERR_DISABLEHARDERR); 901 if (DosQueryPathInfo(list[x], FIL_STANDARD , &fsa, sizeof(fsa))) {902 if (DosQueryPathInfo(list[x], FIL_STANDARDL, &fsa, sizeof(fsa))) { 902 903 list = RemoveFromList(list, list[x]); 903 904 if (!list) … … 981 982 fsa.attrFile = 0; 982 983 DosError(FERR_DISABLEHARDERR); 983 DosQueryPathInfo(list[x], FIL_STANDARD , &fsa, sizeof(fsa));984 DosQueryPathInfo(list[x], FIL_STANDARDL, &fsa, sizeof(fsa)); 984 985 if (fsa.attrFile & FILE_DIRECTORY) { 985 986 sprintf(prompt, GetPString(IDS_DELETINGTEXT), list[x]); … … 1414 1415 ULONG x, z; 1415 1416 BOOL ret, didone = FALSE; 1416 FILEFINDBUF3 ffb;1417 FILEFINDBUF3L ffb; 1417 1418 ULONG ulFindCnt; 1418 1419 HDIR hdir; … … 1435 1436 FILE_DIRECTORY | FILE_READONLY | FILE_SYSTEM | 1436 1437 FILE_HIDDEN, &ffb, sizeof(ffb), &ulFindCnt, 1437 FIL_STANDARD )) {1438 FIL_STANDARDL)) { 1438 1439 DosFindClose(hdir); 1439 1440 if (!(ffb.attrFile & FILE_DIRECTORY)) { … … 1456 1457 FILE_DIRECTORY | FILE_READONLY | FILE_SYSTEM | 1457 1458 FILE_HIDDEN, &ffb, sizeof(ffb), &ulFindCnt, 1458 FIL_STANDARD )) {1459 FIL_STANDARDL)) { 1459 1460 DosFindClose(hdir); 1460 1461 if (!(ffb.attrFile & FILE_DIRECTORY)) { … … 1888 1889 ALLDATA *ad = WinQueryWindowPtr(hwnd, QWL_USER); 1889 1890 CHAR *filename, *enddir; 1890 PFILEFINDBUF3 pffbArray, pffbFile;1891 PFILEFINDBUF3L pffbArray, pffbFile; 1891 1892 HDIR hdir = HDIR_CREATE; 1892 1893 ULONG ulFindCnt; … … 1906 1907 ulFindMax = 1; 1907 1908 1908 ulBufBytes = sizeof(FILEFINDBUF3 ) * ulFindMax;1909 ulBufBytes = sizeof(FILEFINDBUF3L) * ulFindMax; 1909 1910 pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__); 1910 1911 if (!pffbArray) { … … 1926 1927 FILE_READONLY | FILE_DIRECTORY | FILE_SYSTEM | 1927 1928 FILE_HIDDEN, 1928 pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARD );1929 pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARDL); 1929 1930 if (!rc) { 1930 1931 do { … … 1991 1992 } 1992 1993 } 1993 pffbFile = (PFILEFINDBUF3 )((PBYTE)pffbFile + pffbFile->oNextEntryOffset);1994 pffbFile = (PFILEFINDBUF3L)((PBYTE)pffbFile + pffbFile->oNextEntryOffset); 1994 1995 } // for 1995 1996 if (ad->stopflag) 1996 1997 break; 1997 1998 ulFindCnt = ulFindMax; 1998 rc = xDosFindNext(hdir, pffbArray, sizeof(FILEFINDBUF3 ) * ulFindCnt, &ulFindCnt);1999 rc = xDosFindNext(hdir, pffbArray, sizeof(FILEFINDBUF3L) * ulFindCnt, &ulFindCnt); 1999 2000 } while (!rc); 2000 2001 DosFindClose(hdir); -
TabularUnified trunk/dll/select.c ¶
r814 r841 815 815 } 816 816 else { 817 size_t len1 = filelength(fileno(fp1));818 size_t len2 = filelength(fileno(fp2));817 size_t len1 = _filelengthi64(fileno(fp1)); 818 size_t len2 = _filelengthi64(fileno(fp2)); 819 819 820 820 if (len1 == len2) { -
TabularUnified trunk/dll/shadow.c ¶
r793 r841 18 18 #define INCL_DOS 19 19 #define INCL_WIN 20 #define INCL_LONGLONG 20 21 #include <os2.h> 21 22 … … 166 167 CHAR szBuff[CCHMAXPATH + 8]; 167 168 HOBJECT obj = (HOBJECT) 0; 168 FILESTATUS3 fsa;169 FILESTATUS3L fsa; 169 170 170 171 *szBuff = 0; … … 199 200 while (list[x]) { 200 201 if (!DosQueryPathInfo(list[x], 201 FIL_STANDARD , &fsa,202 (ULONG) sizeof(FILESTATUS3 ))) {202 FIL_STANDARDL, &fsa, 203 (ULONG) sizeof(FILESTATUS3L))) { 203 204 204 205 ULONG apt; -
TabularUnified trunk/dll/srchpath.c ¶
r809 r841 18 18 #define INCL_DOS 19 19 #define INCL_DOSERRORS 20 #define INCL_LONGLONG 20 21 21 22 #include <os2.h> … … 104 105 || strchr(filename, ':')) { 105 106 106 FILESTATUS3 fsa;107 FILESTATUS3L fsa; 107 108 108 if (!DosQueryPathInfo(filename, FIL_STANDARD , &fsa, (ULONG) sizeof(fsa)))109 if (!DosQueryPathInfo(filename, FIL_STANDARDL, &fsa, (ULONG) sizeof(fsa))) 109 110 return filename; 110 111 *fbuf = 0; -
TabularUnified trunk/dll/subj.c ¶
r827 r841 20 20 #define INCL_DOS 21 21 #define INCL_DOSERRORS 22 #define INCL_LONGLONG 22 23 #include <os2.h> 23 24 -
TabularUnified trunk/dll/tools.c ¶
r838 r841 22 22 #define INCL_DOS 23 23 #define INCL_WIN 24 #define INCL_LONGLONG 24 25 #include <os2.h> 25 26 … … 889 890 EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID); 890 891 { 891 FILEFINDBUF3 findbuf;892 FILEFINDBUF3L findbuf; 892 893 HDIR hDir; 893 894 ULONG ulSearchCount, x = 0; … … 904 905 FILE_ARCHIVED, 905 906 &findbuf, 906 sizeof(FILEFINDBUF3 ),907 &ulSearchCount, FIL_STANDARD )) {907 sizeof(FILEFINDBUF3L), 908 &ulSearchCount, FIL_STANDARDL)) { 908 909 do { 909 910 priority_bumped(); … … 916 917 } while (!xDosFindNext(hDir, 917 918 &findbuf, 918 sizeof(FILEFINDBUF3 ), &ulSearchCount));919 sizeof(FILEFINDBUF3L), &ulSearchCount)); 919 920 DosFindClose(hDir); 920 921 priority_bumped(); -
TabularUnified trunk/dll/treecnr.c ¶
r838 r841 961 961 if (dcd && dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent) && 962 962 hwndStatus2) { 963 FILEFINDBUF3 ffb;963 FILEFINDBUF3L ffb; 964 964 ULONG nm = 1; 965 965 HDIR hdir = HDIR_CREATE; … … 970 970 FILE_NORMAL | FILE_HIDDEN | 971 971 FILE_SYSTEM | FILE_ARCHIVED | FILE_READONLY, 972 &ffb, sizeof(ffb), &nm, FIL_STANDARD )) {972 &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) { 973 973 CHAR tb[39], tm[39], tpm[39], s[163]; 974 974 ULONG amem; … … 1728 1728 case UM_ENTER: 1729 1729 { 1730 FILEFINDBUF3 ffb;1730 FILEFINDBUF3L ffb; 1731 1731 HDIR hDir = HDIR_CREATE; 1732 1732 ULONG nm = 1; … … 1892 1892 FILE_ARCHIVED | FILE_READONLY | 1893 1893 FILE_HIDDEN | FILE_SYSTEM, 1894 &ffb, sizeof(ffb), &nm, FIL_STANDARD );1894 &ffb, sizeof(ffb), &nm, FIL_STANDARDL); 1895 1895 priority_bumped(); 1896 1896 } -
TabularUnified trunk/dll/undel.c ¶
r793 r841 20 20 #define INCL_DOS 21 21 #define INCL_WIN 22 #define INCL_LONGLONG 22 23 #include <os2.h> 23 24 … … 55 56 struct tempstruct *undelinfo; 56 57 BOOL killme = FALSE; 57 FILESTATUS3 fsa;58 FILESTATUS3L fsa; 58 59 59 60 undelinfo = (struct tempstruct *)arg; … … 135 136 MPFROM2SHORT(0, LIT_FIRST), 136 137 MPFROMP(s)) < 0 137 && DosQueryPathInfo(s, FIL_STANDARD , &fsa,138 && DosQueryPathInfo(s, FIL_STANDARDL, &fsa, 138 139 (ULONG) sizeof(fsa))) 139 140 WinSendDlgItemMsg(hwnd, UNDEL_LISTBOX, LM_INSERTITEM, -
TabularUnified trunk/dll/update.c ¶
r838 r841 62 62 { 63 63 PCNRITEM pci; 64 FILEFINDBUF4 ffb;64 FILEFINDBUF4L ffb; 65 65 HDIR hDir = HDIR_CREATE; 66 66 ULONG nm = 1; … … 85 85 FILE_ARCHIVED | FILE_READONLY | 86 86 FILE_HIDDEN | FILE_SYSTEM, 87 &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZE );87 &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZEL); 88 88 if (!status) { 89 89 #ifdef DEBUG … … 335 335 { 336 336 PCNRITEM pci, *pciList = NULL; 337 FILEFINDBUF4 ffb;337 FILEFINDBUF4L ffb; 338 338 HDIR hDir; 339 339 ULONG nm = (ULONG) howmany; … … 376 376 FILE_ARCHIVED | FILE_READONLY | 377 377 FILE_HIDDEN | FILE_SYSTEM, 378 &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZE );378 &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZEL); 379 379 if (!status) { 380 380 /* file exists */ -
TabularUnified trunk/dll/valid.c ¶
r793 r841 31 31 #define INCL_DOSDEVICES // DosDevIOCtl 32 32 #define INCL_DOSDEVIOCTL // DosDevIOCtl 33 #define INCL_LONGLONG 33 34 #include <os2.h> 34 35 … … 86 87 87 88 int comp = 0; 88 FILESTATUS3 fs3o, fs3n;89 FILESTATUS3L fs3o, fs3n; 89 90 90 91 DosError(FERR_DISABLEHARDERR); 91 if (!DosQueryPathInfo(file1, FIL_STANDARD , &fs3o, sizeof(fs3o))) {92 DosError(FERR_DISABLEHARDERR); 93 if (!DosQueryPathInfo(file2, FIL_STANDARD , &fs3n, sizeof(fs3n))) {92 if (!DosQueryPathInfo(file1, FIL_STANDARDL, &fs3o, sizeof(fs3o))) { 93 DosError(FERR_DISABLEHARDERR); 94 if (!DosQueryPathInfo(file2, FIL_STANDARDL, &fs3n, sizeof(fs3n))) { 94 95 comp = (fs3n.fdateLastWrite.year > 95 96 fs3o.fdateLastWrite.year) ? 1 : … … 299 300 300 301 DosError(FERR_DISABLEHARDERR); 301 rc = DosOpen (szPath, &hDev, &ulAction, 0, 0, FILE_OPEN,302 OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE |303 OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR, 0);302 rc = DosOpenL(szPath, &hDev, &ulAction, 0, 0, FILE_OPEN, 303 OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE | 304 OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR, 0); 304 305 if (rc) { 305 306 DosError(FERR_DISABLEHARDERR); … … 352 353 /* returns: -1 (error), 0 (is a directory), or 1 (is a file) */ 353 354 354 FILESTATUS3 fsa1, fsa2;355 FILESTATUS3L fsa1, fsa2; 355 356 APIRET ret; 356 357 357 358 if (filename1 && filename2) { 358 359 DosError(FERR_DISABLEHARDERR); 359 ret = DosQueryPathInfo(filename1, FIL_STANDARD , &fsa1,360 ret = DosQueryPathInfo(filename1, FIL_STANDARDL, &fsa1, 360 361 (ULONG) sizeof(fsa1)); 361 362 if (!ret) { 362 363 DosError(FERR_DISABLEHARDERR); 363 ret = DosQueryPathInfo(filename2, FIL_STANDARD , &fsa2,364 ret = DosQueryPathInfo(filename2, FIL_STANDARDL, &fsa2, 364 365 (ULONG) sizeof(fsa2)); 365 366 if (!ret) { … … 378 379 /* returns: -1 (error), 0 (is a directory), or 1 (is a file) */ 379 380 380 FILESTATUS3 fsa;381 FILESTATUS3L fsa; 381 382 APIRET ret; 382 383 383 384 if (filename && *filename) { 384 385 DosError(FERR_DISABLEHARDERR); 385 ret = DosQueryPathInfo(filename, FIL_STANDARD , &fsa, (ULONG) sizeof(fsa));386 ret = DosQueryPathInfo(filename, FIL_STANDARDL, &fsa, (ULONG) sizeof(fsa)); 386 387 if (!ret) 387 388 return ((fsa.attrFile & FILE_DIRECTORY) == 0); … … 407 408 { 408 409 CHAR fullname[CCHMAXPATH]; 409 FILESTATUS3 fs;410 FILESTATUS3L fs; 410 411 411 412 if (path) { … … 417 418 DosError(FERR_DISABLEHARDERR); 418 419 if (!DosQueryPathInfo(fullname, 419 FIL_STANDARD ,420 FIL_STANDARDL, 420 421 &fs, 421 422 sizeof(fs)) && (fs.attrFile & FILE_DIRECTORY)) … … 461 462 ULONG ulDrv; 462 463 CHAR *p; 463 FILESTATUS3 fs;464 FILESTATUS3L fs; 464 465 APIRET rc; 465 466 … … 471 472 return path; 472 473 DosError(FERR_DISABLEHARDERR); 473 rc = DosQueryPathInfo(path, FIL_STANDARD , &fs, sizeof(fs));474 rc = DosQueryPathInfo(path, FIL_STANDARDL, &fs, sizeof(fs)); 474 475 if (!rc && (fs.attrFile & FILE_DIRECTORY)) 475 476 return path; … … 866 867 867 868 if (filename) { 868 if (!DosOpen (filename, &handle, &ulAction, 0, 0,869 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,870 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |871 OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |872 OPEN_ACCESS_READONLY, 0)) {869 if (!DosOpenL(filename, &handle, &ulAction, 0, 0, 870 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS, 871 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT | 872 OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE | 873 OPEN_ACCESS_READONLY, 0)) { 873 874 len = 512; 874 875 rc = DosRead(handle, buff, len, &len); -
TabularUnified trunk/dll/viewer.c ¶
r793 r841 19 19 #define INCL_DOS 20 20 #define INCL_WIN 21 #define INCL_LONGLONG 21 22 #include <os2.h> 22 23 … … 790 791 if (!MLEgetreadonly(hwndMLE)) { 791 792 792 LONG oldsize;793 LONGLONG oldsize; 793 794 794 795 if (!*vw->exportfilename || … … 808 809 fp = xfopen(vw->exportfilename, "r+", pszSrcFile, __LINE__); 809 810 if (fp) { 810 oldsize = filelength(fileno(fp));811 DosSetFileSize (fileno(fp), 0);811 oldsize = _filelengthi64(fileno(fp)); 812 DosSetFileSizeL(fileno(fp), 0); 812 813 fclose(fp); 813 814 } … … 822 823 fp = xfopen(vw->exportfilename, "r+", pszSrcFile, __LINE__); 823 824 if (fp) { 824 DosSetFileSize (fileno(fp), oldsize);825 DosSetFileSizeL(fileno(fp), oldsize); 825 826 fclose(fp); 826 827 } -
TabularUnified trunk/dll/viewinf.c ¶
r838 r841 21 21 #define INCL_DOS 22 22 #define INCL_WIN 23 #define INCL_LONGLONG 23 24 #include <os2.h> 24 25 … … 93 94 94 95 CHAR mask[CCHMAXPATH], *enddir, text[CCHMAXPATH * 2]; 95 FILEFINDBUF3 ffb;96 FILEFINDBUF3L ffb; 96 97 HDIR hdir; 97 98 ULONG nm; … … 109 110 DosError(FERR_DISABLEHARDERR); 110 111 if (!xDosFindFirst(mask, &hdir, FILE_NORMAL | FILE_ARCHIVED, 111 &ffb, sizeof(ffb), &nm, FIL_STANDARD )) {112 &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) { 112 113 do { 113 114 priority_normal(); -
TabularUnified trunk/dll/walkem.c ¶
r838 r841 29 29 #define INCL_DOSERRORS 30 30 #define INCL_SHLERRORS // PMERR_NOT_IN_IDX 31 #define INCL_LONGLONG 31 32 #include <os2.h> 32 33 … … 538 539 539 540 CHAR szDrive[] = " :", szTemp[1032]; 540 FILEFINDBUF3 findbuf;541 FILEFINDBUF3L findbuf; 541 542 HDIR hDir = HDIR_CREATE; 542 543 SHORT sDrive; … … 580 581 FILE_HIDDEN, 581 582 &findbuf, 582 sizeof(FILEFINDBUF3 ), &ulSearchCount, FIL_STANDARD)) {583 sizeof(FILEFINDBUF3L), &ulSearchCount, FIL_STANDARDL)) { 583 584 do { 584 585 if (findbuf.attrFile & FILE_DIRECTORY) { … … 597 598 ulSearchCount = 1; 598 599 } while (!xDosFindNext(hDir, 599 &findbuf, sizeof(FILEFINDBUF3 ), &ulSearchCount));600 &findbuf, sizeof(FILEFINDBUF3L), &ulSearchCount)); 600 601 DosFindClose(hDir); 601 602 } … … 695 696 ULONG ulDriveNum, ulDriveMap; 696 697 ULONG ulSearchCount; 697 FILEFINDBUF3 findbuf;698 FILEFINDBUF3L findbuf; 698 699 HDIR hDir; 699 700 APIRET rc; … … 714 715 MUST_HAVE_DIRECTORY | FILE_READONLY | 715 716 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 716 &findbuf, sizeof(FILEFINDBUF3 ),717 &ulSearchCount, FIL_STANDARD );717 &findbuf, sizeof(FILEFINDBUF3L), 718 &ulSearchCount, FIL_STANDARDL); 718 719 else { 719 720 rc = 0; … … 755 756 MUST_HAVE_DIRECTORY | FILE_READONLY | 756 757 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 757 &findbuf, sizeof(FILEFINDBUF3 ),758 &ulSearchCount, FIL_STANDARD );758 &findbuf, sizeof(FILEFINDBUF3L), 759 &ulSearchCount, FIL_STANDARDL); 759 760 else { 760 761 rc = 0; … … 891 892 892 893 ULONG ulSearchCount; 893 FILEFINDBUF3 findbuf;894 FILEFINDBUF3L findbuf; 894 895 HDIR hDir; 895 896 APIRET rc; … … 906 907 MUST_HAVE_DIRECTORY | FILE_READONLY | 907 908 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 908 &findbuf, sizeof(FILEFINDBUF3 ),909 &ulSearchCount, FIL_STANDARD );909 &findbuf, sizeof(FILEFINDBUF3L), 910 &ulSearchCount, FIL_STANDARDL); 910 911 if (!rc) 911 912 DosFindClose(hDir); … … 941 942 942 943 ULONG ulSearchCount; 943 FILEFINDBUF3 findbuf;944 FILEFINDBUF3L findbuf; 944 945 HDIR hDir; 945 946 APIRET rc; … … 955 956 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 956 957 &findbuf, 957 sizeof(FILEFINDBUF3 ),958 &ulSearchCount, FIL_STANDARD );958 sizeof(FILEFINDBUF3L), 959 &ulSearchCount, FIL_STANDARDL); 959 960 if (!rc) 960 961 DosFindClose(hDir); … … 1017 1018 1018 1019 ULONG ulSearchCount; 1019 FILEFINDBUF3 findbuf;1020 FILEFINDBUF3L findbuf; 1020 1021 HDIR hDir; 1021 1022 APIRET rc; … … 1038 1039 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 1039 1040 &findbuf, 1040 sizeof(FILEFINDBUF3 ),1041 &ulSearchCount, FIL_STANDARD );1041 sizeof(FILEFINDBUF3L), 1042 &ulSearchCount, FIL_STANDARDL); 1042 1043 if (!rc) 1043 1044 DosFindClose(hDir); … … 1380 1381 1381 1382 ULONG ulSearchCount; 1382 FILEFINDBUF3 findbuf;1383 FILEFINDBUF3L findbuf; 1383 1384 HDIR hDir; 1384 1385 APIRET rc; … … 1401 1402 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 1402 1403 &findbuf, 1403 sizeof(FILEFINDBUF3 ),1404 &ulSearchCount, FIL_STANDARD );1404 sizeof(FILEFINDBUF3L), 1405 &ulSearchCount, FIL_STANDARDL); 1405 1406 if (!rc) 1406 1407 DosFindClose(hDir); … … 1445 1446 1446 1447 ULONG ulSearchCount; 1447 FILEFINDBUF3 findbuf;1448 FILEFINDBUF3L findbuf; 1448 1449 HDIR hDir; 1449 1450 APIRET rc; … … 1466 1467 FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN, 1467 1468 &findbuf, 1468 sizeof(FILEFINDBUF3 ),1469 &ulSearchCount, FIL_STANDARD );1469 sizeof(FILEFINDBUF3L), 1470 &ulSearchCount, FIL_STANDARDL); 1470 1471 if (!rc) 1471 1472 DosFindClose(hDir); -
TabularUnified trunk/dll/worker.c ¶
r809 r841 31 31 #define INCL_DOSERRORS 32 32 #define INCL_WPCLASS // WinQueryObjectPath 33 #define INCL_LONGLONG 33 34 #include <os2.h> 34 35 … … 127 128 if (hmq2) { 128 129 CHAR message[(CCHMAXPATH * 2) + 80], wildname[CCHMAXPATH]; 129 registerINT x;130 INT x; 130 131 BOOL dontask = FALSE, wildcarding = FALSE, overold = 131 132 FALSE, overnew = FALSE, usedtarget; … … 397 398 goto Abort; 398 399 { 399 FILESTATUS3 fsa;400 FILESTATUS3L fsa; 400 401 401 402 DosError(FERR_DISABLEHARDERR); 402 403 if (DosQueryPathInfo(ex.extractdir, 403 FIL_STANDARD ,404 FIL_STANDARDL, 404 405 &fsa, 405 (ULONG) sizeof(FILESTATUS3 )) ||406 406 (ULONG) sizeof(FILESTATUS3L)) || 407 !(fsa.attrFile & FILE_DIRECTORY)) 407 408 goto Abort; 408 409 } … … 486 487 case IDM_OPENTREE: 487 488 { 488 FILESTATUS3 fsa;489 FILESTATUS3L fsa; 489 490 490 491 DosError(FERR_DISABLEHARDERR); 491 492 if (DosQueryPathInfo(wk->li->list[x], 492 FIL_STANDARD ,493 FIL_STANDARDL, 493 494 &fsa, 494 (ULONG) sizeof(FILESTATUS3 )) ||495 495 (ULONG) sizeof(FILESTATUS3L)) || 496 !(fsa.attrFile & FILE_DIRECTORY)) 496 497 break; 497 498 } … … 600 601 APIRET rc; 601 602 INT type; 602 FILESTATUS4 fs4;603 FILESTATUS4L fs4; 603 604 BOOL isnewer, existed; 604 605 … … 755 756 DRIVE_NOTWRITEABLE) 756 757 && toupper(*newname) != toupper(*wk->li->list[x]) 757 && !DosQueryPathInfo(wk->li->list[x], FIL_QUERYEASIZE ,758 && !DosQueryPathInfo(wk->li->list[x], FIL_QUERYEASIZEL, 758 759 &fs4, sizeof(fs4)) 759 760 && !(fs4.attrFile & FILE_DIRECTORY)) { … … 777 778 DosError(FERR_DISABLEHARDERR); 778 779 if (!DosQueryPathInfo(wk->li->list[cntr], 779 FIL_QUERYEASIZE ,780 FIL_QUERYEASIZEL, 780 781 &fs4, 781 782 sizeof(fs4)) && … … 1247 1248 x = 0; 1248 1249 while (wk->li->list[x]) { 1249 FILESTATUS3 fsa;1250 FILESTATUS3L fsa; 1250 1251 // BOOL spaces; 1251 1252 // if (needs_quoting(wk->li->list[x])) { … … 1256 1257 // spaces = FALSE; 1257 1258 // strcat(szBuffer, wk->li->list[x]); 1258 memset(&fsa, 0, sizeof(FILESTATUS3 ));1259 memset(&fsa, 0, sizeof(FILESTATUS3L)); 1259 1260 DosError(FERR_DISABLEHARDERR); 1260 1261 DosQueryPathInfo(wk->li->list[x], 1261 FIL_STANDARD ,1262 &fsa, (ULONG) sizeof(FILESTATUS3 ));1262 FIL_STANDARDL, 1263 &fsa, (ULONG) sizeof(FILESTATUS3L)); 1263 1264 if (fsa.attrFile & FILE_DIRECTORY) { 1264 1265 BldQuotedFullPathName(szBuffer + strlen(szBuffer), wk->li->list[x], "*"); … … 1447 1448 INT isdir = 0, sysdir = 0, ro = 0, hs = 0; 1448 1449 register INT x; 1449 FILESTATUS3 fsa;1450 FILESTATUS3L fsa; 1450 1451 CHAR prompt[CCHMAXPATH * 3]; 1451 1452 APIRET error; … … 1462 1463 DosError(FERR_DISABLEHARDERR); 1463 1464 if (DosQueryPathInfo(wk->li->list[x], 1464 FIL_STANDARD , &fsa,1465 (ULONG) sizeof(FILESTATUS3 ))) {1465 FIL_STANDARDL, &fsa, 1466 (ULONG) sizeof(FILESTATUS3L))) { 1466 1467 wk->li->list = RemoveFromList(wk->li->list, 1467 1468 wk->li->list[x]); … … 1549 1550 DosError(FERR_DISABLEHARDERR); 1550 1551 DosQueryPathInfo(wk->li->list[x], 1551 FIL_STANDARD ,1552 &fsa, (ULONG) sizeof(FILESTATUS3 ));1552 FIL_STANDARDL, 1553 &fsa, (ULONG) sizeof(FILESTATUS3L)); 1553 1554 if (fsa.attrFile & FILE_DIRECTORY) { 1554 1555 sprintf(prompt, -
TabularUnified trunk/dll/wrappers.c ¶
r838 r841 19 19 #define INCL_DOS 20 20 #define INCL_DOSERRORS 21 #define INCL_LONGLONG 21 22 #include <os2.h> 22 23 … … 30 31 static PSZ pszSrcFile = __FILE__; 31 32 32 APIRET APIENTRYxDosFindFirst(PSZ pszFileSpec,33 34 35 36 37 38 33 APIRET xDosFindFirst(PSZ pszFileSpec, 34 PHDIR phdir, 35 ULONG flAttribute, 36 PVOID pfindbuf, 37 ULONG cbBuf, 38 PULONG pcFileNames, 39 ULONG ulInfoLevel) 39 40 { 40 41 APIRET rc; … … 45 46 } 46 47 47 APIRET APIENTRYxDosFindNext(HDIR hDir,48 49 50 48 APIRET xDosFindNext(HDIR hDir, 49 PVOID pfindbuf, 50 ULONG cbfindbuf, 51 PULONG pcFilenames) 51 52 { 52 53 APIRET rc; … … 65 66 * and we don't put enough additional data on the stack for this to occur. 66 67 * It is caller's responsitibility to report errors 67 * @param pInfoBuf pointer to FILESTATUS3 or EAOP2 buffer68 * @param ulInfoLevel FIL_STANDARD or FIL_QUERYEASIZE68 * @param pInfoBuf pointer to FILESTATUS3L or EAOP2 buffer 69 * @param ulInfoLevel FIL_STANDARDL or FIL_QUERYEASIZE 69 70 * @returns Same as DosSetPathInfo 70 71 */ 71 72 72 APIRET APIENTRYxDosSetPathInfo(PSZ pszPathName,73 74 75 76 73 APIRET xDosSetPathInfo(PSZ pszPathName, 74 ULONG ulInfoLevel, 75 PVOID pInfoBuf, 76 ULONG cbInfoBuf, 77 ULONG flOptions) 77 78 { 78 79 APIRET rc = DosSetPathInfo(pszPathName, ulInfoLevel, pInfoBuf, cbInfoBuf, flOptions); 79 FILESTATUS3 alt_fs3;80 FILESTATUS3L alt_fs3; 80 81 EAOP2 alt_eaop2; 81 82 if (rc == ERROR_INVALID_NAME) { 82 83 switch (ulInfoLevel) { 83 case FIL_STANDARD :84 alt_fs3 = *(PFILESTATUS3 )pInfoBuf; // Copy84 case FIL_STANDARDL: 85 alt_fs3 = *(PFILESTATUS3L)pInfoBuf; // Copy 85 86 rc = DosSetPathInfo(pszPathName, ulInfoLevel, &alt_fs3, sizeof(alt_fs3), flOptions); 86 87 break; … … 207 208 208 209 #pragma alloc_text(WRAPPERS1,xfree,xfopen,xfsopen,xmalloc,xrealloc, xstrdup) 209 210 #pragma alloc_text(WRAPPERS2,xDosSetPathInfo,xDosFindFirst,xDosFindNext) -
TabularUnified trunk/undel.c ¶
r551 r841 1 1 #define INCL_DOS 2 2 #define INCL_WIN 3 #define INCL_LONGLONG 3 4 4 5 #include <os2.h> … … 16 17 HAB hab; 17 18 HMQ hmq; 18 FILESTATUS3 fs;19 FILESTATUS3L fs; 19 20 static CHAR fullname[CCHMAXPATH]; 20 21 CHAR *thisarg = NULL; … … 33 34 } 34 35 DosError(FERR_DISABLEHARDERR); 35 if (thisarg && !DosQueryPathInfo(thisarg, FIL_STANDARD , &fs, sizeof(fs))) {36 if (thisarg && !DosQueryPathInfo(thisarg, FIL_STANDARDL, &fs, sizeof(fs))) { 36 37 if (DosQueryPathInfo(thisarg, 37 38 FIL_QUERYFULLNAME, fullname, sizeof(fullname)))
Note:
See TracChangeset
for help on using the changeset viewer.