Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 29847: Add documentations for EngDxIoctl, NtGdiDxgGenericThunk optimize for EngDxIoctl, NtGdiDxgGenericThunk implement DxDxgGenericThunk, DxDdIoctl for they are outdated, they are left for compatible issue.
by greatlrd＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: greatlrd Date: Wed Oct 24 12:13:39 2007 New Revision: 29847 URL: http://svn.reactos.org/svn/reactos?rev=29847&view=rev Log: Add documentations for EngDxIoctl, NtGdiDxgGenericThunk optimize for EngDxIoctl, NtGdiDxgGenericThunk implement DxDxgGenericThunk, DxDdIoctl for they are outdated, they are left for compatible issue. Added: branches/reactx/reactos/drivers/directx/dxg/historic.c (with props) Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h branches/reactx/reactos/drivers/directx/dxg/dxg_int.h branches/reactx/reactos/include/reactos/drivers/directx/dxg.h branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild Wed Oct 24 12:13:39 2007 @@ -7,5 +7,6 @@ <define name="__USE_W32API" /> <library>dxgthk</library> <file>main.c</file> + <file>historic.c</file> <file>dxg.rc</file> </module> Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h Wed Oct 24 12:13:39 2007 @@ -3,95 +3,96 @@ DRVFN gaDxgFuncs [] = { {DXG_INDEX_DxDxgGenericThunk, (PFN)DxDxgGenericThunk}, - {DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, - {DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, - {DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, - {DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, - {DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, - {DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, - {DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, - {DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, - {DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, - {DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, - {DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, - {DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, - {DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, - {DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, - {DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, - {DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, - {DXG_INDEX_DxDdCreateD3DBuffer2, (PFN)DxDdCreateD3DBuffer}, - {DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, - {DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, - {DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, - {DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, - {DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, - {DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, - {DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, - {DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, - {DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, - {DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, - {DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, - {DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, - {DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, - {DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, - {DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, - {DXG_INDEX_DxDdGetFlipStatus, (PFN)}, - {DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)}, - {DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)}, - {DXG_INDEX_DxDdGetMoCompGuids, (PFN)}, - {DXG_INDEX_DxDdGetMoCompFormats, (PFN)}, - {DXG_INDEX_DxDdGetScanLine, (PFN)}, - {DXG_INDEX_DxDdLock, (PFN)}, - {DXG_INDEX_DxDdLockD3D, (PFN)}, - {DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)}, - {DXG_INDEX_DxDdQueryMoCompStatus, (PFN)}, - {DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)}, - {DXG_INDEX_DxDdReleaseDC, (PFN)}, - {DXG_INDEX_DxDdRenderMoComp, (PFN)}, - {DXG_INDEX_DxDdResetVisrgn, (PFN)}, - {DXG_INDEX_DxDdSetColorKey, (PFN)}, - {DXG_INDEX_DxDdSetExclusiveMode, (PFN)}, - {DXG_INDEX_DxDdSetGammaRamp, (PFN)}, - {DXG_INDEX_DxDdCreateSurfaceEx, (PFN)}, - {DXG_INDEX_DxDdSetOverlayPosition, (PFN)}, - {DXG_INDEX_DxDdUnattachSurface, (PFN)}, - {DXG_INDEX_DxDdUnlockD3D, (PFN)DxDdUnlockD3D}, - {DXG_INDEX_DxDdUnlockD3D2, (PFN)DxDdUnlockD3D}, - {DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, - {DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, - {DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, - {DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, - {DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, - {DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, - {DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, - {DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, - {DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, - {DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, - {DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, - {DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, - {DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, - {DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, - {DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, - {DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, - {DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, - {DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, - {DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, - {DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, - {DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, - {DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, - {DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, - {DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, - {DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, - {DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, - {DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, - {DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, - {DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, - {DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, - {DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, - {DXG_INDEX_DxDdLockDirectDrawSurface, (PFN)DxDdLockDirectDrawSurface}, - {DXG_INDEX_DxDdUnlockDirectDrawSurface, (PFN)DxDdUnlockDirectDrawSurface}, - {DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, - {DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, - {DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, + //{DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, + //{DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, + //{DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, + //{DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, + //{DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, + //{DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, + //{DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, + //{DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, + //{DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, + //{DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, + //{DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, + //{DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, + //{DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, + //{DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, + //{DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, + //{DXG_INDEX_DxDdCreateSurface, (PFN)DxDdCreateD3DBuffer}, + //{DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, + //{DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, + //{DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, + //{DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, + //{DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, + //{DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, + //{DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, + //{DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, + //{DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, + //{DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, + //{DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, + //{DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, + //{DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, + //{DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, + //{DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, + //{DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, + //{DXG_INDEX_DxDdGetFlipStatus, (PFN)DxDdGetFlipStatus}, + //{DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)DxDdGetInternalMoCompInfo}, + //{DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)DxDdGetMoCompBuffInfo}, + //{DXG_INDEX_DxDdGetMoCompGuids, (PFN)DxDdGetMoCompGuids}, + //{DXG_INDEX_DxDdGetMoCompFormats, (PFN)DxDdGetMoCompFormats}, + //{DXG_INDEX_DxDdGetScanLine, (PFN)DxDdGetScanLine}, + //{DXG_INDEX_DxDdLock, (PFN)DxDdLock}, + //{DXG_INDEX_DxDdLockD3D, (PFN)DxDdLockD3D}, + //{DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)DxDdQueryDirectDrawObject}, + //{DXG_INDEX_DxDdQueryMoCompStatus, (PFN)DxDdQueryMoCompStatus}, + //{DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)DxDdReenableDirectDrawObject}, + //{DXG_INDEX_DxDdReleaseDC, (PFN)DxDdReleaseDC}, + //{DXG_INDEX_DxDdRenderMoComp, (PFN)DxDdRenderMoComp}, + //{DXG_INDEX_DxDdResetVisrgn, (PFN)DxDdResetVisrgn}, + //{DXG_INDEX_DxDdSetColorKey, (PFN)DxDdSetColorKey}, + //{DXG_INDEX_DxDdSetExclusiveMode, (PFN)DxDdSetExclusiveMode}, + //{DXG_INDEX_DxDdSetGammaRamp, (PFN)DxDdSetGammaRamp}, + //{DXG_INDEX_DxDdCreateSurfaceEx, (PFN)DxDdCreateSurfaceEx}, + //{DXG_INDEX_DxDdSetOverlayPosition, (PFN)DxDdSetOverlayPosition}, + //{DXG_INDEX_DxDdUnattachSurface, (PFN)DxDdUnattachSurface}, + //{DXG_INDEX_DxDdUnlock, (PFN)DxDdUnlock}, + //{DXG_INDEX_DxDdUnlockD3D2, (PFN)DxDdUnlockD3D}, + //{DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, + //{DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, + //{DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, + //{DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, + //{DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, + //{DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, + //{DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, + //{DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, + //{DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, + //{DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, + //{DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, + //{DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, + //{DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, + //{DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, + //{DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, + //{DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, + //{DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, + //{DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, + //{DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, + //{DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, + //{DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, + //{DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, + //{DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, + //{DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, + //{DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, + //{DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, + //{DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, + //{DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, + //{DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, + //{DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, + //{DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, + //{DXG_INDEX_DxDdLockDirectDrawSurface, (PFN)DxDdLockDirectDrawSurface}, + //{DXG_INDEX_DxDdUnlockDirectDrawSurface, (PFN)DxDdUnlockDirectDrawSurface}, + //{DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, + //{DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, + //{DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, {DXG_INDEX_DxDdIoctl, (PFN)DxDdIoctl} + }; Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h Wed Oct 24 12:13:39 2007 @@ -23,7 +23,7 @@ #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> -#include <reactos/win32k/win32kdc.h> + #include <reactos/drivers/directx/dxg.h> #include <reactos/drivers/directx/dxeng.h> @@ -35,6 +35,8 @@ /* Driver list export functions */ +DWORD STDCALL DxDxgGenericThunk(ULONG_PTR ulIndex, ULONG_PTR ulHandle, SIZE_T *pdwSizeOfPtr1, PVOID pvPtr1, SIZE_T *pdwSizeOfPtr2, PVOID pvPtr2); +DWORD STDCALL DxDdIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize); /* Internel functions */ BOOL DdHmgDestroy(); Added: branches/reactx/reactos/drivers/directx/dxg/historic.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/historic.c (added) +++ branches/reactx/reactos/drivers/directx/dxg/historic.c Wed Oct 24 12:13:39 2007 @@ -1,0 +1,88 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver for dxg implementation + * FILE: drivers/directx/dxg/main.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 15/10-2007 Magnus Olsen + */ + +#include <dxg_int.h> + +/*++ +* @name DxDxgGenericThunk +* @implemented +* +* The function DxDxgGenericThunk redirect dx call to other thing. +* +* @param ULONG_PTR ulIndex +* The functions we want redirct +* +* @param ULONG_PTR ulHandle +* Unknown +* +* @param SIZE_T *pdwSizeOfPtr1 +* Unknown +* +* @param PVOID pvPtr1 +* Unknown +* +* @param SIZE_T *pdwSizeOfPtr2 +* Unknown +* +* @param PVOID pvPtr2 +* Unknown +* +* @return +* always return DDHAL_DRIVER_NOTHANDLED +* +* @remarks. +* This api are not longer use in Windows NT 2000/XP/2003 +* +*--*/ +DWORD +STDCALL +DxDxgGenericThunk(ULONG_PTR ulIndex, + ULONG_PTR ulHandle, + SIZE_T *pdwSizeOfPtr1, + PVOID pvPtr1, + SIZE_T *pdwSizeOfPtr2, + PVOID pvPtr2) +{ + return DDHAL_DRIVER_NOTHANDLED; +} + + +/*++ +* @name DxDdIoctl +* @implemented +* +* The function DxDdIoctl is the ioctl call to diffent dx functions +* +* @param ULONG ulIoctl +* The ioctl code that we want call to +* +* @param PVOID pBuffer +* Our in or out buffer with data to the ioctl code we are using +* +* @param ULONG ulBufferSize +* The buffer size in bytes +* +* @return +* always return DDERR_UNSUPPORTED +* +* @remarks. +* This api are not longer use in Windows NT 2000/XP/2003 +* +*--*/ +DWORD +STDCALL +DxDdIoctl(ULONG ulIoctl, + PVOID pBuffer, + ULONG ulBufferSize) +{ + return DDERR_UNSUPPORTED; +} + Propchange: branches/reactx/reactos/drivers/directx/dxg/historic.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Wed Oct 24 12:13:39 2007 @@ -116,3 +116,102 @@ #define DXG_INDEX_DxDdGetSurfaceLock 0x59 #define DXG_INDEX_DxDdEnumLockedSurfaceRect 0x5A + +/***********************************************************************************/ +/* Driver Functions Protypes */ +/***********************************************************************************/ +typedef DWORD (NTAPI *PGD_DXDXGGENERICTHUNK)(ULONG_PTR, ULONG_PTR, SIZE_T *, PVOID, SIZE_T *, PVOID); +//typedef x (NTAPI *PGD_DxD3dContextCreate)( +//typedef x (NTAPI *PGD_DxD3dContextDestroy)( +//typedef x (NTAPI *PGD_DxD3dContextDestroyAll)( +//typedef x (NTAPI *PGD_DxD3dValidateTextureStageState)( +//typedef x (NTAPI *PGD_DxD3dDrawPrimitives2)( +//typedef x (NTAPI *PGD_DxDdGetDriverState)( +//typedef x (NTAPI *PGD_DxDdAddAttachedSurface)( +//typedef x (NTAPI *PGD_DxDdAlphaBlt)( +//typedef x (NTAPI *PGD_DxDdAttachSurface)( +//typedef x (NTAPI *PGD_DxDdBeginMoCompFrame)( +//typedef x (NTAPI *PGD_DxDdBlt)( +//typedef x (NTAPI *PGD_DxDdCanCreateSurface)( +//typedef x (NTAPI *PGD_DxDdCanCreateD3DBuffer)( +//typedef x (NTAPI *PGD_DxDdColorControl)( +//typedef x (NTAPI *PGD_DxDdCreateDirectDrawObject)( +//typedef x (NTAPI *PGD_DxDdCreateSurface)( +//typedef x (NTAPI *PGD_DxDdCreateD3DBuffer)( +//typedef x (NTAPI *PGD_DxDdCreateMoComp)( +//typedef x (NTAPI *PGD_DxDdCreateSurfaceObject)( +//typedef x (NTAPI *PGD_DxDdDeleteDirectDrawObject)( +//typedef x (NTAPI *PGD_DxDdDeleteSurfaceObject)( +//typedef x (NTAPI *PGD_DxDdDestroyMoComp)( +//typedef x (NTAPI *PGD_DxDdDestroySurface)( +//typedef x (NTAPI *PGD_DxDdDestroyD3DBuffer)( +//typedef x (NTAPI *PGD_DxDdEndMoCompFrame)( +//typedef x (NTAPI *PGD_DxDdFlip)( +//typedef x (NTAPI *PGD_DxDdFlipToGDISurface)( +//typedef x (NTAPI *PGD_DxDdGetAvailDriverMemory)( +//typedef x (NTAPI *PGD_DxDdGetBltStatus)( +//typedef x (NTAPI *PGD_DxDdGetDC)( +//typedef x (NTAPI *PGD_DxDdGetDriverInfo)( +//typedef x (NTAPI *PGD_DxDdGetDxHandle)( +//typedef x (NTAPI *PGD_DxDdGetFlipStatus)( +//typedef x (NTAPI *PGD_DxDdGetInternalMoCompInfo)( +//typedef x (NTAPI *PGD_DxDdGetMoCompBuffInfo)( +//typedef x (NTAPI *PGD_DxDdGetMoCompGuids)( +//typedef x (NTAPI *PGD_DxDdGetMoCompFormats)( +//typedef x (NTAPI *PGD_DxDdGetScanLine)( +//typedef x (NTAPI *PGD_DxDdLock)( +//typedef x (NTAPI *PGD_DxDdLockD3D)( +//typedef x (NTAPI *PGD_DxDdQueryDirectDrawObject)( +//typedef x (NTAPI *PGD_DxDdQueryMoCompStatus)( +//typedef x (NTAPI *PGD_DxDdReenableDirectDrawObject)( +//typedef x (NTAPI *PGD_DxDdReleaseDC)( +//typedef x (NTAPI *PGD_DxDdRenderMoComp)( +//typedef x (NTAPI *PGD_DxDdResetVisrgn)( +//typedef x (NTAPI *PGD_DxDdSetColorKey)( +//typedef x (NTAPI *PGD_DxDdSetExclusiveMode)( +//typedef x (NTAPI *PGD_DxDdSetGammaRamp)( +//typedef x (NTAPI *PGD_DxDdCreateSurfaceEx)( +//typedef x (NTAPI *PGD_DxDdSetOverlayPosition)( +//typedef x (NTAPI *PGD_DxDdUnattachSurface)( +//typedef x (NTAPI *PGD_DxDdUnlock)( +//typedef x (NTAPI *PGD_DxDdUnlockD3D)( +//typedef x (NTAPI *PGD_DxDdUpdateOverlay)( +//typedef x (NTAPI *PGD_DxDdWaitForVerticalBlank)( +//typedef x (NTAPI *PGD_DxDvpCanCreateVideoPort)( +//typedef x (NTAPI *PGD_DxDvpColorControl)( +//typedef x (NTAPI *PGD_DxDvpCreateVideoPort)( +//typedef x (NTAPI *PGD_DxDvpDestroyVideoPort)( +//typedef x (NTAPI *PGD_DxDvpFlipVideoPort)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortBandwidth)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortField)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortFlipStatus)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortInputFormats)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortLine)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortOutputFormats)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortConnectInfo)( +//typedef x (NTAPI *PGD_DxDvpGetVideoSignalStatus)( +//typedef x (NTAPI *PGD_DxDvpUpdateVideoPort)( +//typedef x (NTAPI *PGD_DxDvpWaitForVideoPortSync)( +//typedef x (NTAPI *PGD_DxDvpAcquireNotification)( +//typedef x (NTAPI *PGD_DxDvpReleaseNotification)( +//typedef x (NTAPI *PGD_DxDdHeapVidMemAllocAligned)( +//typedef x (NTAPI *PGD_DxDdHeapVidMemFree)( +//typedef x (NTAPI *PGD_DxDdEnableDirectDraw)( +//typedef x (NTAPI *PGD_DxDdDisableDirectDraw)( +//typedef x (NTAPI *PGD_DxDdSuspendDirectDraw)( +//typedef x (NTAPI *PGD_DxDdResumeDirectDraw)( +//typedef x (NTAPI *PGD_DxDdDynamicModeChange)( +//typedef x (NTAPI *PGD_DxDdCloseProcess)( +//typedef x (NTAPI *PGD_DxDdGetDirectDrawBound)( +//typedef x (NTAPI *PGD_DxDdEnableDirectDrawRedirection)( +//typedef x (NTAPI *PGD_DxDdAllocPrivateUserMem)( +//typedef x (NTAPI *PGD_DxDdFreePrivateUserMem)( +//typedef x (NTAPI *PGD_DxDdLockDirectDrawSurface)( +//typedef x (NTAPI *PGD_DxDdUnlockDirectDrawSurface)( +//typedef x (NTAPI *PGD_DxDdSetAccelLevel)( +//typedef x (NTAPI *PGD_DxDdGetSurfaceLock)( +//typedef x (NTAPI *PGD_DxDdEnumLockedSurfaceRect)( +typedef DWORD (NTAPI *PGD_ENGDXIOCTL)(ULONG, PVOID, ULONG); + + + Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Wed Oct 24 12:13:39 2007 @@ -14,7 +14,6 @@ typedef BOOL (NTAPI* PGD_DDRESTVISRGN)(HANDLE, HWND); typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *); -typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*); typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); @@ -103,7 +102,6 @@ typedef VOID (NTAPI *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR); typedef PVOID (NTAPI *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ; typedef VOID (NTAPI *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID); -typedef DWORD (NTAPI *PGD_ENGDXIOCTL)(ULONG, PVOID, ULONG); typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); @@ -123,7 +121,4 @@ } -BOOL INTERNAL_CALL DD_Cleanup(PVOID pDD); -BOOL INTERNAL_CALL DDSURF_Cleanup(PVOID pDDSurf); - #endif /* _INT_W32k_DDRAW */ Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Oct 24 12:13:39 2007 @@ -150,11 +150,39 @@ } - - -/************************************************************************/ -/* NtGdiDxgGenericThunk */ -/************************************************************************/ +/*++ +* @name NtGdiDxgGenericThunk +* @implemented +* +* The function NtGdiDxgGenericThunk redirect dx call to other thing. +* from dxg.sys +* +* @param ULONG_PTR ulIndex +* The functions we want redirct +* +* @param ULONG_PTR ulHandle +* Unknown +* +* @param SIZE_T *pdwSizeOfPtr1 +* Unknown +* +* @param PVOID pvPtr1 +* Unknown +* +* @param SIZE_T *pdwSizeOfPtr2 +* Unknown +* +* @param PVOID pvPtr2 +* Unknown +* +* @return +* always return DDHAL_DRIVER_NOTHANDLED +* +* @remarks. +* dxg.sys NtGdiDxgGenericThunk call are redirect to dxg.sys +* This api are not longer use in Windows NT 2000/XP/2003 +* +*--*/ DWORD STDCALL NtGdiDxgGenericThunk(ULONG_PTR ulIndex, @@ -164,10 +192,7 @@ SIZE_T *pdwSizeOfPtr2, PVOID pvPtr2) { - PGD_DXGENERICTRUNK pfnDxgGenericThunk = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDxgGenericThunk, pfnDxgGenericThunk); + PGD_DXGENERICTRUNK pfnDxgGenericThunk = (PGD_DXGENERICTRUNK)gpDxFuncs[DXG_INDEX_DxDxgGenericThunk].pfn; if (pfnDxgGenericThunk == NULL) { Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Wed Oct 24 12:13:39 2007 @@ -112,24 +112,42 @@ } } -/************************************************************************/ -/* EngDxIoctl */ -/************************************************************************/ +/*++ +* @name EngDxIoctl +* @implemented +* +* The function EngDxIoctl is the ioctl call to diffent dx functions +* to the driver dxg.sys +* +* @param ULONG ulIoctl +* The ioctl code that we want call to +* +* @param PVOID pBuffer +* Our in or out buffer with data to the ioctl code we are using +* +* @param ULONG ulBufferSize +* The buffer size in bytes +* +* @return +* always return DDERR_UNSUPPORTED +* +* @remarks. +* dxg.sys EngDxIoctl call are redirect to dxg.sys +* This api are not longer use in Windows NT 2000/XP/2003 +* +*--*/ DWORD STDCALL EngDxIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize) { - PGD_ENGDXIOCTL pfnEngDxIoctl = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdIoctl, pfnEngDxIoctl); + PGD_ENGDXIOCTL pfnEngDxIoctl = (PGD_ENGDXIOCTL)gpDxFuncs[DXG_INDEX_DxDdIoctl].pfn; if (pfnEngDxIoctl == NULL) { DPRINT1("Warring no pfnEngDxIoctl"); - return DDHAL_DRIVER_NOTHANDLED; + return DDERR_UNSUPPORTED; } DPRINT1("Calling on dxg.sys pfnEngDxIoctl");

1 0

[hpoussin] 29846: Better check of GetWindowsDirectory() return value
by hpoussin＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: hpoussin Date: Wed Oct 24 11:49:40 2007 New Revision: 29846 URL: http://svn.reactos.org/svn/reactos?rev=29846&view=rev Log: Better check of GetWindowsDirectory() return value Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Wed Oct 24 11:49:40 2007 @@ -207,6 +207,13 @@ UINT len; BOOL ret; + len = GetWindowsDirectoryW(CurrentDirectory, MAX_PATH); + if (len == 0 || len > MAX_PATH) + { + WARN("GetWindowsDirectoryW() failed\n"); + return FALSE; + } + ret = DuplicateTokenEx(pgContext->UserToken, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenPrimary, &hAppToken); if (!ret) { @@ -222,13 +229,6 @@ StartupInfo.wShowWindow = SW_SHOW; StartupInfo.lpDesktop = pszDesktopName; - len = GetWindowsDirectoryW(CurrentDirectory, MAX_PATH); - if (len > MAX_PATH) - { - WARN("GetWindowsDirectoryW() failed\n"); - CloseHandle(hAppToken); - return FALSE; - } ret = CreateProcessAsUserW( hAppToken, pszCmdLine,

1 0

[hpoussin] 29845: Duplicate the user token before calling CreateProcessAsUser() See issue #2569 for more details.
by hpoussin＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: hpoussin Date: Wed Oct 24 11:45:44 2007 New Revision: 29845 URL: http://svn.reactos.org/svn/reactos?rev=29845&view=rev Log: Duplicate the user token before calling CreateProcessAsUser() See issue #2569 for more details. Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Wed Oct 24 11:45:44 2007 @@ -203,8 +203,16 @@ STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; WCHAR CurrentDirectory[MAX_PATH]; + HANDLE hAppToken; UINT len; BOOL ret; + + ret = DuplicateTokenEx(pgContext->UserToken, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenPrimary, &hAppToken); + if (!ret) + { + WARN("DuplicateTokenEx() failed with error %lu\n", GetLastError()); + return FALSE; + } ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); StartupInfo.cb = sizeof(STARTUPINFOW); @@ -218,10 +226,11 @@ if (len > MAX_PATH) { WARN("GetWindowsDirectoryW() failed\n"); + CloseHandle(hAppToken); return FALSE; } ret = CreateProcessAsUserW( - pgContext->UserToken, + hAppToken, pszCmdLine, NULL, NULL, @@ -232,6 +241,7 @@ CurrentDirectory, &StartupInfo, &ProcessInformation); + CloseHandle(hAppToken); if (!ret) WARN("CreateProcessAsUserW() failed with error %lu\n", GetLastError()); return ret;

1 0

[dreimer] 29844: Update part of the Documentation Add two new settings into the cmd Part of RosBE.
by dreimer＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: dreimer Date: Wed Oct 24 11:13:17 2007 New Revision: 29844 URL: http://svn.reactos.org/svn/reactos?rev=29844&view=rev Log: Update part of the Documentation Add two new settings into the cmd Part of RosBE. Added: trunk/tools/RosBE-Windows/Documentation/files/options.html (with props) trunk/tools/RosBE-Windows/Documentation/files/options.jpg (with props) Modified: trunk/tools/RosBE-Windows/Documentation/files/menu.html trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Documentation/files/menu.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/menu.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/menu.html Wed Oct 24 11:13:17 2007 @@ -23,6 +23,7 @@ <li><a href="basic.html">Basic Functions</a></li> <li><a href="adv.html">Advanced Functions</a></li> <li><a href="howto.html">FAQ</a></li> + <li><a href="options.html">Configuration</a></li> <li><a href="credits.html">Credits</a></li> </ol> Added: trunk/tools/RosBE-Windows/Documentation/files/options.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/options.html (added) +++ trunk/tools/RosBE-Windows/Documentation/files/options.html Wed Oct 24 11:13:17 2007 @@ -1,0 +1,27 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +</head> +<body> +RosBE has a small configuration application, which lets you control +many aspects of RosBE's look and feel. Additionally you can change +settings which affect the build process.<br> +<br> +<div style="text-align: center;"><img + style="width: 389px; height: 425px;" alt="RosBE Configurator" + src="options.jpg"><br> +<div style="text-align: left;"><br> +As you can see, it is possible to edit the font and background color +with RosBE Configurator. Additionally you can check the look in the +Preview below.<br> +Additionally you can Enable/Disable many Things with it. So you can +switch on/off showing the time the build process needed. A new feature +is the usage of ccache which can speed up the build process for ~5-10% +for a cost of ~1,5 GB of Cache size. You can switch off/on the logging +and stripping the Output Files, too. Stripping might help if you want +to use ReactOS on a PC with less than 48 MB RAM, because stripped apps +use less RAM.<br> +</div> +</div> +</body> +</html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/options.html ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Documentation/files/options.jpg URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE-Windows/Documentation/files/options.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Wed Oct 24 11:13:17 2007 @@ -51,7 +51,23 @@ set TARGET_CPP=g++ ) ) - +if defined _ROSBE_OBJPATH ( + if not exist "%_ROSBE_OBJPATH%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOB + ) else ( + set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% + ) +) +if defined _ROSBE_OUTPATH ( + if not exist "%_ROSBE_OUTPATH%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOB + ) else ( + set ROS_OUTPUT=%_ROSBE_OUTPATH% + set ROS_TEMPORARY=%_ROSBE_OUTPATH% + ) +) :: :: Get the current date and time for use in in our build log's file name. :: Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Wed Oct 24 11:13:17 2007 @@ -26,7 +26,8 @@ set _ROSBE_STRIP=0 set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 set _ROSBE_LOGDIR=%CD%\RosBE-Logs - +set _ROSBE_OBJPATH= +set _ROSBE_OUTPATH= :: :: Check if the user has used the options utility and :: if so, load their options.

1 0

[peterw] 29843: - Added a small utility (chknewer) to check if one file is newer than another. - This removes the dependency on test from Config.cmd and Build.cmd. - Some other miscellaneous cleanup.
by peterw＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: peterw Date: Wed Oct 24 11:04:52 2007 New Revision: 29843 URL: http://svn.reactos.org/svn/reactos?rev=29843&view=rev Log: - Added a small utility (chknewer) to check if one file is newer than another. - This removes the dependency on test from Config.cmd and Build.cmd. - Some other miscellaneous cleanup. Added: trunk/tools/RosBE-Windows/Tools/chknewer.c (with props) Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Tools/buildtime.c trunk/tools/RosBE-Windows/Tools/cpucount.c trunk/tools/RosBE-Windows/Tools/echoh.c trunk/tools/RosBE-Windows/Tools/flash.c trunk/tools/RosBE-Windows/Tools/getdate.c trunk/tools/RosBE-Windows/Tools/info.txt trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Wed Oct 24 11:04:52 2007 @@ -17,7 +17,7 @@ :: abort the build and inform the user. :: if exist "config.rbuild" ( - test "config.template.rbuild" -nt "config.rbuild" + chknewer "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Wed Oct 24 11:04:52 2007 @@ -85,7 +85,7 @@ :: inform the user and offer an update. :: if exist "%_ROSBE_BASEDIR%\config.rbuild" ( - test "config.template.rbuild" -nt "%_ROSBE_BASEDIR%\config.rbuild" + chknewer "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than working config.rbuild *** Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/buildtim… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/buildtime.c (original) +++ trunk/tools/RosBE-Windows/Tools/buildtime.c Wed Oct 24 11:04:52 2007 @@ -1,13 +1,12 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/buildtime.c * PURPOSE: Buildtime Counter * COPYRIGHT: Copyright 2007 KJK::Hyperion * Copyright 2007 Peter Ward <dralnix(a)gmail.com> * */ - #include <windows.h> #include <time.h> Added: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (added) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Wed Oct 24 11:04:52 2007 @@ -1,0 +1,106 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/chknewer.c + * PURPOSE: Check if a file is newer than another. + * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * + */ + +#include <time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +time_t +StatFile( + char* FileName +); + +int main(int argc, char* argv[]) +{ + FILE *FILE1, *FILE2; + time_t file1time = 0, file2time = 0; + + if (argc > 3) + { + printf("%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + if ((argc == 1) || + (!strncmp(argv[1], "/?", 2)) || + (!strncmp(argv[1], "-h", 2)) || + (!strncmp(argv[1], "--help", 6))) + { + printf("Usage: %s FILE1 FILE2\n", argv[0]); + printf("Checks if FILE1 is newer than FILE2 by checking\n"); + printf("the last data modification time's. Returns 1 if\n"); + printf("FILE1 is newer and 2 if FILE2 is.\n\n"); + return 0; + } + + FILE1 = fopen(argv[1], "r"); + if (!FILE1) + { + printf("%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[1]); + return -1; + } + else + { + if (fclose(FILE1)) + { + printf("%s: Error closing file \"%s\"\n", argv[0], argv[1]); + } + file1time = StatFile(argv[1]); + if (!file1time) + { + printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); + return -1; + } + } + + FILE2 = fopen(argv[2], "r"); + if (!FILE2) + { + printf("%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[2]); + return -1; + } + else + { + if (fclose(FILE2)) + { + printf("%s: Error closing file \"%s\"\n", argv[0], argv[2]); + } + file2time = StatFile(argv[2]); + if (!file2time) + { + printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]); + return -1; + } + } + + if (file1time > file2time) + { + return 1; + } + else + { + return 2; + } +} + +time_t StatFile(char* FileName) +{ + struct stat filestat; + + if (!stat(FileName, &filestat)) + { + return mktime(localtime(&filestat.st_mtime)); + } + else + { + return 0; + } +} Propchange: trunk/tools/RosBE-Windows/Tools/chknewer.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE-Windows/Tools/cpucount.c Wed Oct 24 11:04:52 2007 @@ -1,13 +1,12 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/cpucount.c * PURPOSE: CPU Core Counter * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> * Copyright 2007 Peter Ward <dralnix(a)gmail.com> * */ - #include <windows.h> #include <stdio.h> Modified: trunk/tools/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/echoh.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/echoh.c (original) +++ trunk/tools/RosBE-Windows/Tools/echoh.c Wed Oct 24 11:04:52 2007 @@ -1,12 +1,11 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/echoh.c * PURPOSE: Converts a value to hex and displays it * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> * */ - #include <stdio.h> #include <stdlib.h> Modified: trunk/tools/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/flash.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/flash.c (original) +++ trunk/tools/RosBE-Windows/Tools/flash.c Wed Oct 24 11:04:52 2007 @@ -1,12 +1,11 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/flash.c * PURPOSE: Taskbar Flasher * COPYRIGHT: Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ - #include <windows.h> Modified: trunk/tools/RosBE-Windows/Tools/getdate.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/getdate.… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/getdate.c (original) +++ trunk/tools/RosBE-Windows/Tools/getdate.c Wed Oct 24 11:04:52 2007 @@ -1,6 +1,6 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/getdate.c * PURPOSE: Returns System Date * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Wed Oct 24 11:04:52 2007 @@ -1,6 +1,5 @@ Additional Tools needed: tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm -test: http://gnuwin32.sourceforge.net/packages/coreutils.htm cut: http://www.ltr-data.se/files/cut.zip sed: http://gnuwin32.sourceforge.net/packages/sed.htm grep: http://gnuwin32.sourceforge.net/packages/grep.htm Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Wed Oct 24 11:04:52 2007 @@ -7,10 +7,13 @@ LFLAGS := -s WINVER := 0x502 -all: buildtime cpucount echoh flash getdate +all: buildtime chknewer cpucount echoh flash getdate buildtime: buildtime.c ${CC} ${CFLAGS} buildtime buildtime.c + +chknewer: chknewer.c + ${CC} ${CFLAGS} chknewer chknewer.c cpucount: cpucount.c ${CC} ${CFLAGS} cpucount cpucount.c @@ -25,4 +28,4 @@ ${CC} ${CFLAGS} getdate getdate.c clean: - del buildtime.exe cpucount.exe echoh.exe flash.exe getdate.exe + del /f buildtime.exe chknewer.exe cpucount.exe echoh.exe flash.exe getdate.exe

1 0

[arty] 29842: Remove extra var.
by arty＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: arty Date: Wed Oct 24 07:34:58 2007 New Revision: 29842 URL: http://svn.reactos.org/svn/reactos?rev=29842&view=rev Log: Remove extra var. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Wed Oct 24 07:34:58 2007 @@ -473,7 +473,7 @@ /* Handle relocation sections */ for (i = 0; i < shnum; i++) { Elf32_Rela reloc = { }; - ULONG *Target32, x; + ULONG *Target32; USHORT *Target16; int numreloc, relstart, targetSection; Elf32_Sym symbol; @@ -531,7 +531,6 @@ Target32 = (ULONG*)(((PCHAR)MemLoadAddr) + (P - KernelAddr)); Target16 = (USHORT *)Target32; - x = *Target32; switch (ELF32_R_TYPE(reloc.r_info)) {

1 0

[arty] 29841: React to changes in rbuild with regard to definitions. These are now conditionally done in rosbe-ppc's gcc wrapper.
by arty＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: arty Date: Wed Oct 24 06:23:54 2007 New Revision: 29841 URL: http://svn.reactos.org/svn/reactos?rev=29841&view=rev Log: React to changes in rbuild with regard to definitions. These are now conditionally done in rosbe-ppc's gcc wrapper. Modified: trunk/reactos/ReactOS-ppc.rbuild Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=298… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Wed Oct 24 06:23:54 2007 @@ -13,22 +13,7 @@ <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/> <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/> - <define name="_M_PPC" /> - <define name="_PPC_" /> - <define name="__PowerPC__" /> - <define name="stdcall"/> - <define name="__stdcall__"/> - <define name="fastcall"/> - <define name="cdecl"/> - <define name="__cdecl__"/> - <define name="dllimport"/> - <define name="WORDS_BIGENDIAN"/> <define name="__MSVCRT__"/> - <define name="__NO_CTYPE_INLINES" /> -  - <define name="__MINGW_IMPORT">extern</define> - <define name="_CRTIMP"/> - <define name="'__declspec(x)'"/> <compilerflag>-fshort-wchar</compilerflag> <compilerflag>-fsigned-char</compilerflag> <compilerflag>-mfull-toc</compilerflag>

1 0

[jimtabor] 29840: Update NtUserGetComboBoxInfo header info.
by jimtabor＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: jimtabor Date: Wed Oct 24 06:03:56 2007 New Revision: 29840 URL: http://svn.reactos.org/svn/reactos?rev=29840&view=rev Log: Update NtUserGetComboBoxInfo header info. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Oct 24 06:03:56 2007 @@ -991,11 +991,11 @@ NtUserGetClipCursor( RECT *lpRect); -DWORD +BOOL NTAPI NtUserGetComboBoxInfo( - DWORD Unknown0, - DWORD Unknown1); + HWND hWnd, + PCOMBOBOXINFO pcbi); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Wed Oct 24 06:03:56 2007 @@ -272,11 +272,11 @@ return 0; } -DWORD +BOOL STDCALL NtUserGetComboBoxInfo( - DWORD Unknown0, - DWORD Unknown1) + HWND hWnd, + PCOMBOBOXINFO pcbi) { UNIMPLEMENTED

1 0

[jimtabor] 29839: - Sync to Wine: Listbox controls - Implement NtUserGetListBoxInfo and GetListBoxInfo. Fix header entry. - Add LB_GETLISTBOXINFO to psdk.
by jimtabor＠svn.reactos.org 24 Oct '07

24 Oct '07

Author: jimtabor Date: Wed Oct 24 05:04:06 2007 New Revision: 29839 URL: http://svn.reactos.org/svn/reactos?rev=29839&view=rev Log: - Sync to Wine: Listbox controls - Implement NtUserGetListBoxInfo and GetListBoxInfo. Fix header entry. - Add LB_GETLISTBOXINFO to psdk. Modified: trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/media/doc/README.WINE trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Wed Oct 24 05:04:06 2007 @@ -16,12 +16,26 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * NOTES + * + * This code was audited for completeness against the documented features + * of Comctl32.dll version 6.0 on Oct. 9, 2004, by Dimitrie O. Paun. + * + * Unless otherwise noted, we believe this code to be complete, as per + * the specification mentioned above. + * If you discover missing features, or bugs, please note them below. + * + * TODO: + * - GetListBoxInfo() + * - LB_GETLISTBOXINFO + * - LBS_NODATA */ #include <user32.h> #include <wine/debug.h> -WINE_DECLARE_DEBUG_CHANNEL(combo); + WINE_DEFAULT_DEBUG_CHANNEL(listbox); /* Start of hack section -------------------------------- */ @@ -41,14 +55,6 @@ BOOL STDCALL KillSystemTimer(HWND,UINT_PTR); /* End of hack section -------------------------------- */ - -/* Unimplemented yet: - * - LBS_USETABSTOPS - * - Locale handling - * - * Probably needs improvement: - * - LBS_NOSEL - */ /* Items array granularity */ #define LB_ARRAY_GRANULARITY 16 @@ -341,10 +347,12 @@ * * Set the top item of the listbox, scrolling up or down if necessary. */ -static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, - BOOL scroll ) +static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) { INT max = LISTBOX_GetMaxTopIndex( descr ); + + TRACE("setting top item %d, scroll %d\n", index, scroll); + if (index > max) index = max; if (index < 0) index = 0; if (descr->style & LBS_MULTICOLUMN) index -= index % descr->page_size; @@ -519,6 +527,8 @@ rect->bottom = rect->top + descr->item_height; rect->right += descr->horz_pos; } + + TRACE("item %d, rect %s\n", index, wine_dbgstr_rect(rect)); return ((rect->left < descr->width) && (rect->right > 0) && (rect->top < descr->height) && (rect->bottom > 0)); @@ -704,8 +714,7 @@ * * Repaint a single item synchronously. */ -static void LISTBOX_RepaintItem( LB_DESCR *descr, INT index, - UINT action ) +static void LISTBOX_RepaintItem( LB_DESCR *descr, INT index, UINT action ) { HDC hdc; RECT rect; @@ -736,6 +745,33 @@ /*********************************************************************** + * LISTBOX_DrawFocusRect + */ +static void LISTBOX_DrawFocusRect( LB_DESCR *descr, BOOL on ) +{ + HDC hdc; + RECT rect; + HFONT oldFont = 0; + + /* Do not repaint the item if the item is not visible */ + if (!IsWindowVisible(descr->self)) return; + + if (descr->focus_item == -1) return; + if (!descr->caret_on || !descr->in_focus) return; + + if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) != 1) return; + if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) return; + if (descr->font) oldFont = SelectObject( hdc, descr->font ); + if (!IsWindowEnabled(descr->self)) + SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); + SetWindowOrgEx( hdc, descr->horz_pos, 0, NULL ); + LISTBOX_PaintItem( descr, hdc, &rect, descr->focus_item, ODA_FOCUS, on ? FALSE : TRUE ); + if (oldFont) SelectObject( hdc, oldFont ); + ReleaseDC( descr->self, hdc ); +} + + +/*********************************************************************** * LISTBOX_InitStorage */ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) @@ -767,8 +803,7 @@ /*********************************************************************** * LISTBOX_SetTabStops */ -static BOOL LISTBOX_SetTabStops( LB_DESCR *descr, INT count, - LPINT tabs, BOOL short_ints ) +static BOOL LISTBOX_SetTabStops( LB_DESCR *descr, INT count, LPINT tabs, BOOL short_ints ) { INT i; @@ -1375,6 +1410,8 @@ { INT top; + TRACE("current top item %d, index %d, fully %d\n", descr->top_item, index, fully); + if (index <= descr->top_item) top = index; else if (descr->style & LBS_MULTICOLUMN) { @@ -1413,16 +1450,17 @@ { INT oldfocus = descr->focus_item; + TRACE("old focus %d, index %d\n", oldfocus, index); + if (descr->style & LBS_NOSEL) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; if (index == oldfocus) return LB_OKAY; + + LISTBOX_DrawFocusRect( descr, FALSE ); descr->focus_item = index; - if ((oldfocus != -1) && descr->caret_on && (descr->in_focus)) - LISTBOX_RepaintItem( descr, oldfocus, ODA_FOCUS ); LISTBOX_MakeItemVisible( descr, index, fully_visible ); - if (descr->caret_on && (descr->in_focus)) - LISTBOX_RepaintItem( descr, index, ODA_FOCUS ); + LISTBOX_DrawFocusRect( descr, TRUE ); return LB_OKAY; } @@ -1476,7 +1514,8 @@ static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, BOOL on, BOOL send_notify ) { - TRACE( "index=%d notify=%s\n", index, send_notify ? "YES" : "NO" ); + TRACE( "cur_sel=%d index=%d notify=%s\n", + descr->selected_item, index, send_notify ? "YES" : "NO" ); if (descr->style & LBS_NOSEL) { @@ -1497,8 +1536,8 @@ if (index == oldsel) return LB_OKAY; if (oldsel != -1) descr->items[oldsel].selected = FALSE; if (index != -1) descr->items[index].selected = TRUE; + if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); descr->selected_item = index; - if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); if (index != -1) LISTBOX_RepaintItem( descr, index, ODA_SELECT ); if (send_notify && descr->nb_items) SEND_NOTIFICATION( descr, (index != -1) ? LBN_SELCHANGE : LBN_SELCANCEL ); @@ -1518,7 +1557,7 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) { - INT oldfocus = descr->focus_item; + TRACE("old focus %d, index %d\n", descr->focus_item, index); if ((index < 0) || (index >= descr->nb_items)) return; @@ -1531,9 +1570,7 @@ 4. Set the focus to 'index' and repaint the item */ /* 1. remove the focus and repaint the item */ - descr->focus_item = -1; - if ((oldfocus != -1) && descr->caret_on && (descr->in_focus)) - LISTBOX_RepaintItem( descr, oldfocus, ODA_FOCUS ); + LISTBOX_DrawFocusRect( descr, FALSE ); /* 2. then turn off the previous selection */ /* 3. repaint the new selected item */ @@ -1558,8 +1595,7 @@ /* 4. repaint the new item with the focus */ descr->focus_item = index; LISTBOX_MakeItemVisible( descr, index, fully_visible ); - if (descr->caret_on && (descr->in_focus)) - LISTBOX_RepaintItem( descr, index, ODA_FOCUS ); + LISTBOX_DrawFocusRect( descr, TRUE ); } @@ -1712,7 +1748,7 @@ dis.itemData = descr->items[index].data; SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } - if (HAS_STRINGS(descr) && descr->items[index].str) + if (HAS_STRINGS(descr)) HeapFree( GetProcessHeap(), 0, descr->items[index].str ); } @@ -2066,7 +2102,10 @@ DWORD keys, INT x, INT y ) { INT index = LISTBOX_GetItemFromPoint( descr, x, y ); - TRACE("[%p]: lbuttondown %d,%d item %d\n", descr->self, x, y, index ); + + TRACE("[%p]: lbuttondown %d,%d item %d, focus item %d\n", + descr->self, x, y, index, descr->focus_item); + if (!descr->caret_on && (descr->in_focus)) return 0; if (!descr->in_focus) @@ -2076,6 +2115,16 @@ } if (index == -1) return 0; + + if (!descr->lphc) + { + if (descr->style & LBS_NOTIFY ) + SendMessageW( descr->owner, WM_LBTRACKPOINT, index, + MAKELPARAM( x, y ) ); + } + + descr->captured = TRUE; + SetCapture( descr->self ); if (descr->style & (LBS_EXTENDEDSEL | LBS_MULTIPLESEL)) { @@ -2119,14 +2168,8 @@ TRUE, (descr->style & LBS_NOTIFY) != 0 ); } - descr->captured = TRUE; - SetCapture( descr->self ); - if (!descr->lphc) { - if (descr->style & LBS_NOTIFY ) - SendMessageW( descr->owner, WM_LBTRACKPOINT, index, - MAKELPARAM( x, y ) ); if (GetWindowLongW( descr->self, GWL_EXSTYLE ) & WS_EX_DRAGDETECT) { POINT pt; @@ -2147,7 +2190,7 @@ * * Process LButtonDown message for the ComboListBox * -nn * PARAMS + * PARAMS * pWnd [I] The windows internal structure * pDescr [I] The ListBox internal structure * wParam [I] Key Flag (WM_LBUTTONDOWN doc for more info) @@ -2467,7 +2510,6 @@ } } return 0; - } @@ -2614,8 +2656,8 @@ WPARAM wParam, LPARAM lParam, BOOL unicode ) { LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); + LPHEADCOMBO lphc = 0; LRESULT ret; - LPHEADCOMBO lphc = 0; if (!descr) { @@ -2625,8 +2667,7 @@ { CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; if (lpcs->style & LBS_COMBOBOX) lphc = (LPHEADCOMBO)lpcs->lpCreateParams; - if (!LISTBOX_Create( hwnd, lphc )) - return -1; + if (!LISTBOX_Create( hwnd, lphc )) return -1; TRACE("creating wnd=%p descr=%lx\n", hwnd, GetWindowLongPtrW( hwnd, 0 ) ); return 0; } @@ -2638,6 +2679,7 @@ TRACE("[%p]: msg %s wp %08x lp %08lx\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); + switch(msg) { #ifndef __REACTOS__ @@ -2843,16 +2885,38 @@ { POINT pt; RECT rect; - - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); - rect.left = 0; - rect.top = 0; - rect.right = descr->width; - rect.bottom = descr->height; - - return MAKELONG( LISTBOX_GetItemFromPoint(descr, pt.x, pt.y), - !PtInRect( &rect, pt ) ); + int index; + BOOL hit = TRUE; + + /* The hiword of the return value is not a client area + hittest as suggested by MSDN, but rather a hittest on + the returned listbox item. */ + + if(descr->nb_items == 0) + return 0x1ffff; /* win9x returns 0x10000, we copy winnt */ + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + + SetRect(&rect, 0, 0, descr->width, descr->height); + + if(!PtInRect(&rect, pt)) + { + pt.x = min(pt.x, rect.right - 1); + pt.x = max(pt.x, 0); + pt.y = min(pt.y, rect.bottom - 1); + pt.y = max(pt.y, 0); + hit = FALSE; + } + + index = LISTBOX_GetItemFromPoint(descr, pt.x, pt.y); + + if(index == -1) + { + index = descr->nb_items - 1; + hit = FALSE; + } + return MAKELONG(index, hit ? 0 : 1); } #ifndef __REACTOS__ @@ -3153,6 +3217,10 @@ if ((descr->focus_item != -1) && (descr->in_focus)) LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); return LB_OKAY; + + case LB_GETLISTBOXINFO: + FIXME("LB_GETLISTBOXINFO: stub!\n"); + return 0; case WM_DESTROY: return LISTBOX_Destroy( descr ); @@ -3190,7 +3258,7 @@ descr->in_focus = TRUE; descr->caret_on = TRUE; if (descr->focus_item != -1) - LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); + LISTBOX_DrawFocusRect( descr, TRUE ); SEND_NOTIFICATION( descr, LBN_SETFOCUS ); return 0; case WM_KILLFOCUS: @@ -3325,6 +3393,7 @@ if( lphc ) return 0; return unicode ? SendMessageW( descr->owner, msg, wParam, lParam ) : SendMessageA( descr->owner, msg, wParam, lParam ); + case WM_NCDESTROY: if( lphc && (lphc->dwStyle & CBS_DROPDOWNLIST) != CBS_SIMPLE ) lphc->hWndLBox = 0; @@ -3364,12 +3433,11 @@ } /*********************************************************************** - * GetListBoxInfo + * GetListBoxInfo !REACTOS! */ DWORD STDCALL GetListBoxInfo(HWND hwnd) { - UNIMPLEMENTED; - return 0; -} - + return NtUserGetListBoxInfo(hwnd); // Do it right! Have the message org from kmode! +} + Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Wed Oct 24 05:04:06 2007 @@ -1847,6 +1847,7 @@ #define LB_GETITEMDATA 409 #define LB_GETITEMHEIGHT 417 #define LB_GETITEMRECT 408 +#define LB_GETLISTBOXINFO 434 #define LB_GETLOCALE 422 #define LB_GETSEL 391 #define LB_GETSELCOUNT 400 Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Oct 24 05:04:06 2007 @@ -1161,7 +1161,7 @@ DWORD NTAPI NtUserGetListBoxInfo( - DWORD Unknown0); + HWND hWnd); typedef struct tagNTUSERGETMESSAGEINFO { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Oct 24 05:04:06 2007 @@ -125,7 +125,7 @@ reactos/dll/win32/user32/controls/combo.c # Synced at 20071022 reactos/dll/win32/user32/controls/edit.c # Synced at 20071022 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 - reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616 + reactos/dll/win32/user32/controls/listbox.c # Synced at 20071023 reactos/dll/win32/user32/controls/scrollbar.c # Forked reactos/dll/win32/user32/controls/static.c # Synced at 20060908 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Wed Oct 24 05:04:06 2007 @@ -336,16 +336,6 @@ DWORD STDCALL -NtUserGetListBoxInfo( - DWORD Unknown0) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserGetMouseMovePointsEx( UINT cbSize, LPMOUSEMOVEPOINT lppt, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Wed Oct 24 05:04:06 2007 @@ -2871,6 +2871,32 @@ return NULL; #endif } + + +DWORD +STDCALL +NtUserGetListBoxInfo( + HWND hWnd) +{ + PWINDOW_OBJECT Wnd; + DECLARE_RETURN(DWORD); + + DPRINT("Enter NtUserGetListBoxInfo\n"); + UserEnterExclusive(); + + if (!(Wnd = UserGetWindowObject(hWnd))) + { + RETURN( 0 ); + } + + RETURN( (DWORD) co_IntSendMessage( Wnd->hSelf, LB_GETLISTBOXINFO, 0, 0 )); + +CLEANUP: + DPRINT("Leave NtUserGetListBoxInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + /* * NtUserGetParent

1 0

[gbrunmar] 29838: Made r29837 readable
by gbrunmar＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: gbrunmar Date: Wed Oct 24 01:47:18 2007 New Revision: 29838 URL: http://svn.reactos.org/svn/reactos?rev=29838&view=rev Log: Made r29837 readable Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=29838&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c (original) +++ trunk/reactos/lib/rtl/sd.c Wed Oct 24 01:47:18 2007 @@ -169,25 +169,25 @@ destSD->Group = srcSD->Group; RtlCopySid(GroupLength, (LPBYTE)destSD + (DWORD_PTR)destSD->Group, Group); - if (srcSD->Control & SE_DACL_PRESENT) - { - destSD->Dacl = srcSD->Dacl; + if (srcSD->Control & SE_DACL_PRESENT) + { + destSD->Dacl = srcSD->Dacl; if(srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) - { + { RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Dacl), Dacl, Dacl->AclSize); - } - } - - if (srcSD->Control & SE_SACL_PRESENT) + } + } + + if (srcSD->Control & SE_SACL_PRESENT) { destSD->Sacl = srcSD->Sacl; if(srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) - { + { RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Sacl), Sacl, Sacl->AclSize); - } - } + } + } } else { @@ -199,20 +199,20 @@ destSD->Dacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Dacl->AclSize); if(srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) - { + { RtlCopyMemory(destSD->Dacl, Dacl, Dacl->AclSize); - } - } + } + } if (srcSD->Control & SE_SACL_PRESENT) { destSD->Sacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Sacl->AclSize); if(srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) - { + { RtlCopyMemory(destSD->Sacl, Sacl, Sacl->AclSize); - } - } + } + } } return STATUS_SUCCESS;

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