Changeset 6967 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Feb 14, 2008 7:14:34 PM (17 years ago)

Author:

vboxsync

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

28137

Message:

Don't use the system library path to look for plugins.

File:

• trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp (modified) (38 diffs)

trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp

@@ -97 +97 @@
         char *m_pszSvcName;
         char *m_pszSvcLibrary;
-        
+
         RTLDRMOD m_hLdrMod;
         PFNVBOXHGCMSVCLOAD m_pfnLoad;
@@ -107 +107 @@
 
         uint32_t *m_paClientIds;
-        
+
         HGCMSVCEXTHANDLE m_hExtension;
 
@@ -126 +126 @@
 
         static DECLCALLBACK(void) svcHlpCallComplete (VBOXHGCMCALLHANDLE callHandle, int32_t rc);
-        
+
     public:
 
@@ -239 +239 @@
      * If only library name is specified, then try to load it from:
      *   - RTPathAppPrivateArch
-     *   - RTPathSharedLibs
-     *   - default system LIBPATH.
+     *   - RTPathSharedLibs (legacy)
      */
     int rc = VINF_SUCCESS;
-    
+
     if (RTPathHavePath (pszName))
     {
@@ -251 +250 @@
     else
     {
-        if (strlen (pszName) >= RTPATH_MAX)
-        {
-            return VERR_FILENAME_TOO_LONG;
-        }
-    
         /* Try default locations. */
         char szBase[RTPATH_MAX];
-        
+
         /* Get the appropriate base path. */
         int i;
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < 2; i++)
         {
             if (i == 0)
@@ -267 +261 @@
                 rc = RTPathAppPrivateArch(szBase, sizeof (szBase));
             }
-            else if (i == 1)
+            else
             {
                 rc = RTPathSharedLibs(szBase, sizeof (szBase));
             }
-            else
-            {
-                szBase[0] = 0;
-                rc = VINF_SUCCESS;
-            }
-            
+
             if (RT_SUCCESS(rc))
             {
                 char szPath[RTPATH_MAX];
-        
+
                 /* szPath = pszBase + pszName */
-                if (szBase[0] != 0)
-                {
-                    rc = RTPathAbsEx (szBase, pszName, szPath, sizeof (szPath));
-                }
-                else
-                {
-                    strcpy (szPath, pszName);
-                }
-            
+                rc = RTPathAbsEx (szBase, pszName, szPath, sizeof (szPath));
+
                 if (RT_SUCCESS(rc))
                 {
                     rc = RTLdrLoad (szPath, phLdrMod);
-            
+
                     if (RT_SUCCESS(rc))
                     {
@@ -304 +286 @@
         }
     }
-    
+
     return rc;
 }
@@ -448 +430 @@
     public:
         HGCMMsgHeader () : pCmd (NULL), pHGCMPort (NULL) {};
-        
+
         /* Command pointer/identifier. */
         PVBOXHGCMCMD pCmd;
@@ -519 +501 @@
         case SVC_MSG_HOSTCALL:    return new HGCMMsgHostCallSvc ();
         case SVC_MSG_GUESTCALL:   return new HGCMMsgCall ();
-        case SVC_MSG_LOADSTATE:      
+        case SVC_MSG_LOADSTATE:
         case SVC_MSG_SAVESTATE:   return new HGCMMsgLoadSaveStateClient ();
         case SVC_MSG_REGEXT:      return new HGCMMsgSvcRegisterExtension ();
@@ -694 +676 @@
                 }
             } break;
-            
+
             case SVC_MSG_REGEXT:
             {
@@ -700 +682 @@
 
                 LogFlowFunc(("SVC_MSG_REGEXT handle = %p, pfn = %p\n", pMsg->handle, pMsg->pfnExtension));
-                
+
                 if (pSvc->m_hExtension)
                 {
@@ -715 +697 @@
                         rc = VERR_NOT_SUPPORTED;
                     }
-                    
+
                     if (VBOX_SUCCESS (rc))
                     {
@@ -728 +710 @@
 
                 LogFlowFunc(("SVC_MSG_UNREGEXT handle = %p\n", pMsg->handle));
-                
+
                 if (pSvc->m_hExtension != pMsg->handle)
                 {
@@ -743 +725 @@
                         rc = VERR_NOT_SUPPORTED;
                     }
-                    
+
                     pSvc->m_hExtension = NULL;
                 }
@@ -771 +753 @@
    if (pMsgCore->MsgId () == SVC_MSG_GUESTCALL)
    {
-       /* Only call the completion for these messages. The helper 
+       /* Only call the completion for these messages. The helper
         * is called by the service, and the service does not get
         * any other messages.
@@ -821 +803 @@
             RTStrFree (m_pszSvcLibrary);
             m_pszSvcLibrary = NULL;
-            
+
             RTStrFree (m_pszSvcName);
             m_pszSvcName = NULL;
-            
+
             rc = VERR_NO_MEMORY;
         }
@@ -832 +814 @@
             m_svcHelpers.pfnCallComplete = svcHlpCallComplete;
             m_svcHelpers.pvInstance      = this;
-            
+
             /* Execute the load request on the service thread. */
             HGCMMSGHANDLE hMsg;
@@ -942 +924 @@
     HGCMService *pSvc;
     int rc = HGCMService::ResolveService (&pSvc, pszServiceName);
-    
+
     if (VBOX_SUCCESS (rc))
     {
@@ -968 +950 @@
                 pSvc->m_pSvcNext = sm_pSvcListHead;
                 pSvc->m_pSvcPrev = NULL;
-                
+
                 if (sm_pSvcListHead)
                 {
@@ -1097 +1079 @@
     ASMAtomicIncU32 (&m_u32RefCnt);
     LogFlowFunc(("m_u32RefCnt = %d\n", m_u32RefCnt));
-}       
+}
 
 /** The method dereferences a service and deletes it when no more refs.
@@ -1156 +1138 @@
 
     LogFlowFunc(("%d services to be saved:\n", sm_cServices));
-    
+
     /* Save number of services. */
     rc = SSMR3PutU32(pSSM, sm_cServices);
@@ -1228 +1210 @@
     rc = SSMR3GetU32(pSSM, &cServices);
     AssertRCReturn(rc, rc);
-    
+
     LogFlowFunc(("%d services to be restored:\n", cServices));
 
@@ -1237 +1219 @@
         AssertRCReturn(rc, rc);
         AssertReturn(u32 <= VBOX_HGCM_SVC_NAME_MAX_BYTES, VERR_SSM_UNEXPECTED_DATA);
-        
+
         char *pszServiceName = (char *)alloca (u32);
 
@@ -1243 +1225 @@
         rc = SSMR3GetStrZ(pSSM, pszServiceName, u32);
         AssertRCReturn(rc, rc);
-        
+
         LogFlowFunc(("Restoring service [%s]\n", pszServiceName));
-    
+
         /* Resolve the service instance. */
-        HGCMService *pSvc; 
+        HGCMService *pSvc;
         rc = ResolveService (&pSvc, pszServiceName);
         AssertReturn(pSvc, VERR_SSM_UNEXPECTED_DATA);
-            
+
         /* Get the number of clients. */
         uint32_t cClients;
@@ -1319 +1301 @@
 
     uint32_t handle;
-    
+
     if (pu32ClientIdOut != NULL)
     {
@@ -1353 +1335 @@
 
             rc = hgcmMsgSend (hMsg);
-        
+
             if (VBOX_SUCCESS (rc))
             {
@@ -1363 +1345 @@
                     m_cClientsAllocated += 64;
                 }
-            
+
                 m_paClientIds[m_cClients] = handle;
                 m_cClients++;
@@ -1383 +1365 @@
         ReferenceService ();
     }
-    
+
     LogFlowFunc(("rc = %Vrc\n", rc));
     return rc;
@@ -1412 +1394 @@
 
         rc = hgcmMsgSend (hMsg);
-        
+
         /* Remove the client id from the array in any case. */
         int i;
@@ -1421 +1403 @@
             {
                 m_cClients--;
-                
+
                 if (m_cClients > i)
                 {
                     memmove (&m_paClientIds[i], &m_paClientIds[i + 1], m_cClients - i);
                 }
-                
+
                 break;
             }
@@ -1570 +1552 @@
 
 
-/* 
+/*
  * Main HGCM thread that manages services.
  */
- 
+
 /* Messages processed by the main HGCM thread. */
 #define HGCM_MSG_CONNECT    (10)  /* Connect a client to a service. */
@@ -1667 +1649 @@
         case HGCM_MSG_LOAD:       return new HGCMMsgMainLoad ();
         case HGCM_MSG_HOSTCALL:   return new HGCMMsgMainHostCall ();
-        case HGCM_MSG_LOADSTATE:      
+        case HGCM_MSG_LOADSTATE:
         case HGCM_MSG_SAVESTATE:  return new HGCMMsgMainLoadSaveState ();
         case HGCM_MSG_RESET:      return new HGCMMsgMainReset ();
@@ -1819 +1801 @@
             {
                 HGCMMsgMainRegisterExtension *pMsg = (HGCMMsgMainRegisterExtension *)pMsgCore;
-                
+
                 LogFlowFunc(("HGCM_MSG_REGEXT\n"));
-                
+
                 /* Allocate the handle data. */
                 HGCMSVCEXTHANDLE handle = (HGCMSVCEXTHANDLE)RTMemAllocZ (sizeof (struct _HGCMSVCEXTHANDLEDATA)
                                                                          + strlen (pMsg->pszServiceName)
                                                                          + sizeof (char));
-                
+
                 if (handle == NULL)
                 {
@@ -1835 +1817 @@
                     handle->pszServiceName = (char *)((uint8_t *)handle + sizeof (struct _HGCMSVCEXTHANDLEDATA));
                     strcpy (handle->pszServiceName, pMsg->pszServiceName);
-                    
+
                     HGCMService *pService;
                     rc = HGCMService::ResolveService (&pService, handle->pszServiceName);
@@ -1845 +1827 @@
                         pService->ReleaseService ();
                     }
-                    
+
                     if (VBOX_FAILURE (rc))
                     {
@@ -1872 +1854 @@
                     pService->ReleaseService ();
                 }
-                
+
                 RTMemFree (pMsg->handle);
             } break;
@@ -2237 +2219 @@
         HGCMMsgMainHostCall *pMsg = (HGCMMsgMainHostCall *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
         AssertRelease(pMsg);
-        
+
         pMsg->pszServiceName = (char *)pszServiceName;
         pMsg->u32Function    = u32Function;
@@ -2255 +2237 @@
 {
     LogFlowFunc(("\n"));
-    
+
     /* Disconnect all clients.
      */