Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[greatlrd] 29569: finish the redirect of dxg.sys for the d3d part
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 22:14:04 2007 New Revision: 29569 URL: http://svn.reactos.org/svn/reactos?rev=29569&view=rev Log: finish the redirect of dxg.sys for the d3d part Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sun Oct 14 22:14:04 2007 @@ -8,6 +8,10 @@ * 19/1-2006 Magnus Olsen */ +/* Comment + * NtGdiDdLock and NtGdiDdLockD3D at end calls to same api in the dxg.sys + * NtGdiDdUnlock and NtGdiDdUnlockD3D at end calls to same api in the dxg.sys + */ #include <w32k.h> #include <reactos/drivers/directx/dxg.h> @@ -22,7 +26,8 @@ extern PDRVFN gpDxFuncs; - +typedef DWORD (NTAPI *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA); +typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA); typedef DWORD (NTAPI *PGD_D3DVALIDATETEXTURESTAGESTATE)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); typedef DWORD (NTAPI *PGD_D3DDRAWPRIMITIVES2)(HANDLE, HANDLE, LPD3DNTHAL_DRAWPRIMITIVES2DATA, FLATPTR *, DWORD *, FLATPTR *, DWORD *); typedef DWORD (NTAPI *PGD_DDCREATED3DBUFFER)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *); @@ -43,6 +48,13 @@ } \ } + + + + +/************************************************************************/ +/* NtGdiD3dContextCreate */ +/************************************************************************/ BOOL STDCALL NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, @@ -65,6 +77,9 @@ return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } +/************************************************************************/ +/* NtGdiD3dContextDestroy */ +/************************************************************************/ DWORD STDCALL NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData) @@ -84,6 +99,9 @@ return pfnD3dContextDestroy(pContextDestroyData); } +/************************************************************************/ +/* NtGdiD3dContextDestroyAll */ +/************************************************************************/ DWORD STDCALL NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad) @@ -102,53 +120,10 @@ DPRINT1("Calling on dxg.sys D3dContextDestroyAll"); return pfnD3dContextDestroyAll(pdcad); } - -DWORD -STDCALL -NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData) -{ - PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dValidateTextureStageState, pfnD3dValidateTextureStageState); - - if (pfnD3dValidateTextureStageState == NULL) - { - DPRINT1("Warring no pfnD3dValidateTextureStageState"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dValidateTextureStageState"); - return pfnD3dValidateTextureStageState(pData); -} - -DWORD -STDCALL -NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf, - HANDLE hVBuf, - LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, - FLATPTR *pfpVidMemCmd, - DWORD *pdwSizeCmd, - FLATPTR *pfpVidMemVtx, - DWORD *pdwSizeVtx) -{ - PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dDrawPrimitives2, pfnD3dDrawPrimitives2); - - if (pfnD3dDrawPrimitives2 == NULL) - { - DPRINT1("Warring no pfnD3dDrawPrimitives2"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dDrawPrimitives2"); - return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); -} - - - + +/************************************************************************/ +/* NtGdiDdCreateD3DBuffer */ +/************************************************************************/ DWORD STDCALL NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw, @@ -178,3 +153,101 @@ puCreateSurfaceData, puhSurface); } +/************************************************************************/ +/* NtGdiD3dDrawPrimitives2 */ +/************************************************************************/ +DWORD +STDCALL +NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf, + HANDLE hVBuf, + LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, + FLATPTR *pfpVidMemCmd, + DWORD *pdwSizeCmd, + FLATPTR *pfpVidMemVtx, + DWORD *pdwSizeVtx) +{ + PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dDrawPrimitives2, pfnD3dDrawPrimitives2); + + if (pfnD3dDrawPrimitives2 == NULL) + { + DPRINT1("Warring no pfnD3dDrawPrimitives2"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys D3dDrawPrimitives2"); + return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); +} + + +/************************************************************************/ +/* NtGdiD3dValidateTextureStageState */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdLockD3D(HANDLE hSurface, + PDD_LOCKDATA puLockData) +{ + PGD_DXDDLOCKD3D pfnDdLockD3D = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockD3D, pfnDdLockD3D); + + if (pfnD3dValidateTextureStageState == NULL) + { + DPRINT1("Warring no pfnDdLockD3D"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdLockD3D"); + return pfnDdLockD3D(hSurface, puLockData); +} + +/************************************************************************/ +/* NtGdiD3dValidateTextureStageState */ +/************************************************************************/ +DWORD +STDCALL +NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData) +{ + PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dValidateTextureStageState, pfnD3dValidateTextureStageState); + + if (pfnD3dValidateTextureStageState == NULL) + { + DPRINT1("Warring no pfnD3dValidateTextureStageState"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys D3dValidateTextureStageState"); + return pfnD3dValidateTextureStageState(pData); +} + +DWORD +STDCALL +NtGdiDdUnlockD3D(HANDLE hSurface, + PDD_UNLOCKDATA puUnlockData) +{ + PGD_DXDDUNLOCKD3D pfnDdUnlockD3D = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockD3D, pfnDdUnlockD3D); + + if (pfnD3dValidateTextureStageState == NULL) + { + DPRINT1("Warring no pfnDdUnlockD3D"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdUnlockD3D"); + return pfnDdUnlockD3D(hSurface, puUnlockData); + +} + + + + Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/stubs.c Sun Oct 14 22:14:04 2007 @@ -55,15 +55,7 @@ return 0; } -DWORD STDCALL NtGdiDdLockD3D( - HANDLE hSurface, - PDD_LOCKDATA puLockData -) -{ - UNIMPLEMENTED - return 0; -} BOOL STDCALL NtGdiDdReleaseDC( HANDLE hSurface @@ -102,15 +94,7 @@ UNIMPLEMENTED } -DWORD STDCALL NtGdiDdUnlockD3D( - HANDLE hSurface, - PDD_UNLOCKDATA puUnlockData -) -{ - UNIMPLEMENTED - return 0; -} /* EOF */

1 0

[greatlrd] 29568: adding more redirect for dvp interface to dxg
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 21:49:55 2007 New Revision: 29568 URL: http://svn.reactos.org/svn/reactos?rev=29568&view=rev Log: adding more redirect for dvp interface to dxg Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Sun Oct 14 21:49:55 2007 @@ -22,6 +22,12 @@ extern PDRVFN gpDxFuncs; + +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(hDirectDraw, puGetVPortFlipStatusData); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTINPUTFORMATS)(HANDLE, PDD_GETVPORTINPUTFORMATDATA); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTLINE)(HANDLE, PDD_GETVPORTLINEDATA); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)(HANDLE, PDD_GETVPORTOUTPUTFORMATDATA); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTCONNECTINFO)(HANDLE, PDD_GETVPORTCONNECTDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA); typedef DWORD (NTAPI *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA); typedef DWORD (NTAPI *PGD_DXDVPWAITFORVIDEOPORTSYNC)(hVideoPort, puWaitForVPortSyncData); @@ -110,7 +116,19 @@ NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) { - + PGD_DXDVPGETVIDEOPORTFLIPSTATUS pfnDvpGetVideoPortFlipStatus = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortFlipStatus, pfnDvpGetVideoPortFlipStatus); + + if (pfnDvpGetVideoPortFlipStatus == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortFlipStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortFlipStatus"); + return pfnDvpGetVideoPortFlipStatus(hDirectDraw, puGetVPortFlipStatusData); } @@ -122,7 +140,19 @@ NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) { - + PGD_DXDVPGETVIDEOPORTINPUTFORMATS pfnDvpGetVideoPortInputFormats = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortInputFormats, pfnDvpGetVideoPortInputFormats); + + if (pfnDvpGetVideoPortInputFormats == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortInputFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortInputFormats"); + return pfnDvpGetVideoPortInputFormats(hVideoPort, puGetVPortInputFormatData); } @@ -134,7 +164,19 @@ NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, PDD_GETVPORTLINEDATA puGetVPortLineData) { - + PGD_DXDVPGETVIDEOPORTLINE pfnDvpGetVideoPortLine = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortLine, pfnDvpGetVideoPortLine); + + if (pfnDvpGetVideoPortLine == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortLine"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortLine"); + return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortLineData); } @@ -146,7 +188,20 @@ NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) { - + PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS pfnDvpGetVideoPortOutputFormats = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortOutputFormats, puGetVPortOutputFormatData); + + if (pfnDvpGetVideoSignalStatus == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortOutputFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortOutputFormats"); + return pfnDvpGetVideoPortOutputFormats(hVideoPort, puGetVPortOutputFormatData); + } @@ -158,7 +213,19 @@ NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, PDD_GETVPORTCONNECTDATA puGetVPortConnectData) { - + PGD_DXDVPGETVIDEOPORTCONNECTINFO pfnDvpGetVideoPortConnectInfo = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortConnectInfo, pfnDvpGetVideoPortConnectInfo); + + if (pfnDvpGetVideoPortConnectInfo == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortConnectInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortConnectInfo"); + return pfnDvpGetVideoPortConnectInfo(hVideoPort, puGetVPortConnectData); }

1 0

[greatlrd] 29567: move all dvp stub to dvp.c start redirect all to dxg.sys
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 20:19:56 2007 New Revision: 29567 URL: http://svn.reactos.org/svn/reactos?rev=29567&view=rev Log: move all dvp stub to dvp.c start redirect all to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Sun Oct 14 20:19:56 2007 @@ -17,11 +17,298 @@ #include <debug.h> /********************************************************************************/ -/* DVD interface from DXG.SYS */ +/* DVP interface from DXG.SYS */ /********************************************************************************/ extern PDRVFN gpDxFuncs; - - - +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA); +typedef DWORD (NTAPI *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA); +typedef DWORD (NTAPI *PGD_DXDVPWAITFORVIDEOPORTSYNC)(hVideoPort, puWaitForVPortSyncData); +typedef DWORD (NTAPI *PGD_DXDVPACQUIRENOTIFICATION)(HANDLE, HANDLE*, LPDDVIDEOPORTNOTIFY); +typedef DWORD (NTAPI *PGD_DXDVPRELEASENOTIFICATION)(HANDLE, HANDLE); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFIELD)(HANDLE, PDD_GETVPORTFIELDDATA); + + + +/************************************************************************/ +/* NtGdiDvpCanCreateVideoPort */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpCanCreateVideoPort(hDirectDraw, + PDD_CANCREATEVPORTDATA puCanCreateVPortData) +{ + +} + +/************************************************************************/ +/* NtGdiDvpColorControl */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpColorControl(HANDLE hVideoPort, + PDD_VPORTCOLORDATA puVPortColorData) +{ + +} + +/************************************************************************/ +/* NtGdiDvpCreateVideoPort */ +/************************************************************************/ +HANDLE +STDCALL +NtGdiDvpCreateVideoPort(HANDLE hDirectDraw, + PDD_CREATEVPORTDATA puCreateVPortData) +{ + +} + +/************************************************************************/ +/* NtGdiDvpDestroyVideoPort */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpDestroyVideoPort(HANDLE hVideoPort, + PDD_DESTROYVPORTDATA puDestroyVPortData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpFlipVideoPort */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpFlipVideoPort(HANDLE hVideoPort, + HANDLE hDDSurfaceCurrent, + HANDLE hDDSurfaceTarget, + PDD_FLIPVPORTDATA puFlipVPortData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortBandwidth */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort, + PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortFlipStatus */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, + PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortInputFormats */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, + PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortLine */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, + PDD_GETVPORTLINEDATA puGetVPortLineData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortOutputFormats */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, + PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortConnectInfo */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, + PDD_GETVPORTCONNECTDATA puGetVPortConnectData) +{ + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoSignalStatus */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort, + PDD_GETVPORTSIGNALDATA puGetVPortSignalData) +{ + PGD_DXDVPGETVIDEOSIGNALSTATUS pfnDvpGetVideoSignalStatus = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoSignalStatus, pfnDvpGetVideoSignalStatus); + + if (pfnDvpGetVideoSignalStatus == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoSignalStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoSignalStatus"); + return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortSignalData); + +} + + +/************************************************************************/ +/* NtGdiDvpUpdateVideoPort */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpUpdateVideoPort(HANDLE hVideoPort, + HANDLE* phSurfaceVideo, + HANDLE* phSurfaceVbi, + PDD_UPDATEVPORTDATA puUpdateVPortData) +{ + PGD_DXDVPUPDATEVIDEOPORT pfnDvpUpdateVideoPort = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpUpdateVideoPort, pfnDvpUpdateVideoPort); + + if (pfnDvpUpdateVideoPort == NULL) + { + DPRINT1("Warring no pfnDvpUpdateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpUpdateVideoPort"); + return pfnDvpUpdateVideoPort(hVideoPort, phSurfaceVideo, phSurfaceVbi, puUpdateVPortData); + +} + + +/************************************************************************/ +/* NtGdiDvpWaitForVideoPortSync */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort, + PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) +{ + PGD_DXDVPWAITFORVIDEOPORTSYNC pfnDvpWaitForVideoPortSync = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpWaitForVideoPortSync, pfnDvpWaitForVideoPortSync); + + if (pfnDvpWaitForVideoPortSync == NULL) + { + DPRINT1("Warring no pfnDvpWaitForVideoPortSync"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpWaitForVideoPortSync"); + return pfnDvpWaitForVideoPortSync(hVideoPort, puWaitForVPortSyncData); +} + + +/************************************************************************/ +/* NtGdiDvpAcquireNotification */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpAcquireNotification(HANDLE hVideoPort, + HANDLE* hEvent, + LPDDVIDEOPORTNOTIFY pNotify) +{ + PGD_DXDVPACQUIRENOTIFICATION pfnDvpAcquireNotification = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpAcquireNotification, pfnDvpAcquireNotification); + + if (pfnDvpAcquireNotification == NULL) + { + DPRINT1("Warring no pfnDvpAcquireNotification"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpAcquireNotification"); + return pfnDvpAcquireNotification(hVideoPort, hEvent, pNotify); +} + + +/************************************************************************/ +/* NtGdiDvpReleaseNotification */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpReleaseNotification(HANDLE hVideoPort, + HANDLE hEvent) +{ + PGD_DXDVPRELEASENOTIFICATION pfnDvpReleaseNotification = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpReleaseNotification, pfnDvpReleaseNotification); + + if (pfnDvpReleaseNotification == NULL) + { + DPRINT1("Warring no pfnDvpReleaseNotification"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpReleaseNotification"); + return pfnDvpReleaseNotification(hVideoPort, hEvent); + +} + + +/************************************************************************/ +/* NtGdiDvpGetVideoPortField */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDvpGetVideoPortField(HANDLE hVideoPort, + PDD_GETVPORTFIELDDATA puGetVPortFieldData) +{ + PGD_DXDVPGETVIDEOPORTFIELD pfnDvpGetVideoPortField = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortField, pfnDvpGetVideoPortField); + + if (pfnDvpGetVideoPortField == NULL) + { + DPRINT1("Warring no pfnDvpGetVideoPortField"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortField"); + return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); + +} + Modified: branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c Sun Oct 14 20:19:56 2007 @@ -1973,88 +1973,6 @@ /* * @unimplemented */ -DWORD -STDCALL -NtGdiDvpCanCreateVideoPort( - IN HANDLE hDirectDraw, - IN OUT PDD_CANCREATEVPORTDATA puCanCreateVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpColorControl( - IN HANDLE hVideoPort, - IN OUT PDD_VPORTCOLORDATA puVPortColorData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -HANDLE -STDCALL -NtGdiDvpCreateVideoPort( - IN HANDLE hDirectDraw, - IN OUT PDD_CREATEVPORTDATA puCreateVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpDestroyVideoPort( - IN HANDLE hVideoPort, - IN OUT PDD_DESTROYVPORTDATA puDestroyVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpFlipVideoPort( - IN HANDLE hVideoPort, - IN HANDLE hDDSurfaceCurrent, - IN HANDLE hDDSurfaceTarget, - IN OUT PDD_FLIPVPORTDATA puFlipVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortBandwidth( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ HBRUSH STDCALL NtGdiClearBrushAttributes( @@ -2143,147 +2061,6 @@ - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortFlipStatus( - IN HANDLE hDirectDraw, - IN OUT PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortInputFormats( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortLine( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTLINEDATA puGetVPortLineData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortOutputFormats( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoPortConnectInfo( - IN HANDLE hDirectDraw, - IN OUT PDD_GETVPORTCONNECTDATA puGetVPortConnectData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpGetVideoSignalStatus( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTSIGNALDATA puGetVPortSignalData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpUpdateVideoPort( - IN HANDLE hVideoPort, - IN HANDLE* phSurfaceVideo, - IN HANDLE* phSurfaceVbi, - IN OUT PDD_UPDATEVPORTDATA puUpdateVPortData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpWaitForVideoPortSync( - IN HANDLE hVideoPort, - IN OUT PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpAcquireNotification( - IN HANDLE hVideoPort, - IN OUT HANDLE* hEvent, - IN LPDDVIDEOPORTNOTIFY pNotify) -{ - UNIMPLEMENTED; - return 0; -} - - - /* - * @unimplemented - */ -DWORD -STDCALL -NtGdiDvpReleaseNotification( - IN HANDLE hVideoPort, - IN HANDLE hEvent) -{ - UNIMPLEMENTED; - return 0; -} @@ -2604,18 +2381,6 @@ return 0; } - /* - * @unimplemented - */ - DWORD -STDCALL -NtGdiDvpGetVideoPortField( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTFIELDDATA puGetVPortFieldData) -{ - UNIMPLEMENTED; - return 0; -} /*

1 0

[greatlrd] 29566: add empty file for directx video port control interface
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 19:18:29 2007 New Revision: 29566 URL: http://svn.reactos.org/svn/reactos?rev=29566&view=rev Log: add empty file for directx video port control interface Added: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (with props) Modified: branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild Added: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (added) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Sun Oct 14 19:18:29 2007 @@ -1,0 +1,27 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native DirectDraw implementation + * FILE: subsys/win32k/ntddraw/dvd.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 19/1-2006 Magnus Olsen + */ + + +#include <w32k.h> +#include <reactos/drivers/directx/dxg.h> + +//#define NDEBUG +#include <debug.h> + +/********************************************************************************/ +/* DVD interface from DXG.SYS */ +/********************************************************************************/ + +extern PDRVFN gpDxFuncs; + + + + Propchange: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild Sun Oct 14 19:18:29 2007 @@ -97,6 +97,7 @@ <file>dd.c</file> <file>ddsurf.c</file> <file>d3d.c</file> + <file>dvp.c</file> <file>mocomp.c</file> <file>stubs.c</file> </directory>

1 0

[greatlrd] 29565: redirect whole dd interface to dxg.sys
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 19:03:13 2007 New Revision: 29565 URL: http://svn.reactos.org/svn/reactos?rev=29565&view=rev Log: redirect whole dd interface to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c Sun Oct 14 19:03:13 2007 @@ -18,20 +18,15 @@ extern PDRVFN gpDxFuncs; -// PDD_DESTROYDRIVER DestroyDriver; -// PDD_CREATESURFACE CreateSurface; +/* is not longer in use PDD_DESTROYDRIVER DestroyDriver */ +typedef DWORD (NTAPI *PGD_DDCREATESURFACE)(HANDLE, HANDLE *, DDSURFACEDESC *, DD_SURFACE_GLOBAL *, DD_SURFACE_LOCAL *, DD_SURFACE_MORE *, PDD_CREATESURFACEDATA , HANDLE *); /* see ddsurf.c for PDD_SETCOLORKEY SetColorKey; */ -// PDD_SETMODE SetMode; -// PDD_WAITFORVERTICALBLANK WaitForVerticalBlank; +/* is not longer in use PDD_SETMODE SetMode; */ +typedef DWORD (NTAPI *PGD_DXDDWAITFORVERTICALBLANK)(HANDLE, PDD_WAITFORVERTICALBLANKDATA); typedef DWORD (NTAPI *PGD_DDCANCREATESURFACE)(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData); -// PDD_CREATEPALETTE CreatePalette; -// PDD_GETSCANLINE GetScanLine; -// PDD_MAPMEMORY MapMemory; - - - - - +/* is not longer in use PDD_CREATEPALETTE CreatePalette; */ +typedef DWORD (NTAPI *PGD_DXDDGETSCANLINE)(HANDLE, PDD_GETSCANLINEDATA); +/* is not longer in use PDD_MAPMEMORY MapMemory; */ #define DXG_GET_INDEX_FUNCTION(INDEX, FUNCTION) \ if (gpDxFuncs) \ @@ -47,6 +42,62 @@ } +/************************************************************************/ +/* NtGdiDdCreateSurface */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdCreateSurface(HANDLE hDirectDrawLocal, + HANDLE *hSurface, + DDSURFACEDESC *puSurfaceDescription, + DD_SURFACE_GLOBAL *puSurfaceGlobalData, + DD_SURFACE_LOCAL *puSurfaceLocalData, + DD_SURFACE_MORE *puSurfaceMoreData, + PDD_CREATESURFACEDATA puCreateSurfaceData, + HANDLE *puhSurface) +{ + PGD_DDCREATESURFACE pfnDdCreateSurface = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateSurface, pfnDdCreateSurface); + + if (pfnDdCreateSurface == NULL) + { + DPRINT1("Warring no pfnDdCreateSurface"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdCreateSurface"); + return pfnDdCreateSurface(hDirectDrawLocal,hSurface,puSurfaceDescription,puSurfaceGlobalData, + puSurfaceLocalData,puSurfaceMoreData,puCreateSurfaceData,puhSurface); +} + +/************************************************************************/ +/* NtGdiDdWaitForVerticalBlank */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw, + PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData) +{ + PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdWaitForVerticalBlank, pfnDdWaitForVerticalBlank); + + if (pfnDdWaitForVerticalBlank == NULL) + { + DPRINT1("Warring no pfnDdWaitForVerticalBlank"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdWaitForVerticalBlank"); + return pfnDdWaitForVerticalBlank(hDirectDraw, puWaitForVerticalBlankData); +} + +/************************************************************************/ +/* NtGdiDdCanCreateSurface */ +/************************************************************************/ DWORD STDCALL NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal, @@ -67,511 +118,27 @@ return pfnDdCanCreateSurface(hDirectDrawLocal,puCanCreateSurfaceData); } +/************************************************************************/ +/* NtGdiDdGetScanLine */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdGetScanLine(HANDLE hDirectDrawLocal, + PDD_GETSCANLINEDATA puGetScanLineData) +{ + PGD_DXDDGETSCANLINE pfnDdGetScanLine = NULL; + INT i; + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetScanLine, pfnDdGetScanLine); - - - - - - - - - - - - - - - - - - - - - - -#define DdHandleTable GdiHandleTable - -/* - DdMapMemory, DdDestroyDriver are not exported as NtGdi calls - This file is complete for DD_CALLBACKS setup - - TODO: Fix the NtGdiDdCreateSurface (something is missing in - either GdiEntry or GdiEntry's callback for DdCreateSurface) -*/ - -/************************************************************************/ -/* NtGdiDdCreateSurface */ -/* Status : Bugs out */ -/************************************************************************/ - -DWORD STDCALL NtGdiDdCreateSurface( - HANDLE hDirectDrawLocal, - HANDLE *hSurface, - DDSURFACEDESC *puSurfaceDescription, - DD_SURFACE_GLOBAL *puSurfaceGlobalData, - DD_SURFACE_LOCAL *puSurfaceLocalData, - DD_SURFACE_MORE *puSurfaceMoreData, - PDD_CREATESURFACEDATA puCreateSurfaceData, - HANDLE *puhSurface -) -{ - INT i; - DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; - NTSTATUS Status = FALSE; - PDD_DIRECTDRAW pDirectDraw; - PDD_SURFACE phsurface; - - PDD_SURFACE_LOCAL pLocal; - PDD_SURFACE_MORE pMore; - PDD_SURFACE_GLOBAL pGlobal; - - DD_CREATESURFACEDATA CreateSurfaceData; - - /* FIXME: Alloc as much as needed */ - PHANDLE *myhSurface; - - /* GCC4 gives warnings about uninitialized - values, but they are initialized in SEH */ - - DPRINT1("NtGdiDdCreateSurface\n"); - - DPRINT1("Copy puCreateSurfaceData to kmode CreateSurfaceData\n"); - _SEH_TRY + if (pfnDdGetScanLine == NULL) { - ProbeForRead(puCreateSurfaceData, sizeof(DD_CREATESURFACEDATA), 1); - RtlCopyMemory( &CreateSurfaceData, puCreateSurfaceData, - sizeof( DD_CREATESURFACEDATA ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return ddRVal; + DPRINT1("Warring no pfnDdGetScanLine"); + return DDHAL_DRIVER_NOTHANDLED; } - /* FIXME: There is only support for one surface at the moment. - This is a hack to prevent more than one surface creation */ - if (CreateSurfaceData.dwSCnt > 1) - { - DPRINT1("HACK: Limiting quantity of created surfaces from %d to 1!\n", - CreateSurfaceData.dwSCnt); - CreateSurfaceData.dwSCnt = 1; - } - - - DPRINT1("Setup surface in put handler\n"); - myhSurface = ExAllocatePool(PagedPool, CreateSurfaceData.dwSCnt * sizeof(HANDLE)); - - _SEH_TRY - { - ProbeForRead(hSurface, CreateSurfaceData.dwSCnt * sizeof(HANDLE), 1); - for (i=0;i<CreateSurfaceData.dwSCnt;i++) - { - myhSurface[i] = hSurface[i]; - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return ddRVal; - } - - /* Check if a surface has been created */ - for (i=0;i<CreateSurfaceData.dwSCnt;i++) - { - if (!myhSurface[i]) - { - myhSurface[i] = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DD_SURFACE); - if (!myhSurface[i]) - { - /* FIXME: lock myhSurface*/ - /* FIXME: free myhSurface, and the contain */ - /* FIXME: add to attach list */ - return ddRVal; - } - else - { - /* FIXME: lock myhSurface*/ - /* FIXME: add to attach list */ - } - } - } - - /* FIXME: more than one surface is not supported here, once again */ - /* FIXME: we need release myhSurface before any exits */ - - phsurface = GDIOBJ_LockObj(DdHandleTable, myhSurface[0], GDI_OBJECT_TYPE_DD_SURFACE); - if (!phsurface) - { - return ddRVal; - } - - DPRINT1("Copy puCreateSurfaceData to kmode CreateSurfaceData\n"); - _SEH_TRY - { - ProbeForRead(puCreateSurfaceData, sizeof(DD_CREATESURFACEDATA), 1); - RtlCopyMemory( &CreateSurfaceData, puCreateSurfaceData, - sizeof( DD_CREATESURFACEDATA ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - SetLastNtError(Status); - return ddRVal; - } - - DPRINT1("Copy puSurfaceGlobalData to kmode phsurface->Global\n"); - _SEH_TRY - { - ProbeForRead(puSurfaceGlobalData, sizeof(DD_SURFACE_GLOBAL), 1); - RtlCopyMemory( &phsurface->Global, puSurfaceGlobalData, - sizeof( DD_SURFACE_GLOBAL ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - SetLastNtError(Status); - return ddRVal; - } - - DPRINT1("Copy puSurfaceMoreData to kmode phsurface->More\n"); - _SEH_TRY - { - ProbeForRead(puSurfaceMoreData, sizeof(DD_SURFACE_MORE), 1); - RtlCopyMemory( &phsurface->More, puSurfaceMoreData, - sizeof( DD_SURFACE_MORE ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - SetLastNtError(Status); - return ddRVal; - } - - DPRINT1("Copy puSurfaceLocalData to kmode phsurface->Local\n"); - _SEH_TRY - { - ProbeForRead(puSurfaceLocalData, sizeof(DD_SURFACE_LOCAL), 1); - RtlCopyMemory( &phsurface->Local, puSurfaceLocalData, - sizeof( DD_SURFACE_LOCAL ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - SetLastNtError(Status); - return ddRVal; - } - - DPRINT1("Copy puSurfaceDescription to kmode phsurface->desc\n"); - _SEH_TRY - { - ProbeForRead(puSurfaceDescription, sizeof(DDSURFACEDESC), 1); - RtlCopyMemory( &phsurface->desc, puSurfaceDescription, - sizeof( DDSURFACEDESC ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - SetLastNtError(Status); - return ddRVal; - } - - DPRINT1("Lock hDirectDrawLocal \n"); - phsurface->hDirectDrawLocal = hDirectDrawLocal; - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - if (!pDirectDraw) - { - DPRINT1("fail \n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - return ddRVal; - } - - - /* FIXME: unlock phsurface, free phsurface at failure */ - /* FIXME: unlock hsurface, free phsurface at failure */ - /* FIXME: add support for more than one surface create, once more */ - /* FIXME: alloc memory if it's more than one surface (5th mention - that this long function doesn't support more than one - surface creation. I guess it was easier to support it - than to write such comments 10 times). */ - - pLocal = &phsurface->Local; - pMore = &phsurface->More; - pGlobal = &phsurface->Global; - - for (i = 0; i < CreateSurfaceData.dwSCnt; i++) - { - phsurface->lcllist[i] = (PDD_SURFACE_LOCAL)pLocal; - pLocal->lpGbl = pGlobal; - pLocal->lpSurfMore = pMore; - - /* FIXME ? - pLocal->lpAttachList; - pLocal->lpAttachListFrom; - */ - - /* FIXME: a countup to next pLocal, pMore, pGlobal */ - - } - - /* Setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ - CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *) &phsurface->lcllist; - CreateSurfaceData.lpDDSurfaceDesc = &phsurface->desc; - CreateSurfaceData.CreateSurface = NULL; - CreateSurfaceData.ddRVal = DDERR_GENERIC; - CreateSurfaceData.lpDD = &pDirectDraw->Global; - - /* CreateSurface must crash with lcl converting */ - if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) - { - DPRINT1("0x%04x",pDirectDraw->DD.CreateSurface); - - ddRVal = pDirectDraw->DD.CreateSurface(&CreateSurfaceData); - } - - DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,CreateSurfaceData.ddRVal); - - /* FIXME: support for more that one surface (once more!!!!) */ - _SEH_TRY - { - ProbeForWrite(puSurfaceDescription, sizeof(DDSURFACEDESC), 1); - RtlCopyMemory( puSurfaceDescription, &phsurface->desc, sizeof( DDSURFACEDESC ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - _SEH_TRY - { - ProbeForWrite(puCreateSurfaceData, sizeof(DD_CREATESURFACEDATA), 1); - puCreateSurfaceData->ddRVal = CreateSurfaceData.ddRVal; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - for (i = 0; i < CreateSurfaceData.dwSCnt; i++) - { - _SEH_TRY - { - ProbeForWrite(puSurfaceGlobalData, sizeof(DD_SURFACE_GLOBAL), 1); - RtlCopyMemory( puSurfaceGlobalData, &phsurface->Global, sizeof( DD_SURFACE_GLOBAL ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - _SEH_TRY - { - ProbeForWrite(puSurfaceLocalData, sizeof(DD_SURFACE_LOCAL), 1); - RtlCopyMemory( puSurfaceLocalData, &phsurface->Local, sizeof( DD_SURFACE_LOCAL ) ); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - _SEH_TRY - { - ProbeForWrite(puSurfaceMoreData, sizeof(DD_SURFACE_MORE), 1); - RtlCopyMemory( puSurfaceMoreData, &phsurface->More, sizeof( DD_SURFACE_MORE ) ); - - puSurfaceLocalData->lpGbl = puSurfaceGlobalData; - puSurfaceLocalData->lpSurfMore = puSurfaceMoreData; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - DPRINT1("GDIOBJ_UnlockObjByPtr\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - _SEH_TRY - { - ProbeForWrite(puhSurface, sizeof(HANDLE), 1); - puhSurface[i] = myhSurface[i]; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - - /* FIXME: Fil the return handler */ - DPRINT1("GDIOBJ_UnlockObjByPtr\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - - DPRINT1("Return value is %04x and driver return code is %04x\n", - ddRVal, CreateSurfaceData.ddRVal); - return ddRVal; -} - -/************************************************************************/ -/* NtGdiDdWaitForVerticalBlank */ -/* status : Works as intended */ -/************************************************************************/ - - -DWORD STDCALL NtGdiDdWaitForVerticalBlank( - HANDLE hDirectDrawLocal, - PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData) -{ - DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; - PDD_DIRECTDRAW pDirectDraw = NULL; - NTSTATUS Status = FALSE; - DD_WAITFORVERTICALBLANKDATA WaitForVerticalBlankData; - LPDDHAL_WAITFORVERTICALBLANKDATA pWaitForVerticalBlankData = (LPDDHAL_WAITFORVERTICALBLANKDATA)puWaitForVerticalBlankData; - - if ((hDirectDrawLocal) && - (puWaitForVerticalBlankData)) - { - RtlZeroMemory(&WaitForVerticalBlankData,sizeof(DD_WAITFORVERTICALBLANKDATA)); - - _SEH_TRY - { - ProbeForRead(pWaitForVerticalBlankData, sizeof(DDHAL_WAITFORVERTICALBLANKDATA), 1); - WaitForVerticalBlankData.dwFlags = pWaitForVerticalBlankData->dwFlags; - WaitForVerticalBlankData.bIsInVB = pWaitForVerticalBlankData->bIsInVB; - WaitForVerticalBlankData.hEvent = pWaitForVerticalBlankData->hEvent; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - - if (pDirectDraw != NULL) - { - if (pDirectDraw->DD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) - { - WaitForVerticalBlankData.ddRVal = DDERR_GENERIC; - WaitForVerticalBlankData.lpDD = &pDirectDraw->Global;; - ddRVal = pDirectDraw->DD.WaitForVerticalBlank(&WaitForVerticalBlankData); - } - _SEH_TRY - { - ProbeForWrite(pWaitForVerticalBlankData, sizeof(DDHAL_WAITFORVERTICALBLANKDATA), 1); - pWaitForVerticalBlankData->ddRVal = WaitForVerticalBlankData.ddRVal; - pWaitForVerticalBlankData->bIsInVB = WaitForVerticalBlankData.bIsInVB; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - } - } - } - return ddRVal; + DPRINT1("Calling on dxg.sys pfnDdGetScanLine"); + return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); } - - -/************************************************************************/ -/* GetScanLine */ -/* status : This func is now documented in MSDN, and now it's compatible*/ -/* with Windows 2000 implementation */ -/************************************************************************/ -DWORD STDCALL -NtGdiDdGetScanLine( HANDLE hDirectDrawLocal, PDD_GETSCANLINEDATA puGetScanLineData) -{ - DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; - DD_GETSCANLINEDATA GetScanLineData; - PDD_DIRECTDRAW pDirectDraw = NULL; - NTSTATUS Status = FALSE; - LPDDHAL_GETSCANLINEDATA ourpuGetScanLineData; - - if (hDirectDrawLocal) - { - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW);; - } - - if (pDirectDraw != NULL) - { - DPRINT1("GetScanLine\n"); - if (pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE) - { - RtlZeroMemory(&GetScanLineData,sizeof(DD_GETSCANLINEDATA)); - GetScanLineData.ddRVal = DDERR_GENERIC; - GetScanLineData.lpDD = &pDirectDraw->Global; - ddRVal = pDirectDraw->DD.GetScanLine(&GetScanLineData); - - DPRINT1("GetScanLine\n"); - _SEH_TRY - { - ProbeForWrite(puGetScanLineData, sizeof(DD_GETSCANLINEDATA), 1); - ourpuGetScanLineData = (LPDDHAL_GETSCANLINEDATA)puGetScanLineData; - ourpuGetScanLineData->dwScanLine = GetScanLineData.dwScanLine; - ourpuGetScanLineData->ddRVal = GetScanLineData.ddRVal; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DPRINT1("GetScanLine\n"); - ddRVal = DDHAL_DRIVER_NOTHANDLED; - } - } - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - } - - return ddRVal; -}

1 0

[cfinck] 29564: Add a Czech (QWERTY) keyboard layout by Kamil Hornicek (tykef at atlas dot cz) I renamed the "kbdcz" files from the patch to "kbdcz1" to match the name of this DLL under Windows See issue #2720 for more details.
by cfinck＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: cfinck Date: Sun Oct 14 18:14:16 2007 New Revision: 29564 URL: http://svn.reactos.org/svn/reactos?rev=29564&view=rev Log: Add a Czech (QWERTY) keyboard layout by Kamil Hornicek (tykef at atlas dot cz) I renamed the "kbdcz" files from the patch to "kbdcz1" to match the name of this DLL under Windows See issue #2720 for more details. Added: trunk/reactos/dll/keyboard/kbdcz1/ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c (with props) trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.def (with props) trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild (with props) trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc (with props) Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sun Oct 14 18:14:16 2007 @@ -92,6 +92,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout Text",0x00000000,"Burmese" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000405","Layout File",0x00000000,"kbdcz1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000405","Layout Text",0x00000000,"Czech (QWERTY)" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sun Oct 14 18:14:16 2007 @@ -130,6 +130,7 @@ dll\keyboard\kbdbe\kbdbe.dll 1 dll\keyboard\kbdbur\kbdbur.dll 1 +dll\keyboard\kbdcz1\kbdcz1.dll 1 dll\keyboard\kbdda\kbdda.dll 1 dll\keyboard\kbddv\kbddv.dll 1 dll\keyboard\kbdes\kbdes.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sun Oct 14 18:14:16 2007 @@ -94,6 +94,7 @@ [KeyboardLayout] 00000455 = "Burmese" +00000405 = "Czech (QWERTY)" 00000406 = "Danish (Denmark)" 00000813 = "Dutch (Belgium)" 00000809 = "English (United Kingdom)" @@ -124,6 +125,7 @@ 0000080C = kbdbe.dll 00000813 = kbdbe.dll 00000455 = kbdbur.dll +00000405 = kbdcz1.dll 00000406 = kbdda.dll 00010409 = kbddv.dll 0000040A = kbdes.dll Added: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c (added) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c Sun Oct 14 18:14:16 2007 @@ -1,0 +1,419 @@ +/* + * ReactOS Czech (QWERTY) ASCII Keyboard layout + * Copyright (C) 2007 ReactOS + * License: LGPL, see: LGPL.txt + * + * Based on other kbd*.dlls + * modified by Kamil Hornicek (tykef at atlas dot cz) + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_EMPTY, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 7, + { 0, 1, 2, 0,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Keys that do not have shift states */ + { VK_TAB, NOCAPS, {'\t','\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_OEM_2 ,NOCAPS, {'-', '_'} }, + { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE, NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* normal - shift - ctrl */ + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + + /* Legacy (telnet-style) ascii escapes */ + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { +/* Normal, shifted, control, Alt+Gr */ + { '1', NOCAPS, {'+', '1', WCH_NONE, '!' } }, + { '2', NOCAPS, {0x011b, '2', 0, '@' } }, // e with caron + { '3', NOCAPS, {0x0161, '3', WCH_NONE, '#' } }, // s with caron + { '4', NOCAPS, {0x010d, '4', WCH_NONE, '$' } }, // c with caron + { '5', NOCAPS, {0x0159, '5', WCH_NONE, '%' } }, // r with caron + { '6', NOCAPS, {0x017e, '6', 0x1e, '^' } }, // z with caron + { '7', NOCAPS, {0x00fd, '7', WCH_NONE, '&' } }, // y with acute + { '8', NOCAPS, {0x00e1, '8', WCH_NONE, '*' } }, // a with acute + { '9', NOCAPS, {0x00ed, '9', WCH_NONE, '(' } }, // i with acute + { '0', NOCAPS, {0x00e9, '0', WCH_NONE, ')' } }, // e with acute + { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, '=' } }, // dead letters - acute, caron + { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, WCH_NONE } }, // VK_OEM_PLUS death + { VK_OEM_MINUS, NOCAPS, {'=', '%', 0x1f, '-' } }, + { VK_OEM_1, NOCAPS, {0x016f, '\"', WCH_NONE, ';' } }, // u with ring + { VK_OEM_7, NOCAPS, {0x00a7, '!', WCH_NONE, 0x00a4 } }, // section sign + { VK_OEM_4, NOCAPS, {0x00fa, '/', WCH_NONE, '[' } }, // u with acute + { VK_OEM_5, NOCAPS, {WCH_DEAD, 0x2018, WCH_NONE, '\\' } }, // diaeresis, left single quotation mark + { VK_EMPTY, 0, {0x00a8, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_5 death + { VK_OEM_6, NOCAPS, {')', '(', WCH_NONE, ']' } }, + { VK_OEM_3, NOCAPS, {';', WCH_DEAD, WCH_NONE, '`' } }, // ring + { VK_EMPTY, 0, {WCH_NONE, 0x00b0, WCH_NONE, WCH_NONE } }, // VK_OEM_3 death + { VK_OEM_COMMA, NOCAPS, {',', '?', WCH_NONE, '<' } }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>' } }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20AC } }, // symbol for euro (currency) + { 0, 0 } +}; + + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_DECIMAL, 0, {','} }, + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_BACK, 0, {'\010'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1,keypad_numbers), + vk_master(2,key_to_chars_2mod), + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL }, +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Ctrl" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4a, L"Left" }, + { 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 0, NULL }, +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(0x0043, 0x02c7, 0x010c, 0x0000) }, // C with caron + { DEADTRANS(0x0063, 0x02c7, 0x010d, 0x0000) }, // c with caron + { DEADTRANS(0x0045, 0x02c7, 0x011a, 0x0000) }, // E with caron + { DEADTRANS(0x0065, 0x02c7, 0x011b, 0x0000) }, // e with caron + { DEADTRANS(0x0044, 0x02c7, 0x010e, 0x0000) }, // D with caron + { DEADTRANS(0x0064, 0x02c7, 0x010f, 0x0000) }, // d with caron + { DEADTRANS(0x004c, 0x02c7, 0x013d, 0x0000) }, // L with caron + { DEADTRANS(0x006c, 0x02c7, 0x013e, 0x0000) }, // l with caron + { DEADTRANS(0x004e, 0x02c7, 0x0147, 0x0000) }, // N with caron + { DEADTRANS(0x006e, 0x02c7, 0x0148, 0x0000) }, // n with caron + { DEADTRANS(0x0053, 0x02c7, 0x0160, 0x0000) }, // S with caron + { DEADTRANS(0x0073, 0x02c7, 0x0161, 0x0000) }, // s with caron + { DEADTRANS(0x0052, 0x02c7, 0x0158, 0x0000) }, // R with acute + { DEADTRANS(0x0072, 0x02c7, 0x0159, 0x0000) }, // r with acute + { DEADTRANS(0x0054, 0x02c7, 0x0164, 0x0000) }, // T with caron + { DEADTRANS(0x0074, 0x02c7, 0x0165, 0x0000) }, // t with caron + { DEADTRANS(0x005a, 0x02c7, 0x017d, 0x0000) }, // Z with caron + { DEADTRANS(0x007a, 0x02c7, 0x017e, 0x0000) }, // z with caron + { DEADTRANS(0x0020, 0x02c7, 0x02c7, 0x0000) }, // space > caron + + { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, // A with acute + { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, // a with acute + { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, // E with acute + { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, // e with acute + { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, // I with acute + { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, // i with acute + { DEADTRANS(0x004c, 0x00b4, 0x0139, 0x0000) }, // L with acute + { DEADTRANS(0x006c, 0x00b4, 0x013a, 0x0000) }, // l with acute + { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, // O with acute + { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, // o with acute + { DEADTRANS(0x0052, 0x00b4, 0x0154, 0x0000) }, // R with acute + { DEADTRANS(0x0072, 0x00b4, 0x0155, 0x0000) }, // r with acute + { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, // U with acute + { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, // u with acute + { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, // Y with acute + { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y with acute + { DEADTRANS(0x005a, 0x00b4, 0x0179, 0x0000) }, // Z with acute + { DEADTRANS(0x007a, 0x00b4, 0x017a, 0x0000) }, // z with acute + { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // space > acute + + { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, // A with diaeresis + { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, // a with diaeresis + { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, // E with diaeresis + { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, // e with diaeresis + { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, // O with diaeresis + { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, // o with diaeresis + { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, // U with diaeresis + { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis + { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis + + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round + { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > round + { 0, 0, 0 }, +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x00a1" L"hacek", // caron + L"\x00b4" L"carka", // acute + L"\x005e" L"krouzek", // round + NULL +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Czech keyboard doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + Propchange: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.def (added) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.def Sun Oct 14 18:14:16 2007 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdcz1.dll + +EXPORTS +KbdLayerDescriptor +;EOF Propchange: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild Sun Oct 14 18:14:16 2007 @@ -1,0 +1,9 @@ +<module name="kbdcz1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdcz1.dll" allowwarnings="true"> + <importlibrary definition="kbdcz1.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdcz1.c</file> + <file>kbdcz1.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc (added) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc Sun Oct 14 18:14:16 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Czech Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdcz1\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdcz1.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild Sun Oct 14 18:14:16 2007 @@ -6,6 +6,9 @@ </directory> <directory name="kbdbur"> <xi:include href="kbdbur/kbdbur.rbuild" /> + </directory> + <directory name="kbdcz1"> + <xi:include href="kbdcz1/kbdcz1.rbuild" /> </directory> <directory name="kbdda"> <xi:include href="kbdda/kbdda.rbuild" />

1 0

[greatlrd] 29563: Redirect all dx mocomp api (done)
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 17:58:37 2007 New Revision: 29563 URL: http://svn.reactos.org/svn/reactos?rev=29563&view=rev Log: Redirect all dx mocomp api (done) Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Oct 14 17:58:37 2007 @@ -37,7 +37,6 @@ typedef BOOL (NTAPI *PGD_DXDDDELETESURFACEOBJECT)(HANDLE); typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE); - typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA); @@ -51,10 +50,8 @@ typedef DWORD (NTAPI *PGD_DXDDLOCK)( typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)( typedef DWORD (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)( -typedef DWORD (NTAPI *PGD_DXDDQUERYMOCOMPSTATUS)( typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)( typedef DWORD (NTAPI *PGD_DXDDRELEASEDC)( -typedef DWORD (NTAPI *PGD_DXDDRENDERMOCOMP)( typedef DWORD (NTAPI *PGD_DXDDRESETVISRGN)( typedef DWORD (NTAPI *PGD_DXDDSETCOLORKEY)( typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)( @@ -196,24 +193,7 @@ } -HANDLE -STDCALL -NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData) -{ - PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateMoComp, pfnDdCreateMoComp); - - if (pfnDdCreateMoComp == NULL) - { - DPRINT1("Warring no pfnDdCreateMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCreateMoComp"); - return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); -} + DWORD @@ -281,25 +261,7 @@ return pfnDdAttachSurface(hSurfaceFrom,hSurfaceTo); } -DWORD -STDCALL -NtGdiDdBeginMoCompFrame(HANDLE hMoComp, - PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData) -{ - PGD_DDBEGINMOCOMPFRAME pfnDdBeginMoCompFrame = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdBeginMoCompFrame, pfnDdBeginMoCompFrame); - - if (pfnDdBeginMoCompFrame == NULL) - { - DPRINT1("Warring no pfnDdBeginMoCompFrame"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdBeginMoCompFrame"); - return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); -} + DWORD STDCALL @@ -406,25 +368,7 @@ return pfnDdDeleteSurfaceObject(hSurface); } -DWORD -STDCALL -NtGdiDdDestroyMoComp(HANDLE hMoComp, - PDD_DESTROYMOCOMPDATA puBeginFrameData) -{ - PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyMoComp, pfnDxDdDestroyMoComp); - - if (pfnDxDdDestroyMoComp == NULL) - { - DPRINT1("Warring no pfnDxDdDestroyMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DxDdDestroyMoComp"); - return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); -} + @@ -447,15 +391,6 @@ DPRINT1("Calling on dxg.sys pfnDdDestroyD3DBuffer"); return pfnDdDestroyD3DBuffer(hSurface); } - - - - -typedef DWORD (NTAPI *PGD_DXDDENDMOCOMPFRAME)(HANDLE, PDD_ENDMOCOMPFRAMEDATA); -typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); -typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA); - - /************************************************************************/ /* DIRECT DRAW OBJECT */ Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c Sun Oct 14 17:58:37 2007 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation - * FILE: subsys/win32k/ntddraw/d3d.c + * FILE: subsys/win32k/ntddraw/mocomp.c * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) * REVISION HISTORY: * 19/1-2006 Magnus Olsen @@ -38,59 +38,243 @@ typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPBUFFINFO)(HANDLE, PDD_GETMOCOMPCOMPBUFFDATA); typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPGUIDS)(HANDLE, PDD_GETMOCOMPGUIDSDATA); typedef DWORD (NTAPI *PGD_DXDDGETMOCOMPFORMATS)(HANDLE, PDD_GETMOCOMPFORMATSDATA); - -DWORD -STDCALL -NtGdiDdEndMoCompFrame(HANDLE hMoComp, PDD_ENDMOCOMPFRAMEDATA puEndFrameData) -{ - -} - +typedef DWORD (NTAPI *PGD_DXDDQUERYMOCOMPSTATUS)(HANDLE, PDD_QUERYMOCOMPSTATUSDATA); +typedef DWORD (NTAPI *PGD_DXDDRENDERMOCOMP)(HANDLE, PDD_RENDERMOCOMPDATA); + + +/************************************************************************/ +/* NtGdiDdBeginMoCompFrame */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdBeginMoCompFrame(HANDLE hMoComp, + PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData) +{ + PGD_DDBEGINMOCOMPFRAME pfnDdBeginMoCompFrame = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdBeginMoCompFrame, pfnDdBeginMoCompFrame); + + if (pfnDdBeginMoCompFrame == NULL) + { + DPRINT1("Warring no pfnDdBeginMoCompFrame"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys DdBeginMoCompFrame"); + return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); +} + +/************************************************************************/ +/* NtGdiDdCreateMoComp */ +/************************************************************************/ +HANDLE +STDCALL +NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData) +{ + PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateMoComp, pfnDdCreateMoComp); + + if (pfnDdCreateMoComp == NULL) + { + DPRINT1("Warring no pfnDdCreateMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys DdCreateMoComp"); + return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); +} + +/************************************************************************/ +/* NtGdiDdDestroyMoComp */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdDestroyMoComp(HANDLE hMoComp, + PDD_DESTROYMOCOMPDATA puBeginFrameData) +{ + PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyMoComp, pfnDxDdDestroyMoComp); + + if (pfnDxDdDestroyMoComp == NULL) + { + DPRINT1("Warring no pfnDxDdDestroyMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys DxDdDestroyMoComp"); + return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); +} + +/************************************************************************/ +/* NtGdiDdEndMoCompFrame */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdEndMoCompFrame(HANDLE hMoComp, + PDD_ENDMOCOMPFRAMEDATA puEndFrameData) +{ + PGD_DXDDENDMOCOMPFRAME pfnDdEndMoCompFrame = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdEndMoCompFrame, pfnDdEndMoCompFrame); + + if (pfnDdEndMoCompFrame == NULL) + { + DPRINT1("Warring no pfnDdEndMoCompFrame"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdEndMoCompFrame"); + return pfnDdEndMoCompFrame(hMoComp, puBeginFrameData); +} + +/************************************************************************/ +/* NtGdiDdGetInternalMoCompInfo */ +/************************************************************************/ DWORD STDCALL NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw, PDD_GETINTERNALMOCOMPDATA puGetInternalData) { - -} - -DWORD STDCALL NtGdiDdGetMoCompBuffInfo( - HANDLE hDirectDraw, - PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData) -{ - -} - + PGD_DXDDGETINTERNALMOCOMPINFO pfnDdGetInternalMoCompInfo = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetInternalMoCompInfo, pfnDdGetInternalMoCompInfo); + + if (pfnDdGetInternalMoCompInfo == NULL) + { + DPRINT1("Warring no pfnDdGetInternalMoCompInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetInternalMoCompInfo"); + return pfnDdGetInternalMoCompInfo(hDirectDraw, puGetInternalData); +} + + +/************************************************************************/ +/* NtGdiDdGetMoCompBuffInfo */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw, + PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData) +{ + PGD_DXDDGETMOCOMPBUFFINFO pfnDdGetMoCompBuffInfo = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompBuffInfo, pfnDdGetMoCompBuffInfo); + + if (pfnDdGetMoCompBuffInfo == NULL) + { + DPRINT1("Warring no pfnDdGetMoCompBuffInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetMoCompBuffInfo"); + return pfnDdGetMoCompBuffInfo(hDirectDraw, puGetBuffData); +} + +/************************************************************************/ +/* NtGdiDdGetMoCompFormats */ +/************************************************************************/ DWORD STDCALL NtGdiDdGetMoCompFormats(HANDLE hDirectDraw, PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData) { - -} - - + PGD_DXDDGETMOCOMPFORMATS pfnDdGetMoCompFormats = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompFormats, pfnDdGetMoCompFormats); + + if (pfnDdGetMoCompFormats == NULL) + { + DPRINT1("Warring no pfnDdGetMoCompFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetMoCompFormats"); + return pfnDdGetMoCompFormats(hDirectDraw, puGetMoCompFormatsData); +} + + +/************************************************************************/ +/* NtGdiDdGetMoCompGuids */ +/************************************************************************/ DWORD STDCALL NtGdiDdGetMoCompGuids(HANDLE hDirectDraw, PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData) { - -} - -DWORD -STDCALL NtGdiDdQueryMoCompStatus(HANDLE hMoComp, - PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData) -{ - -} - - + PGD_DXDDGETMOCOMPGUIDS pfnDdGetMoCompGuids = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompGuids, pfnDdGetMoCompGuids); + + if (pfnDdGetMoCompGuids == NULL) + { + DPRINT1("Warring no pfnDdGetMoCompGuids"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetMoCompGuids"); + return pfnDdGetMoCompGuids(hDirectDraw, puGetMoCompGuidsData); +} + + + +/************************************************************************/ +/* NtGdiDdQueryMoCompStatus */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdQueryMoCompStatus(HANDLE hMoComp, + PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData) +{ + PGD_DXDDQUERYMOCOMPSTATUS pfnDdQueryMoCompStatus = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdQueryMoCompStatus, pfnDdQueryMoCompStatus); + + if (pfnDdQueryMoCompStatus == NULL) + { + DPRINT1("Warring no pfnDdQueryMoCompStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdQueryMoCompStatus"); + return pfnDdQueryMoCompStatus(hMoComp, puQueryMoCompStatusData); +} + + +/************************************************************************/ +/* NtGdiDdRenderMoComp */ +/************************************************************************/ DWORD STDCALL NtGdiDdRenderMoComp(HANDLE hMoComp, PDD_RENDERMOCOMPDATA puRenderMoCompData) { - -} - + PGD_DXDDRENDERMOCOMP pfnDdRenderMoComp = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdRenderMoComp, pfnDdRenderMoComp); + + if (pfnDdRenderMoComp == NULL) + { + DPRINT1("Warring no pfnDdRenderMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdRenderMoComp"); + return pfnDdRenderMoComp(hMoComp, puRenderMoCompData); +} + + +

1 0

[greatlrd] 29562: dxtn License GPL Need it by OpenGL / DirectX compress textures, at moment for mesa32 Got Alesky aka Fireball permits to add it, so long it use the patent flag. Some part in this library can contain patent, thing in USA This library will not be build directly, you are force to change the patent flags in the config.rbuild file to 1 But todo so, you need check you country patent.
by greatlrd＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: greatlrd Date: Sun Oct 14 17:03:46 2007 New Revision: 29562 URL: http://svn.reactos.org/svn/reactos?rev=29562&view=rev Log: dxtn License GPL Need it by OpenGL / DirectX compress textures, at moment for mesa32 Got Alesky aka Fireball permits to add it, so long it use the patent flag. Some part in this library can contain patent, thing in USA This library will not be build directly, you are force to change the patent flags in the config.rbuild file to 1 But todo so, you need check you country patent. Added: branches/reactx/reactos/dll/3rdparty/dxtn/ branches/reactx/reactos/dll/3rdparty/dxtn/Makefile (with props) branches/reactx/reactos/dll/3rdparty/dxtn/Makefile.DJ (with props) branches/reactx/reactos/dll/3rdparty/dxtn/Makefile.mgw (with props) branches/reactx/reactos/dll/3rdparty/dxtn/Makefile.vc (with props) branches/reactx/reactos/dll/3rdparty/dxtn/Makefile.wat (with props) branches/reactx/reactos/dll/3rdparty/dxtn/docs/ branches/reactx/reactos/dll/3rdparty/dxtn/docs/README (with props) branches/reactx/reactos/dll/3rdparty/dxtn/docs/fxt1license.txt (with props) branches/reactx/reactos/dll/3rdparty/dxtn/docs/tc.html (with props) branches/reactx/reactos/dll/3rdparty/dxtn/docs/texture_compression_FXT1.txt (with props) branches/reactx/reactos/dll/3rdparty/dxtn/docs/texture_compression_s3tc.txt (with props) branches/reactx/reactos/dll/3rdparty/dxtn/docs/vmath.txt (with props) branches/reactx/reactos/dll/3rdparty/dxtn/dxtn.c (with props) branches/reactx/reactos/dll/3rdparty/dxtn/dxtn.def (with props) branches/reactx/reactos/dll/3rdparty/dxtn/dxtn.h (with props) branches/reactx/reactos/dll/3rdparty/dxtn/dxtn.rbuild (with props) branches/reactx/reactos/dll/3rdparty/dxtn/fxt1.c (with props) branches/reactx/reactos/dll/3rdparty/dxtn/fxt1.h (with props) branches/reactx/reactos/dll/3rdparty/dxtn/internal.h (with props) branches/reactx/reactos/dll/3rdparty/dxtn/test/ branches/reactx/reactos/dll/3rdparty/dxtn/test/Makefile (with props) branches/reactx/reactos/dll/3rdparty/dxtn/test/main.c (with props) branches/reactx/reactos/dll/3rdparty/dxtn/test/tga.c (with props) branches/reactx/reactos/dll/3rdparty/dxtn/test/tga.h (with props) branches/reactx/reactos/dll/3rdparty/dxtn/test/util.c (with props) branches/reactx/reactos/dll/3rdparty/dxtn/test/util.h (with props) branches/reactx/reactos/dll/3rdparty/dxtn/texstore.c (with props) branches/reactx/reactos/dll/3rdparty/dxtn/types.h (with props) branches/reactx/reactos/dll/3rdparty/dxtn/wrapper.c (with props) Modified: branches/reactx/reactos/dll/3rdparty/3rdparty.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactx/reactos/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/3rd… Added: branches/reactx/reactos/dll/3rdparty/dxtn/Makefile URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/Makefile.DJ URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/Makefile.mgw URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/Makefile.vc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/Makefile.wat URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/docs/README URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/docs/fxt1license.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/docs/tc.html URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/docs/texture_compression_FXT1.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/docs/texture_compression_s3tc.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/docs/vmath.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/dxtn.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/dxtn.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/dxtn.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/dxtn.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/fxt1.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/fxt1.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/internal.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/test/Makefile URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/test/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/test/tga.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/test/tga.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/test/util.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/test/util.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/texstore.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/types.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt… Added: branches/reactx/reactos/dll/3rdparty/dxtn/wrapper.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/3rdparty/dxt…

1 0

[fireball] 29561: - Commit changes made to doxygen config by Marc Piulachs. See issue #2709 for more details.
by fireball＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: fireball Date: Sun Oct 14 16:52:44 2007 New Revision: 29561 URL: http://svn.reactos.org/svn/reactos?rev=29561&view=rev Log: - Commit changes made to doxygen config by Marc Piulachs. See issue #2709 for more details. Modified: trunk/reactos/Doxyfile Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=29561&r1=2956… ============================================================================== --- trunk/reactos/Doxyfile (original) +++ trunk/reactos/Doxyfile Sun Oct 14 16:52:44 2007 @@ -85,7 +85,17 @@ # "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then # Doxygen will generate a detailed section even if there is only a brief @@ -477,9 +487,7 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = hal \ - subsystems \ - base +INPUT = # This tag can be used to specify the character encoding of the source files that # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default @@ -495,8 +503,11 @@ # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py -#FILE_PATTERNS = *.c \ - *.h +FILE_PATTERNS = *.c \ + *.h \ + *.cpp \ + *.cc \ + *.cx # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. @@ -638,7 +649,7 @@ # will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. -VERBATIM_HEADERS = NO +VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index @@ -775,7 +786,7 @@ # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # probably better off using the HTML help feature. -GENERATE_TREEVIEW = YES +GENERATE_TREEVIEW = NO # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # used to set the initial width (in pixels) of the frame in which the tree @@ -937,7 +948,7 @@ # generate an XML file that captures the structure of # the code including all documentation. -GENERATE_XML = NO +GENERATE_XML = YES # The XML_OUTPUT tag is used to specify where the XML pages will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be @@ -1129,7 +1140,7 @@ # fallback. It is recommended to install and use dot, since it yields more # powerful graphs. -CLASS_DIAGRAMS = YES +CLASS_DIAGRAMS = NO # You can define message sequence charts within doxygen comments using the \msc # command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to @@ -1150,7 +1161,7 @@ # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = YES +HAVE_DOT = NO # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and @@ -1295,4 +1306,4 @@ # The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. -SEARCHENGINE = YES +SEARCHENGINE = NO

1 0

[dreimer] 29560: Update SVN:Ignore
by dreimer＠svn.reactos.org 14 Oct '07

14 Oct '07

Author: dreimer Date: Sun Oct 14 16:47:23 2007 New Revision: 29560 URL: http://svn.reactos.org/svn/reactos?rev=29560&view=rev Log: Update SVN:Ignore Modified: trunk/reactos/lib/ppcmmu/ (props changed) Propchange: trunk/reactos/lib/ppcmmu/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Oct 14 16:47:23 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007