Changeset 22175 in vbox for trunk/include

Timestamp:

Aug 11, 2009 4:01:01 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50955

Message:

Main: fix windows burns/warnings

File:

• trunk/include/VBox/settings.h (modified) (27 diffs)

trunk/include/VBox/settings.h

@@ -125 +125 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-struct USBDeviceFilter
+struct VBOXXML_CLASS USBDeviceFilter
 {
     USBDeviceFilter()
@@ -144 +144 @@
     USBDeviceFilterAction_T action;                 // only used with host USB filters
     com::Utf8Str            strRemote;              // irrelevant for host USB objects
-    ULONG                   ulMaskedInterfaces;     // irrelevant for host USB objects
-};
-
-struct Host
+    uint32_t                ulMaskedInterfaces;     // irrelevant for host USB objects
+};
+
+struct VBOXXML_CLASS Host
 {
     USBDeviceFiltersList    llUSBDeviceFilters;
 };
 
-struct SystemProperties
+struct VBOXXML_CLASS SystemProperties
 {
     SystemProperties()
@@ -163 +163 @@
     com::Utf8Str            strRemoteDisplayAuthLibrary;
     com::Utf8Str            strWebServiceAuthLibrary;
-    ULONG                   ulLogHistoryCount;
+    uint32_t                ulLogHistoryCount;
 };
 
@@ -171 +171 @@
 typedef std::list<Medium> MediaList;
 
-struct Medium
+struct VBOXXML_CLASS Medium
 {
     com::Guid       uuid;
@@ -186 +186 @@
 };
 
-struct MachineRegistryEntry
+struct VBOXXML_CLASS MachineRegistryEntry
 {
     com::Guid       uuid;
@@ -193 +193 @@
 typedef std::list<MachineRegistryEntry> MachinesRegistry;
 
-struct DHCPServer
+struct VBOXXML_CLASS DHCPServer
 {
     com::Utf8Str    strNetworkName,
@@ -236 +236 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-struct VRDPSettings
+struct VBOXXML_CLASS VRDPSettings
 {
     VRDPSettings()
@@ -248 +248 @@
 
     bool            fEnabled;
-    ULONG           ulPort;
+    uint32_t        ulPort;
     com::Utf8Str    strNetAddress;
     VRDPAuthType_T  authType;
-    ULONG           ulAuthTimeout;
+    uint32_t        ulAuthTimeout;
     bool            fAllowMultiConnection,
                     fReuseSingleConnection;
 };
 
-struct BIOSSettings
+struct VBOXXML_CLASS BIOSSettings
 {
     BIOSSettings()
@@ -273 +273 @@
                     fLogoFadeIn,
                     fLogoFadeOut;
-    ULONG           ulLogoDisplayTime;
+    uint32_t        ulLogoDisplayTime;
     com::Utf8Str    strLogoImagePath;
     BIOSBootMenuMode_T  biosBootMenuMode;
@@ -280 +280 @@
 };
 
-struct DVDDrive
+struct VBOXXML_CLASS DVDDrive
 {
     DVDDrive()
@@ -291 +291 @@
 };
 
-struct FloppyDrive
+struct VBOXXML_CLASS FloppyDrive
 {
     FloppyDrive()
@@ -302 +302 @@
 };
 
-struct USBController
+struct VBOXXML_CLASS USBController
 {
     USBController()
@@ -314 +314 @@
 };
 
-struct NetworkAdapter
+struct VBOXXML_CLASS NetworkAdapter
 {
     NetworkAdapter()
@@ -332 +332 @@
     com::Utf8Str            strMACAddress;
     bool                    fCableConnected;
-    ULONG                   ulLineSpeed;
+    uint32_t                ulLineSpeed;
     bool                    fTraceEnabled;
     com::Utf8Str            strTraceFile;
@@ -343 +343 @@
 typedef std::list<NetworkAdapter> NetworkAdaptersList;
 
-struct SerialPort
+struct VBOXXML_CLASS SerialPort
 {
     SerialPort()
@@ -356 +356 @@
 
     bool            fEnabled;
-    ULONG           ulIOBase;
-    ULONG           ulIRQ;
+    uint32_t        ulIOBase;
+    uint32_t        ulIRQ;
     PortMode_T      portMode;
     com::Utf8Str    strPath;
@@ -364 +364 @@
 typedef std::list<SerialPort> SerialPortsList;
 
-struct ParallelPort
+struct VBOXXML_CLASS ParallelPort
 {
     ParallelPort()
@@ -375 +375 @@
 
     bool            fEnabled;
-    ULONG           ulIOBase;
-    ULONG           ulIRQ;
+    uint32_t        ulIOBase;
+    uint32_t        ulIRQ;
     com::Utf8Str    strPath;
 };
 typedef std::list<ParallelPort> ParallelPortsList;
 
-struct AudioAdapter
+struct VBOXXML_CLASS AudioAdapter
 {
     AudioAdapter()
@@ -394 +394 @@
 };
 
-struct SharedFolder
+struct VBOXXML_CLASS SharedFolder
 {
     SharedFolder()
@@ -406 +406 @@
 typedef std::list<SharedFolder> SharedFoldersList;
 
-struct GuestProperty
+struct VBOXXML_CLASS GuestProperty
 {
     GuestProperty()
@@ -414 +414 @@
     com::Utf8Str    strName,
                     strValue;
-    ULONG64         timestamp;
+    uint64_t        timestamp;
     com::Utf8Str    strFlags;
 };
@@ -421 +421 @@
 typedef std::map<uint32_t, DeviceType_T> BootOrderMap;
 
-struct Hardware
+struct VBOXXML_CLASS Hardware
 {
     Hardware()
@@ -486 +486 @@
 };
 
-struct AttachedDevice
+struct VBOXXML_CLASS AttachedDevice
 {
     AttachedDevice()
@@ -501 +501 @@
 typedef std::list<AttachedDevice> AttachedDevicesList;
 
-struct StorageController
+struct VBOXXML_CLASS StorageController
 {
     StorageController()
@@ -516 +516 @@
     StorageBus_T        storageBus;             // _SATA, _SCSI, _IDE
     StorageControllerType_T controllerType;
-    ULONG               ulPortCount;
+    uint32_t            ulPortCount;
 
     // only for when controllerType == StorageControllerType_IntelAhci:
@@ -530 +530 @@
 // wrap the list into an extra struct so we can use the struct without
 // having to define the typedef above in headers
-struct Storage
+struct VBOXXML_CLASS Storage
 {
     StorageControllersList  llStorageControllers;
@@ -538 +538 @@
 typedef std::list<Snapshot> SnapshotsList;
 
-struct Snapshot
+struct VBOXXML_CLASS Snapshot
 {
     com::Guid       uuid;