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

Merge pull request #4448 from RaiKoHoff/Dev_Master

Browse Source 
Fix path to module relative representation
This commit is contained in:
Rainer Kottenhoff 2023-01-04 01:21:48 +01:00 committed by GitHub
commit 7000b7cf40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Notepad3.c
View File

@ -2764,7 +2764,7 @@ bool SelectExternalToolBar(HWND hwnd)
if (GetOpenFileNameW(&ofn)) {
Path_Sanitize(hfile_pth);
Path_CanonicalizeEx(hfile_pth, Paths.WorkingDirectory);
Path_CanonicalizeEx(hfile_pth, Paths.ModuleDirectory);
Path_Reset(g_tchToolbarBitmap, Path_Get(hfile_pth));
Path_RelativeToApp(g_tchToolbarBitmap, true, true, true);
if (Globals.bCanSaveIniFile) {
@ -2833,14 +2833,8 @@ bool SelectExternalToolBar(HWND hwnd)
//
// LoadBitmapFile()
//
static HBITMAP LoadBitmapFile(LPCWSTR path)
static HBITMAP LoadBitmapFile(const HPATHL hpath)
{
HPATHL hpath = Path_Allocate(path);
if (Path_IsRelative(hpath)) {
Path_GetAppDirectory(hpath);
Path_Append(hpath, path);
}
HBITMAP hbmp = NULL;
if (Path_IsExistingFile(hpath)) {
@ -2855,7 +2849,7 @@ static HBITMAP LoadBitmapFile(LPCWSTR path)
bDimOK = (bmp.bmWidth >= (height * NUMTOOLBITMAPS));
}
if (!bDimOK) {
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_BITMAP, path,
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_BITMAP, Path_Get(hpath),
(height * NUMTOOLBITMAPS), height, NUMTOOLBITMAPS);
if (hbmp) {
DeleteObject(hbmp);
@ -2864,10 +2858,9 @@ static HBITMAP LoadBitmapFile(LPCWSTR path)
}
}
else {
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_LOADFILE, path);
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_LOADFILE, Path_Get(hpath));
}
Path_Release(hpath);
return hbmp;
}
@ -2987,7 +2980,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
if ((Settings.ToolBarTheme == 2) && Path_IsNotEmpty(g_tchToolbarBitmap)) {
HPATHL hfile_pth = Path_Copy(g_tchToolbarBitmap);
Path_AbsoluteFromApp(hfile_pth, true);
hbmp = LoadBitmapFile(Path_Get(hfile_pth));
hbmp = LoadBitmapFile(hfile_pth);
if (!hbmp) {
Path_Reset(g_tchToolbarBitmap, L"");
IniSectionDelete(L"Toolbar Images", L"BitmapDefault", false);
@ -3019,7 +3012,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
if ((Settings.ToolBarTheme == 2) && Path_IsNotEmpty(g_tchToolbarBitmapHot)) {
HPATHL hfile_pth = Path_Copy(g_tchToolbarBitmapHot);
Path_AbsoluteFromApp(hfile_pth, true);
hbmp = Path_IsExistingFile(hfile_pth) ? LoadBitmapFile(Path_Get(hfile_pth)) : NULL;
hbmp = Path_IsExistingFile(hfile_pth) ? LoadBitmapFile(hfile_pth) : NULL;
if (!hbmp) {
Path_Reset(g_tchToolbarBitmapHot, L"");
IniSectionDelete(L"Toolbar Images", L"BitmapHot", false);
@ -3048,7 +3041,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
if ((Settings.ToolBarTheme == 2) && Path_IsNotEmpty(g_tchToolbarBitmapDisabled)) {
HPATHL hfile_pth = Path_Copy(g_tchToolbarBitmapDisabled);
Path_AbsoluteFromApp(hfile_pth, true);
hbmp = Path_IsExistingFile(hfile_pth) ? LoadBitmapFile(Path_Get(hfile_pth)) : NULL;
hbmp = Path_IsExistingFile(hfile_pth) ? LoadBitmapFile(hfile_pth) : NULL;
if (!hbmp) {
Path_Reset(g_tchToolbarBitmapDisabled, L"");
IniSectionDelete(L"Toolbar Images", L"BitmapDisabled", false);

53
src/PathLib.c
View File

@ -766,9 +766,7 @@ bool PTHAPI Path_Append(HPATHL hpth_in_out, LPCWSTR more)
StringCchCatW(wbuf, cch, more);
StrgSanitize(hstr_io);
Path_Canonicalize(hpth_in_out);
return true;
return Path_Canonicalize(hpth_in_out);
}
// ----------------------------------------------------------------------------
@ -1095,14 +1093,13 @@ void PTHAPI Path_GetModuleFilePath(HPATHL hpth_out)
{
static HPATHL mod_path = NULL;
HSTRINGW hstr = ToHStrgW(hpth_out);
if (!hstr) {
if (!hpth_out) {
if (mod_path) {
Path_Release(mod_path);
mod_path = NULL;
}
else {
assert(hstr != NULL);
assert(hpth_out != NULL);
}
return;
}
@ -1810,15 +1807,13 @@ bool PTHAPI Path_CanonicalizeEx(HPATHL hpth_in_out, const HPATHL hdir_rel_base)
bool res = false;
if (!Path_IsEmpty(hdir_rel_base) && _Path_IsRelative(hpth_in_out)) {
HPATHL hmod_pth = Path_Copy(hdir_rel_base);
Path_Append(hmod_pth, Path_Get(hpth_in_out));
res = Path_Canonicalize(hmod_pth);
res = Path_Append(hmod_pth, Path_Get(hpth_in_out));
Path_Swap(hpth_in_out, hmod_pth);
Path_Release(hmod_pth);
}
else {
res = Path_Canonicalize(hpth_in_out);
}
Path_RemoveBackslash(hpth_in_out);
return res;
@ -1927,16 +1922,6 @@ static bool _Path_RelativePathTo(HPATHL hrecv, const HPATHL hfrom, DWORD attr_fr
bool from_is_dir = (attr_from & FILE_ATTRIBUTE_DIRECTORY);
bool to_is_dir = (attr_to & FILE_ATTRIBUTE_DIRECTORY);
#if 0
// DEBUG
{
Path_Reset(hfrom, L"\\FolderA\\FolderB\\FolderC\\abab");
//from_is_dir = true;
Path_Reset(hto, L"\\FolderA\\FolderD\\FolderE\\blah");
//to_is_dir = false;
}
#endif
// ensure comparable paths (no relatives(..\)
HPATHL hfrom_cpy = Path_Allocate(PathGet(hfrom));
Path_Canonicalize(hfrom_cpy);
@ -1947,11 +1932,13 @@ static bool _Path_RelativePathTo(HPATHL hrecv, const HPATHL hfrom, DWORD attr_fr
if (from_is_dir) {
HSTRINGW hstr_from = ToHStrgW(hfrom_cpy);
StrgTrimRight(hstr_from, L'\\');
StrgTrimRight(hstr_from, L'/');
StrgCat(hstr_from, L"\\");
}
if (to_is_dir) {
HSTRINGW hstr_cpy = ToHStrgW(hto_cpy);
StrgTrimRight(hstr_cpy, L'\\');
StrgTrimRight(hstr_cpy, L'/');
StrgCat(hstr_cpy, L"\\");
}
@ -1983,8 +1970,8 @@ static bool _Path_RelativePathTo(HPATHL hrecv, const HPATHL hfrom, DWORD attr_fr
// back to prev sync point
LPCWSTR p = &hfrom_buf[i];
while (p > r) {
if ((*p == L'\\') || (*p == L':')) {
break;
if ((*p == L'\\') || (*p == L'/') || (*p == L':')) {
++p; break;
}
--p;
}
@ -1993,29 +1980,26 @@ static bool _Path_RelativePathTo(HPATHL hrecv, const HPATHL hfrom, DWORD attr_fr
// count dirs of from-path reverse to sync point
size_t dir_cnt = 0;
while (*p != L'\0') {
if ((*p == L'\\')) {
// ignore trailing backslash
if (*(p + 1)) {
++dir_cnt;
}
if ((*p == L'\\') || (*p == L'/')) {
++dir_cnt;
}
++p;
}
// prepare buffer for prefix "..\" x dir_cnt
size_t const alloc_add = wcslen(&hto_buf[prefix]) + 1;
size_t const len = (wcslen(PATHPARENT_PREFIX) * dir_cnt) + alloc_add;
LPWSTR const out_buf = StrgWriteAccessBuf(hrecv_str, len);
size_t const alloc_add = wcslen(&hto_buf[prefix]) + 1;
size_t const len = (wcslen(PATHPARENT_PREFIX) * dir_cnt) + alloc_add;
LPWSTR const hrecv_buf = StrgWriteAccessBuf(hrecv_str, len);
for (size_t d = 0; d < dir_cnt; ++d) {
StringCchCatW(out_buf, len, PATHPARENT_PREFIX);
StringCchCatW(hrecv_buf, len, PATHPARENT_PREFIX);
}
//~Path_RemoveBackslash(hpath_in_out);
if (hto_buf[prefix] == L'\\') {
if ((hto_buf[prefix] == L'\\') || (hto_buf[prefix] == L'/')) {
++prefix;
}
// copy rest of to-path (excluding first seperator)
StringCchCatW(out_buf, len, &hto_buf[prefix]);
StringCchCatW(hrecv_buf, len, &hto_buf[prefix]);
}
else {
Path_Swap(hrecv, hto_cpy);
@ -2230,15 +2214,14 @@ void PTHAPI Path_AbsoluteFromApp(HPATHL hpth_in_out, bool bExpandEnv)
if (_Path_IsRelative(htmp_pth)) {
Path_GetAppDirectory(hpth_in_out);
Path_Append(hpth_in_out, Path_Get(htmp_pth));
Path_Append(hpth_in_out, Path_Get(htmp_pth)); // does Path_Canonicalize()
}
else {
Path_Swap(hpth_in_out, htmp_pth);
Path_Canonicalize(hpth_in_out);
}
Path_Release(htmp_pth);
Path_Canonicalize(hpth_in_out);
// TODO:
//if (PathGetDriveNumber(wchResult) != -1) {
// CharUpperBuff(wchResult, 1);