Changeset 1063
- Timestamp:
- Jul 11, 2008, 5:33:36 AM (17 years ago)
- Location:
- trunk/dll
- Files:
-
- 29 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/arccnrs.c
r1040 r1063 338 338 pai->pszFileName = NullStr; 339 339 free(psz); 340 # ifdef FORTIFY341 Fortify_LeaveScope();342 # endif343 340 } 344 341 } … … 2008 2005 WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID); 2009 2006 free(dcd); 2010 # ifdef FORTIFY2011 Fortify_LeaveScope();2012 # endif2007 # ifdef FORTIFY 2008 Fortify_LeaveScope(); 2009 # endif 2013 2010 WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL); 2014 2011 } … … 2914 2911 { 2915 2912 LISTINFO *li; 2916 # ifdef FORTIFY2917 Fortify_EnterScope();2918 # endif2913 # ifdef FORTIFY 2914 Fortify_EnterScope(); 2915 # endif 2919 2916 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 2920 2917 if (li) { … … 2991 2988 else 2992 2989 free(li); 2993 # ifdef FORTIFY2994 Fortify_LeaveScope();2995 # endif2990 # ifdef FORTIFY 2991 Fortify_LeaveScope(); 2992 # endif 2996 2993 } 2997 2994 } … … 3464 3461 idinc = 0; 3465 3462 WinSetWindowUShort(hwndFrame, QWS_ID, id); 3466 # ifdef FORTIFY3467 Fortify_EnterScope();3468 # endif3463 # ifdef FORTIFY 3464 Fortify_EnterScope(); 3465 # endif 3469 3466 dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__); 3470 3467 if (!dcd) { … … 3551 3548 PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID); 3552 3549 free(dcd); 3553 # ifdef FORTIFY3554 Fortify_LeaveScope();3555 # endif3550 # ifdef FORTIFY 3551 Fortify_LeaveScope(); 3552 # endif 3556 3553 hwndFrame = (HWND) 0; 3557 3554 } -
trunk/dll/autoview.c
r1039 r1063 614 614 } 615 615 free((CHAR *)mp1); 616 # ifdef FORTIFY617 Fortify_LeaveScope();618 # endif616 # ifdef FORTIFY 617 Fortify_LeaveScope(); 618 # endif 619 619 } 620 620 return 0; … … 638 638 hab2 = WinInitialize(0); 639 639 if (hab2) { 640 # ifdef FORTIFY641 Fortify_EnterScope();642 # endif640 # ifdef FORTIFY 641 Fortify_EnterScope(); 642 # endif 643 643 hmq2 = WinCreateMsgQueue(hab2, 128); 644 644 if (hmq2) { … … 673 673 // else 674 674 WinTerminate(hab2); 675 # ifdef FORTIFY675 # ifdef FORTIFY 676 676 Fortify_LeaveScope(); 677 # endif677 # endif 678 678 } 679 679 } … … 799 799 PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID); 800 800 free(ea); 801 # ifdef FORTIFY802 Fortify_LeaveScope();803 # endif801 # ifdef FORTIFY 802 Fortify_LeaveScope(); 803 # endif 804 804 } 805 805 } … … 852 852 if (!PostMsg(hwndAutoObj, UM_LOADFILE, MPFROMP(cf), MPVOID)) 853 853 free(cf); 854 # ifdef FORTIFY855 Fortify_LeaveScope();856 # endif854 # ifdef FORTIFY 855 Fortify_LeaveScope(); 856 # endif 857 857 } 858 858 } … … 911 911 if (!PostMsg(hwndAutoObj, msg, mp1, mp2)) { 912 912 xfree((CHAR *)mp1, pszSrcFile, __LINE__); 913 # ifdef FORTIFY914 Fortify_LeaveScope();915 # endif913 # ifdef FORTIFY 914 Fortify_LeaveScope(); 915 # endif 916 916 } 917 917 return 0; -
trunk/dll/collect.c
r1041 r1063 786 786 } 787 787 xfree(mp1, pszSrcFile, __LINE__); 788 # ifdef FORTIFY789 Fortify_LeaveScope();790 # endif788 # ifdef FORTIFY 789 Fortify_LeaveScope(); 790 # endif 791 791 return 0; 792 792 … … 891 891 if (dcd) { 892 892 WORKER *wk; 893 # ifdef FORTIFY894 Fortify_EnterScope();895 # endif893 # ifdef FORTIFY 894 Fortify_EnterScope(); 895 # endif 896 896 wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__); 897 897 if (!wk) … … 909 909 GetPString(IDS_COULDNTSTARTTHREADTEXT)); 910 910 free(wk); 911 # ifdef FORTIFY912 Fortify_LeaveScope();913 # endif914 911 FreeListInfo((LISTINFO *) mp1); 912 # ifdef FORTIFY 913 Fortify_LeaveScope(); 914 # endif 915 915 } 916 916 } … … 924 924 if (dcd) { 925 925 WORKER *wk; 926 # ifdef FORTIFY927 Fortify_EnterScope();928 # endif926 # ifdef FORTIFY 927 Fortify_EnterScope(); 928 # endif 929 929 wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__); 930 930 if (!wk) … … 942 942 GetPString(IDS_COULDNTSTARTTHREADTEXT)); 943 943 free(wk); 944 # ifdef FORTIFY945 Fortify_LeaveScope();946 # endif947 944 FreeListInfo((LISTINFO *) mp1); 945 # ifdef FORTIFY 946 Fortify_LeaveScope(); 947 # endif 948 948 } 949 949 } … … 970 970 FreeList(dcd->lastselection); 971 971 free(dcd); 972 # ifdef FORTIFY973 Fortify_LeaveScope();974 # endif972 # ifdef FORTIFY 973 Fortify_LeaveScope(); 974 # endif 975 975 WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL); 976 976 } … … 1469 1469 if (!dcd) { 1470 1470 free(mp1); 1471 # ifdef FORTIFY1472 Fortify_LeaveScope();1473 # endif1471 # ifdef FORTIFY 1472 Fortify_LeaveScope(); 1473 # endif 1474 1474 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 1475 1475 } … … 1478 1478 Runtime_Error(pszSrcFile, __LINE__, "PostMsg"); 1479 1479 free(mp1); 1480 # ifdef FORTIFY1481 Fortify_LeaveScope();1482 # endif1480 # ifdef FORTIFY 1481 Fortify_LeaveScope(); 1482 # endif 1483 1483 } 1484 1484 } … … 1607 1607 if (!PostMsg(hwnd, UM_COLLECTFROMFILE, MPFROMP(p), MPVOID)) 1608 1608 free(p); 1609 # ifdef FORTIFY1610 Fortify_LeaveScope();1611 # endif1609 # ifdef FORTIFY 1610 Fortify_LeaveScope(); 1611 # endif 1612 1612 } 1613 1613 } … … 1724 1724 { 1725 1725 LISTINFO *li; 1726 # ifdef FORTIFY1727 Fortify_EnterScope();1728 # endif1726 # ifdef FORTIFY 1727 Fortify_EnterScope(); 1728 # endif 1729 1729 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 1730 1730 if (li) { … … 1775 1775 if (mp2) { 1776 1776 LISTINFO *li; 1777 # ifdef FORTIFY1778 Fortify_EnterScope();1779 # endif1777 # ifdef FORTIFY 1778 Fortify_EnterScope(); 1779 # endif 1780 1780 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 1781 1781 if (li) { … … 2089 2089 LISTINFO *li; 2090 2090 ULONG action = UM_ACTION; 2091 # ifdef FORTIFY2092 Fortify_EnterScope();2093 # endif2091 # ifdef FORTIFY 2092 Fortify_EnterScope(); 2093 # endif 2094 2094 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 2095 2095 if (li) { … … 2136 2136 else 2137 2137 free(li); 2138 # ifdef FORTIFY2139 Fortify_LeaveScope();2140 # endif2138 # ifdef FORTIFY 2139 Fortify_LeaveScope(); 2140 # endif 2141 2141 } 2142 2142 } … … 2854 2854 id = COLLECTOR_FRAME + idinc++; 2855 2855 WinSetWindowUShort(hwndFrame, QWS_ID, id); 2856 # ifdef FORTIFY2857 Fortify_EnterScope();2858 # endif2856 # ifdef FORTIFY 2857 Fortify_EnterScope(); 2858 # endif 2859 2859 dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__); 2860 2860 if (!dcd) { … … 2896 2896 PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID); 2897 2897 free(dcd); 2898 # ifdef FORTIFY2899 Fortify_LeaveScope();2900 # endif2898 # ifdef FORTIFY 2899 Fortify_LeaveScope(); 2900 # endif 2901 2901 hwndFrame = (HWND) 0; 2902 2902 } -
trunk/dll/comp.c
r1039 r1063 201 201 hab2 = WinInitialize(0); 202 202 if (hab2) { 203 # ifdef FORTIFY204 Fortify_EnterScope();205 # endif203 # ifdef FORTIFY 204 Fortify_EnterScope(); 205 # endif 206 206 hmq2 = WinCreateMsgQueue(hab2, 0); 207 207 if (hmq2) { … … 315 315 } 316 316 WinTerminate(hab2); 317 # ifdef FORTIFY317 # ifdef FORTIFY 318 318 Fortify_LeaveScope(); 319 # endif319 # endif 320 320 } 321 321 } … … 408 408 hab = WinInitialize(0); 409 409 if (hab) { 410 # ifdef FORTIFY411 Fortify_EnterScope();412 # endif410 # ifdef FORTIFY 411 Fortify_EnterScope(); 412 # endif 413 413 hmq = WinCreateMsgQueue(hab, 0); 414 414 if (hmq) { … … 693 693 free(cmp); 694 694 WinTerminate(hab); 695 # ifdef FORTIFY695 # ifdef FORTIFY 696 696 Fortify_LeaveScope(); 697 # endif697 # endif 698 698 } 699 699 else … … 720 720 hab = WinInitialize(0); 721 721 if (hab) { 722 # ifdef FORTIFY723 Fortify_EnterScope();724 # endif722 # ifdef FORTIFY 723 Fortify_EnterScope(); 724 # endif 725 725 hmq = WinCreateMsgQueue(hab, 0); 726 726 if (hmq) { … … 758 758 free(cmp); 759 759 WinTerminate(hab); 760 # ifdef FORTIFY760 # ifdef FORTIFY 761 761 Fortify_LeaveScope(); 762 # endif762 # endif 763 763 } 764 764 else … … 1471 1471 // 10 May 08 SHL fixme to suppress W111 1472 1472 Fortify_EnterScope(); 1473 # endif1473 # endif 1474 1474 1475 1475 if (!cmp) { 1476 1476 Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT); 1477 # ifdef FORTIFY1477 # ifdef FORTIFY 1478 1478 // 10 May 08 SHL fixme to suppress W111 1479 1479 Fortify_LeaveScope(); 1480 # endif1480 # endif 1481 1481 _endthread(); 1482 1482 } … … 2102 2102 # ifdef FORTIFY 2103 2103 Fortify_LeaveScope(); 2104 # endif2104 # endif 2105 2105 2106 2106 // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread exit"); … … 2651 2651 WinCheckButton(hwnd, COMP_HIDENOTSELECTED, 0); 2652 2652 cmp->filling = TRUE; 2653 # ifdef FORTIFY2654 Fortify_EnterScope();2655 # endif2653 # ifdef FORTIFY 2654 Fortify_EnterScope(); 2655 # endif 2656 2656 forthread = xmalloc(sizeof(COMPARE), pszSrcFile, __LINE__); 2657 2657 if (!forthread) … … 2666 2666 WinDismissDlg(hwnd, 0); 2667 2667 free(forthread); 2668 # ifdef FORTIFY2669 Fortify_LeaveScope();2670 # endif2668 # ifdef FORTIFY 2669 Fortify_LeaveScope(); 2670 # endif 2671 2671 } 2672 2672 else { -
trunk/dll/datamin.c
r1038 r1063 984 984 # ifdef FORTIFY 985 985 Fortify_EnterScope(); 986 # endif986 # endif 987 987 if (G_hevDataMin == NULLHANDLE) { 988 988 // Create just once for any thread that might use it … … 1078 1078 if (hab != NULLHANDLE) 1079 1079 WinTerminate(hab); 1080 # ifdef FORTIFY1080 # ifdef FORTIFY 1081 1081 Fortify_LeaveScope(); 1082 # endif1082 # endif 1083 1083 } // dataminThread 1084 1084 -
trunk/dll/dircnrs.c
r1041 r1063 990 990 991 991 WORKER *wk; 992 # ifdef FORTIFY993 Fortify_EnterScope();994 # endif992 # ifdef FORTIFY 993 Fortify_EnterScope(); 994 # endif 995 995 wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__); 996 996 if (!wk) … … 1009 1009 free(wk); 1010 1010 FreeListInfo((LISTINFO *) mp1); 1011 # ifdef FORTIFY1012 Fortify_LeaveScope();1013 # endif1011 # ifdef FORTIFY 1012 Fortify_LeaveScope(); 1013 # endif 1014 1014 } 1015 1015 } … … 1025 1025 1026 1026 WORKER *wk; 1027 # ifdef FORTIFY1028 Fortify_EnterScope();1029 # endif1027 # ifdef FORTIFY 1028 Fortify_EnterScope(); 1029 # endif 1030 1030 wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__); 1031 1031 if (!wk) … … 1044 1044 free(wk); 1045 1045 FreeListInfo((LISTINFO *) mp1); 1046 # ifdef FORTIFY1047 Fortify_LeaveScope();1048 # endif1046 # ifdef FORTIFY 1047 Fortify_LeaveScope(); 1048 # endif 1049 1049 } 1050 1050 } … … 1070 1070 FreeList(dcd->lastselection); 1071 1071 xfree(dcd, pszSrcFile, __LINE__); 1072 # ifdef FORTIFY1073 Fortify_LeaveScope();1074 # endif1072 # ifdef FORTIFY 1073 Fortify_LeaveScope(); 1074 # endif 1075 1075 WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL); 1076 1076 DosPostEventSem(CompactSem); … … 3465 3465 idinc = 0; 3466 3466 WinSetWindowUShort(hwndFrame, QWS_ID, id); 3467 # ifdef FORTIFY3468 Fortify_EnterScope();3469 # endif3467 # ifdef FORTIFY 3468 Fortify_EnterScope(); 3469 # endif 3470 3470 dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__); 3471 3471 if (!dcd) { … … 3519 3519 PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID); 3520 3520 free(dcd); 3521 # ifdef FORTIFY3522 Fortify_LeaveScope();3523 # endif3521 # ifdef FORTIFY 3522 Fortify_LeaveScope(); 3523 # endif 3524 3524 hwndFrame = (HWND) 0; 3525 3525 } -
trunk/dll/dirsize.c
r1051 r1063 69 69 typedef struct 70 70 { 71 CHAR szDirName[CCHMAXPATH ];71 CHAR szDirName[CCHMAXPATH + 320]; 72 72 CHAR chStopFlag; 73 73 BOOL dying; … … 309 309 CHAR szAllDir[80]; 310 310 CHAR szBar[80]; 311 CHAR szBuf[CCHMAXPATH * 2];312 313 # ifdef FORTIFY314 Fortify_EnterScope();315 # endif311 CHAR szBuf[CCHMAXPATH + 320]; 312 313 # ifdef FORTIFY 314 Fortify_EnterScope(); 315 # endif 316 316 317 317 // cbFile = currect directory usage in bytes … … 437 437 # ifdef FORTIFY 438 438 Fortify_EnterScope(); 439 # endif439 # endif 440 440 441 441 hwndCnr = dirsize->hwndCnr; … … 467 467 # ifdef FORTIFY 468 468 Fortify_LeaveScope(); 469 # endif469 # endif 470 470 } 471 471 … … 483 483 break; 484 484 } 485 # ifdef FORTIFY486 Fortify_EnterScope();487 # endif485 # ifdef FORTIFY 486 Fortify_EnterScope(); 487 # endif 488 488 pState = xmallocz(sizeof(tState), pszSrcFile, __LINE__); 489 489 if (!pState) { … … 1025 1025 DosSleep(16); //05 Aug 07 GKY 33 1026 1026 xfree(pState, pszSrcFile, __LINE__); // Let's hope no one is still looking 1027 # ifdef FORTIFY1028 Fortify_LeaveScope();1029 # endif1027 # ifdef FORTIFY 1028 Fortify_LeaveScope(); 1029 # endif 1030 1030 } 1031 1031 DosPostEventSem(CompactSem); -
trunk/dll/droplist.c
r1018 r1063 467 467 468 468 if (files && numfiles && files[0] && pcbFile && pulitemID) { 469 # ifdef FORTIFY470 Fortify_EnterScope();471 # endif469 # ifdef FORTIFY 470 Fortify_EnterScope(); 471 # endif 472 472 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 473 473 if (li) { … … 503 503 504 504 FreeDragInfoData(hwndCnr, pDInfo); 505 # ifdef FORTIFY 506 Fortify_LeaveScope(); 507 # endif 505 508 506 509 // 02 Aug 07 SHL fixme to be gone someday or use Runtime_Error if really an error -
trunk/dll/filldir.c
r1053 r1063 41 41 04 Nov 07 GKY Use commaFmtULL to display large file sizes 42 42 29 Feb 08 GKY Use xfree where appropriate 43 07 Jul 08 SHL Use NULL rather than NullStr in FreeCnrItemData 43 44 44 45 ***********************************************************************/ … … 318 319 319 320 // load the object's longname 320 pci->pszLongName = 0;321 pci->pszLongName = NULL; 321 322 if (fLoadLongnames && 322 323 dcd && … … 546 547 pci->pszSubject = NullStr; 547 548 548 pci->pszLongName = 0;549 pci->pszLongName = NULL; 549 550 if (fLoadLongnames && 550 551 dcd && … … 1582 1583 1583 1584 if (pci->pszSubject && pci->pszSubject != NullStr) { 1584 1585 1585 psz = pci->pszSubject; 1586 pci->pszSubject = NullStr; 1586 // pci->pszSubject = NullStr; 1587 pci->pszSubject = NULL; // for debug 1587 1588 free(psz); 1588 1589 } … … 1595 1596 pci->pszLongName != pci->pszDisplayName + 1) { 1596 1597 psz = pci->pszLongName; 1597 pci->pszLongName = NullStr; 1598 //pci->pszLongName = NullStr; 1599 pci->pszLongName = NULL; 1598 1600 free(psz); 1599 1601 } … … 1601 1603 if (pci->pszFileName && pci->pszFileName != NullStr) { 1602 1604 psz = pci->pszFileName; 1603 pci->pszFileName = NullStr; 1605 //pci->pszFileName = NullStr; 1606 pci->pszFileName = NULL; 1604 1607 free(psz); 1605 1608 } … … 1607 1610 if (pci->pszFmtFileSize && pci->pszFmtFileSize != NullStr) { 1608 1611 psz = pci->pszFmtFileSize; 1609 pci->pszFmtFileSize = NullStr; 1612 //pci->pszFmtFileSize = NullStr; 1613 pci->pszFmtFileSize = NULL; 1610 1614 free(psz); 1611 1615 } 1612 // # ifdef FORTIFY1613 // Fortify_LeaveScope();1614 // # endif1615 1616 } 1616 1617 -
trunk/dll/grep.c
r1039 r1063 278 278 # ifdef FORTIFY 279 279 Fortify_EnterScope(); 280 # endif280 # endif 281 281 grep = *(GREP *)arg; 282 282 *grep.stopflag = 0; // reset thread-killing flag … … 417 417 # ifdef FORTIFY 418 418 Fortify_LeaveScope(); 419 # endif419 # endif 420 420 DosPostEventSem(CompactSem); 421 421 } … … 617 617 DosFindClose(findHandle); 618 618 free(pffbArray); 619 # ifdef FORTIFY620 Fortify_LeaveScope();621 # endif619 # ifdef FORTIFY 620 Fortify_LeaveScope(); 621 # endif 622 622 return 1; 623 623 } … … 648 648 # ifdef FORTIFY 649 649 Fortify_LeaveScope(); 650 # endif650 # endif 651 651 return 0; 652 652 } … … 673 673 grep->toinsert = 0L; 674 674 grep->insertedbytes = 0L; 675 # ifdef FORTIFY676 Fortify_LeaveScope();677 # endif675 # ifdef FORTIFY 676 Fortify_LeaveScope(); 677 # endif 678 678 } 679 679 } … … 783 783 if (!grep->dir) { 784 784 free(grep->insertffb); 785 # ifdef FORTIFY786 Fortify_LeaveScope();787 # endif785 # ifdef FORTIFY 786 Fortify_LeaveScope(); 787 # endif 788 788 return FALSE; 789 789 } … … 799 799 if (!grep->dir) { 800 800 free(grep->insertffb[grep->toinsert]); 801 # ifdef FORTIFY802 Fortify_LeaveScope();803 # endif801 # ifdef FORTIFY 802 Fortify_LeaveScope(); 803 # endif 804 804 return FALSE; 805 805 } … … 1019 1019 } 1020 1020 free(input); 1021 # ifdef FORTIFY1022 Fortify_LeaveScope();1023 # endif1021 # ifdef FORTIFY 1022 Fortify_LeaveScope(); 1023 # endif 1024 1024 // DosSleep(1); // 07 Feb 08 SHL 1025 1025 } … … 1136 1136 } 1137 1137 free(buffer); 1138 # ifdef FORTIFY1139 Fortify_LeaveScope();1140 # endif1138 # ifdef FORTIFY 1139 Fortify_LeaveScope(); 1140 # endif 1141 1141 } 1142 1142 return CRC; … … 1162 1162 # ifdef FORTIFY 1163 1163 Fortify_LeaveScope(); 1164 # endif1164 # endif 1165 1165 } 1166 1166 … … 1512 1512 xfree(grep->dupesizes, pszSrcFile, __LINE__); 1513 1513 grep->dupesizes = NULL; 1514 # ifdef FORTIFY1515 Fortify_LeaveScope();1516 # endif1514 # ifdef FORTIFY 1515 Fortify_LeaveScope(); 1516 # endif 1517 1517 1518 1518 InitITimer(pitdSleep, 0); // Reset rate estimator … … 1629 1629 if (!info->name) { 1630 1630 free(info); 1631 # ifdef FORTIFY1632 Fortify_LeaveScope();1633 # endif1631 # ifdef FORTIFY 1632 Fortify_LeaveScope(); 1633 # endif 1634 1634 return FALSE; 1635 1635 } -
trunk/dll/grep2.c
r1047 r1063 825 825 WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, GREP_MASK)); 826 826 free(p); 827 # ifdef FORTIFY828 Fortify_LeaveScope();829 # endif827 # ifdef FORTIFY 828 Fortify_LeaveScope(); 829 # endif 830 830 break; 831 831 } … … 927 927 GetPString(IDS_COULDNTSTARTTHREADTEXT)); 928 928 free(p); 929 # ifdef FORTIFY930 Fortify_LeaveScope();931 # endif929 # ifdef FORTIFY 930 Fortify_LeaveScope(); 931 # endif 932 932 WinDismissDlg(hwnd, 0); 933 933 break; … … 935 935 DosSleep(100); //05 Aug 07 GKY 128 936 936 free(p); 937 # ifdef FORTIFY938 Fortify_LeaveScope();939 # endif937 # ifdef FORTIFY 938 Fortify_LeaveScope(); 939 # endif 940 940 } 941 941 if (changed) { -
trunk/dll/inis.c
r1039 r1063 127 127 128 128 if (inirec) { 129 # ifdef FORTIFY130 Fortify_EnterScope();131 # endif129 # ifdef FORTIFY 130 Fortify_EnterScope(); 131 # endif 132 132 hab2 = WinInitialize(0); 133 133 if (hab2) { … … 297 297 MPVOID); 298 298 free(inirec); 299 # ifdef FORTIFY299 # ifdef FORTIFY 300 300 Fortify_LeaveScope(); 301 # endif301 # endif 302 302 } 303 303 } … … 342 342 343 343 if (prfp) { 344 # ifdef FORTIFY345 Fortify_EnterScope();346 # endif344 # ifdef FORTIFY 345 Fortify_EnterScope(); 346 # endif 347 347 hab2 = WinInitialize(0); 348 348 if (hab2) { … … 444 444 xfree(prfp->pszSysName, pszSrcFile, __LINE__); 445 445 free(prfp); 446 # ifdef FORTIFY446 # ifdef FORTIFY 447 447 Fortify_LeaveScope(); 448 # endif448 # endif 449 449 } 450 450 } -
trunk/dll/init.c
r1045 r1063 538 538 539 539 EndNote(); 540 /*# ifdef FORTIFY541 Fortify_LeaveScope();542 # endif*/543 540 if (FM3ModHandle) 544 541 DosFreeModule(FM3ModHandle); … … 607 604 ret = pfnResVersion(&RVMajor, &RVMinor); 608 605 } 609 /*# ifdef FORTIFY610 Fortify_EnterScope();611 # endif*/612 606 if (RVMajor < VERMAJOR || (RVMajor == VERMAJOR && RVMinor < VERMINOR)) { 613 607 saymsg(MB_ENTER, -
trunk/dll/killproc.c
r1038 r1063 86 86 # ifdef FORTIFY 87 87 Fortify_EnterScope(); 88 # endif88 # endif 89 89 thab = WinInitialize(0); 90 90 thmq = WinCreateMsgQueue(thab, 0); … … 138 138 WinTerminate(thab); 139 139 # ifdef FORTIFY 140 141 # endif140 Fortify_LeaveScope(); 141 # endif 142 142 } 143 143 … … 155 155 # ifdef FORTIFY 156 156 Fortify_EnterScope(); 157 # endif157 # endif 158 158 thab = WinInitialize(0); 159 159 thmq = WinCreateMsgQueue(thab, 0); … … 207 207 WinTerminate(thab); 208 208 # ifdef FORTIFY 209 210 # endif209 Fortify_LeaveScope(); 210 # endif 211 211 } 212 212 … … 229 229 # ifdef FORTIFY 230 230 Fortify_EnterScope(); 231 # endif231 # endif 232 232 thab = WinInitialize(0); 233 233 thmq = WinCreateMsgQueue(thab, 0); … … 309 309 WinTerminate(thab); 310 310 # ifdef FORTIFY 311 312 # endif311 Fortify_LeaveScope(); 312 # endif 313 313 } 314 314 -
trunk/dll/mainwnd.c
r1061 r1063 210 210 if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID)) 211 211 WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID); 212 # ifdef FORTIFY213 Fortify_LeaveScope();214 # endif212 # ifdef FORTIFY 213 Fortify_LeaveScope(); 214 # endif 215 215 break; 216 216 } … … 5807 5807 PostMsg(hwnd, WM_COMMAND, MPFROMLONG(IDM_QUICKSETTINGS), MPVOID); 5808 5808 } 5809 # ifdef FORTIFY5810 Fortify_EnterScope();5811 # endif5809 # ifdef FORTIFY 5810 Fortify_EnterScope(); 5811 # endif 5812 5812 return 0; 5813 5813 } … … 6393 6393 if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID)) 6394 6394 WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID); 6395 # ifdef FORTIFY6396 free_commands();6397 free_associations();6398 free_udirs();6399 free_ldir();6400 free_archivers();6401 free_tools();6402 Fortify_LeaveScope();6403 # endif6395 # ifdef FORTIFY 6396 free_commands(); 6397 free_associations(); 6398 free_udirs(); 6399 free_ldir(); 6400 free_archivers(); 6401 free_tools(); 6402 Fortify_LeaveScope(); 6403 # endif 6404 6404 break; 6405 6405 } -
trunk/dll/makelist.c
r1039 r1063 76 76 FreeList(li->list); 77 77 free(li); 78 # ifdef FORTIFY79 //Fortify_LeaveScope();80 # endif81 78 } 82 79 } … … 97 94 #endif 98 95 free(list); 99 # ifdef FORTIFY100 //Fortify_LeaveScope();101 # endif102 96 } 103 97 DosPostEventSem(CompactSem); … … 116 110 // Use plain realloc for speed 117 111 // 06 Aug 07 SHL fixme to know why + 6 118 # ifdef FORTIFY119 Fortify_EnterScope();120 # endif112 # ifdef FORTIFY 113 Fortify_EnterScope(); 114 # endif 121 115 pflArray = realloc(*list, (*pnumalloced + 6) * sizeof(FILELIST *)); 122 116 if (!pflArray) { … … 170 164 if (((*pnumfiles) + 3) > *pnumalloced) { 171 165 // Use plain realloc for speed 172 # ifdef FORTIFY173 Fortify_EnterScope();174 # endif166 # ifdef FORTIFY 167 Fortify_EnterScope(); 168 # endif 175 169 ppsz = realloc(*list, (*pnumalloced + 6) * sizeof(CHAR *)); 176 170 if (!ppsz) { … … 223 217 // Use plain realloc for speed 224 218 225 # ifdef FORTIFY226 Fortify_EnterScope();227 # endif219 # ifdef FORTIFY 220 Fortify_EnterScope(); 221 # endif 228 222 test = realloc(list, sizeof(CHAR *) * (numfiles + 1)); 229 223 if (!test) … … 277 271 list = NULL; 278 272 } 279 # ifdef FORTIFY280 Fortify_LeaveScope();281 # endif273 # ifdef FORTIFY 274 Fortify_LeaveScope(); 275 # endif 282 276 break; 283 277 } -
trunk/dll/mle.c
r1042 r1063 253 253 GetPString(IDS_OUTOFMEMORY)); 254 254 free(sel); 255 # ifdef FORTIFY256 Fortify_LeaveScope();257 # endif255 # ifdef FORTIFY 256 Fortify_LeaveScope(); 257 # endif 258 258 DosPostEventSem(CompactSem); 259 259 return FALSE; … … 273 273 Runtime_Error(pszSrcFile, __LINE__, "len < 1"); 274 274 free(sel); 275 # ifdef FORTIFY276 Fortify_LeaveScope();277 # endif275 # ifdef FORTIFY 276 Fortify_LeaveScope(); 277 # endif 278 278 DosPostEventSem(CompactSem); 279 279 return FALSE; … … 290 290 DosFreeMem(temp); 291 291 free(sel); 292 # ifdef FORTIFY293 Fortify_LeaveScope();294 # endif292 # ifdef FORTIFY 293 Fortify_LeaveScope(); 294 # endif 295 295 MLEenable(h); 296 296 DosPostEventSem(CompactSem); … … 314 314 DosFreeMem(temp); 315 315 free(sel); 316 # ifdef FORTIFY317 Fortify_LeaveScope();318 # endif316 # ifdef FORTIFY 317 Fortify_LeaveScope(); 318 # endif 319 319 MLEenable(h); 320 320 DosPostEventSem(CompactSem); … … 390 390 DosFreeMem(temp); 391 391 free(sel); 392 # ifdef FORTIFY393 Fortify_LeaveScope();394 # endif392 # ifdef FORTIFY 393 Fortify_LeaveScope(); 394 # endif 395 395 DosPostEventSem(CompactSem); 396 396 MLEenable(h); … … 428 428 # ifdef FORTIFY 429 429 Fortify_LeaveScope(); 430 # endif430 # endif 431 431 DosPostEventSem(CompactSem); 432 432 return TRUE; … … 595 595 ret = FALSE; 596 596 free(buffer); 597 # ifdef FORTIFY598 Fortify_LeaveScope();599 # endif597 # ifdef FORTIFY 598 Fortify_LeaveScope(); 599 # endif 600 600 } 601 601 DosFreeMem(hexbuff); … … 773 773 # ifdef FORTIFY 774 774 Fortify_EnterScope(); 775 # endif775 # endif 776 776 777 777 bkg = (BKGLOAD *) arg; … … 812 812 # ifdef FORTIFY 813 813 Fortify_LeaveScope(); 814 # endif814 # endif 815 815 _endthread(); 816 816 } -
trunk/dll/newview.c
r1039 r1063 934 934 935 935 priority_normal(); 936 # ifdef FORTIFY 937 Fortify_EnterScope(); 938 # endif 936 939 hab2 = WinInitialize(0); 937 940 if (hab2) { 938 941 hmq2 = WinCreateMsgQueue(hab2, 0); 939 942 if (hmq2) { 940 # ifdef FORTIFY941 Fortify_EnterScope();942 # endif943 943 WinCancelShutdown(hmq2, TRUE); 944 944 IncrThreadUsage(); … … 1068 1068 } 1069 1069 WinDestroyMsgQueue(hmq2); 1070 # ifdef FORTIFY1071 Fortify_LeaveScope();1072 # endif1073 1070 } 1074 1071 DecrThreadUsage(); 1075 1072 WinTerminate(hab2); 1076 1073 } 1074 1075 # ifdef FORTIFY 1076 Fortify_LeaveScope(); 1077 # endif 1077 1078 DosPostEventSem(CompactSem); 1078 1079 } … … 1090 1091 1091 1092 priority_normal(); 1093 # ifdef FORTIFY 1094 Fortify_EnterScope(); 1095 # endif 1092 1096 hab2 = WinInitialize(0); 1093 1097 if (hab2) { … … 1096 1100 WinCancelShutdown(hmq2, TRUE); 1097 1101 IncrThreadUsage(); 1098 # ifdef FORTIFY1099 Fortify_EnterScope();1100 # endif1101 1102 ad = WinQueryWindowPtr(hwnd, QWL_USER); 1102 1103 if (ad) { … … 1172 1173 WinDestroyMsgQueue(hmq2); 1173 1174 } 1174 # ifdef FORTIFY1175 Fortify_LeaveScope();1176 # endif1177 1175 DecrThreadUsage(); 1178 1176 WinTerminate(hab2); 1179 1177 } 1178 # ifdef FORTIFY 1179 Fortify_LeaveScope(); 1180 # endif 1180 1181 DosPostEventSem(CompactSem); 1181 1182 } … … 1192 1193 1193 1194 priority_normal(); 1195 # ifdef FORTIFY 1196 Fortify_EnterScope(); 1197 # endif 1194 1198 hab2 = WinInitialize(0); 1195 1199 if (hab2) { … … 1198 1202 WinCancelShutdown(hmq2, TRUE); 1199 1203 IncrThreadUsage(); 1200 # ifdef FORTIFY1201 Fortify_EnterScope();1202 # endif1203 1204 ad = WinQueryWindowPtr(hwnd, QWL_USER); 1204 1205 if (!ad) … … 1352 1353 DecrThreadUsage(); 1353 1354 WinTerminate(hab2); 1355 } 1354 1356 # ifdef FORTIFY 1355 Fortify_LeaveScope(); 1356 # endif 1357 } 1357 Fortify_LeaveScope(); 1358 # endif 1358 1359 DosPostEventSem(CompactSem); 1359 if (ad && !ad->stopflag) { 1360 if (ad && !ad->stopflag) { //Fixme can't post message withou HAB GKY 7-10-08 1360 1361 PostMsg(hwnd, UM_CONTAINER_FILLED, MPFROMLONG(firstline), 1361 1362 MPFROMLONG(cursored)); … … 1376 1377 BOOL error = TRUE; 1377 1378 1379 # ifdef FORTIFY 1380 Fortify_EnterScope(); 1381 # endif 1378 1382 hab2 = WinInitialize(0); 1379 1383 if (hab2) { … … 1382 1386 WinCancelShutdown(hmq2, TRUE); 1383 1387 IncrThreadUsage(); 1384 # ifdef FORTIFY1385 Fortify_EnterScope();1386 # endif1387 1388 ad = WinQueryWindowPtr(hwnd, QWL_USER); 1388 1389 if (ad) { … … 1477 1478 DecrThreadUsage(); 1478 1479 WinTerminate(hab2); 1480 } 1479 1481 # ifdef FORTIFY 1480 Fortify_LeaveScope(); 1481 # endif 1482 } 1483 if (error) 1482 Fortify_LeaveScope(); 1483 # endif 1484 if (error) //fixme 1484 1485 PostMsg(hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID); 1485 1486 DosPostEventSem(CompactSem); -
trunk/dll/notify.c
r1047 r1063 434 434 # ifdef FORTIFY 435 435 Fortify_EnterScope(); 436 # endif436 # endif 437 437 if (hab) { 438 438 HMQ hmq = WinCreateMsgQueue(hab, 0); … … 447 447 } 448 448 # ifdef FORTIFY 449 450 # endif449 Fortify_LeaveScope(); 450 # endif 451 451 } 452 452 -
trunk/dll/objcnr.c
r1039 r1063 217 217 # ifdef FORTIFY 218 218 Fortify_EnterScope(); 219 # endif219 # endif 220 220 if (!dirsize) { 221 221 Runtime_Error(pszSrcFile, __LINE__, "no data"); … … 242 242 # ifdef FORTIFY 243 243 Fortify_LeaveScope(); 244 # endif244 # endif 245 245 } 246 246 … … 275 275 { 276 276 DIRSIZE *dirsize; 277 # ifdef FORTIFY278 Fortify_EnterScope();279 # endif277 # ifdef FORTIFY 278 Fortify_EnterScope(); 279 # endif 280 280 dirsize = xmalloc(sizeof(DIRSIZE), pszSrcFile, __LINE__); 281 281 if (!dirsize) { … … 291 291 GetPString(IDS_COULDNTSTARTTHREADTEXT)); 292 292 free(dirsize); 293 # ifdef FORTIFY294 Fortify_LeaveScope();295 # endif293 # ifdef FORTIFY 294 Fortify_LeaveScope(); 295 # endif 296 296 WinDismissDlg(hwnd, 0); 297 297 break; -
trunk/dll/objwin.c
r1062 r1063 77 77 IDS_WINCREATEWINDOW); 78 78 else { 79 # ifdef FORTIFY80 81 # endif79 # ifdef FORTIFY 80 Fortify_EnterScope(); 81 # endif 82 82 WinSetWindowPtr(ObjectHwnd, QWL_USER, args); 83 83 /* initially populate container */ … … 88 88 WinDispatchMsg(hab2, &qmsg2); 89 89 WinDestroyWindow(ObjectHwnd); 90 # ifdef FORTIFY90 # ifdef FORTIFY 91 91 { 92 92 HWND hwndCnr = ((DIRCNRDATA *)args)->hwndCnr; … … 98 98 Fortify_LeaveScope(); 99 99 } 100 # endif100 # endif 101 101 } 102 102 WinDestroyMsgQueue(hmq2); -
trunk/dll/printer.c
r1038 r1063 115 115 # ifdef FORTIFY 116 116 Fortify_EnterScope(); 117 # endif117 # endif 118 118 priority_normal(); 119 119 hab2 = WinInitialize(0); … … 324 324 if (li) 325 325 FreeListInfo(li); 326 # ifdef FORTIFY326 # ifdef FORTIFY 327 327 Fortify_LeaveScope(); 328 # endif328 # endif 329 329 } 330 330 -
trunk/dll/seeall.c
r1039 r1063 386 386 { 387 387 LISTINFO *li; 388 # ifdef FORTIFY389 Fortify_EnterScope();390 # endif388 # ifdef FORTIFY 389 Fortify_EnterScope(); 390 # endif 391 391 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 392 392 if (li) { … … 1130 1130 1131 1131 if (ad) { 1132 # ifdef FORTIFY 1133 Fortify_EnterScope(); 1134 # endif 1132 1135 hab2 = WinInitialize(0); 1133 1136 if (hab2) { 1134 # ifdef FORTIFY1135 Fortify_EnterScope();1136 # endif1137 1137 hmq2 = WinCreateMsgQueue(hab2, 256); 1138 1138 if (hmq2) { … … 1167 1167 else 1168 1168 WinTerminate(hab2); 1169 # ifdef FORTIFY 1169 } 1170 # ifdef FORTIFY 1170 1171 Fortify_LeaveScope(); 1171 # endif 1172 } 1172 # endif 1173 1173 } 1174 1174 } … … 1647 1647 # ifdef FORTIFY 1648 1648 Fortify_EnterScope(); 1649 # endif1649 # endif 1650 1650 if (!DosRequestMutexSem(ad->hmtxScan, SEM_INDEFINITE_WAIT)) { 1651 1651 priority_normal(); … … 1760 1760 } 1761 1761 # ifdef FORTIFY 1762 1763 # endif1762 Fortify_LeaveScope(); 1763 # endif 1764 1764 } 1765 1765 … … 2057 2057 # ifdef FORTIFY 2058 2058 Fortify_EnterScope(); 2059 # endif2059 # endif 2060 2060 if (!DosRequestMutexSem(ad->hmtxScan, SEM_INDEFINITE_WAIT)) { 2061 2061 priority_normal(); … … 2118 2118 } 2119 2119 # ifdef FORTIFY 2120 2121 # endif2120 Fortify_LeaveScope(); 2121 # endif 2122 2122 } 2123 2123 … … 2475 2475 // fprintf(stderr,"Seeall: WM_CREATE\n"); 2476 2476 WinSetWindowPtr(hwnd, QWL_USER, NULL); 2477 # ifdef FORTIFY2478 Fortify_EnterScope();2479 # endif2477 # ifdef FORTIFY 2478 Fortify_EnterScope(); 2479 # endif 2480 2480 pAD = xmallocz(sizeof(ALLDATA), pszSrcFile, __LINE__); 2481 2481 if (pAD) { … … 4293 4293 FreeAllFilesList(hwnd); 4294 4294 free(pAD); 4295 # ifdef FORTIFY 4296 Fortify_LeaveScope(); 4297 # endif 4298 } 4295 } 4296 # ifdef FORTIFY 4297 Fortify_LeaveScope(); 4298 # endif 4299 4299 break; 4300 4300 } -
trunk/dll/treecnr.c
r1047 r1063 785 785 else { 786 786 WORKER *wk; 787 # ifdef FORTIFY788 Fortify_EnterScope();789 # endif787 # ifdef FORTIFY 788 Fortify_EnterScope(); 789 # endif 790 790 wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__); 791 791 if (!wk) … … 803 803 GetPString(IDS_COULDNTSTARTTHREADTEXT)); 804 804 free(wk); 805 # ifdef FORTIFY806 Fortify_LeaveScope();807 # endif808 805 FreeListInfo((LISTINFO *) mp1); 809 806 } 810 807 } 808 # ifdef FORTIFY 809 Fortify_LeaveScope(); 810 # endif 811 811 } 812 812 } … … 821 821 else { 822 822 WORKER *wk; 823 # ifdef FORTIFY824 Fortify_EnterScope();825 # endif823 # ifdef FORTIFY 824 Fortify_EnterScope(); 825 # endif 826 826 wk = xmallocz(sizeof(WORKER), pszSrcFile, __LINE__); 827 827 if (!wk) … … 839 839 GetPString(IDS_COULDNTSTARTTHREADTEXT)); 840 840 free(wk); 841 # ifdef FORTIFY842 Fortify_LeaveScope();843 # endif844 841 FreeListInfo((LISTINFO *) mp1); 845 842 } 846 843 } 844 # ifdef FORTIFY 845 Fortify_LeaveScope(); 846 # endif 847 847 } 848 848 } … … 860 860 UM_CLOSE, MPFROMLONG(dcd->dontclose != FALSE), MPVOID); 861 861 free(dcd); 862 # ifdef FORTIFY863 Fortify_LeaveScope();864 # endif862 # ifdef FORTIFY 863 Fortify_LeaveScope(); 864 # endif 865 865 WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL); 866 866 } … … 2761 2761 LISTINFO *li; 2762 2762 ULONG action = UM_ACTION; 2763 # ifdef FORTIFY2764 Fortify_EnterScope();2765 # endif2763 # ifdef FORTIFY 2764 Fortify_EnterScope(); 2765 # endif 2766 2766 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 2767 2767 if (li) { … … 2771 2771 if (!li->list || !li->list[0]) { 2772 2772 free(li); 2773 # ifdef FORTIFY2774 Fortify_LeaveScope();2775 # endif2773 # ifdef FORTIFY 2774 Fortify_LeaveScope(); 2775 # endif 2776 2776 break; 2777 2777 } … … 2996 2996 } 2997 2997 if (hwndFrame && hwndClient) { 2998 # ifdef FORTIFY2999 Fortify_EnterScope();3000 # endif2998 # ifdef FORTIFY 2999 Fortify_EnterScope(); 3000 # endif 3001 3001 dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__); 3002 3002 if (!dcd) { … … 3083 3083 PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID); 3084 3084 free(dcd); 3085 # ifdef FORTIFY3086 Fortify_LeaveScope();3087 # endif3085 # ifdef FORTIFY 3086 Fortify_LeaveScope(); 3087 # endif 3088 3088 hwndFrame = (HWND) 0; 3089 3089 } -
trunk/dll/undel.c
r1039 r1063 65 65 # ifdef FORTIFY 66 66 Fortify_EnterScope(); 67 # endif67 # endif 68 68 thab = WinInitialize(0); 69 69 thmq = WinCreateMsgQueue(thab, 0); … … 163 163 } 164 164 # ifdef FORTIFY 165 166 # endif165 Fortify_LeaveScope(); 166 # endif 167 167 } 168 168 -
trunk/dll/viewer.c
r1047 r1063 101 101 # ifdef FORTIFY 102 102 Fortify_EnterScope(); 103 # endif103 # endif 104 104 vw = xmallocz(sizeof(XMLEWNDPTR), pszSrcFile, __LINE__); 105 105 if (!vw) … … 1266 1266 } 1267 1267 } 1268 # ifdef FORTIFY1269 Fortify_LeaveScope();1270 # endif1268 # ifdef FORTIFY 1269 Fortify_LeaveScope(); 1270 # endif 1271 1271 break; 1272 1272 } -
trunk/dll/viewinf.c
r1047 r1063 59 59 # ifdef FORTIFY 60 60 Fortify_EnterScope(); 61 # endif61 # endif 62 62 hwnd = dummy->hwnd; 63 63 hab2 = WinInitialize(0); … … 195 195 # ifdef FORTIFY 196 196 Fortify_LeaveScope(); 197 # endif197 # endif 198 198 } 199 199 -
trunk/dll/worker.c
r1047 r1063 80 80 case IDM_EXTRACT: 81 81 { 82 # ifdef FORTIFY83 Fortify_EnterScope();84 # endif82 # ifdef FORTIFY 83 Fortify_EnterScope(); 84 # endif 85 85 li = xmallocz(sizeof(LISTINFO), pszSrcFile, __LINE__); 86 86 if (li) { … … 105 105 FreeListInfo(wk->li); 106 106 free(wk); 107 # ifdef FORTIFY108 Fortify_LeaveScope();109 # endif107 # ifdef FORTIFY 108 Fortify_LeaveScope(); 109 # endif 110 110 } 111 111 } … … 118 118 } 119 119 FreeUndo(); 120 # ifdef FORTIFY 121 Fortify_LeaveScope(); 122 # endif 120 123 } 121 124 … … 135 138 136 139 137 # ifdef FORTIFY138 Fortify_EnterScope();139 # endif140 140 if (wk) { 141 # ifdef FORTIFY 142 Fortify_EnterScope(); 143 # endif 141 144 if (wk->li && wk->li->list && wk->li->list[0]) { 142 145 hab2 = WinInitialize(0); … … 978 981 FreeListInfo(wk->li); 979 982 free(wk); 980 # ifdef FORTIFY981 Fortify_LeaveScope();982 # endif983 # ifdef FORTIFY 984 Fortify_LeaveScope(); 985 # endif 983 986 DosPostEventSem(CompactSem); 984 987 } … … 995 998 996 999 997 # ifdef FORTIFY998 Fortify_EnterScope();999 # endif1000 1000 if (wk) { 1001 # ifdef FORTIFY 1002 Fortify_EnterScope(); 1003 # endif 1001 1004 if (wk->li && wk->li->list && wk->li->list[0]) { 1002 1005 hab2 = WinInitialize(0); … … 1643 1646 FreeListInfo(wk->li); 1644 1647 free(wk); 1645 # ifdef FORTIFY1646 Fortify_LeaveScope();1647 # endif1648 # ifdef FORTIFY 1649 Fortify_LeaveScope(); 1650 # endif 1648 1651 DosPostEventSem(CompactSem); 1649 1652 } -
trunk/dll/wrappers.c
r1037 r1063 333 333 { 334 334 if (pv && pv != NullStr) { 335 # ifdef FORTIFY335 # ifdef FORTIFY 336 336 Fortify_free(pv, pszSrcFile, uiLineNumber); 337 # else337 # else 338 338 free(pv); 339 # endif339 # endif 340 340 341 341 } … … 350 350 # else 351 351 PVOID pv = malloc(cBytes); 352 # endif352 # endif 353 353 354 354 if (!pv) … … 375 375 { 376 376 if (pvIn != NullStr) { 377 # ifdef FORTIFY378 PVOID pv = Fortify_realloc(pvIn, cBytes, pszSrcFile, uiLineNumber);379 # else380 PVOID pv = realloc(pvIn, cBytes);381 # endif377 # ifdef FORTIFY 378 PVOID pv = Fortify_realloc(pvIn, cBytes, pszSrcFile, uiLineNumber); 379 # else 380 PVOID pv = realloc(pvIn, cBytes); 381 # endif 382 382 383 383 if (!pv && cBytes) … … 398 398 # else 399 399 PSZ psz = strdup(pszIn); 400 # endif400 # endif 401 401 402 402 if (!psz)
Note:
See TracChangeset
for help on using the changeset viewer.