Cleanup wrapper header

elishacloud · Feb 19, 2018 · 6ab81a8 · 6ab81a8
1 parent e48fda7
commit 6ab81a8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 2381 
+#define BUILD_NUMBER 2382 
diff --git a/Stub/BuildNo.rc b/Stub/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 140 
+#define BUILD_NUMBER 141 
diff --git a/Wrappers/wrapper.cpp b/Wrappers/wrapper.cpp
@@ -16,6 +16,7 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#include <vector>
 #include <algorithm>
 #include <fstream>
 
@@ -77,13 +78,26 @@
 		} \
 	}
 
-#include "wrapper.h"
-
 namespace Wrapper
 {
+	struct wrapper_map
+	{
+		FARPROC Proc;
+		FARPROC *val;
+	};
+
+	// Forward function decalration
+	HRESULT __stdcall _jmpaddr();
+	HRESULT __stdcall _jmpaddrvoid();
+
+	// Varable decalration
+	constexpr FARPROC jmpaddr = (FARPROC)*_jmpaddr;
+	constexpr FARPROC jmpaddrvoid = (FARPROC)*_jmpaddrvoid;
 	std::vector<wrapper_map> jmpArray;
 }
 
+#include "wrapper.h"
+
 __declspec(naked) HRESULT __stdcall Wrapper::_jmpaddrvoid()
 {
 	__asm

diff --git a/Wrappers/wrapper.h b/Wrappers/wrapper.h
@@ -1,25 +1,7 @@
 #pragma once
 
-#include <vector>
-
 namespace Wrapper
 {
-	struct wrapper_map
-	{
-		FARPROC Proc;
-		FARPROC *val;
-	};
-
-	// Forward function decalration
-	HRESULT __stdcall _jmpaddr();
-	HRESULT __stdcall _jmpaddrvoid();
-
-	// Varable decalration
-	constexpr FARPROC jmpaddr = (FARPROC)*_jmpaddr;
-	constexpr FARPROC jmpaddrvoid = (FARPROC)*_jmpaddrvoid;
-	extern std::vector<wrapper_map> jmpArray;
-
-	// Shared Functions
 	bool ValidProcAddress(FARPROC ProcAddress);
 	void ShimProc(FARPROC &var, FARPROC in, FARPROC &out);
 	HMODULE CreateWrapper(const char *ProxyDll, const char *WrapperMode);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define BUILD_NUMBER 2381
		#define BUILD_NUMBER 2382