Skip to content

Commit be6e45c

Browse files
author
mikeblome
committed
Local merge conflict
2 parents e9caaed + 665f204 commit be6e45c

2,000 files changed

Lines changed: 27208 additions & 2451 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"files.associations": {}
3+
}

docs/TOC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
## [How User Account Control (UAC) Affects Your Application](security/how-user-account-control-uac-affects-your-application.md)
2323
# [Visual C++ Samples](visual-cpp-samples.md)
2424
# [Visual C++ Help and Community](visual-cpp-help-and-community.md)
25-
# [How to Report a Problem with the Visual C++ Toolset](how-to-report-a-problem-with-the-visual-cpp-toolset.md)
25+
# [How to Report a Problem with the Visual C++ Toolset](how-to-report-a-problem-with-the-visual-cpp-toolset.md)

docs/_breadcrumb/toc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
- name: Reference
5555
tocHref: /cpp/atl-mfc-shared/reference/
5656
topicHref: /cpp/atl-mfc/shared/reference/classes-shared-by-atl-and-mfc
57+
- name: C++/CX
58+
tocHref: /cpp/cppcx/
59+
topicHref: /cpp/cppcx/visual-c-language-reference-c-cx
5760
- name: Linux
5861
tocHref: /cpp/linux/
5962
topicHref: /cpp/linux/download-install-and-setup-the-linux-development-workload

docs/assembler/masm/masm-for-x64-ml64-exe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ translation.priority.ht:
3434
- "zh-tw"
3535
---
3636
# MASM for x64 (ml64.exe)
37-
ml64.exe is the assembler that accepts [!INCLUDE[vcprx64](../../assembler/inline/includes/vcprx64_md.md)] assembly language. For information on ml64.exe compiler options, see [ML and ML64 Command-Line Reference](../../assembler/masm/ml-and-ml64-command-line-reference.md).
37+
ml64.exe is the assembler that accepts x64 assembly language. For information on ml64.exe compiler options, see [ML and ML64 Command-Line Reference](../../assembler/masm/ml-and-ml64-command-line-reference.md).
3838

39-
Inline ASM is not supported for [!INCLUDE[vcprx64](../../assembler/inline/includes/vcprx64_md.md)]. Use MASM or compiler intrinsics ([x64 Intrinsics](http://msdn.microsoft.com/en-us/5d1f5d3e-156e-4ebf-932e-fd09be7ced62)).
39+
Inline ASM is not supported for x64. Use MASM or compiler intrinsics ([x64 (amd64) Intrinsics List](../../intrinsics/x64-amd64-intrinsics-list.md)).
4040

4141
The two workarounds are separate assembly with MASM (which supports x64 fully) and compiler intrinsics. We’ve added a lot of intrinsics to allow customers to make use of special-function instructions (e.g. privileged, bit scan/test, interlocked, etc…) in as close to cross-platform a manner as possible.
4242

docs/assembler/masm/public-masm.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ f1_keywords:
1212
- "public"
1313
dev_langs:
1414
- "C++"
15-
- "Assembly"
1615
helpviewer_keywords:
1716
- "PUBLIC directive"
1817
ms.assetid: 56e15a68-8a35-4bdd-b1ec-a38cbbf1c582

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class CImage
141141
`CImage` cannot be selected into a new [CDC](../../mfc/reference/cdc-class.md). `CImage` creates its own **HDC** for the image. Because an `HBITMAP` can only be selected into one **HDC** at a time, the `HBITMAP` associated with the `CImage` cannot be selected into another **HDC**. If you need a `CDC`, retrieve the **HDC** from the `CImage` and give it to [CDC::FromHandle](../../mfc/reference/cdc-class.md#cdc__fromhandle.
142142

143143
## Example
144-
```cpp
144+
```cpp
145145
// Get a CDC for the image
146146
CDC* pDC = CDC::FromHandle(m_myImage.GetDC());
147147

@@ -154,7 +154,7 @@ m_myImage.ReleaseDC();
154154
155155
156156
## Example
157-
```cpp
157+
```cpp
158158
void CMyDlg::OnRButtonDown(UINT nFlags, CPoint point)
159159
{
160160
UNREFERENCED_PARAMETER(nFlags);
@@ -468,7 +468,7 @@ BOOL CreateEx(
468468
### Example
469469
The following example creates a 100x100 pixel bitmap, using 16 bits to encode each pixel. In a given 16-bit pixel, bits 0-3 encode the red component, bits 4-7 encode green, and bits 8-11 encode blue. The remaining 4 bits are unused.
470470

471-
```cpp
471+
```cpp
472472
DWORD adwBitmasks[3] = { 0x0000000f, 0x000000f0, 0x00000f00 };
473473
m_myImage.CreateEx(100, 100, 16, BI_BITFIELDS, adwBitmasks, 0);
474474
```
@@ -666,7 +666,7 @@ static HRESULT GetExporterFilterString(CSimpleString& strExporters,
666666
667667
For example:
668668
669-
```cpp
669+
```cpp
670670
//First filter in the list will be titled "All Image Files", and
671671
//will accept files with any extension supported by any exporter.
672672
CImage::GetExporterFilterString(
@@ -755,7 +755,7 @@ static HRESULT GetImporterFilterString(CSimpleString& strImporters,
755755

756756
For example:
757757

758-
```cpp
758+
```cpp
759759
//First filter in the list will be titled "All Image Files", and
760760
//will accept files with any extension supported by any importer.
761761
CImage::GetImporterFilterString(
@@ -1501,7 +1501,7 @@ BOOL TransparentBlt(
15011501
15021502
### Example
15031503
1504-
```cpp
1504+
```cpp
15051505
// Performs a transparent blit from the source image to the destination
15061506
// image using the images' current transparency settings
15071507
BOOL TransparentBlt(CImage* pSrcImage, CImage* pDstImage,

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ void DeflateRect(int l, int t, int r, int b) throw();
384384
The first two overloads deflate both pairs of opposite sides of `CRect` so that its total width is decreased by two times *x* (or `cx`) and its total height is decreased by two times *y* (or `cy`). The other two overloads deflate each side of `CRect` independently of the others.
385385

386386
### Example
387-
```cpp
387+
```cpp
388388
CRect rect(10, 10, 50, 50);
389389
rect.DeflateRect(1, 2);
390390
ASSERT(rect.left == 11 && rect.right == 49);
@@ -415,7 +415,7 @@ BOOL EqualRect(LPCRECT lpRect) const throw();
415415
> Both of the rectangles must be normalized or this function may fail. You can call [NormalizeRect](#normalizerect) to normalize the rectangles before calling this function.
416416
417417
### Example
418-
```cpp
418+
```cpp
419419
CRect rect1(35, 150, 10, 25);
420420
CRect rect2(35, 150, 10, 25);
421421
CRect rect3(98, 999, 6, 3);
@@ -453,7 +453,7 @@ int Height() const throw();
453453
CRect rect(20, 30, 80, 70);
454454
int nHt = rect.Height();
455455

456-
```cpp
456+
```cpp
457457
CRect rect(20, 30, 80, 70);
458458
int nHt = rect.Height();
459459

@@ -540,7 +540,7 @@ BOOL IntersectRect(LPCRECT lpRect1, LPCRECT lpRect2) throw();
540540
CRect rectTwo(0, 75, 350, 95);
541541
CRect rectInter;
542542

543-
```cpp
543+
```cpp
544544
CRect rectOne(125, 0, 150, 200);
545545
CRect rectTwo(0, 75, 350, 95);
546546
CRect rectInter;
@@ -575,7 +575,7 @@ BOOL IsRectEmpty() const throw();
575575
CRect rectNone(0, 0, 0, 0);
576576
CRect rectSome(35, 50, 135, 150);
577577
578-
```cpp
578+
```cpp
579579
CRect rectNone(0, 0, 0, 0);
580580
CRect rectSome(35, 50, 135, 150);
581581
ASSERT(rectNone.IsRectEmpty());
@@ -603,7 +603,7 @@ BOOL IsRectNull() const throw();
603603
CRect rectNone(0, 0, 0, 0);
604604
CRect rectSome(35, 50, 135, 150);
605605

606-
```cpp
606+
```cpp
607607
CRect rectNone(0, 0, 0, 0);
608608
CRect rectSome(35, 50, 135, 150);
609609
ASSERT(rectNone.IsRectNull());
@@ -630,7 +630,7 @@ void MoveToX(int x) throw();
630630
CRect rect(0, 0, 100, 100);
631631
rect.MoveToX(10);
632632
633-
```cpp
633+
```cpp
634634
CRect rect(0, 0, 100, 100);
635635
rect.MoveToX(10);
636636
@@ -661,7 +661,7 @@ void MoveToXY(POINT point) throw();
661661
CRect rect(0, 0, 100, 100);
662662
rect.MoveToXY(10, 10);
663663

664-
```cpp
664+
```cpp
665665
CRect rect(0, 0, 100, 100);
666666
rect.MoveToXY(10, 10);
667667
// rect is now (10, 10, 110, 110);
@@ -685,7 +685,7 @@ void MoveToY(int y) throw();
685685
CRect rect(0, 0, 100, 100);
686686
rect.MoveToY(10);
687687
688-
```cpp
688+
```cpp
689689
CRect rect(0, 0, 100, 100);
690690
rect.MoveToY(10);
691691
// rect is now (0, 10, 100, 110);
@@ -711,7 +711,7 @@ void NormalizeRect() throw();
711711
CRect rect1(110, 100, 250, 310);
712712
CRect rect2(250, 310, 110, 100);
713713

714-
```cpp
714+
```cpp
715715
CRect rect1(110, 100, 250, 310);
716716
CRect rect2(250, 310, 110, 100);
717717
rect1.NormalizeRect();
@@ -749,7 +749,7 @@ void OffsetRect(SIZE size) throw();
749749
CRect rect(0, 0, 35, 35);
750750
rect.OffsetRect(230, 230);
751751
752-
```cpp
752+
```cpp
753753
CRect rect(0, 0, 35, 35);
754754
rect.OffsetRect(230, 230);
755755
@@ -799,7 +799,7 @@ void operator=(const RECT& srcRect) throw();
799799
CRect rect(0, 0, 127, 168);
800800
CRect rect2;
801801

802-
```cpp
802+
```cpp
803803
CRect rect(0, 0, 127, 168);
804804
CRect rect2;
805805

@@ -833,7 +833,7 @@ BOOL operator==(const RECT& rect) const throw();
833833
CRect rect2(35, 150, 10, 25);
834834
CRect rect3(98, 999, 6, 3);
835835
836-
```cpp
836+
```cpp
837837
CRect rect1(35, 150, 10, 25);
838838
CRect rect2(35, 150, 10, 25);
839839
CRect rect3(98, 999, 6, 3);
@@ -875,7 +875,7 @@ BOOL operator!=(const RECT& rect) const throw();
875875
CRect rect2(35, 150, 10, 25);
876876
CRect rect3(98, 999, 6, 3);
877877

878-
```cpp
878+
```cpp
879879
CRect rect1(35, 150, 10, 25);
880880
CRect rect2(35, 150, 10, 25);
881881
CRect rect3(98, 999, 6, 3);
@@ -921,7 +921,7 @@ void operator+=(LPCRECT lpRect) throw();
921921
CPoint pt(35, 65);
922922
CRect rect2(135, 300, 235, 400);
923923
924-
```cpp
924+
```cpp
925925
CRect rect1(100, 235, 200, 335);
926926
CPoint pt(35, 65);
927927
CRect rect2(135, 300, 235, 400);
@@ -960,7 +960,7 @@ void operator-=(LPCRECT lpRect) throw();
960960
CPoint pt(35, 65);
961961
rect1 -= pt;
962962

963-
```cpp
963+
```cpp
964964
CRect rect1(100, 235, 200, 335);
965965
CPoint pt(35, 65);
966966

@@ -1012,7 +1012,7 @@ void operator|=(const RECT& rect) throw();
10121012
CRect rect2( 0, 100, 300, 200);
10131013
rect1 |= rect2;
10141014
1015-
```cpp
1015+
```cpp
10161016
CRect rect1(100, 0, 200, 300);
10171017
CRect rect2(0, 100, 300, 200);
10181018
@@ -1050,7 +1050,7 @@ CRect operator+(SIZE size) const throw();
10501050
The third overload returns a new `CRect` that is equal to `CRect` inflated by the number of units specifed in each member of the parameter.
10511051

10521052
### Example
1053-
```cpp
1053+
```cpp
10541054
CRect rect1(100, 235, 200, 335);
10551055
CPoint pt(35, 65);
10561056
CRect rect2;
@@ -1089,7 +1089,7 @@ CRect operator-(LPCRECT lpRect) const throw();
10891089
The third overload returns a new `CRect` that is equal to `CRect` deflated by the number of units specifed in each member of the parameter. Note that this overload functions like [DeflateRect](#deflaterect), not [SubtractRect](#subtractrect).
10901090
10911091
### Example
1092-
```cpp
1092+
```cpp
10931093
CRect rect1(100, 235, 200, 335);
10941094
CPoint pt(35, 65);
10951095
CRect rect2;
@@ -1121,7 +1121,7 @@ CRect operator&(const RECT& rect2) const throw();
11211121
> Both of the rectangles must be normalized or this function may fail. You can call [NormalizeRect](#normalizerect) to normalize the rectangles before calling this function.
11221122
11231123
### Example
1124-
```cpp
1124+
```cpp
11251125
CRect rect1(100, 0, 200, 300);
11261126
CRect rect2(0, 100, 300, 200);
11271127
CRect rect3;
@@ -1159,7 +1159,7 @@ rect2) const throw();
11591159
CRect rect2( 0, 100, 300, 200);
11601160
CRect rect3;
11611161
1162-
```cpp
1162+
```cpp
11631163
CRect rect1(100, 0, 200, 300);
11641164
CRect rect2(0, 100, 300, 200);
11651165
CRect rect3;
@@ -1242,7 +1242,7 @@ void SetRect(int x1, int y1, int x2, int y2) throw();
12421242
CRect rect;
12431243
rect.SetRect(256, 256, 512, 512);
12441244
1245-
```cpp
1245+
```cpp
12461246
CRect rect;
12471247
rect.SetRect(256, 256, 512, 512);
12481248
ASSERT(rect == CRect(256, 256, 512, 512));
@@ -1318,7 +1318,7 @@ BOOL SubtractRect(LPCRECT lpRectSrc1, LPCRECT lpRectSrc2) throw();
13181318
> Both of the rectangles must be normalized or this function may fail. You can call [NormalizeRect](#normalizerect) to normalize the rectangles before calling this function.
13191319
13201320
### Example
1321-
```cpp
1321+
```cpp
13221322
RECT rectOne;
13231323
RECT rectTwo;
13241324

@@ -1393,7 +1393,7 @@ BOOL UnionRect(LPCRECT lpRect1, LPCRECT lpRect2) throw();
13931393
> Both of the rectangles must be normalized or this function may fail. You can call [NormalizeRect](#normalizerect) to normalize the rectangles before calling this function.
13941394
13951395
### Example
1396-
```cpp
1396+
```cpp
13971397
CRect rect1(100, 0, 200, 300);
13981398
CRect rect2(0, 100, 300, 200);
13991399
CRect rect3;
@@ -1421,7 +1421,7 @@ int Width() const throw();
14211421
14221422
### Example
14231423

1424-
```cpp
1424+
```cpp
14251425
CRect rect(20, 30, 80, 70);
14261426
int nWid = rect.Width();
14271427
// nWid is now 60

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ This class represents a `CSimpleStringT` object.
4848
```
4949
template <typename BaseType>
5050
class CSimpleStringT
51-
5251
```
52+
5353
### Parameters
5454
`BaseType`
5555
The character type of the string class. Can be one of the following:
@@ -148,7 +148,7 @@ void Append(PCXSTR pszSrc);
148148
### Example
149149
The following example demonstrates the use of `CSimpleStringT::Append`.
150150

151-
```cpp
151+
```cpp
152152
CSimpleString str1(pMgr), str2(pMgr);
153153
str1.SetString(_T("Soccer is"));
154154
str2.SetString(_T(" an elegant game"));
@@ -198,8 +198,8 @@ static void CopyChars(
198198
### Example
199199
The following example demonstrates the use of `CSimpleStringT::CopyChars`.
200200
201-
```cpp
202-
CSimpleString str(_T("xxxxxxxxxxxxxxxxxxx"), 20, pMgr);
201+
```cpp
202+
CSimpleString str(_T("xxxxxxxxxxxxxxxxxxx"), 20, pMgr);
203203
TCHAR* pszSrc = _T("Hello world!");
204204
_tprintf_s(_T("%s\n"), str);
205205
str.CopyChars(str.GetBuffer(), pszSrc, 12);
@@ -266,7 +266,7 @@ explicit CSimpleStringT(IAtlStringMgr* pStringMgr) throw();
266266
### Example
267267
The following example demonstrates the use of `CSimpleStringT::CSimpleStringT` by using the ATL `typedef``CSimpleString`. `CSimpleString` is a commonly used specialization of the class template `CSimpleStringT`.
268268

269-
```cpp
269+
```cpp
270270
CSimpleString s1(pMgr);
271271
// Empty string
272272
CSimpleString s2(_T("cat"), pMgr);

docs/atl-mfc-shared/unicode-and-multibyte-character-set-mbcs-support.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,8 @@ Some languages, for example, Japanese and Chinese, have large character sets. To
8686

8787
## <a name="_core_mfc_support_for_mbcs_strings"></a> MFC Support for MBCS Strings
8888

89-
> [!WARNING]
90-
> MBCS strings are legacy technology and should not be used in new projects. The following information is provided for scenarios in which you need to maintain existing code that uses MBCS and it is not feasible to upgrade the code to use Unicode.
91-
9289
The class library is also enabled for multibyte character sets, but only for double-byte character sets (DBCS).
9390

94-
> [!IMPORTANT]
95-
> In [!INCLUDE[vs_dev12](../atl-mfc-shared/includes/vs_dev12_md.md)] and later, the MBCS versions of the MFC DLLs are available as a free add-in to Visual Studio from the MSDN download site. For more information, see [MFC MBCS DLL Add-in](../mfc/mfc-mbcs-dll-add-on.md).
96-
9791
In a multibyte character set, a character can be one or two bytes wide. If it is two bytes wide, its first byte is a special "lead byte" that is chosen from a particular range, depending on which code page is in use. Taken together, the lead and "trail bytes" specify a unique character encoding.
9892

9993
If the symbol `_MBCS` is defined for a build of your program, type `TCHAR`, on which `CString` is based, maps to `char`. It is up to you to determine which bytes in a `CString` are lead bytes and which are trail bytes. The C run-time library supplies functions to help you determine this.

0 commit comments

Comments
 (0)