Changeset 95890 in vbox for trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp

Timestamp:

Jul 28, 2022 1:49:20 AM (3 years ago)

Author:

vboxsync

Message:

Add/Nt/VBoxCredProv: Make it compile in VBOX_WITH_NOCRT_STATIC mode. bugref:10261

File:

• trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp

@@ -213 +213 @@
 {
     HRESULT hr = S_OK;
-    DWORD dwErr;
 
     VBoxCredProvVerbose(0, "VBoxCredProv::SetUsageScenario: enmUsageScenario=%d, dwFlags=%ld\n",
@@ -227 +226 @@
             VBoxCredProvReportStatus(VBoxGuestFacilityStatus_Active);
 
-            dwErr = LoadConfiguration();
+            DWORD dwErr = LoadConfiguration();
             if (dwErr != ERROR_SUCCESS)
                 VBoxCredProvVerbose(0, "VBoxCredProv: Error while loading configuration, error=%ld\n", dwErr);
@@ -239 +238 @@
                 break;
 
+            hr = S_OK;
             if (!m_pPoller)
             {
-                try
+#ifdef RT_EXCEPTIONS_ENABLED
+                try { m_pPoller = new VBoxCredProvPoller(); }
+                catch (std::bad_alloc &) { hr = E_OUTOFMEMORY; }
+#else
+                m_pPoller = new VBoxCredProvPoller();
+                AssertStmt(m_pPoller, hr = E_OUTOFMEMORY);
+#endif
+                if (SUCCEEDED(hr))
                 {
-                    m_pPoller = new VBoxCredProvPoller();
-                    AssertPtr(m_pPoller);
                     int rc = m_pPoller->Initialize(this);
                     if (RT_FAILURE(rc))
                         VBoxCredProvVerbose(0, "VBoxCredProv::SetUsageScenario: Error initializing poller thread, rc=%Rrc\n", rc);
-                }
-                catch (std::bad_alloc &ex)
-                {
-                    NOREF(ex);
-                    hr = E_OUTOFMEMORY;
+/** @todo r=bird: Why is the initialize failure ignored here? */
                 }
             }
@@ -259 +260 @@
                 && !m_pCred)
             {
-                try
-                {
-                    m_pCred = new VBoxCredProvCredential();
-                    AssertPtr(m_pPoller);
+#ifdef RT_EXCEPTIONS_ENABLED
+                try { m_pCred = new VBoxCredProvCredential(); }
+                catch (std::bad_alloc &) { hr = E_OUTOFMEMORY; }
+#else
+                m_pCred = new VBoxCredProvCredential();
+                AssertStmt(m_pCred, hr = E_OUTOFMEMORY);
+#endif
+                if (SUCCEEDED(hr))
                     hr = m_pCred->Initialize(m_enmUsageScenario);
-                }
-                catch (std::bad_alloc &ex)
-                {
-                    NOREF(ex);
-                    hr = E_OUTOFMEMORY;
-                }
             }
             else
@@ -277 +276 @@
 
             /* If we failed, do some cleanup. */
+/** @todo r=bird: Why aren't we cleaning up m_pPoller too? Very confusing given
+ * that m_pCred wasn't necessarily even created above.  Always explain the WHY
+ * when doing something that isn't logical like here! */
             if (FAILED(hr))
             {
@@ -291 +293 @@
         case CPUS_CREDUI:          /* Displays an own UI. We don't need that. */
         case CPUS_PLAP:            /* See Pre-Logon-Access Provider. Not needed (yet). */
-
             hr = E_NOTIMPL;
             break;
@@ -571 +572 @@
 VBoxCredProvProviderCreate(REFIID interfaceID, void **ppvInterface)
 {
-    HRESULT hr;
-
-    try
-    {
-        VBoxCredProvProvider *pProvider = new VBoxCredProvProvider();
-        AssertPtr(pProvider);
-        hr = pProvider->QueryInterface(interfaceID, ppvInterface);
-        pProvider->Release();
-    }
-    catch (std::bad_alloc &ex)
-    {
-        NOREF(ex);
-        hr = E_OUTOFMEMORY;
-    }
+    VBoxCredProvProvider *pProvider;
+#ifdef RT_EXCEPTIONS_ENABLED
+    try { pProvider = new VBoxCredProvProvider(); }
+    catch (std::bad_alloc &) { AssertFailedReturn(E_OUTOFMEMORY); }
+#else
+    pProvider = new VBoxCredProvProvider();
+    AssertReturn(pProvider, E_OUTOFMEMORY);
+#endif
+
+    HRESULT hr = pProvider->QueryInterface(interfaceID, ppvInterface);
+    pProvider->Release();
 
     return hr;