Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/11: [NTOS:CM] Implement COMPUTE_HASH_CHAR macro definition

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26fe3616fe2fe35e41dee… commit 26fe3616fe2fe35e41deedb92f75f9cf2ec266f9 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Aug 28 19:37:00 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Oct 1 20:06:00 2023 +0200 [NTOS:CM] Implement COMPUTE_HASH_CHAR macro definition Wrap the hash computation formula in a macro so that we don't have to copy the logic over the places again and again. --- ntoskrnl/include/internal/cm_x.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/include/internal/cm_x.h b/ntoskrnl/include/internal/cm_x.h index b9e561952c3..daf7d67643b 100644 --- a/ntoskrnl/include/internal/cm_x.h +++ b/ntoskrnl/include/internal/cm_x.h @@ -12,6 +12,12 @@ #define GET_HASH_KEY(ConvKey) \ ((CMP_HASH_IRRATIONAL * (ConvKey)) % CMP_HASH_PRIME) +// +// Computes the hashkey of a character +// +#define COMPUTE_HASH_CHAR(ConvKey, Char) \ + (37 * ConvKey + RtlUpcaseUnicodeChar(Char)) + // // Returns the index into the hash table, or the entry itself //

1 year, 7 months

[reactos] 01/11: [NTOS:CM] Add surrounding parentheses to GET_HASH_INDEX definition

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4213d491d768be18c863… commit a4213d491d768be18c863dfba8ea57b2b38c87a7 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Mar 1 19:38:32 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Oct 1 20:05:57 2023 +0200 [NTOS:CM] Add surrounding parentheses to GET_HASH_INDEX definition --- ntoskrnl/include/internal/cm_x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/cm_x.h b/ntoskrnl/include/internal/cm_x.h index 373700b8086..b9e561952c3 100644 --- a/ntoskrnl/include/internal/cm_x.h +++ b/ntoskrnl/include/internal/cm_x.h @@ -16,7 +16,7 @@ // Returns the index into the hash table, or the entry itself // #define GET_HASH_INDEX(ConvKey) \ - GET_HASH_KEY(ConvKey) % CmpHashTableSize + (GET_HASH_KEY(ConvKey) % CmpHashTableSize) #define GET_HASH_ENTRY(Table, ConvKey) \ (&Table[GET_HASH_INDEX(ConvKey)]) #define ASSERT_VALID_HASH(h) \

1 year, 7 months

[reactos] 02/02: [WINSPOOL] Add a number of missing NULL checks.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e68e27ff6161b34a4a45… commit 0e68e27ff6161b34a4a45721f0b98100c60dda25 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 30 19:17:33 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Oct 1 13:05:51 2023 +0300 [WINSPOOL] Add a number of missing NULL checks. --- win32ss/printing/base/winspool/printers.c | 51 ++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 2faf3f91781..6011571d341 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -753,6 +753,11 @@ PRINTER_INFO_9W * get_devmodeW(HANDLE hprn) if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { pi9 = HeapAlloc(hProcessHeap, 0, needed); + if (!pi9) + { + ERR("Failed to allocate PRINTER_INFO_9W of %u bytes\n", needed); + return NULL; + } res = GetPrinterW(hprn, 9, (LPBYTE)pi9, needed, &needed); } @@ -829,6 +834,11 @@ IntFixUpDevModeNames( PDOCUMENTPROPERTYHEADER pdphdr ) if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { pi2 = HeapAlloc(hProcessHeap, 0, needed); + if (!pi2) + { + ERR("Failed to allocate PRINTER_INFO_2W of %u bytes\n", needed); + return FALSE; + } res = GetPrinterW( pdphdr->hPrinter, 2, (LPBYTE)pi2, needed, &needed); } @@ -1272,6 +1282,11 @@ PrinterProperties( HWND hWnd, HANDLE hPrinter ) if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { pi2 = HeapAlloc(hProcessHeap, 0, needed); + if (!pi2) + { + ERR("Failed to allocate PRINTER_INFO_2W of %u bytes\n", needed); + return FALSE; + } res = GetPrinterW(hPrinter, 2, (LPBYTE)pi2, needed, &needed); } @@ -2805,6 +2820,11 @@ QuerySpoolMode( HANDLE hPrinter, PDWORD downloadFontsFlags, PDWORD dwVersion ) if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { pi2 = HeapAlloc(hProcessHeap, 0, needed); + if (!pi2) + { + ERR("Failed to allocate PRINTER_INFO_2W of %u bytes\n", needed); + return FALSE; + } res = GetPrinterW(hPrinter, 2, (LPBYTE)pi2, needed, &needed); } @@ -3506,6 +3526,11 @@ INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam LPWSTR *output; filename = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + if (!filename) + { + ERR("Failed to allocate filename of %u bytes\n", (len + 1) * sizeof(WCHAR)); + return FALSE; + } GetDlgItemTextW(hwnd, EDITBOX, filename, len + 1); if(GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) @@ -3568,6 +3593,12 @@ StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) if(GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; pi5 = HeapAlloc(GetProcessHeap(), 0, len); + if (!pi5) + { + ERR("Failed to allocate PRINTER_INFO_5W of %u bytes\n", len); + return NULL; + } + GetPrinterW(hPrinter, 5, (LPBYTE)pi5, len, &len); if (!pi5->pPortName || wcsicmp(pi5->pPortName, FILE_Port)) { @@ -3595,6 +3626,12 @@ StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) return NULL; } ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!ret) + { + ERR("Failed to allocate path name buffer of %u bytes\n", len * sizeof(WCHAR)); + HeapFree(GetProcessHeap(), 0, name); + return NULL; + } GetFullPathNameW(name, len, ret, NULL); HeapFree(GetProcessHeap(), 0, name); } @@ -3614,6 +3651,11 @@ StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) return NULL; ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!ret) + { + ERR("Failed to allocate path name buffer of %u bytes\n", len * sizeof(WCHAR)); + return NULL; + } GetFullPathNameW(doc->lpszOutput, len, ret, NULL); attr = GetFileAttributesW(ret); @@ -3658,7 +3700,14 @@ StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) { DWORD len = WideCharToMultiByte(CP_ACP, 0, retW, -1, NULL, 0, NULL, NULL); ret = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, retW, -1, ret, len, NULL, NULL); + if (ret) + { + WideCharToMultiByte(CP_ACP, 0, retW, -1, ret, len, NULL, NULL); + } + else + { + ERR("Failed to allocate path name buffer of %u bytes\n", len); + } HeapFree(GetProcessHeap(), 0, retW); }

1 year, 7 months

[reactos] 01/02: [WINSPOOL] Properly copy the DEVMODE in IntFixUpDevModeNames

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02df49ebd8167da3335e9… commit 02df49ebd8167da3335e96af25b91048bc9ec266 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Sep 19 16:33:35 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Oct 1 13:05:51 2023 +0300 [WINSPOOL] Properly copy the DEVMODE in IntFixUpDevModeNames Otherwise the size isn't set up correctly, leading to a crash. Fixes crash in comdl32_winetest printdlg. --- win32ss/printing/base/winspool/printers.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 285696d6a33..2faf3f91781 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -834,7 +834,19 @@ IntFixUpDevModeNames( PDOCUMENTPROPERTYHEADER pdphdr ) if (res) { - FIXME("IFUDMN : Get Printer Name %S\n",pi2->pPrinterName); + /* Check if the provided buffer is large enough */ + DWORD cbDevMode = pi2->pDevMode->dmSize + pi2->pDevMode->dmDriverExtra; + if (pdphdr->cbOut < cbDevMode) + { + ERR("cbOut (%lu) < cbDevMode(%u)\n", pdphdr->cbOut, cbDevMode); + res = FALSE; + goto Exit; + } + + /* Copy the devmode */ + RtlCopyMemory(pdphdr->pdmOut, pi2->pDevMode, cbDevMode); + + TRACE("IFUDMN : Get Printer Name %S\n", pi2->pPrinterName); StringCchCopyW( pdphdr->pdmOut->dmDeviceName, CCHDEVICENAME-1, pi2->pPrinterName ); pdphdr->pdmOut->dmDeviceName[CCHDEVICENAME-1] = 0; } @@ -842,6 +854,8 @@ IntFixUpDevModeNames( PDOCUMENTPROPERTYHEADER pdphdr ) { ERR("IFUDMN : GetPrinterW failed with %u\n", GetLastError()); } + +Exit: HeapFree(hProcessHeap, 0, pi2); return res; }

1 year, 7 months

[reactos] 01/01: [NTOS:MM] Fix missing \n in unimplemented codepath DPRINT

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c7687063979a6a787c67… commit 8c7687063979a6a787c67f9360aa91eb43af4db6 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Sep 30 19:06:30 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Sep 30 19:06:30 2023 +0200 [NTOS:MM] Fix missing \n in unimplemented codepath DPRINT We can hit that unimplemented code-path-line in NtQuerySection() when browsing youtube.com with Chromium 49. --- ntoskrnl/mm/section.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index fe07ac03df0..35c36d45cfa 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -17,7 +17,6 @@ * * * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/section.c * PURPOSE: Implements section objects * * PROGRAMMERS: Rex Jolliff @@ -3874,7 +3873,7 @@ NtQuerySection( } else { - DPRINT1("Unimplemented code path!"); + DPRINT1("Unimplemented code path\n"); } _SEH2_TRY

1 year, 7 months

[reactos] 01/01: [MSPAINT] Larger/smaller Rubber/AirBrush on Ctrl+Plus/Minus (#5740)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=945ee4b2a47402e99beb8… commit 945ee4b2a47402e99beb8a8e877c32e6cf81bbcd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 28 21:54:32 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 28 21:54:32 2023 +0900 [MSPAINT] Larger/smaller Rubber/AirBrush on Ctrl+Plus/Minus (#5740) - Enable changing rubber/airbrush thickness by Ctrl+Plus / Ctrl+Minus key combination in TOOL_AIRBRUSH and TOOL_RUBBER. CORE-19094 --- base/applications/mspaint/mouse.cpp | 10 ++++++++++ base/applications/mspaint/toolsmodel.cpp | 12 ++++++++++++ base/applications/mspaint/toolsmodel.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index fc4b1792bec..793efedf3ec 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -505,6 +505,11 @@ struct RubberTool : SmoothDrawTool else Replace(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_fg, m_bg, toolsModel.GetRubberRadius()); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeRubberThickerOrThinner(bMinus); + } }; // TOOL_FILL @@ -631,6 +636,11 @@ struct AirBrushTool : SmoothDrawTool COLORREF rgb = bLeftButton ? m_fg : m_bg; Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeAirBrushThickerOrThinner(bMinus); + } }; // TOOL_TEXT diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 07ded56ea99..dec101adc9e 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -99,6 +99,18 @@ void ToolsModel::MakeBrushThickerOrThinner(BOOL bThinner) SetBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); } +void ToolsModel::MakeAirBrushThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetAirBrushWidth(); + SetAirBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + +void ToolsModel::MakeRubberThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetRubberRadius(); + SetRubberRadius(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + int ToolsModel::GetShapeStyle() const { return m_shapeStyle; diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index b6f2c96fbdb..d90faee117b 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -120,9 +120,11 @@ public: int GetAirBrushWidth() const; void SetAirBrushWidth(int nAirBrushWidth); + void MakeAirBrushThickerOrThinner(BOOL bThinner); int GetRubberRadius() const; void SetRubberRadius(int nRubberRadius); + void MakeRubberThickerOrThinner(BOOL bThinner); BOOL IsBackgroundTransparent() const; void SetBackgroundTransparent(BOOL bTransparent);

1 year, 7 months

[reactos] 01/01: [MSPAINT] Larger/smaller brush nib on Ctrl+Plus/Minus (#5739)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a4787b3841970bc59c55… commit 8a4787b3841970bc59c5503cb2eeee074a45a7f8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 28 21:30:34 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 28 21:30:34 2023 +0900 [MSPAINT] Larger/smaller brush nib on Ctrl+Plus/Minus (#5739) - Introduce the concept of "brush width" to the tools model. - Enable changing the brush width by Ctrl+Plus/Minus key combination in TOOL_BRUSH. - Re-define brush styles. CORE-19094 --- base/applications/mspaint/drawing.cpp | 117 ++++++++++++++--------------- base/applications/mspaint/drawing.h | 2 +- base/applications/mspaint/mouse.cpp | 5 +- base/applications/mspaint/toolsettings.cpp | 34 +++++++-- base/applications/mspaint/toolsmodel.cpp | 25 +++++- base/applications/mspaint/toolsmodel.h | 25 +++++- 6 files changed, 132 insertions(+), 76 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 96064fff229..3b7579196ce 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -165,73 +165,66 @@ Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r) } void -Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style) +Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style, INT thickness) { HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color)); - LONG a, b; - b = max(1, max(labs(x2 - x1), labs(y2 - y1))); - switch (style) + + if (thickness <= 1) + { + Line(hdc, x1, y1, x2, y2, color, thickness); + } + else { - case 0: - for(a = 0; a <= b; a++) - Ellipse(hdc, (x1 * (b - a) + x2 * a) / b - 3, (y1 * (b - a) + y2 * a) / b - 3, - (x1 * (b - a) + x2 * a) / b + 4, (y1 * (b - a) + y2 * a) / b + 4); - break; - case 1: - for(a = 0; a <= b; a++) - Ellipse(hdc, - (x1 * (b - a) + x2 * a) / b - 2, - (y1 * (b - a) + y2 * a) / b - 2, - (x1 * (b - a) + x2 * a) / b + 2, - (y1 * (b - a) + y2 * a) / b + 2); - break; - case 2: - MoveToEx(hdc, x1, y1, NULL); - LineTo(hdc, x2, y2); - ::SetPixelV(hdc, x2, y2, color); - break; - case 3: - for(a = 0; a <= b; a++) - Rectangle(hdc, - (x1 * (b - a) + x2 * a) / b - 4, - (y1 * (b - a) + y2 * a) / b - 4, - (x1 * (b - a) + x2 * a) / b + 4, - (y1 * (b - a) + y2 * a) / b + 4); - break; - case 4: - for(a = 0; a <= b; a++) - Rectangle(hdc, (x1 * (b - a) + x2 * a) / b - 2, (y1 * (b - a) + y2 * a) / b - 2, - (x1 * (b - a) + x2 * a) / b + 3, (y1 * (b - a) + y2 * a) / b + 3); - break; - case 5: - for(a = 0; a <= b; a++) - Rectangle(hdc, (x1 * (b - a) + x2 * a) / b - 1, (y1 * (b - a) + y2 * a) / b - 1, - (x1 * (b - a) + x2 * a) / b + 1, (y1 * (b - a) + y2 * a) / b + 1); - break; - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: + LONG a, b = max(1, max(labs(x2 - x1), labs(y2 - y1))); + switch ((BrushStyle)style) { - POINT offsTop[] = {{3, -3}, {2, -2}, {0, 0}, - {-4, -4}, {-2, -2}, {-1, 0}}; - POINT offsBtm[] = {{-3, 3}, {-2, 2}, {-1, 1}, - {3, 3}, {2, 2}, {0, 1}}; - LONG idx = style - 6; - POINT pts[4]; - pts[0].x = x1 + offsTop[idx].x; - pts[0].y = y1 + offsTop[idx].y; - pts[1].x = x1 + offsBtm[idx].x; - pts[1].y = y1 + offsBtm[idx].y; - pts[2].x = x2 + offsBtm[idx].x; - pts[2].y = y2 + offsBtm[idx].y; - pts[3].x = x2 + offsTop[idx].x; - pts[3].y = y2 + offsTop[idx].y; - Polygon(hdc, pts, 4); - break; + case BrushStyleRound: + for (a = 0; a <= b; a++) + { + Ellipse(hdc, + (x1 * (b - a) + x2 * a) / b - (thickness / 2), + (y1 * (b - a) + y2 * a) / b - (thickness / 2), + (x1 * (b - a) + x2 * a) / b + (thickness / 2), + (y1 * (b - a) + y2 * a) / b + (thickness / 2)); + } + break; + + case BrushStyleSquare: + for (a = 0; a <= b; a++) + { + Rectangle(hdc, + (x1 * (b - a) + x2 * a) / b - (thickness / 2), + (y1 * (b - a) + y2 * a) / b - (thickness / 2), + (x1 * (b - a) + x2 * a) / b + (thickness / 2), + (y1 * (b - a) + y2 * a) / b + (thickness / 2)); + } + break; + + case BrushStyleForeSlash: + case BrushStyleBackSlash: + { + POINT offsetTop, offsetBottom; + if ((BrushStyle)style == BrushStyleForeSlash) + { + offsetTop = { (thickness - 1) / 2, -(thickness - 1) / 2 }; + offsetBottom = { -thickness / 2, thickness / 2 }; + } + else + { + offsetTop = { -thickness / 2, -thickness / 2 }; + offsetBottom = { (thickness - 1) / 2, (thickness - 1) / 2 }; + } + POINT points[4] = + { + { x1 + offsetTop.x, y1 + offsetTop.y }, + { x1 + offsetBottom.x, y1 + offsetBottom.y }, + { x2 + offsetBottom.x, y2 + offsetBottom.y }, + { x2 + offsetTop.x, y2 + offsetTop.y }, + }; + Polygon(hdc, points, _countof(points)); + break; + } } } DeleteObject(SelectObject(hdc, oldBrush)); diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 950bfdd6974..44936f08503 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -27,7 +27,7 @@ void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF void Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r); -void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style); +void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style, INT thickness); void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 04e749db88b..fc4b1792bec 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -609,12 +609,13 @@ struct BrushTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle()); + Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle(), + toolsModel.GetBrushWidth()); } void OnSpecialTweak(BOOL bMinus) override { - // TODO: + toolsModel.MakeBrushThickerOrThinner(bMinus); } }; diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index b2ee9039817..3d869848480 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -112,23 +112,43 @@ static inline INT getBrushRects(RECT rects[12], LPCRECT prc, LPPOINT ppt = NULL) return getSplitRects(rects, 3, 4, prc, ppt); } +struct BrushStyleAndWidth +{ + BrushStyle style; + INT width; +}; + +static const BrushStyleAndWidth c_BrushPresets[] = +{ + { BrushStyleRound, 7 }, { BrushStyleRound, 4 }, { BrushStyleRound, 1 }, + { BrushStyleSquare, 8 }, { BrushStyleSquare, 5 }, { BrushStyleSquare, 2 }, + { BrushStyleForeSlash, 8 }, { BrushStyleForeSlash, 5 }, { BrushStyleForeSlash, 2 }, + { BrushStyleBackSlash, 8 }, { BrushStyleBackSlash, 5 }, { BrushStyleBackSlash, 2 }, +}; + VOID CToolSettingsWindow::drawBrush(HDC hdc, LPCRECT prc) { RECT rects[12]; getBrushRects(rects, prc); - ::FillRect(hdc, &rects[toolsModel.GetBrushStyle()], (HBRUSH)(COLOR_HIGHLIGHT + 1)); - for (INT i = 0; i < 12; i++) { RECT rcItem = rects[i]; INT x = (rcItem.left + rcItem.right) / 2, y = (rcItem.top + rcItem.bottom) / 2; + INT iColor; - if (i == toolsModel.GetBrushStyle()) + const BrushStyleAndWidth& data = c_BrushPresets[i]; + if (data.width == toolsModel.GetBrushWidth() && data.style == toolsModel.GetBrushStyle()) + { iColor = COLOR_HIGHLIGHTTEXT; + ::FillRect(hdc, &rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1)); + } else + { iColor = COLOR_WINDOWTEXT; - Brush(hdc, x, y, x, y, ::GetSysColor(iColor), i); + } + + Brush(hdc, x, y, x, y, ::GetSysColor(iColor), data.style, data.width); } } @@ -383,7 +403,11 @@ LRESULT CToolSettingsWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lPar case TOOL_BRUSH: iItem = getBrushRects(rects, &rect1, &pt); if (iItem != -1) - toolsModel.SetBrushStyle(iItem); + { + const BrushStyleAndWidth& data = c_BrushPresets[iItem]; + toolsModel.SetBrushStyle(data.style); + toolsModel.SetBrushWidth(data.width); + } break; case TOOL_AIRBRUSH: iItem = getAirBrushRects(rects, &rect1, &pt); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 6b5e41d483a..07ded56ea99 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -14,8 +14,9 @@ ToolsModel toolsModel; ToolsModel::ToolsModel() { m_lineWidth = m_penWidth = 1; + m_brushWidth = 4; m_shapeStyle = 0; - m_brushStyle = 0; + m_brushStyle = BrushStyleRound; m_oldActiveTool = m_activeTool = TOOL_PEN; m_airBrushWidth = 5; m_rubberRadius = 4; @@ -68,6 +69,18 @@ void ToolsModel::SetPenWidth(INT nPenWidth) imageModel.NotifyImageChanged(); } +INT ToolsModel::GetBrushWidth() const +{ + return m_brushWidth; +} + +void ToolsModel::SetBrushWidth(INT nBrushWidth) +{ + m_brushWidth = nBrushWidth; + NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + void ToolsModel::MakeLineThickerOrThinner(BOOL bThinner) { INT thickness = GetLineWidth(); @@ -80,6 +93,12 @@ void ToolsModel::MakePenThickerOrThinner(BOOL bThinner) SetPenWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); } +void ToolsModel::MakeBrushThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetBrushWidth(); + SetBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + int ToolsModel::GetShapeStyle() const { return m_shapeStyle; @@ -91,12 +110,12 @@ void ToolsModel::SetShapeStyle(int nShapeStyle) NotifyToolSettingsChanged(); } -int ToolsModel::GetBrushStyle() const +BrushStyle ToolsModel::GetBrushStyle() const { return m_brushStyle; } -void ToolsModel::SetBrushStyle(int nBrushStyle) +void ToolsModel::SetBrushStyle(BrushStyle nBrushStyle) { m_brushStyle = nBrushStyle; NotifyToolSettingsChanged(); diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index efb63b09022..b6f2c96fbdb 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -28,6 +28,14 @@ enum TOOLTYPE TOOL_MAX = TOOL_RRECT, }; +enum BrushStyle +{ + BrushStyleRound, + BrushStyleSquare, + BrushStyleForeSlash, + BrushStyleBackSlash, +}; + /* CLASSES **********************************************************/ struct ToolBase @@ -68,8 +76,9 @@ class ToolsModel private: int m_lineWidth; INT m_penWidth; + INT m_brushWidth; int m_shapeStyle; - int m_brushStyle; + BrushStyle m_brushStyle; TOOLTYPE m_activeTool; TOOLTYPE m_oldActiveTool; int m_airBrushWidth; @@ -97,17 +106,27 @@ public: int GetShapeStyle() const; void SetShapeStyle(int nShapeStyle); - int GetBrushStyle() const; - void SetBrushStyle(int nBrushStyle); + + INT GetBrushWidth() const; + void SetBrushWidth(INT nBrushWidth); + void MakeBrushThickerOrThinner(BOOL bThinner); + + BrushStyle GetBrushStyle() const; + void SetBrushStyle(BrushStyle nBrushStyle); + TOOLTYPE GetActiveTool() const; TOOLTYPE GetOldActiveTool() const; void SetActiveTool(TOOLTYPE nActiveTool); + int GetAirBrushWidth() const; void SetAirBrushWidth(int nAirBrushWidth); + int GetRubberRadius() const; void SetRubberRadius(int nRubberRadius); + BOOL IsBackgroundTransparent() const; void SetBackgroundTransparent(BOOL bTransparent); + int GetZoom() const; void SetZoom(int nZoom);

1 year, 7 months

[reactos] 01/01: [NTOS:CM] Simplify CmpDelayAllocBucketLock code a bit (#5729)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c84b5007d07c205ff5e00… commit c84b5007d07c205ff5e00a68489e312a06ad689b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Sep 28 11:39:13 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 28 11:39:13 2023 +0200 [NTOS:CM] Simplify CmpDelayAllocBucketLock code a bit (#5729) - Remove duplicate CmpDelayAllocBucketLock definition. - Remove an else. --- ntoskrnl/config/cmalloc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/config/cmalloc.c b/ntoskrnl/config/cmalloc.c index 7d44ff82135..deabafb82bb 100644 --- a/ntoskrnl/config/cmalloc.c +++ b/ntoskrnl/config/cmalloc.c @@ -15,9 +15,9 @@ /* GLOBALS *******************************************************************/ BOOLEAN CmpAllocInited; -KGUARDED_MUTEX CmpAllocBucketLock, CmpDelayAllocBucketLock; - +KGUARDED_MUTEX CmpAllocBucketLock; LIST_ENTRY CmpFreeKCBListHead; + KGUARDED_MUTEX CmpDelayAllocBucketLock; LIST_ENTRY CmpFreeDelayItemsListHead; @@ -252,16 +252,14 @@ SearchList: /* Clear the KCB pointer */ Entry->Kcb = NULL; } - } - else - { - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return NULL; + + /* Do the search again */ + goto SearchList; } - /* Do the search again */ - goto SearchList; + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return NULL; } VOID

1 year, 7 months

[reactos] 01/01: [MSPAINT] Larger/smaller pen nib on Ctrl+Plus/Minus (#5738)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2a012240f8014566cc17… commit f2a012240f8014566cc17c407f53f2033fca1ffc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 28 16:32:36 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 28 16:32:36 2023 +0900 [MSPAINT] Larger/smaller pen nib on Ctrl+Plus/Minus (#5738) - Introduce the concept of pen width (not line width) to the tools model. - Enable changing pen/line width by Ctrl+Plus/Minus key combination in TOOL_PEN, TOOL_LINE, TOOL_BEZIER, TOOL_RECT, TOOL_SHAPE, TOO_ELLIPSE, and TOOL_RRECT tools. CORE-19094 --- base/applications/mspaint/drawing.cpp | 1 + base/applications/mspaint/mouse.cpp | 34 ++++++++++++++++----- base/applications/mspaint/toolbox.cpp | 17 +++++------ base/applications/mspaint/toolbox.h | 4 --- base/applications/mspaint/toolsmodel.cpp | 52 ++++++++++++++++++++++++++++---- base/applications/mspaint/toolsmodel.h | 8 +++++ 6 files changed, 89 insertions(+), 27 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 638e78396e2..96064fff229 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -17,6 +17,7 @@ Line(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, int thickness) HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, color)); MoveToEx(hdc, x1, y1, NULL); LineTo(hdc, x2, y2); + SetPixelV(hdc, x2, y2, color); DeleteObject(SelectObject(hdc, oldPen)); } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 70247293361..04e749db88b 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -320,6 +320,11 @@ struct TwoPointDrawTool : ToolBase m_bDrawing = FALSE; ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; typedef enum DIRECTION @@ -499,8 +504,6 @@ struct RubberTool : SmoothDrawTool Erase(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_bg, toolsModel.GetRubberRadius()); else Replace(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_fg, m_bg, toolsModel.GetRubberRadius()); - g_ptEnd.x = x; - g_ptEnd.y = y; } }; @@ -587,10 +590,12 @@ struct PenTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, 1); - ::SetPixelV(m_hdc, x, y, rgb); - g_ptEnd.x = x; - g_ptEnd.y = y; + Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetPenWidth()); + } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakePenThickerOrThinner(bMinus); } }; @@ -605,8 +610,11 @@ struct BrushTool : SmoothDrawTool { COLORREF rgb = bLeftButton ? m_fg : m_bg; Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle()); - g_ptEnd.x = x; - g_ptEnd.y = y; + } + + void OnSpecialTweak(BOOL bMinus) override + { + // TODO: } }; @@ -863,6 +871,11 @@ struct BezierTool : ToolBase m_bDrawing = FALSE; ToolBase::OnFinishDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; // TOOL_RECT @@ -991,6 +1004,11 @@ struct ShapeTool : ToolBase ToolBase::OnFinishDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; // TOOL_ELLIPSE diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index b02d4fb99b8..54d5bd8c2a4 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -20,8 +20,13 @@ CPaintToolBar::ToolBarWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam { // We have to detect clicking on toolbar even if no change of pressed button POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - INT id = (INT)SendMessage(hwnd, TB_HITTEST, 0, (LPARAM)&pt); - ::PostMessage(::GetParent(hwnd), WM_TOOLBARHIT, id, 0); + INT index = (INT)::SendMessage(hwnd, TB_HITTEST, 0, (LPARAM)&pt); + if (index >= 0) + { + TBBUTTON button; + if (::SendMessage(hwnd, TB_GETBUTTON, index, (LPARAM)&button)) + ::PostMessage(::GetParent(hwnd), WM_COMMAND, button.idCommand, 0); + } } return ::CallWindowProc(oldWndProc, hwnd, uMsg, wParam, lParam); } @@ -112,6 +117,7 @@ static const COMMAND_TO_TOOL CommandToToolMapping[] = { ID_ELLIPSE, TOOL_ELLIPSE }, { ID_RRECT, TOOL_RRECT }, }; +static_assert(_countof(CommandToToolMapping) == TOOL_MAX, "Logical error"); LRESULT CToolBox::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { @@ -183,10 +189,3 @@ LRESULT CToolBox::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa ::ReleaseCapture(); return 0; } - -LRESULT CToolBox::OnToolBarHit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - // See also: CPaintToolBar::ToolBarWndProc - selectionModel.Landing(); - return 0; -} diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index 859493407a4..291032c1fcf 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -14,8 +14,6 @@ #define CX_TOOLBAR (TOOLBAR_COLUMNS * CXY_TB_BUTTON) #define CY_TOOLBAR (TOOLBAR_ROWS * CXY_TB_BUTTON) -#define WM_TOOLBARHIT (WM_APP + 1) - class CPaintToolBar : public CWindow { public: @@ -36,7 +34,6 @@ public: MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) - MESSAGE_HANDLER(WM_TOOLBARHIT, OnToolBarHit) END_MSG_MAP() BOOL DoCreate(HWND hwndParent); @@ -51,5 +48,4 @@ private: LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnToolBarHit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index b787e6d591e..6b5e41d483a 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -13,7 +13,7 @@ ToolsModel toolsModel; ToolsModel::ToolsModel() { - m_lineWidth = 1; + m_lineWidth = m_penWidth = 1; m_shapeStyle = 0; m_brushStyle = 0; m_oldActiveTool = m_activeTool = TOOL_PEN; @@ -53,6 +53,31 @@ void ToolsModel::SetLineWidth(int nLineWidth) { m_lineWidth = nLineWidth; NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + +INT ToolsModel::GetPenWidth() const +{ + return m_penWidth; +} + +void ToolsModel::SetPenWidth(INT nPenWidth) +{ + m_penWidth = nPenWidth; + NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + +void ToolsModel::MakeLineThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetLineWidth(); + SetLineWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + +void ToolsModel::MakePenThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetPenWidth(); + SetPenWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); } int ToolsModel::GetShapeStyle() const @@ -91,23 +116,38 @@ void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) { OnFinishDraw(); + selectionModel.Landing(); + + m_activeTool = nActiveTool; + switch (m_activeTool) { case TOOL_FREESEL: case TOOL_RECTSEL: - case TOOL_RUBBER: case TOOL_COLOR: case TOOL_ZOOM: case TOOL_TEXT: + // The active tool is not an actually drawing tool break; - default: - m_oldActiveTool = m_activeTool; + case TOOL_LINE: + case TOOL_BEZIER: + case TOOL_RECT: + case TOOL_SHAPE: + case TOOL_ELLIPSE: + case TOOL_FILL: + case TOOL_AIRBRUSH: + case TOOL_RRECT: + case TOOL_RUBBER: + case TOOL_BRUSH: + case TOOL_PEN: + // The active tool is an actually drawing tool. Save it for TOOL_COLOR to restore + m_oldActiveTool = nActiveTool; break; } - m_activeTool = nActiveTool; m_pToolObject = GetOrCreateTool(m_activeTool); + NotifyToolChanged(); } @@ -189,9 +229,9 @@ void ToolsModel::NotifyZoomChanged() void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { m_pToolObject->beginEvent(); - m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); g_ptStart.x = g_ptEnd.x = x; g_ptStart.y = g_ptEnd.y = y; + m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); m_pToolObject->endEvent(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 09f48672a01..efb63b09022 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -67,6 +67,7 @@ class ToolsModel { private: int m_lineWidth; + INT m_penWidth; int m_shapeStyle; int m_brushStyle; TOOLTYPE m_activeTool; @@ -85,8 +86,15 @@ public: ~ToolsModel(); BOOL IsSelection() const; + int GetLineWidth() const; void SetLineWidth(int nLineWidth); + void MakeLineThickerOrThinner(BOOL bThinner); + + INT GetPenWidth() const; + void SetPenWidth(INT nPenWidth); + void MakePenThickerOrThinner(BOOL bThinner); + int GetShapeStyle() const; void SetShapeStyle(int nShapeStyle); int GetBrushStyle() const;

1 year, 7 months

[reactos] 01/01: [MSPAINT] "Selection Clone" and "Selection Brush" (#5734)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbc63d876c3295635a6bb… commit cbc63d876c3295635a6bb1b30993e9bd79873941 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 28 07:34:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 28 07:34:25 2023 +0900 [MSPAINT] "Selection Clone" and "Selection Brush" (#5734) - Stamp the image of the selection when the user clicks on the selection while holding down the Ctrl key. - Draw the image of the selection continuously when the user starts dragging the selection while holding down the Shift key. CORE-19094 --- base/applications/mspaint/canvas.cpp | 15 +++++++++++++++ base/applications/mspaint/history.cpp | 13 +++++++++++++ base/applications/mspaint/history.h | 1 + base/applications/mspaint/mouse.cpp | 6 ------ base/applications/mspaint/selectionmodel.cpp | 11 +++++++++++ base/applications/mspaint/selectionmodel.h | 1 + base/applications/mspaint/winproc.cpp | 10 ++++++++++ 7 files changed, 51 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index a403c8bd456..d62779f39a6 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -268,9 +268,18 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { + selectionModel.m_nSelectionBrush = 0; // Selection Brush is OFF if (bLeftButton) { CanvasToImage(pt); + if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Click is Selection Clone + { + imageModel.SelectionClone(); + } + else if (::GetKeyState(VK_SHIFT) < 0) // Shift+Dragging is Selection Brush + { + selectionModel.m_nSelectionBrush = 1; // Selection Brush is ON + } StartSelectionDrag(hitSelection, pt); } else @@ -790,6 +799,12 @@ VOID CCanvasWindow::StartSelectionDrag(HITTEST hit, POINT ptImage) VOID CCanvasWindow::SelectionDragging(POINT ptImage) { + if (selectionModel.m_nSelectionBrush) + { + imageModel.SelectionClone(selectionModel.m_nSelectionBrush == 1); + selectionModel.m_nSelectionBrush = 2; // Selection Brush is ON and drawn + } + selectionModel.Dragging(m_hitSelection, ptImage); Invalidate(FALSE); } diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index e44eca7dc4d..9e924b9e3db 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -299,3 +299,16 @@ void ImageModel::UnlockBitmap(HBITMAP hbmLocked) m_hBms[m_currInd] = hbmLocked; m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select } + +void ImageModel::SelectionClone(BOOL bUndoable) +{ + if (!selectionModel.m_bShow || ::IsRectEmpty(&selectionModel.m_rc)) + return; + + if (bUndoable) + PushImageForUndo(CopyBitmap()); + + selectionModel.DrawSelection(m_hDrawingDC, paletteModel.GetBgColor(), + toolsModel.IsBackgroundTransparent()); + NotifyImageChanged(); +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index fb369dff72c..24f1e09cd13 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -41,6 +41,7 @@ public: void NotifyImageChanged(); BOOL IsBlackAndWhite(); void PushBlackAndWhite(); + void SelectionClone(BOOL bUndoable = TRUE); protected: HDC m_hDrawingDC; // The device context for this class diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index d8e3585c252..70247293361 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -112,10 +112,7 @@ struct FreeSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) - { - selectionModel.DrawBackgroundPoly(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } if (canvasWindow.m_drawing) { @@ -208,10 +205,7 @@ struct RectSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) - { - selectionModel.DrawBackgroundRect(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } if (canvasWindow.m_drawing) { diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index c768c360744..e7263fa4e1f 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -187,6 +187,17 @@ BOOL SelectionModel::TakeOff() // Save the selection area m_rcOld = m_rc; + if (toolsModel.GetActiveTool() == TOOL_RECTSEL) + { + imageModel.PushImageForUndo(); + selectionModel.DrawBackgroundRect(imageModel.GetDC(), selectionModel.m_rgbBack); + } + else if (toolsModel.GetActiveTool() == TOOL_FREESEL) + { + imageModel.PushImageForUndo(); + selectionModel.DrawBackgroundPoly(imageModel.GetDC(), selectionModel.m_rgbBack); + } + imageModel.NotifyImageChanged(); return TRUE; } diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 1d0c1b28614..308952a6e67 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -23,6 +23,7 @@ public: CRect m_rc; // in image pixel coordinates POINT m_ptHit; // in image pixel coordinates CRect m_rcOld; // in image pixel coordinates + INT m_nSelectionBrush = 0; SelectionModel(); ~SelectionModel(); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 99658fccd52..b0330b4292d 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -704,6 +704,16 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (toolsModel.IsSelection()) { canvasWindow.cancelDrawing(); + if (toolsModel.GetActiveTool() == TOOL_FREESEL || + toolsModel.GetActiveTool() == TOOL_RECTSEL) + { + imageModel.Undo(); + if (selectionModel.m_nSelectionBrush == 2) // Selection Brush is drawn + { + imageModel.Undo(); + selectionModel.m_nSelectionBrush = 0; + } + } break; } }

1 year, 7 months

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