From 9bb990e9ed9948a2a6f6fba8922cd6e715b7760d Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Sun, 8 Nov 2015 20:40:08 +0000 Subject: [PATCH] Revert "gsdx|spu2-x: Use atlcomcli.h for CComPtr definition" This reverts commit 0eb771c2a672d0880246aaf6f2ca7c499eb345b4. The buildbot apparently cannot find atlcomcli.h. Oh joy. --- common/include/comptr.h | 419 ++++++++++++++++++ plugins/GSdx/stdafx.h | 3 +- plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp | 2 +- 3 files changed, 422 insertions(+), 2 deletions(-) create mode 100644 common/include/comptr.h diff --git a/common/include/comptr.h b/common/include/comptr.h new file mode 100644 index 0000000000..f068c40c38 --- /dev/null +++ b/common/include/comptr.h @@ -0,0 +1,419 @@ +#pragma once + +#ifndef ASSERT + +#ifdef _DEBUG + #include + #define ASSERT assert +#else + #define ASSERT(exp) ((void)0) +#endif + +#endif + +inline IUnknown* AtlComPtrAssign(IUnknown** pp, IUnknown* lp) +{ + if(pp == NULL) return NULL; + + if(lp != NULL) lp->AddRef(); + + if(*pp) (*pp)->Release(); + + *pp = lp; + + return lp; +} + +inline IUnknown* AtlComQIPtrAssign(IUnknown** pp, IUnknown* lp, REFIID riid) +{ + if(pp == NULL) return NULL; + + IUnknown* pTemp = *pp; + + if(lp == NULL || FAILED(lp->QueryInterface(riid, (void**)pp))) *pp = NULL; + + if(pTemp) pTemp->Release(); + + return *pp; +} + +template class _NoAddRefReleaseOnCComPtr : public T +{ +private: + STDMETHOD_(ULONG, AddRef)() = 0; + STDMETHOD_(ULONG, Release)() = 0; +}; + +template class CComPtrBase +{ +protected: + CComPtrBase() throw() + { + p = NULL; + } + + CComPtrBase(T* lp) throw() + { + p = lp; + + if(p != NULL) p->AddRef(); + } + + void Swap(CComPtrBase& other) + { + T* pTemp = p; + p = other.p; + other.p = pTemp; + } + +public: + typedef T _PtrClass; + + ~CComPtrBase() throw() + { + if(p) p->Release(); + } + + operator T*() const throw() + { + return p; + } + + T& operator*() const + { + ASSERT(p != NULL); + + return *p; + } + + T** operator&() throw() + { + ASSERT(p == NULL); + + return &p; + } + + _NoAddRefReleaseOnCComPtr* operator->() const throw() + { + ASSERT(p != NULL); + + return (_NoAddRefReleaseOnCComPtr*)p; + } + + bool operator!() const throw() + { + return p == NULL; + } + + bool operator < (T* pT) const throw() + { + return p < pT; + } + + bool operator != (T* pT) const + { + return !operator==(pT); + } + + bool operator == (T* pT) const throw() + { + return p == pT; + } + + void Release() throw() + { + T* pTemp = p; + + if(pTemp) + { + p = NULL; + pTemp->Release(); + } + } + + bool IsEqualObject(IUnknown* pOther) throw() + { + if(p == NULL && pOther == NULL) return true; + + if(p == NULL || pOther == NULL) return false; + + CComPtr punk1; + CComPtr punk2; + + p->QueryInterface(__uuidof(IUnknown), (void**)&punk1); + pOther->QueryInterface(__uuidof(IUnknown), (void**)&punk2); + + return punk1 == punk2; + } + + void Attach(T* p2) throw() + { + if(p) + { + ULONG ref = p->Release(); + + (ref); + + ASSERT(ref != 0 || p2 != p); + } + + p = p2; + } + + T* Detach() throw() + { + T* pt = p; + p = NULL; + return pt; + } + + HRESULT CopyTo(T** ppT) throw() + { + ASSERT(ppT != NULL); + + if(ppT == NULL) return E_POINTER; + + *ppT = p; + + if(p) p->AddRef(); + + return S_OK; + } + + HRESULT CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter = NULL, DWORD dwClsContext = CLSCTX_ALL) throw() + { + ASSERT(p == NULL); + + return ::CoCreateInstance(rclsid, pUnkOuter, dwClsContext, __uuidof(T), (void**)&p); + } + + template HRESULT QueryInterface(Q** pp) const throw() + { + ASSERT(pp != NULL); + + return p->QueryInterface(__uuidof(Q), (void**)pp); + } + + T* p; +}; + +template class CComPtr : public CComPtrBase +{ +public: + CComPtr() throw() + { + } + + CComPtr(T* lp) throw() : CComPtrBase(lp) + { + } + + CComPtr(const CComPtr& lp) throw() : CComPtrBase(lp.p) + { + } + + T* operator = (T* lp) throw() + { + if(*this != lp) + { + CComPtr(lp).Swap(*this); + } + + return *this; + } + + template T* operator = (const CComPtr& lp) throw() + { + if(!IsEqualObject(lp)) + { + return static_cast(AtlComQIPtrAssign((IUnknown**)&p, lp, __uuidof(T))); + } + + return *this; + } + + T* operator = (const CComPtr& lp) throw() + { + if(*this != lp) + { + CComPtr(lp).Swap(*this); + } + + return *this; + } + + CComPtr(CComPtr&& lp) throw() : CComPtrBase() + { + lp.Swap(*this); + } + + T* operator = (CComPtr&& lp) throw() + { + if(*this != lp) + { + CComPtr(static_cast(lp)).Swap(*this); + } + + return *this; + } +}; + +template<> class CComPtr : public CComPtrBase +{ +public: + CComPtr() throw() + { + } + + CComPtr(IDispatch* lp) throw() : CComPtrBase(lp) + { + } + + CComPtr(const CComPtr& lp) throw() : CComPtrBase(lp.p) + { + } + + IDispatch* operator = (IDispatch* lp) throw() + { + if(*this != lp) + { + CComPtr(lp).Swap(*this); + } + + return *this; + } + + IDispatch* operator = (const CComPtr& lp) throw() + { + if(*this != lp) + { + CComPtr(lp).Swap(*this); + } + + return *this; + } + + CComPtr(CComPtr&& lp) throw() : CComPtrBase() + { + p = lp.p; + lp.p = NULL; + } + + IDispatch* operator = (CComPtr&& lp) throw() + { + CComPtr(static_cast(lp)).Swap(*this); + + return *this; + } +}; + +template class CComQIPtr : public CComPtr +{ +public: + CComQIPtr() throw() + { + } + /* + CComQIPtr(decltype(__nullptr)) throw() + { + } + */ + CComQIPtr(_Inout_opt_ T* lp) throw() : CComPtr(lp) + { + } + + CComQIPtr(_Inout_ const CComQIPtr& lp) throw() : CComPtr(lp.p) + { + } + + CComQIPtr(_Inout_opt_ IUnknown* lp) throw() + { + if(lp != NULL) + { + if(FAILED(lp->QueryInterface(*piid, (void **)&p))) + { + p = NULL; + } + } + } + /* + T* operator=(decltype(__nullptr)) throw() + { + CComQIPtr(nullptr).Swap(*this); + + return nullptr; + } + */ + T* operator = (T* lp) throw() + { + if(*this != lp) + { + CComQIPtr(lp).Swap(*this); + } + + return *this; + } + + T* operator = (const CComQIPtr& lp) throw() + { + if(*this != lp) + { + CComQIPtr(lp).Swap(*this); + } + + return *this; + } + + T* operator = (IUnknown* lp) throw() + { + if(*this != lp) + { + return static_cast(AtlComQIPtrAssign((IUnknown**)&p, lp, *piid)); + } + + return *this; + } +}; + +template<> class CComQIPtr : public CComPtr +{ +public: + CComQIPtr() throw() + { + } + + CComQIPtr(IUnknown* lp) throw() + { + if(lp != NULL) + { + if(FAILED(lp->QueryInterface(__uuidof(IUnknown), (void **)&p))) + { + p = NULL; + } + } + } + + CComQIPtr(const CComQIPtr& lp) throw() : CComPtr(lp.p) + { + } + + IUnknown* operator = (IUnknown* lp) throw() + { + if(*this != lp) + { + return AtlComQIPtrAssign((IUnknown**)&p, lp, __uuidof(IUnknown)); + } + + return *this; + } + + IUnknown* operator = (const CComQIPtr& lp) throw() + { + if(*this != lp) + { + CComQIPtr(lp).Swap(*this); + } + + return *this; + } +}; diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h index e8e4052404..a648068f2c 100644 --- a/plugins/GSdx/stdafx.h +++ b/plugins/GSdx/stdafx.h @@ -42,7 +42,8 @@ #include #include #include -#include +#include "../../common/include/comptr.h" + #define D3DCOLORWRITEENABLE_RGBA (D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE | D3DCOLORWRITEENABLE_ALPHA) #define D3D11_SHADER_MACRO D3D10_SHADER_MACRO diff --git a/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp b/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp index 9dc1c0e885..e695441635 100644 --- a/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp +++ b/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp @@ -21,7 +21,7 @@ #include "Dialogs.h" #include -#include +#include "../../common/include/comptr.h" namespace Exception {