添加语言包windows平台下清理工作;调整usb监控窗口退出顺序
This commit is contained in:
parent
ed5cfeb2be
commit
14bdeda089
|
@ -1205,6 +1205,12 @@ void usb_monitor::quit(void)
|
||||||
{
|
{
|
||||||
KillTimer(wnd_monitor_, usb_monitor::find_usb_timer_);
|
KillTimer(wnd_monitor_, usb_monitor::find_usb_timer_);
|
||||||
run_ = false;
|
run_ = false;
|
||||||
|
if (IsWindow(wnd_monitor_))
|
||||||
|
{
|
||||||
|
PostMessage(wnd_monitor_, WM_QUIT, 0, 0);
|
||||||
|
Sleep(100);
|
||||||
|
}
|
||||||
|
|
||||||
if (handle_msg_.get())
|
if (handle_msg_.get())
|
||||||
{
|
{
|
||||||
PostThreadMessageW(handle_msg_id_, WM_QUIT, 0, 0);
|
PostThreadMessageW(handle_msg_id_, WM_QUIT, 0, 0);
|
||||||
|
@ -1213,11 +1219,6 @@ void usb_monitor::quit(void)
|
||||||
handle_msg_.reset();
|
handle_msg_.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsWindow(wnd_monitor_))
|
|
||||||
{
|
|
||||||
PostMessage(wnd_monitor_, WM_QUIT, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(lock_);
|
std::lock_guard<std::mutex> lock(lock_);
|
||||||
for (auto& v : devices_)
|
for (auto& v : devices_)
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
// dllmain.cpp : 定义 DLL 应用程序的入口点。
|
// dllmain.cpp : 定义 DLL 应用程序的入口点。
|
||||||
#include "pch.h"
|
#include "pch.h"
|
||||||
|
|
||||||
|
extern void clear_language_data(void);
|
||||||
|
|
||||||
BOOL APIENTRY DllMain( HMODULE hModule,
|
BOOL APIENTRY DllMain( HMODULE hModule,
|
||||||
DWORD ul_reason_for_call,
|
DWORD ul_reason_for_call,
|
||||||
LPVOID lpReserved
|
LPVOID lpReserved
|
||||||
|
@ -11,7 +13,9 @@ BOOL APIENTRY DllMain( HMODULE hModule,
|
||||||
case DLL_PROCESS_ATTACH:
|
case DLL_PROCESS_ATTACH:
|
||||||
case DLL_THREAD_ATTACH:
|
case DLL_THREAD_ATTACH:
|
||||||
case DLL_THREAD_DETACH:
|
case DLL_THREAD_DETACH:
|
||||||
|
break;
|
||||||
case DLL_PROCESS_DETACH:
|
case DLL_PROCESS_DETACH:
|
||||||
|
clear_language_data();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
Loading…
Reference in New Issue