Changeset 100434 in vbox for trunk/src/VBox

Timestamp:

Jul 7, 2023 11:55:21 AM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Use ShClTransfer methods instead of calling the provider interface directly. ​​bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp (modified) (4 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp

@@ -186 +186 @@
     int rc;
 
-    if (   m_hObj == NIL_SHCLOBJHANDLE
-        && m_pTransfer->ProviderIface.pfnObjOpen)
+    if (m_hObj == NIL_SHCLOBJHANDLE)
     {
         SHCLOBJOPENCREATEPARMS openParms;
@@ -198 +197 @@
             rc = RTStrCopy(openParms.pszPath, openParms.cbPath, m_strPath.c_str());
             if (RT_SUCCESS(rc))
-            {
-                rc = m_pTransfer->ProviderIface.pfnObjOpen(&m_pTransfer->ProviderCtx, &openParms, &m_hObj);
-            }
+                rc = ShClTransferObjOpen(m_pTransfer, &openParms, &m_hObj);
 
             ShClTransferObjOpenParmsDestroy(&openParms);
@@ -217 +214 @@
         if (cbToRead)
         {
-            rc = m_pTransfer->ProviderIface.pfnObjRead(&m_pTransfer->ProviderCtx, m_hObj,
-                                                       pvBuffer, cbToRead, 0 /* fFlags */, &cbRead);
+            rc = ShClTransferObjRead(m_pTransfer, m_hObj, pvBuffer, cbToRead, 0 /* fFlags */, &cbRead);
             if (RT_SUCCESS(rc))
             {
@@ -231 +227 @@
         if (m_fIsComplete)
         {
-            if (m_pTransfer->ProviderIface.pfnObjClose)
-            {
-                int rc2 = m_pTransfer->ProviderIface.pfnObjClose(&m_pTransfer->ProviderCtx, m_hObj);
-                AssertRC(rc2);
-            }
+            rc = ShClTransferObjClose(m_pTransfer, m_hObj);
 
             if (m_pParent)