Remove dxwnd

elishacloud · May 10, 2024 · d8eb17b · d8eb17b
1 parent 69e4e96
commit d8eb17b
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 574 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7013 
+#define BUILD_NUMBER 7014 
diff --git a/Dllmain/Dllmain.cpp b/Dllmain/Dllmain.cpp
@@ -24,7 +24,6 @@
 #ifdef DDRAWCOMPAT
 #include "DDrawCompat\DDrawCompatExternal.h"
 #endif // DDRAWCOMPAT
-#include "DxWnd\DxWndExternal.h"
 #include "Utils\Utils.h"
 #include "Logging\Logging.h"
 // Wrappers last
@@ -521,23 +520,6 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
 			VISIT_PROCS_D3D9(SHIM_WRAPPED_PROC);
 		}
 
-		// Start DxWnd module
-		if (Config.DxWnd)
-		{
-			// Check if dxwnd.dll exists then load it
-			HMODULE dxwnd_dll = LoadLibrary("dxwnd.dll");
-			if (dxwnd_dll)
-			{
-				Logging::Log() << "Loading DxWnd " << _TO_STRING(APP_DXWNDVERSION);
-				InitDxWnd(dxwnd_dll);
-			}
-			// If dxwnd.dll does not exist than disable dxwnd setting
-			else
-			{
-				Config.DxWnd = false;
-			}
-		}
-
 		// Load custom dlls
 		if (Config.LoadCustomDllPath.size() != 0)
 		{
@@ -616,13 +598,6 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
 		Fullscreen::StopThread();
 		WriteMemory::StopThread();
 
-		// Unload and Unhook DxWnd
-		if (Config.DxWnd)
-		{
-			Logging::Log() << "Unloading DxWnd";
-			DxWndEndHook();
-		}
-
 #ifdef DDRAWCOMPAT
 		// Unload and Unhook DDrawCompat
 		if (DDrawCompat::IsEnabled())

diff --git a/Dllmain/dxwrapper.h b/Dllmain/dxwrapper.h
@@ -2,11 +2,6 @@
 // Microsoft Visual C++ generated include file.
 // Used by dxwrapper.rc
 
-#ifdef DXWND
-#ifndef DXWND_H
-#include "DxWnd\v2_03_60_src\dxwnd.h"
-#endif
-#endif
 #include "Dllmain\BuildNo.rc"
 
 // Main resource file details
@@ -27,16 +22,6 @@
 #define APP_VERSION _TO_STRING(APP_MAJOR) "." _TO_STRING(APP_MINOR) "." _TO_STRING(APP_BUILDNUMBER) "." _TO_STRING(APP_REVISION)
 #define VERSION_NUMBER APP_MAJOR, APP_MINOR, APP_BUILDNUMBER, APP_REVISION
 
-#ifdef DXWND
-//Verify defintions exist in dxwnd.h
-#ifndef APP_DXWNDNAME
-#include "Missing APP_DXWNDNAME definition in dxwnd.h file"
-#endif
-#ifndef APP_DXWNDVERSION
-#include "Missing APP_DXWNDVERSION definition in dxwnd.h file"
-#endif
-#endif
-
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED

diff --git a/DxWnd/DxWndExternal.h b/DxWnd/DxWndExternal.h
diff --git a/DxWnd/License.txt b/DxWnd/License.txt
diff --git a/DxWnd/v2_03_60_src/License.txt b/DxWnd/v2_03_60_src/License.txt
diff --git a/DxWnd/v2_03_60_src/dxwnd.h b/DxWnd/v2_03_60_src/dxwnd.h
diff --git a/DxWnd/v2_03_60_src/init.cpp b/DxWnd/v2_03_60_src/init.cpp
diff --git a/README.md b/README.md
@@ -13,7 +13,6 @@ DxWrapper has many features including:
 
  - Integration of [DDrawCompat](https://github.com/narzoul/DDrawCompat/)
  - Configuring DDrawCompat options to improve compatibility
- - Proxy for [DxWnd](https://sourceforge.net/projects/dxwnd/)
  - Conversion of DirectDraw 1-6 to DirectDraw 7
  - Conversion of Direct3D 1-6 to Direct3D 7
  - Conversion of DirectDraw 1-7 (ddraw.dll) to Direct3D 9 (d3d9.dll) using [Dd7to9](https://github.com/elishacloud/dxwrapper/wiki/DirectDraw-to-Direct3D9-Conversion)

diff --git a/Resources/dxwnd.dll b/Resources/dxwnd.dll
diff --git a/Resources/dxwnd.exe b/Resources/dxwnd.exe
diff --git a/Settings/AllSettings.ini b/Settings/AllSettings.ini
@@ -23,7 +23,6 @@ DDrawCompat                = 0
 Dinputto8                  = 0
 DisableHighDPIScaling      = 0
 DisableGameUX              = 0
-DxWnd                      = 0
 EnableDdrawWrapper         = 0
 EnableD3d9Wrapper          = 0
 EnableDinput8Wrapper       = 0

diff --git a/Settings/Settings.h b/Settings/Settings.h
@@ -59,7 +59,6 @@
 	visit(DisableHighDPIScaling) \
 	visit(DisableLogging) \
 	visit(DirectShowEmulation) \
-	visit(DxWnd) \
 	visit(CacheClipPlane) \
 	visit(ConvertToDirectDraw7) \
 	visit(ConvertToDirect3D7) \
@@ -244,7 +243,6 @@ struct CONFIG
 	bool DisableHighDPIScaling = false;			// Disables display scaling on high DPI settings
 	bool DisableLogging = false;				// Disables the logging file
 	DWORD SetSwapEffectShim = 0;				// Disables the call to d3d9.dll 'Direct3D9SetSwapEffectUpgradeShim' to switch present mode
-	bool DxWnd = false;							// Enables DxWnd https://sourceforge.net/projects/dxwnd/
 	DWORD CacheClipPlane = 0;					// Caches the ClipPlane for Direct3D9 to fix an issue in d3d9 on Windows 8 and newer
 	bool ConvertToDirectDraw7 = false;			// Converts DirectDraw 1-6 to DirectDraw 7
 	bool ConvertToDirect3D7 = false;			// Converts Direct3D 1-6 to Direct3D 7

diff --git a/Settings/Settings.ini b/Settings/Settings.ini
@@ -22,7 +22,6 @@ D3d8to9                    = 0
 DDrawCompat                = 0
 Dinputto8                  = 0
 DisableGameUX              = 0
-DxWnd                      = 0
 EnableDdrawWrapper         = 0
 EnableD3d9Wrapper          = 0
 EnableDinput8Wrapper       = 0

diff --git a/dxwrapper.vcxproj b/dxwrapper.vcxproj
@@ -115,9 +115,7 @@
 copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\" &gt;nul
 copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\$(TargetName).asi" &gt;nul
 copy /Y "$(ProjectDir)Settings\AllSettings.ini" "$(TargetDir)Build\" &gt;nul
-copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul
-copy /Y "$(ProjectDir)Resources\dxwnd.dll" "$(TargetDir)Build\" &gt;nul
-copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command>
+copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>cmd /q /c "cd /D ""$(ProjectDir)Dllmain\"" &amp;&amp; if not exist BuildNo.rc echo #define BUILD_NUMBER 0 &gt;BuildNo.rc"
@@ -234,9 +232,7 @@ cmd /q /c "cd /D ""$(ProjectDir)d3d8\"" &amp;&amp; del build.bat"</Command>
 copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\" &gt;nul
 copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\$(TargetName).asi" &gt;nul
 copy /Y "$(ProjectDir)Settings\AllSettings.ini" "$(TargetDir)Build\" &gt;nul
-copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul
-copy /Y "$(ProjectDir)Resources\dxwnd.dll" "$(TargetDir)Build\" &gt;nul
-copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command>
+copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul</Command>
     </PostBuildEvent>
     <PreBuildEvent />
   </ItemDefinitionGroup>
@@ -265,9 +261,7 @@ copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command
 copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\" &gt;nul
 copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\$(TargetName).asi" &gt;nul
 copy /Y "$(ProjectDir)Settings\AllSettings.ini" "$(TargetDir)Build\" &gt;nul
-copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul
-copy /Y "$(ProjectDir)Resources\dxwnd.dll" "$(TargetDir)Build\" &gt;nul
-copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command>
+copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -706,7 +700,6 @@ copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command
     <ClCompile Include="dsound\IDirectSoundNotify8.cpp" />
     <ClCompile Include="dsound\IKsPropertySet.cpp" />
     <ClCompile Include="dsound\InterfaceQuery.cpp" />
-    <ClCompile Include="DxWnd\v2_03_60_src\init.cpp" />
     <ClCompile Include="External\d3d8to9\source\d3d8to9_base.cpp" />
     <ClCompile Include="External\d3d8to9\source\d3d8to9_device.cpp" />
     <ClCompile Include="External\d3d8to9\source\d3d8to9_index_buffer.cpp" />
@@ -1341,8 +1334,6 @@ copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command
     <ClInclude Include="dsound\IDirectSoundFXWavesReverb8.h" />
     <ClInclude Include="dsound\IDirectSoundNotify8.h" />
     <ClInclude Include="dsound\IKsPropertySet.h" />
-    <ClInclude Include="DxWnd\DxWndExternal.h" />
-    <ClInclude Include="DxWnd\v2_03_60_src\dxwnd.h" />
     <ClInclude Include="External\d3d8to9\source\d3d8to9.hpp" />
     <ClInclude Include="External\d3d8to9\source\d3d8types.hpp" />
     <ClInclude Include="External\d3d8to9\source\d3dx9.hpp" />

diff --git a/dxwrapper.vcxproj.filters b/dxwrapper.vcxproj.filters
@@ -4,9 +4,6 @@
     <Filter Include="DDrawCompat">
       <UniqueIdentifier>{bf6f3d22-aab2-413e-af84-ee52035f125f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="DxWnd">
-      <UniqueIdentifier>{e266cd78-1c44-4ae4-83ae-9a0b7b6a3d53}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Disasm">
       <UniqueIdentifier>{2768b966-6a71-4031-9b49-a1b7dec51afb}</UniqueIdentifier>
     </Filter>
@@ -41,9 +38,6 @@
     <Filter Include="DDrawCompat\v0.2.0b">
       <UniqueIdentifier>{bc571ee9-1289-4d58-986c-d0206ec8997a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="DxWnd\v2_03_60_src">
-      <UniqueIdentifier>{8e05201f-e493-4a94-b533-2b60fb0aba68}</UniqueIdentifier>
-    </Filter>
     <Filter Include="ddraw\Versions">
       <UniqueIdentifier>{f484f6f8-618e-41ab-9fe4-6034ff843072}</UniqueIdentifier>
     </Filter>
@@ -220,9 +214,6 @@
     <ClCompile Include="d3d9\InterfaceQuery.cpp">
       <Filter>d3d9</Filter>
     </ClCompile>
-    <ClCompile Include="DxWnd\v2_03_60_src\init.cpp">
-      <Filter>DxWnd\v2_03_60_src</Filter>
-    </ClCompile>
     <ClCompile Include="DDrawCompat\DDrawCompatExternal.cpp">
       <Filter>DDrawCompat</Filter>
     </ClCompile>
@@ -1064,18 +1055,12 @@
     <ClInclude Include="Wrappers\winmm.h">
       <Filter>Wrappers</Filter>
     </ClInclude>
-    <ClInclude Include="DxWnd\DxWndExternal.h">
-      <Filter>DxWnd</Filter>
-    </ClInclude>
     <ClInclude Include="DDrawCompat\DDrawCompatExternal.h">
       <Filter>DDrawCompat</Filter>
     </ClInclude>
     <ClInclude Include="DDrawCompat\DDrawLog.h">
       <Filter>DDrawCompat</Filter>
     </ClInclude>
-    <ClInclude Include="DxWnd\v2_03_60_src\dxwnd.h">
-      <Filter>DxWnd\v2_03_60_src</Filter>
-    </ClInclude>
     <ClInclude Include="DDrawCompat\v0.2.1\CompatActivateAppHandler.h">
       <Filter>DDrawCompat\v0.2.1</Filter>
     </ClInclude>