Changeset 85307 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jul 13, 2020 12:38:15 PM (5 years ago)

Author:

vboxsync

Message:

Main/comimpl.xsl,++: Try use the Utf8Str versions of the event stuff where possible. bugref:9790

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• DisplayImpl.cpp (modified) (1 diff)
• GuestFileImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -345 +345 @@
                 ComPtr<IExtraDataChangedEvent> pEDCEv = aEvent;
                 Bstr strMachineId;
+                HRESULT hrc = pEDCEv->COMGETTER(MachineId)(strMachineId.asOutParam());
+                if (FAILED(hrc)) break;
+
                 Bstr strKey;
-                Bstr strVal;
-                HRESULT hrc = S_OK;
-
-                hrc = pEDCEv->COMGETTER(MachineId)(strMachineId.asOutParam());
-                if (FAILED(hrc)) break;
-
                 hrc = pEDCEv->COMGETTER(Key)(strKey.asOutParam());
                 if (FAILED(hrc)) break;
 
+                Bstr strVal;
                 hrc = pEDCEv->COMGETTER(Value)(strVal.asOutParam());
                 if (FAILED(hrc)) break;
@@ -5224 +5222 @@
     AssertComRCReturnRC(autoCaller.rc());
 
-    ::FireStorageControllerChangedEvent(mEventSource, Bstr(aMachineId.toString()).raw(), Bstr(aControllerName).raw());
+    ::FireStorageControllerChangedEvent(mEventSource, aMachineId.toString(), aControllerName);
 
     LogFlowThisFunc(("Leaving rc=%#x\n", S_OK));
@@ -6065 +6063 @@
 }
 
-HRESULT Console::i_onExtraDataChange(IN_BSTR aMachineId, IN_BSTR aKey, IN_BSTR aVal)
+HRESULT Console::i_onExtraDataChange(const Bstr &aMachineId, const Bstr &aKey, const Bstr &aVal)
 {
     LogFlowThisFunc(("\n"));
@@ -6073 +6071 @@
         return autoCaller.rc();
 
-    if (!aMachineId)
+    if (aMachineId != i_getId())
         return S_OK;
 
-    HRESULT hrc = S_OK;
-    Bstr idMachine(aMachineId);
-    if (   FAILED(hrc)
-        || idMachine != i_getId())
-        return hrc;
-
     /* don't do anything if the VM isn't running */
-    SafeVMPtrQuiet ptrVM(this);
-    if (ptrVM.isOk())
-    {
-        if (RTUtf16CmpAscii(aKey, "VBoxInternal2/TurnResetIntoPowerOff") == 0)
-        {
-            mfTurnResetIntoPowerOff = RTUtf16CmpAscii(aVal, "1") == 0;
+    if (aKey == "VBoxInternal2/TurnResetIntoPowerOff")
+    {
+        SafeVMPtrQuiet ptrVM(this);
+        if (ptrVM.isOk())
+        {
+            mfTurnResetIntoPowerOff = aVal == "1";
             int vrc = VMR3SetPowerOffInsteadOfReset(ptrVM.rawUVM(), mfTurnResetIntoPowerOff);
             AssertRC(vrc);
-        }
-
-        ptrVM.release();
+
+            ptrVM.release();
+        }
     }
 
     /* notify console callbacks on success */
-    if (SUCCEEDED(hrc))
-        ::FireExtraDataChangedEvent(mEventSource, aMachineId, aKey, aVal);
-
-    LogFlowThisFunc(("Leaving hrc=%#x\n", hrc));
-    return hrc;
+    ::FireExtraDataChangedEvent(mEventSource, aMachineId.raw(), aKey.raw(), aVal.raw());
+
+    LogFlowThisFunc(("Leaving S_OK\n"));
+    return S_OK;
 }
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -789 +789 @@
         if (fDisabled)
             ::FireGuestMonitorChangedEvent(mParent->i_getEventSource(),
-                                           GuestMonitorChangedEventType_Disabled,  uScreenId, 0, 0, 0, 0);
+                                           GuestMonitorChangedEventType_Disabled, uScreenId, 0, 0, 0, 0);
         else
             ::FireGuestMonitorChangedEvent(mParent->i_getEventSource(),

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -527 +527 @@
 
                 com::SafeArray<BYTE> data((size_t)cbRead);
-                data.initFrom((BYTE*)dataCb.u.read.pvData, cbRead);
+                data.initFrom((BYTE *)dataCb.u.read.pvData, cbRead);
 
                 ::FireGuestFileReadEvent(mEventSource, mSession, this, mData.mOffCurrent, cbRead, ComSafeArrayAsInParam(data));