Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 07:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Thx DrFred notice I did take wrong struct at alloc, I also comment up the code bit.

Browse source 
svn path=/trunk/; revision=26857
This commit is contained in:
Magnus Olsen 2007-05-21 18:49:28 +00:00
parent 30740cbe3d
commit 298cd5e094
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,6 @@ Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface,
DX_STUB_str("DDERR_OUTOFMEMORY"); DX_STUB_str("DDERR_OUTOFMEMORY");
return DDERR_OUTOFMEMORY; return DDERR_OUTOFMEMORY;
} }
This->lpLcl->lpGbl = &ddgbl;
} }
else else
{ {
@ -68,6 +67,7 @@ Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface,
/* We got the DirectDraw interface alloc and we need create the link */ /* We got the DirectDraw interface alloc and we need create the link */
LPDDRAWI_DIRECTDRAW_INT newThis; LPDDRAWI_DIRECTDRAW_INT newThis;
/* step 1.Alloc the new DDRAWI_DIRECTDRAW_INT for the lnking */
newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT));
if (newThis == NULL) if (newThis == NULL)
{ {
@ -75,7 +75,7 @@ Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface,
return DDERR_OUTOFMEMORY; return DDERR_OUTOFMEMORY;
} }
/* we need check the GUID lpGUID what type it is */ /* step 2 check if it not DDCREATE_HARDWAREONLY we got if so we fail */
if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY) if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY)
{ {
if (pGUID !=NULL) if (pGUID !=NULL)
@ -85,23 +85,24 @@ Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface,
return DDERR_INVALIDDIRECTDRAWGUID; return DDERR_INVALIDDIRECTDRAWGUID;
} }
} }
/* step 3 do the link the old interface are store in the new one */
newThis->lpLink = This; newThis->lpLink = This;
newThis->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); /* step 4 we need create new local directdraw struct for the new linked interface */
newThis->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_LCL));
if (newThis->lpLcl == NULL) if (newThis->lpLcl == NULL)
{ {
This = newThis; This = newThis;
DX_STUB_str("DDERR_OUTOFMEMORY"); DX_STUB_str("DDERR_OUTOFMEMORY");
return DDERR_OUTOFMEMORY; return DDERR_OUTOFMEMORY;
} }
RtlCopyMemory(newThis->lpLcl, This->lpLcl, sizeof(DDRAWI_DIRECTDRAW_LCL));
This = newThis; This = newThis;
DX_STUB_str("here\n");
} }
This->lpLcl->lpGbl = &ddgbl;
*pIface = (LPDIRECTDRAW)This; *pIface = (LPDIRECTDRAW)This;
/* Get right interface we whant */ /* Get right interface we whant */
@ -111,8 +112,6 @@ Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface,
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;