From 75fdaf478bb87b7aa6ebf5eca5818f84642adf0d Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Thu, 25 Feb 2021 10:48:50 -0500
Subject: [PATCH] Fix moar bugs

---
 color.d         |  5 ++++-
 com.d           | 10 +++++-----
 simpledisplay.d | 23 ++++++++++++++++-------
 terminal.d      |  5 +++--
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/color.d b/color.d
index 6bb1555..5ccf1b3 100644
--- a/color.d
+++ b/color.d
@@ -209,7 +209,10 @@ struct Color {
 	static Color teal() { return Color(0, 255, 255); }
 	/// Ditto
 	nothrow pure @nogc
-	static Color purple() { return Color(255, 0, 255); }
+	static Color purple() { return Color(128, 0, 128); }
+	/// Ditto
+	nothrow pure @nogc
+	static Color magenta() { return Color(255, 0, 255); }
 	/// Ditto
 	nothrow pure @nogc
 	static Color brown() { return Color(128, 64, 0); }
diff --git a/com.d b/com.d
index c8671e6..070e2ee 100644
--- a/com.d
+++ b/com.d
@@ -92,10 +92,10 @@ module arsd.com;
 	createRawComObject returns the IUnknown raw one
 +/
 
-import core.sys.windows.windows;
-import core.sys.windows.com;
-import core.sys.windows.wtypes;
-import core.sys.windows.oaidl;
+public import core.sys.windows.windows;
+public import core.sys.windows.com;
+public import core.sys.windows.wtypes;
+public import core.sys.windows.oaidl;
 
 import core.stdc.string;
 import core.atomic;
@@ -1131,7 +1131,7 @@ struct TmpStr {
 	char[256] buffer;
 	int length;
 	void clear() { length = 0; }
-	char* getPtr() {
+	char* getPtr() return {
 		buffer[length] = 0;
 		return buffer.ptr;
 	}
diff --git a/simpledisplay.d b/simpledisplay.d
index 5a9e359..3fa8138 100644
--- a/simpledisplay.d
+++ b/simpledisplay.d
@@ -1745,7 +1745,7 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
 	void close() {
 		if (!_closed) {
 			runInGuiThread( {
-				if(_closed) return; // another thread got to it first. this is a big FIXME like this is all pretty wtf-y
+				if(_closed) return; // another thread got to it first. this isn't a big deal, it just means our message was queued
 				if (onClosing !is null) onClosing();
 				impl.closeWindow();
 				_closed = true;
@@ -18488,6 +18488,9 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
 
 	DROPEFFECT de = win32DragAndDropAction(action);
 
+	// I'm not as concerned about the GC here since DoDragDrop blocks so the stack frame still sane the whole time
+	// but still prolly a FIXME
+
 	auto ret = DoDragDrop(obj, src, de, &effect);
 	/+
 	import std.stdio;
@@ -18548,8 +18551,11 @@ void enableDragAndDrop(SimpleWindow window, DropHandler handler) {
 
 		initDnd();
 
-
-		auto dropTarget = new class IDropTarget {
+		auto dropTarget = new class (handler) IDropTarget {
+			DropHandler handler;
+			this(DropHandler handler) {
+				this.handler = handler;
+			}
 			ULONG refCount;
 			ULONG AddRef() {
 				return ++refCount;
@@ -18602,11 +18608,14 @@ void enableDragAndDrop(SimpleWindow window, DropHandler handler) {
 
 				return S_OK;
 			}
-
 		};
-		//import core.memory;
-		//GC.addRoot(cast(void*) dropTarget);
-
+		// Windows can hold on to the handler and try to call it
+		// during which time the GC can't see it. so important to
+		// manually manage this. At some point i'll FIXME and make
+		// all my com instances manually managed since they supposed
+		// to respect the refcount.
+		import core.memory;
+		GC.addRoot(cast(void*) dropTarget);
 
 		if(RegisterDragDrop(window.impl.hwnd, dropTarget) != S_OK)
 			throw new Exception("register");
diff --git a/terminal.d b/terminal.d
index e1a2888..00865dc 100644
--- a/terminal.d
+++ b/terminal.d
@@ -7810,9 +7810,10 @@ version(TerminalDirectToEmulator) {
 
 					// if I don't close the redirected pipe, the other thread
 					// will get stuck indefinitely as it tries to flush its stderr
-					version(Windows)
+					version(Windows) {
 						CloseHandle(wi.readPipe);
-					version(Posix) {
+						wi.readPipe = null;
+					} version(Posix) {
 						import unix = core.sys.posix.unistd;
 						import unix2 = core.sys.posix.fcntl;
 						unix.close(wi.readFd);