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

Timestamp:

Nov 21, 2000, 12:36:09 PM (25 years ago)

Author:

sandervl

Message:

Updates for TEB changes

File:

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

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.27 2000-10-18 17:09:33 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.28 2000-11-21 11:35:08 sandervl Exp $ */
 
 /*
@@ -289 +289 @@
   if(fLogging && flog && (dwEnableLogging > 0))
   {
-    THDB *thdb = GetThreadTHDB();
+    TEB *teb = GetThreadTEB();
 
     va_start(argptr, tekst);
-    if(thdb) {
-    thdb->logfile = (DWORD)flog;
+    if(teb) {
+        teb->o.odin.logfile = (DWORD)flog;
         if(sel == 0x150b && !fIsOS2Image) {
-        fprintf(flog, "t%d: (FS=150B) ", thdb->threadId);
-    }
-    else    fprintf(flog, "t%d: ", thdb->threadId);
+        fprintf(flog, "t%d: (FS=150B) ", teb->o.odin.threadId);
+    }
+    else    fprintf(flog, "t%d: ", teb->o.odin.threadId);
     }
     vfprintf(flog, tekst, argptr);
-    if(thdb) thdb->logfile = 0;
+    if(teb) teb->o.odin.logfile = 0;
     va_end(argptr);
 
@@ -342 +342 @@
   if(fLogging && flog && (dwEnableLogging > 0))
   {
-    THDB *thdb = GetThreadTHDB();
+    TEB *teb = GetThreadTEB();
 
     va_start(argptr, tekst);
-    if(thdb) {
-        thdb->logfile = (DWORD)flog;
+    if(teb) {
+        teb->o.odin.logfile = (DWORD)flog;
     }
     vfprintf(flog, tekst, argptr);
-    if(thdb) thdb->logfile = 0;
+    if(teb) teb->o.odin.logfile = 0;
     va_end(argptr);
   }
@@ -376 +376 @@
   if(fLogging && logfile)
   {
-    THDB *thdb = GetThreadTHDB();
+    TEB *teb = GetThreadTEB();
 
     va_start(argptr, tekst);
-    if(thdb) {
-        thdb->logfile = (DWORD)flog;
+    if(teb) {
+        teb->o.odin.logfile = (DWORD)flog;
     }
     vfprintf((FILE *)logfile, tekst, argptr);
-    if(thdb) thdb->logfile = 0;
+    if(teb) teb->o.odin.logfile = 0;
     va_end(argptr);
 
@@ -400 +400 @@
 void LogException(int state)
 {
-  THDB *thdb = GetThreadTHDB();
+  TEB *teb = GetThreadTEB();
   USHORT *lock;
 
-  if(!thdb) return;
-
-  if(thdb->logfile) {
+  if(!teb) return;
+
+  if(teb->o.odin.logfile) {
     if(state == ENTER_EXCEPTION) {
 #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
-        lock = (USHORT *)(thdb->logfile+0x1C);
+        lock = (USHORT *)(teb->o.odin.logfile+0x1C);
 #else
 #error Check the offset of the lock count word in the file stream structure for this compiler revision!!!!!
@@ -416 +416 @@
     else { //LEAVE_EXCEPTION
 #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
-        lock = (USHORT *)(thdb->logfile+0x1C);
+        lock = (USHORT *)(teb->o.odin.logfile+0x1C);
 #else
 #error Check the offset of the lock count word in the file stream structure for this compiler revision!!!!!
@@ -431 +431 @@
 void CheckLogException()
 {
-  THDB *thdb = GetThreadTHDB();
+  TEB *teb = GetThreadTEB();
   USHORT *lock;
 
-  if(!thdb) return;
-
-  if(thdb->logfile) {
+  if(!teb) return;
+
+  if(teb->o.odin.logfile) {
     //oops, exception in vfprintf; let's clear the lock count
 #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
-    lock = (USHORT *)(thdb->logfile+0x1C);
+    lock = (USHORT *)(teb->o.odin.logfile+0x1C);
 #else
 #error Check the offset of the lock count word in the file stream structure for this compiler revision!!!!!