Fix bugs

HookDLL/HookDLL.vcxproj

@@ -173,6 +173,9 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="cpp.hint" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>

HookDLL/HookDLL.vcxproj.filters

@@ -66,4 +66,7 @@
       <Filter>源文件</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="cpp.hint" />
+  </ItemGroup>
 </Project>

HookDLL/config.cpp

@@ -53,7 +53,7 @@ void Config::initialize() {
 			throw CLI::CallForHelp();
 		}
 		for (auto &f : scanList) {
-			if (!std::experimental::filesystem::exists(f)) {
+			if (!std::experimental::filesystem::exists(f) || !std::experimental::filesystem::is_directory(f)) {
 				std::cout << f << " not exists!";
 				ExitProcess(1);
 			}

HookDLL/data.cpp

@@ -7,11 +7,17 @@
 #include <Windows.h>
 #include <tlhelp32.h>
 #include <string>
+#include <iostream>
 
 namespace WebShellKillHook {
 
 	Data::Data() {
 		data.set<>(picojson::array());
+		WebShellKillHook::Global::event.on(WebShellKillHook::Global::EVENT_SCAN_START, [&]() {
+			isScanning = true;
+			enableCount = 0;
+			realFoundSomething = false;
+		});
 	}
 
 	std::string Data::serialize() {
@@ -21,27 +27,36 @@ namespace WebShellKillHook {
 	LRESULT CALLBACK Data::hookCallback(int nCode, WPARAM wParam, LPARAM lParam) {
 		CWPSTRUCT msg = *(CWPSTRUCT*)lParam;
 		if (msg.message == WM_ENABLE) {
-			if (isScanning) {
+			if (realFoundSomething) {
+				realFoundSomething = false;
 				isScanning = false;
 				Global::event.emit(Global::EVENT_SCAN_END);
 			}
+			else if (isScanning) {
+				if (++enableCount == 7) {
+					isScanning = false;
+					Global::event.emit(Global::EVENT_SCAN_END);
+				}
+			}
 		}
 		else if (msg.message == LVM_INSERTITEMA) {
 			currentColumnIndex = -1;
 			isWaitingForText = true;
 			isSecondCall = 0;
 			item.set<>(picojson::object());
-			isScanning = true;
+			realFoundSomething = true;
 		}
 		else if (msg.message == LVM_SETITEMA) {
 			if (isWaitingForText) {
 				data.get<picojson::array>().push_back(item);
+				std::cerr << item.serialize() << std::endl;
 				item.get<picojson::object>().clear();
 				isWaitingForText = false;
 			}
 		}
 		else if (msg.message == LVM_SETITEMTEXTA) {
-			if (isWaitingForText && ++isSecondCall % 2 == 1) {
+			++isSecondCall;
+			if (isWaitingForText && (isSecondCall % 2 == 0)) {
 				currentColumnIndex++;
 				LPSTR str = (LPSTR)(malloc(sizeof(LPSTR) * 255));
 				ListView_GetItemText(msg.hwnd, ((LVITEMA*)lParam)->iItem, currentColumnIndex, str, 255);

HookDLL/data.h

@@ -15,6 +15,8 @@ namespace WebShellKillHook {
 		int isSecondCall = 0;
 		bool isWaitingForText = false;
 		bool isScanning = false;
+		bool realFoundSomething = false;
+		int enableCount = 0;
 		std::string columnMap[6] = { "file", "level", "description", "size", "time", "crc32" };
 		picojson::value data;
 		picojson::value item;

HookDLL/global.cpp

@@ -54,6 +54,7 @@ namespace WebShellKillHook {
 		void startScanQueue() {
 			currentIterator = Config::scanList.begin();
 			startScan();
+			event.emit(EVENT_SCAN_START);
 		}
 
 		void startScan() {

HookDLL/global.h

@@ -9,6 +9,7 @@ namespace WebShellKillHook {
 		const int EVENT_READY = 1;
 		const int EVENT_GET_BUTTON_HWND = 2;
 		const int EVENT_SCAN_END = 3;
+		const int EVENT_SCAN_START = 4;
 		const int EVENT_DONE = 5;
 		extern EventEmitter event;
 		extern std::vector<std::string>::iterator currentIterator;

HookDLL/stdafx.cpp

@@ -0,0 +1 @@
+#include "stdafx.h"