Skip to content

Commit 3c1955b

Browse files
authored
Merge pull request #293 from Microsoft/live
merge to live (#289)
2 parents 530f6ae + d0e8faa commit 3c1955b

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"files.associations": {
33
"random": "cpp"
44
},
5+
56
"git.ignoreLimitWarning": true
67
}

docs/atl-mfc-shared/reference/cstringt-class.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,11 @@ BSTR AllocSysString() const;
235235
### Remarks
236236
In MFC programs, a [CMemoryException Class](../../mfc/reference/cmemoryexception-class.md) is thrown if insufficient memory exists. In ATL programs, a [CAtlException](../../atl/reference/catlexception-class.md) is thrown. This function is normally used to return strings for Automation.
237237

238+
238239
Commonly, if this string is passed to a COM function as an [in] parameter, then this requires the caller to free the string. This can be done by using [SysFreeString](https://msdn.microsoft.com/library/windows/desktop/ms221481.aspx), as described in the Windows SDK. For more information, see [Allocating and Releasing Memory for a BSTR](../../atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md).
239240

240241
For more information about OLE allocation functions in Windows, see [SysAllocString](https://msdn.microsoft.com/library/windows/desktop/ms221458.aspx) in the Windows SDK.
242+
241243

242244
### Example
243245
The following example demonstrates the use of `CStringT::AllocSysString`.

docs/build/msbuild-visual-cpp-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ The support file directories contain files with these extensions:
108108
## User Targets and Properties
109109

110110
To use MSBuild most effectively on the command line, it helps to know which properties and targets are useful and relevant. Most properties and targets help implement the Visual C++ build system, and consequently are not relevant to the user. This section describes some worthwhile user-oriented properties and targets.
111-
111+
112112
### PlatformToolset Property
113113

114114
The `PlatformToolset` property determines which Visual C++ toolset is used in the build. By default, the current toolset is used. When this property is set, the value of the property is concatenated with literal strings to form the path of a directory that contains the property and target files that are required to build a project for a particular platform. The platform toolset must be installed to build by using that platform toolset version.

docs/error-messages/tool-errors/project-build-error-prj0003.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ translation.priority.ht:
3939
> Error spawning '*command line*'.
4040
4141
The *command line* command formed from input in the **Property Pages** dialog box returned an error code, but no information appears in the **Output** window.
42-
42+
4343
Possible reasons for this error include:
4444

4545
- Your project depends on ATL Server. Beginning in Visual Studio 2008, ATL Server is no longer included as part of Visual Studio, but has been released as a shared-source project at CodePlex. To download the ATL Server source code and tools, go to [ATL Server Library and Tools](http://go.microsoft.com/fwlink/?LinkID=81979).

0 commit comments

Comments
 (0)