SDL: Fix live edit when start path contains unicode characters #123

Author: chrisws

src/platform/sdl/main.cpp

@@ -10,22 +10,14 @@
 #include <getopt.h>
 #include <locale.h>
 
-#include "ui/utils.h"
-#include "ui/strlib.h"
 #include "platform/sdl/runtime.h"
 #include "platform/sdl/settings.h"
 #include "platform/sdl/syswm.h"
-#include "common/smbas.h"
-#include "lib/str.h"
 
 #if !defined(_Win32)
 #include <fontconfig/fontconfig.h>
 #endif
 
-extern "C" unsigned
-  lodepng_decode32(unsigned char **out, unsigned *w, unsigned *h,
-                   const unsigned char *in, size_t insize);
-
 using namespace strlib;
 
 const char *FONTS[] = {
@@ -55,7 +47,6 @@ static struct option OPTIONS[] = {
   {0, 0, 0, 0}
 };
 
-char g_appPath[OS_PATHNAME_SIZE + 1];
 int g_debugPort = 4000;
 
 void appLog(const char *format, ...) {
@@ -235,33 +226,6 @@ void printKeywords() {
   }
 }
 
-void setupAppPath(const char *path) {
-  g_appPath[0] = '\0';
-  if (path[0] == '/' ||
-      (path[1] == ':' && ((path[2] == '\\') || path[2] == '/'))) {
-    // full path or C:/
-    strlcpy(g_appPath, path, sizeof(g_appPath));
-  } else {
-    // relative path
-    char cwd[OS_PATHNAME_SIZE + 1];
-    cwd[0] = '\0';
-    getcwd(cwd, sizeof(cwd) - 1);
-    strlcpy(g_appPath, cwd, sizeof(g_appPath));
-    strlcat(g_appPath, "/", sizeof(g_appPath));
-    strlcat(g_appPath, path, sizeof(g_appPath));
-#if defined(__linux__) || defined(__midipix__)
-    if (access(g_appPath, X_OK) != 0) {
-      // launched via PATH, retrieve full path
-      ssize_t len = ::readlink("/proc/self/exe", g_appPath, sizeof(g_appPath));
-      if (len == -1 || len == sizeof(g_appPath)) {
-        len = 0;
-      }
-      g_appPath[len] = '\0';
-    }
-#endif
-  }
-}
-
 void showHelp() {
   fprintf(stdout,
           "SmallBASIC version %s - kw:%d, pc:%d, fc:%d, ae:%d I=%d N=%d\n\n",

src/platform/sdl/syswm.cpp

@@ -8,11 +8,11 @@
 
 #include "config.h"
 #include "platform/sdl/syswm.h"
+#include "lib/str.h"
 
 #define DEFAULT_FONT_SIZE 12
 #define DEFAULT_FONT_SIZE_PTS 11
 
-extern char g_appPath[];
 extern int g_debugPort;
 
 void appLog(const char *format, ...);
@@ -21,6 +21,12 @@ void appLog(const char *format, ...);
 #include <SDL_syswm.h>
 #include <shellapi.h>
 
+WCHAR g_appPath[MAX_PATH + 1];
+
+void setupAppPath(const char *path) {
+  GetModuleFileNameW(NULL, g_appPath, MAX_PATH);
+}
+
 void loadIcon(SDL_Window *window) {
   HINSTANCE handle = ::GetModuleHandle(NULL);
   HICON icon = ::LoadIcon(handle, MAKEINTRESOURCE(101));
@@ -49,19 +55,19 @@ int getStartupFontSize(SDL_Window *window) {
 }
 
 void launchDebug(const char *file) {
-  STARTUPINFO info = {sizeof(info)};
+  STARTUPINFOW info = {sizeof(info)};
   PROCESS_INFORMATION processInfo;
-  char cmd[1024];
-  sprintf(cmd, "-p %d -d %s", g_debugPort, file);
-  if (!CreateProcess(g_appPath, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
+  WCHAR cmd[MAX_PATH + 1];
+  swprintf(cmd, MAX_PATH, L"-p %d -d %s", g_debugPort, file);
+  if (!CreateProcessW(g_appPath, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
     appLog("failed to start %d %s %s\n", GetLastError(), g_appPath, cmd);
   }
 }
 
 void launch(const char *command, const char *file) {
   STARTUPINFO info = {sizeof(info)};
   PROCESS_INFORMATION processInfo;
-  char cmd[1024];
+  char cmd[MAX_PATH + 1];
   sprintf(cmd, "%s -x %s", command, file);
   if (!CreateProcess(command, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
     appLog("failed to start %d %s %s\n", GetLastError(), command, cmd);
@@ -77,12 +83,25 @@ void browseFile(SDL_Window *window, const char *url) {
   }
 }
 
+void launchExec(const char *file) {
+  STARTUPINFOW info = {sizeof(info)};
+  PROCESS_INFORMATION processInfo;
+  WCHAR cmd[MAX_PATH + 1];
+  swprintf(cmd, MAX_PATH, L"%s -x %s", g_appPath, file);
+  if (!CreateProcessW(g_appPath, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
+    appLog("failed to start %d %s %s\n", GetLastError(), g_appPath, cmd);
+  }
+}
+
 #else
 #include <unistd.h>
 #include <errno.h>
+#include <limits.h>
 #include "icon.h"
 #include "lib/lodepng/lodepng.h"
 
+char g_appPath[PATH_MAX + 1];
+
 void loadIcon(SDL_Window *window) {
   unsigned w, h;
   unsigned char *image;
@@ -165,8 +184,35 @@ void browseFile(SDL_Window *window, const char *url) {
   }
 }
 
+void setupAppPath(const char *path) {
+  g_appPath[0] = '\0';
+  if (path[0] == '/' ||
+      (path[1] == ':' && ((path[2] == '\\') || path[2] == '/'))) {
+    // full path or C:/
+    strlcpy(g_appPath, path, sizeof(g_appPath));
+  } else {
+    // relative path
+    char cwd[PATH_MAX + 1];
+    cwd[0] = '\0';
+    getcwd(cwd, sizeof(cwd) - 1);
+    strlcpy(g_appPath, cwd, sizeof(g_appPath));
+    strlcat(g_appPath, "/", sizeof(g_appPath));
+    strlcat(g_appPath, path, sizeof(g_appPath));
+#if defined(__linux__) || defined(__midipix__)
+    if (access(g_appPath, X_OK) != 0) {
+      // launched via PATH, retrieve full path
+      ssize_t len = ::readlink("/proc/self/exe", g_appPath, sizeof(g_appPath));
+      if (len == -1 || len == sizeof(g_appPath)) {
+        len = 0;
+      }
+      g_appPath[len] = '\0';
+    }
 #endif
+  }
+}
 
 void launchExec(const char *file) {
   launch(g_appPath, file);
 }
+
+#endif

src/platform/sdl/syswm.h

@@ -11,11 +11,12 @@
 
 #include <SDL_video.h>
 
-void loadIcon(SDL_Window *window);
-int getStartupFontSize(SDL_Window *window);
+void browseFile(SDL_Window *window, const char *url);
+int  getStartupFontSize(SDL_Window *window);
+void launch(const char *command, const char *file);
 void launchDebug(const char *file);
 void launchExec(const char *file);
-void launch(const char *command, const char *file);
-void browseFile(SDL_Window *window, const char *url);
+void loadIcon(SDL_Window *window);
+void setupAppPath(const char *path);
 
 #endif