Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [HOTPLUG] Trivial fixes (#5887)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81ba804b55b7edea31a95… commit 81ba804b55b7edea31a95b6b808cb3613563db9a Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Sun Nov 5 07:02:22 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 5 07:02:22 2023 +0700 [HOTPLUG] Trivial fixes (#5887) - Update files header and copyright information - Minor code formatting --- dll/cpl/hotplug/enum.c | 2 +- dll/cpl/hotplug/hotplug.c | 22 ++++++---------------- dll/cpl/hotplug/hotplug.rc | 9 ++++----- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dll/cpl/hotplug/enum.c b/dll/cpl/hotplug/enum.c index 698e94b0cb3..8f9dbc5e42a 100644 --- a/dll/cpl/hotplug/enum.c +++ b/dll/cpl/hotplug/enum.c @@ -2,7 +2,7 @@ * PROJECT: Safely Remove Hardware Applet * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Device enumeration - * COPYRIGHT: Copyright 2013 Johannes Anderwald <johannes.anderwald(a)reactos.org> + * COPYRIGHT: Copyright 2020 Eric Kohl <eric.kohl(a)reactos.org> * Copyright 2023 Thamatip Chitpong <thamatip.chitpong(a)reactos.org> */ diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index 1c50fc62fb1..2b59f8d43c9 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -1,10 +1,10 @@ /* -* PROJECT: Safely Remove Hardware Applet -* LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/cpl/hotplug/hotplug.c -* PURPOSE: applet initialization -* PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) -*/ + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Applet initialization + * COPYRIGHT: Copyright 2013 Johannes Anderwald <johannes.anderwald(a)reactos.org> + * Copyright 2020 Eric Kohl <eric.kohl(a)reactos.org> + */ #include "hotplug.h" @@ -53,7 +53,6 @@ done: return dwFlags; } - static DWORD SetHotPlugFlags( @@ -106,7 +105,6 @@ UpdateDialog( EnableWindow(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_STOP), bHasItem); } - static VOID ShowContextMenu( @@ -136,7 +134,6 @@ ShowContextMenu( NULL); } - static DEVINST GetSelectedDeviceInst( @@ -364,14 +361,10 @@ SafeRemovalDlgProc( SetupDiDestroyClassImageList(&pHotplugData->ImageListData); if (pHotplugData->hIconSm) - { DestroyIcon(pHotplugData->hIconSm); - } if (pHotplugData->hIcon) - { DestroyIcon(pHotplugData->hIcon); - } HeapFree(GetProcessHeap(), 0, pHotplugData); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)NULL); @@ -382,7 +375,6 @@ SafeRemovalDlgProc( return FALSE; } - LONG APIENTRY InitApplet( @@ -402,7 +394,6 @@ InitApplet( return TRUE; } - LONG CALLBACK CPlApplet( @@ -451,7 +442,6 @@ CPlApplet( return FALSE; } - INT WINAPI DllMain( diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index 8979476f923..75dbb9b1f50 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS Safely Remove Hardware Applet - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/hotplug/hotplug.rc - * PURPOSE: main resource file - * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Main resource file + * COPYRIGHT: Copyright 2013 Johannes Anderwald <johannes.anderwald(a)reactos.org> */ #include <windef.h>

1 year, 2 months

[reactos] 01/01: [RAPPS] Improve LicenseType handling (#5809)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b0398184677dcd19a7e9… commit 4b0398184677dcd19a7e9609f9d4eb8c42e00672 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Nov 4 22:08:10 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 22:08:10 2023 +0100 [RAPPS] Improve LicenseType handling (#5809) Tries now to map the "License" text set to "Freeware" to the LICENSE_FREEWARE "LicenseType" so it is translated correctly (LoadString). Fixes the following: - If only the "License" field is set in the DB, nothing will change (this applies to 99% of the current entries in the DB). - If both "LicenseType" and "License" are set, both will be used (no observable change in behavior): "Open Source (GPL v2)" etc. - If only "LicenseType" is set, it will now display just the type "Freeware" instead of "Freeware ()". This is done only for "Freeware", because the others (the open source ones) have many variations. "OpenSource", "Open Source", "Open Source (GPL)" etc. --- base/applications/rapps/appinfo.cpp | 11 +++++++++-- base/applications/rapps/include/appinfo.h | 10 +++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/base/applications/rapps/appinfo.cpp b/base/applications/rapps/appinfo.cpp index 765f02016bb..7e00c4224e8 100644 --- a/base/applications/rapps/appinfo.cpp +++ b/base/applications/rapps/appinfo.cpp @@ -159,13 +159,18 @@ CAvailableApplicationInfo::LicenseString() m_Parser->GetString(L"License", szLicenseString); LicenseType licenseType; - if (IsLicenseType(IntBuffer)) + if (IsKnownLicenseType(IntBuffer)) { licenseType = static_cast<LicenseType>(IntBuffer); } else { licenseType = LICENSE_NONE; + if (szLicenseString.CompareNoCase(L"Freeware") == 0) + { + licenseType = LICENSE_FREEWARE; + szLicenseString = L""; + } } CStringW szLicense; @@ -184,7 +189,9 @@ CAvailableApplicationInfo::LicenseString() return szLicenseString; } - return szLicense + L" (" + szLicenseString + L")"; + if (!szLicenseString.IsEmpty()) + szLicense += L" (" + szLicenseString + L")"; + return szLicense; } VOID diff --git a/base/applications/rapps/include/appinfo.h b/base/applications/rapps/include/appinfo.h index 7ea0c65e537..639d3fc8182 100644 --- a/base/applications/rapps/include/appinfo.h +++ b/base/applications/rapps/include/appinfo.h @@ -8,17 +8,17 @@ enum LicenseType { LICENSE_NONE, - LICENSE_OPENSOURCE, - LICENSE_FREEWARE, - LICENSE_TRIAL, + LICENSE_OPENSOURCE = 1, + LICENSE_FREEWARE = 2, + LICENSE_TRIAL = 3, LICENSE_MIN = LICENSE_NONE, LICENSE_MAX = LICENSE_TRIAL }; inline BOOL -IsLicenseType(INT x) +IsKnownLicenseType(INT x) { - return (x >= LICENSE_MIN && x <= LICENSE_MAX); + return (x > LICENSE_NONE && x <= LICENSE_MAX); } enum AppsCategories

1 year, 2 months

[reactos] 01/01: [NETSHELL] Register folder attributes as SFGAO_FOLDER, not SFGAO_CANDELETE (#5880)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3c1f652ecab59d1d55f9… commit b3c1f652ecab59d1d55f9162ab0602ae0017fd2a Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Nov 4 15:40:22 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 17:40:22 2023 +0300 [NETSHELL] Register folder attributes as SFGAO_FOLDER, not SFGAO_CANDELETE (#5880) On Windows the Network connections folder uses a binary value and someone forgot about Little Endian when converting it to a DWORD. Addendum to 7eb3fcf1d (r66485). CORE-9276 This issue has not been very visible because of bugs in CRegFolderEnum. --- dll/shellext/netshell/res/netshell.rgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/netshell/res/netshell.rgs b/dll/shellext/netshell/res/netshell.rgs index c5b57b659ae..103005a3e6a 100644 --- a/dll/shellext/netshell/res/netshell.rgs +++ b/dll/shellext/netshell/res/netshell.rgs @@ -11,7 +11,7 @@ HKCR DefaultIcon = s '%MODULE%' ShellFolder { - val Attributes = d '0x00000020' + val Attributes = d '0x20000000' } val LocalizedString = s '@%MODULE%,-10000' }

1 year, 2 months

[reactos] 01/01: [NETSHELL] Call ReleaseWriteLock. Fixes CORE-18349 (#5881)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6c838299c7014f8674e6… commit a6c838299c7014f8674e6623856179514f9eedb3 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Nov 4 15:19:10 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 15:19:10 2023 +0100 [NETSHELL] Call ReleaseWriteLock. Fixes CORE-18349 (#5881) --- dll/shellext/netshell/lanconnectui.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index 3d9e0f48a50..d0c5b0b2e28 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -17,6 +17,10 @@ CNetConnectionPropertyUi::~CNetConnectionPropertyUi() if (m_pNCfg) m_pNCfg->Uninitialize(); + // Note: MSDN says we can only unlock after INetCfg::Uninitialize + if (m_NCfgLock) + m_NCfgLock->ReleaseWriteLock(); + if (m_pProperties) NcFreeNetconProperties(m_pProperties); } @@ -181,7 +185,10 @@ CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) hr = pNCfg->Initialize(NULL); if (FAILED_UNEXPECTEDLY(hr)) + { + pNCfgLock->ReleaseWriteLock(); return; + } m_pNCfg = pNCfg; m_NCfgLock = pNCfgLock;

1 year, 2 months

[reactos] 01/01: [MSPAINT] Localize g_ptStart and g_ptEnd into mouse.cpp

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa4b38d902d13072b7b98… commit fa4b38d902d13072b7b982a4411a31cb84ab24b3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 23:00:43 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 4 23:00:43 2023 +0900 [MSPAINT] Localize g_ptStart and g_ptEnd into mouse.cpp And move some ToolsModel code into mouse.cpp CORE-19094 --- base/applications/mspaint/globalvar.h | 2 - base/applications/mspaint/main.cpp | 1 - base/applications/mspaint/mouse.cpp | 129 ++++++++++++++++++++++++++++++- base/applications/mspaint/toolsmodel.cpp | 126 ------------------------------ 4 files changed, 128 insertions(+), 130 deletions(-) diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index cb6eed1ebd4..e2257fbb693 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -11,8 +11,6 @@ extern BOOL g_askBeforeEnlarging; -extern POINT g_ptStart, g_ptEnd; - extern HINSTANCE g_hinstExe; extern WCHAR g_szFileName[MAX_LONG_PATH]; diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 470c4fd4348..dcc3bab80f1 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -10,7 +10,6 @@ #include <dlgs.h> #include <mapi.h> -POINT g_ptStart, g_ptEnd; BOOL g_askBeforeEnlarging = FALSE; // TODO: initialize from registry HINSTANCE g_hinstExe = NULL; WCHAR g_szFileName[MAX_LONG_PATH] = { 0 }; diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index d4b22296a16..ad709d9c3db 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -3,7 +3,7 @@ * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Things which should not be in the mouse event handler itself * COPYRIGHT: Copyright 2015 Benedikt Freisen <b.freisen(a)gmx.net> - * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2021-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ /* INCLUDES *********************************************************/ @@ -12,6 +12,7 @@ INT ToolBase::s_pointSP = 0; POINT ToolBase::s_pointStack[256] = { { 0 } }; +static POINT g_ptStart, g_ptEnd; /* FUNCTIONS ********************************************************/ @@ -1097,3 +1098,129 @@ ToolBase::createToolObject(TOOLTYPE type) UNREACHABLE; return NULL; } + +void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) +{ + m_pToolObject->beginEvent(); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; + m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); + m_pToolObject->endEvent(); +} + +void ToolsModel::OnMouseMove(BOOL bLeftButton, LONG x, LONG y) +{ + m_pToolObject->beginEvent(); + if (m_pToolObject->OnMouseMove(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } + m_pToolObject->endEvent(); +} + +void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) +{ + m_pToolObject->beginEvent(); + if (m_pToolObject->OnButtonUp(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } + m_pToolObject->endEvent(); +} + +void ToolsModel::OnEndDraw(BOOL bCancel) +{ + ATLTRACE("ToolsModel::OnEndDraw(%d)\n", bCancel); + m_pToolObject->beginEvent(); + m_pToolObject->OnEndDraw(bCancel); + m_pToolObject->endEvent(); +} + +void ToolsModel::OnDrawOverlayOnImage(HDC hdc) +{ + m_pToolObject->OnDrawOverlayOnImage(hdc); +} + +void ToolsModel::OnDrawOverlayOnCanvas(HDC hdc) +{ + m_pToolObject->OnDrawOverlayOnCanvas(hdc); +} + +void ToolsModel::SpecialTweak(BOOL bMinus) +{ + m_pToolObject->OnSpecialTweak(bMinus); +} + +void ToolsModel::DrawWithMouseTool(POINT pt, WPARAM wParam) +{ + LONG xRel = pt.x - g_ptStart.x, yRel = pt.y - g_ptStart.y; + + switch (m_activeTool) + { + // freesel, rectsel and text tools always show numbers limited to fit into image area + case TOOL_FREESEL: + case TOOL_RECTSEL: + case TOOL_TEXT: + if (xRel < 0) + xRel = (pt.x < 0) ? -g_ptStart.x : xRel; + else if (pt.x > imageModel.GetWidth()) + xRel = imageModel.GetWidth() - g_ptStart.x; + if (yRel < 0) + yRel = (pt.y < 0) ? -g_ptStart.y : yRel; + else if (pt.y > imageModel.GetHeight()) + yRel = imageModel.GetHeight() - g_ptStart.y; + break; + + // while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 + case TOOL_RUBBER: + case TOOL_PEN: + case TOOL_BRUSH: + case TOOL_AIRBRUSH: + case TOOL_SHAPE: + { + CStringW strCoord; + strCoord.Format(L"%ld, %ld", pt.x, pt.y); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCWSTR)strCoord); + break; + } + default: + break; + } + + // rectsel and shape tools always show non-negative numbers when drawing + if (m_activeTool == TOOL_RECTSEL || m_activeTool == TOOL_SHAPE) + { + xRel = labs(xRel); + yRel = labs(yRel); + } + + if (wParam & MK_LBUTTON) + { + OnMouseMove(TRUE, pt.x, pt.y); + canvasWindow.Invalidate(FALSE); + if ((m_activeTool >= TOOL_TEXT) || IsSelection()) + { + CStringW strSize; + if ((m_activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; + strSize.Format(L"%ld x %ld", xRel, yRel); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); + } + } + + if (wParam & MK_RBUTTON) + { + OnMouseMove(FALSE, pt.x, pt.y); + canvasWindow.Invalidate(FALSE); + if (m_activeTool >= TOOL_TEXT) + { + CStringW strSize; + if ((m_activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; + strSize.Format(L"%ld x %ld", xRel, yRel); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); + } + } +} diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 0700617403e..884b92d7d6c 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -255,55 +255,6 @@ void ToolsModel::NotifyZoomChanged() canvasWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); } -void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) -{ - m_pToolObject->beginEvent(); - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; - m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); - m_pToolObject->endEvent(); -} - -void ToolsModel::OnMouseMove(BOOL bLeftButton, LONG x, LONG y) -{ - m_pToolObject->beginEvent(); - if (m_pToolObject->OnMouseMove(bLeftButton, x, y)) - { - g_ptEnd.x = x; - g_ptEnd.y = y; - } - m_pToolObject->endEvent(); -} - -void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) -{ - m_pToolObject->beginEvent(); - if (m_pToolObject->OnButtonUp(bLeftButton, x, y)) - { - g_ptEnd.x = x; - g_ptEnd.y = y; - } - m_pToolObject->endEvent(); -} - -void ToolsModel::OnEndDraw(BOOL bCancel) -{ - ATLTRACE("ToolsModel::OnEndDraw(%d)\n", bCancel); - m_pToolObject->beginEvent(); - m_pToolObject->OnEndDraw(bCancel); - m_pToolObject->endEvent(); -} - -void ToolsModel::OnDrawOverlayOnImage(HDC hdc) -{ - m_pToolObject->OnDrawOverlayOnImage(hdc); -} - -void ToolsModel::OnDrawOverlayOnCanvas(HDC hdc) -{ - m_pToolObject->OnDrawOverlayOnCanvas(hdc); -} - void ToolsModel::resetTool() { m_pToolObject->reset(); @@ -316,80 +267,3 @@ void ToolsModel::selectAll() OnMouseMove(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); OnButtonUp(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); } - -void ToolsModel::SpecialTweak(BOOL bMinus) -{ - m_pToolObject->OnSpecialTweak(bMinus); -} - -void ToolsModel::DrawWithMouseTool(POINT pt, WPARAM wParam) -{ - LONG xRel = pt.x - g_ptStart.x, yRel = pt.y - g_ptStart.y; - - switch (m_activeTool) - { - // freesel, rectsel and text tools always show numbers limited to fit into image area - case TOOL_FREESEL: - case TOOL_RECTSEL: - case TOOL_TEXT: - if (xRel < 0) - xRel = (pt.x < 0) ? -g_ptStart.x : xRel; - else if (pt.x > imageModel.GetWidth()) - xRel = imageModel.GetWidth() - g_ptStart.x; - if (yRel < 0) - yRel = (pt.y < 0) ? -g_ptStart.y : yRel; - else if (pt.y > imageModel.GetHeight()) - yRel = imageModel.GetHeight() - g_ptStart.y; - break; - - // while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 - case TOOL_RUBBER: - case TOOL_PEN: - case TOOL_BRUSH: - case TOOL_AIRBRUSH: - case TOOL_SHAPE: - { - CStringW strCoord; - strCoord.Format(L"%ld, %ld", pt.x, pt.y); - ::SendMessageW(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCWSTR)strCoord); - break; - } - default: - break; - } - - // rectsel and shape tools always show non-negative numbers when drawing - if (m_activeTool == TOOL_RECTSEL || m_activeTool == TOOL_SHAPE) - { - xRel = labs(xRel); - yRel = labs(yRel); - } - - if (wParam & MK_LBUTTON) - { - OnMouseMove(TRUE, pt.x, pt.y); - canvasWindow.Invalidate(FALSE); - if ((m_activeTool >= TOOL_TEXT) || IsSelection()) - { - CStringW strSize; - if ((m_activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) - yRel = xRel; - strSize.Format(L"%ld x %ld", xRel, yRel); - ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); - } - } - - if (wParam & MK_RBUTTON) - { - OnMouseMove(FALSE, pt.x, pt.y); - canvasWindow.Invalidate(FALSE); - if (m_activeTool >= TOOL_TEXT) - { - CStringW strSize; - if ((m_activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) - yRel = xRel; - strSize.Format(L"%ld x %ld", xRel, yRel); - ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); - } - } -}

1 year, 2 months

[reactos] 01/01: [MSPAINT] Distinguish between icons and cursors (#5884)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56828b82d9fd6f92015e1… commit 56828b82d9fd6f92015e10cd581c3f04cf6a9488 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 22:15:43 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 22:15:43 2023 +0900 [MSPAINT] Distinguish between icons and cursors (#5884) - Convert icons/*_cur.ico to the cursor files (*.cur). - The hot spot is (16, 16) (default). - Rename icons/ folder as img/. - Use LoadCursorW instead of LoadIconW for cursors. - Use CURSOR statements for cursor files instead of ICON statements in rsrc.rc. - I used GIMP to convert the icon files to the PNG files. - I used RealWorld Cursor Editor to convert the PNG files to the cursor files. CORE-19297 --- base/applications/mspaint/CMakeLists.txt | 2 +- base/applications/mspaint/canvas.cpp | 10 ++++---- base/applications/mspaint/icons/airbrush_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/icons/color_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/icons/fill_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/icons/pen_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/icons/zoom_cur.ico | Bin 2238 -> 0 bytes base/applications/mspaint/img/airbrush.cur | Bin 0 -> 766 bytes base/applications/mspaint/img/color.cur | Bin 0 -> 766 bytes base/applications/mspaint/img/fill.cur | Bin 0 -> 766 bytes .../mspaint/{icons => img}/fontstoolbar.bmp | Bin .../mspaint/{icons => img}/handdrag.cur | Bin .../mspaint/{icons => img}/horzskew.ico | Bin .../mspaint/{icons => img}/horzstretch.ico | Bin .../mspaint/{icons => img}/iconbar.bmp | Bin .../mspaint/{icons => img}/nontransparent.ico | Bin base/applications/mspaint/{icons => img}/paint.ico | Bin base/applications/mspaint/{icons => img}/paint.svg | 0 base/applications/mspaint/img/pen.cur | Bin 0 -> 766 bytes .../mspaint/{icons => img}/transparency.xcf | Bin .../mspaint/{icons => img}/transparent.ico | Bin .../mspaint/{icons => img}/vertskew.ico | Bin .../mspaint/{icons => img}/vertstretch.ico | Bin base/applications/mspaint/img/zoom.cur | Bin 0 -> 766 bytes base/applications/mspaint/lang/bg-BG.rc | 2 +- base/applications/mspaint/lang/cs-CZ.rc | 2 +- base/applications/mspaint/lang/de-DE.rc | 2 +- base/applications/mspaint/lang/en-GB.rc | 2 +- base/applications/mspaint/lang/en-US.rc | 2 +- base/applications/mspaint/lang/es-ES.rc | 2 +- base/applications/mspaint/lang/et-EE.rc | 2 +- base/applications/mspaint/lang/eu-ES.rc | 2 +- base/applications/mspaint/lang/fr-FR.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/hu-HU.rc | 2 +- base/applications/mspaint/lang/id-ID.rc | 2 +- base/applications/mspaint/lang/it-IT.rc | 2 +- base/applications/mspaint/lang/ja-JP.rc | 2 +- base/applications/mspaint/lang/nl-NL.rc | 2 +- base/applications/mspaint/lang/no-NO.rc | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 2 +- base/applications/mspaint/lang/pt-PT.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/ru-RU.rc | 2 +- base/applications/mspaint/lang/sk-SK.rc | 2 +- base/applications/mspaint/lang/sq-AL.rc | 2 +- base/applications/mspaint/lang/sv-SE.rc | 2 +- base/applications/mspaint/lang/tr-TR.rc | 2 +- base/applications/mspaint/lang/uk-UA.rc | 2 +- base/applications/mspaint/lang/vi-VN.rc | 2 +- base/applications/mspaint/lang/zh-CN.rc | 2 +- base/applications/mspaint/lang/zh-HK.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- base/applications/mspaint/rsrc.rc | 28 ++++++++++----------- 55 files changed, 50 insertions(+), 50 deletions(-) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index 94b8e26c680..d90fea481fd 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -28,7 +28,7 @@ list(APPEND SOURCE winproc.cpp precomp.h) -file(GLOB mspaint_rc_deps icons/*.*) +file(GLOB mspaint_rc_deps img/*.*) add_rc_deps(rsrc.rc ${mspaint_rc_deps}) add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 87553d04400..6ebe32a48ec 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -659,19 +659,19 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL switch (toolsModel.GetActiveTool()) { case TOOL_FILL: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL))); break; case TOOL_COLOR: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR))); break; case TOOL_ZOOM: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM))); break; case TOOL_PEN: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN))); break; case TOOL_AIRBRUSH: - ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH))); break; default: ::SetCursor(::LoadCursorW(NULL, (LPCWSTR)IDC_CROSS)); diff --git a/base/applications/mspaint/icons/airbrush_cur.ico b/base/applications/mspaint/icons/airbrush_cur.ico deleted file mode 100644 index aa1a09c5962..00000000000 Binary files a/base/applications/mspaint/icons/airbrush_cur.ico and /dev/null differ diff --git a/base/applications/mspaint/icons/color_cur.ico b/base/applications/mspaint/icons/color_cur.ico deleted file mode 100644 index 49d536df9c6..00000000000 Binary files a/base/applications/mspaint/icons/color_cur.ico and /dev/null differ diff --git a/base/applications/mspaint/icons/fill_cur.ico b/base/applications/mspaint/icons/fill_cur.ico deleted file mode 100644 index fa2679fe3f1..00000000000 Binary files a/base/applications/mspaint/icons/fill_cur.ico and /dev/null differ diff --git a/base/applications/mspaint/icons/pen_cur.ico b/base/applications/mspaint/icons/pen_cur.ico deleted file mode 100644 index 107e55551ec..00000000000 Binary files a/base/applications/mspaint/icons/pen_cur.ico and /dev/null differ diff --git a/base/applications/mspaint/icons/zoom_cur.ico b/base/applications/mspaint/icons/zoom_cur.ico deleted file mode 100644 index 072b2c3a238..00000000000 Binary files a/base/applications/mspaint/icons/zoom_cur.ico and /dev/null differ diff --git a/base/applications/mspaint/img/airbrush.cur b/base/applications/mspaint/img/airbrush.cur new file mode 100644 index 00000000000..cf044906c78 Binary files /dev/null and b/base/applications/mspaint/img/airbrush.cur differ diff --git a/base/applications/mspaint/img/color.cur b/base/applications/mspaint/img/color.cur new file mode 100644 index 00000000000..ac736b21b79 Binary files /dev/null and b/base/applications/mspaint/img/color.cur differ diff --git a/base/applications/mspaint/img/fill.cur b/base/applications/mspaint/img/fill.cur new file mode 100644 index 00000000000..df2fbe6c1a2 Binary files /dev/null and b/base/applications/mspaint/img/fill.cur differ diff --git a/base/applications/mspaint/icons/fontstoolbar.bmp b/base/applications/mspaint/img/fontstoolbar.bmp similarity index 100% rename from base/applications/mspaint/icons/fontstoolbar.bmp rename to base/applications/mspaint/img/fontstoolbar.bmp diff --git a/base/applications/mspaint/icons/handdrag.cur b/base/applications/mspaint/img/handdrag.cur similarity index 100% rename from base/applications/mspaint/icons/handdrag.cur rename to base/applications/mspaint/img/handdrag.cur diff --git a/base/applications/mspaint/icons/horzskew.ico b/base/applications/mspaint/img/horzskew.ico similarity index 100% rename from base/applications/mspaint/icons/horzskew.ico rename to base/applications/mspaint/img/horzskew.ico diff --git a/base/applications/mspaint/icons/horzstretch.ico b/base/applications/mspaint/img/horzstretch.ico similarity index 100% rename from base/applications/mspaint/icons/horzstretch.ico rename to base/applications/mspaint/img/horzstretch.ico diff --git a/base/applications/mspaint/icons/iconbar.bmp b/base/applications/mspaint/img/iconbar.bmp similarity index 100% rename from base/applications/mspaint/icons/iconbar.bmp rename to base/applications/mspaint/img/iconbar.bmp diff --git a/base/applications/mspaint/icons/nontransparent.ico b/base/applications/mspaint/img/nontransparent.ico similarity index 100% rename from base/applications/mspaint/icons/nontransparent.ico rename to base/applications/mspaint/img/nontransparent.ico diff --git a/base/applications/mspaint/icons/paint.ico b/base/applications/mspaint/img/paint.ico similarity index 100% rename from base/applications/mspaint/icons/paint.ico rename to base/applications/mspaint/img/paint.ico diff --git a/base/applications/mspaint/icons/paint.svg b/base/applications/mspaint/img/paint.svg similarity index 100% rename from base/applications/mspaint/icons/paint.svg rename to base/applications/mspaint/img/paint.svg diff --git a/base/applications/mspaint/img/pen.cur b/base/applications/mspaint/img/pen.cur new file mode 100644 index 00000000000..98f90d0388b Binary files /dev/null and b/base/applications/mspaint/img/pen.cur differ diff --git a/base/applications/mspaint/icons/transparency.xcf b/base/applications/mspaint/img/transparency.xcf similarity index 100% rename from base/applications/mspaint/icons/transparency.xcf rename to base/applications/mspaint/img/transparency.xcf diff --git a/base/applications/mspaint/icons/transparent.ico b/base/applications/mspaint/img/transparent.ico similarity index 100% rename from base/applications/mspaint/icons/transparent.ico rename to base/applications/mspaint/img/transparent.ico diff --git a/base/applications/mspaint/icons/vertskew.ico b/base/applications/mspaint/img/vertskew.ico similarity index 100% rename from base/applications/mspaint/icons/vertskew.ico rename to base/applications/mspaint/img/vertskew.ico diff --git a/base/applications/mspaint/icons/vertstretch.ico b/base/applications/mspaint/img/vertstretch.ico similarity index 100% rename from base/applications/mspaint/icons/vertstretch.ico rename to base/applications/mspaint/img/vertstretch.ico diff --git a/base/applications/mspaint/img/zoom.cur b/base/applications/mspaint/img/zoom.cur new file mode 100644 index 00000000000..23adbec2bf7 Binary files /dev/null and b/base/applications/mspaint/img/zoom.cur differ diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index e880803577d..94ce4e67db4 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-bg-BG.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-bg-BG.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 22f2387752a..8d367b9e21f 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-cs-CZ.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-cs-CZ.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 07511f578ed..3af564c5035 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-de-DE.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-de-DE.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 29b47c1b7de..25ce4329748 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-en-GB.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-en-GB.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 9119010ce53..9fb7a622aa5 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar.bmp" +IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 6af66999fea..805353c3968 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-es-ES.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-es-ES.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index c6fef7bb171..350f1a0f90f 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-et-EE.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-et-EE.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index fdda0e8edbd..41a8abc6a7b 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-eu-ES.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-eu-ES.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 056a79f6f8e..f37bf8a8444 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-fr-FR.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-fr-FR.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 853dfb9852f..acfb1c65f0f 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-he-IL.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-he-IL.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 266ab21eeb2..bb63ad06f54 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-hu-HU.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-hu-HU.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index b03210330f4..fb7dfe53482 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-id-ID.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-id-ID.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 6ef469f5923..a97c7034912 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-it-IT.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-it-IT.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 5c41f90053b..cb8d2f91061 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ja-JP.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ja-JP.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index de8539ebfc3..972814c2cb1 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-nl-NL.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-nl-NL.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 001ca09b9f2..3e5f1a57146 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-no-NO.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-no-NO.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 0f9b0076a7a..9128980bc7c 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pl-PL.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pl-PL.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index be53b2cc1b4..f69ff23f54d 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pt-BR.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pt-BR.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index f4b9638e03e..c698236a6c4 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pt-PT.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pt-PT.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 274c14a28ea..6bd7c0e3698 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ro-RO.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ro-RO.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 964453968e6..644ef61ad8a 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ru-RU.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ru-RU.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 5fa46a01124..e42f6ac69e0 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sk-SK.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sk-SK.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 5da01332cd3..584d180bcfc 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sq-AL.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sq-AL.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index ec2f3205a74..0c3b2907d02 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sv-SE.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sv-SE.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index b7768297a36..9a5b7004afd 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-tr-TR.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-tr-TR.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index e54a662e1fe..1a6a3f86fec 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-uk-UA.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-uk-UA.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index cebeb1d53cc..d40302055e6 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_VIETNAMESE, SUBLANG_VIETNAMESE_VIETNAM -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-vi-VN.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-vi-VN.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 962479ab51f..19408aaebfc 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-CN.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-CN.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 65dd0e96eb3..5691d4d8811 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-HK.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-HK.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index f08299a24f1..33963d485fd 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-TW.bmp" +//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-TW.bmp" ID_MENU MENU BEGIN diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 5798f4c9ff7..e16d27fce9e 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -21,24 +21,24 @@ /* Icons */ -IDI_APPICON ICON "icons/paint.ico" +IDI_APPICON ICON "img/paint.ico" -IDB_TOOLBARICONS BITMAP "icons/iconbar.bmp" +IDB_TOOLBARICONS BITMAP "img/iconbar.bmp" -IDI_TRANSPARENT ICON "icons/transparent.ico" -IDI_NONTRANSPARENT ICON "icons/nontransparent.ico" +IDI_TRANSPARENT ICON "img/transparent.ico" +IDI_NONTRANSPARENT ICON "img/nontransparent.ico" -IDC_FILL ICON "icons/fill_cur.ico" -IDC_COLOR ICON "icons/color_cur.ico" -IDC_ZOOM ICON "icons/zoom_cur.ico" -IDC_PEN ICON "icons/pen_cur.ico" -IDC_AIRBRUSH ICON "icons/airbrush_cur.ico" -IDC_HANDDRAG CURSOR "icons/handdrag.cur" +IDC_FILL CURSOR "img/fill.cur" +IDC_COLOR CURSOR "img/color.cur" +IDC_ZOOM CURSOR "img/zoom.cur" +IDC_PEN CURSOR "img/pen.cur" +IDC_AIRBRUSH CURSOR "img/airbrush.cur" +IDC_HANDDRAG CURSOR "img/handdrag.cur" -IDI_HORZSTRETCH ICON "icons/horzstretch.ico" -IDI_VERTSTRETCH ICON "icons/vertstretch.ico" -IDI_HORZSKEW ICON "icons/horzskew.ico" -IDI_VERTSKEW ICON "icons/vertskew.ico" +IDI_HORZSTRETCH ICON "img/horzstretch.ico" +IDI_VERTSTRETCH ICON "img/vertstretch.ico" +IDI_HORZSKEW ICON "img/horzskew.ico" +IDI_VERTSKEW ICON "img/vertskew.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "mspaint.exe.manifest"

1 year, 2 months

[reactos] 01/01: [SHELL32] Commonize CCopyToMenu and CMoveToMenu (#5873)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a938d19714f9ab659c8d9… commit a938d19714f9ab659c8d9c2250f2cafc5db8f637 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 21:56:15 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 21:56:15 2023 +0900 [SHELL32] Commonize CCopyToMenu and CMoveToMenu (#5873) Reduce code. And correctly do the filename check. CORE-18909 --- .../{CMoveToMenu.cpp => CCopyMoveToMenu.cpp} | 187 ++++++---- dll/win32/shell32/CCopyMoveToMenu.h | 111 ++++++ dll/win32/shell32/CCopyToMenu.cpp | 381 --------------------- dll/win32/shell32/CCopyToMoveToMenu.h | 112 ------ dll/win32/shell32/CMakeLists.txt | 3 +- dll/win32/shell32/precomp.h | 2 +- 6 files changed, 233 insertions(+), 563 deletions(-) diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CCopyMoveToMenu.cpp similarity index 66% rename from dll/win32/shell32/CMoveToMenu.cpp rename to dll/win32/shell32/CCopyMoveToMenu.cpp index a2d35f1ade1..859b05eb5b7 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CCopyMoveToMenu.cpp @@ -1,33 +1,29 @@ /* - * PROJECT: shell32 + * PROJECT: ReactOS shell32 * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: MoveTo implementation - * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * PURPOSE: CopyTo and MoveTo implementation + * COPYRIGHT: Copyright 2020-2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); -CMoveToMenu::CMoveToMenu() : +CCopyMoveToMenu::CCopyMoveToMenu() : m_idCmdFirst(0), m_idCmdLast(0), - m_idCmdMoveTo(-1), + m_idCmdAction(-1), m_fnOldWndProc(NULL), m_bIgnoreTextBoxChange(FALSE) { } -CMoveToMenu::~CMoveToMenu() -{ -} - static LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { WCHAR szPath[MAX_PATH]; - CMoveToMenu *this_ = - reinterpret_cast<CMoveToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); + CCopyMoveToMenu *this_ = + reinterpret_cast<CCopyMoveToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); switch (uMsg) { @@ -64,30 +60,30 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return CallWindowProcW(this_->m_fnOldWndProc, hwnd, uMsg, wParam, lParam); } -static int CALLBACK +static INT CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) { - CMoveToMenu *this_ = - reinterpret_cast<CMoveToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); + CCopyMoveToMenu *this_ = + reinterpret_cast<CCopyMoveToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); switch (uMsg) { case BFFM_INITIALIZED: { SetWindowLongPtr(hwnd, GWLP_USERDATA, lpData); - this_ = reinterpret_cast<CMoveToMenu *>(lpData); + this_ = reinterpret_cast<CCopyMoveToMenu *>(lpData); // Select initial directory SendMessageW(hwnd, BFFM_SETSELECTION, FALSE, reinterpret_cast<LPARAM>(static_cast<LPCITEMIDLIST>(this_->m_pidlFolder))); // Set caption - CString strCaption(MAKEINTRESOURCEW(IDS_MOVEITEMS)); + CString strCaption(MAKEINTRESOURCEW(this_->GetCaptionStringID())); SetWindowTextW(hwnd, strCaption); // Set OK button text - CString strMove(MAKEINTRESOURCEW(IDS_MOVEBUTTON)); - SetDlgItemText(hwnd, IDOK, strMove); + CString strCopyOrMove(MAKEINTRESOURCEW(this_->GetButtonStringID())); + SetDlgItemText(hwnd, IDOK, strCopyOrMove); // Subclassing this_->m_fnOldWndProc = @@ -125,7 +121,8 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) return FALSE; } -HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) +HRESULT +CCopyMoveToMenu::DoRealFileOp(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) { CDataObjectHIDA pCIDA(m_pDataObject); if (FAILED_UNEXPECTEDLY(pCIDA.hr())) @@ -175,10 +172,7 @@ HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) return E_FAIL; } - SHFILEOPSTRUCTW op = { lpici->hwnd }; - op.wFunc = FO_MOVE; - op.pFrom = strFiles; - op.pTo = szPath; + SHFILEOPSTRUCTW op = { lpici->hwnd, GetFileOp(), strFiles, szPath }; op.fFlags = FOF_ALLOWUNDO; int res = SHFileOperationW(&op); if (res) @@ -189,19 +183,18 @@ HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) return S_OK; } -CStringW CMoveToMenu::DoGetFileTitle() +static HRESULT +DoGetFileTitle(CStringW& strTitle, IDataObject *pDataObject) { - CStringW ret = L"(file)"; - - CDataObjectHIDA pCIDA(m_pDataObject); + CDataObjectHIDA pCIDA(pDataObject); if (FAILED_UNEXPECTEDLY(pCIDA.hr())) - return ret; + return E_FAIL; PCUIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pCIDA); if (!pidlParent) { ERR("HIDA_GetPIDLFolder failed\n"); - return ret; + return E_FAIL; } WCHAR szPath[MAX_PATH]; @@ -209,28 +202,33 @@ CStringW CMoveToMenu::DoGetFileTitle() if (!pidlRelative) { ERR("HIDA_GetPIDLItem failed\n"); - return ret; + return E_FAIL; } CComHeapPtr<ITEMIDLIST> pidlCombine(ILCombine(pidlParent, pidlRelative)); - if (SHGetPathFromIDListW(pidlCombine, szPath)) - ret = PathFindFileNameW(szPath); - else + if (!SHGetPathFromIDListW(pidlCombine, szPath)) + { ERR("Cannot get path\n"); + return E_FAIL; + } + + strTitle = PathFindFileNameW(szPath); + if (strTitle.IsEmpty()) + return E_FAIL; if (pCIDA->cidl > 1) - ret += L" ..."; + strTitle += L" ..."; - return ret; + return S_OK; } -HRESULT CMoveToMenu::DoMoveToFolder(LPCMINVOKECOMMANDINFO lpici) +HRESULT CCopyMoveToMenu::DoAction(LPCMINVOKECOMMANDINFO lpici) { WCHAR wszPath[MAX_PATH]; HRESULT hr = E_FAIL; - TRACE("DoMoveToFolder(%p)\n", lpici); + TRACE("(%p)\n", lpici); if (!SHGetPathFromIDListW(m_pidlFolder, wszPath)) { @@ -238,9 +236,13 @@ HRESULT CMoveToMenu::DoMoveToFolder(LPCMINVOKECOMMANDINFO lpici) return hr; } - CStringW strFileTitle = DoGetFileTitle(); + CStringW strFileTitle; + hr = DoGetFileTitle(strFileTitle, m_pDataObject); + if (FAILED(hr)) + return hr; + CStringW strTitle; - strTitle.Format(IDS_MOVETOTITLE, static_cast<LPCWSTR>(strFileTitle)); + strTitle.Format(GetActionTitleStringID(), static_cast<LPCWSTR>(strFileTitle)); BROWSEINFOW info = { lpici->hwnd }; info.pidlRoot = NULL; @@ -250,14 +252,67 @@ HRESULT CMoveToMenu::DoMoveToFolder(LPCMINVOKECOMMANDINFO lpici) info.lParam = reinterpret_cast<LPARAM>(this); CComHeapPtr<ITEMIDLIST> pidl(SHBrowseForFolder(&info)); if (pidl) + hr = DoRealFileOp(lpici, pidl); + + return hr; +} + +STDMETHODIMP +CCopyToMenu::QueryContextMenu(HMENU hMenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + MENUITEMINFOW mii; + UINT Count = 0; + + TRACE("CCopyToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", + hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + + if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst); + + m_idCmdFirst = m_idCmdLast = idCmdFirst; + + // insert separator if necessary + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE; + if (GetMenuItemInfoW(hMenu, indexMenu - 1, TRUE, &mii) && + mii.fType != MFT_SEPARATOR) { - hr = DoRealMove(lpici, pidl); + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE; + mii.fType = MFT_SEPARATOR; + if (InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) + { + ++indexMenu; + ++Count; + } } - return hr; + // insert "Copy to folder..." + CStringW strText(MAKEINTRESOURCEW(IDS_COPYTOMENU)); + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE; + mii.fType = MFT_STRING; + mii.dwTypeData = strText.GetBuffer(); + mii.cch = wcslen(mii.dwTypeData); + mii.wID = m_idCmdLast; + if (InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) + { + m_idCmdAction = m_idCmdLast++; + ++indexMenu; + ++Count; + } + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + Count); } -HRESULT WINAPI +STDMETHODIMP CMoveToMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, @@ -309,7 +364,7 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu, mii.wID = m_idCmdLast; if (InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) { - m_idCmdMoveTo = m_idCmdLast++; + m_idCmdAction = m_idCmdLast++; ++indexMenu; ++Count; } @@ -317,36 +372,33 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu, return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + Count); } -HRESULT WINAPI -CMoveToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) +STDMETHODIMP +CCopyMoveToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { HRESULT hr = E_FAIL; - TRACE("CMoveToMenu::InvokeCommand(%p)\n", lpici); + TRACE("CCopyMoveToMenu::InvokeCommand(%p)\n", lpici); if (IS_INTRESOURCE(lpici->lpVerb)) { - if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdMoveTo) - { - hr = DoMoveToFolder(lpici); - } + if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdAction) + hr = DoAction(lpici); } else { - if (::lstrcmpiA(lpici->lpVerb, "moveto") == 0) - { - hr = DoMoveToFolder(lpici); - } + if (::lstrcmpiA(lpici->lpVerb, GetVerb()) == 0) + hr = DoAction(lpici); } return hr; } -HRESULT WINAPI -CMoveToMenu::GetCommandString(UINT_PTR idCmd, - UINT uType, - UINT *pwReserved, - LPSTR pszName, - UINT cchMax) +STDMETHODIMP +CCopyMoveToMenu::GetCommandString( + UINT_PTR idCmd, + UINT uType, + UINT *pwReserved, + LPSTR pszName, + UINT cchMax) { FIXME("%p %lu %u %p %p %u\n", this, idCmd, uType, pwReserved, pszName, cchMax); @@ -354,29 +406,30 @@ CMoveToMenu::GetCommandString(UINT_PTR idCmd, return E_NOTIMPL; } -HRESULT WINAPI -CMoveToMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) +STDMETHODIMP +CCopyMoveToMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) { TRACE("This %p uMsg %x\n", this, uMsg); return E_NOTIMPL; } -HRESULT WINAPI -CMoveToMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder, - IDataObject *pdtobj, HKEY hkeyProgID) +STDMETHODIMP +CCopyMoveToMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { m_pidlFolder.Attach(ILClone(pidlFolder)); m_pDataObject = pdtobj; return S_OK; } -HRESULT WINAPI CMoveToMenu::SetSite(IUnknown *pUnkSite) +STDMETHODIMP +CCopyMoveToMenu::SetSite(IUnknown *pUnkSite) { m_pSite = pUnkSite; return S_OK; } -HRESULT WINAPI CMoveToMenu::GetSite(REFIID riid, void **ppvSite) +STDMETHODIMP +CCopyMoveToMenu::GetSite(REFIID riid, void **ppvSite) { if (!m_pSite) return E_FAIL; diff --git a/dll/win32/shell32/CCopyMoveToMenu.h b/dll/win32/shell32/CCopyMoveToMenu.h new file mode 100644 index 00000000000..3b9de7ad91a --- /dev/null +++ b/dll/win32/shell32/CCopyMoveToMenu.h @@ -0,0 +1,111 @@ +/* + * PROJECT: ReactOS shell32 + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CopyTo and MoveTo implementation + * COPYRIGHT: Copyright 2020-2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#pragma once + +class CCopyMoveToMenu : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IContextMenu2, + public IObjectWithSite, + public IShellExtInit +{ +protected: + UINT m_idCmdFirst, m_idCmdLast, m_idCmdAction; + CComPtr<IDataObject> m_pDataObject; + CComPtr<IUnknown> m_pSite; + + HRESULT DoRealFileOp(LPCMINVOKECOMMANDINFO lpici, PCUIDLIST_ABSOLUTE pidl); + HRESULT DoAction(LPCMINVOKECOMMANDINFO lpici); + +public: + CComHeapPtr<ITEMIDLIST> m_pidlFolder; + WNDPROC m_fnOldWndProc; + BOOL m_bIgnoreTextBoxChange; + + CCopyMoveToMenu(); + + virtual UINT GetCaptionStringID() const = 0; + virtual UINT GetButtonStringID() const = 0; + virtual UINT GetActionTitleStringID() const = 0; + virtual UINT GetFileOp() const = 0; + virtual LPCSTR GetVerb() const = 0; + + // IContextMenu + STDMETHODIMP GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) override; + STDMETHODIMP InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) override; + + // IContextMenu2 + STDMETHODIMP HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) override; + + // IShellExtInit + STDMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) override; + + // IObjectWithSite + STDMETHODIMP SetSite(IUnknown *pUnkSite) override; + STDMETHODIMP GetSite(REFIID riid, void **ppvSite) override; +}; + +class CCopyToMenu + : public CComCoClass<CCopyToMenu, &CLSID_CopyToMenu> + , public CCopyMoveToMenu +{ +public: + CComHeapPtr<ITEMIDLIST> m_pidlFolder; + WNDPROC m_fnOldWndProc; + BOOL m_bIgnoreTextBoxChange; + + CCopyToMenu() { } + + // IContextMenu + STDMETHODIMP QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) override; + + DECLARE_REGISTRY_RESOURCEID(IDR_COPYTOMENU) + DECLARE_NOT_AGGREGATABLE(CCopyToMenu) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CCopyToMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + END_COM_MAP() + + UINT GetCaptionStringID() const override { return IDS_COPYITEMS; } + UINT GetButtonStringID() const override { return IDS_COPYBUTTON; } + UINT GetActionTitleStringID() const override { return IDS_COPYTOTITLE; } + UINT GetFileOp() const override { return FO_COPY; } + LPCSTR GetVerb() const override { return "copyto"; } +}; + +class CMoveToMenu + : public CComCoClass<CMoveToMenu, &CLSID_MoveToMenu> + , public CCopyMoveToMenu +{ +public: + CMoveToMenu() { } + + // IContextMenu + STDMETHODIMP QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) override; + + DECLARE_REGISTRY_RESOURCEID(IDR_MOVETOMENU) + DECLARE_NOT_AGGREGATABLE(CMoveToMenu) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CMoveToMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + END_COM_MAP() + + UINT GetCaptionStringID() const override { return IDS_MOVEITEMS; } + UINT GetButtonStringID() const override { return IDS_MOVEBUTTON; } + UINT GetActionTitleStringID() const override { return IDS_MOVETOTITLE; } + UINT GetFileOp() const override { return FO_MOVE; } + LPCSTR GetVerb() const override { return "moveto"; } +}; diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp deleted file mode 100644 index d3da9d1f5a8..00000000000 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ /dev/null @@ -1,381 +0,0 @@ -/* - * PROJECT: shell32 - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: CopyTo implementation - * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) - */ - -#include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - - -CCopyToMenu::CCopyToMenu() : - m_idCmdFirst(0), - m_idCmdLast(0), - m_idCmdCopyTo(-1), - m_fnOldWndProc(NULL), - m_bIgnoreTextBoxChange(FALSE) -{ -} - -CCopyToMenu::~CCopyToMenu() -{ -} - -static LRESULT CALLBACK -WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - WCHAR szPath[MAX_PATH]; - CCopyToMenu *this_ = - reinterpret_cast<CCopyToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); - - switch (uMsg) - { - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT: - { - if (HIWORD(wParam) == EN_CHANGE) - { - if (!this_->m_bIgnoreTextBoxChange) - { - // get the text - GetDlgItemTextW(hwnd, IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, szPath, _countof(szPath)); - StrTrimW(szPath, L" \t"); - - // update OK button - BOOL bValid = !PathIsRelative(szPath) && PathIsDirectoryW(szPath); - SendMessageW(hwnd, BFFM_ENABLEOK, 0, bValid); - - return 0; - } - - // reset flag - this_->m_bIgnoreTextBoxChange = FALSE; - } - break; - } - } - break; - } - } - return CallWindowProcW(this_->m_fnOldWndProc, hwnd, uMsg, wParam, lParam); -} - -static int CALLBACK -BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) -{ - CCopyToMenu *this_ = - reinterpret_cast<CCopyToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); - - switch (uMsg) - { - case BFFM_INITIALIZED: - { - SetWindowLongPtr(hwnd, GWLP_USERDATA, lpData); - this_ = reinterpret_cast<CCopyToMenu *>(lpData); - - // Select initial directory - SendMessageW(hwnd, BFFM_SETSELECTION, FALSE, - reinterpret_cast<LPARAM>(static_cast<LPCITEMIDLIST>(this_->m_pidlFolder))); - - // Set caption - CString strCaption(MAKEINTRESOURCEW(IDS_COPYITEMS)); - SetWindowTextW(hwnd, strCaption); - - // Set OK button text - CString strCopy(MAKEINTRESOURCEW(IDS_COPYBUTTON)); - SetDlgItemText(hwnd, IDOK, strCopy); - - // Subclassing - this_->m_fnOldWndProc = - reinterpret_cast<WNDPROC>( - SetWindowLongPtr(hwnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(WindowProc))); - - // Disable OK - PostMessageW(hwnd, BFFM_ENABLEOK, 0, FALSE); - break; - } - case BFFM_SELCHANGED: - { - if (!this_) - break; - - WCHAR szPath[MAX_PATH]; - LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(lParam); - - szPath[0] = 0; - SHGetPathFromIDListW(pidl, szPath); - - if (ILIsEqual(pidl, this_->m_pidlFolder)) - PostMessageW(hwnd, BFFM_ENABLEOK, 0, FALSE); - else if (PathFileExistsW(szPath) || _ILIsDesktop(pidl)) - PostMessageW(hwnd, BFFM_ENABLEOK, 0, TRUE); - else - PostMessageW(hwnd, BFFM_ENABLEOK, 0, FALSE); - - // the text box will be updated later soon, ignore it - this_->m_bIgnoreTextBoxChange = TRUE; - break; - } - } - - return FALSE; -} - -HRESULT CCopyToMenu::DoRealCopy(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) -{ - CDataObjectHIDA pCIDA(m_pDataObject); - if (FAILED_UNEXPECTEDLY(pCIDA.hr())) - return pCIDA.hr(); - - PCUIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pCIDA); - if (!pidlParent) - { - ERR("HIDA_GetPIDLFolder failed\n"); - return E_FAIL; - } - - CStringW strFiles; - WCHAR szPath[MAX_PATH]; - for (UINT n = 0; n < pCIDA->cidl; ++n) - { - PCUIDLIST_RELATIVE pidlRelative = HIDA_GetPIDLItem(pCIDA, n); - if (!pidlRelative) - continue; - - CComHeapPtr<ITEMIDLIST> pidlCombine(ILCombine(pidlParent, pidlRelative)); - if (!pidl) - return E_FAIL; - - SHGetPathFromIDListW(pidlCombine, szPath); - - if (n > 0) - strFiles += L'|'; - strFiles += szPath; - } - - strFiles += L'|'; // double null-terminated - strFiles.Replace(L'|', L'\0'); - - if (_ILIsDesktop(pidl)) - SHGetSpecialFolderPathW(NULL, szPath, CSIDL_DESKTOPDIRECTORY, FALSE); - else - SHGetPathFromIDListW(pidl, szPath); - INT cchPath = lstrlenW(szPath); - if (cchPath + 1 < MAX_PATH) - { - szPath[cchPath + 1] = 0; // double null-terminated - } - else - { - ERR("Too long path\n"); - return E_FAIL; - } - - SHFILEOPSTRUCTW op = { lpici->hwnd }; - op.wFunc = FO_COPY; - op.pFrom = strFiles; - op.pTo = szPath; - op.fFlags = FOF_ALLOWUNDO; - int res = SHFileOperationW(&op); - if (res) - { - ERR("SHFileOperationW failed with 0x%x\n", res); - return E_FAIL; - } - return S_OK; -} - -CStringW CCopyToMenu::DoGetFileTitle() -{ - CStringW ret = L"(file)"; - - CDataObjectHIDA pCIDA(m_pDataObject); - if (FAILED_UNEXPECTEDLY(pCIDA.hr())) - return ret; - - PCUIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pCIDA); - if (!pidlParent) - { - ERR("HIDA_GetPIDLFolder failed\n"); - return ret; - } - - WCHAR szPath[MAX_PATH]; - PCUIDLIST_RELATIVE pidlRelative = HIDA_GetPIDLItem(pCIDA, 0); - if (!pidlRelative) - { - ERR("HIDA_GetPIDLItem failed\n"); - return ret; - } - - CComHeapPtr<ITEMIDLIST> pidlCombine(ILCombine(pidlParent, pidlRelative)); - - if (SHGetPathFromIDListW(pidlCombine, szPath)) - ret = PathFindFileNameW(szPath); - else - ERR("Cannot get path\n"); - - if (pCIDA->cidl > 1) - ret += L" ..."; - - return ret; -} - -HRESULT CCopyToMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) -{ - WCHAR wszPath[MAX_PATH]; - HRESULT hr = E_FAIL; - - TRACE("DoCopyToFolder(%p)\n", lpici); - - if (!SHGetPathFromIDListW(m_pidlFolder, wszPath)) - { - ERR("SHGetPathFromIDListW failed\n"); - return hr; - } - - CStringW strFileTitle = DoGetFileTitle(); - CStringW strTitle; - strTitle.Format(IDS_COPYTOTITLE, static_cast<LPCWSTR>(strFileTitle)); - - BROWSEINFOW info = { lpici->hwnd }; - info.pidlRoot = NULL; - info.lpszTitle = strTitle; - info.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI; - info.lpfn = BrowseCallbackProc; - info.lParam = reinterpret_cast<LPARAM>(this); - CComHeapPtr<ITEMIDLIST> pidl(SHBrowseForFolder(&info)); - if (pidl) - { - hr = DoRealCopy(lpici, pidl); - } - - return hr; -} - -HRESULT WINAPI -CCopyToMenu::QueryContextMenu(HMENU hMenu, - UINT indexMenu, - UINT idCmdFirst, - UINT idCmdLast, - UINT uFlags) -{ - MENUITEMINFOW mii; - UINT Count = 0; - - TRACE("CCopyToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", - hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - - if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst); - - m_idCmdFirst = m_idCmdLast = idCmdFirst; - - // insert separator if necessary - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE; - if (GetMenuItemInfoW(hMenu, indexMenu - 1, TRUE, &mii) && - mii.fType != MFT_SEPARATOR) - { - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE; - mii.fType = MFT_SEPARATOR; - if (InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) - { - ++indexMenu; - ++Count; - } - } - - // insert "Copy to folder..." - CStringW strText(MAKEINTRESOURCEW(IDS_COPYTOMENU)); - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID | MIIM_TYPE; - mii.fType = MFT_STRING; - mii.dwTypeData = strText.GetBuffer(); - mii.cch = wcslen(mii.dwTypeData); - mii.wID = m_idCmdLast; - if (InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) - { - m_idCmdCopyTo = m_idCmdLast++; - ++indexMenu; - ++Count; - } - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + Count); -} - -HRESULT WINAPI -CCopyToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) -{ - HRESULT hr = E_FAIL; - TRACE("CCopyToMenu::InvokeCommand(%p)\n", lpici); - - if (IS_INTRESOURCE(lpici->lpVerb)) - { - if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdCopyTo) - { - hr = DoCopyToFolder(lpici); - } - } - else - { - if (::lstrcmpiA(lpici->lpVerb, "copyto") == 0) - { - hr = DoCopyToFolder(lpici); - } - } - - return hr; -} - -HRESULT WINAPI -CCopyToMenu::GetCommandString(UINT_PTR idCmd, - UINT uType, - UINT *pwReserved, - LPSTR pszName, - UINT cchMax) -{ - FIXME("%p %lu %u %p %p %u\n", this, - idCmd, uType, pwReserved, pszName, cchMax); - - return E_NOTIMPL; -} - -HRESULT WINAPI -CCopyToMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - TRACE("This %p uMsg %x\n", this, uMsg); - return E_NOTIMPL; -} - -HRESULT WINAPI -CCopyToMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder, - IDataObject *pdtobj, HKEY hkeyProgID) -{ - m_pidlFolder.Attach(ILClone(pidlFolder)); - m_pDataObject = pdtobj; - return S_OK; -} - -HRESULT WINAPI CCopyToMenu::SetSite(IUnknown *pUnkSite) -{ - m_pSite = pUnkSite; - return S_OK; -} - -HRESULT WINAPI CCopyToMenu::GetSite(REFIID riid, void **ppvSite) -{ - if (!m_pSite) - return E_FAIL; - - return m_pSite->QueryInterface(riid, ppvSite); -} diff --git a/dll/win32/shell32/CCopyToMoveToMenu.h b/dll/win32/shell32/CCopyToMoveToMenu.h deleted file mode 100644 index 01ee85d30c7..00000000000 --- a/dll/win32/shell32/CCopyToMoveToMenu.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * PROJECT: shell32 - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: CopyTo and MoveTo implementation - * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) - */ -#pragma once - - -class CCopyToMenu : - public CComCoClass<CCopyToMenu, &CLSID_CopyToMenu>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu2, - public IObjectWithSite, - public IShellExtInit -{ -protected: - UINT m_idCmdFirst, m_idCmdLast, m_idCmdCopyTo; - CComPtr<IDataObject> m_pDataObject; - CComPtr<IUnknown> m_pSite; - - HRESULT DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici); - HRESULT DoRealCopy(LPCMINVOKECOMMANDINFO lpici, PCUIDLIST_ABSOLUTE pidl); - CStringW DoGetFileTitle(); - -public: - CComHeapPtr<ITEMIDLIST> m_pidlFolder; - WNDPROC m_fnOldWndProc; - BOOL m_bIgnoreTextBoxChange; - - CCopyToMenu(); - ~CCopyToMenu(); - - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); - - // IContextMenu2 - virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); - - // IShellExtInit - virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); - - // IObjectWithSite - virtual HRESULT WINAPI SetSite(IUnknown *pUnkSite); - virtual HRESULT WINAPI GetSite(REFIID riid, void **ppvSite); - - DECLARE_REGISTRY_RESOURCEID(IDR_COPYTOMENU) - DECLARE_NOT_AGGREGATABLE(CCopyToMenu) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP(CCopyToMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - END_COM_MAP() -}; - -class CMoveToMenu : - public CComCoClass<CMoveToMenu, &CLSID_MoveToMenu>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu2, - public IObjectWithSite, - public IShellExtInit -{ -protected: - UINT m_idCmdFirst, m_idCmdLast, m_idCmdMoveTo; - CComPtr<IDataObject> m_pDataObject; - CComPtr<IUnknown> m_pSite; - - HRESULT DoMoveToFolder(LPCMINVOKECOMMANDINFO lpici); - HRESULT DoRealMove(LPCMINVOKECOMMANDINFO lpici, PCUIDLIST_ABSOLUTE pidl); - CStringW DoGetFileTitle(); - -public: - CComHeapPtr<ITEMIDLIST> m_pidlFolder; - WNDPROC m_fnOldWndProc; - BOOL m_bIgnoreTextBoxChange; - - CMoveToMenu(); - ~CMoveToMenu(); - - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); - - // IContextMenu2 - virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); - - // IShellExtInit - virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); - - // IObjectWithSite - virtual HRESULT WINAPI SetSite(IUnknown *pUnkSite); - virtual HRESULT WINAPI GetSite(REFIID riid, void **ppvSite); - - DECLARE_REGISTRY_RESOURCEID(IDR_MOVETOMENU) - DECLARE_NOT_AGGREGATABLE(CMoveToMenu) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP(CMoveToMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - END_COM_MAP() -}; diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 5f972807c8b..264b116f5a2 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -73,8 +73,7 @@ list(APPEND SOURCE COpenWithMenu.cpp CNewMenu.cpp CSendToMenu.cpp - CCopyToMenu.cpp - CMoveToMenu.cpp + CCopyMoveToMenu.cpp CShellDispatch.cpp CFolder.cpp CFolderItems.cpp diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index 9b422353e6c..393693885ac 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -95,7 +95,7 @@ #include "COpenWithMenu.h" #include "CNewMenu.h" #include "CSendToMenu.h" -#include "CCopyToMoveToMenu.h" +#include "CCopyMoveToMenu.h" #include "dialogs/filedefext.h" #include "dialogs/drvdefext.h" #include "CQueryAssociations.h"

1 year, 2 months

[reactos] 01/01: [MSPAINT] Use <winuser.rh> instead of <winuser.h> in rsrc.rc (#5883)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d21def4819a51cbc22d38… commit d21def4819a51cbc22d382a724fa5455bfa15cdd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 21:53:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 21:53:04 2023 +0900 [MSPAINT] Use <winuser.rh> instead of <winuser.h> in rsrc.rc (#5883) CORE-19094 --- base/applications/mspaint/rsrc.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 1f0ee5aca23..5798f4c9ff7 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -8,7 +8,7 @@ /* INCLUDES *********************************************************/ #include <windef.h> -#include <winuser.h> +#include <winuser.rh> #include <commctrl.h> #include "resource.h"

1 year, 2 months

[reactos] 01/01: [HOTPLUG] Add device removal support (#5836)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=119057800efd0d2bb8620… commit 119057800efd0d2bb86204ebf1f99558302edc51 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Sat Nov 4 19:31:26 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 13:31:26 2023 +0100 [HOTPLUG] Add device removal support (#5836) --- dll/cpl/hotplug/CMakeLists.txt | 1 + dll/cpl/hotplug/eject.c | 137 ++++++++++++++++++++ dll/cpl/hotplug/enum.c | 285 ++++++++++++++++++++++++++++++++++++++++- dll/cpl/hotplug/hotplug.c | 267 +++++--------------------------------- dll/cpl/hotplug/hotplug.h | 31 +++++ dll/cpl/hotplug/lang/de-DE.rc | 14 ++ dll/cpl/hotplug/lang/en-US.rc | 14 ++ dll/cpl/hotplug/lang/es-ES.rc | 14 ++ dll/cpl/hotplug/lang/fr-FR.rc | 14 ++ dll/cpl/hotplug/lang/id-ID.rc | 14 ++ dll/cpl/hotplug/lang/ja-JP.rc | 14 ++ dll/cpl/hotplug/lang/pl-PL.rc | 14 ++ dll/cpl/hotplug/lang/pt-PT.rc | 14 ++ dll/cpl/hotplug/lang/ro-RO.rc | 14 ++ dll/cpl/hotplug/lang/ru-RU.rc | 14 ++ dll/cpl/hotplug/lang/tr-TR.rc | 14 ++ dll/cpl/hotplug/lang/zh-CN.rc | 14 ++ dll/cpl/hotplug/lang/zh-HK.rc | 14 ++ dll/cpl/hotplug/lang/zh-TW.rc | 14 ++ dll/cpl/hotplug/resource.h | 8 +- 20 files changed, 686 insertions(+), 239 deletions(-) diff --git a/dll/cpl/hotplug/CMakeLists.txt b/dll/cpl/hotplug/CMakeLists.txt index ec6588697c5..c5e636d8938 100644 --- a/dll/cpl/hotplug/CMakeLists.txt +++ b/dll/cpl/hotplug/CMakeLists.txt @@ -3,6 +3,7 @@ spec2def(hotplug.dll hotplug.spec) list(APPEND SOURCE hotplug.c + eject.c enum.c) file(GLOB hotplug_rc_deps resources/*.*) diff --git a/dll/cpl/hotplug/eject.c b/dll/cpl/hotplug/eject.c new file mode 100644 index 00000000000..8f310ce5d0c --- /dev/null +++ b/dll/cpl/hotplug/eject.c @@ -0,0 +1,137 @@ +/* + * PROJECT: Safely Remove Hardware Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Device removal support + * COPYRIGHT: Copyright 2023 Thamatip Chitpong <thamatip.chitpong(a)reactos.org> + */ + +#include "hotplug.h" + +#include <strsafe.h> + +DEVINST +GetDeviceInstForRemoval( + _In_ PHOTPLUG_DATA pHotplugData) +{ + HTREEITEM hItem, hParentItem; + TVITEMW tvItem; + + hItem = TreeView_GetSelection(pHotplugData->hwndDeviceTree); + if (!hItem) + return 0; + + /* Find root item */ + hParentItem = TreeView_GetParent(pHotplugData->hwndDeviceTree, hItem); + while (hParentItem) + { + hItem = hParentItem; + hParentItem = TreeView_GetParent(pHotplugData->hwndDeviceTree, hItem); + } + + ZeroMemory(&tvItem, sizeof(tvItem)); + tvItem.mask = TVIF_PARAM; + tvItem.hItem = hItem; + + TreeView_GetItem(pHotplugData->hwndDeviceTree, &tvItem); + + return tvItem.lParam; +} + +static +VOID +FillConfirmDeviceList( + _In_ HWND hwndCfmDeviceList, + _In_ PHOTPLUG_DATA pHotplugData) +{ + LVCOLUMNW lvColumn; + + ZeroMemory(&lvColumn, sizeof(lvColumn)); + lvColumn.mask = LVCF_FMT; + lvColumn.fmt = LVCFMT_LEFT | LVCFMT_IMAGE; + ListView_InsertColumn(hwndCfmDeviceList, 0, &lvColumn); + + CfmListEnumDevices(hwndCfmDeviceList, pHotplugData); + + ListView_SetColumnWidth(hwndCfmDeviceList, 0, LVSCW_AUTOSIZE_USEHEADER); +} + +static +VOID +SafeRemoveDevice( + _In_ DEVINST DevInst, + _In_opt_ HWND hwndDlg) +{ + PNP_VETO_TYPE VetoType = PNP_VetoTypeUnknown; + CONFIGRET cr; + + cr = CM_Request_Device_EjectW(DevInst, &VetoType, NULL, 0, 0); + if (cr != CR_SUCCESS && VetoType == PNP_VetoTypeUnknown) + { + LPCWSTR pszFormat = L""; + WCHAR szError[64]; + + /* NOTES: IDS_EJECT_ERROR_FORMAT resource has to be explicitly NULL-terminated + * so we can use the string directly without having to make a copy of it. */ + LoadStringW(hApplet, IDS_EJECT_ERROR_FORMAT, (LPWSTR)&pszFormat, 0); + StringCbPrintfW(szError, sizeof(szError), pszFormat, cr); + + MessageBoxW(hwndDlg, szError, NULL, MB_ICONEXCLAMATION | MB_OK); + } +} + +INT_PTR +CALLBACK +ConfirmRemovalDlgProc( + _In_ HWND hwndDlg, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + PHOTPLUG_DATA pHotplugData; + + pHotplugData = (PHOTPLUG_DATA)GetWindowLongPtrW(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndDevList; + + pHotplugData = (PHOTPLUG_DATA)lParam; + SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)pHotplugData); + + hwndDevList = GetDlgItem(hwndDlg, IDC_CONFIRM_STOP_DEVICE_LIST); + + ListView_SetImageList(hwndDevList, + pHotplugData->ImageListData.ImageList, + LVSIL_SMALL); + + FillConfirmDeviceList(hwndDevList, pHotplugData); + + return TRUE; + } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + SafeRemoveDevice(GetDeviceInstForRemoval(pHotplugData), hwndDlg); + EndDialog(hwndDlg, LOWORD(wParam)); + break; + + case IDCANCEL: + EndDialog(hwndDlg, LOWORD(wParam)); + break; + } + + break; + } + + case WM_DESTROY: + SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)NULL); + break; + } + + return FALSE; +} diff --git a/dll/cpl/hotplug/enum.c b/dll/cpl/hotplug/enum.c index 26e25e660b8..698e94b0cb3 100644 --- a/dll/cpl/hotplug/enum.c +++ b/dll/cpl/hotplug/enum.c @@ -1,7 +1,284 @@ /* * PROJECT: Safely Remove Hardware Applet - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/hotplug/enum.c - * PURPOSE: device enumeration - * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Device enumeration + * COPYRIGHT: Copyright 2013 Johannes Anderwald <johannes.anderwald(a)reactos.org> + * Copyright 2023 Thamatip Chitpong <thamatip.chitpong(a)reactos.org> */ + +#include "hotplug.h" + +#include <initguid.h> +#include <devguid.h> + +#define MAX_DEVICE_DISPLAYNAME_LEN 256 + +static +VOID +GetDeviceDisplayInfo( + _In_ DEVINST DevInst, + _In_ PHOTPLUG_DATA pHotplugData, + _Out_writes_z_(cchDesc) LPWSTR pszDesc, + _In_ ULONG cchDesc, + _Out_ PINT pImageIndex) +{ + WCHAR szGuidString[MAX_GUID_STRING_LEN]; + GUID ClassGuid; + ULONG ulSize; + CONFIGRET cr; + + /* Get the device description */ + ulSize = cchDesc * sizeof(WCHAR); + cr = CM_Get_DevNode_Registry_PropertyW(DevInst, + CM_DRP_FRIENDLYNAME, + NULL, + pszDesc, + &ulSize, + 0); + if (cr != CR_SUCCESS) + { + ulSize = cchDesc * sizeof(WCHAR); + cr = CM_Get_DevNode_Registry_PropertyW(DevInst, + CM_DRP_DEVICEDESC, + NULL, + pszDesc, + &ulSize, + 0); + if (cr != CR_SUCCESS) + LoadStringW(hApplet, IDS_UNKNOWN_DEVICE, pszDesc, cchDesc); + } + + /* Get the class GUID */ + ulSize = sizeof(szGuidString); + cr = CM_Get_DevNode_Registry_PropertyW(DevInst, + CM_DRP_CLASSGUID, + NULL, + szGuidString, + &ulSize, + 0); + if (cr == CR_SUCCESS) + { + pSetupGuidFromString(szGuidString, &ClassGuid); + } + else + { + ClassGuid = GUID_DEVCLASS_UNKNOWN; + } + + /* Get the image for the class this device is in */ + SetupDiGetClassImageIndex(&pHotplugData->ImageListData, + &ClassGuid, + pImageIndex); +} + +static +HTREEITEM +InsertDeviceTreeItem( + _In_ HTREEITEM hParent, + _In_ DEVINST DevInst, + _In_ PHOTPLUG_DATA pHotplugData) +{ + WCHAR szDisplayName[MAX_DEVICE_DISPLAYNAME_LEN]; + INT nClassImage; + TVINSERTSTRUCTW tvItem; + + GetDeviceDisplayInfo(DevInst, + pHotplugData, + szDisplayName, + ARRAYSIZE(szDisplayName), + &nClassImage); + + ZeroMemory(&tvItem, sizeof(tvItem)); + tvItem.hParent = hParent; + tvItem.hInsertAfter = TVI_LAST; + + tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + tvItem.item.state = TVIS_EXPANDED; + tvItem.item.stateMask = TVIS_EXPANDED; + tvItem.item.pszText = szDisplayName; + tvItem.item.iImage = nClassImage; + tvItem.item.iSelectedImage = nClassImage; + tvItem.item.lParam = (LPARAM)DevInst; + + return TreeView_InsertItem(pHotplugData->hwndDeviceTree, &tvItem); +} + +static +VOID +DevTreeRecursiveInsertSubDevices( + _In_ HTREEITEM hParentItem, + _In_ DEVINST ParentDevInst, + _In_ PHOTPLUG_DATA pHotplugData) +{ + HTREEITEM hTreeItem; + DEVINST ChildDevInst; + CONFIGRET cr; + + cr = CM_Get_Child(&ChildDevInst, ParentDevInst, 0); + if (cr != CR_SUCCESS) + return; + + hTreeItem = InsertDeviceTreeItem(hParentItem, + ChildDevInst, + pHotplugData); + if (hTreeItem != NULL) + { + DevTreeRecursiveInsertSubDevices(hTreeItem, + ChildDevInst, + pHotplugData); + } + + for (;;) + { + cr = CM_Get_Sibling(&ChildDevInst, ChildDevInst, 0); + if (cr != CR_SUCCESS) + return; + + hTreeItem = InsertDeviceTreeItem(hParentItem, + ChildDevInst, + pHotplugData); + if (hTreeItem != NULL) + { + DevTreeRecursiveInsertSubDevices(hTreeItem, + ChildDevInst, + pHotplugData); + } + } +} + +VOID +EnumHotpluggedDevices( + _In_ PHOTPLUG_DATA pHotplugData) +{ + SP_DEVINFO_DATA did = { 0 }; + HDEVINFO hdev; + int idev; + DWORD dwCapabilities, dwSize; + ULONG ulStatus, ulProblem; + HTREEITEM hTreeItem; + CONFIGRET cr; + + TreeView_DeleteAllItems(pHotplugData->hwndDeviceTree); + + hdev = SetupDiGetClassDevs(NULL, NULL, 0, DIGCF_ALLCLASSES | DIGCF_PRESENT); + if (hdev == INVALID_HANDLE_VALUE) + return; + + did.cbSize = sizeof(did); + + /* Enumerate all the attached devices */ + for (idev = 0; SetupDiEnumDeviceInfo(hdev, idev, &did); idev++) + { + ulStatus = 0; + ulProblem = 0; + + cr = CM_Get_DevNode_Status(&ulStatus, + &ulProblem, + did.DevInst, + 0); + if (cr != CR_SUCCESS) + continue; + + dwCapabilities = 0, + dwSize = sizeof(dwCapabilities); + cr = CM_Get_DevNode_Registry_Property(did.DevInst, + CM_DRP_CAPABILITIES, + NULL, + &dwCapabilities, + &dwSize, + 0); + if (cr != CR_SUCCESS) + continue; + + /* Add devices that require safe removal to the device tree */ + if ( (dwCapabilities & CM_DEVCAP_REMOVABLE) && + !(dwCapabilities & CM_DEVCAP_DOCKDEVICE) && + !(dwCapabilities & CM_DEVCAP_SURPRISEREMOVALOK) && + ((dwCapabilities & CM_DEVCAP_EJECTSUPPORTED) || (ulStatus & DN_DISABLEABLE)) && + ulProblem == 0) + { + hTreeItem = InsertDeviceTreeItem(TVI_ROOT, + did.DevInst, + pHotplugData); + + if ((hTreeItem != NULL) && (pHotplugData->dwFlags & HOTPLUG_DISPLAY_DEVICE_COMPONENTS)) + { + DevTreeRecursiveInsertSubDevices(hTreeItem, + did.DevInst, + pHotplugData); + } + } + } + + SetupDiDestroyDeviceInfoList(hdev); +} + +static +VOID +InsertConfirmDeviceListItem( + _In_ HWND hwndCfmDeviceList, + _In_ DEVINST DevInst, + _In_ PHOTPLUG_DATA pHotplugData) +{ + WCHAR szDisplayName[MAX_DEVICE_DISPLAYNAME_LEN]; + INT nClassImage; + LVITEMW lvItem; + + GetDeviceDisplayInfo(DevInst, + pHotplugData, + szDisplayName, + ARRAYSIZE(szDisplayName), + &nClassImage); + + ZeroMemory(&lvItem, sizeof(lvItem)); + lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; + lvItem.iItem = ListView_GetItemCount(hwndCfmDeviceList); + lvItem.pszText = szDisplayName; + lvItem.iImage = nClassImage; + lvItem.lParam = (LPARAM)DevInst; + + ListView_InsertItem(hwndCfmDeviceList, &lvItem); +} + +static +VOID +CfmListRecursiveInsertSubDevices( + _In_ HWND hwndCfmDeviceList, + _In_ DEVINST ParentDevInst, + _In_ PHOTPLUG_DATA pHotplugData) +{ + DEVINST ChildDevInst; + CONFIGRET cr; + + cr = CM_Get_Child(&ChildDevInst, ParentDevInst, 0); + if (cr != CR_SUCCESS) + return; + + InsertConfirmDeviceListItem(hwndCfmDeviceList, ChildDevInst, pHotplugData); + CfmListRecursiveInsertSubDevices(hwndCfmDeviceList, ChildDevInst, pHotplugData); + + for (;;) + { + cr = CM_Get_Sibling(&ChildDevInst, ChildDevInst, 0); + if (cr != CR_SUCCESS) + return; + + InsertConfirmDeviceListItem(hwndCfmDeviceList, ChildDevInst, pHotplugData); + CfmListRecursiveInsertSubDevices(hwndCfmDeviceList, ChildDevInst, pHotplugData); + } +} + +VOID +CfmListEnumDevices( + _In_ HWND hwndCfmDeviceList, + _In_ PHOTPLUG_DATA pHotplugData) +{ + DEVINST DevInst; + + DevInst = GetDeviceInstForRemoval(pHotplugData); + if (DevInst != 0) + { + InsertConfirmDeviceListItem(hwndCfmDeviceList, DevInst, pHotplugData); + CfmListRecursiveInsertSubDevices(hwndCfmDeviceList, DevInst, pHotplugData); + } +} diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index 15dea9c7583..1c50fc62fb1 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -8,23 +8,9 @@ #include "hotplug.h" -#include <initguid.h> -#include <devguid.h> - #define NDEBUG #include <debug.h> - -typedef struct _HOTPLUG_DATA -{ - HICON hIcon; - HICON hIconSm; - SP_CLASSIMAGELIST_DATA ImageListData; - HMENU hPopupMenu; - DWORD dwFlags; -} HOTPLUG_DATA, *PHOTPLUG_DATA; - - // globals HINSTANCE hApplet = 0; @@ -102,215 +88,22 @@ done: return dwError; } - -static -HTREEITEM -InsertDeviceTreeItem( - _In_ HWND hwndDeviceTree, - _In_ HTREEITEM hParent, - _In_ DWORD DevInst, - _In_ PHOTPLUG_DATA pHotplugData) -{ - WCHAR szDisplayName[40]; - WCHAR szGuidString[MAX_GUID_STRING_LEN]; - TVINSERTSTRUCTW tvItem; - GUID ClassGuid; - INT nClassImage; - DWORD dwSize; - CONFIGRET cr; - - /* Get the device description */ - dwSize = sizeof(szDisplayName); - cr = CM_Get_DevNode_Registry_Property(DevInst, - CM_DRP_DEVICEDESC, - NULL, - szDisplayName, - &dwSize, - 0); - if (cr != CR_SUCCESS) - wcscpy(szDisplayName, L"Unknown Device"); - - /* Get the class GUID */ - dwSize = sizeof(szGuidString); - cr = CM_Get_DevNode_Registry_Property(DevInst, - CM_DRP_CLASSGUID, - NULL, - szGuidString, - &dwSize, - 0); - if (cr == CR_SUCCESS) - { - pSetupGuidFromString(szGuidString, &ClassGuid); - } - else - { - memcpy(&ClassGuid, &GUID_DEVCLASS_UNKNOWN, sizeof(GUID)); - } - - /* Get the image for the class this device is in */ - SetupDiGetClassImageIndex(&pHotplugData->ImageListData, - &ClassGuid, - &nClassImage); - - /* Add it to the device tree */ - ZeroMemory(&tvItem, sizeof(tvItem)); - tvItem.hParent = hParent; - tvItem.hInsertAfter = TVI_LAST; - - tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; - tvItem.item.state = TVIS_EXPANDED; - tvItem.item.stateMask = TVIS_EXPANDED; - tvItem.item.pszText = szDisplayName; - tvItem.item.iImage = nClassImage; - tvItem.item.iSelectedImage = nClassImage; - tvItem.item.lParam = (LPARAM)DevInst; - - return TreeView_InsertItem(hwndDeviceTree, &tvItem); -} - - static VOID -RecursiveInsertSubDevices( - _In_ HWND hwndDeviceTree, - _In_ HTREEITEM hParentItem, - _In_ DWORD ParentDevInst, - _In_ PHOTPLUG_DATA pHotplugData) +UpdateDialog( + _In_ HWND hwndDlg) { - HTREEITEM hTreeItem; - DEVINST ChildDevInst; - CONFIGRET cr; - - DPRINT("RecursiveInsertSubDevices()\n"); + HWND hwndDeviceTree; + BOOL bHasItem; - cr = CM_Get_Child(&ChildDevInst, ParentDevInst, 0); - if (cr != CR_SUCCESS) - { - DPRINT("No child! %lu\n", cr); - return; - } + hwndDeviceTree = GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE); - hTreeItem = InsertDeviceTreeItem(hwndDeviceTree, - hParentItem, - ChildDevInst, - pHotplugData); - if (hTreeItem != NULL) - { - RecursiveInsertSubDevices(hwndDeviceTree, - hTreeItem, - ChildDevInst, - pHotplugData); - } + bHasItem = (TreeView_GetCount(hwndDeviceTree) != 0); + if (bHasItem) + TreeView_SelectItem(hwndDeviceTree, TreeView_GetFirstVisible(hwndDeviceTree)); - for (;;) - { - cr = CM_Get_Sibling(&ChildDevInst, ChildDevInst, 0); - if (cr != CR_SUCCESS) - { - DPRINT("No sibling! %lu\n", cr); - return; - } - - hTreeItem = InsertDeviceTreeItem(hwndDeviceTree, - hParentItem, - ChildDevInst, - pHotplugData); - if (hTreeItem != NULL) - { - RecursiveInsertSubDevices(hwndDeviceTree, - hTreeItem, - ChildDevInst, - pHotplugData); - } - } -} - - -static -VOID -EnumHotpluggedDevices( - HWND hwndDeviceTree, - PHOTPLUG_DATA pHotplugData) -{ - SP_DEVINFO_DATA did = { 0 }; - HDEVINFO hdev; - int idev; - DWORD dwCapabilities, dwSize; - ULONG ulStatus, ulProblem; - HTREEITEM hTreeItem; - CONFIGRET cr; - - DPRINT1("EnumHotpluggedDevices()\n"); - - TreeView_DeleteAllItems(hwndDeviceTree); - - hdev = SetupDiGetClassDevs(NULL, NULL, 0, DIGCF_ALLCLASSES | DIGCF_PRESENT); - if (hdev == INVALID_HANDLE_VALUE) - return; - - did.cbSize = sizeof(did); - - /* Enumerate all the attached devices */ - for (idev = 0; SetupDiEnumDeviceInfo(hdev, idev, &did); idev++) - { - ulStatus = 0; - ulProblem = 0; - - cr = CM_Get_DevNode_Status(&ulStatus, - &ulProblem, - did.DevInst, - 0); - if (cr != CR_SUCCESS) - continue; - - dwCapabilities = 0, - dwSize = sizeof(dwCapabilities); - cr = CM_Get_DevNode_Registry_Property(did.DevInst, - CM_DRP_CAPABILITIES, - NULL, - &dwCapabilities, - &dwSize, - 0); - if (cr != CR_SUCCESS) - continue; - - /* Add devices that require safe removal to the device tree */ - if ( (dwCapabilities & CM_DEVCAP_REMOVABLE) && - !(dwCapabilities & CM_DEVCAP_DOCKDEVICE) && - !(dwCapabilities & CM_DEVCAP_SURPRISEREMOVALOK) && - ((dwCapabilities & CM_DEVCAP_EJECTSUPPORTED) || (ulStatus & DN_DISABLEABLE)) && - ulProblem == 0) - { - hTreeItem = InsertDeviceTreeItem(hwndDeviceTree, - TVI_ROOT, - did.DevInst, - pHotplugData); - - if ((hTreeItem != NULL) && (pHotplugData->dwFlags & HOTPLUG_DISPLAY_DEVICE_COMPONENTS)) - { - RecursiveInsertSubDevices(hwndDeviceTree, - hTreeItem, - did.DevInst, - pHotplugData); - } - } - } - - SetupDiDestroyDeviceInfoList(hdev); -} - - -static -VOID -UpdateButtons( - HWND hwndDlg) -{ - BOOL bEnabled; - - bEnabled = (TreeView_GetCount(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE)) != 0); - - EnableWindow(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_PROPERTIES), bEnabled); - EnableWindow(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_STOP), bEnabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_PROPERTIES), bHasItem); + EnableWindow(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_STOP), bHasItem); } @@ -347,12 +140,12 @@ ShowContextMenu( static DEVINST GetSelectedDeviceInst( - _In_ HWND hwndDeviceTree) + _In_ PHOTPLUG_DATA pHotplugData) { HTREEITEM hTreeItem; TVITEMW item; - hTreeItem = TreeView_GetSelection(hwndDeviceTree); + hTreeItem = TreeView_GetSelection(pHotplugData->hwndDeviceTree); if (hTreeItem == NULL) return 0; @@ -360,7 +153,7 @@ GetSelectedDeviceInst( item.mask = TVIF_PARAM; item.hItem = hTreeItem; - TreeView_GetItem(hwndDeviceTree, &item); + TreeView_GetItem(pHotplugData->hwndDeviceTree, &item); return item.lParam; } @@ -456,19 +249,18 @@ SafeRemovalDlgProc( SetupDiGetClassImageList(&pHotplugData->ImageListData); pHotplugData->hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDM_POPUP_DEVICE_TREE)); - + pHotplugData->hwndDeviceTree = GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE); pHotplugData->dwFlags = GetHotPlugFlags(); if (pHotplugData->dwFlags & HOTPLUG_DISPLAY_DEVICE_COMPONENTS) Button_SetCheck(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DISPLAY_COMPONENTS), BST_CHECKED); - TreeView_SetImageList(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE), + TreeView_SetImageList(pHotplugData->hwndDeviceTree, pHotplugData->ImageListData.ImageList, TVSIL_NORMAL); - EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE), - pHotplugData); - UpdateButtons(hwndDlg); + EnumHotpluggedDevices(pHotplugData); + UpdateDialog(hwndDlg); } return TRUE; @@ -492,17 +284,29 @@ SafeRemovalDlgProc( SetHotPlugFlags(pHotplugData->dwFlags); - EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE), - pHotplugData); + EnumHotpluggedDevices(pHotplugData); + UpdateDialog(hwndDlg); } } break; case IDC_SAFE_REMOVE_PROPERTIES: case IDM_PROPERTIES: + ShowDeviceProperties(hwndDlg, GetSelectedDeviceInst(pHotplugData)); + break; + + case IDC_SAFE_REMOVE_STOP: + case IDM_STOP: { - HWND hwndDevTree = GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE); - ShowDeviceProperties(hwndDlg, GetSelectedDeviceInst(hwndDevTree)); + if (pHotplugData != NULL) + { + DialogBoxParamW(hApplet, + MAKEINTRESOURCEW(IDD_CONFIRM_STOP_HARDWARE_DIALOG), + hwndDlg, + ConfirmRemovalDlgProc, + (LPARAM)pHotplugData); + } + break; } } @@ -524,9 +328,8 @@ SafeRemovalDlgProc( if (pHotplugData != NULL) { - EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE), - pHotplugData); - UpdateButtons(hwndDlg); + EnumHotpluggedDevices(pHotplugData); + UpdateDialog(hwndDlg); } } break; diff --git a/dll/cpl/hotplug/hotplug.h b/dll/cpl/hotplug/hotplug.h index 8e11875c613..1f61a2fb894 100644 --- a/dll/cpl/hotplug/hotplug.h +++ b/dll/cpl/hotplug/hotplug.h @@ -38,7 +38,38 @@ typedef struct APPLET_PROC AppletProc; }APPLET, *PAPPLET; +typedef struct _HOTPLUG_DATA +{ + HICON hIcon; + HICON hIconSm; + SP_CLASSIMAGELIST_DATA ImageListData; + HMENU hPopupMenu; + HWND hwndDeviceTree; + DWORD dwFlags; +} HOTPLUG_DATA, *PHOTPLUG_DATA; + +// eject.c +DEVINST +GetDeviceInstForRemoval( + _In_ PHOTPLUG_DATA pHotplugData); + +INT_PTR +CALLBACK +ConfirmRemovalDlgProc( + _In_ HWND hwndDlg, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam); + +// enum.c +VOID +EnumHotpluggedDevices( + _In_ PHOTPLUG_DATA pHotplugData); +VOID +CfmListEnumDevices( + _In_ HWND hwndCfmDeviceList, + _In_ PHOTPLUG_DATA pHotplugData); // hotplug.c LONG diff --git a/dll/cpl/hotplug/lang/de-DE.rc b/dll/cpl/hotplug/lang/de-DE.rc index 32ae783b3d4..bc70584c158 100644 --- a/dll/cpl/hotplug/lang/de-DE.rc +++ b/dll/cpl/hotplug/lang/de-DE.rc @@ -17,6 +17,18 @@ BEGIN PUSHBUTTON "&Schließen", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -36,4 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Hardware sicher entfernen" IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/en-US.rc b/dll/cpl/hotplug/lang/en-US.rc index f0728860bba..20acd4ecb5c 100644 --- a/dll/cpl/hotplug/lang/en-US.rc +++ b/dll/cpl/hotplug/lang/en-US.rc @@ -17,6 +17,18 @@ BEGIN PUSHBUTTON "&Close", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -36,4 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Safely Remove Hardware" IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/es-ES.rc b/dll/cpl/hotplug/lang/es-ES.rc index 47165e847b7..512a0ae4850 100644 --- a/dll/cpl/hotplug/lang/es-ES.rc +++ b/dll/cpl/hotplug/lang/es-ES.rc @@ -17,6 +17,18 @@ BEGIN PUSHBUTTON "&Cerrar", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -36,4 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Retirar hardware con seguridad" IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/fr-FR.rc b/dll/cpl/hotplug/lang/fr-FR.rc index 36577034316..c7f9e2ab7c7 100644 --- a/dll/cpl/hotplug/lang/fr-FR.rc +++ b/dll/cpl/hotplug/lang/fr-FR.rc @@ -24,6 +24,18 @@ BEGIN PUSHBUTTON "&Fermer", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -43,4 +55,6 @@ 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é." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/id-ID.rc b/dll/cpl/hotplug/lang/id-ID.rc index 29f9c5994fe..45c2963177c 100644 --- a/dll/cpl/hotplug/lang/id-ID.rc +++ b/dll/cpl/hotplug/lang/id-ID.rc @@ -17,6 +17,18 @@ BEGIN PUSHBUTTON "&Tutup", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -36,4 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Hapus perangkat keras dengan aman" IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/ja-JP.rc b/dll/cpl/hotplug/lang/ja-JP.rc index c2a9c356d50..0940057bd35 100644 --- a/dll/cpl/hotplug/lang/ja-JP.rc +++ b/dll/cpl/hotplug/lang/ja-JP.rc @@ -17,6 +17,18 @@ BEGIN PUSHBUTTON "閉じる(&C)", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -36,4 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "安全なハードウェアの取り外し" IDS_CPLDESCRIPTION "コンピュータからデバイスを安全に取り外しできます。" + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/pl-PL.rc b/dll/cpl/hotplug/lang/pl-PL.rc index 2c13620fd6f..cf7af16f8ea 100644 --- a/dll/cpl/hotplug/lang/pl-PL.rc +++ b/dll/cpl/hotplug/lang/pl-PL.rc @@ -17,6 +17,18 @@ BEGIN PUSHBUTTON "Za&mknij", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -36,4 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Bezpieczne usuwanie sprzętu" IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/pt-PT.rc b/dll/cpl/hotplug/lang/pt-PT.rc index ae7db1f835e..8e1ed9d4a18 100644 --- a/dll/cpl/hotplug/lang/pt-PT.rc +++ b/dll/cpl/hotplug/lang/pt-PT.rc @@ -17,6 +17,18 @@ BEGIN PUSHBUTTON "&Fechar", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -36,4 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Remover Hardware com segurança" IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/ro-RO.rc b/dll/cpl/hotplug/lang/ro-RO.rc index 5c0df0fbdf3..d0e9dd9c5c2 100644 --- a/dll/cpl/hotplug/lang/ro-RO.rc +++ b/dll/cpl/hotplug/lang/ro-RO.rc @@ -24,6 +24,18 @@ BEGIN PUSHBUTTON "Î&nchidere", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -43,4 +55,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Eliminare în siguranță a dispozitivul fizic" IDS_CPLDESCRIPTION "Deconectare sau scoatere în siguranță a dispozitivelor din calculator." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/ru-RU.rc b/dll/cpl/hotplug/lang/ru-RU.rc index 953fb4230d4..688ee84c6f6 100644 --- a/dll/cpl/hotplug/lang/ru-RU.rc +++ b/dll/cpl/hotplug/lang/ru-RU.rc @@ -17,6 +17,18 @@ BEGIN PUSHBUTTON "&Закрыть", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -36,4 +48,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Безопасное извлечение устройств" IDS_CPLDESCRIPTION "Безопасно отключайте или извлекайте устройства из вашего компьютера." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/tr-TR.rc b/dll/cpl/hotplug/lang/tr-TR.rc index a77aa3d16c2..7ffed72f7e0 100644 --- a/dll/cpl/hotplug/lang/tr-TR.rc +++ b/dll/cpl/hotplug/lang/tr-TR.rc @@ -19,6 +19,18 @@ BEGIN PUSHBUTTON "&Kapat", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -38,4 +50,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Donanımı Güvenli Kaldır" IDS_CPLDESCRIPTION "Aygıtları bilgisayarınızdan güvenle çıkarın veya çıkarın." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/zh-CN.rc b/dll/cpl/hotplug/lang/zh-CN.rc index 53c3eacb3bc..9ca1e3e351e 100644 --- a/dll/cpl/hotplug/lang/zh-CN.rc +++ b/dll/cpl/hotplug/lang/zh-CN.rc @@ -24,6 +24,18 @@ BEGIN PUSHBUTTON "关闭(&C)", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + IDM_POPUP_DEVICE_TREE MENU BEGIN POPUP "" @@ -37,4 +49,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "安全地移除硬件" IDS_CPLDESCRIPTION "从您的计算机安全地拔出或弹出设备。" + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/zh-HK.rc b/dll/cpl/hotplug/lang/zh-HK.rc index f004ed02c18..75399afc4ab 100644 --- a/dll/cpl/hotplug/lang/zh-HK.rc +++ b/dll/cpl/hotplug/lang/zh-HK.rc @@ -24,6 +24,18 @@ BEGIN PUSHBUTTON "關閉(&C)", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -43,4 +55,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "安全地移除硬件" IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/lang/zh-TW.rc b/dll/cpl/hotplug/lang/zh-TW.rc index afbdbf4b4d6..dd49a385693 100644 --- a/dll/cpl/hotplug/lang/zh-TW.rc +++ b/dll/cpl/hotplug/lang/zh-TW.rc @@ -24,6 +24,18 @@ BEGIN PUSHBUTTON "關閉(&C)", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_CONFIRM_STOP_HARDWARE_DIALOG DIALOGEX 32, 10, 256, 148 +CAPTION "Stop a Hardware Device" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Confirm devices to be stopped, choose OK to continue.", IDC_STATIC, 7, 8, 241, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ReactOS will attempt to stop the following devices. After the devices are stopped they may be removed safely.", IDC_STATIC, 7, 22, 240, 18, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_CONFIRM_STOP_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 8, 45, 240, 78 + DEFPUSHBUTTON "OK", IDOK, 144, 127, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 198, 127, 50, 14 +END + /* Menus */ @@ -43,4 +55,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "安全地移除硬體" IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_UNKNOWN_DEVICE "Unknown Device" + IDS_EJECT_ERROR_FORMAT "Failed to remove device (0x%x)\0" END diff --git a/dll/cpl/hotplug/resource.h b/dll/cpl/hotplug/resource.h index af8d359670d..7206d24bab5 100644 --- a/dll/cpl/hotplug/resource.h +++ b/dll/cpl/hotplug/resource.h @@ -15,6 +15,7 @@ #define IDC_SAFE_REMOVE_DISPLAY_COMPONENTS 306 #define IDD_CONFIRM_STOP_HARDWARE_DIALOG 310 +#define IDC_CONFIRM_STOP_DEVICE_LIST 311 /* Menu IDs */ #define IDM_POPUP_DEVICE_TREE 500 @@ -22,6 +23,7 @@ #define IDM_PROPERTIES 502 /* Resource strings IDs */ -#define IDS_CPLNAME 1000 -#define IDS_CPLDESCRIPTION 1001 - +#define IDS_CPLNAME 1000 +#define IDS_CPLDESCRIPTION 1001 +#define IDS_UNKNOWN_DEVICE 1002 +#define IDS_EJECT_ERROR_FORMAT 1003

1 year, 2 months

[reactos] 01/01: [MSPAINT] Fix filter string UNICODE_NULL problem

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b69a7460db5a8e71cdf9d… commit b69a7460db5a8e71cdf9d49565ea2910088bffac Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 19:47:58 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 4 19:50:36 2023 +0900 [MSPAINT] Fix filter string UNICODE_NULL problem Follow-up to #5882. Some ATL CString do not append the string if there is a UNICODE_NULL in the middle. CORE-19094 --- base/applications/mspaint/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index b98f8ee841b..470c4fd4348 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -209,7 +209,8 @@ BOOL CMainWindow::GetOpenFileName(IN OUT LPWSTR pszFile, INT cchMaxFile) // Get the import filter CSimpleArray<GUID> aguidFileTypesI; CImage::GetImporterFilterString(strFilter, aguidFileTypesI, strAllPictureFiles, - CImage::excludeDefaultLoad, UNICODE_NULL); + CImage::excludeDefaultLoad, L'|'); + strFilter.Replace(L'|', UNICODE_NULL); // Initializing the OPENFILENAME structure for GetOpenFileName ZeroMemory(&ofn, sizeof(ofn)); @@ -236,7 +237,8 @@ BOOL CMainWindow::GetSaveFileName(IN OUT LPWSTR pszFile, INT cchMaxFile) // Get the export filter CSimpleArray<GUID> aguidFileTypesE; CImage::GetExporterFilterString(strFilter, aguidFileTypesE, NULL, - CImage::excludeDefaultSave, UNICODE_NULL); + CImage::excludeDefaultSave, L'|'); + strFilter.Replace(L'|', UNICODE_NULL); // Initializing the OPENFILENAME structure for GetSaveFileName ZeroMemory(&sfn, sizeof(sfn));

1 year, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs