Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 23:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing a crash, fixed so Setcoparative pass the test, still some werid bugs after I delete all code in ddraw.

Browse source 
anyone whant debuging this u are wellcome

svn path=/trunk/; revision=26468
This commit is contained in:
Magnus Olsen 2007-04-22 19:59:44 +00:00
parent 2189a28c87
commit eb55201ce5
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/directx/ddraw/main/ddraw_main.c
View file

@ -34,10 +34,13 @@ Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,
else else
{ {
*obj = NULL; *obj = NULL;
DX_STUB_str("E_NOINTERFACE");
return E_NOINTERFACE; return E_NOINTERFACE;
} }
Main_DirectDraw_AddRef(iface); Main_DirectDraw_AddRef(iface);
DX_STUB_str("DD_OK");
return DD_OK; return DD_OK;
} }

30
reactos/dll/directx/ddraw/startup.c
View file

@ -41,7 +41,10 @@ Create_DirectDraw (LPGUID pGUID,
This = memThis; This = memThis;
if (This == NULL) if (This == NULL)
{ {
if (memThis != NULL) DxHeapMemFree(memThis); if (memThis != NULL)
DxHeapMemFree(memThis);
DX_STUB_str("DDERR_OUTOFMEMORY");
return DDERR_OUTOFMEMORY; return DDERR_OUTOFMEMORY;
} }
} }
@ -51,13 +54,18 @@ Create_DirectDraw (LPGUID pGUID,
LPDDRAWI_DIRECTDRAW_INT newThis; LPDDRAWI_DIRECTDRAW_INT newThis;
newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT));
if (newThis == NULL) if (newThis == NULL)
{
DX_STUB_str("DDERR_OUTOFMEMORY");
return DDERR_OUTOFMEMORY; return DDERR_OUTOFMEMORY;
}
/* we need check the GUID lpGUID what type it is */ /* we need check the GUID lpGUID what type it is */
if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY) if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY)
{ {
if (pGUID !=NULL) if (pGUID !=NULL)
{ {
This = newThis; This = newThis;
DX_STUB_str("DDERR_INVALIDDIRECTDRAWGUID");
return DDERR_INVALIDDIRECTDRAWGUID; return DDERR_INVALIDDIRECTDRAWGUID;
} }
} }
@ -68,15 +76,24 @@ Create_DirectDraw (LPGUID pGUID,
/* Fixme release memory alloc if we fail */ /* Fixme release memory alloc if we fail */
This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT));
if (This->lpLcl == NULL) if (This->lpLcl == NULL)
{
DX_STUB_str("DDERR_OUTOFMEMORY");
return DDERR_OUTOFMEMORY; return DDERR_OUTOFMEMORY;
}
This->lpLcl->lpGbl = &ddgbl;
*pIface = (LPDIRECTDRAW)This; *pIface = (LPDIRECTDRAW)This;
/* Get right interface we whant */ /* Get right interface we whant */
if (Main_DirectDraw_QueryInterface((LPDIRECTDRAW7)This, id, (void**)&pIface)) if (Main_DirectDraw_QueryInterface((LPDIRECTDRAW7)This, id, (void**)&pIface) == DD_OK)
{ {
DX_STUB_str("Got iface");
if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID, FALSE) == DD_OK); if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID, FALSE) == DD_OK);
{ {
DX_STUB_str("here");
/*
RtlZeroMemory(&wnd_class, sizeof(wnd_class)); RtlZeroMemory(&wnd_class, sizeof(wnd_class));
wnd_class.style = CS_HREDRAW | CS_VREDRAW; wnd_class.style = CS_HREDRAW | CS_VREDRAW;
wnd_class.lpfnWndProc = DefWindowProcW; wnd_class.lpfnWndProc = DefWindowProcW;
@ -90,13 +107,17 @@ Create_DirectDraw (LPGUID pGUID,
wnd_class.lpszClassName = classname; wnd_class.lpszClassName = classname;
if(!RegisterClassW(&wnd_class)) if(!RegisterClassW(&wnd_class))
{ {
DX_STUB_str("DDERR_GENERIC");
return DDERR_GENERIC; return DDERR_GENERIC;
} }
*/
DX_STUB_str("DD_OK");
return DD_OK; return DD_OK;
} }
} }
DX_STUB_str("DDERR_INVALIDPARAMS");
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
} }
@ -123,6 +144,7 @@ StartDirectDraw(LPDIRECTDRAW* iface, LPGUID lpGuid, BOOL reenable)
*/ */
if (reenable == FALSE) if (reenable == FALSE)
{ {
if (This->lpLink == NULL) if (This->lpLink == NULL)
@ -141,6 +163,8 @@ StartDirectDraw(LPDIRECTDRAW* iface, LPGUID lpGuid, BOOL reenable)
} }
} }
DX_STUB_str("here");
if (reenable == FALSE) if (reenable == FALSE)
{ {
if (lpGuid == NULL) if (lpGuid == NULL)
@ -248,7 +272,7 @@ StartDirectDraw(LPDIRECTDRAW* iface, LPGUID lpGuid, BOOL reenable)
This->lpLcl->hDD = This->lpLcl->lpGbl->hDD; This->lpLcl->hDD = This->lpLcl->lpGbl->hDD;
ddgbl.hDD = This->lpLcl->lpGbl->hDD; ddgbl.hDD = This->lpLcl->lpGbl->hDD;
DX_STUB_str("DD_OK");
return DD_OK; return DD_OK;
} }