Changeset 60255 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 30, 2016 8:32:04 AM (9 years ago)

Author:

vboxsync

Message:

Additions/VBoxCredProv: Fixes for BSTR handling (untested, thanks PVS).

Location:

trunk/src/VBox/Additions/WINNT/VBoxCredProv

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxCredentialProvider.cpp (modified) (13 diffs)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2009-2015 Oracle Corporation
+# Copyright (C) 2009-2016 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+# Do we want to use Windows SENS (System Event Notification Service)?
+VBOX_WITH_WIN_SENS := 1
+
 DLLS += VBoxCredProv
 VBoxCredProv_TEMPLATE    = VBOXGUESTR3DLL
-VBoxCredProv_DEFS        = VBGL_VBOXGUEST VBOX_WITH_HGCM VBOX_WITH_SENS UNICODE
+VBoxCredProv_DEFS        = VBGL_VBOXGUEST VBOX_WITH_HGCM UNICODE
+ifdef VBOX_WITH_WIN_SENS
+ VBoxService_DEFS       += VBOX_WITH_WIN_SENS
+endif
 VBoxCredProv_SDKS        = ReorderCompilerIncs $(VBOX_WINPSDK_GST_WLH)
 VBoxCredProv_SOURCES  = \
@@ -33 +39 @@
         VBoxCredProvUtils.cpp
 
+ifdef VBOX_WITH_WIN_SENS
+ # To use com::Bstr for BSTR handling.
+ VBoxCredProv_SOURCES += \
+        $(PATH_ROOT)/src/VBox/Main/glue/string.cpp
+endif
+
 VBoxCredProv_LIBS     = \
         $(VBOX_LIB_IPRT_GUEST_R3) \

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 #include <new> /* For bad_alloc. */
 
-#ifdef VBOX_WITH_SENS
+#ifdef VBOX_WITH_WIN_SENS
 # include <eventsys.h>
 # include <sens.h>
@@ -32 +32 @@
 #include <iprt/buildconfig.h>
 #include <iprt/initterm.h>
-#ifdef VBOX_WITH_SENS
-# include <iprt/string.h>
+#ifdef VBOX_WITH_WIN_SENS
+# include <VBox/com/string.h>
+using namespace com;
 #endif
 #include <VBox/VBoxGuestLib.h>
@@ -47 +48 @@
 static HINSTANCE g_hDllInst = NULL;          /**< Global DLL hInstance. */
 
-#ifdef VBOX_WITH_SENS
+#ifdef VBOX_WITH_WIN_SENS
 static bool g_fSENSEnabled = false;
 static IEventSystem *g_pIEventSystem = NULL; /**< Pointer to IEventSystem interface. */
@@ -199 +200 @@
     if (FAILED(hr))
     {
-        VBoxCredProvVerbose(0, "VBoxCredentialProviderRegisterSENS: Could not connect to CEventSystem, hr=%Rhrc\n",
-                            hr);
+        VBoxCredProvVerbose(0, "VBoxCredentialProviderRegisterSENS: Could not connect to CEventSystem, hr=%Rhrc\n", hr);
         return hr;
     }
 
+    /* Note: Bstr class can also throw -- therefore including the setup procedure in the following try block as well. */
     try
     {
         g_pISensLogon = new VBoxCredProvSensLogon();
+
+        AssertPtr(g_pIEventSystem);
         AssertPtr(g_pISensLogon);
-    }
-    catch (std::bad_alloc &ex)
-    {
-        NOREF(ex);
-        hr = E_OUTOFMEMORY;
-    }
-
-    if (   SUCCEEDED(hr)
-        && g_pIEventSystem)
-    {
+
         IEventSubscription *pIEventSubscription;
         int i;
@@ -229 +223 @@
                 continue;
 
-            hr = pIEventSubscription->put_EventClassID(L"{d5978630-5b9f-11d1-8dd2-00aa004abd5e}" /* SENSGUID_EVENTCLASS_LOGON */);
+            hr = pIEventSubscription->put_EventClassID(Bstr("{d5978630-5b9f-11d1-8dd2-00aa004abd5e}" /* SENSGUID_EVENTCLASS_LOGON */).raw());
             if (FAILED(hr))
                 break;
@@ -237 +231 @@
                 break;
 
-            PRTUTF16 pwszTemp;
-            int rc = RTStrToUtf16(g_aSENSEvents[i].pszMethod, &pwszTemp);
-            if (RT_SUCCESS(rc))
-            {
-                hr = pIEventSubscription->put_MethodName(pwszTemp);
-                RTUtf16Free(pwszTemp);
-            }
-            else
-                hr = ERROR_OUTOFMEMORY;
-            if (FAILED(hr))
-                break;
-
-            rc = RTStrToUtf16(g_aSENSEvents[i].pszSubscriptionName, &pwszTemp);
-            if (RT_SUCCESS(rc))
-            {
-                hr = pIEventSubscription->put_SubscriptionName(pwszTemp);
-                RTUtf16Free(pwszTemp);
-            }
-            else
-                hr = ERROR_OUTOFMEMORY;
-            if (FAILED(hr))
-                break;
-
-            rc = RTStrToUtf16(g_aSENSEvents[i].pszSubscriptionUUID, &pwszTemp);
-            if (RT_SUCCESS(rc))
-            {
-                hr = pIEventSubscription->put_SubscriptionID(pwszTemp);
-                RTUtf16Free(pwszTemp);
-            }
-            else
-                hr = ERROR_OUTOFMEMORY;
+            hr = pIEventSubscription->put_MethodName(Bstr(g_aSENSEvents[i].pszMethod).raw());
+            if (FAILED(hr))
+                break;
+
+            hr = pIEventSubscription->put_SubscriptionName(Bstr(g_aSENSEvents[i].pszSubscriptionName).raw());
+            if (FAILED(hr))
+                break;
+
+            hr = pIEventSubscription->put_SubscriptionID(Bstr(g_aSENSEvents[i].pszSubscriptionUUID).raw());
             if (FAILED(hr))
                 break;
@@ -290 +262 @@
             pIEventSubscription->Release();
     }
+    catch (std::bad_alloc &ex)
+    {
+        NOREF(ex);
+        hr = E_OUTOFMEMORY;
+    }
 
     if (FAILED(hr))
     {
         VBoxCredProvVerbose(0, "VBoxCredentialProviderRegisterSENS: Error registering SENS provider, hr=%Rhrc\n", hr);
+
+        if (g_pISensLogon)
+        {
+            delete g_pISensLogon;
+            g_pISensLogon = NULL;
+        }
+
         if (g_pIEventSystem)
         {
@@ -320 +304 @@
     HRESULT hr = CoCreateInstance(CLSID_CEventSystem, 0,
                                   CLSCTX_SERVER, IID_IEventSystem, (void**)&g_pIEventSystem);
-    if (   SUCCEEDED(hr)
-        && g_pIEventSystem)
+    if (FAILED(hr))
+        VBoxCredProvVerbose(0, "VBoxCredentialProviderUnregisterSENS: Could not reconnect to CEventSystem, hr=%Rhrc\n", hr);
+
+    try
     {
         VBoxCredProvVerbose(0, "VBoxCredentialProviderUnregisterSENS\n");
@@ -329 +315 @@
         for (int i = 0; i < RT_ELEMENTS(g_aSENSEvents); i++)
         {
-            int iErrorIdX;
-
-            char *pszSubToRemove;
-            if (!RTStrAPrintf(&pszSubToRemove, "SubscriptionID=%s",
-                              g_aSENSEvents[i].pszSubscriptionUUID))
+            int  iErrorIdX;
+            Bstr strSubToRemove = Utf8StrFmt("SubscriptionID=%s", g_aSENSEvents[i].pszSubscriptionUUID);
+            hr = g_pIEventSystem->Remove(PROGID_EventSubscription, strSubToRemove.raw(), &iErrorIdX);
+            if (FAILED(hr))
             {
-                continue; /* Keep going. */
+                VBoxCredProvVerbose(0, "VBoxCredentialProviderUnregisterSENS: Could not unregister \"%s\" (query: %ls), hr=%Rhrc (index: %d)\n",
+                                    g_aSENSEvents[i].pszMethod, strSubToRemove.raw(), hr, iErrorIdX);
+                /* Keep going. */
             }
-
-            PRTUTF16 pwszTemp;
-            int rc2 = RTStrToUtf16(pszSubToRemove, &pwszTemp);
-            if (RT_SUCCESS(rc2))
-            {
-                hr = g_pIEventSystem->Remove(PROGID_EventSubscription, pwszTemp,
-                                             &iErrorIdX);
-                RTUtf16Free(pwszTemp);
-            }
-            else
-                hr = ERROR_OUTOFMEMORY;
-
-            if (FAILED(hr))
-                VBoxCredProvVerbose(0, "VBoxCredentialProviderUnregisterSENS: Could not unregister \"%s\" (query: %s), hr=%Rhrc (index: %d)\n",
-                                    g_aSENSEvents[i].pszMethod, pszSubToRemove, hr, iErrorIdX);
-                /* Keep going. */
-
-            RTStrFree(pszSubToRemove);
-        }
-
+        }
+    }
+    catch (std::bad_alloc &ex)
+    {
+        NOREF(ex);
+        hr = E_OUTOFMEMORY;
+    }
+
+    if (g_pISensLogon)
+    {
+        delete g_pISensLogon;
+        g_pISensLogon = NULL;
+    }
+
+    if (g_pIEventSystem)
+    {
         g_pIEventSystem->Release();
         g_pIEventSystem = NULL;
     }
 
-    if (g_pISensLogon)
-    {
-        delete g_pISensLogon;
-        g_pISensLogon = NULL;
-    }
-
     VBoxCredProvVerbose(0, "VBoxCredentialProviderUnregisterSENS: Returning hr=%Rhrc\n", hr);
 }
-#endif /* VBOX_WITH_SENS */
+#endif /* VBOX_WITH_WIN_SENS */
 
 
@@ -461 +438 @@
                         g_cDllRefs);
 
-#ifdef VBOX_WITH_SENS
+#ifdef VBOX_WITH_WIN_SENS
     if (!g_cDllRefs)
     {
@@ -499 +476 @@
             pFactory->Release();
 
-#ifdef VBOX_WITH_SENS
+#ifdef VBOX_WITH_WIN_SENS
             g_fSENSEnabled = true; /* By default SENS support is enabled. */
 
@@ -533 +510 @@
 #else
             VBoxCredProvVerbose(0, "VBoxCredentialProviderCreate: SENS support is disabled\n");
-#endif
+#endif /* VBOX_WITH_WIN_SENS */
         }
         catch (std::bad_alloc &ex)