Changeset 3275 for trunk/src/kernel32

Timestamp:

Mar 29, 2000, 7:17:18 PM (25 years ago)

Author:

sandervl

Message:

Critical section changes

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (3 diffs)
• critsection.cpp (modified) (2 diffs)
• exceptutil.asm (modified) (4 diffs)
• winimgres.cpp (modified) (3 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.76 2000-03-29 15:17:27 cbratschi Exp $
+; $Id: KERNEL32.DEF,v 1.77 2000-03-29 17:17:17 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -679 +679 @@
 ;   QueryWin31IniFilesMappedToRegistry = _QueryWin31IniFilesMappedToRegistry@?? ;NT
 ;   QueueUserAPC               = _QueueUserAPC@??            @566
-    RaiseException             = RaiseExceptionAsm           @567
+    RaiseException             = _RaiseException@16          @567
     ReadConsoleA               = _ReadConsoleA@20            @568
     ReadConsoleInputA          = _ReadConsoleInputA@16       @569
@@ -710 +710 @@
     RtlFillMemory              = _RtlFillMemory@12           @588
     RtlMoveMemory              = _RtlMoveMemory@12           @589
-    RtlUnwind                  = RtlUnwindAsm                   @590
+    RtlUnwind                  = _RtlUnwind@16               @590
     RtlZeroMemory              = _RtlZeroMemory@8            @591
     SMapLS                     = _SMapLS@4                   @592       ;W95

trunk/src/kernel32/critsection.cpp

@@ -1 @@
-/* $Id: critsection.cpp,v 1.4 2000-02-16 14:25:36 sandervl Exp $ */
+/* $Id: critsection.cpp,v 1.5 2000-03-29 17:17:17 sandervl Exp $ */
 /*
  * Win32 critical sections
@@ -87 +87 @@
             return;
         }
+
         /* Now wait for it */
-
-        if ( crit->Reserved && crit->Reserved != GetCurrentProcessId() )
+        for (;;)
         {
-            dprintf(("Crst %p belongs to process %ld, current is %ld!\n", 
-                          crit, crit->Reserved, GetCurrentProcessId() ));
-            return;
-        }
-
-        res = ODIN_WaitForSingleObject( crit->LockSemaphore, 5000L );
-        if ( res == WAIT_TIMEOUT )
-        {
-            dprintf(("Critical section %p wait timed out, retrying (60 sec)\n", crit ));
-            res = WaitForSingleObject( crit->LockSemaphore, 60000L );
-        }
-        if ( res == WAIT_TIMEOUT && TRACE_ON(relay) )
-        {
-            dprintf(("Critical section %p wait timed out, retrying (5 min)\n", crit ));
-            res = WaitForSingleObject( crit->LockSemaphore, 300000L );
-        }
-        if (res != STATUS_WAIT_0)
-        {
-            dprintf(("Critical section %p wait failed err=%lx\n", crit, res ));
-            /* FIXME: should raise an exception */
+            res = ODIN_WaitForSingleObject( crit->LockSemaphore, 5000L );
+            if ( res == WAIT_TIMEOUT )
+            {
+                dprintf(("Critical section %p wait timed out, retrying (60 sec)\n", crit ));
+                res = ODIN_WaitForSingleObject( crit->LockSemaphore, 60000L );
+                if ( res == WAIT_TIMEOUT && TRACE_ON(relay) )
+                {
+                    dprintf(("Critical section %p wait timed out, retrying (5 min)\n", crit ));
+                    res = WaitForSingleObject( crit->LockSemaphore, 300000L );
+                }
+            }
+            if (res == STATUS_WAIT_0) break;
+
+#if 0
+            EXCEPTION_RECORD rec;
+
+            rec.ExceptionCode    = EXCEPTION_CRITICAL_SECTION_WAIT;
+            rec.ExceptionFlags   = 0;
+            rec.ExceptionRecord  = NULL;
+            rec.ExceptionAddress = RaiseException;  /* sic */
+            rec.NumberParameters = 1;
+            rec.ExceptionInformation[0] = (DWORD)crit;
+            RtlRaiseException( &rec );
+#endif
+            RaiseException(EXCEPTION_CRITICAL_SECTION_WAIT, 0, 1, (DWORD *)crit);
         }
     }

trunk/src/kernel32/exceptutil.asm

@@ -1 @@
-; $Id: exceptutil.asm,v 1.5 2000-02-16 14:25:40 sandervl Exp $
+; $Id: exceptutil.asm,v 1.6 2000-03-29 17:17:18 sandervl Exp $
 
 ;/*
@@ -12 +12 @@
 
 CODE32          SEGMENT DWORD PUBLIC USE32 'CODE'
-        public  RaiseExceptionAsm
+        public  _RaiseException@16
         extrn   OS2RAISEEXCEPTION : near
 
-RaiseExceptionAsm proc near
+_RaiseException@16 proc near
         push dword ptr [esp+4]  ;DWORD dwExceptionCode
         push dword ptr [esp+12] ;DWORD dwExceptionFlags
@@ -47 +47 @@
 
         ret 20      ;__stdcall
-RaiseExceptionAsm endp
-
-        public  RtlUnwindAsm
+_RaiseException@16 endp
+
+        public  _RtlUnwind@16
         extrn   OS2RTLUNWIND : near
 
-RtlUnwindAsm proc near
+_RtlUnwind@16 proc near
         push dword ptr [esp+4]  ;PWINEXCEPTION_FRAME  pEndFrame
         push dword ptr [esp+12] ;LPVOID unusedEip
@@ -84 +84 @@
 
         ret 20      ;__stdcall
-RtlUnwindAsm endp
+_RtlUnwind@16 endp
 
 

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.33 2000-03-24 19:25:34 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.34 2000-03-29 17:17:18 sandervl Exp $ */
 
 /*
@@ -224 +224 @@
     pData = getPEResourceEntry(id, type, lang);
     if(pData == NULL) {
-        dprintf(("Win32ImageBase::getPEResourceSize: couldn't find resource %d (type %d, lang %d)", id, type, lang));
+        dprintf(("Win32ImageBase::getPEResourceSize: couldn't find resource %d (type %d, lang %x)", id, type, lang));
         return 0;
     }
@@ -265 +265 @@
     if(pData == NULL) {
         if(HIWORD(id)) {
-                dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %s (type %d, lang %d)", szModule, id, type, lang));
-        }
-        else    dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %d (type %d, lang %d)", szModule, id, type, lang));
+                dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %s (type %d, lang %x)", szModule, id, type, lang));
+        }
+        else    dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %d (type %d, lang %x)", szModule, id, type, lang));
         return 0;
     }