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

MakeNSISW now uses RichEdit 2.0, compatible with Unicode (exehead UIs already uses it anyway)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6069 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-04-21 09:09:47 +00:00
parent 70ccef9cbc
commit 68c5a5751e
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Contrib/Makensisw/afxres.h
View file

@ -2,6 +2,7 @@
#define _WIN32_IE 0x0400 #define _WIN32_IE 0x0400
#include <windows.h> #include <windows.h>
#include <richedit.h>
#ifndef IDC_STATIC #ifndef IDC_STATIC
#define IDC_STATIC -1 #define IDC_STATIC -1

2
Contrib/Makensisw/makensisw.cpp
View file

@ -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")); g_sdata.sigint_event = CreateEvent(NULL, FALSE, FALSE, _T("makensis win32 signint event"));
RestoreSymbols(); RestoreSymbols();
HINSTANCE hRichEditDLL = LoadLibrary(_T("RichEd32.dll")); HINSTANCE hRichEditDLL = LoadLibrary(_T("RichEd20.dll"));
if (!InitBranding()) { if (!InitBranding()) {
MessageBox(0,NSISERROR,_T("Error"),MB_ICONEXCLAMATION|MB_OK); MessageBox(0,NSISERROR,_T("Error"),MB_ICONEXCLAMATION|MB_OK);

2
Contrib/Makensisw/resource.rc
View file

@ -161,7 +161,7 @@ CAPTION "MakeNSISW"
MENU IDM_MENU MENU IDM_MENU
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
CONTROL "",IDC_LOGWIN,"RICHEDIT",TCS_HOTTRACK | TCS_BUTTONS | CONTROL "",IDC_LOGWIN,RICHEDIT_CLASS,TCS_HOTTRACK | TCS_BUTTONS |
TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | TCS_MULTISELECT | TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | TCS_MULTISELECT |
WS_BORDER | WS_VSCROLL,7,22,345,186 WS_BORDER | WS_VSCROLL,7,22,345,186
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1

14
Examples/makensis.nsi
View file

@ -118,9 +118,9 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
File /oname=makensis.exe ..\Bin\substart.exe File /oname=makensis.exe ..\Bin\substart.exe
File ..\makensisw.exe File ..\makensisw.exe
File ..\COPYING File ..\COPYING
File ..\NSIS.chm ;File ..\NSIS.chm
File ..\NSIS.exe ;File ..\NSIS.exe
File /nonfatal ..\NSIS.exe.manifest ;File /nonfatal ..\NSIS.exe.manifest
SetOutPath $INSTDIR\Bin SetOutPath $INSTDIR\Bin
File ..\Bin\makensis.exe File ..\Bin\makensis.exe
File ..\Bin\zlib1.dll File ..\Bin\zlib1.dll
@ -177,11 +177,11 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
File ..\Docs\makensisw\*.txt File ..\Docs\makensisw\*.txt
SetOutPath $INSTDIR\Menu SetOutPath $INSTDIR\Menu
File ..\Menu\*.html ;File ..\Menu\*.html
SetOutPath $INSTDIR\Menu\images SetOutPath $INSTDIR\Menu\images
File ..\Menu\images\header.gif ;File ..\Menu\images\header.gif
File ..\Menu\images\line.gif ;File ..\Menu\images\line.gif
File ..\Menu\images\site.gif ;File ..\Menu\images\site.gif
Delete $INSTDIR\makensis.htm Delete $INSTDIR\makensis.htm
Delete $INSTDIR\Docs\*.html Delete $INSTDIR\Docs\*.html