Changeset 1440 for trunk/src

Timestamp:

Oct 25, 1999, 8:20:52 PM (26 years ago)

Author:

achimha

Message:

ported Re/UninitializeCriticalSection from WINE

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (3 diffs)
• KERNEL32.DEF (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.23 1999-10-22 18:07:20 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.24 1999-10-25 18:20:52 achimha Exp $ */
 
 /*
@@ -338 +338 @@
 //******************************************************************************
 //******************************************************************************
-void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *arg1 )
+void WIN32API MakeCriticalSectionGlobal( CRITICAL_SECTION *arg1 )
 {
     dprintf(("KERNEL32:  MakeCriticalSectionGlobal not implemented correctly\n"));
+}
+//******************************************************************************
+//******************************************************************************
+/***********************************************************************
+ *           ReinitializeCriticalSection   (KERNEL32.581)
+ */
+void WIN32API ReinitializeCriticalSection( CRITICAL_SECTION *crit )
+{
+    dprintf(("KERNEL32: ReinitializeCriticalSection\n"));
+    if ( !crit->LockSemaphore )
+        InitializeCriticalSection( crit );
+
+    else if ( crit->Reserved && crit->Reserved != GetCurrentProcessId() )
+    {
+//        FIXME_(win32)("(%p) called for %08lx first, %08lx now: making global\n", 
+//               crit, crit->Reserved, GetCurrentProcessId() );
+
+        MakeCriticalSectionGlobal( crit );
+    }
+}
+//******************************************************************************
+//******************************************************************************
+/***********************************************************************
+ *           UninitializeCriticalSection   (KERNEL32.703)
+ */
+void WIN32API UninitializeCriticalSection( CRITICAL_SECTION *crit )
+{
+    dprintf(("KERNEL32: UninitializeCriticalSection\n"));
+    if ( crit->LockSemaphore )
+    {
+        if ( crit->Reserved )  /* not global */
+            DeleteCriticalSection( crit );
+//        else
+//            FIXME_(win32)("(%p) for %08lx: Crst is global, don't know whether to delete\n", 
+//                   crit, GetCurrentProcessId() );
+    }
 }
 //******************************************************************************
@@ -869 +905 @@
 
 
-//******************************************************************************
-VOID WIN32API UninitializeCriticalSection(CRITICAL_SECTION * lpcsCriticalSection)
-{
-  dprintf(("KERNEL32:  UninitializeCriticalSection NOT IMPLEMENTED\n"));
-}
-
 int WIN32API GetNumberFormatA(LCID     Locale,
                                  DWORD    dwFlags,

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.43 1999-10-20 08:09:04 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.44 1999-10-25 18:20:52 achimha Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -687 +687 @@
     ReadProcessMemory          = _ReadProcessMemory@20       @579
     RegisterServiceProcess     = _RegisterServiceProcess@8   @580       ;W95
-;   ReinitializeCriticalSection  = _ReinitializeCriticalSection@?? @581 ;W95
+   ReinitializeCriticalSection  = _ReinitializeCriticalSection@4 @581 ;W95
 ;   RegisterConsoleVDM         = _RegisterConsoleVDM@??                 ;NT
 ;   RegisterWaitForInputIdle   = _RegisterWaitForInputIdle@??           ;NT