Correct terminate for Windows

awwit · awwit · commit a5ab6f132afa · 2014-06-02T17:05:36.000+03:00
diff --git a/httpserver.userprefs b/httpserver.userprefs
@@ -1,19 +1,15 @@
 ﻿<Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="httpserver/Server.cpp">
+  <MonoDevelop.Ide.Workbench ActiveDocument="httpserver/System.cpp">
     <Files>
-      <File FileName="httpserver/Server.cpp" Line="107" Column="4" />
+      <File FileName="httpserver/Server.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Server.h" Line="1" Column="1" />
       <File FileName="httpserver/Main.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Main.h" Line="1" Column="1" />
       <File FileName="httpserver/DataVariantMultipartFormData.h" Line="1" Column="1" />
       <File FileName="httpserver/DataVariantMultipartFormData.cpp" Line="1" Column="1" />
-      <File FileName="httpserver/ServerOutput.h" Line="1" Column="1" />
-      <File FileName="httpserver/ServerOutput.cpp" Line="1" Column="1" />
-      <File FileName="httpserver/ServerApplicationAbstract.h" Line="1" Column="1" />
       <File FileName="httpserver/ServerRequest.h" Line="1" Column="1" />
       <File FileName="httpserver/ServerResponse.h" Line="1" Column="1" />
-      <File FileName="httpserver/ServerApplicationAbstract.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Event.cpp" Line="1" Column="1" />
       <File FileName="httpserver/DataVariantAbstract.h" Line="1" Column="1" />
       <File FileName="httpserver/DataVariantFormUrlencoded.h" Line="1" Column="1" />
@@ -28,16 +24,14 @@
       <File FileName="httpserver/DataVariantTextPlain.cpp" Line="1" Column="1" />
       <File FileName="httpserver/SignalsHandles.cpp" Line="1" Column="1" />
       <File FileName="httpserver/SignalsHandles.h" Line="1" Column="1" />
-      <File FileName="httpserver/System.cpp" Line="1" Column="1" />
-      <File FileName="httpserver/Socket.cpp" Line="86" Column="2" />
+      <File FileName="httpserver/System.cpp" Line="39" Column="20" />
+      <File FileName="httpserver/Socket.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Utils.h" Line="1" Column="1" />
       <File FileName="httpserver/Utils.cpp" Line="1" Column="1" />
       <File FileName="httpserver/Socket.h" Line="1" Column="1" />
       <File FileName="httpserver/FileIncoming.h" Line="1" Column="1" />
       <File FileName="httpserver/RawData.h" Line="1" Column="1" />
       <File FileName="httpserver/FileIncoming.cpp" Line="1" Column="1" />
-      <File FileName="httpserver/ResourceAbstract.cpp" Line="1" Column="1" />
-      <File FileName="httpserver/ResourceAbstract.h" Line="1" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/httpserver/SignalsHandles.cpp b/httpserver/SignalsHandles.cpp
@@ -67,7 +67,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int mainMessageLoop(HINSTANCE hInstance, HttpServer::Event *pCreatedWindow)
+WPARAM mainMessageLoop(HINSTANCE hInstance, HttpServer::Event *pCreatedWindow)
 {
 	HWND hWnd = CreateWindow(wndClassName, nullptr, 0, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, nullptr, nullptr, hInstance, nullptr);
 
diff --git a/httpserver/System.cpp b/httpserver/System.cpp
@@ -18,7 +18,7 @@ namespace System
 
 		::GetWindowThreadProcessId(hWnd, &process_id);
 
-		if (process_id == ed.process_id)
+		if (process_id == ed.process_id && GetConsoleWindow() != hWnd)
 		{
 			ed.hWnd = hWnd;
 
@@ -32,9 +32,11 @@ namespace System
 	bool sendSignal(const native_processid_type pid, const int signal)
 	{
 	#ifdef WIN32
-		EnumData ed = {pid, nullptr};
+		EnumData ed = {pid, 0};
 
-		if (0 == ::EnumWindows(EnumProc, reinterpret_cast<LPARAM>(&ed) ) )
+		::EnumWindows(EnumProc, reinterpret_cast<LPARAM>(&ed) );
+
+		if (0 == ed.hWnd)
 		{
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)`
`67`	`67`	`return 0;`
`68`	`68`	`}`
`69`	`69`
`70`		`-int mainMessageLoop(HINSTANCE hInstance, HttpServer::Event *pCreatedWindow)`
	`70`	`+WPARAM mainMessageLoop(HINSTANCE hInstance, HttpServer::Event *pCreatedWindow)`
`71`	`71`	`{`
`72`	`72`	`HWND hWnd = CreateWindow(wndClassName, nullptr, 0, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, nullptr, nullptr, hInstance, nullptr);`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace System`
`18`	`18`
`19`	`19`	`::GetWindowThreadProcessId(hWnd, &process_id);`
`20`	`20`
`21`		`- if (process_id == ed.process_id)`
	`21`	`+ if (process_id == ed.process_id && GetConsoleWindow() != hWnd)`
`22`	`22`	`{`
`23`	`23`	`ed.hWnd = hWnd;`
`24`	`24`
`@@ -32,9 +32,11 @@ namespace System`
`32`	`32`	`bool sendSignal(const native_processid_type pid, const int signal)`
`33`	`33`	`{`
`34`	`34`	`#ifdef WIN32`
`35`		`- EnumData ed = {pid, nullptr};`
	`35`	`+ EnumData ed = {pid, 0};`
`36`	`36`
`37`		`- if (0 == ::EnumWindows(EnumProc, reinterpret_cast<LPARAM>(&ed) ) )`
	`37`	`+ ::EnumWindows(EnumProc, reinterpret_cast<LPARAM>(&ed) );`
	`38`	`+`
	`39`	`+ if (0 == ed.hWnd)`
`38`	`40`	`{`
`39`	`41`	`return false;`
`40`	`42`	`}`