mirror of
https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
synced 2024-11-23 20:38:07 +01:00
Cleanup again
This commit is contained in:
parent
04847abeb7
commit
36e8966223
9 changed files with 6 additions and 45 deletions
|
@ -1,16 +1,11 @@
|
|||
#include "Base_Hook.h"
|
||||
#include "Hook_Manager.h"
|
||||
|
||||
#ifndef NO_OVERLAY
|
||||
|
||||
#include <algorithm>
|
||||
#include "Hook_Manager.h"
|
||||
|
||||
#include "../detours/detours.h"
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define VC_EXTRALEAN
|
||||
#include <Windows.h>
|
||||
|
||||
Base_Hook::Base_Hook():
|
||||
_library(nullptr)
|
||||
{}
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
#ifndef __INCLUDED_BASE_HOOK_H__
|
||||
#define __INCLUDED_BASE_HOOK_H__
|
||||
|
||||
#include "../dll/base.h"
|
||||
|
||||
#ifndef NO_OVERLAY
|
||||
|
||||
#include <vector>
|
||||
#include <utility>
|
||||
|
||||
#include "../dll/base.h"
|
||||
|
||||
class Base_Hook
|
||||
{
|
||||
protected:
|
||||
|
|
|
@ -36,13 +36,6 @@ private:
|
|||
decltype(&IDXGISwapChain::ResizeBuffers) ResizeBuffers;
|
||||
decltype(&IDXGISwapChain::ResizeTarget) ResizeTarget;
|
||||
|
||||
// Hook functions so we know we use DX10
|
||||
//static decltype(D3D10CreateDevice) MyD3D10CreateDevice;
|
||||
//static decltype(D3D10CreateDeviceAndSwapChain) MyD3D10CreateDeviceAndSwapChain;
|
||||
|
||||
//decltype(D3D10CreateDevice)* _D3D10CreateDevice;
|
||||
//decltype(D3D10CreateDeviceAndSwapChain)* D3D10CreateDeviceAndSwapChain;
|
||||
|
||||
public:
|
||||
virtual ~DX10_Hook();
|
||||
|
||||
|
|
|
@ -36,13 +36,6 @@ private:
|
|||
decltype(&IDXGISwapChain::ResizeBuffers) ResizeBuffers;
|
||||
decltype(&IDXGISwapChain::ResizeTarget) ResizeTarget;
|
||||
|
||||
// Hook functions so we know we use DX11
|
||||
//static decltype(D3D11CreateDevice) MyD3D11CreateDevice;
|
||||
//static decltype(D3D11CreateDeviceAndSwapChain) MyD3D11CreateDeviceAndSwapChain;
|
||||
|
||||
//decltype(D3D11CreateDevice)* D3D11CreateDevice;
|
||||
//decltype(D3D11CreateDeviceAndSwapChain)* D3D11CreateDeviceAndSwapChain;
|
||||
|
||||
public:
|
||||
virtual ~DX11_Hook();
|
||||
|
||||
|
|
|
@ -42,11 +42,6 @@ private:
|
|||
decltype(&ID3D12CommandQueue::ExecuteCommandLists) ExecuteCommandLists;
|
||||
decltype(&ID3D12GraphicsCommandList::Close) Close;
|
||||
|
||||
// Hook functions so we know we use DX11
|
||||
//static decltype(D3D12CreateDevice) MyD3D12CreateDevice;
|
||||
|
||||
//decltype(D3D12CreateDevice)* D3D12CreateDevice;
|
||||
|
||||
public:
|
||||
virtual ~DX12_Hook();
|
||||
|
||||
|
|
|
@ -37,13 +37,6 @@ private:
|
|||
static HRESULT STDMETHODCALLTYPE MyPresent(IDirect3DDevice9* _this, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion);
|
||||
static HRESULT STDMETHODCALLTYPE MyPresentEx(IDirect3DDevice9Ex* _this, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags);
|
||||
|
||||
// Hook functions so we know we use DX9
|
||||
//static decltype(Direct3DCreate9) MyDirect3DCreate9;
|
||||
//static decltype(Direct3DCreate9Ex) MyDirect3DCreate9Ex;
|
||||
|
||||
//decltype(Direct3DCreate9)* Direct3DCreate9;
|
||||
//decltype(Direct3DCreate9Ex)* Direct3DCreate9Ex;
|
||||
|
||||
public:
|
||||
virtual ~DX9_Hook();
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@ public:
|
|||
static constexpr const char *DLL_NAME = "opengl32.dll";
|
||||
|
||||
using wglSwapBuffers_t = BOOL(WINAPI*)(HDC);
|
||||
//using wglMakeCurrent_t = BOOL(WINAPI*)(HDC, HGLRC);
|
||||
|
||||
private:
|
||||
static OpenGL_Hook* _inst;
|
||||
|
@ -29,11 +28,6 @@ private:
|
|||
static BOOL WINAPI MywglSwapBuffers(HDC hDC);
|
||||
|
||||
wglSwapBuffers_t wglSwapBuffers;
|
||||
|
||||
// Hook functions so we know we use OGL
|
||||
//static BOOL WINAPI MywglMakeCurrent(HDC hDC, HGLRC hGLRC);
|
||||
|
||||
//wglMakeCurrent_t wglMakeCurrent;
|
||||
|
||||
public:
|
||||
virtual ~OpenGL_Hook();
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
#include "Renderer_Detector.h"
|
||||
|
||||
#include "../detours/detours.h"
|
||||
#include "Hook_Manager.h"
|
||||
|
||||
#ifdef STEAM_WIN32
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
#define __INCLUDED_RENDERER_DETECTOR_H__
|
||||
|
||||
#include "Base_Hook.h"
|
||||
#include <thread>
|
||||
|
||||
#ifndef NO_OVERLAY
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
#include <Windows.h>
|
||||
|
||||
#ifdef STEAM_WIN32
|
||||
struct IDXGISwapChain;
|
||||
struct IDirect3DDevice9;
|
||||
struct IDirect3DDevice9Ex;
|
||||
|
|
Loading…
Reference in a new issue