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

Fixed types for POSIX

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7329 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2021-09-19 18:24:24 +00:00
parent 167e53df8a
commit 0a0795dd5a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/ResourceEditor.cpp
View file

@ -43,7 +43,7 @@ static void FreeUnicodeResString(WINWCHAR* s) {
if (!IS_INTRESOURCE(s) && FIRSTRESDIRSTRADDRESS != (WINWCHAR*) s) if (!IS_INTRESOURCE(s) && FIRSTRESDIRSTRADDRESS != (WINWCHAR*) s)
free(s); free(s);
} }
static WINWCHAR* ResStringToUnicode(const char *s) { static WINWCHAR* ResStringToUnicode(const TCHAR *s) {
if (IS_INTRESOURCE(s)) return MAKEINTRESOURCEWINW((ULONG_PTR)s); if (IS_INTRESOURCE(s)) return MAKEINTRESOURCEWINW((ULONG_PTR)s);
if (FIRSTRESDIRSTRADDRESS == (WINWCHAR*) s) return (WINWCHAR*) s; if (FIRSTRESDIRSTRADDRESS == (WINWCHAR*) s) return (WINWCHAR*) s;
WINWCHAR *ws = WinWStrDupFromTChar(s); WINWCHAR *ws = WinWStrDupFromTChar(s);
@ -892,7 +892,7 @@ bool CResourceEditor::AddExtraIconFromFile(const WINWCHAR* Type, WINWCHAR* Name,
} }
template<class C, class P> static bool Contains(C&Map, P*p) { template<class C, class P> static bool Contains(C&Map, P*p) {
return p && (SIZE_T) Map.base <= (SIZE_T) p && (SIZE_T) Map.base + Map.size > (SIZE_T) p; return p && (size_t) Map.base <= (size_t) p && (size_t) Map.base + Map.size > (size_t) p;
} }
void CResourceEditor::FreeExternal(EXTERNAL&X) { void CResourceEditor::FreeExternal(EXTERNAL&X) {
@ -925,7 +925,7 @@ const TCHAR* CResourceEditor::MapExternal(const TCHAR*File, TYPEMANIPULATION Man
CResourceDataEntry*pRE = re.FindResourceT(X.RT, X.RN, X.RL, 0, &pNRDE, &pLRDE); CResourceDataEntry*pRE = re.FindResourceT(X.RT, X.RN, X.RL, 0, &pNRDE, &pLRDE);
if (pRE) { if (pRE) {
const WINWCHAR *wrn = pNRDE->GetNameOrId(); const WINWCHAR *wrn = pNRDE->GetNameOrId();
if (firstname) X.RN = IS_INTRESOURCE(wrn) ? MAKEINTRESOURCE((size_t) wrn) : _T(""); if (firstname) X.RN = IS_INTRESOURCE(wrn) ? (TCHAR*)(size_t) wrn : _T("");
X.RL = pLRDE->GetId(); X.RL = pLRDE->GetId();
ofs = pRE->GetOffset(), siz = pRE->GetSize(); ofs = pRE->GetOffset(), siz = pRE->GetSize();
} }

2
Source/icon.cpp
View file

@ -71,7 +71,7 @@ void free_loaded_icon(IconGroup&icon)
icon.clear(); icon.clear();
} }
IconGroup load_icon_res(CResourceEditor* re, const TCHAR*RT, WORD RN, LANGID RL) IconGroup load_icon_res(CResourceEditor* re, LPWSTR RT, WORD RN, LANGID RL)
{ {
IconGroupHeader* header; IconGroupHeader* header;
IconGroup result; IconGroup result;