Changeset 22016 for trunk/src/peldr/pe.c

Timestamp:

Sep 17, 2012, 6:46:24 PM (13 years ago)

Author:

dmik

Message:

pe: Don't add .exe if there is an extension or path in the file name spec.

Some Win32 applications (e.g. installers) start executables which have
custom extensions using the full path. Adding .exe in this case obviously
breaks them.

File:

• trunk/src/peldr/pe.c (modified) (1 diff)

trunk/src/peldr/pe.c

@@ -199 +199 @@
         win32cmdline = pszTemp;
 
-        // add the .EXE extension if missing
-        int i = strlen(exeName);
-        if (i < 4 || !((exeName[i-1] == 'E' || exeName[i-1] == 'e') &&
-                       (exeName[i-2] == 'X' || exeName[i-2] == 'x') &&
-                       (exeName[i-3] == 'E' || exeName[i-3] == 'e') &&
-                       exeName[i-4] == '.'))
-        {
-            if (i + 4 < CCHMAXPATH)
-                strcat(exeName, ".exe");
+        // add the .EXE extension if missing (only if there's no path)
+        if (*str_find_char(exeName, '.') == '\0' &&
+            *str_find_char(exeName, '\\') == '\0' &&
+            *str_find_char(exeName, '/') == '\0')
+        {
+            int i = strlen(exeName);
+            if (i < 4 || !((exeName[i-1] == 'E' || exeName[i-1] == 'e') &&
+                           (exeName[i-2] == 'X' || exeName[i-2] == 'x') &&
+                           (exeName[i-3] == 'E' || exeName[i-3] == 'e') &&
+                           exeName[i-4] == '.'))
+            {
+                if (i + 4 < CCHMAXPATH)
+                    strcat(exeName, ".exe");
+            }
         }