Changeset 63147 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Aug 8, 2016 11:12:33 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109765

Message:

Main: warnings

Location:

trunk/src/VBox/Main/src-server

Files:

• HostVideoInputDeviceImpl.cpp (modified) (2 diffs)
• MediumImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp

@@ -132 +132 @@
 static int loadHostWebcamLibrary(const char *pszPath, RTLDRMOD *phmod, PFNVBOXHOSTWEBCAMLIST *ppfn)
 {
-    int rc = VINF_SUCCESS;
-    RTLDRMOD hmod = NIL_RTLDRMOD;
-
-    RTERRINFOSTATIC ErrInfo;
-    RTErrInfoInitStatic(&ErrInfo);
+    int rc;
     if (RTPathHavePath(pszPath))
-        rc = SUPR3HardenedLdrLoadPlugIn(pszPath, &hmod, &ErrInfo.Core);
+    {
+        RTLDRMOD hmod = NIL_RTLDRMOD;
+        RTERRINFOSTATIC ErrInfo;
+        rc = SUPR3HardenedLdrLoadPlugIn(pszPath, &hmod, RTErrInfoInitStatic(&ErrInfo));
+        if (RT_SUCCESS(rc))
+        {
+            static const char s_szSymbol[] = "VBoxHostWebcamList";
+            rc = RTLdrGetSymbol(hmod, s_szSymbol, (void **)ppfn);
+            if (RT_SUCCESS(rc))
+                *phmod = hmod;
+            else
+            {
+                if (rc != VERR_SYMBOL_NOT_FOUND)
+                    LogRel(("Resolving symbol '%s': %Rrc\n", s_szSymbol, rc));
+                RTLdrClose(hmod);
+                hmod = NIL_RTLDRMOD;
+            }
+        }
+        else
+        {
+            LogRel(("Loading the library '%s': %Rrc\n", pszPath, rc));
+            if (RTErrInfoIsSet(&ErrInfo.Core))
+                LogRel(("  %s\n", ErrInfo.Core.pszMsg));
+        }
+    }
     else
+    {
+        LogRel(("Loading the library '%s': No path! Refusing to try loading it!\n", pszPath));
         rc = VERR_INVALID_PARAMETER;
-    if (RT_SUCCESS(rc))
-    {
-        static const char *pszSymbol = "VBoxHostWebcamList";
-        rc = RTLdrGetSymbol(hmod, pszSymbol, (void **)ppfn);
-
-        if (RT_FAILURE(rc) && rc != VERR_SYMBOL_NOT_FOUND)
-            LogRel(("Resolving symbol '%s': %Rrc\n", pszSymbol, rc));
-    }
-    else
-    {
-        LogRel(("Loading the library '%s': %Rrc\n", pszPath, rc));
-        if (RTErrInfoIsSet(&ErrInfo.Core))
-            LogRel(("  %s\n", ErrInfo.Core.pszMsg));
-
-        hmod = NIL_RTLDRMOD;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        *phmod = hmod;
-    }
-    else
-    {
-        if (hmod != NIL_RTLDRMOD)
-        {
-            RTLdrClose(hmod);
-            hmod = NIL_RTLDRMOD;
-        }
-    }
-
+    }
     return rc;
 }
 
-static const Utf8Str strExtPackPuel("Oracle VM VirtualBox Extension Pack");
 
 static HRESULT fillDeviceList(VirtualBox *pVirtualBox, HostVideoInputDeviceList *pList)
@@ -183 +175 @@
 #ifdef VBOX_WITH_EXTPACK
     ExtPackManager *pExtPackMgr = pVirtualBox->i_getExtPackManager();
-    hr = pExtPackMgr->i_getLibraryPathForExtPack("VBoxHostWebcam", &strExtPackPuel, &strLibrary);
+    hr = pExtPackMgr->i_getLibraryPathForExtPack("VBoxHostWebcam", ORACLE_PUEL_EXTPACK_NAME, &strLibrary);
 #else
     hr = E_NOTIMPL;

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -47 +47 @@
 
 typedef std::list<Guid> GuidList;
+
+
+#ifdef VBOX_WITH_EXTPACK
+static const char g_szVDPlugin[] = "VDPluginCrypt";
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -3574 +3580 @@
 
 # ifdef VBOX_WITH_EXTPACK
-        static const Utf8Str strExtPackPuel("Oracle VM VirtualBox Extension Pack");
-        static const char *s_pszVDPlugin = "VDPluginCrypt";
         ExtPackManager *pExtPackManager = m->pVirtualBox->i_getExtPackManager();
-        if (pExtPackManager->i_isExtPackUsable(strExtPackPuel.c_str()))
+        if (pExtPackManager->i_isExtPackUsable(ORACLE_PUEL_EXTPACK_NAME))
         {
             /* Load the plugin */
             Utf8Str strPlugin;
-            rc = pExtPackManager->i_getLibraryPathForExtPack(s_pszVDPlugin, &strExtPackPuel, &strPlugin);
+            rc = pExtPackManager->i_getLibraryPathForExtPack(g_szVDPlugin, ORACLE_PUEL_EXTPACK_NAME, &strPlugin);
             if (SUCCEEDED(rc))
             {
@@ -3593 +3597 @@
                 throw setError(VBOX_E_NOT_SUPPORTED,
                                tr("Encryption is not supported because the extension pack '%s' is missing the encryption plugin (old extension pack installed?)"),
-                               strExtPackPuel.c_str());
+                               ORACLE_PUEL_EXTPACK_NAME);
         }
         else
             throw setError(VBOX_E_NOT_SUPPORTED,
                            tr("Encryption is not supported because the extension pack '%s' is missing"),
-                           strExtPackPuel.c_str());
+                           ORACLE_PUEL_EXTPACK_NAME);
 
         PVBOXHDD pDisk = NULL;
@@ -3652 +3656 @@
 
 # ifdef VBOX_WITH_EXTPACK
-        static const Utf8Str strExtPackPuel("Oracle VM VirtualBox Extension Pack");
-        static const char *s_pszVDPlugin = "VDPluginCrypt";
         ExtPackManager *pExtPackManager = m->pVirtualBox->i_getExtPackManager();
-        if (pExtPackManager->i_isExtPackUsable(strExtPackPuel.c_str()))
+        if (pExtPackManager->i_isExtPackUsable(ORACLE_PUEL_EXTPACK_NAME))
         {
             /* Load the plugin */
             Utf8Str strPlugin;
-            rc = pExtPackManager->i_getLibraryPathForExtPack(s_pszVDPlugin, &strExtPackPuel, &strPlugin);
+            rc = pExtPackManager->i_getLibraryPathForExtPack(g_szVDPlugin, ORACLE_PUEL_EXTPACK_NAME, &strPlugin);
             if (SUCCEEDED(rc))
             {
@@ -3671 +3673 @@
                 throw setError(VBOX_E_NOT_SUPPORTED,
                                tr("Encryption is not supported because the extension pack '%s' is missing the encryption plugin (old extension pack installed?)"),
-                               strExtPackPuel.c_str());
+                               ORACLE_PUEL_EXTPACK_NAME);
         }
         else
             throw setError(VBOX_E_NOT_SUPPORTED,
                            tr("Encryption is not supported because the extension pack '%s' is missing"),
-                           strExtPackPuel.c_str());
+                           ORACLE_PUEL_EXTPACK_NAME);
 
         PVBOXHDD pDisk = NULL;
@@ -9414 +9416 @@
 
 #ifdef VBOX_WITH_EXTPACK
-                static const Utf8Str strExtPackPuel("Oracle VM VirtualBox Extension Pack");
-                static const char *s_pszVDPlugin = "VDPluginCrypt";
                 ExtPackManager *pExtPackManager = m->pVirtualBox->i_getExtPackManager();
-                if (pExtPackManager->i_isExtPackUsable(strExtPackPuel.c_str()))
+                if (pExtPackManager->i_isExtPackUsable(ORACLE_PUEL_EXTPACK_NAME))
                 {
                     /* Load the plugin */
                     Utf8Str strPlugin;
-                    rc = pExtPackManager->i_getLibraryPathForExtPack(s_pszVDPlugin, &strExtPackPuel, &strPlugin);
+                    rc = pExtPackManager->i_getLibraryPathForExtPack(g_szVDPlugin, ORACLE_PUEL_EXTPACK_NAME, &strPlugin);
                     if (SUCCEEDED(rc))
                     {
@@ -9433 +9433 @@
                         throw setError(VBOX_E_NOT_SUPPORTED,
                                        tr("Encryption is not supported because the extension pack '%s' is missing the encryption plugin (old extension pack installed?)"),
-                                       strExtPackPuel.c_str());
+                                       ORACLE_PUEL_EXTPACK_NAME);
                 }
                 else
                     throw setError(VBOX_E_NOT_SUPPORTED,
                                    tr("Encryption is not supported because the extension pack '%s' is missing"),
-                                   strExtPackPuel.c_str());
+                                   ORACLE_PUEL_EXTPACK_NAME);
 #else
                 throw setError(VBOX_E_NOT_SUPPORTED,
@@ -9896 +9896 @@
     {
 # ifdef VBOX_WITH_EXTPACK
-        static const Utf8Str strExtPackPuel("Oracle VM VirtualBox Extension Pack");
-        static const char *s_pszVDPlugin = "VDPluginCrypt";
         ExtPackManager *pExtPackManager = m->pVirtualBox->i_getExtPackManager();
-        if (pExtPackManager->i_isExtPackUsable(strExtPackPuel.c_str()))
+        if (pExtPackManager->i_isExtPackUsable(ORACLE_PUEL_EXTPACK_NAME))
         {
             /* Load the plugin */
             Utf8Str strPlugin;
-            rc = pExtPackManager->i_getLibraryPathForExtPack(s_pszVDPlugin, &strExtPackPuel, &strPlugin);
+            rc = pExtPackManager->i_getLibraryPathForExtPack(g_szVDPlugin, ORACLE_PUEL_EXTPACK_NAME, &strPlugin);
             if (SUCCEEDED(rc))
             {
@@ -9915 +9913 @@
                 throw setError(VBOX_E_NOT_SUPPORTED,
                                tr("Encryption is not supported because the extension pack '%s' is missing the encryption plugin (old extension pack installed?)"),
-                               strExtPackPuel.c_str());
+                               ORACLE_PUEL_EXTPACK_NAME);
         }
         else
             throw setError(VBOX_E_NOT_SUPPORTED,
                            tr("Encryption is not supported because the extension pack '%s' is missing"),
-                           strExtPackPuel.c_str());
+                           ORACLE_PUEL_EXTPACK_NAME);
 
         PVBOXHDD pDisk = NULL;