Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSPAINT] mouse.cpp: Use override keywords
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d9b7f77adbc9c79ec256… commit 6d9b7f77adbc9c79ec256f65e725068424c3ea03 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 16:01:10 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 16:01:10 2023 +0900 [MSPAINT] mouse.cpp: Use override keywords CORE-18867 --- base/applications/mspaint/mouse.cpp | 80 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 23bfa69043c..bd7d23c139c 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -108,7 +108,7 @@ struct FreeSelTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { selectionModel.Landing(); if (bLeftButton) @@ -122,7 +122,7 @@ struct FreeSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -134,7 +134,7 @@ struct FreeSelTool : ToolBase } } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -155,7 +155,7 @@ struct FreeSelTool : ToolBase } } - void OnFinishDraw() + void OnFinishDraw() override { if (m_bLeftButton) canvasWindow.Invalidate(FALSE); @@ -164,7 +164,7 @@ struct FreeSelTool : ToolBase ToolBase::OnFinishDraw(); } - void OnCancelDraw() + void OnCancelDraw() override { if (m_bLeftButton) imageModel.Undo(TRUE); @@ -182,7 +182,7 @@ struct RectSelTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { selectionModel.Landing(); if (bLeftButton) @@ -194,7 +194,7 @@ struct RectSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -206,7 +206,7 @@ struct RectSelTool : ToolBase } } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -218,7 +218,7 @@ struct RectSelTool : ToolBase } } - void OnFinishDraw() + void OnFinishDraw() override { if (m_bLeftButton) canvasWindow.Invalidate(FALSE); @@ -227,7 +227,7 @@ struct RectSelTool : ToolBase ToolBase::OnFinishDraw(); } - void OnCancelDraw() + void OnCancelDraw() override { if (m_bLeftButton) imageModel.Undo(TRUE); @@ -244,23 +244,23 @@ struct GenericDrawTool : ToolBase virtual void draw(BOOL bLeftButton, LONG x, LONG y) = 0; - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { imageModel.PushImageForUndo(); draw(bLeftButton, x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { draw(bLeftButton, x, y); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { draw(bLeftButton, x, y); } - void OnCancelDraw() + void OnCancelDraw() override { OnButtonUp(FALSE, 0, 0); imageModel.Undo(TRUE); @@ -275,7 +275,7 @@ struct RubberTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) Erase(m_hdc, last.x, last.y, x, y, m_bg, toolsModel.GetRubberRadius()); @@ -291,7 +291,7 @@ struct FillTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { imageModel.PushImageForUndo(); Fill(m_hdc, x, y, bLeftButton ? m_fg : m_bg); @@ -320,12 +320,12 @@ struct ColorTool : ToolBase paletteModel.SetBgColor(rgbColor); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { fetchColor(bLeftButton, x, y); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); @@ -339,7 +339,7 @@ struct ZoomTool : ToolBase { } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { imageModel.PushImageForUndo(); if (bLeftButton) @@ -362,7 +362,7 @@ struct PenTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; Line(m_hdc, last.x, last.y, x, y, rgb, 1); @@ -377,7 +377,7 @@ struct BrushTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; Brush(m_hdc, last.x, last.y, x, y, rgb, toolsModel.GetBrushStyle()); @@ -391,7 +391,7 @@ struct AirBrushTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); @@ -414,7 +414,7 @@ struct TextTool : ToolBase RectSel(m_hdc, start.x, start.y, pt.x, pt.y); } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { if (!textEditWindow.IsWindow()) textEditWindow.Create(canvasWindow); @@ -423,12 +423,12 @@ struct TextTool : ToolBase UpdatePoint(x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { UpdatePoint(x, y); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { imageModel.Undo(TRUE); @@ -494,7 +494,7 @@ struct TextTool : ToolBase textEditWindow.SetFocus(); } - void OnFinishDraw() + void OnFinishDraw() override { toolsModel.OnButtonDown(TRUE, -1, -1, TRUE); toolsModel.OnButtonUp(TRUE, -1, -1); @@ -509,7 +509,7 @@ struct LineTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) @@ -547,7 +547,7 @@ struct BezierTool : ToolBase m_bLeftButton = bLeftButton; } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -559,7 +559,7 @@ struct BezierTool : ToolBase } } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); pointStack[pointSP].x = x; @@ -567,7 +567,7 @@ struct BezierTool : ToolBase draw(bLeftButton); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); draw(bLeftButton); @@ -576,14 +576,14 @@ struct BezierTool : ToolBase pointSP = 0; } - void OnCancelDraw() + void OnCancelDraw() override { OnButtonUp(FALSE, 0, 0); imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } - void OnFinishDraw() + void OnFinishDraw() override { if (pointSP) { @@ -602,7 +602,7 @@ struct RectTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) @@ -635,7 +635,7 @@ struct ShapeTool : ToolBase m_bLeftButton = bLeftButton; } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -652,7 +652,7 @@ struct ShapeTool : ToolBase } } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); pointStack[pointSP].x = x; @@ -662,7 +662,7 @@ struct ShapeTool : ToolBase draw(bLeftButton, x, y, FALSE); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) @@ -686,13 +686,13 @@ struct ShapeTool : ToolBase pointSP--; } - void OnCancelDraw() + void OnCancelDraw() override { imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } - void OnFinishDraw() + void OnFinishDraw() override { if (pointSP) { @@ -711,7 +711,7 @@ struct EllipseTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0) @@ -730,7 +730,7 @@ struct RRectTool : GenericDrawTool { } - virtual void draw(BOOL bLeftButton, LONG x, LONG y) + void draw(BOOL bLeftButton, LONG x, LONG y) override { imageModel.ResetToPrevious(); if (GetAsyncKeyState(VK_SHIFT) < 0)

1 0

[reactos] 01/01: [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78c8df8393c7164f9dc1b… commit 78c8df8393c7164f9dc1b83ad9a81c8c7ed334f6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 16:44:54 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 16:44:54 2023 +0900 [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush CORE-18867 --- base/applications/mspaint/drawing.cpp | 51 ++++++++++++++++------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 05599d2d2cc..40ff30bcb32 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -116,46 +116,41 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color) void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { - LONG a, b; - HPEN oldPen; - HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color)); + LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2; + RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); - oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); - for(a = 0; a <= b; a++) - Rectangle(hdc, - (x1 * (b - a) + x2 * a) / b - radius, - (y1 * (b - a) + y2 * a) / b - radius, - (x1 * (b - a) + x2 * a) / b + radius, - (y1 * (b - a) + y2 * a) / b + radius); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); + HBRUSH hbr = ::CreateSolidBrush(color); + ::FillRect(hdc, &rc, hbr); + ::DeleteObject(hbr); } void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { - LONG a, b, x, y; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2; + RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; - for(a = 0; a <= b; a++) - for(y = (y1 * (b - a) + y2 * a) / b - radius + 1; - y < (y1 * (b - a) + y2 * a) / b + radius + 1; y++) - for(x = (x1 * (b - a) + x2 * a) / b - radius + 1; - x < (x1 * (b - a) + x2 * a) / b + radius + 1; x++) - if (GetPixel(hdc, x, y) == fg) - SetPixel(hdc, x, y, bg); + for (LONG y = rc.top; y < rc.bottom; ++y) + { + for (LONG x = rc.left; x < rc.right; ++x) + { + if (::GetPixel(hdc, x, y) == fg) + ::SetPixelV(hdc, x, y, bg); + } + } } void Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r) { - LONG a, b; - - for(b = -r; b <= r; b++) - for(a = -r; a <= r; a++) - if ((a * a + b * b <= r * r) && (rand() % 4 == 0)) - SetPixel(hdc, x + a, y + b, color); + for (LONG dy = -r; dy <= r; dy++) + { + for (LONG dx = -r; dx <= r; dx++) + { + if ((dx * dx + dy * dy <= r * r) && (rand() % 4 == 0)) + ::SetPixelV(hdc, x + dx, y + dy, color); + } + } } void

1 0

[reactos] 01/01: [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 2
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03344980688a47267debd… commit 03344980688a47267debdf875b458e50bac70786 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 17:03:22 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 17:03:22 2023 +0900 [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 2 CORE-18867 --- base/applications/mspaint/drawing.cpp | 36 +++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 40ff30bcb32..de9c925f396 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -116,26 +116,42 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color) void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { - LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2; - RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; - + LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + RECT rc; HBRUSH hbr = ::CreateSolidBrush(color); - ::FillRect(hdc, &rc, hbr); + + for (LONG a = 0; a <= b; a++) + { + ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius, + (y1 * (b - a) + y2 * a) / b - radius, + (x1 * (b - a) + x2 * a) / b + radius, + (y1 * (b - a) + y2 * a) / b + radius); + + ::FillRect(hdc, &rc, hbr); + } + ::DeleteObject(hbr); } void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { - LONG cx = (x1 + x2) / 2, cy = (y1 + y2) / 2; - RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; + LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + RECT rc; - for (LONG y = rc.top; y < rc.bottom; ++y) + for (LONG a = 0; a <= b; a++) { - for (LONG x = rc.left; x < rc.right; ++x) + ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius, + (y1 * (b - a) + y2 * a) / b - radius, + (x1 * (b - a) + x2 * a) / b + radius, + (y1 * (b - a) + y2 * a) / b + radius); + for (LONG y = rc.top; y < rc.bottom; ++y) { - if (::GetPixel(hdc, x, y) == fg) - ::SetPixelV(hdc, x, y, bg); + for (LONG x = rc.left; x < rc.right; ++x) + { + if (::GetPixel(hdc, x, y) == fg) + ::SetPixelV(hdc, x, y, bg); + } } } }

1 0

[reactos] 01/01: [MSPAINT] Trivial improvements
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=318b2e786dbd8c1409264… commit 318b2e786dbd8c14092640a68179c37853568150 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 17:42:21 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 17:42:21 2023 +0900 [MSPAINT] Trivial improvements - Use SetPixelV instead of SetPixel. - BI_RGB is zero. - Use CS_HREDRAW and CS_VREDRAW. CORE-18867 --- base/applications/mspaint/dib.cpp | 1 - base/applications/mspaint/drawing.cpp | 2 +- base/applications/mspaint/fullscreen.cpp | 6 ------ base/applications/mspaint/fullscreen.h | 5 ++--- base/applications/mspaint/miniature.h | 3 ++- base/applications/mspaint/mouse.cpp | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 51d09d86d6b..3d74403cdda 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -33,7 +33,6 @@ CreateDIBWithProperties(int width, int height) bmi.bmiHeader.biHeight = height; bmi.bmiHeader.biPlanes = 1; bmi.bmiHeader.biBitCount = 24; - bmi.bmiHeader.biCompression = BI_RGB; return CreateDIBSection(NULL, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); } diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 600e7addd7a..7bb0d57da60 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -189,7 +189,7 @@ Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style) case 2: MoveToEx(hdc, x1, y1, NULL); LineTo(hdc, x2, y2); - SetPixel(hdc, x2, y2, color); + ::SetPixelV(hdc, x2, y2, color); break; case 3: for(a = 0; a <= b; a++) diff --git a/base/applications/mspaint/fullscreen.cpp b/base/applications/mspaint/fullscreen.cpp index 610062c0dbc..63dd070da6d 100644 --- a/base/applications/mspaint/fullscreen.cpp +++ b/base/applications/mspaint/fullscreen.cpp @@ -50,12 +50,6 @@ LRESULT CFullscreenWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } -LRESULT CFullscreenWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - Invalidate(TRUE); - 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 4466b116266..5afe843700e 100644 --- a/base/applications/mspaint/fullscreen.h +++ b/base/applications/mspaint/fullscreen.h @@ -11,7 +11,8 @@ class CFullscreenWindow : public CWindowImpl<CFullscreenWindow> { public: - DECLARE_WND_CLASS_EX(_T("FullscreenWindow"), CS_DBLCLKS, COLOR_BACKGROUND) + DECLARE_WND_CLASS_EX(_T("FullscreenWindow"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + COLOR_BACKGROUND) BEGIN_MSG_MAP(CFullscreenWindow) MESSAGE_HANDLER(WM_CREATE, OnCreate) @@ -19,7 +20,6 @@ public: MESSAGE_HANDLER(WM_KEYDOWN, OnCloseOrKeyDownOrLButtonDown) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnCloseOrKeyDownOrLButtonDown) MESSAGE_HANDLER(WM_PAINT, OnPaint) - MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_GETTEXT, OnGetText) END_MSG_MAP() @@ -29,6 +29,5 @@ private: LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); 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 OnGetText(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index b68d03a086f..63f0fd6997a 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -12,7 +12,8 @@ class CMiniatureWindow : public CWindowImpl<CMiniatureWindow> { public: - DECLARE_WND_CLASS_EX(_T("MiniatureWindow"), CS_DBLCLKS, COLOR_BTNFACE) + DECLARE_WND_CLASS_EX(_T("MiniatureWindow"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + COLOR_BTNFACE) BEGIN_MSG_MAP(CMiniatureWindow) MESSAGE_HANDLER(WM_CLOSE, OnClose) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index bd7d23c139c..61395e8aa7f 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -366,7 +366,7 @@ struct PenTool : GenericDrawTool { COLORREF rgb = bLeftButton ? m_fg : m_bg; Line(m_hdc, last.x, last.y, x, y, rgb, 1); - SetPixel(m_hdc, x, y, rgb); + ::SetPixelV(m_hdc, x, y, rgb); } };

1 0

[reactos] 01/01: [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 3
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b4422b41b93bc6b96562… commit 3b4422b41b93bc6b96562b2ea4d2af826a04d49b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 17:14:41 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 17:14:41 2023 +0900 [MSPAINT] drawing.cpp: Refactor Erase, Replace and Airbrush 3 CORE-18867 --- base/applications/mspaint/drawing.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index de9c925f396..600e7addd7a 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -117,16 +117,13 @@ void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); - RECT rc; HBRUSH hbr = ::CreateSolidBrush(color); for (LONG a = 0; a <= b; a++) { - ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius, - (y1 * (b - a) + y2 * a) / b - radius, - (x1 * (b - a) + x2 * a) / b + radius, - (y1 * (b - a) + y2 * a) / b + radius); - + LONG cx = (x1 * (b - a) + x2 * a) / b; + LONG cy = (y1 * (b - a) + y2 * a) / b; + RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; ::FillRect(hdc, &rc, hbr); } @@ -137,14 +134,12 @@ void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); - RECT rc; for (LONG a = 0; a <= b; a++) { - ::SetRect(&rc, (x1 * (b - a) + x2 * a) / b - radius, - (y1 * (b - a) + y2 * a) / b - radius, - (x1 * (b - a) + x2 * a) / b + radius, - (y1 * (b - a) + y2 * a) / b + radius); + LONG cx = (x1 * (b - a) + x2 * a) / b; + LONG cy = (y1 * (b - a) + y2 * a) / b; + RECT rc = { cx - radius, cy - radius, cx + radius, cy + radius }; for (LONG y = rc.top; y < rc.bottom; ++y) { for (LONG x = rc.left; x < rc.right; ++x)

1 0

[reactos] 01/01: [NTOS:IO] Fix some bugs in the IoQueryDeviceDescription helpers (#5320)
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84b4a80bebd1feaad2c27… commit 84b4a80bebd1feaad2c276883cf25aa033c65baa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 27 22:55:40 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 14 11:20:56 2023 +0200 [NTOS:IO] Fix some bugs in the IoQueryDeviceDescription helpers (#5320) - Add missing ExAllocatePool NULL checks. - Fix order of KeBugCheckEx parameters for PNP_DETECTED_FATAL_ERROR. - The Controller and Peripheral numbers are zero-based, so if the caller wants to inspect controller (or peripheral) zero, let it be so! The original code was treating controller number zero for enumerating controllers of a given class within the different buses, which is wrong. See the diff'ed trace below. Tested with Windows' videoprt.sys VideoPortGetDeviceData(). ```diff IoQueryDeviceDescription() BusType: 0xB093C224 (0) BusNumber: 0xB093C228 (0) ControllerType: 0xF9D01030 (19) ControllerNumber: 0xF9D01038 (0) PeripheralType: 0x00000000 (4294967295) PeripheralNumber: 0x00000000 (4294967295) CalloutRoutine: 0xF9CF74E4 Context: 0xF9D5A340 --> Query: 0xF9D5A22C IopQueryBusDescription(Query: 0xF9D5A22C) RootKey: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM' RootKeyHandle: 0x00000598 KeyIsRoot: TRUE Bus: 0xF9D5A290 (4294967295) Seen: 'CentralProcessor' Seen: 'FloatingPointProcessor' Seen: 'MultifunctionAdapter' SubRootRegName: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter' IopQueryBusDescription(Query: 0xF9D5A22C) RootKey: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter' RootKeyHandle: 0x00000590 KeyIsRoot: FALSE Bus: 0xF9D5A290 (4294967295) Seen: '0' SubRootRegName: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0' Getting bus value: 'Identifier' Getting bus value: 'Configuration Data' Getting bus value: 'Component Information' --> Getting device on Bus #0 : '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0' IopQueryDeviceDescription(Query: 0xF9D5A22C) RootKey: '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0' RootKeyHandle: 0x00000590 Bus: 0 - Enumerating controllers in '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0\DisplayController'... + Getting controller #0 + Retrieving controller '\REGISTRY\MACHINE\HARDWARE\DESCRIPTION\SYSTEM\MultifunctionAdapter\0\DisplayController\0' ``` --- ntoskrnl/io/iomgr/iorsrce.c | 73 +++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/io/iomgr/iorsrce.c b/ntoskrnl/io/iomgr/iorsrce.c index 01f2b104a84..af20b2960d6 100644 --- a/ntoskrnl/io/iomgr/iorsrce.c +++ b/ntoskrnl/io/iomgr/iorsrce.c @@ -170,18 +170,16 @@ IopQueryDeviceDescription( Bus); /* Temporary string */ - TempString.MaximumLength = sizeof(TempBuffer); - TempString.Length = 0; - TempString.Buffer = TempBuffer; + RtlInitEmptyUnicodeString(&TempString, TempBuffer, sizeof(TempBuffer)); /* Append controller name to string */ RtlAppendUnicodeToString(&ControllerRootRegName, L"\\"); RtlAppendUnicodeToString(&ControllerRootRegName, ArcTypes[*Query->ControllerType]); /* Set the controller number if specified */ - if (Query->ControllerNumber && *(Query->ControllerNumber)) + if (Query->ControllerNumber) { - ControllerNumber = *Query->ControllerNumber; + ControllerNumber = *(Query->ControllerNumber); MaximumControllerNumber = ControllerNumber + 1; IORSRCTRACE(" Getting controller #%lu\n", ControllerNumber); } @@ -208,6 +206,11 @@ IopQueryDeviceDescription( /* Allocate it */ ControllerFullInformation = ExAllocatePoolWithTag(PagedPool, LenFullInformation, TAG_IO_RESOURCE); + if (!ControllerFullInformation) + { + ZwClose(ControllerKeyHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Get the information */ Status = ZwQueryKey(ControllerKeyHandle, @@ -222,7 +225,7 @@ IopQueryDeviceDescription( /* No controller was found, bail out */ if (!NT_SUCCESS(Status)) { - if (ControllerFullInformation != NULL) + if (ControllerFullInformation) ExFreePoolWithTag(ControllerFullInformation, TAG_IO_RESOURCE); return Status; } @@ -286,11 +289,17 @@ IopQueryDeviceDescription( (Status != STATUS_BUFFER_TOO_SMALL) && (Status != STATUS_BUFFER_OVERFLOW)) { + ControllerInformation[ControllerLoop] = NULL; continue; } /* Allocate it */ ControllerInformation[ControllerLoop] = ExAllocatePoolWithTag(PagedPool, LenKeyFullInformation, TAG_IO_RESOURCE); + if (!ControllerInformation[ControllerLoop]) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } /* Get the information */ Status = ZwQueryValueKey(ControllerKeyHandle, @@ -339,9 +348,9 @@ IopQueryDeviceDescription( goto EndLoop; /* Set the peripheral number if specified */ - if (Query->PeripheralNumber && *Query->PeripheralNumber) + if (Query->PeripheralNumber) { - PeripheralNumber = *Query->PeripheralNumber; + PeripheralNumber = *(Query->PeripheralNumber); MaximumPeripheralNumber = PeripheralNumber + 1; IORSRCTRACE(" Getting peripheral #%lu\n", PeripheralNumber); } @@ -368,6 +377,12 @@ IopQueryDeviceDescription( /* Allocate it */ PeripheralFullInformation = ExAllocatePoolWithTag(PagedPool, LenFullInformation, TAG_IO_RESOURCE); + if (!PeripheralFullInformation) + { + ZwClose(PeripheralKeyHandle); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto EndLoop; + } /* Get the information */ Status = ZwQueryKey(PeripheralKeyHandle, @@ -450,6 +465,11 @@ IopQueryDeviceDescription( /* Allocate it */ PeripheralInformation[PeripheralLoop] = ExAllocatePoolWithTag(PagedPool, LenKeyFullInformation, TAG_IO_RESOURCE); + if (!PeripheralInformation[PeripheralLoop]) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } /* Get the information */ Status = ZwQueryValueKey(PeripheralKeyHandle, @@ -591,9 +611,8 @@ IopQueryBusDescription( /* Allocate it */ FullInformation = ExAllocatePoolWithTag(PagedPool, LenFullInformation, TAG_IO_RESOURCE); - if (!FullInformation) - return STATUS_NO_MEMORY; + return STATUS_INSUFFICIENT_RESOURCES; /* Get the information */ Status = ZwQueryKey(RootKeyHandle, @@ -608,6 +627,11 @@ IopQueryBusDescription( /* Allocate it */ BasicInformation = ExAllocatePoolWithTag(PagedPool, LenBasicInformation, TAG_IO_RESOURCE); + if (!BasicInformation) + { + ExFreePoolWithTag(FullInformation, TAG_IO_RESOURCE); + return STATUS_INSUFFICIENT_RESOURCES; + } } /* Deallocate the old buffer */ @@ -691,6 +715,11 @@ IopQueryBusDescription( /* Allocate it */ BusInformation[SubBusLoop] = ExAllocatePoolWithTag(PagedPool, LenKeyFullInformation, TAG_IO_RESOURCE); + if (!BusInformation[SubBusLoop]) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } /* Get the information */ Status = ZwQueryValueKey(SubRootKeyHandle, @@ -774,7 +803,8 @@ IopQueryBusDescription( Status = IopQueryBusDescription(Query, SubRootRegName, SubRootKeyHandle, Bus, !KeyIsRoot); /* Everything enumerated */ - if (Status == STATUS_NO_MORE_ENTRIES) Status = STATUS_SUCCESS; + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; ZwClose(SubRootKeyHandle); SubRootKeyHandle = NULL; @@ -860,11 +890,10 @@ IopStoreSystemPartitionInformation( return; } - /* Prepare the string that will receive where symbolic link points to */ - LinkTarget.Length = 0; - /* We will zero the end of the string after having received it */ - LinkTarget.MaximumLength = sizeof(LinkTargetBuffer) - sizeof(UNICODE_NULL); - LinkTarget.Buffer = LinkTargetBuffer; + /* Prepare the string that will receive where symbolic link points to. + * We will zero the end of the string after having received it */ + RtlInitEmptyUnicodeString(&LinkTarget, LinkTargetBuffer, + sizeof(LinkTargetBuffer) - sizeof(UNICODE_NULL)); /* Query target */ Status = ZwQuerySymbolicLinkObject(LinkHandle, &LinkTarget, NULL); @@ -1124,10 +1153,10 @@ IoAssignResources( { /* New drivers should not call this API */ KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, - 0, - 0, + 0x2, (ULONG_PTR)DeviceObject, - (ULONG_PTR)DriverObject); + (ULONG_PTR)DriverObject, + 0); } } @@ -1217,10 +1246,16 @@ IoQueryDeviceDescription( CalloutRoutine, Context, &Query); + if (!BusType) + return STATUS_NOT_IMPLEMENTED; + /* Set up the string */ RootRegKey.Length = 0; RootRegKey.MaximumLength = 2048; RootRegKey.Buffer = ExAllocatePoolWithTag(PagedPool, RootRegKey.MaximumLength, TAG_IO_RESOURCE); + if (!RootRegKey.Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + RtlAppendUnicodeToString(&RootRegKey, L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); /* Open a handle to the Root Registry Key */

1 0

[reactos] 01/01: [FLOPPY] "zero" parameters in IoQueryDeviceDescription() call are NULL pointers.
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f41000714c0c68541a8f… commit 4f41000714c0c68541a8f3b6510976644d9f702c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 7 22:47:32 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 14 11:24:47 2023 +0200 [FLOPPY] "zero" parameters in IoQueryDeviceDescription() call are NULL pointers. --- drivers/storage/floppy/fdc/fdo.c | 2 -- drivers/storage/floppy/floppy/floppy.c | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/storage/floppy/fdc/fdo.c b/drivers/storage/floppy/fdc/fdo.c index f00c58c08d9..a42893dd2c5 100644 --- a/drivers/storage/floppy/fdc/fdo.c +++ b/drivers/storage/floppy/fdc/fdo.c @@ -31,8 +31,6 @@ ForwardIrpAndForget( } - - static NTSTATUS FdcFdoStartDevice( diff --git a/drivers/storage/floppy/floppy/floppy.c b/drivers/storage/floppy/floppy/floppy.c index b67c6096872..c1b96046f21 100644 --- a/drivers/storage/floppy/floppy/floppy.c +++ b/drivers/storage/floppy/floppy/floppy.c @@ -929,7 +929,14 @@ AddControllers(PDRIVER_OBJECT DriverObject) PAGED_CODE(); /* Find our controllers on all ISA buses */ - IoQueryDeviceDescription(&InterfaceType, 0, &ControllerType, 0, &PeripheralType, 0, ConfigCallback, 0); + IoQueryDeviceDescription(&InterfaceType, + NULL, + &ControllerType, + NULL, + &PeripheralType, + NULL, + ConfigCallback, + NULL); /* * w2k breaks the return val from ConfigCallback, so we have to hack around it, rather than just

1 0

[reactos] 01/01: [MSPAINT] Improve CMiniatureWindow (#5337)
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfd42c67a1255f8d3e2aa… commit bfd42c67a1255f8d3e2aa974f435942a06ca7925 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 18:51:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 14 18:51:40 2023 +0900 [MSPAINT] Improve CMiniatureWindow (#5337) - Save the position and size of the miniature window. - Improve drawing of the miniature window. - Sync with the canvas. CORE-18867 --- base/applications/mspaint/history.cpp | 4 +- base/applications/mspaint/history.h | 5 +-- base/applications/mspaint/miniature.cpp | 60 ++++++++++++++++++++++++++-- base/applications/mspaint/miniature.h | 6 +++ base/applications/mspaint/mouse.cpp | 16 ++++---- base/applications/mspaint/selectionmodel.cpp | 17 +++----- base/applications/mspaint/selectionmodel.h | 1 - base/applications/mspaint/toolsmodel.cpp | 3 +- base/applications/mspaint/winproc.cpp | 8 ++-- 9 files changed, 86 insertions(+), 34 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index ae6fb27b451..92ef896afd0 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -17,6 +17,8 @@ void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) canvasWindow.Invalidate(FALSE); + if (miniature.IsWindow()) + miniature.Invalidate(FALSE); } ImageModel::ImageModel() @@ -264,7 +266,7 @@ void ImageModel::DeleteSelection() NotifyImageChanged(); } -void ImageModel::Bound(POINT& pt) +void ImageModel::Bound(POINT& pt) const { pt.x = max(0, min(pt.x, GetWidth())); pt.y = max(0, min(pt.y, GetHeight())); diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 86c312df871..00e66950425 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -36,7 +36,8 @@ public: void FlipVertically(); void RotateNTimes90Degrees(int iN); void DeleteSelection(); - void Bound(POINT& pt); + void Bound(POINT& pt) const; + void NotifyImageChanged(); protected: HDC hDrawingDC; // The device context for this class @@ -44,6 +45,4 @@ protected: int undoSteps; // The undo-able count int redoSteps; // The redo-able count HBITMAP hBms[HISTORYSIZE]; // A rotation buffer of HBITMAPs - - void NotifyImageChanged(); }; diff --git a/base/applications/mspaint/miniature.cpp b/base/applications/mspaint/miniature.cpp index c048d0d2c15..d496a7f74a7 100644 --- a/base/applications/mspaint/miniature.cpp +++ b/base/applications/mspaint/miniature.cpp @@ -5,6 +5,7 @@ * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ #include "precomp.h" @@ -32,6 +33,30 @@ HWND CMiniatureWindow::DoCreate(HWND hwndParent) return Create(hwndParent, rc, strTitle, style, WS_EX_PALETTEWINDOW); } +LRESULT CMiniatureWindow::OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (IsWindowVisible() && !IsIconic() && !IsZoomed()) + { + CRect rc; + GetWindowRect(&rc); + registrySettings.ThumbXPos = rc.left; + registrySettings.ThumbYPos = rc.top; + } + return 0; +} + +LRESULT CMiniatureWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (IsWindowVisible() && !IsIconic() && !IsZoomed()) + { + CRect rc; + GetWindowRect(&rc); + registrySettings.ThumbWidth = rc.Width(); + registrySettings.ThumbHeight = rc.Height(); + } + return 0; +} + LRESULT CMiniatureWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { ShowWindow(SW_HIDE); @@ -39,16 +64,45 @@ LRESULT CMiniatureWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& return 0; } +LRESULT CMiniatureWindow::OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + return TRUE; /* Avoid flickering */ +} + LRESULT CMiniatureWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { RECT rc; GetClientRect(&rc); + // Start painting PAINTSTRUCT ps; HDC hDC = BeginPaint(&ps); - StretchBlt(hDC, 0, 0, rc.right, rc.bottom, - imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), - SRCCOPY); + if (!hDC) + return 0; + + // Use a memory bitmap to reduce flickering + HDC hdcMem = ::CreateCompatibleDC(hDC); + HGDIOBJ hbmOld = ::SelectObject(hdcMem, ::CreateCompatibleBitmap(hDC, rc.right, rc.bottom)); + + // FIXME: Consider aspect ratio + + // Fill the background + ::FillRect(hdcMem, &rc, (HBRUSH)(COLOR_BTNFACE + 1)); + + // Draw the image (hdcMem <-- imageModel) + int cxImage = imageModel.GetWidth(); + int cyImage = imageModel.GetHeight(); + ::StretchBlt(hdcMem, 0, 0, rc.right, rc.bottom, + imageModel.GetDC(), 0, 0, cxImage, cyImage, + SRCCOPY); + + // Move the image (hDC <-- hdcMem) + ::BitBlt(hDC, 0, 0, rc.right, rc.bottom, hdcMem, 0, 0, SRCCOPY); + + // Clean up + ::DeleteObject(::SelectObject(hdcMem, hbmOld)); + ::DeleteDC(hdcMem); + EndPaint(&ps); return 0; } diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index 63f0fd6997a..c8126de691a 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -16,14 +16,20 @@ public: COLOR_BTNFACE) BEGIN_MSG_MAP(CMiniatureWindow) + MESSAGE_HANDLER(WM_MOVE, OnMove) + MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CLOSE, OnClose) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) MESSAGE_HANDLER(WM_PAINT, OnPaint) END_MSG_MAP() HWND DoCreate(HWND hwndParent); private: + LRESULT OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnClose(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 OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 61395e8aa7f..3c0923bec58 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -78,11 +78,13 @@ void ToolBase::reset() void ToolBase::OnCancelDraw() { reset(); + imageModel.NotifyImageChanged(); } void ToolBase::OnFinishDraw() { reset(); + imageModel.NotifyImageChanged(); } void ToolBase::beginEvent() @@ -151,15 +153,12 @@ struct FreeSelTool : ToolBase selectionModel.ResetPtStack(); selectionModel.m_bShow = FALSE; } - canvasWindow.Invalidate(FALSE); + imageModel.NotifyImageChanged(); } } void OnFinishDraw() override { - if (m_bLeftButton) - canvasWindow.Invalidate(FALSE); - m_bLeftButton = FALSE; ToolBase::OnFinishDraw(); } @@ -214,15 +213,12 @@ struct RectSelTool : ToolBase if (start.x == x && start.y == y) imageModel.Undo(TRUE); selectionModel.m_bShow = !selectionModel.m_rc.IsRectEmpty(); - canvasWindow.Invalidate(FALSE); + imageModel.NotifyImageChanged(); } } void OnFinishDraw() override { - if (m_bLeftButton) - canvasWindow.Invalidate(FALSE); - m_bLeftButton = FALSE; ToolBase::OnFinishDraw(); } @@ -253,11 +249,13 @@ struct GenericDrawTool : ToolBase void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { draw(bLeftButton, x, y); + imageModel.NotifyImageChanged(); } void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { draw(bLeftButton, x, y); + imageModel.NotifyImageChanged(); } void OnCancelDraw() override @@ -574,6 +572,7 @@ struct BezierTool : ToolBase pointSP++; if (pointSP == 4) pointSP = 0; + imageModel.NotifyImageChanged(); } void OnCancelDraw() override @@ -649,6 +648,7 @@ struct ShapeTool : ToolBase else { draw(bLeftButton, x, y, bDoubleClick); + imageModel.NotifyImageChanged(); } } diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 33ff6f05722..d70f324d805 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -179,7 +179,7 @@ BOOL SelectionModel::TakeOff() DrawBackgroundRect(hDCImage, paletteModel.GetBgColor()); } - canvasWindow.Invalidate(FALSE); + imageModel.NotifyImageChanged(); return TRUE; } @@ -229,7 +229,7 @@ void SelectionModel::FlipHorizontally() } ::DeleteDC(hdcMem); - NotifyRefreshNeeded(); + imageModel.NotifyImageChanged(); } void SelectionModel::FlipVertically() @@ -251,7 +251,7 @@ void SelectionModel::FlipVertically() } ::DeleteDC(hdcMem); - NotifyRefreshNeeded(); + imageModel.NotifyImageChanged(); } void SelectionModel::RotateNTimes90Degrees(int iN) @@ -303,7 +303,7 @@ void SelectionModel::RotateNTimes90Degrees(int iN) } ::DeleteDC(hdcMem); - NotifyRefreshNeeded(); + imageModel.NotifyImageChanged(); } void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY) @@ -346,7 +346,7 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int ::DeleteDC(hDC); m_bShow = TRUE; - NotifyRefreshNeeded(); + imageModel.NotifyImageChanged(); } HBITMAP SelectionModel::GetBitmap() @@ -417,11 +417,6 @@ void SelectionModel::Dragging(CANVAS_HITTEST hit, POINT pt) m_ptHit = pt; } -void SelectionModel::NotifyRefreshNeeded() -{ - canvasWindow.Invalidate(FALSE); -} - void SelectionModel::ClearMask() { if (m_hbmMask) @@ -450,5 +445,5 @@ void SelectionModel::CancelSelection() imageModel.Undo(TRUE); m_bShow = FALSE; - canvasWindow.Invalidate(FALSE); + imageModel.NotifyImageChanged(); } diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index af285e380d8..01a21c7bc62 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -49,7 +49,6 @@ public: void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY); void CancelSelection(); - void NotifyRefreshNeeded(); void Dragging(CANVAS_HITTEST hit, POINT pt); void ClearMask(); void ClearColor(); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index bebb8687284..822547048f7 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -141,8 +141,7 @@ void ToolsModel::SetBackgroundTransparent(BOOL bTransparent) { m_transpBg = bTransparent; NotifyToolSettingsChanged(); - if (canvasWindow.IsWindow()) - canvasWindow.Invalidate(FALSE); + imageModel.NotifyImageChanged(); } int ToolsModel::GetZoom() const diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 80a225b8a8a..c3cc041ebe8 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -207,7 +207,7 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) imageModel.PushImageForUndo(); selectionModel.InsertFromHBITMAP(bitmap, 0, 0); selectionModel.m_bShow = TRUE; - canvasWindow.Invalidate(FALSE); + imageModel.NotifyImageChanged(); } LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -510,7 +510,7 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { selectionModel.Landing(); selectionModel.m_bShow = FALSE; - canvasWindow.Invalidate(FALSE); + imageModel.NotifyImageChanged(); } break; @@ -656,7 +656,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } imageModel.Undo(); - canvasWindow.Invalidate(FALSE); break; case IDM_EDITREDO: if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) @@ -667,7 +666,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } imageModel.Redo(); - canvasWindow.Invalidate(FALSE); break; case IDM_EDITCOPY: if (OpenClipboard()) @@ -763,7 +761,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_IMAGEDELETEIMAGE: imageModel.PushImageForUndo(); Rect(imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); - canvasWindow.Invalidate(FALSE); + imageModel.NotifyImageChanged(); break; case IDM_IMAGEROTATEMIRROR: switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd))

1 0

[reactos] 01/01: [HALX86] Minor fixes in HaliFindBusAddressTranslation()
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=113656563a3e81e025847… commit 113656563a3e81e0258472ef11c17f9032740879 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 10 14:11:36 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 14 11:27:24 2023 +0200 [HALX86] Minor fixes in HaliFindBusAddressTranslation() - Remove ContextValue variable. This variable erroneously truncated *Context value (that can contain a pointer value) to 32 bits. - Gracefully fail instead of asserting. --- hal/halx86/legacy/bussupp.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c index f967ece635c..6f91c3b7280 100644 --- a/hal/halx86/legacy/bussupp.c +++ b/hal/halx86/legacy/bussupp.c @@ -1333,18 +1333,19 @@ HaliFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, PHAL_BUS_HANDLER BusHandler; PBUS_HANDLER Handler; PLIST_ENTRY NextEntry; - ULONG ContextValue; /* Make sure we have a context */ - if (!Context) return FALSE; - ASSERT((*Context) || (NextBus == TRUE)); + if (!Context) + return FALSE; - /* Read the context */ - ContextValue = *Context; + /* If we have data in the context, then this shouldn't be a new lookup */ + if ((*Context != 0) && (NextBus != FALSE)) + return FALSE; /* Find the bus handler */ - Handler = HalpContextToBusHandler(ContextValue); - if (!Handler) return FALSE; + Handler = HalpContextToBusHandler(*Context); + if (!Handler) + return FALSE; /* Check if this is an ongoing lookup */ if (NextBus) @@ -1354,7 +1355,8 @@ HaliFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, NextEntry = &BusHandler->AllHandlers; /* Get the next one if we were already with one */ - if (ContextValue) NextEntry = NextEntry->Flink; + if (*Context) + NextEntry = NextEntry->Flink; /* Start scanning */ while (TRUE) @@ -1373,7 +1375,10 @@ HaliFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, BusHandler->Handler.BusNumber, BusAddress, AddressSpace, - TranslatedAddress)) break; + TranslatedAddress)) + { + break; + } /* Try the next one */ NextEntry = NextEntry->Flink; @@ -1389,7 +1394,10 @@ HaliFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, Handler->BusNumber, BusAddress, AddressSpace, - TranslatedAddress)) return FALSE; + TranslatedAddress)) + { + return FALSE; + } /* Remember for next time */ *Context = (ULONG_PTR)Handler;

1 0

[reactos] 01/01: [XBOXVMP] Fix in VideoPortGetAccessRanges call: missing Slot parameter.
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61012eb544ebb12ffe878… commit 61012eb544ebb12ffe878376af8c700ed6577cf0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 9 23:17:13 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 14 12:10:55 2023 +0200 [XBOXVMP] Fix in VideoPortGetAccessRanges call: missing Slot parameter. Contrary to what is (badly) written on MSDN, this parameter is *mandatory* when the ranges looked for are on a PCI adapter. Detected when testing with MS Windows' videoprt.sys on XBOX emulator; thanks to Simone Lombardo for assistance! --- win32ss/drivers/miniport/xboxvmp/xboxvmp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c index 3ead664dda1..5cf76e08b12 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c @@ -61,18 +61,20 @@ XboxVmpFindAdapter( OUT PUCHAR Again) { PXBOXVMP_DEVICE_EXTENSION XboxVmpDeviceExtension; - VIDEO_ACCESS_RANGE AccessRanges[3]; VP_STATUS Status; + VIDEO_ACCESS_RANGE AccessRanges[2]; USHORT VendorId = 0x10DE; /* NVIDIA Corporation */ USHORT DeviceId = 0x02A0; /* NV2A XGPU */ + ULONG Slot = 0; TRACE_(IHVVIDEO, "XboxVmpFindAdapter\n"); XboxVmpDeviceExtension = (PXBOXVMP_DEVICE_EXTENSION)HwDeviceExtension; - Status = VideoPortGetAccessRanges(HwDeviceExtension, 0, NULL, 3, AccessRanges, - &VendorId, &DeviceId, NULL); - + VideoPortZeroMemory(&AccessRanges, sizeof(AccessRanges)); + Status = VideoPortGetAccessRanges(HwDeviceExtension, 0, NULL, + RTL_NUMBER_OF(AccessRanges), AccessRanges, + &VendorId, &DeviceId, &Slot); if (Status == NO_ERROR) { XboxVmpDeviceExtension->PhysControlStart = AccessRanges[0].RangeStart;

1 0

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