Commit: 9b1e7fdd6ec29ba4cef95665722de7684c75b355 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: 9b1e7fdd6ec29ba4cef95665722de7684c75b355 (tree)
• l'heure: 2009-05-01 23:23:51
• Auteur: John E. <tdragon@user...>
• Commiter: John E.

Message de Log

Preserve file attributes in archives, UI code modularization

Change Summary

• modified: archiveread.c
• modified: archiveread7z.c
• modified: archivereadtar.c
• modified: archivereadzip.c
• modified: categorytree.c
• modified: categorytree.hh
• modified: download.c
• modified: download.hh
• modified: mainwnd.c
• modified: mingw-get.cbp
• modified: packagelist.c
• modified: pkgindex.cpp
• modified: ui_general.c
• modified: ui_general.hh

Modification

--- a/archiveread.c
+++ b/archiveread.c
@@ -73,7 +73,9 @@ int ArchiveRead_ExtractEntryToBase
  (ArchiveReader* reader,
   char const* base_path)
 {
-	return ((ArchiveReaderStruct*)reader)->internal_extract_entry_to_base(reader, base_path);
+	return ((ArchiveReaderStruct*)reader)->internal_extract_entry_to_base(
+	 reader, base_path
+	 );
 }
 
 

--- a/archiveread7z.c
+++ b/archiveread7z.c
@@ -109,76 +109,81 @@ int ArchiveRead7z_ExtractEntryToBase
 	 READER7Z(reader)->db.Database.Files[READER7Z(reader)->entry].Name);
 
 	if (ArchiveRead7z_EntryIsDirectory(reader))
-		return ArchiveRead_EnsureDirectory(fullpath, strlen(base_path));
-
-	int rmostsep = strlen(fullpath) - 1;
-	while (rmostsep > 0
-	 && fullpath[rmostsep] != '/' && fullpath[rmostsep] != '\\')
-		--rmostsep;
-	if (rmostsep > 0)
 	{
-		char save = fullpath[rmostsep];
-		fullpath[rmostsep] = 0;
 		if (!ArchiveRead_EnsureDirectory(fullpath, strlen(base_path)))
-		{
-			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-			 "Failed to create directory '%s' for extraction", fullpath);
 			return 0;
-		}
-		fullpath[rmostsep] = save;
 	}
-
-	if (!READER7Z(reader)->instream.filep)
+	else
 	{
-		READER7Z(reader)->instream.filep =
-		 fopen(READER7Z(reader)->path, "rb");
+		int rmostsep = strlen(fullpath) - 1;
+		while (rmostsep > 0
+		 && fullpath[rmostsep] != '/' && fullpath[rmostsep] != '\\')
+			--rmostsep;
+		if (rmostsep > 0)
+		{
+			char save = fullpath[rmostsep];
+			fullpath[rmostsep] = 0;
+			if (!ArchiveRead_EnsureDirectory(fullpath, strlen(base_path)))
+			{
+				ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+				 "Failed to create directory '%s' for extraction", fullpath);
+				return 0;
+			}
+			fullpath[rmostsep] = save;
+		}
+
 		if (!READER7Z(reader)->instream.filep)
 		{
+			READER7Z(reader)->instream.filep =
+			 fopen(READER7Z(reader)->path, "rb");
+			if (!READER7Z(reader)->instream.filep)
+			{
+				ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+				 "Failed to reopen file '%s' for entry extraction",
+				 READER7Z(reader)->path);
+				return 0;
+			}
+		}
+
+		size_t offset, outSizeProcessed;
+		SZ_RESULT res = SzExtract(&(READER7Z(reader)->instream.sz_stream),
+		 &(READER7Z(reader)->db), READER7Z(reader)->entry,
+		 &(READER7Z(reader)->blockIndex),
+		 &(READER7Z(reader)->outBuffer),
+		 &(READER7Z(reader)->outBufferSize), &offset, &outSizeProcessed,
+		 &g_allocImp, &g_allocTempImp);
+		if (res == SZE_CRC_ERROR)
+		{
 			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-			 "Failed to reopen file '%s' for entry extraction",
-			 READER7Z(reader)->path);
+			 "Bad CRC for entry '%s'",
+			 READER7Z(reader)->db.Database.Files[READER7Z(reader)->entry].Name);
+			return 0;
+		}
+		else if (res != SZ_OK)
+		{
+			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+			 "7zlib failed to unpack entry '%s'",
+			 READER7Z(reader)->db.Database.Files[READER7Z(reader)->entry].Name);
 			return 0;
 		}
-	}
 
-	size_t offset, outSizeProcessed;
-	SZ_RESULT res = SzExtract(&(READER7Z(reader)->instream.sz_stream),
-	 &(READER7Z(reader)->db), READER7Z(reader)->entry,
-	 &(READER7Z(reader)->blockIndex),
-	 &(READER7Z(reader)->outBuffer),
-	 &(READER7Z(reader)->outBufferSize), &offset, &outSizeProcessed,
-	 &g_allocImp, &g_allocTempImp);
-	if (res == SZE_CRC_ERROR)
-	{
-		ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-		 "Bad CRC for entry '%s'",
-		 READER7Z(reader)->db.Database.Files[READER7Z(reader)->entry].Name);
-		return 0;
-	}
-	else if (res != SZ_OK)
-	{
-		ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-		 "7zlib failed to unpack entry '%s'",
-		 READER7Z(reader)->db.Database.Files[READER7Z(reader)->entry].Name);
-		return 0;
-	}
+		char tmppath[PATH_MAX + 1];
+		snprintf(tmppath, PATH_MAX + 1, "%s.tmp", fullpath);
 
-	char tmppath[PATH_MAX + 1];
-	snprintf(tmppath, PATH_MAX + 1, "%s.tmp", fullpath);
+		FILE* outfile = fopen(tmppath, "wb");
+		if (!outfile)
+		{
+			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+			 "Failed to open output file '%s'", tmppath);
+			return 0;
+		}
+		fwrite(READER7Z(reader)->outBuffer + offset, 1, outSizeProcessed,
+		 outfile);
+		fclose(outfile);
 
-	FILE* outfile = fopen(tmppath, "wb");
-	if (!outfile)
-	{
-		ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-		 "Failed to open output file '%s'", tmppath);
-		return 0;
+		remove(fullpath);
+		rename(tmppath, fullpath);
 	}
-	fwrite(READER7Z(reader)->outBuffer + offset, 1, outSizeProcessed,
-	 outfile);
-	fclose(outfile);
-
-	remove(fullpath);
-	rename(tmppath, fullpath);
 
 	if (READER7Z(reader)->db.Database.Files[READER7Z(reader)->entry].AreAttributesDefined)
 		SetFileAttributes(fullpath, READER7Z(reader)->db.Database.Files[READER7Z(reader)->entry].Attributes);
@@ -222,6 +227,7 @@ void* ArchiveRead7z_OpenFile(char const* file)
 	SZ_RESULT ret = SzArchiveOpen(&instream.sz_stream, &reader->db, &g_allocImp,
 	 &g_allocTempImp);
 	fclose(instream.filep);
+	instream.filep = 0;
 	if (ret != SZ_OK)
 	{
 		ArchiveRead_SetError(&reader->base,

--- a/archivereadtar.c
+++ b/archivereadtar.c
@@ -385,65 +385,71 @@ int ArchiveReadTar_ExtractEntryToBase
 	 READERTAR(reader)->entry_path);
 
 	if (ArchiveReadTar_EntryIsDirectory(reader))
-		return ArchiveRead_EnsureDirectory(fullpath, strlen(base_path));
-
-	int rmostsep = strlen(fullpath) - 1;
-	while (rmostsep > 0
-	 && fullpath[rmostsep] != '/' && fullpath[rmostsep] != '\\')
-		--rmostsep;
-	if (rmostsep > 0)
 	{
-		char save = fullpath[rmostsep];
-		fullpath[rmostsep] = 0;
 		if (!ArchiveRead_EnsureDirectory(fullpath, strlen(base_path)))
-		{
-			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-			 "Failed to create directory '%s' for extraction", fullpath);
 			return 0;
-		}
-		fullpath[rmostsep] = save;
 	}
-
-	char tmppath[PATH_MAX + 1];
-	snprintf(tmppath, PATH_MAX + 1, "%s.tmp", fullpath);
-
-	FILE* outfile = fopen(tmppath, "wb");
-	if (!outfile)
+	else
 	{
-		ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-		 "Failed to open file '%s' for output", tmppath);
-		return 0;
-	}
+		int rmostsep = strlen(fullpath) - 1;
+		while (rmostsep > 0
+		 && fullpath[rmostsep] != '/' && fullpath[rmostsep] != '\\')
+			--rmostsep;
+		if (rmostsep > 0)
+		{
+			char save = fullpath[rmostsep];
+			fullpath[rmostsep] = 0;
+			if (!ArchiveRead_EnsureDirectory(fullpath, strlen(base_path)))
+			{
+				ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+				 "Failed to create directory '%s' for extraction", fullpath);
+				return 0;
+			}
+			fullpath[rmostsep] = save;
+		}
 
-	char buf[BLOCKSIZE];
-	while (READERTAR(reader)->entry_data > 0)
-	{
-		if (DecompressRead(READERTAR(reader), buf, BLOCKSIZE) != BLOCKSIZE)
+		char tmppath[PATH_MAX + 1];
+		snprintf(tmppath, PATH_MAX + 1, "%s.tmp", fullpath);
+
+		FILE* outfile = fopen(tmppath, "wb");
+		if (!outfile)
 		{
 			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-			 "Failed to read %d bytes from decompression stream", BLOCKSIZE);
-			fclose(outfile);
-			remove(tmppath);
+			 "Failed to open file '%s' for output", tmppath);
 			return 0;
 		}
-		int write = (READERTAR(reader)->entry_data < BLOCKSIZE) ?
-		 READERTAR(reader)->entry_data : BLOCKSIZE;
-		if (fwrite(buf, 1, write, outfile) != write)
+
+		char buf[BLOCKSIZE];
+		while (READERTAR(reader)->entry_data > 0)
 		{
-			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-			 "Failed to write %d bytes to '%s'", write, tmppath);
-			fclose(outfile);
-			remove(tmppath);
-			return 0;
+			if (DecompressRead(READERTAR(reader), buf, BLOCKSIZE) != BLOCKSIZE)
+			{
+				ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+				 "Failed to read %d bytes from decompression stream", BLOCKSIZE);
+				fclose(outfile);
+				remove(tmppath);
+				return 0;
+			}
+			int write = (READERTAR(reader)->entry_data < BLOCKSIZE) ?
+			 READERTAR(reader)->entry_data : BLOCKSIZE;
+			if (fwrite(buf, 1, write, outfile) != write)
+			{
+				ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+				 "Failed to write %d bytes to '%s'", write, tmppath);
+				fclose(outfile);
+				remove(tmppath);
+				return 0;
+			}
+			READERTAR(reader)->entry_data -= write;
 		}
-		READERTAR(reader)->entry_data -= write;
-	}
-	fclose(outfile);
+		fclose(outfile);
+
+		remove(fullpath);
+		rename(tmppath, fullpath);
 
-	remove(fullpath);
-	rename(tmppath, fullpath);
+		setfiletime(fullpath, READERTAR(reader)->entry_time);
+	}
 
-	setfiletime(fullpath, READERTAR(reader)->entry_time);
 	chmod(fullpath, READERTAR(reader)->entry_mode);
 
 	return 1;

--- a/archivereadzip.c
+++ b/archivereadzip.c
@@ -117,84 +117,90 @@ int ArchiveReadZip_ExtractEntryToBase
 	 READERZIP(reader)->entry_path);
 
 	if (ArchiveReadZip_EntryIsDirectory(reader))
-		return ArchiveRead_EnsureDirectory(fullpath, strlen(base_path));
-
-	int rmostsep = strlen(fullpath) - 1;
-	while (rmostsep > 0
-	 && fullpath[rmostsep] != '/' && fullpath[rmostsep] != '\\')
-		--rmostsep;
-	if (rmostsep > 0)
 	{
-		char save = fullpath[rmostsep];
-		fullpath[rmostsep] = 0;
 		if (!ArchiveRead_EnsureDirectory(fullpath, strlen(base_path)))
+			return 0;
+	}
+	else
+	{
+		int rmostsep = strlen(fullpath) - 1;
+		while (rmostsep > 0
+		 && fullpath[rmostsep] != '/' && fullpath[rmostsep] != '\\')
+			--rmostsep;
+		if (rmostsep > 0)
+		{
+			char save = fullpath[rmostsep];
+			fullpath[rmostsep] = 0;
+			if (!ArchiveRead_EnsureDirectory(fullpath, strlen(base_path)))
+			{
+				ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+				 "Failed to create directory '%s' for extraction", fullpath);
+				return 0;
+			}
+			fullpath[rmostsep] = save;
+		}
+
+		if (unzOpenCurrentFile(READERZIP(reader)->zf) != UNZ_OK)
 		{
 			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-			 "Failed to create directory '%s' for extraction", fullpath);
+			 "minizip couldn't open entry '%s' for extraction",
+			 READERZIP(reader)->entry_path);
 			return 0;
 		}
-		fullpath[rmostsep] = save;
-	}
 
-	if (unzOpenCurrentFile(READERZIP(reader)->zf) != UNZ_OK)
-	{
-		ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-		 "minizip couldn't open entry '%s' for extraction",
-		 READERZIP(reader)->entry_path);
-		return 0;
-	}
+		char tmppath[PATH_MAX + 1];
+		snprintf(tmppath, PATH_MAX + 1, "%s.tmp", fullpath);
 
-	char tmppath[PATH_MAX + 1];
-	snprintf(tmppath, PATH_MAX + 1, "%s.tmp", fullpath);
+		FILE* outfile = fopen(tmppath, "wb");
+		if (!outfile)
+		{
+			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+			 "Failed to open file '%s' for output", tmppath);
+			unzCloseCurrentFile(READERZIP(reader)->zf);
+			return 0;
+		}
 
-	FILE* outfile = fopen(tmppath, "wb");
-	if (!outfile)
-	{
-		ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-		 "Failed to open file '%s' for output", tmppath);
-		unzCloseCurrentFile(READERZIP(reader)->zf);
-		return 0;
-	}
+		int const buf_size = 1024 * 1024;
+		char* buf = malloc(buf_size);
+		int read;
+		while ((read = unzReadCurrentFile(READERZIP(reader)->zf, buf, buf_size)) > 0)
+		{
+			if (fwrite(buf, 1, read, outfile) != read)
+			{
+				ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+				 "Failed to write %d bytes to '%s'", read, tmppath);
+				free(buf);
+				fclose(outfile);
+				remove(tmppath);
+				unzCloseCurrentFile(READERZIP(reader)->zf);
+				return 0;
+			}
+		}
+		free(buf);
+		fclose(outfile);
 
-	int const buf_size = 1024 * 1024;
-	char* buf = malloc(buf_size);
-	int read;
-	while ((read = unzReadCurrentFile(READERZIP(reader)->zf, buf, buf_size)) > 0)
-	{
-		if (fwrite(buf, 1, read, outfile) != read)
+		int close_result = unzCloseCurrentFile(READERZIP(reader)->zf);
+		if (read < 0)
 		{
 			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-			 "Failed to write %d bytes to '%s'", read, tmppath);
-			free(buf);
-			fclose(outfile);
+			 "minizip error extracting entry '%s'", READERZIP(reader)->entry_path);
+			remove(tmppath);
+			return 0;
+		}
+		if (close_result == UNZ_CRCERROR)
+		{
+			ArchiveRead_SetError((ArchiveReaderStruct*)reader,
+			 "Bad CRC extracting entry '%s'", READERZIP(reader)->entry_path);
 			remove(tmppath);
-			unzCloseCurrentFile(READERZIP(reader)->zf);
 			return 0;
 		}
-	}
-	free(buf);
-	fclose(outfile);
 
-	int close_result = unzCloseCurrentFile(READERZIP(reader)->zf);
-	if (read < 0)
-	{
-		ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-		 "minizip error extracting entry '%s'", READERZIP(reader)->entry_path);
-		remove(tmppath);
-		return 0;
-	}
-	if (close_result == UNZ_CRCERROR)
-	{
-		ArchiveRead_SetError((ArchiveReaderStruct*)reader,
-		 "Bad CRC extracting entry '%s'", READERZIP(reader)->entry_path);
-		remove(tmppath);
-		return 0;
-	}
+		remove(fullpath);
+		rename(tmppath, fullpath);
 
-	remove(fullpath);
-	rename(tmppath, fullpath);
+		setfiletime(fullpath, READERZIP(reader)->entry_info.dosDate);
+	}
 
-	setfiletime(fullpath, READERZIP(reader)->entry_info.dosDate);
 	SetFileAttributes(fullpath, READERZIP(reader)->entry_info.external_fa);
 
 	return 1;

--- a/categorytree.c
+++ b/categorytree.c
@@ -9,6 +9,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commctrl.h>
+#include <stdio.h>
 #include "mainwnd.hh"
 #include "packagelist.hh"
 #include "pkgindex.hh"
@@ -57,6 +58,57 @@ void CategoryTree_Reload()
 			 0, (LPARAM)(LPTVINSERTSTRUCT)&tvins);
 		}
 	}
-	int cats[] = {0, -1};
-	PackageList_SetCategories(cats);
+	int cats = -1;
+	PackageList_SetCategories(&cats);
+}
+
+
+int CategoryTree_WM_NOTIFY
+ (HWND hwndDlg,
+  WPARAM wParam,
+  LPARAM lParam,
+  int* return_value_out __attribute__((unused)))
+{
+	switch (((LPNMHDR)lParam)->code)
+	{
+	case TVN_SELCHANGED:
+		if (((LPNMTREEVIEW)lParam)->itemNew.lParam < 0)
+		{
+			HWND htv = GetDlgItem(hwndDlg, IDC_CATLIST);
+			int childct = 0;
+			HTREEITEM child = TreeView_GetChild(htv,
+			 ((LPNMTREEVIEW)lParam)->itemNew.hItem);
+			for (; child; child = TreeView_GetNextSibling(htv, child))
+				++childct;
+			int cats[childct + 1];
+			cats[childct] = -1;
+			for (child = TreeView_GetChild(htv,
+			 ((LPNMTREEVIEW)lParam)->itemNew.hItem);
+			 child;
+			 child = TreeView_GetNextSibling(htv, child))
+			{
+				TVITEM tvitem;
+				tvitem.hItem = child;
+				tvitem.mask = TVIF_PARAM;
+				if (TreeView_GetItem(htv, &tvitem))
+					cats[childct - 1] = tvitem.lParam - 1;
+				else
+					cats[childct - 1] = -1;
+				--childct;
+			}
+			PackageList_SetCategories(cats);
+		}
+		else if (((LPNMTREEVIEW)lParam)->itemNew.lParam == 0)
+		{
+			int cats = -1;
+			PackageList_SetCategories(&cats);
+		}
+		else
+		{
+			int cats[] = {((LPNMTREEVIEW)lParam)->itemNew.lParam - 1, -1};
+			PackageList_SetCategories(cats);
+		}
+		break;
+	}
+	return 0;
 }

--- a/categorytree.hh
+++ b/categorytree.hh
@@ -6,12 +6,21 @@
 #define CATEGORYTREE_HH_INC
 
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
 void CategoryTree_Reload();
+int CategoryTree_WM_NOTIFY
+ (HWND hwndDlg,
+  WPARAM wParam,
+  LPARAM lParam,
+  int* return_value_out);
 
 
 #ifdef __cplusplus

--- a/download.c
+++ b/download.c
@@ -7,7 +7,8 @@
 
 typedef struct CallbackInfo
 {
-	int (*next_callback)(size_t, size_t);
+	int (*next_callback)(size_t, size_t, void*);
+	void* callback_param;
 } CallbackInfo;
 
 int DLCallback
@@ -18,14 +19,15 @@ int DLCallback
   double ulnow)
 {
 	return ((CallbackInfo*)clientp)->next_callback((size_t)dltotal,
-	 (size_t)dlnow);
+	 (size_t)dlnow, ((CallbackInfo*)clientp)->callback_param);
 }
 
 
 int DownloadFile
  (const char* url,
   const char* local,
-  int (*prog_callback)(size_t, size_t))
+  int (*prog_callback)(size_t, size_t, void*),
+  void* callback_param)
 {
 	int ret = 1;
 
@@ -51,6 +53,7 @@ int DownloadFile
 				curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, DLCallback);
 				CallbackInfo info;
 				info.next_callback = prog_callback;
+				info.callback_param = callback_param;
 				curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &info);
 			}
 			else

--- a/download.hh
+++ b/download.hh
@@ -17,7 +17,8 @@ extern "C" {
 int DownloadFile
  (const char* url,
   const char* local,
-  int (*prog_callback)(size_t, size_t));
+  int (*prog_callback)(size_t, size_t, void*),
+  void* callback_param);
 
 
 #ifdef __cplusplus

--- a/mainwnd.c
+++ b/mainwnd.c
@@ -16,6 +16,7 @@
 #include "ui_general.hh"
 #include "pkgindex.hh"
 #include "packagelist.hh"
+#include "categorytree.hh"
 
 
 HWND g_hmainwnd = 0;
@@ -100,7 +101,7 @@ BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 			HWND hcb = GetDlgItem(hwndDlg, IDC_CATTYPE);
 			SendMessage(hcb, CB_ADDSTRING, 0, (LPARAM)"Category");
-			SendMessage(hcb, CB_ADDSTRING, 0, (LPARAM)"State");
+			SendMessage(hcb, CB_ADDSTRING, 0, (LPARAM)"Installed");
 			SendMessage(hcb, CB_ADDSTRING, 0, (LPARAM)"Release Status");
 			SendMessage(hcb, CB_SETCURSEL, 0, 0);
 
@@ -153,19 +154,22 @@ BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		case IDM_SOURCES_REPOSITORIES:
 			EditReposDlg();
 			return TRUE;
-		case IDC_CATLIST:
-			if (HIWORD(wParam) == LBN_SELCHANGE)
-			{
-				//UI_OnCategoryChange(ListBox_GetCurSel((HWND)lParam));
-				return TRUE;
-			}
-			break;
 		}
 		break;
 
 	case WM_NOTIFY:
 		switch (((LPNMHDR)lParam)->idFrom)
 		{
+		case IDC_CATLIST:
+			{
+				int retval;
+				if (CategoryTree_WM_NOTIFY(hwndDlg, wParam, lParam, &retval))
+				{
+					SetWindowLong(hwndDlg, DWL_MSGRESULT, retval);
+					return TRUE;
+				}
+			}
+			break;
 		case IDC_COMPLIST:
 			switch (((LPNMHDR)lParam)->code)
 			{

--- a/mingw-get.cbp
+++ b/mingw-get.cbp
@@ -33,6 +33,7 @@
 			<Add option="-Wall" />
 			<Add option="-pipe" />
 			<Add option="-mthreads" />
+			<Add option="-fno-exceptions" />
 			<Add option="-D_WIN32_IE=0x0400" />
 			<Add option="-DCURL_STATICLIB" />
 			<Add directory="$(#curl.include)" />
@@ -41,7 +42,6 @@
 		</Compiler>
 		<Linker>
 			<Add library="curl" />
-			<Add library="z" />
 			<Add library="shfolder" />
 			<Add library="shell32" />
 			<Add library="gdi32" />
@@ -52,7 +52,6 @@
 			<Add library="wsock32" />
 			<Add library="wldap32" />
 			<Add directory="$(#curl.lib)" />
-			<Add directory="$(#zlib)" />
 		</Linker>
 		<Unit filename="7z\7zCrc.c">
 			<Option compilerVar="CC" />

--- a/packagelist.c
+++ b/packagelist.c
@@ -186,14 +186,8 @@ void PackageList_SetCategories(const int* categories)
 {
 	ListView_DeleteAllItems(g_hpackagelist);
 
-	if (*categories == -1)
-	{
-		PackageView_SetPackage(-1);
-		return;
-	}
-
 	int have_item = 0;
-	if (*categories == 0)
+	if (*categories == -1)
 	{
 		int i = 0;
 		for (; i < PkgIndex_NumPackages(); ++i)

--- a/pkgindex.cpp
+++ b/pkgindex.cpp
@@ -163,12 +163,19 @@ extern "C" int PkgIndex_Load()
 			const char* name = NonEmptyAttribute(cat_el, "name");
 			if (!name)
 				continue;
-			g_pkgindex.headings.back().second.push_back(
-			 g_pkgindex.categories.size()
-			 );
-			g_pkgindex.category_ids[id] = g_pkgindex.categories.size();
-			g_pkgindex.categories.push_back(std::make_pair(std::string(id),
-			 std::string(name)));
+			StringIntMap::const_iterator found =
+			 g_pkgindex.category_ids.find(id);
+			if (found != g_pkgindex.category_ids.end())
+				g_pkgindex.headings.back().second.push_back(found->second);
+			else
+			{
+				g_pkgindex.headings.back().second.push_back(
+				 g_pkgindex.categories.size()
+				 );
+				g_pkgindex.category_ids[id] = g_pkgindex.categories.size();
+				g_pkgindex.categories.push_back(std::make_pair(std::string(id),
+				 std::string(name)));
+			}
 		}
 		g_pkgindex.headings.back().second.push_back(-1);
 	}

--- a/ui_general.c
+++ b/ui_general.c
@@ -19,9 +19,6 @@
 #include "categorytree.hh"
 
 
-ProgressThreadInfo* g_dlthreadinfo = 0;
-
-
 void LastError_MsgBox(const char* title)
 {
 	MessageBox(g_hmainwnd, MGGetErrors()[0], title, MB_OK | MB_ICONERROR);
@@ -29,26 +26,22 @@ void LastError_MsgBox(const char* title)
 }
 
 
-int ListDownloadCallback(size_t total, size_t current)
+int ListDownloadCallback(size_t total, size_t current, void* param)
 {
-	return ProgressThread_IsCancelled(g_dlthreadinfo) ? 1 : 0;
+	return ProgressThread_IsCancelled((ProgressThreadInfo*)param) ? 1 : 0;
 }
 
 int UpdateListThread(ProgressThreadInfo* info, void* param)
 {
-	g_dlthreadinfo = info;
-
 	ProgressThread_NewStatus(info, "Downloading updated manifest...");
 
 	char localpath[PATH_MAX + 1];
 	snprintf(localpath, PATH_MAX + 1, "%s\\mingw_avail.mft", GetBinDir());
 	int dlresult = DownloadFile(
 	 "http://localhost:1330/mingwinst/mingw_avail.mft", localpath,
-	 ListDownloadCallback
+	 ListDownloadCallback, info
 	 );
 
-	g_dlthreadinfo = 0;
-
 	if (dlresult > 0 && dlresult != 2)
 		dlresult = -dlresult;
 	return dlresult;
@@ -63,3 +56,8 @@ void UI_UpdateLists()
 	CategoryTree_Reload();
 	return;
 }
+
+
+void UI_ApplyChanges()
+{
+}

--- a/ui_general.hh
+++ b/ui_general.hh
@@ -12,6 +12,7 @@ extern "C" {
 
 
 void UI_UpdateLists();
+void UI_ApplyChanges();
 
 void LastError_MsgBox(const char* title);