TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-22 11:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad assert and fail fast on bad input (#166)

Browse Source
This commit is contained in:
Anders Jenbo 2025-05-25 12:59:08 +02:00 committed by GitHub
parent bdbd0e31d7
commit ea73d76b7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
miniwin/miniwin/src/miniwin_d3drmframe.cpp
View File

@ -46,9 +46,6 @@ HRESULT Direct3DRMFrameImpl::QueryInterface(const GUID& riid, void** ppvObject)
HRESULT Direct3DRMFrameImpl::AddChild(IDirect3DRMFrame* child) HRESULT Direct3DRMFrameImpl::AddChild(IDirect3DRMFrame* child)
{ {
if (!child) {
return DDERR_GENERIC;
}
Direct3DRMFrameImpl* childImpl = static_cast<Direct3DRMFrameImpl*>(child); Direct3DRMFrameImpl* childImpl = static_cast<Direct3DRMFrameImpl*>(child);
if (childImpl->m_parent) { if (childImpl->m_parent) {
if (childImpl->m_parent == this) { if (childImpl->m_parent == this) {
@ -64,9 +61,6 @@ HRESULT Direct3DRMFrameImpl::AddChild(IDirect3DRMFrame* child)
HRESULT Direct3DRMFrameImpl::DeleteChild(IDirect3DRMFrame* child) HRESULT Direct3DRMFrameImpl::DeleteChild(IDirect3DRMFrame* child)
{ {
Direct3DRMFrameImpl* childImpl = static_cast<Direct3DRMFrameImpl*>(child); Direct3DRMFrameImpl* childImpl = static_cast<Direct3DRMFrameImpl*>(child);
if (!childImpl) {
return DDERR_GENERIC;
}
HRESULT result = m_children->DeleteElement(childImpl); HRESULT result = m_children->DeleteElement(childImpl);
if (result == DD_OK) { if (result == DD_OK) {
childImpl->m_parent = nullptr; childImpl->m_parent = nullptr;
@ -119,7 +113,6 @@ HRESULT Direct3DRMFrameImpl::GetPosition(IDirect3DRMFrame* reference, D3DVECTOR*
HRESULT Direct3DRMFrameImpl::AddVisual(IDirect3DRMVisual* visual) HRESULT Direct3DRMFrameImpl::AddVisual(IDirect3DRMVisual* visual)
{ {
SDL_assert(false); // Is this actually used?
return m_visuals->AddElement(visual); return m_visuals->AddElement(visual);
} }
@ -137,9 +130,6 @@ HRESULT Direct3DRMFrameImpl::GetVisuals(IDirect3DRMVisualArray** visuals)
HRESULT Direct3DRMFrameImpl::SetTexture(IDirect3DRMTexture* texture) HRESULT Direct3DRMFrameImpl::SetTexture(IDirect3DRMTexture* texture)
{ {
if (!texture) {
return DDERR_GENERIC;
}
auto textureImpl = static_cast<Direct3DRMTextureImpl*>(texture); auto textureImpl = static_cast<Direct3DRMTextureImpl*>(texture);
if (m_texture) { if (m_texture) {
m_texture->Release(); m_texture->Release();