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;
-}
/*