From 906ef5ebe2d221a1487132f991e0eb80758f8396 Mon Sep 17 00:00:00 2001 From: narzoul Date: Fri, 16 Nov 2018 21:15:11 +0100 Subject: [PATCH] Added ReleaseWithDebugLogs configuration --- .gitignore | 262 +++++++++++++++++++++++++++++ DDrawCompat.sln | 37 ++++ DDrawCompat/Common/CompatVtable.h | 4 +- DDrawCompat/Common/Log.h | 2 +- DDrawCompat/Common/VtableVisitor.h | 2 +- DDrawCompat/DDrawCompat.vcxproj | 71 +++++++- DDrawCompat/Gdi/DcFunctions.cpp | 4 +- 7 files changed, 375 insertions(+), 7 deletions(-) create mode 100644 .gitignore create mode 100644 DDrawCompat.sln diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..24a599d --- /dev/null +++ b/.gitignore @@ -0,0 +1,262 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +[Rr]eleaseWithDebugLogs/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +project.fragment.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +#*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc \ No newline at end of file diff --git a/DDrawCompat.sln b/DDrawCompat.sln new file mode 100644 index 0000000..c6a755f --- /dev/null +++ b/DDrawCompat.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2003 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDrawCompat", "DDrawCompat\DDrawCompat.vcxproj", "{1146187A-17DE-4350-B9D1-9F9EAA934908}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + ReleaseWithDebugLogs|x64 = ReleaseWithDebugLogs|x64 + ReleaseWithDebugLogs|x86 = ReleaseWithDebugLogs|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1146187A-17DE-4350-B9D1-9F9EAA934908}.Debug|x64.ActiveCfg = Debug|x64 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.Debug|x64.Build.0 = Debug|x64 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.Debug|x86.ActiveCfg = Debug|Win32 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.Debug|x86.Build.0 = Debug|Win32 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.Release|x64.ActiveCfg = Release|x64 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.Release|x64.Build.0 = Release|x64 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.Release|x86.ActiveCfg = Release|Win32 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.Release|x86.Build.0 = Release|Win32 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.ReleaseWithDebugLogs|x64.ActiveCfg = ReleaseWithDebugLogs|x64 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.ReleaseWithDebugLogs|x64.Build.0 = ReleaseWithDebugLogs|x64 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.ReleaseWithDebugLogs|x86.ActiveCfg = ReleaseWithDebugLogs|Win32 + {1146187A-17DE-4350-B9D1-9F9EAA934908}.ReleaseWithDebugLogs|x86.Build.0 = ReleaseWithDebugLogs|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {16E8A635-0B37-472B-90BC-A9FAE6FADA1B} + EndGlobalSection +EndGlobal diff --git a/DDrawCompat/Common/CompatVtable.h b/DDrawCompat/Common/CompatVtable.h index 86e73e1..633db74 100644 --- a/DDrawCompat/Common/CompatVtable.h +++ b/DDrawCompat/Common/CompatVtable.h @@ -136,7 +136,7 @@ private: static Result STDMETHODCALLTYPE threadSafeFunc(FirstParam firstParam, Params... params) { DDraw::ScopedThreadLock lock; -#ifdef _DEBUG +#ifdef DEBUGLOGS const char* funcName = s_funcNames[getKey()].c_str(); LOG_FUNC(funcName, firstParam, params...); return LOG_RESULT(Hook::getCompatFunc(firstParam)(firstParam, params...)); @@ -149,7 +149,7 @@ private: static void STDMETHODCALLTYPE threadSafeFunc(FirstParam firstParam, Params... params) { DDraw::ScopedThreadLock lock; -#ifdef _DEBUG +#ifdef DEBUGLOGS const char* funcName = s_funcNames[getKey()].c_str(); LOG_FUNC(funcName, firstParam, params...); Hook::getCompatFunc(firstParam)(firstParam, params...); diff --git a/DDrawCompat/Common/Log.h b/DDrawCompat/Common/Log.h index d5c1273..b38263e 100644 --- a/DDrawCompat/Common/Log.h +++ b/DDrawCompat/Common/Log.h @@ -200,7 +200,7 @@ namespace Compat ~LogStruct() { m_os << '}'; } }; -#ifdef _DEBUG +#ifdef DEBUGLOGS typedef Log LogDebug; class LogFunc diff --git a/DDrawCompat/Common/VtableVisitor.h b/DDrawCompat/Common/VtableVisitor.h index ef4906f..269c732 100644 --- a/DDrawCompat/Common/VtableVisitor.h +++ b/DDrawCompat/Common/VtableVisitor.h @@ -23,7 +23,7 @@ std::string getTypeName() return typeName; } -#ifdef _DEBUG +#ifdef DEBUGLOGS #define DD_VISIT(member) \ visitor.visitDebug(getTypeName(), #member) #else diff --git a/DDrawCompat/DDrawCompat.vcxproj b/DDrawCompat/DDrawCompat.vcxproj index 2f19f50..9160792 100644 --- a/DDrawCompat/DDrawCompat.vcxproj +++ b/DDrawCompat/DDrawCompat.vcxproj @@ -5,6 +5,14 @@ Debug Win32 + + ReleaseWithDebugLogs + Win32 + + + ReleaseWithDebugLogs + x64 + Release Win32 @@ -37,6 +45,12 @@ v141 NotSet + + DynamicLibrary + false + v141 + NotSet + DynamicLibrary true @@ -50,6 +64,13 @@ true Unicode + + DynamicLibrary + false + v141 + true + Unicode + @@ -61,12 +82,18 @@ + + + + + + ddraw @@ -82,15 +109,23 @@ $(ProjectDir);C:\Program Files %28x86%29\Microsoft Research\Detours Express 3.0\include;$(IncludePath) C:\Program Files %28x86%29\Microsoft Research\Detours Express 3.0\lib.X86;$(LibraryPath) + + ddraw + $(ProjectDir);C:\Program Files %28x86%29\Microsoft Research\Detours Express 3.0\include;$(IncludePath) + C:\Program Files %28x86%29\Microsoft Research\Detours Express 3.0\lib.X86;$(LibraryPath) + false + + false + Level4 - CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions) + DEBUGLOGS;CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDebug true false @@ -132,6 +167,22 @@ No + + + + + Level4 + DEBUGLOGS;CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + $(IntDir)%(RelativeDir) + + + Dll/DDrawCompat.def + dxguid.lib;detours.lib;msimg32.lib;oleacc.lib;psapi.lib;uxtheme.lib;dwmapi.lib;winmm.lib;%(AdditionalDependencies) + No + + Level3 @@ -150,6 +201,24 @@ DDrawCompat.def + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + DDrawCompat.def + + diff --git a/DDrawCompat/Gdi/DcFunctions.cpp b/DDrawCompat/Gdi/DcFunctions.cpp index b34e4f9..66f915c 100644 --- a/DDrawCompat/Gdi/DcFunctions.cpp +++ b/DDrawCompat/Gdi/DcFunctions.cpp @@ -97,7 +97,7 @@ namespace template Result WINAPI compatGdiDcFunc(Params... params) { -#ifdef _DEBUG +#ifdef DEBUGLOGS LOG_FUNC(g_funcNames[origFunc], params...); #else LOG_FUNC("", params...); @@ -234,7 +234,7 @@ namespace template void hookGdiDcFunction(const char* moduleName, const char* funcName) { -#ifdef _DEBUG +#ifdef DEBUGLOGS g_funcNames[origFunc] = funcName; #endif