Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 49319: [CMAKE] - qedit depends on dxsdk
by jgardou＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jgardou Date: Wed Oct 27 22:39:48 2010 New Revision: 49319 URL: http://svn.reactos.org/svn/reactos?rev=49319&view=rev Log: [CMAKE] - qedit depends on dxsdk Modified: branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/qedit… ============================================================================== --- branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt [iso-8859-1] Wed Oct 27 22:39:48 2010 @@ -31,5 +31,5 @@ kernel32 ntdll) -add_dependencies(qedit qedit_def) +add_dependencies(qedit qedit_def dxsdk) add_livecd_target(qedit reactos/system32)

1 0

[akhaldi] 49318: [CMAKE] - Improve win32k
by akhaldi＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: akhaldi Date: Wed Oct 27 22:27:16 2010 New Revision: 49318 URL: http://svn.reactos.org/svn/reactos?rev=49318&view=rev Log: [CMAKE] - Improve win32k Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Wed Oct 27 22:27:16 2010 @@ -1,12 +1,11 @@ - - -include_directories(.) -include_directories(include) -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) +include_directories( + . + include + ${REACTOS_SOURCE_DIR}/ntoskrnl/include + ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) add_definitions(-DLANGPACK) add_definitions(-D_WIN32K_) @@ -178,17 +177,15 @@ ${CMAKE_CURRENT_BINARY_DIR}/win32k_pch.h.gch ${SOURCE}) -set_target_properties(win32k PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(win32k kernelmodedriver) target_link_libraries(win32k ${CMAKE_CURRENT_SOURCE_DIR}/win32k_i386.def pseh - -lntoskrnl - -lhal - -lftfd dxguid libcntpr) +add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) -add_dependencies(win32k psdk gendib_generated bugcodes subsystem_napi buildno_header) +add_dependencies(win32k gendib_generated subsystem_napi) add_livecd_target(win32k reactos/system32)

1 0

[jgardou] 49317: [CMAKE] - Downgrade a warning to a status, so this is not too intrusive
by jgardou＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: jgardou Date: Wed Oct 27 22:25:35 2010 New Revision: 49317 URL: http://svn.reactos.org/svn/reactos?rev=49317&view=rev Log: [CMAKE] - Downgrade a warning to a status, so this is not too intrusive Modified: branches/cmake-bringup/gcc.cmake 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 22:25:35 2010 @@ -108,7 +108,7 @@ if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() - message(WARNING "${MODULE} has no base address") + message(STATUS "${MODULE} has no base address") endif() endif() if(${TYPE} MATCHES win32ocx)

1 0

[janderwald] 49316: - remove debug prints - dedicated to christoph
by janderwald＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: janderwald Date: Wed Oct 27 21:12:44 2010 New Revision: 49316 URL: http://svn.reactos.org/svn/reactos?rev=49316&view=rev Log: - remove debug prints - dedicated to christoph Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c trunk/reactos/lib/drivers/sound/mmixer/topology.c Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Wed Oct 27 21:12:44 2010 @@ -340,7 +340,6 @@ if (Index >= VolumeData->ValuesCount) { DPRINT1("Index %u out of bounds %u \n", Index, VolumeData->ValuesCount); - DbgBreakPoint(); return MM_STATUS_INVALID_PARAMETER; } Modified: trunk/reactos/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/t… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Wed Oct 27 21:12:44 2010 @@ -14,23 +14,23 @@ { ULONG Index, SubIndex; - DPRINT1("Num Pins %lu NumNodes %lu\n", Topology->TopologyPinsCount, Topology->TopologyNodesCount); + DPRINT("Num Pins %lu NumNodes %lu\n", Topology->TopologyPinsCount, Topology->TopologyNodesCount); for(Index = 0; Index < Topology->TopologyPinsCount; Index++) { - DPRINT1("PinId %lu NodesConnectedFromCount %lu NodesConnectedToCount %lu Visited %lu\n", Topology->TopologyPins[Index].PinId, + DPRINT("PinId %lu NodesConnectedFromCount %lu NodesConnectedToCount %lu Visited %lu\n", Topology->TopologyPins[Index].PinId, Topology->TopologyPins[Index].NodesConnectedFromCount, Topology->TopologyPins[Index].NodesConnectedToCount, Topology->TopologyPins[Index].Visited); for(SubIndex = 0; SubIndex < Topology->TopologyPins[Index].NodesConnectedFromCount; SubIndex++) - DPRINT1("NodesConnectedFrom Index %lu NodeId %lu\n", SubIndex, Topology->TopologyPins[Index].NodesConnectedFrom[SubIndex]->NodeIndex); + DPRINT("NodesConnectedFrom Index %lu NodeId %lu\n", SubIndex, Topology->TopologyPins[Index].NodesConnectedFrom[SubIndex]->NodeIndex); for(SubIndex = 0; SubIndex < Topology->TopologyPins[Index].NodesConnectedToCount; SubIndex++) - DPRINT1("NodesConnectedTo Index %lu NodeId %lu\n", SubIndex, Topology->TopologyPins[Index].NodesConnectedTo[SubIndex]->NodeIndex); + DPRINT("NodesConnectedTo Index %lu NodeId %lu\n", SubIndex, Topology->TopologyPins[Index].NodesConnectedTo[SubIndex]->NodeIndex); } for(Index = 0; Index < Topology->TopologyNodesCount; Index++) { - DPRINT1("NodeId %lu NodesConnectedFromCount %lu NodesConnectedToCount %lu Visited %lu PinConnectedFromCount %lu PinConnectedToCount %lu\n", Topology->TopologyNodes[Index].NodeIndex, + DPRINT("NodeId %lu NodesConnectedFromCount %lu NodesConnectedToCount %lu Visited %lu PinConnectedFromCount %lu PinConnectedToCount %lu\n", Topology->TopologyNodes[Index].NodeIndex, Topology->TopologyNodes[Index].NodeConnectedFromCount, Topology->TopologyNodes[Index].NodeConnectedToCount, Topology->TopologyNodes[Index].Visited, Topology->TopologyNodes[Index].PinConnectedFromCount, Topology->TopologyNodes[Index].PinConnectedToCount); }

1 0

[spetreolle] 49315: [WLANSVC] Fix MIDL_user_allocate prototype. Dedicated to zefklop.
by spetreolle＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: spetreolle Date: Wed Oct 27 20:50:14 2010 New Revision: 49315 URL: http://svn.reactos.org/svn/reactos?rev=49315&view=rev Log: [WLANSVC] Fix MIDL_user_allocate prototype. Dedicated to zefklop. Modified: branches/cmake-bringup/base/services/wlansvc/rpcserver.c Modified: branches/cmake-bringup/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/rpcserver.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/wlansvc/rpcserver.c [iso-8859-1] Wed Oct 27 20:50:14 2010 @@ -525,7 +525,7 @@ return ERROR_CALL_NOT_IMPLEMENTED; } -void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

[tkreuzer] 49314: [CLASSPNP] Fix a typo in the spec file
by tkreuzer＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: tkreuzer Date: Wed Oct 27 20:40:59 2010 New Revision: 49314 URL: http://svn.reactos.org/svn/reactos?rev=49314&view=rev Log: [CLASSPNP] Fix a typo in the spec file Modified: trunk/reactos/drivers/storage/classpnp/class.spec Modified: trunk/reactos/drivers/storage/classpnp/class.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.spec [iso-8859-1] Wed Oct 27 20:40:59 2010 @@ -9,7 +9,7 @@ @ stdcall ClassDeviceControl(ptr ptr) @ stdcall ClassIoComplete(ptr ptr ptr) @ stdcall ClassIoCompleteAssociated(ptr ptr ptr) - @ stdcall ClassInterpretSenseInfo(ptr ptr long long long ptr) + @ stdcall ClassInterpretSenseInfo(ptr ptr long long long ptr ptr) @ stdcall ClassSendDeviceIoControlSynchronous(long ptr ptr long long long ptr) @ stdcall ClassSendIrpSynchronous(ptr ptr) @ stdcall ClassForwardIrpSynchronous(ptr ptr)

1 0

[gadamopoulos] 49313: [FORMATTING] - Fix formatting in message.c
by gadamopoulos＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: gadamopoulos Date: Wed Oct 27 20:31:17 2010 New Revision: 49313 URL: http://svn.reactos.org/svn/reactos?rev=49313&view=rev Log: [FORMATTING] - Fix formatting in message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…

1 0

[tkreuzer] 49312: [basetsd.h] add POINTER_SIGNED, POINTER_UNSIGNED, SPOINTER_32, UPOINTER_32
by tkreuzer＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: tkreuzer Date: Wed Oct 27 20:14:15 2010 New Revision: 49312 URL: http://svn.reactos.org/svn/reactos?rev=49312&view=rev Log: [basetsd.h] add POINTER_SIGNED, POINTER_UNSIGNED, SPOINTER_32, UPOINTER_32 Modified: trunk/reactos/include/psdk/basetsd.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Wed Oct 27 20:14:15 2010 @@ -63,6 +63,17 @@ #else typedef unsigned long POINTER_64_INT; #endif + +#if 0 /* Not supported yet */ +#define POINTER_SIGNED __sptr +#define POINTER_UNSIGNED __uptr +#else +#define POINTER_SIGNED +#define POINTER_UNSIGNED +#endif + +#define SPOINTER_32 POINTER_SIGNED POINTER_32 +#define UPOINTER_32 POINTER_UNSIGNED POINTER_32 #if defined(_WIN64) #define __int3264 __int64

1 0

[tkreuzer] 49311: [CLASSPNP] Convert to spec
by tkreuzer＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: tkreuzer Date: Wed Oct 27 20:13:06 2010 New Revision: 49311 URL: http://svn.reactos.org/svn/reactos?rev=49311&view=rev Log: [CLASSPNP] Convert to spec Added: trunk/reactos/drivers/storage/classpnp/class.spec (with props) Removed: trunk/reactos/drivers/storage/classpnp/class.def Modified: trunk/reactos/drivers/storage/classpnp/classpnp.rbuild Removed: trunk/reactos/drivers/storage/classpnp/class.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.def [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.def (removed) @@ -1,61 +1,0 @@ -NAME CLASSPNP.SYS - -EXPORTS - ClassInitialize@12 - ClassInitializeEx@12 - ClassGetDescriptor@12 - ClassReadDriveCapacity@4 - ClassReleaseQueue@4 - ClassAsynchronousCompletion@12 - ClassSplitRequest@12 - ClassDeviceControl@8 - ClassIoComplete@12 - ClassIoCompleteAssociated@12 - ClassInterpretSenseInfo@28 - ClassSendDeviceIoControlSynchronous@28 - ClassSendIrpSynchronous@8 - ClassForwardIrpSynchronous@8 - ClassSendSrbSynchronous@20 - ClassSendSrbAsynchronous@24 - ClassBuildRequest@8 - ClassModeSense@16 - ClassFindModePage@16 - ClassClaimDevice@8 - ClassInternalIoControl@8 - ClassCreateDeviceObject@20 - ClassRemoveDevice@8 - ClassInitializeSrbLookasideList@8 - ClassDeleteSrbLookasideList@4 - ClassQueryTimeOutRegistryValue@4 - ClassInvalidateBusRelations@4 - ClassMarkChildrenMissing@4 - ClassMarkChildMissing@8 - ClassDebugPrint - ClassGetDriverExtension@4 - ClassCompleteRequest@12 - ClassReleaseRemoveLock@8 - ClassAcquireRemoveLockEx@16 - ClassUpdateInformationInRegistry@20 - ClassWmiCompleteRequest@20 - ClassWmiFireEvent@20 - ClassGetVpb@4 - ClassSetFailurePredictionPoll@12 - ClassNotifyFailurePredicted@32 - ClassInitializeTestUnitPolling@8 - ClassSignalCompletion@12 - ClassSendStartUnit@4 - ClassSetMediaChangeState@12 - ClassResetMediaChangeTimer@4 - ClassCheckMediaState@4 - ClassInitializeMediaChangeDetection@8 - ClassCleanupMediaChangeDetection@4 - ClassEnableMediaChangeDetection@4 - ClassDisableMediaChangeDetection@4 - ClassSpinDownPowerHandler@8 - ClassStopUnitPowerHandler@8 - ClassAcquireChildLock@4 - ClassReleaseChildLock@4 - ClassScanForSpecial@12 - ClassSetDeviceParameter@16 - ClassGetDeviceParameter@16 - Added: trunk/reactos/drivers/storage/classpnp/class.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.spec (added) +++ trunk/reactos/drivers/storage/classpnp/class.spec [iso-8859-1] Wed Oct 27 20:13:06 2010 @@ -1,0 +1,59 @@ + + @ stdcall ClassInitialize(ptr ptr ptr) + @ stdcall ClassInitializeEx(ptr ptr ptr) + @ stdcall ClassGetDescriptor(ptr ptr ptr) + @ stdcall ClassReadDriveCapacity(ptr) + @ stdcall ClassReleaseQueue(ptr) + @ stdcall ClassAsynchronousCompletion(ptr ptr ptr) + @ stdcall ClassSplitRequest(ptr ptr long) + @ stdcall ClassDeviceControl(ptr ptr) + @ stdcall ClassIoComplete(ptr ptr ptr) + @ stdcall ClassIoCompleteAssociated(ptr ptr ptr) + @ stdcall ClassInterpretSenseInfo(ptr ptr long long long ptr) + @ stdcall ClassSendDeviceIoControlSynchronous(long ptr ptr long long long ptr) + @ stdcall ClassSendIrpSynchronous(ptr ptr) + @ stdcall ClassForwardIrpSynchronous(ptr ptr) + @ stdcall ClassSendSrbSynchronous(ptr ptr ptr long long) + @ stdcall ClassSendSrbAsynchronous(ptr ptr ptr ptr long long) + @ stdcall ClassBuildRequest(ptr ptr) + @ stdcall ClassModeSense(ptr ptr long long) + @ stdcall ClassFindModePage(ptr long long long) + @ stdcall ClassClaimDevice(ptr long) + @ stdcall ClassInternalIoControl(ptr ptr) + @ stdcall ClassCreateDeviceObject(ptr ptr ptr long ptr) + @ stdcall ClassRemoveDevice(ptr long) + @ stdcall ClassInitializeSrbLookasideList(ptr long) + @ stdcall ClassDeleteSrbLookasideList(ptr) + @ stdcall ClassQueryTimeOutRegistryValue(ptr) + @ stdcall ClassInvalidateBusRelations(ptr) + @ stdcall ClassMarkChildrenMissing(ptr) + @ stdcall ClassMarkChildMissing(ptr long) + @ varargs ClassDebugPrint(long long) + @ stdcall ClassGetDriverExtension(ptr) + @ stdcall ClassCompleteRequest(ptr ptr long) + @ stdcall ClassReleaseRemoveLock(ptr ptr) + @ stdcall ClassAcquireRemoveLockEx(ptr ptr ptr long) + @ stdcall ClassUpdateInformationInRegistry(ptr ptr long ptr long) + @ stdcall ClassWmiCompleteRequest(ptr ptr long long long) + @ stdcall ClassWmiFireEvent(ptr ptr long long ptr) + @ stdcall ClassGetVpb(ptr) + @ stdcall ClassSetFailurePredictionPoll(ptr long long) + @ stdcall ClassNotifyFailurePredicted(ptr ptr long long long long long long) + @ stdcall ClassInitializeTestUnitPolling(ptr long) + @ stdcall ClassSignalCompletion(ptr ptr ptr) + @ stdcall ClassSendStartUnit(ptr) + @ stdcall ClassSetMediaChangeState(ptr long long) + @ stdcall ClassResetMediaChangeTimer(ptr) + @ stdcall ClassCheckMediaState(ptr) + @ stdcall ClassInitializeMediaChangeDetection(ptr ptr) + @ stdcall ClassCleanupMediaChangeDetection(ptr) + @ stdcall ClassEnableMediaChangeDetection(ptr) + @ stdcall ClassDisableMediaChangeDetection(ptr) + @ stdcall ClassSpinDownPowerHandler(ptr ptr) + @ stdcall ClassStopUnitPowerHandler(ptr ptr) + @ stdcall ClassAcquireChildLock(ptr) + @ stdcall ClassReleaseChildLock(ptr) + @ stdcall ClassScanForSpecial(ptr ptr ptr) + @ stdcall ClassSetDeviceParameter(ptr ptr ptr long) + @ stdcall ClassGetDeviceParameter(ptr ptr ptr ptr) + Propchange: trunk/reactos/drivers/storage/classpnp/class.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/classpnp/classpnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] Wed Oct 27 20:13:06 2010 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="classpnp" type="kernelmodedriver" installbase="system32/drivers" installname="classpnp.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <importlibrary definition="class.def" /> + <importlibrary definition="class.spec" /> <library>ntoskrnl</library> <library>hal</library> <library>pseh</library>

1 0

[tkreuzer] 49310: [WIN32K] Improve the code to enumerate monitors. - Don't use custom MIN / MAX / ABS macros - Calculate distance by r^2 = x^2 + y^2 - Use RECTL_bIntersectRect instead of code dupli...
by tkreuzer＠svn.reactos.org 27 Oct '10

27 Oct '10

Author: tkreuzer Date: Wed Oct 27 17:16:11 2010 New Revision: 49310 URL: http://svn.reactos.org/svn/reactos?rev=49310&view=rev Log: [WIN32K] Improve the code to enumerate monitors. - Don't use custom MIN / MAX / ABS macros - Calculate distance by r^2 = x^2 + y^2 - Use RECTL_bIntersectRect instead of code duplication - Fix possible NULL pointer dereference - pass bottom-right exclusive rect to IntGetMonitorsFromRect from NtUserMonitorFromPoint - Don't handle MONITOR_DEFAULTTOPRIMARY and MONITOR_DEFAULTTONEAREST twice - Use unsigned variables for unsigned values - Don't check the result of a UINT returning function for < 0 - Improve readability 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 17:16:11 2010 @@ -47,16 +47,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ -#ifndef MIN -# define MIN(a, b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef MAX -# define MAX(a, b) ((a) > (b) ? (a) : (b)) -#endif -#ifndef ABS -# define ABS(a) ((a) < (0) ? (-(a)) : (a)) -#endif - /* IntCreateMonitorObject * * Creates a MONITOR @@ -318,9 +308,9 @@ { PMONITOR Monitor, NearestMonitor = NULL, PrimaryMonitor = NULL; UINT iCount = 0; - LONG iNearestDistanceX = 0x7fffffff, iNearestDistanceY = 0x7fffffff; - - /* find monitors which intersect the rectangle */ + ULONG iNearestDistance = 0xffffffff; + + /* Find monitors which intersect the rectangle */ for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) { RECTL MonitorRect, IntersectionRect; @@ -337,49 +327,42 @@ 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)) + /* Check if a rect is given */ + if (pRect == NULL) + { + /* No rect given, so use the full monitor rect */ + IntersectionRect = MonitorRect; + } + + /* We have a rect, calculate intersection */ + else if (!RECTL_bIntersectRect(&IntersectionRect, &MonitorRect, pRect)) + { + /* Rects did not intersect */ + if (flags == MONITOR_DEFAULTTONEAREST) { - 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))) + ULONG cx, cy, iDistance; + + /* Get x and y distance */ + cx = min(abs(MonitorRect.left - pRect->right), + abs(pRect->left - MonitorRect.right)); + cy = min(abs(MonitorRect.top - pRect->bottom), + abs(pRect->top - MonitorRect.bottom)); + + /* Calculate distance square */ + iDistance = cx * cx + cy * cy; + + /* Check if this is the new nearest monitor */ + if (iDistance < iNearestDistance) { - iNearestDistanceX = distanceX; - iNearestDistanceY = distanceY; + iNearestDistance = iDistance; 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; - } - + continue; + } + + /* Check if there's space in the buffer */ if (iCount < listSize) { if (hMonitorList != NULL) @@ -387,27 +370,30 @@ if (monitorRectList != NULL) monitorRectList[iCount] = IntersectionRect; } + + /* Increase count of found monitors */ iCount++; } - if (iCount == 0 && flags == MONITOR_DEFAULTTONEAREST) - { - if (iCount < listSize) - { - if (hMonitorList != NULL) + /* Found nothing intersecting? */ + if (iCount == 0) + { + /* Check if we shall default to the nearest monitor */ + if (flags == MONITOR_DEFAULTTONEAREST && NearestMonitor) + { + if (hMonitorList && listSize > 0) hMonitorList[iCount] = UserHMGetHandle(NearestMonitor); - } - iCount++; - } - else if (iCount == 0 && flags == MONITOR_DEFAULTTOPRIMARY) - { - if (iCount < listSize) - { - if (hMonitorList != NULL) + iCount++; + } + /* Check if we shall default to the primary monitor */ + else if (flags == MONITOR_DEFAULTTOPRIMARY && PrimaryMonitor) + { + if (hMonitorList != NULL && listSize > 0) hMonitorList[iCount] = UserHMGetHandle(PrimaryMonitor); - } - iCount++; - } + iCount++; + } + } + return iCount; } @@ -719,32 +705,17 @@ RECTL InRect; HMONITOR hMonitor = NULL; - /* fill inRect */ - InRect.left = InRect.right = point.x; - InRect.top = InRect.bottom = point.y; + /* fill inRect (bottom-right exclusive) */ + InRect.left = point.x; + InRect.right = point.x + 1; + InRect.top = point.y; + InRect.bottom = point.y + 1; /* find intersecting monitor */ - NumMonitors = IntGetMonitorsFromRect(&InRect, &hMonitor, NULL, 1, 0); + NumMonitors = IntGetMonitorsFromRect(&InRect, &hMonitor, NULL, 1, dwFlags); 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; @@ -773,7 +744,7 @@ IN LPCRECTL pRect, IN DWORD dwFlags) { - INT numMonitors, iLargestArea = -1, i; + ULONG numMonitors, iLargestArea = 0, i; PRECTL rectList; HMONITOR *hMonitorList; HMONITOR hMonitor = NULL; @@ -789,44 +760,24 @@ } /* 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); + numMonitors = IntGetMonitorsFromRect(&rect, &hMonitor, NULL, 1, dwFlags); + if (numMonitors <= 1) + { + return hMonitor; + } + + hMonitorList = ExAllocatePoolWithTag(PagedPool, + sizeof(HMONITOR) * numMonitors, + USERTAG_MONITORRECTS); if (hMonitorList == NULL) { /* FIXME: SetLastWin32Error? */ return (HMONITOR)NULL; } - rectList = ExAllocatePoolWithTag(PagedPool, sizeof (RECT) * numMonitors, USERTAG_MONITORRECTS); + + rectList = ExAllocatePoolWithTag(PagedPool, + sizeof(RECT) * numMonitors, + USERTAG_MONITORRECTS); if (rectList == NULL) { ExFreePoolWithTag(hMonitorList, USERTAG_MONITORRECTS); @@ -837,7 +788,7 @@ /* get intersecting monitors */ numMonitors = IntGetMonitorsFromRect(&rect, hMonitorList, rectList, numMonitors, 0); - if (numMonitors <= 0) + if (numMonitors == 0) { ExFreePoolWithTag(hMonitorList, USERTAG_MONITORRECTS); ExFreePoolWithTag(rectList, USERTAG_MONITORRECTS); @@ -847,9 +798,9 @@ /* 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) + ULONG area = (rectList[i].right - rectList[i].left) * + (rectList[i].bottom - rectList[i].top); + if (area >= iLargestArea) { hMonitor = hMonitorList[i]; }

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