Update Wix to v3.11

This commit is contained in:
Steve Dower
2017-09-04 14:00:39 -07:00
committed by Steve Dower
parent dfc13f5681
commit 2431f7ee3f
125 changed files with 230 additions and 28 deletions

View File

@@ -603,8 +603,8 @@ protected:
virtual BOOL PromptCancel(
__in HWND hWnd,
__in BOOL fForceCancel,
__in_z LPCWSTR wzMessage,
__in_z LPCWSTR wzCaption
__in_z_opt LPCWSTR wzMessage,
__in_z_opt LPCWSTR wzCaption
)
{
::EnterCriticalSection(&m_csCanceled);
@@ -677,14 +677,16 @@ protected:
ReleaseNullObject(m_pEngine);
}
protected:
CRITICAL_SECTION m_csCanceled;
BOOL m_fCanceled;
private:
long m_cReferences;
BOOTSTRAPPER_DISPLAY m_display;
BOOTSTRAPPER_RESTART m_restart;
IBootstrapperEngine* m_pEngine;
CRITICAL_SECTION m_csCanceled;
BOOL m_fCanceled;
BOOL m_fApplying;
BOOL m_fRollingBack;