From f9c05814094ea0855b780106db6a34fdb03a83f3 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 22 Jun 2016 23:32:20 +0200
Subject: [PATCH] winstd::data_blob revised

---
 include/WinStd/Crypt.h | 24 ++++++++++--------------
 src/Crypt.cpp          | 11 +++++++++++
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/include/WinStd/Crypt.h b/include/WinStd/Crypt.h
index 26a5cf97..eea16697 100644
--- a/include/WinStd/Crypt.h
+++ b/include/WinStd/Crypt.h
@@ -842,7 +842,7 @@ namespace winstd
         ///
         /// Initializes an empty BLOB.
         ///
-        data_blob()
+        inline data_blob()
         {
             cbData = 0;
             pbData = NULL;
@@ -851,7 +851,7 @@ namespace winstd
         ///
         /// Initializes a BLOB from existing data.
         ///
-        data_blob(_In_count_(size) BYTE *data, _In_ DWORD size)
+        inline data_blob(_In_count_(size) BYTE *data, _In_ DWORD size)
         {
             cbData = size;
             pbData = data;
@@ -860,7 +860,7 @@ namespace winstd
         ///
         /// Duplicate an existing BLOB.
         ///
-        data_blob(_In_ const DATA_BLOB &other)
+        inline data_blob(_In_ const DATA_BLOB &other)
         {
             cbData = other.cbData;
             if (cbData) {
@@ -874,7 +874,7 @@ namespace winstd
         ///
         /// Move an existing BLOB.
         ///
-        data_blob(_Inout_ DATA_BLOB &&other)
+        inline data_blob(_Inout_ DATA_BLOB &&other)
         {
             cbData = other.cbData;
             pbData = other.pbData;
@@ -885,16 +885,12 @@ namespace winstd
         ///
         /// Destroys the BLOB.
         ///
-        virtual ~data_blob()
-        {
-            if (pbData)
-                LocalFree(pbData);
-        }
+        virtual ~data_blob();
 
         ///
         /// Copy an existing BLOB.
         ///
-        data_blob& operator=(_In_ const DATA_BLOB &other)
+        inline data_blob& operator=(_In_ const DATA_BLOB &other)
         {
             if (this != &other) {
                 cbData = other.cbData;
@@ -914,7 +910,7 @@ namespace winstd
         ///
         /// Move an existing BLOB.
         ///
-        data_blob& operator=(_Inout_ DATA_BLOB &&other)
+        inline data_blob& operator=(_Inout_ DATA_BLOB &&other)
         {
             if (this != &other) {
                 cbData = other.cbData;
@@ -931,7 +927,7 @@ namespace winstd
         ///
         /// Get BLOB size.
         ///
-        DWORD size() const
+        inline DWORD size() const
         {
             return cbData;
         }
@@ -939,7 +935,7 @@ namespace winstd
         ///
         /// Get BLOB buffer.
         ///
-        const BYTE* data() const
+        inline const BYTE* data() const
         {
             return pbData;
         }
@@ -947,7 +943,7 @@ namespace winstd
         ///
         /// Get BLOB buffer.
         ///
-        BYTE* data()
+        inline BYTE* data()
         {
             return pbData;
         }
diff --git a/src/Crypt.cpp b/src/Crypt.cpp
index 039a7b23..e0300737 100644
--- a/src/Crypt.cpp
+++ b/src/Crypt.cpp
@@ -149,3 +149,14 @@ winstd::crypt_key::handle_type winstd::crypt_key::duplicate_internal(_In_ handle
     handle_type hNew = NULL;
     return CryptDuplicateKey(h, NULL, 0, &hNew) ? hNew : NULL;
 }
+
+
+//////////////////////////////////////////////////////////////////////
+// winstd::data_blob
+//////////////////////////////////////////////////////////////////////
+
+winstd::data_blob::~data_blob()
+{
+    if (pbData)
+        LocalFree(pbData);
+}