installer/src/installer-lib/process.cpp - Issue 5663180676136960: Make sure IE and Engine are actually being closed by custom action

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: installer/src/installer-lib/process.cpp

Issue 5663180676136960: Make sure IE and Engine are actually being closed by custom action (Closed)

Patch Set: Use handle class for HMODULE. Add back a test for immersive case. Created June 26, 2014, 1:24 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: installer/src/installer-lib/process.cpp

===================================================================

--- a/installer/src/installer-lib/process.cpp

+++ b/installer/src/installer-lib/process.cpp

@@ -6,6 +6,8 @@

#include "installer-lib.h"

#include "process.h"

+#include "handle.h"

+#include "session.h"

//-------------------------------------------------------

@@ -15,7 +17,7 @@

if (processNames.find(process.szExeFile) != processNames.end())

{

// Make sure the process is still alive

- HANDLE procHandle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, process.th32ProcessID);

+ Windows_Handle procHandle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, process.th32ProcessID);

if ((procHandle == NULL) || (procHandle == INVALID_HANDLE_VALUE)) return false;

DWORD exitCode;

@@ -24,14 +26,13 @@

if (exitCode != STILL_ACTIVE) return false;

// Check if this is a Windows Store app process (we don't care for IE in Modern UI)

- HINSTANCE user32Dll = LoadLibrary(L"user32.dll");

+ Windows_Module_Handle user32Dll(LoadLibrary(L"user32.dll"));

if (!user32Dll) return true;

IsImmersiveDynamicFunc IsImmersiveDynamicCall = (IsImmersiveDynamicFunc)GetProcAddress(user32Dll, "IsImmersiveProcess");

if (!IsImmersiveDynamicCall) return true;

BOOL retValue = !IsImmersiveDynamicCall(procHandle);

- CloseHandle(procHandle);

return retValue;

}