Changeset 3005 for trunk/src/kernel32

Timestamp:

Mar 4, 2000, 8:52:37 PM (25 years ago)

Author:

sandervl

Message:

DosOpen (file handle error) & dll destruction bugfixes

Location:

trunk/src/kernel32

Files:

• directory.cpp (modified) (2 diffs)
• hmdevio.cpp (modified) (3 diffs)
• initsystem.cpp (modified) (2 diffs)
• windllbase.cpp (modified) (6 diffs)
• winexebase.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (5 diffs)
• wprocess.cpp (modified) (4 diffs)

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.16 2000-03-02 19:17:20 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.17 2000-03-04 19:52:35 sandervl Exp $ */
 
 /*
@@ -5 +5 @@
  *
  * Copyright 1998 Sander van Leeuwen
+ *
+ * NOTE: Directory creation has to be done in install program (odin\win) 
  *
  * Parts based on Wine code (991031) (files\directory.c)

trunk/src/kernel32/hmdevio.cpp

@@ -1 @@
-/* $Id: hmdevio.cpp,v 1.3 2000-02-29 22:44:02 sandervl Exp $ */
+/* $Id: hmdevio.cpp,v 1.4 2000-03-04 19:52:36 sandervl Exp $ */
 
 /*
@@ -114 +114 @@
   }
 
+tryopen:
   rc = DosOpen( szOS2Name,                        /* File path name */
                 &hfFileHandle,                  /* File handle */
@@ -123 +124 @@
                 0L);                            /* No extended attribute */
 
+  if(rc == ERROR_TOO_MANY_OPEN_FILES) {
+   ULONG CurMaxFH;
+   LONG  ReqCount = 32;
+
+        rc = DosSetRelMaxFH(&ReqCount, &CurMaxFH);
+        if(rc) {
+                dprintf(("DosSetRelMaxFH returned %d", rc));
+                return rc;
+        }
+        dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
+        goto tryopen;
+  }
+
   dprintf(("DosOpen %s returned %d\n", szOS2Name, rc));
 

trunk/src/kernel32/initsystem.cpp

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.6 2000-03-03 11:15:57 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.7 2000-03-04 19:52:36 sandervl Exp $ */
 /*
  * Odin system initialization (registry & directories)
@@ -113 +113 @@
 //   if(RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &hkey) != ERROR_SUCCESS) 
 //   {
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\Favorites");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\Favorites");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Favorites",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\Programs\\Startup");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\Programs\\Startup");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Startup",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\Desktop");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\Desktop");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Desktop",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\Start Menu\\Programs");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\Start Menu\\Programs");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Programs",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\Fonts");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\Fonts");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Fonts",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\SendTo");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\SendTo");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"SendTo",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\Start Menu");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\Start Menu");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Start Menu",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\ShellNew");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\ShellNew");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Templates",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\Recent");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\Recent");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Recent",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\NetHood");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\NetHood");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"NetHood",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);
-        strcpy(shellpath, InternalGetSystemDirectoryA());
-        strcat(shellpath, "\\WIN\\My Documents");
+        strcpy(shellpath, InternalGetWindowsDirectoryA());
+        strcat(shellpath, "\\My Documents");
         CreateDirectoryA(shellpath, NULL);
         RegSetValueExA(hkey,"Personal",0,REG_SZ, (LPBYTE)shellpath, strlen(shellpath)+1);

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.9 2000-02-16 14:22:11 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.10 2000-03-04 19:52:36 sandervl Exp $ */
 
 /*
@@ -49 +49 @@
                  : Win32ImageBase(hinstance),
                    referenced(0), fSkipEntryCalls(FALSE),
-                   fAttachedToProcess(FALSE), fUnloaded(FALSE)
+                   fAttachedToProcess(FALSE), fUnloaded(FALSE), fDynamicLoad(FALSE)
 {
   dllEntryPoint = DllEntryPoint;
@@ -96 +96 @@
 Win32DllBase::~Win32DllBase()
 {
- Win32DllBase *dll = head;
-
   dprintf(("Win32DllBase::~Win32DllBase %s", szModule));
 
@@ -110 +108 @@
   }
   else {
+        Win32DllBase *dll = head;
         while(dll && dll->next != this) {
                 dll = dll->next;
@@ -294 +293 @@
 //******************************************************************************
 //******************************************************************************
-void Win32DllBase::deleteAll()
-{
+void Win32DllBase::deleteAll(BOOL fDynamicLoad)
+{
+ Win32DllBase *dll = Win32DllBase::head, *tmp;
+
 #ifdef DEBUG
   dlllistmutex.enter();
-  Win32DllBase *dll = head;
 
   dprintf(("Win32DllBase::deleteAll: List of loaded dlls:"));
@@ -306 +306 @@
   }
   dlllistmutex.leave();
+  dll = Win32DllBase::head;
 #endif
 
-  while(Win32DllBase::head) {
-        delete Win32DllBase::head;
+  while(dll) {
+        if(fDynamicLoad || !dll->fDynamicLoad) {
+                tmp = dll->next;
+                dll->Release();
+                dll = tmp;
+        }
+        else    dll = dll->next;
   }
 }

trunk/src/kernel32/winexebase.cpp

@@ -1 @@
-/* $Id: winexebase.cpp,v 1.5 2000-02-16 14:22:11 sandervl Exp $ */
+/* $Id: winexebase.cpp,v 1.6 2000-03-04 19:52:36 sandervl Exp $ */
 
 /*
@@ -59 +59 @@
 Win32ExeBase::~Win32ExeBase()
 {
+  //First delete all dlls that were loaded by the exe or dlls
+  //Then delete all dlls loaded by LoadLibrary (to avoid that we
+  //delete some dlls before the dll, that loaded it, is destroyed)
   Win32DllBase::deleteAll();
+  Win32DllBase::deleteAll(TRUE);
+
   WinExe = NULL;
   if(cmdLineA)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.33 2000-02-22 23:53:03 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.34 2000-03-04 19:52:36 sandervl Exp $ */
 
 /*
@@ -36 +36 @@
 #define PRIVATE_LOGGING
 #include <misc.h>
-#include <win32type.h>
+#include <win32api.h>
 #include <winimagebase.h>
 #include <winimagepeldr.h>
@@ -569 +569 @@
  APIRET   rc;
 
+  //Round down to nearest page boundary
+  virtAddress = virtAddress & ~0xFFF;
+  
   section = findSectionByOS2Addr(virtAddress);
   if(section == NULL) {
@@ -1408 +1411 @@
                     return(FALSE);
                 }
-                WinDll->AddRef();
         }
         dprintf((LOG, "**********************************************************************" ));
@@ -1555 +1557 @@
 
   if( r != MBID_IGNORE )
-     exit(987);
+        ExitProcess(987);
 
   fIgnore = TRUE;

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.70 2000-03-03 11:16:00 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.71 2000-03-04 19:52:37 sandervl Exp $ */
 
 /*
@@ -344 +344 @@
 //******************************************************************************
 //******************************************************************************
-static void _System Win32DllExitList(ULONG reason)
-{
-  dprintf(("Win32DllExitList %d\n", reason));
-
-  if(WinExe) {
-    delete(WinExe);
-    WinExe = NULL;
-  }
-  return;
-}
-//******************************************************************************
-//******************************************************************************
 VOID WIN32API ExitProcess(DWORD exitcode)
 {
@@ -363 +351 @@
   SetOS2ExceptionChain(-1);
 
-  Win32DllExitList(0);
-
-  //Note: Needs to be done after Win32DllExitList (destruction of exe + dll objects)
+  if(WinExe) {
+        delete(WinExe);
+        WinExe = NULL;
+  }
+
+  //Note: Needs to be done after deleting WinExe (destruction of exe + dll objects)
   //Flush and delete all open memory mapped files
   Win32MemMap::deleteAll();
@@ -458 +449 @@
             peldrDll->setNoEntryCalls();
         }
+        //Set flag so this dll doesn't get automatically deleted in ExitProcess
+        //(the first time); give application the chance to free it first
+        //If it's not freed, we delete it the 2nd time in ExitProcess
+        peldrDll->SetDynamicallyLoaded();
 
         if(peldrDll->attachProcess() == FALSE) {