Changeset 96540 in vbox

Timestamp:

Aug 28, 2022 4:40:20 PM (2 years ago)

Author:

vboxsync

Message:

VBox/com/microatl.h: Split up CComCritSectLock into one capable of automatically taking the lock in the constructore, and a base class CComCritSectLockManual requiring explicint locking. Since the code only needs the latter, we avoid a 'throw' that causes trouble in no-CRT mode where we have exceptions disabled. Also added a missing Lock() return code check in GetTI. bugref:10261

File:

• trunk/include/VBox/com/microatl.h (modified) (5 diffs)

trunk/include/VBox/com/microatl.h

@@ -185 +185 @@
 };
 
-template <class TLock> class CComCritSectLock
-{
-public:
-    CComCritSectLock(CComCriticalSection &cs, bool fInitialLock = true) :
-        m_cs(cs),
-        m_fLocked(false)
-    {
-        if (fInitialLock)
-        {
-            HRESULT hrc = Lock();
-            if (FAILED(hrc))
-                throw hrc;
-        }
-    }
-
-    ~CComCritSectLock() throw()
+template<class TLock>
+class CComCritSectLockManual
+{
+public:
+    CComCritSectLockManual(CComCriticalSection &cs)
+        : m_cs(cs)
+        , m_fLocked(false)
+    {
+    }
+
+    ~CComCritSectLockManual() throw()
     {
         if (m_fLocked)
@@ -228 +223 @@
     bool m_fLocked;
 
+    CComCritSectLockManual(const CComCritSectLockManual&) throw(); // Do not call.
+    CComCritSectLockManual &operator=(const CComCritSectLockManual &) throw(); // Do not call.
+};
+
+
+#ifdef RT_EXCEPTIONS_ENABLED
+/** This is called CComCritSecLock in real ATL... */
+template<class TLock>
+class CComCritSectLock : public CComCritSectLockManual<TLock>
+{
+public:
+    CComCritSectLock(CComCriticalSection &cs, bool fInitialLock = true) 
+        : CComCritSectLockManual(cs)
+    {
+        if (fInitialLock)
+        {
+            HRESULT hrc = Lock();
+            if (FAILED(hrc))
+                throw hrc;
+        }
+    }
+
+private:
     CComCritSectLock(const CComCritSectLock&) throw(); // Do not call.
     CComCritSectLock &operator=(const CComCritSectLock &) throw(); // Do not call.
 };
+#endif
 
 class CComFakeCriticalSection
@@ -420 +439 @@
         pNew->pfn = pfn;
         pNew->pv = pv;
-        CComCritSectLock<CComCriticalSection> lock(m_csStaticDataInitAndTypeInfo, false);
+        CComCritSectLockManual<CComCriticalSection> lock(m_csStaticDataInitAndTypeInfo);
         HRESULT hrc = lock.Lock();
         if (SUCCEEDED(hrc))
@@ -576 +595 @@
                     if (!pEntry->pCF)
                     {
-                        CComCritSectLock<CComCriticalSection> lock(_AtlComModule.m_csObjMap, false);
+                        CComCritSectLockManual<CComCriticalSection> lock(_AtlComModule.m_csObjMap);
                         hrc = lock.Lock();
                         if (FAILED(hrc))
@@ -848 +867 @@
         if (m_pTInfo)
             return S_OK;
-        CComCritSectLock<CComCriticalSection> lock(_pAtlModule->m_csStaticDataInitAndTypeInfo, false);
+
+        CComCritSectLockManual<CComCriticalSection> lock(_pAtlModule->m_csStaticDataInitAndTypeInfo);
         HRESULT hrc = lock.Lock();
-        ITypeLib *pTypeLib = NULL;
-        Assert(*m_pLibID != GUID_NULL);
-        hrc = LoadRegTypeLib(*m_pLibID, m_iMajor, m_iMinor, lcid, &pTypeLib);
         if (SUCCEEDED(hrc))
         {
-            ITypeInfo *pTypeInfo;
-            hrc = pTypeLib->GetTypeInfoOfGuid(*m_pGUID, &pTypeInfo);
+            ITypeLib *pTypeLib = NULL;
+            Assert(*m_pLibID != GUID_NULL);
+            hrc = LoadRegTypeLib(*m_pLibID, m_iMajor, m_iMinor, lcid, &pTypeLib);
             if (SUCCEEDED(hrc))
             {
-                ITypeInfo2 *pTypeInfo2;
-                if (SUCCEEDED(pTypeInfo->QueryInterface(__uuidof(ITypeInfo2), (void **)&pTypeInfo2)))
+                ITypeInfo *pTypeInfo;
+                hrc = pTypeLib->GetTypeInfoOfGuid(*m_pGUID, &pTypeInfo);
+                if (SUCCEEDED(hrc))
                 {
-                    pTypeInfo->Release();
-                    pTypeInfo = pTypeInfo2;
+                    ITypeInfo2 *pTypeInfo2;
+                    if (SUCCEEDED(pTypeInfo->QueryInterface(__uuidof(ITypeInfo2), (void **)&pTypeInfo2)))
+                    {
+                        pTypeInfo->Release();
+                        pTypeInfo = pTypeInfo2;
+                    }
+                    m_pTInfo = pTypeInfo;
+                    _pAtlModule->AddTermFunc(Cleanup, (void *)this);
                 }
-                m_pTInfo = pTypeInfo;
-                _pAtlModule->AddTermFunc(Cleanup, (void *)this);
+                pTypeLib->Release();
             }
-            pTypeLib->Release();
         }
         return hrc;