re-construct files arch
This commit is contained in:
parent
f090299f8a
commit
9347a4b752
|
@ -361,6 +361,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
|
||||||
<None Include="device.def" />
|
<None Include="device.def" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Text Include="..\..\code_device\hgdriver\hgdev\CMakeLists.txt" />
|
||||||
<Text Include="..\..\code_device\hgdriver\wrapper\CMakeLists.txt" />
|
<Text Include="..\..\code_device\hgdriver\wrapper\CMakeLists.txt" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -474,7 +474,12 @@
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Text Include="..\..\code_device\hgdriver\wrapper\CMakeLists.txt" />
|
<Text Include="..\..\code_device\hgdriver\hgdev\CMakeLists.txt">
|
||||||
|
<Filter>dev</Filter>
|
||||||
|
</Text>
|
||||||
|
<Text Include="..\..\code_device\hgdriver\wrapper\CMakeLists.txt">
|
||||||
|
<Filter>源文件</Filter>
|
||||||
|
</Text>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="scannerqd.rc">
|
<ResourceCompile Include="scannerqd.rc">
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include "usbview/enum.h"
|
#include "usbview/enum.h"
|
||||||
#include "../../../sdk/include/huagao/brand.h"
|
#include "../../../sdk/include/huagao/brand.h"
|
||||||
|
#include <base/utils.h>
|
||||||
#pragma warning(disable: 4996)
|
#pragma warning(disable: 4996)
|
||||||
|
|
||||||
#define MSG_DEVICE_PNP WM_USER + 1 // wParam: (bool)arrive; lParam: usb_device*
|
#define MSG_DEVICE_PNP WM_USER + 1 // wParam: (bool)arrive; lParam: usb_device*
|
||||||
|
@ -1184,14 +1185,7 @@ void usb_monitor::thread_run_device_event_wnd(void)
|
||||||
SetTimer(wnd_monitor_, usb_monitor::find_usb_timer_, 1000, NULL);
|
SetTimer(wnd_monitor_, usb_monitor::find_usb_timer_, 1000, NULL);
|
||||||
}
|
}
|
||||||
ret = GetLastError();
|
ret = GetLastError();
|
||||||
while (run_ && (ret = GetMessageW(&msg, wnd_monitor_, 0, 0)))
|
while (run_ && utils::run_get_message(wnd_monitor_, 0, 0));
|
||||||
{
|
|
||||||
if (ret == -1)
|
|
||||||
break;
|
|
||||||
|
|
||||||
TranslateMessage(&msg);
|
|
||||||
DispatchMessageW(&msg);
|
|
||||||
}
|
|
||||||
UnregisterDeviceNotification(notify);
|
UnregisterDeviceNotification(notify);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1200,32 +1194,29 @@ void usb_monitor::thread_run_device_event_wnd(void)
|
||||||
}
|
}
|
||||||
void usb_monitor::thread_handle_device_change_msg(void)
|
void usb_monitor::thread_handle_device_change_msg(void)
|
||||||
{
|
{
|
||||||
MSG msg = { 0 };
|
auto pnp = [&](MSG* msg, bool* handled) -> bool
|
||||||
BOOL ret = FALSE;
|
|
||||||
|
|
||||||
handle_msg_id_ = GetCurrentThreadId();
|
|
||||||
while ((ret = GetMessageW(&msg, NULL, 0, 0)))
|
|
||||||
{
|
{
|
||||||
if (ret == -1)
|
if (msg->message == MSG_DEVICE_PNP)
|
||||||
break;
|
|
||||||
|
|
||||||
if (msg.message == MSG_DEVICE_PNP)
|
|
||||||
{
|
{
|
||||||
char buf[40] = { 0 };
|
char buf[40] = { 0 };
|
||||||
usb_device* dev = (usb_device*)msg.lParam;
|
usb_device* dev = (usb_device*)msg->lParam;
|
||||||
//if(msg.wParam)
|
//if(msg.wParam)
|
||||||
// dev->init();
|
// dev->init();
|
||||||
notify_usb_event(dev, msg.wParam);
|
notify_usb_event(dev, msg->wParam);
|
||||||
|
|
||||||
// dev->release ?
|
// dev->release ?
|
||||||
dev->release();
|
dev->release();
|
||||||
|
if (handled)
|
||||||
|
*handled = true;
|
||||||
}
|
}
|
||||||
else
|
else if(handled)
|
||||||
{
|
*handled = false;
|
||||||
TranslateMessage(&msg);
|
|
||||||
DispatchMessageW(&msg);
|
return true;
|
||||||
}
|
};
|
||||||
}
|
|
||||||
|
handle_msg_id_ = GetCurrentThreadId();
|
||||||
|
while (utils::run_get_message(NULL, 0, 0, pnp));
|
||||||
}
|
}
|
||||||
void usb_monitor::quit(void)
|
void usb_monitor::quit(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include "libusb-1.0/libusb.h"
|
#include "libusb-1.0/libusb.h"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "pch.h"
|
#include "pch.h"
|
||||||
|
#include <crtdbg.h>
|
||||||
|
|
||||||
HMODULE me_ = NULL;
|
HMODULE me_ = NULL;
|
||||||
|
|
||||||
|
@ -9,12 +10,19 @@ BOOL APIENTRY DllMain(HMODULE hModule , DWORD ul_reason_for_call, LPVOID /* lpR
|
||||||
case DLL_PROCESS_ATTACH:
|
case DLL_PROCESS_ATTACH:
|
||||||
//sane_invoker::initialize(hModule);
|
//sane_invoker::initialize(hModule);
|
||||||
me_ = hModule;
|
me_ = hModule;
|
||||||
|
#ifdef _DEBUG
|
||||||
|
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
|
||||||
|
_CrtSetBreakAlloc(-1);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case DLL_THREAD_ATTACH:
|
case DLL_THREAD_ATTACH:
|
||||||
case DLL_THREAD_DETACH:
|
case DLL_THREAD_DETACH:
|
||||||
break;
|
break;
|
||||||
case DLL_PROCESS_DETACH:
|
case DLL_PROCESS_DETACH:
|
||||||
//sane_invoker::uninitialize();
|
//sane_invoker::uninitialize();
|
||||||
|
#ifdef _DEBUG
|
||||||
|
OutputDebugStringA("\r\nDS module unloading ...\r\n");
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
@ -215,8 +215,8 @@ move /Y "$(TargetPath)" "$(TargetDir)$(TargetName)"</Command>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\..\code_device\sdk\hginclude\ini_file.h" />
|
<ClInclude Include="..\..\code_device\sdk\base\ini_file.h" />
|
||||||
<ClInclude Include="..\..\code_device\sdk\hginclude\utils.h" />
|
<ClInclude Include="..\..\code_device\sdk\base\utils.h" />
|
||||||
<ClInclude Include="..\..\code_device\twain\ds\huagaods.hpp" />
|
<ClInclude Include="..\..\code_device\twain\ds\huagaods.hpp" />
|
||||||
<ClInclude Include="..\..\code_device\twain\ds\s2t_api.h" />
|
<ClInclude Include="..\..\code_device\twain\ds\s2t_api.h" />
|
||||||
<ClInclude Include="..\..\code_device\twain\ds\sane_helper.h" />
|
<ClInclude Include="..\..\code_device\twain\ds\sane_helper.h" />
|
||||||
|
@ -276,13 +276,13 @@ move /Y "$(TargetPath)" "$(TargetDir)$(TargetName)"</Command>
|
||||||
<ClInclude Include="targetver.h" />
|
<ClInclude Include="targetver.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\..\code_device\sdk\hginclude\ini_file.cpp">
|
<ClCompile Include="..\..\code_device\sdk\base\ini_file.cpp">
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\code_device\sdk\hginclude\utils.cpp">
|
<ClCompile Include="..\..\code_device\sdk\base\utils.cpp">
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||||
|
|
|
@ -28,12 +28,6 @@
|
||||||
<ClCompile Include="pch.cpp">
|
<ClCompile Include="pch.cpp">
|
||||||
<Filter>Sources</Filter>
|
<Filter>Sources</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\code_device\sdk\hginclude\ini_file.cpp">
|
|
||||||
<Filter>imports</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\code_device\sdk\hginclude\utils.cpp">
|
|
||||||
<Filter>imports</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\code_device\twain\ds\huagaods.cpp">
|
<ClCompile Include="..\..\code_device\twain\ds\huagaods.cpp">
|
||||||
<Filter>imports</Filter>
|
<Filter>imports</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
@ -52,6 +46,12 @@
|
||||||
<ClCompile Include="..\..\code_device\twain\ds\s2t.cpp">
|
<ClCompile Include="..\..\code_device\twain\ds\s2t.cpp">
|
||||||
<Filter>imports</Filter>
|
<Filter>imports</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\code_device\sdk\base\ini_file.cpp">
|
||||||
|
<Filter>imports</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\code_device\sdk\base\utils.cpp">
|
||||||
|
<Filter>imports</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="pch.h">
|
<ClInclude Include="pch.h">
|
||||||
|
@ -189,12 +189,6 @@
|
||||||
<ClInclude Include="..\..\sdk\include\twain\twpp\utils.hpp">
|
<ClInclude Include="..\..\sdk\include\twain\twpp\utils.hpp">
|
||||||
<Filter>Headers\twain\twpp</Filter>
|
<Filter>Headers\twain\twpp</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\..\code_device\sdk\hginclude\ini_file.h">
|
|
||||||
<Filter>imports</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\..\code_device\sdk\hginclude\utils.h">
|
|
||||||
<Filter>imports</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\..\code_device\twain\ds\huagaods.hpp">
|
<ClInclude Include="..\..\code_device\twain\ds\huagaods.hpp">
|
||||||
<Filter>imports</Filter>
|
<Filter>imports</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
@ -231,6 +225,12 @@
|
||||||
<ClInclude Include="..\..\sdk\include\huagao\brand_zj.h">
|
<ClInclude Include="..\..\sdk\include\huagao\brand_zj.h">
|
||||||
<Filter>Headers</Filter>
|
<Filter>Headers</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\code_device\sdk\base\ini_file.h">
|
||||||
|
<Filter>imports</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\code_device\sdk\base\utils.h">
|
||||||
|
<Filter>imports</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ResourceCompile Include="huagaotwain.rc">
|
<ResourceCompile Include="huagaotwain.rc">
|
||||||
|
|
Loading…
Reference in New Issue