Changeset 14948 in vbox
- Timestamp:
- Dec 3, 2008 3:06:30 PM (16 years ago)
- svn:sync-xref-src-repo-rev:
- 40303
- Location:
- trunk/src/VBox/Main
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/glue/string.cpp
r8155 r14948 31 31 32 32 /* static */ 33 const Bstr Bstr::Null; /* default ctor is OK */ 33 const Bstr Bstr::Null; /* default ctor is OK */ 34 34 35 35 /* static */ -
trunk/src/VBox/Main/include/Collection.h
r8155 r14948 300 300 * example above). 301 301 * 302 * See descriptions of the above IfaceVectorEnumerator and 302 * See descriptions of the above IfaceVectorEnumerator and 303 303 * ReadonlyIfaceVector templates for more info. 304 304 * … … 315 315 * the given interface of items to be stored in the 316 316 * collection 317 * @param iface Interface of items implemented by the @a itemcls class 317 * @param iface Interface of items implemented by the @a itemcls class 318 318 * @param prefix Prefix to apply to generated enumerator and collection 319 319 * names. … … 466 466 * and must be always used to finalize the collection declaration started 467 467 * by that macro. 468 * 468 * 469 469 * This is a "shortcut" macro that expands exactly to: 470 470 * <code> … … 513 513 * the given interface of items to be stored in the 514 514 * collection 515 * @param iface Interface of items implemented by the @a itemcls class 515 * @param iface Interface of items implemented by the @a itemcls class 516 516 * @param prefix Prefix to apply to generated enumerator and collection 517 517 * names. … … 543 543 */ 544 544 #define COM_IMPL_READONLY_ENUM_AND_COLLECTION(c) \ 545 COM_IMPL_READONLY_ENUM_AND_COLLECTION_EX (0, I##c, c) 545 COM_IMPL_READONLY_ENUM_AND_COLLECTION_EX (0, I##c, c) 546 546 547 547 /** … … 566 566 */ 567 567 #define COM_IMPL_READONLY_ENUM_AND_COLLECTION_AS(prefix, iface) \ 568 COM_IMPL_READONLY_ENUM_AND_COLLECTION_EX (0, iface, prefix) 568 COM_IMPL_READONLY_ENUM_AND_COLLECTION_EX (0, iface, prefix) 569 569 570 570 #endif // !RT_OS_WINDOWS -
trunk/src/VBox/Main/include/PerformanceImpl.h
r13082 r14948 188 188 HRESULT toIPerformanceMetric(pm::Metric *src, IPerformanceMetric **dst); 189 189 HRESULT toIPerformanceMetric(pm::BaseMetric *src, IPerformanceMetric **dst); 190 190 191 191 static void staticSamplerCallback (RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick); 192 192 void samplerCallback(); -
trunk/src/VBox/Main/include/RemoteUSBBackend.h
r12297 r14948 41 41 42 42 43 /* How many remote devices can be attached to a remote client. 43 /* How many remote devices can be attached to a remote client. 44 44 * Normally a client computer has 2-8 physical USB ports, so 16 devices 45 45 * should be usually enough. … … 52 52 RemoteUSBBackendListable *pNext; 53 53 RemoteUSBBackendListable *pPrev; 54 54 55 55 RemoteUSBBackendListable() : pNext (NULL), pPrev (NULL) {}; 56 56 }; … … 61 61 RemoteUSBBackend(Console *console, ConsoleVRDPServer *server, uint32_t u32ClientId); 62 62 ~RemoteUSBBackend(); 63 63 64 64 uint32_t ClientId (void) { return mu32ClientId; } 65 65 66 66 void AddRef (void); 67 67 void Release (void); 68 68 69 69 REMOTEUSBCALLBACK *GetBackendCallbackPointer (void) { return &mCallback; } 70 70 71 71 void NotifyDelete (void); 72 72 73 73 void PollRemoteDevices (void); 74 74 … … 79 79 80 80 int saveDeviceList (const void *pvList, uint32_t cbList); 81 81 82 82 int negotiateResponse (const VRDPUSBREQNEGOTIATERET *pret, uint32_t cbRet); 83 83 … … 91 91 void addDevice (PREMOTEUSBDEVICE pDevice); 92 92 void removeDevice (PREMOTEUSBDEVICE pDevice); 93 93 94 94 bool addUUID (const Guid *pUuid); 95 95 bool findUUID (const Guid *pUuid); … … 101 101 102 102 int cRefs; 103 103 104 104 uint32_t mu32ClientId; 105 105 106 106 RTCRITSECT mCritsect; 107 107 108 108 REMOTEUSBCALLBACK mCallback; 109 109 110 110 bool mfHasDeviceList; 111 111 112 112 void *mpvDeviceList; 113 113 uint32_t mcbDeviceList; 114 114 115 115 typedef enum { 116 116 PollRemoteDevicesStatus_Negotiate, … … 120 120 PollRemoteDevicesStatus_Dereferenced 121 121 } PollRemoteDevicesStatus; 122 122 123 123 PollRemoteDevicesStatus menmPollRemoteDevicesStatus; 124 124 125 125 bool mfPollURB; 126 126 127 127 PREMOTEUSBDEVICE mpDevices; 128 128 129 129 bool mfWillBeDeleted; 130 130 131 131 Guid aGuids[VRDP_MAX_USB_DEVICES_PER_CLIENT]; 132 132 -
trunk/src/VBox/Main/include/VMMDev.h
r11844 r14948 69 69 RTSEMEVENT mCredentialsEvent; 70 70 uint32_t mu32CredentialsFlags; 71 71 72 72 #ifdef VBOX_WITH_HGCM 73 73 bool m_fHGCMActive; -
trunk/src/VBox/Main/solaris/PerformanceSolaris.cpp
r12992 r14948 90 90 int cpus; 91 91 cpu_stat_t cpu_stats; 92 92 93 93 if (mKC == 0) 94 94 return VERR_INTERNAL_ERROR; 95 95 96 96 tmpUser = tmpKernel = tmpIdle = cpus = 0; 97 97 for (ksp = mKC->kc_chain; ksp != NULL; ksp = ksp->ks_next) { … … 106 106 tmpKernel += cpu_stats.cpu_sysinfo.cpu[CPU_KERNEL]; 107 107 tmpIdle += cpu_stats.cpu_sysinfo.cpu[CPU_IDLE]; 108 } 109 } 110 108 } 109 } 110 111 111 if (cpus == 0) 112 112 { … … 165 165 166 166 kstat_named_t *kn; 167 167 168 168 if (mKC == 0 || mSysPages == 0) 169 169 return VERR_INTERNAL_ERROR; -
trunk/src/VBox/Main/win/PerformanceWin.cpp
r14341 r14948 228 228 return RTErrConvertFromWin32(dwError); 229 229 } 230 230 231 231 *user = FILETTIME_TO_100NS(ftUser); 232 232 *idle = FILETTIME_TO_100NS(ftIdle); -
trunk/src/VBox/Main/win/svchlp.h
r8155 r14948 37 37 OK, /* no parameters */ 38 38 Error, /* Utf8Str string (may be null but must present) */ 39 39 40 40 CreateHostNetworkInterface = 100, /* see usage in code */ 41 41 CreateHostNetworkInterface_OK, /* see usage in code */ … … 55 55 int open (const char *aName); 56 56 int close(); 57 57 58 58 bool isOpen() const { return mIsOpen; } 59 59 bool isServer() const { return mIsServer; } 60 const com::Utf8Str &name() const { return mName; } 60 const com::Utf8Str &name() const { return mName; } 61 61 62 62 int write (const void *aVal, size_t aLen); -
trunk/src/VBox/Main/xpcom/server.h
r13908 r14948 28 28 29 29 /** 30 * IPC name used to resolve the client ID of the server. 30 * IPC name used to resolve the client ID of the server. 31 31 */ 32 32 #define VBOXSVC_IPC_NAME "VBoxSVC-" VBOX_VERSION_STRING 33 33 34 34 #endif /* ____H_LINUX_SERVER */ 35
Note:
See TracChangeset
for help on using the changeset viewer.