Changeset 6792 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 4, 2008 5:22:28 PM (17 years ago)

Author:

vboxsync

Message:

Wrong parameters order.

Location:

trunk/src/VBox/Main

Files:

• VMMDevInterface.cpp (modified) (1 diff)
• hgcm/HGCM.cpp (modified) (4 diffs)
• include/VMMDev.h (modified) (1 diff)
• include/hgcm/HGCM.h (modified) (1 diff)

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -560 +560 @@
 }
 
-int VMMDev::hgcmLoadService (const char *pszServiceName, const char *pszServiceLibrary)
-{
-    return HGCMHostLoad (pszServiceName, pszServiceLibrary);
+int VMMDev::hgcmLoadService (const char *pszServiceLibrary, const char *pszServiceName)
+{
+    return HGCMHostLoad (pszServiceLibrary, pszServiceName);
 }
 

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -860 +860 @@
 /* static */ int HGCMService::LoadService (const char *pszServiceLibrary, const char *pszServiceName)
 {
-    LogFlowFunc(("name = %s, lib %s\n", pszServiceName, pszServiceLibrary));
+    LogFlowFunc(("lib %s, name = %s\n", pszServiceLibrary, pszServiceName));
 
     /* Look at already loaded services to avoid double loading. */
@@ -1684 +1684 @@
                              pMsg->pszServiceName, pMsg->pszServiceLibrary));
 
-                rc = HGCMService::LoadService (pMsg->pszServiceName, pMsg->pszServiceLibrary);
+                rc = HGCMService::LoadService (pMsg->pszServiceLibrary, pMsg->pszServiceName);
             } break;
 
@@ -1832 +1832 @@
  * Assign the specified name to the service.
  *
+ * @param pszServiceLibrary  The library to be loaded.
  * @param pszServiceName     The name to be assigned to the service.
- * @param pszServiceLibrary  The library to be loaded.
  * @return VBox rc.
  */
-int HGCMHostLoad (const char *pszServiceName,
-                  const char *pszServiceLibrary)
-{
-    LogFlowFunc(("name = %s, lib = %s\n", pszServiceName, pszServiceLibrary));
-
-    if (!pszServiceName || !pszServiceLibrary)
+int HGCMHostLoad (const char *pszServiceLibrary,
+                  const char *pszServiceName)
+{
+    LogFlowFunc(("lib = %s, name = %s\n", pszServiceLibrary, pszServiceName));
+
+    if (!pszServiceLibrary || !pszServiceName)
     {
         return VERR_INVALID_PARAMETER;
@@ -1857 +1857 @@
         AssertRelease(pMsg);
 
+        pMsg->pszServiceLibrary = pszServiceLibrary;
         pMsg->pszServiceName    = pszServiceName;
-        pMsg->pszServiceLibrary = pszServiceLibrary;
 
         hgcmObjDereference (pMsg);

trunk/src/VBox/Main/include/VMMDev.h

@@ -49 +49 @@
     PPDMIVMMDEVPORT getVMMDevPort();
 
-    int hgcmLoadService (const char *pszServiceName, const char *pszServiceLibrary);
+    int hgcmLoadService (const char *pszServiceLibrary, const char *pszServiceName);
     int hgcmHostCall (const char *pszServiceName, uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms);
     void hgcmShutdown (void);

trunk/src/VBox/Main/include/hgcm/HGCM.h

@@ -39 +39 @@
 int HGCMHostReset (void);
 
-int HGCMHostLoad (const char *pszServiceName, const char *pszServiceLibrary);
+int HGCMHostLoad (const char *pszServiceLibrary, const char *pszServiceName);
 
 int HGCMHostRegisterServiceExtension (HGCMSVCEXTHANDLE *pHandle, const char *pszServiceName, PFNHGCMSVCEXT pfnExtension, void *pvExtension);