Changeset 1481 for trunk/src

Timestamp:

Oct 27, 1999, 8:11:40 PM (26 years ago)

Author:

sandervl

Message:

WinExec rewrite + mmap bugfixes

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (2 diffs)
• KERNEL32.CPP (modified) (2 diffs)
• initterm.cpp (modified) (4 diffs)
• makefile (modified) (2 diffs)
• mmap.cpp (modified) (9 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.11 1999-10-25 22:45:17 phaller Exp $ */
+/* $Id: Fileio.cpp,v 1.12 1999-10-27 18:11:38 sandervl Exp $ */
 
 /*
@@ -44 +44 @@
               HANDLE, hTemplateFile)
 {
+  dprintf(("CreateFileA %s", lpszName));
   return(HMCreateFile(lpszName,
                       fdwAccess,

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.24 1999-10-25 18:20:52 achimha Exp $ */
+/* $Id: KERNEL32.CPP,v 1.25 1999-10-27 18:11:38 sandervl Exp $ */
 
 /*
@@ -437 +437 @@
     free(asciibuffer);
     return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-HINSTANCE WIN32API WinExec(LPCSTR arg1, UINT  arg2)
-{
-    dprintf(("KERNEL32:  WinExec %s\n", arg1));
-    return (HINSTANCE)O32_WinExec(arg1, arg2);
 }
 //******************************************************************************

trunk/src/kernel32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.17 1999-10-24 22:51:21 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.18 1999-10-27 18:11:39 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 #define  INCL_DOSMISC
 #define  INCL_DOSPROCESS
+#define  INCL_DOSSEMAPHORES
 #include <os2wrap.h>    //Odin32 OS/2 api wrappers
 #include <stdlib.h>
@@ -41 +42 @@
 #include "oslibmisc.h"
 #include "heapshared.h"
+#include "mmap.h"
 
 /*-------------------------------------------------------------------*/
@@ -148 +150 @@
 {
     dprintf(("kernel32 exit %d\n", ulReason));
+    //Flush and delete all open memory mapped files
+    Win32MemMap::deleteAll();
+
     WriteOutProfiles();
     DestroyTIB();

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.48 1999-10-27 12:38:48 phaller Exp $
+# $Id: makefile,v 1.49 1999-10-27 18:11:39 sandervl Exp $
 
 #
@@ -132 +132 @@
     os2heap.h
 
-initterm.OBJ: .\initterm.cpp initterm.h  heapshared.h
+initterm.OBJ: .\initterm.cpp initterm.h  heapshared.h  mmap.h
 
 thunk.OBJ: \

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.19 1999-10-24 22:51:21 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.20 1999-10-27 18:11:39 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 //Global DLL Data
 #pragma data_seg(_GLOBALDATA)
-Win32MemMapView *Win32MemMapView::mapviews = NULL;
 Win32MemMap     *Win32MemMap::memmaps = NULL;
 VMutex           globalmapMutex(VMUTEX_SHARED);
-VMutex           globalviewMutex(VMUTEX_SHARED);
 #pragma data_seg()
+VMutex           globalviewMutex;
+Win32MemMapView *Win32MemMapView::mapviews = NULL;
 
 //******************************************************************************
@@ -95 +95 @@
   Win32MemMapView::deleteViews(this); //delete all views of our memory mapped file
 
+  dprintf(("Win32MemMap dtor: deleting view %x %x", pMapping, mSize));
+
   mapMutex.enter();
   if(lpszMapName) {
@@ -404 +406 @@
   }
   globalmapMutex.leave();
-  dprintf(("Win32MemMap::findMap: couldn't find map %s", lpszName));
+  if(!map) dprintf(("Win32MemMap::findMap: couldn't find map %s", lpszName));
   return map;
 }
@@ -517 +519 @@
         return;
 
+  dprintf(("Win32MemMapView dtor: deleting view %x %x", mOffset, mSize));
+
   if(mfAccess != MEMMAP_ACCESS_READ)
         mParentMap->flushView(mOffset, mSize);
@@ -545 +549 @@
 void Win32MemMapView::deleteViews(Win32MemMap *map)
 {
-  DWORD processId = GetCurrentProcess();
-
   globalviewMutex.enter();
   Win32MemMapView *view = mapviews, *nextview;
@@ -553 +555 @@
         while(view) {
                 nextview = view->next;
-                if(view->getParentMap() == map && view->getProcessId() == processId)
+                if(view->getParentMap() == map)
                 {
                         globalviewMutex.leave();
@@ -578 +580 @@
         while(view && (ULONG)view->getViewAddr() <= address) {
                 if((ULONG)view->getViewAddr() <= address &&
-                   (ULONG)view->getViewAddr() + view->getSize() >= address &&
+                   (ULONG)view->getViewAddr() + view->getSize() > address &&
                    view->getAccessFlags() >= accessType)
                 {
@@ -590 +592 @@
   }
 success:
+  if(view)
+        dprintf(("findMapByView %x %x -> %x off %x", address, accessType, view->getViewAddr(), *offset));
+
   globalviewMutex.leave();
   if(pView) *pView = view;

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.42 1999-10-27 10:35:42 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.43 1999-10-27 18:11:40 sandervl Exp $ */
 
 /*
@@ -655 +655 @@
 //******************************************************************************
 //******************************************************************************
+HINSTANCE WIN32API WinExec(LPCSTR lpCmdLine, UINT nCmdShow)
+{
+ STARTUPINFOA        startinfo = {0};
+ PROCESS_INFORMATION procinfo;
+
+    dprintf(("KERNEL32: WinExec %s\n", lpCmdLine));
+    startinfo.dwFlags = nCmdShow;
+    if(CreateProcessA(NULL, (LPSTR)lpCmdLine, NULL, NULL, FALSE, 0, NULL, NULL,
+                      &startinfo, &procinfo) == FALSE) 
+    {
+        return 0;
+    }
+    return procinfo.hProcess; //correct?
+}
+//******************************************************************************
+//******************************************************************************
 FARPROC WIN32API GetProcAddress(HMODULE hModule, LPCSTR lpszProc)
 {