Index: installer/src/installer-lib/process.cpp |
=================================================================== |
--- a/installer/src/installer-lib/process.cpp |
+++ b/installer/src/installer-lib/process.cpp |
@@ -278,11 +278,21 @@ |
} |
break ; |
- default : |
+ case 4: |
/* |
- * We're out of ways to try to shut down. |
+ * We're out of ways to try to shut down. Oh well. Take cover. It gets violent here. |
Eric
2015/03/20 08:53:16
Should restore the first half of the comment to it
|
*/ |
- return false ; |
+ for (auto it = pid_set.begin(); it != pid_set.end(); ++it) |
+ { |
+ HANDLE tmpHandle = OpenProcess(PROCESS_TERMINATE, FALSE, *it); |
+ if (!tmpHandle) continue; |
+ Windows_Handle procHandle(tmpHandle); |
+ TerminateProcess(tmpHandle, 0); |
Eric
2015/03/20 08:53:16
Given how unreliable it's turning out to be to shu
sergei
2015/04/02 08:04:09
Merely want to add that MSI is already configured
sergei
2015/04/02 08:04:09
As well as it would be good to log the state to be
Eric
2015/05/14 15:09:25
The process 'msiexec.exe' runs with elevated privi
|
+ } |
+ break; |
+ |
+ default: |
+ return false; |
} |
/* |
@@ -290,7 +300,7 @@ |
*/ |
for ( unsigned int j = 0 ; j < 50 ; ++ j ) |
{ |
- std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ) ; |
+ std::this_thread::sleep_for( std::chrono::milliseconds( 30 ) ) ; |
Refresh() ; |
if ( ! IsRunning() ) |
{ |