Changeset 65426 in vbox for trunk/src/VBox/Main
- Timestamp:
- Jan 24, 2017 3:14:01 PM (8 years ago)
- Location:
- trunk/src/VBox/Main
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/CertificateImpl.h
r61004 r65426 57 57 58 58 private: 59 // wrapped ICertificate properties59 // Wrapped ICertificate properties 60 60 HRESULT getVersionNumber(CertificateVersion_T *aVersionNumber); 61 61 HRESULT getSerialNumber(com::Utf8Str &aSerialNumber); … … 79 79 HRESULT getTrusted(BOOL *aTrusted); 80 80 HRESULT getExpired(BOOL *aExpired); 81 // wrapped ICertificate methods 81 82 // Wrapped ICertificate methods 82 83 HRESULT isCurrentlyExpired(BOOL *aResult); 83 84 HRESULT queryInfo(LONG aWhat, com::Utf8Str &aResult); 84 85 85 /** @name Methods extracting COM data from the certificate object 86 * @{ */ 86 // Methods extracting COM data from the certificate object 87 87 HRESULT i_getAlgorithmName(PCRTCRX509ALGORITHMIDENTIFIER a_pAlgId, com::Utf8Str &a_rReturn); 88 88 HRESULT i_getX509Name(PCRTCRX509NAME a_pName, std::vector<com::Utf8Str> &a_rReturn); … … 90 90 HRESULT i_getUniqueIdentifier(PCRTCRX509UNIQUEIDENTIFIER a_pUniqueId, com::Utf8Str &a_rReturn); 91 91 HRESULT i_getEncodedBytes(PRTASN1CORE a_pAsn1Obj, std::vector<BYTE> &a_rReturn); 92 /** @} */93 92 94 93 struct Data; -
trunk/src/VBox/Main/src-client/VideoRec.cpp
r65421 r65426 682 682 * @param uHeight Target video resolution (height). 683 683 * @param uRate Target encoding bit rate. 684 * @param uF psTarget FPS (Frame Per Second).684 * @param uFPS Target FPS (Frame Per Second). 685 685 * @param uMaxTimeS Maximum time (in s) to record, or 0 for no time limit. 686 * @param uMax FileSizeMBMaximum file size (in MB) to record, or 0 for no limit.686 * @param uMaxSizeMB Maximum file size (in MB) to record, or 0 for no limit. 687 687 * @param pszOptions Additional options in "key=value" array format. Optional. 688 688 */ -
trunk/src/VBox/Main/src-server/CertificateImpl.cpp
r64885 r65426 134 134 135 135 136 /** @name wrapped ICertificate properties136 /** @name Wrapped ICertificate properties 137 137 * @{ 138 138 */ -
trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp
r65120 r65426 1140 1140 if (mUsb != aDev) 1141 1141 { 1142 #if def RT_OS_WINDOWS1142 #if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING) 1143 1143 /* we used this logic of string comparison in HostUSBDevice::compare 1144 1144 * now we need to preserve strings from the old device if the new device has zero strings
Note:
See TracChangeset
for help on using the changeset viewer.