dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Sprinkle some constness on CResourceDirectoryEntry

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6606 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-09-10 12:14:20 +00:00
parent fed52fac19
commit 757d16f937
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Source/ResourceEditor.cpp
View file

@ -711,7 +711,7 @@ void CResourceEditor::WriteRsrcSec(BYTE* pbRsrcSec) {
PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_ulWrittenAt)->UName.NameString.NameOffset = ConvertEndianness((DWORD) (seeker - pbRsrcSec)); PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_ulWrittenAt)->UName.NameString.NameOffset = ConvertEndianness((DWORD) (seeker - pbRsrcSec));
WINWCHAR* szName = cRDirE->GetName(); const WINWCHAR* szName = cRDirE->GetName();
WORD iLen = (WORD) WinWStrLen(szName) + 1; WORD iLen = (WORD) WinWStrLen(szName) + 1;
*(WORD*)seeker = ConvertEndianness(iLen); *(WORD*)seeker = ConvertEndianness(iLen);
@ -817,9 +817,9 @@ CResourceDirectoryEntry* CResourceDirectory::GetEntry(unsigned int i) {
bool CResourceDirectory::AddEntry(CResourceDirectoryEntry* entry) { bool CResourceDirectory::AddEntry(CResourceDirectoryEntry* entry) {
int i = 0; int i = 0;
if (entry->HasName()) { if (entry->HasName()) {
WINWCHAR* szEntName = entry->GetName(); const WINWCHAR* szEntName = entry->GetName();
for (i = 0; i < m_rdDir.NumberOfNamedEntries; i++) { for (i = 0; i < m_rdDir.NumberOfNamedEntries; i++) {
WINWCHAR* szName = m_vEntries[i]->GetName(); const WINWCHAR* szName = m_vEntries[i]->GetName();
int cmp = WinWStrCmp(szName, szEntName); int cmp = WinWStrCmp(szName, szEntName);
if (cmp == 0) if (cmp == 0)
return false; return false;
@ -866,7 +866,7 @@ int CResourceDirectory::Find(const WINWCHAR* szName) {
if (!m_vEntries[i]->HasName()) if (!m_vEntries[i]->HasName())
continue; continue;
WINWCHAR* szEntName = m_vEntries[i]->GetName(); const WINWCHAR* szEntName = m_vEntries[i]->GetName();
int cmp = WinWStrCmp(szName, szEntName); int cmp = WinWStrCmp(szName, szEntName);
if (!cmp) if (!cmp)
return i; return i;
@ -963,34 +963,34 @@ CResourceDirectoryEntry::~CResourceDirectoryEntry() {
// Methods // Methods
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
bool CResourceDirectoryEntry::HasName() { bool CResourceDirectoryEntry::HasName() const {
return m_bHasName; return m_bHasName;
} }
// Don't forget to free the memory used by the string after usage! // Don't forget to free the memory used by the string after usage!
WINWCHAR* CResourceDirectoryEntry::GetName() { const WINWCHAR* CResourceDirectoryEntry::GetName() const {
return m_bHasName ? m_szName : 0; return m_bHasName ? m_szName : 0;
} }
int CResourceDirectoryEntry::GetNameLength() { int CResourceDirectoryEntry::GetNameLength() const {
return (int) WinWStrLen(m_szName); return (int) WinWStrLen(m_szName);
} }
WORD CResourceDirectoryEntry::GetId() { WORD CResourceDirectoryEntry::GetId() const {
return m_bHasName ? 0 : m_wId; return m_bHasName ? 0 : m_wId;
} }
bool CResourceDirectoryEntry::IsDataDirectory() { bool CResourceDirectoryEntry::IsDataDirectory() const {
return m_bIsDataDirectory; return m_bIsDataDirectory;
} }
CResourceDirectory* CResourceDirectoryEntry::GetSubDirectory() { CResourceDirectory* CResourceDirectoryEntry::GetSubDirectory() const {
if (!m_bIsDataDirectory) if (!m_bIsDataDirectory)
return NULL; return NULL;
return m_rdSubDir; return m_rdSubDir;
} }
CResourceDataEntry* CResourceDirectoryEntry::GetDataEntry() { CResourceDataEntry* CResourceDirectoryEntry::GetDataEntry() const {
if (m_bIsDataDirectory) if (m_bIsDataDirectory)
return NULL; return NULL;
return m_rdeData; return m_rdeData;

14
Source/ResourceEditor.h
View file

@ -233,16 +233,16 @@ public:
CResourceDirectoryEntry(const WINWCHAR* szName, CResourceDataEntry* rdeData); CResourceDirectoryEntry(const WINWCHAR* szName, CResourceDataEntry* rdeData);
virtual ~CResourceDirectoryEntry(); virtual ~CResourceDirectoryEntry();
bool HasName(); bool HasName() const;
WINWCHAR* GetName(); const WINWCHAR* GetName() const;
int GetNameLength(); int GetNameLength() const;
WORD GetId(); WORD GetId() const;
bool IsDataDirectory(); bool IsDataDirectory() const;
CResourceDirectory* GetSubDirectory(); CResourceDirectory* GetSubDirectory() const;
CResourceDataEntry* GetDataEntry(); CResourceDataEntry* GetDataEntry() const;
ULONG_PTR m_ulWrittenAt; ULONG_PTR m_ulWrittenAt;