Changeset 359
- Timestamp:
- Jul 26, 2006, 11:32:14 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/filldir.c
r282 r359 7 7 8 8 Copyright (c) 1993-98 M. Kimes 9 Copyright (c) 2001, 200 5Steven H. Levine9 Copyright (c) 2001, 2006 Steven H. Levine 10 10 11 11 10 Jan 04 SHL ProcessDirectory: avoid most large drive failures … … 23 23 24 Oct 05 SHL FillInRecordFromFSA: correct longname display enable 24 24 24 Oct 05 SHL Drop obsolete code 25 22 Jul 06 SHL Check more run time errors 25 26 26 27 ***********************************************************************/ … … 40 41 #include "fm3dll.h" 41 42 #include "fm3str.h" 43 44 static PSZ pszSrcFile = __FILE__; 42 45 43 46 #pragma alloc_text(FILLDIR,FillInRecordFromFFB,FillInRecordFromFSA,IDFile) … … 192 195 CHAR *value; 193 196 194 pgealist = malloc(sizeof(GEA2LIST) + 32); 195 if (pgealist) 196 { 197 memset(pgealist,0,sizeof(GEA2LIST) + 32); 197 pgealist = xmallocz(sizeof(GEA2LIST) + 32,pszSrcFile,__LINE__); 198 if (pgealist) { 198 199 pgea = &pgealist->list[0]; 199 200 strcpy(pgea->szName,SUBJECT); … … 201 202 pgea->oNextEntryOffset = 0; 202 203 pgealist->cbList = (sizeof(GEA2LIST) + pgea->cbName); 203 pfealist = malloc(1532); 204 if (pfealist) 205 { 206 memset(pfealist,0,1532); 204 pfealist = xmallocz(1532,pszSrcFile,__LINE__); 205 if (pfealist) { 207 206 pfealist->cbList = 1024; 208 207 eaop.fpGEA2List = pgealist; … … 242 241 CHAR *value; 243 242 244 pgealist = malloc(sizeof(GEA2LIST) + 32); 245 if (pgealist) 246 { 247 memset(pgealist,0,sizeof(GEA2LIST) + 32); 243 pgealist = xmallocz(sizeof(GEA2LIST) + 32,pszSrcFile,__LINE__); 244 if (pgealist) { 248 245 pgea = &pgealist->list[0]; 249 246 strcpy(pgea->szName,LONGNAME); … … 251 248 pgea->oNextEntryOffset = 0; 252 249 pgealist->cbList = (sizeof(GEA2LIST) + pgea->cbName); 253 pfealist = malloc(1532);250 pfealist = xmallocz(1532,pszSrcFile,__LINE__); 254 251 if (pfealist) { 255 memset(pfealist,0,1532);256 252 pfealist->cbList = 1024; 257 253 eaop.fpGEA2List = pgealist; … … 445 441 CHAR *value; 446 442 447 pgealist = malloc(sizeof(GEA2LIST) + 32);443 pgealist = xmallocz(sizeof(GEA2LIST) + 32,pszSrcFile,__LINE__); 448 444 if (pgealist) { 449 memset(pgealist,0,sizeof(GEA2LIST) + 32);450 445 pgea = &pgealist->list[0]; 451 446 strcpy(pgea->szName,SUBJECT); … … 453 448 pgea->oNextEntryOffset = 0; 454 449 pgealist->cbList = (sizeof(GEA2LIST) + pgea->cbName); 455 pfealist = malloc(1532);450 pfealist = xmallocz(1532,pszSrcFile,__LINE__); 456 451 if (pfealist) { 457 memset(pfealist,0,1532);458 452 pfealist->cbList = 1024; 459 453 eaop.fpGEA2List = pgealist; … … 493 487 CHAR *value; 494 488 495 pgealist = malloc(sizeof(GEA2LIST) + 32);489 pgealist = xmallocz(sizeof(GEA2LIST) + 32,pszSrcFile,__LINE__); 496 490 if (pgealist) { 497 memset(pgealist,0,sizeof(GEA2LIST) + 32);498 491 pgea = &pgealist->list[0]; 499 492 strcpy(pgea->szName,LONGNAME); … … 501 494 pgea->oNextEntryOffset = 0; 502 495 pgealist->cbList = (sizeof(GEA2LIST) + pgea->cbName); 503 pfealist = malloc(1532);496 pfealist = xmallocz(1532,pszSrcFile,__LINE__); 504 497 if (pfealist) { 505 memset(pfealist,0,1532);506 498 pfealist->cbList = 1024; 507 499 eaop.fpGEA2List = pgealist; … … 700 692 701 693 ulFileCnt = ulM; 702 pszFileSpec = malloc(CCHMAXPATH + 2);703 paffbFound = malloc((ulM + 1) * sizeof(FILEFINDBUF4));704 papffbSelected = malloc((ulM + 1) * sizeof(PFILEFINDBUF4));694 pszFileSpec = xmalloc(CCHMAXPATH + 2,pszSrcFile,__LINE__); 695 paffbFound = xmalloc((ulM + 1) * sizeof(FILEFINDBUF4),pszSrcFile,__LINE__); 696 papffbSelected = xmalloc((ulM + 1) * sizeof(PFILEFINDBUF4),pszSrcFile,__LINE__); 705 697 if (paffbFound && papffbSelected && pszFileSpec) { 706 698 t = strlen(szDirBase); … … 767 759 MPFROMLONG(ulExtraBytes), 768 760 MPFROMLONG(ulFileCnt)); 769 if (pciFirst) 770 { 761 if (!pciFirst) { 762 Win_Error(hwndCnr,HWND_DESKTOP,pszSrcFile,__LINE__, 763 GetPString(IDS_FILLDIRALLOCERRTEXT)); 764 ok = FALSE; 765 ullTotalBytes = 0; 766 } 767 else { 771 768 register INT i; 772 769 … … 803 800 MPFROMP(&ri))) 804 801 { 805 Win_Error(hwndCnr,HWND_DESKTOP, __FILE__,__LINE__,806 GetPString(IDS_FILLDIR ERR2TEXT));802 Win_Error(hwndCnr,HWND_DESKTOP,pszSrcFile,__LINE__, 803 GetPString(IDS_FILLDIRINSERRTEXT)); 807 804 ok = FALSE; 808 805 ullTotalBytes = 0; … … 824 821 } 825 822 } 826 else827 {828 Win_Error(hwndCnr,HWND_DESKTOP,__FILE__,__LINE__,829 GetPString(IDS_FILLDIRERR3TEXT));830 ok = FALSE;831 ullTotalBytes = 0;832 }833 823 if (ok) 834 824 { … … 839 829 else 840 830 { 841 paffbTemp = realloc(paffbTotal,sizeof(FILEFINDBUF4) * 842 (ulFileCnt + ulTotal)); 831 paffbTemp = xrealloc(paffbTotal, 832 sizeof(FILEFINDBUF4) * (ulFileCnt + ulTotal), 833 pszSrcFile,__LINE__); 843 834 if (paffbTemp) 844 835 { … … 888 879 MPFROMLONG(ulExtraBytes), 889 880 MPFROMLONG(ulTotal)); 890 if (pciFirst) 891 { 881 if (!pciFirst) { 882 Win_Error(hwndCnr,HWND_DESKTOP,pszSrcFile,__LINE__, 883 GetPString(IDS_FILLDIRALLOCERRTEXT)); 884 ok = FALSE; 885 ullTotalBytes = 0; 886 } 887 else { 892 888 register INT i; 893 889 … … 924 920 MPFROMP(pciFirst),MPFROMP(&ri))) 925 921 { 926 Win_Error(hwndCnr,HWND_DESKTOP, __FILE__,__LINE__,927 GetPString(IDS_FILLDIR ERR5TEXT));922 Win_Error(hwndCnr,HWND_DESKTOP,pszSrcFile,__LINE__, 923 GetPString(IDS_FILLDIRINSERRTEXT)); 928 924 ok = FALSE; 929 925 ullTotalBytes = 0; … … 943 939 } 944 940 } 945 else946 {947 Win_Error(hwndCnr,HWND_DESKTOP,__FILE__,__LINE__,948 GetPString(IDS_FILLDIRERR3TEXT));949 ok = FALSE;950 ullTotalBytes = 0;951 }952 941 if (ok) 953 942 { … … 1053 1042 rc, 1054 1043 HWND_DESKTOP, 1055 __FILE__,1044 pszSrcFile, 1056 1045 __LINE__, 1057 GetPString(IDS_FILLDIR ERR6TEXT));1046 GetPString(IDS_FILLDIRQCURERRTEXT)); 1058 1047 exit(0); 1059 1048 } … … 1066 1055 MPFROMLONG(EXTRA_RECORD_BYTES2), 1067 1056 MPFROMLONG((ULONG)numtoinsert)); 1068 if (pciFirst) 1069 { 1057 if (!pciFirst) { 1058 Win_Error(hwndCnr,hwndCnr,pszSrcFile,__LINE__, 1059 GetPString(IDS_FILLDIRALLOCERRTEXT)); 1060 exit(0); 1061 } 1062 else { 1070 1063 pci = pciFirst; 1071 1064 for(x = 0;x < 26;x++) { … … 1261 1254 MPFROMP(pciFirst), 1262 1255 MPFROMP(&ri))) 1263 Win_Error(hwndCnr,hwndCnr, __FILE__,__LINE__,1264 GetPString(IDS_FILLDIR ERR5TEXT));1256 Win_Error(hwndCnr,hwndCnr,pszSrcFile,__LINE__, 1257 GetPString(IDS_FILLDIRINSERRTEXT)); 1265 1258 } 1266 1259 /* move cursor onto the default drive rather than the first drive */ … … 1368 1361 MPFROMP(pci), 1369 1362 MPFROMP(&ri))) { 1370 Win_Error(hwndCnr,hwndCnr, __FILE__,__LINE__,1371 GetPString(IDS_FILLDIR ERR5TEXT));1363 Win_Error(hwndCnr,hwndCnr,pszSrcFile,__LINE__, 1364 GetPString(IDS_FILLDIRINSERRTEXT)); 1372 1365 WinSendMsg(hwndCnr, 1373 1366 CM_FREERECORD, … … 1481 1474 } 1482 1475 1483 }1484 else1485 {1486 Win_Error(hwndCnr,hwndCnr,__FILE__,__LINE__,1487 GetPString(IDS_FILLDIRERR7TEXT));1488 exit(0);1489 1476 } 1490 1477 if (!drivesbuilt && hwndMain)
Note:
See TracChangeset
for help on using the changeset viewer.