From 17956ed572cfed8004085db5c694925a5b9ad5fe Mon Sep 17 00:00:00 2001 From: Jon Shiring Date: Tue, 2 Mar 2021 21:04:44 -0800 Subject: [PATCH 1/2] Fixed crashes when picking apps to run for diff/merge/view Easiest fix was to pass in FALSE for whether to use the 'new' Vista-style file dialogues --- Source/gui/OptionsDlg/EditorsPage.cpp | 2 +- Source/gui/OptionsDlg/HelperAppsPage.cpp | 7 ++++--- Source/gui/OptionsDlg/MergeAppPage.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/gui/OptionsDlg/EditorsPage.cpp b/Source/gui/OptionsDlg/EditorsPage.cpp index 3bf45df..4f3f989 100644 --- a/Source/gui/OptionsDlg/EditorsPage.cpp +++ b/Source/gui/OptionsDlg/EditorsPage.cpp @@ -286,7 +286,7 @@ void CEditorsPage::OnBrowse() CFileDialog fDlg(TRUE, NULL, NULL, OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NONETWORKBUTTON | OFN_PATHMUSTEXIST, LoadStringResource(IDS_TEXT_EDITOR_FILTER), this, - MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME)); + MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME), FALSE); TCHAR buf[MAX_PATH]; // Zero 1st char so commdlg knows we aren't providing a default filename diff --git a/Source/gui/OptionsDlg/HelperAppsPage.cpp b/Source/gui/OptionsDlg/HelperAppsPage.cpp index a4be4cd..658bf55 100644 --- a/Source/gui/OptionsDlg/HelperAppsPage.cpp +++ b/Source/gui/OptionsDlg/HelperAppsPage.cpp @@ -287,10 +287,11 @@ void CHelperAppsPage::Browse(CString &filename, LPCTSTR title) { CFileDialog fDlg(TRUE, NULL, NULL, OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NONETWORKBUTTON | OFN_PATHMUSTEXIST, - LoadStringResource(IDS_HELPER_APPS_FILTER), this, - MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME)); + LoadStringResource(IDS_HELPER_APPS_FILTER), + this, + MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME), FALSE); - TCHAR buf[MAX_PATH]; + TCHAR buf[MAX_PATH+1]; // Zero 1st char so commdlg knows we aren't providing a default filename buf[0]=_T('\0'); diff --git a/Source/gui/OptionsDlg/MergeAppPage.cpp b/Source/gui/OptionsDlg/MergeAppPage.cpp index 005d29e..67a3f6c 100644 --- a/Source/gui/OptionsDlg/MergeAppPage.cpp +++ b/Source/gui/OptionsDlg/MergeAppPage.cpp @@ -298,7 +298,7 @@ void CMergeAppPage::Browse(CString &filename, LPCTSTR title) CFileDialog fDlg(TRUE, NULL, NULL, OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NONETWORKBUTTON | OFN_PATHMUSTEXIST, LoadStringResource(IDS_HELPER_APPS_FILTER), this, - MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME)); + MainFrame()->m_osVer.dwMajorVersion < 5 ? OPENFILENAME_SIZE_VERSION_400 : sizeof(OPENFILENAME), FALSE); TCHAR buf[MAX_PATH]; // Zero 1st char so commdlg knows we aren't providing a default filename From 7aac7763d984db66d31de06ff7686c309851884c Mon Sep 17 00:00:00 2001 From: Jon Shiring Date: Thu, 10 Jun 2021 22:36:05 -0700 Subject: [PATCH 2/2] Update .gitignore ignore dependencies/ --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d57d774..7a079ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Bin/ Build/ -*.aps \ No newline at end of file +*.aps +Dependencies/