backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00
Code Issues Projects Releases Activity

move debug code defines into header

Browse Source
This commit is contained in:
FunkyFr3sh 2024-06-22 01:19:25 +02:00
parent 12715febe9
commit c86b6f01a2
13 changed files with 44 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/debug.h
View File

@ -3,6 +3,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <intrin.h>
LONG WINAPI dbg_exception_handler(EXCEPTION_POINTERS* exception); LONG WINAPI dbg_exception_handler(EXCEPTION_POINTERS* exception);
void dbg_counter_start(); void dbg_counter_start();
@ -31,6 +32,15 @@ extern double g_dbg_frame_time;
extern DWORD g_dbg_frame_count; extern DWORD g_dbg_frame_count;
extern LPTOP_LEVEL_EXCEPTION_FILTER g_dbg_exception_filter; extern LPTOP_LEVEL_EXCEPTION_FILTER g_dbg_exception_filter;
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
//#define _DEBUG 1 //#define _DEBUG 1
/* use OutputDebugStringA rather than printf */ /* use OutputDebugStringA rather than printf */

9
src/IDirect3D/IDirect3D.c
View File

@ -1,15 +1,6 @@
#include <intrin.h>
#include "IDirect3D.h" #include "IDirect3D.h"
#include "debug.h" #include "debug.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirect3D__QueryInterface(IDirect3DImpl* This, REFIID riid, void** obj) HRESULT __stdcall IDirect3D__QueryInterface(IDirect3DImpl* This, REFIID riid, void** obj)
{ {

9
src/IDirect3D/IDirect3D2.c
View File

@ -1,15 +1,6 @@
#include <intrin.h>
#include "IDirect3D.h" #include "IDirect3D.h"
#include "debug.h" #include "debug.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirect3D2__QueryInterface(IDirect3D2Impl* This, REFIID riid, void** obj) HRESULT __stdcall IDirect3D2__QueryInterface(IDirect3D2Impl* This, REFIID riid, void** obj)
{ {

9
src/IDirect3D/IDirect3D3.c
View File

@ -1,15 +1,6 @@
#include <intrin.h>
#include "IDirect3D.h" #include "IDirect3D.h"
#include "debug.h" #include "debug.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirect3D3__QueryInterface(IDirect3D3Impl* This, REFIID riid, void** obj) HRESULT __stdcall IDirect3D3__QueryInterface(IDirect3D3Impl* This, REFIID riid, void** obj)
{ {

9
src/IDirect3D/IDirect3D7.c
View File

@ -1,15 +1,6 @@
#include <intrin.h>
#include "IDirect3D.h" #include "IDirect3D.h"
#include "debug.h" #include "debug.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirect3D7__QueryInterface(IDirect3D7Impl* This, REFIID riid, void** obj) HRESULT __stdcall IDirect3D7__QueryInterface(IDirect3D7Impl* This, REFIID riid, void** obj)
{ {

10
src/IDirectDraw/IDirectDraw.c
View File

@ -1,6 +1,5 @@
#include <windows.h> #include <windows.h>
#include <initguid.h> #include <initguid.h>
#include <intrin.h>
#include "IDirectDraw.h" #include "IDirectDraw.h"
#include "IDirect3D.h" #include "IDirect3D.h"
#include "IAMMediaStream.h" #include "IAMMediaStream.h"
@ -12,15 +11,6 @@
#include "hook.h" #include "hook.h"
#include "config.h" #include "config.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid, LPVOID FAR* ppvObj) HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid, LPVOID FAR* ppvObj)
{ {

9
src/IDirectDraw/IDirectDrawClipper.c
View File

@ -1,16 +1,7 @@
#include <intrin.h>
#include "IDirectDrawClipper.h" #include "IDirectDrawClipper.h"
#include "ddclipper.h" #include "ddclipper.h"
#include "debug.h" #include "debug.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirectDrawClipper__QueryInterface(IDirectDrawClipperImpl* This, REFIID riid, LPVOID FAR* ppvObj) HRESULT __stdcall IDirectDrawClipper__QueryInterface(IDirectDrawClipperImpl* This, REFIID riid, LPVOID FAR* ppvObj)
{ {

9
src/IDirectDraw/IDirectDrawGammaControl.c
View File

@ -1,15 +1,6 @@
#include <intrin.h>
#include "IDirectDrawGammaControl.h" #include "IDirectDrawGammaControl.h"
#include "debug.h" #include "debug.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirectDrawGammaControl__QueryInterface(IDirectDrawGammaControlImpl* This, REFIID riid, LPVOID FAR* ppvObj) HRESULT __stdcall IDirectDrawGammaControl__QueryInterface(IDirectDrawGammaControlImpl* This, REFIID riid, LPVOID FAR* ppvObj)
{ {

9
src/IDirectDraw/IDirectDrawPalette.c
View File

@ -1,17 +1,8 @@
#include <intrin.h>
#include "IDirectDrawPalette.h" #include "IDirectDrawPalette.h"
#include "ddpalette.h" #include "ddpalette.h"
#include "ddsurface.h" #include "ddsurface.h"
#include "debug.h" #include "debug.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirectDrawPalette__QueryInterface(IDirectDrawPaletteImpl* This, REFIID riid, LPVOID FAR* ppvObj) HRESULT __stdcall IDirectDrawPalette__QueryInterface(IDirectDrawPaletteImpl* This, REFIID riid, LPVOID FAR* ppvObj)
{ {

9
src/IDirectDraw/IDirectDrawSurface.c
View File

@ -1,4 +1,3 @@
#include <intrin.h>
#include <initguid.h> #include <initguid.h>
#include "IDirectDrawSurface.h" #include "IDirectDrawSurface.h"
#include "IDirectDrawGammaControl.h" #include "IDirectDrawGammaControl.h"
@ -6,14 +5,6 @@
#include "dd.h" #include "dd.h"
#include "debug.h" #include "debug.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
HRESULT __stdcall IDirectDrawSurface__QueryInterface(IDirectDrawSurfaceImpl* This, REFIID riid, LPVOID FAR* ppvObj) HRESULT __stdcall IDirectDrawSurface__QueryInterface(IDirectDrawSurfaceImpl* This, REFIID riid, LPVOID FAR* ppvObj)
{ {

10
src/directinput.c
View File

@ -1,6 +1,5 @@
#include <windows.h> #include <windows.h>
#include <initguid.h> #include <initguid.h>
#include <intrin.h>
#include "directinput.h" #include "directinput.h"
#include "debug.h" #include "debug.h"
#include "hook.h" #include "hook.h"
@ -8,15 +7,6 @@
#include "mouse.h" #include "mouse.h"
#include "config.h" #include "config.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
#ifdef _MSC_VER #ifdef _MSC_VER
#include "detours.h" #include "detours.h"
#endif #endif

34
src/utils.c
View File

@ -155,6 +155,40 @@ void util_limit_game_ticks()
if (GetCurrentThreadId() != g_ddraw.gui_thread_id) if (GetCurrentThreadId() != g_ddraw.gui_thread_id)
return; return;
/*
static void (WINAPI * getSystemTimePreciseAsFileTime)(LPFILETIME);
if (!getSystemTimePreciseAsFileTime)
{
getSystemTimePreciseAsFileTime = GetProcAddress(LoadLibraryA("Kernel32.dll"), "GetSystemTimePreciseAsFileTime");
//if (!getSystemTimePreciseAsFileTime)
// getSystemTimePreciseAsFileTime = GetSystemTimeAsFileTime;
}
if (1)
{
FILETIME ft = { 0 };
getSystemTimePreciseAsFileTime(&ft);
if (CompareFileTime((FILETIME*)&g_ddraw.ticks_limiter.due_time, &ft) == -1)
{
memcpy(&g_ddraw.ticks_limiter.due_time, &ft, sizeof(LARGE_INTEGER));
}
else
{
while (TRUE)
{
getSystemTimePreciseAsFileTime(&ft);
if (CompareFileTime((FILETIME*)&g_ddraw.ticks_limiter.due_time, &ft) <= 0)
break;
}
}
g_ddraw.ticks_limiter.due_time.QuadPart += g_ddraw.ticks_limiter.tick_length_ns;
}
else */
if (g_ddraw.ticks_limiter.htimer) if (g_ddraw.ticks_limiter.htimer)
{ {
FILETIME ft = { 0 }; FILETIME ft = { 0 };

9
src/winapi_hooks.c
View File

@ -1,7 +1,6 @@
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#include <math.h> #include <math.h>
#include <intrin.h>
#include "debug.h" #include "debug.h"
#include "config.h" #include "config.h"
#include "dd.h" #include "dd.h"
@ -20,14 +19,6 @@
#include "hook.h" #include "hook.h"
#include "directinput.h" #include "directinput.h"
#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
#undef _ReturnAddress
#undef _AddressOfReturnAddress
#define _ReturnAddress() __builtin_return_address(0)
#define _AddressOfReturnAddress() __builtin_frame_address (0)
#else
#pragma intrinsic(_ReturnAddress)
#endif /* __GNUC__ */
BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint) BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint)
{ {