VirtualBox

Changeset 83794 in vbox for trunk/src/VBox/Main/src-server


Ignore:
Timestamp:
Apr 18, 2020 1:25:05 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
137320
Message:

Main: VC++ 14.1 adjustments. bugref:8489

Location:
trunk/src/VBox/Main/src-server
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

    r82968 r83794  
    2626
    2727#include <VBox/version.h>
     28#include <revision-generated.h> /* VBOX_SVN_REV - PCH prevents putting it in DEFS. */
    2829
    2930#include "ApplianceImpl.h"

  • trunk/src/VBox/Main/src-server/HostDnsService.cpp

    r82968 r83794  
    3232#include <algorithm>
    3333#include <set>
    34 #include <string>
     34#include <iprt/sanitized/string>
    3535#include "HostDnsService.h"
    3636

  • trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp

    r82968 r83794  
    3939#include <VBox/log.h>
    4040
    41 #include <string>
     41#include <iprt/sanitized/string>
    4242
    4343#include "HostDnsService.h"

  • trunk/src/VBox/Main/src-server/HostImpl.cpp

    r82968 r83794  
    164164
    165165#include <algorithm>
    166 #include <string>
     166#include <iprt/sanitized/string>
    167167#include <vector>
    168168
    … …  
    646646        {
    647647            Bstr bstrValue;
    648             HRESULT hrc = m->pParent->GetExtraData(aGlobalExtraDataKeys[i], bstrValue.asOutParam());
     648            hrc = m->pParent->GetExtraData(aGlobalExtraDataKeys[i], bstrValue.asOutParam());
    649649            if (hrc != S_OK)
    650650                continue;

  • trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

    r82968 r83794  
    161161{
    162162    AssertReturn(mVirtualBox != NULL, E_POINTER);
    163     return mVirtualBox->SetExtraData(BstrFmt("HostOnly/{%RTuuid}/%s", mGuid, szParamName).raw(), Bstr(strValue).raw());
     163    return mVirtualBox->SetExtraData(BstrFmt("HostOnly/{%RTuuid}/%s", mGuid.raw(), szParamName).raw(), Bstr(strValue).raw());
    164164}
    165165
    … …  
    167167{
    168168    AssertReturn(mVirtualBox != NULL, E_POINTER);
    169     return mVirtualBox->SetExtraData(BstrFmt("HostOnly/{%RTuuid}/%s", mGuid, szParamName).raw(), NULL);
     169    return mVirtualBox->SetExtraData(BstrFmt("HostOnly/{%RTuuid}/%s", mGuid.raw(), szParamName).raw(), NULL);
    170170}
    171171
    … …  
    204204        return false; /* Trigger config update, which will fail with proper return code */
    205205    Bstr tmpName;
    206     mVirtualBox->GetExtraData(BstrFmt("HostOnly/{%RTuuid}/Name", mGuid).raw(), tmpName.asOutParam());
     206    mVirtualBox->GetExtraData(BstrFmt("HostOnly/{%RTuuid}/Name", mGuid.raw()).raw(), tmpName.asOutParam());
    207207    return (tmpName.isNotEmpty() && tmpName == mInterfaceName);
    208208

  • trunk/src/VBox/Main/src-server/USBIdDatabaseGenerator.cpp

    r82972 r83794  
    2424#include <algorithm>
    2525#include <map>
    26 #include <string>
     26#include <iprt/sanitized/string>
    2727#include <vector>
    2828

  • trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp

    r82968 r83794  
    2828#include <SystemConfiguration/SCDynamicStore.h>
    2929
    30 #include <string>
     30#include <iprt/sanitized/string>
    3131#include <vector>
    3232#include "../HostDnsService.h"

  • trunk/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp

    r82968 r83794  
    4444#include <sys/socket.h>
    4545
    46 #include <string>
     46#include <iprt/sanitized/string>
    4747#include <vector>
    4848#include "../HostDnsService.h"

  • trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp

    r82968 r83794  
    3636
    3737#include <map>
    38 #include <string>
     38#include <iprt/sanitized/string>
    3939#include <fcntl.h>
    4040#include <unistd.h>

  • trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp

    r82968 r83794  
    3838
    3939#include <algorithm>
    40 #include <sstream>
    41 #include <string>
     40#include <iprt/sanitized/sstream>
     41#include <iprt/sanitized/string>
    4242#include <vector>
    4343

  • trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

    r82968 r83794  
    19101910    {
    19111911        std::list<BoundAdapter> boundAdapters;
    1912         HRESULT hr = netIfGetBoundAdapters(boundAdapters);
     1912        hr = netIfGetBoundAdapters(boundAdapters);
    19131913#if 0
    19141914        if (hr != S_OK)

  • trunk/src/VBox/Main/src-server/win/svcmain.cpp

    r82968 r83794  
    185185    if (hEventShutdown == NULL)
    186186        return false;
    187     DWORD dwThreadID;
    188     HANDLE h = CreateThread(NULL, 0, MonitorProc, this, 0, &dwThreadID);
     187    DWORD idThreadIgnored;
     188    HANDLE h = CreateThread(NULL, 0, MonitorProc, this, 0, &idThreadIgnored);
    189189    return (h != NULL);
    190190}
    … …  
    240240
    241241private:
    242     HRESULT VirtualBoxClassFactory::i_registerWithSds(IUnknown **ppOtherVirtualBox);
    243     void    VirtualBoxClassFactory::i_deregisterWithSds(void);
     242    HRESULT i_registerWithSds(IUnknown **ppOtherVirtualBox);
     243    void    i_deregisterWithSds(void);
    244244
    245245    friend VBoxSVCRegistration;
Note: See TracChangeset for help on using the changeset viewer.

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