From 69f7e3b48c2e0ff5be1d7a83cdcc2597a458357b Mon Sep 17 00:00:00 2001
From: Decaf Code <git@decafcode.org>
Date: Sun, 3 Nov 2019 10:48:04 -0500
Subject: [PATCH] hook/iohook.c: Add iohook_open_nul_fd()

This provides a replacement for iohook_open_dummy_fd() whose error
handling is more consistent with the rest of this library.
---
 hook/iohook.c | 28 ++++++++++++++++++++++++++++
 hook/iohook.h |  8 +++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/hook/iohook.c b/hook/iohook.c
index 67d0beb..f28f52d 100644
--- a/hook/iohook.c
+++ b/hook/iohook.c
@@ -277,6 +277,7 @@ static void iohook_init(void)
     iohook_initted = true;
 }
 
+// Deprecated
 HANDLE iohook_open_dummy_fd(void)
 {
     iohook_init();
@@ -291,6 +292,33 @@ HANDLE iohook_open_dummy_fd(void)
             NULL);
 }
 
+HRESULT iohook_open_nul_fd(HANDLE *out)
+{
+    HANDLE fd;
+
+    assert(out != NULL);
+
+    *out = NULL;
+    iohook_init();
+
+    fd = next_CreateFileW(
+            L"NUL",
+            GENERIC_READ | GENERIC_WRITE,
+            FILE_SHARE_READ | FILE_SHARE_WRITE,
+            NULL,
+            OPEN_EXISTING,
+            FILE_FLAG_OVERLAPPED,
+            NULL);
+
+    if (fd == NULL) {
+        return HRESULT_FROM_WIN32(GetLastError());
+    }
+
+    *out = fd;
+
+    return S_OK;
+}
+
 HRESULT iohook_push_handler(iohook_fn_t fn)
 {
     iohook_fn_t *new_array;
diff --git a/hook/iohook.h b/hook/iohook.h
index 9d55110..58bf642 100644
--- a/hook/iohook.h
+++ b/hook/iohook.h
@@ -39,6 +39,12 @@ struct irp {
 
 typedef HRESULT (*iohook_fn_t)(struct irp *irp);
 
-HANDLE iohook_open_dummy_fd(void);
+HANDLE iohook_open_dummy_fd(void)
+#ifdef __GNUC__
+__attribute__((deprecated("Use iohook_open_nul_fd instead")))
+#endif
+;
+
+HRESULT iohook_open_nul_fd(HANDLE *fd);
 HRESULT iohook_push_handler(iohook_fn_t fn);
 HRESULT iohook_invoke_next(struct irp *irp);