backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Moved common macros to compiler options

Browse Source
This commit is contained in:
narzoul 2018-08-04 13:08:30 +02:00
parent 785663700d
commit e69b5e312c
41 changed files with 46 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DDrawCompat/Common/CompatQueryInterface.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <type_traits> #include <type_traits>
#include <d3d.h> #include <d3d.h>

22
DDrawCompat/Common/Log.cpp
View File

@ -2,7 +2,6 @@
#include <vector> #include <vector>
#include <atlstr.h>
#include <Windows.h> #include <Windows.h>
#include "Common/Log.h" #include "Common/Log.h"
@ -53,8 +52,7 @@ std::ostream& operator<<(std::ostream& os, const WCHAR* wstr)
return os << static_cast<const void*>(wstr); return os << static_cast<const void*>(wstr);
} }
CStringA str(wstr); return os << std::string(wstr, wstr + wcslen(wstr)).c_str();
return os << '"' << static_cast<const char*>(str) << '"';
} }
std::ostream& operator<<(std::ostream& os, const DEVMODEA& dm) std::ostream& operator<<(std::ostream& os, const DEVMODEA& dm)
@ -143,13 +141,13 @@ std::ostream& operator<<(std::ostream& os, const DDSURFACEDESC2& sd)
{ {
return Compat::LogStruct(os) return Compat::LogStruct(os)
<< Compat::hex(sd.dwFlags) << Compat::hex(sd.dwFlags)
<< sd.dwHeight << sd.dwHeight
<< sd.dwWidth << sd.dwWidth
<< sd.lPitch << sd.lPitch
<< sd.dwBackBufferCount << sd.dwBackBufferCount
<< sd.dwMipMapCount << sd.dwMipMapCount
<< sd.dwAlphaBitDepth << sd.dwAlphaBitDepth
<< sd.dwReserved << sd.dwReserved
<< sd.lpSurface << sd.lpSurface
<< sd.ddpfPixelFormat << sd.ddpfPixelFormat
<< sd.ddsCaps << sd.ddsCaps
@ -160,16 +158,16 @@ std::ostream& operator<<(std::ostream& os, const CWPSTRUCT& cwrp)
{ {
return Compat::LogStruct(os) return Compat::LogStruct(os)
<< Compat::hex(cwrp.message) << Compat::hex(cwrp.message)
<< cwrp.hwnd << cwrp.hwnd
<< Compat::hex(cwrp.wParam) << Compat::hex(cwrp.wParam)
<< Compat::hex(cwrp.lParam); << Compat::hex(cwrp.lParam);
} }
std::ostream& operator<<(std::ostream& os, const CWPRETSTRUCT& cwrp) std::ostream& operator<<(std::ostream& os, const CWPRETSTRUCT& cwrp)
{ {
return Compat::LogStruct(os) return Compat::LogStruct(os)
<< Compat::hex(cwrp.message) << Compat::hex(cwrp.message)
<< cwrp.hwnd << cwrp.hwnd
<< Compat::hex(cwrp.wParam) << Compat::hex(cwrp.wParam)
<< Compat::hex(cwrp.lParam) << Compat::hex(cwrp.lParam)
<< Compat::hex(cwrp.lResult); << Compat::hex(cwrp.lResult);

4
DDrawCompat/Common/Log.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ddraw.h> #include <ddraw.h>
#include <fstream> #include <fstream>
#include <ostream> #include <ostream>
@ -186,7 +184,7 @@ namespace Compat
class LogNull class LogNull
{ {
public: public:
template <typename T> LogNull& operator<<(const T&) { return *this; } template <typename T> LogNull& operator<<(const T&) { return *this; }
}; };
typedef LogNull LogDebug; typedef LogNull LogDebug;

2
DDrawCompat/Common/VtableVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ddraw.h> #include <ddraw.h>
#include <typeinfo> #include <typeinfo>

2
DDrawCompat/D3dDdi/AdapterCallbacks.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/D3dDdi/AdapterFuncs.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include <d3dnthal.h> #include <d3dnthal.h>

2
DDrawCompat/D3dDdi/Device.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <map> #include <map>
#include <set> #include <set>

2
DDrawCompat/D3dDdi/DeviceCallbacks.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/D3dDdi/DeviceFuncs.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/D3dDdi/Hooks.cpp
View File

@ -1,5 +1,3 @@
#define CINTERFACE
#include <set> #include <set>
#include <Windows.h> #include <Windows.h>

2
DDrawCompat/D3dDdi/KernelModeThunks.cpp
View File

@ -1,5 +1,3 @@
#define CINTERFACE
#include <map> #include <map>
#include <d3d.h> #include <d3d.h>

3
DDrawCompat/D3dDdi/KernelModeThunks.h
View File

@ -1,8 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#define WIN32_LEAN_AND_MEAN
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>
#include <../km/d3dkmthk.h> #include <../km/d3dkmthk.h>

2
DDrawCompat/D3dDdi/Log/AdapterFuncsLog.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ostream> #include <ostream>
#include <d3d.h> #include <d3d.h>

2
DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ostream> #include <ostream>
#include <d3d.h> #include <d3d.h>

2
DDrawCompat/D3dDdi/Log/DeviceFuncsLog.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ostream> #include <ostream>
#include <d3d.h> #include <d3d.h>

2
DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ostream> #include <ostream>
#include <d3d.h> #include <d3d.h>

2
DDrawCompat/D3dDdi/OversizedResource.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/D3dDdi/RenderTargetResource.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/D3dDdi/Visitors/AdapterFuncsVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/D3dDdi/Visitors/DeviceFuncsVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include <d3dumddi.h> #include <d3dumddi.h>

2
DDrawCompat/DDraw/ActivateAppHandler.cpp
View File

@ -1,5 +1,3 @@
#define CINTERFACE
#include <ddraw.h> #include <ddraw.h>
#include "Common/Hook.h" #include "Common/Hook.h"

2
DDrawCompat/DDraw/DirectDraw.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatPtr.h" #include "Common/CompatPtr.h"

2
DDrawCompat/DDraw/Hooks.cpp
View File

@ -1,5 +1,3 @@
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include "Common/CompatPtr.h" #include "Common/CompatPtr.h"

2
DDrawCompat/DDraw/RealPrimarySurface.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatWeakPtr.h" #include "Common/CompatWeakPtr.h"

2
DDrawCompat/DDraw/Repository.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatRef.h" #include "Common/CompatRef.h"

5
DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp
View File

@ -1,6 +1,3 @@
#define CINTERFACE
#define _NO_DDRAWINT_NO_COM
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatPtr.h" #include "Common/CompatPtr.h"
@ -170,7 +167,7 @@ namespace DDraw
{ {
return CompatPtr<IDirectDrawSurface7>::from(surface.get()); return CompatPtr<IDirectDrawSurface7>::from(surface.get());
} }
if (FAILED(surface->GetAttachedSurface(surface, &caps, &surface.getRef()))) if (FAILED(surface->GetAttachedSurface(surface, &caps, &surface.getRef())))
{ {
return nullptr; return nullptr;

2
DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ddraw.h> #include <ddraw.h>
#include "Common/CompatRef.h" #include "Common/CompatRef.h"

2
DDrawCompat/DDraw/Surfaces/Surface.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <memory> #include <memory>
#include <ddraw.h> #include <ddraw.h>

2
DDrawCompat/DDraw/Surfaces/SurfaceImpl.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <functional> #include <functional>
#include <ddraw.h> #include <ddraw.h>

2
DDrawCompat/DDraw/Types.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <ddraw.h> #include <ddraw.h>
namespace DDraw namespace DDraw

4
DDrawCompat/DDrawCompat.vcxproj
View File

@ -90,7 +90,7 @@
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>PSAPI_VERSION=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
@ -121,7 +121,7 @@
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>PSAPI_VERSION=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>CINTERFACE;_NO_DDRAWINT_NO_COM;PSAPI_VERSION=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;DDRAWCOMPAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName> <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>

2
DDrawCompat/Direct3d/Hooks.cpp
View File

@ -1,5 +1,3 @@
#define CINTERFACE
#include <functional> #include <functional>
#include <d3d.h> #include <d3d.h>

2
DDrawCompat/Direct3d/Types.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
namespace Direct3d namespace Direct3d

2
DDrawCompat/Direct3d/Visitors/Direct3dDeviceVtblVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include "Common/VtableVisitor.h"

2
DDrawCompat/Direct3d/Visitors/Direct3dTextureVtblVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include "Common/VtableVisitor.h"

2
DDrawCompat/Direct3d/Visitors/Direct3dVertexBufferVtblVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include "Common/VtableVisitor.h"

2
DDrawCompat/Direct3d/Visitors/Direct3dViewportVtblVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include "Common/VtableVisitor.h"

2
DDrawCompat/Direct3d/Visitors/Direct3dVtblVisitor.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#define CINTERFACE
#include <d3d.h> #include <d3d.h>
#include "Common/VtableVisitor.h" #include "Common/VtableVisitor.h"

50
DDrawCompat/Win32/Registry.cpp
View File

@ -2,45 +2,49 @@
#include <cstring> #include <cstring>
#include <map> #include <map>
#include <set> #include <set>
#include <sstream>
#include <atlstr.h>
#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;
namespace namespace
{ {
struct RegistryKey struct RegistryKey
{ {
HKEY key; HKEY key;
CStringW subKey; std::wstring subKey;
CStringW value; std::wstring value;
RegistryKey(HKEY key, CStringW subKey, CStringW value) : key(key), subKey(subKey), value(value) {} RegistryKey(HKEY key, const std::wstring& subKey, const std::wstring& value)
: key(key), subKey(subKey), value(value)
{
}
bool operator<(const RegistryKey& rhs) const bool operator<(const RegistryKey& rhs) const
{ {
if (key < rhs.key) { return true; } if (key < rhs.key) { return true; }
if (key > rhs.key) { return false; } if (key > rhs.key) { return false; }
const int subKeyComp = subKey.CompareNoCase(rhs.subKey); const int subKeyComp = lstrcmpiW(subKey.c_str(), rhs.subKey.c_str());
if (subKeyComp < 0) { return true; } if (subKeyComp < 0) { return true; }
if (subKeyComp > 0) { return false; } if (subKeyComp > 0) { return false; }
return value.CompareNoCase(rhs.value) < 0; return lstrcmpiW(value.c_str(), rhs.value.c_str());
} }
bool operator==(const RegistryKey& rhs) const bool operator==(const RegistryKey& rhs) const
{ {
return key == rhs.key && return key == rhs.key &&
0 == subKey.CompareNoCase(rhs.subKey) && 0 == lstrcmpiW(subKey.c_str(), rhs.subKey.c_str()) &&
0 == value.CompareNoCase(rhs.value); 0 == lstrcmpiW(value.c_str(), rhs.value.c_str());
} }
}; };
std::map<RegistryKey, DWORD> g_dwordValues; std::map<RegistryKey, DWORD> g_dwordValues;
std::set<RegistryKey> g_unsetValues; std::set<RegistryKey> g_unsetValues;
CStringW getKeyName(HKEY key) std::wstring getKeyName(HKEY key)
{ {
enum KEY_INFORMATION_CLASS enum KEY_INFORMATION_CLASS
{ {
@ -77,11 +81,11 @@ namespace
ULONG resultSize = 0; ULONG resultSize = 0;
if (SUCCEEDED(ntQueryKey(key, KeyNameInformation, &keyName, sizeof(keyName), &resultSize))) if (SUCCEEDED(ntQueryKey(key, KeyNameInformation, &keyName, sizeof(keyName), &resultSize)))
{ {
return CStringW(keyName.Name, keyName.NameLength / 2); return std::wstring(keyName.Name, keyName.NameLength / 2);
} }
} }
return CStringW(); return std::wstring();
} }
LONG WINAPI regGetValueW(HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpValue, LONG WINAPI regGetValueW(HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpValue,
@ -139,12 +143,14 @@ namespace
if (hKey && lpValueName) if (hKey && lpValueName)
{ {
const CStringW keyName = getKeyName(hKey); const std::wstring keyName = getKeyName(hKey);
const CStringW localMachinePrefix = "\\REGISTRY\\MACHINE\\"; const std::wstring localMachinePrefix = L"\\REGISTRY\\MACHINE\\";
if (localMachinePrefix == keyName.Mid(0, localMachinePrefix.GetLength())) if (localMachinePrefix == keyName.substr(0, localMachinePrefix.size()))
{ {
std::wostringstream oss;
oss << lpValueName;
auto it = g_unsetValues.find(RegistryKey(HKEY_LOCAL_MACHINE, auto it = g_unsetValues.find(RegistryKey(HKEY_LOCAL_MACHINE,
keyName.Mid(localMachinePrefix.GetLength()), lpValueName)); keyName.substr(localMachinePrefix.size()), oss.str()));
if (it != g_unsetValues.end()) if (it != g_unsetValues.end())
{ {
return ERROR_FILE_NOT_FOUND; return ERROR_FILE_NOT_FOUND;
@ -174,13 +180,21 @@ namespace Win32
void setValue(HKEY key, const char* subKey, const char* valueName, DWORD value) void setValue(HKEY key, const char* subKey, const char* valueName, DWORD value)
{ {
assert(key && subKey && valueName); assert(key && subKey && valueName);
g_dwordValues[RegistryKey(key, subKey, valueName)] = value; std::wostringstream subKeyW;
subKeyW << subKey;
std::wostringstream valueNameW;
valueNameW << valueName;
g_dwordValues[RegistryKey(key, subKeyW.str(), valueNameW.str())] = value;
} }
void unsetValue(HKEY key, const char* subKey, const char* valueName) void unsetValue(HKEY key, const char* subKey, const char* valueName)
{ {
assert(key && subKey && valueName); assert(key && subKey && valueName);
g_unsetValues.insert(RegistryKey(key, subKey, valueName)); std::wostringstream subKeyW;
subKeyW << subKey;
std::wostringstream valueNameW;
valueNameW << valueName;
g_unsetValues.insert(RegistryKey(key, subKeyW.str(), valueNameW.str()));
} }
} }
} }