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

revert bad commit

Browse source 
TCHAR is not WCHAR on POSIX, it's wchar_t which can even be 32-bit


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6318 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2013-03-24 06:39:24 +00:00
parent b7d9abe03b
commit 9e0ad1187e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/ResourceEditor.cpp
View file

@ -233,7 +233,7 @@ static void FreeUnicodeResString(WCHAR* szwString) {
bool CResourceEditor::UpdateResource(const TCHAR* szType, WORD szName, LANGID wLanguage, BYTE* lpData, DWORD dwSize) { bool CResourceEditor::UpdateResource(const TCHAR* szType, WORD szName, LANGID wLanguage, BYTE* lpData, DWORD dwSize) {
#ifdef _UNICODE #ifdef _UNICODE
return UpdateResourceW((const WCHAR*) szType, MAKEINTRESOURCEW(szName), wLanguage, lpData, dwSize); return UpdateResourceW(szType, MAKEINTRESOURCEW(szName), wLanguage, lpData, dwSize);
#else #else
WCHAR* szwType = ResStringToUnicode(szType); WCHAR* szwType = ResStringToUnicode(szType);
bool result = UpdateResourceW(szwType, MAKEINTRESOURCEW(szName), wLanguage, lpData, dwSize); bool result = UpdateResourceW(szwType, MAKEINTRESOURCEW(szName), wLanguage, lpData, dwSize);
@ -278,7 +278,7 @@ BYTE* CResourceEditor::GetResourceW(const WCHAR* szType, WCHAR* szName, LANGID w
BYTE* CResourceEditor::GetResource(const TCHAR* szType, WORD szName, LANGID wLanguage) { BYTE* CResourceEditor::GetResource(const TCHAR* szType, WORD szName, LANGID wLanguage) {
#ifdef _UNICODE #ifdef _UNICODE
return GetResourceW((const WCHAR *) szType, MAKEINTRESOURCEW(szName), wLanguage); return GetResourceW(szType, MAKEINTRESOURCEW(szName), wLanguage);
#else #else
WCHAR* szwType = ResStringToUnicode(szType); WCHAR* szwType = ResStringToUnicode(szType);
BYTE* result = GetResourceW(szwType, MAKEINTRESOURCEW(szName), wLanguage); BYTE* result = GetResourceW(szwType, MAKEINTRESOURCEW(szName), wLanguage);
@ -317,7 +317,7 @@ int CResourceEditor::GetResourceSizeW(const WCHAR* szType, WCHAR* szName, LANGID
int CResourceEditor::GetResourceSize(const TCHAR* szType, WORD szName, LANGID wLanguage) { int CResourceEditor::GetResourceSize(const TCHAR* szType, WORD szName, LANGID wLanguage) {
#ifdef _UNICODE #ifdef _UNICODE
return GetResourceSizeW((const WCHAR*) szType, MAKEINTRESOURCEW(szName), wLanguage); return GetResourceSizeW(szType, MAKEINTRESOURCEW(szName), wLanguage);
#else #else
WCHAR* szwType = ResStringToUnicode(szType); WCHAR* szwType = ResStringToUnicode(szType);
int result = GetResourceSizeW(szwType, MAKEINTRESOURCEW(szName), wLanguage); int result = GetResourceSizeW(szwType, MAKEINTRESOURCEW(szName), wLanguage);
@ -356,7 +356,7 @@ DWORD CResourceEditor::GetResourceOffsetW(const WCHAR* szType, WCHAR* szName, LA
DWORD CResourceEditor::GetResourceOffset(const TCHAR* szType, WORD szName, LANGID wLanguage) { DWORD CResourceEditor::GetResourceOffset(const TCHAR* szType, WORD szName, LANGID wLanguage) {
#ifdef _UNICODE #ifdef _UNICODE
return GetResourceOffsetW((const WCHAR*) szType, MAKEINTRESOURCEW(szName), wLanguage); return GetResourceOffsetW(szType, MAKEINTRESOURCEW(szName), wLanguage);
#else #else
WCHAR* szwType = ResStringToUnicode(szType); WCHAR* szwType = ResStringToUnicode(szType);
DWORD result = GetResourceOffsetW(szwType, MAKEINTRESOURCEW(szName), wLanguage); DWORD result = GetResourceOffsetW(szwType, MAKEINTRESOURCEW(szName), wLanguage);