Changeset 433 for trunk/src/kernel32/misc.cpp

Timestamp:

Aug 6, 1999, 11:03:04 AM (26 years ago)

Author:

phaller

Message:

Fix: WriteLog requires to be bracketed in RestoreFS / SetFS, too. The VAC runtime accesses FS directly here!

File:

• trunk/src/kernel32/misc.cpp (modified) (8 diffs)

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.3 1999-06-19 10:54:42 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.4 1999-08-06 09:03:04 phaller Exp $ */
 
 /*
- *
  * Project Odin Software License can be found in LICENSE.TXT
- *
- */
-/*
  * Logging procedures
  *
@@ -14 +10 @@
  *
  */
+
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
 #define INCL_BASE
 #define INCL_WIN
 #define INCL_WINERRORS
 #define INCL_DOSFILEMGR
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>                     //Odin32 OS/2 api wrappers
 #include <stdio.h>
 #include <stdlib.h>
@@ -27 +29 @@
 
 
-//#define PMPRINTF
+/*****************************************************************************
+ * PMPRINTF Version                                                          *
+ *****************************************************************************/
+
 #ifdef PMPRINTF
 
@@ -46 +51 @@
 #define PRINTFIDSIZE sizeof(PRINTFID)
 #define PRINTFMAXBUF PRINTFIDSIZE+PRINTFLINELEN
+
+
+/*****************************************************************************
+ * Structures                                                                *
+ *****************************************************************************/
 
 /* ----- Per-thread output buffer and current indices into line ---- */
@@ -63 +73 @@
 /* ----- Local subroutine ----- */
 static int printf_(struct perthread *);
+
 
 /* ----------------------------------------------------------------- */
@@ -220 +231 @@
   return 0;                        /* success! */
   } /* printf_ */
-#else
-
+#endif
+
+
+
+/*****************************************************************************
+ * Standard Version                                                          *
+ *****************************************************************************/
 
 #if 1   /*PLF Mon  97-09-08 20:04:28*/
@@ -230 +246 @@
 int SYSTEM EXPORT WriteLog(char *tekst, ...)
 {
-    va_list argptr;
-    if(!init){
-        init = TRUE;
-        if(!getenv("NOWIN32LOG")) {
-             flog = fopen("win32os2.log", "w");
-    }
-    else fLogging = FALSE;
-    }
-
-    if(fLogging && flog){
-        va_start(argptr, tekst);
-        vfprintf(flog, tekst, argptr);
-        va_end(argptr);
+  USHORT  sel = RestoreOS2FS();
+  va_list argptr;
+
+  if(!init)
+  {
+    init = TRUE;
+
+    if(!getenv("NOWIN32LOG"))
+      flog = fopen("win32os2.log", "w");
+    else
+      fLogging = FALSE;
+  }
+
+  if(fLogging && flog)
+  {
+    va_start(argptr, tekst);
+    vfprintf(flog, tekst, argptr);
+    va_end(argptr);
+
     if(tekst[strlen(tekst)-1] != '\n')
-        fprintf(flog, "\n");
-    }
-    return 1;
+      fprintf(flog, "\n");
+  }
+
+  SetFS(sel);
+  return 1;
 }
 
 int SYSTEM EXPORT WriteLogError(char *tekst, ...)
 {
-    va_list argptr;
-
-    va_start(argptr, tekst);
-    printf("ERROR: ");
-    vprintf(tekst, argptr);
-    va_end(argptr);
-    if(tekst[strlen(tekst)-1] != '\n') {
+  USHORT  sel = RestoreOS2FS();
+  va_list argptr;
+
+  va_start(argptr, tekst);
+  printf("ERROR: ");
+  vprintf(tekst, argptr);
+  va_end(argptr);
+  if(tekst[strlen(tekst)-1] != '\n')
     printf("\n");
-    }
-
-    return 1;
+
+  SetFS(sel);
+  return 1;
 }
-
-#else   /*PLF Mon  97-09-08 20:04:26*/
+#endif
+
+
+/*****************************************************************************
+ * Modified Standard Version                                                 *
+ *****************************************************************************/
+
+#if 0   /*PLF Mon  97-09-08 20:04:26*/
 /******************************************************************************/
 static BOOL init = FALSE;
@@ -310 +341 @@
 }
 #endif  /*PLF Mon  97-09-08 20:04:23*/
-/******************************************************************************/
-/******************************************************************************/
-
-
-#endif
+