fiX: unicode fixes for windows

* fix: linting

* chore: bump version

* fix: unicode text for Windows

* fix: re-add webview_set_title

CONTRIBUTORS.md

@@ -20,3 +20,4 @@ Wails is what it is because of the time and effort given by these great people.
 * [Toyam Cox](https://github.com/Vaelatern)
 * [Robin Eklind](https://github.com/mewmew)
 * [Kris Raney](https://github.com/kraney)
+* [soon cheol shin](https://github.com/scshin0572)

cmd/helpers.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/leaanthony/mewn"
@@ -87,6 +88,17 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	buildCommand.Add("build")
 
 	if binaryName != "" {
+		// Alter binary name based on OS
+		switch runtime.GOOS {
+		case "windows":
+			if !strings.HasSuffix(binaryName, ".exe") {
+				binaryName += ".exe"
+			}
+		default:
+			if strings.HasSuffix(binaryName, ".exe") {
+				binaryName = strings.TrimSuffix(binaryName, ".exe")
+			}
+		}
 		buildCommand.Add("-o")
 		buildCommand.Add(binaryName)
 	}
@@ -103,7 +115,7 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	}
 
 	// Add windows flags
-	if runtime.GOOS == "windows" {
+	if runtime.GOOS == "windows" && buildMode == BuildModeProd {
 		ldflags += "-H windowsgui "
 	}
 

cmd/templates/angular-template/frontend/browserslist

@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
+IE 9-11 # For IE 9-11 support, remove 'not'.

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v0.18.11-pre"
+const Version = "v0.18.14-pre"

cmd/wails/9_issue.go

@@ -80,15 +80,16 @@ To help you in this process, we will ask for some information, add Go/Wails deta
 		npm := program.FindProgram("npm")
 		if npm != nil {
 			stdout, _, _, _ := npm.Run("--version")
-			nodeVersion = stdout
-			nodeVersion = nodeVersion[:len(nodeVersion)-1]
+			npmVersion = stdout
+			npmVersion = npmVersion[:len(npmVersion)-1]
+			npmVersion = strings.TrimSpace(npmVersion)
 		}
 
 		node := program.FindProgram("node")
 		if node != nil {
 			stdout, _, _, _ := node.Run("--version")
-			npmVersion = stdout
-			npmVersion = npmVersion[:len(npmVersion)-1]
+			nodeVersion = stdout
+			nodeVersion = nodeVersion[:len(nodeVersion)-1]
 		}
 
 		str.WriteString("\n| Name   | Value |\n| ----- | ----- |\n")

lib/renderer/webview/webview.go

@@ -13,7 +13,7 @@ package webview
 #cgo linux openbsd freebsd CFLAGS: -DWEBVIEW_GTK=1 -Wno-deprecated-declarations
 #cgo linux openbsd freebsd pkg-config: gtk+-3.0 webkit2gtk-4.0
 
-#cgo windows CFLAGS: -DWEBVIEW_WINAPI=1 -std=c99 -DUNICODE=1
+#cgo windows CFLAGS: -DWEBVIEW_WINAPI=1 -std=c99 -DUNICODE=1 -D_UNICODE=1
 #cgo windows LDFLAGS: -lole32 -lcomctl32 -loleaut32 -luuid -lgdi32
 
 #cgo darwin CFLAGS: -DWEBVIEW_COCOA=1 -x objective-c

lib/renderer/webview/webview.h

@@ -58,6 +58,7 @@ extern "C"
 #elif defined(WEBVIEW_WINAPI)
 #define CINTERFACE
 #include <windows.h>
+#include <tchar.h>
 
 #include <commctrl.h>
 #include <exdisp.h>
@@ -1350,8 +1351,8 @@ struct webview_priv
   }
 
 #define WEBVIEW_KEY_FEATURE_BROWSER_EMULATION \
-  "Software\\Microsoft\\Internet "            \
-  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION"
+  _T("Software\\Microsoft\\Internet "            \
+  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION")
 
   static int webview_fix_ie_compat_mode()
   {
@@ -1363,7 +1364,7 @@ struct webview_priv
     {
       return -1;
     }
-    for (p = &appname[strlen(appname) - 1]; p != appname && *p != '\\'; p--)
+    for (p = &appname[_tcslen(appname) - 1]; p != appname && *p != _T('\\'); p--)
     {
     }
     p++;
@@ -1603,9 +1604,20 @@ struct webview_priv
 
   WEBVIEW_API void webview_set_title(struct webview *w, const char *title)
   {
+  #ifdef UNICODE
+    wchar_t *u16title = webview_to_utf16(title);
+    if (u16title == NULL)
+    {
+      return;
+    }
+    SetWindowText(w->priv.hwnd, u16title);
+    GlobalFree(u16title);
+  #else
     SetWindowText(w->priv.hwnd, title);
+  #endif
   }
 
+
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     if (w->priv.is_fullscreen == !!fullscreen)
@@ -1861,14 +1873,30 @@ struct webview_priv
         type |= MB_ICONERROR;
         break;
       }
+  #ifdef UNICODE
+      WCHAR *wtitle = webview_to_utf16(title);
+      WCHAR *warg = webview_to_utf16(arg);
+      MessageBox(w->priv.hwnd, warg, wtitle, type);
+      GlobalFree(warg);
+      GlobalFree(wtitle);
+  #else
       MessageBox(w->priv.hwnd, arg, title, type);
+  #endif
 #endif
     }
   }
 
   WEBVIEW_API void webview_terminate(struct webview *w) { PostQuitMessage(0); }
   WEBVIEW_API void webview_exit(struct webview *w) { OleUninitialize(); }
-  WEBVIEW_API void webview_print_log(const char *s) { OutputDebugString(s); }
+  WEBVIEW_API void webview_print_log(const char *s) {
+  #ifdef UNICODE
+    WCHAR *ws = webview_to_utf16(s);
+    OutputDebugString(ws); 
+    GlobalFree(ws);
+  #else
+    OutputDebugString(s); 
+  #endif
+  }
 
 #endif /* WEBVIEW_WINAPI */
 

runtime/js/.eslintrc

@@ -15,10 +15,7 @@
             "error",
             "tab"
         ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
+        "linebreak-style": 0,
         "quotes": [
             "error",
             "single"
@@ -28,4 +25,4 @@
             "always"
         ]
     }
-}
+}

runtime/js/runtime/browser.js

@@ -32,6 +32,6 @@ function OpenFile(filename) {
 }
 
 module.exports = {
-	OpenURL,
-	OpenFile
-};
+	OpenURL: OpenURL,
+	OpenFile: OpenFile
+};

runtime/js/runtime/events.js

@@ -80,10 +80,10 @@ function Acknowledge(eventName) {
 }
 
 module.exports = {
-	OnMultiple,
-	On,
-	Once,
-	Emit,
-	Heartbeat,
-	Acknowledge
-};
+	OnMultiple: OnMultiple,
+	On: On,
+	Once: Once,
+	Emit: Emit,
+	Heartbeat: Heartbeat,
+	Acknowledge: Acknowledge
+};

runtime/js/runtime/log.js

@@ -62,9 +62,9 @@ function Fatal(message) {
 }
 
 module.exports = {
-	Debug,
-	Info,
-	Warning,
-	Error,
-	Fatal
+	Debug: Debug,
+	Info: Info,
+	Warning: Warning,
+	Error: Error,
+	Fatal: Fatal
 };

runtime/js/runtime/main.js

@@ -15,8 +15,8 @@ const Events = require('./events');
 const Init = require('./init');
 
 module.exports = {
-	Log,
-	Browser,
-	Events,
-	Init
-};
+	Log: Log,
+	Browser: Browser,
+	Events: Events,
+	Init: Init
+};

runtime/js/runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wailsapp/runtime",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Wails Javascript runtime library",
   "main": "main.js",
   "types": "runtime.d.ts",