VirtualBox

Changeset 84996 in vbox for trunk/include/VBox/HostServices


Ignore:
Timestamp:
Jun 29, 2020 4:21:34 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
138891
Message:

Shared Clipboard/Transfers: Removed some superfluous HGCM parameters. Untested.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/HostServices/VBoxClipboardSvc.h

    r83621 r84996  
    828828
    829829/**
    830  * Status messag for lists and objects.
     830 * Status message for lists and objects.
    831831 */
    832832typedef struct _VBoxShClStatusMsg
    … …  
    838838    /** uint32_t, in: Transfer status of type SHCLTRANSFERSTATUS. */
    839839    HGCMFunctionParameter uStatus;
    840     /** uint32_t, in: Size of payload of this status, based on the status type. */
    841     HGCMFunctionParameter cbPayload;
    842840    /** pointer, in: Optional payload of this status, based on the status type. */
    843841    HGCMFunctionParameter pvPayload;
    844842} VBoxShClStatusMsg;
    845843
    846 #define VBOX_SHCL_CPARMS_STATUS 4
     844#define VBOX_SHCL_CPARMS_STATUS 3
    847845
    848846/** Invalid message type, do not use. */
    … …  
    872870    /** uint32_t, out: IPRT result of overall operation. */
    873871    HGCMFunctionParameter rc;
    874     /** uint32_t, out: Size of optional payload of this reply, based on the message type. */
    875     HGCMFunctionParameter cbPayload;
    876872    /** pointer, out: Optional payload of this reply, based on the message type. */
    877873    HGCMFunctionParameter pvPayload;
    … …  
    898894
    899895/** Minimum parameters (HGCM function parameters minus the union) a reply message must have. */
    900 #define VBOX_SHCL_CPARMS_REPLY_MIN 5
     896#define VBOX_SHCL_CPARMS_REPLY_MIN 4
    901897
    902898/**
    … …  
    911907} VBoxShClRootListParms;
    912908
     909#define VBOX_SHCL_CPARMS_ROOT_LIST 2
     910
    913911/**
    914912 * Requests to read the root list header.
    … …  
    921919} VBoxShClRootListReadReqMsg;
    922920
    923 #define VBOX_SHCL_CPARMS_ROOT_LIST_HDR_READ_REQ 2
     921#define VBOX_SHCL_CPARMS_ROOT_LIST_HDR_READ_REQ VBOX_SHCL_CPARMS_ROOT_LIST
    924922
    925923/**
    … …  
    935933} VBoxShClRootListHdrMsg;
    936934
    937 #define VBOX_SHCL_CPARMS_ROOT_LIST_HDR_READ  3
    938 #define VBOX_SHCL_CPARMS_ROOT_LIST_HDR_WRITE 3
     935#define VBOX_SHCL_CPARMS_ROOT_LIST_HDR_READ  VBOX_SHCL_CPARMS_ROOT_LIST + 1
     936#define VBOX_SHCL_CPARMS_ROOT_LIST_HDR_WRITE VBOX_SHCL_CPARMS_ROOT_LIST + 1
    939937
    940938/**
    … …  
    951949} VBoxShClRootListEntryParms;
    952950
     951#define VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY 3
     952
    953953/**
    954954 * Request to read a list root entry.
    … …  
    962962} VBoxShClRootListEntryReadReqMsg;
    963963
    964 #define VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_READ_REQ 3
     964#define VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_READ_REQ VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY
    965965
    966966/**
    … …  
    982982} VBoxShClRootListEntryMsg;
    983983
    984 #define VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_READ  6
    985 #define VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_WRITE 6
     984#define VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_READ  VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY + 3
     985#define VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_WRITE VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY + 3
    986986
    987987/**
    … …  
    996996    /** uint32_t, in: Listing flags (see VBOX_SHCL_LIST_FLAG_XXX). */
    997997    HGCMFunctionParameter fList;
    998     /** uint32_t, in: Size (in bytes) of the filter string. */
    999     HGCMFunctionParameter cbFilter;
    1000998    /** pointer, in: Filter string. */
    1001999    HGCMFunctionParameter pvFilter;
    1002     /** uint32_t, in: Size (in bytes) of the listing path. */
    1003     HGCMFunctionParameter cbPath;
    10041000    /** pointer, in: Listing poth. If empty or NULL the listing's root path will be opened. */
    10051001    HGCMFunctionParameter pvPath;
    … …  
    10081004} VBoxShClListOpenMsg;
    10091005
    1010 #define VBOX_SHCL_CPARMS_LIST_OPEN 7
     1006#define VBOX_SHCL_CPARMS_LIST_OPEN 5
    10111007
    10121008/**
    … …  
    10351031} VBoxShClListHdrReqParms;
    10361032
     1033#define VBOX_SHCL_CPARMS_LIST_HDR_REQ 3
     1034
    10371035/**
    10381036 * Request to read a list header.
    … …  
    10451043} VBoxShClListHdrReadReqMsg;
    10461044
    1047 #define VBOX_SHCL_CPARMS_LIST_HDR_READ_REQ 3
     1045#define VBOX_SHCL_CPARMS_LIST_HDR_READ_REQ VBOX_SHCL_CPARMS_LIST_HDR_REQ
    10481046
    10491047/**
    … …  
    10571055    /** uint32_t, in/out: Feature flags (see VBOX_SHCL_FEATURE_FLAG_XXX). */
    10581056    HGCMFunctionParameter   fFeatures;
    1059     /** uint64_t, in/out:  Number of total objects to transfer. */
     1057    /** uint64_t, in/out: Number of total objects to transfer. */
    10601058    HGCMFunctionParameter   cTotalObjects;
    1061     /** uint64_t, in/out:  Number of total bytes to transfer. */
     1059    /** uint64_t, in/out: Number of total bytes to transfer. */
    10621060    HGCMFunctionParameter   cbTotalSize;
    10631061} VBoxShClListHdrMsg;
    10641062
    1065 #define VBOX_SHCL_CPARMS_LIST_HDR 6
     1063#define VBOX_SHCL_CPARMS_LIST_HDR VBOX_SHCL_CPARMS_LIST_HDR_REQ + 3
    10661064
    10671065typedef struct _VBoxShClListEntryReqParms
    … …  
    10751073} VBoxShClListEntryReqParms;
    10761074
     1075#define VBOX_SHCL_CPARMS_LIST_ENTRY_REQ 3
     1076
    10771077/**
    10781078 * Request to read a list entry.
    … …  
    10851085} VBoxShClListEntryReadReqMsg;
    10861086
    1087 #define VBOX_SHCL_CPARMS_LIST_ENTRY_READ 3
     1087#define VBOX_SHCL_CPARMS_LIST_ENTRY_READ VBOX_SHCL_CPARMS_LIST_ENTRY_REQ
    10881088
    10891089/**
    … …  
    10971097    VBoxShClListEntryReqParms ReqParms;
    10981098    /** pointer, in/out: Entry name. */
    1099     HGCMFunctionParameter          szName;
     1099    HGCMFunctionParameter     szName;
    11001100    /** uint32_t, out: Bytes to be used for information/How many bytes were used.  */
    1101     HGCMFunctionParameter          cbInfo;
     1101    HGCMFunctionParameter     cbInfo;
    11021102    /** pointer, in/out: Information to be set/get (SHCLFSOBJINFO only currently).
    11031103     *  Do not forget to set the SHCLFSOBJINFO::Attr::enmAdditional for Get operation as well.  */
    1104     HGCMFunctionParameter          pvInfo;
     1104    HGCMFunctionParameter     pvInfo;
    11051105} VBoxShClListEntryMsg;
    11061106
    1107 #define VBOX_SHCL_CPARMS_LIST_ENTRY 6
     1107#define VBOX_SHCL_CPARMS_LIST_ENTRY VBOX_SHCL_CPARMS_LIST_ENTRY_REQ + 3
    11081108
    11091109/**
    … …  
    11161116    /** uint64_t, in/out: Context ID. */
    11171117    HGCMFunctionParameter uContext;
    1118     /** uint64_t, in/out: Object handle. */
     1118    /** uint64_t, out: Object handle. */
    11191119    HGCMFunctionParameter uHandle;
    1120     /** uint32_t, in/out: Size (in bytes) of absoulte path of object to open/create. */
    1121     HGCMFunctionParameter cbPath;
    1122     /** pointer, in/out: Absoulte path of object to open/create. */
     1120    /** pointer, in: Absoulte path of object to open/create. */
    11231121    HGCMFunctionParameter szPath;
    1124     /** uint32_t in/out: Open / Create flags of type SHCL_OBJ_CF_. */
     1122    /** uint32_t in: Open / Create flags of type SHCL_OBJ_CF_. */
    11251123    HGCMFunctionParameter fCreate;
    11261124} VBoxShClObjOpenMsg;
    11271125
    1128 #define VBOX_SHCL_CPARMS_OBJ_OPEN 5
     1126#define VBOX_SHCL_CPARMS_OBJ_OPEN 4
    11291127
    11301128/**
    … …  
    11851183    /** uint64_t, in/out: SHCLOBJHANDLE of object to write to. */
    11861184    HGCMFunctionParameter uHandle;
    1187     /** uint32_t, in/out: Size (in bytes) of current data chunk. */
     1185    /** uint32_t, out: Size (in bytes) read/written. */
    11881186    HGCMFunctionParameter cbData;
    11891187    /** pointer, in/out: Current data chunk. */
Note: See TracChangeset for help on using the changeset viewer.

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