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

Fixed bug [ 720332 ] ">301 Characters in State of List Box Bug - Install Options 2"

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2467 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-04-18 20:01:23 +00:00
parent b85c364431
commit dc783e9ff8
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -287,8 +287,8 @@ bool SaveSettings(void) {
HWND hwnd; HWND hwnd;
int nBufLen = MAX_BUFFER_LENGTH; int nBufLen = MAX_BUFFER_LENGTH;
char *pszBuffer = (char*)MALLOC(nBufLen); char *pszBuffer = (char*)MALLOC(nBufLen);
if (!pszBuffer) return false; if (!pszBuffer) return false;
for(nIdx = 0; nIdx < nNumFields; nIdx++) { for(nIdx = 0; nIdx < nNumFields; nIdx++) {
hwnd = pFields[nIdx].hwnd; hwnd = pFields[nIdx].hwnd;
wsprintf(szField, "Field %d", nIdx + 1); wsprintf(szField, "Field %d", nIdx + 1);
@ -313,7 +313,8 @@ bool SaveSettings(void) {
pszBuffer = (char*)MALLOC(nBufLen); pszBuffer = (char*)MALLOC(nBufLen);
if (!pszBuffer) return false; if (!pszBuffer) return false;
} }
char *pszItem = (char*)MALLOC(nBufLen); char *pszItem = (char*)MALLOC(/*nBufLen*/32000);
if (!pszItem) return false;
*pszBuffer = '\0'; *pszBuffer = '\0';
int nNumItems = SendMessage(hwnd, LB_GETCOUNT, 0, 0); int nNumItems = SendMessage(hwnd, LB_GETCOUNT, 0, 0);
@ -325,6 +326,9 @@ bool SaveSettings(void) {
} }
} }
wsprintf(pszItem, "%d %d %d\r\n%s\r\n%s", nLength, lstrlen(pszBuffer), nBufLen, pFields[nIdx].pszListItems, pszBuffer);
MessageBox(0, pszItem, "asd", MB_OK);
FREE(pszItem); FREE(pszItem);
break; break;
} }
@ -348,8 +352,16 @@ bool SaveSettings(void) {
WritePrivateProfileString(szField, "STATE", pszBuffer, pszFilename); WritePrivateProfileString(szField, "STATE", pszBuffer, pszFilename);
} }
MessageBox(0, "settings saved", "sad", MB_OK);
char bla[452];
wsprintf(bla, "%d", pszBuffer);
MessageBox(0, bla, pszBuffer, MB_OK);
FREE(pszBuffer); FREE(pszBuffer);
MessageBox(0, "settings saved", "sad", MB_OK);
return true; return true;
} }
@ -509,7 +521,7 @@ bool ReadSettings(void) {
pFields[nIdx].pszListItems = (char*)MALLOC(nResult + 2); pFields[nIdx].pszListItems = (char*)MALLOC(nResult + 2);
strcpy(pFields[nIdx].pszListItems, szResult); strcpy(pFields[nIdx].pszListItems, szResult);
pFields[nIdx].pszListItems[nResult] = '|'; pFields[nIdx].pszListItems[nResult] = '|';
pFields[nIdx].pszListItems[nResult + 1] = '0'; pFields[nIdx].pszListItems[nResult + 1] = '\0';
} }
} }
pFields[nIdx].nMaxLength = GetPrivateProfileInt(szField, "MaxLen", 0, pszFilename); pFields[nIdx].nMaxLength = GetPrivateProfileInt(szField, "MaxLen", 0, pszFilename);
@ -614,8 +626,10 @@ BOOL CALLBACK ParentWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara
{ {
BOOL bRes; BOOL bRes;
if (message == WM_NOTIFY_OUTER_NEXT && wParam == 1) if (message == WM_NOTIFY_OUTER_NEXT && wParam == 1)
{
// Get the settings ready for the leave function verification // Get the settings ready for the leave function verification
SaveSettings(); SaveSettings();
}
bRes = CallWindowProc((long (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,long))lpWndProcOld,hwnd,message,wParam,lParam); bRes = CallWindowProc((long (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,long))lpWndProcOld,hwnd,message,wParam,lParam);
if (message == WM_NOTIFY_OUTER_NEXT && !bRes) if (message == WM_NOTIFY_OUTER_NEXT && !bRes)
{ {
@ -894,8 +908,8 @@ int createCfgDlg()
&& (nFindMsg = LB_FINDSTRINGEXACT) && (nSetSelMsg = LB_SETCURSEL)) && (nFindMsg = LB_FINDSTRINGEXACT) && (nSetSelMsg = LB_SETCURSEL))
)) { )) {
// if this is a listbox or combobox, we need to add the list items. // if this is a listbox or combobox, we need to add the list items.
char *pszStart, *pszEnd; char *pszStart, *pszEnd, *pszList;
pszStart = pszEnd = pFields[nIdx].pszListItems; pszStart = pszEnd = pszList = STRDUP(pFields[nIdx].pszListItems);
while ((*pszEnd) && (*pszStart)) { while ((*pszEnd) && (*pszStart)) {
if (*pszEnd == '|') { if (*pszEnd == '|') {
*pszEnd = '\0'; *pszEnd = '\0';
@ -908,6 +922,7 @@ int createCfgDlg()
} }
pszEnd++; pszEnd++;
} }
FREE(pszList);
if (pFields[nIdx].pszState) { if (pFields[nIdx].pszState) {
if (pFields[nIdx].nFlags & (FLAG_MULTISELECT|FLAG_EXTENDEDSEL) && nFindMsg == LB_FINDSTRINGEXACT) { if (pFields[nIdx].nFlags & (FLAG_MULTISELECT|FLAG_EXTENDEDSEL) && nFindMsg == LB_FINDSTRINGEXACT) {
SendMessage(hwCtrl, LB_SETSEL, FALSE, -1); SendMessage(hwCtrl, LB_SETSEL, FALSE, -1);

BIN
Plugins/InstallOptions.dll
View file

Binary file not shown.