Changeset 80552 in vbox

Timestamp:

Sep 2, 2019 1:16:44 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Formatting, SCM fix.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -1333 +1333 @@
             #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
                         {
-                        if (g_pfnExtension)
-                        {
-                            VBOXCLIPBOARDEXTPARMS parms;
-                            RT_ZERO(parms);
-                            parms.u32Format = u32Formats;
-
-                            g_pfnExtension(g_pvExtension, VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE, &parms, sizeof (parms));
+                            if (g_pfnExtension)
+                            {
+                                VBOXCLIPBOARDEXTPARMS parms;
+                                RT_ZERO(parms);
+                                parms.u32Format = u32Formats;
+
+                                g_pfnExtension(g_pvExtension, VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE, &parms, sizeof (parms));
+                            }
+
+                            VBOXCLIPBOARDCLIENTCMDCTX cmdCtx;
+                            RT_ZERO(cmdCtx);
+
+                            SHAREDCLIPBOARDFORMATDATA formatData;
+                            RT_ZERO(formatData);
+
+                            formatData.uFormats = u32Formats;
+
+                            rc = VBoxClipboardSvcImplFormatAnnounce(pClient, &cmdCtx, &formatData);
                         }
-
-                        VBOXCLIPBOARDCLIENTCMDCTX cmdCtx;
-                        RT_ZERO(cmdCtx);
-
-                        SHAREDCLIPBOARDFORMATDATA formatData;
-                        RT_ZERO(formatData);
-
-                        formatData.uFormats = u32Formats;
-
-                        rc = VBoxClipboardSvcImplFormatAnnounce(pClient, &cmdCtx, &formatData);
                     }
                 }
-            }
             }
 
@@ -1754 +1754 @@
        with the high bit set. */
     SSMR3PutU32(pSSM, UINT32_C(0x80000002));
-    int rc = SSMR3PutStructEx(pSSM, &pClient->State, sizeof(pClient->State), 
+    int rc = SSMR3PutStructEx(pSSM, &pClient->State, sizeof(pClient->State),
                               0 /*fFlags*/, &g_aClipboardClientDataFields[0], NULL);
     AssertRCReturn(rc, rc);