Changeset 9496 for trunk/src

Timestamp:

Dec 13, 2002, 5:46:44 PM (23 years ago)

Author:

sandervl

Message:

Changes for loader path query & default setup

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• initkernel32.cpp (modified) (2 diffs)
• kernel32dbg.def (modified) (2 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.145 2002-11-18 13:53:53 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.146 2002-12-13 16:46:43 sandervl Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1224 +1224 @@
     _dbg_ThreadPopCall@0                                          @3108 NONAME
 
+    _ODIN_QueryLoaders@24                                         @3109 NONAME
+
 ; Char functions (forwarders from user32)
     _CharLowerA@4                                                 @3127 NONAME

trunk/src/kernel32/initkernel32.cpp

@@ -1 @@
-/* $Id: initkernel32.cpp,v 1.23 2002-09-18 10:58:48 sandervl Exp $
+/* $Id: initkernel32.cpp,v 1.24 2002-12-13 16:46:44 sandervl Exp $
  *
  * KERNEL32 DLL entry point
@@ -203 +203 @@
             GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinityMask, &dwSystemAffinityMask);
             SetProcessAffinityMask(GetCurrentProcess(), dwSystemAffinityMask);
+
+            //Set default paths for PE & NE loaders
+            InitLoaders();
             break;
         }

trunk/src/kernel32/kernel32dbg.def

@@ -1 @@
-; $Id: kernel32dbg.def,v 1.20 2002-11-18 13:53:54 sandervl Exp $
+; $Id: kernel32dbg.def,v 1.21 2002-12-13 16:46:44 sandervl Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1224 +1224 @@
     _dbg_ThreadPopCall@0                                          @3108 NONAME
 
+    _ODIN_QueryLoaders@24                                         @3109 NONAME
+
 ; Char functions (forwarders from user32)
     _DbgCharLowerA@4                                                 @3127 NONAME

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.163 2002-12-11 17:12:59 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.164 2002-12-13 16:46:44 sandervl Exp $ */
 
 /*
@@ -47 +47 @@
 #include "mmap.h"
 #include "initterm.h"
+#include "directory.h"
 
 #define DBG_LOCALLOG    DBG_wprocess
@@ -1758 +1759 @@
 //******************************************************************************
 //******************************************************************************
-const char *szPECmdLoader = "PEC.EXE";
-const char *szPEGUILoader = "PE.EXE";
-const char *szNELoader    = "w16odin.exe";
+static char szPECmdLoader[260] = "";
+static char szPEGUILoader[260] = "";
+static char szNELoader[260]    = "";
+//******************************************************************************
+//Set default paths for PE & NE loaders
+//******************************************************************************
+BOOL InitLoaders()
+{
+    sprintf(szPECmdLoader, "%s\\PEC.EXE", InternalGetSystemDirectoryA());
+    sprintf(szPEGUILoader, "%s\\PE.EXE", InternalGetSystemDirectoryA());
+    sprintf(szNELoader, "%s\\W16ODIN.EXE", InternalGetSystemDirectoryA());
+
+    return TRUE;
+}
 //******************************************************************************
 //Override loader names (PEC, PE, W16ODIN)
-//NOTE: String must be resident
 //******************************************************************************
 BOOL WIN32API ODIN_SetLoaders(LPCSTR pszPECmdLoader, LPCSTR pszPEGUILoader,
                               LPCSTR pszNELoader)
 {
-    if(pszPECmdLoader)   szPECmdLoader = pszPECmdLoader;
-    if(pszPEGUILoader)   szPEGUILoader = pszPEGUILoader;
-    if(pszNELoader)      szNELoader = pszNELoader;
+    if(pszPECmdLoader)   strcpy(szPECmdLoader, pszPECmdLoader);
+    if(pszPEGUILoader)   strcpy(szPEGUILoader, pszPEGUILoader);
+    if(pszNELoader)      strcpy(szNELoader, pszNELoader);
+
+    return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API ODIN_QueryLoaders(LPSTR pszPECmdLoader, INT cchPECmdLoader,
+                                LPSTR pszPEGUILoader, INT cchPEGUILoader,
+                                LPSTR pszNELoader, INT cchNELoader)
+{
+    if(pszPECmdLoader)   strncpy(szPECmdLoader, szPECmdLoader, cchPECmdLoader);
+    if(pszPEGUILoader)   strncpy(szPEGUILoader, szPEGUILoader, cchPEGUILoader);
+    if(pszNELoader)      strncpy(szNELoader, szNELoader, cchNELoader);
 
     return TRUE;