fiX: unicode fixes for windows

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)

app.go

@@ -1,9 +1,7 @@
 package wails
 
 import (
-	"fmt"
 	"os"
-	"runtime"
 	"syscall"
 
 	"github.com/syossan27/tebata"
@@ -67,28 +65,9 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 		result.config.DisableInspector = true
 	}
 
-	// If running windows, do a hidpi fix
-	if runtime.GOOS == "windows" {
-		err := SetProcessDPIAware()
-		if err != nil {
-			result.log.Fatalf(err.Error())
-		}
-	}
-
 	return result
 }
 
-// SetProcessDPIAware via user32.dll
-// https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setprocessdpiaware
-// Also, thanks Jack Mordaynt! https://github.com/wailsapp/wails/issues/293
-func SetProcessDPIAware() error {
-	status, r, err := syscall.NewLazyDLL("user32.dll").NewProc("SetProcessDPIAware").Call()
-	if status == 0 {
-		return fmt.Errorf("exit status %d: %v %v", status, r, err)
-	}
-	return nil
-}
-
 // Run the app
 func (a *App) Run() error {
 

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/templates/angular-template/frontend/src/wailsbridge.js

@@ -0,0 +1,17 @@
+/*
+    Wails Bridge (c) 2019-present Lea Anthony
+
+    This prod version is to get around having to rewrite your code
+    for production. When doing a release build, this file will be used 
+    instead of the full version.
+*/
+
+export default {
+  // The main function
+  // Passes the main Wails object to the callback if given.
+  Start: function(callback) {
+    if (callback) {
+      window.wails.events.on("wails:ready", callback);
+    }
+  }
+};

cmd/templates/create-react-app/frontend/src/wailsbridge.js

@@ -0,0 +1,17 @@
+/*
+    Wails Bridge (c) 2019-present Lea Anthony
+
+    This prod version is to get around having to rewrite your code
+    for production. When doing a release build, this file will be used 
+    instead of the full version.
+*/
+
+export default {
+  // The main function
+  // Passes the main Wails object to the callback if given.
+  Start: function (callback) {
+    if (callback) {
+      window.wails.Events.On("wails:ready", callback);
+    }
+  }
+};

cmd/version.go

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

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
+#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 "            \
+  _T("Software\\Microsoft\\Internet "            \
-  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION"
+  "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++;
@@ -1872,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/assets/bridge.js

@@ -95,6 +95,13 @@ function startBridge() {
 		window.wailsbridge.reconnectOverlay.style.display = 'none';
 	}
 
+	// Bridge external.invoke
+	window.external = {
+		invoke: function (msg) {
+			window.wailsbridge.websocket.send(msg);
+		}
+	};
+
 	// Adds a script to the Dom.
 	// Removes it if second parameter is true.
 	function addScript(script, remove) {
@@ -207,4 +214,4 @@ function Init(callback) {
 	start(callback);
 }
 
-module.exports = Init;
+module.exports = Init;

runtime/js/core/ipc.js

@@ -15,11 +15,7 @@ The lightweight framework for web-like apps
  * @param {string} message
  */
 function Invoke(message) {
-	if ( window.wailsbridge ) {
+	window.external.invoke(message);
-		window.wailsbridge.websocket.send(message);
-	} else {
-		window.external.invoke(message);
-	}
 }
 
 /**

runtime/js/core/main.js

@@ -46,16 +46,6 @@ var runtime = {
 // Augment global
 Object.assign(window.wails, runtime);
 
-// Setup global error handler
-window.onerror = function (msg, url, lineNo, columnNo, error) {
-	window.wails.Log.Error('**** Caught Unhandled Error ****');
-	window.wails.Log.Error('Message: ' + msg);
-	window.wails.Log.Error('URL: ' + url);
-	window.wails.Log.Error('Line No: ' + lineNo);
-	window.wails.Log.Error('Column No: ' + columnNo);
-	window.wails.Log.Error('error: ' + error);
-};
-
 // Emit loaded event
 Emit('wails:loaded');
 

runtime/js/runtime/browser.js

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

runtime/js/runtime/events.js

@@ -86,4 +86,4 @@ module.exports = {
 	Emit: Emit,
 	Heartbeat: Heartbeat,
 	Acknowledge: Acknowledge
-};
+};

runtime/js/runtime/main.js

@@ -19,4 +19,4 @@ module.exports = {
 	Browser: Browser,
 	Events: Events,
 	Init: Init
-};
+};

runtime/js/runtime/package.json

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

scripts/build.go

@@ -1,84 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-// Default target to run when none is specified
-// If not set, running mage will list available targets
-// var Default = Build
-
-/*
-# Build runtime
-echo "**** Building Runtime ****"
-cd runtime/js
-npm install
-npm run build
-cd ../..
-
-echo "**** Packing Assets ****"
-cd cmd
-mewn
-cd ..
-cd lib/renderer
-mewn
-cd ../..
-
-echo "**** Installing Wails locally ****"
-cd cmd/wails
-go install
-cd ../..
-
-echo "**** Tidying the mods! ****"
-go mod tidy
-
-echo "**** WE ARE DONE! ****"
-
-*/
-
-func runCommand(command string, args ...string) {
-	cmd := exec.Command(command, args...)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		log.Println(string(output))
-		log.Fatal(err)
-	}
-	cmd.Run()
-	fmt.Println(string(output))
-}
-
-// A build step that requires additional params, or platform specific steps for example
-func main() {
-
-	dir, _ := os.Getwd()
-
-	// Build Runtime
-	fmt.Println("**** Building Runtime ****")
-	runtimeDir, _ := filepath.Abs(filepath.Join(dir, "..", "runtime", "js"))
-	os.Chdir(runtimeDir)
-	runCommand("npm", "install")
-	runCommand("npm", "run", "build")
-
-	// Pack assets
-	fmt.Println("**** Packing Assets ****")
-	rendererDir, _ := filepath.Abs(filepath.Join(dir, "..", "lib", "renderer"))
-	os.Chdir(rendererDir)
-	runCommand("mewn")
-	cmdDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd"))
-	os.Chdir(cmdDir)
-	runCommand("mewn")
-
-	// Install Wails
-	fmt.Println("**** Installing Wails locally ****")
-	execDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd", "wails"))
-	os.Chdir(execDir)
-	runCommand("go", "install")
-
-	baseDir, _ := filepath.Abs(filepath.Join(dir, ".."))
-	os.Chdir(baseDir)
-	runCommand("go", "mod", "tidy")
-}