update to 1.1.4: explicitly end new threads

FlashpointProject · Oct 12, 2022 · 8dcad7a · 8dcad7a
1 parent 1834713
commit 8dcad7a
Show file tree

Hide file tree

Showing 26 changed files with 9 additions and 6 deletions.
diff --git a/Debug/FlashpointProxy.dll b/Debug/FlashpointProxy.dll
diff --git a/Debug/FlashpointProxy.ilk b/Debug/FlashpointProxy.ilk
diff --git a/Debug/FlashpointProxy.pdb b/Debug/FlashpointProxy.pdb
diff --git a/FlashpointProxy/Debug/FlashpointProxy.obj b/FlashpointProxy/Debug/FlashpointProxy.obj
diff --git a/FlashpointProxy/Debug/FlashpointProxy.res b/FlashpointProxy/Debug/FlashpointProxy.res
diff --git a/FlashpointProxy/Debug/FlashpointProxy.tlog/link.read.1.tlog b/FlashpointProxy/Debug/FlashpointProxy.tlog/link.read.1.tlog
diff --git a/FlashpointProxy/Debug/main.obj b/FlashpointProxy/Debug/main.obj
diff --git a/FlashpointProxy/Debug/safeseh.obj b/FlashpointProxy/Debug/safeseh.obj
diff --git a/FlashpointProxy/Debug/shared.obj b/FlashpointProxy/Debug/shared.obj
diff --git a/FlashpointProxy/Debug/vc141.idb b/FlashpointProxy/Debug/vc141.idb
diff --git a/FlashpointProxy/Debug/vc141.pdb b/FlashpointProxy/Debug/vc141.pdb
diff --git a/FlashpointProxy/FlashpointProxy.aps b/FlashpointProxy/FlashpointProxy.aps
diff --git a/FlashpointProxy/FlashpointProxy.rc b/FlashpointProxy/FlashpointProxy.rc
diff --git a/FlashpointProxy/Release/FlashpointProxy.obj b/FlashpointProxy/Release/FlashpointProxy.obj
diff --git a/FlashpointProxy/Release/FlashpointProxy.res b/FlashpointProxy/Release/FlashpointProxy.res
diff --git a/FlashpointProxy/Release/main.obj b/FlashpointProxy/Release/main.obj
diff --git a/FlashpointProxy/Release/safeseh.obj b/FlashpointProxy/Release/safeseh.obj
diff --git a/FlashpointProxy/Release/shared.obj b/FlashpointProxy/Release/shared.obj
diff --git a/FlashpointProxy/Release/vc141.pdb b/FlashpointProxy/Release/vc141.pdb
diff --git a/FlashpointProxy/main.cpp b/FlashpointProxy/main.cpp
@@ -1,7 +1,7 @@
 #include "shared.h"
 #include "FlashpointProxy.h"
 #include <windows.h>
-#include <WinNT.h>
+#include <winnt.h>
 #include <process.h>
 
 LPSTR proxyServer = "http=127.0.0.1:22500;https=127.0.0.1:22500;ftp=127.0.0.1:22500";
@@ -21,8 +21,11 @@ unsigned int __stdcall dynamicThread(void* argList) {
 	if (!FlashpointProxy::enable(proxyServer)) {
 		showLastError("Failed to Enable Flashpoint Proxy");
 		terminateCurrentProcess();
+		_endthreadex(1);
 		return 1;
 	}
+
+	_endthreadex(0);
 	return 0;
 }
 
@@ -46,16 +49,16 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, PCONTEXT contex
 				// deadlock fallback
 				// nothing we can do except begin a thread
 				// and hope it finishes before WinInet is used
-				HANDLE threadHandle = (HANDLE)_beginthreadex(NULL, 0, dynamicThread, 0, 0, 0);
+				HANDLE threadHandle = (HANDLE)_beginthreadex(NULL, 0, dynamicThread, NULL, 0, NULL);
 
 				if (!threadHandle || threadHandle == INVALID_HANDLE_VALUE) {
-					showLastError("Failed to Begin Dynamic Thread");
+					showLastError("Failed to Begin Thread");
 					terminateCurrentProcess();
 					return FALSE;
 				}
 
 				if (!CloseHandle(threadHandle)) {
-					showLastError("Failed to Close Dynamic Thread Handle");
+					showLastError("Failed to Close Handle");
 					terminateCurrentProcess();
 					return FALSE;
 				}

diff --git a/FlashpointProxy/shared.cpp b/FlashpointProxy/shared.cpp
@@ -1,6 +1,6 @@
 #include "shared.h"
 #include <windows.h>
-#include <WinNT.h>
+#include <winnt.h>
 #include <string>
 #include <sstream>
 

diff --git a/README.txt b/README.txt
@@ -1,4 +1,4 @@
-Flashpoint Proxy 1.1.3
+Flashpoint Proxy 1.1.4
 By Anthony Kleine
 
 	This library sets up a process to connect to the Flashpoint Server via

diff --git a/Release/FlashpointProxy.dll b/Release/FlashpointProxy.dll
diff --git a/Release/FlashpointProxy.iobj b/Release/FlashpointProxy.iobj
diff --git a/Release/FlashpointProxy.ipdb b/Release/FlashpointProxy.ipdb
diff --git a/Release/FlashpointProxy.pdb b/Release/FlashpointProxy.pdb