Some tests regarding threading

pierr3 · May 10, 2017 · 5e74214 · 5e74214
1 parent fa68744
commit 5e74214
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 30 deletions.
diff --git a/vSMR/SMRPlugin.cpp b/vSMR/SMRPlugin.cpp
@@ -61,9 +61,11 @@ bool startThreadvStrips = true;
 using namespace SMRPluginSharedData;
 asio::ip::udp::socket* _socket;
 asio::ip::udp::endpoint receiver_endpoint;
-std::thread vStripsThread;
+//std::thread vStripsThread;
 char recv_buf[1024];
 
+vector<CSMRRadar*> RadarScreensOpened;
+
 void datalinkLogin(void * arg) {
 	string raw;
 	string url = baseUrlDatalink;
@@ -264,7 +266,7 @@ void vStripsReceiveThread(const asio::error_code &error, size_t bytes_transferre
 	}
 }
 
-void vStripsThreadFunction()
+void vStripsThreadFunction(void * arg)
 {
 	try
 	{
@@ -321,7 +323,8 @@ CSMRPlugin::CSMRPlugin(void):CPlugIn(EuroScopePlugIn::COMPATIBILITY_CODE, MY_PLU
 
 	try
 	{
-		vStripsThread = std::thread(vStripsThreadFunction);
+		//vStripsThread = std::thread();
+		_beginthread(vStripsThreadFunction, 0, NULL);
 	}
 	catch (std::exception& e)
 	{
@@ -341,7 +344,7 @@ CSMRPlugin::~CSMRPlugin()
 	try
 	{
 		io_service.stop();
-		vStripsThread.join();
+		//vStripsThread.join();
 	}
 	catch (std::exception& e)
 	{
@@ -634,8 +637,20 @@ CRadarScreen * CSMRPlugin::OnRadarScreenCreated(const char * sDisplayName, bool
 {
 	Logger::info(string(__FUNCSIG__));
 	if (!strcmp(sDisplayName, MY_PLUGIN_VIEW_AVISO)) {
-		return new CSMRRadar();
+		CSMRRadar* rd = new CSMRRadar();
+		RadarScreensOpened.push_back(rd);
+		return rd;
 	}
 
 	return NULL;
 }
+
+//---EuroScopePlugInExit-----------------------------------------------
+
+void __declspec (dllexport) EuroScopePlugInExit(void)
+{
+	for each (auto var in RadarScreensOpened)
+	{
+		var->EuroScopePlugInExitCustom();
+	}
+}
diff --git a/vSMR/SMRRadar.cpp b/vSMR/SMRRadar.cpp
@@ -12,7 +12,7 @@ int LeaderLineDefaultlenght = 50;
 //
 
 bool initCursor = true;
-HCURSOR smrCursor;
+HCURSOR smrCursor = NULL;
 bool standardCursor;
 WNDPROC gSourceProc;
 HWND pluginWindow;
@@ -95,8 +95,15 @@ CSMRRadar::CSMRRadar()
 CSMRRadar::~CSMRRadar()
 {
 	Logger::info(string(__FUNCSIG__));
-	this->OnAsrContentToBeSaved();
-	this->EuroScopePlugInExitCustom();
+	try {
+		this->OnAsrContentToBeSaved();
+		//this->EuroScopePlugInExitCustom();
+	}
+	catch (exception &e) {
+		stringstream s;
+		s << e.what() << endl;
+		AfxMessageBox(string("Error occured " + s.str()).c_str());
+	}
 	// Shutting down GDI+
 	GdiplusShutdown(m_gdiplusToken);
 }
@@ -309,15 +316,18 @@ void CSMRRadar::OnMoveScreenObject(int ObjectType, const char * sObjectId, POINT
 				else if (strcmp(sObjectId, "resize") == 0)
 					smrCursor = CopyCursor((HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_SMRRESIZE), IMAGE_CURSOR, 0, 0, LR_SHARED));
 
-				AfxGetMainWnd()->SendMessage(WM_SETCURSOR);
+				//AfxGetMainWnd()->SendMessage(WM_SETCURSOR);
+				AFX_MANAGE_STATE(AfxGetStaticModuleState())
+					SetCursor(smrCursor);
 				standardCursor = false;
 			}
 		} else
 		{
 			if (!standardCursor)
 			{
 				smrCursor = CopyCursor((HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_SMRCURSOR), IMAGE_CURSOR, 0, 0, LR_SHARED));
-				AfxGetMainWnd()->SendMessage(WM_SETCURSOR);
+				AFX_MANAGE_STATE(AfxGetStaticModuleState())
+					SetCursor(smrCursor);
 				standardCursor = true;
 			}
 		}
@@ -331,15 +341,17 @@ void CSMRRadar::OnMoveScreenObject(int ObjectType, const char * sObjectId, POINT
 			if(standardCursor)
 			{
 				smrCursor = CopyCursor((HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_SMRMOVETAG), IMAGE_CURSOR, 0, 0, LR_SHARED));
-				AfxGetMainWnd()->SendMessage(WM_SETCURSOR);
+				AFX_MANAGE_STATE(AfxGetStaticModuleState())
+					SetCursor(smrCursor);
 				standardCursor = false;
 			}
 		} else
 		{
 			if (!standardCursor)
 			{
 				smrCursor = CopyCursor((HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_SMRCURSOR), IMAGE_CURSOR, 0, 0, LR_SHARED));
-				AfxGetMainWnd()->SendMessage(WM_SETCURSOR);
+				AFX_MANAGE_STATE(AfxGetStaticModuleState())
+					SetCursor(smrCursor);
 				standardCursor = true;
 			}
 		}
@@ -390,7 +402,8 @@ void CSMRRadar::OnMoveScreenObject(int ObjectType, const char * sObjectId, POINT
 			{
 				smrCursor = CopyCursor((HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_SMRMOVEWINDOW), IMAGE_CURSOR, 0, 0, LR_SHARED));
 
-				AfxGetMainWnd()->SendMessage(WM_SETCURSOR);
+				AFX_MANAGE_STATE(AfxGetStaticModuleState())
+					SetCursor(smrCursor);
 				standardCursor = false;
 			}
 		}
@@ -399,7 +412,8 @@ void CSMRRadar::OnMoveScreenObject(int ObjectType, const char * sObjectId, POINT
 			if (!standardCursor)
 			{
 				smrCursor = CopyCursor((HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_SMRCURSOR), IMAGE_CURSOR, 0, 0, LR_SHARED));
-				AfxGetMainWnd()->SendMessage(WM_SETCURSOR);
+				AFX_MANAGE_STATE(AfxGetStaticModuleState())
+					SetCursor(smrCursor);
 				standardCursor = true;
 			}
 		}
@@ -1509,6 +1523,7 @@ void CSMRRadar::OnFlightPlanDisconnect(CFlightPlan FlightPlan)
 	}
 }
 
+/*
 LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch (uMsg)
@@ -1519,7 +1534,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	default:
 		return CallWindowProc(gSourceProc, hwnd, uMsg, wParam, lParam);
 	}
-}
+}*/
 
 void CSMRRadar::OnRefresh(HDC hDC, int Phase)
 {
@@ -1531,8 +1546,8 @@ void CSMRRadar::OnRefresh(HDC hDC, int Phase)
 
 		if (smrCursor != nullptr)
 		{
-			pluginWindow = GetActiveWindow();
-			gSourceProc = (WNDPROC)SetWindowLong(pluginWindow, GWL_WNDPROC, (LONG)WindowProc);
+			//pluginWindow = GetActiveWindow();
+			//gSourceProc = (WNDPROC)SetWindowLong(pluginWindow, GWL_WNDPROC, (LONG)WindowProc);
 		}
 		initCursor = false;
 	}
@@ -2737,11 +2752,10 @@ void CSMRRadar::OnRefresh(HDC hDC, int Phase)
 
 void CSMRRadar::EuroScopePlugInExitCustom()
 {
-	Logger::info(string(__FUNCSIG__));
 	AFX_MANAGE_STATE(AfxGetStaticModuleState())
 
-		if (smrCursor != nullptr)
+		/*if (smrCursor != nullptr && smrCursor != NULL)
 		{
 			SetWindowLong(pluginWindow, GWL_WNDPROC, (LONG)gSourceProc);
-		}
-}
+		}*/
+}
diff --git a/vSMR/SMRRadar.hpp b/vSMR/SMRRadar.hpp
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <sstream>
 #include <GdiPlus.h>
+#include <sstream>
 #define _USE_MATH_DEFINES
 #include <math.h>
 #include "Constant.hpp"

diff --git a/vSMR/vSMR.cpp b/vSMR/vSMR.cpp
@@ -46,11 +46,3 @@ void __declspec (dllexport) EuroScopePlugInInit(EuroScopePlugIn::CPlugIn ** ppPl
 		// create the instance
 		* ppPlugInInstance = theApp.gpMyPlugin = new CSMRPlugin();
 }
-
-
-//---EuroScopePlugInExit-----------------------------------------------
-
-void __declspec (dllexport) EuroScopePlugInExit(void)
-{
-	delete theApp;
-}
diff --git a/vSMR/vSMR.vcxproj b/vSMR/vSMR.vcxproj
@@ -75,7 +75,7 @@
       <AdditionalDependencies>..\lib\EuroScopePlugInDll.lib;..\lib\libcurld.lib</AdditionalDependencies>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions>/IGNORE:4099 /NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>