Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 26729: splitted rosdraw.h; outsourced big comment into text file.
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sat May 12 20:21:50 2007 New Revision: 26729 URL: http://svn.reactos.org/svn/reactos?rev=26729&view=rev Log: splitted rosdraw.h; outsourced big comment into text file. Added: trunk/reactos/dll/directx/ddraw/Surface/surface.h (with props) trunk/reactos/dll/directx/ddraw/ddraw_structures.txt (with props) Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h Added: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (added) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sat May 12 20:21:50 2007 @@ -1,0 +1,73 @@ +// public interfaces +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7, DWORD, DWORD, LPDIRECTDRAWSURFACE7, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7, LPVOID, LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 , LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7, REFGUID); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7, LPDDSCAPS2, LPDIRECTDRAWSURFACE7*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7, LPDDSCAPS2 pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7, DDSURFACEDESC2 *, DWORD); +HRESULT WINAPI Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7, DWORD); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7, LPRECT); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7, LPDIRECTDRAW, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD); +HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags); +HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free); + +// hel callbacks +DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver); +DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface); +DWORD CALLBACK HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpSetColorKey); +DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode); +DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank); +DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface); +DWORD CALLBACK HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette); +DWORD CALLBACK HelDdGetScanLine(LPDDHAL_GETSCANLINEDATA lpGetScanLine); +DWORD CALLBACK HelDdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA lpSetExclusiveMode); +DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface); + +// internal functions +HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); +HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); +HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); Propchange: trunk/reactos/dll/directx/ddraw/Surface/surface.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Surface/surface.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/reactos/dll/directx/ddraw/ddraw_structures.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw_st… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw_structures.txt (added) +++ trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Sat May 12 20:21:50 2007 @@ -1,0 +1,338 @@ +* DirectDraw Object struct + + DDRAWI_DIRECTDRAW_INT + it is the the return pointer from ddraw.dll to the program + + DDRAWI_DIRECTDRAW_LCL + It is the program own private data + + DDRAWI_DIRECTDRAW_GBL + This struct is gboal for whole ddraw.dll for all program + it is static in ddraw if it change it change for all + program + + The struct + + from http://msdn2.microsoft.com/en-us/library/ms898267.aspx + it was not document for windows 2000/xp/2003 but ms did document it + for windows ce 5.0 the link are to windows ce 5.0 arch + +typedef struct _DDRAWI_DIRECTDRAW_INT { + LPVOID lpVtbl; + LPDDRAWI_DIRECTDRAW_LCL lpLcl; + LPDDRAWI_DIRECTDRAW_INT lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DIRECTDRAW_INT; + + rest of the struct are from msdn for windows 2000/xp/2003 +typedef struct _DDRAWI_DIRECTDRAW_LCL { + DWORD lpDDMore; + LPDDRAWI_DIRECTDRAW_GBL lpGbl; // fill it from function Create_DirectDraw with static pointer ddgbl + DWORD dwUnused0; + DWORD dwLocalFlags; + DWORD dwLocalRefCnt; + DWORD dwProcessId; + IUnknown FAR *pUnkOuter; + DWORD dwObsolete1; + ULONG_PTR hWnd; + ULONG_PTR hDC; // create HDC and save it to this pointer + DWORD dwErrorMode; + LPDDRAWI_DDRAWSURFACE_INT lpPrimary; + LPDDRAWI_DDRAWSURFACE_INT lpCB; + DWORD dwPreferredMode; + HINSTANCE hD3DInstance; + IUnknown FAR *pD3DIUnknown; + LPDDHAL_CALLBACKS lpDDCB; // same memory pointer as DDRAWI_DIRECTDRAW_GBL->lpDDCBtmp, setup by function StartDirectDraw + ULONG_PTR hDDVxd; + DWORD dwAppHackFlags; + ULONG_PTR hFocusWnd; + DWORD dwHotTracking; + DWORD dwIMEState; + ULONG_PTR hWndPopup; + ULONG_PTR hDD; + ULONG_PTR hGammaCalibrator; + LPDDGAMMACALIBRATORPROC lpGammaCalibrator; +} DDRAWI_DIRECTDRAW_LCL; + + +typedef struct _DDRAWI_DIRECTDRAW_GBL { + DWORD dwRefCnt; + DWORD dwFlags; + FLATPTR fpPrimaryOrig; + DDCORECAPS ddCaps; + DWORD dwInternal1; + DWORD dwUnused1[9]; + LPDDHAL_CALLBACKS lpDDCBtmp; + LPDDRAWI_DDRAWSURFACE_INT dsList; + LPDDRAWI_DDRAWPALETTE_INT palList; + LPDDRAWI_DDRAWCLIPPER_INT clipperList; + LPDDRAWI_DIRECTDRAW_GBL lp16DD; // pointer to it self (DDRAWI_DIRECTDRAW_GBL) + DWORD dwMaxOverlays; + DWORD dwCurrOverlays; + DWORD dwMonitorFrequency; + DDCORECAPS ddHELCaps; + DWORD dwUnused2[50]; + DDCOLORKEY ddckCKDestOverlay; + DDCOLORKEY ddckCKSrcOverlay; + VIDMEMINFO vmiData; + LPVOID lpDriverHandle; + LPDDRAWI_DIRECTDRAW_LCL lpExclusiveOwner; + DWORD dwModeIndex; + DWORD dwModeIndexOrig; + DWORD dwNumFourCC; + DWORD FAR *lpdwFourCC; + DWORD dwNumModes; + LPDDHALMODEINFO lpModeInfo; + PROCESS_LIST plProcessList; + DWORD dwSurfaceLockCount; + DWORD dwAliasedLockCnt; + ULONG_PTR dwReserved3; + ULONG_PTR hDD; // GdiEntry1 are filling this pointer + char cObsolete[12]; + DWORD dwReserved1; + DWORD dwReserved2; + DBLNODE dbnOverlayRoot; + volatile LPWORD lpwPDeviceFlags; + DWORD dwPDevice; + DWORD dwWin16LockCnt; + DWORD dwUnused3; + DWORD hInstance; + DWORD dwEvent16; + DWORD dwSaveNumModes; + ULONG_PTR lpD3DGlobalDriverData; + ULONG_PTR lpD3DHALCallbacks; + DDCORECAPS ddBothCaps; + LPDDVIDEOPORTCAPS lpDDVideoPortCaps; + LPDDRAWI_DDVIDEOPORT_INT dvpList; + ULONG_PTR lpD3DHALCallbacks2; + RECT rectDevice; + DWORD cMonitors; + LPVOID gpbmiSrc; + LPVOID gpbmiDest; + LPHEAPALIASINFO phaiHeapAliases; + ULONG_PTR hKernelHandle; + ULONG_PTR pfnNotifyProc; + LPDDKERNELCAPS lpDDKernelCaps; + LPDDNONLOCALVIDMEMCAPS lpddNLVCaps; + LPDDNONLOCALVIDMEMCAPS lpddNLVHELCaps; + LPDDNONLOCALVIDMEMCAPS lpddNLVBothCaps; + ULONG_PTR lpD3DExtendedCaps; + DWORD dwDOSBoxEvent; + RECT rectDesktop; + char cDriverName[MAX_DRIVER_NAME]; + ULONG_PTR lpD3DHALCallbacks3; + DWORD dwNumZPixelFormats; + LPDDPIXELFORMAT lpZPixelFormats; + LPDDRAWI_DDMOTIONCOMP_INT mcList; + DWORD hDDVxd; + DDSCAPSEX ddsCapsMore; +} DDRAWI_DIRECTDRAW_GBL; + + +*/ + + +/* Clipper Object struct + DDRAWI_DDRAWCLIPPER_INT + it is the the return pointer from ddraw.dll to the program + + DDRAWI_DDRAWCLIPPER_LCL + It is the program own private data + + DDRAWI_DDRAWCLIPPER_GBL + This struct is gboal for whole ddraw.dll for all program + it is static in ddraw if it change it change for all + program + + The struct + +typedef struct _DDRAWI_DDRAWCLIPPER_INT { + LPVOID lpVtbl; + LPDDRAWI_DDRAWCLIPPER_LCL lpLcl; + LPDDRAWI_DDRAWCLIPPER_INT lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DDRAWCLIPPER_INT; + +typedef struct _DDRAWI_DDRAWCLIPPER_LCL { + DWORD lpClipMore; + LPDDRAWI_DDRAWCLIPPER_GBL lpGbl; + LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; + DWORD dwLocalRefCnt; + IUnknown FAR *pUnkOuter; + LPDDRAWI_DIRECTDRAW_INT lpDD_int; + ULONG_PTR dwReserved1; + IUnknown *pAddrefedThisOwner; +} DDRAWI_DDRAWCLIPPER_LCL; + +typedef struct _DDRAWI_DDRAWCLIPPER_GBL { + DWORD dwRefCnt; + DWORD dwFlags; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwProcessId; + ULONG_PTR dwReserved1; + ULONG_PTR hWnd; + LPRGNDATA lpStaticClipList; +} DDRAWI_DDRAWCLIPPER_GBL; +*/ + + + +/* +typedef struct _DDRAWI_DDRAWPALETTE_INT { + LPVOID lpVtbl; + LPDDRAWI_DDRAWPALETTE_LCL lpLcl; + LPDDRAWI_DDRAWPALETTE_INT lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DDRAWPALETTE_INT; + +typedef struct _DDRAWI_DDRAWPALETTE_LCL { + DWORD lpPalMore; + LPDDRAWI_DDRAWPALETTE_GBL lpGbl; + ULONG_PTR dwUnused0; + DWORD dwLocalRefCnt; + IUnknown FAR *pUnkOuter; + LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; + ULONG_PTR dwReserved1; + ULONG_PTR dwDDRAWReserved1; + ULONG_PTR dwDDRAWReserved2; + ULONG_PTR dwDDRAWReserved3; +} DDRAWI_DDRAWPALETTE_LCL; + +typedef struct _DDRAWI_DDRAWPALETTE_GBL { + DWORD dwRefCnt; + DWORD dwFlags; + LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; + DWORD dwProcessId; + LPPALETTEENTRY lpColorTable; + union { + ULONG_PTR dwReserved1; + HPALETTE hHELGDIPalette; + }; + DWORD dwDriverReserved; + DWORD dwContentsStamp; + DWORD dwSaveStamp; + DWORD dwHandle; +} DDRAWI_DDRAWPALETTE_GBL; +*/ + +/* +typedef struct _DDRAWI_DDVIDEOPORT_INT { + LPVOID lpVtbl; + LPDDRAWI_DDVIDEOPORT_LCL lpLcl; + LPDDRAWI_DDVIDEOPORT_INT lpLink; + DWORD dwIntRefCnt; + DWORD dwFlags; +} DDRAWI_DDVIDEOPORT_INT; + +typedef struct _DDRAWI_DDVIDEOPORT_LCL { + LPDDRAWI_DIRECTDRAW_LCL lpDD; + DDVIDEOPORTDESC ddvpDesc; + DDVIDEOPORTINFO ddvpInfo; + LPDDRAWI_DDRAWSURFACE_INT lpSurface; + LPDDRAWI_DDRAWSURFACE_INT lpVBISurface; + LPDDRAWI_DDRAWSURFACE_INT *lpFlipInts; + DWORD dwNumAutoflip; + DWORD dwProcessID; + DWORD dwStateFlags; + DWORD dwFlags; + DWORD dwRefCnt; + FLATPTR fpLastFlip; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; + HANDLE hDDVideoPort; + DWORD dwNumVBIAutoflip; + LPDDVIDEOPORTDESC lpVBIDesc; + LPDDVIDEOPORTDESC lpVideoDesc; + LPDDVIDEOPORTINFO lpVBIInfo; + LPDDVIDEOPORTINFO lpVideoInfo; + DWORD dwVBIProcessID; +} DDRAWI_DDVIDEOPORT_LCL; + + +Surface +typedef struct _DDRAWI_DDRAWSURFACE_GBL { + DWORD dwRefCnt; + DWORD dwGlobalFlags; + union { + LPACCESSRECTLIST lpRectList; + DWORD dwBlockSizeY; + }; + union { + LPVMEMHEAP lpVidMemHeap; + DWORD dwBlockSizeX; + }; + union { + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPVOID lpDDHandle; + }; + FLATPTR fpVidMem; + union { + LONG lPitch; + DWORD dwLinearSize; + }; + WORD wHeight; + WORD wWidth; + DWORD dwUsageCount; + ULONG_PTR dwReserved1; + DDPIXELFORMAT ddpfSurface; +} DDRAWI_DDRAWSURFACE_GBL; + +*/ + + +/* This comment info maybe is wrong + bare in mind I am using logic thinking + for follow info does not exists in MSDN + so I am drawing clude how previews stuffs + works that are document in MSDN/DDK + +follow struct should exists ??? +DDRAWI_DDVIDEOPORT_GBL +DDRAWI_DDGAMMACONTROL_INT +DDRAWI_DDGAMMACONTROL_LCL +DDRAWI_DDGAMMACONTROL_GBL +DDRAWI_DDCOLORCONTROL_INT +DDRAWI_DDCOLORCONTROL_LCL +DDRAWI_DDCOLORCONTROL_GBL +DDRAWI_KERNEL_INT +DDRAWI_KERNEL_LCL +DDRAWI_KERNEL_GBL +DDRAWI_DDKERNELSURFACE_INT +DDRAWI_DDKERNELSURFACE_LCL +DDRAWI_DDKERNELSURFACE_GBL + +follow struct can be easy create +DDRAWI_DDGAMMACONTROL_INT +DDRAWI_DDCOLORCONTROL_INT +DDRAWI_KERNEL_INT + +the DDRAWI_DDGAMMACONTROL_INT should looking like this +typedef struct _DDRAWI_DDGAMMACONTROL_INT +{ + LPVOID lpVtbl; + LPDDRAWI_DDGAMMACONTROL_LCL lpLcl; + LPDDRAWI_DDGAMMACONTROL_INT lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DDGAMMACONTROL_INT, *LPDDRAWI_DDGAMMACONTROL_INT + +how did I got this struct I looked at all other INT struct how they where +build. But it is not 100% sure this one is right untill I/we known how +the DDRAWI_DDGAMMACONTROL_LCL works and DDRAWI_DDCOLORCONTROL_GBL +our internal struct will look like this +typedef struct _DDRAWI_DDGAMMACONTROL_INT +{ + LPVOID lpVtbl; + LPVOID lpLcl; + LPVOID lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DDGAMMACONTROL_INT, *LPDDRAWI_DDGAMMACONTROL_INT + +same goes for DDRAWI_DDCOLORCONTROL_INT + +typedef struct DDRAWI_DDCOLORCONTROL_INT +{ + LPVOID lpVtbl; + LPVOID lpLcl; + LPVOID lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DDCOLORCONTROL_INT, *LPDDRAWI_DDCOLORCONTROL_INT Propchange: trunk/reactos/dll/directx/ddraw/ddraw_structures.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat May 12 20:21:50 2007 @@ -2,20 +2,15 @@ #define __DDRAW_PRIVATE /********* Includes *********/ - #include <windows.h> #include <stdio.h> - - #include <ddraw.h> #include <ddrawi.h> #include <d3dhal.h> #include <ddrawgdi.h> - - - - +#include "Ddraw\ddraw.h" +#include "Surface\surface.h" /* DirectDraw startup code only internal use */ extern DDRAWI_DIRECTDRAW_GBL ddgbl; @@ -24,12 +19,10 @@ extern WNDCLASSW wnd_class; extern CRITICAL_SECTION ddcs; - HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface, LPGUID pGUID, BOOL reenable); HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable); HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable); HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); - HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface); /* DirectDraw Cleanup code only internal use */ @@ -46,450 +39,20 @@ VOID WINAPI AcquireDDThreadLock(); VOID WINAPI ReleaseDDThreadLock(); -HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 , REFIID , LPVOID *); -ULONG WINAPI Main_DirectDraw_AddRef(LPDIRECTDRAW7 ); -ULONG WINAPI Main_DirectDraw_Release(LPDIRECTDRAW7 ); -HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 ); -HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown *); -HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE*, LPUNKNOWN); -HRESULT WINAPI Main_DirectDraw_CreateSurface(LPDIRECTDRAW7, LPDDSURFACEDESC2, LPDIRECTDRAWSURFACE7 *, IUnknown *); -HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7, LPDDDEVICEIDENTIFIER2, DWORD); - -HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7, DWORD, LPDDSURFACEDESC2, LPVOID, - LPDDENUMSURFACESCALLBACK7); - -HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7); -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7, HDC, LPDIRECTDRAWSURFACE7 *); -HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7, LPDDCAPS pDriverCaps, LPDDCAPS); -HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7, LPDWORD pNumCodes, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7 *); -HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7, DWORD dwFlags, HANDLE); -HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7, LPBOOL); -HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7); -HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7, HWND, DWORD); -HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD); -HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface); -HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface); -HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID); -HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags); -HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b); - -ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7); -ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7, REFIID, LPVOID*); -HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); -HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX); -HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7, LPDDBLTBATCH, DWORD, DWORD); -HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7, DWORD, DWORD, LPDIRECTDRAWSURFACE7, LPRECT, DWORD); -HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7, LPVOID, LPDDENUMSURFACESCALLBACK7); -HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK7); -HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 , LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7, REFGUID); -HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7, LPDDSCAPS2, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7, DWORD dwFlags); -HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7, LPDDSCAPS2 pCaps); -HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER*); -HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); -HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7, HDC *); -HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7, LPVOID*); -HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7, LPLONG, LPLONG); -HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE*); -HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7, LPDDPIXELFORMAT); -HRESULT WINAPI Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); -HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER); -HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); -HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7, LONG, LONG); -HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE); -HRESULT WINAPI Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, DWORD, DWORD); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7, DDSURFACEDESC2 *, DWORD); -HRESULT WINAPI Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7, LPRECT); -HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7, LPDIRECTDRAW, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); -HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, - DWORD, LPDDOVERLAYFX); -HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface); - - ULONG WINAPI DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface); HRESULT WINAPI DirectDrawClipper_Initialize( LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags); - - -HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); -HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); -HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); - -/* DirectDraw Object struct - - DDRAWI_DIRECTDRAW_INT - it is the the return pointer from ddraw.dll to the program - - DDRAWI_DIRECTDRAW_LCL - It is the program own private data - - DDRAWI_DIRECTDRAW_GBL - This struct is gboal for whole ddraw.dll for all program - it is static in ddraw if it change it change for all - program - - The struct - - from http://msdn2.microsoft.com/en-us/library/ms898267.aspx - it was not document for windows 2000/xp/2003 but ms did document it - for windows ce 5.0 the link are to windows ce 5.0 arch - -typedef struct _DDRAWI_DIRECTDRAW_INT { - LPVOID lpVtbl; - LPDDRAWI_DIRECTDRAW_LCL lpLcl; - LPDDRAWI_DIRECTDRAW_INT lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DIRECTDRAW_INT; - - rest of the struct are from msdn for windows 2000/xp/2003 -typedef struct _DDRAWI_DIRECTDRAW_LCL { - DWORD lpDDMore; - LPDDRAWI_DIRECTDRAW_GBL lpGbl; // fill it from function Create_DirectDraw with static pointer ddgbl - DWORD dwUnused0; - DWORD dwLocalFlags; - DWORD dwLocalRefCnt; - DWORD dwProcessId; - IUnknown FAR *pUnkOuter; - DWORD dwObsolete1; - ULONG_PTR hWnd; - ULONG_PTR hDC; // create HDC and save it to this pointer - DWORD dwErrorMode; - LPDDRAWI_DDRAWSURFACE_INT lpPrimary; - LPDDRAWI_DDRAWSURFACE_INT lpCB; - DWORD dwPreferredMode; - HINSTANCE hD3DInstance; - IUnknown FAR *pD3DIUnknown; - LPDDHAL_CALLBACKS lpDDCB; // same memory pointer as DDRAWI_DIRECTDRAW_GBL->lpDDCBtmp, setup by function StartDirectDraw - ULONG_PTR hDDVxd; - DWORD dwAppHackFlags; - ULONG_PTR hFocusWnd; - DWORD dwHotTracking; - DWORD dwIMEState; - ULONG_PTR hWndPopup; - ULONG_PTR hDD; - ULONG_PTR hGammaCalibrator; - LPDDGAMMACALIBRATORPROC lpGammaCalibrator; -} DDRAWI_DIRECTDRAW_LCL; - - -typedef struct _DDRAWI_DIRECTDRAW_GBL { - DWORD dwRefCnt; - DWORD dwFlags; - FLATPTR fpPrimaryOrig; - DDCORECAPS ddCaps; - DWORD dwInternal1; - DWORD dwUnused1[9]; - LPDDHAL_CALLBACKS lpDDCBtmp; - LPDDRAWI_DDRAWSURFACE_INT dsList; - LPDDRAWI_DDRAWPALETTE_INT palList; - LPDDRAWI_DDRAWCLIPPER_INT clipperList; - LPDDRAWI_DIRECTDRAW_GBL lp16DD; // pointer to it self (DDRAWI_DIRECTDRAW_GBL) - DWORD dwMaxOverlays; - DWORD dwCurrOverlays; - DWORD dwMonitorFrequency; - DDCORECAPS ddHELCaps; - DWORD dwUnused2[50]; - DDCOLORKEY ddckCKDestOverlay; - DDCOLORKEY ddckCKSrcOverlay; - VIDMEMINFO vmiData; - LPVOID lpDriverHandle; - LPDDRAWI_DIRECTDRAW_LCL lpExclusiveOwner; - DWORD dwModeIndex; - DWORD dwModeIndexOrig; - DWORD dwNumFourCC; - DWORD FAR *lpdwFourCC; - DWORD dwNumModes; - LPDDHALMODEINFO lpModeInfo; - PROCESS_LIST plProcessList; - DWORD dwSurfaceLockCount; - DWORD dwAliasedLockCnt; - ULONG_PTR dwReserved3; - ULONG_PTR hDD; // GdiEntry1 are filling this pointer - char cObsolete[12]; - DWORD dwReserved1; - DWORD dwReserved2; - DBLNODE dbnOverlayRoot; - volatile LPWORD lpwPDeviceFlags; - DWORD dwPDevice; - DWORD dwWin16LockCnt; - DWORD dwUnused3; - DWORD hInstance; - DWORD dwEvent16; - DWORD dwSaveNumModes; - ULONG_PTR lpD3DGlobalDriverData; - ULONG_PTR lpD3DHALCallbacks; - DDCORECAPS ddBothCaps; - LPDDVIDEOPORTCAPS lpDDVideoPortCaps; - LPDDRAWI_DDVIDEOPORT_INT dvpList; - ULONG_PTR lpD3DHALCallbacks2; - RECT rectDevice; - DWORD cMonitors; - LPVOID gpbmiSrc; - LPVOID gpbmiDest; - LPHEAPALIASINFO phaiHeapAliases; - ULONG_PTR hKernelHandle; - ULONG_PTR pfnNotifyProc; - LPDDKERNELCAPS lpDDKernelCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVHELCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVBothCaps; - ULONG_PTR lpD3DExtendedCaps; - DWORD dwDOSBoxEvent; - RECT rectDesktop; - char cDriverName[MAX_DRIVER_NAME]; - ULONG_PTR lpD3DHALCallbacks3; - DWORD dwNumZPixelFormats; - LPDDPIXELFORMAT lpZPixelFormats; - LPDDRAWI_DDMOTIONCOMP_INT mcList; - DWORD hDDVxd; - DDSCAPSEX ddsCapsMore; -} DDRAWI_DIRECTDRAW_GBL; - - -*/ - - -/* Clipper Object struct - DDRAWI_DDRAWCLIPPER_INT - it is the the return pointer from ddraw.dll to the program - - DDRAWI_DDRAWCLIPPER_LCL - It is the program own private data - - DDRAWI_DDRAWCLIPPER_GBL - This struct is gboal for whole ddraw.dll for all program - it is static in ddraw if it change it change for all - program - - The struct - -typedef struct _DDRAWI_DDRAWCLIPPER_INT { - LPVOID lpVtbl; - LPDDRAWI_DDRAWCLIPPER_LCL lpLcl; - LPDDRAWI_DDRAWCLIPPER_INT lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DDRAWCLIPPER_INT; - -typedef struct _DDRAWI_DDRAWCLIPPER_LCL { - DWORD lpClipMore; - LPDDRAWI_DDRAWCLIPPER_GBL lpGbl; - LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; - DWORD dwLocalRefCnt; - IUnknown FAR *pUnkOuter; - LPDDRAWI_DIRECTDRAW_INT lpDD_int; - ULONG_PTR dwReserved1; - IUnknown *pAddrefedThisOwner; -} DDRAWI_DDRAWCLIPPER_LCL; - -typedef struct _DDRAWI_DDRAWCLIPPER_GBL { - DWORD dwRefCnt; - DWORD dwFlags; - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwProcessId; - ULONG_PTR dwReserved1; - ULONG_PTR hWnd; - LPRGNDATA lpStaticClipList; -} DDRAWI_DDRAWCLIPPER_GBL; -*/ - - - -/* -typedef struct _DDRAWI_DDRAWPALETTE_INT { - LPVOID lpVtbl; - LPDDRAWI_DDRAWPALETTE_LCL lpLcl; - LPDDRAWI_DDRAWPALETTE_INT lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DDRAWPALETTE_INT; - -typedef struct _DDRAWI_DDRAWPALETTE_LCL { - DWORD lpPalMore; - LPDDRAWI_DDRAWPALETTE_GBL lpGbl; - ULONG_PTR dwUnused0; - DWORD dwLocalRefCnt; - IUnknown FAR *pUnkOuter; - LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; - ULONG_PTR dwReserved1; - ULONG_PTR dwDDRAWReserved1; - ULONG_PTR dwDDRAWReserved2; - ULONG_PTR dwDDRAWReserved3; -} DDRAWI_DDRAWPALETTE_LCL; - -typedef struct _DDRAWI_DDRAWPALETTE_GBL { - DWORD dwRefCnt; - DWORD dwFlags; - LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; - DWORD dwProcessId; - LPPALETTEENTRY lpColorTable; - union { - ULONG_PTR dwReserved1; - HPALETTE hHELGDIPalette; - }; - DWORD dwDriverReserved; - DWORD dwContentsStamp; - DWORD dwSaveStamp; - DWORD dwHandle; -} DDRAWI_DDRAWPALETTE_GBL; -*/ - -/* -typedef struct _DDRAWI_DDVIDEOPORT_INT { - LPVOID lpVtbl; - LPDDRAWI_DDVIDEOPORT_LCL lpLcl; - LPDDRAWI_DDVIDEOPORT_INT lpLink; - DWORD dwIntRefCnt; - DWORD dwFlags; -} DDRAWI_DDVIDEOPORT_INT; - -typedef struct _DDRAWI_DDVIDEOPORT_LCL { - LPDDRAWI_DIRECTDRAW_LCL lpDD; - DDVIDEOPORTDESC ddvpDesc; - DDVIDEOPORTINFO ddvpInfo; - LPDDRAWI_DDRAWSURFACE_INT lpSurface; - LPDDRAWI_DDRAWSURFACE_INT lpVBISurface; - LPDDRAWI_DDRAWSURFACE_INT *lpFlipInts; - DWORD dwNumAutoflip; - DWORD dwProcessID; - DWORD dwStateFlags; - DWORD dwFlags; - DWORD dwRefCnt; - FLATPTR fpLastFlip; - ULONG_PTR dwReserved1; - ULONG_PTR dwReserved2; - HANDLE hDDVideoPort; - DWORD dwNumVBIAutoflip; - LPDDVIDEOPORTDESC lpVBIDesc; - LPDDVIDEOPORTDESC lpVideoDesc; - LPDDVIDEOPORTINFO lpVBIInfo; - LPDDVIDEOPORTINFO lpVideoInfo; - DWORD dwVBIProcessID; -} DDRAWI_DDVIDEOPORT_LCL; - - -Surface -typedef struct _DDRAWI_DDRAWSURFACE_GBL { - DWORD dwRefCnt; - DWORD dwGlobalFlags; - union { - LPACCESSRECTLIST lpRectList; - DWORD dwBlockSizeY; - }; - union { - LPVMEMHEAP lpVidMemHeap; - DWORD dwBlockSizeX; - }; - union { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPVOID lpDDHandle; - }; - FLATPTR fpVidMem; - union { - LONG lPitch; - DWORD dwLinearSize; - }; - WORD wHeight; - WORD wWidth; - DWORD dwUsageCount; - ULONG_PTR dwReserved1; - DDPIXELFORMAT ddpfSurface; -} DDRAWI_DDRAWSURFACE_GBL; - -*/ - - -/* This comment info maybe is wrong - bare in mind I am using logic thinking - for follow info does not exists in MSDN - so I am drawing clude how previews stuffs - works that are document in MSDN/DDK - -follow struct should exists ??? -DDRAWI_DDVIDEOPORT_GBL -DDRAWI_DDGAMMACONTROL_INT -DDRAWI_DDGAMMACONTROL_LCL -DDRAWI_DDGAMMACONTROL_GBL -DDRAWI_DDCOLORCONTROL_INT -DDRAWI_DDCOLORCONTROL_LCL -DDRAWI_DDCOLORCONTROL_GBL -DDRAWI_KERNEL_INT -DDRAWI_KERNEL_LCL -DDRAWI_KERNEL_GBL -DDRAWI_DDKERNELSURFACE_INT -DDRAWI_DDKERNELSURFACE_LCL -DDRAWI_DDKERNELSURFACE_GBL - -follow struct can be easy create -DDRAWI_DDGAMMACONTROL_INT -DDRAWI_DDCOLORCONTROL_INT -DDRAWI_KERNEL_INT - -the DDRAWI_DDGAMMACONTROL_INT should looking like this +typedef struct DDRAWI_DDCOLORCONTROL_INT +{ + LPVOID lpVtbl; + LPVOID lpLcl; + LPVOID lpLink; + DWORD dwIntRefCnt; +} DDRAWI_DDCOLORCONTROL_INT, *LPDDRAWI_DDCOLORCONTROL_INT; + typedef struct _DDRAWI_DDGAMMACONTROL_INT { LPVOID lpVtbl; - LPDDRAWI_DDGAMMACONTROL_LCL lpLcl; - LPDDRAWI_DDGAMMACONTROL_INT lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DDGAMMACONTROL_INT, *LPDDRAWI_DDGAMMACONTROL_INT - -how did I got this struct I looked at all other INT struct how they where -build. But it is not 100% sure this one is right untill I/we known how -the DDRAWI_DDGAMMACONTROL_LCL works and DDRAWI_DDCOLORCONTROL_GBL -our internal struct will look like this -typedef struct _DDRAWI_DDGAMMACONTROL_INT -{ - LPVOID lpVtbl; - LPVOID lpLcl; - LPVOID lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DDGAMMACONTROL_INT, *LPDDRAWI_DDGAMMACONTROL_INT - -same goes for DDRAWI_DDCOLORCONTROL_INT - -typedef struct DDRAWI_DDCOLORCONTROL_INT -{ - LPVOID lpVtbl; - LPVOID lpLcl; - LPVOID lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DDCOLORCONTROL_INT, *LPDDRAWI_DDCOLORCONTROL_INT -*/ - -typedef struct DDRAWI_DDCOLORCONTROL_INT -{ - LPVOID lpVtbl; - LPVOID lpLcl; - LPVOID lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DDCOLORCONTROL_INT, *LPDDRAWI_DDCOLORCONTROL_INT; - - -typedef struct _DDRAWI_DDGAMMACONTROL_INT -{ - LPVOID lpVtbl; LPVOID lpLcl; LPVOID lpLink; DWORD dwIntRefCnt; @@ -514,10 +77,7 @@ /* now to real info that are for private use and are our own */ - /*********** VTables ************/ - - extern IDirectDrawVtbl DirectDraw_Vtable; extern IDirectDraw2Vtbl DirectDraw2_Vtable; extern IDirectDraw4Vtbl DirectDraw4_Vtable; @@ -535,75 +95,7 @@ extern IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable; /********* Prototypes **********/ -HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach); -HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); -HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD); -HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback); -HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags); - - -HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free); - - -VOID Hal_DirectDraw_Release (LPDIRECTDRAW7 ); -HRESULT Hal_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7, LPDDSCAPS2, LPDWORD, LPDWORD ); -HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7, DWORD, HANDLE ); -HRESULT Hal_DirectDraw_GetScanLine(LPDIRECTDRAW7 , LPDWORD ); -HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); -HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); -HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); -HRESULT Hal_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags); -HRESULT Hal_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey); -HRESULT Hal_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); -HRESULT Hal_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); -HRESULT Hal_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); - -HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 ); -HRESULT Hel_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 ); -VOID Hel_DirectDraw_Release (LPDIRECTDRAW7 ); -HRESULT Hel_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 , LPDDSCAPS2 ddsaps, LPDWORD , LPDWORD ); -HRESULT Hel_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7, DWORD, HANDLE ); -HRESULT Hel_DirectDraw_GetScanLine(LPDIRECTDRAW7 , LPDWORD ); -HRESULT Hel_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); -HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); -HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); -HRESULT Hel_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey); -HRESULT Hel_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); -HRESULT Hel_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); -HRESULT Hel_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags); -HRESULT Hel_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); - -/* HEL CALLBACK */ -DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver); -DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface); -DWORD CALLBACK HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpSetColorKey); -DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode); -DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank); -DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface); -DWORD CALLBACK HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette); -DWORD CALLBACK HelDdGetScanLine(LPDDHAL_GETSCANLINEDATA lpGetScanLine); -DWORD CALLBACK HelDdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA lpSetExclusiveMode); -DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface); - -DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface); -DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData); -DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData); -DWORD CALLBACK HelDdSurfFlip(LPDDHAL_FLIPDATA lpFlipData); -DWORD CALLBACK HelDdSurfGetBltStatus(LPDDHAL_GETBLTSTATUSDATA lpGetBltStatusData); -DWORD CALLBACK HelDdSurfGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA lpGetFlipStatusData); -DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData); -DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr); -DWORD CALLBACK HelDdSurfSetClipList(LPDDHAL_SETCLIPLISTDATA lpSetClipListData); -DWORD CALLBACK HelDdSurfSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKeyData); -DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData); -DWORD CALLBACK HelDdSurfSetPalette(LPDDHAL_SETPALETTEDATA lpSetPaletteData); -DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData); -DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData); - - - +VOID Hal_DirectDraw_Release (LPDIRECTDRAW7); /* Setting for HEL should be move to ros special reg key ? */

1 0

[greatlrd] 26728: forget this change, did think it still was in svn.
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat May 12 19:52:09 2007 New Revision: 26728 URL: http://svn.reactos.org/svn/reactos?rev=26728&view=rev Log: forget this change, did think it still was in svn. Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat May 12 19:52:09 2007 @@ -22,6 +22,7 @@ extern DDRAWI_DDRAWSURFACE_GBL ddSurfGbl; extern WCHAR classname[128]; extern WNDCLASSW wnd_class; +extern CRITICAL_SECTION ddcs; HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface, LPGUID pGUID, BOOL reenable);

1 0

[greatlrd] 26727: start reimplement createsurface
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat May 12 19:50:26 2007 New Revision: 26727 URL: http://svn.reactos.org/svn/reactos?rev=26727&view=rev Log: start reimplement createsurface Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat May 12 19:50:26 2007 @@ -116,6 +116,22 @@ return DD_OK; } + +/* + */ +HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +{ + + DX_WINDBG_trace(); + EnterCriticalSection(&ddcs); + + /* code here */ + + LeaveCriticalSection(&ddcs); + + DX_STUB; +} /* */ Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sat May 12 19:50:26 2007 @@ -36,19 +36,7 @@ } -/* - * stub - * Status not done - */ -HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) -{ - - DX_WINDBG_trace(); - - DX_STUB; - -} + /*

1 0

[mbosma] 26726: Fix warning.
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sat May 12 19:45:54 2007 New Revision: 26726 URL: http://svn.reactos.org/svn/reactos?rev=26726&view=rev Log: Fix warning. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat May 12 19:45:54 2007 @@ -133,9 +133,9 @@ HWND window; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; -#if 0 // this check is totally invalid if you ask me - mbosma /* Get the old window */ window = (HWND) This->lpLcl->hWnd; +#if 0 // this check is totally invalid if you ask me - mbosma if(!window) { return DDERR_NOHWND;

1 0

[mbosma] 26725: Forgot to include surface_main.c in ddraw.rbuild.
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sat May 12 19:24:54 2007 New Revision: 26725 URL: http://svn.reactos.org/svn/reactos?rev=26725&view=rev Log: Forgot to include surface_main.c in ddraw.rbuild. Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sat May 12 19:24:54 2007 @@ -21,7 +21,7 @@ That[0]->lpLcl->lpSurfMore->slist = lpLcl; - //That[0]->lpVtbl = &DirectDrawSurface7_Vtable; // FixMe ! + That[0]->lpVtbl = &DirectDrawSurface7_Vtable; That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); That[0]->lpLcl->lpSurfMore->lpDD_int = This; That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; @@ -113,7 +113,7 @@ That[t]->lpLcl->lpSurfMore->slist = lpLcl; - //That[t]->lpVtbl = &DirectDrawSurface7_Vtable; // FixMe ! + That[t]->lpVtbl = &DirectDrawSurface7_Vtable; That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); That[t]->lpLcl->lpSurfMore->lpDD_int = This; That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Sat May 12 19:24:54 2007 @@ -56,17 +56,6 @@ */ DX_STUB_str("FIXME This is not right exiame how it should be done\n"); return This->dwIntRefCnt; -} - -HRESULT WINAPI -Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, - LPVOID* ppObj) -{ - DX_WINDBG_trace(); - - DX_STUB_str("Unimplement\n"); - - return E_NOINTERFACE; } HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat May 12 19:24:54 2007 @@ -28,7 +28,8 @@ <file>callbacks_dd_hel.c</file> </directory> <directory name="Surface"> - <file>surface_stubs.c</file> + <file>surface_stubs.c</file> + <file>surface_main.c</file> <file>callbacks_surf_hel.c</file> <file>createsurface.c</file> </directory> Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat May 12 19:24:54 2007 @@ -125,6 +125,7 @@ HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7); HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface); ULONG WINAPI DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface);

1 0

[mbosma] 26724: DirectDraw rearrangement. (part 2/2)
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sat May 12 18:58:26 2007 New Revision: 26724 URL: http://svn.reactos.org/svn/reactos?rev=26724&view=rev Log: DirectDraw rearrangement. (part 2/2) Added: trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c trunk/reactos/dll/directx/ddraw/Color/color_stubs.c - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Color/iface_color.c trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (with props) trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c (with props) trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c - copied unchanged from r26723, trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c Removed: trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c trunk/reactos/dll/directx/ddraw/Color/iface_color.c trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/rosdraw.h Removed: trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Clipper/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c (original) +++ trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c (removed) @@ -1,105 +1,0 @@ -/* $Id: clipper.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/clipper.c - * PURPOSE: IDirectDrawClipper Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -ULONG WINAPI -DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_Initialize( LPDIRECTDRAWCLIPPER iface, - LPDIRECTDRAW lpDD, - DWORD dwFlags) -{ - /* FIXME not implment */ - DX_WINDBG_trace(); - DX_STUB_DD_OK; -} - -HRESULT WINAPI -DirectDrawClipper_SetHwnd( LPDIRECTDRAWCLIPPER iface, - DWORD dwFlags, - HWND hWnd) -{ - /* FIXME not implment */ - DX_WINDBG_trace(); - DX_STUB_DD_OK; -} - -HRESULT WINAPI -DirectDrawClipper_GetClipList( LPDIRECTDRAWCLIPPER iface, - LPRECT lpRect, - LPRGNDATA lpClipList, - LPDWORD lpdwSize) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_SetClipList( LPDIRECTDRAWCLIPPER iface, - LPRGNDATA lprgn, - DWORD dwFlag) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_QueryInterface( LPDIRECTDRAWCLIPPER iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_GetHWnd( LPDIRECTDRAWCLIPPER iface, - HWND* hWndPtr) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_IsClipListChanged( LPDIRECTDRAWCLIPPER iface, - BOOL* lpbChanged) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawClipperVtbl DirectDrawClipper_Vtable = -{ - DirectDrawClipper_QueryInterface, - DirectDrawClipper_AddRef, - DirectDrawClipper_Release, - DirectDrawClipper_GetClipList, - DirectDrawClipper_GetHWnd, - DirectDrawClipper_Initialize, - DirectDrawClipper_IsClipListChanged, - DirectDrawClipper_SetClipList, - DirectDrawClipper_SetHwnd -}; Removed: trunk/reactos/dll/directx/ddraw/Color/iface_color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Color/if… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Color/iface_color.c (original) +++ trunk/reactos/dll/directx/ddraw/Color/iface_color.c (removed) @@ -1,66 +1,0 @@ -/* $Id: color.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/color.c - * PURPOSE: IDirectDrawColorControl Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface) -{ - LPDDRAWI_DDCOLORCONTROL_INT This = (LPDDRAWI_DDCOLORCONTROL_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DirectDrawColorControl_QueryInterface( LPDIRECTDRAWCOLORCONTROL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawColorControl_GetColorControls( LPDIRECTDRAWCOLORCONTROL iface, - LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawColorControl_SetColorControls( LPDIRECTDRAWCOLORCONTROL iface, - LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable = -{ - DirectDrawColorControl_QueryInterface, - DirectDrawColorControl_AddRef, - DirectDrawColorControl_Release, - DirectDrawColorControl_GetColorControls, - DirectDrawColorControl_SetColorControls -}; Removed: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c (removed) @@ -1,101 +1,0 @@ -/* $Id: surface_hel.c 21519 2006-04-08 21:05:49Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/soft/surface.c - * PURPOSE: DirectDraw Software Implementation - * PROGRAMMER: Magnus Olsen - * - */ - -#include "rosdraw.h" - - -extern DDPIXELFORMAT pixelformats[]; -extern DWORD pixelformatsCount; - -/* - * Direct Draw Callbacks - */ - -DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface) -{ - DX_STUB; -} - - -DWORD CALLBACK HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpDrvSetColorKey) -{ - DX_STUB; -} - - -DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode) -{ - DEVMODE DevMode; - - DX_STUB_str("in hel"); - - DevMode.dmSize = (WORD)sizeof(DEVMODE); - DevMode.dmDriverExtra = 0; - - SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; - - if (EnumDisplaySettingsEx(NULL, SetMode->dwModeIndex, &DevMode, 0 ) != 0) - { - DX_WINDBG_trace_res((int)DevMode.dmPelsWidth, (int)DevMode.dmPelsHeight, (int)DevMode.dmBitsPerPel ); - - if (ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - { - DX_STUB_str("FAIL"); - SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; - } - else - { - DX_STUB_str("OK"); - SetMode->ddRVal = DD_OK; - } - } - - return DDHAL_DRIVER_HANDLED; -} - -DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdGetScanLine(LPDDHAL_GETSCANLINEDATA lpGetScanLine) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA lpSetExclusiveMode) -{ - DX_WINDBG_trace(); - DX_STUB_str("Not implement yet, return DD_OK for not bsod\n"); - lpSetExclusiveMode->ddRVal = DD_OK; - - return DDHAL_DRIVER_HANDLED; -} - -DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface) -{ - DX_STUB; -} - Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat May 12 18:58:26 2007 @@ -116,206 +116,6 @@ return DD_OK; } -/* - * IMPLEMENT - * Status ok - */ -HRESULT -WINAPI -Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, - DWORD dwFlags, - LPDIRECTDRAWCLIPPER *ppClipper, - IUnknown *pUnkOuter) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - - -/* - * stub - * Status not done - */ -HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) -{ - - DX_WINDBG_trace(); - - DX_STUB; - -} - - -/* - * stub - * Status not done - */ -HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, - LPDIRECTDRAWSURFACE7* dst) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) -{ - - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * stub - * Status not done - */ -HRESULT WINAPI -Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDDSURFACEDESC2 lpDDSD2, LPVOID context, - LPDDENUMSURFACESCALLBACK7 callback) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, - LPDDCAPS pHELCaps) -{ - - DX_WINDBG_trace(); - - DX_STUB; -} - - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ - //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI -Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI -Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, - LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI -Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT -WINAPI -Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; - return DD_OK; -} /* */ @@ -484,110 +284,6 @@ return DD_OK; } - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, - HANDLE h) -{ - - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, - LPDIRECTDRAWSURFACE7 *lpDDS) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, - LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, - DWORD dwNumModes, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) -{ - DX_WINDBG_trace(); - DX_STUB; -} - IDirectDraw7Vtbl DirectDraw7_Vtable = { Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (added) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sat May 12 18:58:26 2007 @@ -1,0 +1,316 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: + * PURPOSE: IDirectDraw7 Implementation + * PROGRAMMER: Magnus Olsen, Maarten Bosma + * + */ + +#include "../rosdraw.h" + +/* + * IMPLEMENT + * Status ok + */ +HRESULT +WINAPI +Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* */ +HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, + LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + +/* + * stub + * Status not done + */ +HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +{ + + DX_WINDBG_trace(); + + DX_STUB; + +} + + +/* + * stub + * Status not done + */ +HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, + LPDIRECTDRAWSURFACE7* dst) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, + LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) +{ + + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * stub + * Status not done + */ +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, LPVOID context, + LPDDENUMSURFACESCALLBACK7 callback) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps) +{ + + DX_WINDBG_trace(); + + DX_STUB; +} + + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) +{ + //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, + LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT +WINAPI +Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; + return DD_OK; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, + HANDLE h) +{ + + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD total, LPDWORD free) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, + LPDIRECTDRAWSURFACE7 *lpDDS) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, + LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, + DWORD dwNumModes, DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) +{ + DX_WINDBG_trace(); + DX_STUB; +} Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Removed: trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Gamma/if… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c (original) +++ trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c (removed) @@ -1,68 +1,0 @@ -/* $Id: gamma.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/gamma.c - * PURPOSE: IDirectDrawGamma Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawGammaControl_AddRef( LPDIRECTDRAWGAMMACONTROL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawGammaControl_Release( LPDIRECTDRAWGAMMACONTROL iface) -{ - LPDDRAWI_DDGAMMACONTROL_INT This = (LPDDRAWI_DDGAMMACONTROL_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DirectDrawGammaControl_QueryInterface( LPDIRECTDRAWGAMMACONTROL iface, - REFIID riid, - LPVOID *ppObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawGammaControl_GetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, - DWORD dwFlags, - LPDDGAMMARAMP lpGammaRamp) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawGammaControl_SetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, - DWORD dwFlags, - LPDDGAMMARAMP lpGammaRamp) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable = -{ - DirectDrawGammaControl_QueryInterface, - DirectDrawGammaControl_AddRef, - DirectDrawGammaControl_Release, - DirectDrawGammaControl_GetGammaRamp, - DirectDrawGammaControl_SetGammaRamp -}; Removed: trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Kernel/i… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c (original) +++ trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c (removed) @@ -1,131 +1,0 @@ -/* $Id: kernel.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/kernel.c - * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -/***** IDirectDrawKernel ****/ - -ULONG WINAPI -DirectDrawKernel_AddRef ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawKernel_Release ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_QueryInterface ( LPDIRECTDRAWKERNEL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_GetKernelHandle ( LPDIRECTDRAWKERNEL iface, - ULONG* handle) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_ReleaseKernelHandle ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - - -ULONG WINAPI -DDSurfaceKernel_AddRef ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface; - - DX_WINDBG_trace(); - - if (iface!=NULL) - { - This->dwIntRefCnt++; - //This->lpLcl->dwLocalRefCnt++; - - //if (This->lpLcl->lpGbl != NULL) - //{ - // This->lpLcl->lpGbl->dwRefCnt++; - //} - } - return This->dwIntRefCnt; -} - -ULONG WINAPI -DDSurfaceKernel_Release ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DDSurfaceKernel_QueryInterface ( LPDIRECTDRAWSURFACEKERNEL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DDSurfaceKernel_GetKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface, - ULONG* handle) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DDSurfaceKernel_ReleaseKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - - -IDirectDrawKernelVtbl DirectDrawKernel_Vtable = -{ - DirectDrawKernel_QueryInterface, - DirectDrawKernel_AddRef, - DirectDrawKernel_Release, - DirectDrawKernel_GetKernelHandle, - DirectDrawKernel_ReleaseKernelHandle -}; - -IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable = -{ - DDSurfaceKernel_QueryInterface, - DDSurfaceKernel_AddRef, - DDSurfaceKernel_Release, - DDSurfaceKernel_GetKernelHandle, - DDSurfaceKernel_ReleaseKernelHandle -}; Removed: trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c (original) +++ trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c (removed) @@ -1,85 +1,0 @@ -/* $Id: palette.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/palette.c - * PURPOSE: IDirectDrawPalette Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, - LPDIRECTDRAW ddraw, - DWORD dwFlags, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, - DWORD dwFlags, - DWORD dwStart, DWORD dwCount, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, - DWORD dwFlags, - DWORD dwStart, - DWORD dwCount, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} -HRESULT WINAPI -DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, - LPDWORD lpdwCaps) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_QueryInterface( LPDIRECTDRAWPALETTE iface, - REFIID refiid, - LPVOID *obj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = -{ - DirectDrawPalette_QueryInterface, - DirectDrawPalette_AddRef, - DirectDrawPalette_Release, - DirectDrawPalette_GetCaps, - DirectDrawPalette_GetEntries, - DirectDrawPalette_Initialize, - DirectDrawPalette_SetEntries -}; Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sat May 12 18:58:26 2007 @@ -21,7 +21,7 @@ That[0]->lpLcl->lpSurfMore->slist = lpLcl; - That[0]->lpVtbl = &DirectDrawSurface7_Vtable; + //That[0]->lpVtbl = &DirectDrawSurface7_Vtable; // FixMe ! That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); That[0]->lpLcl->lpSurfMore->lpDD_int = This; That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; @@ -113,7 +113,7 @@ That[t]->lpLcl->lpSurfMore->slist = lpLcl; - That[t]->lpVtbl = &DirectDrawSurface7_Vtable; + //That[t]->lpVtbl = &DirectDrawSurface7_Vtable; // FixMe ! That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); That[t]->lpLcl->lpSurfMore->lpDD_int = This; That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Sat May 12 18:58:26 2007 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS - * FILE: lib/ddraw/main/surface.c + * FILE: lib/ddraw/ * PURPOSE: IDirectDrawSurface7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * @@ -307,100 +307,6 @@ DX_STUB; } -/* MSDN: "not currently implemented." */ -HRESULT WINAPI -Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, - LPRECT pRect) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx, - DWORD dsty, LPDIRECTDRAWSURFACE7 src, - LPRECT rsrc, DWORD trans) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* MSDN: "not currently implemented." */ -HRESULT WINAPI -Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface, - LPDDBLTBATCH pBatch, DWORD dwCount, - DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags, - LPDIRECTDRAWSURFACE7 pAttach) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface, - LPVOID context, - LPDDENUMSURFACESCALLBACK7 cb) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags, LPVOID context, - LPDDENUMSURFACESCALLBACK7 cb) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps, @@ -460,25 +366,6 @@ } HRESULT WINAPI -Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWCLIPPER* ppClipper) -{ - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, - LPDDCOLORKEY pCKey) -{ - //LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) { LPDDRAWI_DDRAWSURFACE_INT This; @@ -500,46 +387,6 @@ *phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC; return DD_OK; -} - -HRESULT WINAPI -Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} -HRESULT WINAPI -Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface, - LPLONG pX, LPLONG pY) -{ - DX_WINDBG_trace(); - - DX_STUB; -} -HRESULT WINAPI -Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWPALETTE* ppPalette) -{ - DX_WINDBG_trace(); - - DX_STUB; } HRESULT WINAPI @@ -566,25 +413,6 @@ } return retVale; -} - -HRESULT WINAPI -Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, - LPDWORD pdwPriority) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface, - REFGUID tag, LPVOID pBuffer, - LPDWORD pcbBufferSize) -{ - DX_WINDBG_trace(); - - DX_STUB; } HRESULT WINAPI @@ -690,41 +518,6 @@ } HRESULT WINAPI -Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, - LPDWORD pValue) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) -{ - DX_WINDBG_trace(); - - //DX_STUB; - DX_STUB_str("not implement return not lost\n"); - return DD_OK; -} - -HRESULT WINAPI -Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) { LPDDRAWI_DDRAWSURFACE_INT This; @@ -751,15 +544,6 @@ } return DD_OK; -} - -HRESULT WINAPI -Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWCLIPPER pDDClipper) -{ - DX_WINDBG_trace(); - - DX_STUB; } HRESULT WINAPI @@ -832,87 +616,6 @@ } return DDERR_GENERIC; -} - -HRESULT WINAPI -Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWPALETTE pPalette) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface, - DWORD dwPriority) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface, - REFGUID tag, LPVOID pData, - DWORD cbSize, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7 iface, - LPRECT pSrcRect, - LPDIRECTDRAWSURFACE7 pDstSurface, - LPRECT pDstRect, DWORD dwFlags, - LPDDOVERLAYFX pFX) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* MSDN: "not currently implemented." */ -HRESULT WINAPI -Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - - DX_WINDBG_trace(); - - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) - { - return DDERR_GENERIC; - } - - DX_STUB; -} - -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD MaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; } IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable = Added: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c (added) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c Sat May 12 18:58:26 2007 @@ -1,0 +1,325 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: + * PURPOSE: IDirectDrawSurface7 Implementation + * PROGRAMMER: Magnus Olsen, Maarten Bosma + * + */ + +#include "../rosdraw.h" + +HRESULT WINAPI +Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, + LPVOID* ppObj) +{ + DX_WINDBG_trace(); + + DX_STUB_str("Unimplement\n"); + + return E_NOINTERFACE; +} + + +/* MSDN: "not currently implemented." */ +HRESULT WINAPI +Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, + LPRECT pRect) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx, + DWORD dsty, LPDIRECTDRAWSURFACE7 src, + LPRECT rsrc, DWORD trans) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* MSDN: "not currently implemented." */ +HRESULT WINAPI +Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface, + LPDDBLTBATCH pBatch, DWORD dwCount, + DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface, + DWORD dwFlags, + LPDIRECTDRAWSURFACE7 pAttach) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface, + LPVOID context, + LPDDENUMSURFACESCALLBACK7 cb) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7 iface, + DWORD dwFlags, LPVOID context, + LPDDENUMSURFACESCALLBACK7 cb) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWCLIPPER* ppClipper) +{ + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, + LPDDCOLORKEY pCKey) +{ + //LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; + + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} +HRESULT WINAPI +Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface, + LPLONG pX, LPLONG pY) +{ + DX_WINDBG_trace(); + + DX_STUB; +} +HRESULT WINAPI +Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWPALETTE* ppPalette) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, + LPDWORD pdwPriority) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface, + REFGUID tag, LPVOID pBuffer, + LPDWORD pcbBufferSize) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, + LPDWORD pValue) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) +{ + DX_WINDBG_trace(); + + //DX_STUB; + DX_STUB_str("not implement return not lost\n"); + return DD_OK; +} + +HRESULT WINAPI +Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + +HRESULT WINAPI +Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWCLIPPER pDDClipper) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + +HRESULT WINAPI +Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface, + LPDIRECTDRAWPALETTE pPalette) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface, + DWORD dwPriority) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface, + REFGUID tag, LPVOID pData, + DWORD cbSize, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7 iface, + LPRECT pSrcRect, + LPDIRECTDRAWSURFACE7 pDstSurface, + LPRECT pDstRect, DWORD dwFlags, + LPDDOVERLAYFX pFX) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + +/* MSDN: "not currently implemented." */ +HRESULT WINAPI +Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, + DWORD dwFlags) +{ + LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; + + DX_WINDBG_trace(); + + if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) + { + return DDERR_GENERIC; + } + + DX_STUB; +} + + +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, + DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD MaxLOD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + Propchange: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Removed: trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Videopor… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c (original) +++ trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c (removed) @@ -1,264 +1,0 @@ -/* $Id: videoport.c 22739 2006-07-01 12:08:35Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/videoport.c - * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -/************* IDirectDrawVideoPort *************/ - -HRESULT WINAPI -Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_Flip (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_GetBandwidthInfo (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpddpfFormat, DWORD dwWidth, - DWORD dwHeight, DWORD dwFlags, LPDDVIDEOPORTBANDWIDTH lpBandwidth) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_GetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetInputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpNumFormats, - LPDDPIXELFORMAT lpFormats, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetOutputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpInputFormat, - LPDWORD lpNumFormats, LPDDPIXELFORMAT lpFormats, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetFieldPolarity (LPDIRECTDRAWVIDEOPORT iface, LPBOOL lpbFieldPolarity) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoLine (LPDIRECTDRAWVIDEOPORT This, LPDWORD lpdwLine) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoSignalStatus (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpdwStatus) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_SetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_SetTargetSurface (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, - DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_StartVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_StopVideo (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_UpdateVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_WaitForSync (LPDIRECTDRAWVIDEOPORT iface, DWORD dwFlags, DWORD dwLine, - DWORD dwTimeout) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/************* IDDVideoPortContainer *************/ - -HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface, REFIID riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, - LPDIRECTDRAWVIDEOPORT* DDVideoPort, IUnknown* pUnkOuter) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_EnumVideoPorts (LPDDVIDEOPORTCONTAINER iface, - DWORD dwFlags, - LPDDVIDEOPORTCAPS pCaps, - LPVOID pContext, - LPDDENUMVIDEOCALLBACK pEnumVideoCallback) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_GetVideoPortConnectInfo (LPDDVIDEOPORTCONTAINER iface, - DWORD PortId, DWORD* pNumEntries, - LPDDVIDEOPORTCONNECT pConnectInfo) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_QueryVideoPortStatus (LPDDVIDEOPORTCONTAINER iface, - DWORD PortId, - LPDDVIDEOPORTSTATUS pStatus) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/************* IDirectDrawVideoPortNotify *************/ - -HRESULT WINAPI -Main_DDVideoPortNotify_QueryInterface (LPDIRECTDRAWVIDEOPORTNOTIFY iface, REFIID - riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI -Main_DDVideoPortNotify_AddRef (LPDIRECTDRAWVIDEOPORTNOTIFY iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI -Main_DDVideoPortNotify_Release (LPDIRECTDRAWVIDEOPORTNOTIFY iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortNotify_AcquireNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE* h, LPDDVIDEOPORTNOTIFY pVideoPortNotify) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortNotify_ReleaseNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE h) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable = -{ - Main_DirectDrawVideoPort_QueryInterface, - Main_DirectDrawVideoPort_AddRef, - Main_DirectDrawVideoPort_Release, - Main_DirectDrawVideoPort_Flip, - Main_DirectDrawVideoPort_GetBandwidthInfo, - Main_DirectDrawVideoPort_GetColorControls, - Main_DirectDrawVideoPort_GetInputFormats, - Main_DirectDrawVideoPort_GetOutputFormats, - Main_DirectDrawVideoPort_GetFieldPolarity, - Main_DirectDrawVideoPort_GetVideoLine, - Main_DirectDrawVideoPort_GetVideoSignalStatus, - Main_DirectDrawVideoPort_SetColorControls, - Main_DirectDrawVideoPort_SetTargetSurface, - Main_DirectDrawVideoPort_StartVideo, - Main_DirectDrawVideoPort_StopVideo, - Main_DirectDrawVideoPort_UpdateVideo, - Main_DirectDrawVideoPort_WaitForSync -}; - -IDDVideoPortContainerVtbl DDVideoPortContainer_Vtable = -{ - Main_DDVideoPortContainer_QueryInterface, - Main_DDVideoPortContainer_AddRef, - Main_DDVideoPortContainer_Release, - Main_DDVideoPortContainer_CreateVideoPort, - Main_DDVideoPortContainer_EnumVideoPorts, - Main_DDVideoPortContainer_GetVideoPortConnectInfo, - Main_DDVideoPortContainer_QueryVideoPortStatus -}; - -IDirectDrawVideoPortNotifyVtbl DDVideoPortNotify_Vtable = -{ - Main_DDVideoPortNotify_QueryInterface, - Main_DDVideoPortNotify_AddRef, - Main_DDVideoPortNotify_Release, - Main_DDVideoPortNotify_AcquireNotification, - Main_DDVideoPortNotify_ReleaseNotification -}; Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat May 12 18:58:26 2007 @@ -1,6 +1,5 @@ - + <directory name="Surface"> + <file>surface_stubs.c</file> + <file>callbacks_surf_hel.c</file> + <file>createsurface.c</file> + </directory> + <directory name="clipper"> + <file>clipper_stubs.c</file> + </directory> + <directory name="Color"> + <file>color_stubs.c</file> + </directory> + <directory name="Gamma"> + <file>gamma_stubs.c</file> + </directory> + <directory name="Kernel"> + <file>kernel_stubs.c</file> + </directory> + <directory name="Palette"> + <file>palette_stubs.c</file> + </directory> + <directory name="videoport"> + <file>videoport_stubs.c</file> + </directory> +</module> Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat May 12 18:58:26 2007 @@ -73,7 +73,9 @@ HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD); HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface); HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface); - +HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID); +HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags); +HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b); ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7); ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7);

1 0

[mbosma] 26723: DirectDraw rearrangement. (part 1/2)
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sat May 12 18:20:12 2007 New Revision: 26723 URL: http://svn.reactos.org/svn/reactos?rev=26723&view=rev Log: DirectDraw rearrangement. (part 1/2) Added: trunk/reactos/dll/directx/ddraw/Clipper/ trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_clipper.c trunk/reactos/dll/directx/ddraw/Color/ trunk/reactos/dll/directx/ddraw/Color/iface_color.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_color.c trunk/reactos/dll/directx/ddraw/Ddraw/ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/callbacks_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/Gamma/ trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_gamma.c trunk/reactos/dll/directx/ddraw/Kernel/ trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_kernel.c trunk/reactos/dll/directx/ddraw/Palette/ trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_palette.c trunk/reactos/dll/directx/ddraw/Surface/ trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/Videoport/ trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_videoport.c Removed: trunk/reactos/dll/directx/ddraw/callbacks_hel.c trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/createsurface.c trunk/reactos/dll/directx/ddraw/iface_clipper.c trunk/reactos/dll/directx/ddraw/iface_color.c trunk/reactos/dll/directx/ddraw/iface_gamma.c trunk/reactos/dll/directx/ddraw/iface_kernel.c trunk/reactos/dll/directx/ddraw/iface_palette.c trunk/reactos/dll/directx/ddraw/iface_videoport.c trunk/reactos/dll/directx/ddraw/main/ Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild Removed: trunk/reactos/dll/directx/ddraw/callbacks_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callback… ============================================================================== --- trunk/reactos/dll/directx/ddraw/callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/callbacks_hel.c (removed) @@ -1,101 +1,0 @@ -/* $Id: surface_hel.c 21519 2006-04-08 21:05:49Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/soft/surface.c - * PURPOSE: DirectDraw Software Implementation - * PROGRAMMER: Magnus Olsen - * - */ - -#include "rosdraw.h" - - -extern DDPIXELFORMAT pixelformats[]; -extern DWORD pixelformatsCount; - -/* - * Direct Draw Callbacks - */ - -DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface) -{ - DX_STUB; -} - - -DWORD CALLBACK HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpDrvSetColorKey) -{ - DX_STUB; -} - - -DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode) -{ - DEVMODE DevMode; - - DX_STUB_str("in hel"); - - DevMode.dmSize = (WORD)sizeof(DEVMODE); - DevMode.dmDriverExtra = 0; - - SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; - - if (EnumDisplaySettingsEx(NULL, SetMode->dwModeIndex, &DevMode, 0 ) != 0) - { - DX_WINDBG_trace_res((int)DevMode.dmPelsWidth, (int)DevMode.dmPelsHeight, (int)DevMode.dmBitsPerPel ); - - if (ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - { - DX_STUB_str("FAIL"); - SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; - } - else - { - DX_STUB_str("OK"); - SetMode->ddRVal = DD_OK; - } - } - - return DDHAL_DRIVER_HANDLED; -} - -DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdGetScanLine(LPDDHAL_GETSCANLINEDATA lpGetScanLine) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA lpSetExclusiveMode) -{ - DX_WINDBG_trace(); - DX_STUB_str("Not implement yet, return DD_OK for not bsod\n"); - lpSetExclusiveMode->ddRVal = DD_OK; - - return DDHAL_DRIVER_HANDLED; -} - -DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface) -{ - DX_STUB; -} - Removed: trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callback… ============================================================================== --- trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c (removed) @@ -1,92 +1,0 @@ -/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ddraw/ddraw.c - * PURPOSE: DirectDraw Library - * PROGRAMMER: Magnus Olsen (greatlrd) - * - */ - -#include <windows.h> -#include "rosdraw.h" -#include "d3dhal.h" -#include "ddrawgdi.h" - - -DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfFlip(LPDDHAL_FLIPDATA lpFlipData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfGetBltStatus(LPDDHAL_GETBLTSTATUSDATA lpGetBltStatusData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA lpGetFlipStatusData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData) -{ - DX_STUB; -} - - -DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr) -{ - /* - This api is not doucment by MS So I leave it - as stub. - */ - - DX_STUB; -} - -DWORD CALLBACK HelDdSurfSetClipList(LPDDHAL_SETCLIPLISTDATA lpSetClipListData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKeyData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfSetPalette(LPDDHAL_SETPALETTEDATA lpSetPaletteData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData) -{ - DX_STUB; -} - Removed: trunk/reactos/dll/directx/ddraw/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/createsu… ============================================================================== --- trunk/reactos/dll/directx/ddraw/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/createsurface.c (removed) @@ -1,348 +1,0 @@ - -#include "rosdraw.h" - - -HRESULT -CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - - - That[0]->lpLcl->lpSurfMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That[0]->lpLcl->lpSurfMore == NULL) - { - DxHeapMemFree(That); - return DDERR_OUTOFMEMORY; - } - - That[0]->lpLcl->lpSurfMore->slist = lpLcl; - - That[0]->lpVtbl = &DirectDrawSurface7_Vtable; - That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That[0]->lpLcl->lpSurfMore->lpDD_int = This; - That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That[0]->lpLcl->lpSurfMore->slist[0] = That[0]->lpLcl; - That[0]->lpLcl->dwProcessId = GetCurrentProcessId(); - - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - if (pDDSD->dwFlags & DDSD_PIXELFORMAT) - { - That[0]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - } - else - { - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - } - mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That[0]->dwIntRefCnt + 1; // is this correct - mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - - mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist; - - That[0]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That[0]; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That[0]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - That[0]->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That[0]; - - return DD_OK; -} - -HRESULT -CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - DWORD t; - - - /* we are building the backbuffersurface pointer list - * and create the backbuffer surface and set it up - */ - - That[0]->lpLcl->dwBackBufferCount = pDDSD->dwBackBufferCount; - - for (t=0;t<pDDSD->dwBackBufferCount+1;t++) - { - - - That[t]->lpLcl->lpSurfMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That[t]->lpLcl->lpSurfMore == NULL) - { - DxHeapMemFree(That); - return DDERR_OUTOFMEMORY; - } - - That[t]->lpLcl->lpSurfMore->slist = lpLcl; - - That[t]->lpVtbl = &DirectDrawSurface7_Vtable; - That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That[t]->lpLcl->lpSurfMore->lpDD_int = This; - That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That[t]->lpLcl->lpSurfMore->slist[0] = That[t]->lpLcl; - That[t]->lpLcl->dwProcessId = GetCurrentProcessId(); - - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - if (pDDSD->dwFlags & DDSD_PIXELFORMAT) - { - That[t]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - } - else - { - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - } - mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That[t]->dwIntRefCnt + 1; // is this correct - mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - - mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist; - - That[t]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That[0]; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That[t]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - /* Build the linking buffer */ - That[t]->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That[t]; -DX_STUB_str( "ok"); - } - return DD_OK; -} - - - -HRESULT -CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDSURFACEDESC2 pDDSD) -{ - - DDSURFACEDESC mddsdOverlay; - DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; - DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; - DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6]; - DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - INT i; - INT j; - INT cSurfaces; - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - - /* create overlay surface now */ - ZeroMemory(&mddsdOverlay, sizeof(DDSURFACEDESC)); - mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - mddsdOverlay.dwWidth = 100; //pels; - mddsdOverlay.dwHeight = 100; // lines; - mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; - - - //DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdOverlay; // pDDSD; - - - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - // derr(L"DirectDrawImpl[%08x]::__createPrimary Cannot create primary [%08x]", this, rv); - // printf("Fail to mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED \n"); - DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str("mDdCanCreateSurface fail"); -// printf("Fail to mDdCanCreateSurface mDdCanCreateSurface.ddRVal = %d:%s\n",(int)mDdCanCreateSurface.ddRVal,DDErrorString(mDdCanCreateSurface.ddRVal)); - return DDERR_NOTINITIALIZED; - } - - - ZeroMemory(&mOverlayGlobal, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - mOverlayGlobal.dwGlobalFlags = 0; - mOverlayGlobal.lpDD = This->lpLcl->lpGbl; - mOverlayGlobal.lpDDHandle = This->lpLcl->lpGbl; - mOverlayGlobal.wWidth = (WORD)mddsdOverlay.dwWidth; - mOverlayGlobal.wHeight = (WORD)mddsdOverlay.dwHeight; - mOverlayGlobal.lPitch = -1; - mOverlayGlobal.ddpfSurface = mddsdOverlay.ddpfPixelFormat; - - // setup front- and backbuffer surfaces - cSurfaces = mddsdOverlay.dwBackBufferCount + 1; - for ( i = 0; i < cSurfaces; i++) - { - ZeroMemory(&mOverlayMore[i], sizeof(DDRAWI_DDRAWSURFACE_MORE)); - mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - ZeroMemory(&mOverlayLocal[i], sizeof(DDRAWI_DDRAWSURFACE_LCL)); - mOverlayLocal[i].lpGbl = &mOverlayGlobal; - mOverlayLocal[i].lpSurfMore = &mOverlayMore[i]; - mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); - mOverlayLocal[i].dwFlags = (i == 0) ? - (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): - (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); - - mOverlayLocal[i].dwFlags |= - DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| - DDRAWISURF_HASPIXELFORMAT| - DDRAWISURF_HASOVERLAYDATA; - - mOverlayLocal[i].ddsCaps.dwCaps = mddsdOverlay.ddsCaps.dwCaps; - mpOverlayLocals[i] = &mOverlayLocal[i]; - } - - for ( i = 0; i < cSurfaces; i++) - { - j = (i + 1) % cSurfaces; - - - /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - return DD_FALSE; - }*/ - - if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); -//printf("Fail to DdAttachSurface (%d:%d)\n", i, j); - DX_STUB_str("DdAttachSurface fail"); - return DD_FALSE; - } - - } - - // DDHAL_CREATESURFACEDATA mDdCreateSurface; - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &mddsdOverlay;//pDDSD; - mDdCreateSurface.lplpSList = mpOverlayLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; - } - - - if (mDdCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str("mDdCreateSurface fail"); - return mDdCreateSurface.ddRVal; - } - - mDdUpdateOverlay.lpDD = This->lpLcl->lpGbl; - mDdUpdateOverlay.UpdateOverlay = This->lpLcl->lpDDCB->HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->lpLcl->lpPrimary->lpLcl->lpSurfMore->slist[0]; - mDdUpdateOverlay.lpDDSrcSurface = mpOverlayLocals[0];//pDDSurface; - mDdUpdateOverlay.dwFlags = DDOVER_SHOW; - - mDdUpdateOverlay.rDest.top = 0; - mDdUpdateOverlay.rDest.left = 0; - mDdUpdateOverlay.rDest.right = 50; - mDdUpdateOverlay.rDest.bottom = 50; - - mDdUpdateOverlay.rSrc.top = 0; - mDdUpdateOverlay.rSrc.left = 0; - mDdUpdateOverlay.rSrc.right = 50; - mDdUpdateOverlay.rSrc.bottom = 50; - - - - - if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("UpdateOverlay fail"); - return DDERR_NOTINITIALIZED; - } - - - if (mDdUpdateOverlay.ddRVal != DD_OK) - { - DX_STUB_str("mDdUpdateOverlay fail"); - //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); - return mDdUpdateOverlay.ddRVal; - } - - DX_STUB_str("OK"); - return DD_OK; -} Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat May 12 18:20:12 2007 @@ -1,3 +1,4 @@ + Removed: trunk/reactos/dll/directx/ddraw/iface_clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_cl… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_clipper.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_clipper.c (removed) @@ -1,105 +1,0 @@ -/* $Id: clipper.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/clipper.c - * PURPOSE: IDirectDrawClipper Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -ULONG WINAPI -DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_Initialize( LPDIRECTDRAWCLIPPER iface, - LPDIRECTDRAW lpDD, - DWORD dwFlags) -{ - /* FIXME not implment */ - DX_WINDBG_trace(); - DX_STUB_DD_OK; -} - -HRESULT WINAPI -DirectDrawClipper_SetHwnd( LPDIRECTDRAWCLIPPER iface, - DWORD dwFlags, - HWND hWnd) -{ - /* FIXME not implment */ - DX_WINDBG_trace(); - DX_STUB_DD_OK; -} - -HRESULT WINAPI -DirectDrawClipper_GetClipList( LPDIRECTDRAWCLIPPER iface, - LPRECT lpRect, - LPRGNDATA lpClipList, - LPDWORD lpdwSize) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_SetClipList( LPDIRECTDRAWCLIPPER iface, - LPRGNDATA lprgn, - DWORD dwFlag) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_QueryInterface( LPDIRECTDRAWCLIPPER iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_GetHWnd( LPDIRECTDRAWCLIPPER iface, - HWND* hWndPtr) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_IsClipListChanged( LPDIRECTDRAWCLIPPER iface, - BOOL* lpbChanged) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawClipperVtbl DirectDrawClipper_Vtable = -{ - DirectDrawClipper_QueryInterface, - DirectDrawClipper_AddRef, - DirectDrawClipper_Release, - DirectDrawClipper_GetClipList, - DirectDrawClipper_GetHWnd, - DirectDrawClipper_Initialize, - DirectDrawClipper_IsClipListChanged, - DirectDrawClipper_SetClipList, - DirectDrawClipper_SetHwnd -}; Removed: trunk/reactos/dll/directx/ddraw/iface_color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_co… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_color.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_color.c (removed) @@ -1,66 +1,0 @@ -/* $Id: color.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/color.c - * PURPOSE: IDirectDrawColorControl Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface) -{ - LPDDRAWI_DDCOLORCONTROL_INT This = (LPDDRAWI_DDCOLORCONTROL_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DirectDrawColorControl_QueryInterface( LPDIRECTDRAWCOLORCONTROL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawColorControl_GetColorControls( LPDIRECTDRAWCOLORCONTROL iface, - LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawColorControl_SetColorControls( LPDIRECTDRAWCOLORCONTROL iface, - LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable = -{ - DirectDrawColorControl_QueryInterface, - DirectDrawColorControl_AddRef, - DirectDrawColorControl_Release, - DirectDrawColorControl_GetColorControls, - DirectDrawColorControl_SetColorControls -}; Removed: trunk/reactos/dll/directx/ddraw/iface_gamma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_ga… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_gamma.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_gamma.c (removed) @@ -1,68 +1,0 @@ -/* $Id: gamma.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/gamma.c - * PURPOSE: IDirectDrawGamma Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawGammaControl_AddRef( LPDIRECTDRAWGAMMACONTROL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawGammaControl_Release( LPDIRECTDRAWGAMMACONTROL iface) -{ - LPDDRAWI_DDGAMMACONTROL_INT This = (LPDDRAWI_DDGAMMACONTROL_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DirectDrawGammaControl_QueryInterface( LPDIRECTDRAWGAMMACONTROL iface, - REFIID riid, - LPVOID *ppObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawGammaControl_GetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, - DWORD dwFlags, - LPDDGAMMARAMP lpGammaRamp) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawGammaControl_SetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, - DWORD dwFlags, - LPDDGAMMARAMP lpGammaRamp) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable = -{ - DirectDrawGammaControl_QueryInterface, - DirectDrawGammaControl_AddRef, - DirectDrawGammaControl_Release, - DirectDrawGammaControl_GetGammaRamp, - DirectDrawGammaControl_SetGammaRamp -}; Removed: trunk/reactos/dll/directx/ddraw/iface_kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_ke… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_kernel.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_kernel.c (removed) @@ -1,131 +1,0 @@ -/* $Id: kernel.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/kernel.c - * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -/***** IDirectDrawKernel ****/ - -ULONG WINAPI -DirectDrawKernel_AddRef ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawKernel_Release ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_QueryInterface ( LPDIRECTDRAWKERNEL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_GetKernelHandle ( LPDIRECTDRAWKERNEL iface, - ULONG* handle) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_ReleaseKernelHandle ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - - -ULONG WINAPI -DDSurfaceKernel_AddRef ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface; - - DX_WINDBG_trace(); - - if (iface!=NULL) - { - This->dwIntRefCnt++; - //This->lpLcl->dwLocalRefCnt++; - - //if (This->lpLcl->lpGbl != NULL) - //{ - // This->lpLcl->lpGbl->dwRefCnt++; - //} - } - return This->dwIntRefCnt; -} - -ULONG WINAPI -DDSurfaceKernel_Release ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DDSurfaceKernel_QueryInterface ( LPDIRECTDRAWSURFACEKERNEL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DDSurfaceKernel_GetKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface, - ULONG* handle) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DDSurfaceKernel_ReleaseKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - - -IDirectDrawKernelVtbl DirectDrawKernel_Vtable = -{ - DirectDrawKernel_QueryInterface, - DirectDrawKernel_AddRef, - DirectDrawKernel_Release, - DirectDrawKernel_GetKernelHandle, - DirectDrawKernel_ReleaseKernelHandle -}; - -IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable = -{ - DDSurfaceKernel_QueryInterface, - DDSurfaceKernel_AddRef, - DDSurfaceKernel_Release, - DDSurfaceKernel_GetKernelHandle, - DDSurfaceKernel_ReleaseKernelHandle -}; Removed: trunk/reactos/dll/directx/ddraw/iface_palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_pa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_palette.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_palette.c (removed) @@ -1,85 +1,0 @@ -/* $Id: palette.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/palette.c - * PURPOSE: IDirectDrawPalette Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, - LPDIRECTDRAW ddraw, - DWORD dwFlags, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, - DWORD dwFlags, - DWORD dwStart, DWORD dwCount, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, - DWORD dwFlags, - DWORD dwStart, - DWORD dwCount, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} -HRESULT WINAPI -DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, - LPDWORD lpdwCaps) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_QueryInterface( LPDIRECTDRAWPALETTE iface, - REFIID refiid, - LPVOID *obj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = -{ - DirectDrawPalette_QueryInterface, - DirectDrawPalette_AddRef, - DirectDrawPalette_Release, - DirectDrawPalette_GetCaps, - DirectDrawPalette_GetEntries, - DirectDrawPalette_Initialize, - DirectDrawPalette_SetEntries -}; Removed: trunk/reactos/dll/directx/ddraw/iface_videoport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_vi… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_videoport.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_videoport.c (removed) @@ -1,264 +1,0 @@ -/* $Id: videoport.c 22739 2006-07-01 12:08:35Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/videoport.c - * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -/************* IDirectDrawVideoPort *************/ - -HRESULT WINAPI -Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_Flip (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_GetBandwidthInfo (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpddpfFormat, DWORD dwWidth, - DWORD dwHeight, DWORD dwFlags, LPDDVIDEOPORTBANDWIDTH lpBandwidth) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_GetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetInputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpNumFormats, - LPDDPIXELFORMAT lpFormats, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetOutputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpInputFormat, - LPDWORD lpNumFormats, LPDDPIXELFORMAT lpFormats, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetFieldPolarity (LPDIRECTDRAWVIDEOPORT iface, LPBOOL lpbFieldPolarity) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoLine (LPDIRECTDRAWVIDEOPORT This, LPDWORD lpdwLine) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoSignalStatus (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpdwStatus) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_SetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_SetTargetSurface (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, - DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_StartVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_StopVideo (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_UpdateVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_WaitForSync (LPDIRECTDRAWVIDEOPORT iface, DWORD dwFlags, DWORD dwLine, - DWORD dwTimeout) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/************* IDDVideoPortContainer *************/ - -HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface, REFIID riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, - LPDIRECTDRAWVIDEOPORT* DDVideoPort, IUnknown* pUnkOuter) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_EnumVideoPorts (LPDDVIDEOPORTCONTAINER iface, - DWORD dwFlags, - LPDDVIDEOPORTCAPS pCaps, - LPVOID pContext, - LPDDENUMVIDEOCALLBACK pEnumVideoCallback) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_GetVideoPortConnectInfo (LPDDVIDEOPORTCONTAINER iface, - DWORD PortId, DWORD* pNumEntries, - LPDDVIDEOPORTCONNECT pConnectInfo) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_QueryVideoPortStatus (LPDDVIDEOPORTCONTAINER iface, - DWORD PortId, - LPDDVIDEOPORTSTATUS pStatus) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/************* IDirectDrawVideoPortNotify *************/ - -HRESULT WINAPI -Main_DDVideoPortNotify_QueryInterface (LPDIRECTDRAWVIDEOPORTNOTIFY iface, REFIID - riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI -Main_DDVideoPortNotify_AddRef (LPDIRECTDRAWVIDEOPORTNOTIFY iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI -Main_DDVideoPortNotify_Release (LPDIRECTDRAWVIDEOPORTNOTIFY iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortNotify_AcquireNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE* h, LPDDVIDEOPORTNOTIFY pVideoPortNotify) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortNotify_ReleaseNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE h) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable = -{ - Main_DirectDrawVideoPort_QueryInterface, - Main_DirectDrawVideoPort_AddRef, - Main_DirectDrawVideoPort_Release, - Main_DirectDrawVideoPort_Flip, - Main_DirectDrawVideoPort_GetBandwidthInfo, - Main_DirectDrawVideoPort_GetColorControls, - Main_DirectDrawVideoPort_GetInputFormats, - Main_DirectDrawVideoPort_GetOutputFormats, - Main_DirectDrawVideoPort_GetFieldPolarity, - Main_DirectDrawVideoPort_GetVideoLine, - Main_DirectDrawVideoPort_GetVideoSignalStatus, - Main_DirectDrawVideoPort_SetColorControls, - Main_DirectDrawVideoPort_SetTargetSurface, - Main_DirectDrawVideoPort_StartVideo, - Main_DirectDrawVideoPort_StopVideo, - Main_DirectDrawVideoPort_UpdateVideo, - Main_DirectDrawVideoPort_WaitForSync -}; - -IDDVideoPortContainerVtbl DDVideoPortContainer_Vtable = -{ - Main_DDVideoPortContainer_QueryInterface, - Main_DDVideoPortContainer_AddRef, - Main_DDVideoPortContainer_Release, - Main_DDVideoPortContainer_CreateVideoPort, - Main_DDVideoPortContainer_EnumVideoPorts, - Main_DDVideoPortContainer_GetVideoPortConnectInfo, - Main_DDVideoPortContainer_QueryVideoPortStatus -}; - -IDirectDrawVideoPortNotifyVtbl DDVideoPortNotify_Vtable = -{ - Main_DDVideoPortNotify_QueryInterface, - Main_DDVideoPortNotify_AddRef, - Main_DDVideoPortNotify_Release, - Main_DDVideoPortNotify_AcquireNotification, - Main_DDVideoPortNotify_ReleaseNotification -};

1 0

[greatlrd] 26722: sorry did use some private headers that are not commited yet, here is win32kdxtest comping fix.
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat May 12 17:58:27 2007 New Revision: 26722 URL: http://svn.reactos.org/svn/reactos?rev=26722&view=rev Log: sorry did use some private headers that are not commited yet, here is win32kdxtest comping fix. Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c trunk/rostests/dxtest/win32kdxtest/dump.c Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c Sat May 12 17:58:27 2007 @@ -6,6 +6,7 @@ #include <winddi.h> #include <d3dnthal.h> #include <dll/directx/d3d8thk.h> +#include <ddrawi.h> #include "test.h" /* Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c Sat May 12 17:58:27 2007 @@ -25,4 +25,5 @@ testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0"); show_status(fails, "NtGdiDdDeleteDirectDrawObject\0"); -} +} + Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c Sat May 12 17:58:27 2007 @@ -5,6 +5,8 @@ #include <winddi.h> #include <d3dnthal.h> #include <dll/directx/d3d8thk.h> + +#include <ddrawi.h> #include "test.h" /* Modified: trunk/rostests/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/dump.c (original) +++ trunk/rostests/dxtest/win32kdxtest/dump.c Sat May 12 17:58:27 2007 @@ -16,18 +16,18 @@ { \ printf("| "); \ } \ - dwflag = dwflag - dwvalue; \ + dwflag = (ULONG)dwflag - (ULONG)dwvalue; \ printf("%s ",text); \ count++; \ } #define endcheckflag(dwflag,text) \ if (count==0) \ - printf("0x%08lx\n",dwflag);\ + printf("0x%08lx\n", (ULONG) dwflag);\ else \ printf("\n");\ if (flag != 0) \ - printf("undoc value in %s flags value %04lx\n",text,dwflag); + printf("undoc value in %s flags value %08lx\n",text, (ULONG) dwflag); @@ -191,7 +191,7 @@ int t; UINT flag; INT count=0; - LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData; + // LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData; printf("DD_HALINFO Version NT 2000/XP/2003 found \n"); printf(" pHalInfo->dwSize : 0x%08lx\n",(long)pHalInfo->dwSize); @@ -438,8 +438,9 @@ flag = pHalInfo->dwFlags; count = 0; - checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY"); - checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL"); + // FIXME missing DDHALINFO_ISPRIMARYDISPLAY and DDHALINFO_MODEXILLEGAL in currrent headers + // checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY"); + // checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL"); checkflag(flag,DDHALINFO_GETDRIVERINFOSET,"DDHALINFO_GETDRIVERINFOSET"); checkflag(flag,DDHALINFO_GETDRIVERINFO2,"DDHALINFO_GETDRIVERINFO2"); endcheckflag(flag,"pHalInfo->dwFlags"); @@ -456,7 +457,7 @@ } else { - printf("none pHalInfo from the driver\n",pHalInfo->dwSize); + printf("none pHalInfo from the driver 0x%08lx\n",pHalInfo->dwSize); } } }

1 0

[mbosma] 26721: Deactivate a check.
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sat May 12 17:17:01 2007 New Revision: 26721 URL: http://svn.reactos.org/svn/reactos?rev=26721&view=rev Log: Deactivate a check. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sat May 12 17:17:01 2007 @@ -333,13 +333,14 @@ HWND window; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - +#if 0 // this check is totally invalid if you ask me - mbosma /* Get the old window */ window = (HWND) This->lpLcl->hWnd; if(!window) { return DDERR_NOHWND; } +#endif /* Tests suggest that we need one of them: */ if(!(cooplevel & (DDSCL_SETFOCUSWINDOW |

1 0

[ekohl] 26720: - Attach clock specific data to the window instead of storing them in global variables. - Stop the clock and show the system time when the user changes the system time. See issue #2241 for more details.
by ekohl＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: ekohl Date: Sat May 12 16:37:23 2007 New Revision: 26720 URL: http://svn.reactos.org/svn/reactos?rev=26720&view=rev Log: - Attach clock specific data to the window instead of storing them in global variables. - Stop the clock and show the system time when the user changes the system time. See issue #2241 for more details. Modified: trunk/reactos/dll/cpl/timedate/clock.c trunk/reactos/dll/cpl/timedate/dateandtime.c trunk/reactos/dll/cpl/timedate/timedate.h Modified: trunk/reactos/dll/cpl/timedate/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/clock.c?r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/clock.c (original) +++ trunk/reactos/dll/cpl/timedate/clock.c Sat May 12 16:37:23 2007 @@ -1,31 +1,42 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/clock.c + * FILE: dll/cpl/timedate/clock.c * PURPOSE: Draws the analog clock * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * Copyright 2007 Eric Kohl */ /* Code based on clock.c from Programming Windows, Charles Petzold */ #include <timedate.h> +typedef struct _CLOCKDATA +{ + HBRUSH hGreyBrush; + HPEN hGreyPen; + INT cxClient; + INT cyClient; + SYSTEMTIME stCurrent; + SYSTEMTIME stPrevious; + BOOL bTimer; +} CLOCKDATA, *PCLOCKDATA; + + #define TWOPI (2 * 3.14159) static const TCHAR szClockWndClass[] = TEXT("ClockWndClass"); -static HBRUSH hGreyBrush = NULL; -static HPEN hGreyPen = NULL; - -static VOID -SetIsotropic(HDC hdc, INT cxClient, INT cyClient) + +static VOID +SetIsotropic(HDC hdc, PCLOCKDATA pClockData) { /* set isotropic mode */ SetMapMode(hdc, MM_ISOTROPIC); /* position axis in centre of window */ - SetViewportOrgEx(hdc, cxClient / 2, cyClient / 2, NULL); -} + SetViewportOrgEx(hdc, pClockData->cxClient / 2, pClockData->cyClient / 2, NULL); +} + static VOID RotatePoint(POINT pt[], INT iNum, INT iAngle) @@ -45,20 +56,21 @@ } } -static VOID -DrawClock(HDC hdc) -{ - INT iAngle; + +static VOID +DrawClock(HDC hdc, PCLOCKDATA pClockData) +{ + INT iAngle; POINT pt[3]; HBRUSH hBrushOld; HPEN hPenOld = NULL; /* grey brush to fill the dots */ - hBrushOld = SelectObject(hdc, hGreyBrush); + hBrushOld = SelectObject(hdc, pClockData->hGreyBrush); hPenOld = GetCurrentObject(hdc, OBJ_PEN); - for(iAngle = 0; iAngle < 360; iAngle += 6) + for (iAngle = 0; iAngle < 360; iAngle += 6) { /* starting coords */ pt[0].x = 0; @@ -72,7 +84,7 @@ if (iAngle % 5) { pt[2].x = pt[2].y = 7; - SelectObject(hdc, hGreyPen); + SelectObject(hdc, pClockData->hGreyPen); } else { @@ -87,12 +99,12 @@ pt[1].y = pt[0].y + pt[2].y; Ellipse(hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); - } SelectObject(hdc, hBrushOld); SelectObject(hdc, hPenOld); } + static VOID DrawHands(HDC hdc, SYSTEMTIME * pst, BOOL fChange) @@ -108,12 +120,12 @@ SelectObject(hdc, GetStockObject(WHITE_BRUSH)); iAngle[0] = (pst->wHour * 30) % 360 + pst->wMinute / 2; - iAngle[1] = pst->wMinute * 6; - iAngle[2] = pst->wSecond * 6; + iAngle[1] = pst->wMinute * 6; + iAngle[2] = pst->wSecond * 6; CopyMemory(ptTemp, pt, sizeof(pt)); - for(i = fChange ? 0 : 2; i < 3; i++) + for (i = fChange ? 0 : 2; i < 3; i++) { RotatePoint(ptTemp[i], 5, iAngle[i]); @@ -128,62 +140,70 @@ WPARAM wParam, LPARAM lParam) { - - static INT cxClient, cyClient; - static SYSTEMTIME stPrevious; + PCLOCKDATA pClockData; HDC hdc; PAINTSTRUCT ps; - SYSTEMTIME st; + + pClockData = (PCLOCKDATA)GetWindowLongPtr(hwnd, GWLP_USERDATA); switch (uMsg) { case WM_CREATE: - { - hGreyPen = CreatePen(PS_SOLID, 1, RGB(128, 128, 128)); - hGreyBrush = CreateSolidBrush(RGB(128, 128, 128)); + pClockData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLOCKDATA)); + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pClockData); + + pClockData->hGreyPen = CreatePen(PS_SOLID, 1, RGB(128, 128, 128)); + pClockData->hGreyBrush = CreateSolidBrush(RGB(128, 128, 128)); + SetTimer(hwnd, ID_TIMER, 1000, NULL); - GetLocalTime(&st); - stPrevious = st; - } - break; + pClockData->bTimer = TRUE; + GetLocalTime(&pClockData->stCurrent); + pClockData->stPrevious = pClockData->stCurrent; + break; case WM_SIZE: - { - cxClient = LOWORD(lParam); - cyClient = HIWORD(lParam); - } - break; + pClockData->cxClient = LOWORD(lParam); + pClockData->cyClient = HIWORD(lParam); + break; case WM_TIMER: - { - GetLocalTime(&st); - + GetLocalTime(&pClockData->stCurrent); InvalidateRect(hwnd, NULL, TRUE); - - stPrevious = st; - } - break; + pClockData->stPrevious = pClockData->stCurrent; + break; case WM_PAINT: - { hdc = BeginPaint(hwnd, &ps); - - SetIsotropic(hdc, cxClient, cyClient); - - DrawClock(hdc); - DrawHands(hdc, &stPrevious, TRUE); - + SetIsotropic(hdc, pClockData); + DrawClock(hdc, pClockData); + DrawHands(hdc, &pClockData->stPrevious, TRUE); EndPaint(hwnd, &ps); - } - break; + break; case WM_DESTROY: - { - DeleteObject(hGreyPen); - DeleteObject(hGreyBrush); - KillTimer(hwnd, ID_TIMER); - } - break; + DeleteObject(pClockData->hGreyPen); + DeleteObject(pClockData->hGreyBrush); + + if (pClockData->bTimer) + KillTimer(hwnd, ID_TIMER); + + HeapFree(GetProcessHeap(), 0, pClockData); + break; + + case CLM_SETTIME: + /* Stop the timer if it is still running */ + if (pClockData->bTimer) + { + KillTimer(hwnd, ID_TIMER); + pClockData->bTimer = FALSE; + } + + /* Set the current time */ + CopyMemory(&pClockData->stPrevious, (LPSYSTEMTIME)lParam, sizeof(SYSTEMTIME)); + + /* Redraw the clock */ + InvalidateRect(hwnd, NULL, TRUE); + break; default: DefWindowProc(hwnd, Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/dateandti… ============================================================================== --- trunk/reactos/dll/cpl/timedate/dateandtime.c (original) +++ trunk/reactos/dll/cpl/timedate/dateandtime.c Sat May 12 16:37:23 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/dateandtime.c + * FILE: dll/cpl/timedate/dateandtime.c * PURPOSE: Date & Time property page - * COPYRIGHT: Copyright 2004-2005 Eric Kohl + * COPYRIGHT: Copyright 2004-2007 Eric Kohl * Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> * Copyright 2006 Thomas Weidenmueller <w3seek(a)reactos.com> * @@ -361,8 +361,14 @@ { case DTN_DATETIMECHANGE: { + /* Stop the timer */ + KillTimer(hwndDlg, ID_TIMER); + + /* Tell the clock to stop ticking */ + SendDlgItemMessage(hwndDlg, IDC_CLOCKWND, CLM_SETTIME, + 0, (LPARAM)&((LPNMDATETIMECHANGE)lpnm)->st); + /* Enable the 'Apply' button */ - KillTimer(hwndDlg, ID_TIMER); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; Modified: trunk/reactos/dll/cpl/timedate/timedate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.h (original) +++ trunk/reactos/dll/cpl/timedate/timedate.h Sat May 12 16:37:23 2007 @@ -52,6 +52,8 @@ /* clock.c */ +#define CLM_SETTIME (WM_USER + 1) + BOOL RegisterClockControl(VOID); VOID UnregisterClockControl(VOID);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs