Changeset 22015 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Sep 17, 2012, 5:19:47 PM (13 years ago)

Author:

dmik

Message:

kernel32: Add support for custom PE/PEC/W16ODIN paths to ODIN.INI.

This is needed since the RPM package of Odin installs these tools to a
directory which is not the same as the one where kernel32.dll is located.
Together with the fix of the RPM spec (coming later) this fixes the broken
PE and PEC functionality when Odin is installed from RPM.

File:

• trunk/src/kernel32/wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -58 +58 @@
 #include <win/ntddk.h>
 #include <win/psapi.h>
+#include <win/options.h>
 
 #include <custombuild.h>
@@ -2117 +2118 @@
 BOOL InitLoaders()
 {
-    sprintf(szPECmdLoader, "%s\\PEC.EXE", InternalGetSystemDirectoryA());
-    sprintf(szPEGUILoader, "%s\\PE.EXE", InternalGetSystemDirectoryA());
-    sprintf(szNELoader, "%s\\W16ODIN.EXE", InternalGetSystemDirectoryA());
+    int len;
+
+    len = PROFILE_GetOdinIniString(ODINSYSTEM_SECTION, "PEC_EXE", "",
+                                   szPECmdLoader, sizeof(szPECmdLoader));
+    if (len == 0)
+        sprintf(szPECmdLoader, "%s\\PEC.EXE", InternalGetSystemDirectoryA());
+
+    len = PROFILE_GetOdinIniString(ODINSYSTEM_SECTION, "PE_EXE", "",
+                                   szPEGUILoader, sizeof(szPEGUILoader));
+    if (len == 0)
+        sprintf(szPEGUILoader, "%s\\PE.EXE", InternalGetSystemDirectoryA());
+
+
+    len = PROFILE_GetOdinIniString(ODINSYSTEM_SECTION, "W16ODIN_EXE", "",
+                                   szNELoader, sizeof(szNELoader));
+    if (len == 0)
+        sprintf(szNELoader, "%s\\W16ODIN.EXE", InternalGetSystemDirectoryA());
 
     return TRUE;