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

added COMPRESSOR_NONE_SELECTED instead of (NCOMPRESSOR)-1

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5043 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-10 19:48:54 +00:00
parent 122d84ddf2
commit 39e22a96dd
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Contrib/Makensisw/makensisw.cpp
View file

@ -117,7 +117,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
SendDlgItemMessage(hwndDlg,IDC_LOGWIN,WM_SETFONT,(WPARAM)hFont,0); SendDlgItemMessage(hwndDlg,IDC_LOGWIN,WM_SETFONT,(WPARAM)hFont,0);
RestoreWindowPos(g_sdata.hwnd); RestoreWindowPos(g_sdata.hwnd);
RestoreCompressor(); RestoreCompressor();
g_sdata.compressor = (NCOMPRESSOR)-1; g_sdata.compressor = COMPRESSOR_NONE_SELECTED;
argSpaceSize = SetArgv((char *)GetCommandLine(), &argc, &argv); argSpaceSize = SetArgv((char *)GetCommandLine(), &argc, &argv);
if(argc > 1) { if(argc > 1) {
@ -159,7 +159,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
if (argSpaceSize) if (argSpaceSize)
GlobalFree(argv); GlobalFree(argv);
if(g_sdata.compressor == (NCOMPRESSOR)-1) { if(g_sdata.compressor == COMPRESSOR_NONE_SELECTED) {
SetCompressor(g_sdata.default_compressor); SetCompressor(g_sdata.default_compressor);
} }
if(chooseCompressor) { if(chooseCompressor) {

3
Contrib/Makensisw/makensisw.h
View file

@ -81,7 +81,8 @@ enum {
}; };
typedef enum { typedef enum {
COMPRESSOR_SCRIPT, COMPRESSOR_NONE_SELECTED = -1,
COMPRESSOR_SCRIPT = 0,
COMPRESSOR_ZLIB, COMPRESSOR_ZLIB,
COMPRESSOR_ZLIB_SOLID, COMPRESSOR_ZLIB_SOLID,
COMPRESSOR_BZIP2, COMPRESSOR_BZIP2,