Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixing couple of bugs in Main_DirectDraw_QueryInterface

Browse source 
1. adding create linking when u req a new directdraw interface from old one. 
   This Type of linking is exacly same lcl pointer as the linked interface,
   it mean we shall not create new lcl but use the current we got.
 
waring still bugs in DirectDraw_QueryInterface

svn path=/trunk/; revision=27208
This commit is contained in:
Magnus Olsen 2007-06-16 19:38:20 +00:00
parent 6eae3cd5e1
commit 4f6e4650de
1 changed files with 60 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
View file

@ -39,44 +39,79 @@ Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,
*/
if (IsEqualGUID(&IID_IDirectDraw7, id))
{
/* FIXME linking */
LPDDRAWI_DIRECTDRAW_INT newThis;
DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT));
/* DirectDraw7 Vtable */
This->lpVtbl = &DirectDraw7_Vtable;
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7;
*obj = &This->lpVtbl;
Main_DirectDraw_AddRef(iface);
if (newThis == NULL)
{
retVal = DDERR_OUTOFMEMORY;
}
else
{
/* DirectDraw7 Vtable */
newThis->lpVtbl = &DirectDraw7_Vtable;
newThis->lpLcl = This->lpLcl;
newThis->dwIntRefCnt = 1;
newThis->lpLink = This;
*obj = &newThis->lpVtbl;
}
}
else if (IsEqualGUID(&IID_IDirectDraw4, id))
{
/* FIXME linking */
LPDDRAWI_DIRECTDRAW_INT newThis;
DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT));
/* DirectDraw4 Vtable */
This->lpVtbl = &DirectDraw4_Vtable;
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags;
*obj = &This->lpVtbl;
Main_DirectDraw_AddRef(iface);
if (newThis == NULL)
{
retVal = DDERR_OUTOFMEMORY;
}
else
{
/* DirectDraw4 Vtable */
newThis->lpVtbl = &DirectDraw4_Vtable;
newThis->lpLcl = This->lpLcl;
newThis->dwIntRefCnt = 1;
newThis->lpLink = This;
*obj = &newThis->lpVtbl;
}
}
else if (IsEqualGUID(&IID_IDirectDraw2, id))
{
/* FIXME linking */
LPDDRAWI_DIRECTDRAW_INT newThis;
DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT));
/* DirectDraw4 Vtable */
This->lpVtbl = &DirectDraw2_Vtable;
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags;
*obj = &This->lpVtbl;
Main_DirectDraw_AddRef(iface);
if (newThis == NULL)
{
retVal = DDERR_OUTOFMEMORY;
}
else
{
/* DirectDraw4 Vtable */
newThis->lpVtbl = &DirectDraw2_Vtable;
newThis->lpLcl = This->lpLcl;
newThis->dwIntRefCnt = 1;
newThis->lpLink = This;
*obj = &newThis->lpVtbl;
}
}
else if (IsEqualGUID(&IID_IDirectDraw, id))
{
/* FIXME linking */
LPDDRAWI_DIRECTDRAW_INT newThis;
DxHeapMemAlloc(newThis, sizeof(DDRAWI_DIRECTDRAW_INT));
/* DirectDraw4 Vtable */
This->lpVtbl = &DirectDraw_Vtable;
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags;
*obj = &This->lpVtbl;
Main_DirectDraw_AddRef(iface);
if (newThis == NULL)
{
retVal = DDERR_OUTOFMEMORY;
}
else
{
/* DirectDraw4 Vtable */
newThis->lpVtbl = &DirectDraw_Vtable;
newThis->lpLcl = This->lpLcl;
newThis->dwIntRefCnt = 1;
newThis->lpLink = This;
*obj = &newThis->lpVtbl;
}
}
else
{