Ros-diffs April 2023

ros-diffs@reactos.org

17 participants
89 discussions

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b27d08576b07e467a561… commit 2b27d08576b07e467a561591e815d33f408907ac Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 5 01:53:32 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 5 01:53:32 2023 +0200 Grmbl... --- ntoskrnl/io/iomgr/driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 0ba5657000a..245bf5ea478 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -11,10 +11,9 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#include <mm/ARM3/miarm.h> - #define NDEBUG #include <debug.h> +#include <mm/ARM3/miarm.h> /* GLOBALS ********************************************************************/

1 year, 6 months

[reactos] 01/01: [NTOS:IO] ... and fix build by adding missing header.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=143f8549a592382788607… commit 143f8549a592382788607820563941df8cbda7b5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 5 01:45:32 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 5 01:45:32 2023 +0200 [NTOS:IO] ... and fix build by adding missing header. --- ntoskrnl/io/iomgr/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 82fc3c62e15..0ba5657000a 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -11,6 +11,8 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> +#include <mm/ARM3/miarm.h> + #define NDEBUG #include <debug.h>

1 year, 6 months

[reactos] 01/01: [NTOS:IO] Avoid magic value in LdrProcessDriverModule.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c6f7c01e559d43cff7ee… commit 4c6f7c01e559d43cff7ee0e2686891eac4ba8b0c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 5 01:39:32 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 5 01:39:32 2023 +0200 [NTOS:IO] Avoid magic value in LdrProcessDriverModule. --- ntoskrnl/io/iomgr/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 498b09ea40f..82fc3c62e15 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -710,7 +710,7 @@ LdrProcessDriverModule(PLDR_DATA_TABLE_ENTRY LdrEntry, { NTSTATUS Status; UNICODE_STRING BaseName, BaseDirectory; - PLOAD_IMPORTS LoadedImports = (PVOID)-2; + PLOAD_IMPORTS LoadedImports = MM_SYSLDR_NO_IMPORTS; PCHAR MissingApiName, Buffer; PWCHAR MissingDriverName; PVOID DriverBase = LdrEntry->DllBase;

1 year, 6 months

[reactos] 01/01: [SHIMGVW] Update the display window when selecting the Previous/Next picture. (#5223)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b35e46903663b94f47a4… commit 8b35e46903663b94f47a48195d1f65ea53c71bd7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 4 22:07:55 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Apr 4 22:14:14 2023 +0200 [SHIMGVW] Update the display window when selecting the Previous/Next picture. (#5223) Patch by KRosUser. CORE-18905 --- dll/win32/shimgvw/shimgvw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index f8ff14e3f8b..47a34662826 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -537,6 +537,9 @@ pLoadImageFromNode(SHIMGVW_FILENODE *node, HWND hwnd) } EnableToolBarButtons(image != NULL); + + /* Redraw the display window */ + InvalidateRect(hwnd, NULL, FALSE); } static SHIMGVW_FILENODE*

1 year, 6 months

[reactos] 01/01: [SDK] Shorten autogenerated Copyright strings (#5210)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99e5f51d5b0398d2a9000… commit 99e5f51d5b0398d2a90005dfa3f838cca644d40b Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Tue Apr 4 12:10:59 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 4 12:10:59 2023 +0200 [SDK] Shorten autogenerated Copyright strings (#5210) that we do compile into almost every dll and exe. Reduces unnecessary scrolling in the Versions tab of file properties dlg, which precedes the Copyright phrase anyway. MS also uses shorter strings and therefore doesn't require to scroll at all. See attached screenshots in the PR. --- sdk/include/reactos/version.rc | 2 +- sdk/include/reactos/wine/wine_common_ver.rc | 24 +++++------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/sdk/include/reactos/version.rc b/sdk/include/reactos/version.rc index 498c0c788d2..32c612b65a9 100644 --- a/sdk/include/reactos/version.rc +++ b/sdk/include/reactos/version.rc @@ -19,7 +19,7 @@ #define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Project" #define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component" #define REACTOS_DEFAULT_STR_INTERNAL_NAME "" -#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1996-" COPYRIGHT_YEAR " ReactOS Project" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "(C) 1996-" COPYRIGHT_YEAR " ReactOS Project" #define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System" /* Set defaults for everything, unless overridden */ diff --git a/sdk/include/reactos/wine/wine_common_ver.rc b/sdk/include/reactos/wine/wine_common_ver.rc index 936fd33bc54..a9893689686 100644 --- a/sdk/include/reactos/wine/wine_common_ver.rc +++ b/sdk/include/reactos/wine/wine_common_ver.rc @@ -1,20 +1,7 @@ /* - * Copyright 2001 Dmitry Timoshkov - * Copyright 2004 Ivan Leo Puoti - * - * 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 St, Fifth Floor, Boston, MA 02110-1301, USA + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * COPYRIGHT: Copyright 2001 Dmitry Timoshkov + * Copyright 2004 Ivan Leo Puoti */ #include "windef.h" @@ -59,9 +46,8 @@ /* Credit the Wine team */ #define REACTOS_STR_COMPANY_NAME "ReactOS Project/Wine Team\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1996-" COPYRIGHT_YEAR " ReactOS Project, 1993-" COPYRIGHT_YEAR " the Wine project authors\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (c) 1993-" COPYRIGHT_YEAR " the Wine project authors " \ - "(see the file AUTHORS for a complete list)" +#define REACTOS_STR_LEGAL_COPYRIGHT "(C) 1996-" COPYRIGHT_YEAR " ReactOS Project, 1993-" COPYRIGHT_YEAR " the Wine project authors\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "(C) 1993-" COPYRIGHT_YEAR " the Wine project authors" #define REACTOS_VERSION_DLL

1 year, 6 months

[reactos] 01/01: [COMCTL32][USER32] EDIT: WM_SETFONT for IME (#5214)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b356adbc5d29edf1bf39… commit 2b356adbc5d29edf1bf3910f7c59663475abfabc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 4 19:09:21 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 4 19:09:21 2023 +0900 [COMCTL32][USER32] EDIT: WM_SETFONT for IME (#5214) - Call ImmSetCompositionFontW in WM_SETFONT handling of EDIT controls if necessary. - If the specified font is NULL, then use DEFAULT_GUI_FONT. CORE-11700 --- dll/win32/comctl32/edit.c | 12 ++++++++++++ win32ss/user/user32/controls/edit.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index 2ac526e2473..2e7322077fa 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -3766,6 +3766,18 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) es->flags & EF_AFTER_WRAP); ShowCaret(es->hwndSelf); } +#ifdef __REACTOS__ + if (ImmIsIME(GetKeyboardLayout(0))) + { + LOGFONTW lf; + HIMC hIMC = ImmGetContext(es->hwndSelf); + if (font == NULL) + font = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + GetObjectW(font, sizeof(lf), &lf); + ImmSetCompositionFontW(hIMC, &lf); + ImmReleaseContext(es->hwndSelf, hIMC); + } +#endif } diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 89ab481f7da..c9e4faaed53 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -53,6 +53,8 @@ #define ImmLockIMC IMM_FN(ImmLockIMC) #define ImmUnlockIMC IMM_FN(ImmUnlockIMC) #define ImmNotifyIME IMM_FN(ImmNotifyIME) +#define ImmIsIME IMM_FN(ImmIsIME) +#define ImmSetCompositionFontW IMM_FN(ImmSetCompositionFontW) #endif WINE_DEFAULT_DEBUG_CHANNEL(edit); @@ -3972,6 +3974,18 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) es->flags & EF_AFTER_WRAP); ShowCaret(es->hwndSelf); } +#ifdef __REACTOS__ + if (ImmIsIME(GetKeyboardLayout(0))) + { + LOGFONTW lf; + HIMC hIMC = ImmGetContext(es->hwndSelf); + if (font == NULL) + font = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + GetObjectW(font, sizeof(lf), &lf); + ImmSetCompositionFontW(hIMC, &lf); + ImmReleaseContext(es->hwndSelf, hIMC); + } +#endif }

1 year, 6 months

[reactos] 01/01: [MSPAINT] Allow paletteWindow to be bottom-aligned (#5216)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0c657074dcfeefe2888c… commit d0c657074dcfeefe2888c1c3569ad2d7822185c2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 4 19:06:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 4 19:06:06 2023 +0900 [MSPAINT] Allow paletteWindow to be bottom-aligned (#5216) The user will be able to move the palette window to bottom by dragging. - Add Bar1ID registry setting. - Move paletteWindow to top or bottom in mainWindow's WM_SIZE handling. - Track the mouse dragging on paletteWindow. - If the dragging is beyond the center point, then move paletteWindow. CORE-18867 --- base/applications/mspaint/palette.cpp | 34 ++++++++++++++++++++++++++++++++++ base/applications/mspaint/palette.h | 4 ++++ base/applications/mspaint/registry.cpp | 13 +++++++++++++ base/applications/mspaint/registry.h | 6 ++++++ base/applications/mspaint/toolbox.cpp | 2 +- base/applications/mspaint/winproc.cpp | 21 ++++++++++++++++----- 6 files changed, 74 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/palette.cpp b/base/applications/mspaint/palette.cpp index 161d056ba92..920af27d250 100644 --- a/base/applications/mspaint/palette.cpp +++ b/base/applications/mspaint/palette.cpp @@ -132,6 +132,7 @@ LRESULT CPaletteWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, B INT iColor = DoHitTest(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); if (iColor != -1) paletteModel.SetFgColor(paletteModel.GetColor(iColor)); + SetCapture(); return 0; } @@ -178,3 +179,36 @@ LRESULT CPaletteWindow::OnPaletteModelPaletteChanged(UINT nMsg, WPARAM wParam, L InvalidateRect(NULL, FALSE); return 0; } + +LRESULT CPaletteWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (::GetCapture() != m_hWnd) + return 0; + + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + ClientToScreen(&pt); + + RECT rc; + mainWindow.GetWindowRect(&rc); + + POINT ptCenter = { (rc.left + rc.right) / 2, (rc.top + rc.bottom) / 2 }; + + DWORD dwExpectedBar1ID = ((pt.y < ptCenter.y) ? BAR1ID_TOP : BAR1ID_BOTTOM); + + if (registrySettings.Bar1ID != dwExpectedBar1ID) + { + registrySettings.Bar1ID = dwExpectedBar1ID; + mainWindow.PostMessage(WM_SIZE, 0, 0); + } + + return 0; +} + +LRESULT CPaletteWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (::GetCapture() != m_hWnd) + return 0; + + ::ReleaseCapture(); + return 0; +} diff --git a/base/applications/mspaint/palette.h b/base/applications/mspaint/palette.h index 13a7b1663be..c9e09e92708 100644 --- a/base/applications/mspaint/palette.h +++ b/base/applications/mspaint/palette.h @@ -24,6 +24,8 @@ public: MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClk) MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnRButtonDblClk) + MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) + MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) MESSAGE_HANDLER(WM_PALETTEMODELPALETTECHANGED, OnPaletteModelPaletteChanged) END_MSG_MAP() @@ -34,6 +36,8 @@ public: LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnLButtonUp(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); diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index 5a2b15121e3..ecff8a5df30 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -75,6 +75,7 @@ void RegistrySettings::LoadPresets(INT nCmdShow) ShowStatusBar = TRUE; ShowPalette = TRUE; ShowToolBox = TRUE; + Bar1ID = BAR1ID_TOP; Bar2ID = BAR2ID_LEFT; LOGFONT lf; @@ -142,6 +143,12 @@ void RegistrySettings::Load(INT nCmdShow) ReadString(text, _T("TypeFaceName"), strFontName, strFontName); } + CRegKey bar1; + if (bar1.Open(paint, _T("General-Bar1"), KEY_READ) == ERROR_SUCCESS) + { + ReadDWORD(bar1, _T("BarID"), Bar1ID); + } + CRegKey bar2; if (bar2.Open(paint, _T("General-Bar2"), KEY_READ) == ERROR_SUCCESS) { @@ -220,6 +227,12 @@ void RegistrySettings::Store() text.SetStringValue(_T("TypeFaceName"), strFontName); } + CRegKey bar1; + if (bar1.Create(paint, _T("General-Bar1")) == ERROR_SUCCESS) + { + bar1.SetDWORDValue(_T("BarID"), Bar1ID); + } + CRegKey bar2; if (bar2.Create(paint, _T("General-Bar2")) == ERROR_SUCCESS) { diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index 7749328cd10..bc77c4b4423 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -43,8 +43,14 @@ public: DWORD ShowStatusBar; DWORD ShowPalette; DWORD ShowToolBox; + DWORD Bar1ID; DWORD Bar2ID; +// Values for Bar1ID. +// I think these values are Win2k3 mspaint compatible but sometimes not working... +#define BAR1ID_TOP 0x0000e81b +#define BAR1ID_BOTTOM 0x0000e81e + // Values for Bar2ID. // I think these values are Win2k3 mspaint compatible but sometimes not working... #define BAR2ID_LEFT 0x0000e81c diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index c7a4667ac87..7e772a5bb6c 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -147,7 +147,7 @@ LRESULT CToolBox::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa RECT rc; mainWindow.GetWindowRect(&rc); - POINT ptCenter = { (rc.left + rc.right) / 2, (rc.bottom - rc.top) / 2 }; + POINT ptCenter = { (rc.left + rc.right) / 2, (rc.top + rc.bottom) / 2 }; DWORD dwExpectedBar2ID = ((pt.x < ptCenter.x) ? BAR2ID_LEFT : BAR2ID_RIGHT); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 66e29e742b3..c709750b2e3 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -108,11 +108,22 @@ void CMainWindow::alignChildrenToMainWindow() if (::IsWindowVisible(paletteWindow)) { - 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; + if (registrySettings.Bar1ID == BAR1ID_BOTTOM) + { + hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, + rcSpace.left, rcSpace.bottom - CY_PALETTE, + rcSpace.right - rcSpace.left, CY_PALETTE, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + rcSpace.bottom -= CY_PALETTE; + } + else + { + 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; + } } if (canvasWindow.IsWindow())

1 year, 6 months

[reactos] 01/01: [FREELDR] Implement the memory managment functions for UEFI (#5174)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccef43f3b0dcc2ee472d4… commit ccef43f3b0dcc2ee472d497ae09cf8ead9c0bf06 Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Mon Apr 3 08:33:20 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 3 17:33:20 2023 +0200 [FREELDR] Implement the memory managment functions for UEFI (#5174) CORE-11954 - EFI binaries have a different subsystem in the PE header; - ENVIRON: Make sure INTN and UINTN are 64bit for 64bit platforms; - Handle UEFI Memory maps and translate it for freeldr; - Add FAILED_TO_EXIT_BOOTSERVICES Freeldr BSoD code. --- boot/environ/include/efi/ProcessorBind.h | 13 ++ boot/freeldr/freeldr/arch/uefi/stubs.c | 16 +- boot/freeldr/freeldr/arch/uefi/ueficon.c | 4 +- boot/freeldr/freeldr/arch/uefi/uefildr.c | 4 +- boot/freeldr/freeldr/arch/uefi/uefimem.c | 312 +++++++++++++++++++++++++++++ boot/freeldr/freeldr/arch/uefi/uefisetup.c | 4 +- boot/freeldr/freeldr/arch/uefi/uefiutil.c | 4 +- boot/freeldr/freeldr/arch/uefi/uefivid.c | 4 +- boot/freeldr/freeldr/include/debug.h | 3 + boot/freeldr/freeldr/lib/debug.c | 3 + boot/freeldr/freeldr/lib/mm/meminit.c | 2 + boot/freeldr/freeldr/uefi.cmake | 1 + 12 files changed, 346 insertions(+), 24 deletions(-) diff --git a/boot/environ/include/efi/ProcessorBind.h b/boot/environ/include/efi/ProcessorBind.h index 3f73c61d478..bf1dd4c28a3 100644 --- a/boot/environ/include/efi/ProcessorBind.h +++ b/boot/environ/include/efi/ProcessorBind.h @@ -197,6 +197,7 @@ typedef signed char CHAR8; typedef signed char INT8; #endif +#ifndef _WIN64 /// /// Unsigned value of native width. (4 bytes on supported 32-bit processor instructions; /// 8 bytes on supported 64-bit processor instructions.) @@ -207,6 +208,18 @@ typedef UINT32 UINTN; /// 8 bytes on supported 64-bit processor instructions.) /// typedef INT32 INTN; +#else +/// +/// Unsigned value of native width. (4 bytes on supported 32-bit processor instructions; +/// 8 bytes on supported 64-bit processor instructions.) +/// +typedef UINT64 UINTN; +/// +/// Signed value of native width. (4 bytes on supported 32-bit processor instructions; +/// 8 bytes on supported 64-bit processor instructions.) +/// +typedef INT64 INTN; +#endif // // Processor specific defines diff --git a/boot/freeldr/freeldr/arch/uefi/stubs.c b/boot/freeldr/freeldr/arch/uefi/stubs.c index b3d574fb00f..75f7ee0fc8b 100644 --- a/boot/freeldr/freeldr/arch/uefi/stubs.c +++ b/boot/freeldr/freeldr/arch/uefi/stubs.c @@ -1,7 +1,7 @@ /* - * PROJECT: Freeldr UEFI Extension + * PROJECT: FreeLoader UEFI Support * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: UEFI stubs + * PURPOSE: Function stubs * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> */ @@ -41,12 +41,6 @@ UefiVideoSync(VOID) } -PFREELDR_MEMORY_DESCRIPTOR -UefiMemGetMemoryMap(ULONG *MemoryMapSize) -{ - return 0; -} - VOID UefiGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize) @@ -94,12 +88,6 @@ UefiHwDetect(VOID) return 0; } -VOID -UefiPrepareForReactOS(VOID) -{ - -} - VOID UefiPcBeep(VOID) { diff --git a/boot/freeldr/freeldr/arch/uefi/ueficon.c b/boot/freeldr/freeldr/arch/uefi/ueficon.c index 78c67d9c6e8..944d9707bc7 100644 --- a/boot/freeldr/freeldr/arch/uefi/ueficon.c +++ b/boot/freeldr/freeldr/arch/uefi/ueficon.c @@ -1,7 +1,7 @@ /* - * PROJECT: Freeldr UEFI Extension + * PROJECT: FreeLoader UEFI Support * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: UEFI Console output + * PURPOSE: Console output * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> */ diff --git a/boot/freeldr/freeldr/arch/uefi/uefildr.c b/boot/freeldr/freeldr/arch/uefi/uefildr.c index e06ff9a1c5b..ded8e405f69 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefildr.c +++ b/boot/freeldr/freeldr/arch/uefi/uefildr.c @@ -1,7 +1,7 @@ /* - * PROJECT: Freeldr UEFI Extension + * PROJECT: FreeLoader UEFI Support * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: UEFI Entry point and helpers + * PURPOSE: Entry point and helpers * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> */ diff --git a/boot/freeldr/freeldr/arch/uefi/uefimem.c b/boot/freeldr/freeldr/arch/uefi/uefimem.c new file mode 100644 index 00000000000..03a62150ef9 --- /dev/null +++ b/boot/freeldr/freeldr/arch/uefi/uefimem.c @@ -0,0 +1,312 @@ +/* + * PROJECT: FreeLoader UEFI Support + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Memory Management Functions + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +/* INCLUDES ******************************************************************/ + +#include <uefildr.h> + +#include <debug.h> +DBG_DEFAULT_CHANNEL(WARNING); + +#define NEXT_MEMORY_DESCRIPTOR(Descriptor, DescriptorSize) \ + (EFI_MEMORY_DESCRIPTOR*)((char*)(Descriptor) + (DescriptorSize)) +#define EXIT_STACK_SIZE 0x1000 +#define UNUSED_MAX_DESCRIPTOR_COUNT 10000 + +ULONG +AddMemoryDescriptor( + _Inout_ PFREELDR_MEMORY_DESCRIPTOR List, + _In_ ULONG MaxCount, + _In_ PFN_NUMBER BasePage, + _In_ PFN_NUMBER PageCount, + _In_ TYPE_OF_MEMORY MemoryType); + +/* GLOBALS *******************************************************************/ + +extern EFI_SYSTEM_TABLE* GlobalSystemTable; +extern EFI_HANDLE GlobalImageHandle; +extern REACTOS_INTERNAL_BGCONTEXT framebufferData; + +EFI_MEMORY_DESCRIPTOR* EfiMemoryMap = NULL; +UINT32 FreeldrDescCount; +PVOID OsLoaderBase; +SIZE_T OsLoaderSize; +EFI_HANDLE PublicBootHandle; +PVOID ExitStack; +PVOID EndofExitStack; + +/* FUNCTIONS *****************************************************************/ + +static +VOID +PUEFI_LoadMemoryMap( + _Out_ UINTN* LocMapKey, + _Out_ UINTN* LocMapSize, + _Out_ UINTN* LocDescriptorSize, + _Out_ UINT32* LocDescriptorVersion) +{ + EFI_STATUS Status; + UINTN AllocationSize = 0; + ULONG Count = 0; + + Status = GlobalSystemTable->BootServices->GetMemoryMap(LocMapSize, + EfiMemoryMap, + LocMapKey, + LocDescriptorSize, + LocDescriptorVersion); + + /* Reallocate and retrieve again the needed memory map size (since memory + * allocated by AllocatePool() counts in the map), until it's OK. */ + while (Status != EFI_SUCCESS) + { + /* Reallocate the memory map buffer */ + if (EfiMemoryMap) + GlobalSystemTable->BootServices->FreePool(EfiMemoryMap); + + /* If MapSize never reports the correct size after the first time, increment */ + AllocationSize = *LocMapSize + (*LocDescriptorSize * Count); + GlobalSystemTable->BootServices->AllocatePool(EfiLoaderData, AllocationSize, + (VOID**)&EfiMemoryMap); + Status = GlobalSystemTable->BootServices->GetMemoryMap(LocMapSize, + EfiMemoryMap, + LocMapKey, + LocDescriptorSize, + LocDescriptorVersion); + Count++; + } +} + +static +VOID +UefiSetMemory( + _Inout_ PFREELDR_MEMORY_DESCRIPTOR MemoryMap, + _In_ ULONG_PTR BaseAddress, + _In_ PFN_COUNT Size, + _In_ TYPE_OF_MEMORY MemoryType) +{ + ULONG_PTR BasePage, PageCount; + + BasePage = BaseAddress / EFI_PAGE_SIZE; + PageCount = Size; + + /* Add the memory descriptor */ + FreeldrDescCount = AddMemoryDescriptor(MemoryMap, + UNUSED_MAX_DESCRIPTOR_COUNT, + BasePage, + PageCount, + MemoryType); +} + +VOID +ReserveMemory( + _Inout_ PFREELDR_MEMORY_DESCRIPTOR MemoryMap, + _In_ ULONG_PTR BaseAddress, + _In_ PFN_NUMBER Size, + _In_ TYPE_OF_MEMORY MemoryType, + _In_ PCHAR Usage) +{ + ULONG_PTR BasePage, PageCount; + ULONG i; + + BasePage = BaseAddress / PAGE_SIZE; + PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(BaseAddress, Size); + + for (i = 0; i < FreeldrDescCount; i++) + { + /* Check for conflicting descriptor */ + if ((MemoryMap[i].BasePage < BasePage + PageCount) && + (MemoryMap[i].BasePage + MemoryMap[i].PageCount > BasePage)) + { + /* Check if the memory is free */ + if (MemoryMap[i].MemoryType != LoaderFree) + { + FrLdrBugCheckWithMessage( + MEMORY_INIT_FAILURE, + __FILE__, + __LINE__, + "Failed to reserve memory in the range 0x%Ix - 0x%Ix for %s", + BaseAddress, + Size, + Usage); + } + } + } + + /* Add the memory descriptor */ + FreeldrDescCount = AddMemoryDescriptor(MemoryMap, + UNUSED_MAX_DESCRIPTOR_COUNT, + BasePage, + PageCount, + MemoryType); +} + +static +TYPE_OF_MEMORY +UefiConvertToFreeldrDesc(EFI_MEMORY_TYPE EfiMemoryType) +{ + switch (EfiMemoryType) + { + case EfiReservedMemoryType: + return LoaderReserve; + case EfiLoaderCode: + return LoaderLoadedProgram; + case EfiLoaderData: + return LoaderLoadedProgram; + case EfiBootServicesCode: + return LoaderFirmwareTemporary; + case EfiBootServicesData: + return LoaderFirmwareTemporary; + case EfiRuntimeServicesCode: + return LoaderFirmwarePermanent; + case EfiRuntimeServicesData: + return LoaderFirmwarePermanent; + case EfiConventionalMemory: + return LoaderFree; + case EfiUnusableMemory: + return LoaderBad; + case EfiACPIReclaimMemory: + return LoaderFirmwareTemporary; + case EfiACPIMemoryNVS: + return LoaderReserve; + case EfiMemoryMappedIO: + return LoaderReserve; + case EfiMemoryMappedIOPortSpace: + return LoaderReserve; + default: + break; + } + return LoaderReserve; +} + +PFREELDR_MEMORY_DESCRIPTOR +UefiMemGetMemoryMap(ULONG *MemoryMapSize) +{ + EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; + UINT32 DescriptorVersion; + SIZE_T FreeldrMemMapSize; + UINTN DescriptorSize; + EFI_STATUS Status; + UINTN MapSize; + UINTN MapKey; + UINT32 Index; + + EFI_GUID EfiLoadedImageProtocol = EFI_LOADED_IMAGE_PROTOCOL_GUID; + PFREELDR_MEMORY_DESCRIPTOR FreeldrMem = NULL; + EFI_MEMORY_DESCRIPTOR* MapEntry = NULL; + UINT32 EntryCount = 0; + FreeldrDescCount = 0; + + Status = GlobalSystemTable->BootServices->HandleProtocol(GlobalImageHandle, + &EfiLoadedImageProtocol, + (VOID**)&LoadedImage); + if (Status != EFI_SUCCESS) + { + TRACE("Failed to find LoadedImageHandle with status: %d\n", Status); + UiMessageBoxCritical("Unable to initialize memory manager."); + return NULL; + } + OsLoaderBase = LoadedImage->ImageBase; + OsLoaderSize = LoadedImage->ImageSize; + PublicBootHandle = LoadedImage->DeviceHandle; + EfiMemoryMap = NULL; + + TRACE("UefiMemGetMemoryMap: Gather memory map\n"); + PUEFI_LoadMemoryMap(&MapKey, + &MapSize, + &DescriptorSize, + &DescriptorVersion); + + TRACE("Value of MapKey: %d\n", MapKey); + TRACE("Value of MapSize: %d\n", MapSize); + TRACE("Value of DescriptorSize: %d\n", DescriptorSize); + TRACE("Value of DescriptorVersion: %d\n", DescriptorVersion); + + EntryCount = (MapSize / DescriptorSize); + + FreeldrMemMapSize = (sizeof(FREELDR_MEMORY_DESCRIPTOR) * EntryCount); + Status = GlobalSystemTable->BootServices->AllocatePool(EfiLoaderData, + FreeldrMemMapSize, + (void**)&FreeldrMem); + if (Status != EFI_SUCCESS) + { + TRACE("Failed to allocate pool with status %d\n", Status); + UiMessageBoxCritical("Unable to initialize memory manager."); + return NULL; + } + + RtlZeroMemory(FreeldrMem, FreeldrMemMapSize); + MapEntry = EfiMemoryMap; + for (Index = 0; Index < EntryCount; ++Index) + { + TYPE_OF_MEMORY MemoryType = UefiConvertToFreeldrDesc(MapEntry->Type); + if (MemoryType == LoaderFree) + { + Status = GlobalSystemTable->BootServices->AllocatePages(AllocateAddress, + EfiLoaderData, + MapEntry->NumberOfPages, + &MapEntry->PhysicalStart); + if (Status != EFI_SUCCESS) + { + /* We failed to reserve the page, so change its type */ + MemoryType = LoaderFirmwareTemporary; + } + } + + UefiSetMemory(FreeldrMem, + MapEntry->PhysicalStart, + MapEntry->NumberOfPages, + MemoryType); + + MapEntry = NEXT_MEMORY_DESCRIPTOR(MapEntry, DescriptorSize); + } + + *MemoryMapSize = FreeldrDescCount; + return FreeldrMem; +} + +static VOID +UefiExitBootServices(VOID) +{ + UINTN MapKey; + UINTN MapSize; + EFI_STATUS Status; + UINTN DescriptorSize; + UINT32 DescriptorVersion; + + TRACE("Attempting to exit bootsevices\n"); + PUEFI_LoadMemoryMap(&MapKey, + &MapSize, + &DescriptorSize, + &DescriptorVersion); + + Status = GlobalSystemTable->BootServices->ExitBootServices(GlobalImageHandle, MapKey); + /* UEFI spec demands twice! */ + if (Status != EFI_SUCCESS) + Status = GlobalSystemTable->BootServices->ExitBootServices(GlobalImageHandle, MapKey); + + if (Status != EFI_SUCCESS) + { + TRACE("Failed to exit boot services with status: %d\n", Status); + FrLdrBugCheckWithMessage(EXIT_BOOTSERVICES_FAILURE, + __FILE__, + __LINE__, + "Failed to exit boot services with status: %d", + Status); + } + else + { + TRACE("Exited bootservices\n"); + } +} + +VOID +UefiPrepareForReactOS(VOID) +{ + UefiExitBootServices(); + ExitStack = MmAllocateMemoryWithType(EXIT_STACK_SIZE, LoaderOsloaderStack); + EndofExitStack = (PVOID)((ULONG_PTR)ExitStack + EXIT_STACK_SIZE); +} diff --git a/boot/freeldr/freeldr/arch/uefi/uefisetup.c b/boot/freeldr/freeldr/arch/uefi/uefisetup.c index bd223da465f..01d1be758a1 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefisetup.c +++ b/boot/freeldr/freeldr/arch/uefi/uefisetup.c @@ -1,7 +1,7 @@ /* - * PROJECT: Freeldr UEFI Extension + * PROJECT: FreeLoader UEFI Support * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: UEFI Mach Setup + * PURPOSE: Machine Setup * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> */ diff --git a/boot/freeldr/freeldr/arch/uefi/uefiutil.c b/boot/freeldr/freeldr/arch/uefi/uefiutil.c index 9dafea22b6c..133adf20c64 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefiutil.c +++ b/boot/freeldr/freeldr/arch/uefi/uefiutil.c @@ -1,7 +1,7 @@ /* - * PROJECT: Freeldr UEFI Extension + * PROJECT: FreeLoader UEFI Support * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: UEFI Utils source + * PURPOSE: Utils source * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> */ diff --git a/boot/freeldr/freeldr/arch/uefi/uefivid.c b/boot/freeldr/freeldr/arch/uefi/uefivid.c index 5bd869fcfd4..341798c4d85 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefivid.c +++ b/boot/freeldr/freeldr/arch/uefi/uefivid.c @@ -1,7 +1,7 @@ /* - * PROJECT: Freeldr UEFI Extension + * PROJECT: FreeLoader UEFI Support * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: UEFI Video output + * PURPOSE: Video output * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> */ diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index e85582f8cea..feed051d013 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -141,6 +141,9 @@ enum _FRLDR_BUGCHECK_CODES MISSING_HARDWARE_REQUIREMENTS, FREELDR_IMAGE_CORRUPTION, MEMORY_INIT_FAILURE, +#ifdef UEFIBOOT + EXIT_BOOTSERVICES_FAILURE, +#endif }; extern char *BugCodeStrings[]; diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index e68df9af9cf..b7a37977696 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -518,6 +518,9 @@ char *BugCodeStrings[] = "MISSING_HARDWARE_REQUIREMENTS", "FREELDR_IMAGE_CORRUPTION", "MEMORY_INIT_FAILURE", +#ifdef UEFIBOOT + "EXIT_BOOTSERVICES_FAILURE", +#endif }; ULONG_PTR BugCheckInfo[5]; diff --git a/boot/freeldr/freeldr/lib/mm/meminit.c b/boot/freeldr/freeldr/lib/mm/meminit.c index 37a705a0c68..aacccda4800 100644 --- a/boot/freeldr/freeldr/lib/mm/meminit.c +++ b/boot/freeldr/freeldr/lib/mm/meminit.c @@ -238,6 +238,7 @@ static VOID MmCheckFreeldrImageFile(VOID) { +#ifndef UEFIBOOT PIMAGE_NT_HEADERS NtHeaders; PIMAGE_FILE_HEADER FileHeader; PIMAGE_OPTIONAL_HEADER OptionalHeader; @@ -308,6 +309,7 @@ MmCheckFreeldrImageFile(VOID) /* Calculate the full image size */ FrLdrImageSize = (ULONG_PTR)&__ImageBase + OptionalHeader->SizeOfImage - FREELDR_BASE; +#endif } BOOLEAN MmInitializeMemoryManager(VOID) diff --git a/boot/freeldr/freeldr/uefi.cmake b/boot/freeldr/freeldr/uefi.cmake index 21710408dfc..94b5baa7630 100644 --- a/boot/freeldr/freeldr/uefi.cmake +++ b/boot/freeldr/freeldr/uefi.cmake @@ -18,6 +18,7 @@ list(APPEND UEFILDR_ARC_SOURCE arch/uefi/uefivid.c arch/uefi/uefiutil.c arch/uefi/ueficon.c + arch/uefi/uefimem.c arch/vgafont.c) if(ARCH STREQUAL "i386")

1 year, 6 months

[reactos] 01/01: [MSPAINT] Allow ToolBox to be right-aligned (#5213)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83e83bfd2c3a4e6e54a3f… commit 83e83bfd2c3a4e6e54a3f894d81eb86f0eb0a720 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 3 14:34:56 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 3 14:34:56 2023 +0900 [MSPAINT] Allow ToolBox to be right-aligned (#5213) The user will be able to move ToolBox in the main window by dragging. - Add Bar2ID registry setting. - Add CPaintToolBar class to encapsulate the toolbar code. - Capture and track the mouse dragging in CToolBox. - Move the ToolBox if dragging is beyond the center position. CORE-18867 --- base/applications/mspaint/registry.cpp | 13 ++++ base/applications/mspaint/registry.h | 6 ++ base/applications/mspaint/toolbox.cpp | 118 +++++++++++++++++++---------- base/applications/mspaint/toolbox.h | 14 +++- base/applications/mspaint/toolsettings.cpp | 2 + base/applications/mspaint/winproc.cpp | 21 +++-- 6 files changed, 128 insertions(+), 46 deletions(-) diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index fbf659fb70c..5a2b15121e3 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -75,6 +75,7 @@ void RegistrySettings::LoadPresets(INT nCmdShow) ShowStatusBar = TRUE; ShowPalette = TRUE; ShowToolBox = TRUE; + Bar2ID = BAR2ID_LEFT; LOGFONT lf; GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); @@ -141,6 +142,12 @@ void RegistrySettings::Load(INT nCmdShow) ReadString(text, _T("TypeFaceName"), strFontName, strFontName); } + CRegKey bar2; + if (bar2.Open(paint, _T("General-Bar2"), KEY_READ) == ERROR_SUCCESS) + { + ReadDWORD(bar2, _T("BarID"), Bar2ID); + } + CRegKey bar3; if (bar3.Open(paint, _T("General-Bar3"), KEY_READ) == ERROR_SUCCESS) { @@ -213,6 +220,12 @@ void RegistrySettings::Store() text.SetStringValue(_T("TypeFaceName"), strFontName); } + CRegKey bar2; + if (bar2.Create(paint, _T("General-Bar2")) == ERROR_SUCCESS) + { + bar2.SetDWORDValue(_T("BarID"), Bar2ID); + } + CRegKey bar3; if (bar3.Create(paint, _T("General-Bar3")) == ERROR_SUCCESS) { diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index d70e82ede48..7749328cd10 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -43,6 +43,12 @@ public: DWORD ShowStatusBar; DWORD ShowPalette; DWORD ShowToolBox; + DWORD Bar2ID; + +// Values for Bar2ID. +// I think these values are Win2k3 mspaint compatible but sometimes not working... +#define BAR2ID_LEFT 0x0000e81c +#define BAR2ID_RIGHT 0x0000e81d enum WallpaperStyle { TILED, diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 64f90f9c807..c7a4667ac87 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -13,56 +13,56 @@ CToolBox toolBoxContainer; /* FUNCTIONS ********************************************************/ -BOOL CToolBox::DoCreate(HWND hwndParent) -{ - RECT toolBoxContainerPos = { 0, 0, 0, 0 }; - DWORD style = WS_CHILD | (registrySettings.ShowToolBox ? WS_VISIBLE : 0); - return !!Create(hwndParent, toolBoxContainerPos, NULL, style); -} - -LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +BOOL CPaintToolBar::DoCreate(HWND hwndParent) { - HIMAGELIST hImageList; - HBITMAP tempBm; - int i; - TCHAR tooltips[NUM_TOOLS][30]; - - toolSettingsWindow.DoCreate(m_hWnd); - - /* NOTE: The horizontal line above the toolbar is hidden by CCS_NODIVIDER style. */ - RECT toolbarPos = {0, 0, CX_TOOLBAR, CY_TOOLBAR}; + // 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; - 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); - ImageList_AddMasked(hImageList, tempBm, 0xff00ff); - DeleteObject(tempBm); - toolbar.SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - - for (i = 0; i < NUM_TOOLS; i++) - { - TBBUTTON tbbutton; - int wrapnow = 0; + if (!CWindow::Create(TOOLBARCLASSNAME, hwndParent, toolbarPos, NULL, style)) + return FALSE; + + HIMAGELIST hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); + SendMessage(TB_SETIMAGELIST, 0, (LPARAM)hImageList); - if (i % 2 == 1) - wrapnow = TBSTATE_WRAP; + HBITMAP hbmIcons = (HBITMAP)::LoadImage(hProgInstance, MAKEINTRESOURCE(IDB_TOOLBARICONS), + IMAGE_BITMAP, 256, 16, 0); + ImageList_AddMasked(hImageList, hbmIcons, RGB(255, 0, 255)); + ::DeleteObject(hbmIcons); - LoadString(hProgInstance, IDS_TOOLTIP1 + i, tooltips[i], 30); - ZeroMemory(&tbbutton, sizeof(TBBUTTON)); - tbbutton.iString = (INT_PTR) tooltips[i]; - tbbutton.fsStyle = TBSTYLE_CHECKGROUP; - tbbutton.fsState = TBSTATE_ENABLED | wrapnow; + SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + TCHAR szToolTip[30]; + TBBUTTON tbbutton; + ZeroMemory(&tbbutton, sizeof(tbbutton)); + tbbutton.fsStyle = TBSTYLE_CHECKGROUP; + for (INT i = 0; i < NUM_TOOLS; i++) + { + ::LoadString(hProgInstance, IDS_TOOLTIP1 + i, szToolTip, _countof(szToolTip)); + tbbutton.iString = (INT_PTR)szToolTip; + tbbutton.fsState = TBSTATE_ENABLED | ((i % 2 == 1) ? TBSTATE_WRAP : 0); tbbutton.idCommand = ID_FREESEL + i; tbbutton.iBitmap = i; - toolbar.SendMessage(TB_ADDBUTTONS, 1, (LPARAM) &tbbutton); + SendMessage(TB_ADDBUTTONS, 1, (LPARAM) &tbbutton); } - toolbar.SendMessage(TB_CHECKBUTTON, ID_PEN, MAKELPARAM(TRUE, 0)); - toolbar.SendMessage(TB_SETMAXTEXTROWS, 0, 0); - toolbar.SendMessage(TB_SETBUTTONSIZE, 0, MAKELPARAM(CXY_TB_BUTTON, CXY_TB_BUTTON)); + SendMessage(TB_CHECKBUTTON, ID_PEN, MAKELPARAM(TRUE, 0)); + SendMessage(TB_SETMAXTEXTROWS, 0, 0); + SendMessage(TB_SETBUTTONSIZE, 0, MAKELPARAM(CXY_TB_BUTTON, CXY_TB_BUTTON)); + return TRUE; +} + +BOOL CToolBox::DoCreate(HWND hwndParent) +{ + RECT rcToolBox = { 0, 0, 0, 0 }; // Rely on mainWindow's WM_SIZE + DWORD style = WS_CHILD | (registrySettings.ShowToolBox ? WS_VISIBLE : 0); + return !!Create(hwndParent, rcToolBox, NULL, style); +} +LRESULT CToolBox::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + toolbar.DoCreate(m_hWnd); + toolSettingsWindow.DoCreate(m_hWnd); return 0; } @@ -130,3 +130,41 @@ LRESULT CToolBox::OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lPara return 0; } + +LRESULT CToolBox::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + SetCapture(); + return 0; +} + +LRESULT CToolBox::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (::GetCapture() != m_hWnd) + return 0; + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + ClientToScreen(&pt); + + RECT rc; + mainWindow.GetWindowRect(&rc); + + POINT ptCenter = { (rc.left + rc.right) / 2, (rc.bottom - rc.top) / 2 }; + + DWORD dwExpectedBar2ID = ((pt.x < ptCenter.x) ? BAR2ID_LEFT : BAR2ID_RIGHT); + + if (registrySettings.Bar2ID != dwExpectedBar2ID) + { + registrySettings.Bar2ID = dwExpectedBar2ID; + mainWindow.PostMessage(WM_SIZE, 0, 0); + } + + return 0; +} + +LRESULT CToolBox::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (::GetCapture() != m_hWnd) + return 0; + + ::ReleaseCapture(); + return 0; +} diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index b6699c67455..bd0a635636a 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -15,6 +15,12 @@ #define CX_TOOLBAR (TOOLBAR_COLUMNS * CXY_TB_BUTTON) #define CY_TOOLBAR (TOOLBAR_ROWS * CXY_TB_BUTTON) +class CPaintToolBar : public CWindow +{ +public: + BOOL DoCreate(HWND hwndParent); +}; + class CToolBox : public CWindowImpl<CToolBox> { public: @@ -24,16 +30,22 @@ public: MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) MESSAGE_HANDLER(WM_COMMAND, OnCommand) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) + MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) END_MSG_MAP() BOOL DoCreate(HWND hwndParent); private: - CWindow toolbar; + CPaintToolBar toolbar; LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + 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); }; diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index d70a3dd7f5e..6ff0aed291d 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -414,6 +414,8 @@ LRESULT CToolSettingsWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lPar case TOOL_PEN: break; } + + ::SetCapture(::GetParent(m_hWnd)); return 0; } diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index b44534a8043..66e29e742b3 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -88,11 +88,22 @@ void CMainWindow::alignChildrenToMainWindow() if (::IsWindowVisible(toolBoxContainer)) { - 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 (registrySettings.Bar2ID == BAR2ID_RIGHT) + { + hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, + rcSpace.right - CX_TOOLBAR, rcSpace.top, + CX_TOOLBAR, rcSpace.bottom - rcSpace.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + rcSpace.right -= CX_TOOLBAR; + } + else + { + 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))

1 year, 6 months

[reactos] 01/01: [MSI] Fix empty disc costing (Terragen, ...) (#5201)

by Atharva Kulkarni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce562727b8c5660a43900… commit ce562727b8c5660a43900d3d0732611a5ffda4be Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Sun Apr 2 22:49:21 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 2 19:19:21 2023 +0200 [MSI] Fix empty disc costing (Terragen, ...) (#5201) JIRA issue: CORE-18749 --- dll/win32/msi/dialog.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 1bea93dc081..7050d353bb7 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -3159,6 +3159,15 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control * if a width is invalid, all remaining columns are hidden */ if ( !wcsncmp( num, L"-", 1 ) || !str_is_number( num ) ) { +#ifdef __REACTOS__ + // Skip in case of prefix the string of displayed characters with {\style} or {&style}. + if (count == 0 && (!wcsncmp(num, L"\\", 1) || !wcsncmp(num, L"&", 1))) + { + FIXME("Style prefix not supported\n"); + msi_free(num); + continue; + } +#endif msi_free( num ); return; }

1 year, 6 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2023