Changeset 1075

Timestamp:

07/18/08 06:44:01 (3 months ago)

Author:

gyoung

Message:

Debulked TMP code; Added comments;

Location:

trunk/dll

Files:

• arccnrs.c (modified) (1 diff)
• filldir.c (modified) (1 diff)
• fm3dll.h (modified) (1 diff)
• init.c (modified) (5 diffs)
• killproc.c (modified) (3 diffs)
• sysinfo.c (modified) (2 diffs)
• undel.c (modified) (2 diffs)
• worker.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -1859 +1859 @@
                 CHAR szTempFile[CCHMAXPATH];
 
-                if (fUseTmp)
-                  BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
-                else
-                  strcpy(szTempFile, "$FM2PLAY.$$$");
-
+                BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
                 fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
                 if (fp) {

trunk/dll/filldir.c

@@ -42 +42 @@
   29 Feb 08 GKY Use xfree where appropriate
   07 Jul 08 SHL Use NULL rather than NullStr in FreeCnrItemData
+  16 JUL 08 GKY Use TMP directory for temp files
 
 ***********************************************************************/

trunk/dll/fm3dll.h

@@ -83 +83 @@
                 all the details view settings (both the global variables and those in the
                 DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+  16 JUL 08 GKY Use TMP directory for temp files
 
 ***********************************************************************/

trunk/dll/init.c

@@ -49 +49 @@
                 all the details view settings (both the global variables and those in the
                 DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+  16 JUL 08 GKY Use TMP directory for temp files
   17 Jul 08 SHL Reduce code bulk in fUseTmp setup
 
@@ -455 +456 @@
   /* cleanup */
   static CHAR s[CCHMAXPATH];
-  CHAR *enddir;
+  CHAR *enddir, szTempFile[CCHMAXPATH];
   HDIR search_handle;
   ULONG num_matches;
@@ -538 +539 @@
     DosFindClose(search_handle);
   }
-  if (fUseTmp) {
-    CHAR szTempFile[CCHMAXPATH];
-
-    BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
-    DosForceDelete(szTempFile);
-  }
-  else
-    DosForceDelete("$FM2PLAY.$$$");
-
+  BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
+  DosForceDelete(szTempFile);
   EndNote();
   if (FM3ModHandle)
@@ -666 +660 @@
       if (fs3.attrFile & FILE_DIRECTORY) {
         // 17 Jul 08 SHL fixme to check writable someday
-        BldFullPathName(ArcTempRoot, env, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
         pTmpDir = xstrdup(env, pszSrcFile, __LINE__);
         fUseTmp = TRUE;
@@ -672 +665 @@
     }
   }
-  if (!fUseTmp) {
-    if (!fAmAV2)
-      strcpy(ArcTempRoot, "$FM$ARC$");
-    else
-      strcpy(ArcTempRoot, "$AV$ARC$");
-  }
+  BldFullPathName(ArcTempRoot, env, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
 
   /* initialize random number generator */

trunk/dll/killproc.c

@@ -18 +18 @@
   02 Sep 07 GKY Replaced DosQProcStatus with DosQuerySysState to fix trap in thunk code
   02 Sep 07 SHL Expand FillKillListThread2 stack to avoid exception in __TNK
+  16 JUL 08 GKY Use TMP directory for temp files
 
 ***********************************************************************/
@@ -237 +238 @@
 
   WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-  if (fUseTmp)
-    BldFullPathName(s, pTmpDir, "$PSTAT#$.#$#");
-  else
-    strcpy(s, "$PSTAT#$.#$#");
+  BldFullPathName(s, pTmpDir, "$PSTAT#$.#$#");
   unlinkf("%s", s);
   fp = fopen(s, "w");
@@ -307 +305 @@
   }
 Abort:
-  if (fUseTmp) {
-    CHAR szTempFile[CCHMAXPATH];
-
-    BldFullPathName(szTempFile, pTmpDir, "$PSTAT#$.#$#");
-    DosForceDelete(szTempFile);
-  }
-  else
-    DosForceDelete("$PSTAT#$.#$#");
+  BldFullPathName(s, pTmpDir, "$PSTAT#$.#$#");
+  DosForceDelete(s);
   PostMsg(hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
   WinDestroyMsgQueue(thmq);

trunk/dll/sysinfo.c

@@ -15 +15 @@
   29 Jul 06 SHL Use xfgets
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  16 JUL 08 GKY Use TMP directory for temp files
 
 ***********************************************************************/
@@ -49 +50 @@
     if (!WinIsWindow(thab, hwnd))
       goto Abort;
-    if (fUseTmp)
-      BldFullPathName(szTempFile, pTmpDir, "$RMVIEW.#$#");
-    else
-      strcpy(szTempFile, "$RMVIEW.#$#");
+    BldFullPathName(szTempFile, pTmpDir, "$RMVIEW.#$#");
     unlinkf("%s", szTempFile);
     fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);

trunk/dll/undel.c

@@ -15 +15 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   29 Feb 08 GKY Use xfree where appropriate
+  16 JUL 08 GKY Use TMP directory for temp files
 
 ***********************************************************************/
@@ -73 +74 @@
     IncrThreadUsage();
     WinSendDlgItemMsg(hwnd, UNDEL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-    if (fUseTmp)
-      BldFullPathName(szTempFile, pTmpDir, "$UDELETE.#$#");
-    else
-      strcpy(szTempFile, "$UDELETE.#$#");
+    BldFullPathName(szTempFile, pTmpDir, "$UDELETE.#$#");
     unlinkf("%s", szTempFile);
     fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);

trunk/dll/worker.c

@@ -1069 +1069 @@
 
                 FILE *fp;
-                CHAR TempFile[CCHMAXPATH];
-
-                if (fUseTmp)
-                  BldFullPathName(TempFile, pTmpDir, "$FM2PLAY.$$$");
-                else
-                  strcpy(TempFile, "$FM2PLAY.$$$");
-
-                fp = xfopen(TempFile, "w", pszSrcFile, __LINE__);
+                CHAR szTempFile[CCHMAXPATH];
+
+                BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
+                fp = xfopen(szTempFile, "w", pszSrcFile, __LINE__);
                 if (fp) {
                   fprintf(fp, "%s", ";AV/2-built FM2Play listfile\n");
@@ -1083 +1079 @@
                   fprintf(fp, ";end\n");
                   fclose(fp);
-                  strrev(TempFile);
-                  strcat(TempFile, "@/");
-                  strrev(TempFile);
-                  RunFM2Util("FM2PLAY.EXE", TempFile);
-                }
-                /*FILE *fp;
-
-                fp = xfopen("$FM2PLAY.$$$", "w", pszSrcFile, __LINE__);
-                if (fp) {
-                  fprintf(fp, "%s", ";FM/2-built FM2Play listfile\n");
-                  for (x = 0; wk->li->list[x]; x++)
-                    fprintf(fp, "%s\n", wk->li->list[x]);
-                  fprintf(fp, ";end\n");
-                  fclose(fp);
-                  RunFM2Util("FM2PLAY.EXE", "/#$FM2PLAY.$$$");
-                  break;
-                }*/
+                  strrev(szTempFile);
+                  strcat(szTempFile, "@/");
+                  strrev(szTempFile);
+                  RunFM2Util("FM2PLAY.EXE", szTempFile);
+                }
               }
             }