Merge branch 'rizonesoft:master' into master

This commit is contained in:
XSAkos 2026-04-15 20:44:16 +02:00 committed by GitHub
commit 8d967b984e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
32 changed files with 99 additions and 53 deletions

View File

@ -5,6 +5,7 @@
SettingsVersion=5
;AnalyzeReliableConfidenceLevel=50
;DefaultDirectoryOverride=
;ResolveToUNCPaths=false
[Settings2]
;grepWin.exe=%PORTABLEAPPS_DIR%\grepWinPortable\grepWinPortable.exe
;IMEInteraction=0

View File

@ -861,6 +861,7 @@
#define IDM_SET_MULTIPLE_SELECTION 42044
#define IDM_SET_DEFAULTDIR 42045
#define IDM_SET_DEFAULTDIR_RESET 42046
#define IDM_SET_RESOLVE_UNC_PATHS 42047
#define IDM_HELP_ABOUT 43000
#define IDM_HELP_CMD 43001

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Lêerverandering-&Kennisgewing...\tAlt+F5", IDM_SET_CHANGENOTIFY
MENUITEM "AutoSave / Backup Settings...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "&Mute Message Beeps", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "&Esc Sleutel Funksie"
BEGIN
MENUITEM "&Geen", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Паведамленне а&б змяненні файла...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Аўтазахаванне / рэзервовыя копіі...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "&Заглушыць гук паведамленняў", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "&Функцыя клавішы Esc"
BEGIN
MENUITEM "&Няма", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Nachricht bei &Dateiänderung...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Auto-Speichern / Backup Einstellungen...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Keine Nachrichten &Beeps", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Esc-&Key Funktion"
BEGIN
MENUITEM "&Keine", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Ειδοποίηση μετα&βολής αρχείου...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Αυτόματη αποθήκευση / Ρυθμίσεις εφεδρικού αντιγράφου...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Σίγαση ήχ&ων μηνύματος", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Λειτουργία πλήκτρου &Εsc"
BEGIN
MENUITEM "&Καμία", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "File &Change Notification...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "AutoSave / Backup Settings...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "&Mute Message Beeps", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "&Esc Key Function"
BEGIN
MENUITEM "&None", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "File &Change Notification...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "AutoSave / Backup Settings...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "&Mute Message Beeps", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "&Esc Key Function"
BEGIN
MENUITEM "&None", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "N&otificación de cambios en archivo...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Auto guardar / Configuración guardando...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Silenciar sonidos de aviso", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "&Función de la tecla 'Esc'"
BEGIN
MENUITEM "&Ninguna", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Tiedoston &muutosilmoitus...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Automaattitallennus / varmuuskopiointiasetukset...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "&Mykistä viestin äänimerkit", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "&Esc-toiminta"
BEGIN
MENUITEM "&Ei mitään", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Notif&ication de modification de fichier...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Auto-enregister / Paramètres de sauvegarde...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Couper les &bips de messages", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Fonction de la touche ""&Echap"""
BEGIN
MENUITEM "&Aucune", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "फ़ाइल परिवर्तन अधिसूचना (&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "AutoSave / Backup Settings...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "संदेश आवाज़ बंद करें (&M)", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "ESC कुंजी उपयोग (&E)"
BEGIN
MENUITEM "कुछ न करें (&N)", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Figyel&meztetés fájl változásáról...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Aut. mentés / Bizt. mentés beállításai...",IDM_SET_AUTOSAVE_BACKUP
MENUITEM "&Üzenethang némítása", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Esc g&omb funkciója"
BEGIN
MENUITEM "&Semmi", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "&Notifikasi Berkas Berubah...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Pengaturan Otomatis Simpan / Cadangkan ...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Bisukan Bun&yi Pesan Bip", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Fungsi Tombol &Escape"
BEGIN
MENUITEM "&Tidak Ada", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Notifica le modifi&che al file...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Impostazioni Salvataggio automatico e Backup...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Disabilita &beep messaggio", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Azione tasto '&Esc'"
BEGIN
MENUITEM "&Nessuna", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "ファイルの変更を通知(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "自動保存/バックアップの設定...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "メッセージの効果音をミュート(&M)", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Escキーの動作(&E)"
BEGIN
MENUITEM "なし(&N)", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "파일 변경 알림(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "자동 저장 / 백업 설정...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "메시지 경고음 음소거(&M)", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "ESC 키 기능(&E)"
BEGIN
MENUITEM "없음(&N)", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Melding bij bestandswijziging...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Automatisch opslaan / Back-up...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Meldingen dempen", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Functie Esc-&toets"
BEGIN
MENUITEM "&Geen", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Powiadomienie o zmianie pliku...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Ustawienia Autozapisu/ kopii zapasowej...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Wycisz sygnał dźwiękowy", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Funkcja klawisza Esc"
BEGIN
MENUITEM "Żadna", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Notificação de &Mudança de Arquivo...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Configurações de Salvar Automático / Backup...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Deixar Mudo Avisos &Sonoros de Mensagens", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Função da &Tecla Esc"
BEGIN
MENUITEM "&Nada", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Notificação de alteração df fi&cheiro...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "AutoSave / Backup Settings...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Silenciar &beeps das mensagens", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Função da tecla Esc"
BEGIN
MENUITEM "&Nenhuma", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "&Уведомление об изменении файла...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Автосохранение / резервные копии...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Заглу&шить звук уведомлений", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "&Функция клавиши Esc"
BEGIN
MENUITEM "&Нет", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "&Oznámenie o zmene súboru...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Auto-ukladanie / Nastavenie zálohovania...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "&Stlmiť hlásenie pípnutím", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "&Funkcia klávesy Esc"
BEGIN
MENUITEM "Ž&iadna", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Notifiering vid filändring...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "AutoSave / Backup Settings...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Stäng av ljud vid meddelande", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Esc-tangentens funktion"
BEGIN
MENUITEM "Ingen", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Dosyadaki değişiklikler bildirilsin...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Otomatik kayıt / Yedekleme ayarları...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "İleti &sesi kısılsın", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Esc &tuşu işlevi"
BEGIN
MENUITEM "&Yok", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "Thông báo thay đổi tệp(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "Cài đặt lưu tự động / Sao lưu...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "Tắt âm báo tin nhắn(&M)", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Chức năng phím ESC(&E)"
BEGIN
MENUITEM "Không(&N)", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "文件修改通知(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "自动保存和备份设置...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "关闭消息提示音(&M)", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Esc 键功能(&E)"
BEGIN
MENUITEM "无(&N)", IDM_SET_NOESCFUNC

View File

@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
// encoding: UTF-8
#pragma code_page(65001) // UTF-8
#include "resource.h"
@ -483,6 +483,7 @@ BEGIN
MENUITEM "檔案修改通知(&C)...\tAlt+F5", IDM_SET_CHANGENOTIFY
///MENUITEM "自動儲存和備份設定...", IDM_SET_AUTOSAVE_BACKUP
MENUITEM "關閉訊息提示音(&M)", IDM_SET_MUTE_MESSAGEBEEP
MENUITEM "Resolve to &UNC-Paths", IDM_SET_RESOLVE_UNC_PATHS
POPUP "Esc 鍵功能(&E)"
BEGIN
MENUITEM "無(&N)", IDM_SET_NOESCFUNC

View File

@ -1812,6 +1812,7 @@ void LoadSettings()
GET_BOOL_VALUE_FROM_INISECTION(PreferredLocale4DateFmt, false);
GET_BOOL_VALUE_FROM_INISECTION(SearchByClipboardIfEmpty, true);
GET_BOOL_VALUE_FROM_INISECTION(ReplaceByClipboardTag, true);
GET_BOOL_VALUE_FROM_INISECTION(ResolveToUNCPaths, false);
///~Settings2.IMEInteraction = clampi(IniSectionGetInt(IniSecSettings, L"IMEInteraction", Settings2.IMEInteraction), SC_IME_WINDOWED, SC_IME_INLINE);
@ -2259,6 +2260,7 @@ static bool _SaveSettings(bool bForceSaveSettings)
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, PreferredLocale4DateFmt);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, SearchByClipboardIfEmpty);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ReplaceByClipboardTag);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ResolveToUNCPaths);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, DarkModeHiglightContrast);
#ifdef D_NP3_WIN10_DARK_MODE

View File

@ -4458,6 +4458,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
CheckCmd(hmenu, IDS_USE_LOCALE_DATEFMT, Settings.PreferredLocale4DateFmt);
CheckCmd(hmenu, IDM_SET_MUTE_MESSAGEBEEP, Settings.MuteMessageBeep);
CheckCmd(hmenu, IDM_SET_RESOLVE_UNC_PATHS, Settings.ResolveToUNCPaths);
CheckCmd(hmenu, IDM_SET_SAVEBEFORERUNNINGTOOLS, Settings.SaveBeforeRunningTools);
//~EnableCmd(hmenu, IDM_SET_SAVEBEFORERUNNINGTOOLS, !faro);
@ -6645,6 +6646,10 @@ static bool _HandleViewAndSettingsCommands(HWND hwnd, UINT umsg, WPARAM wParam,
Settings.MuteMessageBeep = !Settings.MuteMessageBeep;
break;
case IDM_SET_RESOLVE_UNC_PATHS:
Settings.ResolveToUNCPaths = !Settings.ResolveToUNCPaths;
break;
case IDM_VIEW_SPLIT_UNDOTYPSEQ_LNBRK:
Settings.SplitUndoTypingSeqOnLnBreak = !Settings.SplitUndoTypingSeqOnLnBreak;
break;

View File

@ -2019,39 +2019,49 @@ size_t PTHAPI Path_NormalizeEx(HPATHL hpth_in_out, const HPATHL hpth_wrkdir, boo
}
if (bRealPath) {
// get real path name (based on version developed by zufuliu)
LPCWSTR const path_io = PathGet(hpth_in_out);
HANDLE const hFile = CreateFileW(path_io, // file to open
GENERIC_READ, // open for reading
FILE_SHARE_READ | FILE_SHARE_WRITE, // share anyway
NULL, // default security
OPEN_EXISTING, // existing file only
FILE_ATTRIBUTE_NORMAL, // normal file
NULL); // no attr. template
if (IS_VALID_HANDLE(hFile)) {
// Skip GetFinalPathNameByHandleW for drive-letter paths when UNC resolution is disabled
bool bSkipRealPath = false;
if (!Settings.ResolveToUNCPaths) {
LPCWSTR const skip = _Path_SkipLPPrefix(hstr_io);
bSkipRealPath = (skip && iswalpha(skip[0]) && skip[1] == L':');
}
HSTRINGW hstr = StrgCreate(NULL);
LPWSTR const buf = StrgWriteAccessBuf(hstr, PATHLONG_MAX_CCH);
if (!bSkipRealPath) {
// get real path name (based on version developed by zufuliu)
LPCWSTR const path_io = PathGet(hpth_in_out);
HANDLE const hFile = CreateFileW(path_io, // file to open
GENERIC_READ, // open for reading
FILE_SHARE_READ | FILE_SHARE_WRITE, // share anyway
NULL, // default security
OPEN_EXISTING, // existing file only
FILE_ATTRIBUTE_NORMAL, // normal file
NULL); // no attr. template
if (GetFinalPathNameByHandleW(hFile, buf, PATHLONG_MAX_CCH, FILE_NAME_OPENED) > 0) {
StrgSanitize(hstr);
LPWSTR ptr = buf;
// remove prefix
if ((wcslen(buf) < MAX_PATH_EXPLICIT) || HasOptInToRemoveMaxPathLimit()) {
if ((wcsstr(ptr, PATHUNC_PREFIX1) == ptr) ||
(wcsstr(ptr, PATHUNC_PREFIX2) == ptr)) {
ptr += (wcslen(PATHUNC_PREFIX1) - 2);
*ptr = L'\\';
}
else if (wcsstr(ptr, PATHLONG_PREFIX) == ptr) {
ptr += wcslen(PATHLONG_PREFIX);
if (IS_VALID_HANDLE(hFile)) {
HSTRINGW hstr = StrgCreate(NULL);
LPWSTR const buf = StrgWriteAccessBuf(hstr, PATHLONG_MAX_CCH);
if (GetFinalPathNameByHandleW(hFile, buf, PATHLONG_MAX_CCH, FILE_NAME_OPENED) > 0) {
StrgSanitize(hstr);
LPWSTR ptr = buf;
// remove prefix
if ((wcslen(buf) < MAX_PATH_EXPLICIT) || HasOptInToRemoveMaxPathLimit()) {
if ((wcsstr(ptr, PATHUNC_PREFIX1) == ptr) ||
(wcsstr(ptr, PATHUNC_PREFIX2) == ptr)) {
ptr += (wcslen(PATHUNC_PREFIX1) - 2);
*ptr = L'\\';
}
else if (wcsstr(ptr, PATHLONG_PREFIX) == ptr) {
ptr += wcslen(PATHLONG_PREFIX);
}
}
Path_Reset(hpth_in_out, ptr);
}
Path_Reset(hpth_in_out, ptr);
CloseHandle(hFile);
StrgDestroy(hstr);
}
CloseHandle(hFile);
StrgDestroy(hstr);
}
}
return Path_GetLength(hpth_in_out);

View File

@ -698,6 +698,7 @@ typedef struct SETTINGS_T {
int AutoSaveInterval;
bool SearchByClipboardIfEmpty;
bool ReplaceByClipboardTag;
bool ResolveToUNCPaths;
int DarkModeHiglightContrast;
AutoSaveBackupOptions AutoSaveOptions;