marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Reject IDirectDraw3 QI in ddraw.dll.

oldstable
Stefan Dösinger 2008-12-16 20:56:41 +01:00 committed by Alexandre Julliard
parent 616ea53226
commit 6ef2b65531
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ddraw/ddraw.c
View File

@ -121,8 +121,11 @@ IDirectDrawImpl_QueryInterface(IDirectDraw7 *iface,
}
else if ( IsEqualGUID( &IID_IDirectDraw3, refiid ) )
{
*obj = ICOM_INTERFACE(This, IDirectDraw3);
TRACE("(%p) Returning IDirectDraw3 interface at %p\n", This, *obj);
/* This Interface exists in ddrawex.dll, it is implemented in a wrapper */
WARN("IDirectDraw3 is not valid in ddraw.dll\n");
*obj = NULL;
LeaveCriticalSection(&ddraw_cs);
return E_NOINTERFACE;
}
else if ( IsEqualGUID( &IID_IDirectDraw2, refiid ) )
{

16
dlls/ddraw/tests/ddrawmodes.c
View File

@ -385,6 +385,21 @@ static void testcooperativelevels_exclusive(void)
/* All done */
}
static void testddraw3(void)
{
const GUID My_IID_IDirectDraw3 = {
0x618f8ad4,
0x8b7a,
0x11d0,
{ 0x8f,0xcc,0x0,0xc0,0x4f,0xd9,0x18,0x9d }
};
IDirectDraw3 *dd3;
HRESULT hr;
hr = IDirectDraw_QueryInterface(lpDD, &My_IID_IDirectDraw3, (void **) &dd3);
ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectDraw3 returned 0x%08x, expected E_NOINTERFACE\n", hr);
if(SUCCEEDED(hr) && dd3) IDirectDraw3_Release(dd3);
}
START_TEST(ddrawmodes)
{
createwindow();
@ -394,6 +409,7 @@ START_TEST(ddrawmodes)
if (winetest_interactive)
testdisplaymodes();
flushdisplaymodes();
testddraw3();
releasedirectdraw();
createdirectdraw();