From 52408912ab9174aa0eba88c12bb77d8f3f59b26e Mon Sep 17 00:00:00 2001 From: wizou Date: Mon, 14 Jun 2010 14:28:03 +0000 Subject: [PATCH] Fix a problem with ANSI/Unicode different opcode numbers git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6101 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/fileform.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/exehead/fileform.h b/Source/exehead/fileform.h index 5b7f1d80..9bfe98ec 100644 --- a/Source/exehead/fileform.h +++ b/Source/exehead/fileform.h @@ -167,10 +167,6 @@ enum EW_FOPEN, // FileOpen: 4 [name, openmode, createmode, outputhandle] EW_FPUTS, // FileWrite: 3 [handle, string, ?int:string] EW_FGETS, // FileRead: 4 [handle, output, maxlen, ?getchar:gets] -#ifdef _UNICODE - EW_FPUTWS, // FileWriteUTF16LE: 3 [handle, string, ?int:string] - EW_FGETWS, // FileReadUTF16LE: 4 [handle, output, maxlen, ?getchar:gets] -#endif EW_FSEEK, // FileSeek: 4 [handle, offset, mode, >=0?positionoutput] #endif//NSIS_SUPPORT_FILEFUNCTIONS @@ -204,6 +200,13 @@ enum #ifdef NSIS_LOCKWINDOW_SUPPORT EW_LOCKWINDOW, #endif + +#ifdef _UNICODE // opcodes available only in Unicode installers must be at the end of the enumeration +#ifdef NSIS_SUPPORT_FILEFUNCTIONS + EW_FPUTWS, // FileWriteUTF16LE: 3 [handle, string, ?int:string] + EW_FGETWS, // FileReadUTF16LE: 4 [handle, output, maxlen, ?getchar:gets] +#endif//NSIS_SUPPORT_FILEFUNCTIONS +#endif }; #define FH_FLAGS_MASK 15