Changeset 4946 for trunk/src

Timestamp:

Jan 14, 2001, 6:16:55 PM (25 years ago)

Author:

sandervl

Message:

odininst update, CreateProcess fix & workaround for PM hang in WaitForSingleObject (process handle)

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (3 diffs)
• initsystem.cpp (modified) (3 diffs)
• mmap.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.56 2000-12-03 10:12:32 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.57 2001-01-14 17:16:54 sandervl Exp $ */
 
 /*
@@ -62 +62 @@
 #include "HMNPipe.h"
 #include <vmutex.h>
+#include <win\thread.h>
 
 #define DBG_LOCALLOG  DBG_handlemanager
@@ -1851 +1852 @@
   if (-1 == iIndex)                                               /* error ? */
   {
-    dprintf(("KERNEL32: HandleManager:HMWaitForSingleObject(%08xh) passed on to Open32.\n",
-             hObject));
-
+       dprintf(("KERNEL32: HandleManager:HMWaitForSingleObject(%08xh) passed on to Open32.\n",
+                 hObject));
+
+#if 1
+       //Workaround for applications that block the PM input queue
+       //while waiting for a child process to terminate.
+       //(WaitSingleObject now calls MsgWaitMultipleObjects and
+       // processes messages while waiting for the process to die)
+       //(Napster install now doesn't block PM anymore (forcing a reboot))
+
+       HMODULE hUser32 = LoadLibraryA("USER32.DLL");
+
+       BOOL (* WINAPI pfnPeekMessageA)(LPMSG,HWND,UINT,UINT,UINT);
+       LONG (* WINAPI pfnDispatchMessageA)(const MSG*);
+
+       *(FARPROC *)&pfnPeekMessageA = GetProcAddress(hUser32,"PeekMessageA");
+       *(FARPROC *)&pfnDispatchMessageA = GetProcAddress(hUser32,"DispatchMessageA");
+
+       TEB *teb = GetThreadTEB();
+
+       if(!teb || !pfnPeekMessageA || !pfnDispatchMessageA) {
+           dprintf(("ERROR: !teb || !pfnPeekMessageA || !pfnDispatchMessageA"));
+           DebugInt3();
+           return WAIT_FAILED;
+       }
+
+       //TODO: Ignoring all messages could be dangerous. But processing them,
+       //while the app doesn't expect any, isn't safe either.
+//-> must active check in pmwindow.cpp if this is enabled again!
+//       teb->o.odin.fIgnoreMsgs = TRUE;
+
+       while(TRUE) {
+           dwResult =  (O32_MsgWaitForMultipleObjects(1, &hObject, FALSE, 
+                                                      INFINITE, QS_ALLINPUT));
+           if(dwResult == WAIT_OBJECT_0 + 1) {
+               MSG msg ;
+
+               while (pfnPeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) 
+               {
+                  if (msg.message == WM_QUIT)  return 1;
+
+                  /* otherwise dispatch it */
+                  pfnDispatchMessageA(&msg);
+
+               } // end of PeekMessage while loop
+           }
+           else {
+               dprintf(("WaitForSingleObject: Process %x terminated", hObject));
+               break;
+           }
+       }
+//       teb->o.odin.fIgnoreMsgs = FALSE;
+       FreeLibrary(hUser32);
+       return dwResult;
+  }
+  else {
+#else
     // maybe handles from CreateProcess() ...
     dwResult = O32_WaitForSingleObject(hObject, dwTimeout);
+#endif
     return (dwResult);
   }

trunk/src/kernel32/initsystem.cpp

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.24 2000-12-30 10:17:00 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.25 2001-01-14 17:16:54 sandervl Exp $ */
 /*
  * Odin system initialization (registry, directories & environment)
@@ -71 +71 @@
 #define CLASS_SHORTCUT          "Shortcut"
 #define CLASS_SHELL32DLL    "shell32.dll"
+#define CLASS_SHDOCVW       "shdocvw.dll"
 #define COM_CLASS_ID        "CLSID"
 #define COM_INPROCSERVER        "InprocServer32"
@@ -335 +336 @@
    }
    RegSetValueExA(hkey, "", 0, REG_SZ, (LPBYTE)"", 0);
+   RegCloseKey(hkey);
+
+   //# Entries for IWebBrowser
+   //# Used by Internet Explorer HTML-rendering control
+   //[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{8856f961-340a-11d0-a96b-00c04fd705a2}]
+   //@="Shortcut"
+   //[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{8856f961-340a-11d0-a96b-00c04fd705a2}\InProcServer32]
+   //@="shdocvw.dll"
+   //"ThreadingModel"="Apartment"
+   //[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{8856f961-340a-11d0-a96b-00c04fd705a2}\shellex\MayChangeDefaultMenu]
+   //@=""
+
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\Classes\\CLSID\\{8856f961-340a-11d0-a96b-00c04fd705a2}",&hkey)!=ERROR_SUCCESS) {
+    goto initreg_error;
+   }
+   RegSetValueExA(hkey, "", 0, REG_SZ, (LPBYTE)CLASS_SHORTCUT, sizeof(CLASS_SHORTCUT));
+   RegCloseKey(hkey);
+
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\Classes\\CLSID\\{8856f961-340a-11d0-a96b-00c04fd705a2}\\InProcServer32",&hkey)!=ERROR_SUCCESS) {
+    goto initreg_error;
+   }
+   RegSetValueExA(hkey, "", 0, REG_SZ, (LPBYTE)CLASS_SHDOCVW, sizeof(CLASS_SHDOCVW));
+   RegSetValueExA(hkey, COM_THREADMODEL, 0, REG_SZ, (LPBYTE)COM_THREAD_APARTMENT, sizeof(COM_THREAD_APARTMENT));
+   RegCloseKey(hkey);
+
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\Classes\\CLSID\\{8856f961-340a-11d0-a96b-00c04fd705a2}\\shellex\\MayChangeDefaultMenu",&hkey)!=ERROR_SUCCESS) {
+    goto initreg_error;
+   }
+   RegSetValueExA(hkey, "", 0, REG_SZ, (LPBYTE)"", 1);
    RegCloseKey(hkey);
 

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.47 2000-12-16 18:37:26 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.48 2001-01-14 17:16:55 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
  * TODO: Suspend all threads when a page is committed (possible that another thread
  *       accesses the same memory before the page is read from disk
+ * TODO: File maps for new files (must select an initial size)!
  *
  * Project Odin Software License can be found in LICENSE.TXT

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.110 2000-11-23 19:23:51 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.111 2001-01-14 17:16:55 sandervl Exp $ */
 
 /*
@@ -1568 +1568 @@
         sprintf(cmdline, "%s", lpCommandLine);
     }
+
     char szAppName[255];
+    DWORD fileAttr;
     char *exename = szAppName;
     strncpy(szAppName, cmdline, sizeof(szAppName));
@@ -1576 +1578 @@
         while(*exename != 0 && *exename != '"')
              exename++;
+
+        if(*exename != 0) {
+             *exename = 0;
+        }
+        exename = &szAppName[1];
     }
     else {
+        BOOL fTerminate = FALSE;
+        DWORD fileAttr;
+
         //TODO: doesn't work for directories with spaces!
-        while(*exename != 0 && *exename != ' ' && *exename != '"')
-             exename++;
-    }
-    if(*exename != 0) {
-         *exename = 0;
-    }
-    if(szAppName[0] == '"') {
-        exename = &szAppName[1];
-    }
-    else exename = szAppName;
-
-    if(GetFileAttributesA(exename) == -1) {
+        while(*exename != 0) {
+             while(*exename != 0 && *exename != ' ')
+                  exename++;
+
+             if(*exename != 0) {
+                  *exename = 0;
+                  fTerminate = TRUE;
+             }
+
+             fileAttr = GetFileAttributesA(szAppName);
+             if(fileAttr != -1 && !(fileAttr & FILE_ATTRIBUTE_DIRECTORY)) {
+                  break;
+             }
+             if(fTerminate) {
+                  *exename = ' ';
+                  exename++;
+                  fTerminate = FALSE;
+             }
+        }
+        exename = szAppName;
+    }
+    fileAttr = GetFileAttributesA(exename);
+    if(fileAttr == -1 || (fileAttr & FILE_ATTRIBUTE_DIRECTORY)) {
         dprintf(("CreateProcess: can't find executable!"));
         SetLastError(ERROR_FILE_NOT_FOUND);
         return FALSE;
     }
+
     dprintf(("KERNEL32:  CreateProcess %s\n", cmdline));