Removed unused options

DivaGL.sln

@@ -12,27 +12,17 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
-		DebugDLL|x64 = DebugDLL|x64
 		Release|x64 = Release|x64
-		ReleaseDLL|x64 = ReleaseDLL|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{65707AD3-568A-4FE9-A75E-BDBF3D5EFC88}.Debug|x64.ActiveCfg = DebugOpt|x64
 		{65707AD3-568A-4FE9-A75E-BDBF3D5EFC88}.Debug|x64.Build.0 = DebugOpt|x64
-		{65707AD3-568A-4FE9-A75E-BDBF3D5EFC88}.DebugDLL|x64.ActiveCfg = DebugOpt|x64
-		{65707AD3-568A-4FE9-A75E-BDBF3D5EFC88}.DebugDLL|x64.Build.0 = DebugOpt|x64
 		{65707AD3-568A-4FE9-A75E-BDBF3D5EFC88}.Release|x64.ActiveCfg = Release|x64
 		{65707AD3-568A-4FE9-A75E-BDBF3D5EFC88}.Release|x64.Build.0 = Release|x64
-		{65707AD3-568A-4FE9-A75E-BDBF3D5EFC88}.ReleaseDLL|x64.ActiveCfg = Release|x64
-		{65707AD3-568A-4FE9-A75E-BDBF3D5EFC88}.ReleaseDLL|x64.Build.0 = Release|x64
 		{4D949362-9095-4113-9423-7E0492618F16}.Debug|x64.ActiveCfg = Debug|x64
 		{4D949362-9095-4113-9423-7E0492618F16}.Debug|x64.Build.0 = Debug|x64
-		{4D949362-9095-4113-9423-7E0492618F16}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
-		{4D949362-9095-4113-9423-7E0492618F16}.DebugDLL|x64.Build.0 = DebugDLL|x64
 		{4D949362-9095-4113-9423-7E0492618F16}.Release|x64.ActiveCfg = Release|x64
 		{4D949362-9095-4113-9423-7E0492618F16}.Release|x64.Build.0 = Release|x64
-		{4D949362-9095-4113-9423-7E0492618F16}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
-		{4D949362-9095-4113-9423-7E0492618F16}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/DivaGL/DivaGL.vcxproj

@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -31,24 +23,12 @@
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
@@ -56,15 +36,9 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -73,13 +47,6 @@
     <IntDir>$(SolutionDir)obj\debug\DivaGL\</IntDir>
     <TargetExt>.dva</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>dinput8</TargetName>
-    <OutDir>$(SolutionDir)bin\</OutDir>
-    <IntDir>$(SolutionDir)obj\debug\DivaGL\</IntDir>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>DivaGL</TargetName>
@@ -87,13 +54,6 @@
     <IntDir>$(SolutionDir)obj\release\DivaGL\</IntDir>
     <TargetExt>.dva</TargetExt>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>dinput8</TargetName>
-    <OutDir>$(SolutionDir)bin\</OutDir>
-    <IntDir>$(SolutionDir)obj\release\DivaGL\</IntDir>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -125,45 +85,7 @@
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(SolutionDir)bin\$(TargetName).dva" "N:\DUMP\plugins\$(TargetName).dva"
-copy /Y "$(SolutionDir)bin\$(TargetName).pdb" "N:\DUMP\plugins\$(TargetName).pdb"
-del "$(SolutionDir)bin\$(TargetName).exp"
-del "$(SolutionDir)bin\$(TargetName).lib"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;DINPUT8_DLL;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)extern\src</AdditionalIncludeDirectories>
-      <ConformanceMode>true</ConformanceMode>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OmitFramePointers>false</OmitFramePointers>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <CallingConvention>FastCall</CallingConvention>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <UseFullPaths>false</UseFullPaths>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(SolutionDir)extern\lib;$(SolutionDir)lib\debugopt\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>opengl32.lib;detours.lib;syelog.lib;libdeflatestatic.lib;KKdLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>/ignore:4098 /ignore:4099 /ignore:4286 %(AdditionalOptions)</AdditionalOptions>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy /Y "$(SolutionDir)bin\$(TargetName).dll" "N:\DUMP\$(TargetName).dll"
-copy /Y "$(SolutionDir)bin\$(TargetName).pdb" "N:\DUMP\$(TargetName).pdb"
-del "$(SolutionDir)bin\$(TargetName).exp"
-del "$(SolutionDir)bin\$(TargetName).lib"</Command>
+copy /Y "$(SolutionDir)bin\$(TargetName).pdb" "N:\DUMP\plugins\$(TargetName).pdb"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -204,52 +126,7 @@ del "$(SolutionDir)bin\$(TargetName).lib"</Command>
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(SolutionDir)bin\$(TargetName).dva" "N:\DUMP\plugins\$(TargetName).dva"
-copy /Y "$(SolutionDir)bin\$(TargetName).pdb" "N:\DUMP\plugins\$(TargetName).pdb"
-del "$(SolutionDir)bin\$(TargetName).exp"
-del "$(SolutionDir)bin\$(TargetName).lib"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>WIN32;DINPUT8_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)extern\src</AdditionalIncludeDirectories>
-      <ConformanceMode>true</ConformanceMode>
-      <OmitFramePointers>false</OmitFramePointers>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <CallingConvention>FastCall</CallingConvention>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <FunctionLevelLinking>
-      </FunctionLevelLinking>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <RuntimeTypeInfo>
-      </RuntimeTypeInfo>
-      <UseFullPaths>false</UseFullPaths>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(SolutionDir)extern\lib;$(SolutionDir)lib\release\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>opengl32.lib;detours.lib;syelog.lib;libdeflatestatic.lib;KKdLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions>/ignore:4098 /ignore:4099 /ignore:4286 %(AdditionalOptions)</AdditionalOptions>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy /Y "$(SolutionDir)bin\$(TargetName).dll" "N:\DUMP\$(TargetName).dll"
-copy /Y "$(SolutionDir)bin\$(TargetName).pdb" "N:\DUMP\$(TargetName).pdb"
-del "$(SolutionDir)bin\$(TargetName).exp"
-del "$(SolutionDir)bin\$(TargetName).lib"</Command>
+copy /Y "$(SolutionDir)bin\$(TargetName).pdb" "N:\DUMP\plugins\$(TargetName).pdb"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

src/DivaGL/DivaGL.vcxproj.user

@@ -6,24 +6,12 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerCommandArguments>--launch -w</LocalDebuggerCommandArguments>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <LocalDebuggerCommand>N:\DUMP\diva.exe</LocalDebuggerCommand>
-    <LocalDebuggerWorkingDirectory>N:\DUMP</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>--launch -w</LocalDebuggerCommandArguments>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LocalDebuggerCommand>N:\DUMP\diva.exe</LocalDebuggerCommand>
     <LocalDebuggerCommandArguments>--launch -w</LocalDebuggerCommandArguments>
     <LocalDebuggerWorkingDirectory>N:\DUMP</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-    <LocalDebuggerCommand>N:\DUMP\diva.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>--launch -w</LocalDebuggerCommandArguments>
-    <LocalDebuggerWorkingDirectory>N:\DUMP</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
   <PropertyGroup>
     <ShowAllFiles>true</ShowAllFiles>
   </PropertyGroup>

src/DivaGL/dllmain.cpp

@@ -19,61 +19,6 @@ size_t dll_handle;
 bool aes_ni;
 bool f16c;
 
-#if defined(DINPUT8_DLL)
-struct dinput8 {
-    HMODULE dll;
-    HRESULT(*DirectInput8Create)(HINSTANCE hinst,
-        DWORD dwVersion, REFIID riidltf, LPVOID* ppvOut, LPUNKNOWN punkOuter);
-
-    void LoadOriginalLibrary(HMODULE module) {
-        dll = module;
-        DirectInput8Create = (HRESULT(*)(HINSTANCE hinst, DWORD dwVersion,
-            REFIID riidltf, LPVOID * ppvOut, LPUNKNOWN punkOuter))GetProcAddress(dll, "DirectInput8Create");
-    }
-} dinput8;
-
-extern "C" __declspec(dllexport) HRESULT DirectInput8Create(HINSTANCE hinst,
-    DWORD dwVersion, REFIID riidltf, LPVOID * ppvOut, LPUNKNOWN punkOuter) {
-    if (!dinput8.DirectInput8Create)
-        return (HRESULT)0x80000002;
-    return dinput8.DirectInput8Create(hinst, dwVersion, riidltf, ppvOut, punkOuter);
-}
-
-void load_original_dll() {
-    wchar_t dll_file_path[MAX_PATH];
-    GetModuleFileNameW((HMODULE)dll_handle, dll_file_path, MAX_PATH);
-
-    wchar_t* dll_file_name = wcsrchr(dll_file_path, '\\');
-    if (!dll_file_name)
-        dll_file_name = wcsrchr(dll_file_path, '/');
-
-    if (!dll_file_name)
-        return;
-
-    dll_file_name++;
-
-    _wcslwr_s(dll_file_name, MAX_PATH - (dll_file_name - dll_file_path));
-
-    wchar_t* sys_folder;
-    if (dll_file_name && SUCCEEDED(SHGetKnownFolderPath(FOLDERID_System, 0, 0, &sys_folder))) {
-        size_t dll_path_len = wcslen(sys_folder) + wcslen(dll_file_name) + 2;
-        wchar_t* dll_path = (wchar_t*)malloc(sizeof(wchar_t) * dll_path_len);
-        if (dll_path) {
-            wcscpy_s(dll_path, dll_path_len, sys_folder);
-            wcscat_s(dll_path, dll_path_len, L"\\");
-            wcscat_s(dll_path, dll_path_len, dll_file_name);
-            if (!wcscmp(dll_file_name, L"dinput8.dll")) {
-                HMODULE dinput8_handle = LoadLibraryW(dll_path);
-                if (dinput8_handle)
-                    dinput8.LoadOriginalLibrary(dinput8_handle);
-            }
-            free(dll_path);
-        }
-        CoTaskMemFree((LPVOID)sys_folder);
-    }
-}
-#endif
-
 void FASTCALL divagl_main() {
     int32_t cpuid_data[4] = {};
     __cpuid(cpuid_data, 1);
@@ -91,15 +36,6 @@ void FASTCALL divagl_main() {
         return;
     }
 
-#if defined(DINPUT8_DLL)
-    load_original_dll();
-    LoadLibraryW(L"plugins\\DivaSound.dva");
-    LoadLibraryW(L"plugins\\Patches.dva");
-    LoadLibraryW(L"plugins\\TLAC.dva");
-#endif
-    //Sleep(5000);
-    //return;
-
     wrap_addresses();
 
     printf_divagl("Patching memory");
@@ -110,14 +46,6 @@ void FASTCALL divagl_main() {
 bool APIENTRY DllMain(HMODULE handle, DWORD ul_reason_for_call, LPVOID lpReserved) {
     switch (ul_reason_for_call) {
     case DLL_PROCESS_ATTACH:
-        /*if (!GetConsoleWindow())
-            AllocConsole();
-
-        FILE* f_stdin = 0;
-        FILE* f_stdout = 0;
-        freopen_s(&f_stdin, "CONIN$", "r", stdin);
-        freopen_s(&f_stdout, "CONOUT$", "w", stdout);*/
-
         dll_handle = (size_t)handle;
         printf_divagl("Current version - v0.5.2.0");
         printf_divagl("Attach");