Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NOTEPAD] Apply Wine commit 7854f19 by Andrew Eikum: Don't specify initial dir for save and open dialogs. CORE-9371

Browse source 
svn path=/trunk/; revision=67681
This commit is contained in:
Amine Khaldi 2015-05-12 10:39:31 +00:00
parent 3b59131ee6
commit 70f374d4e7
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/base/applications/notepad/dialog.c
View file

@ -373,12 +373,10 @@ VOID DIALOG_FileNew(VOID)
VOID DIALOG_FileOpen(VOID) VOID DIALOG_FileOpen(VOID)
{ {
OPENFILENAME openfilename; OPENFILENAME openfilename;
TCHAR szDir[MAX_PATH];
TCHAR szPath[MAX_PATH]; TCHAR szPath[MAX_PATH];
ZeroMemory(&openfilename, sizeof(openfilename)); ZeroMemory(&openfilename, sizeof(openfilename));
GetCurrentDirectory(ARRAY_SIZE(szDir), szDir);
if (Globals.szFileName[0] == 0) if (Globals.szFileName[0] == 0)
_tcscpy(szPath, txt_files); _tcscpy(szPath, txt_files);
else else
@ -390,7 +388,6 @@ 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.lpstrInitialDir = szDir;
openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY;
openfilename.lpstrDefExt = szDefaultExt; openfilename.lpstrDefExt = szDefaultExt;
@ -471,12 +468,10 @@ DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
BOOL DIALOG_FileSaveAs(VOID) BOOL DIALOG_FileSaveAs(VOID)
{ {
OPENFILENAME saveas; OPENFILENAME saveas;
TCHAR szDir[MAX_PATH];
TCHAR szPath[MAX_PATH]; TCHAR szPath[MAX_PATH];
ZeroMemory(&saveas, sizeof(saveas)); ZeroMemory(&saveas, sizeof(saveas));
GetCurrentDirectory(ARRAY_SIZE(szDir), szDir);
if (Globals.szFileName[0] == 0) if (Globals.szFileName[0] == 0)
_tcscpy(szPath, txt_files); _tcscpy(szPath, txt_files);
else else
@ -488,7 +483,6 @@ BOOL DIALOG_FileSaveAs(VOID)
saveas.lpstrFilter = Globals.szFilter; saveas.lpstrFilter = Globals.szFilter;
saveas.lpstrFile = szPath; saveas.lpstrFile = szPath;
saveas.nMaxFile = ARRAY_SIZE(szPath); saveas.nMaxFile = ARRAY_SIZE(szPath);
saveas.lpstrInitialDir = szDir;
saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY |
OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK; OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK;
saveas.lpstrDefExt = szDefaultExt; saveas.lpstrDefExt = szDefaultExt;