Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 19:05:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix someprat of Createsurface now it is working for ati readon, the code is not complete.

Browse source 
svn path=/trunk/; revision=18917
This commit is contained in:
Magnus Olsen 2005-10-31 20:08:24 +00:00
parent 341406bf3c
commit 0e0d775a1d
3 changed files with 45 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/lib/ddraw/hal/surface_hal.c
View file

@ -13,6 +13,7 @@
HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest,
LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx)
{
DX_STUB;
IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface;
IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src;

44
reactos/lib/ddraw/main/surface_main.c
View file

@ -23,16 +23,21 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC
This->owner = (IDirectDrawImpl*)pDD;
DDSURFACEDESC DDSD = *(LPDDSURFACEDESC)pDDSD2;
DDSD.dwSize = sizeof(pDDSD2);
/************ fill the discription of our primary surface ***********************/
DDSURFACEDESC ddsd;
memset (&ddsd, 0, sizeof(DDSURFACEDESC));
ddsd.dwSize = sizeof(DDSURFACEDESC);
/* FIXME Fill the rest from ddsd2 to ddsd */
/************ Test see if we can Create Surface ***********************/
if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE)
{
/* can the driver create the surface */
DDHAL_CANCREATESURFACEDATA CanCreateData;
memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA));
CanCreateData.lpDD = &This->owner->DirectDrawGlobal;
CanCreateData.lpDDSurfaceDesc = &DDSD;
CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&ddsd;
if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCreateData) == DDHAL_DRIVER_NOTHANDLED)
return DDERR_INVALIDPARAMS;
@ -41,6 +46,15 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC
return CanCreateData.ddRVal;
}
/************ Create Surface ***********************/
/* FIXME we are skipping filling in some data, I do not care for now */
LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal;
ddsd.dwFlags = DDSD_CAPS;
ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
/* surface global struct */
memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL));
This->Global.lpDD = &This->owner->DirectDrawGlobal;
@ -48,44 +62,44 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC
This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth;
This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch;
/* surface more struct */
memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE));
This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);
/* surface local struct */
memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL));
This->Local.lpGbl = &This->Global;
This->Local.lpSurfMore = &This->More;
This->Local.ddsCaps = DDSD.ddsCaps;
/* we need to set some flags if we create the primary surface */
if(pDDSD2->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE)
{
This->Local.dwFlags |= DDRAWISURF_FRONTBUFFER;
This->Global.dwGlobalFlags |= DDRAWISURFGBL_ISGDISURFACE;
}
/* FIXME do a memcopy */
This->Local.ddsCaps = *(DDSCAPS*)&ddsd.ddsCaps;
/* for the double pointer below */
DDRAWI_DDRAWSURFACE_LCL *pLocal[2];
pLocal[0] = &This->Local;
pLocal[1] = NULL; // we need this one for bad written drivers
pLocal[1] = NULL;
/* the parameter struct */
DDHAL_CREATESURFACEDATA CreateData;
memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA));
CreateData.lpDD = &This->owner->DirectDrawGlobal;
CreateData.lpDDSurfaceDesc = &DDSD;
CreateData.lpDD = pDirectDrawGlobal;
CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &ddsd;
CreateData.dwSCnt = 1;
CreateData.lplpSList = pLocal;
CreateData.ddRVal = DD_FALSE;
/* this is the call we were waiting for */
if(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateData) == DDHAL_DRIVER_NOTHANDLED)
return DDERR_INVALIDPARAMS;
/* FIXME remove the if and debug string*/
if(CreateData.ddRVal != DD_OK)
return CreateData.ddRVal;
OutputDebugString(L"This does not get hit :( ");
OutputDebugString(L"This does hit By Ati Readon but not for nvida :( ");
OutputDebugString(L"Yet ;)");
return DD_OK;
@ -123,6 +137,8 @@ HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst,
{
IDirectDrawImpl* This = (IDirectDrawImpl*)iface;
DX_STUB;
if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE)
{
return Hal_DDrawSurface_Blt( iface, rdst, src, rsrc, dwFlags, lpbltfx);

1
reactos/lib/ddraw/rosdraw.h
View file

@ -44,6 +44,7 @@ typedef struct
DDRAWI_DDRAWSURFACE_GBL Global;
DDRAWI_DDRAWSURFACE_MORE More;
DDRAWI_DDRAWSURFACE_LCL Local;
DDRAWI_DDRAWSURFACE_LCL *pLocal[2];
} IDirectDrawSurfaceImpl;