[[ Bug 20282 ]] Ensure 'the engine folder' returns a LiveCode path

runrevmark · runrevmark · commit 204d4f078568 · 2017-08-31T14:12:32.000Z
This patch fixes an issue where 'the engine folder' would return a
native looking path on Windows. The use of MCcmd has been replaced
with a direct query of the executable module's filename.
diff --git a/docs/notes/bugfix-20282.md b/docs/notes/bugfix-20282.md
@@ -0,0 +1 @@
+# Ensure 'the engine folder' returns a LiveCode path on Windows
diff --git a/engine/src/dskw32.cpp b/engine/src/dskw32.cpp
@@ -1936,12 +1936,24 @@ struct MCWindowsDesktop: public MCSystemInterface, public MCWindowsSystemService
         else if (MCNameIsEqualTo(p_type, MCN_engine, kMCCompareCaseless)
                  || MCNameIsEqualTo(p_type, MCN_resources, kMCCompareCaseless))
         {
-            uindex_t t_last_slash;
-            
-            if (!MCStringLastIndexOfChar(MCcmd, '/', UINDEX_MAX, kMCStringOptionCompareExact, t_last_slash))
-                t_last_slash = MCStringGetLength(MCcmd);
+            /* MCcmd is in LiveCode format, but this function actuall returns native
+             * paths so we just replicate what GetExecutablePath() does. */
+		    WCHAR* wcFileNameBuf = new WCHAR[MAX_PATH+1];
+		    DWORD dwFileNameLen = GetModuleFileNameW(NULL, wcFileNameBuf, MAX_PATH+1);
+		
+            WCHAR* t_last_slash = wcsrchr(wcFileNameBuf, '\\');
+            if (t_last_slash != nullptr)
+            {
+                *t_last_slash = '\0';
+            }
             
-            return MCStringCopySubstring(MCcmd, MCRangeMake(0, t_last_slash), r_folder) ? True : False;
+		    if (!MCStringCreateWithWStringAndRelease((unichar_t*)wcFileNameBuf, &t_native_path))
+            {
+                delete wcFileNameBuf;
+                return false;
+            }
+
+            t_wasfound = True;
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure 'the engine folder' returns a LiveCode path on Windows`