FLTK: fix live edit in windows

chrisws · chrisws · commit a55dba864d6d · 2020-03-08T08:29:37.000+10:00
diff --git a/src/languages/messages.en.h b/src/languages/messages.en.h
@@ -173,7 +173,7 @@
 #define ERR_MISSING_LP          "Missing '('"
 #define ERR_PARFMT              "Parameters count/format error (%s)"
 #define ERR_BYREF               "Parameter %d cannot BYREF"
-#define ERR_BAD_FILE_HANDLE     "VFS: Bad file number (Use OPEN)"
+#define ERR_BAD_FILE_HANDLE     "Invalid file number (Use OPEN)"
 #define ERR_SEP_FMT             "No separator found (missing %s)"
 #define ERR_POLY                "Parsing polyline: type mismatch (element: %d, info: %d)"
 #define ERR_CRITICAL_MISSING_FUNC  "Unsupported built-in function call %ld, please report this bug"
diff --git a/src/lib/jsmn b/src/lib/jsmn
@@ -1 +1 @@
-Subproject commit 85695f3d5903b1cd5b4030efe50db3b4f5f3c928
+Subproject commit 7b6858a5855299d173c5ab2b46e611bf9961cbef
diff --git a/src/lib/lodepng b/src/lib/lodepng
@@ -1 +1 @@
-Subproject commit 5a0dba103893e6b8084be13945a826663917d00a
+Subproject commit e34ac04553e51a6982ae234d98ce6b76dd57a6a1
diff --git a/src/platform/fltk/utils.cxx b/src/platform/fltk/utils.cxx
@@ -271,9 +271,10 @@ void setAppName(const char *path) {
 void launchExec(const char *file) {
   STARTUPINFO info = {sizeof(info)};
   PROCESS_INFORMATION processInfo;
-  char cmd[1024];
-  sprintf(cmd, " -x %s", file);
-  if (!CreateProcess(appName, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
+  char cmd[MAX_PATH];
+  sprintf(cmd, "\"%s\" -x \"%s\"", appName, file);
+  appLog(cmd);
+  if (!CreateProcess(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
     appLog("failed to start %d %s %s\n", GetLastError(), appName, cmd);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -271,9 +271,10 @@ void setAppName(const char *path) {`
`271`	`271`	`void launchExec(const char *file) {`
`272`	`272`	`STARTUPINFO info = {sizeof(info)};`
`273`	`273`	`PROCESS_INFORMATION processInfo;`
`274`		`- char cmd[1024];`
`275`		`- sprintf(cmd, " -x %s", file);`
`276`		`- if (!CreateProcess(appName, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {`
	`274`	`+ char cmd[MAX_PATH];`
	`275`	`+ sprintf(cmd, "\"%s\" -x \"%s\"", appName, file);`
	`276`	`+ appLog(cmd);`
	`277`	`+ if (!CreateProcess(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {`
`277`	`278`	`appLog("failed to start %d %s %s\n", GetLastError(), appName, cmd);`
`278`	`279`	`}`
`279`	`280`	`}`