diff --git a/client/ClientDll_vs2015.vcxproj b/client/ClientDll_vs2015.vcxproj
index 410e3fb..9a021a9 100644
--- a/client/ClientDll_vs2015.vcxproj
+++ b/client/ClientDll_vs2015.vcxproj
@@ -105,6 +105,7 @@
zlib\zlib.lib;%(AdditionalDependencies)
libcmt.lib;msvcrt.lib
/ignore:4099 %(AdditionalOptions)
+ $(SolutionDir)..\SimplePlugins\bin
@@ -123,6 +124,7 @@
zlib\zlib_x64.lib;%(AdditionalDependencies)
libcmt.lib
/ignore:4099 %(AdditionalOptions)
+ $(SolutionDir)..\SimplePlugins\bin
@@ -144,6 +146,7 @@
zlib\zlib.lib;%(AdditionalDependencies)
/SAFESEH:NO /ignore:4099 %(AdditionalOptions)
msvcrt.lib
+ $(SolutionDir)..\SimplePlugins\bin
@@ -164,6 +167,7 @@
true
zlib\zlib_x64.lib;%(AdditionalDependencies)
/SAFESEH:NO /ignore:4099 %(AdditionalOptions)
+ $(SolutionDir)..\SimplePlugins\bin
diff --git a/client/ghost_vs2015.vcxproj b/client/ghost_vs2015.vcxproj
index 81972c0..3f5d723 100644
--- a/client/ghost_vs2015.vcxproj
+++ b/client/ghost_vs2015.vcxproj
@@ -108,6 +108,7 @@
Console
/ignore:4099 %(AdditionalOptions)
+ $(SolutionDir)..\SimplePlugins\bin
@@ -129,6 +130,7 @@
Console
/ignore:4099 %(AdditionalOptions)
+ $(SolutionDir)..\SimplePlugins\bin
@@ -152,6 +154,7 @@
Windows
mainCRTStartup
msvcrt.lib
+ $(SolutionDir)..\SimplePlugins\bin
@@ -174,6 +177,7 @@
/SAFESEH:NO /ignore:4099 %(AdditionalOptions)
Windows
mainCRTStartup
+ $(SolutionDir)..\SimplePlugins\bin
diff --git a/lib/PrivateDesktop_Lib.lib b/lib/PrivateDesktop_Lib.lib
index b7cccef..75fa72f 100644
Binary files a/lib/PrivateDesktop_Lib.lib and b/lib/PrivateDesktop_Lib.lib differ
diff --git a/lib/PrivateDesktop_Libd.lib b/lib/PrivateDesktop_Libd.lib
index 1785561..7034fac 100644
Binary files a/lib/PrivateDesktop_Libd.lib and b/lib/PrivateDesktop_Libd.lib differ
diff --git a/lib/PrivateDesktop_Libx64.lib b/lib/PrivateDesktop_Libx64.lib
index 51f58a8..2f64f2e 100644
Binary files a/lib/PrivateDesktop_Libx64.lib and b/lib/PrivateDesktop_Libx64.lib differ
diff --git a/lib/PrivateDesktop_Libx64d.lib b/lib/PrivateDesktop_Libx64d.lib
index 02a7943..ba4ab76 100644
Binary files a/lib/PrivateDesktop_Libx64d.lib and b/lib/PrivateDesktop_Libx64d.lib differ
diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp
index fdd7ecc..e4a9c05 100644
--- a/server/2015Remote/2015RemoteDlg.cpp
+++ b/server/2015Remote/2015RemoteDlg.cpp
@@ -1131,7 +1131,11 @@ BOOL CMy2015RemoteDlg::OnInitDialog()
THIS_APP->MessageBox(_TR("下载服务启动失败,可能是端口被占用了。"), _TR("提示"), MB_ICONINFORMATION);
}
- UPDATE_SPLASH(17, "正在加载IP数据库...");
+ UPDATE_SPLASH(18, "正在初始化文件上传模块...");
+ int ret = InitFileUpload(GetHMAC(), 64, 50, Logf);
+ g_hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, AfxGetInstanceHandle(), 0);
+
+ UPDATE_SPLASH(20, "正在加载IP数据库...");
char path[MAX_PATH] = {};
GetModuleFileNameA(NULL, path, MAX_PATH);
GET_FILEPATH(path, "qqwry.dat");
@@ -1142,10 +1146,6 @@ BOOL CMy2015RemoteDlg::OnInitDialog()
}
Mprintf("IP数据库加载: %s\n", m_HasQQwry ? "succeed" : "failed");
- UPDATE_SPLASH(20, "正在初始化文件上传模块...");
- int ret = InitFileUpload(GetHMAC(), 64, 50, Logf);
- g_hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, AfxGetInstanceHandle(), 0);
-
UPDATE_SPLASH(25, "正在初始化视频墙...");
m_GroupList = {"default"};
// Grid 容器
diff --git a/server/2015Remote/2015Remote_vs2015.vcxproj b/server/2015Remote/2015Remote_vs2015.vcxproj
index 3292615..165ac86 100644
--- a/server/2015Remote/2015Remote_vs2015.vcxproj
+++ b/server/2015Remote/2015Remote_vs2015.vcxproj
@@ -113,6 +113,7 @@
$(SolutionDir)Bin\$(TargetName)_x86d$(TargetExt)
true
/ignore:4099 %(AdditionalOptions)
+ $(SolutionDir)..\SimplePlugins\bin
false
@@ -145,6 +146,7 @@
LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)
$(SolutionDir)Bin\$(TargetName)_x64d$(TargetExt)
/ignore:4099 %(AdditionalOptions)
+ $(SolutionDir)..\SimplePlugins\bin
false
@@ -179,6 +181,7 @@
zlib\zlib.lib;%(AdditionalDependencies)
/SAFESEH:NO /ignore:4099 %(AdditionalOptions)
$(SolutionDir)Bin\$(TargetName)_x86$(TargetExt)
+ $(SolutionDir)..\SimplePlugins\bin
false
@@ -214,6 +217,7 @@
zlib\zlib_x64.lib
/SAFESEH:NO /ignore:4099 %(AdditionalOptions)
$(SolutionDir)Bin\$(TargetName)_x64$(TargetExt)
+ $(SolutionDir)..\SimplePlugins\bin
false