Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-07 18:56:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing smaller bugs, like save the internal surface list, document up some members what they do

Browse source 
svn path=/trunk/; revision=27262
This commit is contained in:
Magnus Olsen 2007-06-22 15:11:59 +00:00
parent a06823792a
commit e46a5994cf
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/directx/ddraw/Surface/createsurface.c
View file

@ -187,11 +187,12 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD,
ThisSurfLcl->dwProcessId = GetCurrentProcessId(); ThisSurfLcl->dwProcessId = GetCurrentProcessId();
/* FIXME the lpLnk */ /* FIXME the lpLnk */
/* FIXME the ref counter */
Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)ThisSurfInt); Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)ThisSurfInt);
} }
pDDraw->lpLcl->lpGbl->dsList = (LPDDRAWI_DDRAWSURFACE_INT) slist_int;
/* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */
/* FIXME bIsDifferentPixelFormat being set to true or false with automatic detcitons */ /* FIXME bIsDifferentPixelFormat being set to true or false with automatic detcitons */
@ -231,7 +232,7 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD,
return mDdCreateSurface.ddRVal; return mDdCreateSurface.ddRVal;
} }
*ppSurf = &slist_int[0]->lpVtbl; *ppSurf = (LPDIRECTDRAWSURFACE7) &slist_int[0]->lpVtbl;
return DD_OK; return DD_OK;
} }

12
reactos/dll/directx/ddraw/ddraw_structures.txt
View file

@ -37,7 +37,7 @@ typedef struct _DDRAWI_DIRECTDRAW_LCL {
ULONG_PTR hWnd; ULONG_PTR hWnd;
ULONG_PTR hDC; // create HDC and save it to this pointer ULONG_PTR hDC; // create HDC and save it to this pointer
DWORD dwErrorMode; DWORD dwErrorMode;
LPDDRAWI_DDRAWSURFACE_INT lpPrimary; LPDDRAWI_DDRAWSURFACE_INT lpPrimary; // The primary surface
LPDDRAWI_DDRAWSURFACE_INT lpCB; LPDDRAWI_DDRAWSURFACE_INT lpCB;
DWORD dwPreferredMode; DWORD dwPreferredMode;
HINSTANCE hD3DInstance; HINSTANCE hD3DInstance;
@ -49,7 +49,7 @@ typedef struct _DDRAWI_DIRECTDRAW_LCL {
DWORD dwHotTracking; DWORD dwHotTracking;
DWORD dwIMEState; DWORD dwIMEState;
ULONG_PTR hWndPopup; ULONG_PTR hWndPopup;
ULONG_PTR hDD; ULONG_PTR hDD; // from Gdientry1 copy the _DDRAWI_DIRECTDRAW_GBL hDD after startup then copy this back each time we need hDD
ULONG_PTR hGammaCalibrator; ULONG_PTR hGammaCalibrator;
LPDDGAMMACALIBRATORPROC lpGammaCalibrator; LPDDGAMMACALIBRATORPROC lpGammaCalibrator;
} DDRAWI_DIRECTDRAW_LCL; } DDRAWI_DIRECTDRAW_LCL;
@ -62,20 +62,20 @@ typedef struct _DDRAWI_DIRECTDRAW_GBL {
DWORD dwInternal1; DWORD dwInternal1;
DWORD dwUnused1[9]; DWORD dwUnused1[9];
LPDDHAL_CALLBACKS lpDDCBtmp; LPDDHAL_CALLBACKS lpDDCBtmp;
LPDDRAWI_DDRAWSURFACE_INT dsList; LPDDRAWI_DDRAWSURFACE_INT dsList; // list of all created directdraw surface, it is a pointer list
LPDDRAWI_DDRAWPALETTE_INT palList; LPDDRAWI_DDRAWPALETTE_INT palList;
LPDDRAWI_DDRAWCLIPPER_INT clipperList; LPDDRAWI_DDRAWCLIPPER_INT clipperList;
LPDDRAWI_DIRECTDRAW_GBL lp16DD; // pointer to it self (DDRAWI_DIRECTDRAW_GBL) LPDDRAWI_DIRECTDRAW_GBL lp16DD; // pointer to it self (DDRAWI_DIRECTDRAW_GBL)
DWORD dwMaxOverlays; DWORD dwMaxOverlays;
DWORD dwCurrOverlays; DWORD dwCurrOverlays;
DWORD dwMonitorFrequency; DWORD dwMonitorFrequency; // current mointor freq, (nivida always set this to 0, it is a bug in nvida drv)
DDCORECAPS ddHELCaps; DDCORECAPS ddHELCaps;
DWORD dwUnused2[50]; DWORD dwUnused2[50];
DDCOLORKEY ddckCKDestOverlay; DDCOLORKEY ddckCKDestOverlay;
DDCOLORKEY ddckCKSrcOverlay; DDCOLORKEY ddckCKSrcOverlay;
VIDMEMINFO vmiData; VIDMEMINFO vmiData;
LPVOID lpDriverHandle; LPVOID lpDriverHandle;
LPDDRAWI_DIRECTDRAW_LCL lpExclusiveOwner; LPDDRAWI_DIRECTDRAW_LCL lpExclusiveOwner; // which local directdraw comobject is in Exclusive mode and own this
DWORD dwModeIndex; DWORD dwModeIndex;
DWORD dwModeIndexOrig; DWORD dwModeIndexOrig;
DWORD dwNumFourCC; DWORD dwNumFourCC;
@ -118,7 +118,7 @@ typedef struct _DDRAWI_DIRECTDRAW_GBL {
ULONG_PTR lpD3DExtendedCaps; ULONG_PTR lpD3DExtendedCaps;
DWORD dwDOSBoxEvent; DWORD dwDOSBoxEvent;
RECT rectDesktop; RECT rectDesktop;
char cDriverName[MAX_DRIVER_NAME]; char cDriverName[MAX_DRIVER_NAME]; // driver name, if we send in CreateDirectDraw(NULL, ...) this will be fill in the name "display"
ULONG_PTR lpD3DHALCallbacks3; ULONG_PTR lpD3DHALCallbacks3;
DWORD dwNumZPixelFormats; DWORD dwNumZPixelFormats;
LPDDPIXELFORMAT lpZPixelFormats; LPDDPIXELFORMAT lpZPixelFormats;