Commit: 2990b9141d2c350af690ee1f40dc4a72e4d18932 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: 2990b9141d2c350af690ee1f40dc4a72e4d18932 (tree)
• l'heure: 2008-11-02 09:13:49
• Auteur: John E. <tdragon@user...>
• Commiter: John E.

Message de Log

UI/functionality separation made more distinct

Change Summary

• add: download.c
• add: error.c
• add: error.hh
• add: getbindir.c
• modified: mainwnd.c
• modified: mingw-get.cbp
• modified: package.cpp
• add: pkgindex.cpp
• add: pkgindex.hpp
• modified: previnstalls.c
• modified: resource.h
• modified: resource.rc
• add: selectinst.cpp
• modified: tracked_install.hpp
• modified: ui.cpp
• add: versioncompare.c
• add: winmain.cpp

Modification

--- /dev/null
+++ b/download.c
@@ -0,0 +1,85 @@
+
+#include <curl/curl.h>
+#include "error.hh"
+
+
+typedef struct CallbackInfo
+{
+	void (*next_callback)(size_t);
+	int total_sent;
+} CallbackInfo;
+
+int DLCallback
+ (void* clientp,
+  double dltotal,
+  double dlnow,
+  double ultotal,
+  double ulnow)
+{
+	CallbackInfo* cbi = (CallbackInfo*)clientp;
+	if (!cbi->total_sent)
+	{
+		cbi->next_callback((size_t)dltotal);
+		cbi->total_sent = 1;
+	}
+	cbi->next_callback((size_t)dlnow);
+	return 0;
+}
+
+
+size_t DownloadFile
+ (const char* url,
+  const char* local,
+  void (*prog_callback)(size_t))
+{
+	size_t ret = 0;
+
+	CURL* curl = curl_easy_init();
+	if (curl)
+	{
+		curl_easy_setopt(curl, CURLOPT_URL, url);
+		curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+		char errbuf[CURL_ERROR_SIZE];
+		curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf);
+
+		FILE* outfile = fopen(local, "wb");
+		if (outfile)
+		{
+			curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
+
+			if (prog_callback)
+			{
+				curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, DLCallback);
+				CallbackInfo info;
+				info.next_callback = prog_callback;
+				info.total_sent = 0;
+				curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &info);
+			}
+			else
+				curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
+
+			CURLcode success = curl_easy_perform(curl);
+			if (success == 0)
+			{
+				double dltotal;
+				curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &dltotal);
+				ret = dltotal;
+			}
+			else
+			{
+				DeleteFile(local);
+				MGSetError("Failed to download '%s':\n%s", url, errbuf);
+			}
+
+			fclose(outfile);
+		}
+		else
+			MGSetError("Couldn't open '%s' for writing.", local);
+
+		curl_easy_cleanup(curl);
+	}
+	else
+		MGSetError("Couldn't initialize CURL downloader.");
+
+	return ret;
+}

--- /dev/null
+++ b/error.c
@@ -0,0 +1,22 @@
+/** \file error.c
+ *
+ * Created: JohnE, 2008-10-12
+ */
+
+
+#include "error.hh"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+
+char mg_last_error[2048] = {'\0'};
+
+
+void MGSetError(const char* fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	vsnprintf(mg_last_error, 2048, fmt, ap);
+	va_end(ap);
+}

--- /dev/null
+++ b/error.hh
@@ -0,0 +1,24 @@
+#ifndef ERROR_HH_INC
+#define ERROR_HH_INC
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+void MGSetError(const char* fmt, ...);
+
+extern char mg_last_error[];
+
+
+static inline const char* MGLastError()
+{
+	return mg_last_error;
+}
+
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // ERROR_HH_INC

--- /dev/null
+++ b/getbindir.c
@@ -0,0 +1,29 @@
+/** \file getbindir.c
+ *
+ * Created: JohnE, 2008-10-09
+ */
+
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+
+const char* GetBinDir()
+{
+	static char path[1024] = {0};
+	if (!path[0])
+	{
+		GetModuleFileName(0, path, 1024);
+		int i = strlen(path);
+		for (; i >= 0; --i)
+		{
+			if (path[i] == '/' || path[i] == '\\')
+			{
+				path[i] = '\0';
+				break;
+			}
+			path[i] = '\0';
+		}
+	}
+	return path;
+}

--- a/mainwnd.c
+++ b/mainwnd.c
@@ -9,10 +9,14 @@
 #include "pkg_const.h"
 
 
+extern HINSTANCE g_hinstance;
+
+
+HWND g_hmainwnd = 0;
+
 static int g_vert_grip_x = 150;
 static float g_horz_grip_prop = 0.5f;
 static HACCEL g_haccel;
-static HINSTANCE g_instance = 0;
 
 
 void TransToClient(HWND hwnd, RECT* rc)
@@ -31,27 +35,27 @@ void TransToClient(HWND hwnd, RECT* rc)
 }
 
 
-void NewVertSashPos(int pos, HWND mainwnd)
+void NewVertSashPos(int pos)
 {
 	g_vert_grip_x = pos;
 	RECT rc;
-	GetClientRect(mainwnd, &rc);
-	SendMessage(mainwnd, WM_SIZE, SIZE_RESTORED,
+	GetClientRect(g_hmainwnd, &rc);
+	SendMessage(g_hmainwnd, WM_SIZE, SIZE_RESTORED,
 	 MAKELPARAM(rc.right - rc.left, rc.bottom - rc.top));
 }
 
 
-void NewHorzSashPos(int pos, HWND mainwnd)
+void NewHorzSashPos(int pos)
 {
 	RECT tbrc, statrc, rc;
-	GetWindowRect(GetDlgItem(mainwnd, IDC_MAINTOOLBAR), &tbrc);
-	TransToClient(mainwnd, &tbrc);
-	GetWindowRect(GetDlgItem(mainwnd, IDC_STATBAR), &statrc);
-	TransToClient(mainwnd, &statrc);
-	GetClientRect(mainwnd, &rc);
+	GetWindowRect(GetDlgItem(g_hmainwnd, IDC_MAINTOOLBAR), &tbrc);
+	TransToClient(g_hmainwnd, &tbrc);
+	GetWindowRect(GetDlgItem(g_hmainwnd, IDC_STATBAR), &statrc);
+	TransToClient(g_hmainwnd, &statrc);
+	GetClientRect(g_hmainwnd, &rc);
 	g_horz_grip_prop = (float)(pos - (tbrc.bottom - tbrc.top) - 6) /
 	 ((rc.bottom - rc.top) - (tbrc.bottom - tbrc.top) - (statrc.bottom - statrc.top) - 6);
-	SendMessage(mainwnd, WM_SIZE, SIZE_RESTORED,
+	SendMessage(g_hmainwnd, WM_SIZE, SIZE_RESTORED,
 	 MAKELPARAM(rc.right - rc.left, rc.bottom - rc.top));
 }
 
@@ -88,7 +92,7 @@ static void InsertColumn
 }
 
 
-void SelectInst(HINSTANCE, HWND);
+void SelectInstallation();
 const char* Pkg_GetSubItemText(LPARAM, int);
 void UI_OnCategoryChange(int, HWND);
 void UI_SortListView(int, HWND);
@@ -99,6 +103,8 @@ const char* Pkg_GetInstalledVersion(LPARAM);
 int Pkg_GetSelectedAction(LPARAM);
 void Pkg_SelectAction(LPARAM, int);
 int Pkg_GetStateImage(LPARAM);
+int PkgIndex_DownloadUpdate();
+void LastError_MsgBox(const char*);
 
 static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -117,16 +123,16 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			HIMAGELIST il =
 			 ImageList_Create(24, 24, ILC_COLOR32 | ILC_MASK, 6, 0);
 			HBITMAP tbbuttons =
-			 LoadBitmap(g_instance, MAKEINTRESOURCE(IDB_TBBUTTONS));
+			 LoadBitmap(g_hinstance, MAKEINTRESOURCE(IDB_TBBUTTONS));
 			ImageList_AddMasked(il, tbbuttons, RGB(255, 0, 255));
 			DeleteObject(tbbuttons);
 			SendMessage(htb, TB_SETIMAGELIST, (WPARAM)0, (LPARAM)il);
 			TBBUTTON tbButtons[3] = {
-			 { 0, -1, TBSTATE_ENABLED, 
+			 { 0, -1, TBSTATE_ENABLED,
 			  TBSTYLE_BUTTON|TBSTYLE_AUTOSIZE, {0}, 0, (INT_PTR)"Update Lists" },
-			 { 1, -1, TBSTATE_ENABLED, 
+			 { 1, -1, TBSTATE_ENABLED,
 			  TBSTYLE_BUTTON|TBSTYLE_AUTOSIZE, {0}, 0, (INT_PTR)"Mark All Upgrades"},
-			 { 2, -1, 0, 
+			 { 2, -1, 0,
 			  TBSTYLE_BUTTON|TBSTYLE_AUTOSIZE, {0}, 0, (INT_PTR)"Apply"}
 			};
 			SendMessage(htb, TB_BUTTONSTRUCTSIZE,
@@ -151,7 +157,7 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			 LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);
 			il = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 10, 0);
 			HBITMAP buttonsbmp =
-			 LoadBitmap(g_instance, MAKEINTRESOURCE(IDB_STATES));
+			 LoadBitmap(g_hinstance, MAKEINTRESOURCE(IDB_STATES));
 			ImageList_AddMasked(il, buttonsbmp, RGB(255, 0, 255));
 			DeleteObject(buttonsbmp);
 			(void)ListView_SetImageList(hlv, il, LVSIL_SMALL);
@@ -192,7 +198,11 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 			PostQuitMessage(0);
 			return TRUE;
 		case IDM_FILE_CHANGEINST:
-			SelectInst(g_instance, hwndDlg);
+			SelectInstallation();
+			return TRUE;
+		case IDM_SOURCES_UPDATELISTS:
+			if (!PkgIndex_DownloadUpdate())
+				LastError_MsgBox("Update Failure");
 			return TRUE;
 		case IDC_CATLIST:
 			if (HIWORD(wParam) == LBN_SELCHANGE)
@@ -419,29 +429,35 @@ static int ProcessQueuedMessages(HWND wnd)
 }
 
 
-int SashWnd_RegisterClasses(HINSTANCE);
+int SashWnd_RegisterClasses();
 
-HWND CreateMainWnd(HINSTANCE hInstance)
+int CreateMainWnd()
 {
-	g_instance = hInstance;
-
 	InitCommonControls();
 	OleInitialize(0);
 
-	if (!SashWnd_RegisterClasses(hInstance))
+	if (!SashWnd_RegisterClasses(g_hinstance))
+	{
+		MessageBox(0, "Couldn't register window classes for sashes.",
+		 "Windowing Failure", MB_OK | MB_ICONERROR);
 		return 0;
+	}
 
-	g_haccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDA_MAINACCEL));
+	g_haccel = LoadAccelerators(g_hinstance, MAKEINTRESOURCE(IDA_MAINACCEL));
 
-	HWND wnd = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_MAINDLG), 0,
+	HWND wnd = CreateDialog(g_hinstance, MAKEINTRESOURCE(IDD_MAINDLG), 0,
      MainWndProc);
 	if (!wnd)
+	{
+		MessageBox(0, "Couldn't create the main window.", "Windowing Failure",
+		 MB_OK | MB_ICONERROR);
 		return 0;
+	}
 	ShowWindow(wnd, SW_SHOW);
 	if (ProcessQueuedMessages(wnd))
 		return 0;
 
-	return wnd;
+	return 1;
 }
 
 

--- a/mingw-get.cbp
+++ b/mingw-get.cbp
@@ -54,17 +54,16 @@
 			<Add directory="$(#zlib)" />
 		</Linker>
 		<Unit filename="TODO.txt" />
-		<Unit filename="curl_init.cpp" />
-		<Unit filename="download.cpp">
+		<Unit filename="download.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="getbindir.cpp" />
-		<Unit filename="inst_manager.cpp" />
-		<Unit filename="inst_manager.hpp" />
-		<Unit filename="instselect.cpp">
+		<Unit filename="error.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="error.hh" />
+		<Unit filename="getbindir.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="main.cpp" />
 		<Unit filename="mainwnd.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -76,8 +75,8 @@
 		<Unit filename="package.cpp" />
 		<Unit filename="package.hpp" />
 		<Unit filename="pkg_const.h" />
-		<Unit filename="pkg_index.cpp" />
-		<Unit filename="pkg_index.hpp" />
+		<Unit filename="pkgindex.cpp" />
+		<Unit filename="pkgindex.hpp" />
 		<Unit filename="previnstalls.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -89,6 +88,9 @@
 		<Unit filename="sash_wnd.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="selectinst.cpp">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="tinyxml\MODIFIED_TINYXML.txt" />
 		<Unit filename="tinyxml\tinystr.cpp" />
 		<Unit filename="tinyxml\tinystr.h" />
@@ -99,9 +101,10 @@
 		<Unit filename="tracked_install.cpp" />
 		<Unit filename="tracked_install.hpp" />
 		<Unit filename="ui.cpp" />
-		<Unit filename="versioning.c">
+		<Unit filename="versioncompare.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="winmain.cpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />

--- a/package.cpp
+++ b/package.cpp
@@ -3,7 +3,7 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include "pkg_index.hpp"
+#include "pkgindex.hpp"
 #include "pkg_const.h"
 
 

--- /dev/null
+++ b/pkgindex.cpp
@@ -0,0 +1,135 @@
+/** \file pkgindex.cpp
+ *
+ * Created: JohnE, 2008-10-09
+ */
+
+
+#include "pkgindex.hpp"
+
+#include <string>
+#include <cstdarg>
+#include "tinyxml/tinyxml.h"
+#include "package.hpp"
+#include "error.hh"
+
+
+std::vector< std::string > PkgIndex::sm_index_categories;
+PkgIndex::StringIntMap PkgIndex::sm_id_categories;
+PkgIndex::StringPackageMap PkgIndex::sm_id_packages;
+
+
+static const char* NonEmptyAttribute(const TiXmlElement* el, const char* name)
+{
+	const char* attr = el->Attribute(name);
+	if (attr && attr[0])
+		return attr;
+	return 0;
+}
+
+
+extern "C" const char* GetBinDir();
+extern "C" size_t DownloadFile(const char*, const char*, void (*)(size_t));
+
+extern "C" int PkgIndex_DownloadUpdate()
+{
+	if (DownloadFile("http://localhost:1330/mingwinst/mingw_avail.mft",
+	 (std::string(GetBinDir()) + "\\mingw_avail.mft").c_str(), 0) <= 0)
+		return 0;
+	return 1;
+}
+
+
+int PkgIndex::NumCategories()
+{
+	return sm_index_categories.size();
+}
+
+
+const char* PkgIndex::GetCategory(int cat)
+{
+	return sm_index_categories[cat].c_str();
+}
+
+
+int PkgIndex::CategoryIndex(const char* cat_id)
+{
+	StringIntMap::iterator found = sm_id_categories.find(cat_id);
+	if (found == sm_id_categories.end())
+		return -1;
+	return found->second;
+}
+
+
+PkgIndex::PackageIter PkgIndex::Packages_Begin()
+{
+	return sm_id_packages.begin();
+}
+
+
+PkgIndex::PackageIter PkgIndex::Packages_End()
+{
+	return sm_id_packages.end();
+}
+
+
+bool PkgIndex::LoadIndex()
+{
+	std::string mfile = std::string(GetBinDir()) + "\\mingw_avail.mft";
+	TiXmlDocument doc(mfile.c_str());
+	if (!doc.LoadFile())
+	{
+		MGSetError("Couldn't load '%s' as XML", mfile.c_str());
+		return false;
+	}
+	for (TiXmlElement* cat_el =
+	  TiXmlHandle(doc.RootElement()->FirstChildElement("package-categories")).
+	  FirstChildElement("category").ToElement();
+	 cat_el;
+	 cat_el = cat_el->NextSiblingElement("category"))
+	{
+		const char* id = NonEmptyAttribute(cat_el, "id");
+		if (!id)
+			continue;
+		const char* name = NonEmptyAttribute(cat_el, "name");
+		if (!name)
+			continue;
+		sm_id_categories[id] = sm_index_categories.size();
+		sm_index_categories.push_back(name);
+	}
+	for (TiXmlElement* package_el =
+	  TiXmlHandle(doc.RootElement()->FirstChildElement("package-collection")).
+	  FirstChildElement("package").ToElement();
+	 package_el;
+	 package_el = package_el->NextSiblingElement("package"))
+	{
+		const char* id = NonEmptyAttribute(package_el, "id");
+		if (!id)
+			continue;
+		StringPackageMap::iterator found = sm_id_packages.find(id);
+		if (found != sm_id_packages.end())
+			continue;
+		Package::Ref newpkg(new Package(id, package_el));
+		InsertPackage(newpkg);
+	}
+	return true;
+}
+
+
+bool PkgIndex::SetInstallation(const char* inst_path)
+{
+	return true;
+}
+
+
+void PkgIndex::Clear()
+{
+	sm_index_categories.clear();
+	sm_id_categories.clear();
+	sm_id_packages.clear();
+}
+
+
+void PkgIndex::InsertPackage(Package::Ref ins)
+{
+	sm_id_packages.insert(std::make_pair(ins->m_id, ins));
+}

--- /dev/null
+++ b/pkgindex.hpp
@@ -0,0 +1,44 @@
+/** \file pkgindex.hpp
+ *
+ * Created: JohnE, 2008-10-09
+ */
+#ifndef PKGINDEX_HPP_INC
+#define PKGINDEX_HPP_INC
+
+
+#include <list>
+#include <map>
+#include <vector>
+#include "ref.hpp"
+
+
+struct Package;
+
+
+class PkgIndex
+{
+public:
+	static void Clear();
+	static bool LoadIndex();
+	static bool SetInstallation(const char* inst_path);
+
+	static int NumCategories();
+	static const char* GetCategory(int cat);
+	static int CategoryIndex(const char* cat_id);
+
+	typedef std::map< std::string, RefType< Package >::Ref > StringPackageMap;
+	typedef StringPackageMap::const_iterator PackageIter;
+	static PackageIter Packages_Begin();
+	static PackageIter Packages_End();
+
+private:
+	static void InsertPackage(RefType< Package >::Ref ins);
+
+	static std::vector< std::string > sm_index_categories;
+	typedef std::map< std::string, int > StringIntMap;
+	static StringIntMap sm_id_categories;
+	static StringPackageMap sm_id_packages;
+};
+
+
+#endif // PKGINDEX_HPP_INC

--- a/previnstalls.c
+++ b/previnstalls.c
@@ -44,11 +44,8 @@ static int GetPrevInstByFolder(int folder, void (*callback)(const char*))
 
 int GetPrevInstalls(void (*callback)(const char*))
 {
-	int utype = GetAccountTypeHelper();
-	if (utype < 0)
-		return 0;
 	int icount = GetPrevInstByFolder(CSIDL_APPDATA, callback);
-	if (utype >= MU_POWER)
+	if (GetAccountTypeHelper() >= MU_POWER)
 		icount += GetPrevInstByFolder(CSIDL_COMMON_APPDATA, callback);
 	return icount;
 }

--- a/resource.h
+++ b/resource.h
@@ -38,4 +38,5 @@
 #define IDM_FILE_EXIT 1201
 #define IDM_FILE_CHANGEINST 1202
 #define IDM_EDIT_PREFERENCES 1203
-#define IDM_SOURCES_MIRRORS 1204
+#define IDM_SOURCES_UPDATELISTS 1204
+#define IDM_SOURCES_MIRRORS 1205

--- a/resource.rc
+++ b/resource.rc
@@ -19,6 +19,7 @@ IDA_MAINACCEL ACCELERATORS
 BEGIN 
     "I", IDM_FILE_CHANGEINST, CONTROL, ALT, VIRTKEY
     "P", IDM_EDIT_PREFERENCES, CONTROL, VIRTKEY
+    "U", IDM_SOURCES_UPDATELISTS, CONTROL, VIRTKEY
     "M", IDM_SOURCES_MIRRORS, CONTROL, VIRTKEY
 END
 
@@ -36,6 +37,7 @@ BEGIN
 	END
 	POPUP "Sour&ces"
 	BEGIN
+		MENUITEM "&Update Lists\tCtrl+U", IDM_SOURCES_UPDATELISTS
 		MENUITEM "&Mirrors...\tCtrl+M", IDM_SOURCES_MIRRORS
 	END
 END

--- /dev/null
+++ b/selectinst.cpp
@@ -0,0 +1,295 @@
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <windowsx.h>
+#include <shlobj.h>
+#include <sys/stat.h>
+#include <string>
+#include <map>
+#include "resource.h"
+#include "error.hh"
+#include "pkgindex.hpp"
+
+
+extern HINSTANCE g_hinstance;
+extern HWND g_hmainwnd;
+
+
+extern "C" {
+char g_inst_loc[MAX_PATH] = {0};
+}
+
+
+static HWND g_hdlg = 0;
+static BOOL g_createinst = FALSE;
+
+struct CmpStrI
+{
+	bool operator () (const std::string& s1, const std::string& s2)
+	{
+		return (stricmp(s1.c_str(), s2.c_str()) < 0);
+	}
+};
+typedef std::map< std::string, int, CmpStrI > InstIndexMap;
+static InstIndexMap prev_insts;
+
+
+static void ValidateInstPath(HWND hdlg, const std::string& path)
+{
+	int valid = 0;
+	if (path.length() > 0)
+	{
+		size_t i = path.find_last_of("/\\", path.length() - 2);
+		if (path[1] == ':' && i != std::string::npos)
+		{
+			std::string pdir = (i >= 4) ? path.substr(0, i) : path.substr(0, i + 1);
+			struct _stat st;
+			if (_stat(pdir.c_str(), &st) == 0
+			 && _S_ISDIR(st.st_mode))
+			{
+				std::string dpath = path;
+				if (dpath[dpath.length() - 1] == '/'
+				 || dpath[dpath.length() - 1] == '\\')
+					dpath.erase(dpath.length() - 1);
+				if (_stat(dpath.c_str(), &st) == 0)
+				{
+					if (_S_ISDIR(st.st_mode))
+					{
+						if (_stat((dpath + "\\mingwpkg.mft").c_str(), 
+						 &st) == 0)
+						{
+							valid = 1;
+							g_createinst = FALSE;
+							Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
+							 "This is an existing installation");
+							Button_SetCheck(GetDlgItem(hdlg, IDC_EXISTMANAGE),
+							 BST_CHECKED);
+							EnableWindow(GetDlgItem(hdlg, IDC_PREVINSTLIST),
+							 TRUE);
+							InstIndexMap::iterator found =
+							 prev_insts.find(dpath);
+							if (found != prev_insts.end())
+							{
+								(void)ListBox_SetCurSel(
+								 GetDlgItem(hdlg, IDC_PREVINSTLIST),
+								 found->second
+								 );
+							}
+							else
+							{
+								(void)ListBox_SetCurSel(
+								 GetDlgItem(hdlg, IDC_PREVINSTLIST), -1
+								 );
+							}
+						}
+						else
+						{
+							valid = 1;
+							g_createinst = TRUE;
+							Button_SetCheck(GetDlgItem(hdlg, IDC_EXISTMANAGE),
+							 BST_UNCHECKED);
+							EnableWindow(GetDlgItem(hdlg, IDC_PREVINSTLIST),
+							 FALSE);
+							Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
+							 "This path exists");
+						}
+					}
+					else
+					{
+						Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
+						 "This path is not a directory");
+					}
+				}
+				else
+				{
+					valid = 1;
+					g_createinst = TRUE;
+					Button_SetCheck(GetDlgItem(hdlg, IDC_EXISTMANAGE),
+					 BST_UNCHECKED);
+					EnableWindow(GetDlgItem(hdlg, IDC_PREVINSTLIST), FALSE);
+					Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
+					 "This directory will be created");
+				}
+			}
+			else
+			{
+				Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
+				 "The parent directory doesn't exist");
+			}
+		}
+		else
+		{
+			Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
+			 "Not a valid installation path");
+		}
+	}
+	else
+	{
+		Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
+		 "Please enter an installation path");
+	}
+	EnableWindow(GetDlgItem(hdlg, IDOK), valid ? TRUE : FALSE);
+}
+
+
+extern "C" int GetPrevInstalls(void (*)(const char*));
+
+extern "C" void PrevInstCallback(const char* path)
+{
+	int index = ListBox_AddString(GetDlgItem(g_hdlg, IDC_PREVINSTLIST), path);
+	prev_insts[path] = index;
+}
+
+static int CALLBACK InstBrowseProc
+ (HWND hwnd,
+  UINT uMsg,
+  LPARAM lParam,
+  LPARAM lpData)
+{
+	if (uMsg == BFFM_INITIALIZED)
+		SendMessage(hwnd, BFFM_SETSELECTION, TRUE, lpData);
+	return 0;
+}
+
+static BOOL CALLBACK InstSelProc
+ (HWND hwndDlg,
+  UINT uMsg,
+  WPARAM wParam,
+  LPARAM lParam)
+{
+	switch(uMsg)
+	{
+	case WM_INITDIALOG:
+		{
+			g_hdlg = hwndDlg;
+			if (!g_inst_loc[0])
+				strcpy(g_inst_loc, "C:\\mingwgettest");
+			if (GetPrevInstalls(PrevInstCallback) > 0)
+			{
+				SendMessage(GetDlgItem(hwndDlg, IDC_PREVINSTLIST), LB_SETCURSEL,
+				 0, 0);
+				SendMessage(hwndDlg, WM_COMMAND,
+				 MAKEWPARAM(IDC_PREVINSTLIST, LBN_SELCHANGE),
+				 (LPARAM)GetDlgItem(hwndDlg, IDC_PREVINSTLIST));
+				EnableWindow(GetDlgItem(hwndDlg, IDC_PREVINSTLIST), TRUE);
+			}
+			else
+			{
+				EnableWindow(GetDlgItem(hwndDlg, IDC_PREVINSTLIST), FALSE);
+				EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
+				Edit_SetText(GetDlgItem(hwndDlg, IDC_INSTPATH), g_inst_loc);
+			}
+			SetFocus(GetDlgItem(hwndDlg, IDC_INSTPATH));
+		}
+		return FALSE;
+
+	case WM_COMMAND:
+		switch(LOWORD(wParam))
+		{
+		case IDOK:
+			{
+				g_inst_loc[0] = 0;
+				Edit_GetText(GetDlgItem(hwndDlg, IDC_INSTPATH), g_inst_loc,
+				 MAX_PATH);
+				EndDialog(hwndDlg, 1);
+			}
+			return TRUE;
+		case IDCANCEL:
+			EndDialog(hwndDlg, 0);
+			return TRUE;
+		case IDC_EXISTMANAGE:
+			EnableWindow(GetDlgItem(hwndDlg, IDC_PREVINSTLIST),
+			 Button_GetCheck((HWND)lParam) == BST_CHECKED);
+			return TRUE;
+		case IDC_BROWSENEWINST:
+			{
+				char path[MAX_PATH];
+				path[0] = 0;
+				Edit_GetText(GetDlgItem(hwndDlg, IDC_INSTPATH), path, MAX_PATH);
+				if (!path[0])
+					strcpy(path, "C:\\");
+				BROWSEINFO bi;
+				bi.hwndOwner = hwndDlg;
+				bi.pidlRoot = 0;
+				bi.pszDisplayName = 0;
+				bi.lpszTitle = "Select a Folder";
+				bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE;
+				bi.lpfn = InstBrowseProc;
+				bi.lParam = reinterpret_cast< LPARAM >(path);
+				bi.iImage = 0;
+				LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
+				if (pidl)
+				{
+					char cpath[MAX_PATH];
+					if (SHGetPathFromIDList(pidl, cpath))
+					{
+						std::string path = cpath;
+						if (path.length() < 5
+						 || stricmp(path.c_str() + path.length() - 5, "mingw")
+						  != 0)
+						{
+							if (path[path.length() - 1] != '\\')
+								path += '\\';
+							Edit_SetText(GetDlgItem(hwndDlg, IDC_INSTPATH),
+							 (path + "MinGW").c_str());
+						}
+						else
+						{
+							Edit_SetText(GetDlgItem(hwndDlg, IDC_INSTPATH),
+							 path.c_str());
+						}
+					}
+					CoTaskMemFree(pidl);
+				}
+			}
+			return TRUE;
+		case IDC_INSTPATH:
+			if (HIWORD(wParam) == EN_CHANGE)
+			{
+				char path[MAX_PATH];
+				path[0] = 0;
+				Edit_GetText((HWND)lParam, path, MAX_PATH);
+				ValidateInstPath(hwndDlg, path);
+				return TRUE;
+			}
+			break;
+		case IDC_PREVINSTLIST:
+			if (HIWORD(wParam) == LBN_SELCHANGE)
+			{
+				int sel = ListBox_GetCurSel((HWND)lParam);
+				int len = ListBox_GetTextLen((HWND)lParam, sel);
+				char* txt = (char*)malloc(len + 1);
+				if (ListBox_GetText((HWND)lParam, sel, txt) > 0)
+					Edit_SetText(GetDlgItem(hwndDlg, IDC_INSTPATH), txt);
+				free(txt);
+				return TRUE;
+			}
+			break;
+		}
+		break;
+
+	case WM_CLOSE:
+		EndDialog(hwndDlg, 0);
+		return TRUE;
+	}
+
+    return FALSE;
+}
+
+
+extern "C" void LastError_MsgBox(const char*);
+
+extern "C" void SelectInstallation()
+{
+	if (!DialogBox(g_hinstance, MAKEINTRESOURCE(IDD_INSTSEL), g_hmainwnd,
+	 InstSelProc) || !g_inst_loc[0])
+		return;
+	if (!PkgIndex::SetInstallation(g_inst_loc))
+	{
+		LastError_MsgBox("Installation Failure");
+		return;
+	}
+	char title[1024];
+	snprintf(title, 1024, "mingw-get: %s", g_inst_loc);
+	SetWindowText(g_hmainwnd, title);
+}

--- a/tracked_install.hpp
+++ b/tracked_install.hpp
@@ -30,7 +30,7 @@ public:
 		return change.Revert();
 	}
 
-	TCHolderBase* Clone() const
+	virtual TCHolderBase* Clone() const
 	{
 		return new TCHolder< T >(change);
 	}

--- a/ui.cpp
+++ b/ui.cpp
@@ -10,9 +10,13 @@
 #include <commctrl.h>
 #include <climits>
 #include "package.hpp"
-#include "pkg_index.hpp"
+#include "pkgindex.hpp"
 #include "pkg_const.h"
 #include "resource.h"
+#include "error.hh"
+
+
+extern HWND g_hmainwnd;
 
 
 static void LVAddPackage(HWND hlist, const Package& pkg)
@@ -220,27 +224,23 @@ extern "C" void UI_SortListView(int column, HWND hmainwnd)
 }
 
 
-#if 0
-void UI::ResetLists()
+void UI_RefreshCategoryList()
 {
 	ListBox_SetCurSel(GetDlgItem(g_hmainwnd, IDC_CATLIST), 0);
 	int ct = ListBox_GetCount(GetDlgItem(g_hmainwnd, IDC_CATLIST));
 	for (; ct > 1; --ct)
 		ListBox_DeleteString(GetDlgItem(g_hmainwnd, IDC_CATLIST), ct - 1);
 	ListView_DeleteAllItems(GetDlgItem(g_hmainwnd, IDC_COMPLIST));
+	for (int i = 0; i < PkgIndex::NumCategories(); ++i)
+	{
+		ListBox_AddString(GetDlgItem(g_hmainwnd, IDC_CATLIST),
+		 PkgIndex::GetCategory(i));
+	}
+	UI_OnCategoryChange(0, g_hmainwnd);
 }
 
 
-void UI::NotifyNewCategory(const char* name)
-{
-	ListBox_AddString(GetDlgItem(g_hmainwnd, IDC_CATLIST), name);
-}
-
-
-void UI::NotifyNewPackage(const Package& pkg)
+extern "C" void LastError_MsgBox(const char* title)
 {
-	int sel = ListBox_GetCurSel(GetDlgItem(g_hmainwnd, IDC_CATLIST));
-	if (sel <= 0 || pkg.m_categories.count(sel - 1) > 0)
-		LVAddPackage(pkg);
+	MessageBox(g_hmainwnd, MGLastError(), title, MB_OK | MB_ICONERROR);
 }
-#endif

--- /dev/null
+++ b/versioncompare.c
@@ -0,0 +1,44 @@
+
+#include <string.h>
+
+static int IsDigit(char ch)
+{
+	return (ch >= '0' && ch <= '9');
+}
+
+int VersionCompare(const char* v1, const char* v2)
+{
+	static int at1, at2, num1, num2;
+	at1 = 0, at2 = 0;
+	while (v1[at1] && v2[at2])
+	{
+		if (v1[at1] != v2[at2])
+		{
+			if (IsDigit(v1[at1]) && IsDigit(v2[at2]))
+			{
+				num1 = 0;
+				while (IsDigit(v1[at1]))
+				{
+					num1 = num1 * 10 + v1[at1] - '0';
+					++at1;
+				}
+				num2 = 0;
+				while (IsDigit(v2[at2]))
+				{
+					num2 = num2 * 10 + v2[at2] - '0';
+					++at2;
+				}
+				if (num1 != num2)
+					return num1 - num2;
+			}
+			else
+				return v1[at1] - v2[at2];
+		}
+		else
+		{
+			++at1;
+			++at2;
+		}
+	}
+	return v1[at1] - v2[at2];
+}

--- /dev/null
+++ b/winmain.cpp
@@ -0,0 +1,37 @@
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <string>
+#include "pkgindex.hpp"
+#include <curl/curl.h>
+
+
+extern "C" int CreateMainWnd();
+extern "C" int MainMessageLoop();
+extern "C" void SelectInstallation();
+void UI_RefreshCategoryList();
+
+
+HINSTANCE g_hinstance;
+
+
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
+{
+	g_hinstance = hInstance;
+
+	curl_global_init(CURL_GLOBAL_ALL);
+
+	if (!CreateMainWnd())
+		return 1;
+
+	PkgIndex::LoadIndex();
+	UI_RefreshCategoryList();
+
+	SelectInstallation();
+
+	int ret = MainMessageLoop();
+
+	curl_global_cleanup();
+
+	return ret;
+}