VirtualBox

Changeset 80849 in vbox for trunk/src/VBox/HostServices


Ignore:
Timestamp:
Sep 17, 2019 9:46:51 AM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
133419
Message:

Shared Clipboard/URI: Renamed VBOX_WITH_SHARED_CLIPBOARD_URI_LIST -> VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS.

Location:
trunk/src/VBox/HostServices/SharedClipboard
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

    r80663 r80849  
    2929VBoxSharedClipboard_DEFS      = \
    3030        VBOX_WITH_HGCM \
    31         $(if $(VBOX_WITH_SHARED_CLIPBOARD_URI_LIST),VBOX_WITH_SHARED_CLIPBOARD_URI_LIST,)
     31        $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
    3232VBoxSharedClipboard_INCS.win  = \
    3333        $(VBOX_PATH_SDK)
    … …  
    4444        VBoxSharedClipboardSvc-darwin.cpp \
    4545        darwin-pasteboard.cpp
    46 ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     46ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    4747 VBoxSharedClipboard_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_HOST
    4848 VBoxSharedClipboard_SOURCES += \

  • trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-darwin.cpp

    r80847 r80849  
    214214    }
    215215
    216 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     216#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    217217    if (pFormats->uFormats & VBOX_SHCL_FMT_URI_LIST) /* No URI support yet. */
    218218        return VINF_SUCCESS;
    … …  
    276276}
    277277
    278 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     278#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    279279int SharedClipboardSvcImplURIReadDir(PSHCLCLIENT pClient, PSHCLDIRDATA pDirData)
    280280{
    … …  
    312312    return VERR_NOT_IMPLEMENTED;
    313313}
    314 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
    315 
     314#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
     315

  • trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

    r80845 r80849  
    3939using namespace HGCM;
    4040
    41 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     41#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    4242struct SHCLCLIENTSTATE;
    43 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
     43#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
    4444
    4545/**
    … …  
    111111     *  Needed for events which are not bound to a specific transfer. */
    112112    SHCLEVENTSOURCE          Events;
    113 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     113#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    114114    /** URI context data. */
    115115    SHCLURICTX               URI;
    … …  
    196196int sharedClipboardSvcClientWakeup(PSHCLCLIENT pClient);
    197197
    198 # ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     198# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    199199int sharedClipboardSvcURITransferStart(PSHCLCLIENT pClient,
    200200                                     SHCLURITRANSFERDIR enmDir, SHCLSOURCE enmSource,
    201201                                     PSHCLURITRANSFER *ppTransfer);
    202202bool sharedClipboardSvcURIMsgIsAllowed(uint32_t uMode, uint32_t uMsg);
    203 # endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
     203# endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
    204204
    205205/*
    … …  
    221221int SharedClipboardSvcImplSync(PSHCLCLIENT pClient);
    222222
    223 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     223#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    224224int sharedClipboardSvcURITransferOpen(PSHCLPROVIDERCTX pCtx);
    225225DECLCALLBACK(int) sharedClipboardSvcURITransferClose(PSHCLPROVIDERCTX pCtx);
    … …  
    251251int SharedClipboardSvcImplURITransferCreate(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer);
    252252int SharedClipboardSvcImplURITransferDestroy(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer);
    253 #endif /*VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
     253#endif /*VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
    254254
    255255/* Host unit testing interface */

  • trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-utils.cpp

    r80847 r80849  
    3232
    3333
    34 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     34#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    3535/**
    3636 * Returns whether a HGCM message is allowed in a certain service mode or not.
    … …  
    150150}
    151151#endif
    152 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
     152#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
    153153

  • trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

    r80847 r80849  
    2626#include <VBox/GuestHost/clipboard-helper.h>
    2727#include <VBox/GuestHost/SharedClipboard-win.h>
    28 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     28#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    2929# include <VBox/GuestHost/SharedClipboard-uri.h>
    3030#endif
    … …  
    3737#include <iprt/semaphore.h>
    3838#include <iprt/thread.h>
    39 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     39#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    4040# include <iprt/utf16.h>
    4141#endif
    … …  
    4545
    4646#include "VBoxSharedClipboardSvc-internal.h"
    47 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     47#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    4848# include "VBoxSharedClipboardSvc-uri.h"
    4949#endif
    … …  
    336336                break;
    337337
    338 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     338#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    339339            if (fFormats & VBOX_SHCL_FMT_URI_LIST)
    340340            {
    … …  
    367367                    SharedClipboardWinClose();
    368368                }
    369 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     369#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    370370            }
    371371#endif
    … …  
    492492            }
    493493
    494 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     494#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    495495            if (RT_SUCCESS(rc))
    496496            {
    … …  
    525525            LogFunc(("Message loop finished. GetMessage returned %d, message id: %d \n", msgret, msg.message));
    526526
    527 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     527#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    528528            OleSetClipboard(NULL); /* Make sure to flush the clipboard on destruction. */
    529529            OleUninitialize();
    … …  
    590590int SharedClipboardSvcImplInit(void)
    591591{
    592 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     592#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    593593    HRESULT hr = OleInitialize(NULL);
    594594    if (FAILED(hr))
    … …  
    606606void SharedClipboardSvcImplDestroy(void)
    607607{
    608 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     608#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    609609    OleSetClipboard(NULL); /* Make sure to flush the clipboard on destruction. */
    610610    OleUninitialize();
    … …  
    812812            }
    813813        }
    814 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     814#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    815815        else if (pData->uFormat & VBOX_SHCL_FMT_URI_LIST)
    816816        {
    817817            AssertFailed(); /** @todo */
    818818        }
    819 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
     819#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
    820820        SharedClipboardWinClose();
    821821    }
    … …  
    842842}
    843843
    844 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     844#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    845845int SharedClipboardSvcImplURITransferCreate(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer)
    846846{
    … …  
    860860    return VINF_SUCCESS;
    861861}
    862 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
    863 
     862#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
     863

  • trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

    r80847 r80849  
    204204    RT_NOREF(pCmdCtx);
    205205
    206 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     206#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    207207    if (pFormats->uFormats & VBOX_SHCL_FMT_URI_LIST) /* No URI support yet. */
    208208        return VINF_SUCCESS;
    … …  
    389389}
    390390
    391 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     391#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    392392int SharedClipboardSvcImplURITransferCreate(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer)
    393393{

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

    r80847 r80849  
    8484 *
    8585 * Since VBox x.x.x transferring files via Shared Clipboard is supported.
    86  * See the VBOX_WITH_SHARED_CLIPBOARD_URI_LIST define for supported / enabled
     86 * See the VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS define for supported / enabled
    8787 * platforms. This is called "URI transfers".
    8888 *
    … …  
    214214
    215215#include "VBoxSharedClipboardSvc-internal.h"
    216 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     216#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    217217# include "VBoxSharedClipboardSvc-uri.h"
    218218#endif
    … …  
    10991099    AssertPtr(pClient);
    11001100
    1101 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     1101#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    11021102    PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(&pClient->URI, 0 /* Index*/);
    11031103    if (pTransfer)
    … …  
    11491149        {
    11501150            rc = SharedClipboardSvcImplConnect(pClient, VBoxSvcClipboardGetHeadless());
    1151 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     1151#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    11521152            if (RT_SUCCESS(rc))
    11531153                rc = SharedClipboardURICtxInit(&pClient->URI);
    … …  
    13751375                if (RT_SUCCESS(rc))
    13761376                {
    1377 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     1377#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    13781378                    if (uFormat == VBOX_SHCL_FMT_URI_LIST)
    13791379                    {
    … …  
    13851385                    else
    13861386                    {
    1387 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
     1387#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
    13881388                        void    *pv;
    13891389                        uint32_t cb;
    … …  
    14581458                            }
    14591459                        }
    1460 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     1460#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    14611461                    }
    14621462#endif
    … …  
    14751475        default:
    14761476        {
    1477 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     1477#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    14781478            rc = sharedClipboardSvcURIHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival);
    14791479#else
    … …  
    15371537    LogFlowFuncEnter();
    15381538
    1539 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     1539#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    15401540    pClientState->URI.enmTransferDir = SHCLURITRANSFERDIR_UNKNOWN;
    15411541#else
    … …  
    15981598        default:
    15991599        {
    1600 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     1600#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    16011601            rc = sharedClipboardSvcURIHostHandler(u32Function, cParms, paParms);
    16021602#else
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette