Changeset 3995 for trunk/src/kernel32

Timestamp:

Aug 11, 2000, 8:42:55 PM (25 years ago)

Author:

sandervl

Message:

misc fixes

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (2 diffs)
• hmfile.cpp (modified) (2 diffs)
• virtual.cpp (modified) (5 diffs)
• wprocess.cpp (modified) (4 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.45 2000-08-04 21:12:05 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.46 2000-08-11 18:42:53 sandervl Exp $ */
 
 /*
@@ -739 +739 @@
     pHMHandleData->dwAccess    = fdwAccess;
 
-  if(fdwOdinOptions & DUPLICATE_ACCESS_READWRITE) {
+  if((fdwOdinOptions & DUPLICATE_ACCESS_READWRITE) == DUPLICATE_ACCESS_READWRITE) {
         pHMHandleData->dwAccess = GENERIC_READ | GENERIC_WRITE;
   }

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.14 2000-08-04 21:12:07 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.15 2000-08-11 18:42:54 sandervl Exp $ */
 
 /*
@@ -122 +122 @@
                              pHMHandleData->dwFlags,
                              hTemplate);
+#ifdef SHARE_WORKAROUND
+  if (hFile == INVALID_HANDLE_ERROR) {
+        //could be a read-only drive -> FILE_SHARE_WRITE is illegal
+        pHMHandleData->dwShare = FILE_SHARE_READ;
+        hFile = OSLibDosCreateFile((LPSTR)lpFileName,
+                             pHMHandleData->dwAccess,
+                             pHMHandleData->dwShare,
+                             (LPSECURITY_ATTRIBUTES)lpSecurityAttributes,
+                             pHMHandleData->dwCreation,
+                             pHMHandleData->dwFlags,
+                             hTemplate);
+  }
+#endif
+
   if (hFile != INVALID_HANDLE_ERROR)
   {

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.31 2000-08-04 21:12:09 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.32 2000-08-11 18:42:55 sandervl Exp $ */
 
 /*
@@ -219 +219 @@
     HANDLE hFile, hMapping = -1;
 
-    hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL,
+    hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
                            OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
     if (hFile != INVALID_HANDLE_VALUE)
@@ -225 +225 @@
         hMapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY | ((fReadIntoMemory) ? SEC_COMMIT : 0), 0, 0, NULL );
         CloseHandle( hFile );
-        if (hMapping != INVALID_HANDLE_VALUE)
+        if (hMapping)
         {
             *lpMapping = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 );
@@ -244 +244 @@
     HANDLE hFile, hMapping = -1;
 
-    hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL,
+    hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
                         OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
     if (hFile != INVALID_HANDLE_VALUE)
@@ -250 +250 @@
         hMapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY | ((fReadIntoMemory) ? SEC_COMMIT : 0), 0, 0, NULL );
         CloseHandle( hFile );
-        if (hMapping != INVALID_HANDLE_VALUE)
+        if (hMapping)
         {
             *lpMapping = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 );

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.86 2000-08-11 10:56:20 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.87 2000-08-11 18:42:55 sandervl Exp $ */
 
 /*
@@ -431 +431 @@
  BOOL rc;
 
+    //SvL: Ignore FreeLibary for executable
+    if(WinExe && hinstance == WinExe->getInstanceHandle()) {
+        return TRUE;
+    }
+
     winmod = Win32DllBase::findModule(hinstance);
     if(winmod) {
@@ -698 +703 @@
      *  Endif
      */
+    if(WinExe) {
+      char  szDllName[CCHMAXPATH];
+      char *dot;
+
+        strcpy(szDllName, OSLibStripPath((char *)lpszLibFile));
+        strupr(szDllName);
+        dot = strstr(szDllName, ".");
+        if(dot)
+            *dot = 0;
+
+        if(!strcmp(szDllName, WinExe->getModuleName())) {
+                return WinExe->getInstanceHandle();
+        }
+    }
     pModule = Win32DllBase::findModule((LPSTR)lpszLibFile);
     if (pModule)
@@ -1052 +1071 @@
     if(WinExe) {
         if(WinExe->getCommandLineW())
-        return WinExe->getCommandLineW();
+             return WinExe->getCommandLineW();
     }
     if(asciicmdline == NULL) //not used for converted exes
-      asciicmdline = O32_GetCommandLine();
+        asciicmdline = O32_GetCommandLine();
 
     if(asciicmdline) {