Changeset 85306 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 13, 2020 12:10:02 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139284

Message:

Main/comimpl.xsl,++: Make it possible to pass Utf8Str rather that IN_BSTR to the event creation/fire/reinit functions. bugref:9790

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (5 diffs)
• VirtualBoxImpl.cpp (modified) (14 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -4698 +4698 @@
         // i_onExtraDataCanChange() only briefly requests the VirtualBox
         // lock to copy the list of callbacks to invoke
-        Bstr error;
-        Bstr bstrValue(aValue);
-
-        if (!mParent->i_onExtraDataCanChange(mData->mUuid, Bstr(aKey).raw(), bstrValue.raw(), error))
-        {
-            const char *sep = error.isEmpty() ? "" : ": ";
-            Log1WarningFunc(("Someone vetoed! Change refused%s%ls\n", sep, error.raw()));
+        Bstr bstrError;
+        if (!mParent->i_onExtraDataCanChange(mData->mUuid, aKey, aValue, bstrError))
+        {
+            const char *sep = bstrError.isEmpty() ? "" : ": ";
+            Log1WarningFunc(("Someone vetoed! Change refused%s%ls\n", sep, bstrError.raw()));
             return setError(E_ACCESSDENIED,
                             tr("Could not set extra data because someone refused the requested change of '%s' to '%s'%s%ls"),
@@ -4710 +4708 @@
                             aValue.c_str(),
                             sep,
-                            error.raw());
+                            bstrError.raw());
         }
 
@@ -4739 +4737 @@
     // fire notification outside the lock
     if (fChanged)
-        mParent->i_onExtraDataChanged(mData->mUuid, Bstr(aKey).raw(), Bstr(aValue).raw());
+        mParent->i_onExtraDataChanged(mData->mUuid, aKey, aValue);
 
     return S_OK;
@@ -5523 +5521 @@
             alock.release();
 
-            mParent->i_onGuestPropertyChanged(mData->mUuid, Bstr(aName).raw(), Bstr(aValue).raw(), Bstr(aFlags).raw());
+            mParent->i_onGuestPropertyChanged(mData->mUuid, aName, aValue, aFlags);
         }
     }
@@ -13536 +13534 @@
         alock.release();
 
-        mParent->i_onGuestPropertyChanged(mData->mUuid, Bstr(aName).raw(), Bstr(aValue).raw(), Bstr(aFlags).raw());
+        mParent->i_onGuestPropertyChanged(mData->mUuid, aName, aValue, aFlags);
     }
     catch (...)

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -3246 +3246 @@
     ComPtr<IEvent> ptrEvent;
     HRESULT hrc = ::CreateMediumRegisteredEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                                aMediumId.toUtf16().raw(), aDevType, aRegistered);
+                                                aMediumId.toString(), aDevType, aRegistered);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3274 +3274 @@
     ComPtr<IEvent> ptrEvent;
     HRESULT hrc = ::CreateStorageControllerChangedEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                                        aMachineId.toUtf16().raw(), Bstr(aControllerName).raw());
+                                                        aMachineId.toString(), aControllerName);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3293 +3293 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = ::CreateMachineStateChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aState);
+    HRESULT hrc = ::CreateMachineStateChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toString(), aState);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3304 +3304 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = ::CreateMachineDataChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aTemporary);
+    HRESULT hrc = ::CreateMachineDataChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toString(), aTemporary);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3312 +3312 @@
  *  @note Locks this object for reading.
  */
-BOOL VirtualBox::i_onExtraDataCanChange(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue,
-                                        Bstr &aError)
-{
-    LogFlowThisFunc(("machine={%RTuuid} aKey={%ls} aValue={%ls}\n", aId.raw(), aKey, aValue));
+BOOL VirtualBox::i_onExtraDataCanChange(const Guid &aId, const Utf8Str &aKey, const Utf8Str &aValue, Bstr &aError)
+{
+    LogFlowThisFunc(("machine={%RTuuid} aKey={%s} aValue={%s}\n", aId.raw(), aKey.c_str(), aValue.c_str()));
 
     AutoCaller autoCaller(this);
@@ -3321 +3320 @@
 
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = ::CreateExtraDataCanChangeEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aKey, aValue);
+    HRESULT hrc = ::CreateExtraDataCanChangeEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toString(), aKey, aValue);
     AssertComRCReturn(hrc, TRUE);
 
@@ -3353 +3352 @@
  *  @note Doesn't lock any object.
  */
-void VirtualBox::i_onExtraDataChanged(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue)
+void VirtualBox::i_onExtraDataChanged(const Guid &aId, const Utf8Str &aKey, const Utf8Str &aValue)
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = ::CreateExtraDataChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aKey, aValue);
+    HRESULT hrc = ::CreateExtraDataChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toString(), aKey, aValue);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3367 +3366 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = ::CreateMachineRegisteredEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aRegistered);
+    HRESULT hrc = ::CreateMachineRegisteredEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toString(), aRegistered);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3378 +3377 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = ::CreateSessionStateChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aState);
+    HRESULT hrc = ::CreateSessionStateChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toString(), aState);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3390 +3389 @@
     ComPtr<IEvent> ptrEvent;
     HRESULT hrc = ::CreateSnapshotTakenEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                             aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
+                                             aMachineId.toString(), aSnapshotId.toString());
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3402 +3401 @@
     ComPtr<IEvent> ptrEvent;
     HRESULT hrc = ::CreateSnapshotDeletedEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                               aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
+                                               aMachineId.toString(), aSnapshotId.toString());
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3414 +3413 @@
     ComPtr<IEvent> ptrEvent;
     HRESULT hrc = ::CreateSnapshotRestoredEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                                aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
+                                                aMachineId.toString(), aSnapshotId.toString());
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3426 +3425 @@
     ComPtr<IEvent> ptrEvent;
     HRESULT hrc = ::CreateSnapshotChangedEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                               aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
+                                               aMachineId.toString(), aSnapshotId.toString());
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3711 +3710 @@
  *  @note Doesn't lock any object.
  */
-void VirtualBox::i_onGuestPropertyChanged(const Guid &aMachineId, IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags)
+void VirtualBox::i_onGuestPropertyChanged(const Guid &aMachineId, const Utf8Str &aName, const Utf8Str &aValue,
+                                          const Utf8Str &aFlags)
 {
     ComPtr<IEvent> ptrEvent;
     HRESULT hrc = ::CreateGuestPropertyChangedEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                                    aMachineId.toUtf16().raw(), aName, aValue, aFlags);
+                                                    aMachineId.toString(), aName, aValue, aFlags);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));