Changeset 4067 for trunk/src

Timestamp:

Aug 22, 2000, 4:45:41 AM (25 years ago)

Author:

phaller

Message:

implemented _lock, _unlock, CxxThrowException

Location:

trunk/src/msvcrt

Files:

• msvcrt.cpp (modified) (4 diffs)
• msvcrt.def (modified) (3 diffs)

trunk/src/msvcrt/msvcrt.cpp

@@ -1 @@
-/* $Id: msvcrt.cpp,v 1.12 2000-06-21 17:33:37 phaller Exp $ */
+/* $Id: msvcrt.cpp,v 1.13 2000-08-22 02:45:40 phaller Exp $ */
 
 /*
@@ -14 +14 @@
 #include <wchar.h>
 #include <math.h>
+#include <string.h>
+
 #include <heapstring.h>
 #include <crtdll.h>
+
+#include <win/winbase.h>
+#include <win/winnt.h>
 #include "msvcrt.h"
 
@@ -611 +616 @@
  *      FIXME - Could not find anything about it
  */
-INT CDECL MSVCRT__CxxThrowException(DWORD ret)
-{
-  dprintf(("MSVCRT: _CxxThrowException not implemented.\n"));
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return FALSE;
+
+static EXCEPTION_RECORD cxxExceptionFrame =
+{ 0x0e06d763, // Exception Code
+  0x00000001, // Exception Flags
+  0x00000000, // Exception Record Pointer
+  0x00000000, // Exception Address
+  0x00000003, // Number Of Parameters
+  0x19930520, // Parameter #1
+  0x00000000, // Parameter #2
+  0x00000000  // Parameter #3
+};
+
+VOID CDECL MSVCRT__CxxThrowException(DWORD arg1,
+                                     DWORD arg2)
+{
+  EXCEPTION_RECORD er;
+  
+  dprintf(("MSVCRT: _CxxThrowException %08xh %08xh\n",
+           arg1,
+           arg2));
+  
+  //memcpy(er, cxxExceptionFrame, sizeof(er));
+  // PH: optimization - why copying values when they're overwritten anyway...
+  memcpy(&er, &cxxExceptionFrame, 6);
+  
+  // Note: er.ExceptionInformation[0] is already set!
+  er.ExceptionInformation[1] = arg1;
+  er.ExceptionInformation[2] = arg2;
+  
+  RaiseException(er.ExceptionCode,
+                 er.ExceptionFlags,
+                 er.NumberParameters,
+                 &er.ExceptionInformation[0]);
 }
 
@@ -1218 +1251 @@
 
 /*********************************************************************
+ *                  _unlock    (MSVCRT.480)
+ */
+// Note: PH 2000/08/22 array size is probably larger than 0x12!
+static CRITICAL_SECTION* arrpCriticalSections[0x12] = {0};
+
+#define CRITSEC_TABLE_LOCK 0x11
+ 
+VOID CDECL MSVCRT__unlock(unsigned long ulIndex)
+{
+  dprintf(("MSVCRT: _unlock\n"));
+  
+  CRITICAL_SECTION *pCS = arrpCriticalSections[ulIndex];
+  LeaveCriticalSection(pCS);
+}
+
+
+/*********************************************************************
+ *                  _lock    (MSVCRT.318)
+ */
+// Prototype from CRTDLL.CPP
+VOID CDECL amsg_exit(int errnum);
+
+VOID CDECL MSVCRT__lock(unsigned long ulIndex)
+{
+  dprintf(("MSVCRT: _lock\n"));
+  
+  CRITICAL_SECTION *pCS = arrpCriticalSections[ulIndex];
+  if (pCS == NULL)
+  {
+    CRITICAL_SECTION *pCSNew;
+    
+    pCSNew = (CRITICAL_SECTION*)malloc( sizeof(CRITICAL_SECTION) );
+    if (pCSNew == NULL)
+      amsg_exit(0x11); // yield error message
+    
+    MSVCRT__lock(CRITSEC_TABLE_LOCK); // lock table
+    if (pCS != NULL) // has been modified meanwhile by other thread ?
+      free(pCSNew);
+    else
+    {
+      InitializeCriticalSection(pCSNew);
+      arrpCriticalSections[ulIndex] = pCSNew;
+    }
+      
+    MSVCRT__unlock(CRITSEC_TABLE_LOCK); // unlock table
+  }
+    
+  EnterCriticalSection(pCS);
+}
+
+
+/*********************************************************************
  *                  _lseeki64    (MSVCRT.326)
  */

trunk/src/msvcrt/msvcrt.def

@@ -1 @@
-; $Id: msvcrt.def,v 1.17 2000-06-21 17:33:37 phaller Exp $
+; $Id: msvcrt.def,v 1.18 2000-08-22 02:45:41 phaller Exp $
 
 ;
@@ -329 +329 @@
     _loaddll                    = _CRTDLL__loaddll              @316
     _local_unwind2              = _CRTDLL__local_unwind2        @317
-;   _lock                                                       @318
+    _lock                       = _MSVCRT__lock                 @318
     _locking                    = _CRTDLL__locking              @319
     _logb                       = _CRTDLL__logb                 @320
@@ -493 +493 @@
     _unlink                     = _CRTDLL__unlink               @478
     _unloaddll                  = _CRTDLL__unloaddll            @479
-;   _unlock                                                     @480
+    _unlock                     = _MSVCRT__unlock               @480
     _utime                      = _CRTDLL__utime                @481
     _vsnprintf                  = _CRTDLL__vsnprintf            @482