fiX: unicode fixes for windows

CONTRIBUTORS.md

@@ -2,22 +2,22 @@
 
 Wails is what it is because of the time and effort given by these great people. A huge thank you to each and every one!
 
-  * [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot)
-  * [Qais Patankar](https://github.com/qaisjp)
-  * [Anthony Lee](https://github.com/alee792)
-  * [Adrian Lanzafame](https://github.com/lanzafame)
-  * [Mattn](https://github.com/mattn)
-  * [0xflotus](https://github.com/0xflotus)
-  * [Michael D Henderson](https://github.com/mdhender)
-  * [fred2104](https://github.com/fishfishfish2104)
-  * [intelwalk](https://github.com/intelwalk)
-  * [Mark Stenglein](https://github.com/ocelotsloth)
-  * [admin_3.exe](https://github.com/bh90210)
-  * [iceleo-com](https://github.com/iceleo-com)
-  * [fallendusk](https://github.com/fallendusk)
-  * [Florian Didran](https://github.com/fdidron)
-  * [Nikolai Zimmermann](https://github.com/Chronophylos)
-  * [Toyam Cox](https://github.com/Vaelatern)
-  * [Robin Eklind](https://github.com/mewmew)
-  * [Kris Raney](https://github.com/kraney)
-  * [Jack Mordaunt](https://github.com/JackMordaunt)
+* [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot)
+* [Qais Patankar](https://github.com/qaisjp)
+* [Anthony Lee](https://github.com/alee792)
+* [Adrian Lanzafame](https://github.com/lanzafame)
+* [Mattn](https://github.com/mattn)
+* [0xflotus](https://github.com/0xflotus)
+* [Michael D Henderson](https://github.com/mdhender)
+* [fred2104](https://github.com/fishfishfish2104)
+* [intelwalk](https://github.com/intelwalk)
+* [Mark Stenglein](https://github.com/ocelotsloth)
+* [admin_3.exe](https://github.com/bh90210)
+* [iceleo-com](https://github.com/iceleo-com)
+* [fallendusk](https://github.com/fallendusk)
+* [Florian Didran](https://github.com/fdidron)
+* [Nikolai Zimmermann](https://github.com/Chronophylos)
+* [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

@@ -2,7 +2,6 @@ package wails
 
 import (
 	"os"
-	"runtime"
 	"syscall"
 
 	"github.com/syossan27/tebata"
@@ -44,7 +43,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 	}
 
 	result := &App{
-		logLevel:       "debug",
+		logLevel:       "info",
 		renderer:       renderer.NewWebView(),
 		ipc:            ipc.NewManager(),
 		bindingManager: binding.NewManager(),
@@ -66,9 +65,6 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 		result.config.DisableInspector = true
 	}
 
-	// Platform specific init
-	platformInit()
-
 	return result
 }
 
@@ -106,11 +102,6 @@ func (a *App) start() error {
 		return err
 	}
 
-	// Enable console for Windows debug builds
-	if runtime.GOOS == "windows" && BuildMode == cmd.BuildModeDebug {
-		a.renderer.EnableConsole()
-	}
-
 	// Start signal handler
 	t := tebata.New(os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
 	t.Reserve(func() {

app_other.go

@@ -1,7 +0,0 @@
-// +build +linux +darwin !windows
-
-package wails
-
-func platformInit() {
-
-}

app_windows.go

@@ -1,27 +0,0 @@
-// +build windows !linux !darwin
-
-package wails
-
-import (
-	"fmt"
-	"log"
-	"syscall"
-)
-
-func platformInit() {
-	err := SetProcessDPIAware()
-	if err != nil {
-		log.Fatalf(err.Error())
-	}
-}
-
-// SetProcessDPIAware via user32.dll
-// https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setprocessdpiaware
-// Also, thanks Jack Mordaunt! 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
-}

cmd/templates/angular-template/frontend/package.json.template

@@ -22,7 +22,6 @@
     "@angular/platform-browser-dynamic": "~8.0.1",
     "@angular/router": "~8.0.1",
     "@wailsapp/runtime": "^1.0.0",
-    "core-js": "^3.4.4",
     "ngx-build-plus": "^8.0.3",
     "rxjs": "~6.4.0",
     "tslib": "^1.9.0",

cmd/templates/angular-template/frontend/src/main.ts

@@ -1,4 +1,3 @@
-import 'core-js/stable';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 

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/angular-template/frontend/tsconfig.json

@@ -11,7 +11,7 @@
     "module": "esnext",
     "moduleResolution": "node",
     "importHelpers": true,
-    "target": "es5",
+    "target": "es2015",
     "typeRoots": [
       "node_modules/@types"
     ],
@@ -20,4 +20,4 @@
       "dom"
     ]
   }
-}
+}

cmd/templates/angular-template/main.go.template

@@ -11,7 +11,7 @@ func basic() string {
 
 func main() {
 
-	js := mewn.String("./frontend/dist/my-app/main.js")
+	js := mewn.String("./frontend/dist/my-app/main-es2015.js")
 	css := mewn.String("./frontend/dist/my-app/styles.css")
 
 	app := wails.CreateApp(&wails.AppConfig{

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.20.0"
+const Version = "v0.18.14-pre"

go.mod

@@ -31,5 +31,3 @@ require (
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )
-
-go 1.13

lib/interfaces/renderer.go

@@ -3,12 +3,10 @@ package interfaces
 import (
 	"github.com/wailsapp/wails/lib/messages"
 )
-
 // Renderer is an interface describing a Wails target to render the app to
 type Renderer interface {
 	Initialise(AppConfig, IPCManager, EventManager) error
 	Run() error
-	EnableConsole()
 
 	// Binding
 	NewBinding(bindingName string) error

lib/renderer/bridge.go

@@ -74,10 +74,6 @@ func (h *Bridge) evalJS(js string, mtype messageType) error {
 	return nil
 }
 
-// EnableConsole not needed for bridge!
-func (h *Bridge) EnableConsole() {
-}
-
 func (h *Bridge) injectCSS(css string) {
 	// Minify css to overcome issues in the browser with carriage returns
 	minified, err := htmlmin.Minify([]byte(css), &htmlmin.Options{

lib/renderer/webview.go

@@ -19,13 +19,12 @@ import (
 // WebView defines the main webview application window
 // Default values in []
 type WebView struct {
-	window        wv.WebView // The webview object
-	ipc           interfaces.IPCManager
-	log           *logger.CustomLogger
-	config        interfaces.AppConfig
-	eventManager  interfaces.EventManager
-	bindingCache  []string
-	enableConsole bool
+	window       wv.WebView // The webview object
+	ipc          interfaces.IPCManager
+	log          *logger.CustomLogger
+	config       interfaces.AppConfig
+	eventManager interfaces.EventManager
+	bindingCache []string
 }
 
 // NewWebView returns a new WebView struct
@@ -104,11 +103,6 @@ func (w *WebView) evalJS(js string) error {
 	return nil
 }
 
-// EnableConsole enables the console!
-func (w *WebView) EnableConsole() {
-	w.enableConsole = true
-}
-
 // Escape the Javascripts!
 func escapeJS(js string) (string, error) {
 	result := strings.Replace(js, "\\", "\\\\", -1)
@@ -178,13 +172,6 @@ func (w *WebView) Run() error {
 
 	w.log.Info("Running...")
 
-	// Inject firebug in debug mode on Windows
-	if w.enableConsole {
-		w.log.Debug("Enabling Wails console")
-		console := mewn.String("../../runtime/assets/console.js")
-		w.evalJS(console)
-	}
-
 	// Runtime assets
 	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
 	w.evalJS(wailsRuntime)

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 "            \
-  "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++;
@@ -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/assets/console.js

@@ -1,175 +0,0 @@
-(function () {
-
-    window.wailsconsole = {};
-
-    var debugconsole = document.createElement("div");
-    var header = document.createElement("div");
-    var consoleOut = document.createElement("div");
-
-
-    document.addEventListener('keyup', logKey);
-
-    debugconsole.id = "wailsdebug";
-    debugconsole.style.fontSize = "18px";
-    debugconsole.style.width = "100%";
-    debugconsole.style.height = "35%";
-    debugconsole.style.maxHeight = "35%";
-    debugconsole.style.position = "fixed";
-    debugconsole.style.left = "0px";
-    debugconsole.style.backgroundColor = "rgba(255,255,255,0.8)";
-    debugconsole.style.borderTop = '1px solid black';
-    debugconsole.style.color = "black";
-    debugconsole.style.display = "none";
-
-    header.style.width = "100%";
-    header.style.height = "30px";
-    header.style.display = "block";
-    // header.style.paddingTop = "3px";
-    header.style.verticalAlign = "middle";
-    header.style.paddingLeft = "10px";
-    header.style.background = "rgba(255,255,255,0.8)";
-    header.innerHTML = "  <span style='vertical-align: middle'> Wails Console > <input id='conin' style='border: solid 1px black; width: 50%'></input><span style='padding-left: 5px; cursor:pointer;' onclick='window.wailsconsole.clearConsole()'>Clear</span></span>";
-
-    consoleOut.style.position = "absolute";
-    consoleOut.style.width = "100%";
-    consoleOut.style.height = "auto";
-    consoleOut.style.top = "30px";
-    // consoleOut.style.paddingLeft = "10px";
-    consoleOut.style.bottom = "0px";
-    consoleOut.style.backgroundColor = "rgba(200,200,200,1)";
-    consoleOut.style.overflowY = "scroll";
-    consoleOut.style.msOverflowStyle = "-ms-autohiding-scrollbar";
-
-    debugconsole.appendChild(header);
-    debugconsole.appendChild(consoleOut);
-    document.body.appendChild(debugconsole);
-    console.log(debugconsole.style.display)
-
-    function logKey(e) {
-        var conin = document.getElementById('conin');
-        if (e.which == 27 && e.shiftKey) {
-            toggleConsole(conin);
-        }
-        if (e.which == 13 && consoleVisible()) {
-            var command = conin.value.trim();
-            if (command.length > 0) {
-                console.log("> " + command)
-                try {
-                    evaluateInput(command);
-                } catch (e) {
-                    console.error(e.message);
-                }
-                conin.value = "";
-            }
-        }
-    };
-
-
-    function consoleVisible() {
-        return debugconsole.style.display == "block";
-    }
-
-    function toggleConsole(conin) {
-        var display = "none"
-        if (debugconsole.style.display == "none") display = "block";
-        debugconsole.style.display = display;
-        if (display == "block") {
-            conin.focus();
-        }
-    }
-
-    function evaluateExpression(expression) {
-
-        var pathSegments = [].concat(expression.split('.'));
-        if (pathSegments[0] == 'window') {
-            pathSegments.shift()
-        }
-        var currentObject = window;
-        for (var i = 0; i < pathSegments.length; i++) {
-            var pathSegment = pathSegments[i];
-            if (currentObject[pathSegment] == undefined) {
-                return false;
-            }
-            currentObject = currentObject[pathSegment];
-        }
-        console.log(JSON.stringify(currentObject));
-
-        return true;
-    }
-
-    function evaluateInput(command) {
-        try {
-            if (evaluateExpression(command)) {
-                return
-            } else {
-                eval(command);
-            }
-        } catch (e) {
-            console.error(e.message)
-        }
-    }
-
-
-    // Set us up as a listener
-    function hookIntoIPC() {
-        if (window.wails && window.wails._ && window.wails._.AddIPCListener) {
-            window.wails._.AddIPCListener(processIPCMessage);
-        } else {
-            setTimeout(hookIntoIPC, 100);
-        }
-    }
-    hookIntoIPC();
-
-    function processIPCMessage(message) {
-        console.log(message);
-        var parsedMessage;
-        try {
-            parsedMessage = JSON.parse(message);
-        } catch (e) {
-            console.error("Error in parsing IPC message: " + e.message);
-            return false;
-        }
-        var logmessage = "[IPC] "
-        switch (parsedMessage.type) {
-            case 'call':
-                logmessage += " Call: " + parsedMessage.payload.bindingName;
-                var params = "";
-                var parsedParams = JSON.parse(parsedMessage.payload.data);
-                if (parsedParams.length > 0) {
-                    params = parsedParams;
-                }
-                logmessage += "(" + params + ")";
-                break;
-            case 'log':
-                logmessage += "Log (" + parsedMessage.payload.level + "): " + parsedMessage.payload.message;
-                break;
-            default:
-                logmessage = message;
-        }
-        console.log(logmessage);
-    }
-
-    window.wailsconsole.clearConsole = function () {
-        consoleOut.innerHTML = "";
-    }
-
-    console.log = function (message) {
-        consoleOut.innerHTML = consoleOut.innerHTML + "<span style='padding-left: 5px'>" + message + '</span><br/>';
-        consoleOut.scrollTop = consoleOut.scrollHeight;
-
-    };
-    console.error = function (message) {
-        consoleOut.innerHTML = consoleOut.innerHTML + "<span style='color:red; padding-left: 5px'> Error: " + message + '</span><br/>';
-        consoleOut.scrollTop = consoleOut.scrollHeight;
-    };
-    // var h = document.getElementsByTagName("html")[0];
-    // console.log("html margin: " + h.style.marginLeft);
-    // console.log("html padding: " + h.style.paddingLeft);
-
-    // setInterval(function() { console.log("test");}, 1000);
-    // setInterval(function() { console.error("oops");}, 3000);
-    // var script = document.createElement('script'); 
-    // script.src = "https://cdnjs.cloudflare.com/ajax/libs/firebug-lite/1.4.0/firebug-lite.js#startOpened=true"; 
-    // document.body.appendChild(script); 
-
-})();

runtime/js/core/ipc.js

@@ -9,35 +9,13 @@ The lightweight framework for web-like apps
 */
 /* jshint esversion: 6 */
 
-// IPC Listeners
-var listeners = [];
-
-/**
- * Adds a listener to IPC messages
- * @param {function} callback 
- */
-export function AddIPCListener(callback) {
-	listeners.push(callback);
-}
-
 /**
  * Invoke sends the given message to the backend
  *
  * @param {string} message
  */
 function Invoke(message) {
-	if (window.wailsbridge) {
-		window.wailsbridge.websocket.send(message);
-	} else {
-		window.external.invoke(message);
-	}
-
-	// Also send to listeners
-	if (listeners.length > 0) {
-		for (var i = 0; i < listeners.length; i++) {
-			listeners[i](message);
-		}
-	}
+	window.external.invoke(message);
 }
 
 /**

runtime/js/core/main.js

@@ -14,7 +14,6 @@ import { On, OnMultiple, Emit, Notify, Heartbeat, Acknowledge } from './events';
 import { NewBinding } from './bindings';
 import { Callback } from './calls';
 import { AddScript, InjectCSS } from './utils';
-import { AddIPCListener } from './ipc';
 
 // Initialise global if not already
 window.wails = window.wails || {};
@@ -28,7 +27,6 @@ var internal = {
 	AddScript,
 	InjectCSS,
 	Init,
-	AddIPCListener,
 };
 
 // Setup runtime structure
@@ -48,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,85 +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()
-	fmt.Println(string(output))
-	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")
-}