Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[mbosma] 26736: Create Internal_CreateSurface stub.
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 21:50:09 2007 New Revision: 26736 URL: http://svn.reactos.org/svn/reactos?rev=26736&view=rev Log: Create Internal_CreateSurface stub. 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.h 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 21:50:09 2007 @@ -130,6 +130,9 @@ DX_WINDBG_trace(); + if (pUnkOuter) + return DDERR_GENERIC; + /* FIXME vaildate input pointers or warp everthing with SEH */ EnterCriticalSection(&ddcs); @@ -162,7 +165,7 @@ } /* FIXME add one gbl check with one pDDSD check */ - // ret = internal_CreateSurface(iface,dd_desc_v2,ppSurf,pUnkOuter); + ret = Internal_CreateSurface(dd_int,ppSurf,&dd_desc_v2); LeaveCriticalSection(&ddcs); return ret; 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 21:50:09 2007 @@ -9,6 +9,13 @@ */ #include "rosdraw.h" +HRESULT +Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, + LPDDSURFACEDESC2 pDDSD) +{ + return DDERR_GENERIC; +} void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) { Modified: 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 (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sat May 12 21:50:09 2007 @@ -71,3 +71,4 @@ 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); +HRESULT Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT, LPDDRAWI_DDRAWSURFACE_LCL*, LPDDSURFACEDESC2);

1 0

[greatlrd] 26735: implement internal api CopyDDSurfDescToDDSurfDesc2
by greatlrd＠svn.reactos.org 12 May '07

12 May '07

Author: greatlrd Date: Sat May 12 21:48:27 2007 New Revision: 26735 URL: http://svn.reactos.org/svn/reactos?rev=26735&view=rev Log: implement internal api CopyDDSurfDescToDDSurfDesc2 Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/rosdraw.h 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 21:48:27 2007 @@ -149,11 +149,7 @@ if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { - - RtlZeroMemory(&dd_desc_v2,sizeof(DDSURFACEDESC2)); - /* FIXME implement CopyDDSurfDescToDDSurfDesc2 - CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD); - */ + CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD); } else if (pDDSD->dwSize == sizeof(DDSURFACEDESC2)) { 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 21:48:27 2007 @@ -8,6 +8,13 @@ * */ #include "rosdraw.h" + + +void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) +{ + RtlZeroMemory(dst_pDesc,sizeof(DDSURFACEDESC2)); + RtlCopyMemory(dst_pDesc,src_pDesc,sizeof(DDSURFACEDESC)); +} HRESULT 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 21:48:27 2007 @@ -25,6 +25,9 @@ HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface); +/* convert DDSURFACEDESC to DDSURFACEDESC2 */ +void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc); + /* DirectDraw Cleanup code only internal use */ VOID Cleanup(LPDIRECTDRAW7 iface);

1 0

[mbosma] 26734: - outsourced DirectDraw_SetCooperativeLevel - adjusted .c file headers
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 21:30:37 2007 New Revision: 26734 URL: http://svn.reactos.org/svn/reactos?rev=26734&view=rev Log: - outsourced DirectDraw_SetCooperativeLevel - adjusted .c file headers Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c trunk/reactos/dll/directx/ddraw/Color/color_stubs.c trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild Modified: trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Clipper/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $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 + * PROJECT: ReactOS DirectX + * FILE: ddraw/clipper/clipper_stubs.c * PURPOSE: IDirectDrawClipper Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Color/color_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Color/co… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Color/color_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Color/color_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $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 + * PROJECT: ReactOS DirectX + * FILE: ddraw/color/color.c * PURPOSE: IDirectDrawColorControl Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c Sat May 12 21:30:37 2007 @@ -1,9 +1,9 @@ -/* $Id: surface_hel.c 21519 2006-04-08 21:05:49Z greatlrd $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/soft/surface.c - * PURPOSE: DirectDraw Software Implementation + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/callbacks_dd_hel.c + * PURPOSE: HEL Callbacks for Direct Draw * PROGRAMMER: Magnus Olsen * */ 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 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/ddraw.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/ddraw_main.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * @@ -170,174 +170,6 @@ LeaveCriticalSection(&ddcs); return ret; -} - -/* - */ -HRESULT WINAPI -Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) -{ - DX_WINDBG_trace(); - -/* - * Code from wine, this functions have been cut and paste from wine 0.9.35 - * and have been modify allot and are still in devloping so it match with - * msdn document struct and flags - */ - - HWND window; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - /* 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; - } -#endif - - /* Tests suggest that we need one of them: */ - if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | - DDSCL_NORMAL | - DDSCL_EXCLUSIVE ))) - { - return DDERR_INVALIDPARAMS; - } - - /* Handle those levels first which set various hwnds */ - if(cooplevel & DDSCL_SETFOCUSWINDOW) - { - /* This isn't compatible with a lot of flags */ - if(cooplevel & ( DDSCL_MULTITHREADED | - DDSCL_FPUSETUP | - DDSCL_FPUPRESERVE | - DDSCL_ALLOWREBOOT | - DDSCL_ALLOWMODEX | - DDSCL_SETDEVICEWINDOW | - DDSCL_NORMAL | - DDSCL_EXCLUSIVE | - DDSCL_FULLSCREEN ) ) - { - return DDERR_INVALIDPARAMS; - } - - else if(This->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) - { - return DDERR_HWNDALREADYSET; - } - else if( (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) && window) - { - return DDERR_HWNDALREADYSET; - } - - This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; - - - /* Won't use the hwnd param for anything else */ - hwnd = NULL; - - /* Use the focus window for drawing too */ - This->lpLcl->hWnd = This->lpLcl->hFocusWnd; - - } - - /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ - if(cooplevel & DDSCL_NORMAL) - { - /* Can't coexist with fullscreen or exclusive */ - if(cooplevel & (DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ) - return DDERR_INVALIDPARAMS; - - - /* Switching from fullscreen? */ - if(This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) - { - /* Restore the display mode */ - Main_DirectDraw_RestoreDisplayMode(iface); - - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ISFULLSCREEN; - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_HASEXCLUSIVEMODE; - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ALLOWMODEX; - } - - /* Don't override focus windows or private device windows */ - if( hwnd && - !(This->lpLcl->hFocusWnd) && - !(This->lpLcl->dwObsolete1) && - (hwnd != window) ) - { - This->lpLcl->hWnd = (ULONG_PTR)hwnd; - } - - /* FIXME GL - IWineD3DDevice_SetFullscreen(This->wineD3DDevice, - FALSE); - */ - } - else if(cooplevel & DDSCL_FULLSCREEN) - { - /* Needs DDSCL_EXCLUSIVE */ - if(!(cooplevel & DDSCL_EXCLUSIVE) ) - return DDERR_INVALIDPARAMS; - - /* Switch from normal to full screen mode? */ - if (!(This->lpLcl->dwLocalFlags & DDRAWILCL_HASEXCLUSIVEMODE)) - { - /* FIXME GL - IWineD3DDevice_SetFullscreen(This->wineD3DDevice, - TRUE); - */ - } - - /* Don't override focus windows or private device windows */ - if( hwnd && - !(This->lpLcl->hFocusWnd) && - !(This->lpLcl->dwObsolete1) && - (hwnd != window) ) - { - This->lpLcl->hWnd = (ULONG_PTR) hwnd; - } - } - else if(cooplevel & DDSCL_EXCLUSIVE) - { - return DDERR_INVALIDPARAMS; - } - - if(cooplevel & DDSCL_CREATEDEVICEWINDOW) - { - /* Don't create a device window if a focus window is set */ - if( !This->lpLcl->hFocusWnd) - { - HWND devicewindow = CreateWindowExW(0, classname, L"DDraw device window", - WS_POPUP, 0, 0, - GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN), - NULL, NULL, GetModuleHandleW(0), NULL); - - ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ - - This->lpLcl->dwObsolete1 = (DWORD)devicewindow; - } - } - - if(cooplevel & DDSCL_MULTITHREADED && !(This->lpLcl->dwLocalFlags & DDRAWILCL_MULTITHREADED)) - { - /* FIXME GL - * IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); - */ - } - - - - /* Store the cooperative_level */ - - /* FIXME GL - * This->cooperative_level |= cooplevel; - */ - - return DD_OK; - } IDirectDraw7Vtbl DirectDraw7_Vtable = Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (added) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Sat May 12 21:30:37 2007 @@ -1,0 +1,176 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/ddraw_main.c + * PURPOSE: IDirectDraw7::SetCooperativeLevel Implementation + * PROGRAMMER: Magnus Olsen + * + */ + +#include "rosdraw.h" + +HRESULT WINAPI +Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) +{ + DX_WINDBG_trace(); + +/* + * Code from wine, this functions have been cut and paste from wine 0.9.35 + * and have been modify allot and are still in devloping so it match with + * msdn document struct and flags + */ + + HWND window; + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + + /* 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; + } +#endif + + /* Tests suggest that we need one of them: */ + if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | + DDSCL_NORMAL | + DDSCL_EXCLUSIVE ))) + { + return DDERR_INVALIDPARAMS; + } + + /* Handle those levels first which set various hwnds */ + if(cooplevel & DDSCL_SETFOCUSWINDOW) + { + /* This isn't compatible with a lot of flags */ + if(cooplevel & ( DDSCL_MULTITHREADED | + DDSCL_FPUSETUP | + DDSCL_FPUPRESERVE | + DDSCL_ALLOWREBOOT | + DDSCL_ALLOWMODEX | + DDSCL_SETDEVICEWINDOW | + DDSCL_NORMAL | + DDSCL_EXCLUSIVE | + DDSCL_FULLSCREEN ) ) + { + return DDERR_INVALIDPARAMS; + } + + else if(This->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) + { + return DDERR_HWNDALREADYSET; + } + else if( (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) && window) + { + return DDERR_HWNDALREADYSET; + } + + This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; + + + /* Won't use the hwnd param for anything else */ + hwnd = NULL; + + /* Use the focus window for drawing too */ + This->lpLcl->hWnd = This->lpLcl->hFocusWnd; + + } + + /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ + if(cooplevel & DDSCL_NORMAL) + { + /* Can't coexist with fullscreen or exclusive */ + if(cooplevel & (DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ) + return DDERR_INVALIDPARAMS; + + + /* Switching from fullscreen? */ + if(This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) + { + /* Restore the display mode */ + Main_DirectDraw_RestoreDisplayMode(iface); + + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ISFULLSCREEN; + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_HASEXCLUSIVEMODE; + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ALLOWMODEX; + } + + /* Don't override focus windows or private device windows */ + if( hwnd && + !(This->lpLcl->hFocusWnd) && + !(This->lpLcl->dwObsolete1) && + (hwnd != window) ) + { + This->lpLcl->hWnd = (ULONG_PTR)hwnd; + } + + /* FIXME GL + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + FALSE); + */ + } + else if(cooplevel & DDSCL_FULLSCREEN) + { + /* Needs DDSCL_EXCLUSIVE */ + if(!(cooplevel & DDSCL_EXCLUSIVE) ) + return DDERR_INVALIDPARAMS; + + /* Switch from normal to full screen mode? */ + if (!(This->lpLcl->dwLocalFlags & DDRAWILCL_HASEXCLUSIVEMODE)) + { + /* FIXME GL + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + TRUE); + */ + } + + /* Don't override focus windows or private device windows */ + if( hwnd && + !(This->lpLcl->hFocusWnd) && + !(This->lpLcl->dwObsolete1) && + (hwnd != window) ) + { + This->lpLcl->hWnd = (ULONG_PTR) hwnd; + } + } + else if(cooplevel & DDSCL_EXCLUSIVE) + { + return DDERR_INVALIDPARAMS; + } + + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) + { + /* Don't create a device window if a focus window is set */ + if( !This->lpLcl->hFocusWnd) + { + HWND devicewindow = CreateWindowExW(0, classname, L"DDraw device window", + WS_POPUP, 0, 0, + GetSystemMetrics(SM_CXSCREEN), + GetSystemMetrics(SM_CYSCREEN), + NULL, NULL, GetModuleHandleW(0), NULL); + + ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ + + This->lpLcl->dwObsolete1 = (DWORD)devicewindow; + } + } + + if(cooplevel & DDSCL_MULTITHREADED && !(This->lpLcl->dwLocalFlags & DDRAWILCL_MULTITHREADED)) + { + /* FIXME GL + * IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); + */ + } + + + + /* Store the cooperative_level */ + + /* FIXME GL + * This->cooperative_level |= cooplevel; + */ + + return DD_OK; +} Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision 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 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: ddraw\ddraw\ddraw_stubs.c + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/ddraw_stubs.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Gamma/ga… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $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 + * PROJECT: ReactOS DirectX + * FILE: ddraw/gamma/gamma_stubs.c * PURPOSE: IDirectDrawGamma Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Kernel/k… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $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 + * PROJECT: ReactOS DirectX + * FILE: ddraw/kernel/kernel_stubs.c * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $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 + * PROJECT: ReactOS DirectX + * FILE: ddraw/palette/palette_stubs.c * PURPOSE: IDirectDrawPalette Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c Sat May 12 21:30:37 2007 @@ -1,10 +1,10 @@ -/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ddraw/ddraw.c - * PURPOSE: DirectDraw Library - * PROGRAMMER: Magnus Olsen (greatlrd) + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/callbacks_surf_hel.c + * PURPOSE: HEL Callbacks For Surface APIs + * PROGRAMMER: Magnus Olsen * */ 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 21:30:37 2007 @@ -1,4 +1,12 @@ - +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/createsurface.c + * PURPOSE: IDirectDrawSurface7 Creation + * PROGRAMMER: Magnus Olsen + * + */ #include "rosdraw.h" 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 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/ + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/surface_main.c * PURPOSE: IDirectDrawSurface7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: 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 (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/surface_stubs.c * PURPOSE: IDirectDrawSurface7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Videopor… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c Sat May 12 21:30:37 2007 @@ -1,8 +1,8 @@ /* $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 + * PROJECT: ReactOS DirectX + * FILE: ddraw/videoport/videoport_stubs.c * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation * PROGRAMMER: Maarten Bosma * 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 21:30:37 2007 @@ -24,6 +24,7 @@ <directory name="Ddraw"> <file>ddraw_stubs.c</file> + <file>ddraw_setcooperativelevel.c</file> <file>ddraw_main.c</file> <file>callbacks_dd_hel.c</file> </directory>

1 0

[greatlrd] 26733: start implement Main_DirectDraw_CreateSurface we need now finish internal_CreateSurface and CopyDDSurfDescToDDSurfDesc2
by greatlrd＠svn.reactos.org 12 May '07

12 May '07

Author: greatlrd Date: Sat May 12 21:23:48 2007 New Revision: 26733 URL: http://svn.reactos.org/svn/reactos?rev=26733&view=rev Log: start implement Main_DirectDraw_CreateSurface we need now finish internal_CreateSurface and CopyDDSurfDescToDDSurfDesc2 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 21:23:48 2007 @@ -122,15 +122,54 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - - DX_WINDBG_trace(); - EnterCriticalSection(&ddcs); - - /* code here */ + HRESULT ret; + DDSURFACEDESC2 dd_desc_v2; + LPDDRAWI_DIRECTDRAW_INT dd_int; + LPDDRAWI_DIRECTDRAW_LCL dd_lcl; + LPDDRAWI_DIRECTDRAW_GBL dd_gbl; + + DX_WINDBG_trace(); + + /* FIXME vaildate input pointers or warp everthing with SEH */ + + EnterCriticalSection(&ddcs); + + ret = DDERR_GENERIC; + + dd_int = (LPDDRAWI_DIRECTDRAW_INT)iface; + dd_lcl = dd_int->lpLcl; + dd_gbl = dd_lcl->lpGbl; + + if (dd_lcl->dwLocalFlags == 0) + { + LeaveCriticalSection(&ddcs); + /* FIXME send back right return code */ + return DDERR_GENERIC; + } + + if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) + { + + RtlZeroMemory(&dd_desc_v2,sizeof(DDSURFACEDESC2)); + /* FIXME implement CopyDDSurfDescToDDSurfDesc2 + CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD); + */ + } + else if (pDDSD->dwSize == sizeof(DDSURFACEDESC2)) + { + RtlCopyMemory(&dd_desc_v2,pDDSD,sizeof(DDSURFACEDESC2)); + } + else + { + LeaveCriticalSection(&ddcs); + return DDERR_INVALIDPARAMS; + } + + /* FIXME add one gbl check with one pDDSD check */ + // ret = internal_CreateSurface(iface,dd_desc_v2,ppSurf,pUnkOuter); LeaveCriticalSection(&ddcs); - - DX_STUB; + return ret; } /*

1 0

[mbosma] 26732: Reformating
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 20:37:17 2007 New Revision: 26732 URL: http://svn.reactos.org/svn/reactos?rev=26732&view=rev Log: Reformating Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c 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 20:37:17 2007 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS - * FILE: + * FILE: ddraw\ddraw\ddraw_stubs.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * @@ -11,8 +11,7 @@ #include "../rosdraw.h" /* - * IMPLEMENT - * Status ok + * Status: Implentation removed due to rewrite */ HRESULT WINAPI @@ -21,284 +20,198 @@ LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) { - DX_WINDBG_trace(); - - DX_STUB; -} - -/* */ + 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 - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { - - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * stub - * Status not done - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, LPDDENUMSURFACESCALLBACK7 callback) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) { - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) { - - DX_WINDBG_trace(); - - DX_STUB; -} - - -/* - * IMPLEMENT - * Status ok + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ 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 - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) { - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) { - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { - DX_WINDBG_trace(); - - DX_STUB; - return DD_OK; -} - -/* - * IMPLEMENT - * Status ok + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ 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 + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { - - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Status: Implentation removed due to rewrite */ HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) { - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) { - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ + DX_WINDBG_trace(); + DX_STUB; +} + HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) { - DX_WINDBG_trace(); - DX_STUB; -} + DX_WINDBG_trace(); + DX_STUB; +}

1 0

[mbosma] 26731: Sorry, just noticed that I forgot to commit this one.
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 20:29:58 2007 New Revision: 26731 URL: http://svn.reactos.org/svn/reactos?rev=26731&view=rev Log: Sorry, just noticed that I forgot to commit this one. Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (with props) Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (added) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Sat May 12 20:29:58 2007 @@ -1,0 +1,82 @@ +// public interfaces +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); + +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); + +// hel callbacks + +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); + Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

1 0

[mbosma] 26730: Formating
by mbosma＠svn.reactos.org 12 May '07

12 May '07

Author: mbosma Date: Sat May 12 20:28:54 2007 New Revision: 26730 URL: http://svn.reactos.org/svn/reactos?rev=26730&view=rev Log: Formating Modified: trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Modified: 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 (original) +++ trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Sat May 12 20:28:54 2007 @@ -1,21 +1,21 @@ -* 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 +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; @@ -24,7 +24,7 @@ DWORD dwIntRefCnt; } DDRAWI_DIRECTDRAW_INT; - rest of the struct are from msdn for windows 2000/xp/2003 +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 @@ -53,7 +53,6 @@ ULONG_PTR hGammaCalibrator; LPDDGAMMACALIBRATORPROC lpGammaCalibrator; } DDRAWI_DIRECTDRAW_LCL; - typedef struct _DDRAWI_DIRECTDRAW_GBL { DWORD dwRefCnt; @@ -128,23 +127,19 @@ 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 +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; @@ -164,6 +159,7 @@ IUnknown *pAddrefedThisOwner; } DDRAWI_DDRAWCLIPPER_LCL; + typedef struct _DDRAWI_DDRAWCLIPPER_GBL { DWORD dwRefCnt; DWORD dwFlags; @@ -173,11 +169,7 @@ ULONG_PTR hWnd; LPRGNDATA lpStaticClipList; } DDRAWI_DDRAWCLIPPER_GBL; -*/ - - - -/* + typedef struct _DDRAWI_DDRAWPALETTE_INT { LPVOID lpVtbl; LPDDRAWI_DDRAWPALETTE_LCL lpLcl; @@ -213,9 +205,8 @@ DWORD dwSaveStamp; DWORD dwHandle; } DDRAWI_DDRAWPALETTE_GBL; -*/ - -/* + + typedef struct _DDRAWI_DDVIDEOPORT_INT { LPVOID lpVtbl; LPDDRAWI_DDVIDEOPORT_LCL lpLcl; @@ -249,7 +240,8 @@ } DDRAWI_DDVIDEOPORT_LCL; -Surface +Surface: + typedef struct _DDRAWI_DDRAWSURFACE_GBL { DWORD dwRefCnt; DWORD dwGlobalFlags; @@ -277,14 +269,10 @@ 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 +The following informations might be incorrectly +I am using logic thinking since the info does +not exists in MSDN so I am drawing clue how +previews stuffs works that are document in MSDN/DDK follow struct should exists ??? DDRAWI_DDVIDEOPORT_GBL @@ -319,6 +307,7 @@ 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;

1 0

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

12 May '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 12 May '07

12 May '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 12 May '07

12 May '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

← Newer
1
...
17
18
19
20
21
22
23
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007