dxgitrace: Use com_ptr in d3d1[01]size.hpp.

The wrong object was being dereferenced.

3 files changed, 95 insertions, 8 deletions

diff --git a/helpers/com_ptr.hpp b/helpers/com_ptr.hpp
new file mode 100644
index 00000000..83384f74
--- /dev/null
+++ b/helpers/com_ptr.hpp
@@ -0,0 +1,89 @@
+/**************************************************************************
+ *
+ * Copyright 2014 VMware, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#ifndef COM_PTR_HPP
+#define COM_PTR_HPP
+
+
+#include <assert.h>
+
+
+/**
+ * Simple smart pointer template for COM interfaces.
+ */
+template< class T >
+class com_ptr
+{
+private:
+    T *p;
+
+public:
+    com_ptr(void) {
+        p = NULL;
+    }
+
+    ~com_ptr() {
+        if (p) {
+            p->Release();
+        }
+    }
+
+    // Used when initializing
+    T **
+    operator & () {
+        assert(p == NULL);
+        return &p;
+    }
+
+    // Implict cast to T*
+    operator T * () const {
+        return p;
+    }
+
+    // Methods
+    T *
+    operator -> () const {
+        return p;
+    }
+
+    T *
+    operator = (T *q) {
+        if (p) {
+            p->Release();
+        }
+        if (q) {
+            q->AddRef();
+        }
+        return p = q;
+    }
+
+private:
+    com_ptr(const com_ptr &);
+    com_ptr & operator= (const com_ptr &);
+};
+
+
+
+#endif // COM_PTR_HPP
diff --git a/helpers/d3d10size.hpp b/helpers/d3d10size.hpp
index b5a5ef4d..96727a3e 100644
--- a/helpers/d3d10size.hpp
+++ b/helpers/d3d10size.hpp
@@ -42,6 +42,7 @@
 #include <algorithm>
 
 #include "dxgisize.hpp"
+#include "com_ptr.hpp"
 
 
 inline UINT
@@ -261,15 +262,13 @@ _getQueryType(ID3D10Query *pQuery)
 static inline D3D10_QUERY
 _getQueryType(ID3D10Asynchronous *pAsync)
 {
-    ID3D10Query *pQuery = NULL;
+    com_ptr<ID3D10Query> pQuery;
     HRESULT hr;
     hr = pAsync->QueryInterface(IID_ID3D10Query, (void **)&pQuery);
     if (FAILED(hr)) {
         return (D3D10_QUERY)-1;
     }
-    D3D10_QUERY Type = _getQueryType(pQuery);
-    pAsync->Release();
-    return Type;
+    return _getQueryType(pQuery);
 }
 
 
diff --git a/helpers/d3d11size.hpp b/helpers/d3d11size.hpp
index e14351a0..fcab7a7b 100644
--- a/helpers/d3d11size.hpp
+++ b/helpers/d3d11size.hpp
@@ -42,6 +42,7 @@
 #include <algorithm>
 
 #include "dxgisize.hpp"
+#include "com_ptr.hpp"
 
 
 inline UINT
@@ -207,15 +208,13 @@ _getQueryType(ID3D11Query *pQuery)
 static inline D3D11_QUERY
 _getQueryType(ID3D11Asynchronous *pAsync)
 {
-    ID3D11Query *pQuery = NULL;
+    com_ptr<ID3D11Query> pQuery;
     HRESULT hr;
     hr = pAsync->QueryInterface(IID_ID3D11Query, (void **)&pQuery);
     if (FAILED(hr)) {
         return (D3D11_QUERY)-1;
     }
-    D3D11_QUERY Type = _getQueryType(pQuery);
-    pAsync->Release();
-    return Type;
+    return _getQueryType(pQuery);
 }