rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-13 19:29:14 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Validate supported formats in D3D9Surface::GetDC

Browse Source
This commit is contained in:
WinterSnowfall 2024-11-27 00:46:30 +02:00 committed by Robin Kertels
parent fb56668dc0
commit f23c74949a
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/d3d9/d3d9_format.h
View File

@ -255,4 +255,16 @@ namespace dxvk {
|| format == D3D9Format::DXT5;
}
// D3D9 documentation says: IDirect3DSurface9::GetDC is valid on the following formats only:
// D3DFMT_R5G6B5, D3DFMT_X1R5G5B5, D3DFMT_R8G8B8, and D3DFMT_X8R8G8B8. However,
// the equivalent formats of D3DFMT_A1R5G5B5 and D3DFMT_A8R8G8B8 are also supported.
inline bool IsSurfaceGetDCCompatibleFormat(D3D9Format format) {
return format == D3D9Format::R5G6B5
|| format == D3D9Format::X1R5G5B5
|| format == D3D9Format::A1R5G5B5
|| format == D3D9Format::R8G8B8
|| format == D3D9Format::X8R8G8B8
|| format == D3D9Format::A8R8G8B8;
}
}

11
src/d3d9/d3d9_surface.cpp
View File

@ -71,7 +71,7 @@ namespace dxvk {
}
HRESULT STDMETHODCALLTYPE D3D9Surface::QueryInterface(REFIID riid, void** ppvObject) {
if (ppvObject == nullptr)
if (unlikely(ppvObject == nullptr))
return E_POINTER;
*ppvObject = nullptr;
@ -101,7 +101,7 @@ namespace dxvk {
}
HRESULT STDMETHODCALLTYPE D3D9Surface::GetDesc(D3DSURFACE_DESC *pDesc) {
if (pDesc == nullptr)
if (unlikely(pDesc == nullptr))
return D3DERR_INVALIDCALL;
auto& desc = *(m_texture->Desc());
@ -190,11 +190,14 @@ namespace dxvk {
}
HRESULT STDMETHODCALLTYPE D3D9Surface::GetDC(HDC *phDC) {
if (phDC == nullptr)
if (unlikely(phDC == nullptr))
return D3DERR_INVALIDCALL;
const D3D9_COMMON_TEXTURE_DESC& desc = *m_texture->Desc();
if (unlikely(!IsSurfaceGetDCCompatibleFormat(desc.Format)))
return D3DERR_INVALIDCALL;
D3DLOCKED_RECT lockedRect;
HRESULT hr = LockRect(&lockedRect, nullptr, 0);
if (FAILED(hr))
@ -228,7 +231,7 @@ namespace dxvk {
}
HRESULT STDMETHODCALLTYPE D3D9Surface::ReleaseDC(HDC hDC) {
if (m_dcDesc.hDC == nullptr || m_dcDesc.hDC != hDC)
if (unlikely(m_dcDesc.hDC == nullptr || m_dcDesc.hDC != hDC))
return D3DERR_INVALIDCALL;
D3DKMTDestroyDCFromMemory(&m_dcDesc);