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

Cast away MAKEINTRESOURCE wchar_t* vs WORD* issue we don't care about

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7082 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2019-02-11 20:32:42 +00:00
parent 161e81c2f5
commit 2bdfe648f0
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Platform.h
View file

@ -226,13 +226,13 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
# define FIELD_OFFSET(t,f) ((UINT_PTR)&(((t*)0)->f)) # define FIELD_OFFSET(t,f) ((UINT_PTR)&(((t*)0)->f))
# endif # endif
# ifndef MAKEINTRESOURCEA # ifndef MAKEINTRESOURCEA
# define MAKEINTRESOURCEA(i) ((LPSTR)((ULONG_PTR)((WORD)(i)))) # define MAKEINTRESOURCEA(i) ((LPSTR)((ULONG_PTR)((WORD)(ULONG_PTR)(i))))
# endif # endif
# ifndef MAKEINTRESOURCEW # ifndef MAKEINTRESOURCEW
# define MAKEINTRESOURCEW(i) ((LPWSTR)((ULONG_PTR)((WORD)(i)))) # define MAKEINTRESOURCEW(i) ((LPWSTR)((ULONG_PTR)((WORD)(ULONG_PTR)(i))))
# endif # endif
# ifndef MAKEINTRESOURCE # ifndef MAKEINTRESOURCE
# ifdef UNICODE # ifdef _UNICODE
# define MAKEINTRESOURCE MAKEINTRESOURCEW # define MAKEINTRESOURCE MAKEINTRESOURCEW
# else # else
# define MAKEINTRESOURCE MAKEINTRESOURCEA # define MAKEINTRESOURCE MAKEINTRESOURCEA

5
Source/ResourceEditor.cpp
View file

@ -412,7 +412,7 @@ bool CResourceEditor::DeleteResourceT(const TCHAR* szType, WORD szName, LANGID w
return UpdateResourceT(szType, szName, wLanguage, 0, 0, Manip); return UpdateResourceT(szType, szName, wLanguage, 0, 0, Manip);
assert(!EditorSupportsStringNames() && sizeof(szName)); assert(!EditorSupportsStringNames() && sizeof(szName));
const TCHAR*name = MAKEINTRESOURCE(szName); const TCHAR *name = (const TCHAR*) MAKEINTRESOURCE(szName);
unsigned int deleted = 0; unsigned int deleted = 0;
for (;; ++deleted) { for (;; ++deleted) {
CResourceDirectoryEntry*pDir = FindResourceLanguageDirEntryT(szType, name, ANYLANGID); CResourceDirectoryEntry*pDir = FindResourceLanguageDirEntryT(szType, name, ANYLANGID);
@ -461,8 +461,9 @@ int CResourceEditor::GetResourceSizeT(const TCHAR* szType, WORD szName, LANGID w
bool CResourceEditor::ResourceExistsT(const TCHAR* szType, WORD szName, LANGID wLanguage, LANGID*pFoundLanguage) { bool CResourceEditor::ResourceExistsT(const TCHAR* szType, WORD szName, LANGID wLanguage, LANGID*pFoundLanguage) {
assert(!EditorSupportsStringNames() && sizeof(szName)); assert(!EditorSupportsStringNames() && sizeof(szName));
const TCHAR *name = (const TCHAR*) MAKEINTRESOURCE(szName);
if (wLanguage == ALLLANGID) wLanguage = ANYLANGID; if (wLanguage == ALLLANGID) wLanguage = ANYLANGID;
CResourceDirectoryEntry *pRDE = FindResourceLanguageDirEntryT(szType, MAKEINTRESOURCE(szName), wLanguage); CResourceDirectoryEntry *pRDE = FindResourceLanguageDirEntryT(szType, name, wLanguage);
if (pFoundLanguage) *pFoundLanguage = pRDE ? pRDE->GetId() : INVALIDLANGID; if (pFoundLanguage) *pFoundLanguage = pRDE ? pRDE->GetId() : INVALIDLANGID;
return pRDE != 0; return pRDE != 0;
} }