From b7d9abe03b9434b0eb500bb461686e046b820a34 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 24 Mar 2013 06:12:24 +0000 Subject: [PATCH] gotta cast for gcc git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6317 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/ResourceEditor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp index 1c19d830..7daeb868 100644 --- a/Source/ResourceEditor.cpp +++ b/Source/ResourceEditor.cpp @@ -233,7 +233,7 @@ static void FreeUnicodeResString(WCHAR* szwString) { bool CResourceEditor::UpdateResource(const TCHAR* szType, WORD szName, LANGID wLanguage, BYTE* lpData, DWORD dwSize) { #ifdef _UNICODE - return UpdateResourceW(szType, MAKEINTRESOURCEW(szName), wLanguage, lpData, dwSize); + return UpdateResourceW((const WCHAR*) szType, MAKEINTRESOURCEW(szName), wLanguage, lpData, dwSize); #else WCHAR* szwType = ResStringToUnicode(szType); 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) { #ifdef _UNICODE - return GetResourceW(szType, MAKEINTRESOURCEW(szName), wLanguage); + return GetResourceW((const WCHAR *) szType, MAKEINTRESOURCEW(szName), wLanguage); #else WCHAR* szwType = ResStringToUnicode(szType); 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) { #ifdef _UNICODE - return GetResourceSizeW(szType, MAKEINTRESOURCEW(szName), wLanguage); + return GetResourceSizeW((const WCHAR*) szType, MAKEINTRESOURCEW(szName), wLanguage); #else WCHAR* szwType = ResStringToUnicode(szType); 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) { #ifdef _UNICODE - return GetResourceOffsetW(szType, MAKEINTRESOURCEW(szName), wLanguage); + return GetResourceOffsetW((const WCHAR*) szType, MAKEINTRESOURCEW(szName), wLanguage); #else WCHAR* szwType = ResStringToUnicode(szType); DWORD result = GetResourceOffsetW(szwType, MAKEINTRESOURCEW(szName), wLanguage);