Changeset 80662 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 9, 2019 8:43:14 AM (6 years ago)

Author:

vboxsync

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

133193

Message:

Shared Clipboard: Renaming (SHAREDCLIPBOARD -> SHCL and VBOXCLIPBOARD -> SHCL).

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl.cpp (modified) (7 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (6 diffs)

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

@@ -8421 +8421 @@
             LogFlowFunc(("VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE\n"));
 
-            VBOXCLIPBOARDEXTPARMS *pParms = (VBOXCLIPBOARDEXTPARMS *)pvParms;
+            SHCLEXTPARMS *pParms = (SHCLEXTPARMS *)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
@@ -8437 +8437 @@
             LogFlowFunc(("VBOX_CLIPBOARD_EXT_FN_DATA_READ\n"));
 
-            VBOXCLIPBOARDEXTPARMS *pParms = (VBOXCLIPBOARDEXTPARMS *)pvParms;
+            SHCLEXTPARMS *pParms = (SHCLEXTPARMS *)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
@@ -8456 +8456 @@
             LogFlowFunc(("VBOX_CLIPBOARD_EXT_FN_DATA_WRITE\n"));
 
-            VBOXCLIPBOARDEXTPARMS *pParms = (VBOXCLIPBOARDEXTPARMS *)pvParms;
+            SHCLEXTPARMS *pParms = (SHCLEXTPARMS *)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
@@ -8475 +8475 @@
             if (SUCCEEDED(hrc))
             {
-                PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
+                PSHCLEXTAREAPARMS pParms = (PSHCLEXTAREAPARMS)pvParms;
                 AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
@@ -8487 +8487 @@
         case VBOX_CLIPBOARD_EXT_FN_AREA_UNREGISTER:
         {
-            PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
+            PSHCLEXTAREAPARMS pParms = (PSHCLEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
@@ -8497 +8497 @@
         case VBOX_CLIPBOARD_EXT_FN_AREA_ATTACH:
         {
-            PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
+            PSHCLEXTAREAPARMS pParms = (PSHCLEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
@@ -8507 +8507 @@
         case VBOX_CLIPBOARD_EXT_FN_AREA_DETACH:
         {
-            PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
+            PSHCLEXTAREAPARMS pParms = (PSHCLEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 

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

@@ -230 +230 @@
 {
     SharedClipboardAreaData()
-        : uID(NIL_SHAREDCLIPBOARDAREAID) { }
+        : uID(NIL_SHCLAREAID) { }
 
     /** The area's (unique) ID.
-     *  Set to NIL_SHAREDCLIPBOARDAREAID if not initialized yet. */
+     *  Set to NIL_SHCLAREAID if not initialized yet. */
     ULONG               uID;
     /** The actual Shared Clipboard area assigned to this ID. */
@@ -248 +248 @@
 {
     SharedClipboardData()
-        : uMostRecentClipboardAreaID(NIL_SHAREDCLIPBOARDAREAID)
+        : uMostRecentClipboardAreaID(NIL_SHCLAREAID)
         , uMaxClipboardAreas(32) /** @todo Make this configurable. */
     {
@@ -271 +271 @@
     ULONG GenerateAreaID(void)
     {
-        ULONG uID = NIL_SHAREDCLIPBOARDAREAID;
+        ULONG uID = NIL_SHCLAREAID;
 
         int rc = RTCritSectEnter(&CritSect);
@@ -289 +289 @@
     RTCRITSECT                          CritSect;
     /** The most recent (last created) clipboard area ID.
-     *  NIL_SHAREDCLIPBOARDAREAID if not initialized yet. */
+     *  NIL_SHCLAREAID if not initialized yet. */
     ULONG                               uMostRecentClipboardAreaID;
     /** Maximum of concurrent clipboard areas.
@@ -3424 +3424 @@
     if (pAreaData)
     {
-        vrc = pAreaData->Area.OpenTemp(uAreaID, SHAREDCLIPBOARDAREA_OPEN_FLAGS_MUST_NOT_EXIST);
+        vrc = pAreaData->Area.OpenTemp(uAreaID, SHCLAREA_OPEN_FLAGS_MUST_NOT_EXIST);
         if (RT_SUCCESS(vrc))
         {
@@ -3635 +3635 @@
 /**
  * Returns the ID of the most recent (last created) clipboard area,
- * or NIL_SHAREDCLIPBOARDAREAID if no clipboard area has been created yet.
+ * or NIL_SHCLAREAID if no clipboard area has been created yet.
  *
  * @returns Most recent clipboard area ID.