Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed allot compiling issue

Browse source 
svn path=/branches/reactx/; revision=29734
This commit is contained in:
Magnus Olsen 2007-10-21 13:31:39 +00:00
parent 4efa4a4b9c
commit d3527f3196
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsystems/win32/win32k/include/intddraw.h
View file

@ -101,6 +101,12 @@ typedef DWORD (NTAPI *PGD_DXDDSETOVERLAYPOSITION)(HANDLE, HANDLE, PDD_SETOVERLAY
/* From eng.c */
typedef FLATPTR (NTAPI *PGD_HEAPVIDMEMALLOCALIGNED)(LPVIDMEM, DWORD, DWORD, LPSURFACEALIGNMENT, LPLONG);
typedef VOID (NTAPI *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR);
typedef PVOID (NTAPI *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ;
typedef VOID (NTAPI *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID);
typedef DWORD (NTAPI *PGD_ENGDXIOCTL)(ULONG, PVOID, ULONG);
typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE);
typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL);
/* Standard macro */
#define DXG_GET_INDEX_FUNCTION(INDEX, FUNCTION) \

2
reactos/subsystems/win32/win32k/ntddraw/d3d.c
View file

@ -258,7 +258,7 @@ NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw,
PDD_CREATESURFACEDATA puCreateSurfaceData,
HANDLE *puhSurface)
{
PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = (PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn;
PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = (PGD_DDCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn;
if (pfnDdCreateD3DBuffer == NULL)
{

2
reactos/subsystems/win32/win32k/ntddraw/dxeng.c
View file

@ -68,7 +68,7 @@ DxEngVisRgnUniq()
/************************************************************************/
/* Enumate all drivers in win32k */
HDEV *
DxEngEnumerateHdev(HDEV *hdev);
DxEngEnumerateHdev(HDEV *hdev)
{
/* FIXME Enumate all drivers in win32k */
DPRINT1("We do not enumate any device from win32k ");

13
reactos/subsystems/win32/win32k/ntddraw/eng.c
View file

@ -33,7 +33,7 @@ HeapVidMemAllocAligned(LPVIDMEM lpVidMem,
if (pfnHeapVidMemAllocAligned == NULL)
{
DPRINT1("Warring no pfnHeapVidMemAllocAligned");
return NULL;
return 0;
}
DPRINT1("Calling on dxg.sys pfnHeapVidMemAllocAligned");
@ -104,11 +104,12 @@ EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl,
if (pfnEngFreePrivateUserMem == NULL)
{
DPRINT1("Warring no pfnEngFreePrivateUserMem");
return DDHAL_DRIVER_NOTHANDLED;
}
DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem");
return pfnEngFreePrivateUserMem(psl, pv);
else
{
DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem");
pfnEngFreePrivateUserMem(psl, pv);
}
}
/************************************************************************/
@ -132,7 +133,7 @@ EngDxIoctl(ULONG ulIoctl,
}
DPRINT1("Calling on dxg.sys pfnEngDxIoctl");
return pfnEngFreePrivateUserMem(psl, pv);
return pfnEngDxIoctl(ulIoctl, pBuffer, ulBufferSize);
}
/************************************************************************/