feat: add x64/WeaselDeployer.exe for wow64 situation, for huge dictio…

…nary deployment.
rime · Dec 4, 2023 · b841385 · b841385
1 parent ed33c7e
commit b841385
Show file tree

Hide file tree

Showing 12 changed files with 501 additions and 378 deletions.
diff --git a/RimeWithWeasel/RimeWithWeasel.vcxproj b/RimeWithWeasel/RimeWithWeasel.vcxproj
diff --git a/RimeWithWeasel/WeaselUtility.cpp b/RimeWithWeasel/WeaselUtility.cpp
@@ -28,7 +28,11 @@ const char* weasel_shared_data_dir() {
 	GetModuleFileNameA(NULL, path, _countof(path));
 	std::string str_path(path);
 	size_t k = str_path.find_last_of("/\\");
-	strcpy_s(path + k + 1, _countof(path) - (k + 1), "data");
+#ifdef _WIN64
+		strcpy_s(path + k - 3 , _countof(path) - (k + 3), "data");
+#else
+		strcpy_s(path + k + 1, _countof(path) - (k + 1), "data");
+#endif
 	return path;
 }
 

diff --git a/WeaselDeployer/Configurator.cpp b/WeaselDeployer/Configurator.cpp
@@ -20,8 +20,7 @@ static void CreateFileIfNotExist(std::string filename)
 {
 	std::string user_data_dir = weasel_user_data_dir();
 	std::wstring filepathw = string_to_wstring(user_data_dir) + L"\\" + string_to_wstring(filename);
-	DWORD dwAttrib = GetFileAttributes(filepathw.c_str());
-	if (!(INVALID_FILE_ATTRIBUTES != dwAttrib && 0 == (dwAttrib & FILE_ATTRIBUTE_DIRECTORY)))
+	if (!IfFileExistW(filepathw))
 	{
 		std::wofstream o(filepathw, std::ios::app);
 		o.close();

diff --git a/WeaselDeployer/UIStyleSettings.cpp b/WeaselDeployer/UIStyleSettings.cpp
@@ -36,13 +36,6 @@ bool UIStyleSettings::GetPresetColorSchemes(std::vector<ColorSchemeInfo>* result
 	return true;
 }
 
-// check if a file exists
-static inline bool IfFileExist(std::string filename)
-{
-	DWORD dwAttrib = GetFileAttributes(string_to_wstring(filename).c_str());
-	return (INVALID_FILE_ATTRIBUTES != dwAttrib && 0 == (dwAttrib & FILE_ATTRIBUTE_DIRECTORY));
-}
-
 // get preview image from user dir first, then shared_dir
 std::string UIStyleSettings::GetColorSchemePreview(const std::string& color_scheme_id) {
 	std::string shared_dir = rime_get_api()->get_shared_data_dir();

diff --git a/WeaselDeployer/WeaselDeployer.vcxproj b/WeaselDeployer/WeaselDeployer.vcxproj
diff --git a/WeaselServer/WeaselServerApp.cpp b/WeaselServer/WeaselServerApp.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "WeaselServerApp.h"
+#include "WeaselUtility.h"
 
 WeaselServerApp::WeaselServerApp()
 	: m_handler(std::make_unique<RimeWithWeaselHandler>(&m_ui))
@@ -46,10 +47,17 @@ void WeaselServerApp::SetupMenuHandlers()
 {
 	std::wstring dir(install_dir());
 	m_server.AddMenuHandler(ID_WEASELTRAY_QUIT, [this] { return m_server.Stop() == 0; });
-	m_server.AddMenuHandler(ID_WEASELTRAY_DEPLOY, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/deploy")));
-	m_server.AddMenuHandler(ID_WEASELTRAY_SETTINGS, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring()));
-	m_server.AddMenuHandler(ID_WEASELTRAY_DICT_MANAGEMENT, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/dict")));
-	m_server.AddMenuHandler(ID_WEASELTRAY_SYNC, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/sync")));
+	if (is_wow64() && IfFileExistW(dir + L"\\x64\\WeaselDeployer.exe") && IfFileExistW(dir + L"\\x64\\rime.dll")) {
+		m_server.AddMenuHandler(ID_WEASELTRAY_DEPLOY, std::bind(execute, dir + L"\\x64\\WeaselDeployer.exe", std::wstring(L"/deploy")));
+		m_server.AddMenuHandler(ID_WEASELTRAY_SETTINGS, std::bind(execute, dir + L"\\x64\\WeaselDeployer.exe", std::wstring()));
+		m_server.AddMenuHandler(ID_WEASELTRAY_DICT_MANAGEMENT, std::bind(execute, dir + L"\\x64\\WeaselDeployer.exe", std::wstring(L"/dict")));
+		m_server.AddMenuHandler(ID_WEASELTRAY_SYNC, std::bind(execute, dir + L"\\x64\\WeaselDeployer.exe", std::wstring(L"/sync")));
+	} else {
+		m_server.AddMenuHandler(ID_WEASELTRAY_DEPLOY, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/deploy")));
+		m_server.AddMenuHandler(ID_WEASELTRAY_SETTINGS, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring()));
+		m_server.AddMenuHandler(ID_WEASELTRAY_DICT_MANAGEMENT, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/dict")));
+		m_server.AddMenuHandler(ID_WEASELTRAY_SYNC, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/sync")));
+	}
 	m_server.AddMenuHandler(ID_WEASELTRAY_WIKI, std::bind(open, L"https://rime.im/docs/"));
 	m_server.AddMenuHandler(ID_WEASELTRAY_HOMEPAGE, std::bind(open, L"https://rime.im/"));
 	m_server.AddMenuHandler(ID_WEASELTRAY_FORUM, std::bind(open, L"https://rime.im/discuss/"));

diff --git a/WeaselTSF/LanguageBar.cpp b/WeaselTSF/LanguageBar.cpp
@@ -283,18 +283,6 @@ void CLangBarItemButton::SetLangbarStatus(DWORD dwStatus, BOOL fSet)
 	return;
 }
 
-BOOL is_wow64()
-{
-	DWORD errorCode;
-	if (GetSystemWow64DirectoryW(NULL, 0) == 0)
-		if ((errorCode = GetLastError()) == ERROR_CALL_NOT_IMPLEMENTED)
-			return FALSE;
-		else
-			ExitProcess((UINT)errorCode);
-	else
-		return TRUE;
-}
-
 void WeaselTSF::_HandleLangBarMenuSelect(UINT wID)
 {
 	if(wID != ID_WEASELTRAY_RERUN_SERVICE)

diff --git a/github.install.bat b/github.install.bat
@@ -8,16 +8,26 @@ set rime_version=1.9.0
 set download_archive=rime-a608767-Windows-msvc.7z
 set download_archive_deps=rime-deps-a608767-Windows-msvc.7z
 
+set download_archive_x64=rime-a608767-Windows-clang.7z
+set download_archive_deps_x64=rime-deps-a608767-Windows-clang.7z
+
 curl -LO https://github.com/rime/librime/releases/download/%rime_version%/%download_archive%
 curl -LO https://github.com/rime/librime/releases/download/%rime_version%/%download_archive_deps%
+curl -LO https://github.com/rime/librime/releases/download/%rime_version%/%download_archive_x64%
+curl -LO https://github.com/rime/librime/releases/download/%rime_version%/%download_archive_deps_x64%
 
 7z x %download_archive% * -olibrime\ -y
 7z x %download_archive_deps% * -olibrime\ -y
+7z x %download_archive_x64% * -olibrime_x64\ -y
+7z x %download_archive_deps_x64% * -olibrime_x64\ -y
 
 copy /Y librime\dist\include\rime_*.h include\
 copy /Y librime\dist\lib\rime.lib lib\
 copy /Y librime\dist\lib\rime.dll output\
 
+copy /Y librime_x64\dist\lib\rime.dll output\x64\
+copy /Y librime_x64\dist\lib\rime.lib lib\rimex64.lib
+
 if not exist output\data\opencc mkdir output\data\opencc
 copy /Y librime\share\opencc\*.* output\data\opencc\
 
diff --git a/include/WeaselUtility.h b/include/WeaselUtility.h
@@ -63,5 +63,29 @@ inline std::string wstring_to_string(const std::wstring& wstr, int code_page = C
 	return res;
 }
 
+inline bool IfFileExistW(std::wstring filepathw)
+{
+	DWORD dwAttrib = GetFileAttributes(filepathw.c_str());
+	return (INVALID_FILE_ATTRIBUTES != dwAttrib && 0 == (dwAttrib & FILE_ATTRIBUTE_DIRECTORY));
+}
+
+inline bool IfFileExist(std::string filepath, int code_page = CP_ACP)
+{
+	std::wstring filepathw{string_to_wstring(filepath, code_page)};
+	DWORD dwAttrib = GetFileAttributes(filepathw.c_str());
+	return (INVALID_FILE_ATTRIBUTES != dwAttrib && 0 == (dwAttrib & FILE_ATTRIBUTE_DIRECTORY));
+}
+
+inline bool is_wow64() {
+	DWORD errorCode;
+	if (GetSystemWow64DirectoryW(NULL, 0) == 0)
+		if ((errorCode = GetLastError()) == ERROR_CALL_NOT_IMPLEMENTED)
+			return false;
+		else
+			ExitProcess((UINT)errorCode);
+	else
+		return true;
+}
+
 // resource
 std::string GetCustomResource(const char *name, const char *type);
diff --git a/output/install.nsi b/output/install.nsi
@@ -204,6 +204,12 @@ program_files:
   ; images
   SetOutPath $INSTDIR\data\preview
   File "data\preview\*.png"
+  ; WeaselDeployerx64 files
+  ${If} ${RunningX64}
+	  SetOutPath $INSTDIR\x64
+	  File /nonfatal "x64\WeaselDeployer.exe"
+	  File /nonfatal "x64\rime.dll"
+  ${EndIf}
 
   SetOutPath $INSTDIR
 

diff --git a/output/x64/.placeholder b/output/x64/.placeholder
diff --git a/weasel.sln b/weasel.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33516.290
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33529.622
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{53F79A24-5390-4640-84B5-19984EB3353B}"
 	ProjectSection(SolutionItems) = preProject
@@ -136,17 +136,20 @@ Global
 		{1C497821-BD63-4F02-9094-32B185B62F23}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1C497821-BD63-4F02-9094-32B185B62F23}.Debug|Win32.Build.0 = Debug|Win32
 		{1C497821-BD63-4F02-9094-32B185B62F23}.Debug|x64.ActiveCfg = Debug|x64
+		{1C497821-BD63-4F02-9094-32B185B62F23}.Debug|x64.Build.0 = Debug|x64
 		{1C497821-BD63-4F02-9094-32B185B62F23}.Release|Win32.ActiveCfg = Release|Win32
 		{1C497821-BD63-4F02-9094-32B185B62F23}.Release|Win32.Build.0 = Release|Win32
 		{1C497821-BD63-4F02-9094-32B185B62F23}.Release|x64.ActiveCfg = Release|x64
+		{1C497821-BD63-4F02-9094-32B185B62F23}.Release|x64.Build.0 = Release|x64
 		{1C497821-BD63-4F02-9094-32B185B62F23}.ReleaseHant|Win32.ActiveCfg = ReleaseHant|Win32
 		{1C497821-BD63-4F02-9094-32B185B62F23}.ReleaseHant|x64.ActiveCfg = ReleaseHant|x64
-		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Debug|Win32.Build.0 = Debug|Win32
+		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Debug|Win32.ActiveCfg = Debug|x64
+		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Debug|Win32.Build.0 = Debug|x64
 		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Debug|x64.ActiveCfg = Debug|Win32
 		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Release|Win32.ActiveCfg = Release|Win32
 		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Release|Win32.Build.0 = Release|Win32
-		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Release|x64.ActiveCfg = Release|Win32
+		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Release|x64.ActiveCfg = Release|x64
+		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.Release|x64.Build.0 = Release|x64
 		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.ReleaseHant|Win32.ActiveCfg = Release|Win32
 		{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}.ReleaseHant|x64.ActiveCfg = Release|Win32
 		{39F6E3F5-8F0B-4023-BC40-A66AE6C37095}.Debug|Win32.ActiveCfg = Debug|Win32