VirtualBox 3.1 => 3.2 API Changes

948a949
> struct INATEngine;
997a999
> typedef struct INATEngine INATEngine;
1019c1021,1022
<     SettingsVersion_Future = 12
---
>     SettingsVersion_v1_10 = 12,
>     SettingsVersion_Future = 13
1039c1042
< #define MACHINESTATE_IID_STR "36518cf6-cdf0-4d0d-ad2a-5ee9c60c7494"
---
> #define MACHINESTATE_IID_STR "e998d075-543a-41fc-8aa9-5ca3e92393fd"
1041,1042c1044,1045
<     0x36518cf6, 0xcdf0, 0x4d0d, \
<     { 0xad, 0x2a, 0x5e, 0xe9, 0xc6, 0x0c, 0x74, 0x94 } \
---
>     0xe998d075, 0x543a, 0x41fc, \
>     { 0x8a, 0xa9, 0x5c, 0xa3, 0xe9, 0x23, 0x93, 0xfd } \
1062,1064c1065,1069
<     MachineState_RestoringSnapshot = 16,
<     MachineState_DeletingSnapshot = 17,
<     MachineState_SettingUp = 18,
---
>     MachineState_DeletingSnapshotOnline = 16,
>     MachineState_DeletingSnapshotPaused = 17,
>     MachineState_RestoringSnapshot = 18,
>     MachineState_DeletingSnapshot = 19,
>     MachineState_SettingUp = 20,
1066c1071
<     MachineState_LastOnline = 13,
---
>     MachineState_LastOnline = 17,
1068c1073
<     MachineState_LastTransient = 18
---
>     MachineState_LastTransient = 20
1090,1091c1095,1096
< /* Start of enum CpuPropertyType Declaration */
< #define CPUPROPERTYTYPE_IID_STR "af7bb668-eeb1-4404-b77f-a114b30c92d6"
---
> /* Start of enum CPUPropertyType Declaration */
> #define CPUPROPERTYTYPE_IID_STR "24d356a6-2f45-4abd-b977-1cbe9c4701f5"
1093,1094c1098,1099
<     0xaf7bb668, 0xeeb1, 0x4404, \
<     { 0xb7, 0x7f, 0xa1, 0x14, 0xb3, 0x0c, 0x92, 0xd6 } \
---
>     0x24d356a6, 0x2f45, 0x4abd, \
>     { 0xb9, 0x77, 0x1c, 0xbe, 0x9c, 0x47, 0x01, 0xf5 } \
1096c1101
< enum CpuPropertyType
---
> enum CPUPropertyType
1098,1100c1103,1105
<     CpuPropertyType_Null = 0,
<     CpuPropertyType_PAE = 1,
<     CpuPropertyType_Synthetic = 2
---
>     CPUPropertyType_Null = 0,
>     CPUPropertyType_PAE = 1,
>     CPUPropertyType_Synthetic = 2
1102c1107
< /* End of enum CpuPropertyType Declaration */
---
> /* End of enum CPUPropertyType Declaration */
1117c1122,1123
<     HWVirtExPropertyType_NestedPaging = 4
---
>     HWVirtExPropertyType_NestedPaging = 4,
>     HWVirtExPropertyType_LargePages = 5
1204,1233d1209
< /* Start of enum GuestStatisticType Declaration */
< #define GUESTSTATISTICTYPE_IID_STR "aa7c1d71-aafe-47a8-9608-27d2d337cf55"
< #define GUESTSTATISTICTYPE_IID { \
<     0xaa7c1d71, 0xaafe, 0x47a8, \
<     { 0x96, 0x08, 0x27, 0xd2, 0xd3, 0x37, 0xcf, 0x55 } \
< }
< enum GuestStatisticType
< {
<     GuestStatisticType_CPULoad_Idle = 0,
<     GuestStatisticType_CPULoad_Kernel = 1,
<     GuestStatisticType_CPULoad_User = 2,
<     GuestStatisticType_Threads = 3,
<     GuestStatisticType_Processes = 4,
<     GuestStatisticType_Handles = 5,
<     GuestStatisticType_MemoryLoad = 6,
<     GuestStatisticType_PhysMemTotal = 7,
<     GuestStatisticType_PhysMemAvailable = 8,
<     GuestStatisticType_PhysMemBalloon = 9,
<     GuestStatisticType_MemCommitTotal = 10,
<     GuestStatisticType_MemKernelTotal = 11,
<     GuestStatisticType_MemKernelPaged = 12,
<     GuestStatisticType_MemKernelNonpaged = 13,
<     GuestStatisticType_MemSystemCache = 14,
<     GuestStatisticType_PageFileSize = 15,
<     GuestStatisticType_SampleNumber = 16,
<     GuestStatisticType_MaxVal = 17
< };
< /* End of enum GuestStatisticType Declaration */
< 
< 
1281a1258,1318
> /* Start of enum PointingHidType Declaration */
> #define POINTINGHIDTYPE_IID_STR "0d3c17a2-821a-4b2e-ae41-890c6c60aa97"
> #define POINTINGHIDTYPE_IID { \
>     0x0d3c17a2, 0x821a, 0x4b2e, \
>     { 0xae, 0x41, 0x89, 0x0c, 0x6c, 0x60, 0xaa, 0x97 } \
> }
> enum PointingHidType
> {
>     PointingHidType_None = 1,
>     PointingHidType_PS2Mouse = 2,
>     PointingHidType_USBMouse = 3,
>     PointingHidType_USBTablet = 4,
>     PointingHidType_ComboMouse = 5
> };
> /* End of enum PointingHidType Declaration */
> 
> 
> /* Start of enum KeyboardHidType Declaration */
> #define KEYBOARDHIDTYPE_IID_STR "5a5b0996-3a3e-44bb-9019-56979812cbcc"
> #define KEYBOARDHIDTYPE_IID { \
>     0x5a5b0996, 0x3a3e, 0x44bb, \
>     { 0x90, 0x19, 0x56, 0x97, 0x98, 0x12, 0xcb, 0xcc } \
> }
> enum KeyboardHidType
> {
>     KeyboardHidType_None = 1,
>     KeyboardHidType_PS2Keyboard = 2,
>     KeyboardHidType_USBKeyboard = 3,
>     KeyboardHidType_ComboKeyboard = 4
> };
> /* End of enum KeyboardHidType Declaration */
> 
> 
> /* Start of enum IoMgrType Declaration */
> #define IOMGRTYPE_IID_STR "35567419-4d2a-4256-a74e-efcae33493a2"
> #define IOMGRTYPE_IID { \
>     0x35567419, 0x4d2a, 0x4256, \
>     { 0xa7, 0x4e, 0xef, 0xca, 0xe3, 0x34, 0x93, 0xa2 } \
> }
> enum IoMgrType
> {
>     IoMgrType_Simple = 1,
>     IoMgrType_Async = 2
> };
> /* End of enum IoMgrType Declaration */
> 
> 
> /* Start of enum IoBackendType Declaration */
> #define IOBACKENDTYPE_IID_STR "2a7e16d1-4e6b-4d5d-b0c9-b9bbe6c5b2ad"
> #define IOBACKENDTYPE_IID { \
>     0x2a7e16d1, 0x4e6b, 0x4d5d, \
>     { 0xb0, 0xc9, 0xb9, 0xbb, 0xe6, 0xc5, 0xb2, 0xad } \
> }
> enum IoBackendType
> {
>     IoBackendType_Buffered = 1,
>     IoBackendType_Unbuffered = 2
> };
> /* End of enum IoBackendType Declaration */
> 
> 
1565c1602,1603
<     NetworkAttachmentType_HostOnly = 4
---
>     NetworkAttachmentType_HostOnly = 4,
>     NetworkAttachmentType_VDE = 5
1700c1738,1739
<     StorageBus_Floppy = 4
---
>     StorageBus_Floppy = 4,
>     StorageBus_SAS = 5
1720c1759,1760
<     StorageControllerType_I82078 = 7
---
>     StorageControllerType_I82078 = 7,
>     StorageControllerType_LsiLogicSas = 8
1724a1765,1793
> /* Start of enum NATAliasMode Declaration */
> #define NATALIASMODE_IID_STR "67772168-50d9-11df-9669-7fb714ee4fa1"
> #define NATALIASMODE_IID { \
>     0x67772168, 0x50d9, 0x11df, \
>     { 0x96, 0x69, 0x7f, 0xb7, 0x14, 0xee, 0x4f, 0xa1 } \
> }
> enum NATAliasMode
> {
>     NATAliasMode_AliasLog = 0x1,
>     NATAliasMode_AliasProxyOnly = 0x02,
>     NATAliasMode_AliasUseSamePorts = 0x04
> };
> /* End of enum NATAliasMode Declaration */
> 
> 
> /* Start of enum NATProtocol Declaration */
> #define NATPROTOCOL_IID_STR "e90164be-eb03-11de-94af-fff9b1c1b19f"
> #define NATPROTOCOL_IID { \
>     0xe90164be, 0xeb03, 0x11de, \
>     { 0x94, 0xaf, 0xff, 0xf9, 0xb1, 0xc1, 0xb1, 0x9f } \
> }
> enum NATProtocol
> {
>     NATProtocol_UDP = 0,
>     NATProtocol_TCP = 1
> };
> /* End of enum NATProtocol Declaration */
> 
> 
1779c1848
< #define IVIRTUALBOXCALLBACK_IID_STR "9a65adf2-3ee6-406b-bca2-2b1fa05f0d0b"
---
> #define IVIRTUALBOXCALLBACK_IID_STR "7f6a65b6-ad5d-4a67-8872-0b11cb7ea95c"
1781,1782c1850,1851
<     0x9a65adf2, 0x3ee6, 0x406b, \
<     { 0xbc, 0xa2, 0x2b, 0x1f, 0xa0, 0x5f, 0x0d, 0x0b } \
---
>     0x7f6a65b6, 0xad5d, 0x4a67, \
>     { 0x88, 0x72, 0x0b, 0x11, 0xcb, 0x7e, 0xa9, 0x5c } \
1840c1909
<     nsresult (*OnSnapshotDiscarded)(
---
>     nsresult (*OnSnapshotDeleted)(
1919c1988
< #define IVIRTUALBOX_IID_STR "2158464a-f706-414b-a8c4-fb589dfc6b62"
---
> #define IVIRTUALBOX_IID_STR "3f36e024-7fed-4f20-a02c-9158a82b44e6"
1921,1922c1990,1991
<     0x2158464a, 0xf706, 0x414b, \
<     { 0xa8, 0xc4, 0xfb, 0x58, 0x9d, 0xfc, 0x6b, 0x62 } \
---
>     0x3f36e024, 0x7fed, 0x4f20, \
>     { 0xa0, 0x2c, 0x91, 0x58, 0xa8, 0x2b, 0x44, 0xe6 } \
1965a2035
>         PRBool override,
2385c2455
< #define IINTERNALMACHINECONTROL_IID_STR "35d8d838-d066-447d-927a-fd93afdbec90"
---
> #define IINTERNALMACHINECONTROL_IID_STR "57e9a280-8d57-4331-aa31-f009f5194f52"
2387,2388c2457,2458
<     0x35d8d838, 0xd066, 0x447d, \
<     { 0x92, 0x7a, 0xfd, 0x93, 0xaf, 0xdb, 0xec, 0x90 } \
---
>     0x57e9a280, 0x8d57, 0x4331, \
>     { 0xaa, 0x31, 0xf0, 0x09, 0xf5, 0x19, 0x4f, 0x52 } \
2408a2479,2483
>     nsresult (*SetPowerUpInfo)(
>         IInternalMachineControl *pThis,
>         IVirtualBoxErrorInfo * error
>     );
> 
2478a2554,2564
>     nsresult (*FinishOnlineMergeMedium)(
>         IInternalMachineControl *pThis,
>         IMediumAttachment * mediumAttachment,
>         IMedium * source,
>         IMedium * target,
>         PRBool mergeForward,
>         IMedium * parentForTarget,
>         PRUint32 childrenToReparentSize,
>         IMedium ** childrenToReparent
>     );
> 
2499,2510d2584
<     nsresult (*PushGuestProperties)(
<         IInternalMachineControl *pThis,
<         PRUint32 nameSize,
<         PRUnichar ** name,
<         PRUint32 valueSize,
<         PRUnichar ** value,
<         PRUint32 timestampSize,
<         PRUint64* timestamp,
<         PRUint32 flagsSize,
<         PRUnichar ** flags
<     );
< 
2579c2653
< #define IMACHINE_IID_STR "99404f50-dd10-40d3-889b-dd2f79f1e95e"
---
> #define IMACHINE_IID_STR "b8a9324a-1042-4c78-aff6-9d1c2bfd8cd0"
2581,2582c2655,2656
<     0x99404f50, 0xdd10, 0x40d3, \
<     { 0x88, 0x9b, 0xdd, 0x2f, 0x79, 0xf1, 0xe9, 0x5e } \
---
>     0xb8a9324a, 0x1042, 0x4c78, \
>     { 0xaf, 0xf6, 0x9d, 0x1c, 0x2b, 0xfd, 0x8c, 0xd0 } \
2613a2688,2690
>     nsresult (*GetCPUHotPlugEnabled)(IMachine *pThis, PRBool *CPUHotPlugEnabled);
>     nsresult (*SetCPUHotPlugEnabled)(IMachine *pThis, PRBool CPUHotPlugEnabled);
> 
2620,2622d2696
<     nsresult (*GetStatisticsUpdateInterval)(IMachine *pThis, PRUint32 *statisticsUpdateInterval);
<     nsresult (*SetStatisticsUpdateInterval)(IMachine *pThis, PRUint32 statisticsUpdateInterval);
< 
2639a2714,2722
>     nsresult (*GetPointingHidType)(IMachine *pThis, PRUint32 *pointingHidType);
>     nsresult (*SetPointingHidType)(IMachine *pThis, PRUint32 pointingHidType);
> 
>     nsresult (*GetKeyboardHidType)(IMachine *pThis, PRUint32 *keyboardHidType);
>     nsresult (*SetKeyboardHidType)(IMachine *pThis, PRUint32 keyboardHidType);
> 
>     nsresult (*GetHpetEnabled)(IMachine *pThis, PRBool *hpetEnabled);
>     nsresult (*SetHpetEnabled)(IMachine *pThis, PRBool hpetEnabled);
> 
2696a2780,2797
>     nsresult (*GetRTCUseUTC)(IMachine *pThis, PRBool *RTCUseUTC);
>     nsresult (*SetRTCUseUTC)(IMachine *pThis, PRBool RTCUseUTC);
> 
>     nsresult (*GetIoMgr)(IMachine *pThis, PRUint32 *ioMgr);
>     nsresult (*SetIoMgr)(IMachine *pThis, PRUint32 ioMgr);
> 
>     nsresult (*GetIoBackend)(IMachine *pThis, PRUint32 *ioBackend);
>     nsresult (*SetIoBackend)(IMachine *pThis, PRUint32 ioBackend);
> 
>     nsresult (*GetIoCacheEnabled)(IMachine *pThis, PRBool *ioCacheEnabled);
>     nsresult (*SetIoCacheEnabled)(IMachine *pThis, PRBool ioCacheEnabled);
> 
>     nsresult (*GetIoCacheSize)(IMachine *pThis, PRUint32 *ioCacheSize);
>     nsresult (*SetIoCacheSize)(IMachine *pThis, PRUint32 ioCacheSize);
> 
>     nsresult (*GetIoBandwidthMax)(IMachine *pThis, PRUint32 *ioBandwidthMax);
>     nsresult (*SetIoBandwidthMax)(IMachine *pThis, PRUint32 ioBandwidthMax);
> 
2825c2926
<     nsresult (*GetCpuProperty)(
---
>     nsresult (*GetCPUProperty)(
2831c2932
<     nsresult (*SetCpuProperty)(
---
>     nsresult (*SetCPUProperty)(
2837c2938
<     nsresult (*GetCpuIdLeaf)(
---
>     nsresult (*GetCPUIDLeaf)(
2846c2947
<     nsresult (*SetCpuIdLeaf)(
---
>     nsresult (*SetCPUIDLeaf)(
2855c2956
<     nsresult (*RemoveCpuIdLeaf)(
---
>     nsresult (*RemoveCPUIDLeaf)(
2860c2961
<     nsresult (*RemoveAllCpuIdLeafs)(IMachine *pThis );
---
>     nsresult (*RemoveAllCPUIDLeaves)(IMachine *pThis );
3001a3103,3133
>     nsresult (*HotPlugCPU)(
>         IMachine *pThis,
>         PRUint32 cpu
>     );
> 
>     nsresult (*HotUnplugCPU)(
>         IMachine *pThis,
>         PRUint32 cpu
>     );
> 
>     nsresult (*GetCPUStatus)(
>         IMachine *pThis,
>         PRUint32 cpu,
>         PRBool * attached
>     );
> 
>     nsresult (*QueryLogFilename)(
>         IMachine *pThis,
>         PRUint32 idx,
>         PRUnichar * * filename
>     );
> 
>     nsresult (*ReadLog)(
>         IMachine *pThis,
>         PRUint32 idx,
>         PRUint64 offset,
>         PRUint64 size,
>         PRUint32 *dataSize,
>         PRUint8** data
>     );
> 
3012c3144
< #define ICONSOLECALLBACK_IID_STR "d6239535-bda2-4ef7-83f4-f4722e4a3b2c"
---
> #define ICONSOLECALLBACK_IID_STR "60703f8d-81e4-4b45-a147-dcfd07692b19"
3014,3015c3146,3147
<     0xd6239535, 0xbda2, 0x4ef7, \
<     { 0x83, 0xf4, 0xf4, 0x72, 0x2e, 0x4a, 0x3b, 0x2c } \
---
>     0x60703f8d, 0x81e4, 0x4b45, \
>     { 0xa1, 0x47, 0xdc, 0xfd, 0x07, 0x69, 0x2b, 0x19 } \
3034a3167
>         PRBool supportsRelative,
3073a3207,3212
>     nsresult (*OnCPUChange)(
>         IConsoleCallback *pThis,
>         PRUint32 cpu,
>         PRBool add
>     );
> 
3452c3591
<     nsresult (*GetProcessorCpuIdLeaf)(
---
>     nsresult (*GetProcessorCPUIDLeaf)(
3545c3684
< #define ISYSTEMPROPERTIES_IID_STR "8030645c-8fef-4320-bb7b-c829f00069dc"
---
> #define ISYSTEMPROPERTIES_IID_STR "07c3ffd8-8f59-49cc-b608-53a332e85cc3"
3547,3548c3686,3687
<     0x8030645c, 0x8fef, 0x4320, \
<     { 0xbb, 0x7b, 0xc8, 0x29, 0xf0, 0x00, 0x69, 0xdc } \
---
>     0x07c3ffd8, 0x8f59, 0x49cc, \
>     { 0xb6, 0x08, 0x53, 0xa3, 0x32, 0xe8, 0x5c, 0xc3 } \
3565a3705,3706
>     nsresult (*GetMaxGuestMonitors)(ISystemProperties *pThis, PRUint32 *maxGuestMonitors);
> 
3586a3728,3739
>     nsresult (*GetFreeDiskSpaceWarning)(ISystemProperties *pThis, PRUint64 *freeDiskSpaceWarning);
>     nsresult (*SetFreeDiskSpaceWarning)(ISystemProperties *pThis, PRUint64 freeDiskSpaceWarning);
> 
>     nsresult (*GetFreeDiskSpacePercentWarning)(ISystemProperties *pThis, PRUint32 *freeDiskSpacePercentWarning);
>     nsresult (*SetFreeDiskSpacePercentWarning)(ISystemProperties *pThis, PRUint32 freeDiskSpacePercentWarning);
> 
>     nsresult (*GetFreeDiskSpaceError)(ISystemProperties *pThis, PRUint64 *freeDiskSpaceError);
>     nsresult (*SetFreeDiskSpaceError)(ISystemProperties *pThis, PRUint64 freeDiskSpaceError);
> 
>     nsresult (*GetFreeDiskSpacePercentError)(ISystemProperties *pThis, PRUint32 *freeDiskSpacePercentError);
>     nsresult (*SetFreeDiskSpacePercentError)(ISystemProperties *pThis, PRUint32 freeDiskSpacePercentError);
> 
3639c3792
< #define IGUESTOSTYPE_IID_STR "cfe9e64c-4430-435b-9e7c-e3d8e417bd58"
---
> #define IGUESTOSTYPE_IID_STR "8aa950f6-668c-4388-b251-3809b404e862"
3641,3642c3794,3795
<     0xcfe9e64c, 0x4430, 0x435b, \
<     { 0x9e, 0x7c, 0xe3, 0xd8, 0xe4, 0x17, 0xbd, 0x58 } \
---
>     0x8aa950f6, 0x668c, 0x4388, \
>     { 0xb2, 0x51, 0x38, 0x09, 0xb4, 0x04, 0xe8, 0x62 } \
3669a3823,3842
>     nsresult (*GetRecommendedPae)(IGuestOSType *pThis, PRBool *recommendedPae);
> 
>     nsresult (*GetRecommendedDvdStorageController)(IGuestOSType *pThis, PRUint32 *recommendedDvdStorageController);
> 
>     nsresult (*GetRecommendedDvdStorageBus)(IGuestOSType *pThis, PRUint32 *recommendedDvdStorageBus);
> 
>     nsresult (*GetRecommendedHdStorageController)(IGuestOSType *pThis, PRUint32 *recommendedHdStorageController);
> 
>     nsresult (*GetRecommendedHdStorageBus)(IGuestOSType *pThis, PRUint32 *recommendedHdStorageBus);
> 
>     nsresult (*GetRecommendedFirmware)(IGuestOSType *pThis, PRUint32 *recommendedFirmware);
> 
>     nsresult (*GetRecommendedUsbHid)(IGuestOSType *pThis, PRBool *recommendedUsbHid);
> 
>     nsresult (*GetRecommendedHpet)(IGuestOSType *pThis, PRBool *recommendedHpet);
> 
>     nsresult (*GetRecommendedUsbTablet)(IGuestOSType *pThis, PRBool *recommendedUsbTablet);
> 
>     nsresult (*GetRecommendedRtcUseUtc)(IGuestOSType *pThis, PRBool *recommendedRtcUseUtc);
> 
3680c3853
< #define IGUEST_IID_STR "d8556fca-81bc-12af-fca3-365528fa38ca"
---
> #define IGUEST_IID_STR "d073545f-9635-489e-b36f-d468a10f8987"
3682,3683c3855,3856
<     0xd8556fca, 0x81bc, 0x12af, \
<     { 0xfc, 0xa3, 0x36, 0x55, 0x28, 0xfa, 0x38, 0xca } \
---
>     0xd073545f, 0x9635, 0x489e, \
>     { 0xb3, 0x6f, 0xd4, 0x68, 0xa1, 0x0f, 0x89, 0x87 } \
3704a3878,3892
>     nsresult (*InternalGetStatistics)(
>         IGuest *pThis,
>         PRUint32 * cpuUser,
>         PRUint32 * cpuKernel,
>         PRUint32 * cpuIdle,
>         PRUint32 * memTotal,
>         PRUint32 * memFree,
>         PRUint32 * memBalloon,
>         PRUint32 * memCache,
>         PRUint32 * pagedTotal,
>         PRUint32 * memAllocTotal,
>         PRUint32 * memFreeTotal,
>         PRUint32 * memBalloonTotal
>     );
> 
3713c3901
<     nsresult (*GetStatistic)(
---
>     nsresult (*ExecuteProcess)(
3715,3717c3903,3934
<         PRUint32 cpuId,
<         PRUint32 statistic,
<         PRUint32 * statVal
---
>         PRUnichar * execName,
>         PRUint32 flags,
>         PRUint32 argumentsSize,
>         PRUnichar ** arguments,
>         PRUint32 environmentSize,
>         PRUnichar ** environment,
>         PRUnichar * stdIn,
>         PRUnichar * stdOut,
>         PRUnichar * stdErr,
>         PRUnichar * userName,
>         PRUnichar * password,
>         PRUint32 timeoutMS,
>         PRUint32 * pid,
>         IProgress * * progress
>     );
> 
>     nsresult (*GetProcessOutput)(
>         IGuest *pThis,
>         PRUint32 pid,
>         PRUint32 flags,
>         PRUint32 timeoutMS,
>         PRUint64 size,
>         PRUint32 *dataSize,
>         PRUint8** data
>     );
> 
>     nsresult (*GetProcessStatus)(
>         IGuest *pThis,
>         PRUint32 pid,
>         PRUint32 * exitcode,
>         PRUint32 * flags,
>         PRUint32 * reason
3872c4089
< #define IMEDIUM_IID_STR "aa8167ba-df72-4738-b740-9b84377ba9f1"
---
> #define IMEDIUM_IID_STR "d709160c-303f-4ead-b7ef-53ffa26aa861"
3874,3875c4091,4092
<     0xaa8167ba, 0xdf72, 0x4738, \
<     { 0xb7, 0x40, 0x9b, 0x84, 0x37, 0x7b, 0xa9, 0xf1 } \
---
>     0xd709160c, 0x303f, 0x4ead, \
>     { 0xb7, 0xef, 0x53, 0xff, 0xa2, 0x6a, 0xa8, 0x61 } \
4005c4222
<         PRUnichar * targetId,
---
>         IMedium * target,
4127a4345,4348
>     nsresult (*GetRelativeSupported)(IMouse *pThis, PRBool *relativeSupported);
> 
>     nsresult (*GetNeedsHostCursor)(IMouse *pThis, PRBool *needsHostCursor);
> 
4280c4501
< #define IDISPLAY_IID_STR "e2a38ebc-d854-4a3e-bc2e-fdf5ac4a0000"
---
> #define IDISPLAY_IID_STR "1fa79e39-0cc9-4ab3-9df3-ed3e96b42496"
4282,4283c4503,4504
<     0xe2a38ebc, 0xd854, 0x4a3e, \
<     { 0xbc, 0x2e, 0xfd, 0xf5, 0xac, 0x4a, 0x00, 0x00 } \
---
>     0x1fa79e39, 0x0cc9, 0x4ab3, \
>     { 0x9d, 0xf3, 0xed, 0x3e, 0x96, 0xb4, 0x24, 0x96 } \
4289,4293c4510,4516
<     nsresult (*GetWidth)(IDisplay *pThis, PRUint32 *width);
< 
<     nsresult (*GetHeight)(IDisplay *pThis, PRUint32 *height);
< 
<     nsresult (*GetBitsPerPixel)(IDisplay *pThis, PRUint32 *bitsPerPixel);
---
>     nsresult (*GetScreenResolution)(
>         IDisplay *pThis,
>         PRUint32 screenId,
>         PRUint32 * width,
>         PRUint32 * height,
>         PRUint32 * bitsPerPixel
>     );
4323a4547
>         PRUint32 screenId,
4329c4553
<     nsresult (*TakeScreenShotSlow)(
---
>     nsresult (*TakeScreenShotToArray)(
4330a4555
>         PRUint32 screenId,
4338a4564
>         PRUint32 screenId,
4353,4354d4578
<     nsresult (*UpdateCompleted)(IDisplay *pThis );
< 
4370c4594
< #define INETWORKADAPTER_IID_STR "65607a27-2b73-4d43-b4cc-0ba2c817fbde"
---
> #define INETWORKADAPTER_IID_STR "5bdb9df8-a5e1-4322-a139-b7a4a734c790"
4372,4373c4596,4597
<     0x65607a27, 0x2b73, 0x4d43, \
<     { 0xb4, 0xcc, 0x0b, 0xa2, 0xc8, 0x17, 0xfb, 0xde } \
---
>     0x5bdb9df8, 0xa5e1, 0x4322, \
>     { 0xa1, 0x39, 0xb7, 0xa4, 0xa7, 0x34, 0xc7, 0x90 } \
4400a4625,4627
>     nsresult (*GetVDENetwork)(INetworkAdapter *pThis, PRUnichar * *VDENetwork);
>     nsresult (*SetVDENetwork)(INetworkAdapter *pThis, PRUnichar * VDENetwork);
> 
4412a4640,4644
>     nsresult (*GetNatDriver)(INetworkAdapter *pThis, INATEngine * *natDriver);
> 
>     nsresult (*GetBootPriority)(INetworkAdapter *pThis, PRUint32 *bootPriority);
>     nsresult (*SetBootPriority)(INetworkAdapter *pThis, PRUint32 bootPriority);
> 
4420a4653,4654
>     nsresult (*AttachToVDE)(INetworkAdapter *pThis );
> 
4574c4808
< #define IUSBCONTROLLER_IID_STR "238540fa-4b73-435a-a38e-4e1d9eab5c17"
---
> #define IUSBCONTROLLER_IID_STR "6fdcccc5-abd3-4fec-9387-2ad3914fc4a8"
4576,4577c4810,4811
<     0x238540fa, 0x4b73, 0x435a, \
<     { 0xa3, 0x8e, 0x4e, 0x1d, 0x9e, 0xab, 0x5c, 0x17 } \
---
>     0x6fdcccc5, 0xabd3, 0x4fec, \
>     { 0x93, 0x87, 0x2a, 0xd3, 0x91, 0x4f, 0xc4, 0xa8 } \
4588a4823,4824
>     nsresult (*GetProxyAvailable)(IUSBController *pThis, PRBool *proxyAvailable);
> 
4787c5023
< #define IVRDPSERVER_IID_STR "72e671bc-1712-4052-ad6b-e45e76d9d3e4"
---
> #define IVRDPSERVER_IID_STR "7aeeb530-0b08-41fe-835d-9be9ec1dbe5c"
4789,4790c5025,5026
<     0x72e671bc, 0x1712, 0x4052, \
<     { 0xad, 0x6b, 0xe4, 0x5e, 0x76, 0xd9, 0xd3, 0xe4 } \
---
>     0x7aeeb530, 0x0b08, 0x41fe, \
>     { 0x83, 0x5d, 0x9b, 0xe9, 0xec, 0x1d, 0xbe, 0x5c } \
4816a5053,5058
>     nsresult (*GetVideoChannel)(IVRDPServer *pThis, PRBool *videoChannel);
>     nsresult (*SetVideoChannel)(IVRDPServer *pThis, PRBool videoChannel);
> 
>     nsresult (*GetVideoChannelQuality)(IVRDPServer *pThis, PRUint32 *videoChannelQuality);
>     nsresult (*SetVideoChannelQuality)(IVRDPServer *pThis, PRUint32 videoChannelQuality);
> 
4856c5098
< #define IINTERNALSESSIONCONTROL_IID_STR "f9aac6d0-41b3-46b7-bea4-6370b4036de6"
---
> #define IINTERNALSESSIONCONTROL_IID_STR "cc8d63a0-568e-45dd-9bf6-6354049ece1e"
4858,4859c5100,5101
<     0xf9aac6d0, 0x41b3, 0x46b7, \
<     { 0xbe, 0xa4, 0x63, 0x70, 0xb4, 0x03, 0x6d, 0xe6 } \
---
>     0xcc8d63a0, 0x568e, 0x45dd, \
>     { 0x9b, 0xf6, 0x63, 0x54, 0x04, 0x9e, 0xce, 0x1e } \
4916a5159,5164
>     nsresult (*OnCPUChange)(
>         IInternalSessionControl *pThis,
>         PRUint32 cpu,
>         PRBool add
>     );
> 
4969a5218,5231
>     nsresult (*OnlineMergeMedium)(
>         IInternalSessionControl *pThis,
>         IMediumAttachment * mediumAttachment,
>         PRUint32 sourceIdx,
>         PRUint32 targetIdx,
>         IMedium * source,
>         IMedium * target,
>         PRBool mergeForward,
>         IMedium * parentForTarget,
>         PRUint32 childrenToReparentSize,
>         IMedium ** childrenToReparent,
>         IProgress * progress
>     );
> 
5009c5271
< #define ISTORAGECONTROLLER_IID_STR "6bf8335b-d14a-44a5-9b45-ddc49ce7d5b2"
---
> #define ISTORAGECONTROLLER_IID_STR "7635f4ec-8a28-44b5-9223-315a87b710fb"
5011,5012c5273,5274
<     0x6bf8335b, 0xd14a, 0x44a5, \
<     { 0x9b, 0x45, 0xdd, 0xc4, 0x9c, 0xe7, 0xd5, 0xb2 } \
---
>     0x7635f4ec, 0x8a28, 0x44b5, \
>     { 0x92, 0x23, 0x31, 0x5a, 0x87, 0xb7, 0x10, 0xfb } \
5036a5299,5301
>     nsresult (*GetIoBackend)(IStorageController *pThis, PRUint32 *ioBackend);
>     nsresult (*SetIoBackend)(IStorageController *pThis, PRUint32 ioBackend);
> 
5179a5445,5525
> /* Start of struct INATEngine Declaration */
> #define INATENGINE_IID_STR "4b286616-eb03-11de-b0fb-1701eca42246"
> #define INATENGINE_IID { \
>     0x4b286616, 0xeb03, 0x11de, \
>     { 0xb0, 0xfb, 0x17, 0x01, 0xec, 0xa4, 0x22, 0x46 } \
> }
> struct INATEngine_vtbl
> {
>     struct nsISupports_vtbl nsisupports;
> 
>     nsresult (*GetNetwork)(INATEngine *pThis, PRUnichar * *network);
>     nsresult (*SetNetwork)(INATEngine *pThis, PRUnichar * network);
> 
>     nsresult (*GetHostIP)(INATEngine *pThis, PRUnichar * *hostIP);
>     nsresult (*SetHostIP)(INATEngine *pThis, PRUnichar * hostIP);
> 
>     nsresult (*GetTftpPrefix)(INATEngine *pThis, PRUnichar * *tftpPrefix);
>     nsresult (*SetTftpPrefix)(INATEngine *pThis, PRUnichar * tftpPrefix);
> 
>     nsresult (*GetTftpBootFile)(INATEngine *pThis, PRUnichar * *tftpBootFile);
>     nsresult (*SetTftpBootFile)(INATEngine *pThis, PRUnichar * tftpBootFile);
> 
>     nsresult (*GetTftpNextServer)(INATEngine *pThis, PRUnichar * *tftpNextServer);
>     nsresult (*SetTftpNextServer)(INATEngine *pThis, PRUnichar * tftpNextServer);
> 
>     nsresult (*GetAliasMode)(INATEngine *pThis, PRUint32 *aliasMode);
>     nsresult (*SetAliasMode)(INATEngine *pThis, PRUint32 aliasMode);
> 
>     nsresult (*GetDnsPassDomain)(INATEngine *pThis, PRBool *dnsPassDomain);
>     nsresult (*SetDnsPassDomain)(INATEngine *pThis, PRBool dnsPassDomain);
> 
>     nsresult (*GetDnsProxy)(INATEngine *pThis, PRBool *dnsProxy);
>     nsresult (*SetDnsProxy)(INATEngine *pThis, PRBool dnsProxy);
> 
>     nsresult (*GetDnsUseHostResolver)(INATEngine *pThis, PRBool *dnsUseHostResolver);
>     nsresult (*SetDnsUseHostResolver)(INATEngine *pThis, PRBool dnsUseHostResolver);
> 
>     nsresult (*GetRedirects)(INATEngine *pThis, PRUint32 *redirectsSize, PRUnichar * **redirects);
> 
>     nsresult (*SetNetworkSettings)(
>         INATEngine *pThis,
>         PRUint32 mtu,
>         PRUint32 sockSnd,
>         PRUint32 sockRcv,
>         PRUint32 TcpWndSnd,
>         PRUint32 TcpWndRcv
>     );
> 
>     nsresult (*GetNetworkSettings)(
>         INATEngine *pThis,
>         PRUint32 * mtu,
>         PRUint32 * sockSnd,
>         PRUint32 * sockRcv,
>         PRUint32 * TcpWndSnd,
>         PRUint32 * TcpWndRcv
>     );
> 
>     nsresult (*AddRedirect)(
>         INATEngine *pThis,
>         PRUnichar * name,
>         PRUint32 proto,
>         PRUnichar * hostIp,
>         PRUint16 hostPort,
>         PRUnichar * guestIp,
>         PRUint16 guestPort
>     );
> 
>     nsresult (*RemoveRedirect)(
>         INATEngine *pThis,
>         PRUnichar * name
>     );
> 
> };
> 
> struct INATEngine
> {
>     struct INATEngine_vtbl *vtbl;
> };
> /* End of struct INATEngine Declaration */
> 
>