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

Full some additional Structs

Browse source 
svn path=/trunk/; revision=17247
This commit is contained in:
Maarten Bosma 2005-08-09 19:11:57 +00:00
parent 296b3402ac
commit 2afd140d2a
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
reactos/lib/ddraw/hal/ddraw.c
View file

@ -41,8 +41,9 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
This->pD3dTextureFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDSURFACEDESC) * This->D3dDriverData.dwNumTextureFormats); This->pD3dTextureFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDSURFACEDESC) * This->D3dDriverData.dwNumTextureFormats);
This->pdwFourCC = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps);
This->pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes);
This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats);
if(!DdQueryDirectDrawObject ( if(!DdQueryDirectDrawObject (
&This->DirectDrawGlobal, &This->DirectDrawGlobal,
@ -54,9 +55,19 @@ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface)
&This->D3dDriverData, &This->D3dDriverData,
&This->DriverCallbacks.D3dBufferCallbacks, &This->DriverCallbacks.D3dBufferCallbacks,
This->pD3dTextureFormats, This->pD3dTextureFormats,
This->pdwFourCC, This->DirectDrawGlobal.lpdwFourCC,
This->pvmList )) This->HalInfo.vmiData.pvmList ))
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
This->DirectDrawGlobal.vmiData.dwDisplayWidth = This->Width;
This->DirectDrawGlobal.vmiData.dwDisplayHeight = This->Height;
This->DirectDrawGlobal.vmiData.lDisplayPitch = This->Width * This->Bpp/8;
//This->DirectDrawGlobal.vmiData.ddpfDisplay; // This has to be filled
This->DirectDrawGlobal.vmiData.dwOffscreenAlign = 64;
This->DirectDrawGlobal.vmiData.dwOverlayAlign = 64;
This->DirectDrawGlobal.vmiData.dwTextureAlign = 64;
This->DirectDrawGlobal.vmiData.dwZBufferAlign = 64;
This->DirectDrawGlobal.vmiData.dwAlphaAlign = 64;
return DD_OK; return DD_OK;
} }
@ -74,8 +85,8 @@ VOID Hal_DirectDraw_Release (LPDIRECTDRAW7 iface)
if(This->pD3dTextureFormats) if(This->pD3dTextureFormats)
HeapFree(GetProcessHeap(), 0, This->pD3dTextureFormats); HeapFree(GetProcessHeap(), 0, This->pD3dTextureFormats);
if(This->pdwFourCC) if(This->DirectDrawGlobal.lpdwFourCC)
HeapFree(GetProcessHeap(), 0, This->pdwFourCC); HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpdwFourCC);
if(This->pvmList) if(This->HalInfo.vmiData.pvmList)
HeapFree(GetProcessHeap(), 0, This->pvmList); HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList);
} }

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

@ -34,10 +34,7 @@ typedef struct
DDHALINFO HalInfo; DDHALINFO HalInfo;
D3DHAL_GLOBALDRIVERDATA D3dDriverData; D3DHAL_GLOBALDRIVERDATA D3dDriverData;
LPDDSURFACEDESC pD3dTextureFormats; LPDDSURFACEDESC pD3dTextureFormats;
LPDWORD pdwFourCC;
LPVIDMEM pvmList;
HWND window; HWND window;
DWORD cooperative_level; DWORD cooperative_level;