Changeset 342
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/archive.c
r318 r342 11 11 01 Aug 04 SHL Rework lstrip/rstrip usage 12 12 28 Jun 06 SHL Drop obsoletes 13 17 Jul 06 SHL Use Runtime_Error 13 14 14 15 ***********************************************************************/ … … 29 30 #include "fm3str.h" 30 31 32 static PSZ pszSrcFile = __FILE__; 33 31 34 #pragma alloc_text(FMARCHIVE,ArchiveDlgProc) 32 33 35 34 36 MRESULT EXPENTRY ArchiveDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) … … 186 188 arcdata = (DIRCNRDATA *)WinQueryWindowPtr(hwnd,0); 187 189 if(!arcdata) { 188 DosBeep(50,100);190 Runtime_Error(pszSrcFile, __LINE__, "no data"); 189 191 return 0; 190 192 } -
trunk/dll/assoc.c
r290 r342 5 5 6 6 Copyright (c) 1993-98 M. Kimes 7 Copyright (c) 2004 Steven H.Levine7 Copyright (c) 2004, 2006 Steven H.Levine 8 8 9 9 01 Aug 04 SHL Rework lstrip/rstrip usage 10 14 Jul 06 SHL Use Runtime_Error 10 11 11 12 ***********************************************************************/ … … 47 48 static BOOL assloaded = FALSE; 48 49 50 static PSZ pszSrcFile = __FILE__; 51 49 52 #pragma alloc_text(ASSOC2,free_commands,load_associations,save_associations) 50 53 #pragma alloc_text(ASSOC2,ExecAssociation,AssocTextProc) 51 54 52 53 MRESULT EXPENTRY AssocTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) { 54 55 MRESULT EXPENTRY AssocTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) 56 { 55 57 PFNWP oldproc = (PFNWP)WinQueryWindowPtr(hwnd,QWL_USER); 56 58 static BOOL emphasized = FALSE; … … 98 100 99 101 100 VOID free_associations (VOID) {101 102 VOID free_associations (VOID) 103 { 102 104 LINKASSOC *info,*next; 103 105 … … 116 118 117 119 118 VOID load_associations (VOID) {119 120 VOID load_associations (VOID) 121 { 120 122 FILE *fp; 121 123 LINKASSOC *info; … … 134 136 strcat(mask,"ASSOC.DAT"); 135 137 fp = _fsopen(mask,"r",SH_DENYWR); 136 if (fp) {138 if (fp) { 137 139 while(!feof(fp)) { 138 140 if(!fgets(mask,CCHMAXPATH + 24,fp)) … … 157 159 if(!*cl) 158 160 continue; 159 info = malloc(sizeof(LINKASSOC)); 160 if(info) { 161 memset(info,0,sizeof(LINKASSOC)); 162 info->cl = strdup(cl); 163 info->mask = strdup(mask); 161 info = xmallocz(sizeof(LINKASSOC),pszSrcFile,__LINE__); 162 if (info) { 163 info->cl = xstrdup(cl,pszSrcFile,__LINE__); 164 info->mask = xstrdup(mask,pszSrcFile,__LINE__); 164 165 if(*sig) 165 info->sig = strdup(sig);166 info->sig = xstrdup(sig,pszSrcFile,__LINE__); 166 167 info->offset = atol(offset); 167 168 info->flags = atol(flags); 168 if (!info->cl || !info->mask) {169 if (info->cl)169 if (!info->cl || !info->mask) { 170 if (info->cl) 170 171 free(info->cl); 171 if (info->mask)172 if (info->mask) 172 173 free(info->mask); 173 free (info);174 free (info); 174 175 break; 175 176 } … … 188 189 189 190 190 VOID save_associations (VOID) {191 191 VOID save_associations (VOID) 192 { 192 193 LINKASSOC *info; 193 194 FILE *fp; … … 220 221 strcat(s,"\\"); 221 222 strcat(s,"ASSOC.DAT"); 222 fp = fopen(s,"w");223 if (fp) {223 fp = xfopen(s,"w",pszSrcFile,__LINE__); 224 if (fp) { 224 225 fputs(GetPString(IDS_ASSOCFILETEXT),fp); 225 226 info = asshead; … … 244 245 245 246 246 LINKASSOC * add_association (ASSOC *addme) {247 247 LINKASSOC * add_association (ASSOC *addme) 248 { 248 249 LINKASSOC *info; 249 250 … … 258 259 } 259 260 if(!info) { 260 info = malloc(sizeof(LINKASSOC));261 info = xmallocz(sizeof(LINKASSOC),pszSrcFile,__LINE__); 261 262 if(info) { 262 memset(info,0,sizeof(LINKASSOC)); 263 info->cl = strdup(addme->cl); 264 info->mask = strdup(addme->mask); 263 info->cl = xstrdup(addme->cl,pszSrcFile,__LINE__); 264 info->mask = xstrdup(addme->mask,pszSrcFile,__LINE__); 265 265 if(*addme->sig) 266 info->sig = strdup(addme->sig);266 info->sig = xstrdup(addme->sig,pszSrcFile,__LINE__); 267 267 if(addme->offset) 268 268 info->offset = addme->offset; … … 295 295 296 296 297 BOOL kill_association (ASSOC *killme) {298 297 BOOL kill_association (ASSOC *killme) 298 { 299 299 LINKASSOC *info; 300 300 … … 333 333 334 334 335 INT ExecAssociation (HWND hwnd, CHAR *datafile) {336 335 INT ExecAssociation (HWND hwnd, CHAR *datafile) 336 { 337 337 CHAR *file,sig[CCHMAXPATH],sigl[CCHMAXPATH],mask[CCHMAXPATH],*p; 338 338 FILE *fp; … … 382 382 info->sig); 383 383 literal(sigl); 384 fp = _fsopen(datafile, 385 "rb", 386 SH_DENYNO); 387 if(fp) { 384 fp = _fsopen(datafile,"rb",SH_DENYNO); 385 if (fp) { 388 386 if(info->offset < 0L) { 389 387 fseek(fp, … … 463 461 464 462 465 MRESULT EXPENTRY AssocDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {466 463 MRESULT EXPENTRY AssocDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) 464 { 467 465 LINKASSOC *info; 468 466 SHORT x; … … 558 556 MPVOID); 559 557 if(!info) { 560 DosBeep(50,100);558 Runtime_Error(pszSrcFile, __LINE__, "Query item handle failed"); 561 559 break; 562 560 } … … 698 696 temp.flags |= PROMPT; 699 697 info = add_association(&temp); 700 if(info) { 698 if(!info) 699 Runtime_Error(pszSrcFile, __LINE__, "add_association"); 700 else { 701 701 702 702 CHAR s[1002 + CCHMAXPATH + 6]; … … 730 730 save_associations(); 731 731 } 732 else733 DosBeep(50,200);734 732 } 735 733 break; … … 754 752 NULL, 755 753 0L); 756 if(kill_association(&temp)) { 754 if(!kill_association(&temp)) 755 Runtime_Error(pszSrcFile, __LINE__, "kill_association"); 756 else { 757 757 x = (SHORT)WinSendDlgItemMsg(hwnd, 758 758 ASS_LISTBOX, … … 772 772 save_associations(); 773 773 } 774 else775 DosBeep(50,200);776 774 } 777 775 break; … … 783 781 784 782 785 VOID EditAssociations (HWND hwnd) {786 783 VOID EditAssociations (HWND hwnd) 784 { 787 785 static CHAR stop = 0; 788 786 … … 795 793 stop = 0; 796 794 } 797 -
trunk/dll/attribs.c
r2 r342 1 2 /*********************************************************************** 3 4 $Id$ 5 6 attributes editor 7 8 Copyright (c) 1993, 1998 M. Kimes 9 Copyright (c) 2006 Steven H.Levine 10 11 14 Jul 06 SHL Use Runtime_Error 12 13 ***********************************************************************/ 14 1 15 #define INCL_DOS 2 16 #define INCL_WIN 3 4 17 #include <os2.h> 18 5 19 #include <stdarg.h> 6 20 #include <stdio.h> … … 9 23 #include <ctype.h> 10 24 #include <time.h> 25 11 26 #include "fm3dll.h" 12 27 #include "fm3dlg.h" 13 28 #include "fm3str.h" 14 29 30 static PSZ pszSrcFile = __FILE__; 31 15 32 #pragma alloc_text(ATTRIBS,AttrListDlgProc) 16 33 17 18 MRESULT EXPENTRY AttrListDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) { 19 34 MRESULT EXPENTRY AttrListDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) 35 { 20 36 LISTINFO *li; 21 37 … … 279 295 280 296 li = INSTDATA(hwnd); 281 if(!li) 297 if (!li) { 298 Runtime_Error(pszSrcFile, __LINE__, "no data"); 282 299 break; 300 } 283 301 { 284 302 CHAR szBuffer[CCHMAXPATH + 1]; … … 301 319 error = AddToList(szBuffer,&li->list,&numfiles,&numalloc); 302 320 if(error) { 303 DosBeep(250,100);321 Runtime_Error(pszSrcFile, __LINE__, "AddToList"); 304 322 break; 305 323 } … … 312 330 } 313 331 if(!li->list || !li->list[0]) { 314 DosBeep(250,100);332 Runtime_Error(pszSrcFile, __LINE__, "list build failed"); 315 333 break; 316 334 } -
trunk/dll/avl.c
r312 r342 21 21 16 Jun 06 SHL load_archivers: support signatures containing 0s 22 22 26 Jun 06 SHL load_archivers: remember where comments are 23 14 Jul 06 SHL Use Runtime_Error 23 24 24 25 ***********************************************************************/ … … 38 39 #include "fm3dlg.h" 39 40 #include "fm3str.h" 41 42 static PSZ pszSrcFile = __FILE__; 40 43 41 44 #pragma alloc_text(MISC9,quick_find_type,find_type) … … 407 410 // At start of defintion 408 411 409 pat = malloc(sizeof(ARC_TYPE));412 pat = xmallocz(sizeof(ARC_TYPE),pszSrcFile,__LINE__); 410 413 if (!pat) 411 break; // fixme to complain 412 413 memset(pat, 0, sizeof(ARC_TYPE)); 414 pat -> id = strdup(sz); 414 break; 415 pat -> id = xstrdup(sz,pszSrcFile,__LINE__); 415 416 416 417 pat -> comment_line_num = per_sig_comment_line_num; … … 420 421 break; 421 422 if (*sz) 422 pat -> ext = strdup(sz);423 pat -> ext = xstrdup(sz,pszSrcFile,__LINE__); 423 424 else 424 425 pat -> ext = NULL; … … 429 430 break; 430 431 if (*sz) 431 pat -> list = strdup(sz);432 pat -> list = xstrdup(sz,pszSrcFile,__LINE__); 432 433 else 433 434 pat -> list = NULL; … … 437 438 break; 438 439 if (*sz) 439 pat -> extract = strdup(sz);440 pat -> extract = xstrdup(sz,pszSrcFile,__LINE__); 440 441 else 441 442 pat -> extract = NULL; … … 443 444 break; 444 445 if (*sz) 445 pat -> exwdirs = strdup(sz);446 pat -> exwdirs = xstrdup(sz,pszSrcFile,__LINE__); 446 447 else 447 448 pat -> exwdirs = NULL; … … 449 450 break; 450 451 if (*sz) 451 pat -> test = strdup(sz);452 pat -> test = xstrdup(sz,pszSrcFile,__LINE__); 452 453 else 453 454 pat -> test = NULL; … … 455 456 break; 456 457 if (*sz) 457 pat -> create = strdup(sz);458 pat -> create = xstrdup(sz,pszSrcFile,__LINE__); 458 459 else 459 460 pat -> create = NULL; … … 461 462 break; 462 463 if (*sz) 463 pat -> createwdirs = strdup(sz);464 pat -> createwdirs = xstrdup(sz,pszSrcFile,__LINE__); 464 465 else 465 466 pat -> createwdirs = NULL; … … 467 468 break; 468 469 if (*sz) 469 pat -> createrecurse = strdup(sz);470 pat -> createrecurse = xstrdup(sz,pszSrcFile,__LINE__); 470 471 else 471 472 pat -> createrecurse = NULL; … … 473 474 break; 474 475 if (*sz) 475 pat -> move = strdup(sz);476 pat -> move = xstrdup(sz,pszSrcFile,__LINE__); 476 477 else 477 478 pat -> move = NULL; … … 479 480 break; 480 481 if (*sz) 481 pat -> movewdirs = strdup(sz);482 pat -> movewdirs = xstrdup(sz,pszSrcFile,__LINE__); 482 483 else 483 484 pat -> movewdirs = NULL; … … 485 486 break; 486 487 if (*sz) 487 pat -> delete = strdup(sz);488 pat -> delete = xstrdup(sz,pszSrcFile,__LINE__); 488 489 else 489 490 pat -> delete = NULL; … … 494 495 { 495 496 pat -> siglen = i; 496 pat -> signature = malloc(i);497 pat -> signature = xmalloc(i,pszSrcFile,__LINE__); 497 498 if (!pat -> signature) 498 499 break; … … 506 507 break; 507 508 if (*sz) 508 pat -> startlist = strdup(sz);509 pat -> startlist = xstrdup(sz,pszSrcFile,__LINE__); 509 510 else 510 511 pat -> startlist = NULL; … … 512 513 break; 513 514 if (*sz) 514 pat -> endlist = strdup(sz);515 pat -> endlist = xstrdup(sz,pszSrcFile,__LINE__); 515 516 else 516 517 pat -> endlist = NULL; … … 590 591 } 591 592 592 #define TEST_DRAG 0 // fixme to gone593 #define TEST_DRAG 0 // fixme to be gone or to work 593 594 594 595 #pragma alloc_text(FMARCHIVE,SBoxDlgProc,SDlgListboxSubclassProc) … … 654 655 VK_ENDDRAG, 655 656 NULL); 656 if (!hwndDrop) { 657 Win_Error(hwnd,hwnd,__FILE__,__LINE__,"DrgDrag"); 658 } 657 if (!hwndDrop) 658 Win_Error(hwnd,hwnd,pszSrcFile,__LINE__,"DrgDrag"); 659 659 660 660 DrgFreeDraginfo(pdinfo); … … 723 723 pditem = DrgQueryDragitemPtr(pdinfo,0); 724 724 if (!pditem) 725 Win_Error(hwnd,hwnd, __FILE__,__LINE__,"DM_DROP");725 Win_Error(hwnd,hwnd,pszSrcFile,__LINE__,"DM_DROP"); 726 726 /* Check valid rendering mechanisms and data */ 727 727 ok = DrgVerifyRMF(pditem,DRM_LBOX,NULL) && ~pditem->fsControl & DC_PREPARE; … … 765 765 if (!(ARC_TYPE **)mp2) 766 766 { 767 DosBeep(100, 100);767 Runtime_Error(pszSrcFile, __LINE__, "no data"); 768 768 WinDismissDlg(hwnd, 0); 769 769 break; … … 804 804 if (sSelect == LIT_NONE) 805 805 { 806 DosBeep(100, 100);806 Runtime_Error(pszSrcFile, __LINE__, "list empty"); 807 807 return 0; 808 808 } … … 838 838 else 839 839 { 840 Runtime_Error(pszSrcFile, __LINE__, "no match"); 840 841 // Refuse to select 841 842 WinSendDlgItemMsg(hwnd, ASEL_LISTBOX, LM_SELECTITEM, 842 843 MPFROMSHORT(LIT_NONE), FALSE); 843 DosBeep(100, 100);844 844 return 0; 845 845 } … … 880 880 ARCDUMP ad; 881 881 memset(&ad,0,sizeof(ARCDUMP)); 882 ad.info = malloc(sizeof(ARC_TYPE));882 ad.info = xmallocz(sizeof(ARC_TYPE),pszSrcFile,__LINE__); 883 883 if (ad.info) { 884 memset(ad.info, 0, sizeof(ARC_TYPE));885 884 if (!WinDlgBox(HWND_DESKTOP, 886 885 hwnd, … … 899 898 if (!pat) { 900 899 if (arcsighead) 901 saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u", sSelect, __FILE__, __LINE__);900 saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u", sSelect, pszSrcFile, __LINE__); 902 901 else 903 902 arcsighead = ad.info; … … 939 938 940 939 if (!pat) { 941 saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, __FILE__, __LINE__);940 saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, pszSrcFile, __LINE__); 942 941 } 943 942 else { … … 980 979 ; // Find self 981 980 if (!pat || !pat->prev) { 982 saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, __FILE__, __LINE__);981 saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, pszSrcFile, __LINE__); 983 982 } 984 983 else { … … 1027 1026 ; // Find self 1028 1027 if (!pat || !pat->next) { 1029 saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d/%d at %s::%u",sSelect, sItemCount, __FILE__, __LINE__);1028 saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d/%d at %s::%u",sSelect, sItemCount, pszSrcFile, __LINE__); 1030 1029 } 1031 1030 else { -
trunk/dll/input.c
r181 r342 7 7 8 8 Copyright (c) 1993-98 M. Kimes 9 Copyright (c) 2005 Steven H. Levine9 Copyright (c) 2005, 2006 Steven H. Levine 10 10 11 11 28 May 05 SHL Use saymsg 12 14 Jul 06 SHL Use Runtime_Error 12 13 13 14 ***********************************************************************/ … … 38 39 if (!mp2) 39 40 { 41 Runtime_Error(pszSrcFile, __LINE__, "no data"); 40 42 WinDismissDlg(hwnd,0); 41 43 break; … … 43 45 WinSetWindowPtr(hwnd,0,(PVOID)mp2); 44 46 psip = (STRINGINPARMS *)mp2; 45 if (! (BOOL)WinSendDlgItemMsg(hwnd,STR_INPUT,EM_SETTEXTLIMIT,46 MPFROM2SHORT(psip->inputlen,0),MPVOID))47 if (!WinSendDlgItemMsg(hwnd,STR_INPUT,EM_SETTEXTLIMIT, 48 MPFROM2SHORT(psip->inputlen,0),MPVOID)) 47 49 { 48 DosBeep(50,100); 50 Win_Error(hwnd,hwnd,__FILE__,__LINE__, 51 "setlimit failed"); 49 52 WinDismissDlg(hwnd,0); 50 53 break; -
trunk/dll/instant.c
r123 r342 4 4 $Id$ 5 5 6 Instant command 7 6 8 Copyright (c) 1993-98 M. Kimes 7 Copyright (c) 2004 Steven H.Levine 8 9 Revisions 01 Aug 04 SHL - Rework lstrip/rstrip usage 9 Copyright (c) 2004, 2006 Steven H.Levine 10 11 01 Aug 04 SHL Rework lstrip/rstrip usage 12 14 Jul 06 SHL Use Runtime_Error 10 13 11 14 ***********************************************************************/ … … 13 16 #define INCL_DOS 14 17 #define INCL_WIN 15 16 18 #include <os2.h> 19 17 20 #include <stdlib.h> 18 21 #include <stdio.h> 19 22 #include <string.h> 20 23 #include <ctype.h> 24 21 25 #include "fm3dll.h" 22 26 #include "fm3dlg.h" … … 25 29 26 30 #pragma data_seg(DATA1) 31 32 static PSZ pszSrcFile = __FILE__; 33 27 34 #pragma alloc_text(INSTANT,InstantDlgProc) 28 35 … … 31 38 static INT batches = 0; 32 39 33 34 MRESULT EXPENTRY InstantDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) { 35 40 MRESULT EXPENTRY InstantDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) 41 { 36 42 CHAR *path; 37 APIRET temp;43 APIRET rc; 38 44 static CHAR *bat = NULL; 39 45 static HWND myhwnd = (HWND)0; … … 41 47 switch(msg) { 42 48 case WM_INITDLG: 43 if (myhwnd) {44 DosBeep(250,100);49 if (myhwnd) { 50 Runtime_Error(pszSrcFile, __LINE__, "busy"); 45 51 WinSendMsg(myhwnd,WM_SYSCOMMAND,MPFROM2SHORT(SC_RESTORE,0),MPVOID); 46 52 WinSetActiveWindow(HWND_DESKTOP,myhwnd); … … 48 54 break; 49 55 } 50 if (!mp2) {51 DosBeep(50,100);56 if (!mp2) { 57 Runtime_Error(pszSrcFile, __LINE__, "no data"); 52 58 WinDismissDlg(hwnd,0); 53 59 break; … … 98 104 mem = MLEgetlen(hwndMLE); 99 105 if(mem) { 100 if(DosAllocMem((PVOID)&bat,mem,101 PAG_COMMIT | PAG_READ | PAG_WRITE) ||102 !bat) {103 Dos Beep(50,100);106 rc = DosAllocMem((PVOID)&bat,mem, 107 PAG_COMMIT | PAG_READ | PAG_WRITE); 108 if(rc || !bat) { 109 Dos_Error(MB_CANCEL,rc,HWND_DESKTOP,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY)); 104 110 WinDismissDlg(hwnd,0); 105 111 break; 106 112 } 107 113 tlen = (LONG)WinSendMsg(hwndMLE,MLM_QUERYTEXTLENGTH,MPVOID,MPVOID); 108 if(tlen) { 114 if(!tlen) 115 Runtime_Error(pszSrcFile, __LINE__, "no data"); 116 else { 109 117 WinSendMsg(hwndMLE,MLM_SETIMPORTEXPORT, 110 118 MPFROMP(bat), … … 123 131 rstrip(bat); 124 132 } 125 if(*bat) { 133 if(!*bat) 134 Runtime_Error(pszSrcFile, __LINE__, "no data"); 135 else { 126 136 sprintf(s,"%s%sFMTMP%d.CMD",path, 127 137 (path[strlen(path) - 1] == '\\') ? "" : "\\", 128 138 batches++); 129 139 fp = fopen(s,"w"); 130 if(fp) { 140 if(!fp) 141 Runtime_Error(pszSrcFile, __LINE__, "fopen"); 142 else { 131 143 if(!strncmp(bat,"/*",2)) { 132 144 rexx = "'"; … … 149 161 s); 150 162 } 151 else152 DosBeep(500,100);153 163 } 154 else155 DosBeep(50,100);156 164 } 157 else158 DosBeep(50,100);159 165 } 160 166 } … … 168 174 case IDM_HELP: 169 175 path = WinQueryWindowPtr(hwnd,0); 170 temp= saymsg(MB_YESNOCANCEL,176 rc = saymsg(MB_YESNOCANCEL, 171 177 hwnd, 172 178 GetPString(IDS_INSTANTHELPTITLETEXT), … … 175 181 (path[strlen(path) - 1] == '\\') ? "" : "\\", 176 182 batches); 177 if( temp== MBID_YES)183 if(rc == MBID_YES) 178 184 runemf2(WINDOWED | INVISIBLE | BACKGROUND, 179 185 hwnd, … … 182 188 "%s /C HELP BATCH", 183 189 GetCmdSpec(FALSE)); 184 else if( temp== MBID_CANCEL)190 else if(rc == MBID_CANCEL) 185 191 WinDismissDlg(hwnd,0); 186 192 break;
Note:
See TracChangeset
for help on using the changeset viewer.
