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

Timestamp:

Feb 22, 2019 5:40:00 PM (6 years ago)

Author:

vboxsync

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

129000

Message:

Main: Eradicate the use of BSTR in regular API code, there were leaks in almost every occurrence. Also do some Bstr->Utf8Str shuffling to reduce the number of conversions.

Location:

trunk/src/VBox/Main/src-client

Files:

• ClientTokenHolder.cpp (modified) (6 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)
• GuestImpl.cpp (modified) (1 diff)
• USBDeviceImpl.cpp (modified) (1 diff)

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

@@ -136 +136 @@
     mThreadSem = CTHTHREADSEMARG;
 
-    Bstr bstrTokenId(strTokenId);
-
     /*
      * Since there is no guarantee that the constructor and destructor will be
@@ -148 +146 @@
 
     void *data[3];
-    data[0] = (void*)(BSTR)bstrTokenId.raw();
+    data[0] = (void*)strTokenId.c_str();
     data[1] = (void*)mThreadSem;
     data[2] = 0; /* will get an output from the thread */
@@ -172 +170 @@
     }
 #elif defined(RT_OS_OS2)
-    Bstr bstrTokenId(strTokenId);
-
     /*
      * Since there is no guarantee that the constructor and destructor will be
@@ -183 +179 @@
 
     void *data[3];
-    data[0] = (void*)bstrTokenId.raw();
+    data[0] = (void*)strTokenId.c_str();
     data[1] = (void*)mSem;
     data[2] = (void*)false; /* will get the thread result here */
@@ -251 +247 @@
 
 # if defined(RT_OS_WINDOWS)
-    BSTR sessionId = (BSTR)data[0];
+    Utf8Str strSessionId = (const char *)data[0];
     HANDLE initDoneSem = (HANDLE)data[1];
 
-    HANDLE mutex = ::OpenMutex(MUTEX_ALL_ACCESS, FALSE, sessionId);
+    HANDLE mutex = ::OpenMutex(MUTEX_ALL_ACCESS, FALSE, Bstr(strSessionId).raw());
     AssertMsg(mutex, ("cannot open token, err=%d\n", ::GetLastError()));
 
@@ -286 +282 @@
     ::SetEvent(initDoneSem);
 # elif defined(RT_OS_OS2)
-    Utf8Str sessionId = (BSTR)data[0];
+    Utf8Str strSessionId = (const char *)data[0];
     RTSEMEVENT finishSem = (RTSEMEVENT)data[1];
 
-    LogFlowFunc(("sessionId='%s', finishSem=%p\n", sessionId.raw(), finishSem));
+    LogFlowFunc(("strSessionId='%s', finishSem=%p\n", strSessionId.c_str(), finishSem));
 
     HMTX mutex = NULLHANDLE;
-    APIRET arc = ::DosOpenMutexSem((PSZ)sessionId.raw(), &mutex);
+    APIRET arc = ::DosOpenMutexSem((PSZ)strSessionId.c_str(), &mutex);
     AssertMsg(arc == NO_ERROR, ("cannot open token, arc=%ld\n", arc));
 

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

@@ -5169 +5169 @@
 
                     uint16_t port = 0;
-                    BSTR r = pfs[i];
-                    Utf8Str utf = Utf8Str(r);
+                    Utf8Str utf = pfs[i];
                     Utf8Str strName;
                     Utf8Str strProto;

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

@@ -376 +376 @@
         ComPtr<IMachine> ptrMachine(mParent->i_machine());
         alock.release();
-        BSTR bstr;
-        hrc = ptrMachine->COMGETTER(OSTypeId)(&bstr);
+        Bstr bstr;
+        hrc = ptrMachine->COMGETTER(OSTypeId)(bstr.asOutParam());
         aOSTypeId = bstr;
     }

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

@@ -71 +71 @@
     ComAssertComRCRet(hrc, hrc);
 
-    BSTR tmp;
-    BSTR *bptr = &tmp;
-
-    hrc = aUSBDevice->COMGETTER(Manufacturer)(bptr);
-    ComAssertComRCRet(hrc, hrc);
-    unconst(mData.manufacturer) = Utf8Str(tmp);
-
-    hrc = aUSBDevice->COMGETTER(Product)(bptr);
-    ComAssertComRCRet(hrc, hrc);
-    unconst(mData.product) = Utf8Str(tmp);
-
-    hrc = aUSBDevice->COMGETTER(SerialNumber)(bptr);
-    ComAssertComRCRet(hrc, hrc);
-    unconst(mData.serialNumber) = Utf8Str(tmp);
-
-    hrc = aUSBDevice->COMGETTER(Address)(bptr);
-    ComAssertComRCRet(hrc, hrc);
-    unconst(mData.address) = Utf8Str(tmp);
-
-    hrc = aUSBDevice->COMGETTER(Backend)(bptr);
-    ComAssertComRCRet(hrc, hrc);
-    unconst(mData.backend) = Utf8Str(tmp);
+    Bstr bstr;
+
+    hrc = aUSBDevice->COMGETTER(Manufacturer)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.manufacturer) = bstr;
+
+    hrc = aUSBDevice->COMGETTER(Product)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.product) = bstr;
+
+    hrc = aUSBDevice->COMGETTER(SerialNumber)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.serialNumber) = bstr;
+
+    hrc = aUSBDevice->COMGETTER(Address)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.address) = bstr;
+
+    hrc = aUSBDevice->COMGETTER(Backend)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+    unconst(mData.backend) = bstr;
 
     hrc = aUSBDevice->COMGETTER(Port)(&unconst(mData.port));