Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NOTEPAD][WORDPAD][MSPAINT]... Use newer file open dialog (#3571)

Browse source 
Use new-style file open/save-as dialog.
- Add OFN_EXPLORER flag to OPENFILENAME structure in notepad, wordpad, mspaint, clipbrd, mmc, mplay32, mscutils, regedit, winhlp32, progman, shellbtrfs, cryptui, shell32, setupapi, vgafontedit, infinst, and vfdlib modules.
This commit is contained in:
Katayama Hirofumi MZ 2021-04-01 22:50:32 +09:00 committed by GitHub
parent 7e6550b35e
commit bebdfda8b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/applications/clipbrd/clipbrd.c
View file

@ -32,7 +32,7 @@ static void SaveClipboardToFile(void)
sfn.lpstrFilter = szFilterMask; sfn.lpstrFilter = szFilterMask;
sfn.lpstrFile = szFileName; sfn.lpstrFile = szFileName;
sfn.nMaxFile = ARRAYSIZE(szFileName); sfn.nMaxFile = ARRAYSIZE(szFileName);
sfn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; sfn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
sfn.lpstrDefExt = L"clp"; sfn.lpstrDefExt = L"clp";
if (!GetSaveFileNameW(&sfn)) if (!GetSaveFileNameW(&sfn))

2
base/applications/mmc/console.c
View file

@ -249,7 +249,7 @@ DoSaveFileAs(
saveas.lpstrFilter = L"MSC Files\0*.msc\0"; saveas.lpstrFilter = L"MSC Files\0*.msc\0";
saveas.lpstrFile = szPath; saveas.lpstrFile = szPath;
saveas.nMaxFile = MAX_PATH; saveas.nMaxFile = MAX_PATH;
saveas.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT; saveas.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT;
saveas.lpstrDefExt = L"msc"; saveas.lpstrDefExt = L"msc";
if (GetSaveFileName(&saveas)) if (GetSaveFileName(&saveas))

2
base/applications/mplay32/mplay32.c
View file

@ -1158,7 +1158,7 @@ OpenFileDialog(HWND hwnd, DWORD dwFilterIndex, LPTSTR lpType)
OpenFileName.lpstrFilter = szFilter; OpenFileName.lpstrFilter = szFilter;
OpenFileName.lpstrFile = szFile; OpenFileName.lpstrFile = szFile;
OpenFileName.nMaxFile = ARRAYSIZE(szFile); OpenFileName.nMaxFile = ARRAYSIZE(szFile);
OpenFileName.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE; OpenFileName.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE;
OpenFileName.lpstrDefExt = _T("\0"); OpenFileName.lpstrDefExt = _T("\0");
OpenFileName.nFilterIndex = dwFilterIndex; OpenFileName.nFilterIndex = dwFilterIndex;

2
base/applications/mscutils/eventvwr/eventvwr.c
View file

@ -3268,7 +3268,7 @@ InitInstance(HINSTANCE hInstance)
sfn.hInstance = hInstance; sfn.hInstance = hInstance;
sfn.lpstrFilter = szSaveFilter; sfn.lpstrFilter = szSaveFilter;
sfn.lpstrInitialDir = NULL; sfn.lpstrInitialDir = NULL;
sfn.Flags = OFN_HIDEREADONLY | OFN_SHAREAWARE; sfn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_SHAREAWARE;
sfn.lpstrDefExt = NULL; sfn.lpstrDefExt = NULL;
ShowWindow(hwndMainWindow, Settings.wpPos.showCmd); ShowWindow(hwndMainWindow, Settings.wpPos.showCmd);

2
base/applications/mscutils/servman/propsheet_recovery.c
View file

@ -351,7 +351,7 @@ BrowseFile(
ZeroMemory(&ofn, sizeof(ofn)); ZeroMemory(&ofn, sizeof(ofn));
ofn.lStructSize = sizeof(ofn); ofn.lStructSize = sizeof(ofn);
ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING;
ofn.hwndOwner = hwndDlg; ofn.hwndOwner = hwndDlg;
ofn.lpstrFilter = pszFilter; ofn.lpstrFilter = pszFilter;
ofn.lpstrFile = szFile; ofn.lpstrFile = szFile;

4
base/applications/mspaint/main.cpp
View file

@ -282,7 +282,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
ofn.nMaxFile = SIZEOF(ofnFilename); ofn.nMaxFile = SIZEOF(ofnFilename);
ofn.lpstrFileTitle = ofnFiletitle; ofn.lpstrFileTitle = ofnFiletitle;
ofn.nMaxFileTitle = SIZEOF(ofnFiletitle); ofn.nMaxFileTitle = SIZEOF(ofnFiletitle);
ofn.Flags = OFN_HIDEREADONLY; ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY;
ofn.lpstrDefExt = L"bmp"; ofn.lpstrDefExt = L"bmp";
CopyMemory(sfnFilename, filepathname, sizeof(filepathname)); CopyMemory(sfnFilename, filepathname, sizeof(filepathname));
@ -298,7 +298,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
sfn.nMaxFile = SIZEOF(sfnFilename); sfn.nMaxFile = SIZEOF(sfnFilename);
sfn.lpstrFileTitle = sfnFiletitle; sfn.lpstrFileTitle = sfnFiletitle;
sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); sfn.nMaxFileTitle = SIZEOF(sfnFiletitle);
sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK; sfn.Flags = OFN_EXPLORER | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK;
sfn.lpfnHook = OFNHookProc; sfn.lpfnHook = OFNHookProc;
sfn.lpstrDefExt = L"bmp"; sfn.lpstrDefExt = L"bmp";

2
base/applications/notepad/dialog.c
View file

@ -440,7 +440,7 @@ VOID DIALOG_FileOpen(VOID)
openfilename.lpstrFilter = Globals.szFilter; openfilename.lpstrFilter = Globals.szFilter;
openfilename.lpstrFile = szPath; openfilename.lpstrFile = szPath;
openfilename.nMaxFile = ARRAY_SIZE(szPath); openfilename.nMaxFile = ARRAY_SIZE(szPath);
openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; openfilename.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY;
openfilename.lpstrDefExt = szDefaultExt; openfilename.lpstrDefExt = szDefaultExt;
if (GetOpenFileName(&openfilename)) { if (GetOpenFileName(&openfilename)) {

2
base/applications/regedit/framewnd.c
View file

@ -288,7 +288,7 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn)
pofn->nMaxFile = _MAX_PATH; pofn->nMaxFile = _MAX_PATH;
pofn->lpstrFileTitle = FileTitleBuffer; pofn->lpstrFileTitle = FileTitleBuffer;
pofn->nMaxFileTitle = _MAX_PATH; pofn->nMaxFileTitle = _MAX_PATH;
pofn->Flags = OFN_HIDEREADONLY; pofn->Flags = OFN_EXPLORER | OFN_HIDEREADONLY;
pofn->lpstrDefExt = L"reg"; pofn->lpstrDefExt = L"reg";
return TRUE; return TRUE;
} }

2
base/applications/winhlp32/winhelp.c
View file

@ -178,7 +178,7 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len)
openfilename.nMaxFileTitle = 0; openfilename.nMaxFileTitle = 0;
openfilename.lpstrInitialDir = szDir; openfilename.lpstrInitialDir = szDir;
openfilename.lpstrTitle = 0; openfilename.lpstrTitle = 0;
openfilename.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_READONLY; openfilename.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_READONLY;
openfilename.nFileOffset = 0; openfilename.nFileOffset = 0;
openfilename.nFileExtension = 0; openfilename.nFileExtension = 0;
openfilename.lpstrDefExt = 0; openfilename.lpstrDefExt = 0;

2
base/applications/wordpad/print.c
View file

@ -253,7 +253,7 @@ static LPWSTR dialog_print_to_file(HWND hMainWnd)
ZeroMemory(&ofn, sizeof(ofn)); ZeroMemory(&ofn, sizeof(ofn));
ofn.lStructSize = sizeof(ofn); ofn.lStructSize = sizeof(ofn);
ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
ofn.hwndOwner = hMainWnd; ofn.hwndOwner = hMainWnd;
ofn.lpstrFilter = file_filter; ofn.lpstrFilter = file_filter;
ofn.lpstrFile = file; ofn.lpstrFile = file;

4
base/applications/wordpad/wordpad.c
View file

@ -905,7 +905,7 @@ static BOOL DialogSaveFile(void)
ZeroMemory(&sfn, sizeof(sfn)); ZeroMemory(&sfn, sizeof(sfn));
sfn.lStructSize = sizeof(sfn); sfn.lStructSize = sizeof(sfn);
sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_ENABLESIZING; sfn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_ENABLESIZING;
sfn.hwndOwner = hMainWnd; sfn.hwndOwner = hMainWnd;
sfn.lpstrFilter = wszFilter; sfn.lpstrFilter = wszFilter;
sfn.lpstrFile = wszFile; sfn.lpstrFile = wszFile;
@ -989,7 +989,7 @@ static void DialogOpenFile(void)
ZeroMemory(&ofn, sizeof(ofn)); ZeroMemory(&ofn, sizeof(ofn));
ofn.lStructSize = sizeof(ofn); ofn.lStructSize = sizeof(ofn);
ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING; ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_ENABLESIZING;
ofn.hwndOwner = hMainWnd; ofn.hwndOwner = hMainWnd;
ofn.lpstrFilter = wszFilter; ofn.lpstrFilter = wszFilter;
ofn.lpstrFile = wszFile; ofn.lpstrFile = wszFile;

2
base/shell/progman/dialog.c
View file

@ -69,7 +69,7 @@ DIALOG_Browse(HWND hWnd, LPCWSTR lpszzFilter, LPWSTR lpstrFile, INT nMaxFile)
openfilename.lpstrFile = lpstrFile; openfilename.lpstrFile = lpstrFile;
openfilename.nMaxFile = nMaxFile; openfilename.nMaxFile = nMaxFile;
openfilename.lpstrInitialDir = szDir; openfilename.lpstrInitialDir = szDir;
openfilename.Flags = 0; openfilename.Flags = OFN_EXPLORER;
openfilename.lpstrDefExt = L"exe"; openfilename.lpstrDefExt = L"exe";
openfilename.lpstrCustomFilter = NULL; openfilename.lpstrCustomFilter = NULL;
openfilename.nMaxCustFilter = 0; openfilename.nMaxCustFilter = 0;

2
dll/shellext/shellbtrfs/recv.cpp
View file

@ -1700,7 +1700,7 @@ void CALLBACK RecvSubvolGUIW(HWND hwnd, HINSTANCE hinst, LPWSTR lpszCmdLine, int
ofn.hInstance = module; ofn.hInstance = module;
ofn.lpstrFile = file; ofn.lpstrFile = file;
ofn.nMaxFile = sizeof(file) / sizeof(WCHAR); ofn.nMaxFile = sizeof(file) / sizeof(WCHAR);
ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
if (GetOpenFileNameW(&ofn)) { if (GetOpenFileNameW(&ofn)) {
BtrfsRecv recv; BtrfsRecv recv;

1
dll/shellext/shellbtrfs/send.cpp
View file

@ -303,6 +303,7 @@ void BtrfsSend::Browse(HWND hwnd) {
ofn.hInstance = module; ofn.hInstance = module;
ofn.lpstrFile = file; ofn.lpstrFile = file;
ofn.nMaxFile = sizeof(file) / sizeof(WCHAR); ofn.nMaxFile = sizeof(file) / sizeof(WCHAR);
ofn.Flags = OFN_EXPLORER;
if (!GetSaveFileNameW(&ofn)) if (!GetSaveFileNameW(&ofn))
return; return;

3
dll/win32/cryptui/main.c
View file

@ -5114,6 +5114,9 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
ofn.lpstrFilter = make_import_file_filter(data->dwFlags); ofn.lpstrFilter = make_import_file_filter(data->dwFlags);
ofn.lpstrFile = fileBuf; ofn.lpstrFile = fileBuf;
ofn.nMaxFile = ARRAY_SIZE(fileBuf); ofn.nMaxFile = ARRAY_SIZE(fileBuf);
#ifdef __REACTOS__
ofn.Flags = OFN_EXPLORER;
#endif
fileBuf[0] = 0; fileBuf[0] = 0;
if (GetOpenFileNameW(&ofn)) if (GetOpenFileNameW(&ofn))
SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_FILENAME), WM_SETTEXT, SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_FILENAME), WM_SETTEXT,

2
dll/win32/setupapi/dialog.c
View file

@ -119,7 +119,7 @@ static void promptdisk_browse(HWND hwnd, struct promptdisk_params *params)
ZeroMemory(&ofn, sizeof(ofn)); ZeroMemory(&ofn, sizeof(ofn));
ofn.lStructSize = sizeof(ofn); ofn.lStructSize = sizeof(ofn);
ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST;
ofn.hwndOwner = hwnd; ofn.hwndOwner = hwnd;
ofn.nMaxFile = MAX_PATH; ofn.nMaxFile = MAX_PATH;
ofn.lpstrFile = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)); ofn.lpstrFile = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR));

2
dll/win32/shell32/COpenWithMenu.cpp
View file

@ -882,7 +882,7 @@ VOID COpenWithDialog::Browse()
ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.lStructSize = sizeof(OPENFILENAMEW);
ofn.hInstance = shell32_hInstance; ofn.hInstance = shell32_hInstance;
ofn.hwndOwner = m_hDialog; ofn.hwndOwner = m_hDialog;
ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
ofn.nMaxFile = (sizeof(wszPath) / sizeof(WCHAR)); ofn.nMaxFile = (sizeof(wszPath) / sizeof(WCHAR));
ofn.lpstrFile = wszPath; ofn.lpstrFile = wszPath;
ofn.lpstrInitialDir = L"%programfiles%"; ofn.lpstrInitialDir = L"%programfiles%";

2
dll/win32/shell32/dialogs/filetypes.cpp
View file

@ -834,7 +834,7 @@ ActionDlg_OnBrowse(HWND hwndDlg, PACTION_DIALOG pNewAct, BOOL bEdit = FALSE)
ofn.lpstrFile = szFile; ofn.lpstrFile = szFile;
ofn.nMaxFile = _countof(szFile); ofn.nMaxFile = _countof(szFile);
ofn.lpstrTitle = strTitle; ofn.lpstrTitle = strTitle;
ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY;
ofn.lpstrDefExt = L"exe"; ofn.lpstrDefExt = L"exe";
if (GetOpenFileNameW(&ofn)) if (GetOpenFileNameW(&ofn))
{ {

2
modules/rosapps/applications/devutils/vgafontedit/opensave.c
View file

@ -43,7 +43,7 @@ DoOpenFile(OUT PWSTR pszFileName)
PrepareFilter(pszFilter); PrepareFilter(pszFilter);
ofn.lpstrFilter = pszFilter; ofn.lpstrFilter = pszFilter;
ofn.lpstrFile = pszFileName; ofn.lpstrFile = pszFileName;
ofn.Flags = OFN_FILEMUSTEXIST; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST;
bRet = GetOpenFileNameW(&ofn); bRet = GetOpenFileNameW(&ofn);
HeapFree(hProcessHeap, 0, pszFilter); HeapFree(hProcessHeap, 0, pszFilter);

2
modules/rosapps/applications/sysutils/utils/infinst/infinst.c
View file

@ -56,7 +56,7 @@ _tmain(int argc, TCHAR *argv[])
ofc.lpstrFilter = FILEOPEN_FILTER; ofc.lpstrFilter = FILEOPEN_FILTER;
ofc.nFilterIndex = 1; ofc.nFilterIndex = 1;
ofc.lpstrTitle = FILEOPEN_TITLE; ofc.lpstrTitle = FILEOPEN_TITLE;
ofc.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_PATHMUSTEXIST; ofc.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_PATHMUSTEXIST;
ofc.lpstrDefExt = FILEOPEN_DEFEXT; ofc.lpstrDefExt = FILEOPEN_DEFEXT;
ofc.lpstrFile = FileName; ofc.lpstrFile = FileName;
ofc.nMaxFile = sizeof(FileName) / sizeof(TCHAR); ofc.nMaxFile = sizeof(FileName) / sizeof(TCHAR);

2
modules/rosapps/lib/vfdlib/vfdguiopen.c
View file

@ -404,7 +404,7 @@ void OnBrowse(
ofn.nMaxFile = sizeof(file); ofn.nMaxFile = sizeof(file);
ofn.lpstrInitialDir = dir; ofn.lpstrInitialDir = dir;
ofn.lpstrTitle = title ? title : FALLBACK_IMAGE_TITLE; ofn.lpstrTitle = title ? title : FALLBACK_IMAGE_TITLE;
ofn.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
// show the open file dialog box // show the open file dialog box

2
modules/rosapps/lib/vfdlib/vfdguisave.c
View file

@ -422,7 +422,7 @@ void OnBrowse(
ofn.lpstrInitialDir = dir; ofn.lpstrInitialDir = dir;
ofn.lpstrTitle = title ? title : "Save Image"; ofn.lpstrTitle = title ? title : "Save Image";
ofn.lpstrFilter = "*.*\0*.*\0"; ofn.lpstrFilter = "*.*\0*.*\0";
ofn.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
if (GetSaveFileName(&ofn)) { if (GetSaveFileName(&ofn)) {
SetDlgItemText(hDlg, IDC_TARGETFILE, file); SetDlgItemText(hDlg, IDC_TARGETFILE, file);