Ros-diffs March 2023

ros-diffs@reactos.org

18 participants
139 discussions

[reactos] 01/01: [MSPAINT] Move UpdateCanvas's code to newly-defined CCanvasWindow::Update

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eacf003c816335e79ab58… commit eacf003c816335e79ab583f1af7a900aef0642c5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 17 07:51:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Mar 17 07:51:12 2023 +0900 [MSPAINT] Move UpdateCanvas's code to newly-defined CCanvasWindow::Update CORE-18867 --- base/applications/mspaint/canvas.cpp | 25 ++++++++++++------------- base/applications/mspaint/canvas.h | 5 +++-- base/applications/mspaint/imgarea.cpp | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 1293471ddbf..49249373ab8 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -13,23 +13,22 @@ /* FUNCTIONS ********************************************************/ -void -UpdateCanvas(HWND hwndFrom) +VOID CCanvasWindow::Update(HWND hwndFrom) { CRect tempRect; - canvasWindow.GetClientRect(&tempRect); + GetClientRect(&tempRect); CSize sizeScrollBox(tempRect.Width(), tempRect.Height()); CSize sizeZoomed = { Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()) }; CSize sizeWhole = { sizeZoomed.cx + (GRIP_SIZE * 2), sizeZoomed.cy + (GRIP_SIZE * 2) }; /* show/hide the scrollbars */ - canvasWindow.ShowScrollBar(SB_HORZ, sizeScrollBox.cx < sizeWhole.cx); - canvasWindow.ShowScrollBar(SB_VERT, sizeScrollBox.cy < sizeWhole.cy); + ShowScrollBar(SB_HORZ, sizeScrollBox.cx < sizeWhole.cx); + ShowScrollBar(SB_VERT, sizeScrollBox.cy < sizeWhole.cy); if (sizeScrollBox.cx < sizeWhole.cx || sizeScrollBox.cy < sizeWhole.cy) { - canvasWindow.GetClientRect(&tempRect); + GetClientRect(&tempRect); sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); } @@ -38,14 +37,14 @@ UpdateCanvas(HWND hwndFrom) si.nMax = sizeWhole.cx; si.nPage = sizeScrollBox.cx; - canvasWindow.SetScrollInfo(SB_HORZ, &si); + SetScrollInfo(SB_HORZ, &si); si.nMax = sizeWhole.cy; si.nPage = sizeScrollBox.cy; - canvasWindow.SetScrollInfo(SB_VERT, &si); + SetScrollInfo(SB_VERT, &si); - INT dx = -canvasWindow.GetScrollPos(SB_HORZ); - INT dy = -canvasWindow.GetScrollPos(SB_VERT); + INT dx = -GetScrollPos(SB_HORZ); + INT dy = -GetScrollPos(SB_VERT); if (sizeboxLeftTop.IsWindow()) { @@ -81,7 +80,7 @@ LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa { if (m_hWnd) { - UpdateCanvas(m_hWnd); + Update(m_hWnd); } return 0; } @@ -112,7 +111,7 @@ LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& break; } SetScrollInfo(SB_HORZ, &si); - UpdateCanvas(m_hWnd); + Update(m_hWnd); return 0; } @@ -142,7 +141,7 @@ LRESULT CCanvasWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& break; } SetScrollInfo(SB_VERT, &si); - UpdateCanvas(m_hWnd); + Update(m_hWnd); return 0; } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index b97d43a497d..22613518857 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -21,11 +21,12 @@ public: MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) END_MSG_MAP() + VOID Update(HWND hwndFrom); + +protected: LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; - -void UpdateCanvas(HWND hwndFrom); diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index 22264f9bdce..1d8b05024ce 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -54,7 +54,7 @@ LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (!IsWindow()) return 0; - UpdateCanvas(NULL); + canvasWindow.Update(NULL); return 0; } @@ -346,7 +346,7 @@ LRESULT CImgAreaWindow::OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CImgAreaWindow::OnImageModelDimensionsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - UpdateCanvas(NULL); + canvasWindow.Update(NULL); return 0; }

1 year, 9 months

[reactos] 01/01: [MSPAINT] Rename scrollbox as canvas

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7361592ede2b7b554e6d7… commit 7361592ede2b7b554e6d7b4c6680c3a8d612d644 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 17 07:45:14 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Mar 17 07:45:14 2023 +0900 [MSPAINT] Rename scrollbox as canvas - s/CScrollboxWindow/CCanvasWindow/ - s/scrollboxWindow/canvasWindow/ - s/UpdateScrollbox/UpdateCanvas/ CORE-18867 --- base/applications/mspaint/CMakeLists.txt | 2 +- .../mspaint/{scrollbox.cpp => canvas.cpp} | 38 +++++++++++----------- .../applications/mspaint/{scrollbox.h => canvas.h} | 12 +++---- base/applications/mspaint/globalvar.h | 4 +-- base/applications/mspaint/imgarea.cpp | 12 +++---- base/applications/mspaint/main.cpp | 28 ++++++++-------- base/applications/mspaint/precomp.h | 2 +- base/applications/mspaint/winproc.cpp | 20 ++++++------ 8 files changed, 59 insertions(+), 59 deletions(-) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index b4613246f45..2d6e24dc46d 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -7,6 +7,7 @@ if(DBG) endif() list(APPEND SOURCE + canvas.cpp dialogs.cpp dib.cpp drawing.cpp @@ -19,7 +20,6 @@ list(APPEND SOURCE palette.cpp palettemodel.cpp registry.cpp - scrollbox.cpp selection.cpp selectionmodel.cpp sizebox.cpp diff --git a/base/applications/mspaint/scrollbox.cpp b/base/applications/mspaint/canvas.cpp similarity index 79% rename from base/applications/mspaint/scrollbox.cpp rename to base/applications/mspaint/canvas.cpp index 2d36711dcc4..1293471ddbf 100644 --- a/base/applications/mspaint/scrollbox.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -1,8 +1,8 @@ /* * PROJECT: PAINT for ReactOS * LICENSE: LGPL - * FILE: base/applications/mspaint/scrollbox.cpp - * PURPOSE: Functionality surrounding the scroll box window class + * FILE: base/applications/mspaint/canvas.cpp + * PURPOSE: Providing the canvas window class * PROGRAMMERS: Benedikt Freisen */ @@ -14,22 +14,22 @@ /* FUNCTIONS ********************************************************/ void -UpdateScrollbox(HWND hwndFrom) +UpdateCanvas(HWND hwndFrom) { CRect tempRect; - scrollboxWindow.GetClientRect(&tempRect); + canvasWindow.GetClientRect(&tempRect); CSize sizeScrollBox(tempRect.Width(), tempRect.Height()); CSize sizeZoomed = { Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()) }; CSize sizeWhole = { sizeZoomed.cx + (GRIP_SIZE * 2), sizeZoomed.cy + (GRIP_SIZE * 2) }; /* show/hide the scrollbars */ - scrollboxWindow.ShowScrollBar(SB_HORZ, sizeScrollBox.cx < sizeWhole.cx); - scrollboxWindow.ShowScrollBar(SB_VERT, sizeScrollBox.cy < sizeWhole.cy); + canvasWindow.ShowScrollBar(SB_HORZ, sizeScrollBox.cx < sizeWhole.cx); + canvasWindow.ShowScrollBar(SB_VERT, sizeScrollBox.cy < sizeWhole.cy); if (sizeScrollBox.cx < sizeWhole.cx || sizeScrollBox.cy < sizeWhole.cy) { - scrollboxWindow.GetClientRect(&tempRect); + canvasWindow.GetClientRect(&tempRect); sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); } @@ -38,14 +38,14 @@ UpdateScrollbox(HWND hwndFrom) si.nMax = sizeWhole.cx; si.nPage = sizeScrollBox.cx; - scrollboxWindow.SetScrollInfo(SB_HORZ, &si); + canvasWindow.SetScrollInfo(SB_HORZ, &si); si.nMax = sizeWhole.cy; si.nPage = sizeScrollBox.cy; - scrollboxWindow.SetScrollInfo(SB_VERT, &si); + canvasWindow.SetScrollInfo(SB_VERT, &si); - INT dx = -scrollboxWindow.GetScrollPos(SB_HORZ); - INT dy = -scrollboxWindow.GetScrollPos(SB_VERT); + INT dx = -canvasWindow.GetScrollPos(SB_HORZ); + INT dy = -canvasWindow.GetScrollPos(SB_VERT); if (sizeboxLeftTop.IsWindow()) { @@ -77,16 +77,16 @@ UpdateScrollbox(HWND hwndFrom) imageArea.MoveWindow(dx + GRIP_SIZE, dy + GRIP_SIZE, sizeZoomed.cx, sizeZoomed.cy, TRUE); } -LRESULT CScrollboxWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) { - UpdateScrollbox(m_hWnd); + UpdateCanvas(m_hWnd); } return 0; } -LRESULT CScrollboxWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SCROLLINFO si; si.cbSize = sizeof(SCROLLINFO); @@ -112,11 +112,11 @@ LRESULT CScrollboxWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO break; } SetScrollInfo(SB_HORZ, &si); - UpdateScrollbox(m_hWnd); + UpdateCanvas(m_hWnd); return 0; } -LRESULT CScrollboxWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SCROLLINFO si; si.cbSize = sizeof(SCROLLINFO); @@ -142,11 +142,11 @@ LRESULT CScrollboxWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO break; } SetScrollInfo(SB_VERT, &si); - UpdateScrollbox(m_hWnd); + UpdateCanvas(m_hWnd); return 0; } -LRESULT CScrollboxWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { switch (toolsModel.GetActiveTool()) { @@ -167,7 +167,7 @@ LRESULT CScrollboxWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, return 0; } -LRESULT CScrollboxWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { return ::SendMessage(GetParent(), nMsg, wParam, lParam); } diff --git a/base/applications/mspaint/scrollbox.h b/base/applications/mspaint/canvas.h similarity index 70% rename from base/applications/mspaint/scrollbox.h rename to base/applications/mspaint/canvas.h index 56822089bf6..b97d43a497d 100644 --- a/base/applications/mspaint/scrollbox.h +++ b/base/applications/mspaint/canvas.h @@ -1,19 +1,19 @@ /* * PROJECT: PAINT for ReactOS * LICENSE: LGPL - * FILE: base/applications/mspaint/scrollbox.h - * PURPOSE: Functionality surrounding the scroll box window class + * FILE: base/applications/mspaint/canvas.h + * PURPOSE: Providing the canvas window class * PROGRAMMERS: Benedikt Freisen */ #pragma once -class CScrollboxWindow : public CWindowImpl<CScrollboxWindow> +class CCanvasWindow : public CWindowImpl<CCanvasWindow> { public: - DECLARE_WND_CLASS_EX(_T("Scrollbox"), 0, COLOR_APPWORKSPACE) + DECLARE_WND_CLASS_EX(_T("ReactOSPaintCanvas"), 0, COLOR_APPWORKSPACE) - BEGIN_MSG_MAP(CScrollboxWindow) + BEGIN_MSG_MAP(CCanvasWindow) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) @@ -28,4 +28,4 @@ public: LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; -void UpdateScrollbox(HWND hwndFrom); +void UpdateCanvas(HWND hwndFrom); diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index 6ffcfa0ea50..aa144275968 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -61,7 +61,7 @@ class CMiniatureWindow; class CToolBox; class CToolSettingsWindow; class CPaletteWindow; -class CScrollboxWindow; +class CCanvasWindow; class CSelectionWindow; class CImgAreaWindow; class CSizeboxWindow; @@ -73,7 +73,7 @@ extern CMiniatureWindow miniature; extern CToolBox toolBoxContainer; extern CToolSettingsWindow toolSettingsWindow; extern CPaletteWindow paletteWindow; -extern CScrollboxWindow scrollboxWindow; +extern CCanvasWindow canvasWindow; extern CSelectionWindow selectionWindow; extern CImgAreaWindow imageArea; extern CSizeboxWindow sizeboxLeftTop; diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index 5f646da7411..22264f9bdce 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -22,10 +22,10 @@ void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) LOGBRUSH logbrush; int rop; - RECT clientRectScrollbox; + RECT clientRectCanvas; RECT clientRectImageArea; int x, y, w, h; - scrollboxWindow.GetClientRect(&clientRectScrollbox); + canvasWindow.GetClientRect(&clientRectCanvas); GetClientRect(&clientRectImageArea); w = clientRectImageArea.right * 2; h = clientRectImageArea.bottom * 2; @@ -33,8 +33,8 @@ void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) { return; } - w = clientRectImageArea.right * clientRectScrollbox.right / w; - h = clientRectImageArea.bottom * clientRectScrollbox.bottom / h; + w = clientRectImageArea.right * clientRectCanvas.right / w; + h = clientRectImageArea.bottom * clientRectCanvas.bottom / h; x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)); y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)); @@ -54,7 +54,7 @@ LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (!IsWindow()) return 0; - UpdateScrollbox(NULL); + UpdateCanvas(NULL); return 0; } @@ -346,7 +346,7 @@ LRESULT CImgAreaWindow::OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CImgAreaWindow::OnImageModelDimensionsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - UpdateScrollbox(NULL); + UpdateCanvas(NULL); return 0; } diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 525a4634b95..75cc5862110 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -60,7 +60,7 @@ CMiniatureWindow miniature; CToolBox toolBoxContainer; CToolSettingsWindow toolSettingsWindow; CPaletteWindow paletteWindow; -CScrollboxWindow scrollboxWindow; +CCanvasWindow canvasWindow; CSelectionWindow selectionWindow; CImgAreaWindow imageArea; CSizeboxWindow sizeboxLeftTop; @@ -223,9 +223,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument RECT paletteWindowPos = {56, 9, 56 + 255, 9 + 32}; paletteWindow.Create(hwnd, paletteWindowPos, NULL, WS_CHILD | WS_VISIBLE); - /* creating the scroll box */ - RECT scrollboxWindowPos = {0, 0, 0 + 500, 0 + 500}; - scrollboxWindow.Create(hwnd, scrollboxWindowPos, NULL, + // creating the canvas + RECT canvasWindowPos = {0, 0, 0 + 500, 0 + 500}; + canvasWindow.Create(hwnd, canvasWindowPos, NULL, WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, WS_EX_CLIENTEDGE); /* creating the status bar */ @@ -236,9 +236,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument if (registrySettings.ShowStatusBar) ShowWindow(hStatusBar, SW_SHOWNOACTIVATE); - // Creating the window inside the scroll box + // Creating the window inside the canvas RECT imageAreaPos = {GRIP_SIZE, GRIP_SIZE, GRIP_SIZE + imageModel.GetWidth(), GRIP_SIZE + imageModel.GetHeight()}; - imageArea.Create(scrollboxWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); + imageArea.Create(canvasWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); /* create selection window (initially hidden) */ RECT selectionWindowPos = {350, 0, 350 + 100, 0 + 100}; @@ -308,14 +308,14 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* creating the size boxes */ RECT sizeboxPos = {0, 0, GRIP_SIZE, GRIP_SIZE}; - sizeboxLeftTop.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxCenterTop.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightTop.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxLeftCenter.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightCenter.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxLeftBottom.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxCenterBottom.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightBottom.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxLeftTop.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxCenterTop.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightTop.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxLeftCenter.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightCenter.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxLeftBottom.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxCenterBottom.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightBottom.Create(canvasWindow, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); /* placing the size boxes around the image */ imageArea.SendMessage(WM_SIZE, 0, 0); diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 25fd0329d36..7c1f23acebb 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -39,6 +39,7 @@ #define WM_SELECTIONMODELREFRESHNEEDED (WM_APP + 7) #include "resource.h" +#include "canvas.h" #include "drawing.h" #include "dib.h" #include "fullscreen.h" @@ -49,7 +50,6 @@ #include "palette.h" #include "palettemodel.h" #include "registry.h" -#include "scrollbox.h" #include "selection.h" #include "selectionmodel.h" #include "sizebox.h" diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index e6669e19e68..471853bad20 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -46,7 +46,7 @@ zoomTo(int newZoom, int mouseX, int mouseY) RECT clientRectScrollbox; RECT clientRectImageArea; int x, y, w, h; - scrollboxWindow.GetClientRect(&clientRectScrollbox); + canvasWindow.GetClientRect(&clientRectScrollbox); imageArea.GetClientRect(&clientRectImageArea); w = clientRectImageArea.right * newZoom / toolsModel.GetZoom(); h = clientRectImageArea.bottom * newZoom / toolsModel.GetZoom(); @@ -62,11 +62,11 @@ zoomTo(int newZoom, int mouseX, int mouseY) toolsModel.SetZoom(newZoom); imageArea.MoveWindow(GRIP_SIZE, GRIP_SIZE, Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()), FALSE); - scrollboxWindow.Invalidate(TRUE); + canvasWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE); - scrollboxWindow.SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); - scrollboxWindow.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); + canvasWindow.SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); + canvasWindow.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); return TRUE; } @@ -102,9 +102,9 @@ void CMainWindow::alignChildrenToMainWindow() rcSpace.top += CY_PALETTE; } - if (scrollboxWindow.IsWindow()) + if (canvasWindow.IsWindow()) { - hDWP = ::DeferWindowPos(hDWP, scrollboxWindow, NULL, + hDWP = ::DeferWindowPos(hDWP, canvasWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); @@ -216,9 +216,9 @@ LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& for (UINT i = 0; i < nCount; ++i) { if (zDelta < 0) - ::PostMessageW(scrollboxWindow, WM_HSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); + ::PostMessageW(canvasWindow, WM_HSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); else if (zDelta > 0) - ::PostMessageW(scrollboxWindow, WM_HSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); + ::PostMessageW(canvasWindow, WM_HSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); } } else @@ -227,9 +227,9 @@ LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& for (UINT i = 0; i < nCount; ++i) { if (zDelta < 0) - ::PostMessageW(scrollboxWindow, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); + ::PostMessageW(canvasWindow, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); else if (zDelta > 0) - ::PostMessageW(scrollboxWindow, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); + ::PostMessageW(canvasWindow, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); } } }

1 year, 9 months

[reactos] 01/01: [MSPAINT] Remove extra scrlClientWindow (#5162)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a88dcbd6c3b2d611fb915… commit a88dcbd6c3b2d611fb915025f990c7fc9104f354 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 17 07:28:42 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 17 07:28:42 2023 +0900 [MSPAINT] Remove extra scrlClientWindow (#5162) CORE-18867 --- base/applications/mspaint/globalvar.h | 1 - base/applications/mspaint/imgarea.cpp | 50 +------- base/applications/mspaint/main.cpp | 30 ++--- base/applications/mspaint/scrollbox.cpp | 219 ++++++++++++++------------------ base/applications/mspaint/scrollbox.h | 2 +- base/applications/mspaint/selection.cpp | 2 - 6 files changed, 110 insertions(+), 194 deletions(-) diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index de01287c4da..6ffcfa0ea50 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -74,7 +74,6 @@ extern CToolBox toolBoxContainer; extern CToolSettingsWindow toolSettingsWindow; extern CPaletteWindow paletteWindow; extern CScrollboxWindow scrollboxWindow; -extern CScrollboxWindow scrlClientWindow; extern CSelectionWindow selectionWindow; extern CImgAreaWindow imageArea; extern CSizeboxWindow sizeboxLeftTop; diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index c0a5f832251..5f646da7411 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -14,22 +14,6 @@ /* FUNCTIONS ********************************************************/ -void -updateCanvasAndScrollbars() -{ - selectionWindow.ShowWindow(SW_HIDE); - - int zoomedWidth = Zoomed(imageModel.GetWidth()); - int zoomedHeight = Zoomed(imageModel.GetHeight()); - imageArea.MoveWindow(GRIP_SIZE, GRIP_SIZE, zoomedWidth, zoomedHeight, FALSE); - - scrollboxWindow.Invalidate(TRUE); - imageArea.Invalidate(FALSE); - - scrollboxWindow.SetScrollPos(SB_HORZ, 0, TRUE); - scrollboxWindow.SetScrollPos(SB_VERT, 0, TRUE); -} - void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) { HDC hdc; @@ -68,37 +52,9 @@ void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (!IsWindow() || !sizeboxLeftTop.IsWindow()) + if (!IsWindow()) return 0; - int imgXRes = imageModel.GetWidth(); - int imgYRes = imageModel.GetHeight(); - sizeboxLeftTop.MoveWindow( - 0, - 0, GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxCenterTop.MoveWindow( - GRIP_SIZE + (Zoomed(imgXRes) - GRIP_SIZE) / 2, - 0, GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxRightTop.MoveWindow( - GRIP_SIZE + Zoomed(imgXRes), - 0, GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxLeftCenter.MoveWindow( - 0, - GRIP_SIZE + (Zoomed(imgYRes) - GRIP_SIZE) / 2, - GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxRightCenter.MoveWindow( - GRIP_SIZE + Zoomed(imgXRes), - GRIP_SIZE + (Zoomed(imgYRes) - GRIP_SIZE) / 2, - GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxLeftBottom.MoveWindow( - 0, - GRIP_SIZE + Zoomed(imgYRes), GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxCenterBottom.MoveWindow( - GRIP_SIZE + (Zoomed(imgXRes) - GRIP_SIZE) / 2, - GRIP_SIZE + Zoomed(imgYRes), GRIP_SIZE, GRIP_SIZE, TRUE); - sizeboxRightBottom.MoveWindow( - GRIP_SIZE + Zoomed(imgXRes), - GRIP_SIZE + Zoomed(imgYRes), GRIP_SIZE, GRIP_SIZE, TRUE); - UpdateScrollbox(); + UpdateScrollbox(NULL); return 0; } @@ -390,7 +346,7 @@ LRESULT CImgAreaWindow::OnMouseLeave(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CImgAreaWindow::OnImageModelDimensionsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - updateCanvasAndScrollbars(); + UpdateScrollbox(NULL); return 0; } diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 5ee34cd3240..525a4634b95 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -61,7 +61,6 @@ CToolBox toolBoxContainer; CToolSettingsWindow toolSettingsWindow; CPaletteWindow paletteWindow; CScrollboxWindow scrollboxWindow; -CScrollboxWindow scrlClientWindow; CSelectionWindow selectionWindow; CImgAreaWindow imageArea; CSizeboxWindow sizeboxLeftTop; @@ -225,7 +224,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument paletteWindow.Create(hwnd, paletteWindowPos, NULL, WS_CHILD | WS_VISIBLE); /* creating the scroll box */ - RECT scrollboxWindowPos = {56, 49, 56 + 472, 49 + 248}; + RECT scrollboxWindowPos = {0, 0, 0 + 500, 0 + 500}; scrollboxWindow.Create(hwnd, scrollboxWindowPos, NULL, WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, WS_EX_CLIENTEDGE); @@ -237,16 +236,13 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument if (registrySettings.ShowStatusBar) ShowWindow(hStatusBar, SW_SHOWNOACTIVATE); - RECT scrlClientWindowPos = {0, 0, 0 + 500, 0 + 500}; - scrlClientWindow.Create(scrollboxWindow.m_hWnd, scrlClientWindowPos, NULL, WS_CHILD | WS_VISIBLE); + // Creating the window inside the scroll box + RECT imageAreaPos = {GRIP_SIZE, GRIP_SIZE, GRIP_SIZE + imageModel.GetWidth(), GRIP_SIZE + imageModel.GetHeight()}; + imageArea.Create(scrollboxWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); /* create selection window (initially hidden) */ RECT selectionWindowPos = {350, 0, 350 + 100, 0 + 100}; - selectionWindow.Create(scrlClientWindow.m_hWnd, selectionWindowPos, NULL, WS_CHILD | BS_OWNERDRAW); - - /* creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn */ - RECT imageAreaPos = {GRIP_SIZE, GRIP_SIZE, GRIP_SIZE + imageModel.GetWidth(), GRIP_SIZE + imageModel.GetHeight()}; - imageArea.Create(scrlClientWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); + selectionWindow.Create(imageArea.m_hWnd, selectionWindowPos, NULL, WS_CHILD | BS_OWNERDRAW); if (__argc >= 2) { @@ -312,14 +308,14 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* creating the size boxes */ RECT sizeboxPos = {0, 0, GRIP_SIZE, GRIP_SIZE}; - sizeboxLeftTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxCenterTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxLeftCenter.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightCenter.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxLeftBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxCenterBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); - sizeboxRightBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxLeftTop.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxCenterTop.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightTop.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxLeftCenter.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightCenter.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxLeftBottom.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxCenterBottom.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); + sizeboxRightBottom.Create(scrollboxWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); /* placing the size boxes around the image */ imageArea.SendMessage(WM_SIZE, 0, 0); diff --git a/base/applications/mspaint/scrollbox.cpp b/base/applications/mspaint/scrollbox.cpp index c05dffd5ec9..2d36711dcc4 100644 --- a/base/applications/mspaint/scrollbox.cpp +++ b/base/applications/mspaint/scrollbox.cpp @@ -11,176 +11,143 @@ #include "precomp.h" #include <atltypes.h> -/* - * Scrollbar functional modes: - * 0 view < canvas - * 1 view < canvas + scroll width - * 2 view >= canvas + scroll width - * - * Matrix of scrollbar presence (VERTICAL,HORIZONTAL) given by - * vertical & horizontal scrollbar modes (view:canvas ratio): - * - * horizontal mode - * | 0 | 1 | 2 - * vertical ---+-------------+-------------+------------ - * mode 0 | TRUE,TRUE | TRUE,TRUE | TRUE,FALSE - * ---+-------------+-------------+------------ - * 1 | TRUE,TRUE | FALSE,FALSE | FALSE,FALSE - * ---+-------------+-------------+------------ - * 2 | FALSE,TRUE | FALSE,FALSE | FALSE,FALSE - */ - -struct ScrollbarPresence -{ - BOOL bVert; - BOOL bHoriz; -}; - -CONST ScrollbarPresence sp_mx[3][3] = -{ - { { TRUE,TRUE }, { TRUE,TRUE }, { TRUE,FALSE } }, - { { TRUE,TRUE }, { FALSE,FALSE }, { FALSE,FALSE } }, - { { FALSE,TRUE }, { FALSE,FALSE }, { FALSE,FALSE } } -}; - -CONST INT HSCROLL_WIDTH = ::GetSystemMetrics(SM_CYHSCROLL); -CONST INT VSCROLL_WIDTH = ::GetSystemMetrics(SM_CXVSCROLL); - - /* FUNCTIONS ********************************************************/ void -UpdateScrollbox() +UpdateScrollbox(HWND hwndFrom) { CRect tempRect; - CSize sizeImageArea; - CSize sizeScrollBox; - INT vmode, hmode; - SCROLLINFO si; + scrollboxWindow.GetClientRect(&tempRect); + CSize sizeScrollBox(tempRect.Width(), tempRect.Height()); - scrollboxWindow.GetWindowRect(&tempRect); - sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); - - if (imageArea.IsWindow()) - imageArea.GetClientRect(&tempRect); - sizeImageArea = CSize(tempRect.Width(), tempRect.Height()); - sizeImageArea += CSize(GRIP_SIZE * 2, GRIP_SIZE * 2); + CSize sizeZoomed = { Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()) }; + CSize sizeWhole = { sizeZoomed.cx + (GRIP_SIZE * 2), sizeZoomed.cy + (GRIP_SIZE * 2) }; /* show/hide the scrollbars */ - vmode = (sizeScrollBox.cy < sizeImageArea.cy ? 0 : - (sizeScrollBox.cy < sizeImageArea.cy + HSCROLL_WIDTH ? 1 : 2)); - hmode = (sizeScrollBox.cx < sizeImageArea.cx ? 0 : - (sizeScrollBox.cx < sizeImageArea.cx + VSCROLL_WIDTH ? 1 : 2)); - scrollboxWindow.ShowScrollBar(SB_VERT, sp_mx[vmode][hmode].bVert); - scrollboxWindow.ShowScrollBar(SB_HORZ, sp_mx[vmode][hmode].bHoriz); + scrollboxWindow.ShowScrollBar(SB_HORZ, sizeScrollBox.cx < sizeWhole.cx); + scrollboxWindow.ShowScrollBar(SB_VERT, sizeScrollBox.cy < sizeWhole.cy); - si.cbSize = sizeof(SCROLLINFO); - si.fMask = SIF_PAGE | SIF_RANGE; + if (sizeScrollBox.cx < sizeWhole.cx || sizeScrollBox.cy < sizeWhole.cy) + { + scrollboxWindow.GetClientRect(&tempRect); + sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); + } + + SCROLLINFO si = { sizeof(si), SIF_PAGE | SIF_RANGE }; si.nMin = 0; - si.nMax = sizeImageArea.cx + - (sp_mx[vmode][hmode].bVert == TRUE ? HSCROLL_WIDTH : 0); + si.nMax = sizeWhole.cx; si.nPage = sizeScrollBox.cx; scrollboxWindow.SetScrollInfo(SB_HORZ, &si); - si.nMax = sizeImageArea.cy + - (sp_mx[vmode][hmode].bHoriz == TRUE ? VSCROLL_WIDTH : 0); + si.nMax = sizeWhole.cy; si.nPage = sizeScrollBox.cy; scrollboxWindow.SetScrollInfo(SB_VERT, &si); - if (scrlClientWindow.IsWindow()) + INT dx = -scrollboxWindow.GetScrollPos(SB_HORZ); + INT dy = -scrollboxWindow.GetScrollPos(SB_VERT); + + if (sizeboxLeftTop.IsWindow()) { - scrlClientWindow.MoveWindow( - -scrollboxWindow.GetScrollPos(SB_HORZ), -scrollboxWindow.GetScrollPos(SB_VERT), - sizeImageArea.cx, sizeImageArea.cy, TRUE); + sizeboxLeftTop.MoveWindow(dx, dy, GRIP_SIZE, GRIP_SIZE, TRUE); + sizeboxCenterTop.MoveWindow(dx + GRIP_SIZE + (sizeZoomed.cx - GRIP_SIZE) / 2, + dy, + GRIP_SIZE, GRIP_SIZE, TRUE); + sizeboxRightTop.MoveWindow(dx + GRIP_SIZE + sizeZoomed.cx, + dy, + GRIP_SIZE, GRIP_SIZE, TRUE); + sizeboxLeftCenter.MoveWindow(dx, + dy + GRIP_SIZE + (sizeZoomed.cy - GRIP_SIZE) / 2, + GRIP_SIZE, GRIP_SIZE, TRUE); + sizeboxRightCenter.MoveWindow(dx + GRIP_SIZE + sizeZoomed.cx, + dy + GRIP_SIZE + (sizeZoomed.cy - GRIP_SIZE) / 2, + GRIP_SIZE, GRIP_SIZE, TRUE); + sizeboxLeftBottom.MoveWindow(dx, + dy + GRIP_SIZE + sizeZoomed.cy, + GRIP_SIZE, GRIP_SIZE, TRUE); + sizeboxCenterBottom.MoveWindow(dx + GRIP_SIZE + (sizeZoomed.cx - GRIP_SIZE) / 2, + dy + GRIP_SIZE + sizeZoomed.cy, + GRIP_SIZE, GRIP_SIZE, TRUE); + sizeboxRightBottom.MoveWindow(dx + GRIP_SIZE + sizeZoomed.cx, + dy + GRIP_SIZE + sizeZoomed.cy, + GRIP_SIZE, GRIP_SIZE, TRUE); } + + if (imageArea.IsWindow() && hwndFrom != imageArea.m_hWnd) + imageArea.MoveWindow(dx + GRIP_SIZE, dy + GRIP_SIZE, sizeZoomed.cx, sizeZoomed.cy, TRUE); } LRESULT CScrollboxWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd && m_hWnd == scrollboxWindow.m_hWnd) + if (m_hWnd) { - UpdateScrollbox(); + UpdateScrollbox(m_hWnd); } return 0; } LRESULT CScrollboxWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd == scrollboxWindow.m_hWnd) + SCROLLINFO si; + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_ALL; + GetScrollInfo(SB_HORZ, &si); + switch (LOWORD(wParam)) { - SCROLLINFO si; - si.cbSize = sizeof(SCROLLINFO); - si.fMask = SIF_ALL; - scrollboxWindow.GetScrollInfo(SB_HORZ, &si); - switch (LOWORD(wParam)) - { - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); - break; - case SB_LINELEFT: - si.nPos -= 5; - break; - case SB_LINERIGHT: - si.nPos += 5; - break; - case SB_PAGELEFT: - si.nPos -= si.nPage; - break; - case SB_PAGERIGHT: - si.nPos += si.nPage; - break; - } - scrollboxWindow.SetScrollInfo(SB_HORZ, &si); - scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), - Zoomed(imageModel.GetWidth()) + 2 * GRIP_SIZE, - Zoomed(imageModel.GetHeight()) + 2 * GRIP_SIZE, TRUE); + case SB_THUMBTRACK: + case SB_THUMBPOSITION: + si.nPos = HIWORD(wParam); + break; + case SB_LINELEFT: + si.nPos -= 5; + break; + case SB_LINERIGHT: + si.nPos += 5; + break; + case SB_PAGELEFT: + si.nPos -= si.nPage; + break; + case SB_PAGERIGHT: + si.nPos += si.nPage; + break; } + SetScrollInfo(SB_HORZ, &si); + UpdateScrollbox(m_hWnd); return 0; } LRESULT CScrollboxWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd == scrollboxWindow.m_hWnd) + SCROLLINFO si; + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_ALL; + GetScrollInfo(SB_VERT, &si); + switch (LOWORD(wParam)) { - SCROLLINFO si; - si.cbSize = sizeof(SCROLLINFO); - si.fMask = SIF_ALL; - scrollboxWindow.GetScrollInfo(SB_VERT, &si); - switch (LOWORD(wParam)) - { - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); - break; - case SB_LINEUP: - si.nPos -= 5; - break; - case SB_LINEDOWN: - si.nPos += 5; - break; - case SB_PAGEUP: - si.nPos -= si.nPage; - break; - case SB_PAGEDOWN: - si.nPos += si.nPage; - break; - } - scrollboxWindow.SetScrollInfo(SB_VERT, &si); - scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), - Zoomed(imageModel.GetWidth()) + 2 * GRIP_SIZE, - Zoomed(imageModel.GetHeight()) + 2 * GRIP_SIZE, TRUE); + case SB_THUMBTRACK: + case SB_THUMBPOSITION: + si.nPos = HIWORD(wParam); + break; + case SB_LINEUP: + si.nPos -= 5; + break; + case SB_LINEDOWN: + si.nPos += 5; + break; + case SB_PAGEUP: + si.nPos -= si.nPage; + break; + case SB_PAGEDOWN: + si.nPos += si.nPage; + break; } + SetScrollInfo(SB_VERT, &si); + UpdateScrollbox(m_hWnd); return 0; } LRESULT CScrollboxWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - selectionWindow.ShowWindow(SW_HIDE); - switch (toolsModel.GetActiveTool()) { case TOOL_BEZIER: diff --git a/base/applications/mspaint/scrollbox.h b/base/applications/mspaint/scrollbox.h index e2fa3461847..56822089bf6 100644 --- a/base/applications/mspaint/scrollbox.h +++ b/base/applications/mspaint/scrollbox.h @@ -28,4 +28,4 @@ public: LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; -void UpdateScrollbox(); +void UpdateScrollbox(HWND hwndFrom); diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 3a87a21f19d..64d01538216 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -107,8 +107,6 @@ LRESULT CSelectionWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, if (m_iAction != ACTION_MOVE) SetCursor(LoadCursor(NULL, m_lpszCursorLUT[m_iAction])); m_bMoving = TRUE; - scrlClientWindow.InvalidateRect(NULL, TRUE); - scrlClientWindow.SendMessage(WM_PAINT, 0, 0); imageArea.InvalidateRect(NULL, FALSE); imageArea.SendMessage(WM_PAINT, 0, 0); m_rgbBack = paletteModel.GetBgColor();

1 year, 9 months

[reactos] 01/01: [MSPAINT] Refactor about Recent Files (#5163)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41c30182d4638d270b493… commit 41c30182d4638d270b493dee631946aaec5d8b51 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 17 07:28:01 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 17 07:28:01 2023 +0900 [MSPAINT] Refactor about Recent Files (#5163) Define MAX_RECENT_FILES macro as 4. Remove strFile1, ..., strFile4 settings and add strFiles[MAX_RECENT_FILES] for Most Recently Used (MRU) files. CORE-18867 --- base/applications/mspaint/registry.cpp | 71 ++++++++++------------- base/applications/mspaint/registry.h | 7 +-- base/applications/mspaint/winproc.cpp | 103 +++++++++++++++++---------------- base/applications/mspaint/winproc.h | 2 + 4 files changed, 88 insertions(+), 95 deletions(-) diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index c027fcac0e7..46119989429 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -115,10 +115,12 @@ void RegistrySettings::Load(INT nCmdShow) CRegKey files; if (files.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Recent File List"), KEY_READ) == ERROR_SUCCESS) { - ReadString(files, _T("File1"), strFile1); - ReadString(files, _T("File2"), strFile2); - ReadString(files, _T("File3"), strFile3); - ReadString(files, _T("File4"), strFile4); + TCHAR szName[64]; + for (INT i = 0; i < MAX_RECENT_FILES; ++i) + { + wsprintf(szName, _T("File%u"), i + 1); + ReadString(files, szName, strFiles[i]); + } } CRegKey text; @@ -167,14 +169,12 @@ void RegistrySettings::Store() CRegKey files; if (files.Create(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\Recent File List")) == ERROR_SUCCESS) { - if (!strFile1.IsEmpty()) - files.SetStringValue(_T("File1"), strFile1); - if (!strFile2.IsEmpty()) - files.SetStringValue(_T("File2"), strFile2); - if (!strFile3.IsEmpty()) - files.SetStringValue(_T("File3"), strFile3); - if (!strFile4.IsEmpty()) - files.SetStringValue(_T("File4"), strFile4); + TCHAR szName[64]; + for (INT iFile = 0; iFile < MAX_RECENT_FILES; ++iFile) + { + wsprintf(szName, _T("File%u"), iFile + 1); + files.SetStringValue(szName, strFiles[iFile]); + } } CRegKey text; @@ -194,39 +194,30 @@ void RegistrySettings::Store() void RegistrySettings::SetMostRecentFile(LPCTSTR szPathName) { + // Register the file to the user's 'Recent' folder if (szPathName && szPathName[0]) SHAddToRecentDocs(SHARD_PATHW, szPathName); - if (strFile1 == szPathName) + // If szPathName is present in strFiles, move it to the top of the list + for (INT i = MAX_RECENT_FILES - 1, iFound = -1; i > 0; --i) { - // do nothing + if (iFound < 0 && strFiles[i].CompareNoCase(szPathName) == 0) + iFound = i; + + if (iFound >= 0) + { + CString tmp = strFiles[i]; + strFiles[i] = strFiles[i - 1]; + strFiles[i - 1] = tmp; + } } - else if (strFile2 == szPathName) - { - CString strTemp = strFile2; - strFile2 = strFile1; - strFile1 = strTemp; - } - else if (strFile3 == szPathName) - { - CString strTemp = strFile3; - strFile3 = strFile2; - strFile2 = strFile1; - strFile1 = strTemp; - } - else if (strFile4 == szPathName) - { - CString strTemp = strFile4; - strFile4 = strFile3; - strFile3 = strFile2; - strFile2 = strFile1; - strFile1 = strTemp; - } - else + + // If szPathName is not the first item in strFiles, insert it at the top of the list + if (strFiles[0].CompareNoCase(szPathName) != 0) { - strFile4 = strFile3; - strFile3 = strFile2; - strFile2 = strFile1; - strFile1 = szPathName; + for (INT i = MAX_RECENT_FILES - 1; i > 0; --i) + strFiles[i] = strFiles[i - 1]; + + strFiles[0] = szPathName; } } diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index e7b4cc644ee..b891d523c23 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -8,6 +8,8 @@ #pragma once +#define MAX_RECENT_FILES 4 + class RegistrySettings { private: @@ -27,10 +29,7 @@ public: DWORD UnitSetting; WINDOWPLACEMENT WindowPlacement; - CString strFile1; - CString strFile2; - CString strFile3; - CString strFile4; + CString strFiles[MAX_RECENT_FILES]; CString strFontName; DWORD PointSize; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index ac96bb2cfcd..e6669e19e68 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -10,6 +10,7 @@ */ #include "precomp.h" +#include <assert.h> typedef HWND (WINAPI *FN_HtmlHelpW)(HWND, LPCWSTR, UINT, DWORD_PTR); @@ -310,53 +311,63 @@ LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan return 0; } +void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) +{ + LPCTSTR dotext = PathFindExtensionW(filepathname); + BOOL isBMP = FALSE; + if (_tcsicmp(dotext, _T(".bmp")) == 0 || + _tcsicmp(dotext, _T(".dib")) == 0 || + _tcsicmp(dotext, _T(".rle")) == 0) + { + isBMP = TRUE; + } + + EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERPLANE, ENABLED_IF(isAFile && isBMP)); + EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERCENTERED, ENABLED_IF(isAFile && isBMP)); + EnableMenuItem(hPopupMenu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile && isBMP)); + + for (INT iItem = 0; iItem < MAX_RECENT_FILES; ++iItem) + RemoveMenu(hPopupMenu, IDM_FILE1 + iItem, MF_BYCOMMAND); + + if (registrySettings.strFiles[0].IsEmpty()) + return; + + RemoveMenu(hPopupMenu, IDM_FILEMOSTRECENTLYUSEDFILE, MF_BYCOMMAND); + + INT cMenuItems = GetMenuItemCount(hPopupMenu); + + for (INT iItem = 0; iItem < MAX_RECENT_FILES; ++iItem) + { + CString& strFile = registrySettings.strFiles[iItem]; + if (strFile.IsEmpty()) + break; + + // Condense the lengthy pathname by using '...' +#define MAX_RECENT_PATHNAME_DISPLAY 30 + CPath pathFile(strFile); + pathFile.CompactPathEx(MAX_RECENT_PATHNAME_DISPLAY); + assert(_tcslen((LPCTSTR)pathFile) <= MAX_RECENT_PATHNAME_DISPLAY); + + // Add an accelerator (by '&') to the item number for quick access + TCHAR szText[4 + MAX_RECENT_PATHNAME_DISPLAY + 1]; + wsprintf(szText, _T("&%u %s"), iItem + 1, (LPCTSTR)pathFile); + + INT iMenuItem = (cMenuItems - 2) + iItem; + InsertMenu(hPopupMenu, iMenuItem, MF_BYPOSITION | MF_STRING, IDM_FILE1 + iItem, szText); + } +} + LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HMENU menu = GetMenu(); BOOL trueSelection = (::IsWindowVisible(selectionWindow) && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); - BOOL isBMP; + switch (lParam) { case 0: /* File menu */ - if ((HMENU)wParam != GetSubMenu(menu, 0)) - break; - - isBMP = _wcsicmp(PathFindExtensionW(filepathname), L".bmp") == 0; - EnableMenuItem(menu, IDM_FILEASWALLPAPERPLANE, ENABLED_IF(isAFile && isBMP)); - EnableMenuItem(menu, IDM_FILEASWALLPAPERCENTERED, ENABLED_IF(isAFile && isBMP)); - EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile && isBMP)); - - RemoveMenu(menu, IDM_FILE1, MF_BYCOMMAND); - RemoveMenu(menu, IDM_FILE2, MF_BYCOMMAND); - RemoveMenu(menu, IDM_FILE3, MF_BYCOMMAND); - RemoveMenu(menu, IDM_FILE4, MF_BYCOMMAND); - if (!registrySettings.strFile1.IsEmpty()) - { - RemoveMenu(menu, IDM_FILEMOSTRECENTLYUSEDFILE, MF_BYCOMMAND); - CPath pathFile1(registrySettings.strFile1); - pathFile1.CompactPathEx(30); - if (!registrySettings.strFile2.IsEmpty()) - { - CPath pathFile2(registrySettings.strFile2); - pathFile2.CompactPathEx(30); - if (!registrySettings.strFile3.IsEmpty()) - { - CPath pathFile3(registrySettings.strFile3); - pathFile3.CompactPathEx(30); - if (!registrySettings.strFile4.IsEmpty()) - { - CPath pathFile4(registrySettings.strFile4); - pathFile4.CompactPathEx(30); - InsertMenu((HMENU)wParam, 17, MF_BYPOSITION | MF_STRING, IDM_FILE4, _T("4 ") + pathFile4); - } - InsertMenu((HMENU)wParam, 17, MF_BYPOSITION | MF_STRING, IDM_FILE3, _T("3 ") + pathFile3); - } - InsertMenu((HMENU)wParam, 17, MF_BYPOSITION | MF_STRING, IDM_FILE2, _T("2 ") + pathFile2); - } - InsertMenu((HMENU)wParam, 17, MF_BYPOSITION | MF_STRING, IDM_FILE1, _T("1 ") + pathFile1); - } + ProcessFileMenu((HMENU)wParam); break; case 1: /* Edit menu */ EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(imageModel.HasUndoSteps())); @@ -545,23 +556,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH RegistrySettings::SetWallpaper(filepathname, RegistrySettings::STRETCHED); break; case IDM_FILE1: - { - ConfirmSave() && DoLoadImageFile(m_hWnd, registrySettings.strFile1, TRUE); - break; - } case IDM_FILE2: - { - ConfirmSave() && DoLoadImageFile(m_hWnd, registrySettings.strFile2, TRUE); - break; - } case IDM_FILE3: - { - ConfirmSave() && DoLoadImageFile(m_hWnd, registrySettings.strFile3, TRUE); - break; - } case IDM_FILE4: { - ConfirmSave() && DoLoadImageFile(m_hWnd, registrySettings.strFile4, TRUE); + INT iFile = LOWORD(wParam) - IDM_FILE1; + if (ConfirmSave()) + DoLoadImageFile(m_hWnd, registrySettings.strFiles[iFile], TRUE); break; } case IDM_EDITUNDO: diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index 749277560a3..71db5e7950d 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -28,6 +28,7 @@ public: MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) END_MSG_MAP() +private: LRESULT OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -44,4 +45,5 @@ public: void saveImage(BOOL overwrite); void InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window); BOOL ConfirmSave(); + void ProcessFileMenu(HMENU hPopupMenu); };

1 year, 9 months

[reactos] 01/01: [MSPAINT] Restore the main window saved show state (#5158)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a81f229065be314c5171e… commit a81f229065be314c5171e8107f42ca140c5d31d8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 17 07:26:44 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 17 07:26:44 2023 +0900 [MSPAINT] Restore the main window saved show state (#5158) Our mspaint didn't remember the maximized status of the main window. CORE-18867 --- base/applications/mspaint/main.cpp | 11 ++++------- base/applications/mspaint/registry.cpp | 11 ++++++++--- base/applications/mspaint/registry.h | 4 ++-- base/applications/mspaint/winproc.cpp | 1 + 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 598064d19d1..5ee34cd3240 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -137,7 +137,7 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* entry point */ int WINAPI -_tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument, int nFunsterStil) +_tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument, INT nCmdShow) { HWND hwnd; /* This is the handle for our window */ MSG messages; /* Here messages to the application are saved */ @@ -176,12 +176,12 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, _countof(miniaturetitle)); /* load settings from registry */ - registrySettings.Load(); + registrySettings.Load(nCmdShow); showMiniature = registrySettings.ShowThumbnail; imageModel.Crop(registrySettings.BMPWidth, registrySettings.BMPHeight); /* create main window */ - RECT mainWindowPos = {0, 0, 544, 375}; // FIXME: use equivalent of CW_USEDEFAULT for position + RECT mainWindowPos = registrySettings.WindowPlacement.rcNormalPosition; hwnd = mainWindow.Create(HWND_DESKTOP, mainWindowPos, strTitle, WS_OVERLAPPEDWINDOW); RECT fullscreenWindowPos = {0, 0, 100, 100}; @@ -323,11 +323,8 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* placing the size boxes around the image */ imageArea.SendMessage(WM_SIZE, 0, 0); - /* by moving the window, the things in WM_SIZE are done */ - mainWindow.SetWindowPlacement(&(registrySettings.WindowPlacement)); - /* Make the window visible on the screen */ - ShowWindow (hwnd, nFunsterStil); + ShowWindow(hwnd, registrySettings.WindowPlacement.showCmd); /* inform the system, that the main window accepts dropped files */ DragAcceptFiles(hwnd, TRUE); diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index 1702c8d2c01..c027fcac0e7 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -53,7 +53,7 @@ void RegistrySettings::SetWallpaper(LPCTSTR szFileName, RegistrySettings::Wallpa SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) szFileName, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); } -void RegistrySettings::LoadPresets() +void RegistrySettings::LoadPresets(INT nCmdShow) { BMPHeight = GetSystemMetrics(SM_CYSCREEN) / 2; BMPWidth = GetSystemMetrics(SM_CXSCREEN) / 2; @@ -81,11 +81,16 @@ void RegistrySettings::LoadPresets() strFontName = lf.lfFaceName; ZeroMemory(&WindowPlacement, sizeof(WindowPlacement)); + RECT& rc = WindowPlacement.rcNormalPosition; + rc.left = rc.top = CW_USEDEFAULT; + rc.right = rc.left + 544; + rc.bottom = rc.top + 375; + WindowPlacement.showCmd = nCmdShow; } -void RegistrySettings::Load() +void RegistrySettings::Load(INT nCmdShow) { - LoadPresets(); + LoadPresets(nCmdShow); CRegKey view; if (view.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint\\View"), KEY_READ) == ERROR_SUCCESS) diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index be90c104d9c..e7b4cc644ee 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -11,7 +11,7 @@ class RegistrySettings { private: - void LoadPresets(); + void LoadPresets(INT nCmdShow); public: DWORD BMPHeight; @@ -51,7 +51,7 @@ public: static void SetWallpaper(LPCTSTR szFileName, WallpaperStyle style); - void Load(); + void Load(INT nCmdShow); void Store(); void SetMostRecentFile(LPCTSTR szPathName); }; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 5cb8cccf379..ac96bb2cfcd 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -258,6 +258,7 @@ LRESULT CMainWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa LRESULT CMainWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + registrySettings.WindowPlacement.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(&(registrySettings.WindowPlacement)); DoHtmlHelpW(NULL, NULL, HH_CLOSE_ALL, 0);

1 year, 9 months

[reactos] 01/01: [MSPAINT] Unlink HHCTRL.OCX and use dynamic load (#5165)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88733bca7733cec096b6b… commit 88733bca7733cec096b6bd6d0fe09e6628c56057 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 17 07:25:51 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 17 07:25:51 2023 +0900 [MSPAINT] Unlink HHCTRL.OCX and use dynamic load (#5165) Unlink HHCTRL.OCX by modifying CMakeLists.txt. Add DoHtmlHelpW helper function. CORE-18879, CORE-18867 --- base/applications/mspaint/CMakeLists.txt | 2 +- base/applications/mspaint/winproc.cpp | 40 +++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index 99215c5295b..b4613246f45 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -36,6 +36,6 @@ add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) target_link_libraries(mspaint uuid cpprt atl_classes) set_target_cpp_properties(mspaint WITH_EXCEPTIONS) -add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi ntdll) +add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi ntdll) add_pch(mspaint precomp.h SOURCE) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 77d74061aa8..5cb8cccf379 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -9,12 +9,36 @@ * Stanislav Motylkov */ -/* INCLUDES *********************************************************/ - #include "precomp.h" +typedef HWND (WINAPI *FN_HtmlHelpW)(HWND, LPCWSTR, UINT, DWORD_PTR); + +static HINSTANCE s_hHHCTRL_OCX = NULL; // HtmlHelpW needs "hhctrl.ocx" +static FN_HtmlHelpW s_pHtmlHelpW = NULL; + /* FUNCTIONS ********************************************************/ +// A wrapper function for HtmlHelpW +static HWND DoHtmlHelpW(HWND hwndCaller, LPCWSTR pszFile, UINT uCommand, DWORD_PTR dwData) +{ + WCHAR szPath[MAX_PATH]; + + if (!s_hHHCTRL_OCX && (uCommand != HH_CLOSE_ALL)) + { + // The function loads the system library, not local + GetSystemDirectoryW(szPath, _countof(szPath)); + wcscat(szPath, L"\\hhctrl.ocx"); + s_hHHCTRL_OCX = LoadLibraryW(szPath); + if (s_hHHCTRL_OCX) + s_pHtmlHelpW = (FN_HtmlHelpW)GetProcAddress(s_hHHCTRL_OCX, "HtmlHelpW"); + } + + if (!s_pHtmlHelpW) + return NULL; + + return s_pHtmlHelpW(hwndCaller, pszFile, uCommand, dwData); +} + BOOL zoomTo(int newZoom, int mouseX, int mouseY) { @@ -235,6 +259,16 @@ LRESULT CMainWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa LRESULT CMainWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { GetWindowPlacement(&(registrySettings.WindowPlacement)); + + DoHtmlHelpW(NULL, NULL, HH_CLOSE_ALL, 0); + + if (s_hHHCTRL_OCX) + { + FreeLibrary(s_hHHCTRL_OCX); + s_hHHCTRL_OCX = NULL; + s_pHtmlHelpW = NULL; + } + PostQuitMessage(0); /* send a WM_QUIT to the message queue */ return 0; } @@ -445,7 +479,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } case IDM_HELPHELPTOPICS: - HtmlHelp(m_hWnd, _T("help\\Paint.chm"), 0, 0); + DoHtmlHelpW(m_hWnd, L"%SystemRoot%\\Help\\mspaint.chm", HH_DISPLAY_TOPIC, 0); break; case IDM_FILEEXIT: SendMessage(WM_CLOSE, wParam, lParam);

1 year, 9 months

[reactos] 01/01: [NTDLL_APITEST] Write some tests for NtQueryOpenSubKeys

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb7550f76730105582625… commit eb7550f76730105582625e84210a376cf676c112 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Mar 15 19:52:29 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Mar 16 20:04:31 2023 +0100 [NTDLL_APITEST] Write some tests for NtQueryOpenSubKeys --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../rostests/apitests/ntdll/NtQueryOpenSubKeys.c | 101 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 104 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 2e38c4ec7b5..ed7cf1ff86f 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -37,6 +37,7 @@ list(APPEND SOURCE NtQueryInformationThread.c NtQueryInformationToken.c NtQueryKey.c + NtQueryOpenSubKeys.c NtQuerySystemEnvironmentValue.c NtQuerySystemInformation.c NtQueryValueKey.c diff --git a/modules/rostests/apitests/ntdll/NtQueryOpenSubKeys.c b/modules/rostests/apitests/ntdll/NtQueryOpenSubKeys.c new file mode 100644 index 00000000000..3f3aa6dfbc6 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtQueryOpenSubKeys.c @@ -0,0 +1,101 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtQueryOpenSubKeys API + * COPYRIGHT: Copyright 2023 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +START_TEST(NtQueryOpenSubKeys) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG Subkeys; + UNICODE_STRING RegistryKey = RTL_CONSTANT_STRING(L"\\Registry"); + UNICODE_STRING SystemKey = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM"); + UNICODE_STRING SoftwareKey = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SOFTWARE"); + UNICODE_STRING DefaultUserKey = RTL_CONSTANT_STRING(L"\\Registry\\User\\.DEFAULT"); + + /* We give no object attributes and no return variable */ + Status = NtQueryOpenSubKeys(NULL, NULL); + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); + + /* Build a key path to the main registry tree */ + InitializeObjectAttributes(&ObjectAttributes, + &RegistryKey, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* We give object attributes but no return variable */ + Status = NtQueryOpenSubKeys(&ObjectAttributes, NULL); + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); + + /* + * We give no object attributes but return variable. + * + * NOTE: Windows 10 and Server 2003 return different kinds of status + * codes. In Server 2003 it returns STATUS_ACCESS_VIOLATION because + * this function implements more probe checks against the object + * attributes parameter (namely the path name of the object) so it + * fails earlier. In Windows 10 instead the function only probes the + * memory address of the object attributes so that it resides in the boundary + * of the UM memory range so the function lets this NULL parameter + * slide through until ObOpenObjectByName hits this parameter as being + * NULL and returns STATUS_INVALID_PARAMETER. Currently ReactOS follows + * the behavior of Windows 10. + */ + Status = NtQueryOpenSubKeys(NULL, &Subkeys); + ok(Status == STATUS_ACCESS_VIOLATION || Status == STATUS_INVALID_PARAMETER, + "STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER expected, got 0x%lx\n", Status); + + /* Garbage return variable, this function doesn't check for alignment */ + Status = NtQueryOpenSubKeys(&ObjectAttributes, (PVOID)1); + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); + + /* Return the open subkeys of this key now */ + Status = NtQueryOpenSubKeys(&ObjectAttributes, &Subkeys); + ok_ntstatus(Status, STATUS_SUCCESS); + + trace("\\Registry has %lu opened subkeys\n", Subkeys); + + /* Build a key path to the SYSTEM key */ + InitializeObjectAttributes(&ObjectAttributes, + &SystemKey, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Return the open subkeys of this key now */ + Status = NtQueryOpenSubKeys(&ObjectAttributes, &Subkeys); + ok_ntstatus(Status, STATUS_SUCCESS); + + trace("\\Registry\\Machine\\SYSTEM has %lu opened subkeys\n", Subkeys); + + /* Build a key path to the SYSTEM key */ + InitializeObjectAttributes(&ObjectAttributes, + &SoftwareKey, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Return the open subkeys of this key now */ + Status = NtQueryOpenSubKeys(&ObjectAttributes, &Subkeys); + ok_ntstatus(Status, STATUS_SUCCESS); + + trace("\\Registry\\Machine\\SOFTWARE has %lu opened subkeys\n", Subkeys); + + /* Build a key path to the default user key */ + InitializeObjectAttributes(&ObjectAttributes, + &DefaultUserKey, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Return the open subkeys of this key now */ + Status = NtQueryOpenSubKeys(&ObjectAttributes, &Subkeys); + ok_ntstatus(Status, STATUS_SUCCESS); + + trace("\\Registry\\User\\.DEFAULT has %lu opened subkeys\n", Subkeys); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 29b3ae4ba21..03857e1852a 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -33,6 +33,7 @@ extern void func_NtQueryInformationProcess(void); extern void func_NtQueryInformationThread(void); extern void func_NtQueryInformationToken(void); extern void func_NtQueryKey(void); +extern void func_NtQueryOpenSubKeys(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtQuerySystemInformation(void); extern void func_NtQueryValueKey(void); @@ -125,6 +126,7 @@ const struct test winetest_testlist[] = { "NtQueryInformationThread", func_NtQueryInformationThread }, { "NtQueryInformationToken", func_NtQueryInformationToken }, { "NtQueryKey", func_NtQueryKey }, + { "NtQueryOpenSubKeys", func_NtQueryOpenSubKeys }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtQuerySystemInformation", func_NtQuerySystemInformation }, { "NtQueryValueKey", func_NtQueryValueKey },

1 year, 9 months

[reactos] 01/01: [MSPAINT] Delete needless CMainWindow::OnSetCursor

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0cf45d508c7b5256414c9… commit 0cf45d508c7b5256414c98af07ad54de434e1177 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 16 18:13:28 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 16 18:13:28 2023 +0900 [MSPAINT] Delete needless CMainWindow::OnSetCursor CORE-18867 --- base/applications/mspaint/winproc.cpp | 7 ------- base/applications/mspaint/winproc.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 366e711ed06..77d74061aa8 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -384,13 +384,6 @@ LRESULT CMainWindow::OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BO return 0; } -LRESULT CMainWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - SetCursor(LoadCursor(NULL, IDC_ARROW)); - bHandled = FALSE; - return 0; -} - LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (wParam == VK_ESCAPE) diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index f98cd9eda11..749277560a3 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -22,7 +22,6 @@ public: MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_GETMINMAXINFO, OnGetMinMaxInfo) - MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) MESSAGE_HANDLER(WM_COMMAND, OnCommand) @@ -36,7 +35,6 @@ public: LRESULT OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

1 year, 9 months

[reactos] 01/01: [MSPAINT] Delete useless CFullscreenWindow::OnSetCursor

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5ae55f3ff753cb76fc50… commit b5ae55f3ff753cb76fc50fb22db276938d51e688 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 16 17:56:05 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 16 17:56:05 2023 +0900 [MSPAINT] Delete useless CFullscreenWindow::OnSetCursor CORE-18867 --- base/applications/mspaint/fullscreen.cpp | 7 ------- base/applications/mspaint/fullscreen.h | 2 -- base/applications/mspaint/toolbox.h | 1 - 3 files changed, 10 deletions(-) diff --git a/base/applications/mspaint/fullscreen.cpp b/base/applications/mspaint/fullscreen.cpp index a20df99a8a2..4ea04090e92 100644 --- a/base/applications/mspaint/fullscreen.cpp +++ b/base/applications/mspaint/fullscreen.cpp @@ -47,13 +47,6 @@ LRESULT CFullscreenWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& return 0; } -LRESULT CFullscreenWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - SetCursor(LoadCursor(NULL, IDC_ARROW)); - bHandled = FALSE; - return 0; -} - LRESULT CFullscreenWindow::OnGetText(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { // return caption of the main window, instead diff --git a/base/applications/mspaint/fullscreen.h b/base/applications/mspaint/fullscreen.h index 2a41d099786..64f3ce05fad 100644 --- a/base/applications/mspaint/fullscreen.h +++ b/base/applications/mspaint/fullscreen.h @@ -20,7 +20,6 @@ public: MESSAGE_HANDLER(WM_LBUTTONDOWN, OnCloseOrKeyDownOrLButtonDown) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_GETTEXT, OnGetText) END_MSG_MAP() @@ -28,6 +27,5 @@ public: LRESULT OnCloseOrKeyDownOrLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnGetText(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index bce32048193..ac40ab19e5a 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -30,7 +30,6 @@ public: CWindow toolbar; LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

1 year, 9 months

[reactos] 01/01: [MSPAINT] Delete needless CMiniatureWindow::OnSetCursor

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b369ec3fa1d2176b700db… commit b369ec3fa1d2176b700db965bd5661c9f1d987c1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 16 17:49:05 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 16 17:49:05 2023 +0900 [MSPAINT] Delete needless CMiniatureWindow::OnSetCursor CORE-18867 --- base/applications/mspaint/miniature.cpp | 7 ------- base/applications/mspaint/miniature.h | 1 - 2 files changed, 8 deletions(-) diff --git a/base/applications/mspaint/miniature.cpp b/base/applications/mspaint/miniature.cpp index 160ed0ae98e..6df83aee49a 100644 --- a/base/applications/mspaint/miniature.cpp +++ b/base/applications/mspaint/miniature.cpp @@ -31,10 +31,3 @@ LRESULT CMiniatureWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& miniature.ReleaseDC(hdc); return 0; } - -LRESULT CMiniatureWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - SetCursor(LoadCursor(NULL, IDC_ARROW)); - bHandled = FALSE; - return 0; -} diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index ce79455a232..57fe9559481 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -17,7 +17,6 @@ public: BEGIN_MSG_MAP(CMiniatureWindow) MESSAGE_HANDLER(WM_CLOSE, OnClose) MESSAGE_HANDLER(WM_PAINT, OnPaint) - MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) END_MSG_MAP() LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

1 year, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2023