Changeset 5090 for trunk/src/kernel32

Timestamp:

Feb 11, 2001, 11:35:29 AM (25 years ago)

Author:

sandervl

Message:

Update for VAC 3.6.5

Location:

trunk/src/kernel32

Files:

• misc.cpp (modified) (3 diffs)
• thread.H (modified) (2 diffs)
• thread.cpp (modified) (3 diffs)
• winexebase.cpp (modified) (3 diffs)

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.29 2001-01-29 01:21:28 bird Exp $ */
+/* $Id: misc.cpp,v 1.30 2001-02-11 10:34:44 sandervl Exp $ */
 
 /*
@@ -410 +410 @@
         PUSHORT lock = (USHORT *)(teb->o.odin.logfile+0x1C);
 #else
+#if __IBMC__ >= 360 || __IBMCPP__ >= 360
+//TODO: test this!!!!!!!
+        PUSHORT 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!!!!!
+#endif
 #endif
         if (state == ENTER_EXCEPTION)
@@ -445 +450 @@
     lock = (PUSHORT)(teb->o.odin.logfile+0x1C);
 #else
+#if __IBMC__ >= 360 || __IBMCPP__ >= 360
+//TODO: test this!!!!!!!
+        PUSHORT 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!!!!!
+#endif
 #endif
     (*lock)--;

trunk/src/kernel32/thread.H

@@ -1 @@
-/* $Id: thread.H,v 1.6 2000-03-16 19:20:40 sandervl Exp $ */
+/* $Id: thread.H,v 1.7 2001-02-11 10:34:44 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
 #ifndef __THREAD_H__
 #define __THREAD_H__
-
-//Why the @#%@#$ didn't IBM use _stdcall??
 
 typedef DWORD (* WIN32API WIN32THREADPROC)(LPVOID);

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.26 2000-11-21 11:35:09 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.27 2001-02-11 10:34:45 sandervl Exp $ */
 
 /*
@@ -25 +25 @@
 #include "thread.h"
 #include <misc.h>
+#include <cpuhlp.h>
 #include <wprocess.h>
 #include <windllbase.h>
@@ -132 +133 @@
 
   //Set default FPU control word (no exceptions); same as in NT
-  _control87(0x27F, 0xFFF);
+  CONTROL87(0x27F, 0xFFF);
   rc = winthread(userdata);
 

trunk/src/kernel32/winexebase.cpp

@@ -1 @@
-/* $Id: winexebase.cpp,v 1.12 2000-10-06 11:04:01 sandervl Exp $ */
+/* $Id: winexebase.cpp,v 1.13 2001-02-11 10:34:45 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #include <wprocess.h>
 #include <pefile.h>
+#include <cpuhlp.h>
 #include "exceptions.h"
 #include "exceptutil.h"
@@ -114 +115 @@
 
   //Set default FPU control word (no exceptions); same as in NT
-  _control87(0x27F, 0xFFF);
-#if 0
-  ULONG Size = 16, Attr;
-  rc = DosQueryMem((PVOID) (entryPoint), &Size, &Attr);
-  dprintf(("Start exe; Attr = %x, rc = %d", Attr, rc));
-#else
+  CONTROL87(0x27F, 0xFFF);
   dprintf(("Start exe"));
-#endif
   rc = ((WIN32EXEENTRY)entryPoint)(NULL);
   RestoreOS2TIB();