Fun/Yae
1
0
Fork 0
mirror of https://github.com/HolographicHat/Yae.git synced 2026-05-09 14:54:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

encode uri to avoid charset problem

Browse Source
This commit is contained in:
HolographicHat
2022-04-17 23:46:11 +08:00
parent 28080dbafd
commit 4417feab53
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
native/src/main.cc
View File

@@ -171,9 +171,7 @@ namespace native {
Value openUrl(const CallbackInfo &info) {
Env env = info.Env();
string nUrl = info[0].As<Napi::String>().Utf8Value();
wstring url = GetACP() == 936 ? StringToWString(nUrl, CP_UTF8) : StringToWString(nUrl);
Log(env, L"openUrl: " + url);
wstring url = StringToWString(info[0].As<Napi::String>().Utf8Value());
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)
}

6
native/src/utils.cc
View File

@@ -42,11 +42,7 @@ LSTATUS OpenFile(Env env, Napi::String &result, HWND parent) {
open.lpstrFilter = L"国服/国际服主程序 (YuanShen/GenshinImpact.exe)\0YuanShen.exe;GenshinImpact.exe\0";
open.lStructSize = sizeof(open);
if(GetOpenFileName(&open)) {
if (GetACP() == 936) {
result = Napi::String::New(env, WStringToString(file, CP_UTF8));
} else {
result = Napi::String::New(env, WStringToString(file));
}
result = GetACP() == 936 ? Napi::String::New(env, WStringToString(file, CP_UTF8)) : Napi::String::New(env, WStringToString(file));
return ERROR_SUCCESS;
} else {
return ERROR_ERRORS_ENCOUNTERED;