Ros-diffs September 2022

ros-diffs@reactos.org

21 participants
142 discussions

[reactos] 01/01: [EXPLORER] Add 'Show Desktop' button at right edge of taskbar (#4715)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26efda4d8ded94838cbcb… commit 26efda4d8ded94838cbcb330d67b87cdcdd3e334 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 22 12:18:59 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 22 12:18:59 2022 +0900 [EXPLORER] Add 'Show Desktop' button at right edge of taskbar (#4715) This PR adds a tiny button of window class "TrayShowDesktopButtonWClass" at right/bottom edge of taskbar. This button allows the user to access "Show/Restore Desktop" feature by mouse. You can toggle visibility of this button by registry value "TaskbarSd" in key "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced". The button is themed when theme is available. CORE-15369 --- base/shell/explorer/traywnd.cpp | 309 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 297 insertions(+), 12 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index da62c75c269..f1ff6242182 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2,7 +2,7 @@ * ReactOS Explorer * * Copyright 2006 - 2007 Thomas Weidenmueller <w3seek(a)reactos.org> - * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2018-2022 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 @@ -264,6 +264,200 @@ public: }; +// This window class name is CONFIRMED on Win10 by WinHier. +static const WCHAR szTrayShowDesktopButton[] = L"TrayShowDesktopButtonWClass"; + +// The 'Show Desktop' button at edge of taskbar +class CTrayShowDesktopButton : + public CWindowImpl<CTrayShowDesktopButton, CWindow, CControlWinTraits> +{ + LONG m_nClickedTime; + BOOL m_bHovering; + HTHEME m_hTheme; + +public: + DECLARE_WND_CLASS_EX(szTrayShowDesktopButton, CS_HREDRAW | CS_VREDRAW, COLOR_3DFACE) + + CTrayShowDesktopButton() : m_nClickedTime(0), m_bHovering(FALSE) + { + } + + INT WidthOrHeight() const + { +#define SHOW_DESKTOP_MINIMUM_WIDTH 3 + INT cxy = 2 * ::GetSystemMetrics(SM_CXEDGE); + return max(cxy, SHOW_DESKTOP_MINIMUM_WIDTH); + } + + HRESULT DoCreate(HWND hwndParent) + { + DWORD style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; + Create(hwndParent, NULL, NULL, style); + if (!m_hWnd) + return E_FAIL; + + ::SetWindowTheme(m_hWnd, L"TaskBar", NULL); + return S_OK; + } + + LRESULT OnClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + // The actual action can be delayed as an expected behaviour. + // But a too late action is an unexpected behaviour. + LONG nTime0 = m_nClickedTime; + LONG nTime1 = ::GetMessageTime(); + if (nTime1 - nTime0 >= 600) // Ignore after 0.6 sec + return 0; + + // Show/Hide Desktop + ::SendMessageW(::GetParent(m_hWnd), WM_COMMAND, TRAYCMD_TOGGLE_DESKTOP, 0); + return 0; + } + +#define TSDB_CLICK (WM_USER + 100) + + // This function is called from OnLButtonDown and parent. + VOID Click() + { + // The actual action can be delayed as an expected behaviour. + m_nClickedTime = ::GetMessageTime(); + PostMessage(TSDB_CLICK, 0, 0); + } + + LRESULT OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + Click(); // Left-click + return 0; + } + + LRESULT OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (m_hTheme) + ::CloseThemeData(m_hTheme); + + m_hTheme = ::OpenThemeData(m_hWnd, L"TaskBar"); + InvalidateRect(NULL, TRUE); + return 0; + } + + // This function is called from OnPaint and parent. + VOID OnDraw(HDC hdc, LPRECT prc); + + LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + RECT rc; + GetClientRect(&rc); + + PAINTSTRUCT ps; + HDC hdc = BeginPaint(&ps); + OnDraw(hdc, &rc); + EndPaint(&ps); + return 0; + } + + BOOL PtInButton(POINT pt) + { + RECT rc; + GetWindowRect(&rc); + INT cxEdge = ::GetSystemMetrics(SM_CXEDGE), cyEdge = ::GetSystemMetrics(SM_CYEDGE); + ::InflateRect(&rc, max(cxEdge, 1), max(cyEdge, 1)); + return ::PtInRect(&rc, pt); + } + +#define SHOW_DESKTOP_TIMER_ID 999 +#define SHOW_DESKTOP_TIMER_INTERVAL 200 + + VOID StartHovering() + { + if (m_bHovering) + return; + + m_bHovering = TRUE; + SetTimer(SHOW_DESKTOP_TIMER_ID, SHOW_DESKTOP_TIMER_INTERVAL, NULL); + InvalidateRect(NULL, TRUE); + ::SendMessageW(::GetParent(m_hWnd), WM_NCPAINT, 0, 0); + } + + LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + StartHovering(); + return 0; + } + + LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (wParam != SHOW_DESKTOP_TIMER_ID || !m_bHovering) + return 0; + + POINT pt; + ::GetCursorPos(&pt); + if (!PtInButton(pt)) // The end of hovering? + { + m_bHovering = FALSE; + KillTimer(SHOW_DESKTOP_TIMER_ID); + InvalidateRect(NULL, TRUE); + ::SendMessageW(::GetParent(m_hWnd), WM_NCPAINT, 0, 0); + } + + return 0; + } + + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (m_hTheme) + { + CloseThemeData(m_hTheme); + m_hTheme = NULL; + } + return 0; + } + + BEGIN_MSG_MAP(CTrayShowDesktopButton) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) + MESSAGE_HANDLER(WM_THEMECHANGED, OnSettingChanged) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_TIMER, OnTimer) + MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) + MESSAGE_HANDLER(TSDB_CLICK, OnClick) + END_MSG_MAP() +}; + +VOID CTrayShowDesktopButton::OnDraw(HDC hdc, LPRECT prc) +{ + if (m_hTheme) + { + if (m_bHovering) // Draw a hot button + { + HTHEME hButtonTheme = ::OpenThemeData(m_hWnd, L"Button"); + ::DrawThemeBackground(hButtonTheme, hdc, BP_PUSHBUTTON, PBS_NORMAL, prc, prc); + ::CloseThemeData(hButtonTheme); + } + else // Draw a taskbar background + { + ::DrawThemeBackground(m_hTheme, hdc, TBP_BACKGROUNDTOP, 0, prc, prc); + } + } + else + { + RECT rc = *prc; + if (m_bHovering) // Draw a hot button + { + ::DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONPUSH | DFCS_ADJUSTRECT); + HBRUSH hbrHot = ::CreateSolidBrush(RGB(255, 255, 191)); + ::FillRect(hdc, &rc, hbrHot); + ::DeleteObject(hbrHot); + } + else // Draw a flattish button + { + ::DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONPUSH); + ::InflateRect(&rc, -1, -1); + ::FillRect(hdc, &rc, ::GetSysColorBrush(COLOR_3DFACE)); + } + } +} + class CTrayWindow : public CComCoClass<CTrayWindow>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -274,6 +468,7 @@ class CTrayWindow : public IContextMenu { CStartButton m_StartButton; + CTrayShowDesktopButton m_ShowDesktopButton; CComPtr<IMenuBand> m_StartMenuBand; CComPtr<IMenuPopup> m_StartMenuPopup; @@ -327,6 +522,7 @@ public: public: CTrayWindow() : m_StartButton(), + m_ShowDesktopButton(), m_Theme(NULL), m_Font(NULL), m_DesktopWnd(NULL), @@ -1617,7 +1813,7 @@ ChangePos: /* We're about to resize/move the start button, the rebar control and the tray notification control */ - dwp = BeginDeferWindowPos(3); + dwp = BeginDeferWindowPos(4); if (dwp == NULL) { ERR("BeginDeferWindowPos failed. lastErr=%d\n", GetLastError()); @@ -1655,6 +1851,35 @@ ChangePos: } } + if (m_ShowDesktopButton.m_hWnd) + { + // Get rectangle from rcClient + RECT rc = rcClient; + INT cxyShowDesktop = m_ShowDesktopButton.WidthOrHeight(); + if (Horizontal) + { + rc.left = rc.right - cxyShowDesktop; + rc.right += 5; // excessive + } + else + { + rc.top = rc.bottom - cxyShowDesktop; + rc.bottom += 5; // excessive + } + + /* Resize and reposition the button */ + dwp = m_ShowDesktopButton.DeferWindowPos(dwp, NULL, + rc.left, rc.top, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOZORDER | SWP_NOACTIVATE); + + // Adjust rcClient + if (Horizontal) + rcClient.right -= cxyShowDesktop + ::GetSystemMetrics(SM_CXEDGE); + else + rcClient.bottom -= cxyShowDesktop + ::GetSystemMetrics(SM_CYEDGE); + } + /* Determine the size that the tray notification window needs */ if (Horizontal) { @@ -2209,6 +2434,15 @@ ChangePos: return m_ContextMenu->GetCommandString(idCmd, uType, pwReserved, pszName, cchMax); } + BOOL IsShowDesktopButtonNeeded() // Read the registry value + { + return SHRegGetBoolUSValueW( + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", + L"TaskbarSd", + FALSE, + TRUE); + } + /********************************************************** * ##### message handling ##### */ @@ -2224,6 +2458,10 @@ ChangePos: /* Create the Start button */ m_StartButton.Create(m_hWnd); + /* Create the 'Show Desktop' button if necessary */ + if (IsShowDesktopButtonNeeded()) + m_ShowDesktopButton.DoCreate(m_hWnd); + /* Load the saved tray window settings */ RegLoadSettings(); @@ -2364,19 +2602,34 @@ ChangePos: return FALSE; } + // We have to draw non-client area because the 'Show Desktop' button is beyond client area. + void DrawShowDesktopButton() + { + // Get the rectangle in window coordinates + RECT rcButton, rcWnd; + GetWindowRect(&rcWnd); + m_ShowDesktopButton.GetWindowRect(&rcButton); + ::OffsetRect(&rcButton, -rcWnd.left, -rcWnd.top); + + HDC hdc = GetDCEx(NULL, DCX_WINDOW | DCX_CACHE | DCX_NORESETATTRS); + m_ShowDesktopButton.OnDraw(hdc, &rcButton); // Draw the button + ReleaseDC(hdc); + } + LRESULT OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (!m_Theme) - { - bHandled = FALSE; - return 0; - } - else if (g_TaskbarSettings.bLock) + DefWindowProc(uMsg, wParam, lParam); + bHandled = TRUE; + + if (!m_Theme || g_TaskbarSettings.bLock) { + DrawShowDesktopButton(); // We have to draw non-client area return 0; } - return DrawSizerWithTheme((HRGN) wParam); + DrawSizerWithTheme((HRGN) wParam); + DrawShowDesktopButton(); // We have to draw non-client area + return 0; } LRESULT OnCtlColorBtn(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -2601,11 +2854,15 @@ ChangePos: POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)}; WINDOWINFO wi = {sizeof(WINDOWINFO)}; - RECT rcStartBtn; bHandled = FALSE; + if (CheckShowDesktopButtonClick(lParam, bHandled)) + return TRUE; + + RECT rcStartBtn; m_StartButton.GetWindowRect(&rcStartBtn); + GetWindowInfo(m_hWnd, &wi); switch (m_Position) @@ -2632,9 +2889,7 @@ ChangePos: case ABE_BOTTOM: { if (pt.x > rcStartBtn.right || pt.y < rcStartBtn.top) - { return 0; - } if (rcStartBtn.bottom + (int)wi.cyWindowBorders * 2 + 1 < wi.rcWindow.bottom && pt.y > rcStartBtn.bottom) @@ -2764,8 +3019,24 @@ HandleTrayContextMenu: return Ret; } + BOOL CheckShowDesktopButtonClick(LPARAM lParam, BOOL& bHandled) + { + POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)}; + if (m_ShowDesktopButton.PtInButton(pt)) // Did you click the button? + { + m_ShowDesktopButton.Click(); + bHandled = TRUE; + return TRUE; + } + + return FALSE; + } + LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (CheckShowDesktopButtonClick(lParam, bHandled)) + return TRUE; + /* Let the clock handle the double click */ ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); @@ -2931,6 +3202,11 @@ HandleTrayContextMenu: LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + POINT pt; + ::GetCursorPos(&pt); + if (m_ShowDesktopButton.PtInButton(pt)) + m_ShowDesktopButton.StartHovering(); + if (g_TaskbarSettings.sr.AutoHide) { SetTimer(TIMER_ID_MOUSETRACK, MOUSETRACK_INTERVAL, NULL); @@ -2954,6 +3230,14 @@ HandleTrayContextMenu: return TRUE; } + LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + DefWindowProc(uMsg, wParam, lParam); + DrawShowDesktopButton(); // We have to draw non-client area + bHandled = TRUE; + return 0; + } + LRESULT OnNcCalcSize(INT code, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { RECT *rc = NULL; @@ -3124,6 +3408,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_DISPLAYCHANGE, OnDisplayChange) MESSAGE_HANDLER(WM_COPYDATA, OnCopyData) MESSAGE_HANDLER(WM_NCPAINT, OnNcPaint) + MESSAGE_HANDLER(WM_NCACTIVATE, OnNcActivate) MESSAGE_HANDLER(WM_CTLCOLORBTN, OnCtlColorBtn) MESSAGE_HANDLER(WM_MOVING, OnMoving) MESSAGE_HANDLER(WM_SIZING, OnSizing)

1 year, 12 months

[reactos] 01/01: [CPL][INTL] Realize automatic Japanese IME installation (#4705)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34635e1585e97539358d9… commit 34635e1585e97539358d975c4fe0e03758c3c14d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 19 18:13:17 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 19 18:13:17 2022 +0900 [CPL][INTL] Realize automatic Japanese IME installation (#4705) In intl.cpl, realize semi-automatic Japanese IME installation by checkbox "Install files for East Asian languages" by using rapps.exe. CORE-11700 --- dll/cpl/intl/languages.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dll/cpl/intl/languages.c b/dll/cpl/intl/languages.c index 6056a121511..c4507b75643 100644 --- a/dll/cpl/intl/languages.c +++ b/dll/cpl/intl/languages.c @@ -1,6 +1,16 @@ #include "intl.h" #include <shellapi.h> +#include <strsafe.h> + +/* Is there any Japanese input method? */ +BOOL HasJapaneseIME(VOID) +{ + WCHAR szImePath[MAX_PATH]; + GetSystemDirectoryW(szImePath, _countof(szImePath)); + StringCchCatW(szImePath, _countof(szImePath), L"\\mzimeja.ime"); + return GetFileAttributesW(szImePath) != INVALID_FILE_ATTRIBUTES; +} /* Property page dialog callback */ INT_PTR CALLBACK @@ -25,6 +35,24 @@ LanguagesPageProc(HWND hwndDlg, EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_RTOL_LANG), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_ASIAN), FALSE); } + + /* EAST ASIAN specific */ + switch (PRIMARYLANGID(GetUserDefaultLangID())) + { + case LANG_JAPANESE: + if (HasJapaneseIME()) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_ASIAN), FALSE); + CheckDlgButton(hwndDlg, IDC_INST_FILES_FOR_ASIAN, BST_CHECKED); + } + break; + + case LANG_CHINESE: /* Not supported yet */ + case LANG_KOREAN: /* Not supported yet */ + default: + EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_ASIAN), FALSE); + break; + } break; case WM_COMMAND: @@ -46,6 +74,43 @@ LanguagesPageProc(HWND hwndDlg, } } break; + + case IDC_INST_FILES_FOR_ASIAN: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + + case WM_NOTIFY: + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + { + /* Apply changes */ + if (IsDlgButtonChecked(hwndDlg, IDC_INST_FILES_FOR_ASIAN) == BST_CHECKED) + { + /* EAST ASIAN specific */ + switch (PRIMARYLANGID(GetUserDefaultLangID())) + { + case LANG_JAPANESE: + if (HasJapaneseIME()) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_ASIAN), FALSE); + CheckDlgButton(hwndDlg, IDC_INST_FILES_FOR_ASIAN, BST_CHECKED); + } + else + { + ShellExecuteW(hwndDlg, NULL, L"rapps.exe", L"/INSTALL mzimeja", + NULL, SW_SHOWNORMAL); + } + break; + + case LANG_CHINESE: /* Not supported yet */ + case LANG_KOREAN: /* Not supported yet */ + default: + break; + } + } + + PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg); } break; }

2 years

[reactos] 01/01: [SHELL32] Fix property sheets that can't be closed due to failed init (#4709)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32c20ab1129d62921bb37… commit 32c20ab1129d62921bb37842644a0d97c299f7fb Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Mon Sep 19 03:06:47 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 19 04:06:47 2022 +0300 [SHELL32] Fix property sheets that can't be closed due to failed init (#4709) When a PropertySheet fails to init, that fact is being logged and it shows an empty page, but it can't be closed. Handle second failure properly by using FAILED_UNEXPECTEDLY macro. CORE-18333 --- dll/win32/shell32/dialogs/fprop.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/dialogs/fprop.cpp b/dll/win32/shell32/dialogs/fprop.cpp index 3cab59b1f3b..b43ee566e85 100644 --- a/dll/win32/shell32/dialogs/fprop.cpp +++ b/dll/win32/shell32/dialogs/fprop.cpp @@ -132,13 +132,20 @@ SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CH { pFileDefExt->AddRef(); // CreateInstance returns object with 0 ref count hr = pFileDefExt->Initialize(pidlFolder, pDataObj, NULL); - if (SUCCEEDED(hr)) + if (!FAILED_UNEXPECTEDLY(hr)) { hr = pFileDefExt->AddPages(AddPropSheetPageCallback, (LPARAM)&Header); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) + { ERR("AddPages failed\n"); - } else + return FALSE; + } + } + else + { ERR("Initialize failed\n"); + return FALSE; + } } LoadPropSheetHandlers(wszPath, &Header, MAX_PROPERTY_SHEET_PAGE - 1, hpsxa, pDataObj);

2 years

[reactos] 01/01: [HOTPLUG] Add French (fr-FR) translation (#4703)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=456f9f96e733778ee3f4d… commit 456f9f96e733778ee3f4d2501e1d564c87ec6340 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Mon Sep 19 01:14:23 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 19 02:14:23 2022 +0300 [HOTPLUG] Add French (fr-FR) translation (#4703) --- dll/cpl/hotplug/hotplug.rc | 3 +++ dll/cpl/hotplug/lang/fr-FR.rc | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index 77897d9bfac..885713aad6b 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -36,6 +36,9 @@ IDI_HOTPLUG ICON "resources/1.ico" #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/dll/cpl/hotplug/lang/fr-FR.rc b/dll/cpl/hotplug/lang/fr-FR.rc new file mode 100644 index 00000000000..36577034316 --- /dev/null +++ b/dll/cpl/hotplug/lang/fr-FR.rc @@ -0,0 +1,46 @@ +/* + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: French resource file + * TRANSLATOR: Copyright 2022 Kyle Katarn <contact(a)kcsoftwares.com> + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 +CAPTION "" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 + LTEXT "Sélectionnez le périphérique que vous voulez déconnecter ou éjecter, puis cliquez sur Arrêter. Lorsque ReactOS vous en informera, vous pourrez déconnecter le périphérique de votre ordinateur en toute sécurité.", IDC_STATIC, 36, 8, 234, 32, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Périphériques:", IDC_STATIC, 7, 42, 248, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_SAFE_REMOVE_DEVICE_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 52, 264, 102 + LTEXT "", IDC_SAFE_REMOVE_TEXT, 7, 156, 264, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Propriétés", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Arrêter", IDC_SAFE_REMOVE_STOP, 216, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_STATIC, "static", SS_CENTER | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 200, 264, 1 + AUTOCHECKBOX "&Afficher les composants de périphériques", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 145, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Fermer", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + + +/* Menus */ + +IDM_POPUP_DEVICE_TREE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Arrêter", IDM_STOP + MENUITEM "Propriétés", IDM_PROPERTIES + END +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CPLNAME "Retirer un périphérique en toute sécurité" + IDS_CPLDESCRIPTION "Déconnecter ou éjecter un périphérique de votre ordinateur en sécurité." +END

2 years

[reactos] 01/01: [APPWIZ] Update Romanian (ro-RO) translation (#4700)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f0132ee9553f15a04f98… commit 5f0132ee9553f15a04f988702c5dcf82e9c3a661 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Sep 19 02:10:49 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 19 02:10:49 2022 +0300 [APPWIZ] Update Romanian (ro-RO) translation (#4700) --- dll/cpl/appwiz/lang/ro-RO.rc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 530a0948127..2b7f0a4a4ce 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -1,7 +1,9 @@ /* - * FILE: dll/cpl/appwiz/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Software Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -88,8 +90,8 @@ BEGIN IDS_DWL_FAILED "Descărcarea pachetului Gecko a eșuat. Asigurați-vă că aveți conexiune la internet pentru a putea descărca. Asistentul va continua fără a instala pachetul Gecko." IDS_CANTMAKEINETSHORTCUT "Eșec în crearea scurtăturii la Internet." IDS_CANTMAKESHORTCUT "Eșec în crearea scurtăturii." - IDS_NO_MEMORY "No memory could be allocated!" - IDS_NO_DIRECTORY "No directory given!" - IDS_INVALID_PATH "The given path is invalid!" - IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_NO_MEMORY "Nu a putut fi alocată memorie!" + IDS_NO_DIRECTORY "Nu a fost dat niciun director!" + IDS_INVALID_PATH "Calea dată este nevalidă!" + IDS_INVALID_NAME "Numele comenzii rapide pe care l-ați introdus conținea fie caractere nevalide pentru numele fișierelor, fie era prea lung." END

2 years

[reactos] 01/01: [ZIPFLDR] Set large icon correctly (#4708)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7244a4a2f5a53571b7e3a… commit 7244a4a2f5a53571b7e3a287c860e1277ea902d3 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Mon Sep 19 05:56:35 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 19 01:56:35 2022 +0300 [ZIPFLDR] Set large icon correctly (#4708) Now it's correctly displayed in Alt+Tab window selection. --- dll/shellext/zipfldr/CZipExtract.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 24a744f2e2d..20a8087a029 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -331,10 +331,23 @@ public: }; + /* NOTE: This callback is needed to set large icon correctly. */ + static INT CALLBACK s_PropSheetCallbackProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) + { + if (uMsg == PSCB_INITIALIZED) + { + HICON hIcon = LoadIconW(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCEW(IDI_ZIPFLDR)); + CWindow dlg(hwndDlg); + dlg.SetIcon(hIcon, TRUE); + } + + return 0; + } + void runWizard() { PROPSHEETHEADERW psh = { sizeof(psh), 0 }; - psh.dwFlags = PSH_WIZARD97 | PSH_HEADER | PSH_USEICONID; + psh.dwFlags = PSH_WIZARD97 | PSH_HEADER | PSH_USEICONID | PSH_USECALLBACK; psh.hInstance = _AtlBaseModule.GetResourceInstance(); CExtractSettingsPage extractPage(this, &m_Password); @@ -350,6 +363,7 @@ public: psh.pszIcon = MAKEINTRESOURCE(IDI_ZIPFLDR); psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + psh.pfnCallback = s_PropSheetCallbackProc; PropertySheetW(&psh); }

2 years

[reactos] 01/01: [DDRAW] Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags() CORE-18378 (#4713)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=305aae75f59a9e0e43b92… commit 305aae75f59a9e0e43b9213d86dbafe9e750c525 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Sep 18 20:53:30 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 18 20:53:30 2022 +0200 [DDRAW] Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags() CORE-18378 (#4713) Mutes the logging: fixme:(dll/directx/wine/ddraw/utils.c:584) Unhandled flags 0x20. gets logged many times per second. It does affect several applications, e.g. the game 'Anno 1602' from 1998, and the 'Diablo 2 demo' from rapps, For both games it can be observed with both: our VBEMP driver and the VBox4.3.12 3D-accelerated-driver. Muting may improve performance a bit in such apps. It gets logged although no missing features can be perceived visually in the rendering. Fix it by importing Wine-commit b943c7910b3261c9603343369cd632f7a3b56bba ddraw: Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dll/directx/wine/ddraw/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/ddraw/utils.c b/dll/directx/wine/ddraw/utils.c index 65f24dc13fd..b0a028d4a57 100644 --- a/dll/directx/wine/ddraw/utils.c +++ b/dll/directx/wine/ddraw/utils.c @@ -570,7 +570,7 @@ unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) unsigned int wined3d_flags; wined3d_flags = flags & handled; - if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS))) + if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS | DDLOCK_WRITEONLY))) wined3d_flags |= WINED3D_MAP_READ; if (!(flags & DDLOCK_READONLY)) wined3d_flags |= WINED3D_MAP_WRITE; @@ -578,7 +578,7 @@ unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; if (flags & DDLOCK_NODIRTYUPDATE) wined3d_flags |= WINED3D_MAP_NO_DIRTY_UPDATE; - flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_NODIRTYUPDATE); + flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_WRITEONLY | DDLOCK_NODIRTYUPDATE); if (flags) FIXME("Unhandled flags %#x.\n", flags);

2 years

[reactos] 01/01: [GDI32] Fix ExtTextOutA with ETO_GLYPH_INDEX

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d84b76a69e3e57264860f… commit d84b76a69e3e57264860fa2fc3245f6f02dac9ec Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 14 20:53:04 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 18 20:51:12 2022 +0200 [GDI32] Fix ExtTextOutA with ETO_GLYPH_INDEX CORE-18365 --- win32ss/gdi/gdi32/objects/text.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 2a3831aff27..4ba8c9a5d4d 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -465,9 +465,16 @@ ExtTextOutA( UNICODE_STRING StringU; BOOL ret; - RtlInitAnsiString(&StringA, (LPSTR)lpString); + if (fuOptions & ETO_GLYPH_INDEX) + return ExtTextOutW(hdc, x, y, fuOptions, lprc, (LPCWSTR)lpString, cch, lpDx); + + StringA.Buffer = (PCHAR)lpString; + StringA.Length = StringA.MaximumLength = cch; RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); + if (StringU.Length != StringA.Length * sizeof(WCHAR)) + DPRINT1("ERROR: Should convert lpDx properly!\n"); + ret = ExtTextOutW(hdc, x, y, fuOptions, lprc, StringU.Buffer, cch, lpDx); RtlFreeUnicodeString(&StringU);

2 years

[reactos] 01/01: [NTOS] Add some sanity checks when synchronizing PDEs

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75125228be048a899bb9d… commit 75125228be048a899bb9d03efb2a55c8c3a8b60e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 9 19:17:14 2022 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Sep 17 13:48:56 2022 +0200 [NTOS] Add some sanity checks when synchronizing PDEs --- ntoskrnl/include/internal/mm.h | 12 ++--- ntoskrnl/mm/ARM3/miarm.h | 18 +++++-- ntoskrnl/mm/i386/page.c | 117 +++++++++++++++++++++-------------------- ntoskrnl/mm/marea.c | 7 ++- ntoskrnl/mm/rmap.c | 18 +++++-- ntoskrnl/mm/section.c | 14 ++++- 6 files changed, 112 insertions(+), 74 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index af281b26ff3..c7bf663d1c8 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1288,13 +1288,13 @@ NTSTATUS NTAPI MmGetExecuteOptions(IN PULONG ExecuteOptions); -VOID -NTAPI +_Success_(return) +BOOLEAN MmDeleteVirtualMapping( - struct _EPROCESS *Process, - PVOID Address, - BOOLEAN* WasDirty, - PPFN_NUMBER Page + _In_opt_ PEPROCESS Process, + _In_ PVOID Address, + _Out_opt_ BOOLEAN* WasDirty, + _Out_opt_ PPFN_NUMBER Page ); /* arch/procsup.c ************************************************************/ diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index b5fd1de3409..60197cda74e 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -2428,21 +2428,29 @@ FORCEINLINE BOOLEAN MiSynchronizeSystemPde(PMMPDE PointerPde) { - MMPDE SystemPde; ULONG Index; /* Get the Index from the PDE */ Index = ((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE); + if (PointerPde->u.Hard.Valid != 0) + { + NT_ASSERT(PointerPde->u.Long == MmSystemPagePtes[Index].u.Long); + return TRUE; + } + + if (MmSystemPagePtes[Index].u.Hard.Valid == 0) + { + return FALSE; + } /* Copy the PDE from the double-mapped system page directory */ - SystemPde = MmSystemPagePtes[Index]; - *PointerPde = SystemPde; + MI_WRITE_VALID_PDE(PointerPde, MmSystemPagePtes[Index]); /* Make sure we re-read the PDE and PTE */ KeMemoryBarrierWithoutFence(); - /* Return, if we had success */ - return SystemPde.u.Hard.Valid != 0; + /* Return success */ + return TRUE; } #endif diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index a9ba2eb1179..791aeb93490 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -119,7 +119,12 @@ BOOLEAN MiIsPageTablePresent(PVOID Address) { #if _MI_PAGING_LEVELS == 2 - return MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] != 0; + BOOLEAN Ret = MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] != 0; + + /* Some sanity check while we're here */ + ASSERT(Ret == (MiAddressToPde(Address)->u.Hard.Valid != 0)); + + return Ret; #else PMMPDE PointerPde; PMMPPE PointerPpe; @@ -217,16 +222,29 @@ MmGetPfnForProcess(PEPROCESS Process, return Page; } -VOID -NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, - BOOLEAN* WasDirty, PPFN_NUMBER Page) -/* - * FUNCTION: Delete a virtual mapping +/** + * @brief Deletes the virtual mapping and optionally gives back the page & dirty bit. + * + * @param Process - The process this address belongs to, or NULL if system address. + * @param Address - The address to unmap. + * @param WasDirty - Optional param receiving the dirty bit of the PTE. + * @param Page - Optional param receiving the page number previously mapped to this address. + * + * @return Whether there was actually a page mapped at the given address. */ +_Success_(return) +BOOLEAN +MmDeleteVirtualMapping( + _In_opt_ PEPROCESS Process, + _In_ PVOID Address, + _Out_opt_ BOOLEAN* WasDirty, + _Out_opt_ PPFN_NUMBER Page) { PMMPTE PointerPte; MMPTE OldPte; + BOOLEAN ValidPde; + + OldPte.u.Long = 0; DPRINT("MmDeleteVirtualMapping(%p, %p, %p, %p)\n", Process, Address, WasDirty, Page); @@ -244,18 +262,10 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, KeBugCheck(MEMORY_MANAGEMENT); } #if (_MI_PAGING_LEVELS == 2) - if (!MiSynchronizeSystemPde(MiAddressToPde(Address))) + ValidPde = MiSynchronizeSystemPde(MiAddressToPde(Address)); #else - if (!MiIsPdeForAddressValid(Address)) + ValidPde = MiIsPdeForAddressValid(Address); #endif - { - /* There can't be a page if there is no PDE */ - if (WasDirty) - *WasDirty = FALSE; - if (Page) - *Page = 0; - return; - } } else { @@ -266,61 +276,56 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, } /* Only for current process !!! */ - ASSERT(Process = PsGetCurrentProcess()); + ASSERT(Process == PsGetCurrentProcess()); MiLockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); - /* No PDE --> No page */ - if (!MiIsPageTablePresent(Address)) + ValidPde = MiIsPageTablePresent(Address); + if (ValidPde) { - MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); - if (WasDirty) - *WasDirty = 0; - if (Page) - *Page = 0; - return; + MiMakePdeExistAndMakeValid(MiAddressToPde(Address), Process, MM_NOIRQL); } - - MiMakePdeExistAndMakeValid(MiAddressToPde(Address), Process, MM_NOIRQL); } - PointerPte = MiAddressToPte(Address); - OldPte.u.Long = InterlockedExchangePte(PointerPte, 0); - - if (OldPte.u.Long == 0) + /* Get the PTE if we're having anything */ + if (ValidPde) { - /* There was nothing here */ - if (Address < MmSystemRangeStart) - MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); - if (WasDirty) - *WasDirty = 0; - if (Page) - *Page = 0; - return; - } + PointerPte = MiAddressToPte(Address); + OldPte.u.Long = InterlockedExchangePte(PointerPte, 0); - /* It must have been present, or not a swap entry */ - ASSERT(OldPte.u.Hard.Valid || !FlagOn(OldPte.u.Long, 0x800)); - - if (OldPte.u.Hard.Valid) KeInvalidateTlbEntry(Address); - if (Address < MmSystemRangeStart) + if (OldPte.u.Long != 0) + { + /* It must have been present, or not a swap entry */ + ASSERT(OldPte.u.Hard.Valid || !FlagOn(OldPte.u.Long, 0x800)); + if (WasDirty != NULL) + { + *WasDirty = !!OldPte.u.Hard.Dirty; + } + if (Page != NULL) + { + *Page = OldPte.u.Hard.PageFrameNumber; + } + } + } + + if (Process != NULL) { - /* Remove PDE reference */ - if (MiDecrementPageTableReferences(Address) == 0) + /* Remove PDE reference, if needed */ + if (OldPte.u.Long != 0) { - KIRQL OldIrql = MiAcquirePfnLock(); - MiDeletePde(MiAddressToPde(Address), Process); - MiReleasePfnLock(OldIrql); + if (MiDecrementPageTableReferences(Address) == 0) + { + KIRQL OldIrql = MiAcquirePfnLock(); + MiDeletePde(MiAddressToPde(Address), Process); + MiReleasePfnLock(OldIrql); + } } MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); } - if (WasDirty) - *WasDirty = !!OldPte.u.Hard.Dirty; - if (Page) - *Page = OldPte.u.Hard.PageFrameNumber; + return OldPte.u.Long != 0; } @@ -631,7 +636,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, } /* Only for current process !!! */ - ASSERT(Process = PsGetCurrentProcess()); + ASSERT(Process == PsGetCurrentProcess()); MiLockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); MiMakePdeExistAndMakeValid(MiAddressToPde(Address), Process, MM_NOIRQL); diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 78d07c75cd6..8bf8ab72630 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -314,16 +314,19 @@ MmFreeMemoryArea( BOOLEAN Dirty = FALSE; SWAPENTRY SwapEntry = 0; PFN_NUMBER Page = 0; + BOOLEAN DoFree; if (MmIsPageSwapEntry(Process, (PVOID)Address)) { MmDeletePageFileMapping(Process, (PVOID)Address, &SwapEntry); + /* We'll have to do some cleanup when we're on the page file */ + DoFree = TRUE; } else { - MmDeleteVirtualMapping(Process, (PVOID)Address, &Dirty, &Page); + DoFree = MmDeleteVirtualMapping(Process, (PVOID)Address, &Dirty, &Page); } - if (FreePage != NULL) + if (DoFree && (FreePage != NULL)) { FreePage(FreePageContext, MemoryArea, (PVOID)Address, Page, SwapEntry, (BOOLEAN)Dirty); diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index e27e31de820..9c2f00eff22 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -135,6 +135,7 @@ GetEntry: PFN_NUMBER MapPage; LARGE_INTEGER Offset; BOOLEAN Released; + BOOLEAN Unmapped; Offset.QuadPart = MemoryArea->SectionData.ViewOffset + ((ULONG_PTR)Address - MA_GetStartingAddress(MemoryArea)); @@ -158,10 +159,19 @@ GetEntry: /* Delete this virtual mapping in the process */ MmDeleteRmap(Page, Process, Address); - MmDeleteVirtualMapping(Process, Address, &Dirty, &MapPage); - - /* We checked this earlier */ - ASSERT(MapPage == Page); + Unmapped = MmDeleteVirtualMapping(Process, Address, &Dirty, &MapPage); + if (!Unmapped || (MapPage != Page)) + { + /* + * Something's corrupted, we got there because this process is + * supposed to be mapping this page there. + */ + KeBugCheckEx(MEMORY_MANAGEMENT, + (ULONG_PTR)Process, + (ULONG_PTR)Address, + (ULONG_PTR)__FILE__, + __LINE__); + } if (Page != PFN_FROM_SSE(Entry)) { diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 44b5710f6f4..0ab7da4a648 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1897,6 +1897,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, PMM_SECTION_SEGMENT Segment; PFN_NUMBER OldPage; PFN_NUMBER NewPage; + PFN_NUMBER UnmappedPage; PVOID PAddress; LARGE_INTEGER Offset; PMM_REGION Region; @@ -1904,6 +1905,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); BOOLEAN Cow = FALSE; ULONG NewProtect; + BOOLEAN Unmapped; DPRINT("MmAccessFaultSectionView(%p, %p, %p)\n", AddressSpace, MemoryArea, Address); @@ -2003,7 +2005,17 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, * Unshare the old page. */ DPRINT("Swapping page (Old %x New %x)\n", OldPage, NewPage); - MmDeleteVirtualMapping(Process, PAddress, NULL, NULL); + Unmapped = MmDeleteVirtualMapping(Process, PAddress, NULL, &UnmappedPage); + if (!Unmapped || (UnmappedPage != OldPage)) + { + /* Uh , we had a page just before, but suddenly it changes. Someone corrupted us. */ + KeBugCheckEx(MEMORY_MANAGEMENT, + (ULONG_PTR)Process, + (ULONG_PTR)PAddress, + (ULONG_PTR)__FILE__, + __LINE__); + } + if (Process) MmDeleteRmap(OldPage, Process, PAddress); MmUnsharePageEntrySectionSegment(MemoryArea, Segment, &Offset, FALSE, FALSE, NULL);

2 years

[reactos] 01/01: [CPL] Boundary check of Control Panel applets (#4706)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5ebbc8afaf104eff2db2… commit e5ebbc8afaf104eff2db274a73131e83e6bed4dc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 17 13:59:51 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 17 13:59:51 2022 +0900 [CPL] Boundary check of Control Panel applets (#4706) - Check the boundary (i < NUM_APPLETS) of the variable i in CPlApplet functions. - Use UINT type for the variable i. --- dll/cpl/access/access.c | 16 +++++++++++++--- dll/cpl/desk/desk.c | 16 +++++++++++++--- dll/cpl/hotplug/hotplug.c | 14 ++++++++++++-- dll/cpl/input/input.c | 26 +++++++++++++++++--------- dll/cpl/intl/intl.c | 32 +++++++++++++++++++++----------- dll/cpl/joy/joy.c | 26 +++++++++++++++++--------- dll/cpl/main/main.c | 35 +++++++++++++++++++++-------------- dll/cpl/mmsys/mmsys.c | 38 +++++++++++++++++++++----------------- dll/cpl/powercfg/powercfg.c | 28 +++++++++++++++++----------- dll/cpl/sysdm/sysdm.c | 17 +++++++++++++---- dll/cpl/timedate/timedate.c | 32 +++++++++++++++++++------------- dll/cpl/usrmgr/usrmgr.c | 12 ++++++++++-- 12 files changed, 194 insertions(+), 98 deletions(-) diff --git a/dll/cpl/access/access.c b/dll/cpl/access/access.c index d840adfe99e..82ebb52ac04 100644 --- a/dll/cpl/access/access.c +++ b/dll/cpl/access/access.c @@ -240,7 +240,7 @@ CPlApplet(HWND hwndCPl, LPARAM lParam1, LPARAM lParam2) { - INT i = (INT)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -251,6 +251,7 @@ CPlApplet(HWND hwndCPl, return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -258,14 +259,23 @@ CPlApplet(HWND hwndCPl, CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 213ec6c8ff9..a5df62885a2 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -252,7 +252,7 @@ cleanup: LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - int i = (int)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -263,6 +263,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -270,14 +271,23 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index da848bf2cbe..7f2930f26cc 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -548,6 +548,7 @@ CPlApplet( return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -555,14 +556,23 @@ CPlApplet( CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } return FALSE; } diff --git a/dll/cpl/input/input.c b/dll/cpl/input/input.c index d621f2f9cf7..cd8a0291cb5 100644 --- a/dll/cpl/input/input.c +++ b/dll/cpl/input/input.c @@ -87,9 +87,7 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { CPLINFO *CPlInfo; - int i; - - i = (int)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -100,15 +98,25 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return NUM_APPLETS; case CPL_INQUIRE: - CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; + if (i < NUM_APPLETS) + { + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; } diff --git a/dll/cpl/intl/intl.c b/dll/cpl/intl/intl.c index 054a8f1e674..bce915ce177 100644 --- a/dll/cpl/intl/intl.c +++ b/dll/cpl/intl/intl.c @@ -232,6 +232,8 @@ CPlApplet(HWND hwndCpl, LPARAM lParam1, LPARAM lParam2) { + UINT i = (UINT)lParam1; + switch (uMsg) { case CPL_INIT: @@ -241,23 +243,31 @@ CPlApplet(HWND hwndCpl, return NUM_APPLETS; case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - UINT uAppIndex = (UINT)lParam1; - - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[uAppIndex].idIcon; - CPlInfo->idName = Applets[uAppIndex].idName; - CPlInfo->idInfo = Applets[uAppIndex].idDescription; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; - } case CPL_DBLCLK: - Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c index f58c874c9e6..057ec4c8534 100644 --- a/dll/cpl/joy/joy.c +++ b/dll/cpl/joy/joy.c @@ -319,11 +319,9 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { CPLINFO *CPlInfo; - DWORD i; - + UINT i = (UINT)lParam1; UNREFERENCED_PARAMETER(hwndCPl); - i = (DWORD)lParam1; switch (uMsg) { case CPL_INIT: @@ -333,15 +331,25 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return NUM_APPLETS; case CPL_INQUIRE: - CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; + if (i < NUM_APPLETS) + { + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; } diff --git a/dll/cpl/main/main.c b/dll/cpl/main/main.c index 6e1294b3bd0..70c432a2504 100644 --- a/dll/cpl/main/main.c +++ b/dll/cpl/main/main.c @@ -87,6 +87,8 @@ CPlApplet(HWND hwndCpl, LPARAM lParam1, LPARAM lParam2) { + UINT i = (UINT)lParam1; + switch(uMsg) { case CPL_INIT: @@ -96,26 +98,31 @@ CPlApplet(HWND hwndCpl, return NUM_APPLETS; case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - UINT uAppIndex = (UINT)lParam1; - - CPlInfo->lData = lParam1; - CPlInfo->idIcon = Applets[uAppIndex].idIcon; - CPlInfo->idName = Applets[uAppIndex].idName; - CPlInfo->idInfo = Applets[uAppIndex].idDescription; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = lParam1; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; - } case CPL_DBLCLK: - { - UINT uAppIndex = (UINT)lParam1; - Applets[uAppIndex].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + else + return TRUE; break; - } case CPL_STARTWPARMSW: - return Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index 78bdc57078b..bde437eda15 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -745,6 +745,8 @@ CPlApplet(HWND hwndCpl, LPARAM lParam1, LPARAM lParam2) { + UINT i = (UINT)lParam1; + switch (uMsg) { case CPL_INIT: @@ -754,29 +756,31 @@ CPlApplet(HWND hwndCpl, return NUM_APPLETS; case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - UINT uAppIndex = (UINT)lParam1; - - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[uAppIndex].idIcon; - CPlInfo->idName = Applets[uAppIndex].idName; - CPlInfo->idInfo = Applets[uAppIndex].idDescription; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; - } case CPL_DBLCLK: - { - UINT uAppIndex = (UINT)lParam1; - Applets[uAppIndex].AppletProc(hwndCpl, - uMsg, - lParam1, - lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + else + return TRUE; break; - } case CPL_STARTWPARMSW: - return Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index 4e5e1c17220..9fd813a35a7 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -155,7 +155,7 @@ CPlApplet(HWND hwndCPl, LPARAM lParam1, LPARAM lParam2) { - int i = (int)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -170,20 +170,26 @@ CPlApplet(HWND hwndCPl, } case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; - } case CPL_DBLCLK: - { - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; - } } return FALSE; diff --git a/dll/cpl/sysdm/sysdm.c b/dll/cpl/sysdm/sysdm.c index a93b02ceb1e..fbd7651a6f9 100644 --- a/dll/cpl/sysdm/sysdm.c +++ b/dll/cpl/sysdm/sysdm.c @@ -203,7 +203,7 @@ CPlApplet(HWND hwndCPl, LPARAM lParam1, LPARAM lParam2) { - INT i = (INT)lParam1; + UINT i = (UINT)lParam1; UNREFERENCED_PARAMETER(hwndCPl); @@ -216,6 +216,7 @@ CPlApplet(HWND hwndCPl, return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -223,15 +224,23 @@ CPlApplet(HWND hwndCPl, CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); - + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/timedate/timedate.c b/dll/cpl/timedate/timedate.c index 9e1baaa3eca..e3f03fdf7ca 100644 --- a/dll/cpl/timedate/timedate.c +++ b/dll/cpl/timedate/timedate.c @@ -131,7 +131,7 @@ CPlApplet(HWND hwndCpl, LPARAM lParam1, LPARAM lParam2) { - INT i = (INT)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -142,20 +142,26 @@ CPlApplet(HWND hwndCpl, return NUM_APPLETS; case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - } - break; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } + break; case CPL_DBLCLK: - { - Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); - } - break; + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + else + return TRUE; + break; } return FALSE; } diff --git a/dll/cpl/usrmgr/usrmgr.c b/dll/cpl/usrmgr/usrmgr.c index 7aea9731796..6c00abd666e 100644 --- a/dll/cpl/usrmgr/usrmgr.c +++ b/dll/cpl/usrmgr/usrmgr.c @@ -90,7 +90,7 @@ UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - int i = (int)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -101,6 +101,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -108,10 +109,17 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; }

2 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2022