Ros-diffs March 2023

ros-diffs@reactos.org

18 participants
139 discussions

[reactos] 01/01: [MSPAINT] Delete needless CToolBox::OnSetCursor
by Katayama Hirofumi MZ 16 Mar '23

16 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34881b9a88951423ee6ae… commit 34881b9a88951423ee6aeab53f5e15cd3e8f6537 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 16 17:26:27 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 16 17:26:27 2023 +0900 [MSPAINT] Delete needless CToolBox::OnSetCursor CORE-18867 --- base/applications/mspaint/toolbox.cpp | 6 ------ base/applications/mspaint/toolbox.h | 1 - 2 files changed, 7 deletions(-) diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 575ad62692c..c989b882295 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -57,12 +57,6 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl return 0; } -LRESULT CToolBox::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - SetCursor(LoadCursor(NULL, IDC_ARROW)); - return 0; -} - LRESULT CToolBox::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { toolbar.SendMessage(WM_SYSCOLORCHANGE, 0, 0); diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index fc02299565b..bce32048193 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -22,7 +22,6 @@ public: BEGIN_MSG_MAP(CToolBox) MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged)

1 0

[reactos] 01/01: [NOTEPAD] Use full path for non-existent file (#5152)
by Katayama Hirofumi MZ 16 Mar '23

16 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=136f23578f26247da1618… commit 136f23578f26247da1618a5b36568bb3831b1e2d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 16 10:18:54 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 16 10:18:54 2023 +0900 [NOTEPAD] Use full path for non-existent file (#5152) In HandleCommandLine function, use GetFullPathName API to get the full path of a non-existent file. CORE-18259, CORE-18837 --- base/applications/notepad/main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index e92e1e8ec0b..3f30dd2a3fd 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -462,6 +462,7 @@ static int AlertFileDoesNotExist(LPCTSTR szFileName) static BOOL HandleCommandLine(LPTSTR cmdline) { BOOL opt_print = FALSE; + TCHAR szPath[MAX_PATH]; while (*cmdline == _T(' ') || *cmdline == _T('-') || *cmdline == _T('/')) { @@ -518,9 +519,11 @@ static BOOL HandleCommandLine(LPTSTR cmdline) } } + GetFullPathName(file_name, ARRAY_SIZE(szPath), szPath, NULL); + if (file_exists) { - DoOpenFile(file_name); + DoOpenFile(szPath); InvalidateRect(Globals.hMainWnd, NULL, FALSE); if (opt_print) { @@ -530,9 +533,10 @@ static BOOL HandleCommandLine(LPTSTR cmdline) } else { - switch (AlertFileDoesNotExist(file_name)) { + switch (AlertFileDoesNotExist(file_name)) + { case IDYES: - DoOpenFile(file_name); + DoOpenFile(szPath); break; case IDNO:

1 0

[reactos] 01/01: [REGEDIT] import Wine commit f5fe9a6 by Hugh McMaster. https://github.com/wine-mirror/wine/commit/f5fe9a6cf9121004ecdf5c0b285fcd88ec8a0d94 This removes the ROS-diff caused by CORE-18603's fix
by Robert Naumann 15 Mar '23

15 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75ac9f8477370e473541a… commit 75ac9f8477370e473541ae636215334e7023b2aa Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Tue Mar 14 20:09:19 2023 +0100 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Wed Mar 15 16:54:47 2023 +0100 [REGEDIT] import Wine commit f5fe9a6 by Hugh McMaster. https://github.com/wine-mirror/wine/commit/f5fe9a6cf9121004ecdf5c0b285fcd88… This removes the ROS-diff caused by CORE-18603's fix --- base/applications/regedit/regproc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/base/applications/regedit/regproc.c b/base/applications/regedit/regproc.c index c76c35787c5..8311a477712 100644 --- a/base/applications/regedit/regproc.c +++ b/base/applications/regedit/regproc.c @@ -1370,7 +1370,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) #define MAX_SUBKEY_LEN 257 -static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) +static void export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) { LONG rc; DWORD max_value_len = 256, value_len; @@ -1440,7 +1440,6 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) } free(subkey_name); - return 0; } static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) @@ -1492,7 +1491,6 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) HKEY key_class, key; WCHAR *subkey; FILE *fp; - BOOL ret; if (!(key_class = parse_key_name(path, &subkey))) { @@ -1505,15 +1503,12 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; fp = REGPROC_open_export_file(file_name, unicode); - ret = export_registry_data(fp, key, path, unicode); + export_registry_data(fp, key, path, unicode); export_newline(fp, unicode); fclose(fp); RegCloseKey(key); -#ifdef __REACTOS__ /* Fixes CORE-18603: Remove this when Wine Bug 54491 is fixed and synched back */ - ret = TRUE; -#endif - return ret; + return TRUE; } static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode)

1 0

[reactos] 01/01: [MSPAINT] Delete unused global variables (lfTextFont, ...
by Katayama Hirofumi MZ 15 Mar '23

15 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3625f55fbb30bd8306112… commit 3625f55fbb30bd83061128c0c5c0602386d4c295 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 15 15:09:26 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Mar 15 15:09:26 2023 +0900 [MSPAINT] Delete unused global variables (lfTextFont, ... hfontTextFont, hwndEditCtl, textToolText, and textToolTextMaxLen). CORE-18867 --- base/applications/mspaint/globalvar.h | 5 ----- base/applications/mspaint/main.cpp | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index 87f903438ba..de01287c4da 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -26,11 +26,6 @@ extern ToolsModel toolsModel; class SelectionModel; extern SelectionModel selectionModel; -extern LOGFONT lfTextFont; -extern HFONT hfontTextFont; -extern LPTSTR textToolText; -extern int textToolTextMaxLen; - class PaletteModel; extern PaletteModel paletteModel; diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 7d1f6af427b..598064d19d1 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -21,12 +21,6 @@ ToolsModel toolsModel; SelectionModel selectionModel; -LOGFONT lfTextFont; -HFONT hfontTextFont; -HWND hwndEditCtl; -LPTSTR textToolText = NULL; -int textToolTextMaxLen = 0; - PaletteModel paletteModel; RegistrySettings registrySettings; @@ -166,13 +160,6 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); #endif - /* init font for text tool */ - ZeroMemory(&lfTextFont, sizeof(lfTextFont)); - lfTextFont.lfHeight = 0; - lfTextFont.lfWeight = FW_NORMAL; - lfTextFont.lfCharSet = DEFAULT_CHARSET; - hfontTextFont = CreateFontIndirect(&lfTextFont); - hProgInstance = hThisInstance; /* initialize common controls library */

1 0

[reactos] 01/01: Fix buffer read past end problem. (#5146)
by Doug Lyons 15 Mar '23

15 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cce3eb93931163db4e463… commit cce3eb93931163db4e463650e6f44e451e77a239 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Tue Mar 14 20:57:54 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 15 10:57:54 2023 +0900 Fix buffer read past end problem. (#5146) Fixes crashes in regedit-find affecting CORE-15896 and CORE-18230. After possible RegQueryValueExW append 3 zero bytes to guarantee that we will end with a UNICODE NULL. --- base/applications/regedit/find.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/regedit/find.c b/base/applications/regedit/find.c index df5c0959347..c970a53cf51 100644 --- a/base/applications/regedit/find.c +++ b/base/applications/regedit/find.c @@ -223,7 +223,7 @@ BOOL RegFindRecurse( NULL, &cb); if (lResult != ERROR_SUCCESS) goto err; - pb = malloc(cb); + pb = malloc(cb + 3); /* To avoid buffer overrun, append 3 NULs */ if (pb == NULL) goto err; lResult = RegQueryValueExW(hSubKey, ppszNames[i], NULL, &type, @@ -231,6 +231,11 @@ BOOL RegFindRecurse( if (lResult != ERROR_SUCCESS) goto err; + /* To avoid buffer overrun, append 3 NUL bytes. + NOTE: cb can be an odd number although UNICODE_NULL is two bytes. + Two bytes at odd position is not enough to avoid buffer overrun. */ + pb[cb] = pb[cb + 1] = pb[cb + 2] = 0; + if ((s_dwFlags & RSF_LOOKATDATA) && CompareData(type, (LPWSTR) pb, s_szFindWhat)) {

1 0

[reactos] 01/01: [MSPAINT] Avoid flickering when resizing (#5144)
by Katayama Hirofumi MZ 14 Mar '23

14 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44b2a46d032fd50255f55… commit 44b2a46d032fd50255f55895dc9f7c389778e212 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 15 07:29:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 15 07:29:25 2023 +0900 [MSPAINT] Avoid flickering when resizing (#5144) - Add CPaletteWindow::OnEraseBkgnd to avoid flickering. - Add getColorBoxRect and drawColorBox helper functions to draw a color box. - Add CPaletteWindow::DoHitTest helper function to do a hit test. - Improve CPaletteWindow::OnPaint by using a memory bitmap. - Improve readability of CMainWindow::alignChildrenToMainWindow. CORE-18867 --- base/applications/mspaint/palette.cpp | 175 +++++++++++++++++++++++----------- base/applications/mspaint/palette.h | 9 ++ base/applications/mspaint/resource.h | 1 + base/applications/mspaint/toolbox.cpp | 20 ++-- base/applications/mspaint/toolbox.h | 6 ++ base/applications/mspaint/winproc.cpp | 55 ++++++----- 6 files changed, 173 insertions(+), 93 deletions(-) diff --git a/base/applications/mspaint/palette.cpp b/base/applications/mspaint/palette.cpp index 24fe9c96bf5..7795b97c28e 100644 --- a/base/applications/mspaint/palette.cpp +++ b/base/applications/mspaint/palette.cpp @@ -4,95 +4,162 @@ * FILE: base/applications/mspaint/palette.cpp * PURPOSE: Window procedure of the palette window * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -/* INCLUDES *********************************************************/ - #include "precomp.h" +/* The private metrics */ +#define CXY_SELECTEDBOX 15 /* width / height of a selected color box */ +#define X_MARGIN 4 /* horizontal margin */ +#define Y_MARGIN ((rcClient.bottom / 2) - CXY_COLORBOX) /* center position minus one color box */ +#define X_COLORBOX_OFFSET (X_MARGIN + CXY_BIGBOX + X_MARGIN) +#define COLOR_COUNT 28 +#define HALF_COLOR_COUNT (COLOR_COUNT / 2) + /* FUNCTIONS ********************************************************/ +static VOID drawColorBox(HDC hDC, LPCRECT prc, COLORREF rgbColor, UINT nBorder) +{ + RECT rc = *prc; + ::FillRect(hDC, &rc, (HBRUSH)(COLOR_3DFACE + 1)); + ::DrawEdge(hDC, &rc, nBorder, BF_RECT | BF_ADJUST); + + HBRUSH hbr = ::CreateSolidBrush(rgbColor); + ::FillRect(hDC, &rc, hbr); + ::DeleteObject(hbr); +} + +static VOID getColorBoxRect(LPRECT prc, const RECT& rcClient, INT iColor) +{ + INT dx = (iColor % HALF_COLOR_COUNT) * CXY_COLORBOX; /* delta x */ + INT dy = (iColor / HALF_COLOR_COUNT) * CXY_COLORBOX; /* delta y */ + prc->left = X_COLORBOX_OFFSET + dx; + prc->right = prc->left + CXY_COLORBOX; + prc->top = Y_MARGIN + dy; + prc->bottom = prc->top + CXY_COLORBOX; +} + +INT CPaletteWindow::DoHitTest(INT xPos, INT yPos) const +{ + RECT rcClient; + GetClientRect(&rcClient); + + /* delta x and y */ + INT dx = (xPos - X_COLORBOX_OFFSET), dy = (yPos - Y_MARGIN); + + /* horizontal and vertical indexes */ + INT ix = (dx / CXY_COLORBOX), iy = (dy / CXY_COLORBOX); + + /* Is it inside of a color box? */ + if (0 <= ix && ix < HALF_COLOR_COUNT && 0 <= iy && iy < 2) + return ix + (iy * HALF_COLOR_COUNT); /* return the color index */ + + return -1; /* Not found */ +} + +LRESULT CPaletteWindow::OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + return TRUE; /* Avoid flickering */ +} + LRESULT CPaletteWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - RECT rc = { 0, 0, 31, 32 }; - HPEN oldPen; - HBRUSH oldBrush; - int i, a, b; + RECT rc, rcClient; + GetClientRect(&rcClient); PAINTSTRUCT ps; HDC hDC = BeginPaint(&ps); - for(b = 2; b < 30; b++) - for(a = 2; a < 29; a++) - if ((a + b) % 2 == 1) - SetPixel(hDC, a, b, GetSysColor(COLOR_BTNHILIGHT)); - - DrawEdge(hDC, &rc, EDGE_RAISED, BF_TOPLEFT); - DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_TOPLEFT | BF_BOTTOMRIGHT); - SetRect(&rc, 11, 12, 26, 27); - DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); - oldPen = (HPEN) SelectObject(hDC, CreatePen(PS_NULL, 0, 0)); - oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(paletteModel.GetBgColor())); - Rectangle(hDC, rc.left, rc.top + 2, rc.right - 1, rc.bottom - 1); - DeleteObject(SelectObject(hDC, oldBrush)); - SetRect(&rc, 4, 5, 19, 20); - DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); - oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(paletteModel.GetFgColor())); - Rectangle(hDC, rc.left + 2, rc.top + 2, rc.right - 1, rc.bottom - 1); - DeleteObject(SelectObject(hDC, oldBrush)); - DeleteObject(SelectObject(hDC, oldPen)); - - for(i = 0; i < 28; i++) + /* To avoid flickering, we use a memory bitmap. + The left and top values are zeros in client rectangle */ + HDC hMemDC = ::CreateCompatibleDC(hDC); + HBITMAP hbm = ::CreateCompatibleBitmap(hDC, rcClient.right, rcClient.bottom); + HGDIOBJ hbmOld = ::SelectObject(hMemDC, hbm); + + /* Fill the background (since WM_ERASEBKGND handling is disabled) */ + ::FillRect(hMemDC, &rcClient, (HBRUSH)(COLOR_3DFACE + 1)); + + /* Draw the big box that contains the black box and the white box */ + ::SetRect(&rc, X_MARGIN, Y_MARGIN, X_MARGIN + CXY_BIGBOX, Y_MARGIN + CXY_BIGBOX); + ::DrawEdge(hMemDC, &rc, EDGE_SUNKEN, BF_RECT | BF_ADJUST); + COLORREF rgbLight = ::GetSysColor(COLOR_3DHIGHLIGHT); + for (INT y = rc.top; y < rc.bottom; ++y) + { + BOOL bLight = (y & 1); + for (INT x = rc.left; x < rc.right; ++x) + { + if (bLight) + ::SetPixelV(hMemDC, x, y, rgbLight); + bLight = !bLight; + } + } + + /* Draw the white box in the big box, at 5/8 position */ + rc.left = X_MARGIN + (CXY_BIGBOX * 5 / 8) - (CXY_SELECTEDBOX / 2); + rc.top = Y_MARGIN + (CXY_BIGBOX * 5 / 8) - (CXY_SELECTEDBOX / 2); + rc.right = rc.left + CXY_SELECTEDBOX; + rc.bottom = rc.top + CXY_SELECTEDBOX; + drawColorBox(hMemDC, &rc, paletteModel.GetBgColor(), BDR_RAISEDINNER); + + /* Draw the black box (overlapping the white box), at 3/8 position */ + rc.left = X_MARGIN + (CXY_BIGBOX * 3 / 8) - (CXY_SELECTEDBOX / 2); + rc.top = Y_MARGIN + (CXY_BIGBOX * 3 / 8) - (CXY_SELECTEDBOX / 2); + rc.right = rc.left + CXY_SELECTEDBOX; + rc.bottom = rc.top + CXY_SELECTEDBOX; + drawColorBox(hMemDC, &rc, paletteModel.GetFgColor(), BDR_RAISEDINNER); + + /* Draw the normal color boxes */ + for (INT i = 0; i < COLOR_COUNT; i++) { - SetRect(&rc, 31 + (i % 14) * 16, - 0 + (i / 14) * 16, 16 + 31 + (i % 14) * 16, 16 + 0 + (i / 14) * 16); - DrawEdge(hDC, &rc, EDGE_RAISED, BF_TOPLEFT); - DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_RECT); - oldPen = (HPEN) SelectObject(hDC, CreatePen(PS_NULL, 0, 0)); - oldBrush = (HBRUSH) SelectObject(hDC, CreateSolidBrush(paletteModel.GetColor(i))); - Rectangle(hDC, rc.left + 2, rc.top + 2, rc.right - 1, rc.bottom - 1); - DeleteObject(SelectObject(hDC, oldBrush)); - DeleteObject(SelectObject(hDC, oldPen)); + getColorBoxRect(&rc, rcClient, i); + drawColorBox(hMemDC, &rc, paletteModel.GetColor(i), BDR_SUNKENOUTER); } + + /* Transfer bits (hDC <-- hMemDC) */ + ::BitBlt(hDC, 0, 0, rcClient.right, rcClient.bottom, hMemDC, 0, 0, SRCCOPY); + + ::SelectObject(hMemDC, hbmOld); + ::DeleteDC(hMemDC); EndPaint(&ps); return 0; } LRESULT CPaletteWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (GET_X_LPARAM(lParam) >= 31) - paletteModel.SetFgColor(paletteModel.GetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14)); + INT iColor = DoHitTest(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + if (iColor != -1) + paletteModel.SetFgColor(paletteModel.GetColor(iColor)); return 0; } LRESULT CPaletteWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (GET_X_LPARAM(lParam) >= 31) - paletteModel.SetBgColor(paletteModel.GetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14)); + INT iColor = DoHitTest(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + if (iColor != -1) + paletteModel.SetBgColor(paletteModel.GetColor(iColor)); return 0; } LRESULT CPaletteWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (GET_X_LPARAM(lParam) >= 31) - if (ChooseColor(&choosecolor)) - { - paletteModel.SetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14, - choosecolor.rgbResult); - paletteModel.SetFgColor(choosecolor.rgbResult); - } + INT iColor = DoHitTest(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + if (iColor != -1 && ChooseColor(&choosecolor)) + { + paletteModel.SetColor(iColor, choosecolor.rgbResult); + paletteModel.SetFgColor(choosecolor.rgbResult); + } return 0; } LRESULT CPaletteWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (GET_X_LPARAM(lParam) >= 31) - if (ChooseColor(&choosecolor)) - { - paletteModel.SetColor((GET_X_LPARAM(lParam) - 31) / 16 + (GET_Y_LPARAM(lParam) / 16) * 14, - choosecolor.rgbResult); - paletteModel.SetBgColor(choosecolor.rgbResult); - } + INT iColor = DoHitTest(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + if (iColor != -1 && ChooseColor(&choosecolor)) + { + paletteModel.SetColor(iColor, choosecolor.rgbResult); + paletteModel.SetBgColor(choosecolor.rgbResult); + } return 0; } diff --git a/base/applications/mspaint/palette.h b/base/applications/mspaint/palette.h index ca84fc5e9d3..13a7b1663be 100644 --- a/base/applications/mspaint/palette.h +++ b/base/applications/mspaint/palette.h @@ -8,12 +8,17 @@ #pragma once +#define CXY_COLORBOX 16 /* width / height of a normal color box */ +#define CXY_BIGBOX (CXY_COLORBOX * 2) /* width / height of the big box */ +#define CY_PALETTE (8 + CXY_BIGBOX + 8) + class CPaletteWindow : public CWindowImpl<CPaletteWindow> { public: DECLARE_WND_CLASS_EX(_T("Palette"), CS_DBLCLKS, COLOR_BTNFACE) BEGIN_MSG_MAP(CPaletteWindow) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) @@ -23,6 +28,7 @@ public: MESSAGE_HANDLER(WM_PALETTEMODELPALETTECHANGED, OnPaletteModelPaletteChanged) END_MSG_MAP() + LRESULT OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -30,4 +36,7 @@ public: LRESULT OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelPaletteChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + +protected: + INT DoHitTest(INT xPos, INT yPos) const; }; diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 3e563416309..fed82f9e1f0 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -119,6 +119,7 @@ #define ID_SHAPE 613 #define ID_ELLIPSE 614 #define ID_RRECT 615 +#define NUM_TOOLS (ID_RRECT - ID_FREESEL + 1) #define ID_ACCELERATORS 800 diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index d11917b5cac..575ad62692c 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -18,15 +18,13 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl HIMAGELIST hImageList; HBITMAP tempBm; int i; - TCHAR tooltips[16][30]; - - /* - * FIXME: Unintentionally there is a line above the tool bar (hidden by y-offset). - * To prevent cropping of the buttons height has been increased from 200 to 205 - */ - RECT toolbarPos = {1, -2, 1 + 50, -2 + 205}; - toolbar.Create(TOOLBARCLASSNAME, m_hWnd, toolbarPos, NULL, - WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS); + TCHAR tooltips[NUM_TOOLS][30]; + + /* NOTE: The horizontal line above the toolbar is hidden by CCS_NODIVIDER style. */ + RECT toolbarPos = {0, 0, CX_TOOLBAR, CY_TOOLBAR}; + DWORD style = WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | + TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_NODIVIDER; + toolbar.Create(TOOLBARCLASSNAME, m_hWnd, toolbarPos, NULL, style); hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); toolbar.SendMessage(TB_SETIMAGELIST, 0, (LPARAM) hImageList); tempBm = (HBITMAP) LoadImage(hProgInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), IMAGE_BITMAP, 256, 16, 0); @@ -34,7 +32,7 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl DeleteObject(tempBm); toolbar.SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - for(i = 0; i < 16; i++) + for (i = 0; i < NUM_TOOLS; i++) { TBBUTTON tbbutton; int wrapnow = 0; @@ -54,7 +52,7 @@ LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl toolbar.SendMessage(TB_CHECKBUTTON, ID_PEN, MAKELPARAM(TRUE, 0)); toolbar.SendMessage(TB_SETMAXTEXTROWS, 0, 0); - toolbar.SendMessage(TB_SETBUTTONSIZE, 0, MAKELPARAM(25, 25)); + toolbar.SendMessage(TB_SETBUTTONSIZE, 0, MAKELPARAM(CXY_TB_BUTTON, CXY_TB_BUTTON)); return 0; } diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index f7cdfc91288..fc02299565b 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -9,6 +9,12 @@ #pragma once +#define TOOLBAR_ROWS 8 +#define TOOLBAR_COLUMNS 2 +#define CXY_TB_BUTTON 25 +#define CX_TOOLBAR ((TOOLBAR_COLUMNS * CXY_TB_BUTTON) + 2) +#define CY_TOOLBAR ((TOOLBAR_ROWS * CXY_TB_BUTTON) + 2) + class CToolBox : public CWindowImpl<CToolBox> { public: diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 3a064799c40..366e711ed06 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -47,45 +47,45 @@ zoomTo(int newZoom, int mouseX, int mouseY) void CMainWindow::alignChildrenToMainWindow() { - int x, y, w, h; - RECT clientRect; + RECT clientRect, rc; GetClientRect(&clientRect); + RECT rcSpace = clientRect; - if (::IsWindowVisible(toolBoxContainer)) + if (::IsWindowVisible(hStatusBar)) { - x = 56; - w = clientRect.right - 56; + ::GetWindowRect(hStatusBar, &rc); + rcSpace.bottom -= rc.bottom - rc.top; } - else + + HDWP hDWP = ::BeginDeferWindowPos(3); + + if (::IsWindowVisible(toolBoxContainer)) { - x = 0; - w = clientRect.right; + hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, + rcSpace.left, rcSpace.top, + CX_TOOLBAR, rcSpace.bottom - rcSpace.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + rcSpace.left += CX_TOOLBAR; } + if (::IsWindowVisible(paletteWindow)) { - y = 49; - h = clientRect.bottom - 49; - } - else - { - y = 3; - h = clientRect.bottom - 3; + hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, + rcSpace.left, rcSpace.top, + rcSpace.right - rcSpace.left, CY_PALETTE, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + rcSpace.top += CY_PALETTE; } - INT statusBarHeight = 0; - if (::IsWindowVisible(hStatusBar)) + if (scrollboxWindow.IsWindow()) { - RECT Rect; - INT borders[3]; - ::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&Rect); - ::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&borders); - statusBarHeight = Rect.bottom - Rect.top + borders[1]; + hDWP = ::DeferWindowPos(hDWP, scrollboxWindow, NULL, + rcSpace.left, rcSpace.top, + rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); } - if (scrollboxWindow.IsWindow()) - scrollboxWindow.MoveWindow(x, y, w, h - statusBarHeight, TRUE); - if (paletteWindow.IsWindow()) - paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); + ::EndDeferWindowPos(hDWP); } void CMainWindow::saveImage(BOOL overwrite) @@ -369,11 +369,10 @@ LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHand int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; if (::IsWindow(hStatusBar)) { - ::SendMessage(hStatusBar, WM_SIZE, wParam, lParam); + ::SendMessage(hStatusBar, WM_SIZE, 0, 0); ::SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); } alignChildrenToMainWindow(); - Invalidate(TRUE); return 0; }

1 0

[reactos] 01/01: [NOTEPAD] Delete license.c (no use) (#5159)
by Katayama Hirofumi MZ 14 Mar '23

14 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5840df9e9a6fe3055d78… commit f5840df9e9a6fe3055d7838a5704d0b5e2393847 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 15 07:28:15 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 15 07:28:15 2023 +0900 [NOTEPAD] Delete license.c (no use) (#5159) File license.c is not used. Reduce source code. CORE-18837 --- base/applications/notepad/license.c | 42 ------------------------------------- 1 file changed, 42 deletions(-) diff --git a/base/applications/notepad/license.c b/base/applications/notepad/license.c deleted file mode 100644 index c218e273451..00000000000 --- a/base/applications/notepad/license.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Notepad (license.h) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "notepad.h" - -VOID WineLicense(HWND Wnd) -{ - /* FIXME: should load strings from resources */ - LICENSE *License = &WineLicense_En; - MessageBoxA(Wnd, - License->License, - License->LicenseCaption, - MB_ICONINFORMATION | MB_OK); -} - - -VOID WineWarranty(HWND Wnd) -{ - /* FIXME: should load strings from resources */ - LICENSE *License = &WineLicense_En; - MessageBoxA(Wnd, - License->Warranty, - License->WarrantyCaption, - MB_ICONEXCLAMATION | MB_OK); -}

1 0

[reactos] 01/01: [NOTEPAD] Use new-style file header (#5160)
by Katayama Hirofumi MZ 14 Mar '23

14 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb1d9d722deae47f7c4d9… commit fb1d9d722deae47f7c4d9d0f2b48f2d752f66b71 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 15 07:27:29 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 15 07:27:29 2023 +0900 [NOTEPAD] Use new-style file header (#5160) CORE-18837 --- base/applications/notepad/dialog.c | 27 +++++++-------------------- base/applications/notepad/dialog.h | 21 ++++----------------- base/applications/notepad/main.c | 29 ++++++++--------------------- base/applications/notepad/notepad_res.h | 23 +++++------------------ base/applications/notepad/printing.c | 5 ++++- base/applications/notepad/rsrc.rc | 21 +++++---------------- base/applications/notepad/settings.c | 25 ++++++------------------- base/applications/notepad/text.c | 27 +++++++-------------------- 8 files changed, 46 insertions(+), 132 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 5c78dadc39a..cc5efe0743f 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -1,24 +1,11 @@ /* - * Notepad (dialog.c) - * - * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "notepad.h" diff --git a/base/applications/notepad/dialog.h b/base/applications/notepad/dialog.h index 43b70b4fa12..c9681df92f0 100644 --- a/base/applications/notepad/dialog.h +++ b/base/applications/notepad/dialog.h @@ -1,21 +1,8 @@ /* - * Notepad (dialog.h) - * - * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> */ #pragma once diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index f9e437f7720..e92e1e8ec0b 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -1,25 +1,12 @@ /* - * Notepad - * - * Copyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au> - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * Copyright 2020-2023 Katayama Hirofumi MZ - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au> + * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * Copyright 2020-2023 Katayama Hirofumi MZ */ #include "notepad.h" diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index 153590f67b8..36260a98d7d 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -1,22 +1,9 @@ /* - * Constants, used in resources. - * - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk */ #pragma once diff --git a/base/applications/notepad/printing.c b/base/applications/notepad/printing.c index 7040ec3498f..be15b2ecb0a 100644 --- a/base/applications/notepad/printing.c +++ b/base/applications/notepad/printing.c @@ -2,7 +2,10 @@ * PROJECT: ReactOS Notepad * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS - * COPYRIGHT: Copyright 2020-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * Copyright 2020-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "notepad.h" diff --git a/base/applications/notepad/rsrc.rc b/base/applications/notepad/rsrc.rc index d4f99a341cc..4d18985f8bf 100644 --- a/base/applications/notepad/rsrc.rc +++ b/base/applications/notepad/rsrc.rc @@ -1,20 +1,9 @@ /* - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> */ #include <windef.h> diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 92039ffa18d..5295a06f025 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -1,23 +1,10 @@ /* - * Notepad (settings.c) - * - * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk */ #include "notepad.h" diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 8b8de3c9c1a..a0ad8640eb0 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -1,24 +1,11 @@ /* - * Notepad (text.c) - * - * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * Copyright 2019-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * Copyright 2019-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "notepad.h"

1 0

[reactos] 01/01: [SHELL32] Give opportunity to rename file/folder on its creation (#5139)
by Jose Carlos Jesus 14 Mar '23

14 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8c4d589b1e49c78dcafe… commit b8c4d589b1e49c78dcafefb2252345632b6d0c6f Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Mar 14 18:27:14 2023 -0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 14 22:27:14 2023 +0100 [SHELL32] Give opportunity to rename file/folder on its creation (#5139) * [SHELL32] Fix issue when creating a new file or folder. No chance to rename the displayed name. The CNewMenu::SelectNewItem method starts with a request to notify the View object about a new item by calling SHChangeNotify. After creating and obtaining the new PIDL by calling ILFindLastID, the CDefView::SelectItem method is called. This method fails right from the start when calling LV_FindItemByPidl which returns -1, thus preventing the user from being given the opportunity to change the name displayed by default. This failure is due to the fact that this object has not yet been added to the CDefView::m_ListView list. This is caused by the asynchronous nature of SHChangeNotify. Thanks to Giannis Adamopoulos for the big help. --- dll/win32/shell32/CDefView.cpp | 1 - dll/win32/shell32/CDefaultContextMenu.cpp | 2 +- dll/win32/shell32/CNewMenu.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 6b51d9e83cd..7cf9160df58 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -990,7 +990,6 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl) lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0); m_ListView.SetItem(&lvItem); m_ListView.Update(nItem); - m_ListView.EditLabel(nItem); return TRUE; } diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 2559e6e0438..577e93d332e 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -926,7 +926,7 @@ CDefaultContextMenu::DoCreateNewFolder( CComPtr<IShellView> psv; /* Notify the view object about the new item */ - SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, (LPCVOID)wszName, NULL); + SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW | SHCNF_FLUSH, (LPCVOID)wszName, NULL); if (!m_site) return S_OK; diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index f3ec59cf3da..a02314b1d8e 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -418,7 +418,7 @@ HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName, BOOL dwSelectFlags |= SVSI_EDIT; /* Notify the view object about the new item */ - SHChangeNotify(wEventId, uFlags, (LPCVOID) pszName, NULL); + SHChangeNotify(wEventId, uFlags | SHCNF_FLUSH, (LPCVOID)pszName, NULL); if (!m_pSite) return S_OK;

1 0

[reactos] 01/01: [MSPAINT] CImageAreaWindow should inherit CWindowImpl<CImgAreaWindow>
by Katayama Hirofumi MZ 14 Mar '23

14 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b6b1b3513276556c31cc… commit 9b6b1b3513276556c31cc39672c7bbb0ac9a75c7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 14 14:17:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Mar 14 14:17:40 2023 +0900 [MSPAINT] CImageAreaWindow should inherit CWindowImpl<CImgAreaWindow> ... instead of CWindowImpl<CMainWindow>. CORE-18867 --- base/applications/mspaint/imgarea.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/imgarea.h b/base/applications/mspaint/imgarea.h index 384b8ac3ff4..306c94088e9 100644 --- a/base/applications/mspaint/imgarea.h +++ b/base/applications/mspaint/imgarea.h @@ -10,7 +10,7 @@ #pragma once -class CImgAreaWindow : public CWindowImpl<CMainWindow> +class CImgAreaWindow : public CWindowImpl<CImgAreaWindow> { public: CImgAreaWindow() : drawing(FALSE)

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2023