Amebis/MSICA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Simon Rozman 2015-04-09 08:50:39 +00:00
parent b2c39c3e82
commit c7e1fb1b22
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MSICALib/MSICALib.h
View File

@ -684,32 +684,6 @@ UINT ExecuteSequence(MSIHANDLE hInstall);
// Inline helper functions
////////////////////////////////////////////////////////////////////
namespace MSICA {
inline VOID GuidToString(const GUID &guid, ATL::CAtlStringA &str)
{
str.Format("{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
guid.Data1,
guid.Data2,
guid.Data3,
guid.Data4[0], guid.Data4[1],
guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
}
inline VOID GuidToString(const GUID &guid, ATL::CAtlStringW &str)
{
str.Format(L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
guid.Data1,
guid.Data2,
guid.Data3,
guid.Data4[0], guid.Data4[1],
guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
}
} // namespace MSICA
inline UINT MsiRecordFormatStringA(MSIHANDLE hInstall, MSIHANDLE hRecord, unsigned int iField, ATL::CAtlStringA &sValue)
{
UINT uiResult;

4
MSICALib/OpWLAN.cpp
View File

@ -78,7 +78,7 @@ HRESULT COpWLANProfileDelete::Execute(CSession *pSession)
else {
PMSIHANDLE hRecordProg = ::MsiCreateRecord(4);
ATL::CAtlStringW sGUID;
GuidToString(m_guidInterface, sGUID);
GuidToString(&m_guidInterface, sGUID);
::MsiRecordSetInteger(hRecordProg, 1, ERROR_INSTALL_WLAN_PROFILE_DELETE);
::MsiRecordSetStringW(hRecordProg, 2, sGUID );
::MsiRecordSetStringW(hRecordProg, 3, m_sValue );
@ -135,7 +135,7 @@ HRESULT COpWLANProfileSet::Execute(CSession *pSession)
DWORD dwSize = 1024, dwResult;
LPWSTR szBuffer = sReason.GetBuffer(dwSize);
GuidToString(m_guidInterface, sGUID);
GuidToString(&m_guidInterface, sGUID);
dwResult = ::WlanReasonCodeToString(wlrc, dwSize, szBuffer, NULL);
sReason.ReleaseBuffer(dwSize);
if (dwResult != NO_ERROR) sReason.Format(L"0x%x", wlrc);

1
MSICALib/stdafx.h
View File

@ -22,6 +22,7 @@
#include "MSICALib.h"
#include "../../../lib/atl/atlcrypt.h"
#include "../../../lib/atl/atlwin.h"
#include <atlbase.h>
#include <atlfile.h>