https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43556bfff2b7a56b0829356bfd87303343acf5a0
commit 43556bfff2b7a56b0829356bfd87303343acf5a0 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Wed Jan 29 02:29:16 2020 +0900 Commit: Katayama Hirofumi MZ <[email protected]> CommitDate: Wed Jan 29 02:29:16 2020 +0900 [CPL][APPWIZ] Consider PSN_SETACTIVE - Correctly respond even if the user clicked "Back" button. - Accept environment variables. CORE-16534 --- dll/cpl/appwiz/createlink.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 27ac650e96e..46cf6f9b84c 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -231,7 +231,7 @@ WelcomeDlgProc(HWND hwndDlg, LPPROPSHEETPAGEW ppsp; PCREATE_LINK_CONTEXT pContext; LPPSHNOTIFY lppsn; - WCHAR szPath[MAX_PATH]; + WCHAR szPath[MAX_PATH * 2]; WCHAR szDesc[100]; BROWSEINFOW brws; LPITEMIDLIST pidllist; @@ -284,11 +284,18 @@ WelcomeDlgProc(HWND hwndDlg, case WM_NOTIFY: lppsn = (LPPSHNOTIFY) lParam; pContext = (PCREATE_LINK_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); - if (lppsn->hdr.code == PSN_WIZNEXT) + if (lppsn->hdr.code == PSN_SETACTIVE) + { + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget); + } + else if (lppsn->hdr.code == PSN_WIZNEXT) { GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget, _countof(pContext->szTarget)); StrTrimW(pContext->szTarget, L" \t"); + ExpandEnvironmentStringsW(pContext->szTarget, szPath, _countof(szPath)); + StringCchCopyW(pContext->szTarget, _countof(pContext->szTarget), szPath); + if (IsInternetLocation(pContext->szTarget)) { /* internet */ @@ -336,7 +343,7 @@ WelcomeDlgProc(HWND hwndDlg, return TRUE; } } - else if (lppsn->hdr.code == PSN_RESET) + else if (lppsn->hdr.code == PSN_RESET && !lppsn->lParam) { /* The user has clicked [Cancel] */ DeleteFileW(pContext->szOldFile); @@ -367,11 +374,6 @@ FinishDlgProc(HWND hwndDlg, ppsp = (LPPROPSHEETPAGEW)lParam; pContext = (PCREATE_LINK_CONTEXT) ppsp->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); - - /* TODO: Use shell32!PathCleanupSpec instead of DoConvertNameForFileSystem */ - DoConvertNameForFileSystem(pContext->szDescription); - SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription); - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); break; case WM_COMMAND: @@ -397,7 +399,13 @@ FinishDlgProc(HWND hwndDlg, case WM_NOTIFY: lppsn = (LPPSHNOTIFY) lParam; pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER); - if (lppsn->hdr.code == PSN_WIZFINISH) + if (lppsn->hdr.code == PSN_SETACTIVE) + { + /* TODO: Use shell32!PathCleanupSpec instead of DoConvertNameForFileSystem */ + DoConvertNameForFileSystem(pContext->szDescription); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription); + } + else if (lppsn->hdr.code == PSN_WIZFINISH) { GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription, _countof(pContext->szDescription)); StrTrimW(pContext->szDescription, L" \t"); @@ -458,7 +466,7 @@ FinishDlgProc(HWND hwndDlg, } } } - else if (lppsn->hdr.code == PSN_RESET) + else if (lppsn->hdr.code == PSN_RESET && !lppsn->lParam) { /* The user has clicked [Cancel] */ DeleteFileW(pContext->szOldFile);
