Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 01/01: [BROWSEUI] Refactor settings and sync them between windows (#5496)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43b3dc20341682ffe1f5b… commit 43b3dc20341682ffe1f5b29e28b023f5843952b3 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 17 03:14:41 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 17 12:14:41 2023 +0300 [BROWSEUI] Refactor settings and sync them between windows (#5496) This works similarly to how our shell stores its settings from a software design standpoint. - Add settings.cpp file and ShellSettings structure to load and save settings. - Add a registry value to hivedef.inf for the locked toolbar state. This prevents a bug where the associated registry key cannot be opened or saved to. - Add new BWM_SETTINGCHANGE window message to refresh the UI on setting changes and send it to every open window when saving settings to the registry. - Add new BWM_GETSETTINGSPTR window message to share the shellbrowser settings structure pointer with child windows and toolbars. --- boot/bootdata/hivedef.inf | 1 + dll/win32/browseui/CMakeLists.txt | 1 + dll/win32/browseui/internettoolbar.cpp | 92 +++++++++++++++++----------------- dll/win32/browseui/internettoolbar.h | 4 ++ dll/win32/browseui/precomp.h | 14 ++++++ dll/win32/browseui/settings.cpp | 36 +++++++++++++ dll/win32/browseui/shellbrowser.cpp | 66 ++++++++++++++---------- 7 files changed, 141 insertions(+), 73 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 6394246fad9..6551f5a7701 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1902,6 +1902,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ShowSuperHid HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState","FullPath",0x00010003,0 HKCU,"SOFTWARE\Microsoft\Internet Explorer\Main","StatusBarOther",0x00010003,1 +HKCU,"SOFTWARE\Microsoft\Internet Explorer\Toolbar","Locked",0x00010003,1 ; ComDlg32 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32",,0x00000012 diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 8b9eb4ebd3d..83a78e085dc 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -30,6 +30,7 @@ list(APPEND SOURCE internettoolbar.cpp parsecmdline.cpp regtreeoptions.cpp + settings.cpp shellbrowser.cpp toolsband.cpp travellog.cpp diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 8d51ad6bcfe..b9d3b6273b7 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -250,11 +250,11 @@ HRESULT CDockSite::GetRBBandInfo(REBARBANDINFOW &bandInfo) bandInfo.fStyle |= RBBS_BREAK; if (fDeskBandInfo.dwModeFlags & DBIMF_TOPALIGN) bandInfo.fStyle |= RBBS_TOPALIGN; - if (fFlags & ITF_NOGRIPPER || fToolbar->fLocked) + if (fFlags & ITF_NOGRIPPER || fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_NOGRIPPER; if (fFlags & ITF_NOTITLE) bandInfo.fStyle |= RBBS_HIDETITLE; - if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->fLocked) + if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_GRIPPERALWAYS; if (fFlags & ITF_FIXEDSIZE) bandInfo.fStyle |= RBBS_FIXEDSIZE; @@ -607,17 +607,13 @@ HRESULT STDMETHODCALLTYPE CMenuCallback::CallbackSM(LPSMDATA psmd, UINT uMsg, WP CInternetToolbar::CInternetToolbar() { - fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", - L"Locked", - FALSE, - TRUE); - fMainReBar = NULL; fMenuBandWindow = NULL; fNavigationWindow = NULL; fMenuCallback = new CComObject<CMenuCallback>(); fToolbarWindow = NULL; fAdviseCookie = 0; + pSettings = NULL; } CInternetToolbar::~CInternetToolbar() @@ -714,45 +710,40 @@ HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar) } HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) +{ + if (locked != pSettings->fLocked) + { + pSettings->fLocked = locked; + pSettings->Save(); + RefreshLockedToolbarState(); + } + return S_OK; +} + +void CInternetToolbar::RefreshLockedToolbarState() { REBARBANDINFOW rebarBandInfo; int bandCount; CDockSite *dockSite; - HRESULT hResult; - if (locked != fLocked) + rebarBandInfo.cbSize = sizeof(rebarBandInfo); + rebarBandInfo.fMask = RBBIM_STYLE | RBBIM_LPARAM; + bandCount = (int)SendMessage(fMainReBar, RB_GETBANDCOUNT, 0, 0); + for (INT x = 0; x < bandCount; x++) { - DWORD dwLocked = locked ? 1 : 0; - SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", - L"Locked", - REG_DWORD, - &dwLocked, - sizeof(dwLocked), - SHREGSET_FORCE_HKCU); - fLocked = locked; - - rebarBandInfo.cbSize = sizeof(rebarBandInfo); - rebarBandInfo.fMask = RBBIM_STYLE | RBBIM_LPARAM; - bandCount = (int)SendMessage(fMainReBar, RB_GETBANDCOUNT, 0, 0); - for (INT x = 0; x < bandCount; x++) + SendMessage(fMainReBar, RB_GETBANDINFOW, x, (LPARAM)&rebarBandInfo); + dockSite = reinterpret_cast<CDockSite *>(rebarBandInfo.lParam); + if (dockSite != NULL) { - SendMessage(fMainReBar, RB_GETBANDINFOW, x, (LPARAM)&rebarBandInfo); - dockSite = reinterpret_cast<CDockSite *>(rebarBandInfo.lParam); - if (dockSite != NULL) - { - rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS); - if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || fLocked) - rebarBandInfo.fStyle |= RBBS_NOGRIPPER; - if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !fLocked) - rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS; - SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); - } + rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS); + if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || pSettings->fLocked) + rebarBandInfo.fStyle |= RBBS_NOGRIPPER; + if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !pSettings->fLocked) + rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS; + SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); } - hResult = ReserveBorderSpace(0); - - // TODO: refresh view menu? } - return S_OK; + ReserveBorderSpace(0); } HRESULT CInternetToolbar::SetState(const GUID *pguidCmdGroup, long commandID, OLECMD* pcmd) @@ -980,7 +971,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::ResizeBorderDW(LPCRECT prcBorder, ::GetWindowRect(fMainReBar, &availableBorderSpace); neededBorderSpace.left = 0; neededBorderSpace.top = availableBorderSpace.bottom - availableBorderSpace.top; - if (!fLocked) + if (!pSettings->fLocked) neededBorderSpace.top += 3; neededBorderSpace.right = 0; neededBorderSpace.bottom = 0; @@ -1145,7 +1136,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryStatus(const GUID *pguidCmdGrou break; case ITID_TOOLBARLOCKED: // lock toolbars prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; - if (fLocked) + if (pSettings->fLocked) prgCmds->cmdf |= OLECMDF_LATCHED; break; default: @@ -1184,7 +1175,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::Exec(const GUID *pguidCmdGroup, DWOR // run customize return S_OK; case ITID_TOOLBARLOCKED: - return LockUnlockToolbars(!fLocked); + return LockUnlockToolbars(!pSettings->fLocked); } } return E_FAIL; @@ -1356,6 +1347,9 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::SetSite(IUnknown *pUnkSite) if (ownerWindow == NULL) return E_FAIL; + // Get settings from owner window + ::SendMessageW(ownerWindow, BWM_GETSETTINGSPTR, 0, (LPARAM)&pSettings); + // create dock container fSite = pUnkSite; dockContainer = SHCreateWorkerWindowW(0, ownerWindow, 0, @@ -1682,7 +1676,6 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, RBHITTESTINFO hitTestInfo; REBARBANDINFOW rebarBandInfo; int bandID; - BOOL goButtonChecked; clickLocation.x = LOWORD(lParam); clickLocation.y = HIWORD(lParam); @@ -1727,9 +1720,8 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, SHCheckMenuItem(contextMenu, IDM_TOOLBARS_ADDRESSBAR, IsBandVisible(ITBBID_ADDRESSBAND) == S_OK); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LINKSBAR, FALSE); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_CUSTOMIZE, FALSE); - SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, fLocked); - goButtonChecked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); - SHCheckMenuItem(contextMenu, IDM_TOOLBARS_GOBUTTON, goButtonChecked); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, pSettings->fLocked); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_GOBUTTON, pSettings->fShowGoButton); // TODO: use GetSystemMetrics(SM_MENUDROPALIGNMENT) to determine menu alignment command = TrackPopupMenu(contextMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, @@ -1745,7 +1737,7 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, case IDM_TOOLBARS_LINKSBAR: // links break; case IDM_TOOLBARS_LOCKTOOLBARS: // lock the toolbars - LockUnlockToolbars(!fLocked); + LockUnlockToolbars(!pSettings->fLocked); break; case IDM_TOOLBARS_CUSTOMIZE: // customize SendMessage(fToolbarWindow, TB_CUSTOMIZE, 0, 0); @@ -1850,7 +1842,7 @@ LRESULT CInternetToolbar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CInternetToolbar::OnLDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { bHandled = FALSE; - if (fLocked) + if (pSettings->fLocked) return 0; if (wParam & MK_CONTROL) @@ -1928,3 +1920,11 @@ LRESULT CInternetToolbar::OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam return lres; } + +LRESULT CInternetToolbar::OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + /* Refresh toolbar locked state */ + RefreshLockedToolbarState(); + + return 0; +} diff --git a/dll/win32/browseui/internettoolbar.h b/dll/win32/browseui/internettoolbar.h index e824df72b19..0b154ab07b0 100644 --- a/dll/win32/browseui/internettoolbar.h +++ b/dll/win32/browseui/internettoolbar.h @@ -92,6 +92,7 @@ public: BOOL fSizing; POINT fStartPosition; LONG fStartHeight; + ShellSettings *pSettings; public: CInternetToolbar(); virtual ~CInternetToolbar(); @@ -105,6 +106,7 @@ public: HRESULT IsBandVisible(int BandID); HRESULT ToggleBandVisibility(int BandID); HRESULT SetState(const GUID *pguidCmdGroup, long commandID, OLECMD* pcmd); + void RefreshLockedToolbarState(); public: // *** IInputObject specific methods *** @@ -200,6 +202,7 @@ public: LRESULT OnLUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); BEGIN_MSG_MAP(CInternetToolbar) COMMAND_ID_HANDLER(IDM_GOTO_BACK, OnTravelBack) @@ -221,6 +224,7 @@ public: MESSAGE_HANDLER(WM_LBUTTONUP, OnLUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_WININICHANGE, OnWinIniChange) + MESSAGE_HANDLER(BWM_SETTINGCHANGE, OnSettingsChange) END_MSG_MAP() DECLARE_REGISTRY_RESOURCEID(IDR_INTERNETTOOLBAR) diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h index 67fe4c33208..c3c26e7115d 100644 --- a/dll/win32/browseui/precomp.h +++ b/dll/win32/browseui/precomp.h @@ -37,6 +37,10 @@ #include "resource.h" +#define BWM_SETTINGCHANGE (WM_USER + 300) +#define BWM_GETSETTINGSPTR (WM_USER + 301) +struct ShellSettings; + #include "ACLCustomMRU.h" #include "aclhistory.h" #include "aclistisf.h" @@ -65,4 +69,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); +struct ShellSettings +{ + BOOL fLocked = FALSE; + BOOL fShowGoButton = FALSE; + BOOL fStatusBarVisible = FALSE; + + BOOL Save(); + BOOL Load(); +}; + #endif /* _BROWSEUI_PCH_ */ diff --git a/dll/win32/browseui/settings.cpp b/dll/win32/browseui/settings.cpp new file mode 100644 index 00000000000..de7e6c04480 --- /dev/null +++ b/dll/win32/browseui/settings.cpp @@ -0,0 +1,36 @@ +/* + * PROJECT: ReactOS browseui + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Stores settings for the file explorer UI. + * COPYRIGHT: Copyright 2023 Carl Bialorucki <cbialo2(a)outlook.com> + */ + +#include "precomp.h" + +BOOL ShellSettings::Save() +{ + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"StatusBarOther", + REG_DWORD, &fStatusBarVisible, sizeof(fStatusBarVisible), SHREGSET_FORCE_HKCU); + + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", + REG_DWORD, &fShowGoButton, sizeof(fShowGoButton), SHREGSET_FORCE_HKCU); + + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", L"Locked", + REG_DWORD, &fLocked, sizeof(fLocked), SHREGSET_FORCE_HKCU); + + return TRUE; +} + +BOOL ShellSettings::Load() +{ + fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", + L"StatusBarOther", FALSE, FALSE); + + fShowGoButton = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", + L"ShowGoButton", FALSE, TRUE); + + fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", + L"Locked", FALSE, TRUE); + + return TRUE; +} diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 0c808c29e25..0f1e3814ebe 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -292,7 +292,6 @@ private: CComPtr<IShellView> fCurrentShellView; // LPITEMIDLIST fCurrentDirectoryPIDL; // HWND fStatusBar; - bool fStatusBarVisible; CToolbarProxy fToolbarProxy; barInfo fClientBars[3]; CComPtr<ITravelLog> fTravelLog; @@ -306,6 +305,7 @@ private: IBindCtx *fHistoryBindContext; HDSA menuDsa; HACCEL m_hAccel; + ShellSettings m_settings; public: #if 0 ULONG InternalAddRef() @@ -350,7 +350,7 @@ public: HRESULT UpdateUpState(); void UpdateGotoMenu(HMENU theMenu); void UpdateViewMenu(HMENU theMenu); - void LoadSettings(); + void LoadCabinetState(); /* // *** IDockingWindowFrame methods *** virtual HRESULT STDMETHODCALLTYPE AddToolbar(IUnknown *punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags); @@ -624,6 +624,8 @@ public: LRESULT OnRefresh(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnExplorerBar(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnGetSettingsPtr(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); HRESULT OnSearch(); static ATL::CWndClassInfo& GetWndClassInfo() @@ -674,6 +676,8 @@ public: COMMAND_RANGE_HANDLER(IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, OnGoTravel) COMMAND_RANGE_HANDLER(IDM_EXPLORERBAND_BEGINCUSTOM, IDM_EXPLORERBAND_ENDCUSTOM, OnExplorerBar) MESSAGE_HANDLER(WM_COMMAND, RelayCommands) + MESSAGE_HANDLER(BWM_SETTINGCHANGE, OnSettingsChange) + MESSAGE_HANDLER(BWM_GETSETTINGSPTR, OnGetSettingsPtr) END_MSG_MAP() BEGIN_CONNECTION_POINT_MAP(CShellBrowser) @@ -714,6 +718,7 @@ CShellBrowser::CShellBrowser() fHistoryObject = NULL; fHistoryStream = NULL; fHistoryBindContext = NULL; + m_settings.Load(); } CShellBrowser::~CShellBrowser() @@ -783,11 +788,11 @@ HRESULT CShellBrowser::Initialize() fToolbarProxy.Initialize(m_hWnd, clientBar); - LoadSettings(); + LoadCabinetState(); // create status bar DWORD dwStatusStyle = WS_CHILD | WS_CLIPSIBLINGS | SBARS_SIZEGRIP | SBARS_TOOLTIPS; - if (fStatusBarVisible) + if (m_settings.fStatusBarVisible) dwStatusStyle |= WS_VISIBLE; fStatusBar = ::CreateWindowExW(0, STATUSCLASSNAMEW, NULL, dwStatusStyle, 0, 0, 500, 20, m_hWnd, (HMENU)IDC_STATUSBAR, @@ -1449,7 +1454,7 @@ void CShellBrowser::RepositionBars() GetClientRect(&clientRect); - if (fStatusBarVisible && fStatusBar) + if (m_settings.fStatusBarVisible && fStatusBar) { ::GetWindowRect(fStatusBar, &statusRect); ::SetWindowPos(fStatusBar, NULL, clientRect.left, clientRect.bottom - (statusRect.bottom - statusRect.top), @@ -1517,13 +1522,8 @@ void CShellBrowser::RepositionBars() clientRect.bottom - clientRect.top, SWP_NOOWNERZORDER | SWP_NOZORDER); } -void CShellBrowser::LoadSettings() +void CShellBrowser::LoadCabinetState() { - fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", - L"StatusBarOther", - FALSE, - FALSE); - fCabinetState.fFullPathTitle = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", L"FullPath", FALSE, @@ -1757,7 +1757,7 @@ void CShellBrowser::UpdateViewMenu(HMENU theMenu) menuItemInfo.hSubMenu = toolbarMenu; SetMenuItemInfo(theMenu, IDM_VIEW_TOOLBARS, FALSE, &menuItemInfo); } - SHCheckMenuItem(theMenu, IDM_VIEW_STATUSBAR, fStatusBarVisible ? TRUE : FALSE); + SHCheckMenuItem(theMenu, IDM_VIEW_STATUSBAR, m_settings.fStatusBarVisible ? TRUE : FALSE); } HRESULT CShellBrowser::BuildExplorerBandMenu() @@ -3681,21 +3681,9 @@ LRESULT CShellBrowser::OnOrganizeFavorites(WORD wNotifyCode, WORD wID, HWND hWnd LRESULT CShellBrowser::OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - fStatusBarVisible = !fStatusBarVisible; - if (fStatusBar) - { - ::ShowWindow(fStatusBar, fStatusBarVisible ? SW_SHOW : SW_HIDE); - RepositionBars(); - } - - DWORD dwStatusBarVisible = fStatusBarVisible; - SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", - L"StatusBarOther", - REG_DWORD, - &dwStatusBarVisible, - sizeof(dwStatusBarVisible), - SHREGSET_FORCE_HKCU); - + m_settings.fStatusBarVisible = !m_settings.fStatusBarVisible; + m_settings.Save(); + SendMessageW(BWM_SETTINGCHANGE, 0, (LPARAM)&m_settings); return 0; } @@ -3800,6 +3788,30 @@ LRESULT CShellBrowser::RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BO return 0; } +LRESULT CShellBrowser::OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + /* Refresh child windows */ + ::SendMessageW(fClientBars[BIInternetToolbar].hwnd, uMsg, wParam, lParam); + + /* Refresh status bar */ + if (fStatusBar) + { + ::ShowWindow(fStatusBar, m_settings.fStatusBarVisible ? SW_SHOW : SW_HIDE); + RepositionBars(); + } + + return 0; +} + +LRESULT CShellBrowser::OnGetSettingsPtr(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (!lParam) + return ERROR_INVALID_PARAMETER; + + *(ShellSettings**)lParam = &m_settings; + return NO_ERROR; +} + HRESULT CShellBrowser_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreatorInit<CShellBrowser>(riid, ppv);

1 year, 4 months

[reactos] 01/01: [KERNEL32] CreateProcessInternalW(): Always use Peb variable

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8888311452009a409673a… commit 8888311452009a409673adf16d99832ff7e5fe71 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Aug 17 02:51:09 2023 +0200 Commit: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> CommitDate: Thu Aug 17 02:51:09 2023 +0200 [KERNEL32] CreateProcessInternalW(): Always use Peb variable Trivial consistency/optimization. Addendum to d81cd01 (r59637). --- dll/win32/kernel32/client/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index fdfd390395e..9f1f1c1a4a0 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -3555,7 +3555,7 @@ StartScan: /* If the process is being debugged, only read IFEO if the PEB says so */ if (!(dwCreationFlags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)) || - (NtCurrentPeb()->ReadImageFileExecOptions)) + (Peb->ReadImageFileExecOptions)) { /* Let's do this! Attempt to open IFEO */ IFEOStatus = LdrOpenImageFileOptionsKey(&PathName, 0, &KeyHandle);

1 year, 4 months

[reactos] 01/01: [KERNEL32] Fix startup context of initial thread

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5645f7cf8f5b9f41de782… commit 5645f7cf8f5b9f41de782535081983db0a7cfb35 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 14 22:03:00 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 16 22:03:05 2023 +0300 [KERNEL32] Fix startup context of initial thread When creating a new process the monster function CreateProcessInternalW calls BaseInitializeContext to set up the context for the initial thread. One of the parameters is the PEB pointer. Instead of passing the pointer to the newly created process' PEB, the function was passing it's own PEB address, leading to test failures. How this is not an issue otherwise is a mystery to be resolved by someone else. Also remove ros_skip_flaky marks in kernel32_winetest:process (yes, flaky, because sometimes the PEB addresses actually match) --- dll/win32/kernel32/client/proc.c | 2 +- modules/rostests/winetests/kernel32/process.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 5a8c78c1364..fdfd390395e 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -4181,7 +4181,7 @@ StartScan: /* Create the Thread's Context */ BaseInitializeContext(&Context, - Peb, + RemotePeb, ImageInformation.TransferAddress, InitialTeb.StackBase, 0); diff --git a/modules/rostests/winetests/kernel32/process.c b/modules/rostests/winetests/kernel32/process.c index 2944c9bf4cb..9a9a583ff53 100644 --- a/modules/rostests/winetests/kernel32/process.c +++ b/modules/rostests/winetests/kernel32/process.c @@ -3439,9 +3439,7 @@ static void test_SuspendProcessState(void) #endif ret = ReadProcessMemory( pi.hProcess, peb_ptr, &child_peb, sizeof(child_peb), NULL ); - ros_skip_flaky ok( ret, "Failed to read PEB (%u)\n", GetLastError() ); - ros_skip_flaky ok( child_peb.ImageBaseAddress == exe_base, "wrong base %p/%p\n", child_peb.ImageBaseAddress, exe_base ); ok( entry_ptr == (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint,

1 year, 4 months

[reactos] 01/01: [SHLWAPI][SDK] Rewrite SHGet/SHSetIniStringW in C++ (#5561)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf55034cdf3cb3adfb8e2… commit cf55034cdf3cb3adfb8e2b256ad720b555999522 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 16 07:13:14 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 16 07:13:14 2023 +0900 [SHLWAPI][SDK] Rewrite SHGet/SHSetIniStringW in C++ (#5561) - Follow-up to #5547. Move SHGetIniStringW / SHSetIniStringW into propbag.cpp. - Rewrite them in C++. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 103 +------------------------------- dll/win32/shlwapi/propbag.cpp | 113 ++++++++++++++++++++++++++++++++++++ sdk/include/reactos/shlwapi_undoc.h | 13 ++++- 3 files changed, 127 insertions(+), 102 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index a151d4dce00..6f8855fd10a 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -3272,6 +3272,7 @@ BOOL WINAPI PlaySoundWrapW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound) return PlaySoundW(pszSound, hmod, fdwSound); } +#ifndef __REACTOS__ /* See propbag.cpp */ /************************************************************************* * @ [SHLWAPI.294] * @@ -3291,37 +3292,6 @@ BOOL WINAPI PlaySoundWrapW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound) DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, DWORD outLen, LPCWSTR filename) { -#ifdef __REACTOS__ - WCHAR szSection[MAX_PATH + 2]; - WCHAR szWideBuff[MAX_PATH]; - CHAR szUtf7Buff[MAX_PATH]; - - TRACE("(%s,%s,%p,%08x,%s)\n", debugstr_w(appName), debugstr_w(keyName), - out, outLen, debugstr_w(filename)); - - if (outLen == 0) - return 0; - - /* Try ".W"-appended section name. See also SHSetIniStringW. */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".W"); - GetPrivateProfileStringW(szSection, keyName, NULL, szWideBuff, _countof(szWideBuff), filename); - if (szWideBuff[0] == UNICODE_NULL) /* It's empty or not found */ - { - /* Try the normal section name */ - return GetPrivateProfileStringW(appName, keyName, NULL, out, outLen, filename); - } - - /* Okay, now ".W" version is valid. Its value is a UTF-7 string in UTF-16 */ - - /* szWideBuff --> szUtf7Buff */ - SHUnicodeToAnsiCP(CP_ACP, szWideBuff, szUtf7Buff, _countof(szUtf7Buff)); - szUtf7Buff[_countof(szUtf7Buff) - 1] = ANSI_NULL; - - /* szUtf7Buff --> out */ - SHAnsiToUnicodeCP(CP_UTF7, szUtf7Buff, out, outLen); - out[outLen - 1] = UNICODE_NULL; -#else INT ret; WCHAR *buf; @@ -3344,27 +3314,12 @@ DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, *out = 0; HeapFree(GetProcessHeap(), 0, buf); -#endif return strlenW(out); } - -#ifdef __REACTOS__ -static BOOL Is7BitClean(LPCWSTR psz) -{ - if (!psz) - return TRUE; - - while (*psz) - { - if (*psz > 0x7F) - return FALSE; - ++psz; - } - return TRUE; -} #endif +#ifndef __REACTOS__ /* See propbag.cpp */ /************************************************************************* * @ [SHLWAPI.295] * @@ -3384,64 +3339,12 @@ static BOOL Is7BitClean(LPCWSTR psz) BOOL WINAPI SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, LPCWSTR filename) { -#ifdef __REACTOS__ - WCHAR szSection[MAX_PATH + 2]; - WCHAR szWideBuff[MAX_PATH]; - CHAR szUtf7Buff[MAX_PATH]; - - TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), - debugstr_w(filename)); - - /* Write a normal profile string. If str was NULL, then key will be deleted */ - if (!WritePrivateProfileStringW(appName, keyName, str, filename)) - return FALSE; - - if (Is7BitClean(str)) - { - /* Delete ".A" version */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".A"); - WritePrivateProfileStringW(szSection, keyName, NULL, filename); - - /* Delete ".W" version */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".W"); - WritePrivateProfileStringW(szSection, keyName, NULL, filename); - - return TRUE; - } - - /* Now str is not 7-bit clean. It needs UTF-7 encoding in UTF-16. - We write ".A" and ".W"-appended sections. */ - - /* str --> szUtf7Buff */ - SHUnicodeToAnsiCP(CP_UTF7, str, szUtf7Buff, _countof(szUtf7Buff)); - szUtf7Buff[_countof(szUtf7Buff) - 1] = ANSI_NULL; - - /* szUtf7Buff --> szWideBuff */ - SHAnsiToUnicodeCP(CP_ACP, szUtf7Buff, szWideBuff, _countof(szWideBuff)); - szWideBuff[_countof(szWideBuff) - 1] = UNICODE_NULL; - - /* Write ".A" version */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".A"); - if (!WritePrivateProfileStringW(szSection, keyName, str, filename)) - return FALSE; - - /* Write ".W" version */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".W"); - if (!WritePrivateProfileStringW(szSection, keyName, szWideBuff, filename)) - return FALSE; - - return TRUE; -#else TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), debugstr_w(filename)); return WritePrivateProfileStringW(appName, keyName, str, filename); -#endif } +#endif /************************************************************************* * @ [SHLWAPI.313] diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index f9951324d0c..28e22736d5d 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -12,6 +12,7 @@ #include <atlstr.h> // for CStringW #include <atlsimpcoll.h> // for CSimpleMap #include <atlcomcli.h> // for CComVariant +#include <atlconv.h> // for CA2W and CW2A WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -580,3 +581,115 @@ SHCreatePropertyBagOnRegKey( return pRegBag->QueryInterface(riid, ppvObj); } + +/************************************************************************** + * SHGetIniStringW (SHLWAPI.294) + * + * @see https://source.winehq.org/WineAPI/SHGetIniStringW.html + */ +EXTERN_C DWORD WINAPI +SHGetIniStringW( + _In_z_ LPCWSTR appName, + _In_z_ LPCWSTR keyName, + _Out_writes_to_(outLen, return + 1) LPWSTR out, + _In_ DWORD outLen, + _In_z_ LPCWSTR filename) +{ + TRACE("(%s,%s,%p,%08x,%s)\n", debugstr_w(appName), debugstr_w(keyName), + out, outLen, debugstr_w(filename)); + + if (outLen == 0) + return 0; + + // Try ".W"-appended section name. See also SHSetIniStringW + CStringW szSection(appName); + szSection += L".W"; + CStringW pszWideBuff; + const INT cchWideMax = 4 * MAX_PATH; // UTF-7 needs 4 times length buffer. + GetPrivateProfileStringW(szSection, keyName, NULL, + pszWideBuff.GetBuffer(cchWideMax), cchWideMax, filename); + pszWideBuff.ReleaseBuffer(); + + if (pszWideBuff.IsEmpty()) // It's empty or not found + { + // Try the normal section name + return GetPrivateProfileStringW(appName, keyName, NULL, out, outLen, filename); + } + + // Okay, now ".W" version is valid. Its value is a UTF-7 string in UTF-16 + CW2A wide2utf7(pszWideBuff); + MultiByteToWideChar(CP_UTF7, 0, wide2utf7, -1, out, outLen); + out[outLen - 1] = UNICODE_NULL; + + return lstrlenW(out); +} + +static BOOL Is7BitClean(LPCWSTR psz) +{ + if (!psz) + return TRUE; + + while (*psz) + { + if (*psz > 0x7F) + return FALSE; + ++psz; + } + return TRUE; +} + +/************************************************************************** + * SHSetIniStringW (SHLWAPI.295) + * + * @see https://source.winehq.org/WineAPI/SHSetIniStringW.html + */ +EXTERN_C BOOL WINAPI +SHSetIniStringW( + _In_z_ LPCWSTR appName, + _In_z_ LPCWSTR keyName, + _In_opt_z_ LPCWSTR str, + _In_z_ LPCWSTR filename) +{ + TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), + debugstr_w(filename)); + + // Write a normal profile string. If str was NULL, then key will be deleted + if (!WritePrivateProfileStringW(appName, keyName, str, filename)) + return FALSE; + + if (Is7BitClean(str)) + { + // Delete ".A" version + CStringW szSection(appName); + szSection += L".A"; + WritePrivateProfileStringW(szSection, keyName, NULL, filename); + + // Delete ".W" version + szSection = appName; + szSection += L".W"; + WritePrivateProfileStringW(szSection, keyName, NULL, filename); + + return TRUE; + } + + // Now str is not 7-bit clean. It needs UTF-7 encoding in UTF-16. + // We write ".A" and ".W"-appended sections + CW2A wide2utf7(str, CP_UTF7); + CA2W utf72wide(wide2utf7, CP_ACP); + + BOOL ret = TRUE; + + // Write ".A" version + CStringW szSection(appName); + szSection += L".A"; + if (!WritePrivateProfileStringW(szSection, keyName, str, filename)) + ret = FALSE; + + // Write ".W" version + szSection = appName; + szSection += L".W"; + if (!WritePrivateProfileStringW(szSection, keyName, utf72wide, filename)) + ret = FALSE; + + return ret; +} diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index a2677a639ce..4e01e7c633f 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -180,10 +180,19 @@ HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD si #endif DWORD WINAPI -SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, DWORD outLen, LPCWSTR filename); +SHGetIniStringW( + _In_z_ LPCWSTR appName, + _In_z_ LPCWSTR keyName, + _Out_writes_to_(outLen, return + 1) LPWSTR out, + _In_ DWORD outLen, + _In_z_ LPCWSTR filename); BOOL WINAPI -SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, LPCWSTR filename); +SHSetIniStringW( + _In_z_ LPCWSTR appName, + _In_z_ LPCWSTR keyName, + _In_opt_z_ LPCWSTR str, + _In_z_ LPCWSTR filename); int WINAPIV

1 year, 4 months

[reactos] 01/01: [TASKMGR] Do not disable status bar when opening system menu (#5571)

by Egor Ananyin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d53e953cd19ea11b6ab8… commit 2d53e953cd19ea11b6ab8221e959b2f143be7fb3 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Tue Aug 15 22:37:27 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 15 21:37:27 2023 +0200 [TASKMGR] Do not disable status bar when opening system menu (#5571) We do not need to clean the status bar when opening the system menu as it does not show any hints. CORE-19061 --- base/applications/taskmgr/taskmgr.c | 22 ++++++++++++++-------- base/applications/taskmgr/taskmgr.h | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 44bc24b2f96..6cbf8c7994e 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -482,14 +482,23 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) TrayIcon_UpdateIcon(); break; + case WM_INITMENUPOPUP: + /* Do not disable the status bar if we opened the system menu */ + if (!HIWORD(lParam)) + TaskManager_DisableStatusBar(hDlg); + else + TaskManager_EnableStatusBar(hDlg); + break; case WM_ENTERMENULOOP: - TaskManager_OnEnterMenuLoop(hDlg); + bInMenuLoop = TRUE; break; case WM_EXITMENULOOP: - TaskManager_OnExitMenuLoop(hDlg); + bInMenuLoop = FALSE; + TaskManager_EnableStatusBar(hDlg); break; case WM_MENUSELECT: - TaskManager_OnMenuSelect(hDlg, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); + if (!(HIWORD(wParam) & MF_SYSMENU)) + TaskManager_OnMenuSelect(hDlg, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); break; case WM_SYSCOLORCHANGE: /* Forward WM_SYSCOLORCHANGE to common controls */ @@ -887,24 +896,21 @@ void TaskManager_OnRestoreMainWindow(void) SetWindowPos(hMainWnd, (OnTop ? HWND_TOPMOST : HWND_TOP), 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW); } -void TaskManager_OnEnterMenuLoop(HWND hWnd) +void TaskManager_DisableStatusBar(HWND hWnd) { int nParts; /* Update the status bar pane sizes */ nParts = -1; SendMessageW(hStatusWnd, SB_SETPARTS, 1, (LPARAM) (LPINT)&nParts); - bInMenuLoop = TRUE; SendMessageW(hStatusWnd, SB_SETTEXT, (WPARAM)0, (LPARAM)L""); } -void TaskManager_OnExitMenuLoop(HWND hWnd) +void TaskManager_EnableStatusBar(HWND hWnd) { RECT rc; int nParts[3]; - bInMenuLoop = FALSE; - /* Update the status bar pane sizes */ GetClientRect(hWnd, &rc); nParts[0] = STATUS_SIZE1; diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index 28136f8271c..a3b6220e8b9 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -94,8 +94,8 @@ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr); void LoadSettings(void); void SaveSettings(void); void TaskManager_OnRestoreMainWindow(void); -void TaskManager_OnEnterMenuLoop(HWND hWnd); -void TaskManager_OnExitMenuLoop(HWND hWnd); +void TaskManager_DisableStatusBar(HWND hWnd); +void TaskManager_EnableStatusBar(HWND hWnd); void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnTabWndSelChange(void);

1 year, 4 months

[reactos] 01/01: [FASTFAT][NTDLL_APITEST] Add missing semicolon after _SEH2_END (#5568)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a995d8d614cd149f4d87c… commit a995d8d614cd149f4d87c177f053c177904d1b2f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jul 29 18:37:18 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 15 18:16:31 2023 +0200 [FASTFAT][NTDLL_APITEST] Add missing semicolon after _SEH2_END (#5568) Trivial code consistency. --- drivers/filesystems/fastfat/read.c | 2 +- modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/fastfat/read.c b/drivers/filesystems/fastfat/read.c index e1003e921d7..54a5894afe2 100644 --- a/drivers/filesystems/fastfat/read.c +++ b/drivers/filesystems/fastfat/read.c @@ -87,7 +87,7 @@ FatOverflowPagingFileRead ( RtlZeroMemory((AT), (BYTE_COUNT)); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ FatRaiseStatus( IrpContext, STATUS_INVALID_USER_BUFFER ); \ - } _SEH2_END \ + } _SEH2_END; \ } // diff --git a/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c b/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c index 1ae645facf5..ab98927fb15 100644 --- a/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c +++ b/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c @@ -23,7 +23,7 @@ static FN_RtlMultipleFreeHeap g_free = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ threw = _SEH2_GetExceptionCode(); \ } \ - _SEH2_END \ + _SEH2_END; \ ok((ret) == (ret_expected), "ret excepted %d, but %d\n", (ret_expected), (ret)); \ ok((err) == (err_expected), "err excepted %d, but %d\n", (err_expected), (err)); \ ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw)); @@ -37,7 +37,7 @@ static FN_RtlMultipleFreeHeap g_free = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ threw = _SEH2_GetExceptionCode(); \ } \ - _SEH2_END \ + _SEH2_END; \ ok((err) == (err_expected), "err excepted %d, but %d", (err_expected), (err)); \ ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw)); @@ -50,7 +50,7 @@ static FN_RtlMultipleFreeHeap g_free = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ threw = _SEH2_GetExceptionCode(); \ } \ - _SEH2_END \ + _SEH2_END; \ ok((ret) == (ret_expected), "ret excepted %d, but %d\n", (ret_expected), (ret)); \ ok((err) == (err_expected), "err excepted %d, but %d\n", (err_expected), (err)); \ ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw));

1 year, 4 months

[reactos] 01/01: [NTUSER][USER32] Remove 4 remnant defines (#5572)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=728d5736d944a8cc56cdb… commit 728d5736d944a8cc56cdba253298ff354999fb10 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Aug 13 21:47:01 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 15 18:13:27 2023 +0200 [NTUSER][USER32] Remove 4 remnant defines (#5572) IS_SYSTEM_MENU(): "moved" to ntuser on 6dfa71c (r68904). IS_SYSTEM_POPUP(): uselessly added on 6fc29cc (r8195). IS_BITMAP_ITEM(): uses removed on 07b6ddc (r23221). uselessly copied to ntuser on 6dfa71c (r68904). --- win32ss/user/ntuser/menu.c | 2 -- win32ss/user/user32/windows/menu.c | 8 -------- 2 files changed, 10 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 01740c9c23e..ebade16f1b7 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -60,8 +60,6 @@ BOOL fInEndMenu = FALSE; #define IS_SYSTEM_MENU(MenuInfo) \ (!((MenuInfo)->fFlags & MNF_POPUP) && ((MenuInfo)->fFlags & MNF_SYSMENU)) -#define IS_BITMAP_ITEM(flags) (MF_BITMAP == MENU_ITEM_TYPE(flags)) - #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define IS_STRING_ITEM(flags) (MF_STRING == MENU_ITEM_TYPE(flags)) diff --git a/win32ss/user/user32/windows/menu.c b/win32ss/user/user32/windows/menu.c index 59c687f4c3a..0d20c780981 100644 --- a/win32ss/user/user32/windows/menu.c +++ b/win32ss/user/user32/windows/menu.c @@ -42,14 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(menu); #define IS_STRING_ITEM(flags) (MF_STRING == MENU_ITEM_TYPE(flags)) #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) -#define IS_SYSTEM_MENU(MenuInfo) \ - (0 == ((MenuInfo)->fFlags & MNF_POPUP) && 0 != ((MenuInfo)->fFlags & MNF_SYSMENU)) - -#define IS_SYSTEM_POPUP(MenuInfo) \ - (0 != ((MenuInfo)->fFlags & MNF_POPUP) && 0 != ((MenuInfo)->fFlags & MNF_SYSMENU)) - -#define IS_BITMAP_ITEM(flags) (MF_BITMAP == MENU_ITEM_TYPE(flags)) - /********************************************************************* * PopupMenu class descriptor */

1 year, 4 months

[reactos] 01/01: [APPWIZ] Don't forget to CoInitializeEx on COM thread (#5551)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e6b3f4bbd4ca9a812465… commit 9e6b3f4bbd4ca9a8124650a55a4690fdf8851fe2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 14 21:06:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 14 21:06:40 2023 +0900 [APPWIZ] Don't forget to CoInitializeEx on COM thread (#5551) - Do CoInitializeEx and CoUninitialize in download_proc. CORE-19110, CORE-15786 --- dll/cpl/appwiz/addons.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index 5fdfc999f1e..614bd2ab3e8 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -358,7 +358,9 @@ static DWORD WINAPI download_proc(PVOID arg) { WCHAR message[256]; WCHAR tmp_dir[MAX_PATH], tmp_file[MAX_PATH]; - HRESULT hres; + HRESULT hres, hrCoInit; + + hrCoInit = CoInitializeEx(NULL, COINIT_MULTITHREADED); GetTempPathW(sizeof(tmp_dir)/sizeof(WCHAR), tmp_dir); GetTempFileNameW(tmp_dir, NULL, 0, tmp_file); @@ -388,6 +390,10 @@ static DWORD WINAPI download_proc(PVOID arg) DeleteFileW(tmp_file); PostMessageW(install_dialog, WM_COMMAND, IDCANCEL, 0); + + if (SUCCEEDED(hrCoInit)) + CoUninitialize(); + return 0; }

1 year, 4 months

[reactos] 01/01: [ATL] Make CImage thread-safe (#5553)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=485c03ad0304f7dcf0b38… commit 485c03ad0304f7dcf0b38e9f562ad5264b8b3a2a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 14 20:45:37 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 14 20:45:37 2023 +0900 [ATL] Make CImage thread-safe (#5553) - Add CInitGDIPlus subclass in CImage. - Lock the CInitGDIPlus data by using a critical section. - Add CImage::InitGDIPlus and use it. CORE-19008 --- sdk/lib/atl/atlimage.h | 327 ++++++++++++++++++++++++++----------------------- 1 file changed, 177 insertions(+), 150 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 462b63b1e92..09e2d6452c5 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -12,9 +12,6 @@ // See rostest/apitests/atl/CImage_WIP.txt for test results. // !!!! -// TODO: CImage::Load, CImage::Save -// TODO: make CImage thread-safe - #pragma once #include <atlcore.h> // for ATL Core @@ -58,25 +55,26 @@ public: m_rgbTransColor = CLR_INVALID; ZeroMemory(&m_ds, sizeof(m_ds)); - if (GetCommon().AddRef() == 1) - { - GetCommon().LoadLib(); - } + s_gdiplus.IncreaseCImageCount(); } - ~CImage() + virtual ~CImage() throw() { Destroy(); - ReleaseGDIPlus(); + s_gdiplus.DecreaseCImageCount(); } - operator HBITMAP() + operator HBITMAP() throw() { return m_hbm; } -public: - void Attach(HBITMAP hBitmap, DIBOrientation eOrientation = DIBOR_DEFAULT) + static void ReleaseGDIPlus() + { + s_gdiplus.ReleaseGDIPlus(); + } + + void Attach(HBITMAP hBitmap, DIBOrientation eOrientation = DIBOR_DEFAULT) throw() { AttachInternal(hBitmap, eOrientation, -1); } @@ -119,7 +117,6 @@ public: m_hDC = NULL; } -public: BOOL AlphaBlend(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, @@ -376,13 +373,16 @@ public: HRESULT Load(LPCTSTR pszFileName) throw() { + if (!InitGDIPlus()) + return E_FAIL; + // convert the file name string into Unicode CStringW pszNameW(pszFileName); // create a GpBitmap object from file using namespace Gdiplus; GpBitmap *pBitmap = NULL; - if (GetCommon().CreateBitmapFromFile(pszNameW, &pBitmap) != Ok) + if (s_gdiplus.CreateBitmapFromFile(pszNameW, &pBitmap) != Ok) { return E_FAIL; } @@ -390,10 +390,10 @@ public: // get bitmap handle HBITMAP hbm = NULL; Color color(0xFF, 0xFF, 0xFF); - Status status = GetCommon().CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); + Status status = s_gdiplus.CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); // delete GpBitmap - GetCommon().DisposeImage(pBitmap); + s_gdiplus.DisposeImage(pBitmap); // attach it if (status == Ok) @@ -402,10 +402,13 @@ public: } HRESULT Load(IStream* pStream) throw() { + if (!InitGDIPlus()) + return E_FAIL; + // create GpBitmap from stream using namespace Gdiplus; GpBitmap *pBitmap = NULL; - if (GetCommon().CreateBitmapFromStream(pStream, &pBitmap) != Ok) + if (s_gdiplus.CreateBitmapFromStream(pStream, &pBitmap) != Ok) { return E_FAIL; } @@ -413,10 +416,10 @@ public: // get bitmap handle HBITMAP hbm = NULL; Color color(0xFF, 0xFF, 0xFF); - Status status = GetCommon().CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); + Status status = s_gdiplus.CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); // delete Bitmap - GetCommon().DisposeImage(pBitmap); + s_gdiplus.DisposeImage(pBitmap); // attach it if (status == Ok) @@ -502,18 +505,11 @@ public: return PlgBlt(hDestDC, pPoints, rectSrc, hbmMask, pointMask); } - void ReleaseGDIPlus() throw() - { - COMMON*& pCommon = GetCommonPtr(); - if (pCommon && pCommon->Release() == 0) - { - delete pCommon; - pCommon = NULL; - } - } - HRESULT Save(IStream* pStream, GUID *guidFileType) const throw() { + if (!InitGDIPlus()) + return E_FAIL; + using namespace Gdiplus; ATLASSERT(m_hbm); @@ -527,14 +523,14 @@ public: // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; - GetCommon().CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); + s_gdiplus.CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); // save to stream Status status; - status = GetCommon().SaveImageToStream(pBitmap, pStream, &clsid, NULL); + status = s_gdiplus.SaveImageToStream(pBitmap, pStream, &clsid, NULL); // destroy GpBitmap - GetCommon().DisposeImage(pBitmap); + s_gdiplus.DisposeImage(pBitmap); return (status == Ok ? S_OK : E_FAIL); } @@ -542,6 +538,9 @@ public: HRESULT Save(LPCTSTR pszFileName, REFGUID guidFileType = GUID_NULL) const throw() { + if (!InitGDIPlus()) + return E_FAIL; + using namespace Gdiplus; ATLASSERT(m_hbm); @@ -567,13 +566,13 @@ public: // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; - GetCommon().CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); + s_gdiplus.CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); // save to file - Status status = GetCommon().SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); + Status status = s_gdiplus.SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); // destroy GpBitmap - GetCommon().DisposeImage(pBitmap); + s_gdiplus.DisposeImage(pBitmap); return (status == Ok ? S_OK : E_FAIL); } @@ -689,7 +688,6 @@ public: rectSrc.bottom - rectSrc.top, crTransparent); } -public: static BOOL IsTransparencySupported() throw() { return TRUE; @@ -710,7 +708,7 @@ public: excludeDefaultSave = excludeIcon | excludeEMF | excludeWMF }; -protected: +private: static bool ShouldExcludeFormat(REFGUID guidFileType, DWORD dwExclude) { if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatGIF)) @@ -811,7 +809,9 @@ public: DWORD dwExclude = excludeDefaultLoad, TCHAR chSeparator = TEXT('|')) { - CImage dummy; // HACK: Initialize common + if (!InitGDIPlus()) + return E_FAIL; + UINT cDecoders = 0; Gdiplus::ImageCodecInfo* pDecoders = _getAllDecoders(cDecoders); HRESULT hr = BuildCodecFilterString(pDecoders, @@ -832,7 +832,9 @@ public: DWORD dwExclude = excludeDefaultSave, TCHAR chSeparator = TEXT('|')) { - CImage dummy; // HACK: Initialize common + if (!InitGDIPlus()) + return E_FAIL; + UINT cEncoders = 0; Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); HRESULT hr = BuildCodecFilterString(pEncoders, @@ -846,153 +848,177 @@ public: return hr; } -protected: +private: // an extension of BITMAPINFO struct MYBITMAPINFOEX : BITMAPINFO { RGBQUAD bmiColorsExtra[256 - 1]; }; - // abbreviations of GDI+ basic types. FIXME: Delete us - typedef Gdiplus::GpStatus St; - typedef Gdiplus::GpBitmap Bm; - typedef Gdiplus::GpImage Im; - - // The common data of atlimage - struct COMMON + class CInitGDIPlus { + private: // GDI+ function types using FUN_Startup = decltype(&Gdiplus::GdiplusStartup); using FUN_Shutdown = decltype(&Gdiplus::GdiplusShutdown); - using FUN_GetImageEncoderSize = decltype(&Gdiplus::DllExports::GdipGetImageEncodersSize); - using FUN_GetImageEncoder = decltype(&Gdiplus::DllExports::GdipGetImageEncoders); - using FUN_GetImageDecoderSize = decltype(&Gdiplus::DllExports::GdipGetImageDecodersSize); - using FUN_GetImageDecoder = decltype(&Gdiplus::DllExports::GdipGetImageDecoders); using FUN_CreateBitmapFromFile = decltype(&Gdiplus::DllExports::GdipCreateBitmapFromFile); - using FUN_CreateHBITMAPFromBitmap = decltype(&Gdiplus::DllExports::GdipCreateHBITMAPFromBitmap); - using FUN_CreateBitmapFromStream = decltype(&Gdiplus::DllExports::GdipCreateBitmapFromStream); using FUN_CreateBitmapFromHBITMAP = decltype(&Gdiplus::DllExports::GdipCreateBitmapFromHBITMAP); - using FUN_SaveImageToStream = decltype(&Gdiplus::DllExports::GdipSaveImageToStream); - using FUN_SaveImageToFile = decltype(&Gdiplus::DllExports::GdipSaveImageToFile); + using FUN_CreateBitmapFromStream = decltype(&Gdiplus::DllExports::GdipCreateBitmapFromStream); + using FUN_CreateHBITMAPFromBitmap = decltype(&Gdiplus::DllExports::GdipCreateHBITMAPFromBitmap); using FUN_DisposeImage = decltype(&Gdiplus::DllExports::GdipDisposeImage); + using FUN_GetImageDecoder = decltype(&Gdiplus::DllExports::GdipGetImageDecoders); + using FUN_GetImageDecoderSize = decltype(&Gdiplus::DllExports::GdipGetImageDecodersSize); + using FUN_GetImageEncoder = decltype(&Gdiplus::DllExports::GdipGetImageEncoders); + using FUN_GetImageEncoderSize = decltype(&Gdiplus::DllExports::GdipGetImageEncodersSize); + using FUN_SaveImageToFile = decltype(&Gdiplus::DllExports::GdipSaveImageToFile); + using FUN_SaveImageToStream = decltype(&Gdiplus::DllExports::GdipSaveImageToStream); // members - int count = 0; - HINSTANCE hinstGdiPlus = NULL; - ULONG_PTR gdiplusToken = 0; + HINSTANCE m_hInst; + ULONG_PTR m_dwToken; + CRITICAL_SECTION m_sect; + LONG m_nCImageObjects; + DWORD m_dwLastError; - // GDI+ functions - FUN_Startup Startup = NULL; - FUN_Shutdown Shutdown = NULL; - FUN_GetImageEncoderSize GetImageEncodersSize = NULL; - FUN_GetImageEncoder GetImageEncoders = NULL; - FUN_GetImageDecoderSize GetImageDecodersSize = NULL; - FUN_GetImageDecoder GetImageDecoders = NULL; - FUN_CreateBitmapFromFile CreateBitmapFromFile = NULL; - FUN_CreateHBITMAPFromBitmap CreateHBITMAPFromBitmap = NULL; - FUN_CreateBitmapFromStream CreateBitmapFromStream = NULL; - FUN_CreateBitmapFromHBITMAP CreateBitmapFromHBITMAP = NULL; - FUN_SaveImageToStream SaveImageToStream = NULL; - FUN_SaveImageToFile SaveImageToFile = NULL; - FUN_DisposeImage DisposeImage = NULL; - - COMMON() + void _clear_funs() throw() { + Startup = NULL; + Shutdown = NULL; + CreateBitmapFromFile = NULL; + CreateBitmapFromHBITMAP = NULL; + CreateBitmapFromStream = NULL; + CreateHBITMAPFromBitmap = NULL; + DisposeImage = NULL; + GetImageDecoders = NULL; + GetImageDecodersSize = NULL; + GetImageEncoders = NULL; + GetImageEncodersSize = NULL; + SaveImageToFile = NULL; + SaveImageToStream = NULL; } - ~COMMON() + template <typename T_FUN> + T_FUN _get_fun(T_FUN& fun, LPCSTR name) throw() { - FreeLib(); + if (!fun) + fun = reinterpret_cast<T_FUN>(::GetProcAddress(m_hInst, name)); + return fun; } - ULONG AddRef() + public: + // GDI+ functions + FUN_Startup Startup; + FUN_Shutdown Shutdown; + FUN_CreateBitmapFromFile CreateBitmapFromFile; + FUN_CreateBitmapFromHBITMAP CreateBitmapFromHBITMAP; + FUN_CreateBitmapFromStream CreateBitmapFromStream; + FUN_CreateHBITMAPFromBitmap CreateHBITMAPFromBitmap; + FUN_DisposeImage DisposeImage; + FUN_GetImageDecoder GetImageDecoders; + FUN_GetImageDecoderSize GetImageDecodersSize; + FUN_GetImageEncoder GetImageEncoders; + FUN_GetImageEncoderSize GetImageEncodersSize; + FUN_SaveImageToFile SaveImageToFile; + FUN_SaveImageToStream SaveImageToStream; + + CInitGDIPlus() throw() + : m_hInst(NULL) + , m_dwToken(0) + , m_nCImageObjects(0) + , m_dwLastError(ERROR_SUCCESS) { - return ++count; + _clear_funs(); + ::InitializeCriticalSection(&m_sect); } - ULONG Release() + + ~CInitGDIPlus() throw() { - return --count; + ReleaseGDIPlus(); + ::DeleteCriticalSection(&m_sect); } - // get procedure address of the DLL - template <typename FUN_T> - FUN_T _getFUN(FUN_T& fun, const char *name) + bool Init() throw() { - if (fun) - return fun; - fun = reinterpret_cast<FUN_T>(::GetProcAddress(hinstGdiPlus, name)); - return fun; + ::EnterCriticalSection(&m_sect); + + if (m_dwToken == 0) + { + if (!m_hInst) + m_hInst = ::LoadLibrary(TEXT("gdiplus.dll")); + + if (m_hInst && + _get_fun(Startup, "GdiplusStartup") && + _get_fun(Shutdown, "GdiplusShutdown") && + _get_fun(CreateBitmapFromFile, "GdipCreateBitmapFromFile") && + _get_fun(CreateBitmapFromHBITMAP, "GdipCreateBitmapFromHBITMAP") && + _get_fun(CreateBitmapFromStream, "GdipCreateBitmapFromStream") && + _get_fun(CreateHBITMAPFromBitmap, "GdipCreateHBITMAPFromBitmap") && + _get_fun(DisposeImage, "GdipDisposeImage") && + _get_fun(GetImageDecoders, "GdipGetImageDecoders") && + _get_fun(GetImageDecodersSize, "GdipGetImageDecodersSize") && + _get_fun(GetImageEncoders, "GdipGetImageEncoders") && + _get_fun(GetImageEncodersSize, "GdipGetImageEncodersSize") && + _get_fun(SaveImageToFile, "GdipSaveImageToFile") && + _get_fun(SaveImageToStream, "GdipSaveImageToStream")) + { + using namespace Gdiplus; + GdiplusStartupInput input; + GdiplusStartupOutput output; + Startup(&m_dwToken, &input, &output); + } + } + + bool ret = (m_dwToken != 0); + ::LeaveCriticalSection(&m_sect); + + return ret; } - HINSTANCE LoadLib() + void ReleaseGDIPlus() throw() { - if (hinstGdiPlus) - return hinstGdiPlus; - - hinstGdiPlus = ::LoadLibraryA("gdiplus.dll"); - - _getFUN(Startup, "GdiplusStartup"); - _getFUN(Shutdown, "GdiplusShutdown"); - _getFUN(GetImageEncodersSize, "GdipGetImageEncodersSize"); - _getFUN(GetImageEncoders, "GdipGetImageEncoders"); - _getFUN(GetImageDecodersSize, "GdipGetImageDecodersSize"); - _getFUN(GetImageDecoders, "GdipGetImageDecoders"); - _getFUN(CreateBitmapFromFile, "GdipCreateBitmapFromFile"); - _getFUN(CreateHBITMAPFromBitmap, "GdipCreateHBITMAPFromBitmap"); - _getFUN(CreateBitmapFromStream, "GdipCreateBitmapFromStream"); - _getFUN(CreateBitmapFromHBITMAP, "GdipCreateBitmapFromHBITMAP"); - _getFUN(SaveImageToStream, "GdipSaveImageToStream"); - _getFUN(SaveImageToFile, "GdipSaveImageToFile"); - _getFUN(DisposeImage, "GdipDisposeImage"); - - if (hinstGdiPlus && Startup) + ::EnterCriticalSection(&m_sect); + if (m_dwToken) + { + if (Shutdown) + Shutdown(m_dwToken); + + m_dwToken = 0; + } + if (m_hInst) { - Gdiplus::GdiplusStartupInput gdiplusStartupInput; - Startup(&gdiplusToken, &gdiplusStartupInput, NULL); + ::FreeLibrary(m_hInst); + m_hInst = NULL; } + _clear_funs(); + ::LeaveCriticalSection(&m_sect); + } - return hinstGdiPlus; + void IncreaseCImageCount() throw() + { + ::EnterCriticalSection(&m_sect); + ++m_nCImageObjects; + ::LeaveCriticalSection(&m_sect); } - void FreeLib() + + void DecreaseCImageCount() throw() { - if (hinstGdiPlus) + ::EnterCriticalSection(&m_sect); + if (--m_nCImageObjects == 0) { - Shutdown(gdiplusToken); - - Startup = NULL; - Shutdown = NULL; - GetImageEncodersSize = NULL; - GetImageEncoders = NULL; - GetImageDecodersSize = NULL; - GetImageDecoders = NULL; - CreateBitmapFromFile = NULL; - CreateHBITMAPFromBitmap = NULL; - CreateBitmapFromStream = NULL; - CreateBitmapFromHBITMAP = NULL; - SaveImageToStream = NULL; - SaveImageToFile = NULL; - DisposeImage = NULL; - ::FreeLibrary(hinstGdiPlus); - hinstGdiPlus = NULL; + ReleaseGDIPlus(); } + ::LeaveCriticalSection(&m_sect); } - }; // struct COMMON + }; - static COMMON*& GetCommonPtr() - { - static COMMON *s_pCommon = NULL; - return s_pCommon; - } + static CInitGDIPlus s_gdiplus; - static COMMON& GetCommon() + static bool InitGDIPlus() throw() { - COMMON*& pCommon = GetCommonPtr(); - if (pCommon == NULL) - pCommon = new COMMON; - return *pCommon; + return s_gdiplus.Init(); } -protected: +private: HBITMAP m_hbm; mutable HGDIOBJ m_hbmOld; mutable HDC m_hDC; @@ -1070,7 +1096,7 @@ protected: static Gdiplus::ImageCodecInfo* _getAllEncoders(UINT& cEncoders) { UINT total_size = 0; - GetCommon().GetImageEncodersSize(&cEncoders, &total_size); + s_gdiplus.GetImageEncodersSize(&cEncoders, &total_size); if (total_size == 0) return NULL; // failure @@ -1082,14 +1108,14 @@ protected: return NULL; // failure } - GetCommon().GetImageEncoders(cEncoders, total_size, ret); + s_gdiplus.GetImageEncoders(cEncoders, total_size, ret); return ret; // needs delete[] } static Gdiplus::ImageCodecInfo* _getAllDecoders(UINT& cDecoders) { UINT total_size = 0; - GetCommon().GetImageDecodersSize(&cDecoders, &total_size); + s_gdiplus.GetImageDecodersSize(&cDecoders, &total_size); if (total_size == 0) return NULL; // failure @@ -1101,12 +1127,12 @@ protected: return NULL; // failure } - GetCommon().GetImageDecoders(cDecoders, total_size, ret); + s_gdiplus.GetImageDecoders(cDecoders, total_size, ret); return ret; // needs delete[] } void AttachInternal(HBITMAP hBitmap, DIBOrientation eOrientation, - LONG iTransColor) + LONG iTransColor) throw() { Destroy(); @@ -1187,11 +1213,12 @@ protected: } private: - // NOTE: CImage is not copyable - CImage(const CImage&); - CImage& operator=(const CImage&); + CImage(const CImage&) = delete; + CImage& operator=(const CImage&) = delete; }; +DECLSPEC_SELECTANY CImage::CInitGDIPlus CImage::s_gdiplus; + } #endif

1 year, 4 months

[reactos] 01/01: [GITHUB] Update workflow actions to V3 to fix potential problems (#5569)

by Maj Soklič

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa7d5dbf06cc02ea57484… commit fa7d5dbf06cc02ea57484bd006cf4f31ab6e0bb8 Author: Maj Soklič <majs.1236(a)gmail.com> AuthorDate: Mon Aug 14 12:30:30 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 14 13:30:30 2023 +0300 [GITHUB] Update workflow actions to V3 to fix potential problems (#5569) GitHub is starting to discontinue Actions V2 (the date was postponed). Once they enforce Actions V3, builds will likely fail to run, so it's better to change this sooner rather than later. - Update GitHub Actions to V3 - Replace deprecated set-output with $GITHUB_OUTPUT This also fixes the warnings on the builds/artifacts page. --- .github/workflows/build.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f2ee4b20ed..537dc710880 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,12 +21,12 @@ jobs: id: get_rosbe_spec run: | gcc -march=native -Q --help=target | grep "\-march= " | awk '{print $NF}' - echo ::set-output name=march-sha::$(gcc -march=native -Q --help=target | sha1sum | awk '{print $1}') - echo ::set-output name=git-sha::$(git ls-remote https://github.com/zefklop/RosBE.git | grep unix_amd64 | awk '{print $1}') + echo march-sha=$(gcc -march=native -Q --help=target | sha1sum | awk '{print $1}') >> $GITHUB_OUTPUT + echo git-sha=$(git ls-remote https://github.com/zefklop/RosBE.git | grep unix_amd64 | awk '{print $1}') >> $GITHUB_OUTPUT wget https://gist.githubusercontent.com/zefklop/b2d6a0b470c70183e93d5285a03f5899… - name: Get RosBE id: get_rosbe - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: RosBE-CI key: RosBE-CI-${{runner.os}}-${{steps.get_rosbe_spec.outputs.march-sha}}-${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}} @@ -46,11 +46,11 @@ jobs: sudo ./llvm.sh $LLVM_VERSION echo "D_CLANG_VERSION=-DCLANG_VERSION=$LLVM_VERSION" >> $GITHUB_ENV - name: Source checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: src - name: Set up cache for ccache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ccache key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} @@ -74,7 +74,7 @@ jobs: - name: Print ccache statistics run: ccache -s - name: Upload ISOs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}} path: | @@ -129,7 +129,7 @@ jobs: arch: amd64 toolset: ${{matrix.toolset}} - name: Source checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: src - name: Configure @@ -139,7 +139,7 @@ jobs: - name: Generate ISOs run: cmake --build build --target bootcd --target livecd - name: Upload ISOs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}} path: | @@ -147,7 +147,7 @@ jobs: build/livecd.iso - name: Upload debug symbols if: ${{ matrix.config == 'Debug' }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}} path: build/msvc_pdb @@ -183,7 +183,7 @@ jobs: arch: amd64_arm64 toolset: ${{matrix.toolset}} - name: Source checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: src - name: Configure @@ -204,7 +204,7 @@ jobs: if: ${{ matrix.arch == 'arm64' }} run: cmake --build build --target calc magnify mstsc notepad osk regedit taskmgr winmine wordpad base/applications/screensavers/all -- -k0 - name: Upload compiled binaries - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: | @@ -227,7 +227,7 @@ jobs: !**/*.tlb - name: Upload debug symbols if: ${{ matrix.config == 'Debug' }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: build/msvc_pdb @@ -268,7 +268,7 @@ jobs: - name: Add LLVM to PATH run: echo "${env:LLVM_PATH}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Source checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: src - name: Configure @@ -278,7 +278,7 @@ jobs: - name: Generate ISOs run: cmake --build build --target bootcd --target livecd - name: Upload ISOs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reactos-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: | @@ -286,7 +286,7 @@ jobs: build/livecd.iso - name: Upload debug symbols if: ${{ matrix.config == 'Debug' }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} path: build/msvc_pdb @@ -307,7 +307,7 @@ jobs: # uses: ilammy/msvc-dev-cmd@v1 # with: # arch: amd64_x86 -# - uses: actions/checkout@v2 +# - uses: actions/checkout@v3 # with: # path: src # - name: Configure

1 year, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
17
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 August 2023