Skip to content

Commit 0fefbdf

Browse files
Albertyang0Albertyang0
authored
Merge pull request #5780 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
2 parents 7ced3ed + 88cc5e0 commit 0fefbdf

20 files changed

+60
-73
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -998,11 +998,11 @@ Concatenates two strings or a character and a string.
998998
```cpp
999999
friend CStringT operator+(const CStringT& str1, const CStringT& str2);
10001000
friend CStringT operator+(const CStringT& str1, PCXSTR psz2);
1001-
friend CStringT operator+(PCXSTR psz1, const CStringT& str2,);
1002-
friend CStringT operator+(char ch1, const CStringT& str2,);
1001+
friend CStringT operator+(PCXSTR psz1, const CStringT& str2);
1002+
friend CStringT operator+(char ch1, const CStringT& str2);
10031003
friend CStringT operator+(const CStringT& str1, char ch2);
10041004
friend CStringT operator+(const CStringT& str1, wchar_t ch2);
1005-
friend CStringT operator+(wchar_t ch1, const CStringT& str2,);
1005+
friend CStringT operator+(wchar_t ch1, const CStringT& str2);
10061006
```
10071007

10081008
### Parameters
@@ -1102,8 +1102,8 @@ friend bool operator==(const CStringT& str1, PCXSTR psz2) throw();
11021102
friend bool operator==(const CStringT& str1, PCYSTR psz2) throw();
11031103
friend bool operator==(const CStringT& str1, XCHAR ch2) throw();
11041104
friend bool operator==(PCXSTR psz1, const CStringT& str2) throw();
1105-
friend bool operator==(PCYSTR psz1, const CStringT& str2,) throw();
1106-
friend bool operator==(XCHAR ch1, const CStringT& str2,) throw();
1105+
friend bool operator==(PCYSTR psz1, const CStringT& str2) throw();
1106+
friend bool operator==(XCHAR ch1, const CStringT& str2) throw();
11071107
```
11081108

11091109
### Parameters
@@ -1144,8 +1144,8 @@ friend bool operator!=(const CStringT& str1, PCXSTR psz2) throw();
11441144
friend bool operator!=(const CStringT& str1, PCYSTR psz2) throw();
11451145
friend bool operator!=(const CStringT& str1, XCHAR ch2) throw();
11461146
friend bool operator!=(PCXSTR psz1, const CStringT& str2) throw();
1147-
friend bool operator!=(PCYSTR psz1, const CStringT& str2,) throw();
1148-
friend bool operator!=(XCHAR ch1, const CStringT& str2,) throw();
1147+
friend bool operator!=(PCYSTR psz1, const CStringT& str2) throw();
1148+
friend bool operator!=(XCHAR ch1, const CStringT& str2) throw();
11491149
```
11501150

11511151
### Parameters

‎docs/atl/reference/cstockpropimpl-class.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: CStockPropImpl Class"
32
title: "CStockPropImpl Class"
3+
description: "Learn more about: CStockPropImpl Class"
44
ms.date: "05/06/2019"
55
f1_keywords: ["CStockPropImpl", "ATLCTL/ATL::CStockPropImpl", "ATLCTL/ATL::get_Appearance", "ATLCTL/ATL::get_AutoSize", "ATLCTL/ATL::get_BackColor", "ATLCTL/ATL::get_BackStyle", "ATLCTL/ATL::get_BorderColor", "ATLCTL/ATL::get_BorderStyle", "ATLCTL/ATL::get_BorderVisible", "ATLCTL/ATL::get_BorderWidth", "ATLCTL/ATL::get_Caption", "ATLCTL/ATL::get_DrawMode", "ATLCTL/ATL::get_DrawStyle", "ATLCTL/ATL::get_DrawWidth", "ATLCTL/ATL::get_Enabled", "ATLCTL/ATL::get_FillColor", "ATLCTL/ATL::get_FillStyle", "ATLCTL/ATL::get_Font", "ATLCTL/ATL::get_ForeColor", "ATLCTL/ATL::get_HWND", "ATLCTL/ATL::get_MouseIcon", "ATLCTL/ATL::get_MousePointer", "ATLCTL/ATL::get_Picture", "ATLCTL/ATL::get_ReadyState", "ATLCTL/ATL::get_TabStop", "ATLCTL/ATL::get_Text", "ATLCTL/ATL::getvalid", "ATLCTL/ATL::get_Window", "ATLCTL/ATL::put_Appearance", "ATLCTL/ATL::put_AutoSize", "ATLCTL/ATL::put_BackColor", "ATLCTL/ATL::put_BackStyle", "ATLCTL/ATL::put_BorderColor", "ATLCTL/ATL::put_BorderStyle", "ATLCTL/ATL::put_BorderVisible", "ATLCTL/ATL::put_BorderWidth", "ATLCTL/ATL::put_Caption", "ATLCTL/ATL::put_DrawMode", "ATLCTL/ATL::put_DrawStyle", "ATLCTL/ATL::put_DrawWidth", "ATLCTL/ATL::put_Enabled", "ATLCTL/ATL::put_FillColor", "ATLCTL/ATL::put_FillStyle", "ATLCTL/ATL::put_Font", "ATLCTL/ATL::put_ForeColor", "ATLCTL/ATL::put_HWND", "ATLCTL/ATL::put_MouseIcon", "ATLCTL/ATL::put_MousePointer", "ATLCTL/ATL::put_Picture", "ATLCTL/ATL::put_ReadyState", "ATLCTL/ATL::put_TabStop", "ATLCTL/ATL::put_Text", "ATLCTL/ATL::putvalid", "ATLCTL/ATL::put_Window", "ATLCTL/ATL::putref_Font", "ATLCTL/ATL::putref_MouseIcon", "ATLCTL/ATL::putref_Picture"]
66
helpviewer_keywords: ["CStockPropImpl class", "controls [ATL], stock properties", "stock properties, ATL controls"]
7-
ms.assetid: 45f11d7d-6580-4a0e-872d-3bc8b836cfda
87
---
98
# CStockPropImpl Class
109

@@ -607,7 +606,7 @@ Returns S_OK on success, or an error HRESULT on failure.
607606
Call this method to set the value of flag that indicates if the control cannot be any other size.
608607

609608
```
610-
HRESULT STDMETHODCALLTYPE put_AutoSize(VARIANT_BOOL bAutoSize,);
609+
HRESULT STDMETHODCALLTYPE put_AutoSize(VARIANT_BOOL bAutoSize);
611610
```
612611

613612
### Parameters
@@ -1100,5 +1099,5 @@ The same as [CStockPropImpl::put_Picture](#put_picture), but with a reference co
11001099

11011100
## See also
11021101

1103-
[Class Overview](../../atl/atl-class-overview.md)<br/>
1102+
[Class Overview](../../atl/atl-class-overview.md)\
11041103
[IDispatchImpl Class](../../atl/reference/idispatchimpl-class.md)

‎docs/build/vscpp-step-2-build.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ If red squiggles appear under anything in the source code editor, the build may
8888

8989
::: moniker range="<msvc-170"
9090

91-
If the path shown in File Explorer ends in `\HelloWorld\HelloWorld`, you opened the HelloWorld *project* instead of the HelloWorld *solution*. You won't see your app in th `Debug` folder. Navigate up a level in File Explorer to get to the solution folder, the first *HelloWorld* in the path. This folder also contains a `Debug` folder, where your app is.
91+
If the path shown in File Explorer ends in `\HelloWorld\HelloWorld`, you opened the HelloWorld *project* instead of the HelloWorld *solution*. You won't see your app in the `Debug` folder. Navigate up a level in File Explorer to get to the solution folder, the first *HelloWorld* in the path. This folder also contains a `Debug` folder, where your app is.
9292

9393
You can also navigate to the solution `Debug` folder at the command line to run your app. Your app won't run from other directories without specifying the path to the app. However, you can copy your app to another directory and run it from there. It's also possible to copy it to a directory specified by your `PATH` environment variable, then run it from anywhere.
9494

‎docs/c-runtime-library/reference/sopen-s-wsopen-s.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
2-
description: "Learn more about: _sopen_s, _wsopen_s"
32
title: "_sopen_s, _wsopen_s"
3+
description: "Learn more about: _sopen_s, _wsopen_s"
44
ms.date: 05/18/2022
55
api_name: ["_sopen_s", "_wsopen_s", "_o__sopen_s", "_o__wsopen_s"]
66
api_location: ["msvcrt.dll", "msvcr80.dll", "msvcr90.dll", "msvcr100.dll", "msvcr100_clr0400.dll", "msvcr110.dll", "msvcr110_clr0400.dll", "msvcr120.dll", "msvcr120_clr0400.dll", "ucrtbase.dll", "api-ms-win-crt-stdio-l1-1-0.dll"]
77
api_type: ["DLLExport"]
88
topic_type: ["apiref"]
99
f1_keywords: ["CORECRT_IO/_sopen_s", "CORECRT_WIO/_wsopen_s", "TCHAR/_tsopen_s", "_sopen_s", "_wsopen_s", "_tsopen_s", "sopen_s", "wsopen_s"]
1010
helpviewer_keywords: ["sopen_s function", "_wsopen_s function", "wsopen_s function", "opening files, for sharing", "files [C++], opening", "_sopen_s function", "files [C++], sharing"]
11-
ms.assetid: 059a0084-d08c-4973-9174-55e391b72aa2
1211
---
1312
# `_sopen_s`, `_wsopen_s`
1413

@@ -29,7 +28,7 @@ errno_t _wsopen_s(
2928
const wchar_t *filename,
3029
int oflag,
3130
int shflag,
32-
int pmode,
31+
int pmode
3332
);
3433
```
3534

‎docs/intrinsics/arm-intrinsics.md

Lines changed: 2 additions & 3 deletions
Large diffs are not rendered by default.

‎docs/intrinsics/x86-intrinsics-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ The following table lists the intrinsics available on x86 processors. The Techno
11391139
| [`_mm256_set1_ps`](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_set1_ps) | AVX | immintrin.h | `__m256 _mm256_set1_ps(float);` |
11401140
| [`_mm256_setr_epi16`](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_setr_epi16) | AVX | immintrin.h | `(__m256i _mm256_setr_epi16(short, short, short, short, short, short, short, short, short, short, short, short, short, short, short, short);` |
11411141
| [`_mm256_setr_epi32`](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_setr_epi32) | AVX | immintrin.h | `__m256i _mm256_setr_epi32(int, int, int, int, int, int, int, int);` |
1142-
| [`_mm256_setr_epi8`](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_setr_epi8) | AVX | immintrin.h | `(__m256i _mm256_setr_epi8(char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char,);` |
1142+
| [`_mm256_setr_epi8`](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_setr_epi8) | AVX | immintrin.h | `(__m256i _mm256_setr_epi8(char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char, char);` |
11431143
| [`_mm256_setr_pd`](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_setr_pd) | AVX | immintrin.h | `__m256d _mm256_setr_pd(double, double, double, double);` |
11441144
| [`_mm256_setr_ps`](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_setr_ps) | AVX | immintrin.h | `__m256 _mm256_setr_ps(float, float, float, float, float, float, float, float);` |
11451145
| [`_mm256_setzero_pd`](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_setzero_pd) | AVX | immintrin.h | `__m256d _mm256_setzero_pd(void);` |

‎docs/mfc/reference/cd2dpathgeometry-class.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: CD2DPathGeometry Class"
32
title: "CD2DPathGeometry Class"
3+
description: "Learn more about: CD2DPathGeometry Class"
44
ms.date: "11/04/2016"
55
f1_keywords: ["CD2DPathGeometry", "AFXRENDERTARGET/CD2DPathGeometry", "AFXRENDERTARGET/CD2DPathGeometry::CD2DPathGeometry", "AFXRENDERTARGET/CD2DPathGeometry::Attach", "AFXRENDERTARGET/CD2DPathGeometry::Create", "AFXRENDERTARGET/CD2DPathGeometry::Destroy", "AFXRENDERTARGET/CD2DPathGeometry::Detach", "AFXRENDERTARGET/CD2DPathGeometry::GetFigureCount", "AFXRENDERTARGET/CD2DPathGeometry::GetSegmentCount", "AFXRENDERTARGET/CD2DPathGeometry::Open", "AFXRENDERTARGET/CD2DPathGeometry::Stream", "AFXRENDERTARGET/CD2DPathGeometry::m_pPathGeometry"]
66
helpviewer_keywords: ["CD2DPathGeometry [MFC], CD2DPathGeometry", "CD2DPathGeometry [MFC], Attach", "CD2DPathGeometry [MFC], Create", "CD2DPathGeometry [MFC], Destroy", "CD2DPathGeometry [MFC], Detach", "CD2DPathGeometry [MFC], GetFigureCount", "CD2DPathGeometry [MFC], GetSegmentCount", "CD2DPathGeometry [MFC], Open", "CD2DPathGeometry [MFC], Stream", "CD2DPathGeometry [MFC], m_pPathGeometry"]
7-
ms.assetid: 686216eb-5080-4242-ace5-8fa1ce96307c
87
---
98
# CD2DPathGeometry Class
109

@@ -127,7 +126,7 @@ Pointer to detached resource interface.
127126
128127
## <a name="getfigurecount"></a> CD2DPathGeometry::GetFigureCount
129128
130-
Retrieves tthe number of figures in the path geometry.
129+
Retrieves the number of figures in the path geometry.
131130
132131
```
133132
int GetFigureCount() const;

‎docs/mfc/reference/cgopherconnection-class.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: CGopherConnection Class"
32
title: "CGopherConnection Class"
3+
description: "Learn more about: CGopherConnection Class"
44
ms.date: "11/04/2016"
55
f1_keywords: ["CGopherConnection", "AFXINET/CGopherConnection", "AFXINET/CGopherConnection::CGopherConnection", "AFXINET/CGopherConnection::CreateLocator", "AFXINET/CGopherConnection::GetAttribute", "AFXINET/CGopherConnection::OpenFile"]
66
helpviewer_keywords: ["CGopherConnection [MFC], CGopherConnection", "CGopherConnection [MFC], CreateLocator", "CGopherConnection [MFC], GetAttribute", "CGopherConnection [MFC], OpenFile"]
7-
ms.assetid: b5b96aea-ac99-430e-bd84-d1372b43f78f
87
---
98
# CGopherConnection Class
109

@@ -167,8 +166,9 @@ Call this member function to retrieve specific attribute information about an it
167166

168167
```
169168
BOOL GetAttribute(
170-
CGopherLocator& refLocator CString strRequestedAttributes,
171-
CString& strResult,);
169+
CGopherLocator& refLocator,
170+
CString strRequestedAttributes,
171+
CString& strResult);
172172
```
173173

174174
### Parameters
@@ -222,11 +222,11 @@ Override the *dwContext* default to set the context identifier to a value of you
222222

223223
## See also
224224

225-
[CInternetConnection Class](../../mfc/reference/cinternetconnection-class.md)<br/>
226-
[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
227-
[CFtpConnection Class](../../mfc/reference/cftpconnection-class.md)<br/>
228-
[CHttpConnection Class](../../mfc/reference/chttpconnection-class.md)<br/>
229-
[CInternetConnection Class](../../mfc/reference/cinternetconnection-class.md)<br/>
230-
[CGopherLocator Class](../../mfc/reference/cgopherlocator-class.md)<br/>
231-
[CGopherFile Class](../../mfc/reference/cgopherfile-class.md)<br/>
225+
[CInternetConnection Class](../../mfc/reference/cinternetconnection-class.md)\
226+
[Hierarchy Chart](../../mfc/hierarchy-chart.md)\
227+
[CFtpConnection Class](../../mfc/reference/cftpconnection-class.md)\
228+
[CHttpConnection Class](../../mfc/reference/chttpconnection-class.md)\
229+
[CInternetConnection Class](../../mfc/reference/cinternetconnection-class.md)\
230+
[CGopherLocator Class](../../mfc/reference/cgopherlocator-class.md)\
231+
[CGopherFile Class](../../mfc/reference/cgopherfile-class.md)\
232232
[CInternetSession Class](../../mfc/reference/cinternetsession-class.md)

‎docs/mfc/reference/cmfcdynamiclayout-class.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
2-
description: "Learn more about: CMFCDynamicLayout Class"
32
title: "CMFCDynamicLayout Class"
3+
description: "Learn more about: CMFCDynamicLayout Class"
44
ms.date: "08/29/2019"
55
f1_keywords: ["CMFCDynamicLayout", "AFXLAYOUT/CMFCDynamicLayout", "AFXLAYOUT/CMFCDynamicLayout::AddItem", "AFXLAYOUT/CMFCDynamicLayout::Adjust", "AFXLAYOUT/CMFCDynamicLayout::Create", "AFXLAYOUT/CMFCDynamicLayout::GetHostWnd", "AFXLAYOUT/CMFCDynamicLayout::GetMinSize", "AFXLAYOUT/CMFCDynamicLayout::GetWindowRect", "AFXLAYOUT/CMFCDynamicLayout::HasItem", "AFXLAYOUT/CMFCDynamicLayout::IsEmpty", "AFXLAYOUT/CMFCDynamicLayout::LoadResource", "AFXLAYOUT/CMFCDynamicLayout::SetMinSize"]
6-
ms.assetid: c2df2976-f049-47fc-9cf0-abe3e01948bc
76
---
87
# CMFCDynamicLayout Class
98

@@ -170,7 +169,7 @@ The position and size of a child control is changed dynamically when a hosting w
170169
Retrieves the rectangle for the window's current client area.
171170

172171
```cpp
173-
void GetHostWndRect(CRect& rect,);
172+
void GetHostWndRect(CRect& rect);
174173
```
175174
176175
### Parameters
@@ -503,5 +502,5 @@ A [SizeSettings](#sizesettings_structure) value that encapsulates the requested
503502

504503
## See also
505504

506-
[Hierarchy Chart](../../mfc/hierarchy-chart.md)<br/>
505+
[Hierarchy Chart](../../mfc/hierarchy-chart.md)\
507506
[Classes](../../mfc/reference/mfc-classes.md)

0 commit comments

Comments
 (0)