From ea73d76b7db088cd6d9753ea13b8666670eb8b3d Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 25 May 2025 12:59:08 +0200 Subject: [PATCH] Fix bad assert and fail fast on bad input (#166) --- miniwin/miniwin/src/miniwin_d3drmframe.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/miniwin/miniwin/src/miniwin_d3drmframe.cpp b/miniwin/miniwin/src/miniwin_d3drmframe.cpp index b034a95e..325f23e4 100644 --- a/miniwin/miniwin/src/miniwin_d3drmframe.cpp +++ b/miniwin/miniwin/src/miniwin_d3drmframe.cpp @@ -46,9 +46,6 @@ HRESULT Direct3DRMFrameImpl::QueryInterface(const GUID& riid, void** ppvObject) HRESULT Direct3DRMFrameImpl::AddChild(IDirect3DRMFrame* child) { - if (!child) { - return DDERR_GENERIC; - } Direct3DRMFrameImpl* childImpl = static_cast(child); if (childImpl->m_parent) { if (childImpl->m_parent == this) { @@ -64,9 +61,6 @@ HRESULT Direct3DRMFrameImpl::AddChild(IDirect3DRMFrame* child) HRESULT Direct3DRMFrameImpl::DeleteChild(IDirect3DRMFrame* child) { Direct3DRMFrameImpl* childImpl = static_cast(child); - if (!childImpl) { - return DDERR_GENERIC; - } HRESULT result = m_children->DeleteElement(childImpl); if (result == DD_OK) { childImpl->m_parent = nullptr; @@ -119,7 +113,6 @@ HRESULT Direct3DRMFrameImpl::GetPosition(IDirect3DRMFrame* reference, D3DVECTOR* HRESULT Direct3DRMFrameImpl::AddVisual(IDirect3DRMVisual* visual) { - SDL_assert(false); // Is this actually used? return m_visuals->AddElement(visual); } @@ -137,9 +130,6 @@ HRESULT Direct3DRMFrameImpl::GetVisuals(IDirect3DRMVisualArray** visuals) HRESULT Direct3DRMFrameImpl::SetTexture(IDirect3DRMTexture* texture) { - if (!texture) { - return DDERR_GENERIC; - } auto textureImpl = static_cast(texture); if (m_texture) { m_texture->Release();