Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 23:32:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

implemet follow for the callback interface videoport in gdi32.dll/win32/gdi32/misc/gdientry.c

Browse source 
DvpCreateVideoPort, DvpDestroyVideoPort, DvpFlipVideoPort 
Bugfix : DdGetDriverInfo for the videoport callback interface set the pUserDvdPort->dwFlags right 8not tested in windows yet)
Bugfix : DdQueryDirectDrawObject forget two d3d* callbacks to setup propert to user mode.




svn path=/trunk/; revision=32484
This commit is contained in:
Magnus Olsen 2008-02-25 22:21:33 +00:00
parent 3b1a6d89ac
commit 8779081ea2
1 changed files with 55 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

62
reactos/dll/win32/gdi32/misc/gdientry.c
View file

@ -484,6 +484,51 @@ DdGetScanLine(LPDDHAL_GETSCANLINEDATA pGetScanLine)
(PDD_GETSCANLINEDATA)pGetScanLine); (PDD_GETSCANLINEDATA)pGetScanLine);
} }
/*
* @implemented
*
* DvpCreateVideoPort
*/
BOOL
WINAPI
DvpCreateVideoPort(LPDDHAL_CREATEVPORTDATA pDvdCreatePort)
{
pDvdCreatePort->lpVideoPort->hDDVideoPort =
NtGdiDvpCreateVideoPort(GetDdHandle(pDvdCreatePort->lpDD->lpGbl->hDD),
(PDD_CREATEVPORTDATA) pDvdCreatePort);
return TRUE;
}
/*
* @implemented
*
* DvpCreateVideoPort
*/
DWORD
WINAPI
DvpDestroyVideoPort(LPDDHAL_DESTROYVPORTDATA pDvdDestoryPort)
{
return NtGdiDvpDestroyVideoPort(pDvdDestoryPort->lpVideoPort->hDDVideoPort, (PDD_DESTROYVPORTDATA)pDvdDestoryPort);
}
/*
* @implemented
*
* DvpCreateVideoPort
*/
DWORD
WINAPI
DvpFlipVideoPort(LPDDHAL_FLIPVPORTDATA pDvdPortFlip)
{
return NtGdiDvpFlipVideoPort(pDvdPortFlip->lpVideoPort->hDDVideoPort,
(HANDLE)pDvdPortFlip->lpSurfCurr->hDDSurface,
(HANDLE)pDvdPortFlip->lpSurfTarg->hDDSurface,
(PDD_FLIPVPORTDATA) pDvdPortFlip);
}
DWORD DWORD
WINAPI WINAPI
DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData)
@ -520,12 +565,15 @@ DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData)
/* Setup user out buffer and convert kmode callbacks to user mode */ /* Setup user out buffer and convert kmode callbacks to user mode */
pUserDvdPort->dwSize = DDVIDEOPORTCALLBACKSSIZE; pUserDvdPort->dwSize = DDVIDEOPORTCALLBACKSSIZE;
// FIXME setup the flags pUserDvdPort->dwFlags = (pDvdPortInfo.dwFlags & ~(DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP |
// pUserDvdPort->dwFlags = eax; DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE | DDHAL_VPORT32_WAITFORSYNC)) |
(DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP |
DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE);
pData->dwActualSize = DDVIDEOPORTCALLBACKSSIZE; pData->dwActualSize = DDVIDEOPORTCALLBACKSSIZE;
pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) NULL; // FIXME : DvpCreateVideoPort pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) DvpCreateVideoPort;
pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) NULL; // FIXME : DvpFlipVideoPort pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) DvpFlipVideoPort;
pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) NULL; // FIXME : DvpDestroyVideoPort pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) DvpDestroyVideoPort;
pUserDvdPort->UpdateVideoPort = (LPDDHALVPORTCB_UPDATE) NULL; // FIXME : DvpUpdateVideoPort pUserDvdPort->UpdateVideoPort = (LPDDHALVPORTCB_UPDATE) NULL; // FIXME : DvpUpdateVideoPort
if (pDvdPort.CanCreateVideoPort) if (pDvdPort.CanCreateVideoPort)
@ -1120,7 +1168,7 @@ DdQueryDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
if ( D3dBufferCallbacks.DestroyD3DBuffer ) if ( D3dBufferCallbacks.DestroyD3DBuffer )
{ {
pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) NULL; //DdDestroyD3DBuffer; pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) DdDestroyD3DBuffer;
} }
if ( D3dBufferCallbacks.LockD3DBuffer ) if ( D3dBufferCallbacks.LockD3DBuffer )
@ -1130,7 +1178,7 @@ DdQueryDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
if ( D3dBufferCallbacks.UnlockD3DBuffer ) if ( D3dBufferCallbacks.UnlockD3DBuffer )
{ {
pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) NULL; //DdUnlockD3D; pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D;
} }
} }