Changeset 335 for trunk/dll/seeall.c
- Timestamp:
- Jul 25, 2006, 9:03:44 PM (19 years ago)
- File:
-
- 1 edited
-
trunk/dll/seeall.c (modified) (31 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/seeall.c
r302 r335 17 17 06 Jun 05 SHL Drop unused code 18 18 29 May 06 SHL Comments 19 17 Jul 06 SHL Use Runtime_Error 19 20 20 21 ***********************************************************************/ … … 38 39 39 40 #pragma data_seg(DATA2) 41 42 static PSZ pszSrcFile = __FILE__; 43 40 44 #pragma alloc_text(SEEALL,comparefullnames,comparenames,comparesizes) 41 45 #pragma alloc_text(SEEALL,comparedates,compareexts,SeeStatusProc) … … 206 210 flags |= (DP_CRCS | DP_SIZES); 207 211 } 208 if (!flags)212 if (!flags) 209 213 saymsg(MB_ENTER, 210 214 hwnd, … … 380 384 LISTINFO *li; 381 385 382 li = malloc(sizeof(LISTINFO)); 383 if(li) { 384 memset(li,0,sizeof(LISTINFO)); 386 li = xmallocz(sizeof(LISTINFO),pszSrcFile,__LINE__); 387 if (li) { 385 388 li->hwndS = WinWindowFromID(hwndFrame,FID_CLIENT); 386 389 li->type = IDM_PRINT; … … 394 397 if(li && li->list && li->list[0]) { 395 398 strcpy(li->targetpath,printer); 396 if(_beginthread(PrintList, 397 NULL, 398 65536, 399 (PVOID)li) == -1) { 400 DosBeep(50,100); 399 if(_beginthread(PrintList,NULL,65536,(PVOID)li) == -1) { 400 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT)); 401 401 FreeListInfo(li); 402 402 } … … 404 404 } 405 405 } 406 else407 FreeList(list);408 406 } 409 407 break; … … 842 840 rc, 843 841 hwndFrame, 844 __FILE__,842 pszSrcFile, 845 843 __LINE__, 846 844 "%s %s \"%s\" %s\"%s\" %s.", … … 913 911 !*ex.extractdir) 914 912 break; 915 if(!IsFile(ex.extractdir)) { 913 if (IsFile(ex.extractdir) != 0) 914 Runtime_Error(pszSrcFile, __LINE__, "directory expected"); 915 else { 916 916 if(needs_quoting(ex.masks) && 917 917 !strchr(ex.masks,'\"') ) … … 930 930 (maskspaces) ? "\"" : NullStr); 931 931 } 932 else 933 DosBeep(50,100); 934 } 935 if(!PostMsg(WinWindowFromID(hwndFrame,FID_CLIENT), 936 UM_UPDATERECORDLIST, 937 MPFROMP(list), 938 MPVOID)) 932 } 933 // fixme to not leak? 934 if (!PostMsg(WinWindowFromID(hwndFrame,FID_CLIENT), 935 UM_UPDATERECORDLIST, 936 MPFROMP(list), 937 MPVOID)) 939 938 FreeList(list); 940 939 break; … … 1137 1136 error, 1138 1137 hwndFrame, 1139 __FILE__,1138 pszSrcFile, 1140 1139 __LINE__, 1141 1140 GetPString(IDS_DELETEFAILED2TEXT), … … 1612 1611 ALLFILES *temp,**templ; 1613 1612 1614 temp = realloc(ad->afhead,(ad->afalloc + 1) * 1615 sizeof(ALLFILES)); 1616 if(temp) { 1617 ad->afhead = temp; 1618 templ = realloc(ad->afindex,(ad->afalloc + 1) * 1619 sizeof(ALLFILES *)); 1620 if(templ) 1621 ad->afindex = templ; 1622 else { 1623 // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Realloc failed."); 1624 ad->stopflag = 1; 1625 break; 1626 } 1627 ad->afalloc++; 1628 } 1629 else { 1630 // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Realloc failed."); 1613 temp = xrealloc(ad->afhead,(ad->afalloc + 1) * sizeof(ALLFILES),pszSrcFile,__LINE__); 1614 if (!temp) { 1631 1615 ad->stopflag = 1; 1632 1616 break; 1633 1617 } 1634 } 1635 ad->afhead[ad->affiles].fullname = strdup(list[z]); 1618 else { 1619 ad->afhead = temp; 1620 templ = xrealloc(ad->afindex,(ad->afalloc + 1) * sizeof(ALLFILES *),pszSrcFile,__LINE__); 1621 if (!templ) { 1622 ad->stopflag = 1; 1623 break; 1624 } 1625 else 1626 ad->afindex = templ; 1627 ad->afalloc++; 1628 } 1629 } 1630 ad->afhead[ad->affiles].fullname = xstrdup(list[z],pszSrcFile,__LINE__); 1636 1631 if(ad->afhead[ad->affiles].fullname) { 1637 1632 p = strrchr(ad->afhead[ad->affiles].fullname,'\\'); … … 2008 2003 FreeAllFilesList(hwnd); 2009 2004 else { 2010 tempa = realloc(pAD->afhead,pAD->affiles * sizeof(ALLFILES));2011 if (tempa) {2005 tempa = xrealloc(pAD->afhead,pAD->affiles * sizeof(ALLFILES),pszSrcFile,__LINE__); 2006 if (tempa) { 2012 2007 pAD->afhead = tempa; 2013 2008 pAD->afalloc = pAD->affiles; 2014 2009 } 2015 templ = realloc(pAD->afindex,pAD->affiles * sizeof(ALLFILES *));2016 if (templ)2010 templ = xrealloc(pAD->afindex,pAD->affiles * sizeof(ALLFILES *),pszSrcFile,__LINE__); 2011 if (templ) 2017 2012 pAD->afindex = templ; 2018 2013 DosPostEventSem(CompactSem); … … 2034 2029 register PBYTE fb; 2035 2030 2036 filename = malloc(CCHMAXPATH); 2037 if(!filename) { 2038 // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Malloc filename failed."); 2031 filename = xmalloc(CCHMAXPATH,pszSrcFile,__LINE__); 2032 if(!filename) 2039 2033 return; 2040 } 2034 2041 2035 uL = ad->afFilesToGet; 2042 2036 if(fRemoteBug && isalpha(*pathname) && pathname[1] == ':' && … … 2044 2038 (driveflags[toupper(*pathname) - 'A'] & DRIVE_REMOTE)) 2045 2039 uL = 1L; 2046 pffb = malloc(sizeof(FILEFINDBUF3) * uL);2040 pffb = xmalloc(sizeof(FILEFINDBUF3) * uL,pszSrcFile,__LINE__); 2047 2041 if(!pffb) { 2048 2042 free(filename); 2049 // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Malloc pffb failed.");2050 2043 return; 2051 2044 } … … 2083 2076 ALLFILES *temp; 2084 2077 2085 temp = realloc(ad->afhead,(ad->afalloc + 1000) * 2086 sizeof(ALLFILES)); 2087 if(temp) { 2078 temp = xrealloc(ad->afhead,(ad->afalloc + 1000) * 2079 sizeof(ALLFILES),pszSrcFile,__LINE__); 2080 if (!temp) { 2081 ad->stopflag = 1; 2082 break; 2083 } 2084 else { 2088 2085 ad->afhead = temp; 2089 2086 if(ad->stopflag) … … 2091 2088 ad->afalloc += 1000; 2092 2089 } 2093 else { 2094 // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Realloc failed."); 2095 ad->stopflag = 1; 2096 break; 2097 } 2098 } 2099 ad->afhead[ad->affiles].fullname = strdup(filename); 2100 if(ad->afhead[ad->affiles].fullname) { 2090 } 2091 ad->afhead[ad->affiles].fullname = xstrdup(filename,pszSrcFile,__LINE__); 2092 if (!ad->afhead[ad->affiles].fullname) { 2093 ad->stopflag = 1; 2094 break; 2095 } 2096 else { 2101 2097 ad->afhead[ad->affiles].filename = 2102 2098 ad->afhead[ad->affiles].fullname + (enddir - filename); … … 2111 2107 if(ad->longestw < ffb->cchName + (enddir - filename)) 2112 2108 ad->longestw = ffb->cchName + (enddir - filename); 2113 }2114 else {2115 // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Strdup failed.");2116 ad->stopflag = 1;2117 break;2118 2109 } 2119 2110 } … … 2174 2165 ALLFILES *tempa,**templ; 2175 2166 2176 tempa = realloc(ad->afhead,sizeof(ALLFILES) * ad->affiles);2177 if (tempa) {2167 tempa = xrealloc(ad->afhead,sizeof(ALLFILES) * ad->affiles,pszSrcFile,__LINE__); 2168 if (tempa) { 2178 2169 ad->afhead = tempa; 2179 2170 ad->afalloc = ad->affiles; 2180 2171 } 2181 templ = realloc(ad->afindex,sizeof(ALLFILES *) * ad->affiles);2182 if (templ)2172 templ = xrealloc(ad->afindex,sizeof(ALLFILES *) * ad->affiles,pszSrcFile,__LINE__); 2173 if (templ) 2183 2174 ad->afindex = templ; 2184 2175 DosPostEventSem(CompactSem); 2185 2176 } 2186 2177 2187 if (!ad->stopflag) {2178 if (!ad->stopflag) { 2188 2179 PostMsg(hwnd,UM_RESCAN,MPFROMLONG(1L),MPVOID); 2189 2180 ReSort(hwnd); … … 2552 2543 // fprintf(stderr,"Seeall: WM_CREATE\n"); 2553 2544 WinSetWindowPtr(hwnd,QWL_USER,NULL); 2554 pAD = malloc(sizeof(ALLDATA));2545 pAD = xmallocz(sizeof(ALLDATA),pszSrcFile,__LINE__); 2555 2546 if(pAD) { 2556 memset(pAD,0,sizeof(ALLDATA));2557 2547 pAD->size = sizeof(ALLDATA); 2558 2548 pAD->hwndFrame = WinQueryWindow(hwnd,QW_PARENT); … … 2661 2651 FID_HORZSCROLL); 2662 2652 pAD->multiplier = 1; 2663 if(_beginthread(MakeSeeObj,NULL,122880,(PVOID)pAD) != -1) { 2664 if(!DosCreateMutexSem(NULL,&pAD->hmtxScan,0L,FALSE)) { 2653 if(_beginthread(MakeSeeObj,NULL,122880,(PVOID)pAD) == -1) 2654 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT)); 2655 else { 2656 if (!DosCreateMutexSem(NULL,&pAD->hmtxScan,0L,FALSE)) { 2665 2657 pAD->hwndStatus = WinCreateWindow(WinQueryWindow(hwnd,QW_PARENT), 2666 2658 GetPString(IDS_WCSEESTATUS), … … 2706 2698 } 2707 2699 } 2708 if(_beginthread(FindAllThread,NULL,524288,(PVOID)hwnd) == -1) 2700 if(_beginthread(FindAllThread,NULL,524288,(PVOID)hwnd) == -1) { 2701 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT)); 2709 2702 PostMsg(hwnd,WM_CLOSE,MPVOID,MPVOID); 2703 } 2710 2704 else { 2711 2705 DosSleep(100L); … … 2838 2832 strcpy(s, 2839 2833 GetPString(IDS_WORKINGTEXT)); 2840 if (pAD->affiles) {2834 if (pAD->affiles) { 2841 2835 commafmt(tm,sizeof(tm),pAD->affiles); 2842 2836 strcat(s,tm); … … 3158 3152 3159 3153 list = BuildAList(hwnd); 3160 if(list) { 3154 if (!list) 3155 Runtime_Error(pszSrcFile, __LINE__, "no data"); 3156 else { 3161 3157 WinSetWindowText(pAD->hwndStatus, 3162 3158 GetPString(IDS_DRAGGINGFILESTEXT)); … … 3171 3167 MPVOID); 3172 3168 } 3173 else3174 DosBeep(50,100);3175 3169 } 3176 3170 break; … … 3961 3955 DUPE_FRAME, 3962 3956 MPFROM2SHORT(pAD->dupeflags,0)); 3963 if(pAD->dupeflags) { 3964 if(_beginthread(FindDupes, 3965 NULL, 3966 65536, 3967 (PVOID)hwnd) == -1) 3968 DosBeep(50,100); 3957 if (pAD->dupeflags) { 3958 if(_beginthread(FindDupes,NULL,65536,(PVOID)hwnd) == -1) 3959 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT)); 3969 3960 } 3970 3961 DosReleaseMutexSem(pAD->hmtxScan); … … 4160 4151 FreeAllFilesList(hwnd); 4161 4152 pAD->stopflag = 0; 4162 if(_beginthread(FindAllThread,NULL,524288,(PVOID)hwnd) != -1) { 4153 if(_beginthread(FindAllThread,NULL,524288,(PVOID)hwnd) == -1) { 4154 Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_COULDNTSTARTTHREADTEXT)); 4155 WinDestroyWindow(WinQueryWindow(hwnd,QW_PARENT)); 4156 DosReleaseMutexSem(pAD->hmtxScan); 4157 } 4158 else { 4163 4159 DosReleaseMutexSem(pAD->hmtxScan); 4164 4160 DosSleep(100); … … 4166 4162 PostMsg(hwnd,UM_SETUP2,MPVOID,MPVOID); 4167 4163 PostMsg(hwnd,UM_RESCAN,MPVOID,MPVOID); 4168 }4169 else {4170 DosBeep(250,100);4171 WinDestroyWindow(WinQueryWindow(hwnd,QW_PARENT));4172 DosReleaseMutexSem(pAD->hmtxScan);4173 4164 } 4174 4165 } … … 4265 4256 CHAR **list = BuildAList(hwnd); 4266 4257 4267 if(list) { 4258 if (!list) 4259 Runtime_Error(pszSrcFile, __LINE__, "no data"); 4260 else { 4268 4261 switch(SHORT1FROMMP(mp1)) { 4269 4262 case IDM_COLLECT: … … 4304 4297 } 4305 4298 } 4306 else4307 DosBeep(50,100);4308 4299 } 4309 4300 break; … … 4438 4429 UM_SETUP4, 4439 4430 MPVOID, 4440 MPVOID)) 4431 MPVOID)) 4441 4432 { 4442 4433 PostMsg((HWND)0, … … 4451 4442 // Needs to be static for other thread 4452 4443 if (!pszDir) 4453 pszDir = malloc(CCHMAXPATH);4444 pszDir = xmalloc(CCHMAXPATH,pszSrcFile,__LINE__); 4454 4445 if (pszDir) { 4455 4446 strcpy(pszDir, pszStartPath);
Note:
See TracChangeset
for help on using the changeset viewer.
