Ros-diffs October 2023

ros-diffs@reactos.org

21 participants
140 discussions

[reactos] 01/01: [XDK] Fix / improve some definitions
by Timo Kreuzer 17 Oct '23

17 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9cb1699205cf68fd0af0… commit d9cb1699205cf68fd0af09f3f6f4f8d920bfe346 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 12 19:31:50 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 17 13:02:30 2023 +0300 [XDK] Fix / improve some definitions --- sdk/include/xdk/rtltypes.h | 36 +++++++++++++++++++++--------------- sdk/include/xdk/winnt.template.h | 1 + sdk/include/xdk/winnt_old.h | 19 ------------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/sdk/include/xdk/rtltypes.h b/sdk/include/xdk/rtltypes.h index 527d3ed67ce..f248232485c 100644 --- a/sdk/include/xdk/rtltypes.h +++ b/sdk/include/xdk/rtltypes.h @@ -296,7 +296,7 @@ typedef LPOSVERSIONINFOA LPOSVERSIONINFO; #endif /* UNICODE */ $endif (_WDMDDK_) -$if (_NTDDK_) +$if (_NTDDK_ || _WINNT_) #ifndef _RTL_RUN_ONCE_DEF #define _RTL_RUN_ONCE_DEF @@ -309,6 +309,26 @@ $if (_NTDDK_) #define RTL_RUN_ONCE_CTX_RESERVED_BITS 2 +typedef union _RTL_RUN_ONCE { + PVOID Ptr; +} RTL_RUN_ONCE, *PRTL_RUN_ONCE; + +typedef +_Function_class_(RTL_RUN_ONCE_INIT_FN) +_IRQL_requires_same_ +ULONG +NTAPI +RTL_RUN_ONCE_INIT_FN( + _Inout_ PRTL_RUN_ONCE RunOnce, + _Inout_opt_ PVOID Parameter, + _Inout_opt_ PVOID* Context); +typedef RTL_RUN_ONCE_INIT_FN* PRTL_RUN_ONCE_INIT_FN; + +#endif /* _RTL_RUN_ONCE_DEF */ + +$endif(_NTDDK_ || _WINNT_) +$if(_NTDDK_) + #define RTL_HASH_ALLOCATED_HEADER 0x00000001 #define RTL_HASH_RESERVED_SIGNATURE 0 @@ -345,20 +365,6 @@ $if (_NTDDK_) #define VER_PLATFORM_WIN32_WINDOWS 1 #define VER_PLATFORM_WIN32_NT 2 -typedef union _RTL_RUN_ONCE { - PVOID Ptr; -} RTL_RUN_ONCE, *PRTL_RUN_ONCE; - -_Function_class_(RTL_RUN_ONCE_INIT_FN) -_IRQL_requires_same_ -typedef ULONG /* LOGICAL */ -(NTAPI *PRTL_RUN_ONCE_INIT_FN) ( - _Inout_ PRTL_RUN_ONCE RunOnce, - _Inout_opt_ PVOID Parameter, - _Inout_opt_ PVOID *Context); - -#endif /* _RTL_RUN_ONCE_DEF */ - typedef enum _TABLE_SEARCH_RESULT { TableEmptyTree, TableFoundNode, diff --git a/sdk/include/xdk/winnt.template.h b/sdk/include/xdk/winnt.template.h index 75a85102e08..216290cc980 100644 --- a/sdk/include/xdk/winnt.template.h +++ b/sdk/include/xdk/winnt.template.h @@ -74,6 +74,7 @@ $include(ntbasedef.h) $include(interlocked.h) $include(ketypes.h) $include(extypes.h) +$include(rtltypes.h) $include(winnt_old.h) #ifdef __cplusplus diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 8edf6f58a59..08443624d29 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -2749,25 +2749,6 @@ NTAPI RtlQueryDepthSList( _In_ PSLIST_HEADER ListHead); -#ifndef _RTL_RUN_ONCE_DEF -#define _RTL_RUN_ONCE_DEF - -#define RTL_RUN_ONCE_CHECK_ONLY 0x00000001UL -#define RTL_RUN_ONCE_ASYNC 0x00000002UL -#define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL - -#define RTL_RUN_ONCE_CTX_RESERVED_BITS 2 - -#define RTL_RUN_ONCE_INIT {0} - -typedef union _RTL_RUN_ONCE { - PVOID Ptr; -} RTL_RUN_ONCE, *PRTL_RUN_ONCE; - -typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); -typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; - -#endif #define RTL_CONDITION_VARIABLE_INIT {0} #define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1

1 0

[reactos] 01/01: [STLPORT] Make stl thread-safe
by Timo Kreuzer 17 Oct '23

17 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b38f80119ddc45a28251… commit 7b38f80119ddc45a28251129b6c8a7fbbcf60846 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Sep 21 23:38:02 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 17 13:01:24 2023 +0300 [STLPORT] Make stl thread-safe Define _STLP_THREADS to make stl thread safe. Also remove defined(__BUILDING_STLPORT) from the preprocessor conditions for which STLPInterlockedExchangePointer is defined, because that function is used in _threads.h, which can get included by apps using the stl through stl headers. --- sdk/include/c++/stlport/stl/config/_reactos.h | 5 ++++- sdk/include/c++/stlport/stl/config/_windows.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sdk/include/c++/stlport/stl/config/_reactos.h b/sdk/include/c++/stlport/stl/config/_reactos.h index d1e7d1683e9..dd08393e256 100644 --- a/sdk/include/c++/stlport/stl/config/_reactos.h +++ b/sdk/include/c++/stlport/stl/config/_reactos.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2010 - * J�r�me Gardou + * Jérôme Gardou * * * This material is provided "as is", with absolutely no warranty expressed @@ -302,6 +302,9 @@ // Calling convention #define _STLP_CALL __cdecl +// Always build multithreaded code +#define _STLP_THREADS + #if 0 #ifdef _M_AMD64 diff --git a/sdk/include/c++/stlport/stl/config/_windows.h b/sdk/include/c++/stlport/stl/config/_windows.h index ac9856eb31d..8af985ea82b 100644 --- a/sdk/include/c++/stlport/stl/config/_windows.h +++ b/sdk/include/c++/stlport/stl/config/_windows.h @@ -205,7 +205,7 @@ _STLP_IMPORT_DECLSPEC void _STLP_STDCALL OutputDebugStringA(const char* lpOutput * to avoid macro definition conflict. */ # if !defined (_WIN64) /* Under 32 bits platform we rely on a simple InterlockedExchange call. */ -# if defined (__cplusplus) && defined(__BUILDING_STLPORT) +# if defined (__cplusplus) /* We do not define this function if we are not in a C++ translation unit just * because of the 'inline' keyword portability issue it would introduce. We will * have to fix it the day we need this function for a C translation unit.

1 0

[reactos] 01/01: [MSPAINT] Implement mouse middle button dragging (#5804)
by Katayama Hirofumi MZ 17 Oct '23

17 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97e53c6963678be5f399e… commit 97e53c6963678be5f399e99e179c177358c14ab3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 17 15:58:34 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 17 15:58:34 2023 +0900 [MSPAINT] Implement mouse middle button dragging (#5804) - Handle WM_MBUTTONDOWN and WM_MBUTTONUP messages. - Implement dragging by mouse middle button. - Add IDC_HANDDRAG cursor resource. CORE-19094 --- base/applications/mspaint/canvas.cpp | 33 +++++++++++++++++++++++---- base/applications/mspaint/canvas.h | 2 ++ base/applications/mspaint/icons/handdrag.cur | Bin 0 -> 326 bytes base/applications/mspaint/resource.h | 1 + base/applications/mspaint/rsrc.rc | 1 + 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index e8b024e21ec..b423662d882 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -278,7 +278,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) { case SB_THUMBTRACK: case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); + si.nPos = (SHORT)HIWORD(wParam); break; case SB_LINELEFT: si.nPos -= 5; @@ -293,9 +293,9 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) si.nPos += si.nPage; break; } + si.nPos = max(min(si.nPos, si.nMax), si.nMin); SetScrollInfo(fnBar, &si); - updateScrollRange(); - Invalidate(FALSE); // FIXME: Flicker + Invalidate(); } LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -315,7 +315,15 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; m_nMouseDownMsg = nMsg; - BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + BOOL bLeftButton = (nMsg == WM_LBUTTONDOWN); + + if (nMsg == WM_MBUTTONDOWN) + { + m_ptOrig = pt; + SetCapture(); + ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + return 0; + } HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) @@ -407,6 +415,17 @@ LRESULT CCanvasWindow::OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, B LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + + if (m_nMouseDownMsg == WM_MBUTTONDOWN) + { + INT x = GetScrollPos(SB_HORZ) - (pt.x - m_ptOrig.x); + INT y = GetScrollPos(SB_VERT) - (pt.y - m_ptOrig.y); + SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); + SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); + m_ptOrig = pt; + return 0; + } + CanvasToImage(pt); if (toolsModel.GetActiveTool() == TOOL_ZOOM) @@ -675,6 +694,12 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } + if (m_nMouseDownMsg == WM_MBUTTONDOWN) + { + ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + return 0; + } + POINT pt; ::GetCursorPos(&pt); ScreenToClient(&pt); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 238229e3b2b..76e7225ccfd 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -22,11 +22,13 @@ public: MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnButtonDown) MESSAGE_HANDLER(WM_RBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_MBUTTONDOWN, OnButtonDown) MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) MESSAGE_HANDLER(WM_LBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_RBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_MBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) diff --git a/base/applications/mspaint/icons/handdrag.cur b/base/applications/mspaint/icons/handdrag.cur new file mode 100644 index 00000000000..74e5ba6b9c2 Binary files /dev/null and b/base/applications/mspaint/icons/handdrag.cur differ diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index b41486cee4d..3f87e6e42e1 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -22,6 +22,7 @@ #define IDC_ZOOM 532 #define IDC_PEN 533 #define IDC_AIRBRUSH 534 +#define IDC_HANDDRAG 535 #define IDI_HORZSTRETCH 535 #define IDI_VERTSTRETCH 536 diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 4bca40c0a6f..1f0ee5aca23 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -33,6 +33,7 @@ IDC_COLOR ICON "icons/color_cur.ico" IDC_ZOOM ICON "icons/zoom_cur.ico" IDC_PEN ICON "icons/pen_cur.ico" IDC_AIRBRUSH ICON "icons/airbrush_cur.ico" +IDC_HANDDRAG CURSOR "icons/handdrag.cur" IDI_HORZSTRETCH ICON "icons/horzstretch.ico" IDI_VERTSTRETCH ICON "icons/vertstretch.ico"

1 0

[reactos] 03/03: [SDK] Move definition of MyInt128 into stubs.h
by Timo Kreuzer 17 Oct '23

17 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40d444919e3f0cc54f11a… commit 40d444919e3f0cc54f11ad0cfec001f384ceea90 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 7 12:32:12 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 17 09:41:18 2023 +0300 [SDK] Move definition of MyInt128 into stubs.h --- sdk/include/reactos/stubs.h | 7 +++++++ sdk/tools/spec2def/spec2def.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/include/reactos/stubs.h b/sdk/include/reactos/stubs.h index 5b872fbe47c..b5e1517f104 100644 --- a/sdk/include/reactos/stubs.h +++ b/sdk/include/reactos/stubs.h @@ -31,6 +31,13 @@ typedef struct _EXCEPTION_RECORD { #define EXCEPTION_WINE_STUB 0x80000100 #define EH_NONCONTINUABLE 0x01 +/* __int128 is not supported on x86, so use a custom type */ +typedef struct +{ + __int64 lower; + __int64 upper; +} MyInt128; + void __stdcall RtlRaiseException( diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index 2ec775cc390..2eae6bb0170 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -228,13 +228,6 @@ OutputHeader_stub(FILE *file) fprintf(file, "WINE_DECLARE_DEBUG_CHANNEL(relay);\n"); } - /* __int128 is not supported on x86, so use a custom type */ - fprintf(file, "\n" - "typedef struct {\n" - " __int64 lower;\n" - " __int64 upper;\n" - "} MyInt128;\n"); - fprintf(file, "\n"); }

1 0

[reactos] 02/03: [SDK] Do not include windef.h into stubs.h
by Timo Kreuzer 17 Oct '23

17 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a27b8009e0652aab9aef2… commit a27b8009e0652aab9aef29f9963e21cb53d2a124 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 7 10:22:34 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 17 09:41:18 2023 +0300 [SDK] Do not include windef.h into stubs.h This prevents pulling in function declarations that are incompatible with the generated stubs. --- dll/win32/msvcrt/stubs.c | 1 + dll/win32/msvcrt20/stubs.c | 3 ++- dll/win32/msvcrt40/stubs.c | 1 + sdk/include/reactos/stubs.h | 39 ++++++++++++++++++++++++++++++--------- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dll/win32/msvcrt/stubs.c b/dll/win32/msvcrt/stubs.c index 389bc11f3ed..6c0bcfee5dc 100644 --- a/dll/win32/msvcrt/stubs.c +++ b/dll/win32/msvcrt/stubs.c @@ -1,4 +1,5 @@ +#include <windef.h> #include <stubs.h> #undef UNIMPLEMENTED diff --git a/dll/win32/msvcrt20/stubs.c b/dll/win32/msvcrt20/stubs.c index 489e122ef4f..469228006a4 100644 --- a/dll/win32/msvcrt20/stubs.c +++ b/dll/win32/msvcrt20/stubs.c @@ -1,3 +1,4 @@ +#include <windef.h> #include <stubs.h> #undef UNIMPLEMENTED @@ -24,4 +25,4 @@ size_t _heapused( size_t *pUsed, size_t *pCommit ) return( 0 ); } -int _fileinfo = 0; \ No newline at end of file +int _fileinfo = 0; diff --git a/dll/win32/msvcrt40/stubs.c b/dll/win32/msvcrt40/stubs.c index dc730333044..013083d4214 100644 --- a/dll/win32/msvcrt40/stubs.c +++ b/dll/win32/msvcrt40/stubs.c @@ -1,3 +1,4 @@ +#include <windef.h> #include <stubs.h> #undef UNIMPLEMENTED diff --git a/sdk/include/reactos/stubs.h b/sdk/include/reactos/stubs.h index 6b5cd36372c..5b872fbe47c 100644 --- a/sdk/include/reactos/stubs.h +++ b/sdk/include/reactos/stubs.h @@ -1,6 +1,28 @@ -#define WIN32_NO_STATUS -#define _NTSYSTEM_ -#include <windef.h> + +#ifndef _WINDEF_ +typedef unsigned short wchar_t; +typedef unsigned long DWORD, ULONG; +typedef void* PVOID; +#define __int64 long long +#ifdef _WIN64 +typedef unsigned long long ULONG_PTR; +#else +typedef unsigned long ULONG_PTR; +#endif + +#define EXCEPTION_MAXIMUM_PARAMETERS 15 +typedef struct _EXCEPTION_RECORD { + DWORD ExceptionCode; + DWORD ExceptionFlags; + struct _EXCEPTION_RECORD* ExceptionRecord; + PVOID ExceptionAddress; + DWORD NumberParameters; + ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; +} EXCEPTION_RECORD, * PEXCEPTION_RECORD; + +#define EXCEPTION_NONCONTINUABLE 0x01 + +#endif #ifndef PRIx64 #define PRIx64 "I64x" @@ -9,24 +31,23 @@ #define EXCEPTION_WINE_STUB 0x80000100 #define EH_NONCONTINUABLE 0x01 -NTSYSAPI -VOID -NTAPI +void +__stdcall RtlRaiseException( - _In_ PEXCEPTION_RECORD ExceptionRecord + PEXCEPTION_RECORD ExceptionRecord ); ULONG __cdecl DbgPrint( - _In_z_ _Printf_format_string_ PCSTR Format, + const char* Format, ... ); #define __wine_spec_unimplemented_stub(module, function) \ { \ EXCEPTION_RECORD ExceptionRecord = {0}; \ - ExceptionRecord.ExceptionRecord = NULL; \ + ExceptionRecord.ExceptionRecord = 0; \ ExceptionRecord.ExceptionCode = EXCEPTION_WINE_STUB; \ ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; \ ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)module; \

1 0

[reactos] 01/03: [CMAKE] Don't use precompiled headers for autogenerated stub files
by Timo Kreuzer 17 Oct '23

17 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b7c7d8e68251eaad3cc4… commit 3b7c7d8e68251eaad3cc499647d52c88dba82980 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Oct 6 20:07:02 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 17 09:41:18 2023 +0300 [CMAKE] Don't use precompiled headers for autogenerated stub files --- sdk/cmake/gcc.cmake | 3 +++ sdk/cmake/msvc.cmake | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index a4a013ed6a0..0eefc577a60 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -425,6 +425,9 @@ function(spec2def _dllname _spec_file) COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${__with_relay_arg} ${__version_arg} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) + # Do not use precompiled headers for the stub file + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES SKIP_PRECOMPILE_HEADERS ON) + if(__spec2def_ADD_IMPORTLIB) set(_extraflags) if(__spec2def_NO_PRIVATE_WARNINGS) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 8dcfc8d43cc..dd3df55021d 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -396,6 +396,9 @@ function(spec2def _dllname _spec_file) COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${__with_relay_arg} ${__version_arg} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) + # Do not use precompiled headers for the stub file + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES SKIP_PRECOMPILE_HEADERS ON) + if(__spec2def_ADD_IMPORTLIB) generate_import_lib(lib${_file} ${_dllname} ${_spec_file} "${__version_arg}") if(__spec2def_NO_PRIVATE_WARNINGS)

1 0

[reactos] 01/01: [MSPAINT] Simplify canvas mouse message handling (#5803)
by Katayama Hirofumi MZ 17 Oct '23

17 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f49919ce5d3de933c6dd4… commit f49919ce5d3de933c6dd42b2beb54f82cae47e8c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 17 13:48:19 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 17 13:48:19 2023 +0900 [MSPAINT] Simplify canvas mouse message handling (#5803) - Unify some mouse message handlers of CCanvasWindow. - Add CCanvasWindow::m_nMouseDownMsg member. CORE-19094 --- base/applications/mspaint/canvas.cpp | 54 +++++++++++------------------------- base/applications/mspaint/canvas.h | 25 +++++++---------- 2 files changed, 26 insertions(+), 53 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index e19c4e6e306..e8b024e21ec 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -310,10 +310,13 @@ LRESULT CCanvasWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& return 0; } -LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + m_nMouseDownMsg = nMsg; + BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { @@ -333,7 +336,7 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam } else { - canvasWindow.ClientToScreen(&pt); + ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } return 0; @@ -347,13 +350,13 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam case TOOL_BEZIER: case TOOL_SHAPE: toolsModel.OnCancelDraw(); - canvasWindow.Invalidate(); + Invalidate(); break; case TOOL_FREESEL: case TOOL_RECTSEL: toolsModel.OnFinishDraw(); - canvasWindow.Invalidate(); + Invalidate(); break; default: @@ -386,40 +389,21 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam return 0; } -LRESULT CCanvasWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDown(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDown(FALSE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnLRButtonDblClk(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); m_drawing = FALSE; - ReleaseCapture(); + ::ReleaseCapture(); + m_nMouseDownMsg = 0; - toolsModel.OnButtonDown(bLeftButton, pt.x, pt.y, TRUE); + toolsModel.OnButtonDown(nMsg == WM_LBUTTONDBLCLK, pt.x, pt.y, TRUE); toolsModel.resetTool(); Invalidate(FALSE); return 0; } -LRESULT CCanvasWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDblClk(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDblClk(FALSE, nMsg, wParam, lParam, bHandled); -} - LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; @@ -612,13 +596,16 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } -LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); ::ReleaseCapture(); + BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + m_nMouseDownMsg = 0; + if (m_drawing) { m_drawing = FALSE; @@ -680,16 +667,6 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, return 0; } -LRESULT CCanvasWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonUp(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonUp(FALSE, nMsg, wParam, lParam, bHandled); -} - LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (CWaitCursor::IsWaiting()) @@ -760,6 +737,7 @@ LRESULT CCanvasWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { // Cancel dragging ::ReleaseCapture(); + m_nMouseDownMsg = 0; m_hitCanvasSizeBox = HIT_NONE; ::SetRectEmpty(&m_rcResizing); Invalidate(TRUE); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 21a6e11ecfa..238229e3b2b 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -20,13 +20,13 @@ public: MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) - MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClk) - MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnRButtonDblClk) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_RBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnButtonDblClk) + MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) + MESSAGE_HANDLER(WM_LBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_RBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) @@ -76,14 +76,8 @@ protected: LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -91,7 +85,8 @@ protected: LRESULT OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonDblClk(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + UINT m_nMouseDownMsg = 0; + LRESULT OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); };

1 0

[reactos] 01/01: [MSPAINT] Improve Zoom tool (#5798)
by Katayama Hirofumi MZ 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f1eb03ad28f6262b7322… commit 8f1eb03ad28f6262b7322a637f775d7e1312351c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 17 07:25:50 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 17 07:25:50 2023 +0900 [MSPAINT] Improve Zoom tool (#5798) - Delete global zoomTo function. - Add CCanvasWindow::zoomTo and CCanvasWindow::getNewZoomRect functions. - Rename CCanvasWindow::updateScrollInfo as CCanvasWindow::updateScrollRange. - Rename CCanvasWindow::resetScrollPos as CCanvasWindow::updateScrollPos. - Draw the proper zoom rectangle on mouse move. - Revert the active tool on click when the tool was Zoom. CORE-19094 --- base/applications/mspaint/canvas.cpp | 57 ++++++++++++++++++++++++---- base/applications/mspaint/canvas.h | 6 ++- base/applications/mspaint/common.h | 1 - base/applications/mspaint/dib.cpp | 2 +- base/applications/mspaint/history.cpp | 2 +- base/applications/mspaint/mouse.cpp | 61 +++++++++++++++++++++--------- base/applications/mspaint/toolsettings.cpp | 2 +- base/applications/mspaint/winproc.cpp | 55 ++++++--------------------- 8 files changed, 113 insertions(+), 73 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 60aa29929b5..e19c4e6e306 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -89,6 +89,49 @@ HITTEST CCanvasWindow::CanvasHitTest(POINT pt) return getSizeBoxHitTest(pt, &rcBase); } +VOID CCanvasWindow::getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget) +{ + CRect rcImage; + GetImageRect(rcImage); + ImageToCanvas(rcImage); + + // Calculate the zoom rectangle + INT oldZoom = toolsModel.GetZoom(); + GetClientRect(rcView); + LONG cxView = rcView.right * oldZoom / newZoom, cyView = rcView.bottom * oldZoom / newZoom; + ::SetRect(&rcView, ptTarget.x - cxView / 2, ptTarget.y - cyView / 2, + ptTarget.x + cxView / 2, ptTarget.y + cyView / 2); + + // Shift the rectangle if necessary + INT dx = 0, dy = 0; + if (rcView.left < rcImage.left) + dx = rcImage.left - rcView.left; + else if (rcImage.right < rcView.right) + dx = rcImage.right - rcView.right; + if (rcView.top < rcImage.top) + dy = rcImage.top - rcView.top; + else if (rcImage.bottom < rcView.bottom) + dy = rcImage.bottom - rcView.bottom; + rcView.OffsetRect(dx, dy); + + rcView.IntersectRect(&rcView, &rcImage); +} + +VOID CCanvasWindow::zoomTo(INT newZoom, LONG left, LONG top) +{ + POINT pt = { left, top }; + CanvasToImage(pt); + + toolsModel.SetZoom(newZoom); + ImageToCanvas(pt); + pt.x += GetScrollPos(SB_HORZ); + pt.y += GetScrollPos(SB_VERT); + + updateScrollRange(); + updateScrollPos(pt.x, pt.y); + Invalidate(TRUE); +} + VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) { // This is the target area we have to draw on @@ -180,7 +223,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) ::DeleteDC(hdcMem0); } -VOID CCanvasWindow::updateScrollInfo() +VOID CCanvasWindow::updateScrollRange() { CRect rcClient; GetClientRect(&rcClient); @@ -211,16 +254,16 @@ VOID CCanvasWindow::updateScrollInfo() SetScrollInfo(SB_VERT, &si); } -VOID CCanvasWindow::resetScrollPos() +VOID CCanvasWindow::updateScrollPos(INT x, INT y) { - SetScrollPos(SB_HORZ, 0); - SetScrollPos(SB_VERT, 0); + SetScrollPos(SB_HORZ, x); + SetScrollPos(SB_VERT, y); } LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) - updateScrollInfo(); + updateScrollRange(); return 0; } @@ -251,7 +294,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) break; } SetScrollInfo(fnBar, &si); - updateScrollInfo(); + updateScrollRange(); Invalidate(FALSE); // FIXME: Flicker } @@ -632,7 +675,7 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, m_hitCanvasSizeBox = HIT_NONE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions - updateScrollInfo(); + updateScrollRange(); Invalidate(TRUE); return 0; } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 193d7603abd..21a6e11ecfa 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -42,8 +42,8 @@ public: VOID cancelDrawing(); VOID finishDrawing(); - VOID updateScrollInfo(); - VOID resetScrollPos(); + VOID updateScrollRange(); + VOID updateScrollPos(INT x = 0, INT y = 0); VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); @@ -51,6 +51,8 @@ public: VOID CanvasToImage(RECT& rc, BOOL bZoomed = FALSE); VOID GetImageRect(RECT& rc); VOID MoveSelection(INT xDelta, INT yDelta); + VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget); + VOID zoomTo(INT newZoom, LONG left = 0, LONG top = 0); protected: HITTEST m_hitSelection; diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index d2e862b0114..3dda6703441 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -43,7 +43,6 @@ enum HITTEST // hit /* FUNCTIONS ********************************************************/ -BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 7b458138618..eede3325c55 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -241,7 +241,7 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) { // update image - canvasWindow.resetScrollPos(); + canvasWindow.updateScrollPos(); imageModel.PushImageForUndo(hBitmap); imageModel.ClearHistory(); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 05990df42b8..2d28cb5def2 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -16,7 +16,7 @@ void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) { - canvasWindow.updateScrollInfo(); + canvasWindow.updateScrollRange(); canvasWindow.Invalidate(); } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index dc9ce6b89a2..c7c19e16544 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -563,40 +563,67 @@ struct ColorTool : ToolBase // TOOL_ZOOM struct ZoomTool : ToolBase { + BOOL m_bZoomed = FALSE; + ZoomTool() : ToolBase(TOOL_ZOOM) { } + BOOL getNewZoomRect(CRect& rcView, INT newZoom); + void OnDrawOverlayOnCanvas(HDC hdc) override { - CRect rc; - canvasWindow.GetImageRect(rc); - canvasWindow.ImageToCanvas(rc); - - POINT pt; - ::GetCursorPos(&pt); - ::ScreenToClient(canvasWindow, &pt); - - // FIXME: Draw the border of the area that is to be zoomed in - if (rc.PtInRect(pt)) - DrawXorRect(hdc, &rc); + CRect rcView; + INT oldZoom = toolsModel.GetZoom(); + if (oldZoom < MAX_ZOOM && getNewZoomRect(rcView, oldZoom * 2)) + DrawXorRect(hdc, &rcView); } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { + INT newZoom, oldZoom = toolsModel.GetZoom(); if (bLeftButton) - { - if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, x, y); - } + newZoom = (oldZoom < MAX_ZOOM) ? (oldZoom * 2) : MIN_ZOOM; else + newZoom = (oldZoom > MIN_ZOOM) ? (oldZoom / 2) : MAX_ZOOM; + + m_bZoomed = FALSE; + + if (oldZoom != newZoom) { - if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, x, y); + CRect rcView; + if (getNewZoomRect(rcView, newZoom)) + { + canvasWindow.zoomTo(newZoom, rcView.left, rcView.top); + m_bZoomed = TRUE; + } } } + + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + { + if (m_bZoomed) + toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + + return TRUE; + } }; +BOOL ZoomTool::getNewZoomRect(CRect& rcView, INT newZoom) +{ + CPoint pt; + ::GetCursorPos(&pt); + canvasWindow.ScreenToClient(&pt); + + canvasWindow.getNewZoomRect(rcView, newZoom, pt); + + CRect rc; + canvasWindow.GetImageRect(rc); + canvasWindow.ImageToCanvas(rc); + + return rc.PtInRect(pt); +} + // TOOL_PEN struct PenTool : SmoothDrawTool { diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 182862ec305..745f2afe3e0 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -309,7 +309,7 @@ LRESULT CToolSettingsWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { INT trackPos = MAX_ZOOM_TRACK - (INT)trackbarZoom.SendMessage(TBM_GETPOS, 0, 0); - zoomTo(MIN_ZOOM << trackPos, 0, 0); + canvasWindow.zoomTo(MIN_ZOOM << trackPos); INT zoomRate = toolsModel.GetZoom(); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 58bf4a98909..c1cbff31b8c 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -41,37 +41,6 @@ static HWND DoHtmlHelpW(HWND hwndCaller, LPCWSTR pszFile, UINT uCommand, DWORD_P return s_pHtmlHelpW(hwndCaller, pszFile, uCommand, dwData); } -BOOL -zoomTo(int newZoom, int mouseX, int mouseY) -{ - int x, y, w, h; - RECT clientRectScrollbox; - canvasWindow.GetClientRect(&clientRectScrollbox); - - RECT clientRectImageArea; - ::SetRect(&clientRectImageArea, 0, 0, imageModel.GetWidth(), imageModel.GetHeight()); - Zoomed(clientRectImageArea); - - w = clientRectImageArea.right * newZoom / toolsModel.GetZoom(); - h = clientRectImageArea.bottom * newZoom / toolsModel.GetZoom(); - if (!w || !h) - { - return FALSE; - } - w = clientRectImageArea.right * clientRectScrollbox.right / w; - h = clientRectImageArea.bottom * clientRectScrollbox.bottom / h; - x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / toolsModel.GetZoom(); - y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / toolsModel.GetZoom(); - - toolsModel.SetZoom(newZoom); - - canvasWindow.Invalidate(TRUE); - - canvasWindow.SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); - canvasWindow.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); - return TRUE; -} - void CMainWindow::alignChildrenToMainWindow() { RECT clientRect, rc; @@ -216,20 +185,20 @@ LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { INT zDelta = (SHORT)HIWORD(wParam); - if (::GetAsyncKeyState(VK_CONTROL) < 0) + if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Wheel { if (zDelta < 0) { if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, 0, 0); + canvasWindow.zoomTo(toolsModel.GetZoom() / 2); } else if (zDelta > 0) { if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, 0, 0); + canvasWindow.zoomTo(toolsModel.GetZoom() * 2); } } - else + else // Wheel only { UINT nCount = 3; if (::GetAsyncKeyState(VK_SHIFT) < 0) @@ -921,7 +890,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_IMAGEROTATEMIRROR: { CWaitCursor waitCursor; - canvasWindow.resetScrollPos(); + canvasWindow.updateScrollPos(); switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ @@ -1054,25 +1023,25 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_VIEWZOOM125: - zoomTo(125, 0, 0); + canvasWindow.zoomTo(125); break; case IDM_VIEWZOOM25: - zoomTo(250, 0, 0); + canvasWindow.zoomTo(250); break; case IDM_VIEWZOOM50: - zoomTo(500, 0, 0); + canvasWindow.zoomTo(500); break; case IDM_VIEWZOOM100: - zoomTo(1000, 0, 0); + canvasWindow.zoomTo(1000); break; case IDM_VIEWZOOM200: - zoomTo(2000, 0, 0); + canvasWindow.zoomTo(2000); break; case IDM_VIEWZOOM400: - zoomTo(4000, 0, 0); + canvasWindow.zoomTo(4000); break; case IDM_VIEWZOOM800: - zoomTo(8000, 0, 0); + canvasWindow.zoomTo(8000); break; case IDM_VIEWFULLSCREEN:

1 0

[reactos] 01/01: [NTUSER] Remove a wrong check in MENU_MouseMove (#5736)
by Egor Ananyin 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2d3aa7f4ac40e0d84c05… commit e2d3aa7f4ac40e0d84c05aa98dd1554ba8c6c456 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Mon Oct 16 19:10:52 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 16 19:10:52 2023 +0300 [NTUSER] Remove a wrong check in MENU_MouseMove (#5736) This check doesn't seem to be correct in modern ReactOS. Furthermore, it actually hadn't been working for a long time until it was uncovered by the recent system menu changes. Reverts a hack introduced in 17a315285 (r72517), fixes CORE-19170. The initial bug described in CORE-2338 is not observed. --- win32ss/user/ntuser/menu.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 869b9bb4cc4..6b2f242cc25 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3683,20 +3683,7 @@ static BOOL FASTCALL MENU_MouseMove(MTRACKER *pmt, PMENU PtMenu, UINT Flags) UINT Index = NO_SELECTED_ITEM; if ( PtMenu ) - { - if (IS_SYSTEM_MENU(PtMenu)) - { - Index = 0; - //// ReactOS only HACK: CORE-2338 - // Windows tracks mouse moves to the system menu but does not open it. - // Only keyboard tracking can do that. - // - TRACE("SystemMenu\n"); - return TRUE; // Stay inside the Loop! - } - else - MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); - } + MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); if (Index == NO_SELECTED_ITEM) {

1 0

[reactos] 01/01: [USERENV] SetUserEnvironmentVariable(): Remove use of uninit' ShortName
by Serge Gautherie 16 Oct '23

16 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13a145b6d808816b299b1… commit 13a145b6d808816b299b1691d699996f7a34e4fe Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Oct 16 19:02:27 2023 +0300 [USERENV] SetUserEnvironmentVariable(): Remove use of uninit' ShortName Addendum to 96fe018 (r72066). --- dll/win32/userenv/environment.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/userenv/environment.c b/dll/win32/userenv/environment.c index 043e3123790..0b54ba6f6c2 100644 --- a/dll/win32/userenv/environment.c +++ b/dll/win32/userenv/environment.c @@ -88,8 +88,6 @@ SetUserEnvironmentVariable(PWSTR* Environment, { DPRINT("GetShortPathNameW() failed for %S (Error %lu)\n", DstValue.Buffer, GetLastError()); } - - DPRINT("Buffer: %S\n", ShortName); } RtlInitUnicodeString(&Name, lpName);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2023