Changeset 1554
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/arccnrs.c
r1545 r1554 84 84 15 Apr 10 JBS Ticket 422: Stop hang when open archive gets deleted or moved 85 85 23 Oct 10 GKY Add ForwardslashToBackslash function to streamline code 86 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 87 by temp file creation failures. 86 88 87 89 ***********************************************************************/ … … 2021 2023 CHAR *modew = "w"; 2022 2024 2025 if (pTmpDir && !IsValidDir(pTmpDir)) 2026 DosCreateDir(pTmpDir, 0); 2023 2027 BldFullPathName(szTempFile, pTmpDir, PCSZ_FM2PLAYTEMP); 2024 2028 fp = xfopen(szTempFile, modew, pszSrcFile, __LINE__, FALSE); … … 3650 3654 dcd->id = id; 3651 3655 dcd->type = ARC_FRAME; 3652 if (!pTmpDir)3653 strcpy(dcd->workdir, pFM2SaveDirectory);3656 if (pTmpDir && !IsValidDir(pTmpDir)) 3657 DosCreateDir(pTmpDir, 0); 3654 3658 MakeTempName(dcd->workdir, ArcTempRoot, 2); 3655 3659 strcpy(dcd->arcname, fullname); -
trunk/dll/dirsize.c
r1544 r1554 51 51 aren't user settable; realappname should be used for setting applicable to 52 52 one or more miniapp but not to FM/2 53 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *. 53 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). 54 Mostly cast CHAR CONSTANT * as CHAR *. 55 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 56 by temp file creation failures. 54 57 55 58 ***********************************************************************/ … … 957 960 CHAR *modea = "a+"; 958 961 959 if (pTmpDir) 960 strcpy(szFileName, pTmpDir); 961 else 962 if (pTmpDir && !IsValidDir(pTmpDir)) 963 DosCreateDir(pTmpDir, 0); 964 //if (pTmpDir) 965 // strcpy(szFileName, pTmpDir); 966 else if (!pTmpDir) 962 967 strcpy(szFileName, pFM2SaveDirectory); 963 968 sprintf(&szFileName[strlen(szFileName)], "%s%csizes.Rpt", PCSZ_BACKSLASH, -
trunk/dll/inis.c
r1545 r1554 38 38 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *. 39 39 23 Oct 10 GKY Add ForwardslashToBackslash function to streamline code 40 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 41 by temp file creation failures. 40 42 41 43 ***********************************************************************/ … … 1178 1180 /* make copies of new inis */ 1179 1181 *tempuserini = 0; 1180 *tempsysini = 0; 1182 *tempsysini = 0; 1183 if (pTmpDir && !IsValidDir(pTmpDir)) 1184 DosCreateDir(pTmpDir, 0); 1181 1185 BldFullPathName(tempuserini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPUSER.INI"); 1182 1186 rc = DosCopy(userini, tempuserini, DCPY_EXISTING); … … 1189 1193 GetPString(IDS_COMPCOPYFAILEDTEXT), userini, tempuserini); 1190 1194 break; 1191 } 1195 } 1196 if (pTmpDir && !IsValidDir(pTmpDir)) 1197 DosCreateDir(pTmpDir, 0); 1192 1198 BldFullPathName(tempsysini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPSYS.INI"); 1193 1199 rc = DosCopy(sysini, tempsysini, DCPY_EXISTING); -
trunk/dll/init.c
r1553 r1554 101 101 entries in the tree container, fix related semaphore performance using 102 102 combination of event and mutex semaphores 103 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 104 by temp file creation failures. 103 105 104 106 ***********************************************************************/ … … 582 584 strcpy(s, pFM2SaveDirectory); 583 585 AddBackslashToPath(s); 584 //if (s[strlen(s) - 1] != '\\')585 // strcat(s, "\\");586 586 enddir = &s[strlen(s)]; 587 587 strcat(s, "$FM2LI$T."); … … 729 729 ULONG num_matches, ul; 730 730 731 //Save the FM2 save directory name. This is the location of the ini, dat files etc. 732 save_dir2(temp); 733 pFM2SaveDirectory = xstrdup(temp, pszSrcFile, __LINE__); 731 734 strcpy(szTempName, env); 732 735 AddBackslashToPath(szTempName); … … 767 770 rc = DosCreateDir(szTempName, 0); 768 771 if (!rc) 769 pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__); // if writable 772 pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__); // if writable 773 else 774 pTmpDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__); 770 775 } 771 776 } 772 777 } 773 774 //Save the FM2 save directory name. This is the location of the ini, dat files etc.775 {776 CHAR temp[CCHMAXPATH];777 save_dir2(temp);778 pFM2SaveDirectory = xstrdup(temp, pszSrcFile, __LINE__);779 }780 778 // Check free space on TMP and FM2 Save drives 781 779 { -
trunk/dll/killproc.c
r1544 r1554 27 27 aren't user settable; realappname should be used for setting applicable to 28 28 one or more miniapp but not to FM/2 29 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *. 29 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). 30 Mostly cast CHAR CONSTANT * as CHAR *. 31 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 32 by temp file creation failures. 30 33 31 34 ***********************************************************************/ … … 63 66 #include "fortify.h" 64 67 #include "excputil.h" // xbeginthread 68 #include "valid.h" // IsValidDir 65 69 66 70 // Data definitions … … 267 271 268 272 WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID); 273 if (pTmpDir && !IsValidDir(pTmpDir)) 274 DosCreateDir(pTmpDir, 0); 269 275 BldFullPathName(s, pTmpDir, "$PSTAT#$.#$#"); 270 276 unlinkf(s); -
trunk/dll/sysinfo.c
r1544 r1554 17 17 16 JUL 08 GKY Use TMP directory for temp files 18 18 08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used) 19 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 20 by temp file creation failures. 19 21 20 22 ***********************************************************************/ … … 39 41 #include "misc.h" // PostMsg 40 42 #include "strips.h" // bstrip 43 #include "valid.h" // IsValidDir 41 44 42 45 #pragma data_seg(DATA1) … … 62 65 if (!WinIsWindow(thab, hwnd)) 63 66 goto Abort; 67 if (pTmpDir && !IsValidDir(pTmpDir)) 68 DosCreateDir(pTmpDir, 0); 64 69 BldFullPathName(szTempFile, pTmpDir, "$RMVIEW.#$#"); 65 70 unlinkf(szTempFile); -
trunk/dll/systemf.c
r1544 r1554 35 35 17 JAN 10 GKY Add ENVIRONMENT_SIZE vaiable to replace multiple (often different hard coded sizes) set to 2048 36 36 (the largest value I found). 37 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 38 by temp file creation failures. 37 39 38 40 ***********************************************************************/ … … 254 256 CHAR *modew = "w"; 255 257 258 if (pTmpDir && !IsValidDir(pTmpDir)) 259 DosCreateDir(pTmpDir, 0); 256 260 strcpy(listfile, pTmpDir ? pTmpDir : pFM2SaveDirectory); 257 261 MakeTempName(listfile, "$FM2LI$T", 2); -
trunk/dll/undel.c
r1544 r1554 20 20 08 Mar 09 GKY Additional strings move to PCSZs 21 21 28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code. 22 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 23 by temp file creation failures. 22 24 23 25 ***********************************************************************/ … … 92 94 IncrThreadUsage(); 93 95 WinSendDlgItemMsg(hwnd, UNDEL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID); 96 if (pTmpDir && !IsValidDir(pTmpDir)) 97 DosCreateDir(pTmpDir, 0); 94 98 BldFullPathName(szTempFile, pTmpDir, "$UDELETE.#$#"); 95 99 unlinkf(szTempFile); -
trunk/dll/worker.c
r1544 r1554 44 44 26 Jul 09 GKY Fix failure of containers to update when Tree container isn't open in FM2 lite 45 45 13 Dec 09 GKY Attempt to fix container update issues with FM/2 lite 46 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *. 46 17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). 47 Mostly cast CHAR CONSTANT * as CHAR *. 48 20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused 49 by temp file creation failures. 47 50 48 51 ***********************************************************************/ … … 1171 1174 CHAR *modew = "w"; 1172 1175 1173 BldFullPathName(szTempFile, pTmpDir, PCSZ_FM2PLAYTEMP); 1176 if (pTmpDir && !IsValidDir(pTmpDir)) 1177 DosCreateDir(pTmpDir, 0); 1178 BldFullPathName(szTempFile, pTmpDir, PCSZ_FM2PLAYTEMP); 1174 1179 fp = xfopen(szTempFile, modew, pszSrcFile, __LINE__, FALSE); 1175 1180 if (fp) {
Note:
See TracChangeset
for help on using the changeset viewer.
