Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 18718: implement MakeAbsoluteSD2 by forwarding to RtlSelfRelativeToAbsoluteSD2
by weiden＠svn.reactos.com 23 Oct '05

23 Oct '05

implement MakeAbsoluteSD2 by forwarding to RtlSelfRelativeToAbsoluteSD2 Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/sec/sec.c Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/rtl/sd.c _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-10-23 18:03:08 UTC (rev 18717) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-10-23 18:23:57 UTC (rev 18718) @@ -542,6 +542,14 @@ NTSYSAPI NTSTATUS NTAPI +RtlSelfRelativeToAbsoluteSD2( + IN OUT PSECURITY_DESCRIPTOR SelfRelativeSD, + OUT PULONG BufferSize +); + +NTSYSAPI +NTSTATUS +NTAPI RtlSetControlSecurityDescriptor( IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-10-23 18:03:08 UTC (rev 18717) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-10-23 18:23:57 UTC (rev 18718) @@ -413,7 +413,7 @@ ;MSChapSrvChangePassword ;MSChapSrvChangePassword2 MakeAbsoluteSD@44 -;MakeAbsoluteSD2 +MakeAbsoluteSD2@8 MakeSelfRelativeSD@12 MapGenericMask(a)8=NTDLL.RtlMapGenericMask NotifyBootConfigStatus@4 _____ Modified: trunk/reactos/lib/advapi32/sec/sec.c --- trunk/reactos/lib/advapi32/sec/sec.c 2005-10-23 18:03:08 UTC (rev 18717) +++ trunk/reactos/lib/advapi32/sec/sec.c 2005-10-23 18:23:57 UTC (rev 18718) @@ -273,6 +273,28 @@ */ BOOL STDCALL +MakeAbsoluteSD2(IN OUT PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor, + OUT LPDWORD lpdwBufferSize) +{ + NTSTATUS Status; + + Status = RtlSelfRelativeToAbsoluteSD2(pSelfRelativeSecurityDescriptor, + lpdwBufferSize); + if (!NT_SUCCESS(Status)) + { + SetLastError (RtlNtStatusToDosError (Status)); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +STDCALL MakeSelfRelativeSD ( PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor, PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor, _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-10-23 18:03:08 UTC (rev 18717) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-10-23 18:23:57 UTC (rev 18718) @@ -606,6 +606,7 @@ RtlRunEncodeUnicodeString@8 RtlSecondsSince1970ToTime@8 RtlSecondsSince1980ToTime@8 +RtlSelfRelativeToAbsoluteSD2@8 RtlSelfRelativeToAbsoluteSD@44 RtlSetAllBits@4 RtlSetAttributesSecurityDescriptor@12 _____ Modified: trunk/reactos/lib/rtl/sd.c --- trunk/reactos/lib/rtl/sd.c 2005-10-23 18:03:08 UTC (rev 18717) +++ trunk/reactos/lib/rtl/sd.c 2005-10-23 18:23:57 UTC (rev 18718) @@ -729,7 +729,7 @@ * @unimplemented */ NTSTATUS NTAPI -RtlSelfRelativeToAbsoluteSD2(PISECURITY_DESCRIPTOR_RELATIVE SelfRelativeSecurityDescriptor, +RtlSelfRelativeToAbsoluteSD2(PISECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, PULONG BufferSize) { UNIMPLEMENTED;

1 0

[greatlrd] 18717: change the marco return code to DDERR_UNSUPPORTED
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

change the marco return code to DDERR_UNSUPPORTED Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 17:53:19 UTC (rev 18716) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 18:03:08 UTC (rev 18717) @@ -81,6 +81,6 @@ /*********** Macros ***********/ -#define DX_STUB return DD_OK; +#define DX_STUB return DDERR_UNSUPPORTED; #endif /* __DDRAW_PRIVATE */

1 0

[mbosma] 18716: Add a macro for the stubs.
by mbosma＠svn.reactos.com 23 Oct '05

23 Oct '05

Add a macro for the stubs. Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/main/surface.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 16:46:36 UTC (rev 18715) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 17:53:19 UTC (rev 18716) @@ -177,137 +177,137 @@ HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,REFIID refiid,LPVOID *obj) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, LPPALETTEENTRY palent,LPDIRECTDRAWPALETTE* ppPalette,LPUNKNOWN pUnknown) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, LPDDENUMSURFACESCALLBACK7 callback) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) { - return DDERR_UNSUPPORTED; + DX_STUB; } IDirectDraw7Vtbl DirectDraw_VTable = _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 16:46:36 UTC (rev 18715) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 17:53:19 UTC (rev 18716) @@ -13,6 +13,7 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD) { + DX_STUB; IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; if (This->owner) @@ -93,24 +94,6 @@ return DD_OK; } -HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, - LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) -{ - return DD_OK; -} - -HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, - LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event) -{ - return DD_OK; -} - -HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) -{ - return DD_OK; -} - - ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) { IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; @@ -130,18 +113,35 @@ /**** Stubs ****/ +HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, + LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, + LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) +{ + DX_STUB; +} + HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, LPVOID* ppObj) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach) { - return DDERR_UNSUPPORTED; + DX_STUB; } /* MSDN: "not currently implemented." */ @@ -149,7 +149,7 @@ Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI @@ -157,13 +157,13 @@ DWORD dsty, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD trans) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface) { - return DDERR_UNSUPPORTED; + DX_STUB; } /* MSDN: "not currently implemented." */ @@ -172,13 +172,13 @@ LPDDBLTBATCH pBatch, DWORD dwCount, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI @@ -186,7 +186,7 @@ DWORD dwFlags, LPDIRECTDRAWSURFACE7 pAttach) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI @@ -194,7 +194,7 @@ LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI @@ -202,20 +202,20 @@ DWORD dwFlags, LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI @@ -223,83 +223,83 @@ LPDDSCAPS2 pCaps, LPDIRECTDRAWSURFACE7* ppSurface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWCLIPPER* ppClipper) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface, LPLONG pX, LPLONG pY) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWPALETTE* ppPalette) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7 iface, LPDDPIXELFORMAT pDDPixelFormat) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwPriority) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI @@ -307,96 +307,94 @@ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, LPDWORD pValue) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWCLIPPER pDDClipper) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_SetLOD (LPDIRECTDRAWSURFACE7 iface, DWORD dwMaxLOD) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7 iface, LONG X, LONG Y) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWPALETTE pPalette) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface, DWORD dwPriority) { - return DDERR_UNSUPPORTED; + DX_STUB; } -/* Be careful when locking this: it is risky to call the object's AddRef - * or Release holding a lock. */ HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface, REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI @@ -406,7 +404,7 @@ LPRECT pDstRect, DWORD dwFlags, LPDDOVERLAYFX pFX) { - return DDERR_UNSUPPORTED; + DX_STUB; } /* MSDN: "not currently implemented." */ @@ -414,13 +412,13 @@ Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { - return DDERR_UNSUPPORTED; + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef) { - return DDERR_NOTAOVERLAYSURFACE; + DX_STUB; } IDirectDrawSurface7Vtbl DDrawSurface_VTable = _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 16:46:36 UTC (rev 18715) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 17:53:19 UTC (rev 18716) @@ -14,7 +14,6 @@ - /******** Main Object ********/ typedef struct @@ -32,7 +31,6 @@ } IDirectDrawImpl; - /******** Surface Object ********/ typedef struct @@ -44,7 +42,6 @@ } IDirectDrawSurfaceImpl; - /******** Clipper Object ********/ typedef struct @@ -56,7 +53,6 @@ } IDirectDrawClipperImpl; - /******** Palette Object ********/ typedef struct @@ -66,15 +62,13 @@ IDirectDrawImpl* owner; -} IDirect3DDeviceImpl; +} IDirectDrawPaletteImpl; - /*********** VTables ************/ extern IDirectDraw7Vtbl DirectDraw_VTable; extern IDirectDrawSurface7Vtbl DDrawSurface_VTable; - /********* Prototypes **********/ HRESULT Hal_DirectDraw_Initialize (LPDIRECTDRAW7 iface); @@ -85,4 +79,8 @@ HRESULT Hel_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface); VOID Hel_DirectDraw_Release (LPDIRECTDRAW7 iface); +/*********** Macros ***********/ + +#define DX_STUB return DD_OK; + #endif /* __DDRAW_PRIVATE */

1 0

[greatlrd] 18715: fix the thrunk so it compiles again after me
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

fix the thrunk so it compiles again after me Modified: trunk/reactos/w32api/include/ddk/ddrawint.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 15:27:27 UTC (rev 18714) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 16:46:36 UTC (rev 18715) @@ -9,15 +9,15 @@ #ifndef _NO_COM #define _NO_COM #include <ddraw.h> -#include <dvp.h> +#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ #undef _NO_COM #else #include <ddraw.h> -#include <dvp.h> +#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ #endif #else #include <ddraw.h> -#include <dvp.h> +#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ #endif #ifdef __cplusplus

1 0

[greatlrd] 18714: fix the ddrawint.h no typo remove one extra member in some struct, adding define, new struct
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

fix the ddrawint.h no typo remove one extra member in some struct, adding define, new struct Modified: trunk/reactos/w32api/include/ddk/ddrawint.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 15:24:56 UTC (rev 18713) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 15:27:27 UTC (rev 18714) @@ -9,15 +9,15 @@ #ifndef _NO_COM #define _NO_COM #include <ddraw.h> -#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ +#include <dvp.h> #undef _NO_COM #else #include <ddraw.h> -#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ +#include <dvp.h> #endif #else #include <ddraw.h> -#include <ddk/ddrawi.h> /* FIXME: We shouldn't include this header. */ +#include <dvp.h> #endif #ifdef __cplusplus @@ -54,12 +54,19 @@ typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; +/********************************************************************** **/ +/* _DD_GETHEAPALIGNMENTDATA is defined in dmemmgr.h */ + /*********************************************************************** */ +struct _DD_GETHEAPALIGNMENTDATA; +typedef struct _DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA; - /*********************************************************************** */ /* Video memory info structures */ /*********************************************************************** */ + +typedef ULONG_PTR FLATPTR; + typedef struct _VIDEOMEMORY { DWORD dwFlags; @@ -921,7 +928,7 @@ #define DDRAWI_GETCOLOR 0x0001 #define DDRAWI_SETCOLOR 0x0002 -typedef struct +typedef struct _DD_COLORCONTROLDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -932,9 +939,9 @@ } DD_COLORCONTROLDATA, *PDD_COLORCONTROLDATA; typedef DWORD (STDCALL *PDD_COLORCB_COLORCONTROL)(PDD_COLORCONTROLDATA); -DEFINE_GUID(GUID_ColorControlCallbacks, 0xEFD60CC2, 0x49E7, 0x11D0, 0x88, 0x9D, 0x00, 0xAA, 0x00, 0xBB, 0xB7, 0x6A); -typedef struct + +typedef struct _DD_COLORCONTROLCALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -947,7 +954,7 @@ /* IDirectDrawVideo callbacks */ /*********************************************************************** */ -typedef struct +typedef struct _DD_GETMOCOMPGUIDSDATA { PDD_DIRECTDRAW_LOCAL lpDD; DWORD dwNumGuids; @@ -956,7 +963,7 @@ } DD_GETMOCOMPGUIDSDATA, *PDD_GETMOCOMPGUIDSDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_GETGUIDS)(PDD_GETMOCOMPGUIDSDATA); -typedef struct +typedef struct _DD_GETMOCOMPFORMATSDATA { PDD_DIRECTDRAW_LOCAL lpDD; GUID *lpGuid; @@ -966,7 +973,7 @@ } DD_GETMOCOMPFORMATSDATA, *PDD_GETMOCOMPFORMATSDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_GETFORMATS)(PDD_GETMOCOMPFORMATSDATA); -typedef struct +typedef struct _DD_CREATEMOCOMPDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_MOTIONCOMP_LOCAL lpMoComp; @@ -980,7 +987,7 @@ } DD_CREATEMOCOMPDATA, *PDD_CREATEMOCOMPDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_CREATE)(PDD_CREATEMOCOMPDATA); -typedef struct +typedef struct _DDCOMPBUFFERINFO { DWORD dwSize; DWORD dwNumCompBuffers; @@ -989,9 +996,9 @@ DWORD dwBytesToAllocate; DDSCAPS2 ddCompCaps; DDPIXELFORMAT ddPixelFormat; -} DDCOMPBUFFERINFO, *PDDCOMPBUFFERINFO; +} DDCOMPBUFFERINFO, *LPDDCOMPBUFFERINFO; -typedef struct +typedef struct _DD_GETMOCOMPCOMPBUFFDATA { PDD_DIRECTDRAW_LOCAL lpDD; GUID *lpGuid; @@ -999,12 +1006,12 @@ DWORD dwHeight; DDPIXELFORMAT ddPixelFormat; DWORD dwNumTypesCompBuffs; - PDDCOMPBUFFERINFO lpCompBuffInfo; + LPDDCOMPBUFFERINFO lpCompBuffInfo; HRESULT ddRVal; } DD_GETMOCOMPCOMPBUFFDATA, *PDD_GETMOCOMPCOMPBUFFDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_GETCOMPBUFFINFO)(PDD_GETMOCOMPCOMPBUFFDATA); -typedef struct +typedef struct _DD_GETINTERNALMOCOMPDATA { PDD_DIRECTDRAW_LOCAL lpDD; GUID *lpGuid; @@ -1016,7 +1023,7 @@ } DD_GETINTERNALMOCOMPDATA, *PDD_GETINTERNALMOCOMPDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_GETINTERNALINFO)(PDD_GETINTERNALMOCOMPDATA); -typedef struct +typedef struct _DD_BEGINMOCOMPFRAMEDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_MOTIONCOMP_LOCAL lpMoComp; @@ -1029,7 +1036,7 @@ } DD_BEGINMOCOMPFRAMEDATA, *PDD_BEGINMOCOMPFRAMEDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_BEGINFRAME)(PDD_BEGINMOCOMPFRAMEDATA); -typedef struct +typedef struct _DD_ENDMOCOMPFRAMEDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_MOTIONCOMP_LOCAL lpMoComp; @@ -1039,21 +1046,21 @@ } DD_ENDMOCOMPFRAMEDATA, *PDD_ENDMOCOMPFRAMEDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_ENDFRAME)(PDD_ENDMOCOMPFRAMEDATA); -typedef struct +typedef struct _DDMOCOMPBUFFERINFO { DWORD dwSize; PDD_SURFACE_LOCAL lpCompSurface; DWORD dwDataOffset; DWORD dwDataSize; LPVOID lpPrivate; -} DDMOCOMPBUFFERINFO, *PDDMOCOMPBUFFERINFO; +} DDMOCOMPBUFFERINFO, *LPDDMOCOMPBUFFERINFO; -typedef struct +typedef struct _DD_RENDERMOCOMPDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_MOTIONCOMP_LOCAL lpMoComp; DWORD dwNumBuffers; - PDDMOCOMPBUFFERINFO lpBufferInfo; + LPDDMOCOMPBUFFERINFO lpBufferInfo; DWORD dwFunction; LPVOID lpInputData; DWORD dwInputDataSize; @@ -1065,7 +1072,7 @@ #define DDMCQUERY_READ 0x00000001 -typedef struct +typedef struct _DD_QUERYMOCOMPSTATUSDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_MOTIONCOMP_LOCAL lpMoComp; @@ -1075,7 +1082,7 @@ } DD_QUERYMOCOMPSTATUSDATA, *PDD_QUERYMOCOMPSTATUSDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_QUERYSTATUS)(PDD_QUERYMOCOMPSTATUSDATA); -typedef struct +typedef struct _DD_DESTROYMOCOMPDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_MOTIONCOMP_LOCAL lpMoComp; @@ -1083,9 +1090,9 @@ } DD_DESTROYMOCOMPDATA, *PDD_DESTROYMOCOMPDATA; typedef DWORD (STDCALL *PDD_MOCOMPCB_DESTROY)(PDD_DESTROYMOCOMPDATA); -DEFINE_GUID(GUID_MotionCompCallbacks, 0xB1122B40, 0x5DA5, 0x11D1, 0x8F, 0xCF, 0x00, 0xC0, 0x4F, 0xC2, 0x9B, 0x4E); -typedef struct + +typedef struct DD_MOTIONCOMPCALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -1099,8 +1106,7 @@ PDD_MOCOMPCB_RENDER RenderMoComp; PDD_MOCOMPCB_QUERYSTATUS QueryMoCompStatus; PDD_MOCOMPCB_DESTROY DestroyMoComp; -} DD_MOTIONCOMPCALLBACKS; -typedef DD_MOTIONCOMPCALLBACKS *PDD_MOTIONCOMPCALLBACKS; +} DD_MOTIONCOMPCALLBACKS, *PDD_MOTIONCOMPCALLBACKS; #define DDHAL_MOCOMP32_GETGUIDS 0x00000001 #define DDHAL_MOCOMP32_GETFORMATS 0x00000002 @@ -1117,7 +1123,7 @@ /* D3D buffer callbacks */ /*********************************************************************** */ -typedef struct +typedef struct _DD_D3DBUFCALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -1132,7 +1138,7 @@ /* DdGetDriverInfo callback */ /*********************************************************************** */ -typedef struct +typedef struct _DD_GETDRIVERINFODATA { // Input: PVOID dhpdev; @@ -1143,8 +1149,7 @@ PVOID lpvData; // Output: DWORD dwActualSize; - HRESULT ddRVal; - ULONG_PTR dwContext; + HRESULT ddRVal; } DD_GETDRIVERINFODATA, *PDD_GETDRIVERINFODATA; typedef DWORD (STDCALL *PDD_GETDRIVERINFO)(PDD_GETDRIVERINFODATA); @@ -1155,7 +1160,7 @@ /* Driver info structures */ /*********************************************************************** */ -typedef struct +typedef struct _DDNTCORECAPS { DWORD dwSize; DWORD dwCaps; @@ -1210,8 +1215,18 @@ DWORD dwSVBCaps2; } DDNTCORECAPS, *PDDNTCORECAPS; -typedef struct + +typedef struct _DD_HALINFO_V4 { + DWORD dwSize; + VIDEOMEMORYINFO vmiData; + DDNTCORECAPS ddCaps; + PDD_GETDRIVERINFO GetDriverInfo; + DWORD dwFlags; +} DD_HALINFO_V4, *PDD_HALINFO_V4; + +typedef struct _DD_HALINFO +{ DWORD dwSize; VIDEOMEMORYINFO vmiData; DDNTCORECAPS ddCaps; @@ -1223,9 +1238,8 @@ } DD_HALINFO, *PDD_HALINFO; -DEFINE_GUID(GUID_NonLocalVidMemCaps, 0x86C4FA80, 0x8D84, 0x11D0, 0x94, 0xE8, 0x00, 0xC0, 0x4F, 0xC3, 0x41, 0x37); -typedef struct +typedef struct _DD_NONLOCALVIDMEMCAPS { DWORD dwSize; DWORD dwNLVBCaps; @@ -1235,13 +1249,13 @@ DWORD dwNLVBRops[DD_ROP_SPACE]; } DD_NONLOCALVIDMEMCAPS, *PDD_NONLOCALVIDMEMCAPS; -DEFINE_GUID(GUID_DDMoreSurfaceCaps, 0x3B8A0466, 0xF269, 0x11D1, 0x88, 0x0B, 0x00, 0xC0, 0x4F, 0xD9, 0x30, 0xC5); -typedef struct + +typedef struct _DD_MORESURFACECAPS { DWORD dwSize; DDSCAPSEX ddsCapsMore; - struct + struct tagNTExtendedHeapRestrictions { DDSCAPSEX ddsCapsEx; DDSCAPSEX ddsCapsExAlt; @@ -1283,8 +1297,163 @@ typedef DWORD (STDCALL *PDD_KERNELCB_SYNCVIDEOPORT)(PDD_SYNCVIDEOPORTDATA); +typedef struct DD_NTPRIVATEDRIVERCAPS +{ + DWORD dwSize; + DWORD dwPrivateCaps; +} DD_NTPRIVATEDRIVERCAPS; +typedef struct _DD_UPDATENONLOCALHEAPDATA +{ + PDD_DIRECTDRAW_GLOBAL lpDD; + DWORD dwHeap; + FLATPTR fpGARTLin; + FLATPTR fpGARTDev; + ULONG_PTR ulPolicyMaxBytes; + HRESULT ddRVal; + VOID* UpdateNonLocalHeap; +} DD_UPDATENONLOCALHEAPDATA, *PDD_UPDATENONLOCALHEAPDATA; +typedef struct _DD_STEREOMODE +{ + DWORD dwSize; + DWORD dwHeight; + DWORD dwWidth; + DWORD dwBpp; + DWORD dwRefreshRate; + BOOL bSupported; +} DD_STEREOMODE, *PDD_STEREOMODE; + +typedef struct _DD_MORECAPS +{ + DWORD dwSize; + DWORD dwAlphaCaps; + DWORD dwSVBAlphaCaps; + DWORD dwVSBAlphaCaps; + DWORD dwSSBAlphaCaps; + DWORD dwFilterCaps; + DWORD dwSVBFilterCaps; + DWORD dwVSBFilterCaps; + DWORD dwSSBFilterCaps; +} DD_MORECAPS, *PDD_MORECAPS; + +typedef struct _DD_CLIPPER_GLOBAL +{ + ULONG_PTR dwReserved1; +} DD_CLIPPER_GLOBAL; + +typedef struct _DD_CLIPPER_LOCAL +{ + ULONG_PTR dwReserved1; +} DD_CLIPPER_LOCAL; + +typedef struct _DD_PALETTE_LOCAL +{ + ULONG dwReserved0; + ULONG_PTR dwReserved1; +} DD_PALETTE_LOCAL; + + +typedef struct DD_KERNELCALLBACKS +{ + DWORD dwSize; + DWORD dwFlags; + PDD_KERNELCB_SYNCSURFACE SyncSurfaceData; + PDD_KERNELCB_SYNCVIDEOPORT SyncVideoPortData; +} DD_KERNELCALLBACKS, *PDD_KERNELCALLBACKS; +typedef DWORD (STDCALL *PDD_KERNELCB_SYNCVIDEOPORT)(PDD_SYNCVIDEOPORTDATA); + + + +#define MAX_AUTOFLIP_BUFFERS 10 +#define DDSCAPS_EXECUTEBUFFER DDSCAPS_RESERVED2 +#define DDSCAPS_COMMANDBUFFER DDSCAPS_RESERVED3 +#define DDSCAPS_VERTEXBUFFER DDSCAPS_RESERVED4 +#define DDPF_D3DFORMAT 0x00200000l +#define D3DFORMAT_OP_TEXTURE 0x00000001L +#define D3DFORMAT_OP_VOLUMETEXTURE 0x00000002L +#define D3DFORMAT_OP_CUBETEXTURE 0x00000004L +#define D3DFORMAT_OP_OFFSCREEN_RENDERTARGET 0x00000008L +#define D3DFORMAT_OP_SAME_FORMAT_RENDERTARGET 0x00000010L +#define D3DFORMAT_OP_ZSTENCIL 0x00000040L +#define D3DFORMAT_OP_ZSTENCIL_WITH_ARBITRARY_COLOR_DEPTH 0x00000080L +#define D3DFORMAT_OP_SAME_FORMAT_UP_TO_ALPHA_RENDERTARGET 0x00000100L +#define D3DFORMAT_OP_DISPLAYMODE 0x00000400L +#define D3DFORMAT_OP_3DACCELERATION 0x00000800L +#define D3DFORMAT_OP_PIXELSIZE 0x00001000L +#define D3DFORMAT_OP_CONVERT_TO_ARGB 0x00002000L +#define D3DFORMAT_OP_OFFSCREENPLAIN 0x00004000L +#define D3DFORMAT_OP_SRGBREAD 0x00008000L +#define D3DFORMAT_OP_BUMPMAP 0x00010000L +#define D3DFORMAT_OP_DMAP 0x00020000L +#define D3DFORMAT_OP_NOFILTER 0x00040000L +#define D3DFORMAT_MEMBEROFGROUP_ARGB 0x00080000L +#define D3DFORMAT_OP_SRGBWRITE 0x00100000L +#define D3DFORMAT_OP_NOALPHABLEND 0x00200000L +#define D3DFORMAT_OP_AUTOGENMIPMAP 0x00400000L +#define D3DFORMAT_OP_VERTEXTEXTURE 0x00800000L +#define D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP 0x01000000L + +#define DDHAL_PLEASEALLOC_BLOCKSIZE 0x00000002l +#define DDHAL_PLEASEALLOC_USERMEM 0x00000004l + +#define VIDMEM_ISLINEAR 0x00000001l +#define VIDMEM_ISRECTANGULAR 0x00000002l +#define VIDMEM_ISHEAP 0x00000004l +#define VIDMEM_ISNONLOCAL 0x00000008l +#define VIDMEM_ISWC 0x00000010l +#define VIDMEM_HEAPDISABLED 0x00000020l + +#define DDHAL_CREATESURFACEEX_SWAPHANDLES 0x00000001l + +#define DDHAL_KERNEL_SYNCSURFACEDATA 0x00000001l +#define DDHAL_KERNEL_SYNCVIDEOPORTDATA 0x00000002l + +#define DDHAL_DRIVER_NOTHANDLED 0x00000000l +#define DDHAL_DRIVER_HANDLED 0x00000001l +#define DDHAL_DRIVER_NOCKEYHW 0x00000002l + +#define DDRAWISURF_HASCKEYSRCBLT 0x00000800L +#define DDRAWISURF_HASPIXELFORMAT 0x00002000L +#define DDRAWISURF_HASOVERLAYDATA 0x00004000L +#define DDRAWISURF_FRONTBUFFER 0x04000000L +#define DDRAWISURF_BACKBUFFER 0x08000000L +#define DDRAWISURF_INVALID 0x10000000L +#define DDRAWISURF_DRIVERMANAGED 0x40000000L + +#define ROP_HAS_SOURCE 0x00000001l +#define ROP_HAS_PATTERN 0x00000002l +#define ROP_HAS_SOURCEPATTERN ROP_HAS_SOURCE | ROP_HAS_PATTERN + +#define DDHAL_EXEBUFCB32_CANCREATEEXEBUF 0x00000001l +#define DDHAL_EXEBUFCB32_CREATEEXEBUF 0x00000002l +#define DDHAL_EXEBUFCB32_DESTROYEXEBUF 0x00000004l +#define DDHAL_EXEBUFCB32_LOCKEXEBUF 0x00000008l +#define DDHAL_EXEBUFCB32_UNLOCKEXEBUF 0x00000010l + +#define DDHAL_D3DBUFCB32_CANCREATED3DBUF DDHAL_EXEBUFCB32_CANCREATEEXEBUF +#define DDHAL_D3DBUFCB32_CREATED3DBUF DDHAL_EXEBUFCB32_CREATEEXEBUF +#define DDHAL_D3DBUFCB32_DESTROYD3DBUF DDHAL_EXEBUFCB32_DESTROYEXEBUF +#define DDHAL_D3DBUFCB32_LOCKD3DBUF DDHAL_EXEBUFCB32_LOCKEXEBUF +#define DDHAL_D3DBUFCB32_UNLOCKD3DBUF DDHAL_EXEBUFCB32_UNLOCKEXEBUF + +#define DDHALINFO_GETDRIVERINFOSET 0x00000004l +#define DDHALINFO_GETDRIVERINFO2 0x00000008l + +#define DDRAWIVPORT_ON 0x00000001 +#define DDRAWIVPORT_SOFTWARE_AUTOFLIP 0x00000002 +#define DDRAWIVPORT_COLORKEYANDINTERP 0x00000004 + +#define DDHAL_PRIVATECAP_ATOMICSURFACECREATION 0x00000001l +#define DDHAL_PRIVATECAP_NOTIFYPRIMARYCREATION 0x00000002l +#define DDHAL_PRIVATECAP_RESERVED1 0x00000004l + +#define DDRAWI_VPORTSTART 0x0001 +#define DDRAWI_VPORTSTOP 0x0002 +#define DDRAWI_VPORTUPDATE 0x0003 +#define DDRAWI_VPORTGETCOLOR 0x0001 +#define DDRAWI_VPORTSETCOLOR 0x0002 + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

[greatlrd] 18713: commit change to ddraw to use the new headers that will come in next commit
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

commit change to ddraw to use the new headers that will come in next commit Modified: trunk/reactos/lib/ddraw/ddraw.xml Modified: trunk/reactos/lib/ddraw/main/surface.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/ddraw.xml --- trunk/reactos/lib/ddraw/ddraw.xml 2005-10-23 15:06:20 UTC (rev 18712) +++ trunk/reactos/lib/ddraw/ddraw.xml 2005-10-23 15:24:56 UTC (rev 18713) @@ -1,12 +1,13 @@ <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll"> <importlibrary definition="ddraw.def" /> - <include base="ddraw">.</include> - <include base="d3d8thk">.</include> + <include base="ddraw">.</include> <define name="UNICODE" /> <define name="__USE_W32API" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> + + <library>ntdll</library> <library>kernel32</library> <library>gdi32</library> _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 15:06:20 UTC (rev 18712) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 15:24:56 UTC (rev 18713) @@ -28,7 +28,7 @@ /* can the driver create the surface */ DDHAL_CANCREATESURFACEDATA CanCreateData; - memset(&CanCreateData, 0, sizeof(DD_CANCREATESURFACEDATA)); + memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); CanCreateData.lpDD = &This->owner->DirectDrawGlobal; CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; CanCreateData.CanCreateSurface = This->owner->HalInfo.lpDDCallbacks->CanCreateSurface; _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 15:06:20 UTC (rev 18712) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 15:24:56 UTC (rev 18713) @@ -6,14 +6,15 @@ #include <windows.h> #include <stdio.h> #include <ddraw.h> - -#include <ddk/ddrawint.h> -#include <ddk/d3dnthal.h> +#include <ddk/ddrawi.h> #include <ddk/d3dhal.h> #include <ddrawgdi.h> -#include <d3d8thk.h> + + + + /******** Main Object ********/ typedef struct

1 0

[gedmurphy] 18712: - Add the calculator to the start menu
by gedmurphy＠svn.reactos.com 23 Oct '05

23 Oct '05

- Add the calculator to the start menu - Capilalize the app names Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/resource.h Modified: trunk/reactos/lib/syssetup/syssetup_De.rc Modified: trunk/reactos/lib/syssetup/syssetup_En.rc Modified: trunk/reactos/lib/syssetup/syssetup_Fr.rc Modified: trunk/reactos/lib/syssetup/syssetup_Ja.rc Modified: trunk/reactos/lib/syssetup/syssetup_Nl.rc _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-10-23 15:03:21 UTC (rev 18711) +++ trunk/reactos/lib/syssetup/install.c 2005-10-23 15:06:20 UTC (rev 18712) @@ -444,10 +444,11 @@ /* create and fill Accessories subfolder */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) { + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Calculator.lnk"), _T("calc.exe"), IDS_CMT_CALC); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); } @@ -462,7 +463,7 @@ _tcscpy(GamePath, Sys); if((_taccess(_tcscat(GamePath, _T("\\winemine.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, sGames, _T("winemine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); + CreateShortcut(CSIDL_PROGRAMS, sGames, _T("WineMine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); } } _____ Modified: trunk/reactos/lib/syssetup/resource.h --- trunk/reactos/lib/syssetup/resource.h 2005-10-23 15:03:21 UTC (rev 18711) +++ trunk/reactos/lib/syssetup/resource.h 2005-10-23 15:06:20 UTC (rev 18712) @@ -93,8 +93,9 @@ #define IDS_CMT_WINEFILE 3212 #define IDS_CMT_NOTEPAD 3213 #define IDS_CMT_REGEDIT 3214 -#define IDS_CMT_SOLITAIRE 3215 -#define IDS_CMT_WINEMINE 3216 +#define IDS_CMT_CALC 3215 +#define IDS_CMT_SOLITAIRE 3216 +#define IDS_CMT_WINEMINE 3217 #define IDR_GPL 4000 _____ Modified: trunk/reactos/lib/syssetup/syssetup_De.rc --- trunk/reactos/lib/syssetup/syssetup_De.rc 2005-10-23 15:03:21 UTC (rev 18711) +++ trunk/reactos/lib/syssetup/syssetup_De.rc 2005-10-23 15:06:20 UTC (rev 18712) @@ -196,6 +196,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Zubeh÷r" + IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Íffne Kommandozeilenfenster" IDS_CMT_EXPLORER "Starte Explorer" IDS_CMT_WINEFILE "Starte Winefile" _____ Modified: trunk/reactos/lib/syssetup/syssetup_En.rc --- trunk/reactos/lib/syssetup/syssetup_En.rc 2005-10-23 15:03:21 UTC (rev 18711) +++ trunk/reactos/lib/syssetup/syssetup_En.rc 2005-10-23 15:06:20 UTC (rev 18712) @@ -197,6 +197,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" + IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" IDS_CMT_WINEFILE "Launch Winefile" _____ Modified: trunk/reactos/lib/syssetup/syssetup_Fr.rc --- trunk/reactos/lib/syssetup/syssetup_Fr.rc 2005-10-23 15:03:21 UTC (rev 18711) +++ trunk/reactos/lib/syssetup/syssetup_Fr.rc 2005-10-23 15:06:20 UTC (rev 18712) @@ -197,6 +197,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" + IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" IDS_CMT_WINEFILE "Launch Winefile" _____ Modified: trunk/reactos/lib/syssetup/syssetup_Ja.rc --- trunk/reactos/lib/syssetup/syssetup_Ja.rc 2005-10-23 15:03:21 UTC (rev 18711) +++ trunk/reactos/lib/syssetup/syssetup_Ja.rc 2005-10-23 15:06:20 UTC (rev 18712) @@ -197,6 +197,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" + IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" IDS_CMT_WINEFILE "Launch Winefile" _____ Modified: trunk/reactos/lib/syssetup/syssetup_Nl.rc --- trunk/reactos/lib/syssetup/syssetup_Nl.rc 2005-10-23 15:03:21 UTC (rev 18711) +++ trunk/reactos/lib/syssetup/syssetup_Nl.rc 2005-10-23 15:06:20 UTC (rev 18712) @@ -197,6 +197,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" + IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" IDS_CMT_WINEFILE "Launch Winefile"

1 0

[greatlrd] 18711: reverit my last change, filip told me this file is autogenrate I did not check, thx filip
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

reverit my last change, filip told me this file is autogenrate I did not check, thx filip Modified: trunk/reactos/services/eventlog/eventlog.h _____ Modified: trunk/reactos/services/eventlog/eventlog.h --- trunk/reactos/services/eventlog/eventlog.h 2005-10-23 15:00:27 UTC (rev 18710) +++ trunk/reactos/services/eventlog/eventlog.h 2005-10-23 15:03:21 UTC (rev 18711) @@ -14,7 +14,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <debug.h> -//#include "eventlogrpc_s.h" +#include "eventlogrpc_s.h" typedef struct _IO_ERROR_LPC {

1 0

[greatlrd] 18710: commect out line #include "eventlogrpc_s.h" for that file does not exists in ros tree. and that why cis goes crazy.
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

commect out line #include "eventlogrpc_s.h" for that file does not exists in ros tree. and that why cis goes crazy. Modified: trunk/reactos/services/eventlog/eventlog.h _____ Modified: trunk/reactos/services/eventlog/eventlog.h --- trunk/reactos/services/eventlog/eventlog.h 2005-10-23 14:51:35 UTC (rev 18709) +++ trunk/reactos/services/eventlog/eventlog.h 2005-10-23 15:00:27 UTC (rev 18710) @@ -14,7 +14,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <debug.h> -#include "eventlogrpc_s.h" +//#include "eventlogrpc_s.h" typedef struct _IO_ERROR_LPC {

1 0

[chorns] 18709: Have pre-compiled header rule depend on widl generated headers
by chorns＠svn.reactos.com 23 Oct '05

23 Oct '05

Have pre-compiled header rule depend on widl generated headers Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-10-23 14:44:12 UTC (rev 18708) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-10-23 14:51:35 UTC (rev 18709) @@ -1565,10 +1565,15 @@ const string& baseHeaderFilename = module.pch->file.name; const string& pchFilename = GetPrecompiledHeaderFilename (); CLEAN_FILE(pchFilename); + string dependencies = baseHeaderFilename; + /* WIDL generated headers may be used */ + vector<string> rpcDependencies; + GetRpcHeaderDependencies ( rpcDependencies ); + dependencies += " " + v2s ( rpcDependencies, 5 ); fprintf ( fMakefile, "%s: %s\n", pchFilename.c_str(), - baseHeaderFilename.c_str() ); + dependencies.c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile, "\t%s -o %s %s -g %s\n\n",

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