From abd99a325b54e1297dedec84a22ca094cd3f453d Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Fri, 27 Nov 2015 13:35:24 -0500
Subject: [PATCH] Integrated the Common Controls 6 manifest into libui.dll.
 While it does work, themes don't work, and I wonder if it's because of
 isolation awareness. Time to write an nmakefile!

---
 windows/libui.manifest | 23 +++++++++++++++++++++++
 windows/resources.rc   |  3 +++
 windows/winapi.h       |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 windows/libui.manifest

diff --git a/windows/libui.manifest b/windows/libui.manifest
new file mode 100644
index 00000000..903c5359
--- /dev/null
+++ b/windows/libui.manifest
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="*"
+    name="CompanyName.ProductName.YourApplication"
+    type="win32"
+/>
+<description>Your application description here.</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="*"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
+
diff --git a/windows/resources.rc b/windows/resources.rc
index 442c19d4..93ed7d34 100644
--- a/windows/resources.rc
+++ b/windows/resources.rc
@@ -5,6 +5,9 @@
 // this is a UTF-8 file
 #pragma code_page(65001)
 
+// this is the Common Controls 6 manifest
+ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "libui.manifest"
+
 // this is the dialog template used by tab pages; see windows/tabpage.c for details
 rcTabPageDialog DIALOGEX 0, 0, 100, 100
 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE
diff --git a/windows/winapi.h b/windows/winapi.h
index a8ca5d4e..a918cabc 100644
--- a/windows/winapi.h
+++ b/windows/winapi.h
@@ -8,6 +8,8 @@
 // see https://github.com/golang/go/issues/9916#issuecomment-74812211
 #define INITGUID
 #define _USE_MATH_DEFINES
+// for the manifest
+#define ISOLATION_AWARE_ENABLED 1
 // get Windows version right; right now Windows Vista
 #define WINVER 0x0600				/* according to Microsoft's winnls.h */
 #define _WIN32_WINNT 0x0600		/* according to Microsoft's sdkddkver.h */