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

Type mismatches

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1884 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-12-05 14:49:00 +00:00
parent 415c1a00c6
commit fba4c4d342
3 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/ResourceEditor.cpp
View file

@ -201,7 +201,7 @@ BYTE* CResourceEditor::GetResource(char* szType, char* szName, LANGID wLanguage)
// Saves the edited PE into a buffer and returns it.
BYTE* CResourceEditor::Save(DWORD &dwSize) {
int i;
unsigned int i;
DWORD dwRsrcSize = m_cResDir->GetSize(); // Size of new resource section
DWORD dwRsrcSizeAligned = RALIGN(dwRsrcSize, m_ntHeaders->OptionalHeader.FileAlignment); // Align it to FileAlignment
@ -513,8 +513,8 @@ IMAGE_RESOURCE_DIRECTORY CResourceDirectory::GetInfo() {
return m_rdDir;
}
CResourceDirectoryEntry* CResourceDirectory::GetEntry(int i) {
if (m_vEntries.size() < i || i < 0)
CResourceDirectoryEntry* CResourceDirectory::GetEntry(unsigned int i) {
if (m_vEntries.size() < i)
return 0;
return m_vEntries[i];
}
@ -571,9 +571,9 @@ int CResourceDirectory::Find(char* szName) {
return Find(WORD(szName));
else
if (szName[0] == '#')
return Find(atol(szName+1));
return Find(WORD(atoi(szName+1)));
for (int i = 0; i < m_vEntries.size(); i++) {
for (unsigned int i = 0; i < m_vEntries.size(); i++) {
if (!m_vEntries[i]->HasName())
continue;
@ -591,7 +591,7 @@ int CResourceDirectory::Find(char* szName) {
// Returns the index of a directory entry with the specified id
// Returns -1 if can not be found
int CResourceDirectory::Find(WORD wId) {
for (int i = 0; i < m_vEntries.size(); i++) {
for (unsigned int i = 0; i < m_vEntries.size(); i++) {
if (m_vEntries[i]->HasName())
continue;
@ -605,7 +605,7 @@ int CResourceDirectory::Find(WORD wId) {
// Get the size of this resource directory (including all of its children)
DWORD CResourceDirectory::GetSize() {
DWORD dwSize = sizeof(IMAGE_RESOURCE_DIRECTORY);
for (int i = 0; i < m_vEntries.size(); i++) {
for (unsigned int i = 0; i < m_vEntries.size(); i++) {
dwSize += sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY);
if (m_vEntries[i]->HasName())
dwSize += sizeof(IMAGE_RESOURCE_DIR_STRING_U) + m_vEntries[i]->GetNameLength()*sizeof(WCHAR);
@ -622,7 +622,7 @@ DWORD CResourceDirectory::GetSize() {
// Destroys this directory and all of its children
void CResourceDirectory::Destroy() {
for (int i = 0; i < m_vEntries.size(); i++) {
for (unsigned int i = 0; i < m_vEntries.size(); i++) {
if (m_vEntries[i]->IsDataDirectory()) {
m_vEntries[i]->GetSubDirectory()->Destroy();
delete m_vEntries[i]->GetSubDirectory();