Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49309: [WIN32K] Fix possible NULL pointer dereferences. Spotted by Amine Khaldi.
by tkreuzer＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: tkreuzer Date: Wed Oct 27 17:08:40 2010 New Revision: 49309 URL: http://svn.reactos.org/svn/reactos?rev=49309&view=rev Log: [WIN32K] Fix possible NULL pointer dereferences. Spotted by Amine Khaldi. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Wed Oct 27 17:08:40 2010 @@ -941,6 +941,12 @@ VscVkTable = KeyboardLayout->pVSCtoVK_E1; } + if (!VscVkTable) + { + DPRINT1("somethings wrong, Prefix=0x%x", Prefix); + return; + } + RawVk = 0xff; while (VscVkTable->Vsc) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Wed Oct 27 17:08:40 2010 @@ -2492,18 +2492,23 @@ UserEnterExclusive(); /* Validate input */ - if (hWnd && (hWnd != INVALID_HANDLE_VALUE) && !(Window = UserGetWindowObject(hWnd))) - { - UserLeave(); - return FALSE; - } + if (hWnd && (hWnd != INVALID_HANDLE_VALUE)) + { + Window = UserGetWindowObject(hWnd); + if (!Window) + { + UserLeave(); + return FALSE; + } + } + switch(dwType) { case FNID_DEFWINDOWPROC: - UserRefObjectCo(Window, &Ref); + if (Window) UserRefObjectCo(Window, &Ref); lResult = IntDefWindowProc(Window, Msg, wParam, lParam, Ansi); Ret = TRUE; - UserDerefObjectCo(Window); + if (Window) UserDerefObjectCo(Window); break; case FNID_SENDNOTIFYMESSAGE: Ret = UserSendNotifyMessage(hWnd, Msg, wParam, lParam);

1 0

[tkreuzer] 49308: [FORMATTING] - Apply consistent indentation of 4 spaces and ansi style formatting. - Remove the long GPL header
by tkreuzer＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: tkreuzer Date: Wed Oct 27 15:59:48 2010 New Revision: 49308 URL: http://svn.reactos.org/svn/reactos?rev=49308&view=rev Log: [FORMATTING] - Apply consistent indentation of 4 spaces and ansi style formatting. - Remove the long GPL header Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Wed Oct 27 15:59:48 2010 @@ -1,21 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Monitor support @@ -48,18 +31,18 @@ NTSTATUS InitMonitorImpl() { - DPRINT("Initializing monitor implementation...\n"); - - return STATUS_SUCCESS; + DPRINT("Initializing monitor implementation...\n"); + + return STATUS_SUCCESS; } NTSTATUS CleanupMonitorImpl() { - DPRINT("Cleaning up monitor implementation...\n"); - /* FIXME: Destroy monitor objects? */ - - return STATUS_SUCCESS; + DPRINT("Cleaning up monitor implementation...\n"); + /* FIXME: Destroy monitor objects? */ + + return STATUS_SUCCESS; } /* PRIVATE FUNCTIONS **********************************************************/ @@ -86,18 +69,18 @@ PMONITOR IntCreateMonitorObject() { - HANDLE Handle; - PMONITOR Monitor; - - Monitor = UserCreateObject(gHandleTable, NULL, &Handle, otMonitor, sizeof (MONITOR)); - if (Monitor == NULL) - { - return NULL; - } - - ExInitializeFastMutex(&Monitor->Lock); - - return Monitor; + HANDLE Handle; + PMONITOR Monitor; + + Monitor = UserCreateObject(gHandleTable, NULL, &Handle, otMonitor, sizeof (MONITOR)); + if (Monitor == NULL) + { + return NULL; + } + + ExInitializeFastMutex(&Monitor->Lock); + + return Monitor; } /* IntDestroyMonitorObject @@ -114,33 +97,32 @@ void IntDestroyMonitorObject(IN PMONITOR pMonitor) { - RtlFreeUnicodeString(&pMonitor->DeviceName); - UserDereferenceObject(pMonitor); + RtlFreeUnicodeString(&pMonitor->DeviceName); + UserDereferenceObject(pMonitor); } PMONITOR FASTCALL UserGetMonitorObject(IN HMONITOR hMonitor) { - PMONITOR Monitor; - - if (!hMonitor) - { - SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); - return NULL; - } - - - Monitor = (PMONITOR)UserGetObject(gHandleTable, hMonitor, otMonitor); - if (!Monitor) - { - SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); - return NULL; - } - - ASSERT(Monitor->head.cLockObj >= 0); - - return Monitor; + PMONITOR Monitor; + + if (!hMonitor) + { + SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); + return NULL; + } + + Monitor = (PMONITOR)UserGetObject(gHandleTable, hMonitor, otMonitor); + if (!Monitor) + { + SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); + return NULL; + } + + ASSERT(Monitor->head.cLockObj >= 0); + + return Monitor; } @@ -160,58 +142,58 @@ IntAttachMonitor(IN PDEVOBJ *pGdiDevice, IN ULONG DisplayNumber) { - PMONITOR Monitor; - WCHAR Buffer[CCHDEVICENAME]; - - DPRINT("Attaching monitor...\n"); - - /* create new monitor object */ - Monitor = IntCreateMonitorObject(); - if (Monitor == NULL) - { - DPRINT("Couldnt create monitor object\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - _snwprintf(Buffer, CCHDEVICENAME, L"\\\\.\\DISPLAY%d", DisplayNumber + 1); - if (!RtlCreateUnicodeString(&Monitor->DeviceName, Buffer)) - { - DPRINT("Couldn't duplicate monitor name!\n"); - UserDereferenceObject(Monitor); - UserDeleteObject(UserHMGetHandle(Monitor), otMonitor); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Monitor->GdiDevice = pGdiDevice; - Monitor->rcMonitor.left = 0; - Monitor->rcMonitor.top = 0; - Monitor->rcMonitor.right = Monitor->rcMonitor.left + pGdiDevice->gdiinfo.ulHorzRes; - Monitor->rcMonitor.bottom = Monitor->rcMonitor.top + pGdiDevice->gdiinfo.ulVertRes; - Monitor->rcWork = Monitor->rcMonitor; - Monitor->cWndStack = 0; - - Monitor->hrgnMonitor = IntSysCreateRectRgnIndirect( &Monitor->rcMonitor ); - - IntGdiSetRegionOwner(Monitor->hrgnMonitor, GDI_OBJ_HMGR_PUBLIC); - - if (gMonitorList == NULL) - { - DPRINT("Primary monitor is beeing attached\n"); - Monitor->IsPrimary = TRUE; - gMonitorList = Monitor; - } - else - { - PMONITOR p; - DPRINT("Additional monitor is beeing attached\n"); - for (p = gMonitorList; p->Next != NULL; p = p->Next) - { - p->Next = Monitor; - } - Monitor->Prev = p; - } - - return STATUS_SUCCESS; + PMONITOR Monitor; + WCHAR Buffer[CCHDEVICENAME]; + + DPRINT("Attaching monitor...\n"); + + /* create new monitor object */ + Monitor = IntCreateMonitorObject(); + if (Monitor == NULL) + { + DPRINT("Couldnt create monitor object\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + _snwprintf(Buffer, CCHDEVICENAME, L"\\\\.\\DISPLAY%d", DisplayNumber + 1); + if (!RtlCreateUnicodeString(&Monitor->DeviceName, Buffer)) + { + DPRINT("Couldn't duplicate monitor name!\n"); + UserDereferenceObject(Monitor); + UserDeleteObject(UserHMGetHandle(Monitor), otMonitor); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Monitor->GdiDevice = pGdiDevice; + Monitor->rcMonitor.left = 0; + Monitor->rcMonitor.top = 0; + Monitor->rcMonitor.right = Monitor->rcMonitor.left + pGdiDevice->gdiinfo.ulHorzRes; + Monitor->rcMonitor.bottom = Monitor->rcMonitor.top + pGdiDevice->gdiinfo.ulVertRes; + Monitor->rcWork = Monitor->rcMonitor; + Monitor->cWndStack = 0; + + Monitor->hrgnMonitor = IntSysCreateRectRgnIndirect( &Monitor->rcMonitor ); + + IntGdiSetRegionOwner(Monitor->hrgnMonitor, GDI_OBJ_HMGR_PUBLIC); + + if (gMonitorList == NULL) + { + DPRINT("Primary monitor is beeing attached\n"); + Monitor->IsPrimary = TRUE; + gMonitorList = Monitor; + } + else + { + PMONITOR p; + DPRINT("Additional monitor is beeing attached\n"); + for (p = gMonitorList; p->Next != NULL; p = p->Next) + { + p->Next = Monitor; + } + Monitor->Prev = p; + } + + return STATUS_SUCCESS; } /* IntDetachMonitor @@ -228,48 +210,48 @@ NTSTATUS IntDetachMonitor(IN PDEVOBJ *pGdiDevice) { - PMONITOR Monitor; - - for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) - { - if (Monitor->GdiDevice == pGdiDevice) - break; - } - - if (Monitor == NULL) - { - /* no monitor for given device found */ - return STATUS_INVALID_PARAMETER; - } - - if (Monitor->IsPrimary && (Monitor->Next != NULL || Monitor->Prev != NULL)) - { - PMONITOR NewPrimaryMonitor = (Monitor->Prev != NULL) ? (Monitor->Prev) : (Monitor->Next); - - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&NewPrimaryMonitor->Lock); - NewPrimaryMonitor->IsPrimary = TRUE; - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&NewPrimaryMonitor->Lock); - } - - if (gMonitorList == Monitor) - { - gMonitorList = Monitor->Next; - if (Monitor->Next != NULL) - Monitor->Next->Prev = NULL; - } - else - { - Monitor->Prev->Next = Monitor->Next; - if (Monitor->Next != NULL) - Monitor->Next->Prev = Monitor->Prev; - } - - if (Monitor->hrgnMonitor) - REGION_FreeRgnByHandle(Monitor->hrgnMonitor); - - IntDestroyMonitorObject(Monitor); - - return STATUS_SUCCESS; + PMONITOR Monitor; + + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + if (Monitor->GdiDevice == pGdiDevice) + break; + } + + if (Monitor == NULL) + { + /* no monitor for given device found */ + return STATUS_INVALID_PARAMETER; + } + + if (Monitor->IsPrimary && (Monitor->Next != NULL || Monitor->Prev != NULL)) + { + PMONITOR NewPrimaryMonitor = (Monitor->Prev != NULL) ? (Monitor->Prev) : (Monitor->Next); + + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&NewPrimaryMonitor->Lock); + NewPrimaryMonitor->IsPrimary = TRUE; + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&NewPrimaryMonitor->Lock); + } + + if (gMonitorList == Monitor) + { + gMonitorList = Monitor->Next; + if (Monitor->Next != NULL) + Monitor->Next->Prev = NULL; + } + else + { + Monitor->Prev->Next = Monitor->Next; + if (Monitor->Next != NULL) + Monitor->Next->Prev = Monitor->Prev; + } + + if (Monitor->hrgnMonitor) + REGION_FreeRgnByHandle(Monitor->hrgnMonitor); + + IntDestroyMonitorObject(Monitor); + + return STATUS_SUCCESS; } /* IntGetPrimaryMonitor @@ -283,16 +265,16 @@ FASTCALL IntGetPrimaryMonitor() { - PMONITOR Monitor; - - for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) - { - /* FIXME: I guess locking the monitor is not neccessary to read 1 int */ - if (Monitor->IsPrimary) - break; - } - - return Monitor; + PMONITOR Monitor; + + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + /* FIXME: I guess locking the monitor is not neccessary to read 1 int */ + if (Monitor->IsPrimary) + break; + } + + return Monitor; } /* IntGetMonitorsFromRect @@ -334,99 +316,99 @@ OPTIONAL IN DWORD listSize, OPTIONAL IN DWORD flags) { - PMONITOR Monitor, NearestMonitor = NULL, PrimaryMonitor = NULL; - UINT iCount = 0; - LONG iNearestDistanceX = 0x7fffffff, iNearestDistanceY = 0x7fffffff; - - /* find monitors which intersect the rectangle */ - for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) - { - RECTL MonitorRect, IntersectionRect; - - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&Monitor->Lock); - MonitorRect = Monitor->rcMonitor; - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Monitor->Lock); - - DPRINT("MonitorRect: left = %d, top = %d, right = %d, bottom = %d\n", - MonitorRect.left, MonitorRect.top, MonitorRect.right, MonitorRect.bottom); - - if (flags == MONITOR_DEFAULTTOPRIMARY && Monitor->IsPrimary) - { - PrimaryMonitor = Monitor; - } - - if (pRect != NULL) - { - BOOL intersects = TRUE; - - /* check if the rect intersects the monitor */ - if ((pRect->right < MonitorRect.left) || (pRect->left > MonitorRect.right) || - (pRect->bottom < MonitorRect.top) || (pRect->top > MonitorRect.bottom)) - { - intersects = FALSE; - } - - if (flags == MONITOR_DEFAULTTONEAREST && !intersects) - { - INT distanceX, distanceY; - - distanceX = MIN(ABS(MonitorRect.left - pRect->right), - ABS(pRect->left - MonitorRect.right)); - distanceY = MIN(ABS(MonitorRect.top - pRect->bottom), - ABS(pRect->top - MonitorRect.bottom)); - - if (((distanceX < iNearestDistanceX) && (distanceY <= iNearestDistanceY)) || - ((distanceX <= iNearestDistanceX) && (distanceY < iNearestDistanceY))) + PMONITOR Monitor, NearestMonitor = NULL, PrimaryMonitor = NULL; + UINT iCount = 0; + LONG iNearestDistanceX = 0x7fffffff, iNearestDistanceY = 0x7fffffff; + + /* find monitors which intersect the rectangle */ + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + RECTL MonitorRect, IntersectionRect; + + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&Monitor->Lock); + MonitorRect = Monitor->rcMonitor; + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Monitor->Lock); + + DPRINT("MonitorRect: left = %d, top = %d, right = %d, bottom = %d\n", + MonitorRect.left, MonitorRect.top, MonitorRect.right, MonitorRect.bottom); + + if (flags == MONITOR_DEFAULTTOPRIMARY && Monitor->IsPrimary) + { + PrimaryMonitor = Monitor; + } + + if (pRect != NULL) + { + BOOL intersects = TRUE; + + /* check if the rect intersects the monitor */ + if ((pRect->right < MonitorRect.left) || (pRect->left > MonitorRect.right) || + (pRect->bottom < MonitorRect.top) || (pRect->top > MonitorRect.bottom)) { - iNearestDistanceX = distanceX; - iNearestDistanceY = distanceY; - NearestMonitor = Monitor; + intersects = FALSE; } - } - - if (!intersects) - continue; - - /* calculate intersection */ - IntersectionRect.left = MAX(MonitorRect.left, pRect->left); - IntersectionRect.top = MAX(MonitorRect.top, pRect->top); - IntersectionRect.right = MIN(MonitorRect.right, pRect->right); - IntersectionRect.bottom = MIN(MonitorRect.bottom, pRect->bottom); - } - else - { - IntersectionRect = MonitorRect; - } - - if (iCount < listSize) - { - if (hMonitorList != NULL) - hMonitorList[iCount] = UserHMGetHandle(Monitor); - if (monitorRectList != NULL) - monitorRectList[iCount] = IntersectionRect; - } - iCount++; - } - - if (iCount == 0 && flags == MONITOR_DEFAULTTONEAREST) - { - if (iCount < listSize) - { - if (hMonitorList != NULL) - hMonitorList[iCount] = UserHMGetHandle(NearestMonitor); - } - iCount++; - } - else if (iCount == 0 && flags == MONITOR_DEFAULTTOPRIMARY) - { - if (iCount < listSize) - { - if (hMonitorList != NULL) - hMonitorList[iCount] = UserHMGetHandle(PrimaryMonitor); - } - iCount++; - } - return iCount; + + if (flags == MONITOR_DEFAULTTONEAREST && !intersects) + { + INT distanceX, distanceY; + + distanceX = MIN(ABS(MonitorRect.left - pRect->right), + ABS(pRect->left - MonitorRect.right)); + distanceY = MIN(ABS(MonitorRect.top - pRect->bottom), + ABS(pRect->top - MonitorRect.bottom)); + + if (((distanceX < iNearestDistanceX) && (distanceY <= iNearestDistanceY)) || + ((distanceX <= iNearestDistanceX) && (distanceY < iNearestDistanceY))) + { + iNearestDistanceX = distanceX; + iNearestDistanceY = distanceY; + NearestMonitor = Monitor; + } + } + + if (!intersects) + continue; + + /* calculate intersection */ + IntersectionRect.left = MAX(MonitorRect.left, pRect->left); + IntersectionRect.top = MAX(MonitorRect.top, pRect->top); + IntersectionRect.right = MIN(MonitorRect.right, pRect->right); + IntersectionRect.bottom = MIN(MonitorRect.bottom, pRect->bottom); + } + else + { + IntersectionRect = MonitorRect; + } + + if (iCount < listSize) + { + if (hMonitorList != NULL) + hMonitorList[iCount] = UserHMGetHandle(Monitor); + if (monitorRectList != NULL) + monitorRectList[iCount] = IntersectionRect; + } + iCount++; + } + + if (iCount == 0 && flags == MONITOR_DEFAULTTONEAREST) + { + if (iCount < listSize) + { + if (hMonitorList != NULL) + hMonitorList[iCount] = UserHMGetHandle(NearestMonitor); + } + iCount++; + } + else if (iCount == 0 && flags == MONITOR_DEFAULTTOPRIMARY) + { + if (iCount < listSize) + { + if (hMonitorList != NULL) + hMonitorList[iCount] = UserHMGetHandle(PrimaryMonitor); + } + iCount++; + } + return iCount; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -464,146 +446,147 @@ INT APIENTRY NtUserEnumDisplayMonitors( - OPTIONAL IN HDC hDC, - OPTIONAL IN LPCRECTL pRect, - OPTIONAL OUT HMONITOR *hMonitorList, - OPTIONAL OUT PRECTL monitorRectList, - OPTIONAL IN DWORD listSize) -{ - INT numMonitors, i; - HMONITOR *safeHMonitorList = NULL; - PRECTL safeRectList = NULL; - RECTL rect, *myRect; - RECTL dcRect; - NTSTATUS status; - - /* get rect */ - if (pRect != NULL) - { - status = MmCopyFromCaller(&rect, pRect, sizeof (RECT)); - if (!NT_SUCCESS(status)) - { - DPRINT("MmCopyFromCaller() failed!\n"); - SetLastNtError(status); - return -1; - } - } - - if (hDC != NULL) - { - PDC dc; - INT regionType; - - /* get visible region bounding rect */ - dc = DC_LockDc(hDC); - if (dc == NULL) - { - DPRINT("DC_LockDc() failed!\n"); - /* FIXME: setlasterror? */ - return -1; - } - regionType = REGION_GetRgnBox(dc->prgnVis, &dcRect); - DC_UnlockDc(dc); - - if (regionType == 0) - { - DPRINT("NtGdiGetRgnBox() failed!\n"); - return -1; - } - if (regionType == NULLREGION) - return 0; - if (regionType == COMPLEXREGION) - { /* TODO: warning */ - } - - /* if hDC and pRect are given the area of interest is pRect with - coordinate origin at the DC position */ - if (pRect != NULL) - { - rect.left += dcRect.left; - rect.right += dcRect.left; - rect.top += dcRect.top; - rect.bottom += dcRect.top; - } - /* if hDC is given and pRect is not the area of interest is the - bounding rect of hDC */ - else - { - rect = dcRect; - } - } - - if (hDC == NULL && pRect == NULL) - myRect = NULL; - else - myRect = &rect; - - /* find intersecting monitors */ - numMonitors = IntGetMonitorsFromRect(myRect, NULL, NULL, 0, 0); - if (numMonitors == 0 || listSize == 0 || - (hMonitorList == NULL && monitorRectList == NULL)) - { - DPRINT("numMonitors = %d\n", numMonitors); - return numMonitors; - } - - if (hMonitorList != NULL && listSize != 0) - { - safeHMonitorList = ExAllocatePoolWithTag(PagedPool, sizeof (HMONITOR) * listSize, USERTAG_MONITORRECTS); - if (safeHMonitorList == NULL) - { - /* FIXME: SetLastWin32Error? */ - return -1; - } - } - if (monitorRectList != NULL && listSize != 0) - { - safeRectList = ExAllocatePoolWithTag(PagedPool, sizeof (RECT) * listSize, USERTAG_MONITORRECTS); - if (safeRectList == NULL) - { - ExFreePoolWithTag(safeHMonitorList, USERTAG_MONITORRECTS); - /* FIXME: SetLastWin32Error? */ - return -1; - } - } - - /* get intersecting monitors */ - numMonitors = IntGetMonitorsFromRect(myRect, safeHMonitorList, safeRectList, - listSize, 0 ); - - if (hDC != NULL && pRect != NULL && safeRectList != NULL) - for (i = 0; i < numMonitors; i++) - { - safeRectList[i].left -= dcRect.left; - safeRectList[i].right -= dcRect.left; - safeRectList[i].top -= dcRect.top; - safeRectList[i].bottom -= dcRect.top; - } - - /* output result */ - if (hMonitorList != NULL && listSize != 0) - { - status = MmCopyToCaller(hMonitorList, safeHMonitorList, sizeof (HMONITOR) * listSize); - ExFreePool(safeHMonitorList); - if (!NT_SUCCESS(status)) - { - ExFreePoolWithTag(safeRectList, USERTAG_MONITORRECTS); - SetLastNtError(status); - return -1; - } - } - if (monitorRectList != NULL && listSize != 0) - { - status = MmCopyToCaller(monitorRectList, safeRectList, sizeof (RECT) * listSize); - ExFreePoolWithTag(safeRectList, USERTAG_MONITORRECTS); - if (!NT_SUCCESS(status)) - { - SetLastNtError(status); - return -1; - } - } - - return numMonitors; + OPTIONAL IN HDC hDC, + OPTIONAL IN LPCRECTL pRect, + OPTIONAL OUT HMONITOR *hMonitorList, + OPTIONAL OUT PRECTL monitorRectList, + OPTIONAL IN DWORD listSize) +{ + INT numMonitors, i; + HMONITOR *safeHMonitorList = NULL; + PRECTL safeRectList = NULL; + RECTL rect, *myRect; + RECTL dcRect; + NTSTATUS status; + + /* get rect */ + if (pRect != NULL) + { + status = MmCopyFromCaller(&rect, pRect, sizeof (RECT)); + if (!NT_SUCCESS(status)) + { + DPRINT("MmCopyFromCaller() failed!\n"); + SetLastNtError(status); + return -1; + } + } + + if (hDC != NULL) + { + PDC dc; + INT regionType; + + /* get visible region bounding rect */ + dc = DC_LockDc(hDC); + if (dc == NULL) + { + DPRINT("DC_LockDc() failed!\n"); + /* FIXME: setlasterror? */ + return -1; + } + regionType = REGION_GetRgnBox(dc->prgnVis, &dcRect); + DC_UnlockDc(dc); + + if (regionType == 0) + { + DPRINT("NtGdiGetRgnBox() failed!\n"); + return -1; + } + if (regionType == NULLREGION) + return 0; + if (regionType == COMPLEXREGION) + { + /* TODO: warning */ + } + + /* if hDC and pRect are given the area of interest is pRect with + coordinate origin at the DC position */ + if (pRect != NULL) + { + rect.left += dcRect.left; + rect.right += dcRect.left; + rect.top += dcRect.top; + rect.bottom += dcRect.top; + } + /* if hDC is given and pRect is not the area of interest is the + bounding rect of hDC */ + else + { + rect = dcRect; + } + } + + if (hDC == NULL && pRect == NULL) + myRect = NULL; + else + myRect = &rect; + + /* find intersecting monitors */ + numMonitors = IntGetMonitorsFromRect(myRect, NULL, NULL, 0, 0); + if (numMonitors == 0 || listSize == 0 || + (hMonitorList == NULL && monitorRectList == NULL)) + { + DPRINT("numMonitors = %d\n", numMonitors); + return numMonitors; + } + + if (hMonitorList != NULL && listSize != 0) + { + safeHMonitorList = ExAllocatePoolWithTag(PagedPool, sizeof (HMONITOR) * listSize, USERTAG_MONITORRECTS); + if (safeHMonitorList == NULL) + { + /* FIXME: SetLastWin32Error? */ + return -1; + } + } + if (monitorRectList != NULL && listSize != 0) + { + safeRectList = ExAllocatePoolWithTag(PagedPool, sizeof (RECT) * listSize, USERTAG_MONITORRECTS); + if (safeRectList == NULL) + { + ExFreePoolWithTag(safeHMonitorList, USERTAG_MONITORRECTS); + /* FIXME: SetLastWin32Error? */ + return -1; + } + } + + /* get intersecting monitors */ + numMonitors = IntGetMonitorsFromRect(myRect, safeHMonitorList, safeRectList, + listSize, 0 ); + + if (hDC != NULL && pRect != NULL && safeRectList != NULL) + for (i = 0; i < numMonitors; i++) + { + safeRectList[i].left -= dcRect.left; + safeRectList[i].right -= dcRect.left; + safeRectList[i].top -= dcRect.top; + safeRectList[i].bottom -= dcRect.top; + } + + /* output result */ + if (hMonitorList != NULL && listSize != 0) + { + status = MmCopyToCaller(hMonitorList, safeHMonitorList, sizeof (HMONITOR) * listSize); + ExFreePool(safeHMonitorList); + if (!NT_SUCCESS(status)) + { + ExFreePoolWithTag(safeRectList, USERTAG_MONITORRECTS); + SetLastNtError(status); + return -1; + } + } + if (monitorRectList != NULL && listSize != 0) + { + status = MmCopyToCaller(monitorRectList, safeRectList, sizeof (RECT) * listSize); + ExFreePoolWithTag(safeRectList, USERTAG_MONITORRECTS); + if (!NT_SUCCESS(status)) + { + SetLastNtError(status); + return -1; + } + } + + return numMonitors; } /* NtUserGetMonitorInfo @@ -633,81 +616,81 @@ BOOL APIENTRY NtUserGetMonitorInfo( - IN HMONITOR hMonitor, - OUT LPMONITORINFO pMonitorInfo) -{ - PMONITOR Monitor; - MONITORINFOEXW MonitorInfo; - NTSTATUS Status; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserGetMonitorInfo\n"); - UserEnterShared(); - - /* get monitor object */ - if (!(Monitor = UserGetMonitorObject(hMonitor))) - { - DPRINT("Couldnt find monitor 0x%lx\n", hMonitor); - RETURN(FALSE); - } - - if(pMonitorInfo == NULL) - { - SetLastNtError(STATUS_INVALID_PARAMETER); - RETURN(FALSE); - } - - /* get size of pMonitorInfo */ - Status = MmCopyFromCaller(&MonitorInfo.cbSize, &pMonitorInfo->cbSize, sizeof (MonitorInfo.cbSize)); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN(FALSE); - } - if ((MonitorInfo.cbSize != sizeof (MONITORINFO)) && - (MonitorInfo.cbSize != sizeof (MONITORINFOEXW))) - { - SetLastNtError(STATUS_INVALID_PARAMETER); - RETURN(FALSE); - } - - /* fill monitor info */ - MonitorInfo.rcMonitor = Monitor->rcMonitor; - MonitorInfo.rcWork = Monitor->rcWork; - MonitorInfo.dwFlags = 0; - - if (Monitor->IsPrimary) - MonitorInfo.dwFlags |= MONITORINFOF_PRIMARY; - - /* fill device name */ - if (MonitorInfo.cbSize == sizeof (MONITORINFOEXW)) - { - WCHAR nul = L'\0'; - INT len = Monitor->DeviceName.Length; - if (len >= CCHDEVICENAME * sizeof (WCHAR)) - len = (CCHDEVICENAME - 1) * sizeof (WCHAR); - - memcpy(MonitorInfo.szDevice, Monitor->DeviceName.Buffer, len); - memcpy(MonitorInfo.szDevice + (len / sizeof (WCHAR)), &nul, sizeof (WCHAR)); - } - - /* output data */ - Status = MmCopyToCaller(pMonitorInfo, &MonitorInfo, MonitorInfo.cbSize); - if (!NT_SUCCESS(Status)) - { - DPRINT("GetMonitorInfo: MmCopyToCaller failed\n"); - SetLastNtError(Status); - RETURN(FALSE); - } - - DPRINT("GetMonitorInfo: success\n"); - - RETURN(TRUE); + IN HMONITOR hMonitor, + OUT LPMONITORINFO pMonitorInfo) +{ + PMONITOR Monitor; + MONITORINFOEXW MonitorInfo; + NTSTATUS Status; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserGetMonitorInfo\n"); + UserEnterShared(); + + /* get monitor object */ + if (!(Monitor = UserGetMonitorObject(hMonitor))) + { + DPRINT("Couldnt find monitor 0x%lx\n", hMonitor); + RETURN(FALSE); + } + + if(pMonitorInfo == NULL) + { + SetLastNtError(STATUS_INVALID_PARAMETER); + RETURN(FALSE); + } + + /* get size of pMonitorInfo */ + Status = MmCopyFromCaller(&MonitorInfo.cbSize, &pMonitorInfo->cbSize, sizeof (MonitorInfo.cbSize)); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(FALSE); + } + if ((MonitorInfo.cbSize != sizeof (MONITORINFO)) && + (MonitorInfo.cbSize != sizeof (MONITORINFOEXW))) + { + SetLastNtError(STATUS_INVALID_PARAMETER); + RETURN(FALSE); + } + + /* fill monitor info */ + MonitorInfo.rcMonitor = Monitor->rcMonitor; + MonitorInfo.rcWork = Monitor->rcWork; + MonitorInfo.dwFlags = 0; + + if (Monitor->IsPrimary) + MonitorInfo.dwFlags |= MONITORINFOF_PRIMARY; + + /* fill device name */ + if (MonitorInfo.cbSize == sizeof (MONITORINFOEXW)) + { + WCHAR nul = L'\0'; + INT len = Monitor->DeviceName.Length; + if (len >= CCHDEVICENAME * sizeof (WCHAR)) + len = (CCHDEVICENAME - 1) * sizeof (WCHAR); + + memcpy(MonitorInfo.szDevice, Monitor->DeviceName.Buffer, len); + memcpy(MonitorInfo.szDevice + (len / sizeof (WCHAR)), &nul, sizeof (WCHAR)); + } + + /* output data */ + Status = MmCopyToCaller(pMonitorInfo, &MonitorInfo, MonitorInfo.cbSize); + if (!NT_SUCCESS(Status)) + { + DPRINT("GetMonitorInfo: MmCopyToCaller failed\n"); + SetLastNtError(Status); + RETURN(FALSE); + } + + DPRINT("GetMonitorInfo: success\n"); + + RETURN(TRUE); CLEANUP: - DPRINT("Leave NtUserGetMonitorInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserGetMonitorInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } /* NtUserMonitorFromPoint @@ -729,42 +712,42 @@ HMONITOR APIENTRY NtUserMonitorFromPoint( - IN POINT point, - IN DWORD dwFlags) -{ - INT NumMonitors; - RECTL InRect; - HMONITOR hMonitor = NULL; - - /* fill inRect */ - InRect.left = InRect.right = point.x; - InRect.top = InRect.bottom = point.y; - - /* find intersecting monitor */ - NumMonitors = IntGetMonitorsFromRect(&InRect, &hMonitor, NULL, 1, 0); - if (NumMonitors < 0) - { - return (HMONITOR)NULL; - } - - if (hMonitor == NULL) - { - if (dwFlags == MONITOR_DEFAULTTOPRIMARY) - { - PMONITOR MonitorObj = IntGetPrimaryMonitor(); - if (MonitorObj) - hMonitor = UserHMGetHandle(MonitorObj); - } - else if (dwFlags == MONITOR_DEFAULTTONEAREST) - { - NumMonitors = IntGetMonitorsFromRect(&InRect, &hMonitor, NULL, - 1, MONITOR_DEFAULTTONEAREST); - /*ASSERT( (numMonitors > 0) && (hMonitor != NULL) );*/ - } - /* else flag is DEFAULTTONULL */ - } - - return hMonitor; + IN POINT point, + IN DWORD dwFlags) +{ + INT NumMonitors; + RECTL InRect; + HMONITOR hMonitor = NULL; + + /* fill inRect */ + InRect.left = InRect.right = point.x; + InRect.top = InRect.bottom = point.y; + + /* find intersecting monitor */ + NumMonitors = IntGetMonitorsFromRect(&InRect, &hMonitor, NULL, 1, 0); + if (NumMonitors < 0) + { + return (HMONITOR)NULL; + } + + if (hMonitor == NULL) + { + if (dwFlags == MONITOR_DEFAULTTOPRIMARY) + { + PMONITOR MonitorObj = IntGetPrimaryMonitor(); + if (MonitorObj) + hMonitor = UserHMGetHandle(MonitorObj); + } + else if (dwFlags == MONITOR_DEFAULTTONEAREST) + { + NumMonitors = IntGetMonitorsFromRect(&InRect, &hMonitor, NULL, + 1, MONITOR_DEFAULTTONEAREST); + /*ASSERT( (numMonitors > 0) && (hMonitor != NULL) );*/ + } + /* else flag is DEFAULTTONULL */ + } + + return hMonitor; } /* NtUserMonitorFromRect @@ -787,131 +770,131 @@ HMONITOR APIENTRY NtUserMonitorFromRect( - IN LPCRECTL pRect, - IN DWORD dwFlags) -{ - INT numMonitors, iLargestArea = -1, i; - PRECTL rectList; - HMONITOR *hMonitorList; - HMONITOR hMonitor = NULL; - RECTL rect; - NTSTATUS status; - - /* get rect */ - status = MmCopyFromCaller(&rect, pRect, sizeof (RECT)); - if (!NT_SUCCESS(status)) - { - SetLastNtError(status); - return (HMONITOR)NULL; - } - - /* find intersecting monitors */ - numMonitors = IntGetMonitorsFromRect(&rect, NULL, NULL, 0, 0); - if (numMonitors < 0) - { - return (HMONITOR)NULL; - } - - if (numMonitors == 0) - { - if (dwFlags == MONITOR_DEFAULTTOPRIMARY) - { - PMONITOR monitorObj = IntGetPrimaryMonitor(); - if (monitorObj) - return UserHMGetHandle(monitorObj); - } - else if (dwFlags == MONITOR_DEFAULTTONEAREST) - { - numMonitors = IntGetMonitorsFromRect(&rect, &hMonitor, NULL, - 1, MONITOR_DEFAULTTONEAREST); - if (numMonitors <= 0) - { - /* error? */ - return (HMONITOR)NULL; - } - - if (numMonitors > 0) - return hMonitor; - } - /* else flag is DEFAULTTONULL */ - return (HMONITOR)NULL; - } - - hMonitorList = ExAllocatePoolWithTag(PagedPool, sizeof (HMONITOR) * numMonitors, USERTAG_MONITORRECTS); - if (hMonitorList == NULL) - { - /* FIXME: SetLastWin32Error? */ - return (HMONITOR)NULL; - } - rectList = ExAllocatePoolWithTag(PagedPool, sizeof (RECT) * numMonitors, USERTAG_MONITORRECTS); - if (rectList == NULL) - { - ExFreePoolWithTag(hMonitorList, USERTAG_MONITORRECTS); - /* FIXME: SetLastWin32Error? */ - return (HMONITOR)NULL; - } - - /* get intersecting monitors */ - numMonitors = IntGetMonitorsFromRect(&rect, hMonitorList, rectList, - numMonitors, 0); - if (numMonitors <= 0) - { - ExFreePoolWithTag(hMonitorList, USERTAG_MONITORRECTS); - ExFreePoolWithTag(rectList, USERTAG_MONITORRECTS); - return (HMONITOR)NULL; - } - - /* find largest intersection */ - for (i = 0; i < numMonitors; i++) - { - INT area = (rectList[i].right - rectList[i].left) * - (rectList[i].bottom - rectList[i].top); - if (area > iLargestArea) - { - hMonitor = hMonitorList[i]; - } - } - - ExFreePoolWithTag(hMonitorList, USERTAG_MONITORRECTS); - ExFreePoolWithTag(rectList, USERTAG_MONITORRECTS); - - return hMonitor; + IN LPCRECTL pRect, + IN DWORD dwFlags) +{ + INT numMonitors, iLargestArea = -1, i; + PRECTL rectList; + HMONITOR *hMonitorList; + HMONITOR hMonitor = NULL; + RECTL rect; + NTSTATUS status; + + /* get rect */ + status = MmCopyFromCaller(&rect, pRect, sizeof (RECT)); + if (!NT_SUCCESS(status)) + { + SetLastNtError(status); + return (HMONITOR)NULL; + } + + /* find intersecting monitors */ + numMonitors = IntGetMonitorsFromRect(&rect, NULL, NULL, 0, 0); + if (numMonitors < 0) + { + return (HMONITOR)NULL; + } + + if (numMonitors == 0) + { + if (dwFlags == MONITOR_DEFAULTTOPRIMARY) + { + PMONITOR monitorObj = IntGetPrimaryMonitor(); + if (monitorObj) + return UserHMGetHandle(monitorObj); + } + else if (dwFlags == MONITOR_DEFAULTTONEAREST) + { + numMonitors = IntGetMonitorsFromRect(&rect, &hMonitor, NULL, + 1, MONITOR_DEFAULTTONEAREST); + if (numMonitors <= 0) + { + /* error? */ + return (HMONITOR)NULL; + } + + if (numMonitors > 0) + return hMonitor; + } + /* else flag is DEFAULTTONULL */ + return (HMONITOR)NULL; + } + + hMonitorList = ExAllocatePoolWithTag(PagedPool, sizeof (HMONITOR) * numMonitors, USERTAG_MONITORRECTS); + if (hMonitorList == NULL) + { + /* FIXME: SetLastWin32Error? */ + return (HMONITOR)NULL; + } + rectList = ExAllocatePoolWithTag(PagedPool, sizeof (RECT) * numMonitors, USERTAG_MONITORRECTS); + if (rectList == NULL) + { + ExFreePoolWithTag(hMonitorList, USERTAG_MONITORRECTS); + /* FIXME: SetLastWin32Error? */ + return (HMONITOR)NULL; + } + + /* get intersecting monitors */ + numMonitors = IntGetMonitorsFromRect(&rect, hMonitorList, rectList, + numMonitors, 0); + if (numMonitors <= 0) + { + ExFreePoolWithTag(hMonitorList, USERTAG_MONITORRECTS); + ExFreePoolWithTag(rectList, USERTAG_MONITORRECTS); + return (HMONITOR)NULL; + } + + /* find largest intersection */ + for (i = 0; i < numMonitors; i++) + { + INT area = (rectList[i].right - rectList[i].left) * + (rectList[i].bottom - rectList[i].top); + if (area > iLargestArea) + { + hMonitor = hMonitorList[i]; + } + } + + ExFreePoolWithTag(hMonitorList, USERTAG_MONITORRECTS); + ExFreePoolWithTag(rectList, USERTAG_MONITORRECTS); + + return hMonitor; } HMONITOR APIENTRY NtUserMonitorFromWindow( - IN HWND hWnd, - IN DWORD dwFlags) -{ - PWND Window; - HMONITOR hMonitor = NULL; - RECTL Rect; - DECLARE_RETURN(HMONITOR); - - DPRINT("Enter NtUserMonitorFromWindow\n"); - UserEnterShared(); - - if (!(Window = UserGetWindowObject(hWnd))) - { - if (dwFlags == MONITOR_DEFAULTTONULL) - { - RETURN(hMonitor); - } - IntGetMonitorsFromRect(NULL, &hMonitor, NULL, 1, dwFlags); - RETURN(hMonitor); - } - - Rect.left = Rect.right = Window->rcWindow.left; - Rect.top = Rect.bottom = Window->rcWindow.bottom; - - IntGetMonitorsFromRect(&Rect, &hMonitor, NULL, 1, dwFlags); - - RETURN(hMonitor); + IN HWND hWnd, + IN DWORD dwFlags) +{ + PWND Window; + HMONITOR hMonitor = NULL; + RECTL Rect; + DECLARE_RETURN(HMONITOR); + + DPRINT("Enter NtUserMonitorFromWindow\n"); + UserEnterShared(); + + if (!(Window = UserGetWindowObject(hWnd))) + { + if (dwFlags == MONITOR_DEFAULTTONULL) + { + RETURN(hMonitor); + } + IntGetMonitorsFromRect(NULL, &hMonitor, NULL, 1, dwFlags); + RETURN(hMonitor); + } + + Rect.left = Rect.right = Window->rcWindow.left; + Rect.top = Rect.bottom = Window->rcWindow.bottom; + + IntGetMonitorsFromRect(&Rect, &hMonitor, NULL, 1, dwFlags); + + RETURN(hMonitor); CLEANUP: - DPRINT("Leave NtUserMonitorFromWindow, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} + DPRINT("Leave NtUserMonitorFromWindow, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +}

1 0

[jgardou] 49307: Sync with trunk (r49303)
by jgardou＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jgardou Date: Wed Oct 27 15:52:24 2010 New Revision: 49307 URL: http://svn.reactos.org/svn/reactos?rev=49307&view=rev Log: Sync with trunk (r49303) Added: branches/cmake-bringup/subsystems/win32/win32k/dib/alphablend.c - copied unchanged from r49306, trunk/reactos/subsystems/win32/win32k/dib/alphablend.c branches/cmake-bringup/subsystems/win32/win32k/eng/ldevobj.c - copied unchanged from r49306, trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c branches/cmake-bringup/subsystems/win32/win32k/eng/pdevobj.c - copied unchanged from r49306, trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c branches/cmake-bringup/subsystems/win32/win32k/eng/rlecomp.c - copied unchanged from r49306, trunk/reactos/subsystems/win32/win32k/eng/rlecomp.c branches/cmake-bringup/subsystems/win32/win32k/include/device.h - copied unchanged from r49306, trunk/reactos/subsystems/win32/win32k/include/device.h branches/cmake-bringup/subsystems/win32/win32k/include/ldevobj.h - copied unchanged from r49306, trunk/reactos/subsystems/win32/win32k/include/ldevobj.h Removed: branches/cmake-bringup/subsystems/win32/win32k/ldr/ Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/rapps/rapps/firefox36.txt branches/cmake-bringup/base/applications/rapps/rapps/libreoffice.txt branches/cmake-bringup/base/applications/rapps/rapps/mirandaim.txt branches/cmake-bringup/base/applications/rapps/rapps/mirc.txt branches/cmake-bringup/base/applications/rapps/rapps/opera.txt branches/cmake-bringup/base/applications/rapps/rapps/scummvm.txt branches/cmake-bringup/base/applications/rapps/rapps/seamonkey.txt branches/cmake-bringup/base/applications/rapps/rapps/thunderbird.txt branches/cmake-bringup/base/shell/explorer/desktop/desktop.cpp branches/cmake-bringup/base/system/services/rpcserver.c branches/cmake-bringup/boot/bootdata/hivesys_i386.inf branches/cmake-bringup/boot/bootdata/packages/reactos.dff branches/cmake-bringup/dll/win32/gdi32/include/gdi32p.h branches/cmake-bringup/dll/win32/gdi32/misc/wingl.c branches/cmake-bringup/dll/win32/gdi32/objects/bitmap.c branches/cmake-bringup/dll/win32/gdi32/objects/dc.c branches/cmake-bringup/dll/win32/user32/include/cursor.h branches/cmake-bringup/dll/win32/user32/include/user32.h branches/cmake-bringup/dll/win32/user32/include/user32p.h branches/cmake-bringup/dll/win32/user32/misc/display.c branches/cmake-bringup/dll/win32/user32/misc/misc.c branches/cmake-bringup/dll/win32/user32/windows/class.c branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c branches/cmake-bringup/dll/win32/user32/windows/defwnd.c branches/cmake-bringup/dll/win32/user32/windows/draw.c branches/cmake-bringup/dll/win32/user32/windows/hook.c branches/cmake-bringup/dll/win32/user32/windows/input.c branches/cmake-bringup/dll/win32/user32/windows/menu.c branches/cmake-bringup/dll/win32/user32/windows/message.c branches/cmake-bringup/dll/win32/user32/windows/window.c branches/cmake-bringup/drivers/ksfilter/ks/property.c branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/guids.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/interfaces.hpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/irpstream.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/private.hpp branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp branches/cmake-bringup/hal/halx86/generic/usage.c branches/cmake-bringup/include/psdk/ks.h branches/cmake-bringup/include/psdk/ksmedia.h branches/cmake-bringup/include/reactos/win32k/ntuser.h branches/cmake-bringup/ntoskrnl/include/internal/io.h branches/cmake-bringup/ntoskrnl/io/iomgr/iorsrce.c branches/cmake-bringup/ntoskrnl/io/pnpmgr/pnpreport.c branches/cmake-bringup/ntoskrnl/io/pnpmgr/pnpres.c branches/cmake-bringup/ntoskrnl/mm/ARM3/virtual.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/desktopbg.c branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/dib/dib.c branches/cmake-bringup/subsystems/win32/win32k/dib/dib.h branches/cmake-bringup/subsystems/win32/win32k/dib/dib16bpp.c branches/cmake-bringup/subsystems/win32/win32k/dib/dib1bpp.c branches/cmake-bringup/subsystems/win32/win32k/dib/dib24bpp.c branches/cmake-bringup/subsystems/win32/win32k/dib/dib32bpp.c branches/cmake-bringup/subsystems/win32/win32k/dib/dib4bpp.c branches/cmake-bringup/subsystems/win32/win32k/dib/dib8bpp.c branches/cmake-bringup/subsystems/win32/win32k/eng/alphablend.c branches/cmake-bringup/subsystems/win32/win32k/eng/bitblt.c branches/cmake-bringup/subsystems/win32/win32k/eng/copybits.c branches/cmake-bringup/subsystems/win32/win32k/eng/device.c branches/cmake-bringup/subsystems/win32/win32k/eng/engbrush.c branches/cmake-bringup/subsystems/win32/win32k/eng/engmisc.c branches/cmake-bringup/subsystems/win32/win32k/eng/gradient.c branches/cmake-bringup/subsystems/win32/win32k/eng/lineto.c branches/cmake-bringup/subsystems/win32/win32k/eng/mapping.c branches/cmake-bringup/subsystems/win32/win32k/eng/mem.c branches/cmake-bringup/subsystems/win32/win32k/eng/mouse.c branches/cmake-bringup/subsystems/win32/win32k/eng/paint.c branches/cmake-bringup/subsystems/win32/win32k/eng/semaphor.c branches/cmake-bringup/subsystems/win32/win32k/eng/stretchblt.c branches/cmake-bringup/subsystems/win32/win32k/eng/surface.c branches/cmake-bringup/subsystems/win32/win32k/eng/transblt.c branches/cmake-bringup/subsystems/win32/win32k/eng/xlate.c branches/cmake-bringup/subsystems/win32/win32k/include/bitmaps.h branches/cmake-bringup/subsystems/win32/win32k/include/dc.h branches/cmake-bringup/subsystems/win32/win32k/include/dib.h branches/cmake-bringup/subsystems/win32/win32k/include/eng.h branches/cmake-bringup/subsystems/win32/win32k/include/gdiobj.h branches/cmake-bringup/subsystems/win32/win32k/include/hook.h branches/cmake-bringup/subsystems/win32/win32k/include/inteng.h branches/cmake-bringup/subsystems/win32/win32k/include/intgdi.h branches/cmake-bringup/subsystems/win32/win32k/include/misc.h branches/cmake-bringup/subsystems/win32/win32k/include/mouse.h branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h branches/cmake-bringup/subsystems/win32/win32k/include/palette.h branches/cmake-bringup/subsystems/win32/win32k/include/pdevobj.h branches/cmake-bringup/subsystems/win32/win32k/include/region.h branches/cmake-bringup/subsystems/win32/win32k/include/surface.h branches/cmake-bringup/subsystems/win32/win32k/include/win32.h branches/cmake-bringup/subsystems/win32/win32k/include/win32kp.h branches/cmake-bringup/subsystems/win32/win32k/include/window.h branches/cmake-bringup/subsystems/win32/win32k/include/xlateobj.h branches/cmake-bringup/subsystems/win32/win32k/main/dllmain.c branches/cmake-bringup/subsystems/win32/win32k/misc/copy.c branches/cmake-bringup/subsystems/win32/win32k/misc/driver.c branches/cmake-bringup/subsystems/win32/win32k/misc/file.c branches/cmake-bringup/subsystems/win32/win32k/misc/registry.c branches/cmake-bringup/subsystems/win32/win32k/ntddraw/dxeng.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/callback.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/caret.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/clipboard.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/desktop.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/display.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/event.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/focus.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/hook.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/kbdlayout.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/metric.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntuser.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/object.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/simplecall.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/windc.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/winpos.c branches/cmake-bringup/subsystems/win32/win32k/objects/arc.c branches/cmake-bringup/subsystems/win32/win32k/objects/bitblt.c branches/cmake-bringup/subsystems/win32/win32k/objects/bitmaps.c branches/cmake-bringup/subsystems/win32/win32k/objects/brush.c branches/cmake-bringup/subsystems/win32/win32k/objects/cliprgn.c branches/cmake-bringup/subsystems/win32/win32k/objects/dcattr.c branches/cmake-bringup/subsystems/win32/win32k/objects/dclife.c branches/cmake-bringup/subsystems/win32/win32k/objects/dcobjs.c branches/cmake-bringup/subsystems/win32/win32k/objects/dcstate.c branches/cmake-bringup/subsystems/win32/win32k/objects/dcutil.c branches/cmake-bringup/subsystems/win32/win32k/objects/device.c branches/cmake-bringup/subsystems/win32/win32k/objects/dibobj.c branches/cmake-bringup/subsystems/win32/win32k/objects/drawing.c branches/cmake-bringup/subsystems/win32/win32k/objects/fillshap.c branches/cmake-bringup/subsystems/win32/win32k/objects/freetype.c branches/cmake-bringup/subsystems/win32/win32k/objects/gdibatch.c branches/cmake-bringup/subsystems/win32/win32k/objects/gdiobj.c branches/cmake-bringup/subsystems/win32/win32k/objects/icm.c branches/cmake-bringup/subsystems/win32/win32k/objects/line.c branches/cmake-bringup/subsystems/win32/win32k/objects/palette.c branches/cmake-bringup/subsystems/win32/win32k/objects/path.c branches/cmake-bringup/subsystems/win32/win32k/objects/pen.c branches/cmake-bringup/subsystems/win32/win32k/objects/region.c branches/cmake-bringup/subsystems/win32/win32k/objects/stockobj.c branches/cmake-bringup/subsystems/win32/win32k/stubs/stubs.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… Modified: branches/cmake-bringup/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/bootdata/hiv… Modified: branches/cmake-bringup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/bootdata/pac… Modified: branches/cmake-bringup/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/i… Modified: branches/cmake-bringup/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/m… Modified: branches/cmake-bringup/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/o… Modified: branches/cmake-bringup/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/o… Modified: branches/cmake-bringup/dll/win32/user32/include/cursor.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/guids.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… Modified: branches/cmake-bringup/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… Modified: branches/cmake-bringup/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/ks.h… Modified: branches/cmake-bringup/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/ksme… Modified: branches/cmake-bringup/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… Modified: branches/cmake-bringup/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… Modified: branches/cmake-bringup/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/pnpmg… Modified: branches/cmake-bringup/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/pnpmg… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/paint.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/mouse.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/misc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/misc/registry.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/dcattr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

1 0

[spetreolle] 49306: [CMAKE] Improve minicd and livecd macros. Files and iso images are updated/cleaned without any manual steps.
by spetreolle＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: spetreolle Date: Wed Oct 27 14:06:40 2010 New Revision: 49306 URL: http://svn.reactos.org/svn/reactos?rev=49306&view=rev Log: [CMAKE] Improve minicd and livecd macros. Files and iso images are updated/cleaned without any manual steps. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Oct 27 14:06:40 2010 @@ -108,12 +108,12 @@ file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos") file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos/system32") -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/minicd.iso +add_custom_target(minicd COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/minicd.iso DEPENDS native-cdmake) -add_custom_target(minicd DEPENDS ${REACTOS_BINARY_DIR}/minicd.iso) + add_minicd(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcd.ini "" freeldr.ini) +set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/minicd.iso) #livecd target set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") @@ -132,12 +132,11 @@ file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32") file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config") -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso +add_custom_target(livecd COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${LIVECD_DIR} REACTOS ${REACTOS_BINARY_DIR}/livecd.iso DEPENDS native-cdmake) -add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso) add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) +set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/livecd.iso) include(baseaddress.cmake) Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Wed Oct 27 14:06:40 2010 @@ -125,23 +125,19 @@ set(_nameoncd ${ARGN}) endif() - add_custom_command( - OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd} - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}) - - add_custom_target(${_targetname}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(${_targetname}_minicd ${_targetname}) + add_custom_target(${_targetname}_minicd + COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd} + DEPENDS ${_targetname}) + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd}) + add_dependencies(minicd ${_targetname}_minicd) -ENDMACRO(add_minicd_target _targetname _dir _nameoncd) +ENDMACRO(add_minicd_target) MACRO(add_minicd FILENAME _dir _nameoncd) - add_custom_command( - OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd} - DEPENDS ${FILENAME} - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}) - - add_custom_target(${_nameoncd}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd}) + add_custom_target(${_nameoncd}_minicd + COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd} + DEPENDS ${FILENAME}) + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd}) add_dependencies(minicd ${_nameoncd}_minicd) ENDMACRO(add_minicd) @@ -150,112 +146,108 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport) set(IS_CPP 1) endmacro() - -MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd - - get_target_property(FILENAME ${_targetname} LOCATION) - - if("${ARGN}" STREQUAL "") - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) - endif() - - add_custom_command( - OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd} - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_custom_target(${_targetname}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(${_targetname}_livecd ${_targetname}) - add_dependencies(livecd ${_targetname}_livecd) -ENDMACRO(add_livecd_target _targetname _dir _nameoncd) - -MACRO(add_livecd FILENAME _dir _nameoncd) - add_custom_command( - OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd} - DEPENDS ${FILENAME} - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_custom_target(${_nameoncd}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(livecd ${_nameoncd}_livecd) -ENDMACRO(add_livecd) - -macro(custom_incdefs) - if(NOT DEFINED result_incs) #rpc_defines - get_directory_property(rpc_defines COMPILE_DEFINITIONS) - get_directory_property(rpc_includes INCLUDE_DIRECTORIES) - - foreach(arg ${rpc_defines}) - set(result_defs ${result_defs} -D${arg}) - endforeach(arg ${defines}) - - foreach(arg ${rpc_includes}) - set(result_incs -I${arg} ${result_incs}) - endforeach(arg ${includes}) - endif() -endmacro(custom_incdefs) - -macro(rpcproxy TARGET) - custom_incdefs() - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) - - foreach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c - PROPERTIES GENERATED TRUE) - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) - list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) - list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p) - add_custom_target(${TARGET}_${FILE}_p - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) - #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) - endforeach(_in_FILE ${ARGN}) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} - DEPENDS native-widl) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - PROPERTIES GENERATED TRUE) - - add_library(${TARGET}_proxy ${SOURCE}) - add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) -endmacro(rpcproxy) - -macro (MACRO_IDL_FILES) - custom_incdefs() - foreach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + +MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd + + get_target_property(FILENAME ${_targetname} LOCATION) + + if("${ARGN}" STREQUAL "") + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) + endif() + + add_custom_target(${_targetname}_livecd + COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd} + DEPENDS ${_targetname}) + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd}) + + add_dependencies(livecd ${_targetname}_livecd) +ENDMACRO(add_livecd_target) + +MACRO(add_livecd FILENAME _dir _nameoncd) + add_custom_target(${_nameoncd}_livecd + COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd} + DEPENDS ${FILENAME}) + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd}) + + add_dependencies(livecd ${_nameoncd}_livecd) +ENDMACRO(add_livecd) + +macro(custom_incdefs) + if(NOT DEFINED result_incs) #rpc_defines + get_directory_property(rpc_defines COMPILE_DEFINITIONS) + get_directory_property(rpc_includes INCLUDE_DIRECTORIES) + + foreach(arg ${rpc_defines}) + set(result_defs ${result_defs} -D${arg}) + endforeach(arg ${defines}) + + foreach(arg ${rpc_includes}) + set(result_incs -I${arg} ${result_incs}) + endforeach(arg ${includes}) + endif() +endmacro(custom_incdefs) + +macro(rpcproxy TARGET) + custom_incdefs() + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) + + foreach(_in_FILE ${ARGN}) + get_filename_component(FILE ${_in_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS native-widl) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c + PROPERTIES GENERATED TRUE) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) + list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) + list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p) + add_custom_target(${TARGET}_${FILE}_p + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) + #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) + endforeach(_in_FILE ${ARGN}) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} + DEPENDS native-widl) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c + PROPERTIES GENERATED TRUE) + + add_library(${TARGET}_proxy ${SOURCE}) + add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) +endmacro(rpcproxy) + +macro (MACRO_IDL_FILES) + custom_incdefs() + foreach(_in_FILE ${ARGN}) + get_filename_component(FILE ${_in_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl DEPENDS ${_in_file}) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - PROPERTIES GENERATED TRUE) - add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) - add_dependencies(${FILE}_server psdk) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + PROPERTIES GENERATED TRUE) + add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) + add_dependencies(${FILE}_server psdk) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl DEPENDS ${_in_file}) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - PROPERTIES GENERATED TRUE) - add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) - add_dependencies(${FILE}_client psdk) - endforeach(_in_FILE ${ARGN}) - -endmacro (MACRO_IDL_FILES) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + PROPERTIES GENERATED TRUE) + add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) + add_dependencies(${FILE}_client psdk) + endforeach(_in_FILE ${ARGN}) + +endmacro (MACRO_IDL_FILES) macro(ADD_TYPELIB TARGET) custom_incdefs()

1 0

[jgardou] 49305: [CMAKE] - use baseaddresses for dlls
by jgardou＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jgardou Date: Wed Oct 27 14:00:51 2010 New Revision: 49305 URL: http://svn.reactos.org/svn/reactos?rev=49305&view=rev Log: [CMAKE] - use baseaddresses for dlls Added: branches/cmake-bringup/baseaddress.cmake (with props) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Oct 27 14:00:51 2010 @@ -139,6 +139,8 @@ add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso) add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) +include(baseaddress.cmake) + add_subdirectory(base) add_subdirectory(boot) add_subdirectory(dll) Added: branches/cmake-bringup/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/baseaddress.cmake… ============================================================================== --- branches/cmake-bringup/baseaddress.cmake (added) +++ branches/cmake-bringup/baseaddress.cmake [iso-8859-1] Wed Oct 27 14:00:51 2010 @@ -1,0 +1,260 @@ +set(baseaddress_regtests 0x07000000) +set(baseaddress_notifyhook 0x08000000) +set(baseaddress_faultrep 0x107a0000) +set(baseaddress_qmgrprxy 0x1f710000) +set(baseaddress_cryptdlg 0x209c0000) +set(baseaddress_comcat 0x20a50000) +set(baseaddress_windowscodecs 0x26c40000) +set(baseaddress_devenum 0x35670000) +set(baseaddress_rsabase 0x35700000) +set(baseaddress_rsaenh 0x35780000) +set(baseaddress_url 0x42ea0000) +set(baseaddress_wlanapi 0x470f0000) +set(baseaddress_pidgen 0x473e0000) +set(baseaddress_dwmapi 0x4a3f0000) +set(baseaddress_t2embed 0x4b310000) +set(baseaddress_msftedit 0x4b460000) +set(baseaddress_loadperf 0x4b920000) +set(baseaddress_mprapi 0x4c400000) +set(baseaddress_wuapi 0x506a0000) +set(baseaddress_srclient 0x512c0000) +set(baseaddress_pstorec 0x513d0000) +set(baseaddress_lpk 0x516c0000) +set(baseaddress_msgsm32acm 0x56db0000) +set(baseaddress_msdvbnp 0x58280000) +set(baseaddress_msg711acm 0x584f0000) +set(baseaddress_imaadp32acm 0x585e0000) +set(baseaddress_bdaplgin 0x58600000) +set(baseaddress_telephon 0x58750000) +set(baseaddress_pwrcfg 0x587e0000) +set(baseaddress_mmsys 0x588a0000) +set(baseaddress_joy 0x589b0000) +set(baseaddress_qmgr 0x59620000) +set(baseaddress_msvidctl 0x59660000) +set(baseaddress_uxtheme 0x5ad70000) +set(baseaddress_vdmdbg 0x5b0d0000) +set(baseaddress_untfs 0x5b340000) +set(baseaddress_objsel 0x5b400000) +set(baseaddress_ufat 0x5b570000) +set(baseaddress_tapiui 0x5b770000) +set(baseaddress_uext2 0x5b7a0000) +set(baseaddress_slayer 0x5c7e0000) +set(baseaddress_usrmgr 0x5c900000) +set(baseaddress_shimgvw 0x5cb00000) +set(baseaddress_commctrl 0x5d090000) +set(baseaddress_dplayx 0x5e080000) +set(baseaddress_input 0x5e400000) +set(baseaddress_ntlanman 0x5f380000) +set(baseaddress_dinput 0x5f580000) +set(baseaddress_netid 0x5f660000) +set(baseaddress_ntprint 0x5f6a0000) +set(baseaddress_mssip32 0x60430000) +set(baseaddress_msisip 0x60b10000) +set(baseaddress_inseng 0x61000000) +set(baseaddress_qedit 0x611c0000) +set(baseaddress_modemui 0x61650000) +set(baseaddress_mapi32 0x62250000) +set(baseaddress_mciwave 0x622a0000) +set(baseaddress_mciseq 0x622b0000) +set(baseaddress_mciqtz32 0x622c0000) +set(baseaddress_mcicda 0x622e0000) +set(baseaddress_localui 0x62f70000) +set(baseaddress_hdwwiz 0x64d40000) +set(baseaddress_timedate 0x64da0000) +set(baseaddress_sysdm 0x64dd0000) +set(baseaddress_ncpl 0x64ea0000) +set(baseaddress_main 0x64f40000) +set(baseaddress_intl 0x64fb0000) +set(baseaddress_desk 0x65080000) +set(baseaddress_appwiz 0x65100000) +set(baseaddress_mlang 0x65140000) +set(baseaddress_access 0x65180000) +set(baseaddress_itss 0x66370000) +set(baseaddress_itircl 0x663a0000) +set(baseaddress_inetmib1 0x666f0000) +set(baseaddress_initpki 0x66b00000) +set(baseaddress_wshtcpip 0x677b0000) +set(baseaddress_crypt32 0x67ab0000) +set(baseaddress_httpapi 0x67ae0000) +set(baseaddress_hid 0x688f0000) +set(baseaddress_psxdll 0x68eb0000) +set(baseaddress_psapi 0x68f70000) +set(baseaddress_ksproxy 0x68f90000) +set(baseaddress_getuname 0x69110000) +set(baseaddress_oleacc 0x69640000) +set(baseaddress_winmm 0x697d0000) +set(baseaddress_msimg32 0x69cc0000) +set(baseaddress_browseui 0x69cd0000) +set(baseaddress_netplwiz 0x6a240000) +set(baseaddress_shell32 0x6a360000) +set(baseaddress_unicode 0x6b200000) +set(baseaddress_advpack 0x6b300000) +set(baseaddress_control 0x6b310000) +set(baseaddress_ncpa 0x6b320000) +set(baseaddress_dbghelp 0x6b330000) +set(baseaddress_dinput8 0x6b340000) +set(baseaddress_dxdiagn 0x6b350000) +set(baseaddress_dsound 0x6b360000) +set(baseaddress_glu32 0x6b370000) +set(baseaddress_mesa32 0x6b380000) +set(baseaddress_opengl32 0x6b390000) +set(baseaddress_secur32 0x6b3a0000) +set(baseaddress_smdll 0x6b3b0000) +set(baseaddress_urlmon 0x6b3c0000) +set(baseaddress_serialui 0x6b3d0000) +set(baseaddress_hlink 0x6c6e0000) +set(baseaddress_deskmon 0x6d400000) +set(baseaddress_deskadp 0x6d410000) +set(baseaddress_wldap32 0x6e130000) +set(baseaddress_sxs 0x6e160000) +set(baseaddress_schannel 0x6e360000) +set(baseaddress_console 0x6e4d0000) +set(baseaddress_compstui 0x6ec10000) +set(baseaddress_hnetcfg 0x6edb0000) +set(baseaddress_clb 0x6f2b0000) +set(baseaddress_fontext 0x6f7b0000) +set(baseaddress_jscript 0x6fe80000) +set(baseaddress_cards 0x701a0000) +set(baseaddress_wininet 0x70200000) +set(baseaddress_winhttp 0x70c60000) +set(baseaddress_batt 0x70cb0000) +set(baseaddress_amstream 0x71030000) +set(baseaddress_aclui 0x71550000) +set(baseaddress_dhcpcsvc 0x71650000) +set(baseaddress_shdocvw 0x71700000) +set(baseaddress_actxprxy 0x71800000) +set(baseaddress_mswsock 0x71a30000) +set(baseaddress_wsock32 0x71ab0000) +set(baseaddress_acledit 0x71b70000) +set(baseaddress_netapi32 0x71c00000) +set(baseaddress_olesvr32 0x71dd0000) +set(baseaddress_olecli32 0x71df0000) +set(baseaddress_olethk32 0x71e10000) +set(baseaddress_netevent 0x71e70000) +set(baseaddress_dplay 0x71e80000) +set(baseaddress_security 0x71f10000) +set(baseaddress_mssign32 0x720c0000) +set(baseaddress_cryptui 0x720d0000) +set(baseaddress_winfax 0x722c0000) +set(baseaddress_winscard 0x723d0000) +set(baseaddress_devmgr 0x72a90000) +set(baseaddress_msadp32acm 0x72cb0000) +set(baseaddress_wdmaud.drv 0x72d20000) +set(baseaddress_winspool 0x72f50000) +set(baseaddress_softpub 0x73290000) +set(baseaddress_mscat32 0x732b0000) +set(baseaddress_mstask 0x73520000) +set(baseaddress_traffic 0x73550000) +set(baseaddress_mciavi32 0x73610000) +set(baseaddress_msvidc32 0x73650000) +set(baseaddress_msrle32 0x73660000) +set(baseaddress_msdmo 0x73670000) +set(baseaddress_avicap32 0x739e0000) +set(baseaddress_avifil32 0x73ac0000) +set(baseaddress_mscms 0x73af0000) +set(baseaddress_dciman32 0x73b10000) +set(baseaddress_sti 0x73b60000) +set(baseaddress_iccvid 0x73bc0000) +set(baseaddress_coredll 0x73d80000) +set(baseaddress_lz32 0x73d80000) +set(baseaddress_ksuser 0x73ea0000) +set(baseaddress_icmp 0x741f0000) +set(baseaddress_spoolss 0x742a0000) +set(baseaddress_msimtf 0x746b0000) +set(baseaddress_msctf 0x746e0000) +set(baseaddress_kbsdll 0x74720000) +set(baseaddress_quartz 0x747d0000) +set(baseaddress_userenv 0x74850000) +set(baseaddress_syssetup 0x74a10000) +set(baseaddress_ws2_32 0x74aa0000) +set(baseaddress_powrprof 0x74ad0000) +set(baseaddress_msxml3 0x74ae0000) +set(baseaddress_printui 0x74b40000) +set(baseaddress_sndblst 0x74c30000) +set(baseaddress_pdh 0x74c70000) +set(baseaddress_oledlg 0x74d00000) +set(baseaddress_samsrv 0x74f30000) +set(baseaddress_resutils 0x75070000) +set(baseaddress_samlib 0x750c0000) +set(baseaddress_cabinet 0x75120000) +set(baseaddress_netcfgx 0x755f0000) +set(baseaddress_iphlpapi 0x75700000) +set(baseaddress_nddeapi 0x75940000) +set(baseaddress_msgina 0x75970000) +set(baseaddress_localspl 0x75b80000) +set(baseaddress_cryptnet 0x75e60000) +set(baseaddress_rpcrt4 0x76000000) +set(baseaddress_shlwapi 0x76100000) +set(baseaddress_inetcomm 0x76140000) +set(baseaddress_comctl32 0x76170000) +set(baseaddress_comdlg32 0x76230000) +set(baseaddress_winsta 0x762f0000) +set(baseaddress_imm32 0x76320000) +set(baseaddress_d3d8thk 0x76340000) +set(baseaddress_riched32 0x76340000) +set(baseaddress_riched20 0x76360000) +set(baseaddress_odbccp32 0x76380000) +set(baseaddress_twain_32 0x76380000) +set(baseaddress_netshell 0x76390000) +set(baseaddress_lsasrv 0x76540000) +set(baseaddress_midimap 0x76600000) +set(baseaddress_wavemap 0x76610000) +set(baseaddress_mpr 0x76620000) +set(baseaddress_mshtml 0x76650000) +set(baseaddress_odbc32 0x76710000) +set(baseaddress_setupapi 0x76730000) +set(baseaddress_cryptdll 0x768f0000) +set(baseaddress_shfolder 0x76900000) +set(baseaddress_ntdsapi 0x76910000) +set(baseaddress_ntmarta 0x76920000) +set(baseaddress_rasdlg 0x76930000) +set(baseaddress_gdiplus 0x76a70000) +set(baseaddress_atl 0x76ac0000) +set(baseaddress_sfc 0x76b50000) +set(baseaddress_credui 0x76bf0000) +set(baseaddress_sfc_os 0x76c10000) +set(baseaddress_wintrust 0x76c30000) +set(baseaddress_imagehlp 0x76c90000) +set(baseaddress_clusapi 0x76d10000) +set(baseaddress_wmi 0x76d20000) +set(baseaddress_dhcpcsvc 0x76d80000) +set(baseaddress_fmifs 0x76df0000) +set(baseaddress_oleaut32 0x76e00000) +set(baseaddress_tapi32 0x76e60000) +set(baseaddress_rasman 0x76e90000) +set(baseaddress_rasapi32 0x76ee0000) +set(baseaddress_wtsapi32 0x76f50000) +set(baseaddress_msvfw32 0x76f60000) +set(baseaddress_msacm32 0x77400000) +set(baseaddress_crtdll 0x77630000) +set(baseaddress_authz 0x77690000) +set(baseaddress_cfgmgr32 0x77700000) +set(baseaddress_sensapi 0x77700000) +set(baseaddress_msafd 0x77780000) +set(baseaddress_packet 0x77780000) +set(baseaddress_msi 0x77790000) +set(baseaddress_snmpapi 0x777a0000) +set(baseaddress_usp10 0x777b0000) +set(baseaddress_iprtprio 0x777c0000) +set(baseaddress_ws2help 0x777e0000) +set(baseaddress_wshirda 0x777f0000) +set(baseaddress_version 0x77a40000) +set(baseaddress_ole32 0x77a50000) +set(baseaddress_olepro32 0x77b20000) +set(baseaddress_activeds 0x77cb0000) +set(baseaddress_advapi32 0x77dc0000) +set(baseaddress_user32 0x77e50000) +set(baseaddress_gdi32 0x77f70000) +set(baseaddress_dnsapi 0x77fb0000) +set(baseaddress_msvcrt 0x78000000) +set(baseaddress_msvcrt20 0x78500000) +set(baseaddress_msvcrt40 0x78700000) +set(baseaddress_mscoree 0x79000000) +set(baseaddress_fusion 0x79040000) +set(baseaddress_kernel32 0x7c700000) +set(baseaddress_ntdll 0x7c900000) +set(baseaddress_query 0x7d9a0000) +set(baseaddress_hhctrl 0x7e410000) +set(baseaddress_sxs 0x7e690000) +set(baseaddress_beepmidi 0x7ef00000) +set(baseaddress_freetype 0x7f000000) Propchange: branches/cmake-bringup/baseaddress.cmake ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=493… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Oct 27 14:00:51 2010 @@ -105,6 +105,11 @@ endif() if(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMain@12) + if(DEFINED baseaddress_${MODULE}) + set_image_base(${MODULE} ${baseaddress_${MODULE}}) + else() + message(WARNING "${MODULE} has no base address") + endif() endif() if(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMain@12)

1 0

[fireball] 49304: - Undef NB_HOOKS to fix compilation with latest trunk. - Check if Process is not NULL in get_process_idle_event request, fixes a crash.
by fireball＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: fireball Date: Wed Oct 27 12:56:36 2010 New Revision: 49304 URL: http://svn.reactos.org/svn/reactos?rev=49304&view=rev Log: - Undef NB_HOOKS to fix compilation with latest trunk. - Check if Process is not NULL in get_process_idle_event request, fixes a crash. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] Wed Oct 27 12:56:36 2010 @@ -28,6 +28,8 @@ #define NDEBUG #include <debug.h> +#undef NB_HOOKS + struct hook_table; struct hook Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] Wed Oct 27 12:56:36 2010 @@ -50,7 +50,7 @@ { Process = PsGetProcessWin32Process(ProcessObject); - if (Process->idle_event && ProcessObject != PsGetCurrentProcess()) + if (Process && Process->idle_event && ProcessObject != PsGetCurrentProcess()) { /* Get a handle to the idle event (in another process) */ Status = ObOpenObjectByPointer(Process->idle_event,

1 0

[tkreuzer] 49303: [WIN32K] Fix possible NULL pointer dereference. Spotted by Amine Khaldi.
by tkreuzer＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: tkreuzer Date: Wed Oct 27 12:51:32 2010 New Revision: 49303 URL: http://svn.reactos.org/svn/reactos?rev=49303&view=rev Log: [WIN32K] Fix possible NULL pointer dereference. Spotted by Amine Khaldi. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Wed Oct 27 12:51:32 2010 @@ -299,17 +299,21 @@ UserEnterExclusive(); /* Validate input */ - if (hWnd && (hWnd != INVALID_HANDLE_VALUE) && !(Window = UserGetWindowObject(hWnd))) - { - UserLeave(); - return; + if (hWnd && (hWnd != INVALID_HANDLE_VALUE)) + { + Window = UserGetWindowObject(hWnd); + if (!Window) + { + UserLeave(); + return; + } } if (gpsi->dwInstalledEventHooks & GetMaskFromEvent(Event)) { - UserRefObjectCo(Window, &Ref); + if (Window) UserRefObjectCo(Window, &Ref); IntNotifyWinEvent( Event, Window, idObject, idChild, WEF_SETBYWNDPTI); - UserDerefObjectCo(Window); + if (Window) UserDerefObjectCo(Window); } UserLeave(); }

1 0

[fireball] 49302: [NTOS/MM] - Don't access pfn database directly, there is a function for this. Thanks sir_richard.
by fireball＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: fireball Date: Wed Oct 27 09:58:18 2010 New Revision: 49302 URL: http://svn.reactos.org/svn/reactos?rev=49302&view=rev Log: [NTOS/MM] - Don't access pfn database directly, there is a function for this. Thanks sir_richard. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Oct 27 09:58:18 2010 @@ -1075,7 +1075,7 @@ if (!TempPte.u.Hard.Valid) return MmProtectToValue[TempPte.u.Soft.Protection]; /* If we get here, the PTE is valid, so look up the page in PFN database */ - Pfn = &MmPfnDatabase[TempPte.u.Hard.PageFrameNumber]; + Pfn = MiGetPfnEntry(TempPte.u.Hard.PageFrameNumber); if (!Pfn->u3.e1.PrototypePte) {

1 0

[jimtabor] 49301: [Win32k|User32] - Fix for DosBOX. See bug 5670 for more details. Added more data copies in user32 hook.c.
by jimtabor＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jimtabor Date: Wed Oct 27 01:56:56 2010 New Revision: 49301 URL: http://svn.reactos.org/svn/reactos?rev=49301&view=rev Log: [Win32k|User32] - Fix for DosBOX. See bug 5670 for more details. Added more data copies in user32 hook.c. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Wed Oct 27 01:56:56 2010 @@ -452,12 +452,12 @@ CREATESTRUCTW Csw; CBT_CREATEWNDW CbtCreatewndw; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; - PKBDLLHOOKSTRUCT pKeyboardLlData; - PMSLLHOOKSTRUCT pMouseLlData; - PMSG pMsg; + KBDLLHOOKSTRUCT KeyboardLlData, *pKeyboardLlData; + MSLLHOOKSTRUCT MouseLlData, *pMouseLlData; + MSG Msg, *pMsg; PMOUSEHOOKSTRUCT pMHook; - PCWPSTRUCT pCWP; - PCWPRETSTRUCT pCWPR; + CWPSTRUCT CWP, *pCWP; + CWPRETSTRUCT CWPR, *pCWPR; PRECTL prl; LPCBTACTIVATESTRUCT pcbtas; WPARAM wParam = 0; @@ -541,11 +541,13 @@ case WH_KEYBOARD_LL: ERR("WH_KEYBOARD_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); pKeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pKeyboardLlData); + RtlCopyMemory(&KeyboardLlData, pKeyboardLlData, sizeof(KBDLLHOOKSTRUCT)); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData); break; case WH_MOUSE_LL: pMouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pMouseLlData); + RtlCopyMemory(&MouseLlData, pMouseLlData, sizeof(MSLLHOOKSTRUCT)); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData); break; case WH_MOUSE: /* SEH support */ pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); @@ -560,26 +562,33 @@ _SEH2_END; break; case WH_CALLWNDPROC: + ERR("WH_CALLWNDPROC: Code %d, wParam %d\n",Common->Code,Common->wParam); pCWP = (PCWPSTRUCT)((PCHAR) Common + Common->lParam); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWP); + RtlCopyMemory(&CWP, pCWP, sizeof(CWPSTRUCT)); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWP); break; case WH_CALLWNDPROCRET: pCWPR = (PCWPRETSTRUCT)((PCHAR) Common + Common->lParam); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); + RtlCopyMemory(&CWPR, pCWPR, sizeof(CWPRETSTRUCT)); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWPR); break; case WH_MSGFILTER: /* All SEH support */ + ERR("WH_MSGFILTER: Code %d, wParam %d\n",Common->Code,Common->wParam); case WH_SYSMSGFILTER: case WH_GETMESSAGE: pMsg = (PMSG)((PCHAR) Common + Common->lParam); + RtlCopyMemory(&Msg, pMsg, sizeof(MSG)); _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pMsg); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &Msg); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Hit = TRUE; } _SEH2_END; + if (!Hit && Common->HookId == WH_GETMESSAGE) + RtlCopyMemory(pMsg, &Msg, sizeof(MSG)); break; case WH_FOREGROUNDIDLE: /* <-- SEH support */ case WH_KEYBOARD: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Wed Oct 27 01:56:56 2010 @@ -726,7 +726,7 @@ pti = PsGetCurrentThreadWin32Thread(); Elem = Hook->Chain.Flink; - if (Elem != &pti->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) + if (Elem != &pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) return CONTAINING_RECORD(Elem, HOOK, Chain); } return NULL; @@ -785,10 +785,11 @@ pti = PsGetCurrentThreadWin32Thread(); - if ( pti->pDeskInfo && - IsListEmpty(&pti->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) ) - { - pti->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); + if ( pti->rpdesk && + pti->rpdesk->pDeskInfo && + IsListEmpty(&pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) ) + { + pti->rpdesk->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); return TRUE; } } @@ -830,7 +831,7 @@ pti->fsHooks = 0; } // Global search based on Thread and cleanup. - if (pti->pDeskInfo->fsHooks) + if (pti->rpdesk->pDeskInfo->fsHooks) { for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) { @@ -876,7 +877,7 @@ ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); pti = PsGetCurrentThreadWin32Thread(); - if (!pti || !pti->pDeskInfo) + if (!pti || !pti->rpdesk || !pti->rpdesk->pDeskInfo) goto Exit; // Must have a desktop running for hooks. if ( pti->TIF_flags & TIF_INCLEANUP) @@ -888,7 +889,7 @@ Local = TRUE; } - if ( pti->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId) ) + if ( pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId) ) { DPRINT("Global Hooker %d\n", HookId); Global = TRUE; @@ -897,7 +898,7 @@ if ( !Local && !Global ) goto Exit; // No work! pLLE = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; - pGLE = &pti->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; + pGLE = &pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; Hook = NULL; /* SetWindowHookEx sorts out the Thread issue by placing the Hook to @@ -987,14 +988,12 @@ ObReferenceObject(ptiHook->pEThread); if (ptiHook != pti ) { - if (HookId == WH_KEYBOARD_LL){ - DPRINT1("\nGlobal Hook posting to another Thread! %d\n",HookId );} + DPRINT("\nGlobal Hook posting to another Thread! %d\n",HookId ); Result = IntCallLowLevelHook(Hook, Code, wParam, lParam); } else { /* Make the direct call. */ - if (HookId == WH_KEYBOARD_LL){ - DPRINT1("\nLocal Hook calling to Thread! %d\n",HookId );} + DPRINT("\nLocal Hook calling to Thread! %d\n",HookId ); Result = co_IntCallHookProc( HookId, Code, wParam, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Oct 27 01:56:56 2010 @@ -798,7 +798,7 @@ KbdHookData.dwExtraInfo = 0; if (co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, Msg.message, (LPARAM) &KbdHookData)) { - DPRINT("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + DPRINT1("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", Msg.message, Msg.wParam, Msg.lParam); if (Entered) UserLeave(); return;

1 0

[jimtabor] 49300: [User32] - Fix an over site and copy the return data back to the kernel.
by jimtabor＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jimtabor Date: Wed Oct 27 00:03:41 2010 New Revision: 49300 URL: http://svn.reactos.org/svn/reactos?rev=49300&view=rev Log: [User32] - Fix an over site and copy the return data back to the kernel. Modified: trunk/reactos/dll/win32/user32/windows/hook.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Wed Oct 27 00:03:41 2010 @@ -449,12 +449,9 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength) { PHOOKPROC_CALLBACK_ARGUMENTS Common; - LRESULT Result; CREATESTRUCTW Csw; CBT_CREATEWNDW CbtCreatewndw; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; - WPARAM wParam = 0; - LPARAM lParam = 0; PKBDLLHOOKSTRUCT pKeyboardLlData; PMSLLHOOKSTRUCT pMouseLlData; PMSG pMsg; @@ -463,6 +460,9 @@ PCWPRETSTRUCT pCWPR; PRECTL prl; LPCBTACTIVATESTRUCT pcbtas; + WPARAM wParam = 0; + LPARAM lParam = 0; + LRESULT Result = 0; BOOL Hit = FALSE; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -530,6 +530,10 @@ { case HCBT_CREATEWND: CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; + CbtCreatewndExtra->Cs.x = CbtCreatewndw.lpcs->x; + CbtCreatewndExtra->Cs.y = CbtCreatewndw.lpcs->y; + CbtCreatewndExtra->Cs.cx = CbtCreatewndw.lpcs->cx; + CbtCreatewndExtra->Cs.cy = CbtCreatewndw.lpcs->cy; break; } break;

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