Changeset 1456 for trunk/src/ddraw

Timestamp:

Oct 26, 1999, 7:53:43 PM (26 years ago)

Author:

sandervl

Message:

log fixes (FS)

Location:

trunk/src/ddraw

Files:

• initterm.cpp (modified) (6 diffs)
• initterm.h (added)
• makefile (modified) (2 diffs)
• misc.cpp (modified) (2 diffs)

trunk/src/ddraw/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.9 1999-09-15 23:26:06 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.10 1999-10-26 17:52:31 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 #include <odinlx.h>
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
+#include "initterm.h"
 
 extern "C" {
@@ -40 +41 @@
 void CDECL _ctordtorTerm( void );
 }
+
+char ddrawPath[CCHMAXPATH] = "";
 
 /*-------------------------------------------------------------------*/
@@ -72 +75 @@
    switch (ulFlag) {
       case 0 :
+      {
          _ctordtorInit();
+
+         DosQueryModuleName(hModule, CCHMAXPATH, ddrawPath);
+         char *endofpath = strrchr(ddrawPath, '\\');
+         if(endofpath) *(endofpath+1) = 0;
 
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
@@ -89 +97 @@
 
          break;
+      }
       case 1 :
          UnregisterLxDll(hModule);
@@ -106 +115 @@
 {
    _ctordtorTerm();
+   CloseLogFile();
    DosExitList(EXLST_EXIT, cleanup);
    return ;

trunk/src/ddraw/makefile

@@ -54 +54 @@
     $(PDWIN32_INCLUDE)\win\d3d.h
 
-misc.obj: misc.cpp
+misc.obj: misc.cpp initterm.h
 
 os2palette.obj: os2palette.cpp  \
@@ -84 +84 @@
 rectangle.obj: rectangle.cpp
 
-initterm.obj: initterm.cpp
+initterm.obj: initterm.cpp initterm.h
 
 clean:
-  $(RM) *.obj *.lib *.dll *~ *.map *.pch
+  $(RM) *.obj *.lib *.dll *.map *.pch
   $(RM) $(PDWIN32_BIN)\$(TARGET).dll
   $(RM) $(PDWIN32_LIB)\$(TARGET).lib

trunk/src/ddraw/misc.cpp

@@ -8 +8 @@
 #include <string.h>
 #include <stdarg.h>
-#include "misc.h"
-
+#include <misc.h>
+#include "initterm.h"
 
 //#define PMPRINTF
@@ -235 +235 @@
 
 
-#if 1   /*PLF Mon  97-09-08 20:04:28*/
+/*****************************************************************************
+ * Standard Version                                                          *
+ *****************************************************************************/
+
 static FILE *flog = NULL;   /*PLF Mon  97-09-08 20:00:15*/
 static BOOL init = FALSE;
+static BOOL fLogging = TRUE;
 
 int SYSTEM EXPORT WriteLog(char *tekst, ...)
 {
+  USHORT  sel = RestoreOS2FS();
   va_list argptr;
+
   if(!init)
   {
     init = TRUE;
-    if(!getenv("NODDRAWLOG"))
-      flog = fopen("DDRAW.log", "w");
-  }
-
-  if(flog)
+
+    if(!getenv("NODDRAWLOG")) {
+        char logname[CCHMAXPATH];
+
+        flog = fopen("DDRAW.log", "w");
+        if(flog == NULL) {//probably running exe on readonly device
+                sprintf(logname, "%sddraw.log", ddrawPath);
+                flog = fopen(logname, "w");
+        }
+    }
+    else
+      fLogging = FALSE;
+  }
+
+  if(fLogging && flog)
   {
-     va_start(argptr, tekst);
-     vfprintf(flog, tekst, argptr);
-     va_end(argptr);
-     fflush(flog);
-  }
+    va_start(argptr, tekst);
+    vfprintf(flog, tekst, argptr);
+    va_end(argptr);
+
+    if(tekst[strlen(tekst)-1] != '\n')
+      fprintf(flog, "\n");
+  }
+
+  SetFS(sel);
   return 1;
 }
-#else   /*PLF Mon  97-09-08 20:04:26*/
-/******************************************************************************/
-static BOOL init = FALSE;
-static BOOL fLog = TRUE;
-/******************************************************************************/
-int SYSTEM EXPORT WriteLog(char *tekst, ...)
-{
-  ULONG Action, Wrote;
-  HFILE log;
-  APIRET rc;
-  char message[4096];
-  va_list argptr;
-  ULONG openFlags = OPEN_ACTION_CREATE_IF_NEW;
-
-  if(fLog == FALSE)
-    return(FALSE);
-
-  if(!init)
-  {
-    init = TRUE;
-    openFlags |= OPEN_ACTION_REPLACE_IF_EXISTS;
-    if(getenv("NOWIN32LOG"))
-      fLog = FALSE;
-  }
-  else
-    openFlags |= OPEN_ACTION_OPEN_IF_EXISTS;
-
-  rc = DosOpen( "win32os2.log",
-                &log,           /* file handle returned */
-                &Action,
-                0L,
-                FILE_NORMAL,
-                openFlags,
-                OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYWRITE,
-                (PEAOP2)NULL);
-
-   rc = DosSetFilePtr(log, 0, FILE_END, &Wrote);
-   va_start(argptr, tekst);
-   vsprintf(message, tekst, argptr);
-   va_end(argptr);
-
-   rc = DosWrite(log, message, strlen(message), &Wrote);
-
-   DosClose(log);   /*PLF Mon  97-09-08 20:01:43*/
-   return(TRUE);
+//******************************************************************************
+//NOTE: No need to save/restore FS, as our FS selectors have already been
+//      destroyed and FS == 0x150B.
+//******************************************************************************
+void CloseLogFile()
+{
+  fclose(flog);
+  flog = 0;
 }
-#endif  /*PLF Mon  97-09-08 20:04:23*/
-/******************************************************************************/
-/******************************************************************************/
-
-
 #endif