Fix broken layout of virtual function tables when building with MinGW (…

…#124)

CMakeLists.txt

@@ -3,10 +3,11 @@ cmake_minimum_required(VERSION 3.12)
 project(d3d8to9 CXX)
 
 set(SRCS
-  source/d3d8to9_base.cpp
+  source/d3d8.hpp
   source/d3d8to9.cpp
-  source/d3d8to9_device.cpp
   source/d3d8to9.hpp
+  source/d3d8to9_base.cpp
+  source/d3d8to9_device.cpp
   source/d3d8to9_index_buffer.cpp
   source/d3d8to9_surface.cpp
   source/d3d8to9_swap_chain.cpp

d3d8to9.vcxproj

@@ -88,6 +88,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="res\resource.h" />
+    <ClInclude Include="source\d3d8.hpp" />
     <ClInclude Include="source\d3d8to9.hpp" />
     <ClInclude Include="source\d3d8types.hpp" />
     <ClInclude Include="source\d3dx9.hpp" />

d3d8to9.vcxproj.filters

@@ -29,6 +29,9 @@
     <ClInclude Include="res\resource.h">
       <Filter>resources</Filter>
     </ClInclude>
+    <ClInclude Include="source\d3d8.hpp">
+      <Filter>helpers</Filter>
+    </ClInclude>
     <ClInclude Include="source\d3d8to9.hpp" />
     <ClInclude Include="source\d3d8types.hpp">
       <Filter>helpers</Filter>

source/d3d8to9.cpp

@@ -15,7 +15,7 @@ PFN_D3DXLoadSurfaceFromSurface D3DXLoadSurfaceFromSurface = nullptr;
 std::ofstream LOG;
 #endif
 
-extern "C" Direct3D8 *WINAPI Direct3DCreate8(UINT SDKVersion)
+extern "C" IDirect3D8 *WINAPI Direct3DCreate8(UINT SDKVersion)
 {
 #ifndef D3D8TO9NOLOG
 	static bool LogMessageFlag = true;

source/d3d8to9_base.cpp

@@ -46,11 +46,11 @@ HRESULT STDMETHODCALLTYPE Direct3D8::QueryInterface(REFIID riid, void **ppvObj)
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3D8) ||
 		riid == __uuidof(IUnknown))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3D8 *>(this);
 
 		return S_OK;
 	}
@@ -166,7 +166,7 @@ HMONITOR STDMETHODCALLTYPE Direct3D8::GetAdapterMonitor(UINT Adapter)
 {
 	return ProxyInterface->GetAdapterMonitor(Adapter);
 }
-HRESULT STDMETHODCALLTYPE Direct3D8::CreateDevice(UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS8 *pPresentationParameters, Direct3DDevice8 **ppReturnedDeviceInterface)
+HRESULT STDMETHODCALLTYPE Direct3D8::CreateDevice(UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS8 *pPresentationParameters, IDirect3DDevice8 **ppReturnedDeviceInterface)
 {
 #ifndef D3D8TO9NOLOG
 	LOG << "Redirecting '" << "IDirect3D8::CreateDevice" << "(" << this << ", " << Adapter << ", " << DeviceType << ", " << hFocusWindow << ", " << BehaviorFlags << ", " << pPresentationParameters << ", " << ppReturnedDeviceInterface << ")' ..." << std::endl;

source/d3d8to9_index_buffer.cpp

@@ -19,12 +19,12 @@ HRESULT STDMETHODCALLTYPE Direct3DIndexBuffer8::QueryInterface(REFIID riid, void
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3DIndexBuffer8) ||
 		riid == __uuidof(IUnknown) ||
-		riid == __uuidof(Direct3DResource8))
+		riid == __uuidof(IDirect3DResource8))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3DIndexBuffer8 *>(this);
 
 		return S_OK;
 	}
@@ -44,7 +44,7 @@ ULONG STDMETHODCALLTYPE Direct3DIndexBuffer8::Release()
 	return ProxyInterface->Release();
 }
 
-HRESULT STDMETHODCALLTYPE Direct3DIndexBuffer8::GetDevice(Direct3DDevice8 **ppDevice)
+HRESULT STDMETHODCALLTYPE Direct3DIndexBuffer8::GetDevice(IDirect3DDevice8 **ppDevice)
 {
 	if (ppDevice == nullptr)
 		return D3DERR_INVALIDCALL;

source/d3d8to9_surface.cpp

@@ -19,11 +19,11 @@ HRESULT STDMETHODCALLTYPE Direct3DSurface8::QueryInterface(REFIID riid, void **p
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3DSurface8) ||
 		riid == __uuidof(IUnknown))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3DSurface8 *>(this);
 
 		return S_OK;
 	}
@@ -43,7 +43,7 @@ ULONG STDMETHODCALLTYPE Direct3DSurface8::Release()
 	return ProxyInterface->Release();
 }
 
-HRESULT STDMETHODCALLTYPE Direct3DSurface8::GetDevice(Direct3DDevice8 **ppDevice)
+HRESULT STDMETHODCALLTYPE Direct3DSurface8::GetDevice(IDirect3DDevice8 **ppDevice)
 {
 	if (ppDevice == nullptr)
 		return D3DERR_INVALIDCALL;

source/d3d8to9_swap_chain.cpp

@@ -19,11 +19,11 @@ HRESULT STDMETHODCALLTYPE Direct3DSwapChain8::QueryInterface(REFIID riid, void *
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3DSwapChain8) ||
 		riid == __uuidof(IUnknown))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3DSwapChain8 *>(this);
 
 		return S_OK;
 	}
@@ -49,7 +49,7 @@ HRESULT STDMETHODCALLTYPE Direct3DSwapChain8::Present(const RECT *pSourceRect, c
 
 	return ProxyInterface->Present(pSourceRect, pDestRect, hDestWindowOverride, nullptr, 0);
 }
-HRESULT STDMETHODCALLTYPE Direct3DSwapChain8::GetBackBuffer(UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, Direct3DSurface8 **ppBackBuffer)
+HRESULT STDMETHODCALLTYPE Direct3DSwapChain8::GetBackBuffer(UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface8 **ppBackBuffer)
 {
 	if (ppBackBuffer == nullptr)
 		return D3DERR_INVALIDCALL;

source/d3d8to9_texture.cpp

@@ -19,13 +19,13 @@ HRESULT STDMETHODCALLTYPE Direct3DTexture8::QueryInterface(REFIID riid, void **p
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3DTexture8) ||
 		riid == __uuidof(IUnknown) ||
-		riid == __uuidof(Direct3DResource8) ||
-		riid == __uuidof(Direct3DBaseTexture8))
+		riid == __uuidof(IDirect3DResource8) ||
+		riid == __uuidof(IDirect3DBaseTexture8))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3DTexture8 *>(this);
 
 		return S_OK;
 	}
@@ -45,7 +45,7 @@ ULONG STDMETHODCALLTYPE Direct3DTexture8::Release()
 	return ProxyInterface->Release();
 }
 
-HRESULT STDMETHODCALLTYPE Direct3DTexture8::GetDevice(Direct3DDevice8 **ppDevice)
+HRESULT STDMETHODCALLTYPE Direct3DTexture8::GetDevice(IDirect3DDevice8 **ppDevice)
 {
 	if (ppDevice == nullptr)
 		return D3DERR_INVALIDCALL;
@@ -112,7 +112,7 @@ HRESULT STDMETHODCALLTYPE Direct3DTexture8::GetLevelDesc(UINT Level, D3DSURFACE_
 
 	return D3D_OK;
 }
-HRESULT STDMETHODCALLTYPE Direct3DTexture8::GetSurfaceLevel(UINT Level, Direct3DSurface8 **ppSurfaceLevel)
+HRESULT STDMETHODCALLTYPE Direct3DTexture8::GetSurfaceLevel(UINT Level, IDirect3DSurface8 **ppSurfaceLevel)
 {
 	if (ppSurfaceLevel == nullptr)
 		return D3DERR_INVALIDCALL;
@@ -157,13 +157,13 @@ HRESULT STDMETHODCALLTYPE Direct3DCubeTexture8::QueryInterface(REFIID riid, void
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3DCubeTexture8) ||
 		riid == __uuidof(IUnknown) ||
-		riid == __uuidof(Direct3DResource8) ||
-		riid == __uuidof(Direct3DBaseTexture8))
+		riid == __uuidof(IDirect3DResource8) ||
+		riid == __uuidof(IDirect3DBaseTexture8))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3DCubeTexture8 *>(this);
 
 		return S_OK;
 	}
@@ -183,7 +183,7 @@ ULONG STDMETHODCALLTYPE Direct3DCubeTexture8::Release()
 	return ProxyInterface->Release();
 }
 
-HRESULT STDMETHODCALLTYPE Direct3DCubeTexture8::GetDevice(Direct3DDevice8 **ppDevice)
+HRESULT STDMETHODCALLTYPE Direct3DCubeTexture8::GetDevice(IDirect3DDevice8 **ppDevice)
 {
 	if (ppDevice == nullptr)
 		return D3DERR_INVALIDCALL;
@@ -250,7 +250,7 @@ HRESULT STDMETHODCALLTYPE Direct3DCubeTexture8::GetLevelDesc(UINT Level, D3DSURF
 
 	return D3D_OK;
 }
-HRESULT STDMETHODCALLTYPE Direct3DCubeTexture8::GetCubeMapSurface(D3DCUBEMAP_FACES FaceType, UINT Level, Direct3DSurface8 **ppCubeMapSurface)
+HRESULT STDMETHODCALLTYPE Direct3DCubeTexture8::GetCubeMapSurface(D3DCUBEMAP_FACES FaceType, UINT Level, IDirect3DSurface8 **ppCubeMapSurface)
 {
 	if (ppCubeMapSurface == nullptr)
 		return D3DERR_INVALIDCALL;
@@ -295,13 +295,13 @@ HRESULT STDMETHODCALLTYPE Direct3DVolumeTexture8::QueryInterface(REFIID riid, vo
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3DVolumeTexture8) ||
 		riid == __uuidof(IUnknown) ||
-		riid == __uuidof(Direct3DResource8) ||
-		riid == __uuidof(Direct3DBaseTexture8))
+		riid == __uuidof(IDirect3DResource8) ||
+		riid == __uuidof(IDirect3DBaseTexture8))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3DVolumeTexture8 *>(this);
 
 		return S_OK;
 	}
@@ -321,7 +321,7 @@ ULONG STDMETHODCALLTYPE Direct3DVolumeTexture8::Release()
 	return ProxyInterface->Release();
 }
 
-HRESULT STDMETHODCALLTYPE Direct3DVolumeTexture8::GetDevice(Direct3DDevice8 **ppDevice)
+HRESULT STDMETHODCALLTYPE Direct3DVolumeTexture8::GetDevice(IDirect3DDevice8 **ppDevice)
 {
 	if (ppDevice == nullptr)
 		return D3DERR_INVALIDCALL;
@@ -388,7 +388,7 @@ HRESULT STDMETHODCALLTYPE Direct3DVolumeTexture8::GetLevelDesc(UINT Level, D3DVO
 
 	return D3D_OK;
 }
-HRESULT STDMETHODCALLTYPE Direct3DVolumeTexture8::GetVolumeLevel(UINT Level, Direct3DVolume8 **ppVolumeLevel)
+HRESULT STDMETHODCALLTYPE Direct3DVolumeTexture8::GetVolumeLevel(UINT Level, IDirect3DVolume8 **ppVolumeLevel)
 {
 	if (ppVolumeLevel == nullptr)
 		return D3DERR_INVALIDCALL;

source/d3d8to9_vertex_buffer.cpp

@@ -19,12 +19,12 @@ HRESULT STDMETHODCALLTYPE Direct3DVertexBuffer8::QueryInterface(REFIID riid, voi
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3DVertexBuffer8) ||
 		riid == __uuidof(IUnknown) ||
-		riid == __uuidof(Direct3DResource8))
+		riid == __uuidof(IDirect3DResource8))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3DVertexBuffer8 *>(this);
 
 		return S_OK;
 	}
@@ -44,7 +44,7 @@ ULONG STDMETHODCALLTYPE Direct3DVertexBuffer8::Release()
 	return ProxyInterface->Release();
 }
 
-HRESULT STDMETHODCALLTYPE Direct3DVertexBuffer8::GetDevice(Direct3DDevice8 **ppDevice)
+HRESULT STDMETHODCALLTYPE Direct3DVertexBuffer8::GetDevice(IDirect3DDevice8 **ppDevice)
 {
 	if (ppDevice == nullptr)
 		return D3DERR_INVALIDCALL;

source/d3d8to9_volume.cpp

@@ -19,11 +19,11 @@ HRESULT STDMETHODCALLTYPE Direct3DVolume8::QueryInterface(REFIID riid, void **pp
 	if (ppvObj == nullptr)
 		return E_POINTER;
 
-	if (riid == __uuidof(this) ||
+	if (riid == __uuidof(IDirect3DVolume8) ||
 		riid == __uuidof(IUnknown))
 	{
 		AddRef();
-		*ppvObj = this;
+		*ppvObj = static_cast<IDirect3DVolume8 *>(this);
 
 		return S_OK;
 	}
@@ -43,7 +43,7 @@ ULONG STDMETHODCALLTYPE Direct3DVolume8::Release()
 	return ProxyInterface->Release();
 }
 
-HRESULT STDMETHODCALLTYPE Direct3DVolume8::GetDevice(Direct3DDevice8 **ppDevice)
+HRESULT STDMETHODCALLTYPE Direct3DVolume8::GetDevice(IDirect3DDevice8 **ppDevice)
 {
 	if (ppDevice == nullptr)
 		return D3DERR_INVALIDCALL;

source/interface_query.cpp

@@ -18,9 +18,9 @@ void GenericQueryInterface(REFIID riid, LPVOID *ppvObj, Direct3DDevice8 *pDevice
 	if (ppvObj == nullptr || *ppvObj == nullptr || pDevice == nullptr)
 		return;
 
-	if (riid == __uuidof(Direct3D8))
+	if (riid == __uuidof(IDirect3D8))
 	{
-		Direct3D8 *pD3D8 = nullptr;
+		IDirect3D8 *pD3D8 = nullptr;
 		if (SUCCEEDED(pDevice->GetDirect3D(&pD3D8)) && pD3D8)
 		{
 			*ppvObj = pD3D8;
@@ -29,14 +29,14 @@ void GenericQueryInterface(REFIID riid, LPVOID *ppvObj, Direct3DDevice8 *pDevice
 		}
 	}
 
-	if (riid == __uuidof(Direct3DDevice8))
+	if (riid == __uuidof(IDirect3DDevice8))
 	{
-		*ppvObj = pDevice;
+		*ppvObj = static_cast<IDirect3DDevice8 *>(pDevice);
 		return;
 	}
 
 #define QUERY_INTERFACE(x) \
-	if (riid == __uuidof(x)) \
+	if (riid == __uuidof(I ## x)) \
 	{ \
 		*ppvObj = pDevice->ProxyAddressLookupTable->FindAddress<x>(*ppvObj); \
 		return; \
@@ -54,25 +54,25 @@ void GenericQueryInterface(REFIID riid, LPVOID *ppvObj, Direct3DDevice8 *pDevice
 
 REFIID ConvertREFIID(REFIID riid)
 {
-	if (riid == __uuidof(Direct3D8))
+	if (riid == __uuidof(IDirect3D8))
 		return IID_IDirect3D9;
-	if (riid == __uuidof(Direct3DDevice8))
+	if (riid == __uuidof(IDirect3DDevice8))
 		return IID_IDirect3DDevice9;
-	if (riid == __uuidof(Direct3DTexture8))
+	if (riid == __uuidof(IDirect3DTexture8))
 		return IID_IDirect3DTexture9;
-	if (riid == __uuidof(Direct3DCubeTexture8))
+	if (riid == __uuidof(IDirect3DCubeTexture8))
 		return IID_IDirect3DCubeTexture9;
-	if (riid == __uuidof(Direct3DVolumeTexture8))
+	if (riid == __uuidof(IDirect3DVolumeTexture8))
 		return IID_IDirect3DVolumeTexture9;
-	if (riid == __uuidof(Direct3DVertexBuffer8))
+	if (riid == __uuidof(IDirect3DVertexBuffer8))
 		return IID_IDirect3DVertexBuffer9;
-	if (riid == __uuidof(Direct3DIndexBuffer8))
+	if (riid == __uuidof(IDirect3DIndexBuffer8))
 		return IID_IDirect3DIndexBuffer9;
-	if (riid == __uuidof(Direct3DSurface8))
+	if (riid == __uuidof(IDirect3DSurface8))
 		return IID_IDirect3DSurface9;
-	if (riid == __uuidof(Direct3DVolume8))
+	if (riid == __uuidof(IDirect3DVolume8))
 		return IID_IDirect3DVolume9;
-	if (riid == __uuidof(Direct3DSwapChain8))
+	if (riid == __uuidof(IDirect3DSwapChain8))
 		return IID_IDirect3DSwapChain9;
 	return riid;
 }

source/interface_query.hpp

@@ -8,6 +8,17 @@
 #include <algorithm>
 #include <unordered_map>
 
+class Direct3D8;
+class Direct3DDevice8;
+class Direct3DSwapChain8;
+class Direct3DTexture8;
+class Direct3DCubeTexture8;
+class Direct3DVolumeTexture8;
+class Direct3DSurface8;
+class Direct3DVolume8;
+class Direct3DVertexBuffer8;
+class Direct3DIndexBuffer8;
+
 class AddressLookupTable
 {
 	template <typename T>