From 28080dbafddc86b49deda53b7a51975a67a22869 Mon Sep 17 00:00:00 2001
From: HolographicHat <holographichat@outlook.com>
Date: Sun, 17 Apr 2022 22:54:35 +0800
Subject: [PATCH] fix

---
 native/src/main.cc  |  4 +++-
 native/src/utils.cc | 23 +++++++----------------
 native/src/utils.h  |  4 ++--
 package/package.js  | 12 ++++++------
 version.js          |  4 ++--
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/native/src/main.cc b/native/src/main.cc
index 7ba065a..9b3bdf9 100644
--- a/native/src/main.cc
+++ b/native/src/main.cc
@@ -171,7 +171,9 @@ namespace native {
 
     Value openUrl(const CallbackInfo &info) {
         Env env = info.Env();
-        wstring url = StringToWString(info[0].As<Napi::String>().Utf8Value());
+        string nUrl = info[0].As<Napi::String>().Utf8Value();
+        wstring url = GetACP() == 936 ? StringToWString(nUrl, CP_UTF8) : StringToWString(nUrl);
+        Log(env, L"openUrl: " + url);
         HINSTANCE retcode = ShellExecute(GetConsoleWindow(), L"open", url.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
         return Napi::Number::New(env, (INT_PTR)retcode); // NOLINT(cppcoreguidelines-narrowing-conversions)
     }
diff --git a/native/src/utils.cc b/native/src/utils.cc
index 6d2c457..6f393fc 100644
--- a/native/src/utils.cc
+++ b/native/src/utils.cc
@@ -1,28 +1,19 @@
 #include "utils.h"
 #include "define.h"
 
-string GBKToUTF8(const wstring& src) {
-    int len = WideCharToMultiByte(CP_UTF8, 0, src.c_str(), -1, nullptr, 0, nullptr, nullptr);
-    auto *buffer = new CHAR[len];
-    WideCharToMultiByte(CP_UTF8, 0, src.c_str(), -1, buffer, len, nullptr, nullptr);
-    string strTemp(buffer);
-    delete[] buffer;
-    return strTemp;
-}
-
-wstring StringToWString(const string &src) {
-    int len = MultiByteToWideChar(CP_ACP, 0, src.c_str(), -1, nullptr, 0);
+wstring StringToWString(const string &src, UINT codePage) {
+    int len = MultiByteToWideChar(codePage, 0, src.c_str(), -1, nullptr, 0);
     auto *buffer = new WCHAR[len];
-    MultiByteToWideChar(CP_ACP, 0, src.c_str(), -1, buffer, len);
+    MultiByteToWideChar(codePage, 0, src.c_str(), -1, buffer, len);
     wstring strTemp(buffer);
     delete[] buffer;
     return strTemp;
 }
 
-string WStringToString(const wstring &src) {
-    int len = WideCharToMultiByte(CP_ACP, 0, src.c_str(), -1, nullptr, 0, nullptr, nullptr);
+string WStringToString(const wstring &src, UINT codePage) {
+    int len = WideCharToMultiByte(codePage, 0, src.c_str(), -1, nullptr, 0, nullptr, nullptr);
     auto *buffer = new CHAR[len];
-    WideCharToMultiByte(CP_ACP, 0, src.c_str(), -1, buffer, len, nullptr, nullptr);
+    WideCharToMultiByte(codePage, 0, src.c_str(), -1, buffer, len, nullptr, nullptr);
     string strTemp(buffer);
     delete[] buffer;
     return strTemp;
@@ -52,7 +43,7 @@ LSTATUS OpenFile(Env env, Napi::String &result, HWND parent) {
     open.lStructSize = sizeof(open);
     if(GetOpenFileName(&open)) {
         if (GetACP() == 936) {
-            result = Napi::String::New(env, GBKToUTF8(file));
+            result = Napi::String::New(env, WStringToString(file, CP_UTF8));
         } else {
             result = Napi::String::New(env, WStringToString(file));
         }
diff --git a/native/src/utils.h b/native/src/utils.h
index 35a657e..1f0da1c 100644
--- a/native/src/utils.h
+++ b/native/src/utils.h
@@ -2,8 +2,8 @@
 
 #include "define.h"
 
-string WStringToString(const wstring &src);
-wstring StringToWString(const string &src);
+string WStringToString(const wstring &src, UINT codePage = CP_ACP);
+wstring StringToWString(const string &src, UINT codePage = CP_ACP);
 LSTATUS OpenFile(Env env, Napi::String &result, HWND parent = GetConsoleWindow());
 BOOL EnablePrivilege(Env env, const wstring &name);
 void Log(Env env, const string &msg);
diff --git a/package/package.js b/package/package.js
index 413c6b8..9e0f7ee 100644
--- a/package/package.js
+++ b/package/package.js
@@ -36,22 +36,22 @@ const cleanUp = () => {
 
 
 const c = {
-    finalName: `${name}-Win7`,
-    nodeVersion: "14.19.1",
+    forWin7: false,
     sevenZipPath: "\"C:/Program Files/7-Zip/7z.exe\""
 };
 
 (async () => {
-    console.log(c)
+    const fn = c.forWin7 ? `${name}-Win7` : name
+    const nv = c.forWin7 ? "14.19.1" : "16.14.2"
     log("Generate and compile version info")
     generateAndCompileVersionInfo()
     log("Modify executable file resources")
-    const path = `C:/Users/holog/.pkg-cache/v3.3/built-v${c.nodeVersion}-win-x64`
+    const path = `C:/Users/holog/.pkg-cache/v3.3/built-v${nv}-win-x64`
     generateScript(path)
     execSync(`rh.exe -script tmp.script`)
     cleanUp()
     log("Build and compress package")
-    await pkg.exec(`../app.js -t node${c.nodeVersion.split(".")[0]}-win-x64 -C Brotli --build -o ${c.finalName}.exe`.split(" "))
-    execSync(`${c.sevenZipPath} a ${c.finalName}.7z ${c.finalName}.exe -mx=9 -myx=9 -mmt=4 -sdel -stl`)
+    await pkg.exec(`../app.js -t node${nv.split(".")[0]}-win-x64 -C Brotli --build -o ${fn}.exe`.split(" "))
+    execSync(`${c.sevenZipPath} a ${fn}.7z ${fn}.exe -mx=9 -myx=9 -mmt=4 -sdel -stl`)
     log("Done")
 })()
diff --git a/version.js b/version.js
index 722cb8f..a254c72 100644
--- a/version.js
+++ b/version.js
@@ -1,7 +1,7 @@
 const version = {
     code: 7,
-    name: "1.6",
-    isDev: false
+    name: "1.6.50",
+    isDev: true
 }
 
 module.exports = { version }