Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 11:51:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

started cleanup object/dc.c

Browse source 
1. remove the static global value edd_directdraw_global I intrudues for dx.
   it is now for each driver. 

svn path=/trunk/; revision=33330
This commit is contained in:
Magnus Olsen 2008-05-06 20:20:56 +00:00
parent 9aafcccad6
commit bb0603242f
3 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/subsystems/win32/win32k/include/tags.h
View file

@ -91,8 +91,9 @@
/* Dx internal tags rember I do not known if it right namees */ /* Dx internal tags rember I do not known if it right namees */
#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ #define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */
#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ #define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */
#define TAG_DDRAW TAG('D', 'h', ' ', '1') #define TAG_DDRAW TAG('D', 'h', ' ', '1')
#define TAG_DDSURF TAG('D', 'h', ' ', '2') #define TAG_DDSURF TAG('D', 'h', ' ', '2')
#define TAG_EDDGBL TAG('E', 'D', 'D', 'G') /* ? edd_directdraw_global ??*/
#endif /* _WIN32K_TAGS_H */ #endif /* _WIN32K_TAGS_H */

15
reactos/subsystems/win32/win32k/ntddraw/ddraw.c
View file

@ -432,10 +432,6 @@ NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal,
DWORD *puNumFourCC, DWORD *puNumFourCC,
DWORD *puFourCC) DWORD *puFourCC)
{ {
#if DXDBG
BOOL status = FALSE;
#endif
PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject = (PGD_DXDDQUERYDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdQueryDirectDrawObject].pfn; PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject = (PGD_DXDDQUERYDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdQueryDirectDrawObject].pfn;
if (pfnDdQueryDirectDrawObject == NULL) if (pfnDdQueryDirectDrawObject == NULL)
@ -446,21 +442,10 @@ NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal,
DPRINT1("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); DPRINT1("Calling dxg.sys pfnDdQueryDirectDrawObject\n");
#if DXDBG
status = pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData,
puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC);
dump_edd_directdraw_global(&edd_DdirectDraw_Global);
dump_edd_directdraw_local(edd_DdirectDraw_Global.peDirectDrawLocalList);
return status;
#else
return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData,
puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC);
#endif
} }

10
reactos/subsystems/win32/win32k/objects/dc.c
View file

@ -32,7 +32,7 @@ static GDIDEVICE PrimarySurface;
static KEVENT VideoDriverNeedsPreparation; static KEVENT VideoDriverNeedsPreparation;
static KEVENT VideoDriverPrepared; static KEVENT VideoDriverPrepared;
static PDC defaultDCstate = NULL; static PDC defaultDCstate = NULL;
EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global;
NTSTATUS FASTCALL NTSTATUS FASTCALL
InitDcImpl(VOID) InitDcImpl(VOID)
@ -554,8 +554,11 @@ IntPrepareDriver()
PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs.
PrimarySurface.ppdevParent = NULL; // Always NULL if primary. PrimarySurface.ppdevParent = NULL; // Always NULL if primary.
PrimarySurface.pGraphicsDev = NULL; // Fixme! PrimarySurface.pGraphicsDev = NULL; // Fixme!
PrimarySurface.pEDDgpl = (EDD_DIRECTDRAW_GLOBAL *)&edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. PrimarySurface.pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL);
RtlZeroMemory( &edd_DdirectDraw_Global ,sizeof(EDD_DIRECTDRAW_GLOBAL)); if (PrimarySurface.pEDDgpl)
{
RtlZeroMemory( PrimarySurface.pEDDgpl ,sizeof(EDD_DIRECTDRAW_GLOBAL));
}
ret = TRUE; ret = TRUE;
goto cleanup; goto cleanup;
} }
@ -626,6 +629,7 @@ PrepareVideoPrt()
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }
BOOL FASTCALL BOOL FASTCALL
IntCreatePrimarySurface() IntCreatePrimarySurface()
{ {