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

bye bye DXG_GET_INDEX_FUNCTION

Browse source 
patch from Stefan Ginsberg stefan__100__at hotmail dot com 
it remove the bad macro DXG_GET_INDEX_FUNCTION that never worked as it should. 

svn path=/trunk/; revision=33305
This commit is contained in:
Magnus Olsen 2008-05-05 19:42:23 +00:00
parent 18eec41ac4
commit 91f47e9c2b
2 changed files with 9 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,18 +108,6 @@ typedef VOID (NTAPI *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID);
typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE);
typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL);
/* Standard macro */
#define DXG_GET_INDEX_FUNCTION(INDEX, FUNCTION) \
for (i = 0; i <= DXG_INDEX_DxDdIoctl; i++) \
{ \
if (gpDxFuncs[i].iFunc == INDEX) \
{ \
FUNCTION = (VOID *)gpDxFuncs[i].pfn; \
break; \
} \
}
/* Gammaramp internal prototype */ /* Gammaramp internal prototype */
BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp);
BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL); BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL);

47
reactos/subsystems/win32/win32k/ntddraw/dvp.c
View file

@ -1,4 +1,3 @@
/* /*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -187,10 +186,7 @@ STDCALL
NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, NtGdiDvpGetVideoPortLine(HANDLE hVideoPort,
PDD_GETVPORTLINEDATA puGetVPortLineData) PDD_GETVPORTLINEDATA puGetVPortLineData)
{ {
PGD_DXDVPGETVIDEOPORTLINE pfnDvpGetVideoPortLine = NULL; PGD_DXDVPGETVIDEOPORTLINE pfnDvpGetVideoPortLine = (PGD_DXDVPGETVIDEOPORTLINE)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortLine].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortLine, pfnDvpGetVideoPortLine);
if (pfnDvpGetVideoPortLine == NULL) if (pfnDvpGetVideoPortLine == NULL)
{ {
@ -211,10 +207,7 @@ STDCALL
NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort,
PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData)
{ {
PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS pfnDvpGetVideoPortOutputFormats = NULL; PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS pfnDvpGetVideoPortOutputFormats = (PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortOutputFormats].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortOutputFormats, puGetVPortOutputFormatData);
if (pfnDvpGetVideoPortOutputFormats == NULL) if (pfnDvpGetVideoPortOutputFormats == NULL)
{ {
@ -236,10 +229,7 @@ STDCALL
NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw,
PDD_GETVPORTCONNECTDATA puGetVPortConnectData) PDD_GETVPORTCONNECTDATA puGetVPortConnectData)
{ {
PGD_DXDVPGETVIDEOPORTCONNECTINFO pfnDvpGetVideoPortConnectInfo = NULL; PGD_DXDVPGETVIDEOPORTCONNECTINFO pfnDvpGetVideoPortConnectInfo = (PGD_DXDVPGETVIDEOPORTCONNECTINFO)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortConnectInfo].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortConnectInfo, pfnDvpGetVideoPortConnectInfo);
if (pfnDvpGetVideoPortConnectInfo == NULL) if (pfnDvpGetVideoPortConnectInfo == NULL)
{ {
@ -260,10 +250,7 @@ STDCALL
NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort, NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort,
PDD_GETVPORTSIGNALDATA puGetVPortSignalData) PDD_GETVPORTSIGNALDATA puGetVPortSignalData)
{ {
PGD_DXDVPGETVIDEOSIGNALSTATUS pfnDvpGetVideoSignalStatus = NULL; PGD_DXDVPGETVIDEOSIGNALSTATUS pfnDvpGetVideoSignalStatus = (PGD_DXDVPGETVIDEOSIGNALSTATUS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoSignalStatus].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoSignalStatus, pfnDvpGetVideoSignalStatus);
if (pfnDvpGetVideoSignalStatus == NULL) if (pfnDvpGetVideoSignalStatus == NULL)
{ {
@ -287,10 +274,7 @@ NtGdiDvpUpdateVideoPort(HANDLE hVideoPort,
HANDLE* phSurfaceVbi, HANDLE* phSurfaceVbi,
PDD_UPDATEVPORTDATA puUpdateVPortData) PDD_UPDATEVPORTDATA puUpdateVPortData)
{ {
PGD_DXDVPUPDATEVIDEOPORT pfnDvpUpdateVideoPort = NULL; PGD_DXDVPUPDATEVIDEOPORT pfnDvpUpdateVideoPort = (PGD_DXDVPUPDATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpUpdateVideoPort].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpUpdateVideoPort, pfnDvpUpdateVideoPort);
if (pfnDvpUpdateVideoPort == NULL) if (pfnDvpUpdateVideoPort == NULL)
{ {
@ -312,10 +296,7 @@ STDCALL
NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort, NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort,
PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData)
{ {
PGD_DXDVPWAITFORVIDEOPORTSYNC pfnDvpWaitForVideoPortSync = NULL; PGD_DXDVPWAITFORVIDEOPORTSYNC pfnDvpWaitForVideoPortSync = (PGD_DXDVPWAITFORVIDEOPORTSYNC)gpDxFuncs[DXG_INDEX_DxDvpWaitForVideoPortSync].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpWaitForVideoPortSync, pfnDvpWaitForVideoPortSync);
if (pfnDvpWaitForVideoPortSync == NULL) if (pfnDvpWaitForVideoPortSync == NULL)
{ {
@ -337,10 +318,7 @@ NtGdiDvpAcquireNotification(HANDLE hVideoPort,
HANDLE* hEvent, HANDLE* hEvent,
LPDDVIDEOPORTNOTIFY pNotify) LPDDVIDEOPORTNOTIFY pNotify)
{ {
PGD_DXDVPACQUIRENOTIFICATION pfnDvpAcquireNotification = NULL; PGD_DXDVPACQUIRENOTIFICATION pfnDvpAcquireNotification = (PGD_DXDVPACQUIRENOTIFICATION)gpDxFuncs[DXG_INDEX_DxDvpAcquireNotification].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpAcquireNotification, pfnDvpAcquireNotification);
if (pfnDvpAcquireNotification == NULL) if (pfnDvpAcquireNotification == NULL)
{ {
@ -361,10 +339,7 @@ STDCALL
NtGdiDvpReleaseNotification(HANDLE hVideoPort, NtGdiDvpReleaseNotification(HANDLE hVideoPort,
HANDLE hEvent) HANDLE hEvent)
{ {
PGD_DXDVPRELEASENOTIFICATION pfnDvpReleaseNotification = NULL; PGD_DXDVPRELEASENOTIFICATION pfnDvpReleaseNotification = (PGD_DXDVPRELEASENOTIFICATION)gpDxFuncs[DXG_INDEX_DxDvpReleaseNotification].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpReleaseNotification, pfnDvpReleaseNotification);
if (pfnDvpReleaseNotification == NULL) if (pfnDvpReleaseNotification == NULL)
{ {
@ -386,10 +361,7 @@ STDCALL
NtGdiDvpGetVideoPortField(HANDLE hVideoPort, NtGdiDvpGetVideoPortField(HANDLE hVideoPort,
PDD_GETVPORTFIELDDATA puGetVPortFieldData) PDD_GETVPORTFIELDDATA puGetVPortFieldData)
{ {
PGD_DXDVPGETVIDEOPORTFIELD pfnDvpGetVideoPortField = NULL; PGD_DXDVPGETVIDEOPORTFIELD pfnDvpGetVideoPortField = (PGD_DXDVPGETVIDEOPORTFIELD)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortField].pfn;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortField, pfnDvpGetVideoPortField);
if (pfnDvpGetVideoPortField == NULL) if (pfnDvpGetVideoPortField == NULL)
{ {
@ -401,4 +373,3 @@ NtGdiDvpGetVideoPortField(HANDLE hVideoPort,
return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData);
} }