Changeset 24664 in vbox for trunk/src

Timestamp:

Nov 14, 2009 11:55:35 PM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl.cpp: Fussing over the guest property code. (no fixes yet)

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -507 +507 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
+
 bool Console::enabledGuestPropertiesVRDP(void)
 {
@@ -607 +608 @@
     return;
 }
+
 #endif /* VBOX_WITH_GUEST_PROPS */
 
@@ -1162 +1164 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
+
 // static
 DECLCALLBACK(int)
-Console::doGuestPropNotification(void *pvExtension, uint32_t,
+Console::doGuestPropNotification(void *pvExtension, uint32_t u32Function,
                                  void *pvParms, uint32_t cbParms)
 {
     using namespace guestProp;
 
-//     LogFlowFunc(("pvExtension=%p, pvParms=%p, cbParms=%u\n", pvExtension, pvParms, cbParms));
-    int rc = VINF_SUCCESS;
-    /* No locking, as this is purely a notification which does not make any
-     * changes to the object state. */
-    PHOSTCALLBACKDATA pCBData = reinterpret_cast<PHOSTCALLBACKDATA>(pvParms);
+    Assert(u32Function == 0); NOREF(u32Function);
+
+    /*
+     * No locking, as this is purely a notification which does not make any
+     * changes to the object state.
+     */
+    PHOSTCALLBACKDATA   pCBData = reinterpret_cast<PHOSTCALLBACKDATA>(pvParms);
     AssertReturn(sizeof(HOSTCALLBACKDATA) == cbParms, VERR_INVALID_PARAMETER);
     AssertReturn(HOSTCALLBACKMAGIC == pCBData->u32Magic, VERR_INVALID_PARAMETER);
-    ComObjPtr<Console> pConsole = reinterpret_cast<Console *>(pvExtension);
-//     LogFlowFunc(("pCBData->pcszName=%s, pCBData->pcszValue=%s, pCBData->pcszFlags=%s\n", pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags));
+    Log5(("Console::doGuestPropNotification: pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n",
+          pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags));
+
+    int  rc;
     Bstr name(pCBData->pcszName);
     Bstr value(pCBData->pcszValue);
     Bstr flags(pCBData->pcszFlags);
-    if (   name.isNull()
-        || (value.isNull() && (pCBData->pcszValue != NULL))
-        || (flags.isNull() && (pCBData->pcszFlags != NULL))
+    if (   !name.isNull()
+        && (!value.isNull() || pCBData->pcszValue == NULL)
+        && (!flags.isNull() || pCBData->pcszFlags == NULL)
        )
+    {
+        ComObjPtr<Console> ptrConsole = reinterpret_cast<Console *>(pvExtension);
+        HRESULT hrc = ptrConsole->mControl->PushGuestProperty(name,
+                                                              value,
+                                                              pCBData->u64Timestamp,
+                                                              flags);
+        if (SUCCEEDED(hrc))
+            rc = VINF_SUCCESS;
+        else
+        {
+            LogFunc(("Console::doGuestPropNotification: hrc=%Rhrc pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n",
+                     pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags));
+            rc = Global::vboxStatusCodeFromCOM(hrc);
+        }
+    }
+    else
         rc = VERR_NO_MEMORY;
-    else
-    {
-        HRESULT hrc = pConsole->mControl->PushGuestProperty(name, value,
-                                                            pCBData->u64Timestamp,
-                                                            flags);
-        if (FAILED(hrc))
-        {
-//             LogFunc(("pConsole->mControl->PushGuestProperty failed, hrc=0x%x\n", hrc));
-//             LogFunc(("pCBData->pcszName=%s\n", pCBData->pcszName));
-//             LogFunc(("pCBData->pcszValue=%s\n", pCBData->pcszValue));
-//             LogFunc(("pCBData->pcszFlags=%s\n", pCBData->pcszFlags));
-            rc = Global::vboxStatusCodeFromCOM(hrc);
-        }
-    }
-//     LogFlowFunc(("rc=%Rrc\n", rc));
     return rc;
 }
@@ -1300 +1308 @@
     return S_OK;
 }
-#endif
+
+#endif /* VBOX_WITH_GUEST_PROPS */
 
 
@@ -3897 +3906 @@
 #ifndef VBOX_WITH_GUEST_PROPS
     ReturnComNotImplemented();
-#else
+#else  /* VBOX_WITH_GUEST_PROPS */
     if (!VALID_PTR(aName))
         return E_INVALIDARG;
@@ -3974 +3983 @@
 #ifndef VBOX_WITH_GUEST_PROPS
     ReturnComNotImplemented();
-#else
+#else /* VBOX_WITH_GUEST_PROPS */
     if (!VALID_PTR(aName))
         return E_INVALIDARG;
@@ -4050 +4059 @@
 #ifndef VBOX_WITH_GUEST_PROPS
     ReturnComNotImplemented();
-#else
+#else /* VBOX_WITH_GUEST_PROPS */
     if (!VALID_PTR(aPatterns) && (aPatterns != NULL))
         return E_POINTER;