Changeset 58204 in vbox
- Timestamp:
- Oct 12, 2015 4:10:11 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.kmk
r58167 r58204 824 824 -e '/warning. Unexpected tag .dd. found/d' \ 825 825 -e '/warning. Unsupported xml.html tag .globalScope. found/d' \ 826 -e '/\/include\/VBox\/VBoxGuestLib\.h.* warning/b ignore' \827 826 -e '/\/include\/VBox\/VBoxVideoGuest\.h.* warning/b ignore' \ 828 827 -e '/\/include\/VBox\/sup\.h.* warning/b ignore' \ … … 840 839 -e '/\/src\/VBox\/Additions\/WINNT\/VBoxTray\/VBoxDnD\.h.* warning/b ignore' \ 841 840 -e '/\/src\/VBox\/Additions\/WINNT\/VBoxTray\/VBoxDnD\.cpp.* warning/b ignore' \ 842 -e '/\/src\/VBox\/Additions\/common\/VBoxGuestLib\/.* warning/b ignore' \843 841 -e '/\/src\/VBox\/Additions\/common\/VBoxVideo\/HGSMIBase\.cpp.* warning/b ignore' \ 844 842 -e '/\/src\/VBox\/Additions\/common\/VBoxVideo\/Modesetting\.cpp.* warning/b ignore' \ -
trunk/include/VBox/VBoxGuestLib.h
r58184 r58204 656 656 VBGLR3DECL(int) VbglR3GuestCtrlSessionGetOpen(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puProtocol, char *pszUser, uint32_t cbUser, 657 657 char *pszPassword, uint32_t cbPassword, char *pszDomain, uint32_t cbDomain, 658 uint32_t *pfFlags, uint32_t *p uSessionID);659 VBGLR3DECL(int) VbglR3GuestCtrlSessionGetClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *pfFlags, uint32_t *p uSessionID);658 uint32_t *pfFlags, uint32_t *pidSession); 659 VBGLR3DECL(int) VbglR3GuestCtrlSessionGetClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *pfFlags, uint32_t *pidSession); 660 660 /* Guest path handling. */ 661 661 VBGLR3DECL(int) VbglR3GuestCtrlPathGetRename(PVBGLR3GUESTCTRLCMDCTX pCtx, char *pszSource, uint32_t cbSource, char *pszDest, -
trunk/include/VBox/VBoxGuestLibSharedFolders.h
r58203 r58204 32 32 33 33 RT_C_DECLS_BEGIN 34 35 36 /** @addtogroup grp_vboxguest_lib_r0 37 * @{ 38 */ 34 39 35 40 typedef struct VBGLSFCLIENT … … 97 102 98 103 DECLVBGL(int) VbglR0SfDirInfo(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile,PSHFLSTRING ParsedPath, uint32_t flags, 99 104 uint32_t index, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer, uint32_t *pcFiles); 100 105 DECLVBGL(int) VbglR0SfFsInfo(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer); 101 106 … … 108 113 DECLVBGL(int) VbglR0SfSetSymlinks(PVBGLSFCLIENT pClient); 109 114 115 /** @} */ 116 110 117 RT_C_DECLS_END 111 118 -
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp
r58177 r58204 169 169 * @copydoc VbglR3GetAdditionsVersion 170 170 */ 171 static int vbglR3GetAdditionsCompileTimeVersion(char **ppszVer, char **ppszVerEx , char **ppszRev)171 static int vbglR3GetAdditionsCompileTimeVersion(char **ppszVer, char **ppszVerExt, char **ppszRev) 172 172 { 173 173 int rc = VINF_SUCCESS; … … 176 176 if (RT_SUCCESS(rc)) 177 177 { 178 if (ppszVerEx )179 rc = RTStrDupEx(ppszVerEx , VBOX_VERSION_STRING);178 if (ppszVerExt) 179 rc = RTStrDupEx(ppszVerExt, VBOX_VERSION_STRING); 180 180 if (RT_SUCCESS(rc)) 181 181 { … … 187 187 /* bail out: */ 188 188 } 189 if (ppszVerEx )190 { 191 RTStrFree(*ppszVerEx );192 *ppszVerEx = NULL;189 if (ppszVerExt) 190 { 191 RTStrFree(*ppszVerExt); 192 *ppszVerExt = NULL; 193 193 } 194 194 } … … 330 330 * @param fReserved Flags reserved for future hacks. 331 331 */ 332 VBGLR3DECL(int) VbglR3ReportAdditionsStatus(VBoxGuestFacilityType enmFacility, 333 VBoxGuestFacilityStatus enmStatusCurrent, 332 VBGLR3DECL(int) VbglR3ReportAdditionsStatus(VBoxGuestFacilityType enmFacility, VBoxGuestFacilityStatus enmStatus, 334 333 uint32_t fReserved) 335 334 { … … 340 339 { 341 340 Report.guestStatus.facility = enmFacility; 342 Report.guestStatus.status = enmStatus Current;341 Report.guestStatus.status = enmStatus; 343 342 Report.guestStatus.flags = fReserved; 344 343 -
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp
r58183 r58204 68 68 * 69 69 * @returns VBox status code. 70 * @param idClient IdThe client id returned by VbglR3ClipboardConnect().70 * @param idClient The client id returned by VbglR3ClipboardConnect(). 71 71 */ 72 72 VBGLR3DECL(int) VbglR3ClipboardDisconnect(HGCMCLIENTID idClient) -
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp
r57358 r58204 112 112 * @param ppwszUser Receives pointer of allocated user name string. 113 113 * The returned pointer must be freed using VbglR3CredentialsDestroyUtf16(). 114 * @param pp swzPassword Receives pointer of allocated user password string.114 * @param ppwszPassword Receives pointer of allocated user password string. 115 115 * The returned pointer must be freed using VbglR3CredentialsDestroyUtf16(). 116 116 * @param ppwszDomain Receives pointer of allocated domain name string. -
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp
r58154 r58204 280 280 * @return IPRT status code. 281 281 * @param pCtx Host context. 282 * @param uFlags282 * @param fFlags Some kind of flag. Figure it out yourself. 283 283 ** @todo Docs! 284 284 */ 285 VBGLR3DECL(int) VbglR3GuestCtrlSessionClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uFlags)285 VBGLR3DECL(int) VbglR3GuestCtrlSessionClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t fFlags) 286 286 { 287 287 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); … … 296 296 297 297 VbglHGCMParmUInt32Set(&Msg.context, pCtx->uContextID); 298 VbglHGCMParmUInt32Set(&Msg.flags, uFlags);298 VbglHGCMParmUInt32Set(&Msg.flags, fFlags); 299 299 300 300 int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg)); … … 340 340 * 341 341 * @return IPRT status code. 342 * @param pCtx Host context.343 342 ** @todo Docs! 344 343 */ … … 348 347 char *pszPassword, uint32_t cbPassword, 349 348 char *pszDomain, uint32_t cbDomain, 350 uint32_t *p uFlags, uint32_t *puSessionID)349 uint32_t *pfFlags, uint32_t *pidSession) 351 350 { 352 351 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); … … 357 356 AssertPtrReturn(pszPassword, VERR_INVALID_POINTER); 358 357 AssertPtrReturn(pszDomain, VERR_INVALID_POINTER); 359 AssertPtrReturn(p uFlags, VERR_INVALID_POINTER);358 AssertPtrReturn(pfFlags, VERR_INVALID_POINTER); 360 359 361 360 HGCMMsgSessionOpen Msg; … … 385 384 Msg.context.GetUInt32(&pCtx->uContextID); 386 385 Msg.protocol.GetUInt32(puProtocol); 387 Msg.flags.GetUInt32(p uFlags);388 389 if (p uSessionID)390 *p uSessionID= VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(pCtx->uContextID);386 Msg.flags.GetUInt32(pfFlags); 387 388 if (pidSession) 389 *pidSession = VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(pCtx->uContextID); 391 390 } 392 391 } … … 400 399 * 401 400 * @return IPRT status code. 402 * @param pCtx Host context.403 401 ** @todo Docs! 404 402 */ 405 VBGLR3DECL(int) VbglR3GuestCtrlSessionGetClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *p uFlags, uint32_t *puSessionID)403 VBGLR3DECL(int) VbglR3GuestCtrlSessionGetClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *pfFlags, uint32_t *pidSession) 406 404 { 407 405 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); 408 406 AssertReturn(pCtx->uNumParms == 2, VERR_INVALID_PARAMETER); 409 407 410 AssertPtrReturn(p uFlags, VERR_INVALID_POINTER);408 AssertPtrReturn(pfFlags, VERR_INVALID_POINTER); 411 409 412 410 HGCMMsgSessionClose Msg; … … 431 429 { 432 430 Msg.context.GetUInt32(&pCtx->uContextID); 433 Msg.flags.GetUInt32(p uFlags);434 435 if (p uSessionID)436 *p uSessionID= VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(pCtx->uContextID);431 Msg.flags.GetUInt32(pfFlags); 432 433 if (pidSession) 434 *pidSession = VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(pCtx->uContextID); 437 435 } 438 436 } … … 445 443 char *pszSource, uint32_t cbSource, 446 444 char *pszDest, uint32_t cbDest, 447 uint32_t *p uFlags)445 uint32_t *pfFlags) 448 446 { 449 447 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); … … 454 452 AssertPtrReturn(pszDest, VERR_INVALID_POINTER); 455 453 AssertReturn(cbDest, VERR_INVALID_PARAMETER); 456 AssertPtrReturn(p uFlags, VERR_INVALID_POINTER);454 AssertPtrReturn(pfFlags, VERR_INVALID_POINTER); 457 455 458 456 HGCMMsgPathRename Msg; … … 479 477 { 480 478 Msg.context.GetUInt32(&pCtx->uContextID); 481 Msg.flags.GetUInt32(p uFlags);479 Msg.flags.GetUInt32(pfFlags); 482 480 } 483 481 } … … 497 495 VBGLR3DECL(int) VbglR3GuestCtrlProcGetStart(PVBGLR3GUESTCTRLCMDCTX pCtx, 498 496 char *pszCmd, uint32_t cbCmd, 499 uint32_t *p uFlags,497 uint32_t *pfFlags, 500 498 char *pszArgs, uint32_t cbArgs, uint32_t *pcArgs, 501 499 char *pszEnv, uint32_t *pcbEnv, uint32_t *pcEnvVars, … … 509 507 510 508 AssertPtrReturn(pszCmd, VERR_INVALID_POINTER); 511 AssertPtrReturn(p uFlags, VERR_INVALID_POINTER);509 AssertPtrReturn(pfFlags, VERR_INVALID_POINTER); 512 510 AssertPtrReturn(pszArgs, VERR_INVALID_POINTER); 513 511 AssertPtrReturn(pcArgs, VERR_INVALID_POINTER); … … 565 563 { 566 564 Msg.context.GetUInt32(&pCtx->uContextID); 567 Msg.flags.GetUInt32(p uFlags);565 Msg.flags.GetUInt32(pfFlags); 568 566 Msg.num_args.GetUInt32(pcArgs); 569 567 Msg.num_env.GetUInt32(pcEnvVars); … … 594 592 */ 595 593 VBGLR3DECL(int) VbglR3GuestCtrlProcGetOutput(PVBGLR3GUESTCTRLCMDCTX pCtx, 596 uint32_t *puPID, uint32_t *puHandle, uint32_t *p uFlags)594 uint32_t *puPID, uint32_t *puHandle, uint32_t *pfFlags) 597 595 { 598 596 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); … … 601 599 AssertPtrReturn(puPID, VERR_INVALID_POINTER); 602 600 AssertPtrReturn(puHandle, VERR_INVALID_POINTER); 603 AssertPtrReturn(p uFlags, VERR_INVALID_POINTER);601 AssertPtrReturn(pfFlags, VERR_INVALID_POINTER); 604 602 605 603 HGCMMsgProcOutput Msg; … … 628 626 Msg.pid.GetUInt32(puPID); 629 627 Msg.handle.GetUInt32(puHandle); 630 Msg.flags.GetUInt32(p uFlags);628 Msg.flags.GetUInt32(pfFlags); 631 629 } 632 630 } … … 645 643 */ 646 644 VBGLR3DECL(int) VbglR3GuestCtrlProcGetInput(PVBGLR3GUESTCTRLCMDCTX pCtx, 647 uint32_t *puPID, uint32_t *p uFlags,645 uint32_t *puPID, uint32_t *pfFlags, 648 646 void *pvData, uint32_t cbData, 649 647 uint32_t *pcbSize) … … 653 651 654 652 AssertPtrReturn(puPID, VERR_INVALID_POINTER); 655 AssertPtrReturn(p uFlags, VERR_INVALID_POINTER);653 AssertPtrReturn(pfFlags, VERR_INVALID_POINTER); 656 654 AssertPtrReturn(pvData, VERR_INVALID_POINTER); 657 655 AssertPtrReturn(pcbSize, VERR_INVALID_POINTER); … … 682 680 Msg.context.GetUInt32(&pCtx->uContextID); 683 681 Msg.pid.GetUInt32(puPID); 684 Msg.flags.GetUInt32(p uFlags);682 Msg.flags.GetUInt32(pfFlags); 685 683 Msg.size.GetUInt32(pcbSize); 686 684 } … … 692 690 VBGLR3DECL(int) VbglR3GuestCtrlDirGetRemove(PVBGLR3GUESTCTRLCMDCTX pCtx, 693 691 char *pszPath, uint32_t cbPath, 694 uint32_t *p uFlags)692 uint32_t *pfFlags) 695 693 { 696 694 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); … … 699 697 AssertPtrReturn(pszPath, VERR_INVALID_POINTER); 700 698 AssertReturn(cbPath, VERR_INVALID_PARAMETER); 701 AssertPtrReturn(p uFlags, VERR_INVALID_POINTER);699 AssertPtrReturn(pfFlags, VERR_INVALID_POINTER); 702 700 703 701 HGCMMsgDirRemove Msg; … … 723 721 { 724 722 Msg.context.GetUInt32(&pCtx->uContextID); 725 Msg.flags.GetUInt32(p uFlags);723 Msg.flags.GetUInt32(pfFlags); 726 724 } 727 725 } … … 1344 1342 */ 1345 1343 VBGLR3DECL(int) VbglR3GuestCtrlProcCbStatus(PVBGLR3GUESTCTRLCMDCTX pCtx, 1346 uint32_t uPID, uint32_t uStatus, uint32_t uFlags,1344 uint32_t uPID, uint32_t uStatus, uint32_t fFlags, 1347 1345 void *pvData, uint32_t cbData) 1348 1346 { … … 1359 1357 VbglHGCMParmUInt32Set(&Msg.pid, uPID); 1360 1358 VbglHGCMParmUInt32Set(&Msg.status, uStatus); 1361 VbglHGCMParmUInt32Set(&Msg.flags, uFlags);1359 VbglHGCMParmUInt32Set(&Msg.flags, fFlags); 1362 1360 VbglHGCMParmPtrSet(&Msg.data, pvData, cbData); 1363 1361 … … 1380 1378 */ 1381 1379 VBGLR3DECL(int) VbglR3GuestCtrlProcCbOutput(PVBGLR3GUESTCTRLCMDCTX pCtx, 1382 uint32_t uPID,uint32_t uHandle, uint32_t uFlags,1380 uint32_t uPID,uint32_t uHandle, uint32_t fFlags, 1383 1381 void *pvData, uint32_t cbData) 1384 1382 { … … 1395 1393 VbglHGCMParmUInt32Set(&Msg.pid, uPID); 1396 1394 VbglHGCMParmUInt32Set(&Msg.handle, uHandle); 1397 VbglHGCMParmUInt32Set(&Msg.flags, uFlags);1395 VbglHGCMParmUInt32Set(&Msg.flags, fFlags); 1398 1396 VbglHGCMParmPtrSet(&Msg.data, pvData, cbData); 1399 1397 … … 1417 1415 VBGLR3DECL(int) VbglR3GuestCtrlProcCbStatusInput(PVBGLR3GUESTCTRLCMDCTX pCtx, 1418 1416 uint32_t uPID, uint32_t uStatus, 1419 uint32_t uFlags, uint32_t cbWritten)1417 uint32_t fFlags, uint32_t cbWritten) 1420 1418 { 1421 1419 AssertPtrReturn(pCtx, VERR_INVALID_POINTER); … … 1431 1429 VbglHGCMParmUInt32Set(&Msg.pid, uPID); 1432 1430 VbglHGCMParmUInt32Set(&Msg.status, uStatus); 1433 VbglHGCMParmUInt32Set(&Msg.flags, uFlags);1431 VbglHGCMParmUInt32Set(&Msg.flags, fFlags); 1434 1432 VbglHGCMParmUInt32Set(&Msg.written, cbWritten); 1435 1433 -
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
r58183 r58204 328 328 * Optional. 329 329 * @param pu64Timestamp Where to store the timestamp. Optional. 330 * @param p szFlagsWhere to store the pointer to the flags. Optional.330 * @param ppszFlags Where to store the pointer to the flags. Optional. 331 331 * @param pcbBufActual If @a pcBuf is not large enough, the size needed. 332 332 * Optional. … … 521 521 * @returns VBox status code. 522 522 * @retval VINF_SUCCESS on success and pcBuf points to a packed array 523 * of the form <name>, <value>, <timestamp string>, <flags>,523 * of the form \<name\>, \<value\>, \<timestamp string\>, \<flags\>, 524 524 * terminated by four empty strings. pcbBufActual will contain the 525 525 * total size of the array. … … 529 529 * 530 530 * @param idClient The client ID returned by VbglR3GuestPropConnect 531 * @param p aszPatterns A packed array of zero terminated strings, terminated531 * @param pszzPatterns A packed array of zero terminated strings, terminated 532 532 * by an empty string. 533 533 * @param pcBuf The buffer to store the results to. -
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp
r57358 r58204 38 38 * @returns IPRT status code. 39 39 * @param fOr The OR mask. 40 * @param fNo 40 * @param fNot The NOT mask. 41 41 */ 42 42 VBGLR3DECL(int) VbglR3CtlFilterMask(uint32_t fOr, uint32_t fNot) -
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp
r58191 r58204 154 154 * @param pcBits Where to store the bits per pixel requested (a value 155 155 * of zero means do not change). 156 * @param iDisplayWhere to store the display number the request was for156 * @param piDisplay Where to store the display number the request was for 157 157 * - 0 for the primary display, 1 for the first 158 158 * secondary display, etc. … … 213 213 * @param pdy New vertical position of the secondary monitor. 214 214 * Optional. 215 * param pfEnabled Secondary monitor is enabled or not. 216 * Optional. 217 * param pfChangeOrigin Whether the mode hint retrieved included information 218 * about origin/display offset inside the frame-buffer. 219 * Optional. 215 * @param pfEnabled Secondary monitor is enabled or not. Optional. 216 * @param pfChangeOrigin Whether the mode hint retrieved included 217 * information about origin/display offset inside the 218 * frame-buffer. Optional. 220 219 * 221 220 */
Note:
See TracChangeset
for help on using the changeset viewer.