1
0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00

Use angle brackets in all include directives

This commit is contained in:
narzoul 2021-02-20 13:39:18 +01:00
parent 4e3debf776
commit b4ef2a1c0c
61 changed files with 128 additions and 128 deletions

View File

@ -2,8 +2,8 @@
#include <algorithm> #include <algorithm>
#include "Common/CompatQueryInterface.h" #include <Common/CompatQueryInterface.h>
#include "Common/CompatWeakPtr.h" #include <Common/CompatWeakPtr.h>
template <typename Intf> template <typename Intf>
class CompatPtr : public CompatWeakPtr<Intf> class CompatPtr : public CompatWeakPtr<Intf>

View File

@ -4,7 +4,7 @@
#include <d3d.h> #include <d3d.h>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
namespace Compat namespace Compat
{ {

View File

@ -2,7 +2,7 @@
#include <ostream> #include <ostream>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
template <typename Intf> template <typename Intf>
class CompatRef class CompatRef

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common/CompatVtableInstance.h" #include <Common/CompatVtableInstance.h>
template <typename Interface> template <typename Interface>
using Vtable = typename std::remove_pointer<decltype(Interface::lpVtbl)>::type; using Vtable = typename std::remove_pointer<decltype(Interface::lpVtbl)>::type;

View File

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "Common/LogWrapperVisitor.h" #include <Common/LogWrapperVisitor.h>
#include "Common/VtableHookVisitor.h" #include <Common/VtableHookVisitor.h>
#include "Common/VtableUpdateVisitor.h" #include <Common/VtableUpdateVisitor.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
#define SET_COMPAT_VTABLE(Vtable, CompatInterface) \ #define SET_COMPAT_VTABLE(Vtable, CompatInterface) \
namespace Compat \ namespace Compat \

View File

@ -2,7 +2,7 @@
#include <ostream> #include <ostream>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
template <typename Intf> template <typename Intf>
class CompatWeakPtr class CompatWeakPtr

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Common/FuncNameVisitor.h" #include <Common/FuncNameVisitor.h>
#include "Common/Log.h" #include <Common/Log.h>
template <typename Vtable, int instanceId = 0> template <typename Vtable, int instanceId = 0>
class LogWrapperVisitor class LogWrapperVisitor

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common/Time.h" #include <Common/Time.h>
namespace Time namespace Time
{ {

View File

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "Common/FuncNameVisitor.h" #include <Common/FuncNameVisitor.h>
#include "Common/Hook.h" #include <Common/Hook.h>
#include "D3dDdi/ScopedCriticalSection.h" #include <D3dDdi/ScopedCriticalSection.h>
#include "DDraw/ScopedThreadLock.h" #include <DDraw/ScopedThreadLock.h>
struct _D3DDDI_ADAPTERCALLBACKS; struct _D3DDDI_ADAPTERCALLBACKS;
struct _D3DDDI_ADAPTERFUNCS; struct _D3DDDI_ADAPTERFUNCS;

View File

@ -1,5 +1,5 @@
#include "D3dDdi/Adapter.h" #include <D3dDdi/Adapter.h>
#include "D3dDdi/AdapterFuncs.h" #include <D3dDdi/AdapterFuncs.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -1,4 +1,4 @@
#include "D3dDdi/AdapterCallbacks.h" #include <D3dDdi/AdapterCallbacks.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -3,8 +3,8 @@
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
#include "D3dDdi/Visitors/AdapterCallbacksVisitor.h" #include <D3dDdi/Visitors/AdapterCallbacksVisitor.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -4,9 +4,9 @@
#include <d3dumddi.h> #include <d3dumddi.h>
#include <d3dnthal.h> #include <d3dnthal.h>
#include "D3dDdi/D3dDdiVtable.h" #include <D3dDdi/D3dDdiVtable.h>
#include "D3dDdi/Log/AdapterFuncsLog.h" #include <D3dDdi/Log/AdapterFuncsLog.h>
#include "D3dDdi/Visitors/AdapterFuncsVisitor.h" #include <D3dDdi/Visitors/AdapterFuncsVisitor.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -2,11 +2,11 @@
#include <map> #include <map>
#include "Common/CompatVtableInstance.h" #include <Common/CompatVtableInstance.h>
#include "Common/Log.h" #include <Common/Log.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
#include "Config/Config.h" #include <Config/Config.h>
#include "D3dDdi/ScopedCriticalSection.h" #include <D3dDdi/ScopedCriticalSection.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -1,4 +1,4 @@
#include "D3dDdi/DeviceCallbacks.h" #include <D3dDdi/DeviceCallbacks.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -3,9 +3,9 @@
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
#include "D3dDdi/Log/DeviceCallbacksLog.h" #include <D3dDdi/Log/DeviceCallbacksLog.h>
#include "D3dDdi/Visitors/DeviceCallbacksVisitor.h" #include <D3dDdi/Visitors/DeviceCallbacksVisitor.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -1,5 +1,5 @@
#include "D3dDdi/Device.h" #include <D3dDdi/Device.h>
#include "D3dDdi/DeviceFuncs.h" #include <D3dDdi/DeviceFuncs.h>
namespace namespace
{ {

View File

@ -3,9 +3,9 @@
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include "D3dDdi/D3dDdiVtable.h" #include <D3dDdi/D3dDdiVtable.h>
#include "D3dDdi/Log/DeviceFuncsLog.h" #include <D3dDdi/Log/DeviceFuncsLog.h>
#include "D3dDdi/Visitors/DeviceFuncsVisitor.h" #include <D3dDdi/Visitors/DeviceFuncsVisitor.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -1,4 +1,4 @@
#include "D3dDdi/FormatInfo.h" #include <D3dDdi/FormatInfo.h>
namespace namespace
{ {

View File

@ -5,11 +5,11 @@
#include <winternl.h> #include <winternl.h>
#include <..\km\d3dkmthk.h> #include <..\km\d3dkmthk.h>
#include "Common/Hook.h" #include <Common/Hook.h>
#include "Common/Log.h" #include <Common/Log.h>
#include "D3dDdi/AdapterCallbacks.h" #include <D3dDdi/AdapterCallbacks.h>
#include "D3dDdi/AdapterFuncs.h" #include <D3dDdi/AdapterFuncs.h>
#include "D3dDdi/KernelModeThunks.h" #include <D3dDdi/KernelModeThunks.h>
std::ostream& operator<<(std::ostream& os, const D3DDDIARG_OPENADAPTER& data) std::ostream& operator<<(std::ostream& os, const D3DDDIARG_OPENADAPTER& data)
{ {

View File

@ -1,5 +1,5 @@
#include "Common/Log.h" #include <Common/Log.h>
#include "D3dDdi/Log/AdapterFuncsLog.h" #include <D3dDdi/Log/AdapterFuncsLog.h>
std::ostream& operator<<(std::ostream& os, const D3DDDI_ALLOCATIONLIST& data) std::ostream& operator<<(std::ostream& os, const D3DDDI_ALLOCATIONLIST& data)
{ {

View File

@ -1,5 +1,5 @@
#include "Common/Log.h" #include <Common/Log.h>
#include "D3dDdi/Log/DeviceCallbacksLog.h" #include <D3dDdi/Log/DeviceCallbacksLog.h>
std::ostream& operator<<(std::ostream& os, const D3DDDI_ALLOCATIONINFO& data) std::ostream& operator<<(std::ostream& os, const D3DDDI_ALLOCATIONINFO& data)
{ {

View File

@ -1,5 +1,5 @@
#include "Common/Log.h" #include <Common/Log.h>
#include "D3dDdi/Log/KernelModeThunksLog.h" #include <D3dDdi/Log/KernelModeThunksLog.h>
std::ostream& operator<<(std::ostream& os, const LUID& luid) std::ostream& operator<<(std::ostream& os, const LUID& luid)
{ {

View File

@ -1,4 +1,4 @@
#include "D3dDdi/ScopedCriticalSection.h" #include <D3dDdi/ScopedCriticalSection.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common/ScopedCriticalSection.h" #include <Common/ScopedCriticalSection.h>
namespace D3dDdi namespace D3dDdi
{ {

View File

@ -3,7 +3,7 @@
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
struct AdapterCallbacksIntf struct AdapterCallbacksIntf
{ {

View File

@ -3,7 +3,7 @@
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
struct AdapterFuncsIntf struct AdapterFuncsIntf
{ {

View File

@ -3,8 +3,8 @@
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
#include "D3dDdi/Hooks.h" #include <D3dDdi/Hooks.h>
struct DeviceCallbacksIntf struct DeviceCallbacksIntf
{ {

View File

@ -3,8 +3,8 @@
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
#include "D3dDdi/Hooks.h" #include <D3dDdi/Hooks.h>
struct DeviceFuncsIntf struct DeviceFuncsIntf
{ {

View File

@ -4,8 +4,8 @@
#include <intrin.h> #include <intrin.h>
#include "Common/ScopedCriticalSection.h" #include <Common/ScopedCriticalSection.h>
#include "DDraw/Blitter.h" #include <DDraw/Blitter.h>
#pragma warning(disable : 4127) #pragma warning(disable : 4127)

View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "Common/CompatRef.h" #include <Common/CompatRef.h>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
#include "DDraw/Visitors/DirectDrawClipperVtblVisitor.h" #include <DDraw/Visitors/DirectDrawClipperVtblVisitor.h>
namespace DDraw namespace DDraw
{ {

View File

@ -1,6 +1,6 @@
#include "DDraw/DirectDrawGammaControl.h" #include <DDraw/DirectDrawGammaControl.h>
#include "DDraw/RealPrimarySurface.h" #include <DDraw/RealPrimarySurface.h>
#include "DDraw/Surfaces/PrimarySurface.h" #include <DDraw/Surfaces/PrimarySurface.h>
namespace namespace
{ {

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
#include "DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h" #include <DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h>
namespace DDraw namespace DDraw
{ {

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
#include "DDraw/Visitors/DirectDrawPaletteVtblVisitor.h" #include <DDraw/Visitors/DirectDrawPaletteVtblVisitor.h>
namespace DDraw namespace DDraw
{ {

View File

@ -1,8 +1,8 @@
#include <set> #include <set>
#include "DDraw/DirectDrawSurface.h" #include <DDraw/DirectDrawSurface.h>
#include "DDraw/Surfaces/Surface.h" #include <DDraw/Surfaces/Surface.h>
#include "DDraw/Surfaces/SurfaceImpl.h" #include <DDraw/Surfaces/SurfaceImpl.h>
namespace namespace
{ {

View File

@ -2,11 +2,11 @@
#include <vector> #include <vector>
#include "Common/CompatPtr.h" #include <Common/CompatPtr.h>
#include "Common/CompatRef.h" #include <Common/CompatRef.h>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
#include "DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h" #include <DDraw/Visitors/DirectDrawSurfaceVtblVisitor.h>
#include "DDraw/Types.h" #include <DDraw/Types.h>
namespace DDraw namespace DDraw
{ {

View File

@ -1,13 +1,13 @@
#include "Common/CompatRef.h" #include <Common/CompatRef.h>
#include "Common/Log.h" #include <Common/Log.h>
#include "DDraw/DirectDraw.h" #include <DDraw/DirectDraw.h>
#include "DDraw/DirectDrawClipper.h" #include <DDraw/DirectDrawClipper.h>
#include "DDraw/DirectDrawGammaControl.h" #include <DDraw/DirectDrawGammaControl.h>
#include "DDraw/DirectDrawPalette.h" #include <DDraw/DirectDrawPalette.h>
#include "DDraw/DirectDrawSurface.h" #include <DDraw/DirectDrawSurface.h>
#include "DDraw/Hooks.h" #include <DDraw/Hooks.h>
#include "DDraw/RealPrimarySurface.h" #include <DDraw/RealPrimarySurface.h>
#include "Win32/Registry.h" #include <Win32/Registry.h>
namespace namespace
{ {

View File

@ -2,7 +2,7 @@
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatPtr.h" #include <Common/CompatPtr.h>
namespace DDraw namespace DDraw
{ {

View File

@ -1,4 +1,4 @@
#include "DDraw/IReleaseNotifier.h" #include <DDraw/IReleaseNotifier.h>
#include <initguid.h> #include <initguid.h>

View File

@ -2,9 +2,9 @@
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatPtr.h" #include <Common/CompatPtr.h>
#include "Common/CompatRef.h" #include <Common/CompatRef.h>
#include "DDraw/Surfaces/Surface.h" #include <DDraw/Surfaces/Surface.h>
namespace DDraw namespace DDraw
{ {

View File

@ -2,10 +2,10 @@
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatRef.h" #include <Common/CompatRef.h>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
#include "DDraw/Surfaces/SurfaceImpl.h" #include <DDraw/Surfaces/SurfaceImpl.h>
#include "DDraw/Types.h" #include <DDraw/Types.h>
namespace DDraw namespace DDraw
{ {

View File

@ -1,11 +1,11 @@
#include <initguid.h> #include <initguid.h>
#include "Common/CompatPtr.h" #include <Common/CompatPtr.h>
#include "D3dDdi/Device.h" #include <D3dDdi/Device.h>
#include "D3dDdi/Resource.h" #include <D3dDdi/Resource.h>
#include "DDraw/DirectDrawSurface.h" #include <DDraw/DirectDrawSurface.h>
#include "DDraw/Surfaces/Surface.h" #include <DDraw/Surfaces/Surface.h>
#include "DDraw/Surfaces/SurfaceImpl.h" #include <DDraw/Surfaces/SurfaceImpl.h>
// {C62D8849-DFAC-4454-A1E8-DA67446426BA} // {C62D8849-DFAC-4454-A1E8-DA67446426BA}
DEFINE_GUID(IID_CompatSurfacePrivateData, DEFINE_GUID(IID_CompatSurfacePrivateData,

View File

@ -5,8 +5,8 @@
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatPtr.h" #include <Common/CompatPtr.h>
#include "Common/CompatRef.h" #include <Common/CompatRef.h>
namespace DDraw namespace DDraw
{ {

View File

@ -4,8 +4,8 @@
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatVtable.h" #include <Common/CompatVtable.h>
#include "DDraw/Types.h" #include <DDraw/Types.h>
namespace DDraw namespace DDraw
{ {

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirectDrawClipperVtbl> struct VtableForEach<IDirectDrawClipperVtbl>

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirectDrawGammaControlVtbl> struct VtableForEach<IDirectDrawGammaControlVtbl>

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirectDrawPaletteVtbl> struct VtableForEach<IDirectDrawPaletteVtbl>

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirectDrawSurfaceVtbl> struct VtableForEach<IDirectDrawSurfaceVtbl>

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirectDrawVtbl> struct VtableForEach<IDirectDrawVtbl>

View File

@ -1,4 +1,4 @@
#include "Direct3d/Direct3dTexture.h" #include <Direct3d/Direct3dTexture.h>
namespace Direct3d namespace Direct3d
{ {

View File

@ -1,4 +1,4 @@
#include "Direct3d/Direct3dVertexBuffer.h" #include <Direct3d/Direct3dVertexBuffer.h>
namespace Direct3d namespace Direct3d
{ {

View File

@ -1,4 +1,4 @@
#include "Direct3d/Direct3dViewport.h" #include <Direct3d/Direct3dViewport.h>
namespace Direct3d namespace Direct3d
{ {

View File

@ -2,7 +2,7 @@
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatPtr.h" #include <Common/CompatPtr.h>
namespace Direct3d namespace Direct3d
{ {

View File

@ -2,7 +2,7 @@
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirect3DDeviceVtbl> struct VtableForEach<IDirect3DDeviceVtbl>

View File

@ -2,7 +2,7 @@
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirect3DTextureVtbl> struct VtableForEach<IDirect3DTextureVtbl>

View File

@ -2,7 +2,7 @@
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirect3DVertexBufferVtbl> struct VtableForEach<IDirect3DVertexBufferVtbl>

View File

@ -2,7 +2,7 @@
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirect3DViewportVtbl> struct VtableForEach<IDirect3DViewportVtbl>

View File

@ -2,7 +2,7 @@
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include <Common/VtableVisitor.h>
template <> template <>
struct VtableForEach<IDirect3DVtbl> struct VtableForEach<IDirect3DVtbl>

View File

@ -2,7 +2,7 @@
#include <Windows.h> #include <Windows.h>
#include "Common/CompatPtr.h" #include <Common/CompatPtr.h>
namespace Gdi namespace Gdi
{ {

View File

@ -1,7 +1,7 @@
#include <Windows.h> #include <Windows.h>
#include "Common/Hook.h" #include <Common/Hook.h>
#include "Win32/MsgHooks.h" #include <Win32/MsgHooks.h>
namespace namespace
{ {

View File

@ -4,9 +4,9 @@
#include <set> #include <set>
#include <sstream> #include <sstream>
#include "Common/Hook.h" #include <Common/Hook.h>
#include "Common/Log.h" #include <Common/Log.h>
#include "Win32/Registry.h" #include <Win32/Registry.h>
typedef long NTSTATUS; typedef long NTSTATUS;