2018.12.18 Community 修复Combo控件显示不正常的bug；修复分析文件时偶发性崩溃

Author: fawdlstty

NetToolbox/Resource.rc

@@ -130,7 +130,7 @@ int WINAPI _tWinMain (HINSTANCE hInstance, HINSTANCE, LPTSTR, int nCmdShow) {
 				std::string data = tool_WebRequest::get (url_base + "info.json");
 				Json o = Json::parse (data);
 				std::string ver_srv = o["version"];
-				if (_parse_ver (ver_srv) != ver_src) {
+				if (_parse_ver (ver_srv) > ver_src) {
 					tool_Mutex m (_T ("nettoolbox_checknew"));
 					if (!m.try_lock ())
 						return;

NetToolbox/main.cpp

@@ -77,7 +77,7 @@ class tool_PE {
 				std::string dll_name = (LPCSTR) ::ImageRvaToVa (pNtHeader, mod_base, pImportTable[i].Name, nullptr);
 				std::vector<std::tuple<int16_t, std::string>> dll_vimport;
 				PIMAGE_THUNK_DATA32 pThunk = (PIMAGE_THUNK_DATA32) ::ImageRvaToVa (pNtHeader, mod_base, pImportTable[i].OriginalFirstThunk, nullptr);
-				for (DWORD j = 0; memcmp (pThunk + j, &null_thunk, sizeof (null_thunk)) != 0; j++) {
+				for (DWORD j = 0; pThunk && memcmp (pThunk + j, &null_thunk, sizeof (null_thunk)) != 0; j++) {
 					if (pThunk[j].u1.AddressOfData & IMAGE_ORDINAL_FLAG32) {
 						dll_vimport.push_back ({ (uint16_t) (pThunk[j].u1.AddressOfData & 0xffff), "" });
 					} else {

NetToolbox/tools/tool_PE.hpp

@@ -44,6 +44,8 @@
 
 
 ## 修改日志
+2018.12.18 Community 修复Combo控件显示不正常的bug；修复分析文件时偶发性崩溃
+
 2018.12.09 Community 开源；修改描述信息
 
 2018.11.29 Community 优化在启动时阻塞请求网络的问题；优化网页首页展示；新增Base64编码解码；完成http、qps两个页面的参数编辑优化
@@ -82,3 +84,13 @@
 
 ## 许可证
 GPL-3.0
+
+
+
+## 赞助
+![poor.jpg](poor.jpg)
+
+
+
+## 其他
+技术交流：[点击链接加入群【网络工具箱交流群 943497747】](https://jq.qq.com/?_wv=1027&k=5vG1SGq)

README.md

@@ -12,7 +12,7 @@
 	<Style name="x_list_hdr" value="height=&quot;24&quot; sepimage=&quot;list_sep.png&quot; sepwidth=&quot;2&quot;"/>
 	<Style name="x_checkbox" value="normalimage=&quot;file='selbox.png' source='0,15,15,30' dest='0,0,15,15'&quot; hotimage=&quot;file='selbox.png' source='15,15,30,30' dest='0,0,15,15'&quot; pushedimage=&quot;file='selbox.png' source='30,15,45,30' dest='0,0,15,15'&quot; selectedimage=&quot;file='selbox.png' source='45,15,60,30' dest='0,0,15,15'&quot; selectedhotimage=&quot;file='selbox.png' source='60,15,75,30' dest='0,0,15,15'&quot; selectedpushedimage=&quot;file='selbox.png' source='75,15,90,30' dest='0,0,15,15'&quot;" />
 	<Style name="x_radio" value="normalimage=&quot;file='selbox.png' source='0,0,15,15' dest='0,0,15,15'&quot; hotimage=&quot;file='selbox.png' source='15,0,30,15' dest='0,0,15,15'&quot; pushedimage=&quot;file='selbox.png' source='30,0,45,15' dest='0,0,15,15'&quot; selectedimage=&quot;file='selbox.png' source='45,0,60,15' dest='0,0,15,15'&quot; selectedhotimage=&quot;file='selbox.png' source='60,0,75,15' dest='0,0,15,15'&quot; selectedpushedimage=&quot;file='selbox.png' source='75,0,90,15' dest='0,0,15,15'&quot;" />
-	<Style name="x_combo" value="height=&quot;24&quot; normalimage=&quot;file='scrollbar.png' source='32,48,48,64' dest='-20,4,-4,20'&quot; bkcolor=&quot;#FF808080&quot; textcolor=&quot;#FFFFFFFF&quot; textpadding=&quot;6,6,6,5&quot; itemtextpadding=&quot;4,4,4,3&quot;" />
+	<Style name="x_combo" value="height=&quot;24&quot; normalimage=&quot;file='scrollbar.png' source='32,48,48,64' dest='-20,4,-4,20'&quot; bkcolor=&quot;#FF808080&quot; textcolor=&quot;#FFFFFFFF&quot; textpadding=&quot;6,6,24,5&quot; itemtextpadding=&quot;4,4,4,3&quot; itemendellipsis=&quot;true&quot;" />
 	<Style name="x_button" value="height=&quot;24&quot; width=&quot;80&quot; bkcolor=&quot;#FF808080&quot; textcolor=&quot;#FFFFFFFF&quot; hotbkcolor=&quot;#FF606060&quot; pushedbkcolor=&quot;#FFA0A0A0&quot;" />
 	<Style name="x_ver_sep" value="sepimm=&quot;true&quot; inset=&quot;0,0,0,5&quot; sepheight=&quot;5&quot;" />
 	<Style name="x_hor_sep" value="sepimm=&quot;true&quot; inset=&quot;0,0,5,0&quot; sepwidth=&quot;5&quot;" />