From b4ef2a1c0c3c389265a45fc3142095b47109b41a Mon Sep 17 00:00:00 2001 From: narzoul Date: Sat, 20 Feb 2021 13:39:18 +0100 Subject: [PATCH] Use angle brackets in all include directives --- DDrawCompat/Common/CompatPtr.h | 4 ++-- DDrawCompat/Common/CompatQueryInterface.h | 2 +- DDrawCompat/Common/CompatRef.h | 2 +- DDrawCompat/Common/CompatVtable.h | 2 +- DDrawCompat/Common/CompatVtableInstance.h | 8 ++++---- DDrawCompat/Common/CompatWeakPtr.h | 2 +- DDrawCompat/Common/LogWrapperVisitor.h | 4 ++-- DDrawCompat/Common/Time.cpp | 2 +- DDrawCompat/Common/VtableHookVisitor.h | 8 ++++---- DDrawCompat/D3dDdi/Adapter.cpp | 4 ++-- DDrawCompat/D3dDdi/AdapterCallbacks.cpp | 2 +- DDrawCompat/D3dDdi/AdapterCallbacks.h | 4 ++-- DDrawCompat/D3dDdi/AdapterFuncs.h | 6 +++--- DDrawCompat/D3dDdi/D3dDdiVtable.h | 10 +++++----- DDrawCompat/D3dDdi/DeviceCallbacks.cpp | 2 +- DDrawCompat/D3dDdi/DeviceCallbacks.h | 6 +++--- DDrawCompat/D3dDdi/DeviceFuncs.cpp | 4 ++-- DDrawCompat/D3dDdi/DeviceFuncs.h | 6 +++--- DDrawCompat/D3dDdi/FormatInfo.cpp | 2 +- DDrawCompat/D3dDdi/Hooks.cpp | 10 +++++----- DDrawCompat/D3dDdi/Log/AdapterFuncsLog.cpp | 4 ++-- DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.cpp | 4 ++-- .../D3dDdi/Log/KernelModeThunksLog.cpp | 4 ++-- DDrawCompat/D3dDdi/ScopedCriticalSection.cpp | 2 +- DDrawCompat/D3dDdi/ScopedCriticalSection.h | 2 +- .../D3dDdi/Visitors/AdapterCallbacksVisitor.h | 2 +- .../D3dDdi/Visitors/AdapterFuncsVisitor.h | 2 +- .../D3dDdi/Visitors/DeviceCallbacksVisitor.h | 4 ++-- .../D3dDdi/Visitors/DeviceFuncsVisitor.h | 4 ++-- DDrawCompat/DDraw/Blitter.cpp | 4 ++-- DDrawCompat/DDraw/DirectDrawClipper.h | 6 +++--- DDrawCompat/DDraw/DirectDrawGammaControl.cpp | 6 +++--- DDrawCompat/DDraw/DirectDrawGammaControl.h | 4 ++-- DDrawCompat/DDraw/DirectDrawPalette.h | 4 ++-- DDrawCompat/DDraw/DirectDrawSurface.cpp | 6 +++--- DDrawCompat/DDraw/DirectDrawSurface.h | 10 +++++----- DDrawCompat/DDraw/Hooks.cpp | 20 +++++++++---------- DDrawCompat/DDraw/Hooks.h | 2 +- DDrawCompat/DDraw/IReleaseNotifier.cpp | 2 +- DDrawCompat/DDraw/Surfaces/PrimarySurface.h | 6 +++--- .../DDraw/Surfaces/PrimarySurfaceImpl.h | 8 ++++---- DDrawCompat/DDraw/Surfaces/Surface.cpp | 12 +++++------ DDrawCompat/DDraw/Surfaces/Surface.h | 4 ++-- DDrawCompat/DDraw/Surfaces/SurfaceImpl.h | 4 ++-- .../Visitors/DirectDrawClipperVtblVisitor.h | 2 +- .../DirectDrawGammaControlVtblVisitor.h | 2 +- .../Visitors/DirectDrawPaletteVtblVisitor.h | 2 +- .../Visitors/DirectDrawSurfaceVtblVisitor.h | 2 +- .../DDraw/Visitors/DirectDrawVtblVisitor.h | 2 +- DDrawCompat/Direct3d/Direct3dTexture.cpp | 2 +- DDrawCompat/Direct3d/Direct3dVertexBuffer.cpp | 2 +- DDrawCompat/Direct3d/Direct3dViewport.cpp | 2 +- DDrawCompat/Direct3d/Hooks.h | 2 +- .../Visitors/Direct3dDeviceVtblVisitor.h | 2 +- .../Visitors/Direct3dTextureVtblVisitor.h | 2 +- .../Direct3dVertexBufferVtblVisitor.h | 2 +- .../Visitors/Direct3dViewportVtblVisitor.h | 2 +- .../Direct3d/Visitors/Direct3dVtblVisitor.h | 2 +- DDrawCompat/Gdi/VirtualScreen.h | 2 +- DDrawCompat/Win32/MsgHooks.cpp | 4 ++-- DDrawCompat/Win32/Registry.cpp | 6 +++--- 61 files changed, 128 insertions(+), 128 deletions(-) diff --git a/DDrawCompat/Common/CompatPtr.h b/DDrawCompat/Common/CompatPtr.h index 2d68f0b..6040296 100644 --- a/DDrawCompat/Common/CompatPtr.h +++ b/DDrawCompat/Common/CompatPtr.h @@ -2,8 +2,8 @@ #include -#include "Common/CompatQueryInterface.h" -#include "Common/CompatWeakPtr.h" +#include +#include template class CompatPtr : public CompatWeakPtr diff --git a/DDrawCompat/Common/CompatQueryInterface.h b/DDrawCompat/Common/CompatQueryInterface.h index 8646192..864101b 100644 --- a/DDrawCompat/Common/CompatQueryInterface.h +++ b/DDrawCompat/Common/CompatQueryInterface.h @@ -4,7 +4,7 @@ #include -#include "Common/CompatVtable.h" +#include namespace Compat { diff --git a/DDrawCompat/Common/CompatRef.h b/DDrawCompat/Common/CompatRef.h index cf23e77..ed98a7c 100644 --- a/DDrawCompat/Common/CompatRef.h +++ b/DDrawCompat/Common/CompatRef.h @@ -2,7 +2,7 @@ #include -#include "Common/CompatVtable.h" +#include template class CompatRef diff --git a/DDrawCompat/Common/CompatVtable.h b/DDrawCompat/Common/CompatVtable.h index b8fecfe..1556d62 100644 --- a/DDrawCompat/Common/CompatVtable.h +++ b/DDrawCompat/Common/CompatVtable.h @@ -1,6 +1,6 @@ #pragma once -#include "Common/CompatVtableInstance.h" +#include template using Vtable = typename std::remove_pointer::type; diff --git a/DDrawCompat/Common/CompatVtableInstance.h b/DDrawCompat/Common/CompatVtableInstance.h index 294f8b5..fff181e 100644 --- a/DDrawCompat/Common/CompatVtableInstance.h +++ b/DDrawCompat/Common/CompatVtableInstance.h @@ -1,9 +1,9 @@ #pragma once -#include "Common/LogWrapperVisitor.h" -#include "Common/VtableHookVisitor.h" -#include "Common/VtableUpdateVisitor.h" -#include "Common/VtableVisitor.h" +#include +#include +#include +#include #define SET_COMPAT_VTABLE(Vtable, CompatInterface) \ namespace Compat \ diff --git a/DDrawCompat/Common/CompatWeakPtr.h b/DDrawCompat/Common/CompatWeakPtr.h index 3ab8150..e7e5c21 100644 --- a/DDrawCompat/Common/CompatWeakPtr.h +++ b/DDrawCompat/Common/CompatWeakPtr.h @@ -2,7 +2,7 @@ #include -#include "Common/CompatVtable.h" +#include template class CompatWeakPtr diff --git a/DDrawCompat/Common/LogWrapperVisitor.h b/DDrawCompat/Common/LogWrapperVisitor.h index cf3b930..8e832af 100644 --- a/DDrawCompat/Common/LogWrapperVisitor.h +++ b/DDrawCompat/Common/LogWrapperVisitor.h @@ -1,7 +1,7 @@ #pragma once -#include "Common/FuncNameVisitor.h" -#include "Common/Log.h" +#include +#include template class LogWrapperVisitor diff --git a/DDrawCompat/Common/Time.cpp b/DDrawCompat/Common/Time.cpp index d37c095..2609803 100644 --- a/DDrawCompat/Common/Time.cpp +++ b/DDrawCompat/Common/Time.cpp @@ -1,6 +1,6 @@ #pragma once -#include "Common/Time.h" +#include namespace Time { diff --git a/DDrawCompat/Common/VtableHookVisitor.h b/DDrawCompat/Common/VtableHookVisitor.h index 28e263f..778608b 100644 --- a/DDrawCompat/Common/VtableHookVisitor.h +++ b/DDrawCompat/Common/VtableHookVisitor.h @@ -1,9 +1,9 @@ #pragma once -#include "Common/FuncNameVisitor.h" -#include "Common/Hook.h" -#include "D3dDdi/ScopedCriticalSection.h" -#include "DDraw/ScopedThreadLock.h" +#include +#include +#include +#include struct _D3DDDI_ADAPTERCALLBACKS; struct _D3DDDI_ADAPTERFUNCS; diff --git a/DDrawCompat/D3dDdi/Adapter.cpp b/DDrawCompat/D3dDdi/Adapter.cpp index ad5f6d7..978cba6 100644 --- a/DDrawCompat/D3dDdi/Adapter.cpp +++ b/DDrawCompat/D3dDdi/Adapter.cpp @@ -1,5 +1,5 @@ -#include "D3dDdi/Adapter.h" -#include "D3dDdi/AdapterFuncs.h" +#include +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/AdapterCallbacks.cpp b/DDrawCompat/D3dDdi/AdapterCallbacks.cpp index 782ff74..422d9e2 100644 --- a/DDrawCompat/D3dDdi/AdapterCallbacks.cpp +++ b/DDrawCompat/D3dDdi/AdapterCallbacks.cpp @@ -1,4 +1,4 @@ -#include "D3dDdi/AdapterCallbacks.h" +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/AdapterCallbacks.h b/DDrawCompat/D3dDdi/AdapterCallbacks.h index af9b885..3e512d3 100644 --- a/DDrawCompat/D3dDdi/AdapterCallbacks.h +++ b/DDrawCompat/D3dDdi/AdapterCallbacks.h @@ -3,8 +3,8 @@ #include #include -#include "Common/CompatVtable.h" -#include "D3dDdi/Visitors/AdapterCallbacksVisitor.h" +#include +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/AdapterFuncs.h b/DDrawCompat/D3dDdi/AdapterFuncs.h index 2021f04..fe54c0e 100644 --- a/DDrawCompat/D3dDdi/AdapterFuncs.h +++ b/DDrawCompat/D3dDdi/AdapterFuncs.h @@ -4,9 +4,9 @@ #include #include -#include "D3dDdi/D3dDdiVtable.h" -#include "D3dDdi/Log/AdapterFuncsLog.h" -#include "D3dDdi/Visitors/AdapterFuncsVisitor.h" +#include +#include +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/D3dDdiVtable.h b/DDrawCompat/D3dDdi/D3dDdiVtable.h index 5dd6bd2..76df51c 100644 --- a/DDrawCompat/D3dDdi/D3dDdiVtable.h +++ b/DDrawCompat/D3dDdi/D3dDdiVtable.h @@ -2,11 +2,11 @@ #include -#include "Common/CompatVtableInstance.h" -#include "Common/Log.h" -#include "Common/VtableVisitor.h" -#include "Config/Config.h" -#include "D3dDdi/ScopedCriticalSection.h" +#include +#include +#include +#include +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/DeviceCallbacks.cpp b/DDrawCompat/D3dDdi/DeviceCallbacks.cpp index 915bad1..001b702 100644 --- a/DDrawCompat/D3dDdi/DeviceCallbacks.cpp +++ b/DDrawCompat/D3dDdi/DeviceCallbacks.cpp @@ -1,4 +1,4 @@ -#include "D3dDdi/DeviceCallbacks.h" +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/DeviceCallbacks.h b/DDrawCompat/D3dDdi/DeviceCallbacks.h index 494e964..794d06e 100644 --- a/DDrawCompat/D3dDdi/DeviceCallbacks.h +++ b/DDrawCompat/D3dDdi/DeviceCallbacks.h @@ -3,9 +3,9 @@ #include #include -#include "Common/CompatVtable.h" -#include "D3dDdi/Log/DeviceCallbacksLog.h" -#include "D3dDdi/Visitors/DeviceCallbacksVisitor.h" +#include +#include +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/DeviceFuncs.cpp b/DDrawCompat/D3dDdi/DeviceFuncs.cpp index 4f23b42..985f83d 100644 --- a/DDrawCompat/D3dDdi/DeviceFuncs.cpp +++ b/DDrawCompat/D3dDdi/DeviceFuncs.cpp @@ -1,5 +1,5 @@ -#include "D3dDdi/Device.h" -#include "D3dDdi/DeviceFuncs.h" +#include +#include namespace { diff --git a/DDrawCompat/D3dDdi/DeviceFuncs.h b/DDrawCompat/D3dDdi/DeviceFuncs.h index ed8adad..c51286f 100644 --- a/DDrawCompat/D3dDdi/DeviceFuncs.h +++ b/DDrawCompat/D3dDdi/DeviceFuncs.h @@ -3,9 +3,9 @@ #include #include -#include "D3dDdi/D3dDdiVtable.h" -#include "D3dDdi/Log/DeviceFuncsLog.h" -#include "D3dDdi/Visitors/DeviceFuncsVisitor.h" +#include +#include +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/FormatInfo.cpp b/DDrawCompat/D3dDdi/FormatInfo.cpp index 096c6d6..61043cb 100644 --- a/DDrawCompat/D3dDdi/FormatInfo.cpp +++ b/DDrawCompat/D3dDdi/FormatInfo.cpp @@ -1,4 +1,4 @@ -#include "D3dDdi/FormatInfo.h" +#include namespace { diff --git a/DDrawCompat/D3dDdi/Hooks.cpp b/DDrawCompat/D3dDdi/Hooks.cpp index d095140..ff6e7d5 100644 --- a/DDrawCompat/D3dDdi/Hooks.cpp +++ b/DDrawCompat/D3dDdi/Hooks.cpp @@ -5,11 +5,11 @@ #include #include <..\km\d3dkmthk.h> -#include "Common/Hook.h" -#include "Common/Log.h" -#include "D3dDdi/AdapterCallbacks.h" -#include "D3dDdi/AdapterFuncs.h" -#include "D3dDdi/KernelModeThunks.h" +#include +#include +#include +#include +#include std::ostream& operator<<(std::ostream& os, const D3DDDIARG_OPENADAPTER& data) { diff --git a/DDrawCompat/D3dDdi/Log/AdapterFuncsLog.cpp b/DDrawCompat/D3dDdi/Log/AdapterFuncsLog.cpp index 97c3419..1229201 100644 --- a/DDrawCompat/D3dDdi/Log/AdapterFuncsLog.cpp +++ b/DDrawCompat/D3dDdi/Log/AdapterFuncsLog.cpp @@ -1,5 +1,5 @@ -#include "Common/Log.h" -#include "D3dDdi/Log/AdapterFuncsLog.h" +#include +#include std::ostream& operator<<(std::ostream& os, const D3DDDI_ALLOCATIONLIST& data) { diff --git a/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.cpp b/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.cpp index 9757ba0..7c686d1 100644 --- a/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.cpp +++ b/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.cpp @@ -1,5 +1,5 @@ -#include "Common/Log.h" -#include "D3dDdi/Log/DeviceCallbacksLog.h" +#include +#include std::ostream& operator<<(std::ostream& os, const D3DDDI_ALLOCATIONINFO& data) { diff --git a/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.cpp b/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.cpp index 52798fe..a604def 100644 --- a/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.cpp +++ b/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.cpp @@ -1,5 +1,5 @@ -#include "Common/Log.h" -#include "D3dDdi/Log/KernelModeThunksLog.h" +#include +#include std::ostream& operator<<(std::ostream& os, const LUID& luid) { diff --git a/DDrawCompat/D3dDdi/ScopedCriticalSection.cpp b/DDrawCompat/D3dDdi/ScopedCriticalSection.cpp index 058d386..7936075 100644 --- a/DDrawCompat/D3dDdi/ScopedCriticalSection.cpp +++ b/DDrawCompat/D3dDdi/ScopedCriticalSection.cpp @@ -1,4 +1,4 @@ -#include "D3dDdi/ScopedCriticalSection.h" +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/ScopedCriticalSection.h b/DDrawCompat/D3dDdi/ScopedCriticalSection.h index 9e660b3..b3bf370 100644 --- a/DDrawCompat/D3dDdi/ScopedCriticalSection.h +++ b/DDrawCompat/D3dDdi/ScopedCriticalSection.h @@ -1,6 +1,6 @@ #pragma once -#include "Common/ScopedCriticalSection.h" +#include namespace D3dDdi { diff --git a/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h b/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h index c4bda80..bab2820 100644 --- a/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h +++ b/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h @@ -3,7 +3,7 @@ #include #include -#include "Common/VtableVisitor.h" +#include struct AdapterCallbacksIntf { diff --git a/DDrawCompat/D3dDdi/Visitors/AdapterFuncsVisitor.h b/DDrawCompat/D3dDdi/Visitors/AdapterFuncsVisitor.h index 4136c5e..9ccec9e 100644 --- a/DDrawCompat/D3dDdi/Visitors/AdapterFuncsVisitor.h +++ b/DDrawCompat/D3dDdi/Visitors/AdapterFuncsVisitor.h @@ -3,7 +3,7 @@ #include #include -#include "Common/VtableVisitor.h" +#include struct AdapterFuncsIntf { diff --git a/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h b/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h index 65b1248..5fc09e6 100644 --- a/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h +++ b/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h @@ -3,8 +3,8 @@ #include #include -#include "Common/VtableVisitor.h" -#include "D3dDdi/Hooks.h" +#include +#include struct DeviceCallbacksIntf { diff --git a/DDrawCompat/D3dDdi/Visitors/DeviceFuncsVisitor.h b/DDrawCompat/D3dDdi/Visitors/DeviceFuncsVisitor.h index dd3a470..543df6a 100644 --- a/DDrawCompat/D3dDdi/Visitors/DeviceFuncsVisitor.h +++ b/DDrawCompat/D3dDdi/Visitors/DeviceFuncsVisitor.h @@ -3,8 +3,8 @@ #include #include -#include "Common/VtableVisitor.h" -#include "D3dDdi/Hooks.h" +#include +#include struct DeviceFuncsIntf { diff --git a/DDrawCompat/DDraw/Blitter.cpp b/DDrawCompat/DDraw/Blitter.cpp index 9db6b05..926f118 100644 --- a/DDrawCompat/DDraw/Blitter.cpp +++ b/DDrawCompat/DDraw/Blitter.cpp @@ -4,8 +4,8 @@ #include -#include "Common/ScopedCriticalSection.h" -#include "DDraw/Blitter.h" +#include +#include #pragma warning(disable : 4127) diff --git a/DDrawCompat/DDraw/DirectDrawClipper.h b/DDrawCompat/DDraw/DirectDrawClipper.h index 6ce4ae4..f053117 100644 --- a/DDrawCompat/DDraw/DirectDrawClipper.h +++ b/DDrawCompat/DDraw/DirectDrawClipper.h @@ -1,8 +1,8 @@ #pragma once -#include "Common/CompatRef.h" -#include "Common/CompatVtable.h" -#include "DDraw/Visitors/DirectDrawClipperVtblVisitor.h" +#include +#include +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/DirectDrawGammaControl.cpp b/DDrawCompat/DDraw/DirectDrawGammaControl.cpp index e4f1b7a..f4cd40a 100644 --- a/DDrawCompat/DDraw/DirectDrawGammaControl.cpp +++ b/DDrawCompat/DDraw/DirectDrawGammaControl.cpp @@ -1,6 +1,6 @@ -#include "DDraw/DirectDrawGammaControl.h" -#include "DDraw/RealPrimarySurface.h" -#include "DDraw/Surfaces/PrimarySurface.h" +#include +#include +#include namespace { diff --git a/DDrawCompat/DDraw/DirectDrawGammaControl.h b/DDrawCompat/DDraw/DirectDrawGammaControl.h index aa53078..01dfd14 100644 --- a/DDrawCompat/DDraw/DirectDrawGammaControl.h +++ b/DDrawCompat/DDraw/DirectDrawGammaControl.h @@ -1,7 +1,7 @@ #pragma once -#include "Common/CompatVtable.h" -#include "DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h" +#include +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/DirectDrawPalette.h b/DDrawCompat/DDraw/DirectDrawPalette.h index cfaa4ff..2d5b311 100644 --- a/DDrawCompat/DDraw/DirectDrawPalette.h +++ b/DDrawCompat/DDraw/DirectDrawPalette.h @@ -1,7 +1,7 @@ #pragma once -#include "Common/CompatVtable.h" -#include "DDraw/Visitors/DirectDrawPaletteVtblVisitor.h" +#include +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/DirectDrawSurface.cpp b/DDrawCompat/DDraw/DirectDrawSurface.cpp index b05b47f..7e3e5f9 100644 --- a/DDrawCompat/DDraw/DirectDrawSurface.cpp +++ b/DDrawCompat/DDraw/DirectDrawSurface.cpp @@ -1,8 +1,8 @@ #include -#include "DDraw/DirectDrawSurface.h" -#include "DDraw/Surfaces/Surface.h" -#include "DDraw/Surfaces/SurfaceImpl.h" +#include +#include +#include namespace { diff --git a/DDrawCompat/DDraw/DirectDrawSurface.h b/DDrawCompat/DDraw/DirectDrawSurface.h index 91c8f18..ef066cb 100644 --- a/DDrawCompat/DDraw/DirectDrawSurface.h +++ b/DDrawCompat/DDraw/DirectDrawSurface.h @@ -2,11 +2,11 @@ #include -#include "Common/CompatPtr.h" -#include "Common/CompatRef.h" -#include "Common/CompatVtable.h" -#include "DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h" -#include "DDraw/Types.h" +#include +#include +#include +#include +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/Hooks.cpp b/DDrawCompat/DDraw/Hooks.cpp index f17c5d0..b092849 100644 --- a/DDrawCompat/DDraw/Hooks.cpp +++ b/DDrawCompat/DDraw/Hooks.cpp @@ -1,13 +1,13 @@ -#include "Common/CompatRef.h" -#include "Common/Log.h" -#include "DDraw/DirectDraw.h" -#include "DDraw/DirectDrawClipper.h" -#include "DDraw/DirectDrawGammaControl.h" -#include "DDraw/DirectDrawPalette.h" -#include "DDraw/DirectDrawSurface.h" -#include "DDraw/Hooks.h" -#include "DDraw/RealPrimarySurface.h" -#include "Win32/Registry.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/DDrawCompat/DDraw/Hooks.h b/DDrawCompat/DDraw/Hooks.h index c2a3557..ccb82f9 100644 --- a/DDrawCompat/DDraw/Hooks.h +++ b/DDrawCompat/DDraw/Hooks.h @@ -2,7 +2,7 @@ #include -#include "Common/CompatPtr.h" +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/IReleaseNotifier.cpp b/DDrawCompat/DDraw/IReleaseNotifier.cpp index 7e64109..7cadf72 100644 --- a/DDrawCompat/DDraw/IReleaseNotifier.cpp +++ b/DDrawCompat/DDraw/IReleaseNotifier.cpp @@ -1,4 +1,4 @@ -#include "DDraw/IReleaseNotifier.h" +#include #include diff --git a/DDrawCompat/DDraw/Surfaces/PrimarySurface.h b/DDrawCompat/DDraw/Surfaces/PrimarySurface.h index 2c4d8f0..b2b158f 100644 --- a/DDrawCompat/DDraw/Surfaces/PrimarySurface.h +++ b/DDrawCompat/DDraw/Surfaces/PrimarySurface.h @@ -2,9 +2,9 @@ #include -#include "Common/CompatPtr.h" -#include "Common/CompatRef.h" -#include "DDraw/Surfaces/Surface.h" +#include +#include +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.h b/DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.h index b6bcb61..5edccce 100644 --- a/DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.h +++ b/DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.h @@ -2,10 +2,10 @@ #include -#include "Common/CompatRef.h" -#include "Common/CompatVtable.h" -#include "DDraw/Surfaces/SurfaceImpl.h" -#include "DDraw/Types.h" +#include +#include +#include +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/Surfaces/Surface.cpp b/DDrawCompat/DDraw/Surfaces/Surface.cpp index 6b87b04..4050016 100644 --- a/DDrawCompat/DDraw/Surfaces/Surface.cpp +++ b/DDrawCompat/DDraw/Surfaces/Surface.cpp @@ -1,11 +1,11 @@ #include -#include "Common/CompatPtr.h" -#include "D3dDdi/Device.h" -#include "D3dDdi/Resource.h" -#include "DDraw/DirectDrawSurface.h" -#include "DDraw/Surfaces/Surface.h" -#include "DDraw/Surfaces/SurfaceImpl.h" +#include +#include +#include +#include +#include +#include // {C62D8849-DFAC-4454-A1E8-DA67446426BA} DEFINE_GUID(IID_CompatSurfacePrivateData, diff --git a/DDrawCompat/DDraw/Surfaces/Surface.h b/DDrawCompat/DDraw/Surfaces/Surface.h index 2c155c7..505026e 100644 --- a/DDrawCompat/DDraw/Surfaces/Surface.h +++ b/DDrawCompat/DDraw/Surfaces/Surface.h @@ -5,8 +5,8 @@ #include -#include "Common/CompatPtr.h" -#include "Common/CompatRef.h" +#include +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/Surfaces/SurfaceImpl.h b/DDrawCompat/DDraw/Surfaces/SurfaceImpl.h index 8cf7393..8f04d6a 100644 --- a/DDrawCompat/DDraw/Surfaces/SurfaceImpl.h +++ b/DDrawCompat/DDraw/Surfaces/SurfaceImpl.h @@ -4,8 +4,8 @@ #include -#include "Common/CompatVtable.h" -#include "DDraw/Types.h" +#include +#include namespace DDraw { diff --git a/DDrawCompat/DDraw/Visitors/DirectDrawClipperVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawClipperVtblVisitor.h index a4a8646..6d47310 100644 --- a/DDrawCompat/DDraw/Visitors/DirectDrawClipperVtblVisitor.h +++ b/DDrawCompat/DDraw/Visitors/DirectDrawClipperVtblVisitor.h @@ -1,6 +1,6 @@ #pragma once -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h index 32f8c46..cd718e0 100644 --- a/DDrawCompat/DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h +++ b/DDrawCompat/DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h @@ -1,6 +1,6 @@ #pragma once -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/DDraw/Visitors/DirectDrawPaletteVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawPaletteVtblVisitor.h index a9e7a3b..b861e19 100644 --- a/DDrawCompat/DDraw/Visitors/DirectDrawPaletteVtblVisitor.h +++ b/DDrawCompat/DDraw/Visitors/DirectDrawPaletteVtblVisitor.h @@ -1,6 +1,6 @@ #pragma once -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h index 81a7d90..c3bc9ac 100644 --- a/DDrawCompat/DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h +++ b/DDrawCompat/DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h @@ -1,6 +1,6 @@ #pragma once -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/DDraw/Visitors/DirectDrawVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawVtblVisitor.h index a0f260a..03ee3ef 100644 --- a/DDrawCompat/DDraw/Visitors/DirectDrawVtblVisitor.h +++ b/DDrawCompat/DDraw/Visitors/DirectDrawVtblVisitor.h @@ -1,6 +1,6 @@ #pragma once -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/Direct3d/Direct3dTexture.cpp b/DDrawCompat/Direct3d/Direct3dTexture.cpp index fa0201f..e0c6b09 100644 --- a/DDrawCompat/Direct3d/Direct3dTexture.cpp +++ b/DDrawCompat/Direct3d/Direct3dTexture.cpp @@ -1,4 +1,4 @@ -#include "Direct3d/Direct3dTexture.h" +#include namespace Direct3d { diff --git a/DDrawCompat/Direct3d/Direct3dVertexBuffer.cpp b/DDrawCompat/Direct3d/Direct3dVertexBuffer.cpp index 4b91f5f..f13ede0 100644 --- a/DDrawCompat/Direct3d/Direct3dVertexBuffer.cpp +++ b/DDrawCompat/Direct3d/Direct3dVertexBuffer.cpp @@ -1,4 +1,4 @@ -#include "Direct3d/Direct3dVertexBuffer.h" +#include namespace Direct3d { diff --git a/DDrawCompat/Direct3d/Direct3dViewport.cpp b/DDrawCompat/Direct3d/Direct3dViewport.cpp index 41670ae..736a10a 100644 --- a/DDrawCompat/Direct3d/Direct3dViewport.cpp +++ b/DDrawCompat/Direct3d/Direct3dViewport.cpp @@ -1,4 +1,4 @@ -#include "Direct3d/Direct3dViewport.h" +#include namespace Direct3d { diff --git a/DDrawCompat/Direct3d/Hooks.h b/DDrawCompat/Direct3d/Hooks.h index cf5c003..93af1f2 100644 --- a/DDrawCompat/Direct3d/Hooks.h +++ b/DDrawCompat/Direct3d/Hooks.h @@ -2,7 +2,7 @@ #include -#include "Common/CompatPtr.h" +#include namespace Direct3d { diff --git a/DDrawCompat/Direct3d/Visitors/Direct3dDeviceVtblVisitor.h b/DDrawCompat/Direct3d/Visitors/Direct3dDeviceVtblVisitor.h index 19e18f8..e2d7132 100644 --- a/DDrawCompat/Direct3d/Visitors/Direct3dDeviceVtblVisitor.h +++ b/DDrawCompat/Direct3d/Visitors/Direct3dDeviceVtblVisitor.h @@ -2,7 +2,7 @@ #include -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/Direct3d/Visitors/Direct3dTextureVtblVisitor.h b/DDrawCompat/Direct3d/Visitors/Direct3dTextureVtblVisitor.h index 48e4ccd..924751c 100644 --- a/DDrawCompat/Direct3d/Visitors/Direct3dTextureVtblVisitor.h +++ b/DDrawCompat/Direct3d/Visitors/Direct3dTextureVtblVisitor.h @@ -2,7 +2,7 @@ #include -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/Direct3d/Visitors/Direct3dVertexBufferVtblVisitor.h b/DDrawCompat/Direct3d/Visitors/Direct3dVertexBufferVtblVisitor.h index 797526b..ea23cf8 100644 --- a/DDrawCompat/Direct3d/Visitors/Direct3dVertexBufferVtblVisitor.h +++ b/DDrawCompat/Direct3d/Visitors/Direct3dVertexBufferVtblVisitor.h @@ -2,7 +2,7 @@ #include -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/Direct3d/Visitors/Direct3dViewportVtblVisitor.h b/DDrawCompat/Direct3d/Visitors/Direct3dViewportVtblVisitor.h index 6d0b72c..16ad008 100644 --- a/DDrawCompat/Direct3d/Visitors/Direct3dViewportVtblVisitor.h +++ b/DDrawCompat/Direct3d/Visitors/Direct3dViewportVtblVisitor.h @@ -2,7 +2,7 @@ #include -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/Direct3d/Visitors/Direct3dVtblVisitor.h b/DDrawCompat/Direct3d/Visitors/Direct3dVtblVisitor.h index 1a501a8..fc35f3f 100644 --- a/DDrawCompat/Direct3d/Visitors/Direct3dVtblVisitor.h +++ b/DDrawCompat/Direct3d/Visitors/Direct3dVtblVisitor.h @@ -2,7 +2,7 @@ #include -#include "Common/VtableVisitor.h" +#include template <> struct VtableForEach diff --git a/DDrawCompat/Gdi/VirtualScreen.h b/DDrawCompat/Gdi/VirtualScreen.h index 4dfd381..089cb65 100644 --- a/DDrawCompat/Gdi/VirtualScreen.h +++ b/DDrawCompat/Gdi/VirtualScreen.h @@ -2,7 +2,7 @@ #include -#include "Common/CompatPtr.h" +#include namespace Gdi { diff --git a/DDrawCompat/Win32/MsgHooks.cpp b/DDrawCompat/Win32/MsgHooks.cpp index cfb8210..31c47c2 100644 --- a/DDrawCompat/Win32/MsgHooks.cpp +++ b/DDrawCompat/Win32/MsgHooks.cpp @@ -1,7 +1,7 @@ #include -#include "Common/Hook.h" -#include "Win32/MsgHooks.h" +#include +#include namespace { diff --git a/DDrawCompat/Win32/Registry.cpp b/DDrawCompat/Win32/Registry.cpp index 50b9a40..d674578 100644 --- a/DDrawCompat/Win32/Registry.cpp +++ b/DDrawCompat/Win32/Registry.cpp @@ -4,9 +4,9 @@ #include #include -#include "Common/Hook.h" -#include "Common/Log.h" -#include "Win32/Registry.h" +#include +#include +#include typedef long NTSTATUS;