From ff7cc9a72a1856ba3f414ca97869ecc6c984b5af Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Mon, 5 Dec 2005 18:43:49 +0000 Subject: [PATCH] display the "Reinstall Driver" button in case the installation previously failed svn path=/trunk/; revision=19913 --- reactos/lib/devmgr/En.rc | 1 + reactos/lib/devmgr/advprop.c | 14 +++++++++++--- reactos/lib/devmgr/devprblm.c | 6 ++++++ reactos/lib/devmgr/resource.h | 1 + 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/reactos/lib/devmgr/En.rc b/reactos/lib/devmgr/En.rc index be57589aee1..5fdf87213c2 100644 --- a/reactos/lib/devmgr/En.rc +++ b/reactos/lib/devmgr/En.rc @@ -19,6 +19,7 @@ BEGIN IDS_DEVONPARENT "on %1" IDS_TROUBLESHOOTDEV "&Troubleshoot..." IDS_ENABLEDEV "E&nable Device" + IDS_REINSTALLDRV "Re&install Driver" END STRINGTABLE diff --git a/reactos/lib/devmgr/advprop.c b/reactos/lib/devmgr/advprop.c index 38f799d2d7f..e1de40f1574 100644 --- a/reactos/lib/devmgr/advprop.c +++ b/reactos/lib/devmgr/advprop.c @@ -470,10 +470,18 @@ GetParentNode: DeviceInfoData->DevInst, 0, dap->hMachine); - if (cr == CR_SUCCESS && - (Status & DN_HAS_PROBLEM) && ProblemNumber == CM_PROB_DISABLED) + if (cr == CR_SUCCESS && (Status & DN_HAS_PROBLEM)) { - TroubleShootStrId = IDS_ENABLEDEV; + switch (ProblemNumber) + { + case CM_PROB_DISABLED: + TroubleShootStrId = IDS_ENABLEDEV; + break; + + case CM_PROB_FAILED_INSTALL: + TroubleShootStrId = IDS_REINSTALLDRV; + break; + } } if (LoadString(hDllInstance, diff --git a/reactos/lib/devmgr/devprblm.c b/reactos/lib/devmgr/devprblm.c index 90186bccd55..a787c63aedf 100644 --- a/reactos/lib/devmgr/devprblm.c +++ b/reactos/lib/devmgr/devprblm.c @@ -56,6 +56,12 @@ ShowDeviceProblemWizard(IN HWND hWndParent OPTIONAL, break; } + case CM_PROB_FAILED_INSTALL: + { + /* FIXME - display the driver installation wizard */ + break; + } + default: { /* FIXME - troubleshoot the device */ diff --git a/reactos/lib/devmgr/resource.h b/reactos/lib/devmgr/resource.h index 665c3a2f1be..a97e8f39fa0 100644 --- a/reactos/lib/devmgr/resource.h +++ b/reactos/lib/devmgr/resource.h @@ -24,6 +24,7 @@ #define IDC_PROPERTIES 0x58A #define IDC_DEVUSAGELABEL 0x58B #define IDC_DEVPROBLEM 0x58C +#define IDS_REINSTALLDRV 0x58D #define IDS_NAME 0x100 #define IDS_TYPE 0x101 -- 2.17.1