Added Common Controls code again (because we're going to need the subclassing functions now).

1 files changed, 9 insertions, 0 deletions

diff --git a/new/init_windows.c b/new/init_windows.c
index f2c687d..3e19cfe 100644
--- a/new/init_windows.c
+++ b/new/init_windows.c
@@ -25,6 +25,7 @@ uiInitError *uiInit(uiInitOptions *o)
 {
 	uiInitError *err;
 	STARTUPINFOW si;
+	const char *ce;
 	HICON hDefaultIcon;
 	HCURSOR hDefaultCursor;
 	NONCLIENTMETRICSW ncm;
@@ -42,6 +43,14 @@ uiInitError *uiInit(uiInitOptions *o)
 	if ((si.dwFlags & STARTF_USESHOWWINDOW) != 0)
 		nCmdShow = si.wShowWindow;
 
+	// TODO add "in initCommonControls()" to each of the messages this returns
+	// TODO make loadLastError() return err directly
+	ce = initCommonControls();
+	if (ce != NULL) {
+		loadLastError(err, ce);
+		return err;
+	}
+
 	hDefaultIcon = LoadIconW(NULL, IDI_APPLICATION);
 	if (hDefaultIcon == NULL) {
 		loadLastError(err, "loading default icon for window classes");