Changeset 6129 for trunk/src

Timestamp:

Jun 27, 2001, 3:35:47 PM (24 years ago)

Author:

sandervl

Message:

reset FPU before calling entrypoints; search executable in CreateProcess

Location:

trunk/src/kernel32

Files:

• cpu.cpp (modified) (2 diffs)
• initsystem.cpp (modified) (2 diffs)
• thread.cpp (modified) (2 diffs)
• winexebase.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (10 diffs)

trunk/src/kernel32/cpu.cpp

@@ -1 @@
-/* $Id: cpu.cpp,v 1.11 2000-10-03 17:28:29 sandervl Exp $ */
+/* $Id: cpu.cpp,v 1.12 2001-06-27 13:35:45 sandervl Exp $ */
 /*
  * Odin win32 CPU apis
@@ -232 +232 @@
   GetSystemInfo (&si); /* To ensure the information is loaded and cached */
 
-  if (feature < 64)
+  if (feature < 64) {
+    dprintf(("IsProcessorFeaturePresent %x -> %x", feature, PF[feature]));
     return PF[feature];
+  }
   else
     return FALSE;

trunk/src/kernel32/initsystem.cpp

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.27 2001-04-01 14:33:50 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.28 2001-06-27 13:35:46 sandervl Exp $ */
 /*
  * Odin system initialization (registry, directories & environment)
@@ -67 +67 @@
         buffer1[12] = 0;
         signature = GetCPUSignature();
-        sprintf(buffer, "x86 Family %x Model %x Stepping %x, %s", (signature >> 8)&0xf, signature & 0xf, (signature >> 4)&0xf, buffer1);
+        sprintf(buffer, "x86 Family %x Model %x Stepping %x, %s", (signature >> 8)&0xf, (signature >> 4) & 0xf, signature & 0xf, buffer1);
         SetEnvironmentVariableA("PROCESSOR_IDENTIFIER", buffer);
         sprintf(buffer, "%x", (signature >> 8)&0xf);

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.28 2001-03-22 18:16:41 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.29 2001-06-27 13:35:46 sandervl Exp $ */
 
 /*
@@ -132 +132 @@
   Win32DllBase::attachThreadToAllDlls();          //send DLL_THREAD_ATTACH message to all dlls
 
-  //Set default FPU control word (no exceptions); same as in NT
-  CONTROL87(0x27F, 0xFFF);
+  //Reset FPU to default values (control word 0x27F; same as in NT)
+  _fpreset();
   rc = AsmCallThreadHandler(winthread, userdata);
 

trunk/src/kernel32/winexebase.cpp

@@ -1 @@
-/* $Id: winexebase.cpp,v 1.15 2001-06-11 09:49:36 phaller Exp $ */
+/* $Id: winexebase.cpp,v 1.16 2001-06-27 13:35:46 sandervl Exp $ */
 
 /*
@@ -110 +110 @@
   SetWin32TIB();
 
-  //Set default FPU control word (no exceptions); same as in NT
-  CONTROL87(0x27F, 0xFFF);
-  
+  //Reset FPU to default values (control word 0x27F; same as in NT)
+  _fpreset();
   dprintf(("KERNEL32: Win32ExeBase::start exe at %08xh\n",
           (void*)entryPoint ));

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.87 2001-06-10 22:32:17 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.88 2001-06-27 13:35:47 sandervl Exp $ */
 
 /*
@@ -775 +775 @@
         }
     }
+    if(fPageCmd == COMPLETE_SECTION && section->type == SECTION_DEBUG) {//ignore
+        return TRUE;
+    }
     //Check range of pages with the same attributes starting at virtAddress
     //(some pages might already have been loaded)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.126 2001-06-15 18:58:39 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.127 2001-06-27 13:35:47 sandervl Exp $ */
 
 /*
@@ -1660 +1660 @@
     }
 
-    char szAppName[255];
+    char szAppName[MAX_PATH];
+    char buffer[MAX_PATH];
     DWORD fileAttr;
-    char *exename = szAppName;
-    strncpy(szAppName, cmdline, sizeof(szAppName));
-    szAppName[254] = 0;
+    char *exename = buffer;
+    strncpy(buffer, cmdline, sizeof(szAppName));
+    buffer[MAX_PATH-1] = 0;
     if(*exename == '"') {
         exename++;
@@ -1673 +1674 @@
              *exename = 0;
         }
-        exename = &szAppName[1];
+        exename++;
+        if (SearchPathA( NULL, &buffer[1], ".exe", sizeof(szAppName), szAppName, NULL ) ||
+            SearchPathA( NULL, &buffer[1], NULL, sizeof(szAppName), szAppName, NULL )) 
+        {
+            //
+        }
     }
     else {
@@ -1687 +1693 @@
                   fTerminate = TRUE;
              }
-
-             fileAttr = GetFileAttributesA(szAppName);
-             if(fileAttr != -1 && !(fileAttr & FILE_ATTRIBUTE_DIRECTORY)) {
-                  break;
+             dprintf(("Trying '%s'", buffer ));
+             if (SearchPathA( NULL, buffer, ".exe", sizeof(szAppName), szAppName, NULL ) ||
+                 SearchPathA( NULL, buffer, NULL, sizeof(szAppName), szAppName, NULL ))
+             {
+                 if(fTerminate) exename++;
+                 break;
              }
+
              if(fTerminate) {
                   *exename = ' ';
@@ -1698 +1707 @@
              }
         }
-        exename = szAppName;
-    }
-    fileAttr = GetFileAttributesA(exename);
+    }
+    lpCommandLine = exename; //start of command line parameters
+
+    fileAttr = GetFileAttributesA(szAppName);
     if(fileAttr == -1 || (fileAttr & FILE_ATTRIBUTE_DIRECTORY)) {
         dprintf(("CreateProcess: can't find executable!"));
@@ -1707 +1717 @@
     }
 
-    dprintf(("KERNEL32: CreateProcess %s\n", cmdline));
+    dprintf(("KERNEL32: CreateProcess %s %s", szAppName, lpCommandLine));
 
     DWORD Characteristics, SubSystem, fNEExe;
-    if(Win32ImageBase::isPEImage(exename, &Characteristics, &SubSystem, &fNEExe) == 0) {
+    if(Win32ImageBase::isPEImage(szAppName, &Characteristics, &SubSystem, &fNEExe) == 0) {
         char *lpszPE;
         if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) {
@@ -1722 +1732 @@
             char *newcmdline;
 
-            newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(cmdline) + 32);
-            sprintf(newcmdline, "%s /OPT:[CURDIR=%s] %s", lpszPE, lpCurrentDirectory, cmdline);
+            newcmdline = (char *)malloc(strlen(lpCurrentDirectory) + strlen(szAppName) + strlen(lpCommandLine) + 32);
+            sprintf(newcmdline, "%s /OPT:[CURDIR=%s] %s %s", lpszPE, lpCurrentDirectory, szAppName, lpCommandLine);
             free(cmdline);
             cmdline = newcmdline;
@@ -1730 +1740 @@
             char *newcmdline;
 
-            newcmdline = (char *)malloc(strlen(cmdline) + 16);
-            sprintf(newcmdline, "%s %s", lpszPE, cmdline);
+            newcmdline = (char *)malloc(strlen(szAppName) + strlen(lpCommandLine) + 16);
+            sprintf(newcmdline, "%s %s %s", lpszPE, szAppName, lpCommandLine);
             free(cmdline);
             cmdline = newcmdline;
@@ -1744 +1754 @@
         char *newcmdline;
 
-        newcmdline = (char *)malloc(strlen(cmdline) + 16);
-        sprintf(newcmdline, "w16odin.exe %s", cmdline);
+        newcmdline = (char *)malloc(strlen(szAppName) + strlen(cmdline) + 16);
+        sprintf(newcmdline, "w16odin.exe %s", szAppName, lpCommandLine);
         free(cmdline);
         cmdline = newcmdline;
@@ -1756 +1766 @@
     }
     else {//os/2 app??
-        rc = O32_CreateProcess(NULL, (LPCSTR)cmdline,lpProcessAttributes,
+        rc = O32_CreateProcess(szAppName, (LPCSTR)lpCommandLine, lpProcessAttributes,
                                lpThreadAttributes, bInheritHandles, dwCreationFlags,
                                lpEnvironment, lpCurrentDirectory, lpStartupInfo,