Skip to content

Commit a9dcbcc

Browse files
authored
Merge pull request MicrosoftDocs#1527 from MicrosoftDocs/master
10/25 AM Publish
2 parents 80fc7b0 + a7a8a91 commit a9dcbcc

File tree

1,267 files changed

+25079
-27047
lines changed

Some content is hidden

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

1,267 files changed

+25079
-27047
lines changed

.openpublishing.redirection.json

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6500,6 +6500,116 @@
65006500
"redirect_url": "/cpp/parallel/openmp/reference/openmp-environment-variables#omp-schedule",
65016501
"redirect_document_id": false
65026502
},
6503+
{
6504+
"source_path": "docs/parallel/openmp/reference/omp-destroy-lock.md",
6505+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-destroy-lock",
6506+
"redirect_document_id": false
6507+
},
6508+
{
6509+
"source_path": "docs/parallel/openmp/reference/omp-destroy-nest-lock.md",
6510+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-destroy-nest-lock",
6511+
"redirect_document_id": false
6512+
},
6513+
{
6514+
"source_path": "docs/parallel/openmp/reference/omp-get-dynamic.md",
6515+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-dynamic",
6516+
"redirect_document_id": false
6517+
},
6518+
{
6519+
"source_path": "docs/parallel/openmp/reference/omp-get-max-threads.md",
6520+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-max-threads",
6521+
"redirect_document_id": false
6522+
},
6523+
{
6524+
"source_path": "docs/parallel/openmp/reference/omp-get-nested.md",
6525+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-nested",
6526+
"redirect_document_id": false
6527+
},
6528+
{
6529+
"source_path": "docs/parallel/openmp/reference/omp-get-num-procs.md",
6530+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-num-procs",
6531+
"redirect_document_id": false
6532+
},
6533+
{
6534+
"source_path": "docs/parallel/openmp/reference/omp-get-num-threads.md",
6535+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-num-threads",
6536+
"redirect_document_id": false
6537+
},
6538+
{
6539+
"source_path": "docs/parallel/openmp/reference/omp-get-thread-num.md",
6540+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-thread-num",
6541+
"redirect_document_id": false
6542+
},
6543+
{
6544+
"source_path": "docs/parallel/openmp/reference/omp-get-wtick.md",
6545+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-wtick",
6546+
"redirect_document_id": false
6547+
},
6548+
{
6549+
"source_path": "docs/parallel/openmp/reference/omp-get-wtime.md",
6550+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-wtime",
6551+
"redirect_document_id": false
6552+
},
6553+
{
6554+
"source_path": "docs/parallel/openmp/reference/omp-init-lock.md",
6555+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-init-lock",
6556+
"redirect_document_id": false
6557+
},
6558+
{
6559+
"source_path": "docs/parallel/openmp/reference/omp-init-nest-lock.md",
6560+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-init-nest-lock",
6561+
"redirect_document_id": false
6562+
},
6563+
{
6564+
"source_path": "docs/parallel/openmp/reference/omp-in-parallel.md",
6565+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-in-parallel",
6566+
"redirect_document_id": false
6567+
},
6568+
{
6569+
"source_path": "docs/parallel/openmp/reference/omp-set-dynamic.md",
6570+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-dynamic",
6571+
"redirect_document_id": false
6572+
},
6573+
{
6574+
"source_path": "docs/parallel/openmp/reference/omp-set-lock.md",
6575+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-lock",
6576+
"redirect_document_id": false
6577+
},
6578+
{
6579+
"source_path": "docs/parallel/openmp/reference/omp-set-nest-lock.md",
6580+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-nest-lock",
6581+
"redirect_document_id": false
6582+
},
6583+
{
6584+
"source_path": "docs/parallel/openmp/reference/omp-set-nested.md",
6585+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-nested",
6586+
"redirect_document_id": false
6587+
},
6588+
{
6589+
"source_path": "docs/parallel/openmp/reference/omp-set-num-threads.md",
6590+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-num-threads",
6591+
"redirect_document_id": false
6592+
},
6593+
{
6594+
"source_path": "docs/parallel/openmp/reference/omp-test-lock.md",
6595+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-test-lock",
6596+
"redirect_document_id": false
6597+
},
6598+
{
6599+
"source_path": "docs/parallel/openmp/reference/omp-test-nest-lock.md",
6600+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-test-nest-lock",
6601+
"redirect_document_id": false
6602+
},
6603+
{
6604+
"source_path": "docs/parallel/openmp/reference/omp-unset-lock.md",
6605+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-unset-lock",
6606+
"redirect_document_id": false
6607+
},
6608+
{
6609+
"source_path": "docs/parallel/openmp/reference/omp-unset-nest-lock.md",
6610+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-unset-nest-lock",
6611+
"redirect_document_id": false
6612+
},
65036613
{
65046614
"source_path": "docs/porting/index.md",
65056615
"redirect_url": "/cpp/porting/visual-cpp-porting-and-upgrading-guide",

docs/assembler/inline/emit-pseudoinstruction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ The following fragment places the bytes 0x4A, 0x43, and 0x4B into the code:
2626
.
2727
.
2828
__asm {
29-
randasm
30-
}
29+
randasm
30+
}
3131
```
3232
3333
> [!CAUTION]

docs/assembler/masm/assume.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Enables error checking for register values.
2323
> ASSUME *register*:ERROR [[, *register*:ERROR]]...<br/>
2424
> ASSUME [[*register*:]] NOTHING [[, *register*:NOTHING]]...
2525
26-
2726
## Remarks
2827

2928
After an `ASSUME` is put into effect, the assembler watches for changes to the values of the given registers. **ERROR** generates an error if the register is used. **NOTHING** removes register error checking. You can combine different kinds of assumptions in one statement.

docs/assembler/masm/struct-masm.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Declares a structure type having the specified *field-declarations*. Each field
2222
> *field-declarations*<br/>
2323
> *name* ENDS
2424
25-
2625
## See also
2726

2827
[Directives Reference](../../assembler/masm/directives-reference.md)<br/>

docs/atl-mfc-shared/cstring-operations-relating-to-c-style-strings.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ A [CString](../atl-mfc-shared/using-cstring.md) object contains character string
3333

3434
To use a `CString` object as a C-style string, cast the object to LPCTSTR. In the following example, the `CString` returns a pointer to a read-only C-style null-terminated string. The `strcpy` function puts a copy of the C-style string in the variable `myString`.
3535

36-
```
37-
CString aCString = "A string";
38-
char myString[256];
36+
```cpp
37+
CString aCString = "A string";
38+
char myString[256];
3939
strcpy(myString, (LPCTSTR)aCString);
4040
```
4141

docs/atl-mfc-shared/elapsed-time-general-purpose-classes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ The following procedure shows how to calculate the difference between two `CTime
1717

1818
[!code-cpp[NVC_ATLMFC_Utilities#174](../atl-mfc-shared/codesnippet/cpp/elapsed-time-general-purpose-classes_1.cpp)]
1919

20-
Once you have calculated `elapsedTime`, you can use the member functions of `CTimeSpan` to extract the components of the elapsed-time value.
20+
Once you have calculated `elapsedTime`, you can use the member functions of `CTimeSpan` to extract the components of the elapsed-time value.
2121

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

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ To determine if an attached bitmap is a DIB section, call [IsDibSection](#isdibs
113113

114114
## Example
115115

116-
```cpp
116+
```cpp
117117
// Get a CDC for the image
118118
CDC* pDC = CDC::FromHandle(m_myImage.GetDC());
119119

@@ -122,19 +122,19 @@ pDC->Rectangle(0, 40, 100, 50);
122122
m_myImage.ReleaseDC();
123123
```
124124
125-
When you use `CImage` in an MFC project, note which member functions in your project expect a pointer to a [CBitmap](../../mfc/reference/cbitmap-class.md) object. If you want to use `CImage` with such a function, like [CMenu::AppendMenu](../../mfc/reference/cmenu-class.md#appendmenu), use [CBitmap::FromHandle](../../mfc/reference/cbitmap-class.md#fromhandle), pass it your `CImage` HBITMAP, and use the returned `CBitmap*`.
125+
When you use `CImage` in an MFC project, note which member functions in your project expect a pointer to a [CBitmap](../../mfc/reference/cbitmap-class.md) object. If you want to use `CImage` with such a function, like [CMenu::AppendMenu](../../mfc/reference/cmenu-class.md#appendmenu), use [CBitmap::FromHandle](../../mfc/reference/cbitmap-class.md#fromhandle), pass it your `CImage` HBITMAP, and use the returned `CBitmap*`.
126126
127127
## Example
128128
129-
```cpp
129+
```cpp
130130
void CMyDlg::OnRButtonDown(UINT nFlags, CPoint point)
131131
{
132132
UNREFERENCED_PARAMETER(nFlags);
133-
133+
134134
CBitmap* pBitmap = CBitmap::FromHandle(m_myImage);
135135
m_pmenuPop->AppendMenu(0, ID_BMPCOMMAND, pBitmap);
136136
ClientToScreen(&point);
137-
m_pmenuPop->TrackPopupMenu(TPM_RIGHTBUTTON | TPM_LEFTALIGN, point.x,
137+
m_pmenuPop->TrackPopupMenu(TPM_RIGHTBUTTON | TPM_LEFTALIGN, point.x,
138138
point.y, this);
139139
}
140140
```
@@ -144,8 +144,8 @@ Through `CImage`, you have access to the actual bits of a DIB section. You can u
144144
You can use `CImage` from either MFC or ATL.
145145

146146
> [!NOTE]
147-
> When you create a project using `CImage`, you must define `CString` before you include `atlimage.h`. If your project uses ATL without MFC, include `atlstr.h` before you include `atlimage.h`. If your project uses MFC (or if it is an ATL project with MFC support), include `afxstr.h` before you include `atlimage.h`.
148-
>
147+
> When you create a project using `CImage`, you must define `CString` before you include `atlimage.h`. If your project uses ATL without MFC, include `atlstr.h` before you include `atlimage.h`. If your project uses MFC (or if it is an ATL project with MFC support), include `afxstr.h` before you include `atlimage.h`.<br/>
148+
> <br/>
149149
> Likewise, you must include `atlimage.h` before you include `atlimpl.cpp`. To accomplish this easily, include `atlimage.h` in your `stdafx.h`.
150150
151151
## Requirements
@@ -243,7 +243,7 @@ Nonzero if successful; otherwise 0.
243243

244244
Alpha-blend bitmaps support color blending on a per-pixel basis.
245245

246-
When *bBlendOp* is set to the default of AC_SRC_OVER, the source bitmap is placed over the destination bitmap based on the alpha values of the source pixels.
246+
When *bBlendOp* is set to the default of AC_SRC_OVER, the source bitmap is placed over the destination bitmap based on the alpha values of the source pixels.
247247

248248
## <a name="attach"></a> CImage::Attach
249249

@@ -447,9 +447,9 @@ TRUE if successful. Otherwise FALSE.
447447

448448
### Example
449449

450-
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.
450+
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.
451451

452-
```cpp
452+
```cpp
453453
DWORD adwBitmasks[3] = { 0x0000000f, 0x000000f0, 0x00000f00 };
454454
m_myImage.CreateEx(100, 100, 16, BI_BITFIELDS, adwBitmasks, 0);
455455
```
@@ -666,17 +666,16 @@ An array of GUIDs, with each element corresponding to one of the file types in t
666666
*pszAllFilesDescription*<br/>
667667
If this parameter is not NULL, the filter string will have one additional filter at the beginning of the list. This filter will have the current value of *pszAllFilesDescription* for its description, and accepts files of any extension supported by any other exporter in the list.
668668
669-
For example:
669+
For example:
670670
671-
```cpp
671+
```cpp
672672
//First filter in the list will be titled "All Image Files", and
673673
//will accept files with any extension supported by any exporter.
674674
CImage::GetExporterFilterString(
675-
strExporters, aguidFileTypes,
675+
strExporters, aguidFileTypes,
676676
_T("All Image Files"));
677677
```
678678

679-
680679
*dwExclude*<br/>
681680
Set of bit flags specifying which file types to exclude from the list. Allowable flags are:
682681

@@ -762,17 +761,16 @@ An array of GUIDs, with each element corresponding to one of the file types in t
762761
*pszAllFilesDescription*<br/>
763762
If this parameter is not NULL, the filter string will have one additional filter at the beginning of the list. This filter will have the current value of *pszAllFilesDescription* for its description, and accepts files of any extension supported by any other exporter in the list.
764763

765-
For example:
764+
For example:
766765

767-
```cpp
766+
```cpp
768767
//First filter in the list will be titled "All Image Files", and
769768
//will accept files with any extension supported by any importer.
770769
CImage::GetImporterFilterString(
771-
strImporters, aguidFileTypes,
770+
strImporters, aguidFileTypes,
772771
_T("All Image Files"));
773772
```
774773
775-
776774
*dwExclude*<br/>
777775
Set of bit flags specifying which file types to exclude from the list. Allowable flags are:
778776
@@ -1301,7 +1299,7 @@ Sets the red, green, blue (RGB) color values for a range of entries in the palet
13011299
13021300
```
13031301
void SetColorTable(
1304-
UINT iFirstColor,
1302+
UINT iFirstColor,
13051303
UINT nColors,
13061304
const RGBQUAD* prgbColors) throw();
13071305
```
@@ -1368,7 +1366,7 @@ The index of a color in the color palette.
13681366
Sets the pixel at the locations specified by *x* and *y* to the colors indicated by *r*, *g*, and *b*, in a red, green, blue (RGB) image.
13691367
13701368
```
1371-
void SetPixelRGB(
1369+
void SetPixelRGB(
13721370
int x,
13731371
int y,
13741372
BYTE r,
@@ -1580,12 +1578,12 @@ TRUE if successful, otherwise FALSE.
15801578
15811579
`TransparentBlt` is supported for source bitmaps of 4 bits per pixel and 8 bits per pixel. Use [CImage::AlphaBlend](#alphablend) to specify 32 bits-per-pixel bitmaps with transparency.
15821580
1583-
### Example
1581+
### Example
15841582
1585-
```cpp
1586-
// Performs a transparent blit from the source image to the destination
1583+
```cpp
1584+
// Performs a transparent blit from the source image to the destination
15871585
// image using the images' current transparency settings
1588-
BOOL TransparentBlt(CImage* pSrcImage, CImage* pDstImage,
1586+
BOOL TransparentBlt(CImage* pSrcImage, CImage* pDstImage,
15891587
int xDest, int yDest, int nDestWidth, int nDestHeight)
15901588
{
15911589
HDC hDstDC = NULL;
@@ -1617,4 +1615,4 @@ BOOL TransparentBlt(CImage* pSrcImage, CImage* pDstImage,
16171615
[CreateDIBSection](/windows/desktop/api/wingdi/nf-wingdi-createdibsection)<br/>
16181616
[ATL COM Desktop Components](../../atl/atl-com-desktop-components.md)<br/>
16191617
[Device-Independent Bitmaps](/windows/desktop/gdi/device-independent-bitmaps)<br/>
1620-
[CreateDIBSection](/windows/desktop/api/wingdi/nf-wingdi-createdibsection)
1618+
[CreateDIBSection](/windows/desktop/api/wingdi/nf-wingdi-createdibsection)

0 commit comments

Comments
 (0)