Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/avv.c
r122 r199 7 7 8 8 Copyright (c) 1993-98 M. Kimes 9 Copyright (c) 2004 Steven H.Levine9 Copyright (c) 2004, 2005 Steven H.Levine 10 10 11 11 Archive containers 12 12 13 Revisions 31 Jul 04 SHL ArcReviewDlgProc: correct nameis... decodes 14 01 Aug 04 SHL Localize functions 15 01 Aug 04 SHL Rework fixup usage 13 31 Jul 04 SHL ArcReviewDlgProc: correct nameis... decodes 14 01 Aug 04 SHL Localize functions 15 01 Aug 04 SHL Rework fixup usage 16 06 Jun 05 SHL Drop unused 16 17 17 18 ***********************************************************************/ … … 39 40 40 41 static PSZ checkfile(PSZ file,INT *error); 41 static ULONG checkfile2(PSZ file,INT *error);42 static PSZ checksayfile(HWND hwnd,PSZ file,INT *error);43 42 static INT check_archiver (HWND hwnd,ARC_TYPE *info); 44 43 static INT get_int_from_window (HWND hwnd,USHORT id); … … 206 205 207 206 208 #pragma alloc_text (AVV2,nonull,rewrite_archiverbb2,checkfile ,checkfile2)207 #pragma alloc_text (AVV2,nonull,rewrite_archiverbb2,checkfile) 209 208 210 209 // nonull - convert NULL pointer to empty string … … 349 348 } 350 349 351 352 static ULONG checkfile2 (PSZ file,INT *error) 353 { 354 CHAR *p,*pp = NULL; 355 INT ret; 356 ULONG apptype = 0L; 357 358 if(!file || !*file) { 359 *error = 3; 360 return apptype; 361 } 362 pp = strchr(file,' '); 363 if(pp) 364 *pp = 0; 365 p = searchpath(file); 366 if(!p || !*p) 367 *error = 1; 368 else { 369 ret = (INT)DosQAppType(p,&apptype); 370 if(ret) 371 *error = -1; 372 else { 373 apptype &= (~FAPPTYP_32BIT); 374 if(!apptype || 375 (apptype == FAPPTYP_NOTWINDOWCOMPAT) || 376 (apptype == FAPPTYP_WINDOWCOMPAT) || 377 (apptype & FAPPTYP_BOUND) || 378 (apptype & FAPPTYP_WINDOWAPI) || 379 (apptype & FAPPTYP_DOS)) { 380 *error = 0; 381 } 382 else 383 *error = 2; 384 } 385 } 386 if(pp) 387 *pp = ' '; 388 return apptype; 389 } 390 391 #pragma alloc_text (AVV3,checksayfile,check_archiver,ArcReviewDlgProc) 392 393 static PSZ checksayfile (HWND hwnd,PSZ file,INT *error) 394 { 395 PSZ p; 396 PSZ pp = NULL; 397 398 p = checkfile(file,error); 399 if(*error) { 400 if(p) 401 pp = strchr(p,' '); 402 if(pp) 403 *pp = 0; 404 switch(*error) { 405 case 1: 406 saymsg(MB_ENTER | MB_ICONEXCLAMATION, 407 hwnd, 408 GetPString(IDS_ERRORCHKARCTEXT), 409 GetPString(IDS_PROGNOTFOUNDTEXT), 410 (p && *p) ? p : file); 411 break; 412 413 case 2: 414 saymsg(MB_ENTER | MB_ICONEXCLAMATION, 415 hwnd, 416 GetPString(IDS_ERRORCHKARCTEXT), 417 GetPString(IDS_PROGNOTEXECTEXT), 418 (p && *p) ? p : file); 419 break; 420 421 case -1: 422 saymsg(MB_ENTER | MB_ICONEXCLAMATION, 423 hwnd, 424 GetPString(IDS_ERRORCHKARCTEXT), 425 GetPString(IDS_OS2CHOKECHKTEXT), 426 (p && *p) ? p : file); 427 break; 428 429 default: 430 break; 431 } 432 if(pp) 433 *pp = ' '; 434 } 435 return p; 436 } 437 350 #pragma alloc_text (AVV3,check_archiver,ArcReviewDlgProc) 438 351 439 352 static INT check_archiver(HWND hwnd,ARC_TYPE *info) -
trunk/dll/comp.c
r157 r199 15 15 24 May 05 SHL Rework for CNRITEM.szSubject 16 16 25 May 05 SHL Rework with ULONGLONG 17 06 Jun 05 SHL Drop unused 17 18 18 19 ***********************************************************************/ … … 35 36 #include "fm3str.h" 36 37 37 #pragma alloc_text(COMPAREDIR,FillCnrs,FillDirList,CompNames ,CompNames2)38 #pragma alloc_text(COMPAREDIR,FillCnrs,FillDirList,CompNames) 38 39 #pragma alloc_text(COMPAREDIR1,CompareDlgProc) 39 40 #pragma alloc_text(COMPAREDIR2,SelectCnrs,ActionCnr) … … 722 723 723 724 return stricmp(fl1->fname,fl2->fname); 724 }725 726 727 static int CompNames2 (const void *n1,const void *n2) {728 729 FILELIST *fl1 = *(FILELIST **)n1;730 FILELIST *fl2 = *(FILELIST **)n2;731 register CHAR *p1,*p2;732 733 p1 = strrchr(fl1->fname,'\\');734 if(p1)735 p1++;736 else737 p1 = fl1->fname;738 p2 = strrchr(fl2->fname,'\\');739 if(p2)740 p2++;741 else742 p2 = fl2->fname;743 return stricmp(p1,p2);744 725 } 745 726 -
trunk/dll/valid.c
r184 r199 473 473 CHAR * MakeValidDir (CHAR *path) 474 474 { 475 CHAR fullname[CCHMAXPATH],drive;475 CHAR drive; 476 476 register CHAR *p; 477 477 FILESTATUS3 fs;
Note:
See TracChangeset
for help on using the changeset viewer.