LINK disabled until crashes under Windows 98 are resolved

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2692 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-07-05 16:55:54 +00:00
parent 5086c6e339
commit c6b7e9f9a2
2 changed files with 13 additions and 1 deletions

View file

@ -63,6 +63,9 @@ char *STRDUP(const char *c)
#define FIELD_GROUPBOX (12) #define FIELD_GROUPBOX (12)
#define FIELD_LINK (13) #define FIELD_LINK (13)
// settings
// crashes on windows 98 - #define IO_ENABLE_LINK
// general flags // general flags
#define FLAG_RIGHT 0x00000001 #define FLAG_RIGHT 0x00000001
@ -529,7 +532,11 @@ bool ReadSettings(void) {
{ "ICON", FIELD_ICON }, { "ICON", FIELD_ICON },
{ "BITMAP", FIELD_BITMAP }, { "BITMAP", FIELD_BITMAP },
{ "GROUPBOX", FIELD_GROUPBOX }, { "GROUPBOX", FIELD_GROUPBOX },
#ifdef IO_ENABLE_LINK
{ "LINK", FIELD_LINK }, { "LINK", FIELD_LINK },
#else
{ "LINK", FIELD_LABEL },
#endif
{ NULL, 0 } { NULL, 0 }
}; };
// Control flags // Control flags
@ -738,6 +745,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg,
return 0; return 0;
} }
#ifdef IO_ENABLE_LINK
// pFields[nIdx].nParentIdx is used to store original windowproc // pFields[nIdx].nParentIdx is used to store original windowproc
int StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam) int StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam)
{ {
@ -824,6 +832,7 @@ int StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam)
else else
return 0; return 0;
} }
#endif
int nIdx; int nIdx;
HWND childwnd; HWND childwnd;
@ -1154,9 +1163,12 @@ int createCfgDlg()
nImageType, nImageType,
nImage nImage
); );
} else if (nType == FIELD_LINK){ }
#ifdef IO_ENABLE_LINK
else if (nType == FIELD_LINK) {
pFields[nIdx].nParentIdx = SetWindowLong(hwCtrl, GWL_WNDPROC, (long)StaticLINKWindowProc); pFields[nIdx].nParentIdx = SetWindowLong(hwCtrl, GWL_WNDPROC, (long)StaticLINKWindowProc);
} }
#endif
} }
} }

Binary file not shown.