From 5e10b905f9c551194806afc6fffd981d45d5085f Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 22 Jun 2016 16:24:03 +0200
Subject: [PATCH] winstd::com_initializer helper introduced

---
 include/WinStd/COM.h | 49 ++++++++++++++++++++++++++++++++++++++++++++
 src/COM.cpp          | 11 ++++++++++
 2 files changed, 60 insertions(+)

diff --git a/include/WinStd/COM.h b/include/WinStd/COM.h
index fcddd3b0..00fc2734 100644
--- a/include/WinStd/COM.h
+++ b/include/WinStd/COM.h
@@ -28,6 +28,7 @@ namespace winstd
 
     class WINSTD_API bstr;
     class WINSTD_API variant;
+    class WINSTD_API com_initializer;
 }
 
 #pragma once
@@ -913,4 +914,52 @@ namespace winstd
     };
 
     /// @}
+
+
+    class WINSTD_API com_initializer
+    {
+    public:
+        ///
+        /// Initializes the COM library on the current thread and identifies the concurrency model as single-thread apartment (STA).
+        ///
+        /// \sa [CoInitialize function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms678543.aspx)
+        ///
+        inline com_initializer(_In_opt_ LPVOID pvReserved)
+        {
+            m_result = CoInitialize(pvReserved);
+        }
+
+
+        ///
+        /// Initializes the COM library for use by the calling thread, sets the thread's concurrency model, and creates a new apartment for the thread if one is required.
+        ///
+        /// \sa [CoInitializeEx function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms695279.aspx)
+        ///
+        inline com_initializer(_In_opt_ LPVOID pvReserved, _In_ DWORD dwCoInit)
+        {
+            m_result = CoInitializeEx(pvReserved, dwCoInit);
+        }
+
+
+        ///
+        /// Uninitializes COM.
+        ///
+        /// \sa [CoUninitialize function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms688715.aspx)
+        ///
+        virtual ~com_initializer();
+
+
+        ///
+        /// Return result of `CoInitialize()` call.
+        ///
+        /// \sa [CoInitialize function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms678543.aspx)
+        ///
+        inline HRESULT status() const
+        {
+            return m_result;
+        }
+
+    protected:
+        HRESULT m_result;   ///< Result of CoInitialize call
+    };
 }
diff --git a/src/COM.cpp b/src/COM.cpp
index 220c00c8..7d48aa32 100644
--- a/src/COM.cpp
+++ b/src/COM.cpp
@@ -52,3 +52,14 @@ winstd::variant::~variant()
 {
     VariantClear(this);
 }
+
+
+//////////////////////////////////////////////////////////////////////
+// winstd::com_initializer
+//////////////////////////////////////////////////////////////////////
+
+winstd::com_initializer::~com_initializer()
+{
+    if (SUCCEEDED(m_result))
+        CoUninitialize();
+}