diff --git a/AMSICA/include/AMSICA.h b/AMSICA/include/AMSICA.h index bdff1e5..738abdc 100644 --- a/AMSICA/include/AMSICA.h +++ b/AMSICA/include/AMSICA.h @@ -5,13 +5,13 @@ // Version //////////////////////////////////////////////////////////////////////////// -#define AMSICA_VERSION 0x01010000 +#define AMSICA_VERSION 0x01010100 #define AMSICA_VERSION_MAJ 1 #define AMSICA_VERSION_MIN 1 -#define AMSICA_VERSION_REV 0 +#define AMSICA_VERSION_REV 1 -#define AMSICA_VERSION_STR "1.1" +#define AMSICA_VERSION_STR "1.1.1" #if !defined(RC_INVOKED) && !defined(MIDL_PASS) @@ -477,7 +477,6 @@ public: #include #include -#include #include #include @@ -791,8 +790,6 @@ inline HRESULT operator >>(ATL::CAtlFile &f, DWORDLONG &i) template inline HRESULT operator <<(ATL::CAtlFile &f, const ATL::CAtlArray &a) { - assert(a.GetCount() <= INT_MAX); - HRESULT hr; DWORD dwCount = (DWORD)a.GetCount(), dwWritten; @@ -1116,7 +1113,7 @@ inline HRESULT operator <<(ATL::CAtlFile &f, const COpRegValueCreate &op) case REG_DWORD_BIG_ENDIAN: hr = f << (int)(op.m_dwData); if (FAILED(hr)) return hr; break; case REG_MULTI_SZ: hr = f << op.m_szData; if (FAILED(hr)) return hr; break; case REG_QWORD_LITTLE_ENDIAN: hr = f << op.m_qwData; if (FAILED(hr)) return hr; break; - default: assert(0); return E_UNEXPECTED; + default: return E_UNEXPECTED; } return S_OK; @@ -1138,7 +1135,7 @@ inline HRESULT operator >>(ATL::CAtlFile &f, COpRegValueCreate &op) case REG_DWORD_BIG_ENDIAN: hr = f >> (int&)(op.m_dwData); if (FAILED(hr)) return hr; break; case REG_MULTI_SZ: hr = f >> op.m_szData; if (FAILED(hr)) return hr; break; case REG_QWORD_LITTLE_ENDIAN: hr = f >> op.m_qwData; if (FAILED(hr)) return hr; break; - default: assert(0); return E_UNEXPECTED; + default: return E_UNEXPECTED; } return S_OK; @@ -1267,7 +1264,6 @@ inline HRESULT operator <<(ATL::CAtlFile &f, const COpList &list) hr = list.Save(f, pOp); else { // Unsupported type of operation. - assert(0); hr = E_UNEXPECTED; } @@ -1340,7 +1336,6 @@ inline HRESULT operator >>(ATL::CAtlFile &f, COpList &list) break; default: // Unsupported type of operation. - assert(0); hr = E_UNEXPECTED; } @@ -1395,7 +1390,6 @@ inline BOOL IsWow64Process() template inline static HRESULT COpList::Save(ATL::CAtlFile &f, const COperation *p) { - assert(p); HRESULT hr; const T *pp = dynamic_cast(p); if (!pp) return E_UNEXPECTED; diff --git a/AMSICA/include/StdAfx.h b/AMSICA/include/StdAfx.h index 2e2ced6..a131344 100644 --- a/AMSICA/include/StdAfx.h +++ b/AMSICA/include/StdAfx.h @@ -38,9 +38,3 @@ #include #include #include - -#ifdef NDEBUG -#define verify(expr) ((void)(expr)) -#else -#define verify(expr) assert(expr) -#endif diff --git a/AMSICA/src/AMSICA.cpp b/AMSICA/src/AMSICA.cpp index ba2abd2..d009634 100644 --- a/AMSICA/src/AMSICA.cpp +++ b/AMSICA/src/AMSICA.cpp @@ -61,8 +61,6 @@ COpRollbackEnable::COpRollbackEnable(BOOL bEnable, int iTicks) : HRESULT COpRollbackEnable::Execute(CSession *pSession) { - assert(pSession); - pSession->m_bRollbackEnabled = m_bValue; return S_OK; } @@ -100,7 +98,6 @@ void COpList::Free() HRESULT COpList::LoadFromFile(LPCTSTR pszFileName) { - assert(pszFileName); HRESULT hr; ATL::CAtlFile fSequence; @@ -114,7 +111,6 @@ HRESULT COpList::LoadFromFile(LPCTSTR pszFileName) HRESULT COpList::SaveToFile(LPCTSTR pszFileName) const { - assert(pszFileName); HRESULT hr; ATL::CAtlFile fSequence; @@ -132,24 +128,22 @@ HRESULT COpList::SaveToFile(LPCTSTR pszFileName) const HRESULT COpList::Execute(CSession *pSession) { - assert(pSession); POSITION pos; HRESULT hr; PMSIHANDLE hRecordProg = ::MsiCreateRecord(3); // Tell the installer to use explicit progress messages. - verify(::MsiRecordSetInteger(hRecordProg, 1, 1) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, 1) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 3, 0) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, 1); + ::MsiRecordSetInteger(hRecordProg, 2, 1); + ::MsiRecordSetInteger(hRecordProg, 3, 0); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_PROGRESS, hRecordProg); // Prepare hRecordProg for progress messages. - verify(::MsiRecordSetInteger(hRecordProg, 1, 2) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 3, 0) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, 2); + ::MsiRecordSetInteger(hRecordProg, 3, 0); for (pos = GetHeadPosition(); pos;) { COperation *pOp = GetNext(pos); - assert(pOp); hr = pOp->Execute(pSession); if (!pSession->m_bContinueOnError && FAILED(hr)) { @@ -158,12 +152,12 @@ HRESULT COpList::Execute(CSession *pSession) return hr; } - verify(::MsiRecordSetInteger(hRecordProg, 2, pOp->m_iTicks) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 2, pOp->m_iTicks); if (::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_PROGRESS, hRecordProg) == IDCANCEL) return AtlHresultFromWin32(ERROR_INSTALL_USEREXIT); } - verify(::MsiRecordSetInteger(hRecordProg, 2, m_iTicks) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 2, m_iTicks); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_PROGRESS, hRecordProg); return S_OK; diff --git a/AMSICA/src/AMSICAFileOp.cpp b/AMSICA/src/AMSICAFileOp.cpp index f4ac5e2..41d69ba 100644 --- a/AMSICA/src/AMSICAFileOp.cpp +++ b/AMSICA/src/AMSICAFileOp.cpp @@ -15,7 +15,6 @@ COpFileDelete::COpFileDelete(LPCWSTR pszFileName, int iTicks) : HRESULT COpFileDelete::Execute(CSession *pSession) { - assert(pSession); DWORD dwError; if (pSession->m_bRollbackEnabled) { @@ -43,9 +42,9 @@ HRESULT COpFileDelete::Execute(CSession *pSession) return S_OK; else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(3); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_FILE_DELETE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 2, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 3, dwError ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_FILE_DELETE_FAILED); + ::MsiRecordSetStringW(hRecordProg, 2, m_sValue ); + ::MsiRecordSetInteger(hRecordProg, 3, dwError ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(dwError); } @@ -64,7 +63,6 @@ COpFileMove::COpFileMove(LPCWSTR pszFileSrc, LPCWSTR pszFileDst, int iTicks) : HRESULT COpFileMove::Execute(CSession *pSession) { - assert(pSession); DWORD dwError; // Move the file. @@ -78,10 +76,10 @@ HRESULT COpFileMove::Execute(CSession *pSession) return S_OK; } else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(4); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_FILE_MOVE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 2, m_sValue1 ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue2 ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 4, dwError ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_FILE_MOVE_FAILED); + ::MsiRecordSetStringW(hRecordProg, 2, m_sValue1 ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue2 ); + ::MsiRecordSetInteger(hRecordProg, 4, dwError ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(dwError); } diff --git a/AMSICA/src/AMSICATSOp.cpp b/AMSICA/src/AMSICATSOp.cpp index 9cecbe9..ee23d21 100644 --- a/AMSICA/src/AMSICATSOp.cpp +++ b/AMSICA/src/AMSICATSOp.cpp @@ -38,7 +38,7 @@ HRESULT COpTaskCreate::Execute(CSession *pSession) POSITION pos; // Display our custom message in the progress bar. - verify(::MsiRecordSetStringW(hRecordMsg, 1, m_sValue) == ERROR_SUCCESS); + ::MsiRecordSetStringW(hRecordMsg, 1, m_sValue); if (MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ACTIONDATA, hRecordMsg) == IDCANCEL) return AtlHresultFromWin32(ERROR_INSTALL_USEREXIT); @@ -396,7 +396,7 @@ HRESULT COpTaskCreate::Execute(CSession *pSession) stValue.wYear = ttData.wBeginYear; stValue.wMonth = ttData.wBeginMonth; stValue.wDay = ttData.wBeginDay; - verify(::SystemTimeToFileTime(&stValue, &ftValue)); + ::SystemTimeToFileTime(&stValue, &ftValue); ullValue = ((ULONGLONG)(ftValue.dwHighDateTime) << 32) | ftValue.dwLowDateTime; // Wrap days. @@ -408,7 +408,7 @@ HRESULT COpTaskCreate::Execute(CSession *pSession) // Convert numerical date to DMY (ULONGLONG -> FILETIME -> SYSTEMTIME). ftValue.dwHighDateTime = ullValue >> 32; ftValue.dwLowDateTime = ullValue & 0xffffffff; - verify(::FileTimeToSystemTime(&ftValue, &stValue)); + ::FileTimeToSystemTime(&ftValue, &stValue); // Set new trigger date and time. ttData.wBeginYear = stValue.wYear; @@ -431,9 +431,9 @@ HRESULT COpTaskCreate::Execute(CSession *pSession) finish: if (FAILED(hr)) { PMSIHANDLE hRecordProg = ::MsiCreateRecord(3); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_TASK_CREATE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 2, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 3, hr ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_TASK_CREATE_FAILED); + ::MsiRecordSetStringW(hRecordProg, 2, m_sValue ); + ::MsiRecordSetInteger(hRecordProg, 3, hr ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); } return hr; @@ -634,7 +634,6 @@ COpTaskDelete::COpTaskDelete(LPCWSTR pszTaskName, int iTicks) : HRESULT COpTaskDelete::Execute(CSession *pSession) { - assert(pSession); HRESULT hr; CComPtr pService; @@ -802,9 +801,9 @@ HRESULT COpTaskDelete::Execute(CSession *pSession) finish: if (FAILED(hr)) { PMSIHANDLE hRecordProg = ::MsiCreateRecord(3); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_TASK_DELETE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 2, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 3, hr ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_TASK_DELETE_FAILED); + ::MsiRecordSetStringW(hRecordProg, 2, m_sValue ); + ::MsiRecordSetInteger(hRecordProg, 3, hr ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); } return hr; @@ -824,7 +823,6 @@ COpTaskEnable::COpTaskEnable(LPCWSTR pszTaskName, BOOL bEnable, int iTicks) : HRESULT COpTaskEnable::Execute(CSession *pSession) { - assert(pSession); HRESULT hr; CComPtr pService; @@ -923,9 +921,9 @@ HRESULT COpTaskEnable::Execute(CSession *pSession) finish: if (FAILED(hr)) { PMSIHANDLE hRecordProg = ::MsiCreateRecord(3); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_TASK_ENABLE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 2, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 3, hr ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_TASK_ENABLE_FAILED); + ::MsiRecordSetStringW(hRecordProg, 2, m_sValue ); + ::MsiRecordSetInteger(hRecordProg, 3, hr ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); } return hr; @@ -944,7 +942,6 @@ COpTaskCopy::COpTaskCopy(LPCWSTR pszTaskSrc, LPCWSTR pszTaskDst, int iTicks) : HRESULT COpTaskCopy::Execute(CSession *pSession) { - assert(pSession); HRESULT hr; CComPtr pService; @@ -1029,10 +1026,10 @@ HRESULT COpTaskCopy::Execute(CSession *pSession) finish: if (FAILED(hr)) { PMSIHANDLE hRecordProg = ::MsiCreateRecord(4); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_TASK_COPY_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 2, m_sValue1 ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue2 ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 4, hr ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_TASK_COPY_FAILED); + ::MsiRecordSetStringW(hRecordProg, 2, m_sValue1 ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue2 ); + ::MsiRecordSetInteger(hRecordProg, 4, hr ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); } return hr; diff --git a/AMSICA/src/MSICARegOp.cpp b/AMSICA/src/MSICARegOp.cpp index c98612c..33b0dc0 100644 --- a/AMSICA/src/MSICARegOp.cpp +++ b/AMSICA/src/MSICARegOp.cpp @@ -37,7 +37,6 @@ COpRegKeyCreate::COpRegKeyCreate(HKEY hKeyRoot, LPCWSTR pszKeyName, int iTicks) HRESULT COpRegKeyCreate::Execute(CSession *pSession) { - assert(pSession); LONG lResult; REGSAM samAdditional = 0; ATL::CAtlStringW sPartialName; @@ -72,10 +71,10 @@ HRESULT COpRegKeyCreate::Execute(CSession *pSession) // Create the key. lResult = ::RegCreateKeyExW(m_hKeyRoot, sPartialName, NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_ENUMERATE_SUB_KEYS | samAdditional, NULL, &hKey, NULL); if (lResult != ERROR_SUCCESS) break; - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); } else if (lResult == ERROR_SUCCESS) { // This key already exists. Release its handle and continue. - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); } else break; @@ -87,10 +86,10 @@ HRESULT COpRegKeyCreate::Execute(CSession *pSession) return S_OK; else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(4); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_CREATE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 4, lResult ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_CREATE_FAILED); + ::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue ); + ::MsiRecordSetInteger(hRecordProg, 4, lResult ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(lResult); } @@ -108,7 +107,6 @@ COpRegKeyCopy::COpRegKeyCopy(HKEY hKeyRoot, LPCWSTR pszKeyNameSrc, LPCWSTR pszKe HRESULT COpRegKeyCopy::Execute(CSession *pSession) { - assert(pSession); LONG lResult; REGSAM samAdditional = 0; @@ -139,11 +137,11 @@ HRESULT COpRegKeyCopy::Execute(CSession *pSession) return S_OK; else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(5); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_COPY_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue1 ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 4, m_sValue2 ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 5, lResult ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_COPY_FAILED); + ::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue1 ); + ::MsiRecordSetStringW(hRecordProg, 4, m_sValue2 ); + ::MsiRecordSetInteger(hRecordProg, 5, lResult ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(lResult); } @@ -293,7 +291,6 @@ COpRegKeyDelete::COpRegKeyDelete(HKEY hKey, LPCWSTR pszKeyName, int iTicks) : CO HRESULT COpRegKeyDelete::Execute(CSession *pSession) { - assert(pSession); LONG lResult; HKEY hKey; REGSAM samAdditional = 0; @@ -308,7 +305,7 @@ HRESULT COpRegKeyDelete::Execute(CSession *pSession) // Probe to see if the key exists. lResult = ::RegOpenKeyExW(m_hKeyRoot, m_sValue, 0, DELETE | samAdditional, &hKey); if (lResult == ERROR_SUCCESS) { - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); if (pSession->m_bRollbackEnabled) { // Make a backup of the key first. @@ -324,7 +321,7 @@ HRESULT COpRegKeyDelete::Execute(CSession *pSession) sBackupName.Format(L"%.*ls (orig %u)", iLength, (LPCWSTR)m_sValue, ++uiCount); lResult = ::RegOpenKeyExW(m_hKeyRoot, sBackupName, 0, KEY_ENUMERATE_SUB_KEYS | samAdditional, &hKey); if (lResult != ERROR_SUCCESS) break; - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); } if (lResult == ERROR_FILE_NOT_FOUND) { // Since copying registry key is a complicated job (when rollback/commit support is required), and we do have an operation just for that, we use it. @@ -339,10 +336,10 @@ HRESULT COpRegKeyDelete::Execute(CSession *pSession) pSession->m_olCommit.AddTail(new COpRegKeyDelete(m_hKeyRoot, sBackupName)); } else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(4); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_PROBING_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, sBackupName ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 4, lResult ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_PROBING_FAILED); + ::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ); + ::MsiRecordSetStringW(hRecordProg, 3, sBackupName ); + ::MsiRecordSetInteger(hRecordProg, 4, lResult ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(lResult); } @@ -356,10 +353,10 @@ HRESULT COpRegKeyDelete::Execute(CSession *pSession) return S_OK; else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(4); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_DELETE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 4, lResult ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_DELETE_FAILED); + ::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue ); + ::MsiRecordSetInteger(hRecordProg, 4, lResult ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(lResult); } @@ -407,7 +404,7 @@ LONG COpRegKeyDelete::DeleteKeyRecursively(HKEY hKeyRoot, LPCWSTR pszKeyName, RE lResult = ERROR_OUTOFMEMORY; } - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); // Finally try to delete the key. lResult = ::RegDeleteKeyExW(hKeyRoot, pszKeyName, samAdditional, 0); @@ -466,8 +463,7 @@ COpRegValueCreate::COpRegValueCreate(HKEY hKeyRoot, LPCWSTR pszKeyName, LPCWSTR m_dwType(REG_BINARY), COpRegValueSingle(hKeyRoot, pszKeyName, pszValueName, iTicks) { - assert(lpData || !nSize); - verify(m_binData.SetCount(nSize)); + m_binData.SetCount(nSize); memcpy(m_binData.GetData(), lpData, nSize); } @@ -490,7 +486,6 @@ COpRegValueCreate::COpRegValueCreate(HKEY hKeyRoot, LPCWSTR pszKeyName, LPCWSTR HRESULT COpRegValueCreate::Execute(CSession *pSession) { - assert(pSession); LONG lResult; REGSAM sam = KEY_QUERY_VALUE | STANDARD_RIGHTS_WRITE | KEY_SET_VALUE; HKEY hKey; @@ -544,22 +539,21 @@ HRESULT COpRegValueCreate::Execute(CSession *pSession) break; default: - assert(0); lResult = ERROR_UNSUPPORTED_TYPE; } - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); } if (lResult == ERROR_SUCCESS) return S_OK; else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(5); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_SETVALUE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 4, m_sValueName ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 5, lResult ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_SETVALUE_FAILED); + ::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue ); + ::MsiRecordSetStringW(hRecordProg, 4, m_sValueName ); + ::MsiRecordSetInteger(hRecordProg, 5, lResult ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(lResult); } @@ -577,7 +571,6 @@ COpRegValueCopy::COpRegValueCopy(HKEY hKeyRoot, LPCWSTR pszKeyName, LPCWSTR pszV HRESULT COpRegValueCopy::Execute(CSession *pSession) { - assert(pSession); LONG lResult; REGSAM sam = KEY_QUERY_VALUE | KEY_SET_VALUE; HKEY hKey; @@ -607,7 +600,6 @@ HRESULT COpRegValueCopy::Execute(CSession *pSession) lResult = ::RegQueryValueExW(hKey, m_sValueName1, 0, NULL, NULL, &dwSize); if (lResult == ERROR_SUCCESS) { LPBYTE lpData = new BYTE[dwSize]; - assert(lpData); // Read the source registry value. lResult = ::RegQueryValueExW(hKey, m_sValueName1, 0, &dwType, lpData, &dwSize); if (lResult == ERROR_SUCCESS) { @@ -622,19 +614,19 @@ HRESULT COpRegValueCopy::Execute(CSession *pSession) delete [] lpData; } - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); } if (lResult == ERROR_SUCCESS) return S_OK; else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(6); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_COPYVALUE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 4, m_sValueName1 ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 5, m_sValueName2 ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 6, lResult ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_COPYVALUE_FAILED); + ::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue ); + ::MsiRecordSetStringW(hRecordProg, 4, m_sValueName1 ); + ::MsiRecordSetStringW(hRecordProg, 5, m_sValueName2 ); + ::MsiRecordSetInteger(hRecordProg, 6, lResult ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(lResult); } @@ -652,7 +644,6 @@ COpRegValueDelete::COpRegValueDelete(HKEY hKeyRoot, LPCWSTR pszKeyName, LPCWSTR HRESULT COpRegValueDelete::Execute(CSession *pSession) { - assert(pSession); LONG lResult; REGSAM sam = KEY_QUERY_VALUE | KEY_SET_VALUE; HKEY hKey; @@ -687,7 +678,7 @@ HRESULT COpRegValueDelete::Execute(CSession *pSession) COpRegValueCopy opCopy(m_hKeyRoot, m_sValue, m_sValueName, sBackupName); HRESULT hr = opCopy.Execute(pSession); if (FAILED(hr)) { - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); return hr; } @@ -698,13 +689,13 @@ HRESULT COpRegValueDelete::Execute(CSession *pSession) pSession->m_olCommit.AddTail(new COpRegValueDelete(m_hKeyRoot, m_sValue, sBackupName)); } else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(5); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_PROBINGVAL_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, sBackupName ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 4, lResult ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_PROBINGVAL_FAILED); + ::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue ); + ::MsiRecordSetStringW(hRecordProg, 3, sBackupName ); + ::MsiRecordSetInteger(hRecordProg, 4, lResult ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); return AtlHresultFromWin32(lResult); } } @@ -713,18 +704,18 @@ HRESULT COpRegValueDelete::Execute(CSession *pSession) lResult = ::RegDeleteValueW(hKey, m_sValueName); } - verify(::RegCloseKey(hKey) == ERROR_SUCCESS); + ::RegCloseKey(hKey); } if (lResult == ERROR_SUCCESS || lResult == ERROR_FILE_NOT_FOUND) return S_OK; else { PMSIHANDLE hRecordProg = ::MsiCreateRecord(5); - verify(::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_DELETEVALUE_FAILED) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 3, m_sValue ) == ERROR_SUCCESS); - verify(::MsiRecordSetStringW(hRecordProg, 4, m_sValueName ) == ERROR_SUCCESS); - verify(::MsiRecordSetInteger(hRecordProg, 5, lResult ) == ERROR_SUCCESS); + ::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_REGKEY_DELETEVALUE_FAILED); + ::MsiRecordSetInteger(hRecordProg, 2, (UINT)m_hKeyRoot & 0x7fffffff ); + ::MsiRecordSetStringW(hRecordProg, 3, m_sValue ); + ::MsiRecordSetStringW(hRecordProg, 4, m_sValueName ); + ::MsiRecordSetInteger(hRecordProg, 5, lResult ); ::MsiProcessMessage(pSession->m_hInstall, INSTALLMESSAGE_ERROR, hRecordProg); return AtlHresultFromWin32(lResult); }