From 8f5a7b54eb953bbfc877ec915e26b3a95ec28d00 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> Date: Sun, 21 Feb 2010 23:00:56 +0000 Subject: New updater with 3x reduced footprint and fully W7 and x64 compatible git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@476 4f64403b-2f21-0410-a795-97e2b3489a10 --- updater/conf_comp_dialog.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'updater/conf_comp_dialog.cpp') diff --git a/updater/conf_comp_dialog.cpp b/updater/conf_comp_dialog.cpp index 6daebde..1134b0f 100644 --- a/updater/conf_comp_dialog.cpp +++ b/updater/conf_comp_dialog.cpp @@ -1,7 +1,7 @@ #include "common.h" #include "conf_comp_dialog.h" -void FillFolder(TCHAR *folder_name, StringList *filenames) { +void FillFolder(TCHAR *folder_name, StrList *filenames) { TCHAR mask[MAX_PATH], filename[MAX_PATH], *p; _tcscpy(mask, folder_name); @@ -22,7 +22,7 @@ void FillFolder(TCHAR *folder_name, StringList *filenames) { if(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { FillFolder(filename, filenames); } else { - filenames->push_back(filename); + filenames->insert(mir_tstrdup(filename)); } } } while(FindNextFile(hFileSearch, &findData)); @@ -54,7 +54,7 @@ INT_PTR CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, //enumerate plugins, fill in list { - StringList filenames; + StrList filenames; ListView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_LIST_COMPONENTS)); @@ -70,9 +70,11 @@ INT_PTR CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, TCHAR *p; FillFolder(options.temp_folder, &filenames); - for(filenames.reset(); filenames.current(); filenames.next()) { - if(_tcslen(filenames.current()) > temp_folder_name_len) { - p = filenames.current() + temp_folder_name_len + 1; + for (int i = 0; i < filenames.getCount(); ++i) + { + if(_tcslen(filenames[i]) > temp_folder_name_len) + { + p = filenames[i] + temp_folder_name_len + 1; lvI.iSubItem = 0; lvI.pszText = p; @@ -167,7 +169,7 @@ INT_PTR CALLBACK DlgProcConfirmComponents(HWND hwndDlg, UINT msg, WPARAM wParam, TCHAR fname_buff[MAX_PATH]; _tcscpy(fname_buff, options.temp_folder); _tcscat(fname_buff, _T("\\")); - size_t path_len = _tcslen(fname_buff); + int path_len = (int)_tcslen(fname_buff); TCHAR *p = fname_buff + path_len; int size = ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_LIST_COMPONENTS)); -- cgit v1.2.3