add dx11 dev&swapchain wrapping

Author: megai2

addon/com_wrapper.cpp

@@ -13,6 +13,14 @@ static void* wrap_pass_vtable[METHOD_WRAP_COUNT+1] = {
 
 #define WRAPPED_METH_PREFIX(b) wrap_pass_obj_##b, __SPECIAL_IGNORANCE
 #include "com_wrapper_obj_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) wrap_pass_dev11_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_dev11_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) wrap_pass_swc_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_swc_methods.inc"
 #undef WRAPPED_METH_PREFIX
 
 	0
@@ -26,6 +34,14 @@ static void* wrap_pre_vtable[METHOD_WRAP_COUNT+1] = {
 
 #define WRAPPED_METH_PREFIX(b) wrap_pre_obj_##b, __SPECIAL_IGNORANCE
 #include "com_wrapper_obj_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) wrap_pre_dev11_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_dev11_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) wrap_pre_swc_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_swc_methods.inc"
 #undef WRAPPED_METH_PREFIX
 
 	0
@@ -40,6 +56,15 @@ static void* wrap_post_vtable[METHOD_WRAP_COUNT+1] = {
 #define WRAPPED_METH_PREFIX(b) wrap_post_obj_##b, __SPECIAL_IGNORANCE
 #include "com_wrapper_obj_methods.inc"
 #undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) wrap_post_dev11_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_dev11_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) wrap_post_swc_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_swc_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
 	0
 };
 
@@ -51,6 +76,14 @@ static void* wrap_prepost_vtable[METHOD_WRAP_COUNT+1] = {
 
 #define WRAPPED_METH_PREFIX(b) wrap_prepost_obj_##b, __SPECIAL_IGNORANCE
 #include "com_wrapper_obj_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) wrap_prepost_dev11_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_dev11_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) wrap_prepost_swc_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_swc_methods.inc"
 #undef WRAPPED_METH_PREFIX
 
 	0
@@ -90,6 +123,26 @@ IDirect3D9 * wrap_CreateObj(IDirect3D9 * origObj)
 	return (IDirect3D9*)ret;
 }
 
+ID3D11Device* wrap_CreateDevice11(ID3D11Device* origDev)
+{
+	wrapped_com_obj * ret = (wrapped_com_obj*)malloc(sizeof(wrapped_com_obj));
+
+	ret->vtable = (com_vtable*)&g_main_vtable[METH_DEV11_QueryInterface];
+	ret->orig_dev11 = origDev;
+
+	return (ID3D11Device*)ret;
+}
+
+IDXGISwapChain* wrap_CreateSwapchain(IDXGISwapChain* origSwc)
+{
+	wrapped_com_obj* ret = (wrapped_com_obj*)malloc(sizeof(wrapped_com_obj));
+
+	ret->vtable = (com_vtable*)&g_main_vtable[METH_SWC_QueryInterface];
+	ret->orig_swc = origSwc;
+
+	return (IDXGISwapChain*)ret;
+}
+
 void wrap_SwitchMethod(d3d9_vtable_method method, vtable_wrap_mode mode)
 {
 	g_main_vtable[method] = wrap_vtable_arr[mode][method];
@@ -135,5 +188,20 @@ void wrap_InitEvents()
 	#include "com_wrapper_obj_methods.inc"
 	#undef WRAPPED_METH_PREFIX
 
+	#define WRAPPED_METH_PREFIX(b) \
+		 preCallEvents[METH_DEV11_##b] = gAPI->query_event(gAPI->hash_name((wchar_t*)EVENT_NAME_STR(DEV11_##b, PRE_))); \
+		postCallEvents[METH_DEV11_##b] = gAPI->query_event(gAPI->hash_name((wchar_t*)EVENT_NAME_STR(DEV11_##b, POST_))); \
+		g_main_vtable[METH_DEV11_##b] = wrap_pass_vtable[METH_DEV11_##b]; \
+		__SPECIAL_IGNORANCE
+	#include "com_wrapper_dev11_methods.inc"
+	#undef WRAPPED_METH_PREFIX
+
+	#define WRAPPED_METH_PREFIX(b) \
+		 preCallEvents[METH_SWC_##b] = gAPI->query_event(gAPI->hash_name((wchar_t*)EVENT_NAME_STR(SWC_##b, PRE_))); \
+		postCallEvents[METH_SWC_##b] = gAPI->query_event(gAPI->hash_name((wchar_t*)EVENT_NAME_STR(SWC_##b, POST_))); \
+		g_main_vtable[METH_SWC_##b] = wrap_pass_vtable[METH_SWC_##b]; \
+		__SPECIAL_IGNORANCE
+	#include "com_wrapper_swc_methods.inc"
+	#undef WRAPPED_METH_PREFIX
 
 }

addon/com_wrapper.h

@@ -6,13 +6,17 @@ typedef struct com_vtable {
 	void* methods[1024];
 } com_vtable;
 
+#pragma pack(push, 1)
 typedef struct wrapped_com_obj {
 	com_vtable* vtable;
 	union {
 		IDirect3D9* orig_obj;
 		IDirect3DDevice9* orig_dev;
+		ID3D11Device* orig_dev11;
+		IDXGISwapChain* orig_swc;
 	};
 } wrapped_com_obj;
+#pragma pack(pop)
 
 #define WRAPPED_METH_DECL_(a,b) WRAPPED_METH_PREFIX(b)
 #define WRAPPED_METH_DECL(b) WRAPPED_METH_DECL_(HRESULT, b)
@@ -60,7 +64,16 @@ typedef enum d3d9_vtable_method {
 
 #define WRAPPED_METH_PREFIX(b) METH_OBJ_##b, __SPECIAL_IGNORANCE
 #include "com_wrapper_obj_methods.inc"
-#undef WRAPPED_METH_PREFIX	
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) METH_DEV11_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_dev11_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
+#define WRAPPED_METH_PREFIX(b) METH_SWC_##b, __SPECIAL_IGNORANCE
+#include "com_wrapper_swc_methods.inc"
+#undef WRAPPED_METH_PREFIX
+
 	METHOD_WRAP_COUNT
 } d3d9_vtable_method;
 
@@ -77,6 +90,8 @@ typedef enum vtable_wrap_mode {
 
 IDirect3DDevice9* wrap_CreateDevice(IDirect3DDevice9* origDev);
 IDirect3D9* wrap_CreateObj(IDirect3D9* origObj);
+ID3D11Device* wrap_CreateDevice11(ID3D11Device* origDev);
+IDXGISwapChain* wrap_CreateSwapchain(IDXGISwapChain* origSwc);
 
 typedef struct wrap_event_data {
 	void* ret;