vbox的更動 6985 路徑 trunk/src/VBox/Main/hgcm/HGCM.cpp

時間撮記:

2008-2-18 上午11:05:05 (17 年 以前)

作者:

vboxsync

訊息:

HGCM: reapplied r28137, which got lost when I commited the code Vitali sent me

檔案:

• trunk/src/VBox/Main/hgcm/HGCM.cpp (修改) (36 筆差異)

trunk/src/VBox/Main/hgcm/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;
 
@@ -240 +240 @@
      * 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))
     {
@@ -252 +251 @@
     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)
@@ -268 +262 @@
                 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))
                     {
@@ -305 +287 @@
         }
     }
-    
+
     return rc;
 }
@@ -449 +431 @@
     public:
         HGCMMsgHeader () : pCmd (NULL), pHGCMPort (NULL) {};
-        
+
         /* Command pointer/identifier. */
         PVBOXHGCMCMD pCmd;
@@ -520 +502 @@
         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 ();
@@ -695 +677 @@
                 }
             } break;
-            
+
             case SVC_MSG_REGEXT:
             {
@@ -701 +683 @@
 
                 LogFlowFunc(("SVC_MSG_REGEXT handle = %p, pfn = %p\n", pMsg->handle, pMsg->pfnExtension));
-                
+
                 if (pSvc->m_hExtension)
                 {
@@ -716 +698 @@
                         rc = VERR_NOT_SUPPORTED;
                     }
-                    
+
                     if (VBOX_SUCCESS (rc))
                     {
@@ -729 +711 @@
 
                 LogFlowFunc(("SVC_MSG_UNREGEXT handle = %p\n", pMsg->handle));
-                
+
                 if (pSvc->m_hExtension != pMsg->handle)
                 {
@@ -744 +726 @@
                         rc = VERR_NOT_SUPPORTED;
                     }
-                    
+
                     pSvc->m_hExtension = NULL;
                 }
@@ -772 +754 @@
    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.
@@ -832 +814 @@
             RTStrFree (m_pszSvcLibrary);
             m_pszSvcLibrary = NULL;
-            
+
             RTStrFree (m_pszSvcName);
             m_pszSvcName = NULL;
-            
+
             rc = VERR_NO_MEMORY;
         }
@@ -844 +826 @@
             m_svcHelpers.pvInstance          = this;
             m_svcHelpers.pfnDisconnectClient = svcHlpDisconnectClient;
-            
+
             /* Execute the load request on the service thread. */
             HGCMMSGHANDLE hMsg;
@@ -954 +936 @@
     HGCMService *pSvc;
     int rc = HGCMService::ResolveService (&pSvc, pszServiceName);
-    
+
     if (VBOX_SUCCESS (rc))
     {
@@ -980 +962 @@
                 pSvc->m_pSvcNext = sm_pSvcListHead;
                 pSvc->m_pSvcPrev = NULL;
-                
+
                 if (sm_pSvcListHead)
                 {
@@ -1109 +1091 @@
     ASMAtomicIncU32 (&m_u32RefCnt);
     LogFlowFunc(("m_u32RefCnt = %d\n", m_u32RefCnt));
-}       
+}
 
 /** The method dereferences a service and deletes it when no more refs.
@@ -1168 +1150 @@
 
     LogFlowFunc(("%d services to be saved:\n", sm_cServices));
-    
+
     /* Save number of services. */
     rc = SSMR3PutU32(pSSM, sm_cServices);
@@ -1240 +1222 @@
     rc = SSMR3GetU32(pSSM, &cServices);
     AssertRCReturn(rc, rc);
-    
+
     LogFlowFunc(("%d services to be restored:\n", cServices));
 
@@ -1249 +1231 @@
         AssertRCReturn(rc, rc);
         AssertReturn(u32 <= VBOX_HGCM_SVC_NAME_MAX_BYTES, VERR_SSM_UNEXPECTED_DATA);
-        
+
         char *pszServiceName = (char *)alloca (u32);
 
@@ -1255 +1237 @@
         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;
@@ -1331 +1313 @@
 
     uint32_t handle;
-    
+
     if (pu32ClientIdOut != NULL)
     {
@@ -1365 +1347 @@
 
             rc = hgcmMsgSend (hMsg);
-        
+
             if (VBOX_SUCCESS (rc))
             {
@@ -1375 +1357 @@
                     m_cClientsAllocated += 64;
                 }
-            
+
                 m_paClientIds[m_cClients] = handle;
                 m_cClients++;
@@ -1395 +1377 @@
         ReferenceService ();
     }
-    
+
     LogFlowFunc(("rc = %Vrc\n", rc));
     return rc;
@@ -1441 +1423 @@
             {
                 m_cClients--;
-                
+
                 if (m_cClients > i)
                 {
                     memmove (&m_paClientIds[i], &m_paClientIds[i + 1], m_cClients - i);
                 }
-                
+
                 break;
             }
@@ -1590 +1572 @@
 
 
-/* 
+/*
  * Main HGCM thread that manages services.
  */
- 
+
 /* Messages processed by the main HGCM thread. */
 #define HGCM_MSG_CONNECT    (10)  /* Connect a client to a service. */
@@ -1687 +1669 @@
         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 ();
@@ -1839 +1821 @@
             {
                 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)
                 {
@@ -1855 +1837 @@
                     handle->pszServiceName = (char *)((uint8_t *)handle + sizeof (struct _HGCMSVCEXTHANDLEDATA));
                     strcpy (handle->pszServiceName, pMsg->pszServiceName);
-                    
+
                     HGCMService *pService;
                     rc = HGCMService::ResolveService (&pService, handle->pszServiceName);
@@ -1865 +1847 @@
                         pService->ReleaseService ();
                     }
-                    
+
                     if (VBOX_FAILURE (rc))
                     {
@@ -1892 +1874 @@
                     pService->ReleaseService ();
                 }
-                
+
                 RTMemFree (pMsg->handle);
             } break;
@@ -2257 +2239 @@
         HGCMMsgMainHostCall *pMsg = (HGCMMsgMainHostCall *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
         AssertRelease(pMsg);
-        
+
         pMsg->pszServiceName = (char *)pszServiceName;
         pMsg->u32Function    = u32Function;
@@ -2275 +2257 @@
 {
     LogFlowFunc(("\n"));
-    
+
     /* Disconnect all clients.
      */