Changeset 32283 in vbox

Timestamp:

Sep 7, 2010 12:24:57 PM (14 years ago)

Author:

vboxsync

Message:

Guest Additions/common: Renamed VBoxGuestHGCMInitCommunication to VBoxGuestReinitDevExtAfterHibernation.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-win-pnp.cpp (modified) (2 diffs)
• VBoxGuest.cpp (modified) (3 diffs)
• VBoxGuestInternal.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp

@@ -237 +237 @@
                 }
             }
-/*
-#ifdef VBOX_WITH_HGCM
-            if (NT_SUCCESS(rc))
-            {
-                int vrc = VBoxGuestHGCMInitCommunication(pDevExt, vboxguestwinVersionToOSType(g_winVersion));
-                if (RT_FAILURE(vrc))
-                    rc = STATUS_UNSUCCESSFUL;
-            }
-#endif
-*/
+
             if (NT_SUCCESS(rc))
             {
@@ -547 +538 @@
                                 {
                                     Log(("VBoxGuest::vboxguestwinGuestPower: Returning from hibernation!\n"));
-#ifdef VBOX_WITH_HGCM
-                                    int rc = VBoxGuestHGCMInitCommunication(pDevExt, vboxguestwinVersionToOSType(g_winVersion));
+                                    int rc = VBoxGuestReinitDevExtAfterHibernation(pDevExt, vboxguestwinVersionToOSType(g_winVersion));
                                     if (RT_FAILURE(rc))
-                                        Log(("VBoxGuest::vboxguestwinGuestPower: Cannot re-init HGCM chain, rc = %d!\n", rc));
-#endif
+                                        Log(("VBoxGuest::vboxguestwinGuestPower: Cannot re-init VMMDev chain, rc = %d!\n", rc));
                                 }
                             }

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -40 +40 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
 # include "revision-generated.h"
+#endif
+#ifdef RT_OS_WINDOWS
+# ifndef CTL_CODE
+#  include <Windows.h>
+# endif
 #endif
 
@@ -440 +445 @@
 
 /**
+ * Helper to reinit the VBoxVMM communication after hibernation.
+ *
+ * @returns VBox status code.
+ * @param   pDevExt         The device extension.
+ * @param   enmOSType       The OS type.
+ */
+int VBoxGuestReinitDevExtAfterHibernation(PVBOXGUESTDEVEXT pDevExt, VBOXOSTYPE enmOSType)
+{
+    int rc = VBoxGuestReportGuestInfo(enmOSType);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VBoxGuestReportDriverStatus(true /* Driver is active */);
+        if (RT_FAILURE(rc))
+            Log(("VBoxGuest::VBoxGuestReinitDevExtAfterHibernation: could not report guest driver status, rc=%Rrc\n", rc));
+    }
+    else
+        Log(("VBoxGuest::VBoxGuestReinitDevExtAfterHibernation: could not report guest information to host, rc=%Rrc\n", rc));
+    Log(("VBoxGuest::VBoxGuestReinitDevExtAfterHibernation: returned with rc=%Rrc\n", rc));
+    return rc;
+}
+
+
+/**
  * Inflate/deflate the balloon by one chunk.
  *
@@ -1564 +1592 @@
 
 
-/**
- * Helper to reinit the VBoxVMM communication after hibernation.
- *
- * @returns VBox status code.
- * @param   pDevExt         The device extension.
- * @param   enmOSType       The OS type.
- *
- * @todo    r=bird: This is a misnomer, it's related to VMMDev communication in
- *          general, not only HGCM.  Further, it's reinit only.  Init can only
- *          be done VBoxGuestInitDevExt.  A better name would be
- *          VBoxGuestReinitDevExtAfterHibernation.
- */
-int VBoxGuestHGCMInitCommunication(PVBOXGUESTDEVEXT pDevExt, VBOXOSTYPE enmOSType)
-{
-    int rc = VBoxGuestReportGuestInfo(enmOSType);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VBoxGuestReportDriverStatus(true /* Driver is active */);
-        if (RT_FAILURE(rc))
-            Log(("VBoxGuest::VBoxGuestInitHGCMCommunication: could not report guest driver status, rc=%Rrc\n", rc));
-    }
-    else
-        Log(("VBoxGuest::VBoxGuestInitHGCMCommunication: could not report guest information to host, rc=%Rrc\n", rc));
-    Log(("VBoxGuest::VBoxGuestInitHGCMCommunication: returned with rc=%Rrc\n", rc));
-    return rc;
-}
-
-
 static int VBoxGuestCommonIOCtl_HGCMConnect(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,
                                             VBoxGuestHGCMConnectInfo *pInfo, size_t *pcbDataReturned)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -213 +213 @@
 
 int  VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, void *pvMMIOBase, uint32_t cbMMIO, VBOXOSTYPE enmOSType, uint32_t fEvents);
+bool VBoxGuestCommonISR(PVBOXGUESTDEVEXT pDevExt);
 void VBoxGuestDeleteDevExt(PVBOXGUESTDEVEXT pDevExt);
-bool VBoxGuestCommonISR(PVBOXGUESTDEVEXT pDevExt);
+int  VBoxGuestReinitDevExtAfterHibernation(PVBOXGUESTDEVEXT pDevExt, VBOXOSTYPE enmOSType);
 int  VBoxGuestSetGuestCapabilities(uint32_t fOr, uint32_t fNot);
 
@@ -220 +221 @@
 int  VBoxGuestCreateKernelSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION *ppSession);
 void VBoxGuestCloseSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession);
-
-#ifdef VBOX_WITH_HGCM
-int  VBoxGuestHGCMInitCommunication(PVBOXGUESTDEVEXT pDevExt, VBOXOSTYPE enmOSType);
-#endif
 
 int  VBoxGuestCommonIOCtlFast(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession);