Changeset 1641 for trunk/src

Timestamp:

Nov 8, 1999, 9:53:24 PM (26 years ago)

Author:

sandervl

Message:

Critical section Wine port + mmap fix (limit size of mmap files)

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (4 diffs)
• critsection.cpp (added)
• kobjects.cpp (modified) (2 diffs)
• makefile (modified) (2 diffs)
• mmap.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.27 1999-11-08 13:43:12 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.28 1999-11-08 20:53:24 sandervl Exp $ */
 
 /*
@@ -317 +317 @@
 //******************************************************************************
 //******************************************************************************
-VOID WIN32API EnterCriticalSection(CRITICAL_SECTION * lpcsCriticalSection)
-{
-////    dprintf(("KERNEL32:  EnterCriticalSection\n"));
-    O32_EnterCriticalSection(lpcsCriticalSection);
-}
-//******************************************************************************
-//******************************************************************************
-VOID WIN32API LeaveCriticalSection(CRITICAL_SECTION * arg1)
-{
-////    dprintf(("KERNEL32:  LeaveCriticalSection\n"));
-    O32_LeaveCriticalSection(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-VOID WIN32API InitializeCriticalSection(CRITICAL_SECTION * arg1)
-{
-    dprintf(("KERNEL32:  InitializeCriticalSection\n"));
-    O32_InitializeCriticalSection(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() );
-    }
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API SetEnvironmentVariableA(LPCSTR arg1, LPCSTR arg2)
 {
@@ -456 +393 @@
 DWORD WIN32API GetCurrentProcessId(void)
 {
-    dprintf(("KERNEL32:  GetCurrentProcessId\n"));
+//    dprintf(("KERNEL32:  GetCurrentProcessId\n"));
     return O32_GetCurrentProcessId();
 }
@@ -527 +464 @@
 //******************************************************************************
 //SvL: 24-6-'97 - Added
-//******************************************************************************
-VOID WIN32API DeleteCriticalSection( CRITICAL_SECTION * arg1)
-{
-    dprintf(("KERNEL32:  OS2DeleteCriticalSection\n"));
-    O32_DeleteCriticalSection(arg1);
-}
-//******************************************************************************
 //******************************************************************************
 BOOL WIN32API Beep( DWORD arg1, DWORD  arg2)

trunk/src/kernel32/kobjects.cpp

@@ -1 @@
-/* $Id: kobjects.cpp,v 1.7 1999-11-04 20:03:08 phaller Exp $ */
+/* $Id: kobjects.cpp,v 1.8 1999-11-08 20:53:24 sandervl Exp $ */
 
 /*
@@ -389 +389 @@
               LPCSTR, arg4)
 {
-  dprintf(("KERNEL32: CreateSemaphoreA(%s)\n",
-           arg4));
-
   return HMCreateSemaphore(arg1,
                            arg2,

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.52 1999-11-08 13:43:12 sandervl Exp $
+# $Id: makefile,v 1.53 1999-11-08 20:53:24 sandervl Exp $
 
 #
@@ -31 +31 @@
 winimagebase.OBJ windllbase.OBJ winexebase.OBJ time.obj mmap.obj \
 winimagepe2lx.obj winimagepeldr.obj windllpe2lx.obj windlllx.obj windllpeldr.obj \
-winexepe2lx.obj winexelx.obj winexepeldr.obj WINRES.OBJ \
+winexepe2lx.obj winexelx.obj winexepeldr.obj WINRES.OBJ critsection.obj \
 pefile.OBJ winimgres.OBJ wintls.obj async.OBJ fileio.obj \
 atom.obj disk.obj directory.obj cvtbitmap.obj hmmmap.obj winfakepeldr.obj \

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.20 1999-10-27 18:11:39 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.21 1999-11-08 20:53:24 sandervl Exp $ */
 
 /*
@@ -79 +79 @@
                 goto fail;
         }
+        //SvL: Temporary limitation of size (Warp Server Advanced doesn't allow
+        //     one to reserve more than 450 MB of continuous memory; (Warp 4
+        //     much less))
+        if(mSize > 64*1024*1024) {
+                mSize = 64*1024*1024;
+        }
   }