forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix moar bugs

This commit is contained in:
Adam D. Ruppe 2021-02-25 10:48:50 -05:00
parent f94e51e6ba
commit 75fdaf478b
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
color.d
View File

@ -209,7 +209,10 @@ struct Color {
static Color teal() { return Color(0, 255, 255); } static Color teal() { return Color(0, 255, 255); }
/// Ditto /// Ditto
nothrow pure @nogc 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 /// Ditto
nothrow pure @nogc nothrow pure @nogc
static Color brown() { return Color(128, 64, 0); } static Color brown() { return Color(128, 64, 0); }

10
com.d
View File

@ -92,10 +92,10 @@ module arsd.com;
createRawComObject returns the IUnknown raw one createRawComObject returns the IUnknown raw one
+/ +/
import core.sys.windows.windows; public import core.sys.windows.windows;
import core.sys.windows.com; public import core.sys.windows.com;
import core.sys.windows.wtypes; public import core.sys.windows.wtypes;
import core.sys.windows.oaidl; public import core.sys.windows.oaidl;
import core.stdc.string; import core.stdc.string;
import core.atomic; import core.atomic;
@ -1131,7 +1131,7 @@ struct TmpStr {
char[256] buffer; char[256] buffer;
int length; int length;
void clear() { length = 0; } void clear() { length = 0; }
char* getPtr() { char* getPtr() return {
buffer[length] = 0; buffer[length] = 0;
return buffer.ptr; return buffer.ptr;
} }

23
simpledisplay.d
View File

@ -1745,7 +1745,7 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
void close() { void close() {
if (!_closed) { if (!_closed) {
runInGuiThread( { 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(); if (onClosing !is null) onClosing();
impl.closeWindow(); impl.closeWindow();
_closed = true; _closed = true;
@ -18488,6 +18488,9 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
DROPEFFECT de = win32DragAndDropAction(action); 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); auto ret = DoDragDrop(obj, src, de, &effect);
/+ /+
import std.stdio; import std.stdio;
@ -18548,8 +18551,11 @@ void enableDragAndDrop(SimpleWindow window, DropHandler handler) {
initDnd(); initDnd();
auto dropTarget = new class (handler) IDropTarget {
auto dropTarget = new class IDropTarget { DropHandler handler;
this(DropHandler handler) {
this.handler = handler;
}
ULONG refCount; ULONG refCount;
ULONG AddRef() { ULONG AddRef() {
return ++refCount; return ++refCount;
@ -18602,11 +18608,14 @@ void enableDragAndDrop(SimpleWindow window, DropHandler handler) {
return S_OK; return S_OK;
} }
}; };
//import core.memory; // Windows can hold on to the handler and try to call it
//GC.addRoot(cast(void*) dropTarget); // 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) if(RegisterDragDrop(window.impl.hwnd, dropTarget) != S_OK)
throw new Exception("register"); throw new Exception("register");

5
terminal.d
View File

@ -7810,9 +7810,10 @@ version(TerminalDirectToEmulator) {
// if I don't close the redirected pipe, the other thread // if I don't close the redirected pipe, the other thread
// will get stuck indefinitely as it tries to flush its stderr // will get stuck indefinitely as it tries to flush its stderr
version(Windows) version(Windows) {
CloseHandle(wi.readPipe); CloseHandle(wi.readPipe);
version(Posix) { wi.readPipe = null;
} version(Posix) {
import unix = core.sys.posix.unistd; import unix = core.sys.posix.unistd;
import unix2 = core.sys.posix.fcntl; import unix2 = core.sys.posix.fcntl;
unix.close(wi.readFd); unix.close(wi.readFd);