Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 31183: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) design cleanup bit. fix so each directdraw surface got own directdraw surface vtable. For some api are new in some version and some functions have more param or different struct in newer directdraw surface
by greatlrd＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: greatlrd Date: Wed Dec 12 18:01:25 2007 New Revision: 31183 URL: http://svn.reactos.org/svn/reactos?rev=31183&view=rev Log: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) design cleanup bit. fix so each directdraw surface got own directdraw surface vtable. For some api are new in some version and some functions have more param or different struct in newer directdraw surface Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.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 Wed Dec 12 18:01:25 2007 @@ -188,7 +188,7 @@ /* FIXME the lpLnk */ - Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)ThisSurfInt); + Main_DDrawSurface_AddRef(ThisSurfInt); } pDDraw->lpLcl->lpGbl->dsList = (LPDDRAWI_DDRAWSURFACE_INT) slist_int; @@ -247,3 +247,4 @@ + 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 Wed Dec 12 18:01:25 2007 @@ -1,8 +1,7 @@ // public interfaces -ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7); +ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT); 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_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT, REFIID, LPVOID*); 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); @@ -68,3 +67,4 @@ DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface); + 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 Wed Dec 12 18:01:25 2007 @@ -20,19 +20,31 @@ SetPalette; */ +LPDDRAWI_DDRAWSURFACE_INT +internal_directdrawsurface_int_alloc(LPDDRAWI_DDRAWSURFACE_INT This) +{ + LPDDRAWI_DDRAWSURFACE_INT newThis; + DxHeapMemAlloc(newThis, sizeof(LPDDRAWI_DDRAWSURFACE_INT)); + if (newThis) + { + newThis->lpLcl = This->lpLcl; + newThis->lpLink = This; + } + return newThis; +} HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { return DDERR_ALREADYINITIALIZED; } -ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) +ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT iface) { LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); - if (iface!=NULL) + if (This!=NULL) { This->dwIntRefCnt++; This->lpLcl->dwLocalRefCnt++; @@ -47,14 +59,102 @@ } HRESULT WINAPI -Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, +Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT iface, REFIID riid, LPVOID* ppObj) { + LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); - - DX_STUB_str("Unimplement\n"); - - return E_NOINTERFACE; + HRESULT retVal = DD_OK; + *ppObj = NULL; + + _SEH_TRY + { + if (IsEqualGUID(&IID_IDirectDrawSurface7, riid)) + { + if (This->lpVtbl != &DirectDrawSurface7_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface7_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurface4, riid)) + { + if (This->lpVtbl != &DirectDrawSurface4_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface4_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurface3, riid)) + { + if (This->lpVtbl != &DirectDrawSurface3_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface3_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurface2, riid)) + { + if (This->lpVtbl != &DirectDrawSurface2_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface2_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirectDrawSurface, riid)) + { + if (This->lpVtbl != &DirectDrawSurface_Vtable) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &DirectDrawSurface_Vtable; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else + { + DX_STUB_str("E_NOINTERFACE"); + retVal = E_NOINTERFACE; + } + } + _SEH_HANDLE + { + } + _SEH_END; + return retVal; } @@ -688,62 +788,3 @@ return DDERR_GENERIC; } - -IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable = -{ - /*** IUnknown ***/ - Main_DDrawSurface_QueryInterface, - Main_DDrawSurface_AddRef, /* (Compact done) */ - Main_DDrawSurface_Release, - /*** IDirectDrawSurface ***/ - Main_DDrawSurface_AddAttachedSurface, - Main_DDrawSurface_AddOverlayDirtyRect, - Main_DDrawSurface_Blt, - Main_DDrawSurface_BltBatch, - Main_DDrawSurface_BltFast, - Main_DDrawSurface_DeleteAttachedSurface, - Main_DDrawSurface_EnumAttachedSurfaces, - Main_DDrawSurface_EnumOverlayZOrders, - Main_DDrawSurface_Flip, - Main_DDrawSurface_GetAttachedSurface, - Main_DDrawSurface_GetBltStatus, - Main_DDrawSurface_GetCaps, - Main_DDrawSurface_GetClipper, - Main_DDrawSurface_GetColorKey, - Main_DDrawSurface_GetDC, - Main_DDrawSurface_GetFlipStatus, - Main_DDrawSurface_GetOverlayPosition, - Main_DDrawSurface_GetPalette, - Main_DDrawSurface_GetPixelFormat, - Main_DDrawSurface_GetSurfaceDesc, - Main_DDrawSurface_Initialize, - Main_DDrawSurface_IsLost, - Main_DDrawSurface_Lock, - Main_DDrawSurface_ReleaseDC, - Main_DDrawSurface_Restore, - Main_DDrawSurface_SetClipper, - Main_DDrawSurface_SetColorKey, - Main_DDrawSurface_SetOverlayPosition, - Main_DDrawSurface_SetPalette, - Main_DDrawSurface_Unlock, - Main_DDrawSurface_UpdateOverlay, - Main_DDrawSurface_UpdateOverlayDisplay, - Main_DDrawSurface_UpdateOverlayZOrder, - /*** IDirectDrawSurface2 ***/ - Main_DDrawSurface_GetDDInterface, - Main_DDrawSurface_PageLock, - Main_DDrawSurface_PageUnlock, - /*** IDirectDrawSurface3 ***/ - Main_DDrawSurface_SetSurfaceDesc, - /*** IDirectDrawSurface4 ***/ - Main_DDrawSurface_SetPrivateData, - Main_DDrawSurface_GetPrivateData, - Main_DDrawSurface_FreePrivateData, - Main_DDrawSurface_GetUniquenessValue, - Main_DDrawSurface_ChangeUniquenessValue, - /*** IDirectDrawSurface7 ***/ - Main_DDrawSurface_SetPriority, - Main_DDrawSurface_GetPriority, - Main_DDrawSurface_SetLOD, - Main_DDrawSurface_GetLOD -}; Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c Wed Dec 12 18:01:25 2007 @@ -55,8 +55,8 @@ HRESULT WINAPI Main_DirectDraw_DuplicateSurface( LPDIRECTDRAW2 iface, - LPDIRECTDRAWSURFACE2 src, - LPDIRECTDRAWSURFACE2* dst); + LPDIRECTDRAWSURFACE src, + LPDIRECTDRAWSURFACE* dst); HRESULT WINAPI Main_DirectDraw_EnumDisplayModes( @@ -182,3 +182,4 @@ }; + Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Wed Dec 12 18:01:25 2007 @@ -72,7 +72,7 @@ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, - LPDDENUMSURFACESCALLBACK7 callback); + LPDDENUMSURFACESCALLBACK2 callback); HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW4 iface); @@ -97,7 +97,7 @@ HRESULT WINAPI Main_DirectDraw_GetGDISurface( LPDIRECTDRAW4 iface, - LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface); + LPDIRECTDRAWSURFACE4 *lplpGDIDDSSurface); HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency ( @@ -156,7 +156,7 @@ Main_DirectDraw_GetSurfaceFromDC( LPDIRECTDRAW4 iface, HDC hdc, - LPDIRECTDRAWSURFACE7 *lpDDS); + LPDIRECTDRAWSURFACE4 *lpDDS); HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW4 iface); Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,103 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE2); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE2, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE2, HDC); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE2, LPRECT, LPDIRECTDRAWSURFACE2, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE2, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE2, DWORD, DWORD, LPDIRECTDRAWSURFACE2, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE2, DWORD, LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE2, LPVOID, LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE2, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE2 , LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE2, LPDDSCAPS, LPDIRECTDRAWSURFACE2*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE2, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE2, LPDDSCAPS pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE2, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE2, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE2, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE2, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE2, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE2, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE2, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE2, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE2, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE2, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE2, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE2, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE2, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE2, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE2, DWORD, LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE2, LPVOID); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE2, LPDIRECTDRAW, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE2, LPRECT, LPDDSURFACEDESC, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE2, LPRECT, LPDIRECTDRAWSURFACE2, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE2, LPDIRECTDRAWSURFACE2); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE2, LPRECT); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE2, DDSURFACEDESC2, DWORD); + + +IDirectDrawSurface2Vtbl DirectDrawSurface2_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, + Main_DDrawSurface_GetDDInterface, + Main_DDrawSurface_PageLock, + Main_DDrawSurface_PageUnlock, +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface2_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,104 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE3); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE3, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE3, HDC); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE3, LPRECT, LPDIRECTDRAWSURFACE3, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE3, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE3, DWORD, DWORD, LPDIRECTDRAWSURFACE3, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE3, DWORD, LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE3, LPVOID, LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE3, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE3 , LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE3, LPDDSCAPS, LPDIRECTDRAWSURFACE3*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE3, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE3, LPDDSCAPS pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE3, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE3, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE3, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE3, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE3, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE3, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE3, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE3, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE3, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE3, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE3, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE3, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE3, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE3, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE3, DWORD, LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE3, DDSURFACEDESC *, DWORD); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE3, LPVOID); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE3, LPDIRECTDRAW, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE3, LPRECT, LPDDSURFACEDESC, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE3, LPRECT, LPDIRECTDRAWSURFACE3, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE3, LPDIRECTDRAWSURFACE3); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE3, LPRECT); + + +IDirectDrawSurface3Vtbl DirectDrawSurface3_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, + Main_DDrawSurface_GetDDInterface, + Main_DDrawSurface_PageLock, + Main_DDrawSurface_PageUnlock, + Main_DDrawSurface_SetSurfaceDesc, +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface3_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,114 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE4); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE4, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE4, HDC); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE4, LPRECT, LPDIRECTDRAWSURFACE4, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE4, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE4, DWORD, DWORD, LPDIRECTDRAWSURFACE4, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE4, DWORD, LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE4, LPVOID, LPDDENUMSURFACESCALLBACK2); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE4, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK2); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE4 , LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE4, REFGUID); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE4, LPDDSCAPS2, LPDIRECTDRAWSURFACE4*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE4, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE4, LPDDSCAPS2 pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE4, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE4, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE4, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE4, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE4, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE4, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE4, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE4, REFGUID, LPVOID, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE4, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE4, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE4, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE4, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE4, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE4, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE4, REFGUID, LPVOID, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE4, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE4, DWORD, LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE4, DDSURFACEDESC2 *, DWORD); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE4, LPRECT); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE4, LPDIRECTDRAW, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE4, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE4, LPRECT, LPDIRECTDRAWSURFACE4, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE4, LPDIRECTDRAWSURFACE4); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE4, LPRECT); + + +IDirectDrawSurface4Vtbl DirectDrawSurface4_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, + Main_DDrawSurface_GetDDInterface, + Main_DDrawSurface_PageLock, + Main_DDrawSurface_PageUnlock, + Main_DDrawSurface_SetSurfaceDesc, + Main_DDrawSurface_SetPrivateData, + Main_DDrawSurface_GetPrivateData, + Main_DDrawSurface_FreePrivateData, + Main_DDrawSurface_GetUniquenessValue, + Main_DDrawSurface_ChangeUniquenessValue, +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,122 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +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); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7, LPRECT); + + +IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, + Main_DDrawSurface_GetDDInterface, + Main_DDrawSurface_PageLock, + Main_DDrawSurface_PageUnlock, + Main_DDrawSurface_SetSurfaceDesc, + Main_DDrawSurface_SetPrivateData, + Main_DDrawSurface_GetPrivateData, + Main_DDrawSurface_FreePrivateData, + Main_DDrawSurface_GetUniquenessValue, + Main_DDrawSurface_ChangeUniquenessValue, + Main_DDrawSurface_SetPriority, + Main_DDrawSurface_GetPriority, + Main_DDrawSurface_SetLOD, + Main_DDrawSurface_GetLOD +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c Wed Dec 12 18:01:25 2007 @@ -1,0 +1,95 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE); +ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE, REFIID, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE, DWORD, DWORD, LPDIRECTDRAWSURFACE, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE, DWORD, LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE, LPVOID, LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE , LPDIRECTDRAWSURFACE, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE, LPDDSCAPS, LPDIRECTDRAWSURFACE*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE, LPDDSCAPS pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE, DWORD, LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE, LPVOID); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE, LPDIRECTDRAW, LPDDSURFACEDESC); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE, LPRECT, LPDDSURFACEDESC, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE, LPRECT, LPDIRECTDRAWSURFACE, LPRECT, + DWORD, LPDDOVERLAYFX); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE, LPRECT); + + +IDirectDrawSurfaceVtbl DirectDrawSurface_Vtable = +{ + Main_DDrawSurface_QueryInterface, + Main_DDrawSurface_AddRef, /* (Compact done) */ + Main_DDrawSurface_Release, + Main_DDrawSurface_AddAttachedSurface, + Main_DDrawSurface_AddOverlayDirtyRect, + Main_DDrawSurface_Blt, + Main_DDrawSurface_BltBatch, + Main_DDrawSurface_BltFast, + Main_DDrawSurface_DeleteAttachedSurface, + Main_DDrawSurface_EnumAttachedSurfaces, + Main_DDrawSurface_EnumOverlayZOrders, + Main_DDrawSurface_Flip, + Main_DDrawSurface_GetAttachedSurface, + Main_DDrawSurface_GetBltStatus, + Main_DDrawSurface_GetCaps, + Main_DDrawSurface_GetClipper, + Main_DDrawSurface_GetColorKey, + Main_DDrawSurface_GetDC, + Main_DDrawSurface_GetFlipStatus, + Main_DDrawSurface_GetOverlayPosition, + Main_DDrawSurface_GetPalette, + Main_DDrawSurface_GetPixelFormat, + Main_DDrawSurface_GetSurfaceDesc, + Main_DDrawSurface_Initialize, + Main_DDrawSurface_IsLost, + Main_DDrawSurface_Lock, + Main_DDrawSurface_ReleaseDC, + Main_DDrawSurface_Restore, + Main_DDrawSurface_SetClipper, + Main_DDrawSurface_SetColorKey, + Main_DDrawSurface_SetOverlayPosition, + Main_DDrawSurface_SetPalette, + Main_DDrawSurface_Unlock, + Main_DDrawSurface_UpdateOverlay, + Main_DDrawSurface_UpdateOverlayDisplay, + Main_DDrawSurface_UpdateOverlayZOrder, +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native 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 Wed Dec 12 18:01:25 2007 @@ -62,5 +62,10 @@ <file>DirectDraw4_Vtable.c</file> <file>DirectDraw2_Vtable.c</file> <file>DirectDraw_Vtable.c</file> + <file>DirectDrawSurface7_Vtable.c</file> + <file>DirectDrawSurface4_Vtable.c</file> + <file>DirectDrawSurface3_Vtable.c</file> + <file>DirectDrawSurface2_Vtable.c</file> + <file>DirectDrawSurface_Vtable.c</file> </directory> -</module> +</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 Wed Dec 12 18:01:25 2007 @@ -28,7 +28,10 @@ extern IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable; -extern IDirectDrawSurface3Vtbl DirectDrawSurface3_VTable; +extern IDirectDrawSurface4Vtbl DirectDrawSurface4_Vtable; +extern IDirectDrawSurface3Vtbl DirectDrawSurface3_Vtable; +extern IDirectDrawSurface2Vtbl DirectDrawSurface2_Vtable; +extern IDirectDrawSurfaceVtbl DirectDrawSurface_Vtable; extern IDirectDrawPaletteVtbl DirectDrawPalette_Vtable; extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable; extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable;

1 0

[hpoussin] 31182: Remove useless test
by hpoussin＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: hpoussin Date: Wed Dec 12 15:08:11 2007 New Revision: 31182 URL: http://svn.reactos.org/svn/reactos?rev=31182&view=rev Log: Remove useless test Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Wed Dec 12 15:08:11 2007 @@ -1,7 +1,7 @@ /* * VideoPort driver * - * Copyright (C) 2002, 2003, 2004 ReactOS Team + * Copyright (C) ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,7 +18,6 @@ * If not, write to the Free Software Foundation, * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: videoprt.c 29323 2007-10-01 08:14:24Z fireball $ */ @@ -669,15 +668,13 @@ return STATUS_UNSUCCESSFUL; } - /* add no PNP bus here, add more bus type if it needed */ - - if ( (HwInitializationData->AdapterInterfaceType == InterfaceTypeUndefined) || - (HwInitializationData->AdapterInterfaceType == Internal) ) - - { - DPRINT1("No PNP Videocard .\n"); - LegacyDetection = TRUE; - } + /* We can't check HwInitializationData->AdapterInterfaceType to know if + * we have to use legacy detection, as MSDN states that this member is + * ignored by videoprt and should remain zero-initialized. + * Force legacy detection, so NT4 drivers will still work on ReactOS. + * WARNING: this will cause all Plug-and-Play IRPs to fail. + */ + LegacyDetection = TRUE; DriverObject->MajorFunction[IRP_MJ_CREATE] = IntVideoPortDispatchOpen; DriverObject->MajorFunction[IRP_MJ_CLOSE] = IntVideoPortDispatchClose;

1 0

[hpoussin] 31181: Remove hack
by hpoussin＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: hpoussin Date: Wed Dec 12 14:42:20 2007 New Revision: 31181 URL: http://svn.reactos.org/svn/reactos?rev=31181&view=rev Log: Remove hack Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Wed Dec 12 14:42:20 2007 @@ -564,7 +564,7 @@ { /* Fail */ DPRINT1("Restore Privilege missing!\n"); - //return STATUS_PRIVILEGE_NOT_HELD; + return STATUS_PRIVILEGE_NOT_HELD; } /* Block APCs */

1 0

[hpoussin] 31180: Get SeRestorePrivilege before calling RegLoadKey
by hpoussin＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: hpoussin Date: Wed Dec 12 14:41:38 2007 New Revision: 31180 URL: http://svn.reactos.org/svn/reactos?rev=31180&view=rev Log: Get SeRestorePrivilege before calling RegLoadKey Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c (original) +++ trunk/reactos/dll/win32/userenv/profile.c Wed Dec 12 14:41:38 2007 @@ -1,6 +1,5 @@ /* * ReactOS kernel - * Copyright (C) 2004 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,13 +15,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/profile.c * PURPOSE: User profile code - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Hervé Poussineau */ #include <precomp.h> @@ -98,6 +97,67 @@ RtlFreeUnicodeString (&UserName); return bResult; +} + + +static BOOL +AcquireRemoveRestorePrivilege( + IN BOOL bAcquire) +{ + HANDLE Process; + HANDLE Token; + PTOKEN_PRIVILEGES TokenPriv; + BOOL bRet; + + DPRINT("AcquireRemoveRestorePrivilege(%d)\n", bAcquire); + + Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); + if (!Process) + { + DPRINT1("OpenProcess() failed with error %lu\n", GetLastError()); + return FALSE; + } + bRet = OpenProcessToken(Process, TOKEN_ADJUST_PRIVILEGES, &Token); + CloseHandle(Process); + if (!bRet) + { + DPRINT1("OpenProcessToken() failed with error %lu\n", GetLastError()); + return FALSE; + } + TokenPriv = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges) + sizeof(LUID_AND_ATTRIBUTES)); + if (!TokenPriv) + { + DPRINT1("Failed to allocate mem for token privileges\n"); + CloseHandle(Token); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + TokenPriv->PrivilegeCount = 1; + TokenPriv->Privileges[0].Attributes = bAcquire ? SE_PRIVILEGE_ENABLED : 0; + if (!LookupPrivilegeValue(NULL, SE_RESTORE_NAME, &TokenPriv->Privileges[0].Luid)) + { + DPRINT1("LookupPrivilegeValue() failed with error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, TokenPriv); + CloseHandle(Token); + return FALSE; + } + bRet = AdjustTokenPrivileges( + Token, + FALSE, + TokenPriv, + 0, + NULL, + NULL); + HeapFree(GetProcessHeap(), 0, TokenPriv); + CloseHandle(Token); + + if (!bRet) + { + DPRINT1("AdjustTokenPrivileges() failed with error %lu\n", GetLastError()); + return FALSE; + } + + return TRUE; } @@ -285,10 +345,19 @@ wcscpy (szBuffer, szUserProfilePath); wcscat (szBuffer, L"\\ntuser.dat"); + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); + return FALSE; + } + /* Create new user hive */ Error = RegLoadKeyW (HKEY_USERS, SidString, szBuffer); + AcquireRemoveRestorePrivilege(FALSE); if (Error != ERROR_SUCCESS) { DPRINT1("Error: %lu\n", Error); @@ -967,10 +1036,18 @@ } ret = FALSE; + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError()); + goto cleanup; + } + /* Load user registry hive */ Error = RegLoadKeyW(HKEY_USERS, SidString.Buffer, szUserHivePath); + AcquireRemoveRestorePrivilege(FALSE); if (Error != ERROR_SUCCESS) { DPRINT1("RegLoadKeyW() failed (Error %ld)\n", Error);

1 0

[cwittich] 31179: only clear it when the buffer is valid
by cwittich＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: cwittich Date: Wed Dec 12 12:17:59 2007 New Revision: 31179 URL: http://svn.reactos.org/svn/reactos?rev=31179&view=rev Log: only clear it when the buffer is valid Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Wed Dec 12 12:17:59 2007 @@ -29,13 +29,14 @@ /* Return a block of memory from the ARC Hardware Heap */ Buffer = &reactos_arc_hardware_data[FldrpHwHeapLocation]; - /* Clear it */ - RtlZeroMemory(Buffer, Size); - /* Increment the heap location */ FldrpHwHeapLocation += Size; if (FldrpHwHeapLocation > HW_MAX_ARC_HEAP_SIZE) Buffer = NULL; - + + /* Clear it */ + if (Buffer) + RtlZeroMemory(Buffer, Size); + /* Return the buffer */ return Buffer; }

1 0

[winesync] 31178: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: winesync Date: Wed Dec 12 11:52:08 2007 New Revision: 31178 URL: http://svn.reactos.org/svn/reactos?rev=31178&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/dsa.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Wed Dec 12 11:52:08 2007 @@ -82,15 +82,6 @@ } /****************************************************************************** -@@ -3521,6 +3525,8 @@ - * from which to switch to the next page */ - SendMessageW(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0); - -+ PROPSHEET_UnChanged(hwnd, (HWND)wParam); -+ - return TRUE; - } - Index: tooltips.c =================================================================== --- tooltips.c (revision 25790) @@ -143,54 +134,3 @@ if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); -@@ -4160,6 +4158,22 @@ - static LRESULT - TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) - { -+ TVHITTESTINFO ht; -+ -+ ht.pt = *pPt; -+ -+ TREEVIEW_HitTest(infoPtr, &ht); -+ -+ if (ht.hItem) -+ { -+ /* Change to screen coordinate for WM_CONTEXTMENU */ -+ ClientToScreen(infoPtr->hwnd, &ht.pt); -+ -+ /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ -+ SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, -+ (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); -+ } -+ - return 0; - } - -Index: monthcal.c -=================================================================== ---- monthcal.c (revision 29360) -+++ monthcal.c (working copy) -@@ -1719,11 +1719,12 @@ - - - static LRESULT --MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr) -+MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr, HWND hFocusWnd) - { - TRACE("\n"); - -- InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); -+ if (infoPtr->hwndNotify != hFocusWnd) -+ ShowWindow(infoPtr->hwndSelf, SW_HIDE); - - return 0; - } -@@ -2031,7 +2032,7 @@ - return DLGC_WANTARROWS | DLGC_WANTCHARS; - - case WM_KILLFOCUS: -- return MONTHCAL_KillFocus(infoPtr); -+ return MONTHCAL_KillFocus(infoPtr, wParam); - - case WM_RBUTTONDOWN: - return MONTHCAL_RButtonDown(infoPtr, lParam); Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32undoc.c (original) +++ trunk/reactos/dll/win32/comctl32/comctl32undoc.c Wed Dec 12 11:52:08 2007 @@ -834,8 +834,8 @@ const WINEMRUITEM *witem; INT desired, datasize; + if ((nItemPos < 0) || !lpBuffer) return mp->cursize; if (nItemPos >= mp->cursize) return -1; - if ((nItemPos < 0) || !lpBuffer) return mp->cursize; desired = mp->realMRU[nItemPos]; desired -= 'a'; TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); @@ -860,8 +860,8 @@ INT desired, datasize; DWORD lenA; + if ((nItemPos < 0) || !lpBuffer) return mp->cursize; if (nItemPos >= mp->cursize) return -1; - if ((nItemPos < 0) || !lpBuffer) return mp->cursize; desired = mp->realMRU[nItemPos]; desired -= 'a'; TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c Wed Dec 12 11:52:08 2007 @@ -343,7 +343,7 @@ else { /* menu item was selected */ if (HIWORD(wParam) & MF_POPUP) - uMenuID = (UINT)*(lpwIDs+1); + uMenuID = *(lpwIDs+1); else uMenuID = (UINT)LOWORD(wParam); TRACE("uMenuID = %u\n", uMenuID); Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dpa.c (original) +++ trunk/reactos/dll/win32/comctl32/dpa.c Wed Dec 12 11:52:08 2007 @@ -443,7 +443,7 @@ /* create a new pointer array */ nNewItems = hdpaTemp->nGrow * - ((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1); + (((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1); nSize = nNewItems * sizeof(LPVOID); hdpaTemp->ptrs = HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize); hdpaTemp->nMaxCount = nNewItems; @@ -583,7 +583,7 @@ if (hdpa->nMaxCount <= i) { /* resize the block of memory */ INT nNewItems = - hdpa->nGrow * ((INT)(((i+1) - 1) / hdpa->nGrow) + 1); + hdpa->nGrow * ((((i+1) - 1) / hdpa->nGrow) + 1); INT nSize = nNewItems * sizeof(LPVOID); if (hdpa->ptrs) @@ -654,7 +654,7 @@ return NULL; hdpa->nMaxCount = nNewItems; - hdpa->ptrs = (LPVOID*)lpDest; + hdpa->ptrs = lpDest; } return lpTemp; Modified: trunk/reactos/dll/win32/comctl32/dsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dsa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dsa.c (original) +++ trunk/reactos/dll/win32/comctl32/dsa.c Wed Dec 12 11:52:08 2007 @@ -211,7 +211,7 @@ else { /* resize the block of memory */ nNewItems = - hdsa->nGrow * ((INT)(((nIndex + 1) - 1) / hdsa->nGrow) + 1); + hdsa->nGrow * ((((nIndex + 1) - 1) / hdsa->nGrow) + 1); nSize = hdsa->nItemSize * nNewItems; lpTemp = ReAlloc (hdsa->pData, nSize); Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c (original) +++ trunk/reactos/dll/win32/comctl32/header.c Wed Dec 12 11:52:08 2007 @@ -981,7 +981,7 @@ int height, width; HFONT hFont; - if (wParam < 0 || wParam >= infoPtr->uNumItem) + if (wParam >= infoPtr->uNumItem) return FALSE; if (!infoPtr->bRectsValid) Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Wed Dec 12 11:52:08 2007 @@ -944,7 +944,7 @@ return result; } -static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd) +static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd, BOOL SubItem) { if (lpnmlvcd->clrTextBk == CLR_DEFAULT) lpnmlvcd->clrTextBk = comctl32_color.clrWindow; @@ -952,18 +952,21 @@ lpnmlvcd->clrText = comctl32_color.clrWindowText; /* apprently, for selected items, we have to override the returned values */ - if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) - { - if (infoPtr->bFocus) - { - lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; - lpnmlvcd->clrText = comctl32_color.clrHighlightText; + if (!SubItem) + { + if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) + { + if (infoPtr->bFocus) + { + lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; + lpnmlvcd->clrText = comctl32_color.clrHighlightText; + } + else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) + { + lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; + lpnmlvcd->clrText = comctl32_color.clrBtnText; + } } - else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) - { - lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; - lpnmlvcd->clrText = comctl32_color.clrBtnText; - } } /* Set the text attributes */ @@ -3787,7 +3790,9 @@ if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; } if (nSubItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) - prepaint_setup(infoPtr, hdc, &nmlvcd); + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); + else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE) + prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); /* in full row select, subitems, will just use main item's colors */ if (nSubItem && uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) @@ -3930,7 +3935,7 @@ if (!(cditemmode & CDRF_SKIPDEFAULT)) { - prepaint_setup (infoPtr, hdc, &nmlvcd); + prepaint_setup (infoPtr, hdc, &nmlvcd, FALSE); SendMessageW(infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } @@ -4118,7 +4123,7 @@ customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); if (cdmode & CDRF_SKIPDEFAULT) goto enddraw; - prepaint_setup(infoPtr, hdc, &nmlvcd); + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); /* Use these colors to draw the items */ infoPtr->clrTextBk = nmlvcd.clrTextBk; @@ -5040,12 +5045,12 @@ BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL); LVFINDINFOW fiw; INT res; - LPWSTR strW; + LPWSTR strW = NULL; memcpy(&fiw, lpFindInfo, sizeof(fiw)); if (hasText) fiw.psz = strW = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE); res = LISTVIEW_FindItemW(infoPtr, nStart, &fiw); - if (hasText) textfreeT(strW, FALSE); + textfreeT(strW, FALSE); return res; } Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c Wed Dec 12 11:52:08 2007 @@ -1725,6 +1725,8 @@ if (infoPtr->hwndNotify != hFocusWnd) ShowWindow(infoPtr->hwndSelf, SW_HIDE); + else + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } @@ -2032,7 +2034,7 @@ return DLGC_WANTARROWS | DLGC_WANTCHARS; case WM_KILLFOCUS: - return MONTHCAL_KillFocus(infoPtr, wParam); + return MONTHCAL_KillFocus(infoPtr, (HWND)wParam); case WM_RBUTTONDOWN: return MONTHCAL_RButtonDown(infoPtr, lParam); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Wed Dec 12 11:52:08 2007 @@ -1527,7 +1527,7 @@ if ((psInfo->ppshheader.dwFlags & PSH_WATERMARK) && !(psInfo->ppshheader.dwFlags & PSH_USEHBMWATERMARK)) { - ((PropSheetInfo *)psInfo)->ppshheader.u4.hbmWatermark = + psInfo->ppshheader.u4.hbmWatermark = CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u4.pszbmWatermark, 0, NULL, 0); } @@ -1535,7 +1535,7 @@ if ((psInfo->ppshheader.dwFlags & PSH_HEADER) && !(psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER)) { - ((PropSheetInfo *)psInfo)->ppshheader.u5.hbmHeader = + psInfo->ppshheader.u5.hbmHeader = CreateMappedBitmap(psInfo->ppshheader.hInstance, (INT_PTR)psInfo->ppshheader.u5.pszbmHeader, 0, NULL, 0); } } @@ -2081,7 +2081,7 @@ index = PROPSHEET_FindPageByResId(psInfo, result); if(index >= psInfo->nPages) { index = old_index; - WARN("Tried to skip to nonexistant page by res id\n"); + WARN("Tried to skip to nonexistent page by res id\n"); break; } continue; Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c Wed Dec 12 11:52:08 2007 @@ -2797,7 +2797,7 @@ static LRESULT REBAR_PushChevron(const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - if (wParam >= 0 && (UINT)wParam < infoPtr->uNumBands) + if ((UINT)wParam < infoPtr->uNumBands) { NMREBARCHEVRON nmrbc; REBAR_BAND *lpBand = &infoPtr->bands[wParam]; Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c Wed Dec 12 11:52:08 2007 @@ -3190,7 +3190,7 @@ (LPWSTR)RT_DIALOG))) return FALSE; - if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes))) + if(!(template = LoadResource (COMCTL32_hModule, hRes))) return FALSE; ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), @@ -5893,7 +5893,7 @@ infoPtr->nButtonDown = -1; /* Issue NM_RELEASEDCAPTURE to parent to let him know it is released */ - TOOLBAR_SendNotify ((NMHDR *) &hdr, infoPtr, + TOOLBAR_SendNotify (&hdr, infoPtr, NM_RELEASEDCAPTURE); /* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c Wed Dec 12 11:52:08 2007 @@ -1109,7 +1109,7 @@ if (IS_INTRESOURCE(lpToolInfo->lpszText)) { TRACE("add string id %x\n", LOWORD(lpToolInfo->lpszText)); - toolPtr->lpszText = (LPWSTR)lpToolInfo->lpszText; + toolPtr->lpszText = lpToolInfo->lpszText; } else if (lpToolInfo->lpszText) { if (lpToolInfo->lpszText == LPSTR_TEXTCALLBACKW) { Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Wed Dec 12 11:52:08 2007 @@ -811,7 +811,7 @@ ClientToScreen(infoPtr->hwndSelf, &pt); SendMessageW (infoPtr->hwndToolTip, TTM_TRACKPOSITION, - 0, (LPARAM)MAKELPARAM(pt.x, pt.y)); + 0, MAKELPARAM(pt.x, pt.y)); } Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Wed Dec 12 11:52:08 2007 @@ -3994,7 +3994,7 @@ if(ht.hItem && (ht.flags & TVHT_ONITEM)) { infoPtr->focusedItem = ht.hItem; - InvalidateRect(hwnd, &(((HTREEITEM)(ht.hItem))->rect), TRUE); + InvalidateRect(hwnd, &ht.hItem->rect, TRUE); if(infoPtr->selectedItem) InvalidateRect(hwnd, &(infoPtr->selectedItem->rect), TRUE); @@ -4173,7 +4173,6 @@ SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); } - return 0; }

1 0

[arty] 31177: Add simple hardware.h for ppc.
by arty＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: arty Date: Wed Dec 12 10:43:07 2007 New Revision: 31177 URL: http://svn.reactos.org/svn/reactos?rev=31177&view=rev Log: Add simple hardware.h for ppc. Added: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/ trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h (with props) Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Added: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h Wed Dec 12 10:43:07 2007 @@ -1,0 +1,94 @@ +/* + * FreeLoader + * + * Copyright (C) 2003 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __POWERPC_HARDWARE_H_ +#define __POWERPC_HARDWARE_H_ + +#ifndef __REGISTRY_H +#include "../../reactos/registry.h" +#endif + +#define CONFIG_CMD(bus, dev_fn, where) \ + (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) + +// +// Static heap for ARC Hardware Component Tree +// 16KB oughta be enough for anyone. +// +#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 + +// +// ARC Component Configuration Routines +// +VOID +NTAPI +FldrSetComponentInformation( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN IDENTIFIER_FLAG Flags, + IN ULONG Key, + IN ULONG Affinity +); + +VOID +NTAPI +FldrSetIdentifier( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN PWCHAR Identifier +); + +VOID +NTAPI +FldrCreateSystemKey( + OUT PCONFIGURATION_COMPONENT_DATA *SystemKey +); + +VOID +NTAPI +FldrCreateComponentKey( + IN PCONFIGURATION_COMPONENT_DATA SystemKey, + IN PWCHAR BusName, + IN ULONG BusNumber, + IN CONFIGURATION_CLASS Class, + IN CONFIGURATION_TYPE Type, + OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey +); + +VOID +NTAPI +FldrSetConfigurationData( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN PVOID ConfigurationData, + IN ULONG Size +); + + +/* PROTOTYPES ***************************************************************/ + +/* hardware.c */ + +VOID StallExecutionProcessor(ULONG Microseconds); + +VOID HalpCalibrateStallExecution(VOID); + +ULONGLONG RDTSC(VOID); + +#endif /* __POWERPC_HARDWARE_H_ */ + +/* EOF */ Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Wed Dec 12 10:43:07 2007 @@ -69,6 +69,8 @@ #include <arch/i386/machxbox.h> #include <internal/i386/intrin_i.h> #include <internal/i386/ke.h> +#elif _PPC_ +#include <arch/powerpc/hardware.h> #elif _MIPS_ #include <arch/mips/arcbios.h> #endif

1 0

[weiden] 31176: Add support for trustees with objects (building object ACEs is not yet implemented)
by weiden＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: weiden Date: Wed Dec 12 10:04:12 2007 New Revision: 31176 URL: http://svn.reactos.org/svn/reactos?rev=31176&view=rev Log: Add support for trustees with objects (building object ACEs is not yet implemented) Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Wed Dec 12 10:04:12 2007 @@ -186,6 +186,74 @@ return Ret; } +static DWORD +AccpGetTrusteeObjects(IN PTRUSTEE_W Trustee, + OUT GUID *pObjectTypeGuid OPTIONAL, + OUT GUID *pInheritedObjectTypeGuid OPTIONAL) +{ + DWORD Ret; + + switch (Trustee->TrusteeForm) + { + case TRUSTEE_IS_OBJECTS_AND_NAME: + { + POBJECTS_AND_NAME_W pOan = (POBJECTS_AND_NAME_W)Trustee->ptstrName; + + /* pOan->ObjectsPresent should always be 0 here because a previous + call to AccpGetTrusteeSid should have rejected these trustees + already. */ + ASSERT(pOan->ObjectsPresent == 0); + + Ret = pOan->ObjectsPresent; + break; + } + + case TRUSTEE_IS_OBJECTS_AND_SID: + { + POBJECTS_AND_SID pOas = (POBJECTS_AND_SID)Trustee->ptstrName; + + if (pObjectTypeGuid != NULL && pOas->ObjectsPresent & ACE_OBJECT_TYPE_PRESENT) + *pObjectTypeGuid = pOas->ObjectTypeGuid; + + if (pInheritedObjectTypeGuid != NULL && pOas->ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) + *pObjectTypeGuid = pOas->InheritedObjectTypeGuid; + + Ret = pOas->ObjectsPresent; + break; + } + + default: + /* Any other trustee forms have no objects attached... */ + Ret = 0; + break; + } + + return Ret; +} + +static DWORD +AccpCalcNeededAceSize(IN PSID Sid, + IN DWORD ObjectsPresent) +{ + DWORD Ret; + + Ret = sizeof(ACE) + GetLengthSid(Sid); + + /* This routine calculates the generic size of the ACE needed. + If no objects are present it is assumed that only a standard + ACE is to be created. */ + + if (ObjectsPresent & ACE_OBJECT_TYPE_PRESENT) + Ret += sizeof(GUID); + if (ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) + Ret += sizeof(GUID); + + if (ObjectsPresent != 0) + Ret += sizeof(DWORD); /* Include the Flags member to make it an object ACE */ + + return Ret; +} + static GUID* AccpGetObjectAceObjectType(IN PACE_HEADER AceHeader) { @@ -411,14 +479,23 @@ if (Trustee->pMultipleTrustee || Trustee->MultipleTrusteeOperation != NO_MULTIPLE_TRUSTEE) { - DPRINT1("Trustee form not supported\n"); + /* This is currently not supported */ return ERROR_INVALID_PARAMETER; } switch (Trustee->TrusteeForm) { + case TRUSTEE_IS_OBJECTS_AND_NAME: + if (((POBJECTS_AND_NAME_W)Trustee->ptstrName)->ObjectsPresent != 0) + { + /* This is not supported as there is no way to interpret the + strings provided, and we need GUIDs for the ACEs... */ + Ret = ERROR_INVALID_PARAMETER; + break; + } + /* fall through */ + case TRUSTEE_IS_NAME: - case TRUSTEE_IS_OBJECTS_AND_NAME: if (*pPolicyHandle == NULL) { Ret = AccpOpenLSAPolicyHandle(NULL, /* FIXME - always local? */ @@ -449,7 +526,6 @@ break; default: - DPRINT1("Wrong Trustee form\n"); Ret = ERROR_INVALID_PARAMETER; break; } @@ -1154,7 +1230,10 @@ PACL pNew = NULL; ACL_SIZE_INFORMATION SizeInformation; PACE_HEADER pAce; + BOOLEAN KeepAceBuf[8]; BOOLEAN *pKeepAce = NULL; + GUID ObjectTypeGuid, InheritedObjectTypeGuid; + DWORD ObjectsPresent; BOOL needToClean; PSID pSid1, pSid2; ULONG i; @@ -1177,12 +1256,17 @@ goto Cleanup; } - pKeepAce = (BOOLEAN *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount * sizeof(*pKeepAce)); - if (!pKeepAce) - { - Ret = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } + if (SizeInformation.AceCount > sizeof(KeepAceBuf) / sizeof(KeepAceBuf[0])) + { + pKeepAce = (BOOLEAN *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount * sizeof(*pKeepAce)); + if (!pKeepAce) + { + Ret = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + } + else + pKeepAce = KeepAceBuf; memset(pKeepAce, TRUE, SizeInformation.AceCount * sizeof(*pKeepAce)); } @@ -1201,6 +1285,10 @@ &needToClean); if (Ret != ERROR_SUCCESS) goto Cleanup; + + ObjectsPresent = AccpGetTrusteeObjects(&pListOfExplicitEntries[i].Trustee, + NULL, + NULL); switch (pListOfExplicitEntries[i].grfAccessMode) { @@ -1228,12 +1316,9 @@ break; /* ...and replace by the current access */ case GRANT_ACCESS: - /* Add to ACL */ - SizeInformation.AclBytesInUse += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(pSid1); - break; case DENY_ACCESS: /* Add to ACL */ - SizeInformation.AclBytesInUse += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + RtlLengthSid(pSid1); + SizeInformation.AclBytesInUse += AccpCalcNeededAceSize(pSid1, ObjectsPresent); break; case SET_AUDIT_SUCCESS: case SET_AUDIT_FAILURE: @@ -1283,7 +1368,23 @@ if (Ret != ERROR_SUCCESS) goto Cleanup; - bRet = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + ObjectsPresent = AccpGetTrusteeObjects(&pListOfExplicitEntries[i].Trustee, + &ObjectTypeGuid, + &InheritedObjectTypeGuid); + + if (ObjectsPresent == 0) + { + /* FIXME: Call AddAccessDeniedAceEx instead! */ + bRet = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + } + else + { + /* FIXME: Call AddAccessDeniedObjectAce */ + DPRINT1("Object ACEs not yet supported!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + bRet = FALSE; + } + if (needToClean) LocalFree((HLOCAL)pSid1); if (!bRet) { @@ -1310,7 +1411,23 @@ if (Ret != ERROR_SUCCESS) goto Cleanup; - bRet = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + ObjectsPresent = AccpGetTrusteeObjects(&pListOfExplicitEntries[i].Trustee, + &ObjectTypeGuid, + &InheritedObjectTypeGuid); + + if (ObjectsPresent == 0) + { + /* FIXME: Call AddAccessAllowedAceEx instead! */ + bRet = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + } + else + { + /* FIXME: Call AddAccessAllowedObjectAce */ + DPRINT1("Object ACEs not yet supported!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + bRet = FALSE; + } + if (needToClean) LocalFree((HLOCAL)pSid1); if (!bRet) { @@ -1326,7 +1443,7 @@ *NewAcl = pNew; Cleanup: - if (pKeepAce) + if (pKeepAce && pKeepAce != KeepAceBuf) LocalFree((HLOCAL)pKeepAce); if (pNew && Ret != ERROR_SUCCESS)

1 0

[jimtabor] 31175: Temporarily implement GWL_HWNDPARENT in user mode.
by jimtabor＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: jimtabor Date: Wed Dec 12 09:12:02 2007 New Revision: 31175 URL: http://svn.reactos.org/svn/reactos?rev=31175&view=rev Log: Temporarily implement GWL_HWNDPARENT in user mode. Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Wed Dec 12 09:12:02 2007 @@ -529,6 +529,11 @@ case GWL_HWNDPARENT: DbgPrint("GWL_HWNDPARENT\n"); /* FIXME: Implement in user32 */ + { + HWND parent = GetAncestor( hWnd, GA_PARENT ); + if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); + return (LONG)parent; + } case GWL_WNDPROC: /* Call win32k for this as a callproc handle may need to be created */ @@ -583,6 +588,11 @@ case GWL_HWNDPARENT: DbgPrint("GWL_HWNDPARENT\n"); /* FIXME: Implement in user32 */ + { + HWND parent = GetAncestor( hWnd, GA_PARENT ); + if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); + return (LONG)parent; + } case GWL_WNDPROC: /* Call win32k for this as a callproc handle may need to be created */

1 0

[jimtabor] 31174: A partial implementation of NtGdiCreate/DeleteClientObj.
by jimtabor＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: jimtabor Date: Wed Dec 12 05:29:21 2007 New Revision: 31174 URL: http://svn.reactos.org/svn/reactos?rev=31174&view=rev Log: A partial implementation of NtGdiCreate/DeleteClientObj. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Wed Dec 12 05:29:21 2007 @@ -1509,8 +1509,13 @@ IN ULONG ulType ) { - UNIMPLEMENTED; - return 0; +// INT Index; +// PGDI_TABLE_ENTRY Entry; + HANDLE handle = GDIOBJ_AllocObj(GdiHandleTable, GDI_OBJECT_TAG_CLIOBJ); +// Need to change handle type based on ulType. +// Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)handle); +// Entry = &GdiHandleTable->Entries[Index]; + return handle; } W32KAPI @@ -1520,8 +1525,7 @@ IN HANDLE h ) { - UNIMPLEMENTED; - return 0; + return GDIOBJ_FreeObj(GdiHandleTable, h, GDI_OBJECT_TAG_CLIOBJ); } /* EOF */

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