Changeset 80966 in vbox

Timestamp:

Sep 24, 2019 9:58:55 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Win: Don't bail out if we don't have the new clipboard API available.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp (modified) (3 diffs)

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

@@ -160 +160 @@
     {
         /* Check that new Clipboard API is available. */
-        rc = SharedClipboardWinCheckAndInitNewAPI(&pWinCtx->newAPI);
-        if (RT_SUCCESS(rc))
-        {
-            pWinCtx->hWnd                 = NULL;
-            pWinCtx->hWndClipboardOwnerUs = NULL;
-            pWinCtx->hWndNextInChain      = NULL;
-        }
+        SharedClipboardWinCheckAndInitNewAPI(&pWinCtx->newAPI);
+        /* Do *not* check the rc, as the call might return VERR_SYMBOL_NOT_FOUND is the new API isn't available. */
+
+        pWinCtx->hWnd                 = NULL;
+        pWinCtx->hWndClipboardOwnerUs = NULL;
+        pWinCtx->hWndNextInChain      = NULL;
     }
 
@@ -194 +193 @@
  * the new clipboard API.
  *
- * @returns VBox status code.
+ * @returns VBox status code, or VERR_SYMBOL_NOT_FOUND if the new API is not available.
  * @param   pAPI                Where to store the retrieved function pointers.
  *                              Will be set to NULL if the new API is not available.
@@ -215 +214 @@
     if (RT_SUCCESS(rc))
     {
-        LogFunc(("New Clipboard API enabled\n"));
+        LogRel(("Shared Clipboard: New Clipboard API enabled\n"));
     }
     else
     {
         RT_BZERO(pAPI, sizeof(SHCLWINAPINEW));
-        LogFunc(("New Clipboard API not available; rc=%Rrc\n", rc));
-    }
-
+        LogRel(("Shared Clipboard: New Clipboard API not available (%Rrc)\n", rc));
+    }
+
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }