Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[jgardou] 46937: [WIN32K] - Update direct DCs surface before blit if needed - call directly ppdev in MouseSafetyOnDraw{Start, End} - use directly the PDEVOBJ surface in mouse operations - Add some mouse-related sanity checks

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Apr 19 15:52:37 2010 New Revision: 46937 URL: http://svn.reactos.org/svn/reactos?rev=46937&view=rev Log: [WIN32K] - Update direct DCs surface before blit if needed - call directly ppdev in MouseSafetyOnDraw{Start,End} - use directly the PDEVOBJ surface in mouse operations - Add some mouse-related sanity checks Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c branches/reactos-yarotows/subsystems/win32/win32k/include/mouse.h branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Mon Apr 19 15:52:37 2010 @@ -37,23 +37,17 @@ */ INT INTERNAL_CALL MouseSafetyOnDrawStart( - SURFOBJ *pso, + PPDEVOBJ ppdev, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2) { LONG tmp; - PDEVOBJ *ppdev; GDIPOINTER *pgp; - ASSERT(pso != NULL); - - ppdev = GDIDEV(pso); - if (ppdev == NULL) - { - return FALSE; - } + ASSERT(ppdev != NULL); + ASSERT(ppdev->pSurface != NULL); pgp = &ppdev->Pointer; @@ -88,7 +82,7 @@ && pgp->Exclude.top <= HazardY2) { ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; - ppdev->pfnMovePointer(pso, -1, -1, NULL); + ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, -1, -1, NULL); } return(TRUE); @@ -99,19 +93,12 @@ */ INT INTERNAL_CALL MouseSafetyOnDrawEnd( - SURFOBJ *pso) -{ - PDEVOBJ *ppdev; + PPDEVOBJ ppdev) +{ GDIPOINTER *pgp; - ASSERT(pso != NULL); - - ppdev = (PDEVOBJ*)pso->hdev; - - if (ppdev == NULL) - { - return(FALSE); - } + ASSERT(ppdev != NULL); + ASSERT(ppdev->pSurface != NULL); pgp = &ppdev->Pointer; @@ -125,7 +112,7 @@ return FALSE; } - ppdev->pfnMovePointer(pso, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); + ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); ppdev->SafetyRemoveLevel = 0; @@ -635,7 +622,9 @@ return 0; } - psurf = pdc->dclevel.pSurface; + ASSERT(pdc->dctype == DCTYPE_DIRECT); + /* We're not sure DC surface is the good one */ + psurf = pdc->ppdev->pSurface; if (!psurf) { DPRINT1("DC has no surface.\n"); @@ -710,12 +699,13 @@ DPRINT1("Failed to lock the DC.\n"); return; } + ASSERT(pdc->dctype == DCTYPE_DIRECT); /* Store the cursor exclude position in the PDEV */ prcl = &pdc->ppdev->Pointer.Exclude; /* Call Eng/Drv function */ - IntEngMovePointer(&pdc->dclevel.pSurface->SurfObj, x, y, prcl); + IntEngMovePointer(&pdc->ppdev->pSurface->SurfObj, x, y, prcl); /* Unlock the DC */ DC_UnlockDc(pdc); Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/mouse.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/mouse.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/mouse.h [iso-8859-1] Mon Apr 19 15:52:37 2010 @@ -2,8 +2,8 @@ #include <include/winsta.h> -INT INTERNAL_CALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2); -INT INTERNAL_CALL MouseSafetyOnDrawEnd(SURFOBJ *SurfObj); +INT INTERNAL_CALL MouseSafetyOnDrawStart(PPDEVOBJ ppdev, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2); +INT INTERNAL_CALL MouseSafetyOnDrawEnd(PPDEVOBJ ppdev); #ifndef XBUTTON1 #define XBUTTON1 (0x01) Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Apr 19 15:52:37 2010 @@ -493,20 +493,32 @@ if(pdcFirst && pdcFirst->dctype == DCTYPE_DIRECT) { EngAcquireSemaphore(pdcFirst->ppdev->hsemDevLock); - MouseSafetyOnDrawStart(&pdcFirst->dclevel.pSurface->SurfObj, + MouseSafetyOnDrawStart(pdcFirst->ppdev, prcFirst->left, prcFirst->top, prcFirst->right, prcFirst->bottom) ; + /* Update surface if needed */ + if(pdcFirst->ppdev->pSurface != pdcFirst->dclevel.pSurface) + { + SURFACE_ShareUnlockSurface(pdcFirst->dclevel.pSurface); + pdcFirst->dclevel.pSurface = PDEVOBJ_pSurface(pdcFirst->ppdev); + } } if(pdcSecond && pdcSecond->dctype == DCTYPE_DIRECT) { EngAcquireSemaphore(pdcSecond->ppdev->hsemDevLock); - MouseSafetyOnDrawStart(&pdcSecond->dclevel.pSurface->SurfObj, + MouseSafetyOnDrawStart(pdcSecond->ppdev, prcSecond->left, prcSecond->top, prcSecond->right, prcSecond->bottom) ; + /* Update surface if needed */ + if(pdcSecond->ppdev->pSurface != pdcSecond->dclevel.pSurface) + { + SURFACE_ShareUnlockSurface(pdcSecond->dclevel.pSurface); + pdcSecond->dclevel.pSurface = PDEVOBJ_pSurface(pdcSecond->ppdev); + } } } @@ -517,7 +529,7 @@ { if(pdc1->dctype == DCTYPE_DIRECT) { - MouseSafetyOnDrawEnd(&pdc1->dclevel.pSurface->SurfObj); + MouseSafetyOnDrawEnd(pdc1->ppdev); EngReleaseSemaphore(pdc1->ppdev->hsemDevLock); } @@ -525,7 +537,7 @@ { if(pdc2->dctype == DCTYPE_DIRECT) { - MouseSafetyOnDrawEnd(&pdc2->dclevel.pSurface->SurfObj); + MouseSafetyOnDrawEnd(pdc2->ppdev); EngReleaseSemaphore(pdc2->ppdev->hsemDevLock); } }

14 years, 5 months

[akhaldi] 46936: [DDK] - mountdev.h : Guards definition with the appropriate NTDDI_VERSION, and apply a consistent formatting. - mountmgr.h : Guards definition with the appropriate NTDDI_VERSION, apply a consistent formatting and add some missing definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 19 12:31:22 2010 New Revision: 46936 URL: http://svn.reactos.org/svn/reactos?rev=46936&view=rev Log: [DDK] - mountdev.h : Guards definition with the appropriate NTDDI_VERSION, and apply a consistent formatting. - mountmgr.h : Guards definition with the appropriate NTDDI_VERSION, apply a consistent formatting and add some missing definitions. Modified: branches/header-work/include/ddk/mountdev.h branches/header-work/include/ddk/mountmgr.h Modified: branches/header-work/include/ddk/mountdev.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/mountde… ============================================================================== --- branches/header-work/include/ddk/mountdev.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/mountdev.h [iso-8859-1] Mon Apr 19 12:31:22 2010 @@ -1,42 +1,47 @@ - - #ifndef _MOUNTDEV_ #define _MOUNTDEV_ #include <mountmgr.h> +#if (NTDDI_VERSION >= NTDDI_WIN2K) + #define IOCTL_MOUNTDEV_QUERY_UNIQUE_ID CTL_CODE(MOUNTDEVCONTROLTYPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY CTL_CODE(MOUNTDEVCONTROLTYPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME CTL_CODE(MOUNTDEVCONTROLTYPE, 3, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MOUNTDEV_LINK_CREATED CTL_CODE(MOUNTDEVCONTROLTYPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MOUNTDEV_LINK_DELETED CTL_CODE(MOUNTDEVCONTROLTYPE, 5, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct _MOUNTDEV_UNIQUE_ID { + USHORT UniqueIdLength; + UCHAR UniqueId[1]; +} MOUNTDEV_UNIQUE_ID, *PMOUNTDEV_UNIQUE_ID; + +typedef struct _MOUNTDEV_SUGGESTED_LINK_NAME { + BOOLEAN UseOnlyIfThereAreNoOtherLinks; + USHORT NameLength; + WCHAR Name[1]; +} MOUNTDEV_SUGGESTED_LINK_NAME, *PMOUNTDEV_SUGGESTED_LINK_NAME; + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + +#if (NTDDI_VERSION >= NTDDI_WINXP) + #define IOCTL_MOUNTDEV_QUERY_STABLE_GUID CTL_CODE(MOUNTDEVCONTROLTYPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) -typedef struct _MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT -{ - ULONG Size; - USHORT OldUniqueIdOffset; - USHORT OldUniqueIdLength; - USHORT NewUniqueIdOffset; - USHORT NewUniqueIdLength; +typedef struct _MOUNTDEV_STABLE_GUID { + GUID StableGuid; +} MOUNTDEV_STABLE_GUID, *PMOUNTDEV_STABLE_GUID; + +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + +/* FIXME : These definitions don't exist in the official header : */ +#define IOCTL_MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY CTL_CODE(MOUNTDEVCONTROLTYPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) +typedef struct _MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT { + ULONG Size; + USHORT OldUniqueIdOffset; + USHORT OldUniqueIdLength; + USHORT NewUniqueIdOffset; + USHORT NewUniqueIdLength; } MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT, *PMOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT; -typedef struct _MOUNTDEV_SUGGESTED_LINK_NAME -{ - BOOLEAN UseOnlyIfThereAreNoOtherLinks; - USHORT NameLength; - WCHAR Name[1]; -} MOUNTDEV_SUGGESTED_LINK_NAME, *PMOUNTDEV_SUGGESTED_LINK_NAME; -typedef struct _MOUNTDEV_UNIQUE_ID -{ - USHORT UniqueIdLength; - UCHAR UniqueId[1]; -} MOUNTDEV_UNIQUE_ID, *PMOUNTDEV_UNIQUE_ID; - -typedef struct _MOUNTDEV_STABLE_GUID -{ - GUID StableGuid; -} MOUNTDEV_STABLE_GUID, *PMOUNTDEV_STABLE_GUID; - -#endif +#endif /* _MOUNTDEV_ */ Modified: branches/header-work/include/ddk/mountmgr.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/mountmg… ============================================================================== --- branches/header-work/include/ddk/mountmgr.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/mountmgr.h [iso-8859-1] Mon Apr 19 12:31:22 2010 @@ -1,111 +1,43 @@ - #ifndef _MOUNTMGR_ #define _MOUNTMGR_ +#if (NTDDI_VERSION >= NTDDI_WIN2K) + +#if defined(DEFINE_GUID) DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID, 0x53F5630D, 0xB6BF, 0x11D0, 0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B); +#endif #define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager" #define MOUNTMGR_DOS_DEVICE_NAME L"\\\\.\\MountPointManager" #define MOUNTMGRCONTROLTYPE ((ULONG) 'm') #define MOUNTDEVCONTROLTYPE ((ULONG) 'M') -#define IOCTL_MOUNTMGR_CREATE_POINT \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_CREATE_POINT \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_DELETE_POINTS \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_QUERY_POINTS \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 6, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 6, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 7, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 7, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_CHANGE_NOTIFY \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 8, METHOD_BUFFERED, FILE_READ_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 8, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 9, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 9, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_MOUNTMGR_CHECK_UNPROCESSED_VOLUMES \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 11, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATHS \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 13, METHOD_BUFFERED, FILE_ANY_ACCESS) + CTL_CODE(MOUNTMGRCONTROLTYPE, 11, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME \ - CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct _MOUNTDEV_NAME -{ - USHORT NameLength; - WCHAR Name[1]; -} MOUNTDEV_NAME, *PMOUNTDEV_NAME; - -typedef struct _MOUNTMGR_MOUNT_POINT -{ - ULONG SymbolicLinkNameOffset; - USHORT SymbolicLinkNameLength; - ULONG UniqueIdOffset; - USHORT UniqueIdLength; - ULONG DeviceNameOffset; - USHORT DeviceNameLength; -} MOUNTMGR_MOUNT_POINT, *PMOUNTMGR_MOUNT_POINT; - -typedef struct _MOUNTMGR_CREATE_POINT_INPUT -{ - USHORT SymbolicLinkNameOffset; - USHORT SymbolicLinkNameLength; - USHORT DeviceNameOffset; - USHORT DeviceNameLength; -} MOUNTMGR_CREATE_POINT_INPUT, *PMOUNTMGR_CREATE_POINT_INPUT; - -typedef struct _MOUNTMGR_MOUNT_POINTS -{ - ULONG Size; - ULONG NumberOfMountPoints; - MOUNTMGR_MOUNT_POINT MountPoints[1]; -} MOUNTMGR_MOUNT_POINTS, *PMOUNTMGR_MOUNT_POINTS; - -typedef struct _MOUNTMGR_DRIVE_LETTER_INFORMATION -{ - BOOLEAN DriveLetterWasAssigned; - UCHAR CurrentDriveLetter; -} MOUNTMGR_DRIVE_LETTER_INFORMATION, *PMOUNTMGR_DRIVE_LETTER_INFORMATION; - -typedef struct _MOUNTMGR_DRIVE_LETTER_TARGET -{ - USHORT DeviceNameLength; - WCHAR DeviceName[1]; -} MOUNTMGR_DRIVE_LETTER_TARGET, *PMOUNTMGR_DRIVE_LETTER_TARGET; - -typedef struct _MOUNTMGR_CHANGE_NOTIFY_INFO { - ULONG EpicNumber; -} MOUNTMGR_CHANGE_NOTIFY_INFO, *PMOUNTMGR_CHANGE_NOTIFY_INFO; - -typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT -{ - USHORT SourceVolumeNameOffset; - USHORT SourceVolumeNameLength; - USHORT TargetVolumeNameOffset; - USHORT TargetVolumeNameLength; -} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT; - -typedef struct _MOUNTMGR_TARGET_NAME -{ - USHORT DeviceNameLength; - WCHAR DeviceName[1]; -} MOUNTMGR_TARGET_NAME, *PMOUNTMGR_TARGET_NAME; - -typedef struct _MOUNTMGR_VOLUME_PATHS -{ - ULONG MultiSzLength; - WCHAR MultiSz[1]; -} MOUNTMGR_VOLUME_PATHS, *PMOUNTMGR_VOLUME_PATHS; + CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #define MOUNTMGR_IS_DRIVE_LETTER(s) ((s)->Length == 28 && (s)->Buffer[0] == '\\' && (s)->Buffer[1] == 'D' && \ (s)->Buffer[2] == 'o' && (s)->Buffer[3] == 's' && (s)->Buffer[4] == 'D' && \ @@ -122,9 +54,112 @@ (s)->Buffer[19] == '-' && (s)->Buffer[24] == '-' && (s)->Buffer[29] == '-' && \ (s)->Buffer[34] == '-' && (s)->Buffer[47] == '}') +typedef struct _MOUNTMGR_CREATE_POINT_INPUT { + USHORT SymbolicLinkNameOffset; + USHORT SymbolicLinkNameLength; + USHORT DeviceNameOffset; + USHORT DeviceNameLength; +} MOUNTMGR_CREATE_POINT_INPUT, *PMOUNTMGR_CREATE_POINT_INPUT; + +typedef struct _MOUNTMGR_MOUNT_POINT { + ULONG SymbolicLinkNameOffset; + USHORT SymbolicLinkNameLength; + ULONG UniqueIdOffset; + USHORT UniqueIdLength; + ULONG DeviceNameOffset; + USHORT DeviceNameLength; +} MOUNTMGR_MOUNT_POINT, *PMOUNTMGR_MOUNT_POINT; + +typedef struct _MOUNTMGR_MOUNT_POINTS { + ULONG Size; + ULONG NumberOfMountPoints; + MOUNTMGR_MOUNT_POINT MountPoints[1]; +} MOUNTMGR_MOUNT_POINTS, *PMOUNTMGR_MOUNT_POINTS; + +typedef struct _MOUNTMGR_DRIVE_LETTER_TARGET { + USHORT DeviceNameLength; + WCHAR DeviceName[1]; +} MOUNTMGR_DRIVE_LETTER_TARGET, *PMOUNTMGR_DRIVE_LETTER_TARGET; + +typedef struct _MOUNTMGR_DRIVE_LETTER_INFORMATION { + BOOLEAN DriveLetterWasAssigned; + UCHAR CurrentDriveLetter; +} MOUNTMGR_DRIVE_LETTER_INFORMATION, *PMOUNTMGR_DRIVE_LETTER_INFORMATION; + +typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT { + USHORT SourceVolumeNameOffset; + USHORT SourceVolumeNameLength; + USHORT TargetVolumeNameOffset; + USHORT TargetVolumeNameLength; +} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT; + +typedef struct _MOUNTMGR_CHANGE_NOTIFY_INFO { + ULONG EpicNumber; +} MOUNTMGR_CHANGE_NOTIFY_INFO, *PMOUNTMGR_CHANGE_NOTIFY_INFO; + +typedef struct _MOUNTMGR_TARGET_NAME { + USHORT DeviceNameLength; + WCHAR DeviceName[1]; +} MOUNTMGR_TARGET_NAME, *PMOUNTMGR_TARGET_NAME; + +typedef struct _MOUNTDEV_NAME { + USHORT NameLength; + WCHAR Name[1]; +} MOUNTDEV_NAME, *PMOUNTDEV_NAME; + +#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +#define IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATHS \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 13, METHOD_BUFFERED, FILE_ANY_ACCESS) + #define MOUNTMGR_IS_DOS_VOLUME_NAME(s) (MOUNTMGR_IS_VOLUME_NAME(s) && (s)->Length == 96 && (s)->Buffer[1] == '\\') #define MOUNTMGR_IS_DOS_VOLUME_NAME_WB(s) (MOUNTMGR_IS_VOLUME_NAME(s) && (s)->Length == 98 && (s)->Buffer[1] == '\\') #define MOUNTMGR_IS_NT_VOLUME_NAME(s) ( MOUNTMGR_IS_VOLUME_NAME(s) && (s)->Length == 96 && (s)->Buffer[1] == '?') #define MOUNTMGR_IS_NT_VOLUME_NAME_WB(s) (MOUNTMGR_IS_VOLUME_NAME(s) && (s)->Length == 98 && (s)->Buffer[1] == '?') + +typedef struct _MOUNTMGR_VOLUME_PATHS { + ULONG MultiSzLength; + WCHAR MultiSz[1]; +} MOUNTMGR_VOLUME_PATHS, *PMOUNTMGR_VOLUME_PATHS; + +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + +#if (NTDDI_VERSION >= NTDDI_WS03) + +#define IOCTL_MOUNTMGR_SCRUB_REGISTRY \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 14, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_QUERY_AUTO_MOUNT \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 15, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTMGR_SET_AUTO_MOUNT \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 16, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +typedef enum _MOUNTMGR_AUTO_MOUNT_STATE { + Disabled = 0, + Enabled +} MOUNTMGR_AUTO_MOUNT_STATE; + +typedef struct _MOUNTMGR_QUERY_AUTO_MOUNT { + MOUNTMGR_AUTO_MOUNT_STATE CurrentState; +} MOUNTMGR_QUERY_AUTO_MOUNT, *PMOUNTMGR_QUERY_AUTO_MOUNT; + +typedef struct _MOUNTMGR_SET_AUTO_MOUNT { + MOUNTMGR_AUTO_MOUNT_STATE NewState; +} MOUNTMGR_SET_AUTO_MOUNT, *PMOUNTMGR_SET_AUTO_MOUNT; + +#endif /* (NTDDI_VERSION >= NTDDI_WS03) */ + +#if (NTDDI_VERSION >= NTDDI_WIN7) + +#define IOCTL_MOUNTMGR_BOOT_DL_ASSIGNMENT \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 17, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_TRACELOG_CACHE \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 18, METHOD_BUFFERED, FILE_READ_ACCESS) + #endif +#endif /* _MOUNTMGR_ */ +

14 years, 5 months

[jgardou] 46935: [WIN32K] - Finally get rid of SURFACE::BitsLock

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Apr 19 02:56:25 2010 New Revision: 46935 URL: http://svn.reactos.org/svn/reactos?rev=46935&view=rev Log: [WIN32K] - Finally get rid of SURFACE::BitsLock Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/eng/copybits.c branches/reactos-yarotows/subsystems/win32/win32k/eng/gradient.c branches/reactos-yarotows/subsystems/win32/win32k/eng/lineto.c branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c branches/reactos-yarotows/subsystems/win32/win32k/eng/paint.c branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/eng/transblt.c branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -305,11 +305,6 @@ return TRUE; } - SURFACE_LockBitmapBits(psurfDest); - - if (psoSource != psoDest) - SURFACE_LockBitmapBits(psurfSource); - /* Call the driver's DrvAlphaBlend if available */ if (psurfDest->flHooks & HOOK_ALPHABLEND) { @@ -323,10 +318,6 @@ ret = EngAlphaBlend(psoDest, psoSource, ClipRegion, ColorTranslation, DestRect, SourceRect, BlendObj); } - - if (psoSource != psoDest) - SURFACE_UnlockBitmapBits(psurfSource); - SURFACE_UnlockBitmapBits(psurfDest); return ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -582,19 +582,6 @@ psurfSrc = NULL; } - if (bRemoveMouse) - { - SURFACE_LockBitmapBits(psurfTrg); - - if (psoSrc) - { - if (psoSrc != psoTrg) - { - SURFACE_LockBitmapBits(psurfSrc); - } - } - } - /* Is the target surface device managed? */ if (psurfTrg->flHooks & HOOK_BITBLT) { @@ -631,18 +618,6 @@ rop4); // FIXME: cleanup temp surface! - - if (bRemoveMouse) - { - if (psoSrc) - { - if (psoSrc != psoTrg) - { - SURFACE_UnlockBitmapBits(psurfSrc); - } - } - SURFACE_UnlockBitmapBits(psurfTrg); - } return bResult; } @@ -972,8 +947,6 @@ ASSERT(psoDest); psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); - SURFACE_LockBitmapBits(psurfDest); - /* Dummy BitBlt to let driver know that it should flush its changes. This should really be done using a call to DrvSynchronizeSurface, but the VMware driver doesn't hook that call. */ @@ -989,8 +962,6 @@ DestRect, pptlMask, pptlMask, pbo, BrushOrigin, R4_NOOP, FALSE); - SURFACE_UnlockBitmapBits(psurfDest); - return ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -53,13 +53,7 @@ ASSERT(psoDest != NULL && psoSource != NULL && DestRect != NULL && SourcePoint != NULL); psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); - SURFACE_LockBitmapBits(psurfSource); - psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); - if (psoDest != psoSource) - { - SURFACE_LockBitmapBits(psurfDest); - } // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, // mark the copy block function to be DrvCopyBits instead of the @@ -180,12 +174,6 @@ } cleanup: - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - return ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -548,7 +548,6 @@ psurf = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); ASSERT(psurf); - SURFACE_LockBitmapBits(psurf); if(psurf->flHooks & HOOK_GRADIENTFILL) { Ret = GDIDEVFUNCS(psoDest).GradientFill( @@ -560,7 +559,6 @@ Ret = EngGradientFill(psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, pptlDitherOrg, ulMode); } - SURFACE_UnlockBitmapBits(psurf); return Ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/lineto.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/lineto.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -565,8 +565,6 @@ if (b.left == b.right) b.right++; if (b.top == b.bottom) b.bottom++; - SURFACE_LockBitmapBits(psurfDest); - if (psurfDest->flHooks & HOOK_LINETO) { /* Call the driver's DrvLineTo */ @@ -585,8 +583,6 @@ { ret = EngLineTo(psoDest, ClipObj, pbo, x1, y1, x2, y2, RectBounds, Mix); } - - SURFACE_UnlockBitmapBits(psurfDest); return ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -540,14 +540,13 @@ IN LONG y, IN RECTL *prcl) { - SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; if(ppdev->SafetyRemoveLevel) return ; - SURFACE_LockBitmapBits(psurf); + EngAcquireSemaphore(ppdev->hsemDevLock); ppdev->pfnMovePointer(pso, x, y, prcl); - SURFACE_UnlockBitmapBits(psurf); + EngReleaseSemaphore(ppdev->hsemDevLock); } ULONG APIENTRY @@ -564,13 +563,12 @@ IN FLONG fl) { ULONG ulResult = SPS_DECLINE; - SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); PFN_DrvSetPointerShape pfnSetPointerShape; PPDEVOBJ ppdev = GDIDEV(pso); pfnSetPointerShape = GDIDEVFUNCS(pso).SetPointerShape; - SURFACE_LockBitmapBits(psurf); + EngAcquireSemaphore(ppdev->hsemDevLock); if (pfnSetPointerShape) { ulResult = pfnSetPointerShape(pso, @@ -608,7 +606,7 @@ ppdev->pfnMovePointer = EngMovePointer; } - SURFACE_UnlockBitmapBits(psurf); + EngReleaseSemaphore(ppdev->hsemDevLock); return ulResult; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/paint.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/paint.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/paint.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -32,7 +32,7 @@ #define NDEBUG #include <debug.h> -static BOOL APIENTRY FillSolidUnlocked(SURFOBJ *pso, PRECTL pRect, ULONG iColor) +BOOL APIENTRY FillSolid(SURFOBJ *pso, PRECTL pRect, ULONG iColor) { LONG y; ULONG LineWidth; @@ -41,7 +41,6 @@ ASSERT(pso); ASSERT(pRect); psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); - MouseSafetyOnDrawStart(pso, pRect->left, pRect->top, pRect->right, pRect->bottom); LineWidth = pRect->right - pRect->left; DPRINT(" LineWidth: %d, top: %d, bottom: %d\n", LineWidth, pRect->top, pRect->bottom); for (y = pRect->top; y < pRect->bottom; y++) @@ -49,20 +48,7 @@ DibFunctionsForBitmapFormat[pso->iBitmapFormat].DIB_HLine( pso, pRect->left, pRect->right, y, iColor); } - MouseSafetyOnDrawEnd(pso); - return TRUE; -} - -BOOL APIENTRY FillSolid(SURFOBJ *pso, PRECTL pRect, ULONG iColor) -{ - SURFACE *psurf; - BOOL Result; - psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); - SURFACE_LockBitmapBits(psurf); - Result = FillSolidUnlocked(pso, pRect, iColor); - SURFACE_UnlockBitmapBits(psurf); - return Result; } BOOL APIENTRY @@ -87,7 +73,7 @@ if (ClipRegion->iDComplexity == DC_RECT) { - FillSolidUnlocked(pso, &(ClipRegion->rclBounds), iColor); + FillSolid(pso, &(ClipRegion->rclBounds), iColor); } else { /* Enumerate all the rectangles and draw them */ @@ -96,7 +82,7 @@ do { EnumMore = CLIPOBJ_bEnum(ClipRegion, sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c; i++) { - FillSolidUnlocked(pso, RectEnum.arcl + i, iColor); + FillSolid(pso, RectEnum.arcl + i, iColor); } } while (EnumMore); } @@ -141,11 +127,8 @@ if((pso->iType!=STYPE_BITMAP) && (psurf->flHooks & HOOK_PAINT)) { // Call the driver's DrvPaint - SURFACE_LockBitmapBits(psurf); - ret = GDIDEVFUNCS(pso).Paint( pso, ClipRegion, Brush, BrushOrigin, Mix); - SURFACE_UnlockBitmapBits(psurf); return ret; } return EngPaint(pso, ClipRegion, Brush, BrushOrigin, Mix ); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -373,15 +373,12 @@ goto leave; } - ASSERT(pSurface->BitsLock); - /* 4. Get DirectDraw information */ /* 5. Enable DirectDraw Not traced */ /* 6. Copy old PDEV state to new PDEV instance */ /* 7. Switch the PDEVs */ PDEVOBJ_vSwitchPdev(ppdev, ppdevTmp); - ASSERT(ppdev->pSurface->BitsLock); /* 8. Disable DirectDraw */ @@ -395,7 +392,6 @@ EngReleaseSemaphore(ghsemPDEV); DPRINT1("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); - ASSERT(ppdev->pSurface->BitsLock); return retval; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -462,15 +462,10 @@ /* No success yet */ ret = FALSE; - SURFACE_LockBitmapBits(psurfDest); if (UsesSource) { psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); - if (psoSource != psoDest) - { - SURFACE_LockBitmapBits(psurfSource); - } } /* Prepare color adjustment */ @@ -509,15 +504,6 @@ pbo, ROP); } - - if (UsesSource) - { - if (psoSource != psoDest) - { - SURFACE_UnlockBitmapBits(psurfSource); - } - } - SURFACE_UnlockBitmapBits(psurfDest); return ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -136,41 +136,8 @@ } } - if (NULL != psurf->BitsLock) - { - ExFreePoolWithTag(psurf->BitsLock, TAG_SURFACE); - psurf->BitsLock = NULL; - } - return TRUE; } - -BOOL INTERNAL_CALL -SURFACE_InitBitsLock(PSURFACE psurf) -{ - psurf->BitsLock = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FAST_MUTEX), - TAG_SURFACE); - if (NULL == psurf->BitsLock) - { - return FALSE; - } - - ExInitializeFastMutex(psurf->BitsLock); - - return TRUE; -} - -void INTERNAL_CALL -SURFACE_CleanupBitsLock(PSURFACE psurf) -{ - if (NULL != psurf->BitsLock) - { - ExFreePoolWithTag(psurf->BitsLock, TAG_SURFACE); - psurf->BitsLock = NULL; - } -} - /* * @implemented @@ -348,12 +315,6 @@ } hbmp = psurf->BaseObject.hHmgr; - if (! SURFACE_InitBitsLock(psurf)) - { - SURFACE_UnlockSurface(psurf); - SURFACE_FreeSurfaceByHandle(hbmp); - return 0; - } pso = &psurf->SurfObj; if (Format == BMF_4RLE) @@ -436,7 +397,7 @@ psurf->flFlags = 0; psurf->dimension.cx = 0; psurf->dimension.cy = 0; - + psurf->hSecure = NULL; psurf->hDIBSection = NULL; @@ -526,7 +487,7 @@ /* The height times the bytes for each scanline */ Size = BitmapInfo->Height * ScanLine; } - + if (Size) { /* Check for allocation flag */ @@ -564,15 +525,6 @@ else EngFreeMem(Bits); } - return NULL; - } - - /* Lock down the surface */ - if (!SURFACE_InitBitsLock(psurf)) - { - /* Bail out if that failed */ - SURFACE_UnlockSurface(psurf); - SURFACE_FreeSurfaceByHandle(psurf->BaseObject.hHmgr); return NULL; } @@ -588,7 +540,7 @@ LocalSize.cx = BitmapInfo->Width; pso->sizlBitmap = LocalSize; pso->iType = STYPE_BITMAP; - + /* Device-managed surface, no flags or dimension */ pso->dhsurf = 0; pso->dhpdev = NULL; @@ -599,10 +551,10 @@ psurf->hSecure = NULL; psurf->hDIBSection = NULL; psurf->flHooks = 0; - + /* Set bits */ pso->pvBits = Bits; - + /* Check for bitmap type */ if (!Compressed) { @@ -626,7 +578,7 @@ /* Compressed surfaces don't have scanlines! */ pso->lDelta = 0; pso->cjBits = BitmapInfo->Size; - + /* Check for JPG or PNG */ if ((BitmapInfo->Format != BMF_JPEG) && (BitmapInfo->Format != BMF_PNG)) { @@ -640,11 +592,11 @@ ASSERT(FALSE); // ENGDDI shouldn't be creating PNGs for drivers ;-) } } - + /* Finally set the handle and uniq */ pso->hsurf = (HSURF)psurf->BaseObject.hHmgr; pso->iUniq = 0; - + /* Unlock and return the surface */ SURFACE_UnlockSurface(psurf); return pso; @@ -663,7 +615,7 @@ { SURFOBJ* Surface; DEVBITMAPINFO BitmapInfo; - + /* Capture the parameters */ BitmapInfo.Format = Format; BitmapInfo.Width = Size.cx; @@ -700,7 +652,7 @@ break; } } - + /* Now create the surface */ Surface = SURFMEM_bCreateDib(&BitmapInfo, Bits); if (!Surface) return 0; @@ -731,12 +683,6 @@ hsurf = psurf->BaseObject.hHmgr; GDIOBJ_SetOwnership(hsurf, NULL); - if (!SURFACE_InitBitsLock(psurf)) - { - SURFACE_UnlockSurface(psurf); - SURFACE_FreeSurfaceByHandle(hsurf); - return 0; - } pso = &psurf->SurfObj; pso->dhsurf = dhsurf; Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/transblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/transblt.c [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -284,12 +284,6 @@ OutputRect = InputClippedRect; } - if(psoSource != psoDest) - { - SURFACE_LockBitmapBits(psurfSource); - } - SURFACE_LockBitmapBits(psurfDest); - if(psurfDest->flHooks & HOOK_TRANSPARENTBLT) { Ret = GDIDEVFUNCS(psoDest).TransparentBlt( @@ -305,12 +299,6 @@ &OutputRect, &InputRect, iTransColor, Reserved); } - SURFACE_UnlockBitmapBits(psurfDest); - if(psoSource != psoDest) - { - SURFACE_UnlockBitmapBits(psurfSource); - } - return Ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] Mon Apr 19 02:56:25 2010 @@ -26,7 +26,7 @@ to get width/height of bitmap, use bitmap.bmWidth/bitmap.bmHeight for that */ - + HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. ULONG cRef; // 0x064 HPALETTE hpalHint; @@ -37,8 +37,6 @@ DWORD dwOffset; /* reactos specific */ - PFAST_MUTEX BitsLock; /* You need to hold this lock before you touch - the actual bits in the bitmap */ HPALETTE hDIBPalette; DWORD dsBitfields[3]; // hack, should probably use palette instead DWORD biClrUsed; @@ -64,12 +62,7 @@ #define SURFACE_ShareUnlockSurface(pBMObj) \ GDIOBJ_ShareUnlockObjByPtr ((POBJ)pBMObj) -#define SURFACE_LockBitmapBits(pBMObj) ExEnterCriticalRegionAndAcquireFastMutexUnsafe((pBMObj)->BitsLock) -#define SURFACE_UnlockBitmapBits(pBMObj) ExReleaseFastMutexUnsafeAndLeaveCriticalRegion((pBMObj)->BitsLock) - BOOL INTERNAL_CALL SURFACE_Cleanup(PVOID ObjectBody); -BOOL INTERNAL_CALL SURFACE_InitBitsLock(SURFACE *pBMObj); -void INTERNAL_CALL SURFACE_CleanupBitsLock(SURFACE *pBMObj); #define GDIDEV(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev)) #define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions

14 years, 5 months

[jgardou] 46934: [WIN32k] - Don't hold the DC blit lock during the whole GreTextOutW function.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Apr 19 02:51:32 2010 New Revision: 46934 URL: http://svn.reactos.org/svn/reactos?rev=46934&view=rev Log: [WIN32k] - Don't hold the DC blit lock during the whole GreTextOutW function. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Apr 19 02:51:32 2010 @@ -3187,9 +3187,6 @@ return TRUE; } - /* FIXME : This is ugly, but this function must be rewritten anyway */ - DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds, NULL, DestRect); - pdcattr = dc->pdcattr; if (pdcattr->ulDirty_ & DIRTY_TEXT) @@ -3262,6 +3259,8 @@ DestRect.top += dc->ptlDCOrig.y; DestRect.right += dc->ptlDCOrig.x; DestRect.bottom += dc->ptlDCOrig.y; + + DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect); IntEngBitBlt( &psurf->SurfObj, @@ -3276,6 +3275,7 @@ &BrushOrigin, ROP3_TO_ROP4(PATCOPY)); fuOptions &= ~ETO_OPAQUE; + DC_vFinishBlit(dc, NULL); } else { @@ -3454,7 +3454,6 @@ /* * The main rendering loop. */ - for (i = 0; i < Count; i++) { if (fuOptions & ETO_GLYPH_INDEX) @@ -3503,6 +3502,7 @@ DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6); DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6); + DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect); IntEngBitBlt( &psurf->SurfObj, NULL, @@ -3515,7 +3515,9 @@ &dc->eboBackground.BrushObject, &BrushOrigin, ROP3_TO_ROP4(PATCOPY)); + DC_vFinishBlit(dc, NULL); BackgroundLeft = DestRect.right; + } DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left; @@ -3568,7 +3570,7 @@ DestRect.right = lprc->right + dc->ptlDCOrig.x; DoBreak = TRUE; } - + DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect); IntEngMaskBlt( SurfObj, SourceGlyphSurf, @@ -3579,6 +3581,7 @@ (PPOINTL)&MaskRect, &dc->eboText.BrushObject, &BrushOrigin); + DC_vFinishBlit(dc, NULL); EngUnlockSurface(SourceGlyphSurf); EngDeleteSurface((HSURF)HSourceGlyph); @@ -3608,7 +3611,6 @@ String++; } - IntUnLockFreeType; EXLATEOBJ_vCleanup(&exloRGB2Dst); @@ -3616,7 +3618,6 @@ if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); good: - DC_vFinishBlit(dc, NULL); DC_UnlockDc( dc ); return TRUE; @@ -3627,7 +3628,7 @@ fail: if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); - DC_vFinishBlit(dc, NULL); + DC_UnlockDc(dc); return FALSE;

14 years, 5 months

[jgardou] 46933: [WIN32K] - Do not draw mouse when it has intentionnally been put away. Fixes some mouse-related graphical glitches

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Apr 19 02:11:30 2010 New Revision: 46933 URL: http://svn.reactos.org/svn/reactos?rev=46933&view=rev Log: [WIN32K] - Do not draw mouse when it has intentionnally been put away. Fixes some mouse-related graphical glitches Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Mon Apr 19 02:11:30 2010 @@ -385,7 +385,7 @@ pgp->HotSpot.y = yHot; /* Calculate lDelta for our surfaces. */ - lDelta = DIB_GetDIBWidthBytes(pgp->Size.cx, + lDelta = DIB_GetDIBWidthBytes(pgp->Size.cx, BitsPerFormat(pso->iBitmapFormat)); rcl.left = 0; @@ -526,7 +526,7 @@ prcl->right = prcl->left + pgp->Size.cx; prcl->bottom = prcl->top + pgp->Size.cy; } - } + } else if (prcl != NULL) { prcl->left = prcl->top = prcl->right = prcl->bottom = -1; @@ -542,6 +542,8 @@ { SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + if(ppdev->SafetyRemoveLevel) + return ; SURFACE_LockBitmapBits(psurf); ppdev->pfnMovePointer(pso, x, y, prcl); @@ -654,7 +656,7 @@ { /* We have one, lock it */ psurfColor = SURFACE_ShareLockSurface(hbmColor); - + if (psurfColor) { /* Create an XLATEOBJ, no mono support */

14 years, 5 months

[jgardou] 46932: [WIN32K] - call DC_vPrepareDCsForBlit / DC_vFinishBlit in the right place

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Apr 19 01:48:11 2010 New Revision: 46932 URL: http://svn.reactos.org/svn/reactos?rev=46932&view=rev Log: [WIN32K] - call DC_vPrepareDCsForBlit / DC_vFinishBlit in the right place Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/line.c branches/reactos-yarotows/subsystems/win32/win32k/objects/path.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/line.c [iso-8859-1] Mon Apr 19 01:48:11 2010 @@ -435,8 +435,6 @@ dc = DC_LockDc(hdc); if (!dc) return FALSE; pdcattr = dc->pdcattr; - DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds, - NULL, dc->rosdc.CombinedClip->rclBounds); _SEH2_TRY { @@ -503,7 +501,6 @@ } _SEH2_END; - DC_vFinishBlit(dc, NULL); DC_UnlockDc(dc); return result; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/path.c [iso-8859-1] Mon Apr 19 01:48:11 2010 @@ -2622,7 +2622,12 @@ if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) DC_vUpdateLineBrush(pDc); + DC_vPrepareDCsForBlit(pDc, pDc->rosdc.CombinedClip->rclBounds, + NULL, pDc->rosdc.CombinedClip->rclBounds); + bRet = PATH_StrokePath(pDc, pPath); + + DC_vFinishBlit(pDc, NULL); PATH_EmptyPath(pPath); PATH_UnlockPath( pPath );

14 years, 5 months

[dreimer] 46931: Update winhlp32 to Wine 1.1.43

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Apr 19 01:16:10 2010 New Revision: 46931 URL: http://svn.reactos.org/svn/reactos?rev=46931&view=rev Log: Update winhlp32 to Wine 1.1.43 Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] Mon Apr 19 01:16:10 2010 @@ -492,7 +492,7 @@ int leaf, void** next) { *next = (char *)p+strlen(p)+(leaf?5:3); - WINE_TRACE("Comparing '%s' with '%s'\n", (char *)p, (char *)key); + WINE_TRACE("Comparing '%s' with '%s'\n", (char *)p, (const char *)key); return strcmp(p, key); } @@ -1601,7 +1601,7 @@ case 0xEE: case 0xEF: { - char* ptr = (char*) format + 8; + const char* ptr = (const char*) format + 8; BYTE type = format[3]; int wnd = -1;

14 years, 5 months

[jgardou] 46930: [WIN32K] - Do not create a PDEVOBJ for nothing at startup - Create the surface for real in IntCreatePrimarySurface

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Apr 19 01:15:02 2010 New Revision: 46930 URL: http://svn.reactos.org/svn/reactos?rev=46930&view=rev Log: [WIN32K] - Do not create a PDEVOBJ for nothing at startup - Create the surface for real in IntCreatePrimarySurface Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c branches/reactos-yarotows/subsystems/win32/win32k/objects/device.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Mon Apr 19 01:15:02 2010 @@ -24,22 +24,18 @@ InitMetrics(VOID) { INT *piSysMet; - PPDEVOBJ ppdev; ULONG Width, Height; /* FIXME: HACK, due to missing PDEV on first init */ - ppdev = EngpGetPDEV(NULL); - - if (!ppdev) + if (!pPrimarySurface) { Width = 640; Height = 480; } else { - Width = ppdev->gdiinfo.ulHorzRes; - Height = ppdev->gdiinfo.ulVertRes; - PDEVOBJ_vRelease(ppdev); + Width = pPrimarySurface->gdiinfo.ulHorzRes; + Height = pPrimarySurface->gdiinfo.ulVertRes; } piSysMet = gpsi->aiSysMet; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Mon Apr 19 01:15:02 2010 @@ -45,7 +45,7 @@ Dc->rosdc.hGCClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); if (Dc->rosdc.hClipRgn == NULL) - NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, ((PROSRGNDATA)Dc->prgnVis)->BaseObject.hHmgr, 0, RGN_COPY); + NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, hRgnVis, 0, RGN_COPY); else // FYI: Vis == NULL! source of "IntGdiCombineRgn requires hSrc2 != NULL for combine mode 1!" NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, Dc->rosdc.hClipRgn, hRgnVis, RGN_AND); NtGdiOffsetRgn(Dc->rosdc.hGCClipRgn, Dc->ptlDCOrig.x, Dc->ptlDCOrig.y); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/device.c [iso-8859-1] Mon Apr 19 01:15:02 2010 @@ -41,10 +41,11 @@ /* attach monitor */ IntAttachMonitor(gppdevPrimary, 0); -DPRINT1("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", + DPRINT1("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", pPrimarySurface, pPrimarySurface->pSurface); - pso = &pPrimarySurface->pSurface->SurfObj; + /* Create surface */ + pso = &PDEVOBJ_pSurface(pPrimarySurface)->SurfObj; SurfSize = pso->sizlBitmap; /* Put the pointer in the center of the screen */

14 years, 5 months

[mkupfer] 46929: - Once again, fix INF files

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Mon Apr 19 01:02:14 2010 New Revision: 46929 URL: http://svn.reactos.org/svn/reactos?rev=46929&view=rev Log: - Once again, fix INF files Modified: trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=4692… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4692… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available.

14 years, 5 months

[fireball] 46928: Samuel Serapion - Add IdlInterface module type.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 18 20:22:29 2010 New Revision: 46928 URL: http://svn.reactos.org/svn/reactos?rev=46928&view=rev Log: Samuel Serapion - Add IdlInterface module type. Modified: trunk/reactos/tools/sysgen/RosFramework/RBuildModule.cs trunk/reactos/tools/sysgen/SysGen.BuildEngine/Tasks/RBuild/ModuleTask.cs Modified: trunk/reactos/tools/sysgen/RosFramework/RBuildModule.cs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysgen/RosFramework/… ============================================================================== --- trunk/reactos/tools/sysgen/RosFramework/RBuildModule.cs [iso-8859-1] (original) +++ trunk/reactos/tools/sysgen/RosFramework/RBuildModule.cs [iso-8859-1] Sun Apr 18 20:22:29 2010 @@ -224,6 +224,7 @@ case ModuleType.Alias: case ModuleType.BootProgram: case ModuleType.IdlHeader: + case ModuleType.IdlInterface: case ModuleType.MessageHeader: case ModuleType.Package: case ModuleType.ModuleGroup: @@ -234,7 +235,7 @@ case ModuleType.Cabinet: return ".cab"; default: - throw new Exception("Unknown module type"); + throw new Exception("Unknown Module Type: " + Type.ToString()); } } } @@ -431,6 +432,7 @@ case ModuleType.RpcProxy: case ModuleType.Alias: case ModuleType.IdlHeader: + case ModuleType.IdlInterface: case ModuleType.MessageHeader: case ModuleType.EmbeddedTypeLib: case ModuleType.Cabinet: @@ -439,7 +441,7 @@ case ModuleType.PlatformProfile: return false; default: - throw new Exception("Unknown Module Type"); + throw new Exception("Unknown Module Type: " + Type.ToString()); } } } @@ -479,6 +481,7 @@ case ModuleType.RpcProxy: case ModuleType.Alias: case ModuleType.IdlHeader: + case ModuleType.IdlInterface: case ModuleType.MessageHeader: case ModuleType.EmbeddedTypeLib: case ModuleType.Cabinet: @@ -487,7 +490,7 @@ case ModuleType.PlatformProfile: return false; default: - throw new Exception("Unknown Module Type"); + throw new Exception("Unknown Module Type: " + Type.ToString()); } } } @@ -531,6 +534,7 @@ case ModuleType.Alias: case ModuleType.BootProgram: case ModuleType.IdlHeader: + case ModuleType.IdlInterface: case ModuleType.MessageHeader: case ModuleType.EmbeddedTypeLib: case ModuleType.Cabinet: @@ -539,7 +543,7 @@ case ModuleType.PlatformProfile: return string.Empty; default: - throw new Exception("Unknown Module Type"); + throw new Exception("Unknown Module Type: " + Type.ToString()); } } } @@ -593,6 +597,7 @@ case ModuleType.Alias: case ModuleType.BootProgram: case ModuleType.IdlHeader: + case ModuleType.IdlInterface: case ModuleType.MessageHeader: case ModuleType.EmbeddedTypeLib: case ModuleType.Cabinet: @@ -601,7 +606,7 @@ case ModuleType.PlatformProfile: return string.Empty; default: - throw new Exception("Unknown Module Type"); + throw new Exception("Unknown Module Type: " + Type.ToString()); } } } Modified: trunk/reactos/tools/sysgen/SysGen.BuildEngine/Tasks/RBuild/ModuleTask.cs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysgen/SysGen.BuildE… ============================================================================== --- trunk/reactos/tools/sysgen/SysGen.BuildEngine/Tasks/RBuild/ModuleTask.cs [iso-8859-1] (original) +++ trunk/reactos/tools/sysgen/SysGen.BuildEngine/Tasks/RBuild/ModuleTask.cs [iso-8859-1] Sun Apr 18 20:22:29 2010 @@ -176,6 +176,7 @@ (Module.Type == ModuleType.BootSector) || (Module.Type == ModuleType.EmbeddedTypeLib) || (Module.Type == ModuleType.IdlHeader) || + (Module.Type == ModuleType.IdlInterface) || (Module.Type == ModuleType.Kernel) || (Module.Type == ModuleType.KernelModeDLL) || (Module.Type == ModuleType.KernelModeDriver) ||

14 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2010