backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

add NULL checks to QueryInterface

Browse Source
This commit is contained in:
FunkyFr3sh 2024-08-31 11:12:39 +02:00
parent 004951a940
commit 248b62a332
5 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/IDirectDraw/IDirectDraw.c
View File

@ -18,7 +18,11 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid
HRESULT ret = E_NOINTERFACE; HRESULT ret = E_NOINTERFACE;
if (riid) if (!ppvObj)
{
ret = E_INVALIDARG;
}
else if (riid)
{ {
if (IsEqualGUID(&IID_IDirectDraw2, riid) || if (IsEqualGUID(&IID_IDirectDraw2, riid) ||
IsEqualGUID(&IID_IDirectDraw4, riid) || IsEqualGUID(&IID_IDirectDraw4, riid) ||

6
src/IDirectDraw/IDirectDrawClipper.c
View File

@ -14,6 +14,12 @@ HRESULT __stdcall IDirectDrawClipper__QueryInterface(IDirectDrawClipperImpl* Thi
_ReturnAddress()); _ReturnAddress());
HRESULT ret = E_NOINTERFACE; HRESULT ret = E_NOINTERFACE;
if (!ppvObj)
{
ret = E_INVALIDARG;
}
TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__);
return ret; return ret;
} }

6
src/IDirectDraw/IDirectDrawGammaControl.c
View File

@ -13,6 +13,12 @@ HRESULT __stdcall IDirectDrawGammaControl__QueryInterface(IDirectDrawGammaContro
_ReturnAddress()); _ReturnAddress());
HRESULT ret = E_NOINTERFACE; HRESULT ret = E_NOINTERFACE;
if (!ppvObj)
{
ret = E_INVALIDARG;
}
TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__);
return ret; return ret;
} }

6
src/IDirectDraw/IDirectDrawPalette.c
View File

@ -15,6 +15,12 @@ HRESULT __stdcall IDirectDrawPalette__QueryInterface(IDirectDrawPaletteImpl* Thi
_ReturnAddress()); _ReturnAddress());
HRESULT ret = E_NOINTERFACE; HRESULT ret = E_NOINTERFACE;
if (!ppvObj)
{
ret = E_INVALIDARG;
}
TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__);
return ret; return ret;
} }

6
src/IDirectDraw/IDirectDrawSurface.c
View File

@ -11,7 +11,11 @@ HRESULT __stdcall IDirectDrawSurface__QueryInterface(IDirectDrawSurfaceImpl* Thi
TRACE("-> %s(This=%p, riid=%08X, ppvObj=%p) [%p]\n", __FUNCTION__, This, (unsigned int)riid, ppvObj, _ReturnAddress()); TRACE("-> %s(This=%p, riid=%08X, ppvObj=%p) [%p]\n", __FUNCTION__, This, (unsigned int)riid, ppvObj, _ReturnAddress());
HRESULT ret = S_OK; HRESULT ret = S_OK;
if (riid) if (!ppvObj)
{
ret = E_INVALIDARG;
}
else if (riid)
{ {
if (IsEqualGUID(&IID_IDirectDrawSurface, riid) || if (IsEqualGUID(&IID_IDirectDrawSurface, riid) ||
IsEqualGUID(&IID_IDirectDrawSurface2, riid) || IsEqualGUID(&IID_IDirectDrawSurface2, riid) ||