Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 70342: [ARWINSS] - Update patch for trunk. Size--; - Thanks to Konstantin Shkil for spotting and fixing that dhcpsvc.dll overlap!
by fireball＠svn.reactos.org 13 Dec '15

13 Dec '15

Author: fireball Date: Sun Dec 13 22:31:27 2015 New Revision: 70342 URL: http://svn.reactos.org/svn/reactos?rev=70342&view=rev Log: [ARWINSS] - Update patch for trunk. Size--; - Thanks to Konstantin Shkil for spotting and fixing that dhcpsvc.dll overlap! Modified: branches/arwinss/trunk.diff Modified: branches/arwinss/trunk.diff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/trunk.diff?rev=70342&r1… ============================================================================== --- branches/arwinss/trunk.diff [iso-8859-1] (original) +++ branches/arwinss/trunk.diff [iso-8859-1] Sun Dec 13 22:31:27 2015 @@ -1,6 +1,6 @@ Index: base/system/winlogon/winlogon.c =================================================================== ---- base/system/winlogon/winlogon.c (revision 69795) +--- base/system/winlogon/winlogon.c (revision 70340) +++ base/system/winlogon/winlogon.c (working copy) @@ -397,7 +397,7 @@ HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); @@ -13,22 +13,24 @@ #if 0 Index: cmake/baseaddress.cmake =================================================================== ---- cmake/baseaddress.cmake (revision 69795) +--- cmake/baseaddress.cmake (revision 70340) +++ cmake/baseaddress.cmake (working copy) -@@ -2,8 +2,8 @@ +@@ -2,9 +2,9 @@ set(baseaddress_kernel32 0x7c750000) set(baseaddress_msvcrt 0x7c6b0000) set(baseaddress_advapi32 0x7c610000) -set(baseaddress_gdi32 0x7c570000) -set(baseaddress_user32 0x7c3d0000) +-set(baseaddress_dhcpcsvc 0x7c380000) +set(baseaddress_gdi32 0x7c530000) +set(baseaddress_user32 0x7c380000) - set(baseaddress_dhcpcsvc 0x7c380000) ++set(baseaddress_dhcpcsvc 0x7cb80000) set(baseaddress_dnsapi 0x7c330000) set(baseaddress_icmp 0x7c300000) + set(baseaddress_iphlpapi 0x7c2b0000) Index: cmake/config.cmake =================================================================== ---- cmake/config.cmake (revision 69795) +--- cmake/config.cmake (revision 70340) +++ cmake/config.cmake (working copy) @@ -58,6 +58,9 @@ "Whether to compile support for ELF files. @@ -42,7 +44,7 @@ If you live in a country where software patents are valid/apply, don't Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 69795) +--- CMakeLists.txt (revision 70340) +++ CMakeLists.txt (working copy) @@ -165,6 +165,10 @@ add_definitions(-D_WINKD_=1) @@ -67,7 +69,7 @@ create_registry_hives() Index: dll/win32/kernel32/client/dllmain.c =================================================================== ---- dll/win32/kernel32/client/dllmain.c (revision 69795) +--- dll/win32/kernel32/client/dllmain.c (revision 70340) +++ dll/win32/kernel32/client/dllmain.c (working copy) @@ -131,7 +131,7 @@ SessionId, @@ -80,7 +82,7 @@ BASESRV_SERVERDLL_INDEX, Index: dll/win32/msgina/gui.c =================================================================== ---- dll/win32/msgina/gui.c (revision 69795) +--- dll/win32/msgina/gui.c (revision 70340) +++ dll/win32/msgina/gui.c (working copy) @@ -73,6 +73,7 @@ @@ -111,7 +113,7 @@ /* Index: include/asm/syscalls.inc =================================================================== ---- include/asm/syscalls.inc (revision 69795) +--- include/asm/syscalls.inc (revision 70340) +++ include/asm/syscalls.inc (working copy) @@ -1,4 +1,4 @@ - @@ -323,7 +325,7 @@ -#endif Index: include/psdk/winddi.h =================================================================== ---- include/psdk/winddi.h (revision 69795) +--- include/psdk/winddi.h (revision 70340) +++ include/psdk/winddi.h (working copy) @@ -2911,7 +2911,7 @@ _In_ ULONG cjSize, @@ -336,7 +338,7 @@ APIENTRY Index: include/reactos/wine/config.h =================================================================== ---- include/reactos/wine/config.h (revision 69795) +--- include/reactos/wine/config.h (revision 70340) +++ include/reactos/wine/config.h (working copy) @@ -1,3 +1,5 @@ +#include "reactos/buildno.h" @@ -346,7 +348,7 @@ /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ Index: lib/3rdparty/CMakeLists.txt =================================================================== ---- lib/3rdparty/CMakeLists.txt (revision 69795) +--- lib/3rdparty/CMakeLists.txt (revision 70340) +++ lib/3rdparty/CMakeLists.txt (working copy) @@ -2,7 +2,9 @@ add_subdirectory(adns) @@ -360,7 +362,7 @@ add_subdirectory(libsamplerate) Index: subsystems/win32/csrsrv/init.c =================================================================== ---- subsystems/win32/csrsrv/init.c (revision 69795) +--- subsystems/win32/csrsrv/init.c (revision 70340) +++ subsystems/win32/csrsrv/init.c (working copy) @@ -20,7 +20,7 @@ /* DATA ***********************************************************************/ @@ -373,7 +375,7 @@ HANDLE CsrObjectDirectory = NULL; Index: win32ss/CMakeLists.txt =================================================================== ---- win32ss/CMakeLists.txt (revision 69795) +--- win32ss/CMakeLists.txt (revision 70340) +++ win32ss/CMakeLists.txt (working copy) @@ -10,7 +10,10 @@ PROJECT(WIN32SS) @@ -402,7 +404,7 @@ \ No newline at end of file Index: win32ss/drivers/CMakeLists.txt =================================================================== ---- win32ss/drivers/CMakeLists.txt (revision 69795) +--- win32ss/drivers/CMakeLists.txt (revision 70340) +++ win32ss/drivers/CMakeLists.txt (working copy) @@ -1,6 +1,8 @@ @@ -415,7 +417,7 @@ add_subdirectory(watchdog) Index: win32ss/include/ntgdihdl.h =================================================================== ---- win32ss/include/ntgdihdl.h (revision 69795) +--- win32ss/include/ntgdihdl.h (revision 70340) +++ win32ss/include/ntgdihdl.h (working copy) @@ -260,6 +260,7 @@ DWORD dwCFCount; @@ -447,7 +449,7 @@ FLONG AttrFlags; Index: win32ss/user/winsrv/consrv/conoutput.c =================================================================== ---- win32ss/user/winsrv/consrv/conoutput.c (revision 69795) +--- win32ss/user/winsrv/consrv/conoutput.c (revision 70340) +++ win32ss/user/winsrv/consrv/conoutput.c (working copy) @@ -99,9 +99,13 @@ * Indeed, the palette handle comes from a console app @@ -465,7 +467,7 @@ Buffer, Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c =================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69795) +--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 70340) +++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy) @@ -159,7 +159,11 @@ } @@ -481,9 +483,9 @@ return (WndClassAtom != 0); Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c =================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69795) +--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 70340) +++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy) -@@ -160,9 +160,14 @@ +@@ -161,9 +161,14 @@ /* Assign this console input thread to this desktop */ DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle DesktopConsoleThreadInfo.ThreadId = InputThreadId; @@ -498,7 +500,7 @@ if (!NT_SUCCESS(Status)) goto Quit; /* Connect this CSR thread to the USER subsystem */ -@@ -299,9 +304,13 @@ +@@ -301,9 +306,13 @@ /* Remove this console input thread from this desktop */ // DesktopConsoleThreadInfo.DesktopHandle; DesktopConsoleThreadInfo.ThreadId = 0; @@ -512,7 +514,7 @@ /* Close the duplicated desktop handle */ CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop -@@ -358,11 +367,16 @@ +@@ -366,11 +375,16 @@ { RtlInitUnicodeString(&DesktopPath, L"Default"); } @@ -532,27 +534,9 @@ Index: win32ss/user/winsrv/usersrv/init.c =================================================================== ---- win32ss/user/winsrv/usersrv/init.c (revision 69795) +--- win32ss/user/winsrv/usersrv/init.c (revision 70340) +++ win32ss/user/winsrv/usersrv/init.c (working copy) -@@ -173,6 +173,7 @@ - CsrApiPort = CsrQueryApiPort(); - - /* Inform win32k about the API port */ -+#ifndef _ARWINSS_ - Status = NtUserSetInformationThread(NtCurrentThread(), - UserThreadCsrApiPort, - &CsrApiPort, -@@ -181,6 +182,9 @@ - { - return Status; - } -+#else -+ UNIMPLEMENTED -+#endif - } - - /* Check connection info validity */ -@@ -199,9 +203,14 @@ +@@ -199,9 +199,14 @@ /* Pass the request to win32k */ ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; @@ -567,7 +551,7 @@ return Status; } -@@ -254,7 +263,11 @@ +@@ -254,7 +259,11 @@ } /* Set the process creation notify routine for BASE */ @@ -581,7 +565,7 @@ Status = NtUserInitialize(USER_VERSION, Index: win32ss/user/winsrv/usersrv/shutdown.c =================================================================== ---- win32ss/user/winsrv/usersrv/shutdown.c (revision 69795) +--- win32ss/user/winsrv/usersrv/shutdown.c (revision 70340) +++ win32ss/user/winsrv/usersrv/shutdown.c (working copy) @@ -381,7 +381,12 @@ static BOOLEAN @@ -596,32 +580,3 @@ } -@@ -678,9 +683,14 @@ - while (TRUE) - { - /* Notify Win32k and potentially Winlogon of the shutdown */ -+#ifndef _ARWINSS_ - Status = NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadInitiateShutdown, - &Flags, sizeof(Flags)); -+#else -+ Status = STATUS_SUCCESS; -+ UNIMPLEMENTED -+#endif - DPRINT1("Win32k says: %lx\n", Status); - switch (Status) - { -@@ -736,9 +746,13 @@ - // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason - - /* Tell Win32k and potentially Winlogon that we're done */ -+#ifndef _ARWINSS_ - NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadEndShutdown, - &Status, sizeof(Status)); -+#else -+ UNIMPLEMENTED -+#endif - - DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); -

1 0

[fireball] 70341: [WIN32K] - Add NtUserSetInformationThread stub, thanks to Konstantin Shkil. The general direction is that it's fine to add syscalls to Arwinss' win32k which are called by other co...
by fireball＠svn.reactos.org 13 Dec '15

13 Dec '15

Author: fireball Date: Sun Dec 13 22:29:04 2015 New Revision: 70341 URL: http://svn.reactos.org/svn/reactos?rev=70341&view=rev Log: [WIN32K] - Add NtUserSetInformationThread stub, thanks to Konstantin Shkil. The general direction is that it's fine to add syscalls to Arwinss' win32k which are called by other components like usersrv/consrv, as the list is quite small really, and NtUserInitialize is already there. Added: branches/arwinss/arwinss/server/main/misc.c (with props) Modified: branches/arwinss/arwinss/server/CMakeLists.txt branches/arwinss/arwinss/server/w32ksvc.db branches/arwinss/arwinss/server/w32ksvc.h Modified: branches/arwinss/arwinss/server/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/CMakeLis… ============================================================================== --- branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] Sun Dec 13 22:29:04 2015 @@ -87,6 +87,7 @@ main/monitor.c main/kbdlayout.c main/keyboard.c + main/misc.c swm/winman.c wine/atom.c wine/class.c Added: branches/arwinss/arwinss/server/main/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/mis… ============================================================================== --- branches/arwinss/arwinss/server/main/misc.c (added) +++ branches/arwinss/arwinss/server/main/misc.c [iso-8859-1] Sun Dec 13 22:29:04 2015 @@ -0,0 +1,167 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: server/main/misc.c + * PURPOSE: Misc stuff + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> + +//#define NDEBUG +#include <debug.h> + +#include <ntstatus.h> +//#include <shutdown.h> +#include <csr.h> + +extern PEPROCESS CsrProcess; + +NTSTATUS +APIENTRY +NtUserSetInformationThread(IN HANDLE ThreadHandle, + IN USERTHREADINFOCLASS ThreadInformationClass, + IN PVOID ThreadInformation, + IN ULONG ThreadInformationLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + PETHREAD Thread; + + /* Allow only CSRSS to perform this operation */ + if (PsGetCurrentProcess() != CsrProcess) + return STATUS_ACCESS_DENIED; + + UserEnterExclusive(); + + /* Get the Thread */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_SET_INFORMATION, + *PsThreadType, + UserMode, + (PVOID)&Thread, + NULL); + if (!NT_SUCCESS(Status)) goto Quit; + + switch (ThreadInformationClass) + { + case UserThreadInitiateShutdown: + { + ULONG CapturedFlags = 0; + + DPRINT("Shutdown initiated\n"); + + if (ThreadInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Capture the caller value */ + Status = STATUS_SUCCESS; + _SEH2_TRY + { + ProbeForWrite(ThreadInformation, sizeof(CapturedFlags), sizeof(PVOID)); + CapturedFlags = *(PULONG)ThreadInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + Status = STATUS_NOT_IMPLEMENTED; //UserInitiateShutdown(Thread, &CapturedFlags); + UNIMPLEMENTED; + + /* Return the modified value to the caller */ + _SEH2_TRY + { + *(PULONG)ThreadInformation = CapturedFlags; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + break; + } + + case UserThreadEndShutdown: + { + NTSTATUS ShutdownStatus; + + DPRINT("Shutdown ended\n"); + + if (ThreadInformationLength != sizeof(ShutdownStatus)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Capture the caller value */ + Status = STATUS_SUCCESS; + _SEH2_TRY + { + ProbeForRead(ThreadInformation, sizeof(ShutdownStatus), sizeof(PVOID)); + ShutdownStatus = *(NTSTATUS*)ThreadInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + Status = STATUS_NOT_IMPLEMENTED; //UserEndShutdown(Thread, ShutdownStatus); + UNIMPLEMENTED; + break; + } + + case UserThreadCsrApiPort: + { + HANDLE CsrPortHandle; + + DPRINT("Set CSR API Port for Win32k\n"); + + if (ThreadInformationLength != sizeof(CsrPortHandle)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Capture the caller value */ + Status = STATUS_SUCCESS; + _SEH2_TRY + { + ProbeForRead(ThreadInformation, sizeof(CsrPortHandle), sizeof(PVOID)); + CsrPortHandle = *(PHANDLE)ThreadInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + Status = STATUS_NOT_IMPLEMENTED;//InitCsrApiPort(CsrPortHandle); + UNIMPLEMENTED; + break; + } + + default: + { + UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + } + + ObDereferenceObject(Thread); + +Quit: + UserLeave(); + return Status; +} Propchange: branches/arwinss/arwinss/server/main/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/arwinss/server/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/w32ksvc.… ============================================================================== --- branches/arwinss/arwinss/server/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/w32ksvc.db [iso-8859-1] Sun Dec 13 22:29:04 2015 @@ -92,4 +92,5 @@ SwmPosChanged 5 SwmGetWindowFromPoint 2 SwmShowWindow 3 -NtUserInitialize 3 +NtUserInitialize 3 +NtUserSetInformationThread 4 Modified: branches/arwinss/arwinss/server/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/w32ksvc.… ============================================================================== --- branches/arwinss/arwinss/server/w32ksvc.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/w32ksvc.h [iso-8859-1] Sun Dec 13 22:29:04 2015 @@ -96,3 +96,4 @@ SVC_(SwmGetWindowFromPoint, 2) SVC_(SwmShowWindow, 3) SVC_(NtUserInitialize, 3) +SVC_(NtUserSetInformationThread, 4)

1 0

[tfaber] 70340: [RAPPS] - Remove checksum from uTorrent download, since the only available URL is for the latest build (so it changes)
by tfaber＠svn.reactos.org 13 Dec '15

13 Dec '15

Author: tfaber Date: Sun Dec 13 13:20:31 2015 New Revision: 70340 URL: http://svn.reactos.org/svn/reactos?rev=70340&view=rev Log: [RAPPS] - Remove checksum from uTorrent download, since the only available URL is for the latest build (so it changes) Modified: trunk/reactos/media/rapps/utorrent.txt Modified: trunk/reactos/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/utorrent.txt?r… ============================================================================== --- trunk/reactos/media/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/utorrent.txt [iso-8859-1] Sun Dec 13 13:20:31 2015 @@ -4,14 +4,13 @@ [Section] Name = ÂµTorrent -Version = 3.4.3 +Version = 3.4.5 License = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 1.66 MB +Size = 1.93 MB Category = 5 URLSite = http://www.utorrent.com/ URLDownload = http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/… -SHA1 = 8fffab0df9bf581c209337fc07ea93d2ba22cc8c CDPath = none [Section.0407]

1 0

[tfaber] 70339: [RAPPS] - Fix PuTTY URL (don't use /latest/)
by tfaber＠svn.reactos.org 13 Dec '15

13 Dec '15

Author: tfaber Date: Sun Dec 13 13:05:00 2015 New Revision: 70339 URL: http://svn.reactos.org/svn/reactos?rev=70339&view=rev Log: [RAPPS] - Fix PuTTY URL (don't use /latest/) Modified: trunk/reactos/media/rapps/putty.txt Modified: trunk/reactos/media/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/putty.txt?rev=… ============================================================================== --- trunk/reactos/media/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/putty.txt [iso-8859-1] Sun Dec 13 13:05:00 2015 @@ -10,7 +10,7 @@ Size = 1.84 MB Category = 5 URLSite = http://www.chiark.greenend.org.uk/~sgtatham/putty/ -URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.65-installer.exe +URLDownload = http://the.earth.li/~sgtatham/putty/0.65/x86/putty-0.65-installer.exe SHA1 = 119261bd53b792e13e7fd27384e86ea960597a7e CDPath = none

1 0

[dquintana] 70338: [WIN32K] * GetGUIThreadInfo: When they said "foreground thread", they meant the one with the keyboard focus, not the currently running one. NOTE: This needs verification, as I ha...
by dquintana＠svn.reactos.org 13 Dec '15

13 Dec '15

Author: dquintana Date: Sun Dec 13 06:08:12 2015 New Revision: 70338 URL: http://svn.reactos.org/svn/reactos?rev=70338&view=rev Log: [WIN32K] * GetGUIThreadInfo: When they said "foreground thread", they meant the one with the keyboard focus, not the currently running one. NOTE: This needs verification, as I have no idea how to properly handle IntGetFocusMessageQueue() returning NULL. [MAGNIFY] * Make use of the new-found ability to call GetGUIThreadInfo with 0 as the threadId. CORE-10691 Modified: trunk/reactos/base/applications/magnify/magnifier.c trunk/reactos/win32ss/user/ntuser/misc.c Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun Dec 13 06:08:12 2015 @@ -350,12 +350,11 @@ case WM_TIMER: { BOOL hasMoved = FALSE; - HWND hwndForeground = GetForegroundWindow (); - DWORD threadId = GetWindowThreadProcessId(hwndForeground, NULL); + GUITHREADINFO guiInfo; guiInfo.cbSize = sizeof(guiInfo); - GetGUIThreadInfo(threadId, &guiInfo); + GetGUIThreadInfo(0, &guiInfo); if (bFollowMouse) { @@ -374,7 +373,7 @@ } } - if (bFollowCaret && hwndForeground && guiInfo.hwndCaret) + if (bFollowCaret && guiInfo.hwndCaret) { POINT ptCaret; ptCaret.x = (guiInfo.rcCaret.left + guiInfo.rcCaret.right) / 2; @@ -394,7 +393,7 @@ } } - if (bFollowFocus && hwndForeground && guiInfo.hwndFocus) + if (bFollowFocus && guiInfo.hwndFocus) { POINT ptFocus; RECT activeRect; Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Sun Dec 13 06:08:12 2015 @@ -371,27 +371,31 @@ } W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread; Desktop = W32Thread->rpdesk; + + if (!Thread || !Desktop ) + { + if(Thread) + ObDereferenceObject(Thread); + EngSetLastError(ERROR_ACCESS_DENIED); + RETURN( FALSE); + } + + if ( W32Thread->MessageQueue ) + MsgQueue = W32Thread->MessageQueue; + else + { + if ( Desktop ) MsgQueue = Desktop->ActiveMessageQueue; + } } else { /* Get the foreground thread */ - Thread = PsGetCurrentThread(); - W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread; - Desktop = W32Thread->rpdesk; - } - - if (!Thread || !Desktop ) - { - if(idThread && Thread) - ObDereferenceObject(Thread); - EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( FALSE); - } - - if ( W32Thread->MessageQueue ) - MsgQueue = W32Thread->MessageQueue; - else - { - if ( Desktop ) MsgQueue = Desktop->ActiveMessageQueue; + /* FIXME: Handle NULL queue properly? */ + MsgQueue = IntGetFocusMessageQueue(); + if(!MsgQueue) + { + EngSetLastError(ERROR_ACCESS_DENIED); + RETURN( FALSE); + } } CaretInfo = &MsgQueue->CaretInfo;

1 0

[dquintana] 70337: [MAGNIFY] * Use GetGUIThreadInfo instead of multiple separate "hacks" to obtain all the necessary data in one single call. * Keep the off-screen DC for later use, and only recrea...
by dquintana＠svn.reactos.org 13 Dec '15

13 Dec '15

Author: dquintana Date: Sun Dec 13 05:07:37 2015 New Revision: 70337 URL: http://svn.reactos.org/svn/reactos?rev=70337&view=rev Log: [MAGNIFY] * Use GetGUIThreadInfo instead of multiple separate "hacks" to obtain all the necessary data in one single call. * Keep the off-screen DC for later use, and only recreate when needed. * Restore caret follow back to default-on. More changes toward CORE-10691 Modified: trunk/reactos/base/applications/magnify/magnifier.c trunk/reactos/base/applications/magnify/settings.c Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun Dec 13 05:07:37 2015 @@ -44,6 +44,13 @@ HWND hOptionsDialog; BOOL bOptionsDialog = FALSE; +BOOL bRecreateOffscreenDC = TRUE; +LONG sourceWidth = 0; +LONG sourceHeight = 0; +HDC hdcOffscreen = NULL; +HANDLE hbmpOld; +HBITMAP hbmpOffscreen = NULL; + /* Current magnified area */ POINT cp; @@ -51,6 +58,8 @@ POINT pMouse; POINT pCaret; POINT pFocus; +HWND pCaretWnd; +HWND pFocusWnd; ATOM MyRegisterClass(HINSTANCE hInstance); BOOL InitInstance(HINSTANCE, int); @@ -96,6 +105,11 @@ DispatchMessage(&msg); } } + + + SelectObject(hdcOffscreen, hbmpOld); + DeleteObject (hbmpOffscreen); + DeleteDC(hdcOffscreen); return (int) msg.wParam; } @@ -201,9 +215,6 @@ void Draw(HDC aDc) { HDC desktopHdc = NULL; - HDC HdcStretch; - HANDLE hOld; - HBITMAP HbmpStrech; RECT sourceRect, intersectedRect; RECT targetRect, appRect; @@ -212,7 +223,6 @@ ICONINFO iinfo; int AppWidth, AppHeight; - LONG blitAreaWidth, blitAreaHeight; if (bInvertColors) rop = NOTSRCCOPY; @@ -220,7 +230,8 @@ desktopHdc = GetDC(0); GetClientRect(hMainWnd, &appRect); - GetWindowRect(hDesktopWindow, &sourceRect); + AppWidth = (appRect.right - appRect.left); + AppHeight = (appRect.bottom - appRect.top); ZeroMemory(&cinfo, sizeof(cinfo)); ZeroMemory(&iinfo, sizeof(iinfo)); @@ -232,38 +243,48 @@ ClientToScreen(hMainWnd, (POINT*)&targetRect.left); ClientToScreen(hMainWnd, (POINT*)&targetRect.right); - AppWidth = (appRect.right - appRect.left); - AppHeight = (appRect.bottom - appRect.top); - - blitAreaWidth = AppWidth / iZoom; - blitAreaHeight = AppHeight / iZoom; - - sourceRect.left = (cp.x) - (blitAreaWidth /2); - sourceRect.top = (cp.y) - (blitAreaHeight /2); - sourceRect.right = sourceRect.left + blitAreaWidth; - sourceRect.bottom = sourceRect.top + blitAreaHeight; + if (bRecreateOffscreenDC || !hdcOffscreen) + { + bRecreateOffscreenDC = FALSE; + + if(hdcOffscreen) + { + SelectObject(hdcOffscreen, hbmpOld); + DeleteObject (hbmpOffscreen); + DeleteDC(hdcOffscreen); + } + + sourceWidth = AppWidth / iZoom; + sourceHeight = AppHeight / iZoom; + + /* Create a memory DC compatible with client area DC */ + hdcOffscreen = CreateCompatibleDC(desktopHdc); + + /* Create a bitmap compatible with the client area DC */ + hbmpOffscreen = CreateCompatibleBitmap( + desktopHdc, + sourceWidth, + sourceHeight); + + /* Select our bitmap in memory DC and save the old one */ + hbmpOld = SelectObject(hdcOffscreen , hbmpOffscreen); + } + + GetWindowRect(hDesktopWindow, &sourceRect); + sourceRect.left = (cp.x) - (sourceWidth /2); + sourceRect.top = (cp.y) - (sourceHeight /2); + sourceRect.right = sourceRect.left + sourceWidth; + sourceRect.bottom = sourceRect.top + sourceHeight; GetBestOverlapWithMonitors(&sourceRect); - - /* Create a memory DC compatible with client area DC */ - HdcStretch = CreateCompatibleDC(desktopHdc); - - /* Create a bitmap compatible with the client area DC */ - HbmpStrech = CreateCompatibleBitmap( - desktopHdc, - blitAreaWidth, - blitAreaHeight); - - /* Select our bitmap in memory DC and save the old one */ - hOld = SelectObject(HdcStretch , HbmpStrech); /* Paint the screen bitmap to our in memory DC */ BitBlt( - HdcStretch, + hdcOffscreen, 0, 0, - blitAreaWidth, - blitAreaHeight, + sourceWidth, + sourceHeight, desktopHdc, sourceRect.left, sourceRect.top, @@ -272,12 +293,12 @@ if (IntersectRect(&intersectedRect, &sourceRect, &targetRect)) { OffsetRect(&intersectedRect, -sourceRect.left, -sourceRect.top); - FillRect(HdcStretch, &intersectedRect, GetStockObject(DC_BRUSH)); + FillRect(hdcOffscreen, &intersectedRect, GetStockObject(DC_BRUSH)); } /* Draw the mouse pointer in the right position */ DrawIcon( - HdcStretch , + hdcOffscreen , pMouse.x - iinfo.xHotspot - sourceRect.left, // - 10, pMouse.y - iinfo.yHotspot - sourceRect.top, // - 10, cinfo.hCursor); @@ -289,11 +310,11 @@ 0, AppWidth, AppHeight, - HdcStretch, + hdcOffscreen, 0, 0, - blitAreaWidth, - blitAreaHeight, + sourceWidth, + sourceHeight, SRCCOPY | NOMIRRORBITMAP); /* Cleanup */ @@ -301,9 +322,6 @@ DeleteObject(iinfo.hbmMask); if (iinfo.hbmColor) DeleteObject(iinfo.hbmColor); - SelectObject(HdcStretch, hOld); - DeleteObject (HbmpStrech); - DeleteDC(HdcStretch); ReleaseDC(hDesktopWindow, desktopHdc); } @@ -332,6 +350,12 @@ case WM_TIMER: { BOOL hasMoved = FALSE; + HWND hwndForeground = GetForegroundWindow (); + DWORD threadId = GetWindowThreadProcessId(hwndForeground, NULL); + GUITHREADINFO guiInfo; + guiInfo.cbSize = sizeof(guiInfo); + + GetGUIThreadInfo(threadId, &guiInfo); if (bFollowMouse) { @@ -350,47 +374,43 @@ } } - if (bFollowCaret && !hasMoved) - { - POINT pNewCaret; - HWND hwnd2; - - //Get caret position - HWND hwnd1 = GetForegroundWindow (); - DWORD a = GetWindowThreadProcessId(hwnd1, NULL); - DWORD b = GetCurrentThreadId(); - AttachThreadInput (a, b, TRUE); - hwnd2 = GetFocus(); - - GetCaretPos( &pNewCaret); - ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); - AttachThreadInput (a, b, FALSE); - - if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y))) + if (bFollowCaret && hwndForeground && guiInfo.hwndCaret) + { + POINT ptCaret; + ptCaret.x = (guiInfo.rcCaret.left + guiInfo.rcCaret.right) / 2; + ptCaret.y = (guiInfo.rcCaret.top + guiInfo.rcCaret.bottom) / 2; + + if (guiInfo.hwndCaret && ((pCaretWnd != guiInfo.hwndCaret) || (pCaret.x != ptCaret.x) || (pCaret.y != ptCaret.y))) { //Update to new position - pCaret = pNewCaret; - cp = pNewCaret; + pCaret = ptCaret; + pCaretWnd = guiInfo.hwndCaret; + if(!hasMoved) + { + ClientToScreen (guiInfo.hwndCaret, (LPPOINT) &ptCaret); + cp = ptCaret; + } hasMoved = TRUE; } } - if (bFollowFocus && !hasMoved) - { - POINT pNewFocus; - RECT controlRect; + if (bFollowFocus && hwndForeground && guiInfo.hwndFocus) + { + POINT ptFocus; + RECT activeRect; //Get current control focus - HWND hwnd3 = GetFocus (); - GetWindowRect (hwnd3 , &controlRect); - pNewFocus.x = controlRect.left; - pNewFocus.y = controlRect.top; - - if(((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y))) + GetWindowRect (guiInfo.hwndFocus, &activeRect); + ptFocus.x = (activeRect.left + activeRect.right) / 2; + ptFocus.y = (activeRect.top + activeRect.bottom) / 2; + + if(guiInfo.hwndFocus && ((guiInfo.hwndFocus != pFocusWnd) || (pFocus.x != ptFocus.x) || (pFocus.y != ptFocus.y))) { //Update to new position - pFocus = pNewFocus; - cp = pNewFocus; + pFocus = ptFocus; + pFocusWnd = guiInfo.hwndFocus; + if(!hasMoved) + cp = ptFocus; hasMoved = TRUE; } } @@ -451,6 +471,16 @@ break; } + case WM_CONTEXTMENU: + TrackPopupMenu(notifyMenu, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, hWnd, NULL); + break; + + case WM_SIZE: + case WM_DISPLAYCHANGE: + bRecreateOffscreenDC = TRUE; + Refresh(); + return DefWindowProc(hWnd, message, wParam, lParam); + case WM_ERASEBKGND: // handle WM_ERASEBKGND by simply returning non-zero because we did all the drawing in WM_PAINT. break; @@ -511,12 +541,6 @@ break; - case WM_CONTEXTMENU: - { - TrackPopupMenu(notifyMenu, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, hWnd, NULL); - break; - } - default: return DefWindowProc(hWnd, message, wParam, lParam); } Modified: trunk/reactos/base/applications/magnify/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] Sun Dec 13 05:07:37 2015 @@ -18,7 +18,7 @@ BOOL bFollowMouse = TRUE; BOOL bFollowFocus = TRUE; -BOOL bFollowCaret = FALSE; // FIXME: Default to false because AttachThreadInput seems to break. +BOOL bFollowCaret = TRUE; BOOL bInvertColors = FALSE; BOOL bStartMinimized = FALSE;

1 0

[dquintana] 70336: [MAGNIFY] * Replace the menubar with a notification icon and context menu. * Change the dialog button to "Ok" instead of "Exit" (applied to en-US and es-ES only, the translators ...
by dquintana＠svn.reactos.org 13 Dec '15

13 Dec '15

Author: dquintana Date: Sun Dec 13 02:57:14 2015 New Revision: 70336 URL: http://svn.reactos.org/svn/reactos?rev=70336&view=rev Log: [MAGNIFY] * Replace the menubar with a notification icon and context menu. * Change the dialog button to "Ok" instead of "Exit" (applied to en-US and es-ES only, the translators will have to do the rest :P). * Due to a rather bad problem presumably caused by AttachThreadInput, set the "Follow Caret" option to disabled by default. This can be re-enabled once the problem is fixed. More changes toward CORE-10691 Modified: trunk/reactos/base/applications/magnify/lang/en-US.rc trunk/reactos/base/applications/magnify/lang/es-ES.rc trunk/reactos/base/applications/magnify/magnifier.c trunk/reactos/base/applications/magnify/settings.c Modified: trunk/reactos/base/applications/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/en-US.rc [iso-8859-1] Sun Dec 13 02:57:14 2015 @@ -33,7 +33,7 @@ CAPTION "Magnifier Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Exit", IDOK, 96, 161, 50, 14 + DEFPUSHBUTTON "Ok", IDOK, 96, 161, 50, 14 PUSHBUTTON "Help", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "Magnification level:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: trunk/reactos/base/applications/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/es-ES.rc [iso-8859-1] Sun Dec 13 02:57:14 2015 @@ -37,7 +37,7 @@ CAPTION "Configurar lupa" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Salir", IDOK, 96, 161, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 96, 161, 50, 14 PUSHBUTTON "Ayuda", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "Niveles de aumento:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 76, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun Dec 13 02:57:14 2015 @@ -3,8 +3,9 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/magnify/magnifier.c * PURPOSE: Magnification of parts of the screen. - * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> - * + * AUTHORS: + * Marc Piulachs <marc.piulachs(a)codexchange.net> + * David Quintana <gigaherz(a)gmail.com> */ /* TODO: AppBar */ @@ -14,6 +15,8 @@ #include <winuser.h> #include <wingdi.h> #include <winnls.h> +#include <shellapi.h> +#include <windowsx.h> #include "resource.h" @@ -28,11 +31,18 @@ TCHAR szTitle[MAX_LOADSTRING]; #define TIMER_SPEED 1 -#define REPAINT_SPEED 100 +#define REPAINT_SPEED 100 DWORD lastTicks = 0; HWND hDesktopWindow = NULL; + +#define APPMSG_NOTIFYICON (WM_APP+1) +HICON notifyIcon; +NOTIFYICONDATA nid; +HMENU notifyMenu; +HWND hOptionsDialog; +BOOL bOptionsDialog = FALSE; /* Current magnified area */ POINT cp; @@ -102,7 +112,7 @@ wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wc.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER); + wc.lpszMenuName = NULL; //MAKEINTRESOURCE(IDC_MAGNIFIER); wc.lpszClassName = szWindowClass; return RegisterClass(&wc); @@ -136,6 +146,10 @@ ShowWindow(hMainWnd, bStartMinimized ? SW_MINIMIZE : nCmdShow); UpdateWindow(hMainWnd); + // Windows 2003's Magnifier always shows this dialog, and exits when the dialog isclosed. + // Should we add a custom means to prevent opening it? + hOptionsDialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hMainWnd, OptionsProc); + if (bShowWarning) DialogBox(hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, WarningProc); @@ -293,6 +307,22 @@ ReleaseDC(hDesktopWindow, desktopHdc); } +void HandleNotifyIconMessage(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + POINT pt; + + switch(lParam) + { + case WM_LBUTTONUP: + PostMessage(hMainWnd, WM_COMMAND, IDM_OPTIONS, 0); + break; + case WM_RBUTTONUP: + GetCursorPos (&pt); + TrackPopupMenu(notifyMenu, 0, pt.x, pt.y, 0, hWnd, NULL); + break; + } +} + LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { int wmId; @@ -390,7 +420,14 @@ switch (wmId) { case IDM_OPTIONS: - DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, OptionsProc); + if(bOptionsDialog) + { + ShowWindow(hOptionsDialog, SW_HIDE); + } + else + { + ShowWindow(hOptionsDialog, SW_SHOW); + } break; case IDM_ABOUT: DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutProc); @@ -423,9 +460,24 @@ SaveSettings(); KillTimer(hWnd , 1); PostQuitMessage(0); + + /* Cleanup notification icon */ + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uFlags = NIF_MESSAGE; + nid.hWnd = hWnd; + nid.uCallbackMessage = APPMSG_NOTIFYICON; + Shell_NotifyIcon(NIM_DELETE, &nid); + + DestroyIcon(notifyIcon); + + DestroyWindow(hOptionsDialog); break; case WM_CREATE: + { + HMENU tempMenu; + /* Load settings from registry */ LoadSettings(); @@ -434,7 +486,36 @@ /* Set the timer */ SetTimer (hWnd , 1, TIMER_SPEED , NULL); - break; + + /* Notification icon */ + notifyIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); + + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uFlags = NIF_ICON | NIF_MESSAGE; + nid.hWnd = hWnd; + nid.uCallbackMessage = APPMSG_NOTIFYICON; + nid.hIcon = notifyIcon; + Shell_NotifyIcon(NIM_ADD, &nid); + + tempMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDC_MAGNIFIER)); + notifyMenu = GetSubMenu(tempMenu, 0); + RemoveMenu(tempMenu, 0, MF_BYPOSITION); + DestroyMenu(tempMenu); + + break; + } + + case APPMSG_NOTIFYICON: + HandleNotifyIconMessage(hWnd, wParam, lParam); + + break; + + case WM_CONTEXTMENU: + { + TrackPopupMenu(notifyMenu, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, hWnd, NULL); + break; + } default: return DefWindowProc(hWnd, message, wParam, lParam); @@ -468,6 +549,9 @@ UNREFERENCED_PARAMETER(lParam); switch (message) { + case WM_SHOWWINDOW: + bOptionsDialog = wParam; + break; case WM_INITDIALOG: { // Add the zoom items... @@ -508,7 +592,7 @@ { case IDOK: case IDCANCEL: - EndDialog(hDlg, LOWORD(wParam)); + ShowWindow(hDlg, SW_HIDE); return (INT_PTR)TRUE; case IDC_BUTTON_HELP: Modified: trunk/reactos/base/applications/magnify/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] Sun Dec 13 02:57:14 2015 @@ -18,7 +18,7 @@ BOOL bFollowMouse = TRUE; BOOL bFollowFocus = TRUE; -BOOL bFollowCaret = TRUE; +BOOL bFollowCaret = FALSE; // FIXME: Default to false because AttachThreadInput seems to break. BOOL bInvertColors = FALSE; BOOL bStartMinimized = FALSE;

1 0

[dquintana] 70335: [MAGNIFY] Some improvements to the drawing code: * Draw as soon as the mouse/caret/focus changes, or after 100ms if nothing changed. * Copy only the needed area of the screen int...
by dquintana＠svn.reactos.org 13 Dec '15

13 Dec '15

Author: dquintana Date: Sun Dec 13 00:34:18 2015 New Revision: 70335 URL: http://svn.reactos.org/svn/reactos?rev=70335&view=rev Log: [MAGNIFY] Some improvements to the drawing code: * Draw as soon as the mouse/caret/focus changes, or after 100ms if nothing changed. * Copy only the needed area of the screen into the internal buffer. * Blank out the area of the buffer where the client region of the magnifier overlaps, to avoid re-zooming the pixels. * Keep the source region contained within the closest monitor, instead of only the primary one. * Invert colors when copying from the screen, instead of when stretching, since there's less pixels to draw. First step toward the improvements described in CORE-10691 Modified: trunk/reactos/base/applications/magnify/magnifier.c Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun Dec 13 00:34:18 2015 @@ -27,7 +27,10 @@ TCHAR szTitle[MAX_LOADSTRING]; +#define TIMER_SPEED 1 #define REPAINT_SPEED 100 + +DWORD lastTicks = 0; HWND hDesktopWindow = NULL; @@ -148,26 +151,62 @@ } } +void GetBestOverlapWithMonitors(LPRECT rect) +{ + int rcLeft, rcTop; + int rcWidth, rcHeight; + RECT rcMon; + HMONITOR hMon = MonitorFromRect(rect, MONITOR_DEFAULTTONEAREST); + MONITORINFO info; + info.cbSize = sizeof(info); + + GetMonitorInfo(hMon, &info); + + rcMon = info.rcMonitor; + + rcLeft = rect->left; + rcTop = rect->top; + rcWidth = (rect->right - rect->left); + rcHeight = (rect->bottom - rect->top); + + if (rcLeft < rcMon.left) + rcLeft = rcMon.left; + + if (rcTop < rcMon.top) + rcTop = rcMon.top; + + if (rcLeft > (rcMon.right - rcWidth)) + rcLeft = (rcMon.right - rcWidth); + + if (rcTop > (rcMon.bottom - rcHeight)) + rcTop = (rcMon.bottom - rcHeight); + + OffsetRect(rect, (rcLeft-rect->left), (rcTop-rect->top)); +} + void Draw(HDC aDc) { HDC desktopHdc = NULL; - HDC HdcStrech; + HDC HdcStretch; HANDLE hOld; HBITMAP HbmpStrech; - - RECT R; - RECT appRect; + + RECT sourceRect, intersectedRect; + RECT targetRect, appRect; DWORD rop = SRCCOPY; CURSORINFO cinfo; ICONINFO iinfo; - int Width, Height, AppWidth, AppHeight; - LONG blitAreaWidth, blitAreaHeight, blitAreaX, blitAreaY; - - desktopHdc = GetWindowDC(hDesktopWindow); + int AppWidth, AppHeight; + LONG blitAreaWidth, blitAreaHeight; + + if (bInvertColors) + rop = NOTSRCCOPY; + + desktopHdc = GetDC(0); GetClientRect(hMainWnd, &appRect); - GetWindowRect(hDesktopWindow, &R); + GetWindowRect(hDesktopWindow, &sourceRect); ZeroMemory(&cinfo, sizeof(cinfo)); ZeroMemory(&iinfo, sizeof(iinfo)); @@ -175,63 +214,59 @@ GetCursorInfo(&cinfo); GetIconInfo(cinfo.hCursor, &iinfo); + targetRect = appRect; + ClientToScreen(hMainWnd, (POINT*)&targetRect.left); + ClientToScreen(hMainWnd, (POINT*)&targetRect.right); + + AppWidth = (appRect.right - appRect.left); + AppHeight = (appRect.bottom - appRect.top); + + blitAreaWidth = AppWidth / iZoom; + blitAreaHeight = AppHeight / iZoom; + + sourceRect.left = (cp.x) - (blitAreaWidth /2); + sourceRect.top = (cp.y) - (blitAreaHeight /2); + sourceRect.right = sourceRect.left + blitAreaWidth; + sourceRect.bottom = sourceRect.top + blitAreaHeight; + + GetBestOverlapWithMonitors(&sourceRect); + /* Create a memory DC compatible with client area DC */ - HdcStrech = CreateCompatibleDC(desktopHdc); + HdcStretch = CreateCompatibleDC(desktopHdc); /* Create a bitmap compatible with the client area DC */ HbmpStrech = CreateCompatibleBitmap( desktopHdc, - R.right, - R.bottom); + blitAreaWidth, + blitAreaHeight); /* Select our bitmap in memory DC and save the old one */ - hOld = SelectObject(HdcStrech , HbmpStrech); - + hOld = SelectObject(HdcStretch , HbmpStrech); + /* Paint the screen bitmap to our in memory DC */ BitBlt( - HdcStrech, + HdcStretch, 0, 0, - R.right, - R.bottom, + blitAreaWidth, + blitAreaHeight, desktopHdc, - 0, - 0, - SRCCOPY); - + sourceRect.left, + sourceRect.top, + rop); + + if (IntersectRect(&intersectedRect, &sourceRect, &targetRect)) + { + OffsetRect(&intersectedRect, -sourceRect.left, -sourceRect.top); + FillRect(HdcStretch, &intersectedRect, GetStockObject(DC_BRUSH)); + } + /* Draw the mouse pointer in the right position */ DrawIcon( - HdcStrech , - pMouse.x - iinfo.xHotspot, // - 10, - pMouse.y - iinfo.yHotspot, // - 10, + HdcStretch , + pMouse.x - iinfo.xHotspot - sourceRect.left, // - 10, + pMouse.y - iinfo.yHotspot - sourceRect.top, // - 10, cinfo.hCursor); - - Width = (R.right - R.left); - Height = (R.bottom - R.top); - - AppWidth = (appRect.right - appRect.left); - AppHeight = (appRect.bottom - appRect.top); - - blitAreaWidth = AppWidth / iZoom; - blitAreaHeight = AppHeight / iZoom; - - blitAreaX = (cp.x) - (blitAreaWidth /2); - blitAreaY = (cp.y) - (blitAreaHeight /2); - - if (blitAreaX < 0) - blitAreaX = 0; - - if (blitAreaY < 0) - blitAreaY = 0; - - if (blitAreaX > (Width - blitAreaWidth)) - blitAreaX = (Width - blitAreaWidth); - - if (blitAreaY > (Height - blitAreaHeight)) - blitAreaY = (Height - blitAreaHeight); - - if (bInvertColors) - rop = NOTSRCCOPY; /* Blast the stretched image from memory DC to window DC */ StretchBlt( @@ -240,22 +275,21 @@ 0, AppWidth, AppHeight, - HdcStrech, - blitAreaX, - blitAreaY, + HdcStretch, + 0, + 0, blitAreaWidth, blitAreaHeight, - rop | NOMIRRORBITMAP); - - + SRCCOPY | NOMIRRORBITMAP); + /* Cleanup */ if (iinfo.hbmMask) DeleteObject(iinfo.hbmMask); if (iinfo.hbmColor) DeleteObject(iinfo.hbmColor); - SelectObject(HdcStrech, hOld); + SelectObject(HdcStretch, hOld); DeleteObject (HbmpStrech); - DeleteDC(HdcStrech); + DeleteDC(HdcStretch); ReleaseDC(hDesktopWindow, desktopHdc); } @@ -267,53 +301,85 @@ { case WM_TIMER: { - POINT pNewMouse; - POINT pNewCaret; - POINT pNewFocus; - HWND hwnd1, hwnd2, hwnd3; - DWORD a, b; - RECT controlRect; - - //Get current mouse position - GetCursorPos (&pNewMouse); - - //Get caret position - hwnd1 = GetForegroundWindow (); - a = GetWindowThreadProcessId(hwnd1, NULL); - b = GetCurrentThreadId(); - AttachThreadInput (a, b, TRUE); - hwnd2 = GetFocus(); - - GetCaretPos( &pNewCaret); - ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); - AttachThreadInput (a, b, FALSE); - - //Get current control focus - hwnd3 = GetFocus (); - GetWindowRect (hwnd3 , &controlRect); - pNewFocus.x = controlRect.left; - pNewFocus.y = controlRect.top; - - //If mouse has moved .... - if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y)) && bFollowMouse) - { - //Update to new position - pMouse = pNewMouse; - cp = pNewMouse; - } - else if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y)) && bFollowCaret) - { - //Update to new position - pCaret = pNewCaret; - cp = pNewCaret; - } - else if (((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y)) && bFollowFocus) - { - //Update to new position - pFocus = pNewFocus; - cp = pNewFocus; - } - Refresh(); + BOOL hasMoved = FALSE; + + if (bFollowMouse) + { + POINT pNewMouse; + + //Get current mouse position + GetCursorPos (&pNewMouse); + + //If mouse has moved ... + if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y))) + { + //Update to new position + pMouse = pNewMouse; + cp = pNewMouse; + hasMoved = TRUE; + } + } + + if (bFollowCaret && !hasMoved) + { + POINT pNewCaret; + HWND hwnd2; + + //Get caret position + HWND hwnd1 = GetForegroundWindow (); + DWORD a = GetWindowThreadProcessId(hwnd1, NULL); + DWORD b = GetCurrentThreadId(); + AttachThreadInput (a, b, TRUE); + hwnd2 = GetFocus(); + + GetCaretPos( &pNewCaret); + ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); + AttachThreadInput (a, b, FALSE); + + if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y))) + { + //Update to new position + pCaret = pNewCaret; + cp = pNewCaret; + hasMoved = TRUE; + } + } + + if (bFollowFocus && !hasMoved) + { + POINT pNewFocus; + RECT controlRect; + + //Get current control focus + HWND hwnd3 = GetFocus (); + GetWindowRect (hwnd3 , &controlRect); + pNewFocus.x = controlRect.left; + pNewFocus.y = controlRect.top; + + if(((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y))) + { + //Update to new position + pFocus = pNewFocus; + cp = pNewFocus; + hasMoved = TRUE; + } + } + + if(!hasMoved) + { + DWORD newTicks = GetTickCount(); + DWORD elapsed = (newTicks - lastTicks); + if(elapsed > REPAINT_SPEED) + { + hasMoved = TRUE; + } + } + + if(hasMoved) + { + lastTicks = GetTickCount(); + Refresh(); + } } break; @@ -367,7 +433,7 @@ hDesktopWindow = GetDesktopWindow(); /* Set the timer */ - SetTimer (hWnd , 1, REPAINT_SPEED , NULL); + SetTimer (hWnd , 1, TIMER_SPEED , NULL); break; default:

1 0

[hbelusca] 70334: [WIN32K:CLIP] - Adjust the type of some variables. - Correctly set the fClipboardChanged flag to TRUE when emptying the clipboard: now this correctly triggers sending the WM_DRAWC...
by hbelusca＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: hbelusca Date: Sat Dec 12 21:47:14 2015 New Revision: 70334 URL: http://svn.reactos.org/svn/reactos?rev=70334&view=rev Log: [WIN32K:CLIP] - Adjust the type of some variables. - Correctly set the fClipboardChanged flag to TRUE when emptying the clipboard: now this correctly triggers sending the WM_DRAWCLIPBOARD message to windows. Adapted from a patch by Ricardo Hanke. CORE-10351 Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sat Dec 12 21:47:14 2015 @@ -40,7 +40,7 @@ static PCLIP FASTCALL IntIsFormatAvailable(PWINSTATION_OBJECT pWinStaObj, UINT fmt) { - unsigned i = 0; + DWORD i; for (i = 0; i < pWinStaObj->cNumClipFormats; ++i) { @@ -335,7 +335,7 @@ VOID NTAPI UserEmptyClipboardData(PWINSTATION_OBJECT pWinSta) { - unsigned i; + DWORD i; PCLIP pElement; for (i = 0; i < pWinSta->cNumClipFormats; ++i) @@ -630,6 +630,7 @@ pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen; pWinStaObj->iClipSequenceNumber++; + pWinStaObj->fClipboardChanged = TRUE; bRet = TRUE; }

1 0

[hbelusca] 70333: Whitespace fixes only.
by hbelusca＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: hbelusca Date: Sat Dec 12 21:28:55 2015 New Revision: 70333 URL: http://svn.reactos.org/svn/reactos?rev=70333&view=rev Log: Whitespace fixes only. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sat Dec 12 21:28:55 2015 @@ -44,7 +44,7 @@ for (i = 0; i < pWinStaObj->cNumClipFormats; ++i) { - if (pWinStaObj->pClipBase[i].fmt == fmt) + if (pWinStaObj->pClipBase[i].fmt == fmt) return &pWinStaObj->pClipBase[i]; } @@ -232,14 +232,14 @@ pDibEl = IntIsFormatAvailable(pWinStaObj, CF_DIB); ASSERT(pDibEl && !IS_DATA_SYNTHESIZED(pDibEl)); - if(!pDibEl->fGlobalHandle) + if (!pDibEl->fGlobalHandle) return; pMemObj = (PCLIPBOARDDATA)UserGetObject(gHandleTable, pDibEl->hData, TYPE_CLIPDATA); if (!pMemObj) return; - pBmi = (BITMAPINFO*)pMemObj->Data; + pBmi = (BITMAPINFO*)pMemObj->Data; if (pMemObj->cbData < sizeof(DWORD) && pMemObj->cbData < pBmi->bmiHeader.biSize) goto cleanup; @@ -341,11 +341,12 @@ for (i = 0; i < pWinSta->cNumClipFormats; ++i) { pElement = &pWinSta->pClipBase[i]; - IntFreeElementData(pElement); - } - - if(pWinSta->pClipBase) + IntFreeElementData(pElement); + } + + if (pWinSta->pClipBase) ExFreePoolWithTag(pWinSta->pClipBase, USERTAG_CLIPBOARD); + pWinSta->pClipBase = NULL; pWinSta->cNumClipFormats = 0; } @@ -413,7 +414,7 @@ } cleanup: - if(pWinStaObj) + if (pWinStaObj) ObDereferenceObject(pWinStaObj); return Ret; @@ -569,10 +570,10 @@ if (pWindowRemove && pWinStaObj->spwndClipViewer) { - if(pWindowRemove == pWinStaObj->spwndClipViewer) + if (pWindowRemove == pWinStaObj->spwndClipViewer) pWinStaObj->spwndClipViewer = UserGetWindowObject(hWndNewNext); - if(pWinStaObj->spwndClipViewer) + if (pWinStaObj->spwndClipViewer) bRet = (BOOL)co_IntSendMessage(pWinStaObj->spwndClipViewer->head.h, WM_CHANGECBCHAIN, (WPARAM)hWndRemove, (LPARAM)hWndNewNext); } @@ -730,7 +731,7 @@ UserEnterShared(); pWinStaObj = IntGetWinStaForCbAccess(); - if(!pWinStaObj) + if (!pWinStaObj) goto cleanup; if (pWinStaObj->spwndClipViewer) @@ -911,7 +912,7 @@ _SEH2_END; cleanup: - if(pWinStaObj) + if (pWinStaObj) ObDereferenceObject(pWinStaObj); UserLeave(); @@ -976,7 +977,7 @@ cleanup: TRACE("NtUserSetClipboardData returns: %p\n", hRet); - if(pWinStaObj) + if (pWinStaObj) ObDereferenceObject(pWinStaObj); return hRet; @@ -1041,7 +1042,7 @@ pWinStaObj->spwndClipViewer = pWindow; cleanup: - if(pWinStaObj) + if (pWinStaObj) ObDereferenceObject(pWinStaObj); UserLeave();

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