From 68c5a5751e8b80d2ff24b92ba362780bbbb264ab Mon Sep 17 00:00:00 2001
From: wizou <wizou@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 21 Apr 2010 09:09:47 +0000
Subject: [PATCH] MakeNSISW now uses RichEdit 2.0, compatible with Unicode
 (exehead UIs already uses it anyway)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6069 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/afxres.h      |  1 +
 Contrib/Makensisw/makensisw.cpp |  2 +-
 Contrib/Makensisw/resource.rc   |  2 +-
 Examples/makensis.nsi           | 14 +++++++-------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Contrib/Makensisw/afxres.h b/Contrib/Makensisw/afxres.h
index cc81d957..80f822f7 100644
--- a/Contrib/Makensisw/afxres.h
+++ b/Contrib/Makensisw/afxres.h
@@ -2,6 +2,7 @@
 
 #define _WIN32_IE 0x0400
 #include <windows.h>
+#include <richedit.h>
 
 #ifndef IDC_STATIC
 #define IDC_STATIC -1
diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index 19248721..2d6d6cb5 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -49,7 +49,7 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, TCHAR *cmdParam, int
   g_sdata.sigint_event = CreateEvent(NULL, FALSE, FALSE, _T("makensis win32 signint event"));
   RestoreSymbols();
 
-  HINSTANCE hRichEditDLL = LoadLibrary(_T("RichEd32.dll"));
+  HINSTANCE hRichEditDLL = LoadLibrary(_T("RichEd20.dll"));
 
   if (!InitBranding()) {
     MessageBox(0,NSISERROR,_T("Error"),MB_ICONEXCLAMATION|MB_OK);
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index b6aae6c8..dd281165 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -161,7 +161,7 @@ CAPTION "MakeNSISW"
 MENU IDM_MENU
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "",IDC_LOGWIN,"RICHEDIT",TCS_HOTTRACK | TCS_BUTTONS | 
+    CONTROL         "",IDC_LOGWIN,RICHEDIT_CLASS,TCS_HOTTRACK | TCS_BUTTONS | 
                     TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | TCS_MULTISELECT | 
                     WS_BORDER | WS_VSCROLL,7,22,345,186
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index dc4e7f7d..81bf3224 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -118,9 +118,9 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
   File /oname=makensis.exe ..\Bin\substart.exe
   File ..\makensisw.exe
   File ..\COPYING
-  File ..\NSIS.chm
-  File ..\NSIS.exe
-  File /nonfatal ..\NSIS.exe.manifest
+  ;File ..\NSIS.chm
+  ;File ..\NSIS.exe
+  ;File /nonfatal ..\NSIS.exe.manifest
   SetOutPath $INSTDIR\Bin
   File ..\Bin\makensis.exe
   File ..\Bin\zlib1.dll
@@ -177,11 +177,11 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
   File ..\Docs\makensisw\*.txt
 
   SetOutPath $INSTDIR\Menu
-  File ..\Menu\*.html
+  ;File ..\Menu\*.html
   SetOutPath $INSTDIR\Menu\images
-  File ..\Menu\images\header.gif
-  File ..\Menu\images\line.gif
-  File ..\Menu\images\site.gif
+  ;File ..\Menu\images\header.gif
+  ;File ..\Menu\images\line.gif
+  ;File ..\Menu\images\site.gif
 
   Delete $INSTDIR\makensis.htm
   Delete $INSTDIR\Docs\*.html