- Timestamp:
- May 17, 2023 1:48:57 PM (17 months ago)
- Location:
- trunk
- Files:
-
- 45 edited
-
include/VBox/com/array.h (modified) (15 diffs)
-
include/VBox/com/microatl.h (modified) (21 diffs)
-
include/iprt/nocrt/fstream (modified) (4 diffs)
-
include/iprt/nocrt/ios (modified) (2 diffs)
-
include/iprt/nocrt/ostream (modified) (9 diffs)
-
include/iprt/nocrt/string (modified) (2 diffs)
-
src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDrawCmd.cpp (modified) (1 diff)
-
src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispInternal.h (modified) (1 diff)
-
src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.h (modified) (1 diff)
-
src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp (modified) (4 diffs)
-
src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.h (modified) (1 diff)
-
src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPRegistry.cpp (modified) (4 diffs)
-
src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp (modified) (1 diff)
-
src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPRegistry.cpp (modified) (1 diff)
-
src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp (modified) (1 diff)
-
src/VBox/Additions/WINNT/SharedFolders/driver/path.cpp (modified) (1 diff)
-
src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.cpp (modified) (2 diffs)
-
src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.cpp (modified) (3 diffs)
-
src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.h (modified) (1 diff)
-
src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp (modified) (2 diffs)
-
src/VBox/Additions/WINNT/VBoxTray/VBoxLA.cpp (modified) (1 diff)
-
src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h (modified) (4 diffs)
-
src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp (modified) (3 diffs)
-
src/VBox/Additions/common/VBoxService/VBoxService-win.cpp (modified) (5 diffs)
-
src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp (modified) (1 diff)
-
src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (6 diffs)
-
src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (1 diff)
-
src/VBox/Devices/Audio/DrvHostAudioDSoundMMNotifClient.cpp (modified) (2 diffs)
-
src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp (modified) (1 diff)
-
src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp (modified) (1 diff)
-
src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (1 diff)
-
src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp (modified) (8 diffs)
-
src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h (modified) (1 diff)
-
src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (3 diffs)
-
src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp (modified) (2 diffs)
-
src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp (modified) (1 diff)
-
src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp (modified) (1 diff)
-
src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp (modified) (1 diff)
-
src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp (modified) (2 diffs)
-
src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp (modified) (1 diff)
-
src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (2 diffs)
-
src/VBox/Runtime/r3/nt/RTPathQueryInfo-nt.cpp (modified) (1 diff)
-
src/VBox/Runtime/r3/win/fileio-win.cpp (modified) (1 diff)
-
src/VBox/Runtime/r3/win/process-win.cpp (modified) (1 diff)
-
src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/com/array.h
r99772 r99828 691 691 AssertComRCReturnVoid(rc); 692 692 # ifndef VBOX_WITH_TYPE_TRAITS 693 AssertMsgReturnVoid( 694 vt == VarType() 695 || vt == VarTypeUnsigned(), 693 AssertMsgReturnVoid( vt == Traits::VarType() 694 || vt == Traits::VarTypeUnsigned(), 696 695 ("Expected vartype %d or %d, got %d.\n", 697 VarType(), VarTypeUnsigned(), vt)); 698 # else /* !VBOX_WITH_TYPE_TRAITS */ 699 AssertMsgReturnVoid( 700 vt == VarType(), 696 Traits::VarType(), Traits::VarTypeUnsigned(), vt)); 697 # else /* VBOX_WITH_TYPE_TRAITS */ 698 AssertMsgReturnVoid(vt == Traits::VarType(), 701 699 ("Expected vartype %d, got %d.\n", 702 VarType(), vt));703 # endif 700 Traits::VarType(), vt)); 701 # endif /* VBOX_WITH_TYPE_TRAITS */ 704 702 rc = SafeArrayAccessData(arg, (void HUGEP **)&m.raw); 705 703 AssertComRCReturnVoid(rc); … … 733 731 SafeArray::Copy(*it, m.arr[i]); 734 732 #else 735 Copy(*it, m.raw[i]);733 SafeArray::Copy(*it, m.raw[i]); 736 734 #endif 737 735 } … … 762 760 it != aMap.end(); ++ it, ++ i) 763 761 #ifdef VBOX_WITH_XPCOM 764 Copy(it->second, m.arr[i]);765 #else 766 Copy(it->second, m.raw[i]);762 SafeArray::Copy(it->second, m.arr[i]); 763 #else 764 SafeArray::Copy(it->second, m.raw[i]); 767 765 #endif 768 766 } … … 810 808 #else 811 809 if (m.arr) 812 return Size(m.arr->rgsabound[0].cElements);810 return Traits::Size(m.arr->rgsabound[0].cElements); 813 811 return 0; 814 812 #endif … … 841 839 SafeArray::Copy(m.arr[i - 1], m.arr[i]); 842 840 #else 843 Copy(m.raw[i - 1], m.raw[i]);841 SafeArray::Copy(m.raw[i - 1], m.raw[i]); 844 842 #endif 845 843 } … … 849 847 ++ m.size; 850 848 #else 851 Copy(aElement, m.raw[0]);849 SafeArray::Copy(aElement, m.raw[0]); 852 850 #endif 853 851 return true; … … 879 877 ++ m.size; 880 878 #else 881 Copy(aElement, m.raw[size() - 1]);879 SafeArray::Copy(aElement, m.raw[size() - 1]); 882 880 #endif 883 881 return true; … … 1246 1244 #else 1247 1245 1248 SAFEARRAYBOUND bound = { VarCount(aNewSize), 0 };1246 SAFEARRAYBOUND bound = { Traits::VarCount(aNewSize), 0 }; 1249 1247 HRESULT rc; 1250 1248 1251 1249 if (m.arr == NULL) 1252 1250 { 1253 m.arr = CreateSafeArray(VarType(), &bound);1251 m.arr = Traits::CreateSafeArray(Traits::VarType(), &bound); 1254 1252 AssertReturn(m.arr != NULL, false); 1255 1253 } … … 1485 1483 { 1486 1484 if (mVal == NULL) 1487 Copy(&aThat, mVal);1485 SafeGUIDArray::Copy(&aThat, mVal); 1488 1486 else 1489 1487 *mVal = aThat; … … 1723 1721 ("Expected IID {%RTuuid}, got {%RTuuid}.\n", &COM_IIDOF(I), &guid)); 1724 1722 1725 rc = SafeArrayAccessData(arg, (void HUGEP **)& m.raw);1723 rc = SafeArrayAccessData(arg, (void HUGEP **)&this->m.raw); 1726 1724 AssertComRCReturnVoid(rc); 1727 1725 1728 m.arr = arg;1729 m.isWeak = true;1726 this->m.arr = arg; 1727 this->m.isWeak = true; 1730 1728 1731 1729 #endif /* !VBOX_WITH_XPCOM */ … … 1753 1751 1754 1752 size_t i = 0; 1755 for (typename List::const_iterator it = aCntr.begin(); 1756 it != aCntr.end(); ++ it, ++ i) 1757 #ifdef VBOX_WITH_XPCOM 1758 this->Copy(*it, Base::m.arr[i]); 1759 #else 1760 Copy(*it, Base::m.raw[i]); 1753 for (typename List::const_iterator it = aCntr.begin(); it != aCntr.end(); ++it, ++i) 1754 #ifdef VBOX_WITH_XPCOM 1755 SafeIfaceArray::Copy(*it, Base::m.arr[i]); 1756 #else 1757 SafeIfaceArray::Copy(*it, Base::m.raw[i]); 1761 1758 #endif 1762 1759 } … … 1782 1779 1783 1780 size_t i = 0; 1784 for (typename List::const_iterator it = aCntr.begin(); 1785 it != aCntr.end(); ++ it, ++ i) 1781 for (typename List::const_iterator it = aCntr.begin(); it != aCntr.end(); ++it, ++i) 1786 1782 #ifdef VBOX_WITH_XPCOM 1787 1783 SafeIfaceArray::Copy(*it, Base::m.arr[i]); 1788 1784 #else 1789 Copy(*it, Base::m.raw[i]);1785 SafeIfaceArray::Copy(*it, Base::m.raw[i]); 1790 1786 #endif 1791 1787 } … … 1814 1810 1815 1811 size_t i = 0; 1816 for (typename Map::const_iterator it = aMap.begin(); 1817 it != aMap.end(); ++ it, ++ i) 1812 for (typename Map::const_iterator it = aMap.begin(); it != aMap.end(); ++it, ++i) 1818 1813 #ifdef VBOX_WITH_XPCOM 1819 1814 SafeIfaceArray::Copy(it->second, Base::m.arr[i]); 1820 1815 #else 1821 Copy(it->second, Base::m.raw[i]);1816 SafeIfaceArray::Copy(it->second, Base::m.raw[i]); 1822 1817 #endif 1823 1818 } … … 1847 1842 size_t i = 0; 1848 1843 for (typename Map::const_iterator it = aMap.begin(); 1849 it != aMap.end(); ++ it, ++i)1844 it != aMap.end(); ++it, ++i) 1850 1845 #ifdef VBOX_WITH_XPCOM 1851 1846 SafeIfaceArray::Copy(it->second, Base::m.arr[i]); 1852 1847 #else 1853 Copy(it->second, Base::m.raw[i]);1848 SafeIfaceArray::Copy(it->second, Base::m.raw[i]); 1854 1849 #endif 1855 1850 } … … 1860 1855 SafeIfaceArray::Copy(obj, Base::m.arr[iIdx]); 1861 1856 #else 1862 Copy(obj, Base::m.raw[iIdx]);1857 SafeIfaceArray::Copy(obj, Base::m.raw[iIdx]); 1863 1858 #endif 1864 1859 } -
trunk/include/VBox/com/microatl.h
r98103 r99828 239 239 if (fInitialLock) 240 240 { 241 HRESULT hrc = Lock();241 HRESULT hrc = this->Lock(); 242 242 if (FAILED(hrc)) 243 243 throw hrc; … … 724 724 { 725 725 // Catch refcount screwups by setting refcount to -(LONG_MAX/2). 726 m_iRef = -(LONG_MAX/2);727 FinalRelease();726 this->m_iRef = -(LONG_MAX/2); 727 this->FinalRelease(); 728 728 } 729 729 STDMETHOD_(ULONG, AddRef)() throw() … … 731 731 // If you get errors about undefined InternalAddRef then Base does not 732 732 // derive from CComObjectRootEx. 733 ULONG l = InternalAddRef();733 ULONG l = this->InternalAddRef(); 734 734 if (l == 2) 735 735 { … … 743 743 // If you get errors about undefined InternalRelease then Base does not 744 744 // derive from CComObjectRootEx. 745 ULONG l = InternalRelease();745 ULONG l = this->InternalRelease(); 746 746 if (l == 0) 747 747 delete this; … … 757 757 // If you get errors about undefined _InternalQueryInterface then 758 758 // double check BEGIN_COM_MAP in the class definition. 759 return _InternalQueryInterface(iid, ppvObj);759 return this->_InternalQueryInterface(iid, ppvObj); 760 760 } 761 761 static HRESULT WINAPI CreateInstance(CComObjectCached<Base> **pp) throw() … … 792 792 { 793 793 // Catch refcount screwups by setting refcount to -(LONG_MAX/2). 794 m_iRef = -(LONG_MAX/2);795 FinalRelease();794 this->m_iRef = -(LONG_MAX/2); 795 this->FinalRelease(); 796 796 } 797 797 STDMETHOD_(ULONG, AddRef)() throw() … … 799 799 // If you get errors about undefined InternalAddRef then Base does not 800 800 // derive from CComObjectRootEx. 801 return InternalAddRef();801 return this->InternalAddRef(); 802 802 } 803 803 STDMETHOD_(ULONG, Release)() throw() … … 805 805 // If you get errors about undefined InternalRelease then Base does not 806 806 // derive from CComObjectRootEx. 807 ULONG l = InternalRelease();807 ULONG l = this->InternalRelease(); 808 808 if (l == 0) 809 809 delete this; … … 814 814 // If you get errors about undefined _InternalQueryInterface then 815 815 // double check BEGIN_COM_MAP in the class definition. 816 return _InternalQueryInterface(iid, ppvObj);816 return this->_InternalQueryInterface(iid, ppvObj); 817 817 } 818 818 }; … … 1051 1051 AssertMsg(_pAtlModule, ("ATL: referring to ATL module without having one declared in this linking namespace\n")); 1052 1052 // Catch refcount screwups by setting refcount to -(LONG_MAX/2). 1053 m_iRef = -(LONG_MAX/2);1054 FinalRelease();1053 this->m_iRef = -(LONG_MAX/2); 1054 this->FinalRelease(); 1055 1055 _pAtlModule->Unlock(); 1056 1056 } … … 1059 1059 // If you get errors about undefined InternalAddRef then Base does not 1060 1060 // derive from CComObjectRootEx. 1061 return InternalAddRef();1061 return this->InternalAddRef(); 1062 1062 } 1063 1063 STDMETHOD_(ULONG, Release)() … … 1065 1065 // If you get errors about undefined InternalRelease then Base does not 1066 1066 // derive from CComObjectRootEx. 1067 ULONG l = InternalRelease();1067 ULONG l = this->InternalRelease(); 1068 1068 if (l == 0) 1069 1069 delete this; … … 1074 1074 // If you get errors about undefined _InternalQueryInterface then 1075 1075 // double check BEGIN_COM_MAP in the class definition. 1076 return _InternalQueryInterface(iid, ppvObj);1076 return this->_InternalQueryInterface(iid, ppvObj); 1077 1077 } 1078 1078 … … 1084 1084 HRESULT hrc = E_OUTOFMEMORY; 1085 1085 CComObject<Base> *p = NULL; 1086 #ifdef RT_EXCEPTIONS_ENABLED 1086 1087 try 1087 1088 { 1089 #endif 1088 1090 p = new CComObject<Base>(); 1091 #ifdef RT_EXCEPTIONS_ENABLED 1089 1092 } 1090 1093 catch (std::bad_alloc &) … … 1092 1095 p = NULL; 1093 1096 } 1097 #endif 1094 1098 if (p) 1095 1099 { 1096 1100 p->InternalFinalConstructAddRef(); 1101 #ifdef RT_EXCEPTIONS_ENABLED 1097 1102 try 1098 1103 { 1104 #endif 1099 1105 hrc = p->_AtlInitialConstruct(); 1100 1106 if (SUCCEEDED(hrc)) 1101 1107 hrc = p->FinalConstruct(); 1108 #ifdef RT_EXCEPTIONS_ENABLED 1102 1109 } 1103 1110 catch (std::bad_alloc &) … … 1105 1112 hrc = E_OUTOFMEMORY; 1106 1113 } 1114 #endif 1107 1115 p->InternalFinalConstructRelease(); 1108 1116 if (FAILED(hrc)) … … 1156 1164 CComContainedObject(void *pv) 1157 1165 { 1158 m_pOuterUnknown = (IUnknown *)pv;1166 this->m_pOuterUnknown = (IUnknown *)pv; 1159 1167 } 1160 1168 1161 1169 STDMETHOD_(ULONG, AddRef)() throw() 1162 1170 { 1163 return OuterAddRef();1171 return this->OuterAddRef(); 1164 1172 } 1165 1173 STDMETHOD_(ULONG, Release)() throw() 1166 1174 { 1167 return OuterRelease();1175 return this->OuterRelease(); 1168 1176 } 1169 1177 STDMETHOD(QueryInterface)(REFIID iid, void **ppvObj) throw() 1170 1178 { 1171 return OuterQueryInterface(iid, ppvObj);1179 return this->OuterQueryInterface(iid, ppvObj); 1172 1180 } 1173 1181 }; … … 1188 1196 AssertMsg(_pAtlModule, ("ATL: referring to ATL module without having one declared in this linking namespace\n")); 1189 1197 // Catch refcount screwups by setting refcount to -(LONG_MAX/2). 1190 m_iRef = -(LONG_MAX/2);1191 FinalRelease();1198 this->m_iRef = -(LONG_MAX/2); 1199 this->FinalRelease(); 1192 1200 _pAtlModule->Unlock(); 1193 1201 } … … 1196 1204 HRESULT hrc = m_Aggregated._AtlInitialConstruct(); 1197 1205 if (SUCCEEDED(hrc)) 1198 {1199 1206 hrc = CComObjectRootEx<typename Aggregated::_ThreadModel::ThreadModelNoCS>::_AtlInitialConstruct(); 1200 }1201 1207 return hrc; 1202 1208 } … … 1214 1220 STDMETHOD_(ULONG, AddRef)() 1215 1221 { 1216 return InternalAddRef();1222 return this->InternalAddRef(); 1217 1223 } 1218 1224 STDMETHOD_(ULONG, Release)() 1219 1225 { 1220 ULONG l = InternalRelease();1226 ULONG l = this->InternalRelease(); 1221 1227 if (l == 0) 1222 1228 delete this; … … 1329 1335 } 1330 1336 // IClassFactory 1331 STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, void **p vObj)1337 STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, void **ppvObj) 1332 1338 { 1333 1339 HRESULT hrc = E_POINTER; -
trunk/include/iprt/nocrt/fstream
r98103 r99828 56 56 public: 57 57 basic_filebuf(PRTSTREAM a_pStrm = NULL, bool a_fStdStream = false) 58 : basic_streambuf ()58 : basic_streambuf<a_CharType, a_CharTraits>() 59 59 , m_pStrm(a_pStrm) 60 60 , m_fStdStream(a_fStdStream) … … 142 142 //} 143 143 144 std::streamsize xsputn(char_type const *a_pchSrc, std::streamsize a_cchSrc) //RT_OVERRIDE 144 std::streamsize xsputn(typename basic_streambuf<a_CharType, a_CharTraits>::char_type const *a_pchSrc, 145 std::streamsize a_cchSrc) //RT_OVERRIDE 145 146 { 146 147 if (flushBuffered()) … … 167 168 public: 168 169 basic_ofstream() 169 : basic_ostream (&m_FileBuf) /** @todo m_FileBuf isn't initialized yet... */170 : basic_ostream<a_CharType, a_CharTraits>(&m_FileBuf) /** @todo m_FileBuf isn't initialized yet... */ 170 171 , m_FileBuf() 171 172 { … … 173 174 174 175 explicit basic_ofstream(const char *a_pszFilename, ios_base::openmode a_fMode = ios_base::out) 175 : basic_ostream (&m_FileBuf) /** @todo m_FileBuf isn't initialized yet... */176 : basic_ostream<a_CharType, a_CharTraits>(&m_FileBuf) /** @todo m_FileBuf isn't initialized yet... */ 176 177 , m_FileBuf() 177 178 { -
trunk/include/iprt/nocrt/ios
r98103 r99828 266 266 char_type *epptr() const RT_NOEXCEPT 267 267 { 268 return &m_pach Buf[m_cchPut];268 return &m_pachPut[m_cchPut]; 269 269 } 270 270 … … 498 498 } 499 499 500 std::basic_streambuf<a_CharType, a_CharTraits> *rdbuf(std::basic_streambuf<a_CharType, a_CharTraits> *a_pNew buf) RT_NOEXCEPT500 std::basic_streambuf<a_CharType, a_CharTraits> *rdbuf(std::basic_streambuf<a_CharType, a_CharTraits> *a_pNewBuf) RT_NOEXCEPT 501 501 { 502 502 std::basic_streambuf<a_CharType, a_CharTraits> *pOldBuf = m_pBuf; -
trunk/include/iprt/nocrt/ostream
r98103 r99828 51 51 class basic_ostream : public basic_ios<a_CharType, a_CharTraits> 52 52 { 53 public: 54 typedef a_CharType char_type; 55 typedef a_CharTraits traits_type; 56 typedef typename a_CharTraits::int_type int_type; 57 typedef typename a_CharTraits::pos_type pos_type; 58 typedef typename a_CharTraits::off_type off_type; 59 53 60 protected: 54 61 /** Sentry class that performs pre and post output work. */ … … 71 78 pTiedStream->flush(); 72 79 if (!pTiedStream->good()) 73 a_rParent.setstate( failbit);80 a_rParent.setstate(ios::failbit); 74 81 } 75 82 } … … 91 98 public: 92 99 explicit basic_ostream(std::basic_streambuf<a_CharType,a_CharTraits> *a_pBuf) 93 : basic_ios (a_pBuf)100 : basic_ios<a_CharType, a_CharTraits>(a_pBuf) 94 101 { } 95 102 … … 99 106 std::basic_ostream<a_CharType, a_CharTraits> *a_pTiedStream, 100 107 bool a_fUnbuffered) 101 : basic_ios (a_pBuf)102 { 103 m_pTiedStream = a_pTiedStream;108 : basic_ios<a_CharType, a_CharTraits>(a_pBuf) 109 { 110 this->m_pTiedStream = a_pTiedStream; 104 111 if (!a_fUnbuffered) 105 setf(std::ios_base::unitbuf);112 this->setf(std::ios_base::unitbuf); 106 113 } 107 114 … … 116 123 117 124 public: 118 basic_ostream &put( char_type a_ch)125 basic_ostream &put(a_CharType a_ch) 119 126 { 120 127 sentry PrePost(*this); 121 128 if (PrePost) 122 129 { 123 if ( m_pBuf->sputc(a_ch) == traits_type::eof())124 m_fState |=badbit;130 if (this->m_pBuf->sputc(a_ch) == traits_type::eof()) 131 this->m_fState |= ios::badbit; 125 132 } 126 133 return *this; 127 134 } 128 135 129 basic_ostream &write(const char_type *a_pchSrc, std::streamsize a_cchToWrite)136 basic_ostream &write(const a_CharType *a_pchSrc, std::streamsize a_cchToWrite) 130 137 { 131 138 sentry PrePost(*this); 132 139 if (PrePost) 133 140 { 134 std::streamsize cchWritten = m_pBuf->sputn(a_pchSrc, a_cchToWrite);141 std::streamsize cchWritten = this->m_pBuf->sputn(a_pchSrc, a_cchToWrite); 135 142 if (cchWritten != a_cchToWrite) 136 m_fState |=badbit;143 this->m_fState |= ios::badbit; 137 144 } 138 145 return *this; … … 141 148 basic_ostream &flush() 142 149 { 143 if ( m_pBuf)144 m_pBuf->pubsync();150 if (this->m_pBuf) 151 this->m_pBuf->pubsync(); 145 152 return *this; 146 153 } … … 148 155 pos_type tellp() RT_NOEXCEPT; 149 156 basic_ostream &seekp(pos_type a_off) RT_NOEXCEPT; 150 basic_ostream &seekp(off_type a_off, seekdir enmDir) RT_NOEXCEPT;157 basic_ostream &seekp(off_type a_off, ios::seekdir enmDir) RT_NOEXCEPT; 151 158 152 159 /** @name Internal support methods … … 157 164 inline unsigned intGetIntegerBase() const RT_NOEXCEPT 158 165 { 159 switch ( m_fFlags &basefield)166 switch (this->m_fFlags & ios::basefield) 160 167 { 161 168 default: 162 case dec: return 10;163 case hex: return 16;164 case oct: return 8;169 case ios::dec: return 10; 170 case ios::hex: return 16; 171 case ios::oct: return 8; 165 172 } 166 173 } … … 170 177 { 171 178 unsigned fFlags = 0; 172 if ( m_fFlags &uppercase)179 if (this->m_fFlags & ios::uppercase) 173 180 fFlags |= RTSTR_F_CAPITAL; 174 if ( m_fFlags &showbase)181 if (this->m_fFlags & ios::showbase) 175 182 fFlags |= RTSTR_F_SPECIAL; 176 if ( m_fFlags &showpos)183 if (this->m_fFlags & ios::showpos) 177 184 fFlags |= RTSTR_F_PLUS; 178 185 return fFlags; -
trunk/include/iprt/nocrt/string
r98103 r99828 158 158 { 159 159 const char_type * const pszStart = a_psz; 160 while (!eq(*a_psz Left, char_type()))160 while (!eq(*a_psz, char_type())) 161 161 a_psz++; 162 162 return static_cast<std::size_t>(a_psz - pszStart); … … 216 216 char_type volatile *pchDstV = static_cast<char_type const volatile *>(a_pchDst); 217 217 char_type const volatile *pchSrcV = static_cast<char_type const volatile *>(a_pchSrc); 218 if ((uintptr_t) a_pchDst < (uintptr_t)a_pchSrc)218 if ((uintptr_t)pchDstV < (uintptr_t)pchSrcV) 219 219 { 220 220 /* forward copy */ 221 221 while (a_cch-- > 0) 222 * a_pchDstV++ = *a_pchSrcV++;222 *pchDstV++ = *pchSrcV++; 223 223 } 224 224 else 225 225 { 226 226 /* reverse copy */ 227 a_pchSrcV += a_cch;228 a_pchDstV += a_cch;229 while (a_cch Dst-- > 0)230 * a_pchDstV-- = *a_pchSrcV--;227 pchSrcV += a_cch; 228 pchDstV += a_cch; 229 while (a_cch-- > 0) 230 *pchDstV-- = *pchSrcV--; 231 231 } 232 232 return pchRet; -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDrawCmd.cpp
r98103 r99828 158 158 } 159 159 160 void VBoxDispDumpPSO(SURFOBJ *pso, c har *s)160 void VBoxDispDumpPSO(SURFOBJ *pso, const char *s) 161 161 { 162 162 RT_NOREF(pso, s); -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispInternal.h
r98103 r99828 163 163 164 164 BOOL VBoxDispIsScreenSurface(SURFOBJ *pso); 165 void VBoxDispDumpPSO(SURFOBJ *pso, c har *s);165 void VBoxDispDumpPSO(SURFOBJ *pso, const char *s); 166 166 167 167 BOOL vrdpDrvRealizeBrush(BRUSHOBJ *pbo, SURFOBJ *psoTarget, SURFOBJ *psoPattern, SURFOBJ *psoMask, -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.h
r98103 r99828 61 61 VP_STATUS VBoxMPCmnRegInit(IN PVBOXMP_DEVEXT pExt, OUT VBOXMPCMNREGISTRY *pReg); 62 62 VP_STATUS VBoxMPCmnRegFini(IN VBOXMPCMNREGISTRY Reg); 63 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, P WSTR pName, uint32_t Val);64 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, P WSTR pName, uint32_t *pVal);63 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t Val); 64 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t *pVal); 65 65 66 66 /* Pointer related */ -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp
r98103 r99828 405 405 } 406 406 407 NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN P WCHAR pName, IN ACCESS_MASK fAccess)407 NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN PCWCHAR pName, IN ACCESS_MASK fAccess) 408 408 { 409 409 OBJECT_ATTRIBUTES ObjAttr; … … 416 416 } 417 417 418 NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN P WCHAR pName, IN ACCESS_MASK fAccess)418 NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PCWCHAR pName, IN ACCESS_MASK fAccess) 419 419 { 420 420 return vboxWddmRegOpenKeyEx(phKey, NULL, pName, fAccess); … … 562 562 } 563 563 564 NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN P WCHAR pName, OUT PDWORD pDword)564 NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN PCWCHAR pName, OUT PDWORD pDword) 565 565 { 566 566 struct … … 591 591 } 592 592 593 NTSTATUS vboxWddmRegSetValueDword(IN HANDLE hKey, IN P WCHAR pName, IN DWORD val)593 NTSTATUS vboxWddmRegSetValueDword(IN HANDLE hKey, IN PCWCHAR pName, IN DWORD val) 594 594 { 595 595 UNICODE_STRING RtlStr; -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.h
r98103 r99828 93 93 NTSTATUS vboxWddmRegQueryDrvKeyName(PVBOXMP_DEVEXT pDevExt, ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult); 94 94 95 NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN P WCHAR pName, IN ACCESS_MASK fAccess);96 NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN P WCHAR pName, IN ACCESS_MASK fAccess);97 NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN P WCHAR pName, OUT PDWORD pDword);98 NTSTATUS vboxWddmRegSetValueDword(IN HANDLE hKey, IN P WCHAR pName, IN DWORD val);95 NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN PCWCHAR pName, IN ACCESS_MASK fAccess); 96 NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PCWCHAR pName, IN ACCESS_MASK fAccess); 97 NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN PCWCHAR pName, OUT PDWORD pDword); 98 NTSTATUS vboxWddmRegSetValueDword(IN HANDLE hKey, IN PCWCHAR pName, IN DWORD val); 99 99 100 100 NTSTATUS vboxWddmRegDrvFlagsSet(PVBOXMP_DEVEXT pDevExt, DWORD fVal); -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPRegistry.cpp
r98103 r99828 52 52 { 53 53 if (!Reg) 54 {55 54 return ERROR_INVALID_PARAMETER; 56 }57 55 58 56 NTSTATUS Status = ZwClose(Reg); … … 60 58 } 61 59 62 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, P WSTR pName, uint32_t *pVal)60 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t *pVal) 63 61 { 64 62 /* seems like the new code assumes the Reg functions zeroes up the value on failure */ … … 66 64 67 65 if (!Reg) 68 {69 66 return ERROR_INVALID_PARAMETER; 70 }71 67 72 68 NTSTATUS Status = vboxWddmRegQueryValueDword(Reg, pName, (PDWORD)pVal); … … 74 70 } 75 71 76 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, P WSTR pName, uint32_t Val)72 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t Val) 77 73 { 78 74 if (!Reg) -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp
r98103 r99828 108 108 109 109 /* Write hw information to registry, so that it's visible in windows property dialog */ 110 rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.ChipType",110 rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.ChipType", 111 111 g_wszVBoxChipType, sizeof(g_wszVBoxChipType)); 112 112 VBOXMP_WARN_VPS(rc); 113 rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.DacType",113 rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.DacType", 114 114 g_wszVBoxDACType, sizeof(g_wszVBoxDACType)); 115 115 VBOXMP_WARN_VPS(rc); 116 rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.MemorySize",116 rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.MemorySize", 117 117 &cbVRAM, sizeof(ULONG)); 118 118 VBOXMP_WARN_VPS(rc); 119 rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.AdapterString",119 rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.AdapterString", 120 120 g_wszVBoxAdapterString, sizeof(g_wszVBoxAdapterString)); 121 121 VBOXMP_WARN_VPS(rc); 122 rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.BiosString",122 rc = VideoPortSetRegistryParameters(pExt, (PWSTR)L"HardwareInformation.BiosString", 123 123 g_wszVBoxBiosString, sizeof(g_wszVBoxBiosString)); 124 124 VBOXMP_WARN_VPS(rc); -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPRegistry.cpp
r98103 r99828 58 58 } 59 59 60 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, P WSTR pName, uint32_t Val)60 VP_STATUS VBoxMPCmnRegSetDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t Val) 61 61 { 62 return VideoPortSetRegistryParameters(Reg, pName, &Val, sizeof(Val));62 return VideoPortSetRegistryParameters(Reg, (PWSTR)pName, &Val, sizeof(Val)); 63 63 } 64 64 65 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, P WSTR pName, uint32_t *pVal)65 VP_STATUS VBoxMPCmnRegQueryDword(IN VBOXMPCMNREGISTRY Reg, PCWSTR pName, uint32_t *pVal) 66 66 { 67 VP_STATUS rc; 68 69 rc = VideoPortGetRegistryParameters(Reg, pName, FALSE, VBoxMPQueryNamedValueCB, pVal); 70 if (rc!=NO_ERROR && pVal) 71 { 67 VP_STATUS rc = VideoPortGetRegistryParameters(Reg, (PWSTR)pName, FALSE, VBoxMPQueryNamedValueCB, pVal); 68 if (rc != NO_ERROR && pVal) 72 69 *pVal = 0; 73 }74 70 return rc; 75 71 } -
trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp
r98639 r99828 100 100 typedef struct 101 101 { 102 P WSTR pApplicationId;103 P WSTR pDisplayName;104 P WSTR pProductName;105 P WSTR pMfgName;102 PCWSTR pApplicationId; 103 PCWSTR pDisplayName; 104 PCWSTR pProductName; 105 PCWSTR pMfgName; 106 106 } INSTALLERINFO, *PINSTALLERINFO; 107 107 typedef const PINSTALLERINFO PCINSTALLERINFO; -
trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.cpp
r98103 r99828 37 37 * Defined Constants And Macros * 38 38 *********************************************************************************************************************************/ 39 static UNICODE_STRING g_UnicodeBackslash = { 2, 4, L"\\" };39 static UNICODE_STRING g_UnicodeBackslash = { 2, 4, (PWSTR)L"\\" }; 40 40 41 41 -
trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.cpp
r98103 r99828 1124 1124 NTSTATUS Status = STATUS_BAD_NETWORK_NAME; 1125 1125 1126 ULONG i; 1127 PWCHAR pwc; 1128 PWCHAR pwc1; 1129 1130 static PWCHAR spwszPrefix = L"\\Device\\VBoxMiniRdr\\;"; 1126 static WCHAR const s_wszPrefix[] = L"\\Device\\VBoxMiniRdr\\;"; 1131 1127 1132 1128 /* Unicode chars in the string. */ … … 1135 1131 1136 1132 /* Check that the name starts with correct prefix. */ 1137 pwc1 = &spwszPrefix[0]; 1138 pwc = ConnectionName->Buffer; 1133 PCWCHAR pwc1 = &s_wszPrefix[0]; 1134 PCWCHAR pwc = ConnectionName->Buffer; 1135 ULONG i; 1139 1136 for (i = 0; i < cConnectionName; i++, pwc1++, pwc++) 1140 1137 { -
trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.cpp
r98103 r99828 69 69 { 70 70 /** The actual method name the subscription is for. */ 71 c har *pszMethod;71 const char *pszMethod; 72 72 /** A friendly name for the subscription. */ 73 c har *pszSubscriptionName;73 const char *pszSubscriptionName; 74 74 /** The actual subscription UUID. 75 75 * Should not be changed. */ 76 c har *pszSubscriptionUUID;76 const char *pszSubscriptionUUID; 77 77 } g_aSENSEvents[] = { 78 78 { "Logon", "VBoxCredProv SENS Logon", "{561D0791-47C0-4BC3-87C0-CDC2621EA653}" }, … … 284 284 break; 285 285 286 hr = g_pIEventSystem->Store( PROGID_EventSubscription, (IUnknown*)pIEventSubscription);286 hr = g_pIEventSystem->Store((BSTR)PROGID_EventSubscription, (IUnknown*)pIEventSubscription); 287 287 if (FAILED(hr)) 288 288 break; … … 346 346 AssertContinue(SUCCEEDED(hr)); /* keep going */ 347 347 int iErrorIdX; 348 hr = g_pIEventSystem->Remove( PROGID_EventSubscription, bstrSubToRemove.raw(), &iErrorIdX);348 hr = g_pIEventSystem->Remove((BSTR)PROGID_EventSubscription, bstrSubToRemove.raw(), &iErrorIdX); 349 349 if (FAILED(hr)) 350 350 { -
trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.h
r98103 r99828 91 91 { 92 92 /** The user's profile image (tile). */ 93 { { VBOXCREDPROV_FIELDID_TILEIMAGE, CPFT_TILE_IMAGE, L"Tile Image", {0} }, CPFS_DISPLAY_IN_BOTH, CPFIS_NONE },94 { { VBOXCREDPROV_FIELDID_USERNAME, CPFT_LARGE_TEXT, L"Username", CPFG_LOGON_USERNAME }, CPFS_DISPLAY_IN_BOTH, CPFIS_NONE },95 { { VBOXCREDPROV_FIELDID_PASSWORD, CPFT_PASSWORD_TEXT, L"Password", CPFG_LOGON_PASSWORD }, CPFS_DISPLAY_IN_SELECTED_TILE, CPFIS_FOCUSED },96 { { VBOXCREDPROV_FIELDID_DOMAINNAME, CPFT_LARGE_TEXT, L"", {0} }, CPFS_DISPLAY_IN_SELECTED_TILE, CPFIS_FOCUSED },97 { { VBOXCREDPROV_FIELDID_SUBMIT_BUTTON, CPFT_SUBMIT_BUTTON, L"Submit", {0} }, CPFS_DISPLAY_IN_SELECTED_TILE, CPFIS_FOCUSED },93 { { VBOXCREDPROV_FIELDID_TILEIMAGE, CPFT_TILE_IMAGE, (LPWSTR)L"Tile Image", {0} }, CPFS_DISPLAY_IN_BOTH, CPFIS_NONE }, 94 { { VBOXCREDPROV_FIELDID_USERNAME, CPFT_LARGE_TEXT, (LPWSTR)L"Username", CPFG_LOGON_USERNAME }, CPFS_DISPLAY_IN_BOTH, CPFIS_NONE }, 95 { { VBOXCREDPROV_FIELDID_PASSWORD, CPFT_PASSWORD_TEXT, (LPWSTR)L"Password", CPFG_LOGON_PASSWORD }, CPFS_DISPLAY_IN_SELECTED_TILE, CPFIS_FOCUSED }, 96 { { VBOXCREDPROV_FIELDID_DOMAINNAME, CPFT_LARGE_TEXT, (LPWSTR)L"", {0} }, CPFS_DISPLAY_IN_SELECTED_TILE, CPFIS_FOCUSED }, 97 { { VBOXCREDPROV_FIELDID_SUBMIT_BUTTON, CPFT_SUBMIT_BUTTON, (LPWSTR)L"Submit", {0} }, CPFS_DISPLAY_IN_SELECTED_TILE, CPFIS_FOCUSED }, 98 98 /** New since Windows 8: The image used to represent a credential provider on the logon page. */ 99 { { VBOXCREDPROV_FIELDID_PROVIDER_LOGO, CPFT_TILE_IMAGE, L"Provider Logo", CPFG_CREDENTIAL_PROVIDER_LOGO }, CPFS_HIDDEN /* Not used yet. */, CPFIS_NONE },99 { { VBOXCREDPROV_FIELDID_PROVIDER_LOGO, CPFT_TILE_IMAGE, (LPWSTR)L"Provider Logo", CPFG_CREDENTIAL_PROVIDER_LOGO }, CPFS_HIDDEN /* Not used yet. */, CPFIS_NONE }, 100 100 /** New since Windows 8: The label associated with a credential provider on the logon page. */ 101 { { VBOXCREDPROV_FIELDID_PROVIDER_LABEL, CPFT_SMALL_TEXT, L"Provider Label", CPFG_CREDENTIAL_PROVIDER_LABEL }, CPFS_HIDDEN /* Not used yet. */, CPFIS_NONE }101 { { VBOXCREDPROV_FIELDID_PROVIDER_LABEL, CPFT_SMALL_TEXT, (LPWSTR)L"Provider Label", CPFG_CREDENTIAL_PROVIDER_LABEL }, CPFS_HIDDEN /* Not used yet. */, CPFIS_NONE } 102 102 }; 103 103 -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp
r98103 r99828 1643 1643 DWORD winEr; 1644 1644 int iPath; 1645 UINT fSetFlags = 0; /* /permissive- hack */ 1645 1646 1646 1647 winEr = vboxDispIfWddmDcCreate(&DispCfg, QDC_ONLY_ACTIVE_PATHS); … … 1744 1745 #endif 1745 1746 1746 UINTfSetFlags = !fSetTopology ? (SDC_USE_SUPPLIED_DISPLAY_CONFIG) : (SDC_ALLOW_PATH_ORDER_CHANGES | SDC_TOPOLOGY_SUPPLIED);1747 fSetFlags = !fSetTopology ? (SDC_USE_SUPPLIED_DISPLAY_CONFIG) : (SDC_ALLOW_PATH_ORDER_CHANGES | SDC_TOPOLOGY_SUPPLIED); 1747 1748 winEr = vboxDispIfWddmDcSet(&DispCfg, fSetFlags | SDC_VALIDATE); 1748 1749 if (winEr != ERROR_SUCCESS) -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxLA.cpp
r98103 r99828 158 158 159 159 160 static BOOL laGetRegistryDWORD( WCHAR *pwszRegKey,WCHAR *pwszName, DWORD *pdwValue)160 static BOOL laGetRegistryDWORD(const WCHAR *pwszRegKey, const WCHAR *pwszName, DWORD *pdwValue) 161 161 { 162 162 LONG lErr; -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h
r98103 r99828 80 80 * The environment information for services. 81 81 */ 82 typedef struct _VBOXSERVICEENV82 typedef struct VBOXSERVICEENV 83 83 { 84 84 /** hInstance of VBoxTray. */ … … 97 97 * A service descriptor. 98 98 */ 99 typedef struct _VBOXSERVICEDESC99 typedef struct VBOXSERVICEDESC 100 100 { 101 101 /** The service's name. RTTHREAD_NAME_LEN maximum characters. */ 102 c har*pszName;102 const char *pszName; 103 103 /** The service description. */ 104 c har*pszDesc;104 const char *pszDesc; 105 105 106 106 /** Callbacks. */ … … 145 145 * The service initialization info and runtime variables. 146 146 */ 147 typedef struct _VBOXSERVICEINFO147 typedef struct VBOXSERVICEINFO 148 148 { 149 149 /** Pointer to the service descriptor. */ … … 166 166 } VBOXSERVICEINFO, *PVBOXSERVICEINFO; 167 167 168 /* Globally unique (system wide) message registration. */ 169 typedef struct _VBOXGLOBALMESSAGE 168 /** 169 * Globally unique (system wide) message registration. 170 */ 171 typedef struct VBOXGLOBALMESSAGE 170 172 { 171 173 /** Message name. */ 172 c har*pszName;174 const char *pszName; 173 175 /** Function pointer for handling the message. */ 174 int (* pfnHandler)(WPARAM wParam, LPARAM lParam);176 int (*pfnHandler)(WPARAM wParam, LPARAM lParam); 175 177 176 178 /* Variables. */ -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp
r98103 r99828 65 65 }; 66 66 67 typedef struct _VBOXVRDPEXPPARAM67 typedef struct VBOXVRDPEXPPARAM 68 68 { 69 69 const char *name; … … 77 77 } VBOXVRDPEXPPARAM, *PVBOXVRDPEXPPARAM; 78 78 79 typedef struct _VBOXVRDPCONTEXT79 typedef struct VBOXVRDPCONTEXT 80 80 { 81 81 const VBOXSERVICEENV *pEnv; … … 96 96 static VBOXVRDPEXPPARAM s_aSPIParams[] = 97 97 { 98 { SPI_(MEDIUM, DESKWALLPAPER), VBOX_SPI_STRING, "" },98 { SPI_(MEDIUM, DESKWALLPAPER), VBOX_SPI_STRING, (void *)"" }, 99 99 { SPI_(FULL, DROPSHADOW), VBOX_SPI_BOOL_PTR, }, 100 100 { SPI_(HIGH, FONTSMOOTHING), VBOX_SPI_BOOL, }, -
trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp
r98794 r99828 63 63 static RTSEMEVENT g_WindowsEvent = NIL_RTSEMEVENT; 64 64 65 static SERVICE_TABLE_ENTRY const g_aServiceTable[] =66 { 67 { VBOXSERVICE_NAME, vgsvcWinMain },68 { NULL, NULL}65 static SERVICE_TABLE_ENTRYA const g_aServiceTable[] = 66 { 67 { (PSTR)VBOXSERVICE_NAME, vgsvcWinMain }, 68 { NULL, NULL} 69 69 }; 70 70 … … 188 188 * @todo Add event log capabilities / check return values. 189 189 */ 190 static int vgsvcWinAddAceToObjectsSecurityDescriptor(LP TSTR pszObjName, SE_OBJECT_TYPE enmObjectType, const char *pszTrustee,190 static int vgsvcWinAddAceToObjectsSecurityDescriptor(LPCSTR pszObjName, SE_OBJECT_TYPE enmObjectType, const char *pszTrustee, 191 191 TRUSTEE_FORM enmTrusteeForm, DWORD dwAccessRights, ACCESS_MODE fAccessMode, 192 192 DWORD dwInheritance) … … 219 219 { 220 220 /* Attach the new ACL as the object's DACL. */ 221 rcWin = g_pfnSetNamedSecurityInfoA( pszObjName, enmObjectType, DACL_SECURITY_INFORMATION,221 rcWin = g_pfnSetNamedSecurityInfoA((PSTR)pszObjName, enmObjectType, DACL_SECURITY_INFORMATION, 222 222 NULL, NULL, pNewDACL, NULL); 223 223 if (rcWin == ERROR_SUCCESS) … … 317 317 /** @todo On Vista+ SERVICE_DESCRIPTION also supports localized strings! */ 318 318 SERVICE_DESCRIPTION desc; 319 desc.lpDescription = VBOXSERVICE_DESCRIPTION;319 desc.lpDescription = (LPSTR)VBOXSERVICE_DESCRIPTION; 320 320 if (!g_pfnChangeServiceConfig2A(hService, SERVICE_CONFIG_DESCRIPTION, &desc)) 321 321 { … … 459 459 if (AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_LOCAL_RID, 0, 0, 0, 0, 0, 0, 0, &pBuiltinUsersSID)) 460 460 { 461 rc = vgsvcWinAddAceToObjectsSecurityDescriptor( TEXT("\\\\.\\VBoxMiniRdrDN"), SE_FILE_OBJECT,461 rc = vgsvcWinAddAceToObjectsSecurityDescriptor("\\\\.\\VBoxMiniRdrDN", SE_FILE_OBJECT, 462 462 (LPTSTR)pBuiltinUsersSID, TRUSTEE_IS_SID, 463 463 FILE_GENERIC_READ | FILE_GENERIC_WRITE, SET_ACCESS, NO_INHERITANCE); -
trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
r98103 r99828 1393 1393 NetRsrc.lpLocalName = wszDrive; 1394 1394 NetRsrc.lpRemoteName = wszPrefixedName; 1395 NetRsrc.lpProvider = L"VirtualBox Shared Folders"; /* Only try our provider. */1395 NetRsrc.lpProvider = (PWSTR)L"VirtualBox Shared Folders"; /* Only try our provider. */ 1396 1396 NetRsrc.lpComment = pwszName; 1397 1397 -
trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp
r98103 r99828 120 120 * Registers a new module with the VMM 121 121 * @param pModule Module ptr 122 * @param fValidateMemory Validate/touch memory pages or not 123 */ 124 static void vgsvcPageSharingRegisterModule(PVGSVCPGSHKNOWNMOD pModule, bool fValidateMemory) 122 * @param fValidateMemory Validate/touch memory pages or not 123 * @param pVersionInfo Version info bytes. 124 */ 125 static void vgsvcPageSharingRegisterModuleInner(PVGSVCPGSHKNOWNMOD pModule, bool fValidateMemory, BYTE *pVersionInfo) 125 126 { 126 127 VMMDEVSHAREDREGIONDESC aRegions[VMMDEVSHAREDREGIONDESC_MAX]; 127 128 DWORD dwModuleSize = pModule->Info.modBaseSize; 128 129 BYTE *pBaseAddress = pModule->Info.modBaseAddr; 129 130 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule\n");131 132 DWORD dwDummy;133 DWORD cbVersion = GetFileVersionInfoSize(pModule->Info.szExePath, &dwDummy);134 if (!cbVersion)135 {136 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: GetFileVersionInfoSize failed with %d\n", GetLastError());137 return;138 }139 BYTE *pVersionInfo = (BYTE *)RTMemAllocZ(cbVersion);140 if (!pVersionInfo)141 return;142 143 if (!GetFileVersionInfo(pModule->Info.szExePath, 0, cbVersion, pVersionInfo))144 {145 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: GetFileVersionInfo failed with %d\n", GetLastError());146 goto end;147 }148 130 149 131 /* Fetch default code page. */ … … 160 142 { 161 143 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: VerQueryValue failed with %d (cb=%d)\n", GetLastError(), cbTranslate); 162 goto end;144 return; 163 145 } 164 146 … … 172 154 { 173 155 /* Fetch file version string. */ 174 char szFileVersionLocation[256];156 char szFileVersionLocation[256]; 175 157 176 158 /** @todo r=bird: Mixing ANSI and TCHAR crap again. This code is a mess. We … … 189 171 { 190 172 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: no file version found!\n"); 191 goto end;173 return; 192 174 } 193 175 194 176 unsigned idxRegion = 0; 195 196 177 if (fValidateMemory) 197 178 { … … 256 237 if (idxRegion >= RT_ELEMENTS(aRegions)) 257 238 break; /* out of room */ 258 } 259 while (dwModuleSize); 239 } while (dwModuleSize); 260 240 } 261 241 else … … 270 250 idxRegion++; 271 251 } 272 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: VbglR3RegisterSharedModule %s %s base=%p size=%x cregions=%d\n", pModule->Info.szModule, pModule->szFileVersion, pModule->Info.modBaseAddr, pModule->Info.modBaseSize, idxRegion); 252 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: VbglR3RegisterSharedModule %s %s base=%p size=%x cregions=%d\n", 253 pModule->Info.szModule, pModule->szFileVersion, pModule->Info.modBaseAddr, pModule->Info.modBaseSize, idxRegion); 273 254 int rc = VbglR3RegisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (uintptr_t)pModule->Info.modBaseAddr, 274 255 pModule->Info.modBaseSize, idxRegion, aRegions); 275 256 if (RT_FAILURE(rc)) 276 257 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: VbglR3RegisterSharedModule failed with %Rrc\n", rc); 277 278 end: 279 RTMemFree(pVersionInfo); 280 return; 258 } 259 260 261 /** 262 * Registers a new module with the VMM 263 * @param pModule Module ptr 264 * @param fValidateMemory Validate/touch memory pages or not 265 */ 266 static void vgsvcPageSharingRegisterModule(PVGSVCPGSHKNOWNMOD pModule, bool fValidateMemory) 267 { 268 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule\n"); 269 270 DWORD dwDummy; 271 DWORD cbVersion = GetFileVersionInfoSize(pModule->Info.szExePath, &dwDummy); 272 if (cbVersion) 273 { 274 BYTE *pVersionInfo = (BYTE *)RTMemTmpAllocZ(cbVersion); 275 if (pVersionInfo) 276 { 277 if (GetFileVersionInfo(pModule->Info.szExePath, 0, cbVersion, pVersionInfo)) 278 vgsvcPageSharingRegisterModuleInner(pModule, fValidateMemory, pVersionInfo); 279 else 280 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: GetFileVersionInfo failed with %d\n", GetLastError()); 281 RTMemTmpFree(pVersionInfo); 282 } 283 } 284 else 285 VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: GetFileVersionInfoSize failed with %d\n", GetLastError()); 281 286 } 282 287 -
trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp
r98103 r99828 80 80 typedef struct VBOXSERVICEVMINFOFILE 81 81 { 82 c har *pszFilePath;83 c har *pszFileName;82 const char *pszFilePath; 83 const char *pszFileName; 84 84 } VBOXSERVICEVMINFOFILE, *PVBOXSERVICEVMINFOFILE; 85 85 -
trunk/src/VBox/Devices/Audio/DrvHostAudioDSoundMMNotifClient.cpp
r98103 r99828 102 102 STDMETHODIMP DrvHostAudioDSoundMMNotifClient::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState) 103 103 { 104 c har *pszState = "unknown";104 const char *pszState = "unknown"; 105 105 106 106 switch (dwNewState) … … 180 180 { 181 181 PDMAUDIODIR enmDir = PDMAUDIODIR_INVALID; 182 c har*pszRole = "unknown";182 const char *pszRole = "unknown"; 183 183 if (eFlow == eRender) 184 184 { -
trunk/src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp
r98103 r99828 1997 1997 pThis->pNotifyClient->lockLeave(); 1998 1998 1999 P RTUTF16 pwszDevId = pCfgReq->enmDir == PDMAUDIODIR_IN ? pThis->pwszInputDevId : pThis->pwszOutputDevId;2000 P RTUTF16 const pwszDevIdDesc = pwszDevId ? pwszDevId : pCfgReq->enmDir == PDMAUDIODIR_IN ? L"{Default-In}" : L"{Default-Out}";1999 PCRTUTF16 pwszDevId = pCfgReq->enmDir == PDMAUDIODIR_IN ? pThis->pwszInputDevId : pThis->pwszOutputDevId; 2000 PCRTUTF16 const pwszDevIdDesc = pwszDevId ? pwszDevId : pCfgReq->enmDir == PDMAUDIODIR_IN ? L"{Default-In}" : L"{Default-Out}"; 2001 2001 if (!pIDevice) 2002 2002 { -
trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp
r98103 r99828 386 386 LSA_UNICODE_STRING lwsPrivilege; 387 387 // Create an LSA_UNICODE_STRING for the privilege names. 388 lwsPrivilege.Buffer = L"SeServiceLogonRight";388 lwsPrivilege.Buffer = (PWSTR)L"SeServiceLogonRight"; 389 389 size_t cwPrivilege = wcslen(lwsPrivilege.Buffer); 390 390 lwsPrivilege.Length = (USHORT)cwPrivilege * sizeof(WCHAR); -
trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
r98103 r99828 427 427 /* .QueryRoutine = */ NULL, 428 428 /* .Flags = */ RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_TYPECHECK, 429 /* .Name = */ L"ForceAsyncTsc",429 /* .Name = */ (PWSTR)L"ForceAsyncTsc", 430 430 /* .EntryContext = */ &g_Options.fOptForceAsyncTsc, 431 431 /* .DefaultType = */ (REG_DWORD << RTL_QUERY_REGISTRY_TYPECHECK_SHIFT) | REG_DWORD, -
trunk/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp
r98103 r99828 1376 1376 uint64_t u64Tmp = 0; 1377 1377 ULONG ulTmp = 0; 1378 PVOID pInfo = &ulTmp;1378 void const *pvInfo = &ulTmp; 1379 1379 ULONG cbInfo = sizeof(ulTmp); 1380 1380 … … 1393 1393 pParams->Flags = 0; 1394 1394 pParams->InterruptModeration = NdisInterruptModerationNotSupported; 1395 p Info = NULL; /* Do not copy */1395 pvInfo = NULL; /* Do not copy */ 1396 1396 break; 1397 1397 } … … 1407 1407 break; 1408 1408 case OID_GEN_RCV_OK: 1409 p Info = vboxNetAdpWinStatsU64(&u64Tmp, &cbInfo, vboxNetAdpWinStatsTotals(pThis->au64StatsInPackets));1409 pvInfo = vboxNetAdpWinStatsU64(&u64Tmp, &cbInfo, vboxNetAdpWinStatsTotals(pThis->au64StatsInPackets)); 1410 1410 break; 1411 1411 case OID_GEN_XMIT_OK: 1412 p Info = vboxNetAdpWinStatsU64(&u64Tmp, &cbInfo, vboxNetAdpWinStatsTotals(pThis->au64StatsOutPackets));1412 pvInfo = vboxNetAdpWinStatsU64(&u64Tmp, &cbInfo, vboxNetAdpWinStatsTotals(pThis->au64StatsOutPackets)); 1413 1413 break; 1414 1414 case OID_GEN_STATISTICS: … … 1419 1419 if (cbInfo > pQuery->InformationBufferLength) 1420 1420 break; 1421 p Info = NULL; /* Do not copy */1421 pvInfo = NULL; /* Do not copy */ 1422 1422 memset(pStats, 0, cbInfo); 1423 1423 pStats->Header.Type = NDIS_OBJECT_TYPE_DEFAULT; … … 1461 1461 } 1462 1462 case OID_GEN_VENDOR_DESCRIPTION: 1463 p Info = VBOXNETADP_VENDOR_NAME;1463 pvInfo = VBOXNETADP_VENDOR_NAME; 1464 1464 cbInfo = sizeof(VBOXNETADP_VENDOR_NAME); 1465 1465 break; … … 1472 1472 case OID_802_3_PERMANENT_ADDRESS: 1473 1473 case OID_802_3_CURRENT_ADDRESS: 1474 p Info = &pThis->MacAddr;1474 pvInfo = &pThis->MacAddr; 1475 1475 cbInfo = sizeof(pThis->MacAddr); 1476 1476 break; … … 1480 1480 break; 1481 1481 case OID_PNP_CAPABILITIES: 1482 p Info = &pThis->pGlobals->PMCaps;1482 pvInfo = &pThis->pGlobals->PMCaps; 1483 1483 cbInfo = sizeof(pThis->pGlobals->PMCaps); 1484 1484 break; 1485 1485 case OID_PNP_QUERY_POWER: 1486 p Info = NULL; /* Do not copy */1486 pvInfo = NULL; /* Do not copy */ 1487 1487 cbInfo = 0; 1488 1488 break; … … 1501 1501 else 1502 1502 { 1503 if (p Info)1504 NdisMoveMemory(pQuery->InformationBuffer, p Info, cbInfo);1503 if (pvInfo) 1504 NdisMoveMemory(pQuery->InformationBuffer, pvInfo, cbInfo); 1505 1505 pQuery->BytesWritten = cbInfo; 1506 1506 } -
trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h
r99739 r99828 493 493 /** @} */ 494 494 495 #ifdef RT_OS_WINDOWS 496 /** The NDIS_STRING_CONST macro doesn't work in /permissive- mode, so "fix" that. 497 * Putting it in this header as it's the only common to all users. */ 498 # define VBOX_NDIS_STRING_CONST(a_sz) { sizeof(L##a_sz) - sizeof(WCHAR), sizeof(L##a_sz), (PWSTR)L##a_sz } 499 #endif 495 500 496 501 RT_C_DECLS_END -
trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp
r98103 r99828 1357 1357 1358 1358 static HRESULT netIfExecMethod(IWbemServices * pSvc, IWbemClassObject *pClass, com::Bstr const &rObjPath, 1359 const char *pszMethodName, LP WSTR *papwszArgNames, LPVARIANT *pArgs, UINT cArgs,1359 const char *pszMethodName, LPCWSTR *papwszArgNames, LPVARIANT *pArgs, UINT cArgs, 1360 1360 IWbemClassObject **ppOutParams) 1361 1361 { … … 1503 1503 if (SUCCEEDED(hr)) 1504 1504 { 1505 LP WSTR argNames[] = {L"IPAddress", L"SubnetMask"};1506 LPVARIANT args[] = { pIp, pMask };1505 LPCWSTR argNames[] = {L"IPAddress", L"SubnetMask"}; 1506 LPVARIANT args[] = { pIp, pMask }; 1507 1507 1508 1508 ComPtr<IWbemClassObject> pOutParams; … … 1596 1596 if (SUCCEEDED(hr)) 1597 1597 { 1598 LP WSTR argNames[] = {L"DefaultIPGateway"};1599 LPVARIANT args[] = {pGw};1598 LPCWSTR argNames[] = {L"DefaultIPGateway"}; 1599 LPVARIANT args[] = {pGw}; 1600 1600 ComPtr<IWbemClassObject> pOutParams; 1601 1601 -
trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp
r98103 r99828 185 185 NDIS_HANDLE hConfiguration; 186 186 PNDIS_CONFIGURATION_PARAMETER pParameterValue; 187 NDIS_STRING strMAC = NDIS_STRING_CONST("MAC");187 NDIS_STRING strMAC = VBOX_NDIS_STRING_CONST("MAC"); 188 188 RTMAC mac; 189 189 … … 341 341 if (Status == STATUS_SUCCESS) 342 342 { 343 static UNICODE_STRING NetCfgInstanceIdValue = NDIS_STRING_CONST("NetCfgInstanceId");343 static UNICODE_STRING NetCfgInstanceIdValue = VBOX_NDIS_STRING_CONST("NetCfgInstanceId"); 344 344 // UCHAR valBuf[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + RTUUID_STR_LENGTH*2 + 10]; 345 345 // ULONG cLength = sizeof(valBuf); -
trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp
r98103 r99828 142 142 { 143 143 PNDIS_CONFIGURATION_PARAMETER pParam; 144 NDIS_STRING UppedBindStr = NDIS_STRING_CONST("UpperBindings");144 NDIS_STRING UppedBindStr = VBOX_NDIS_STRING_CONST("UpperBindings"); 145 145 NdisReadConfiguration(&Status, &pParam, hConfig, &UppedBindStr, NdisParameterString); 146 146 Assert(Status == NDIS_STATUS_SUCCESS); -
trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp
r98103 r99828 1373 1373 if (Status == NDIS_STATUS_SUCCESS) 1374 1374 { 1375 NDIS_STRING strCfgParam = NDIS_STRING_CONST("PassVmTrafficToHost");1375 NDIS_STRING strCfgParam = VBOX_NDIS_STRING_CONST("PassVmTrafficToHost"); 1376 1376 PNDIS_CONFIGURATION_PARAMETER pParam = NULL; 1377 1377 NdisReadConfiguration(&Status, &pParam, hConfig, &strCfgParam, NdisParameterInteger); -
trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
r98103 r99828 1688 1688 RTL_QUERY_REGISTRY_TABLE aParams[] = 1689 1689 { 1690 {vboxUsbFltRegKeyQuery, 0, L"ForceReplugWhenDevPopulateFails", &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, REG_DWORD, &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, sizeof(ULONG) },1691 { NULL, 0, NULL, NULL, 0,0, 0 }1690 {vboxUsbFltRegKeyQuery, 0, (PWSTR)L"ForceReplugWhenDevPopulateFails", &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, REG_DWORD, &g_VBoxUsbFltGlobals.dwForceReplugWhenDevPopulateFails, sizeof(ULONG) }, 1691 { NULL, 0, NULL, NULL, 0, 0, 0 } 1692 1692 }; 1693 1693 UNICODE_STRING UnicodePath = RTL_CONSTANT_STRING(L"\\VBoxUSB"); -
trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
r98103 r99828 804 804 * @param uErrId Unique error id representing the location in the driver. 805 805 * @param cbDumpData Number of bytes at pDumpData. 806 * @param pDumpData Pointer to data that will be added to the message (see 'details' tab). 806 * @param pvDumpData Pointer to data that will be added to the message 807 * (see 'details' tab). 807 808 * 808 809 * NB: We only use IoLogMsg.dll as the message file, limiting 809 810 * ErrCode to status codes and messages defined in ntiologc.h 810 811 */ 811 static void vboxUsbMonLogError(NTSTATUS ErrCode, NTSTATUS ReturnedStatus, ULONG uErrId, USHORT cbDumpData, PVOID pDumpData)812 static void vboxUsbMonLogError(NTSTATUS ErrCode, NTSTATUS ReturnedStatus, ULONG uErrId, USHORT cbDumpData, void const *pvDumpData) 812 813 { 813 814 PIO_ERROR_LOG_PACKET pErrEntry; … … 824 825 uint8_t *pDump = (uint8_t *)pErrEntry->DumpData; 825 826 if (cbDumpData) 826 memcpy(pDump, p DumpData, cbDumpData);827 memcpy(pDump, pvDumpData, cbDumpData); 827 828 pErrEntry->MajorFunctionCode = 0; 828 829 pErrEntry->RetryCount = 0; -
trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp
r98103 r99828 46 46 /** @todo r=bird: why do we need to query the size first and then the data. 47 47 * The API should be perfectly capable of doing that without our help. */ 48 WCHAR wcDummy = 0; 48 49 DWORD cwcNeeded = 0; 49 UINT uiRet = MsiGetPropertyW(hMsi, pwszName, L"", &cwcNeeded);50 UINT uiRet = MsiGetPropertyW(hMsi, pwszName, &wcDummy, &cwcNeeded); 50 51 if (uiRet == ERROR_MORE_DATA) 51 52 { -
trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp
r98103 r99828 772 772 773 773 /** RTPathAppend-like function. */ 774 static UINT AppendToPath(wchar_t *pwszPath, size_t cwcPath, wchar_t *pwszAppend, bool fDoubleTerm = false)774 static UINT AppendToPath(wchar_t *pwszPath, size_t cwcPath, const wchar_t *pwszAppend, bool fDoubleTerm = false) 775 775 { 776 776 size_t cwcCurPath = RTUtf16Len(pwszPath); … … 792 792 793 793 /** RTPathJoin-like function. */ 794 static UINT JoinPaths(wchar_t *pwszPath, size_t cwcPath, wchar_t *pwszPath1, wchar_t *pwszAppend, bool fDoubleTerm = false)794 static UINT JoinPaths(wchar_t *pwszPath, size_t cwcPath, wchar_t *pwszPath1, const wchar_t *pwszAppend, bool fDoubleTerm = false) 795 795 { 796 796 size_t cwcCurPath = RTUtf16Len(pwszPath1); -
trunk/src/VBox/Runtime/r3/nt/RTPathQueryInfo-nt.cpp
r98103 r99828 118 118 /** @todo query the whole path as it is possible relative. Use the buffer for 119 119 * temporary name storage. */ 120 pNtParent->Buffer = L".";120 pNtParent->Buffer = (PWCH)L"."; 121 121 pNtParent->Length = 1 * sizeof(RTUTF16); 122 122 pNtParent->MaximumLength = 2 * sizeof(RTUTF16); -
trunk/src/VBox/Runtime/r3/win/fileio-win.cpp
r98103 r99828 1021 1021 NtClose(hDupFile); 1022 1022 1023 if ( RT_SUCCESS(rcNt))1023 if (NT_SUCCESS(rcNt)) 1024 1024 return VINF_SUCCESS; 1025 1025 return RTErrConvertFromNtStatus(rcNt); -
trunk/src/VBox/Runtime/r3/win/process-win.cpp
r99483 r99828 1434 1434 && rtProcWinAddSidToDesktop(hDesktop, pSid)) 1435 1435 { 1436 pStartupInfo->lpDesktop = L"winsta0\\default";1436 pStartupInfo->lpDesktop = (PWSTR)L"winsta0\\default"; 1437 1437 } 1438 1438 RTMemFree(pSid); -
trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h
r98103 r99828 1156 1156 VID_PROCESSOR_STATUS enmCpuStatus = VidProcessorStatusUndefined; 1157 1157 NTSTATUS rcNt = g_pfnVidGetVirtualProcessorRunningStatus(pVCpu->pVMR3->nem.s.hPartitionDevice, pVCpu->idCpu, &enmCpuStatus); 1158 Assert RC(rcNt);1158 AssertMsg(NT_SUCCESS(rcNt), ("rcNt=%#x\n", rcNt)); 1159 1159 1160 1160 RTErrVarsRestore(&Saved);
Note:
See TracChangeset
for help on using the changeset viewer.

