From 0c26276b21e4cf0f7a0665c0280b3888ebfbd1af Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Thu, 20 Jun 2019 23:50:28 -0700
Subject: [PATCH] Add AutoHandle helper class.

---
 include/stratosphere.hpp             |  3 ++
 include/stratosphere/auto_handle.hpp | 80 ++++++++++++++++++++++++++++
 include/stratosphere/defines.hpp     | 27 ++++++++++
 include/stratosphere/hossynch.hpp    |  1 +
 4 files changed, 111 insertions(+)
 create mode 100644 include/stratosphere/auto_handle.hpp
 create mode 100644 include/stratosphere/defines.hpp

diff --git a/include/stratosphere.hpp b/include/stratosphere.hpp
index b9141543..688d452d 100644
--- a/include/stratosphere.hpp
+++ b/include/stratosphere.hpp
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include "stratosphere/defines.hpp"
+
 #include "stratosphere/utilities.hpp"
 #include "stratosphere/emummc_utilities.hpp"
 
@@ -23,6 +25,7 @@
 
 #include "stratosphere/version_check.hpp"
 
+#include "stratosphere/auto_handle.hpp"
 #include "stratosphere/hossynch.hpp"
 #include "stratosphere/message_queue.hpp"
 #include "stratosphere/iwaitable.hpp"
diff --git a/include/stratosphere/auto_handle.hpp b/include/stratosphere/auto_handle.hpp
new file mode 100644
index 00000000..77846547
--- /dev/null
+++ b/include/stratosphere/auto_handle.hpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018-2019 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <switch.h>
+#include "defines.hpp"
+
+class AutoHandle {
+    NON_COPYABLE(AutoHandle);
+    private:
+        Handle hnd;
+    public:
+        AutoHandle() : hnd(INVALID_HANDLE) { /* ... */ }
+        AutoHandle(Handle h) : hnd(h) { /* ... */ }
+        ~AutoHandle() {
+            if (this->hnd != INVALID_HANDLE) {
+                svcCloseHandle(this->hnd);
+                this->hnd = INVALID_HANDLE;
+            }
+        }
+
+        AutoHandle(AutoHandle&& rhs) {
+            this->hnd = rhs.hnd;
+            rhs.hnd = INVALID_HANDLE;
+        }
+
+        AutoHandle& operator=(AutoHandle&& rhs) {
+            rhs.Swap(*this);
+            return *this;
+        }
+
+        explicit operator bool() const {
+            return this->hnd != INVALID_HANDLE;
+        }
+
+        void Swap(AutoHandle& rhs) {
+            std::swap(this->hnd, rhs.hnd);
+        }
+
+        Handle Get() const {
+            return this->hnd;
+        }
+
+        Handle *GetPointer() {
+            return &this->hnd;
+        }
+
+        Handle *GetPointerAndClear() {
+            this->Clear();
+            return this->GetPointer();
+        }
+
+        Handle Move() {
+            const Handle h = this->hnd;
+            this->hnd = INVALID_HANDLE;
+            return h;
+        }
+
+        void Reset(Handle h) {
+            AutoHandle(h).Swap(*this);
+        }
+
+        void Clear() {
+            this->Reset(INVALID_HANDLE);
+        }
+};
diff --git a/include/stratosphere/defines.hpp b/include/stratosphere/defines.hpp
new file mode 100644
index 00000000..2a76f02a
--- /dev/null
+++ b/include/stratosphere/defines.hpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018-2019 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Any broadly useful language defines should go here. */
+
+#define NON_COPYABLE(cls) \
+    cls(const cls&) = delete; \
+    cls& operator=(const cls&) = delete
+
+#define NON_MOVEABLE(cls) \
+    cls(cls&&) = delete; \
+    cls& operator=(cls&&) = delete
diff --git a/include/stratosphere/hossynch.hpp b/include/stratosphere/hossynch.hpp
index 242f882b..624dba80 100644
--- a/include/stratosphere/hossynch.hpp
+++ b/include/stratosphere/hossynch.hpp
@@ -19,6 +19,7 @@
 #include <switch/arm/counter.h>
 #include <mutex>
 #include "results.hpp"
+#include "auto_handle.hpp"
 
 class HosMutex {
     private: