CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-23 21:01:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5606 from RaiKoHoff/Dev_Master

Browse Source 
chg: crtl+c / rmb-copy for line (empty selection) and hyperlinks
This commit is contained in:
Rainer Kottenhoff 2026-03-23 10:44:26 +01:00 committed by GitHub
commit 60cac64a4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
38 changed files with 74 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grepWinNP3/sktoolslib_mod/BrowseFolder.cpp
View File

@ -211,7 +211,7 @@ CBrowseFolder::RetVal CBrowseFolder::Show(HWND parent, std::wstring& path, const
{
using SHCIFPN = HRESULT(WINAPI*)(PCWSTR pszPath, IBindCtx * pbc, REFIID riid, void** ppv);
HMODULE hLib = LoadLibrary(L"shell32.dll");
HMODULE hLib = LoadLibraryExW(L"shell32.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
if (hLib)
{
SHCIFPN pShcifpn = reinterpret_cast<SHCIFPN>(GetProcAddress(hLib, "SHCreateItemFromParsingName"));

2
grepWinNP3/sktoolslib_mod/DarkModeHelper.cpp
View File

@ -148,7 +148,7 @@ DarkModeHelper::DarkModeHelper()
}
}
if (dllPath.empty())
m_hUxthemeLib = LoadLibrary(L"uxtheme.dll");
m_hUxthemeLib = LoadLibraryExW(L"uxtheme.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
else
m_hUxthemeLib = LoadLibrary(dllPath.c_str());
if (m_hUxthemeLib && m_bCanHaveDarkMode)

2
grepWinNP3/sktoolslib_mod/InfoRtfDialog.cpp
View File

@ -30,7 +30,7 @@ CInfoRtfDialog::CInfoRtfDialog()
, m_rtfId(0)
, m_iconId(0)
{
m_richEditLib = LoadLibrary(TEXT("Msftedit.dll"));
m_richEditLib = LoadLibraryExW(L"Msftedit.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
}
CInfoRtfDialog::~CInfoRtfDialog()

2
grepWinNP3/src/grepWin.cpp
View File

@ -240,7 +240,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
g_hDlgIcon128 = nullptr;
LoadIconWithScaleDown(hInstance, MAKEINTRESOURCE(IDI_GREPWIN), 128, 128, &g_hDlgIcon128);
HMODULE hRichEdt = LoadLibrary(L"Riched20.dll");
HMODULE hRichEdt = LoadLibraryExW(L"Riched20.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
CCmdLineParser parser(lpCmdLine);

1
language/common_res.h
View File

@ -556,6 +556,7 @@
#define CMD_ENTER_RETURN 20062
#define CMD_PARAGRAPH_UP 20063
#define CMD_PARAGRAPH_DOWN 20064
#define CMD_COPY_HYPERLINK 20065
#define IDS_MUI_MENU_LANGUAGE 34500
#define IDS_MUI_LANG_EN_US 34501

1
language/np3_af_za/menu_af_za.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Maak Skakel Oop", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Undo", IDM_EDIT_UNDO
MENUITEM "Redo", IDM_EDIT_REDO

1
language/np3_be_by/menu_be_by.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Адкрыць гіперспасылку", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Адмена", IDM_EDIT_UNDO
MENUITEM "Паўтор", IDM_EDIT_REDO

1
language/np3_de_de/menu_de_de.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Öffne Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Rückgängig", IDM_EDIT_UNDO
MENUITEM "Wiederholen", IDM_EDIT_REDO

1
language/np3_el_gr/menu_el_gr.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Άνοιγμα υπερσύνδεσης", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Αναίρεση", IDM_EDIT_UNDO
MENUITEM "Επανάληψη ενέργειας", IDM_EDIT_REDO

1
language/np3_en_gb/menu_en_gb.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Open Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Undo", IDM_EDIT_UNDO
MENUITEM "Redo", IDM_EDIT_REDO

1
language/np3_en_us/menu_en_us.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Open Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Undo", IDM_EDIT_UNDO
MENUITEM "Redo", IDM_EDIT_REDO

1
language/np3_es_es/menu_es_es.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Abrir Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Deshacer", IDM_EDIT_UNDO
MENUITEM "Rehacer", IDM_EDIT_REDO

1
language/np3_fi_fi/menu_fi_fi.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Avaa Hyperlinkki", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Kumoa", IDM_EDIT_UNDO
MENUITEM "Tee uudelleen", IDM_EDIT_REDO

1
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Ouvrir l'hyperlien", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Défaire", IDM_EDIT_UNDO
MENUITEM "Refaire", IDM_EDIT_REDO

1
language/np3_hi_in/menu_hi_in.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "हाईपरलिंक खोलें", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "पूर्ववत करें", IDM_EDIT_UNDO
MENUITEM "फिर से करें", IDM_EDIT_REDO

1
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Hiperhivatkozás megnyitása", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Visszavonás", IDM_EDIT_UNDO
MENUITEM "Újra", IDM_EDIT_REDO

1
language/np3_id_id/menu_id_id.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Buka Tautan", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Urungkan", IDM_EDIT_UNDO
MENUITEM "Kembalikan", IDM_EDIT_REDO

1
language/np3_it_it/menu_it_it.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Apri hyperlink", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Annulla", IDM_EDIT_UNDO
MENUITEM "Ripristina", IDM_EDIT_REDO

1
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "リンクを開く", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "元に戻す", IDM_EDIT_UNDO
MENUITEM "やり直し", IDM_EDIT_REDO

1
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "하이퍼링크 열기", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "실행 취소", IDM_EDIT_UNDO
MENUITEM "다시 실행", IDM_EDIT_REDO

1
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Hyperlink openen", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Ongedaan maken", IDM_EDIT_UNDO
MENUITEM "Opnieuw uitvoeren", IDM_EDIT_REDO

1
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Otwórz łącze", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Cofnij", IDM_EDIT_UNDO
MENUITEM "Do przodu", IDM_EDIT_REDO

1
language/np3_pt_br/menu_pt_br.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Abrir Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Desfazer", IDM_EDIT_UNDO
MENUITEM "Refazer", IDM_EDIT_REDO

1
language/np3_pt_pt/menu_pt_pt.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Abrir hiperligação", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Anular", IDM_EDIT_UNDO
MENUITEM "Refazer", IDM_EDIT_REDO

1
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Открыть гиперссылку", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Отмена", IDM_EDIT_UNDO
MENUITEM "Повтор", IDM_EDIT_REDO

1
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Otvoriť Hyperlink", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Späť", IDM_EDIT_UNDO
MENUITEM "Znova", IDM_EDIT_REDO

1
language/np3_sv_se/menu_sv_se.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Öppna hyperlänk", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Ångra", IDM_EDIT_UNDO
MENUITEM "Gör om", IDM_EDIT_REDO

1
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Bağlantıyı aç", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Geri al", IDM_EDIT_UNDO
MENUITEM "Yinele", IDM_EDIT_REDO

1
language/np3_vi_vn/menu_vi_vn.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Mở liên kết", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "Hoàn tác", IDM_EDIT_UNDO
MENUITEM "Làm lại", IDM_EDIT_REDO

1
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "打开超链接", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "撤销", IDM_EDIT_UNDO
MENUITEM "重做", IDM_EDIT_REDO

1
language/np3_zh_tw/menu_zh_tw.rc
View File

@ -560,6 +560,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "打開超連結", CMD_OPEN_HYPERLINK
MENUITEM "Copy Hyperlink URL", CMD_COPY_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "復原", IDM_EDIT_UNDO
MENUITEM "取消復原", IDM_EDIT_REDO

18
minipath/minipath.vcxproj
View File

@ -210,7 +210,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@ -277,7 +277,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@ -347,7 +347,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@ -388,7 +388,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Link>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@ -432,7 +432,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<Link>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@ -479,7 +479,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Link>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@ -531,7 +531,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_AVX2|x64'">
<Link>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@ -586,7 +586,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<Link>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@ -640,7 +640,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_AVX2|ARM64'">
<Link>
<AdditionalDependencies>shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

4
minipath/src/minipath.c
View File

@ -37,6 +37,10 @@
#include "minipath.h"
#include "resource.h"
#pragma comment(lib, "shlwapi.lib")
#pragma comment(lib, "muiload.lib")
#pragma comment(lib, "psapi.lib")
SETTINGS_T Settings;
SETTINGS_T Defaults;

2
src/DarkMode/DarkMode.h
View File

@ -5,6 +5,8 @@
#pragma comment(lib, "NtDll.lib")
#pragma comment(lib, "Comctl32.lib")
#pragma comment(lib, "Uxtheme.lib")
#pragma comment(lib, "user32-stub.lib")
#pragma comment(lib, "uxtheme-stub.lib")
#ifdef __cplusplus
extern "C" {

10
src/Helpers.c
View File

@ -1949,11 +1949,15 @@ ptrdiff_t MultiByteToWideCharEx(
//
// UrlEscapeEx()
//
void UrlEscapeEx(LPCWSTR lpURL, LPWSTR lpEscaped, DWORD* pcchEscaped, bool bEscReserved)
{
UNREFERENCED_PARAMETER(bEscReserved);
UrlEscape(lpURL, lpEscaped, pcchEscaped, (URL_ESCAPE_SEGMENT_ONLY | URL_ESCAPE_URI_COMPONENT));
if (bEscReserved) {
// full component encoding (like encodeURIComponent) — for EditURLEncode
UrlEscape(lpURL, lpEscaped, pcchEscaped, (URL_ESCAPE_SEGMENT_ONLY | URL_ESCAPE_URI_COMPONENT));
} else {
// preserve URL structure, encode unsafe chars + non-ASCII as UTF-8, leave query/fragment as-is
UrlEscape(lpURL, lpEscaped, pcchEscaped, (URL_BROWSER_MODE | URL_ESCAPE_AS_UTF8));
}
}

12
src/Notepad3.c
View File

@ -4678,6 +4678,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
bool const bIsHLink = (SciCall_IndicatorValueAt(INDIC_NP3_HYPERLINK, iCurPos) > 0);
EnableCmd(hmenu, CMD_OPEN_HYPERLINK, !mrs && bIsHLink);
EnableCmd(hmenu, CMD_COPY_HYPERLINK, !mrs && bIsHLink);
EnableCmd(hmenu, CMD_WEBACTION1, !se && !mrs && bPosInSel && !bIsHLink);
EnableCmd(hmenu, CMD_WEBACTION2, !se && !mrs && bPosInSel && !bIsHLink);
@ -5248,8 +5249,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
s_bLastCopyFromMe = true;
}
if (SciCall_IsSelectionEmpty()) {
if (!HandleHotSpotURLClicked(SciCall_GetCurrentPos(), COPY_HYPERLINK) &&
!Settings2.NoCopyLineOnEmptySelection) {
if (!Settings2.NoCopyLineOnEmptySelection) {
if (Sci_GetNetLineLength(Sci_GetCurrentLineNumber()) > 0) {
SciCall_CopyAllowLine(); // (!) VisualStudio behavior
// On Windows, an extra "MSDEVLineSelect" marker is added to the clipboard
@ -6805,8 +6805,8 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case IDM_HELP_ABOUT: {
//~HMODULE hRichEdit = LoadLibrary(L"RICHED20.DLL"); // Use RICHEDIT_CONTROL_VER for control in common_res.h
HMODULE const hRichEdit = LoadLibrary(L"MSFTEDIT.DLL"); // Use "RichEdit50W" for control in common_res.h;
//~HMODULE hRichEdit = LoadLibraryExW(L"RICHED20.DLL", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); // Use RICHEDIT_CONTROL_VER for control in common_res.h
HMODULE const hRichEdit = LoadLibraryExW(L"MSFTEDIT.DLL", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); // Use "RichEdit50W" for control in common_res.h;
if (hRichEdit) {
ThemedDialogBox(Globals.hLngResContainer, MAKEINTRESOURCE(IDD_MUI_ABOUT), hwnd, AboutDlgProc);
FreeLibrary(hRichEdit);
@ -7398,6 +7398,10 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
HandleHotSpotURLClicked(SciCall_GetCurrentPos(), (OPEN_WITH_BROWSER | OPEN_IN_NOTEPAD3));
break;
case CMD_COPY_HYPERLINK:
HandleHotSpotURLClicked(SciCall_GetCurrentPos(), COPY_HYPERLINK);
break;
case CMD_FOLDJUMPDOWN:
EditFoldCmdKey(DOWN, SNIFF);
break;

18
src/Notepad3.vcxproj
View File

@ -267,7 +267,7 @@
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@ -341,7 +341,7 @@
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@ -416,7 +416,7 @@
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(OutputPath)obj;$(ClangAnalysisToolsPath)\..\lib\clang\16\lib\windows\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -493,7 +493,7 @@
<SDLCheck>false</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
@ -579,7 +579,7 @@
<SDLCheck>false</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
@ -664,7 +664,7 @@
<SDLCheck>false</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
@ -749,7 +749,7 @@
<SDLCheck>false</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
@ -835,7 +835,7 @@
<SDLCheck>false</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
@ -920,7 +920,7 @@
<SDLCheck>false</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>scintilla.lib;lexilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>

4
src/TypeDefs.h
View File

@ -43,6 +43,10 @@
#include <windows.h>
#include <CommCtrl.h>
#pragma comment(lib, "imm32.lib")
#pragma comment(lib, "shlwapi.lib")
#pragma comment(lib, "muiload.lib")
#define STRSAFE_NO_CB_FUNCTIONS
#define STRSAFE_NO_DEPRECATE // don't allow deprecated functions
#include <strsafe.h>