update for winbuild

base/hdir.cpp

@@ -78,7 +78,7 @@ int listdir(const char* dir, std::list<hdir_t>& dirs) {
         if (data.dwFileAttributes & _A_SUBDIR) {
             tmp.type = 'd';
         }
-        tmp.mod = 0777;
+        tmp.mode = 0777;
         tmp.size = (((uint64_t)data.nFileSizeHigh) << 32) | data.nFileSizeLow;
         tmp.atime = FileTime2Epoch(data.ftLastAccessTime);
         tmp.mtime = FileTime2Epoch(data.ftLastWriteTime);

base/queue.h

@@ -76,7 +76,7 @@ static inline void qtype##_resize(qtype* p, int maxsize) {\
 }\
 \
 static inline void qtype##_double_resize(qtype* p) {\
-    return qtype##_resize(p, p->maxsize*2);\
+    qtype##_resize(p, p->maxsize*2);\
 }\
 \
 static inline void qtype##_push_back(qtype* p, type* elem) {\

event/hloop.c

@@ -64,13 +64,13 @@ static int hloop_process_timers(hloop_t* loop) {
             heap_dequeue(&loop->timers);
             if (timer->event_type == HEVENT_TYPE_TIMEOUT) {
                 while (timer->next_timeout <= now_hrtime) {
-                    timer->next_timeout += ((htimeout_t*)timer)->timeout*1000;
+                    timer->next_timeout += ((htimeout_t*)timer)->timeout * 1000;
                 }
             }
             else if (timer->event_type == HEVENT_TYPE_PERIOD) {
                 hperiod_t* period = (hperiod_t*)timer;
                 timer->next_timeout = calc_next_timeout(period->minute, period->hour, period->day,
-                        period->week, period->month) * 1e6;
+                        period->week, period->month) * 1000000;
             }
             heap_insert(&loop->timers, &timer->node);
         }
@@ -399,7 +399,7 @@ htimer_t* htimer_add_period(hloop_t* loop, htimer_cb cb,
     timer->day    = day;
     timer->month  = month;
     timer->week   = week;
-    timer->next_timeout = calc_next_timeout(minute, hour, day, week, month) * 1e6;
+    timer->next_timeout = calc_next_timeout(minute, hour, day, week, month) * 1000000;
     heap_insert(&loop->timers, &timer->node);
     EVENT_ADD(loop, timer, cb);
     loop->ntimers++;

http/HttpMessage.cpp

@@ -58,7 +58,7 @@ void HttpMessage::FillContentLength() {
 
     if (iter == headers.end() || content_length == 0) {
         if (content_length == 0) {
-            content_length == body.size();
+            content_length = body.size();
         }
         if (content_length == 0) {
             DumpBody();

winbuild/libhw/libhw.vcxproj

@@ -74,7 +74,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../../;../../include;../../3rd/include;../../base;../../event;../../utils;../../http;../../http/client;../../http/server;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../;../../include;../../3rd/include;../../base;../../event;../../utils;../../http;../../http/client;../../http/server;../../protocol</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
@@ -87,7 +87,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../../;../../include;../../3rd/include;../../base;../../event;../../utils;../../http;../../http/client;../../http/server;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../;../../include;../../3rd/include;../../base;../../event;../../utils;../../http;../../http/client;../../http/server;../../protocol</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
@@ -102,7 +102,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../../;../../include;../../3rd/include;../../base;../../event;../../utils;../../http;../../http/client;../../http/server;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../;../../include;../../3rd/include;../../base;../../event;../../utils;../../http;../../http/client;../../http/server;../../protocol</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
@@ -121,7 +121,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>../../;../../include;../../3rd/include;../../base;../../event;../../utils;../../http;../../http/client;../../http/server;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../;../../include;../../3rd/include;../../base;../../event;../../utils;../../http;../../http/client;../../http/server;../../protocol</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
@@ -186,6 +186,10 @@
     <ClInclude Include="..\..\http\server\HttpHandler.h" />
     <ClInclude Include="..\..\http\server\HttpService.h" />
     <ClInclude Include="..\..\http\server\http_server.h" />
+    <ClInclude Include="..\..\protocol\dns.h" />
+    <ClInclude Include="..\..\protocol\ftp.h" />
+    <ClInclude Include="..\..\protocol\icmp.h" />
+    <ClInclude Include="..\..\protocol\smtp.h" />
     <ClInclude Include="..\..\utils\base64.h" />
     <ClInclude Include="..\..\utils\hbytearray.h" />
     <ClInclude Include="..\..\utils\hendian.h" />
@@ -235,6 +239,10 @@
     <ClCompile Include="..\..\http\server\HttpServer.cpp" />
     <ClCompile Include="..\..\http\server\HttpService.cpp" />
     <ClCompile Include="..\..\http\server\http_page.cpp" />
+    <ClCompile Include="..\..\protocol\dns.c" />
+    <ClCompile Include="..\..\protocol\ftp.c" />
+    <ClCompile Include="..\..\protocol\icmp.c" />
+    <ClCompile Include="..\..\protocol\smtp.c" />
     <ClCompile Include="..\..\utils\base64.c" />
     <ClCompile Include="..\..\utils\hframe.cpp" />
     <ClCompile Include="..\..\utils\hmain.cpp" />