From 37de341023c2de0498d5e433a5d9fe64c6fafbea Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Fri, 13 May 2005 14:21:37 +0000 Subject: [PATCH] display source path in "move file" dialog svn path=/trunk/; revision=15260 --- reactos/subsys/system/winefile/winefile.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/reactos/subsys/system/winefile/winefile.c b/reactos/subsys/system/winefile/winefile.c index 22765552240..9d2145eaafa 100644 --- a/reactos/subsys/system/winefile/winefile.c +++ b/reactos/subsys/system/winefile/winefile.c @@ -1645,6 +1645,7 @@ static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, switch(nmsg) { case WM_INITDIALOG: SetWindowLong(hwnd, GWL_USERDATA, lparam); + SetWindowText(GetDlgItem(hwnd, 201), (LPCTSTR)lparam); return 1; case WM_COMMAND: { @@ -3713,9 +3714,11 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam case ID_FILE_MOVE: { TCHAR new_name[BUFFER_LEN], old_name[BUFFER_LEN]; - int len; + int len, ret; - int ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), hwnd, DestinationDlgProc, (LPARAM)new_name); + get_path(pane->cur, new_name); + + ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), hwnd, DestinationDlgProc, (LPARAM)new_name); if (ret != IDOK) break; @@ -3723,12 +3726,10 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam get_path(pane->cur->up, old_name); len = lstrlen(old_name); - if (old_name[len-1]!='\\' && old_name[len-1]!='/') { + if (old_name[len-1]!='\\' && old_name[len-1]!='/') old_name[len++] = '/'; - old_name[len] = '\n'; - } - lstrcpy(&old_name[len], new_name); + lstrcpy(old_name+len, new_name); lstrcpy(new_name, old_name); }