Changeset 84984 in vbox
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/HostServices/DragAndDropSvc.h
r82968 r84984 253 253 * HOST_DND_HG_EVT_DROPPED 254 254 */ 255 typedef struct VBOXDNDHGACTIONMSG255 typedef struct HGCMMsgHGAction 256 256 { 257 257 VBGLIOCHGCMCALL hdr; … … 282 282 } v3; 283 283 } u; 284 } VBOXDNDHGACTIONMSG;284 } HGCMMsgHGAction; 285 285 286 286 /** … … 290 290 * HOST_DND_HG_EVT_LEAVE 291 291 */ 292 typedef struct VBOXDNDHGLEAVEMSG292 typedef struct HGCMMsgHGLeave 293 293 { 294 294 VBGLIOCHGCMCALL hdr; … … 301 301 } v3; 302 302 } u; 303 } VBOXDNDHGLEAVEMSG;303 } HGCMMsgHGLeave; 304 304 305 305 /** … … 309 309 * HOST_DND_HG_EVT_CANCEL 310 310 */ 311 typedef struct VBOXDNDHGCANCELMSG311 typedef struct HGCMMsgHGCancel 312 312 { 313 313 VBGLIOCHGCMCALL hdr; … … 320 320 } v3; 321 321 } u; 322 } VBOXDNDHGCANCELMSG;322 } HGCMMsgHGCancel; 323 323 324 324 /** … … 331 331 * New since protocol v3. 332 332 */ 333 typedef struct VBOXDNDHGSENDDATAHDRMSG333 typedef struct HGCMMsgHGSendDataHdr 334 334 { 335 335 VBGLIOCHGCMCALL hdr; … … 364 364 /** Size (in bytes) of checksum. */ 365 365 HGCMFunctionParameter cbChecksum; /* OUT uint32_t */ 366 } VBOXDNDHGSENDDATAHDRMSG;366 } HGCMMsgHGSendDataHdr; 367 367 368 368 /** … … 372 372 * HOST_DND_HG_SND_DATA 373 373 */ 374 typedef struct VBOXDNDHGSENDDATAMSG374 typedef struct HGCMMsgHGSendData 375 375 { 376 376 VBGLIOCHGCMCALL hdr; … … 402 402 } v3; 403 403 } u; 404 } VBOXDNDHGSENDDATAMSG;404 } HGCMMsgHGSendData; 405 405 406 406 /** … … 413 413 * HOST_DND_HG_SND_MORE_DATA 414 414 */ 415 typedef struct VBOXDNDHGSENDMOREDATAMSG415 typedef struct HGCMMsgHGSendMoreData 416 416 { 417 417 VBGLIOCHGCMCALL hdr; … … 419 419 HGCMFunctionParameter pvData; /* OUT ptr */ 420 420 HGCMFunctionParameter cbData; /* OUT uint32_t */ 421 } VBOXDNDHGSENDMOREDATAMSG;421 } HGCMMsgHGSendMoreData; 422 422 423 423 /** … … 428 428 * GUEST_DND_GH_SND_DIR 429 429 */ 430 typedef struct VBOXDNDHGSENDDIRMSG430 typedef struct HGCMMsgHGSendDir 431 431 { 432 432 VBGLIOCHGCMCALL hdr; … … 455 455 } v3; 456 456 } u; 457 } VBOXDNDHGSENDDIRMSG;457 } HGCMMsgHGSendDir; 458 458 459 459 /** … … 465 465 * GUEST_DND_GH_SND_FILE_HDR 466 466 */ 467 typedef struct VBOXDNDHGSENDFILEHDRMSG467 typedef struct HGCMMsgHGSendFileHdr 468 468 { 469 469 VBGLIOCHGCMCALL hdr; … … 481 481 /** Total size (in bytes). */ 482 482 HGCMFunctionParameter cbTotal; /* OUT uint64_t */ 483 } VBOXDNDHGSENDFILEHDRMSG;483 } HGCMMsgHGSendFileHdr; 484 484 485 485 /** … … 489 489 * HOST_DND_HG_SND_FILE 490 490 */ 491 typedef struct VBOXDNDHGSENDFILEDATAMSG491 typedef struct HGCMMsgHGSendFileData 492 492 { 493 493 VBGLIOCHGCMCALL hdr; … … 537 537 } v3; 538 538 } u; 539 } VBOXDNDHGSENDFILEDATAMSG;539 } HGCMMsgHGSendFileData; 540 540 541 541 /** … … 545 545 * HOST_DND_GH_REQ_PENDING 546 546 */ 547 typedef struct VBOXDNDGHREQPENDINGMSG547 typedef struct HGCMMsgGHReqPending 548 548 { 549 549 VBGLIOCHGCMCALL hdr; … … 564 564 } v3; 565 565 } u; 566 } VBOXDNDGHREQPENDINGMSG;566 } HGCMMsgGHReqPending; 567 567 568 568 /** … … 573 573 * HOST_DND_GH_EVT_DROPPED 574 574 */ 575 typedef struct VBOXDNDGHDROPPEDMSG575 typedef struct HGCMMsgGHDropped 576 576 { 577 577 VBGLIOCHGCMCALL hdr; … … 600 600 } v3; 601 601 } u; 602 } VBOXDNDGHDROPPEDMSG;602 } HGCMMsgGHDropped; 603 603 604 604 /* … … 614 614 * GUEST_DND_GET_NEXT_HOST_MSG 615 615 */ 616 typedef struct VBOXDNDNEXTMSGMSG616 typedef struct HGCMMsgGetNext 617 617 { 618 618 VBGLIOCHGCMCALL hdr; … … 625 625 * new message to arrive. */ 626 626 HGCMFunctionParameter fBlock; /* OUT uint32_t */ 627 } VBOXDNDNEXTMSGMSG;627 } HGCMMsgGetNext; 628 628 629 629 /** … … 634 634 * GUEST_DND_CONNECT 635 635 */ 636 typedef struct VBOXDNDCONNECTMSG636 typedef struct HGCMMsgConnect 637 637 { 638 638 VBGLIOCHGCMCALL hdr; … … 657 657 } v3; 658 658 } u; 659 } VBOXDNDCONNECTMSG;659 } HGCMMsgConnect; 660 660 661 661 /** … … 666 666 * GUEST_DND_HG_ACK_OP 667 667 */ 668 typedef struct VBOXDNDHGACKOPMSG668 typedef struct HGCMMsgHGAck 669 669 { 670 670 VBGLIOCHGCMCALL hdr; … … 683 683 } v3; 684 684 } u; 685 } VBOXDNDHGACKOPMSG;686 687 /** 688 * HG request for data event.685 } HGCMMsgHGAck; 686 687 /** 688 * Requests data to be sent to the guest. 689 689 * 690 690 * Used by: 691 691 * GUEST_DND_HG_REQ_DATA 692 692 */ 693 typedef struct VBOXDNDHGREQDATAMSG693 typedef struct HGCMMsgHGReqData 694 694 { 695 695 VBGLIOCHGCMCALL hdr; … … 709 709 } v3; 710 710 } u; 711 } VBOXDNDHGREQDATAMSG;712 713 typedef struct VBOXDNDHGEVTPROGRESSMSG711 } HGCMMsgHGReqData; 712 713 typedef struct HGCMMsgHGProgress 714 714 { 715 715 VBGLIOCHGCMCALL hdr; … … 732 732 } v3; 733 733 } u; 734 } VBOXDNDHGEVTPROGRESSMSG; 735 736 /** 737 * Acknowledges a pending drag and drop event 738 * to the host. 734 } HGCMMsgHGProgress; 735 736 /** 737 * Acknowledges a pending guest drag and drop event to the host. 739 738 * 740 739 * Used by: 741 740 * GUEST_DND_GH_ACK_PENDING 742 741 */ 743 typedef struct VBOXDNDGHACKPENDINGMSG742 typedef struct HGCMMsgGHAckPending 744 743 { 745 744 VBGLIOCHGCMCALL hdr; … … 763 762 } v3; 764 763 } u; 765 } VBOXDNDGHACKPENDINGMSG;764 } HGCMMsgGHAckPending; 766 765 767 766 /** … … 774 773 * New since protocol v3. 775 774 */ 776 typedef struct VBOXDNDHGSENDDATAHDRMSG VBOXDNDGHSENDDATAHDRMSG;775 typedef struct HGCMMsgHGSendDataHdr HGCMMsgGHSendDataHdr; 777 776 778 777 /** … … 782 781 * GUEST_DND_GH_SND_DATA 783 782 */ 784 typedef struct VBOXDNDGHSENDDATAMSG783 typedef struct HGCMMsgGHSendData 785 784 { 786 785 VBGLIOCHGCMCALL hdr; … … 810 809 } v3; 811 810 } u; 812 } VBOXDNDGHSENDDATAMSG;811 } HGCMMsgGHSendData; 813 812 814 813 /** … … 818 817 * GUEST_DND_GH_SND_DIR 819 818 */ 820 typedef struct VBOXDNDHGSENDDIRMSG VBOXDNDGHSENDDIRMSG;819 typedef struct HGCMMsgHGSendDir HGCMMsgGHSendDir; 821 820 822 821 /** … … 828 827 * New since protocol v2. 829 828 */ 830 typedef struct VBOXDNDHGSENDFILEHDRMSG VBOXDNDGHSENDFILEHDRMSG;829 typedef struct HGCMMsgHGSendFileHdr HGCMMsgGHSendFileHdr; 831 830 832 831 /** … … 836 835 * GUEST_DND_GH_SND_FILE_DATA 837 836 */ 838 typedef struct VBOXDNDHGSENDFILEDATAMSG VBOXDNDGHSENDFILEDATAMSG;837 typedef struct HGCMMsgHGSendFileData HGCMMsgGHSendFileData; 839 838 840 839 /** … … 844 843 * GUEST_DND_GH_EVT_ERROR 845 844 */ 846 typedef struct VBOXDNDGHEVTERRORMSG845 typedef struct HGCMMsgGHError 847 846 { 848 847 VBGLIOCHGCMCALL hdr; … … 861 860 } v3; 862 861 } u; 863 } VBOXDNDGHEVTERRORMSG;862 } HGCMMsgGHError; 864 863 865 864 #pragma pack() -
trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp
r82968 r84984 72 72 AssertPtrReturn(pcParms, VERR_INVALID_POINTER); 73 73 74 VBOXDNDNEXTMSGMSGMsg;74 HGCMMsgGetNext Msg; 75 75 RT_ZERO(Msg); 76 76 VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GET_NEXT_HOST_MSG, 3); … … 127 127 return VERR_NO_MEMORY; 128 128 129 VBOXDNDHGACTIONMSGMsg;129 HGCMMsgHGAction Msg; 130 130 RT_ZERO(Msg); 131 131 … … 184 184 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); 185 185 186 VBOXDNDHGLEAVEMSGMsg;186 HGCMMsgHGLeave Msg; 187 187 RT_ZERO(Msg); 188 188 … … 205 205 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); 206 206 207 VBOXDNDHGCANCELMSGMsg;207 HGCMMsgHGCancel Msg; 208 208 RT_ZERO(Msg); 209 209 … … 238 238 AssertPtrReturn(pfMode, VERR_INVALID_POINTER); 239 239 240 VBOXDNDHGSENDDIRMSGMsg;240 HGCMMsgHGSendDir Msg; 241 241 RT_ZERO(Msg); 242 242 … … 281 281 AssertPtrReturn(pcbDataRecv, VERR_INVALID_POINTER); 282 282 283 VBOXDNDHGSENDFILEDATAMSGMsg;283 HGCMMsgHGSendFileData Msg; 284 284 RT_ZERO(Msg); 285 285 … … 329 329 AssertReturn(pcbTotal, VERR_INVALID_POINTER); 330 330 331 VBOXDNDHGSENDFILEHDRMSGMsg;331 HGCMMsgHGSendFileHdr Msg; 332 332 RT_ZERO(Msg); 333 333 … … 657 657 LogFlowFunc(("pvDate=%p, cbData=%RU32\n", pvData, cbData)); 658 658 659 VBOXDNDHGSENDDATAMSGMsg;659 HGCMMsgHGSendData Msg; 660 660 RT_ZERO(Msg); 661 661 … … 703 703 Assert(pCtx->uProtocol >= 3); /* Only for protocol v3 and up. */ 704 704 705 VBOXDNDHGSENDDATAHDRMSGMsg;705 HGCMMsgHGSendDataHdr Msg; 706 706 RT_ZERO(Msg); 707 707 VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_DATA_HDR, 12); … … 970 970 /* pScreenID is optional. */ 971 971 972 VBOXDNDGHREQPENDINGMSGMsg;972 HGCMMsgGHReqPending Msg; 973 973 RT_ZERO(Msg); 974 974 … … 1013 1013 return VERR_NO_MEMORY; 1014 1014 1015 VBOXDNDGHDROPPEDMSGMsg;1015 HGCMMsgGHDropped Msg; 1016 1016 RT_ZERO(Msg); 1017 1017 … … 1111 1111 * does not implement this command. 1112 1112 */ 1113 VBOXDNDCONNECTMSGMsg;1113 HGCMMsgConnect Msg; 1114 1114 RT_ZERO(Msg); 1115 1115 … … 1366 1366 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); 1367 1367 1368 VBOXDNDHGACKOPMSGMsg;1368 HGCMMsgHGAck Msg; 1369 1369 RT_ZERO(Msg); 1370 1370 … … 1394 1394 const uint32_t cbFormat = (uint32_t)strlen(pcszFormat) + 1; /* Include termination */ 1395 1395 1396 VBOXDNDHGREQDATAMSGMsg;1396 HGCMMsgHGReqData Msg; 1397 1397 RT_ZERO(Msg); 1398 1398 … … 1421 1421 AssertReturn(uStatus > DND_PROGRESS_UNKNOWN, VERR_INVALID_PARAMETER); 1422 1422 1423 VBOXDNDHGEVTPROGRESSMSGMsg;1423 HGCMMsgHGProgress Msg; 1424 1424 RT_ZERO(Msg); 1425 1425 … … 1458 1458 return VERR_INVALID_UTF8_ENCODING; 1459 1459 1460 VBOXDNDGHACKPENDINGMSGMsg;1460 HGCMMsgGHAckPending Msg; 1461 1461 RT_ZERO(Msg); 1462 1462 … … 1490 1490 AssertPtrReturn(pDataHdr, VERR_INVALID_POINTER); 1491 1491 1492 VBOXDNDGHSENDDATAHDRMSGMsgHdr;1492 HGCMMsgGHSendDataHdr MsgHdr; 1493 1493 RT_ZERO(MsgHdr); 1494 1494 … … 1514 1514 if (RT_SUCCESS(rc)) 1515 1515 { 1516 VBOXDNDGHSENDDATAMSG MsgData; 1517 RT_ZERO(MsgData); 1516 HGCMMsgGHSendData MsgData; 1518 1517 1519 1518 VBGL_HGCM_HDR_INIT(&MsgData.hdr, pCtx->uClientID, GUEST_DND_GH_SND_DATA, 5); … … 1576 1575 const uint32_t cbPath = (uint32_t)strPath.length() + 1; /* Include termination. */ 1577 1576 1578 VBOXDNDGHSENDDIRMSGMsg;1577 HGCMMsgGHSendDir Msg; 1579 1578 RT_ZERO(Msg); 1580 1579 … … 1614 1613 pObj->GetSize(), pObj->GetMode())); 1615 1614 1616 VBOXDNDGHSENDFILEHDRMSGMsgHdr;1615 HGCMMsgGHSendFileHdr MsgHdr; 1617 1616 RT_ZERO(MsgHdr); 1618 1617 … … 1634 1633 * Send the actual file data, chunk by chunk. 1635 1634 */ 1636 VBOXDNDGHSENDFILEDATAMSGMsg;1635 HGCMMsgGHSendFileData Msg; 1637 1636 RT_ZERO(Msg); 1638 1637 … … 1869 1868 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); 1870 1869 1871 VBOXDNDGHEVTERRORMSGMsg;1870 HGCMMsgGHError Msg; 1872 1871 RT_ZERO(Msg); 1873 1872
Note:
See TracChangeset
for help on using the changeset viewer.
