From b4135c317f742a94e714b50284edb7b6c156bdc2 Mon Sep 17 00:00:00 2001
From: hecomi <info@hecomi.com>
Date: Sat, 14 Mar 2020 19:19:35 +0900
Subject: [PATCH] fix initializations.

---
 Plugins/uDesktopDuplication/uDesktopDuplication/Common.h  | 6 +++---
 .../uDesktopDuplication/uDesktopDuplication/Cursor.cpp    | 2 +-
 Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.h  | 8 ++++----
 Plugins/uDesktopDuplication/uDesktopDuplication/Device.h  | 2 +-
 .../uDesktopDuplication/uDesktopDuplication/Duplicator.h  | 6 +++---
 Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.h | 6 +++---
 .../uDesktopDuplication/MonitorManager.h                  | 2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Common.h b/Plugins/uDesktopDuplication/uDesktopDuplication/Common.h
index fbf2aaa..8a6fd42 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Common.h
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Common.h
@@ -33,7 +33,7 @@ class ScopedReleaser
 public:
     using ReleaseFuncType = std::function<void()>;
     ScopedReleaser(ReleaseFuncType&& func) : func_(func) {}
-    ~ScopedReleaser() { func_(); }
+    virtual ~ScopedReleaser() { func_(); }
 
 private:
     const ReleaseFuncType func_;
@@ -48,7 +48,7 @@ public:
     using microseconds = std::chrono::microseconds;
     using TimerFuncType = std::function<void(microseconds)>;
     ScopedTimer(TimerFuncType&& func);
-    ~ScopedTimer();
+    virtual ~ScopedTimer();
 
 private:
     const TimerFuncType func_;
@@ -71,7 +71,7 @@ void SendMessageToUnity(Message message);
 
 // Buffer
 template <class T>
-class Buffer
+class Buffer final
 {
 public:
     Buffer() 
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp
index a0852ed..e5d8baa 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp
@@ -99,7 +99,7 @@ void Cursor::UpdateTexture(
     bgraBuffer_.ExpandIfNeeded(bgraBufferSize);
     
     // Check buffers
-    if (!bgraBuffer_ || !buffer_) 
+    if (!bgraBuffer_ || !buffer_)
     {
         Debug::Error("Cursor::UpdateTexture() => no buffer.");
         return;
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.h b/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.h
index 3857b9c..74d93a4 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.h
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.h
@@ -9,7 +9,7 @@
 
 class Duplicator;
 
-class Cursor
+class Cursor final
 {
 public:
     explicit Cursor();
@@ -39,7 +39,7 @@ private:
     int y_ = -1;
     Buffer<BYTE> buffer_;
     Buffer<BYTE> bgraBuffer_;
-    DXGI_OUTDUPL_POINTER_SHAPE_INFO shapeInfo_;
-    LARGE_INTEGER timestamp_;
-    D3D11_BOX capturedImageArea_;
+    DXGI_OUTDUPL_POINTER_SHAPE_INFO shapeInfo_ = {};
+    LARGE_INTEGER timestamp_ = {};
+    D3D11_BOX capturedImageArea_ = {};
 };
\ No newline at end of file
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Device.h b/Plugins/uDesktopDuplication/uDesktopDuplication/Device.h
index 8058844..13efe24 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Device.h
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Device.h
@@ -8,7 +8,7 @@
 
 
 // Thraed safe self created ID3D11Device from specified adapter
-class IsolatedD3D11Device
+class IsolatedD3D11Device final
 {
 public:
     IsolatedD3D11Device();
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h
index 9a0f730..1c14376 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h
@@ -30,7 +30,7 @@ enum class DuplicatorState
 };
 
 
-class Duplicator
+class Duplicator final
 {
 public:
     using State = DuplicatorState;
@@ -83,7 +83,7 @@ private:
 
     std::shared_ptr<class IsolatedD3D11Device> device_;
     Microsoft::WRL::ComPtr<IDXGIOutputDuplication> dupl_;
-    Frame lastFrame_;
+    Frame lastFrame_ = {};
     UINT lastFrameId_ = 0;
     bool isFrameAcquired_ = false;
 
@@ -91,5 +91,5 @@ private:
     std::thread thread_;
     mutable std::mutex mutex_;
 
-    Metadata metaData_;
+    Metadata metaData_ = {};
 };
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.h b/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.h
index d7bbdeb..20c0c5a 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.h
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.h
@@ -13,7 +13,7 @@ class MonitorManager;
 enum class DuplicatorState;
 
 
-class Monitor
+class Monitor final
 {
 public:
     explicit Monitor(int id);
@@ -68,8 +68,8 @@ private:
 
     Microsoft::WRL::ComPtr<IDXGIOutput> output_;
     Microsoft::WRL::ComPtr<IDXGIAdapter> adapter_;
-    DXGI_OUTPUT_DESC outputDesc_;
-    MONITORINFOEX monitorInfo_;
+    DXGI_OUTPUT_DESC outputDesc_ = {};
+    MONITORINFOEX monitorInfo_ = {};
 
     std::shared_ptr<class Duplicator> duplicator_;
     UINT lastFrameId_ = -1;
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.h b/Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.h
index 3905ba7..fbd1d3c 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.h
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.h
@@ -10,7 +10,7 @@ struct IUnityInterfaces;
 class Monitor;
 class Cursor;
 
-class MonitorManager
+class MonitorManager final
 {
 public:
     MonitorManager();