From 594cc4d8da87a572abe447bdbb496518958d6a71 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Thu, 10 Aug 2023 14:41:42 +0200 Subject: [PATCH] add DebugLogMini build config --- cnc-ddraw.sln | 7 ++++-- cnc-ddraw.vcxproj | 47 +++++++++++++++++++++++++++++++++++ cnc-ddraw.vcxproj.filters | 5 ---- src/IDirectDraw/IDirectDraw.c | 4 +-- src/dd.c | 2 +- src/ddsurface.c | 6 ++--- src/debug.c | 4 +-- src/winapi_hooks.c | 6 ++--- 8 files changed, 63 insertions(+), 18 deletions(-) diff --git a/cnc-ddraw.sln b/cnc-ddraw.sln index 317ca47..ab7f479 100644 --- a/cnc-ddraw.sln +++ b/cnc-ddraw.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30503.244 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33829.357 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cnc-ddraw", "cnc-ddraw.vcxproj", "{96094551-5D52-4EBD-BE4C-5291A03507FC}" EndProject @@ -9,6 +9,7 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 DebugLog|x86 = DebugLog|x86 + DebugLogMini|x86 = DebugLogMini|x86 Release|x86 = Release|x86 ReleaseWin2000|x86 = ReleaseWin2000|x86 EndGlobalSection @@ -17,6 +18,8 @@ Global {96094551-5D52-4EBD-BE4C-5291A03507FC}.Debug|x86.Build.0 = Debug|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLog|x86.ActiveCfg = DebugLog|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLog|x86.Build.0 = DebugLog|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLogMini|x86.ActiveCfg = DebugLogMini|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLogMini|x86.Build.0 = DebugLogMini|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.Release|x86.ActiveCfg = Release|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.Release|x86.Build.0 = Release|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.ReleaseWin2000|x86.ActiveCfg = ReleaseWin2000|Win32 diff --git a/cnc-ddraw.vcxproj b/cnc-ddraw.vcxproj index a6e3b55..6fa674b 100644 --- a/cnc-ddraw.vcxproj +++ b/cnc-ddraw.vcxproj @@ -1,6 +1,10 @@  + + DebugLogMini + Win32 + DebugLog Win32 @@ -142,6 +146,13 @@ true MultiByte + + DynamicLibrary + false + v141_xp + true + MultiByte + @@ -160,6 +171,9 @@ + + + $(SolutionDir)bin\Debug\ @@ -185,6 +199,12 @@ false ddraw + + $(SolutionDir)bin\DebugLogMini\ + $(SolutionDir)bin\DebugLogMini\ + false + ddraw + @@ -290,6 +310,33 @@ if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ( copy "$(TargetPath)" "$(LocalDebuggerWorkingDirectory)$(TargetFileName)" ) + + + + + + Level2 + + + MaxSpeed + true + true + _DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + inc;src\detours + + + Windows + true + true + dbghelp.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ddraw.def + + + +if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ( + copy "$(TargetPath)" "$(LocalDebuggerWorkingDirectory)$(TargetFileName)" +) diff --git a/cnc-ddraw.vcxproj.filters b/cnc-ddraw.vcxproj.filters index 145a53f..39187f8 100644 --- a/cnc-ddraw.vcxproj.filters +++ b/cnc-ddraw.vcxproj.filters @@ -272,9 +272,4 @@ Resource Files - - - Source Files - - \ No newline at end of file diff --git a/src/IDirectDraw/IDirectDraw.c b/src/IDirectDraw/IDirectDraw.c index 45296dd..3bf3861 100644 --- a/src/IDirectDraw/IDirectDraw.c +++ b/src/IDirectDraw/IDirectDraw.c @@ -483,9 +483,9 @@ HRESULT __stdcall IDirectDraw__TestCooperativeLevel(IDirectDrawImpl* This) HRESULT __stdcall IDirectDraw__GetDeviceIdentifier(IDirectDrawImpl* This, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p, pDDDI=%p, dwFlags=%08X)\n", __FUNCTION__, This, pDDDI, dwFlags); + TRACE("-> %s(This=%p, pDDDI=%p, dwFlags=%08X)\n", __FUNCTION__, This, pDDDI, dwFlags); HRESULT ret = dd_GetDeviceIdentifier((LPDDDEVICEIDENTIFIER)pDDDI, dwFlags, &This->guid); - TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); + TRACE("<- %s\n", __FUNCTION__); return ret; } diff --git a/src/dd.c b/src/dd.c index 2eb5e73..5d27aa3 100644 --- a/src/dd.c +++ b/src/dd.c @@ -129,7 +129,7 @@ HRESULT dd_EnumDisplayModes( flags == m.dmDisplayFlags && fixed_output == m.dmDisplayFixedOutput) { - TRACE_EXT( + TRACE( " %u: %ux%u@%u %u bpp\n", i, m.dmPelsWidth, diff --git a/src/ddsurface.c b/src/ddsurface.c index ead79ca..8571cd4 100644 --- a/src/ddsurface.c +++ b/src/ddsurface.c @@ -844,9 +844,9 @@ HRESULT dds_GetClipper(IDirectDrawSurfaceImpl* This, IDirectDrawClipperImpl** lp HRESULT dds_GetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKEY lpColorKey) { - if (dwFlags != DDCKEY_SRCBLT) + if (dwFlags != DDCKEY_SRCBLT || !lpColorKey) { - TRACE_EXT(" NOT_IMPLEMENTED dwFlags=%08X\n", dwFlags); + TRACE(" NOT_IMPLEMENTED dwFlags=%08X, lpColorKey=%p\n", dwFlags, lpColorKey); } if (lpColorKey) @@ -1024,7 +1024,7 @@ HRESULT dds_SetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKE { if (dwFlags != DDCKEY_SRCBLT || !lpColorKey) { - TRACE_EXT(" NOT_IMPLEMENTED dwFlags=%08X, lpColorKey=%p\n", dwFlags, lpColorKey); + TRACE(" NOT_IMPLEMENTED dwFlags=%08X, lpColorKey=%p\n", dwFlags, lpColorKey); } if (lpColorKey) diff --git a/src/debug.c b/src/debug.c index 6ac0b88..290aa63 100644 --- a/src/debug.c +++ b/src/debug.c @@ -516,7 +516,7 @@ void dbg_dump_dds_blt_fx_flags(DWORD flags) void dbg_dump_dds_caps(DWORD caps) { -#ifdef _DEBUG_X +#ifdef _DEBUG if (caps & DDSCAPS_RESERVED1) { TRACE(" DDSCAPS_RESERVED1\n"); } @@ -612,7 +612,7 @@ void dbg_dump_dds_caps(DWORD caps) void dbg_dump_dds_flags(DWORD flags) { -#ifdef _DEBUG_X +#ifdef _DEBUG if (flags & DDSD_CAPS) { TRACE(" DDSD_CAPS\n"); } diff --git a/src/winapi_hooks.c b/src/winapi_hooks.c index 0a02e09..ea0f5cf 100644 --- a/src/winapi_hooks.c +++ b/src/winapi_hooks.c @@ -909,11 +909,11 @@ HMODULE WINAPI fake_LoadLibraryA(LPCSTR lpLibFileName) { HMODULE hmod = real_LoadLibraryA(lpLibFileName); -#ifdef _DEBUG_X +#ifdef _DEBUG char mod_path[MAX_PATH] = { 0 }; if (hmod && GetModuleFileNameA(hmod, mod_path, MAX_PATH)) { - TRACE_EXT("LoadLibraryA Module %s = %p (%s)\n", mod_path, hmod, lpLibFileName); + TRACE("LoadLibraryA Module %s = %p (%s)\n", mod_path, hmod, lpLibFileName); } #endif @@ -1203,7 +1203,7 @@ HRESULT WINAPI fake_CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD { if (rclsid && riid) { - TRACE("CoCreateInstance rclsid = %08X, riid = %08X, \n", ((GUID*)rclsid)->Data1, ((GUID*)riid)->Data1); + TRACE("CoCreateInstance rclsid = %08X, riid = %08X\n", ((GUID*)rclsid)->Data1, ((GUID*)riid)->Data1); if (IsEqualGUID(&CLSID_DirectDraw, rclsid) || IsEqualGUID(&CLSID_DirectDraw7, rclsid)) {