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

Try to handle Unicode mode changes after !include

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6372 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-06-05 09:47:39 +00:00
parent 41c993aa0b
commit db1838e746
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Include/Win/COM.nsh
View file

@ -43,7 +43,7 @@ ${EndIf}
!ifndef __WIN_COM__INC
!define __WIN_COM__INC
!define __WIN_COM__INC ${NSIS_CHAR_SIZE}
!verbose push
!verbose 3
@ -57,6 +57,10 @@ ${EndIf}
!define NSISCOMCALL "!insertmacro NSISCOMCALL "
!macro NSISCOMCALL vtblidx decl ptr params
!if ${NSIS_CHAR_SIZE} <> ${__WIN_COM__INC}
; Warn if QueryInterface() for IID_IShellLink etc will return the wrong interface
!warning "NSIS_CHAR_SIZE changed, existing defines and macros might not work correctly!"
!endif
System::Call `${ptr}->${vtblidx}${decl}${params}`
!macroend
!define NSISCOMIFACEDECL "!insertmacro NSISCOMIFACEDECL "