VirtualBox

Changeset 22183 in vbox


Ignore:
Timestamp:
Aug 11, 2009 5:00:33 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
50963
Message:

Main: fix more windows warnings + burns

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/settings.h

    r22177 r22183  
    5151#include <vector>
    5252
    53 #ifdef IN_VBOXXML_R3
    54 # define VBOXXML_CLASS DECLEXPORT_CLASS
    55 #else
    56 # define VBOXXML_CLASS DECLIMPORT_CLASS
    57 #endif
     53// #ifdef IN_VBOXXML_R3
     54// # define VBOXXML_CLASS DECLEXPORT_CLASS
     55// #else
     56// # define VBOXXML_CLASS DECLIMPORT_CLASS
     57// #endif
     58
     59#define VBOXXML_CLASS
    5860
    5961namespace xml

  • trunk/src/VBox/Main/MachineImpl.cpp

    r22173 r22183  
    31843184        }
    31853185    }
    3186     catch (std::bad_alloc &e)
     3186    catch (std::bad_alloc &)
    31873187    {
    31883188        rc = E_OUTOFMEMORY;
    … …  
    50155015#endif /* VBOX_WITH_GUEST_PROPS defined */
    50165016    }
    5017     catch(std::bad_alloc &e)
     5017    catch(std::bad_alloc &)
    50185018    {
    50195019        return E_OUTOFMEMORY;
    … …  
    54365436            }
    54375437
    5438             /* update mConfigFileFull amd mConfigFile */
     5438            /* update m_strConfigFileFull amd mConfigFile */
    54395439            Utf8Str oldConfigFileFull = mData->m_strConfigFileFull;
    54405440            Utf8Str oldConfigFile = mData->m_strConfigFile;
    … …  
    57475747
    57485748        // CPU
    5749         data.fHardwareVirt = mHWData->mHWVirtExEnabled;
    5750         data.fNestedPaging = mHWData->mHWVirtExNestedPagingEnabled;
    5751         data.fVPID = mHWData->mHWVirtExVPIDEnabled;
    5752         data.fPAE = mHWData->mPAEEnabled;
     5749        data.fHardwareVirt = !!mHWData->mHWVirtExEnabled;
     5750        data.fNestedPaging = !!mHWData->mHWVirtExNestedPagingEnabled;
     5751        data.fVPID = !!mHWData->mHWVirtExVPIDEnabled;
     5752        data.fPAE = !!mHWData->mPAEEnabled;
    57535753
    57545754        data.cCPUs = mHWData->mCPUCount;
    … …  
    58765876        data.strNotificationPatterns = mHWData->mGuestPropertyNotificationPatterns;
    58775877    }
    5878     catch(std::bad_alloc &e)
     5878    catch(std::bad_alloc &)
    58795879    {
    58805880        return E_OUTOFMEMORY;
    … …  
    59165916        if (ctl.controllerType == StorageControllerType_IntelAhci)
    59175917        {
    5918             if (    (FAILED(rc = pCtl->GetIDEEmulationPort(0, &ctl.lIDE0MasterEmulationPort)))
    5919                  || (FAILED(rc = pCtl->GetIDEEmulationPort(1, &ctl.lIDE0SlaveEmulationPort)))
    5920                  || (FAILED(rc = pCtl->GetIDEEmulationPort(2, &ctl.lIDE1MasterEmulationPort)))
    5921                  || (FAILED(rc = pCtl->GetIDEEmulationPort(3, &ctl.lIDE1SlaveEmulationPort)))
     5918            if (    (FAILED(rc = pCtl->GetIDEEmulationPort(0, (LONG*)&ctl.lIDE0MasterEmulationPort)))
     5919                 || (FAILED(rc = pCtl->GetIDEEmulationPort(1, (LONG*)&ctl.lIDE0SlaveEmulationPort)))
     5920                 || (FAILED(rc = pCtl->GetIDEEmulationPort(2, (LONG*)&ctl.lIDE1MasterEmulationPort)))
     5921                 || (FAILED(rc = pCtl->GetIDEEmulationPort(3, (LONG*)&ctl.lIDE1SlaveEmulationPort)))
    59225922               )
    59235923                ComAssertRCRet(rc, rc);
    … …  
    70777077    /* create the interprocess semaphore */
    70787078#if defined(RT_OS_WINDOWS)
    7079     mIPCSemName = aMachine->mData->mConfigFileFull;
     7079    mIPCSemName = aMachine->mData->m_strConfigFileFull;
    70807080    for (size_t i = 0; i < mIPCSemName.length(); i++)
    70817081        if (mIPCSemName[i] == '\\')
    … …  
    71197119    }
    71207120# else /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
    7121     Utf8Str semName = aMachine->mData->mConfigFileFull;
     7121    Utf8Str semName = aMachine->mData->m_strConfigFileFull;
    71227122    char *pszSemName = NULL;
    71237123    RTStrUtf8ToCurrentCP (&pszSemName, semName);
    … …  
    75187518    mIPCKey.cloneTo(aId);
    75197519# else /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
    7520     mData->mConfigFileFull.cloneTo(aId);
     7520    mData->m_strConfigFileFull.cloneTo(aId);
    75217521# endif /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
    75227522    return S_OK;

  • trunk/src/VBox/Main/VirtualBoxImpl.cpp

    r22173 r22183  
    19761976        id.create();
    19771977        SVCHlpClient client;
    1978         vrc = client.create (Utf8StrFmt ("VirtualBox\\SVCHelper\\{%RTuuid}",
    1979                                          id.raw()));
     1978        vrc = client.create(Utf8StrFmt("VirtualBox\\SVCHelper\\{%RTuuid}",
     1979                                       id.raw()).c_str());
    19801980        if (RT_FAILURE(vrc))
    19811981        {
    1982             rc = setError (E_FAIL,
    1983                 tr ("Could not create the communication channel (%Rrc)"), vrc);
     1982            rc = setError(E_FAIL,
     1983                          tr("Could not create the communication channel (%Rrc)"), vrc);
    19841984            break;
    19851985        }
    … …  
    20332033        else
    20342034        {
    2035             const char *args[] = { exePath, "/Helper", client.name(), 0 };
     2035            const char *args[] = { exePath, "/Helper", client.name().c_str(), 0 };
    20362036            vrc = RTProcCreate (exePath, args, RTENV_DEFAULT, 0, &pid);
    20372037            if (RT_FAILURE(vrc))

  • trunk/src/VBox/Main/include/AudioAdapterImpl.h

    r22173 r22183  
    3131namespace settings
    3232{
    33     class AudioAdapter;
     33    struct AudioAdapter;
    3434}
    3535

  • trunk/src/VBox/Main/include/BIOSSettingsImpl.h

    r22173 r22183  
    3232namespace settings
    3333{
    34     class BIOSSettings;
     34    struct BIOSSettings;
    3535}
    3636

  • trunk/src/VBox/Main/include/DHCPServerImpl.h

    r22173 r22183  
    3434namespace settings
    3535{
    36     class DHCPServer;
     36    struct DHCPServer;
    3737}
    3838

  • trunk/src/VBox/Main/include/DVDDriveImpl.h

    r22173 r22183  
    3333namespace settings
    3434{
    35     class DVDDrive;
     35    struct DVDDrive;
    3636}
    3737

  • trunk/src/VBox/Main/include/FloppyDriveImpl.h

    r22173 r22183  
    3333namespace settings
    3434{
    35     class FloppyDrive;
     35    struct FloppyDrive;
    3636}
    3737

  • trunk/src/VBox/Main/include/HardDiskImpl.h

    r22173 r22183  
    4040namespace settings
    4141{
    42     class Medium;
     42    struct Medium;
    4343}
    4444

  • trunk/src/VBox/Main/include/HostImpl.h

    r22173 r22183  
    5050namespace settings
    5151{
    52     class Host;
     52    struct Host;
    5353}
    5454

  • trunk/src/VBox/Main/include/MachineImpl.h

    r22173 r22183  
    3737#include "ParallelPortImpl.h"
    3838#include "BIOSSettingsImpl.h"
     39#include "StorageControllerImpl.h"          // required for MachineImpl.h to compile on Windows
    3940#ifdef VBOX_WITH_RESOURCE_USAGE_API
    4041#include "PerformanceImpl.h"
    … …  
    7677{
    7778    class MachineConfigFile;
    78     class Snapshot;
    79     class Hardware;
    80     class Storage;
    81     class StorageController;
    82     class MachineRegistryEntry;
     79    struct Snapshot;
     80    struct Hardware;
     81    struct Storage;
     82    struct StorageController;
     83    struct MachineRegistryEntry;
    8384}
    8485

  • trunk/src/VBox/Main/include/MediumImpl.h

    r22173 r22183  
    3434namespace settings
    3535{
    36     class Medium;
     36    struct Medium;
    3737}
    3838

  • trunk/src/VBox/Main/include/NetworkAdapterImpl.h

    r22173 r22183  
    3232namespace settings
    3333{
    34     class NetworkAdapter;
     34    struct NetworkAdapter;
    3535}
    3636

  • trunk/src/VBox/Main/include/ParallelPortImpl.h

    r22173 r22183  
    3030namespace settings
    3131{
    32     class ParallelPort;
     32    struct ParallelPort;
    3333}
    3434

  • trunk/src/VBox/Main/include/SerialPortImpl.h

    r22173 r22183  
    3232namespace settings
    3333{
    34     class SerialPort;
     34    struct SerialPort;
    3535}
    3636

  • trunk/src/VBox/Main/include/SnapshotImpl.h

    r22173 r22183  
    3232namespace settings
    3333{
    34     class Snapshot;
     34    struct Snapshot;
    3535}
    3636

  • trunk/src/VBox/Main/include/SystemPropertiesImpl.h

    r22173 r22183  
    3535namespace settings
    3636{
    37     class SystemProperties;
     37    struct SystemProperties;
    3838}
    3939

  • trunk/src/VBox/Main/include/USBControllerImpl.h

    r22173 r22183  
    3737namespace settings
    3838{
    39     class USBController;
     39    struct USBController;
    4040}
    4141

  • trunk/src/VBox/Main/include/VRDPServerImpl.h

    r22173 r22183  
    3333namespace settings
    3434{
    35     class VRDPSettings;
     35    struct VRDPSettings;
    3636}
    3737
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette