From bf3574a4e101bb1c1a24b7e115d29e26858526a7 Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Tue, 14 Jul 2009 17:24:51 -0300 Subject: [PATCH] appwiz.cpl: Execute installer when Modify clicked. --- dlls/appwiz.cpl/appwiz.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 1815320a474..0d9e555fc30 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -489,8 +489,9 @@ static void InstallProgram(HWND hWnd) * Name : UninstallProgram * Description: Executes the specified program's installer. * Parameters : id - the internal ID of the installer to remove + * Parameters : button - ID of button pressed (Modify or Remove) */ -static void UninstallProgram(int id) +static void UninstallProgram(int id, DWORD button) { APPINFO *iter; STARTUPINFOW si; @@ -513,8 +514,9 @@ static void UninstallProgram(int id) memset(&si, 0, sizeof(STARTUPINFOW)); si.cb = sizeof(STARTUPINFOW); si.wShowWindow = SW_NORMAL; - res = CreateProcessW(NULL, iter->path, NULL, NULL, FALSE, 0, NULL, - NULL, &si, &info); + + res = CreateProcessW(NULL, (button == IDC_MODIFY) ? iter->path_modify : iter->path, + NULL, NULL, FALSE, 0, NULL, NULL, &si, &info); if (res) { @@ -856,6 +858,7 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar break; case IDC_ADDREMOVE: + case IDC_MODIFY: selitem = SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETNEXTITEM, -1, LVNI_FOCUSED|LVNI_SELECTED); @@ -866,7 +869,7 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar if (SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETITEMW, 0, (LPARAM) &lvItem)) - UninstallProgram(lvItem.lParam); + UninstallProgram(lvItem.lParam, LOWORD(wParam)); } hImageList = ResetApplicationList(FALSE, hWnd, hImageList); -- 2.11.4.GIT