From 05530cafe8fa678bff46f3f7cebc7c718cb8c984 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 16 May 2015 11:55:03 -0400
Subject: [PATCH] Fixed assorted errors. Now to figure out why we're running
 out of memory...

---
 redo/GNUmaketest.mk | 1 -
 redo/test/test.h    | 2 +-
 redo/windows/init.c | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/redo/GNUmaketest.mk b/redo/GNUmaketest.mk
index f769d68f..25194a9d 100644
--- a/redo/GNUmaketest.mk
+++ b/redo/GNUmaketest.mk
@@ -4,7 +4,6 @@
 include test/GNUmakeinc.mk
 
 baseHFILES = \
-	ui.h \
 	$(testHFILES)
 
 baseCFILES = $(testCFILES)
diff --git a/redo/test/test.h b/redo/test/test.h
index d76dea53..03a03f66 100644
--- a/redo/test/test.h
+++ b/redo/test/test.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <string.h>
-#include "../ui.h"
+#include "../out/ui.h"
 
 // main.c
 extern void die(const char *, ...);
diff --git a/redo/windows/init.c b/redo/windows/init.c
index 4ac11501..69e3ec45 100644
--- a/redo/windows/init.c
+++ b/redo/windows/init.c
@@ -85,6 +85,8 @@ const char *uiInit(uiInitOptions *o)
 	if (initAlloc() == 0)
 		return loadLastError("error initializing memory allocations");
 
+	initResizes();
+
 	nCmdShow = SW_SHOWDEFAULT;
 	GetStartupInfoW(&si);
 	if ((si.dwFlags & STARTF_USESHOWWINDOW) != 0)
@@ -137,6 +139,7 @@ void uiUninit(void)
 	unregisterWindowClass();
 	// TODO delete default cursor
 	// TODO delete default icon
+	uninitResizes();
 	uninitAlloc();
 }