Skip to content

Commit d8eb17b

Browse files
elishacloudelishacloud
committed
Remove dxwnd
1 parent 69e4e96 commit d8eb17b

File tree

16 files changed

+4
-574
lines changed

16 files changed

+4
-574
lines changed

‎Dllmain/BuildNo.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define BUILD_NUMBER 7013
1+
#define BUILD_NUMBER 7014

‎Dllmain/Dllmain.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#ifdef DDRAWCOMPAT
2525
#include "DDrawCompat\DDrawCompatExternal.h"
2626
#endif // DDRAWCOMPAT
27-
#include "DxWnd\DxWndExternal.h"
2827
#include "Utils\Utils.h"
2928
#include "Logging\Logging.h"
3029
// Wrappers last
@@ -521,23 +520,6 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
521520
VISIT_PROCS_D3D9(SHIM_WRAPPED_PROC);
522521
}
523522

524-
// Start DxWnd module
525-
if (Config.DxWnd)
526-
{
527-
// Check if dxwnd.dll exists then load it
528-
HMODULE dxwnd_dll = LoadLibrary("dxwnd.dll");
529-
if (dxwnd_dll)
530-
{
531-
Logging::Log() << "Loading DxWnd " << _TO_STRING(APP_DXWNDVERSION);
532-
InitDxWnd(dxwnd_dll);
533-
}
534-
// If dxwnd.dll does not exist than disable dxwnd setting
535-
else
536-
{
537-
Config.DxWnd = false;
538-
}
539-
}
540-
541523
// Load custom dlls
542524
if (Config.LoadCustomDllPath.size() != 0)
543525
{
@@ -616,13 +598,6 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
616598
Fullscreen::StopThread();
617599
WriteMemory::StopThread();
618600

619-
// Unload and Unhook DxWnd
620-
if (Config.DxWnd)
621-
{
622-
Logging::Log() << "Unloading DxWnd";
623-
DxWndEndHook();
624-
}
625-
626601
#ifdef DDRAWCOMPAT
627602
// Unload and Unhook DDrawCompat
628603
if (DDrawCompat::IsEnabled())

‎Dllmain/dxwrapper.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
// Microsoft Visual C++ generated include file.
33
// Used by dxwrapper.rc
44

5-
#ifdef DXWND
6-
#ifndef DXWND_H
7-
#include "DxWnd\v2_03_60_src\dxwnd.h"
8-
#endif
9-
#endif
105
#include "Dllmain\BuildNo.rc"
116

127
// Main resource file details
@@ -27,16 +22,6 @@
2722
#define APP_VERSION _TO_STRING(APP_MAJOR) "." _TO_STRING(APP_MINOR) "." _TO_STRING(APP_BUILDNUMBER) "." _TO_STRING(APP_REVISION)
2823
#define VERSION_NUMBER APP_MAJOR, APP_MINOR, APP_BUILDNUMBER, APP_REVISION
2924

30-
#ifdef DXWND
31-
//Verify defintions exist in dxwnd.h
32-
#ifndef APP_DXWNDNAME
33-
#include "Missing APP_DXWNDNAME definition in dxwnd.h file"
34-
#endif
35-
#ifndef APP_DXWNDVERSION
36-
#include "Missing APP_DXWNDVERSION definition in dxwnd.h file"
37-
#endif
38-
#endif
39-
4025
// Next default values for new objects
4126
//
4227
#ifdef APSTUDIO_INVOKED

‎DxWnd/DxWndExternal.h

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎DxWnd/License.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎DxWnd/v2_03_60_src/License.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎DxWnd/v2_03_60_src/dxwnd.h

Lines changed: 0 additions & 389 deletions
This file was deleted.

‎DxWnd/v2_03_60_src/init.cpp

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ DxWrapper has many features including:
1313

1414
- Integration of [DDrawCompat](https://github.com/narzoul/DDrawCompat/)
1515
- Configuring DDrawCompat options to improve compatibility
16-
- Proxy for [DxWnd](https://sourceforge.net/projects/dxwnd/)
1716
- Conversion of DirectDraw 1-6 to DirectDraw 7
1817
- Conversion of Direct3D 1-6 to Direct3D 7
1918
- Conversion of DirectDraw 1-7 (ddraw.dll) to Direct3D 9 (d3d9.dll) using [Dd7to9](https://github.com/elishacloud/dxwrapper/wiki/DirectDraw-to-Direct3D9-Conversion)

‎Resources/dxwnd.dll

-621 KB
Binary file not shown.

‎Resources/dxwnd.exe

-543 KB
Binary file not shown.

‎Settings/AllSettings.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ DDrawCompat = 0
2323
Dinputto8 = 0
2424
DisableHighDPIScaling = 0
2525
DisableGameUX = 0
26-
DxWnd = 0
2726
EnableDdrawWrapper = 0
2827
EnableD3d9Wrapper = 0
2928
EnableDinput8Wrapper = 0

‎Settings/Settings.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
visit(DisableHighDPIScaling) \
6060
visit(DisableLogging) \
6161
visit(DirectShowEmulation) \
62-
visit(DxWnd) \
6362
visit(CacheClipPlane) \
6463
visit(ConvertToDirectDraw7) \
6564
visit(ConvertToDirect3D7) \
@@ -244,7 +243,6 @@ struct CONFIG
244243
bool DisableHighDPIScaling = false; // Disables display scaling on high DPI settings
245244
bool DisableLogging = false; // Disables the logging file
246245
DWORD SetSwapEffectShim = 0; // Disables the call to d3d9.dll 'Direct3D9SetSwapEffectUpgradeShim' to switch present mode
247-
bool DxWnd = false; // Enables DxWnd https://sourceforge.net/projects/dxwnd/
248246
DWORD CacheClipPlane = 0; // Caches the ClipPlane for Direct3D9 to fix an issue in d3d9 on Windows 8 and newer
249247
bool ConvertToDirectDraw7 = false; // Converts DirectDraw 1-6 to DirectDraw 7
250248
bool ConvertToDirect3D7 = false; // Converts Direct3D 1-6 to Direct3D 7

‎Settings/Settings.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ D3d8to9 = 0
2222
DDrawCompat = 0
2323
Dinputto8 = 0
2424
DisableGameUX = 0
25-
DxWnd = 0
2625
EnableDdrawWrapper = 0
2726
EnableD3d9Wrapper = 0
2827
EnableDinput8Wrapper = 0

‎dxwrapper.vcxproj

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,7 @@
115115
copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\" &gt;nul
116116
copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\$(TargetName).asi" &gt;nul
117117
copy /Y "$(ProjectDir)Settings\AllSettings.ini" "$(TargetDir)Build\" &gt;nul
118-
copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul
119-
copy /Y "$(ProjectDir)Resources\dxwnd.dll" "$(TargetDir)Build\" &gt;nul
120-
copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command>
118+
copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul</Command>
121119
</PostBuildEvent>
122120
<PreBuildEvent>
123121
<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>
234232
copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\" &gt;nul
235233
copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\$(TargetName).asi" &gt;nul
236234
copy /Y "$(ProjectDir)Settings\AllSettings.ini" "$(TargetDir)Build\" &gt;nul
237-
copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul
238-
copy /Y "$(ProjectDir)Resources\dxwnd.dll" "$(TargetDir)Build\" &gt;nul
239-
copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command>
235+
copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul</Command>
240236
</PostBuildEvent>
241237
<PreBuildEvent />
242238
</ItemDefinitionGroup>
@@ -265,9 +261,7 @@ copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command
265261
copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\" &gt;nul
266262
copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\$(TargetName).asi" &gt;nul
267263
copy /Y "$(ProjectDir)Settings\AllSettings.ini" "$(TargetDir)Build\" &gt;nul
268-
copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul
269-
copy /Y "$(ProjectDir)Resources\dxwnd.dll" "$(TargetDir)Build\" &gt;nul
270-
copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command>
264+
copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &gt;nul</Command>
271265
</PostBuildEvent>
272266
</ItemDefinitionGroup>
273267
<ItemGroup>
@@ -706,7 +700,6 @@ copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command
706700
<ClCompile Include="dsound\IDirectSoundNotify8.cpp" />
707701
<ClCompile Include="dsound\IKsPropertySet.cpp" />
708702
<ClCompile Include="dsound\InterfaceQuery.cpp" />
709-
<ClCompile Include="DxWnd\v2_03_60_src\init.cpp" />
710703
<ClCompile Include="External\d3d8to9\source\d3d8to9_base.cpp" />
711704
<ClCompile Include="External\d3d8to9\source\d3d8to9_device.cpp" />
712705
<ClCompile Include="External\d3d8to9\source\d3d8to9_index_buffer.cpp" />
@@ -1341,8 +1334,6 @@ copy /Y "$(ProjectDir)Resources\dxwnd.exe" "$(TargetDir)Build\" &gt;nul</Command
13411334
<ClInclude Include="dsound\IDirectSoundFXWavesReverb8.h" />
13421335
<ClInclude Include="dsound\IDirectSoundNotify8.h" />
13431336
<ClInclude Include="dsound\IKsPropertySet.h" />
1344-
<ClInclude Include="DxWnd\DxWndExternal.h" />
1345-
<ClInclude Include="DxWnd\v2_03_60_src\dxwnd.h" />
13461337
<ClInclude Include="External\d3d8to9\source\d3d8to9.hpp" />
13471338
<ClInclude Include="External\d3d8to9\source\d3d8types.hpp" />
13481339
<ClInclude Include="External\d3d8to9\source\d3dx9.hpp" />

‎dxwrapper.vcxproj.filters

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<Filter Include="DDrawCompat">
55
<UniqueIdentifier>{bf6f3d22-aab2-413e-af84-ee52035f125f}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="DxWnd">
8-
<UniqueIdentifier>{e266cd78-1c44-4ae4-83ae-9a0b7b6a3d53}</UniqueIdentifier>
9-
</Filter>
107
<Filter Include="Disasm">
118
<UniqueIdentifier>{2768b966-6a71-4031-9b49-a1b7dec51afb}</UniqueIdentifier>
129
</Filter>
@@ -41,9 +38,6 @@
4138
<Filter Include="DDrawCompat\v0.2.0b">
4239
<UniqueIdentifier>{bc571ee9-1289-4d58-986c-d0206ec8997a}</UniqueIdentifier>
4340
</Filter>
44-
<Filter Include="DxWnd\v2_03_60_src">
45-
<UniqueIdentifier>{8e05201f-e493-4a94-b533-2b60fb0aba68}</UniqueIdentifier>
46-
</Filter>
4741
<Filter Include="ddraw\Versions">
4842
<UniqueIdentifier>{f484f6f8-618e-41ab-9fe4-6034ff843072}</UniqueIdentifier>
4943
</Filter>
@@ -220,9 +214,6 @@
220214
<ClCompile Include="d3d9\InterfaceQuery.cpp">
221215
<Filter>d3d9</Filter>
222216
</ClCompile>
223-
<ClCompile Include="DxWnd\v2_03_60_src\init.cpp">
224-
<Filter>DxWnd\v2_03_60_src</Filter>
225-
</ClCompile>
226217
<ClCompile Include="DDrawCompat\DDrawCompatExternal.cpp">
227218
<Filter>DDrawCompat</Filter>
228219
</ClCompile>
@@ -1064,18 +1055,12 @@
10641055
<ClInclude Include="Wrappers\winmm.h">
10651056
<Filter>Wrappers</Filter>
10661057
</ClInclude>
1067-
<ClInclude Include="DxWnd\DxWndExternal.h">
1068-
<Filter>DxWnd</Filter>
1069-
</ClInclude>
10701058
<ClInclude Include="DDrawCompat\DDrawCompatExternal.h">
10711059
<Filter>DDrawCompat</Filter>
10721060
</ClInclude>
10731061
<ClInclude Include="DDrawCompat\DDrawLog.h">
10741062
<Filter>DDrawCompat</Filter>
10751063
</ClInclude>
1076-
<ClInclude Include="DxWnd\v2_03_60_src\dxwnd.h">
1077-
<Filter>DxWnd\v2_03_60_src</Filter>
1078-
</ClInclude>
10791064
<ClInclude Include="DDrawCompat\v0.2.1\CompatActivateAppHandler.h">
10801065
<Filter>DDrawCompat\v0.2.1</Filter>
10811066
</ClInclude>

0 commit comments

Comments
 (0)