re-construct files arch

device/scannerqd.vcxproj

@@ -361,6 +361,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
     <None Include="device.def" />
   </ItemGroup>
   <ItemGroup>
+    <Text Include="..\..\code_device\hgdriver\hgdev\CMakeLists.txt" />
     <Text Include="..\..\code_device\hgdriver\wrapper\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>

device/scannerqd.vcxproj.filters

@@ -474,7 +474,12 @@
     </None>
   </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>
     <ResourceCompile Include="scannerqd.rc">

device/win_usb/win_usb.cpp

@@ -28,6 +28,7 @@
 #endif
 #include "usbview/enum.h"
 #include "../../../sdk/include/huagao/brand.h"
+#include <base/utils.h>
 #pragma warning(disable: 4996)
 
 #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);
         }
         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);
     }
 
@@ -1200,32 +1194,29 @@ void usb_monitor::thread_run_device_event_wnd(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 };
-            usb_device* dev = (usb_device*)msg.lParam;
+            usb_device* dev = (usb_device*)msg->lParam;
             //if(msg.wParam)
             //    dev->init();
-            notify_usb_event(dev, msg.wParam);
+            notify_usb_event(dev, msg->wParam);
 
             // 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)
 {

device/win_usb/win_usb.h

@@ -10,6 +10,7 @@
 #include <string>
 #include <mutex>
 #include <thread>
+#include <functional>
 #include <memory>
 #include "libusb-1.0/libusb.h"
 

twain/dllmain.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include <crtdbg.h>
 
 HMODULE me_ = NULL;
 
@@ -9,12 +10,19 @@ BOOL APIENTRY DllMain(HMODULE  hModule , DWORD ul_reason_for_call, LPVOID /* lpR
     case DLL_PROCESS_ATTACH:
         //sane_invoker::initialize(hModule);
         me_ = hModule;
+#ifdef _DEBUG
+        _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+        _CrtSetBreakAlloc(-1);
+#endif
         break;
     case DLL_THREAD_ATTACH:
     case DLL_THREAD_DETACH:
         break;
     case DLL_PROCESS_DETACH:
         //sane_invoker::uninitialize();
+#ifdef _DEBUG
+        OutputDebugStringA("\r\nDS module unloading ...\r\n");
+#endif
         break;
     }
     return TRUE;

twain/twain.vcxproj

@@ -215,8 +215,8 @@ move /Y "$(TargetPath)" "$(TargetDir)$(TargetName)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <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\s2t_api.h" />
     <ClInclude Include="..\..\code_device\twain\ds\sane_helper.h" />
@@ -276,13 +276,13 @@ move /Y "$(TargetPath)" "$(TargetDir)$(TargetName)"</Command>
     <ClInclude Include="targetver.h" />
   </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)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </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)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

twain/twain.vcxproj.filters

@@ -28,12 +28,6 @@
     <ClCompile Include="pch.cpp">
       <Filter>Sources</Filter>
     </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">
       <Filter>imports</Filter>
     </ClCompile>
@@ -52,6 +46,12 @@
     <ClCompile Include="..\..\code_device\twain\ds\s2t.cpp">
       <Filter>imports</Filter>
     </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>
     <ClInclude Include="pch.h">
@@ -189,12 +189,6 @@
     <ClInclude Include="..\..\sdk\include\twain\twpp\utils.hpp">
       <Filter>Headers\twain\twpp</Filter>
     </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">
       <Filter>imports</Filter>
     </ClInclude>
@@ -231,6 +225,12 @@
     <ClInclude Include="..\..\sdk\include\huagao\brand_zj.h">
       <Filter>Headers</Filter>
     </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>
     <ResourceCompile Include="huagaotwain.rc">