Skip to content

Commit 62d9ca4

Browse files
author
Colin Robertson
authored
Merge branch 'master' into FromPublicMasterBranch
2 parents 5823096 + 92046f4 commit 62d9ca4

Some content is hidden

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

52 files changed

+190
-177
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ An alpha transparency value to be used on the entire source bitmap. The default
202202
The alpha-blending function for source and destination bitmaps, a global alpha value to be applied to the entire source bitmap, and format information for the source bitmap. The source and destination blend functions are currently limited to AC_SRC_OVER.
203203

204204
*pointDest*<br/>
205-
A reference to a [POINT](/previous-versions/dd162805\(v=vs.85\)) structure that identifies the upper left corner of the destination rectangle, in logical units.
205+
A reference to a [POINT](/windows/win32/api/windef/ns-windef-point) structure that identifies the upper left corner of the destination rectangle, in logical units.
206206

207207
*nDestWidth*<br/>
208208
The width, in logical units, of the destination rectangle.
@@ -223,7 +223,7 @@ The width, in logical units, of the source rectangle.
223223
The height, in logical units, of the source rectangle.
224224

225225
*rectDest*<br/>
226-
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure, identifying the destination.
226+
A reference to a [RECT](/windows/win32/api/windef/ns-windef-rect) structure, identifying the destination.
227227

228228
*rectSrc*<br/>
229229
A reference to a `RECT` structure, identifying the source.
@@ -312,7 +312,7 @@ The logical y-coordinate of the upper left corner of the destination rectangle.
312312
The raster operation to be performed. Raster-operation codes define exactly how to combine the bits of the source, the destination, and the pattern (as defined by the currently selected brush) to form the destination. See [BitBlt](/windows/win32/api/wingdi/nf-wingdi-bitblt) in the Windows SDK for a list of other raster-operation codes and their descriptions.
313313
314314
*pointDest*<br/>
315-
A [POINT](/previous-versions/dd162805\(v=vs.85\)) structure indicating the upper left corner of the destination rectangle.
315+
A [POINT](/windows/win32/api/windef/ns-windef-point) structure indicating the upper left corner of the destination rectangle.
316316
317317
*nDestWidth*<br/>
318318
The width, in logical units, of the destination rectangle.
@@ -327,7 +327,7 @@ The logical x-coordinate of the upper left corner of the source rectangle.
327327
The logical y-coordinate of the upper left corner of the source rectangle.
328328
329329
*rectDest*<br/>
330-
A [RECT](/previous-versions/dd162897\(v=vs.85\)) structure indicating the destination rectangle.
330+
A [RECT](/windows/win32/api/windef/ns-windef-rect) structure indicating the destination rectangle.
331331
332332
*pointSrc*<br/>
333333
A `POINT` structure indicating the upper left corner of the source rectangle.
@@ -424,7 +424,7 @@ Specifies the type of compression for a compressed bottom-up bitmap (top-down DI
424424
- BI_BITFIELDS The format is uncompressed and the color table consists of three DWORD color masks that specify the red, green, and blue components, respectively, of each pixel. This is valid when used with 16- and 32-bpp bitmaps.
425425
426426
*pdwBitfields*<br/>
427-
Only used if *eCompression* is set to BI_BITFIELDS, otherwise it must be NULL. A pointer to an array of three DWORD bitmasks, specifying which bits of each pixel are used for the red, green, and blue components of the color, respectively. For information on restrictions for the bitfields, see [BITMAPINFOHEADER](/previous-versions//dd183376\(v=vs.85\)) in the Windows SDK.
427+
Only used if *eCompression* is set to BI_BITFIELDS, otherwise it must be NULL. A pointer to an array of three DWORD bitmasks, specifying which bits of each pixel are used for the red, green, and blue components of the color, respectively. For information on restrictions for the bitfields, see [BITMAPINFOHEADER](/windows/win32/api/wingdi/ns-wingdi-bitmapinfoheader) in the Windows SDK.
428428
429429
*dwFlags*<br/>
430430
Specifies if the bitmap object has an alpha channel. Can be a combination of zero or more of the following values:
@@ -539,13 +539,13 @@ The width, in logical units, of the source rectangle.
539539
The height, in logical units, of the source rectangle.
540540

541541
*rectDest*<br/>
542-
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure, identifying the destination.
542+
A reference to a [RECT](/windows/win32/api/windef/ns-windef-rect) structure, identifying the destination.
543543

544544
*rectSrc*<br/>
545545
A reference to a `RECT` structure, identifying the source.
546546

547547
*pointDest*<br/>
548-
A reference to a [POINT](/previous-versions/dd162805\(v=vs.85\)) structure that identifies the upper left corner of the destination rectangle, in logical units.
548+
A reference to a [POINT](/windows/win32/api/windef/ns-windef-point) structure that identifies the upper left corner of the destination rectangle, in logical units.
549549

550550
### Return Value
551551

@@ -592,7 +592,7 @@ The number of bits per pixel.
592592

593593
This value determines the number of bits that define each pixel and the maximum number of colors in the bitmap.
594594

595-
The bits per pixel is usually 1, 4, 8, 16, 24, or 32. See the `biBitCount` member of [BITMAPINFOHEADER](/previous-versions//dd183376\(v=vs.85\)) in the Windows SDK for more information about this value.
595+
The bits per pixel is usually 1, 4, 8, 16, 24, or 32. See the `biBitCount` member of [BITMAPINFOHEADER](/windows/win32/api/wingdi/ns-wingdi-bitmapinfoheader) in the Windows SDK for more information about this value.
596596

597597
## <a name="getcolortable"></a> CImage::GetColorTable
598598

@@ -1203,10 +1203,10 @@ The x-coordinate of the upper left corner of the monochrome bitmap.
12031203
The y-coordinate of the upper left corner of the monochrome bitmap.
12041204
12051205
*rectSrc*<br/>
1206-
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure specifying the coordinates of the source rectangle.
1206+
A reference to a [RECT](/windows/win32/api/windef/ns-windef-rect) structure specifying the coordinates of the source rectangle.
12071207
12081208
*pointMask*<br/>
1209-
A [POINT](/previous-versions/dd162805\(v=vs.85\)) structure indicating the upper left corner of the mask bitmap.
1209+
A [POINT](/windows/win32/api/windef/ns-windef-point) structure indicating the upper left corner of the mask bitmap.
12101210
12111211
### Return Value
12121212
@@ -1463,7 +1463,7 @@ The height, in logical units, of the destination rectangle.
14631463
The raster operation to be performed. Raster-operation codes define exactly how to combine the bits of the source, the destination, and the pattern (as defined by the currently selected brush) to form the destination. See [BitBlt](/windows/win32/api/wingdi/nf-wingdi-bitblt) in the Windows SDK for a list of other raster-operation codes and their descriptions.
14641464

14651465
*rectDest*<br/>
1466-
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure, identifying the destination.
1466+
A reference to a [RECT](/windows/win32/api/windef/ns-windef-rect) structure, identifying the destination.
14671467

14681468
*xSrc*<br/>
14691469
The x-coordinate, in logical units, of the upper left corner of the source rectangle.
@@ -1546,7 +1546,7 @@ The height, in logical units, of the destination rectangle.
15461546
The color in the source bitmap to treat as transparent. By default, CLR_INVALID, indicating that the color currently set as the transparent color of the image should be used.
15471547

15481548
*rectDest*<br/>
1549-
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure, identifying the destination.
1549+
A reference to a [RECT](/windows/win32/api/windef/ns-windef-rect) structure, identifying the destination.
15501550

15511551
*xSrc*<br/>
15521552
The x-coordinate, in logical units, of the upper left corner of the source rectangle.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ See the following descriptions of the individual operators:
166166

167167
- **operator +(** *point* **)**
168168

169-
This operation offsets (moves) a [POINT](/previous-versions/dd162805\(v=vs.85\)) (or [CPoint](../../atl-mfc-shared/reference/cpoint-class.md)) value by this `CSize` value. The `cx` and `cy` members of this `CSize` value are added to the `x` and `y` data members of the `POINT` value. It is analogous to the version of [CPoint::operator +](../../atl-mfc-shared/reference/cpoint-class.md#operator_add) that takes a [SIZE](/windows/win32/api/windef/ns-windef-size) parameter.
169+
This operation offsets (moves) a [POINT](/windows/win32/api/windef/ns-windef-point) (or [CPoint](../../atl-mfc-shared/reference/cpoint-class.md)) value by this `CSize` value. The `cx` and `cy` members of this `CSize` value are added to the `x` and `y` data members of the `POINT` value. It is analogous to the version of [CPoint::operator +](../../atl-mfc-shared/reference/cpoint-class.md#operator_add) that takes a [SIZE](/windows/win32/api/windef/ns-windef-size) parameter.
170170

171171
- **operator +(** *lpRect* **)**
172172

173-
This operation offsets (moves) a [RECT](/previous-versions/dd162897\(v=vs.85\)) (or [CRect](../../atl-mfc-shared/reference/crect-class.md)) value by this `CSize` value. The `cx` and `cy` members of this `CSize` value are added to the `left`, `top`, `right`, and `bottom` data members of the `RECT` value. It is analogous to the version of [CRect::operator +](../../atl-mfc-shared/reference/crect-class.md#operator_add) that takes a [SIZE](/windows/win32/api/windef/ns-windef-size) parameter.
173+
This operation offsets (moves) a [RECT](/windows/win32/api/windef/ns-windef-rect) (or [CRect](../../atl-mfc-shared/reference/crect-class.md)) value by this `CSize` value. The `cx` and `cy` members of this `CSize` value are added to the `left`, `top`, `right`, and `bottom` data members of the `RECT` value. It is analogous to the version of [CRect::operator +](../../atl-mfc-shared/reference/crect-class.md#operator_add) that takes a [SIZE](/windows/win32/api/windef/ns-windef-size) parameter.
174174

175175
### Example
176176

@@ -197,11 +197,11 @@ The fourth operator, the unary minus, changes the sign of the `CSize` value. See
197197

198198
- **operator -(** *point* **)**
199199

200-
This operation offsets (moves) a [POINT](/previous-versions/dd162805\(v=vs.85\)) or [CPoint](../../atl-mfc-shared/reference/cpoint-class.md) value by the additive inverse of this `CSize` value. The `cx` and `cy` of this `CSize` value are subtracted from the `x` and `y` data members of the `POINT` value. It is analogous to the version of [CPoint::operator -](../../atl-mfc-shared/reference/cpoint-class.md#operator_-) that takes a [SIZE](/windows/win32/api/windef/ns-windef-size) parameter.
200+
This operation offsets (moves) a [POINT](/windows/win32/api/windef/ns-windef-point) or [CPoint](../../atl-mfc-shared/reference/cpoint-class.md) value by the additive inverse of this `CSize` value. The `cx` and `cy` of this `CSize` value are subtracted from the `x` and `y` data members of the `POINT` value. It is analogous to the version of [CPoint::operator -](../../atl-mfc-shared/reference/cpoint-class.md#operator_-) that takes a [SIZE](/windows/win32/api/windef/ns-windef-size) parameter.
201201

202202
- **operator -(** *lpRect* **)**
203203

204-
This operation offsets (moves) a [RECT](/previous-versions/dd162897\(v=vs.85\)) or [CRect](../../atl-mfc-shared/reference/crect-class.md) value by the additive inverse of this `CSize` value. The `cx` and `cy` members of this `CSize` value are subtracted from the `left`, `top`, `right`, and `bottom` data members of the `RECT` value. It is analogous to the version of [CRect::operator -](../../atl-mfc-shared/reference/crect-class.md#operator_-) that takes a [SIZE](/windows/win32/api/windef/ns-windef-size) parameter.
204+
This operation offsets (moves) a [RECT](/windows/win32/api/windef/ns-windef-rect) or [CRect](../../atl-mfc-shared/reference/crect-class.md) value by the additive inverse of this `CSize` value. The `cx` and `cy` members of this `CSize` value are subtracted from the `left`, `top`, `right`, and `bottom` data members of the `RECT` value. It is analogous to the version of [CRect::operator -](../../atl-mfc-shared/reference/crect-class.md#operator_-) that takes a [SIZE](/windows/win32/api/windef/ns-windef-size) parameter.
205205

206206
- **operator -()**
207207

docs/atl/reference/atl-drawinfo-structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Information context for the target device pointed to by `ptd` from which the obj
5050
The device context on which to draw. For a windowless object, the `hdcDraw` member is in the `MM_TEXT` mapping mode with its logical coordinates matching the client coordinates of the containing window. In addition, the device context should be in the same state as the one normally passed by a `WM_PAINT` message.
5151

5252
`prcBounds`<br/>
53-
Pointer to a [RECTL](/previous-versions//dd162907\(v=vs.85\)) structure specifying the rectangle on `hdcDraw` and in which the object should be drawn. This member controls the positioning and stretching of the object. This member should be NULL to draw a windowless in-place active object. In every other situation, NULL is not a legal value and should result in an `E_INVALIDARG` error code. If the container passes a non-NULL value to a windowless object, the object should render the requested aspect into the specified device context and rectangle. A container can request this from a windowless object to render a second, non-active view of the object or to print the object.
53+
Pointer to a [RECTL](/windows/win32/api/windef/ns-windef-rectl) structure specifying the rectangle on `hdcDraw` and in which the object should be drawn. This member controls the positioning and stretching of the object. This member should be NULL to draw a windowless in-place active object. In every other situation, NULL is not a legal value and should result in an `E_INVALIDARG` error code. If the container passes a non-NULL value to a windowless object, the object should render the requested aspect into the specified device context and rectangle. A container can request this from a windowless object to render a second, non-active view of the object or to print the object.
5454

5555
`prcWBounds`<br/>
5656
If `hdcDraw` is a metafile device context (see [GetDeviceCaps](/windows/win32/api/wingdi/nf-wingdi-getdevicecaps) in the Windows SDK), this is a pointer to a `RECTL` structure specifying the bounding rectangle in the underlying metafile. The rectangle structure contains the window extent and window origin. These values are useful for drawing metafiles. The rectangle indicated by `prcBounds` is nested inside this `prcWBounds` rectangle; they are in the same coordinate space.

docs/atl/reference/ccontainedwindowt-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ HWND Create(
190190
[in] The handle to the parent or owner window.
191191

192192
*rect*<br/>
193-
[in] A [RECT](/previous-versions/dd162897\(v=vs.85\)) structure specifying the position of the window. The `RECT` can be passed by pointer or by reference.
193+
[in] A [RECT](/windows/win32/api/windef/ns-windef-rect) structure specifying the position of the window. The `RECT` can be passed by pointer or by reference.
194194

195195
*szWindowName*<br/>
196196
[in] Specifies the name of the window. The default value is NULL.

docs/atl/reference/cdialogimpl-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ HWND Create(
101101
[in] The handle to the owner window.
102102

103103
**RECT&** *rect*
104-
[in] A [RECT](/previous-versions/dd162897\(v=vs.85\)) structure specifying the dialog's size and position.
104+
[in] A [RECT](/windows/win32/api/windef/ns-windef-rect) structure specifying the dialog's size and position.
105105

106106
*dwInitParam*<br/>
107107
[in] Specifies the value to pass to the dialog box in the *lParam* parameter of the WM_INITDIALOG message.

docs/atl/reference/cwindow-class.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ BOOL ClientToScreen(LPRECT lpRect) const throw();
381381
382382
See [ClientToScreen](/windows/win32/api/winuser/nf-winuser-clienttoscreen) in the Windows SDK.
383383
384-
The second version of this method allows you to convert the coordinates of a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure.
384+
The second version of this method allows you to convert the coordinates of a [RECT](/windows/win32/api/windef/ns-windef-rect) structure.
385385
386386
## <a name="create"></a> CWindow::Create
387387
@@ -1634,7 +1634,7 @@ int MapWindowPoints(
16341634
16351635
See [MapWindowPoints](/windows/win32/api/winuser/nf-winuser-mapwindowpoints) in the Windows SDK.
16361636
1637-
The second version of this method allows you to convert the coordinates of a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure.
1637+
The second version of this method allows you to convert the coordinates of a [RECT](/windows/win32/api/windef/ns-windef-rect) structure.
16381638
16391639
## <a name="messagebox"></a> CWindow::MessageBox
16401640
@@ -1768,7 +1768,7 @@ BOOL MoveWindow(
17681768
17691769
For a top-level window object, the x and y parameters are relative to the upper-left corner of the screen. For a child window object, they are relative to the upper-left corner of the parent window's client area.
17701770
1771-
The second version of this method uses a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure to determine the window's new position, width, and height.
1771+
The second version of this method uses a [RECT](/windows/win32/api/windef/ns-windef-rect) structure to determine the window's new position, width, and height.
17721772
17731773
## <a name="nextdlgctrl"></a> CWindow::NextDlgCtrl
17741774
@@ -1979,7 +1979,7 @@ BOOL ScreenToClient(LPRECT lpRect) const throw();
19791979

19801980
See [ScreenToClient](/windows/win32/api/winuser/nf-winuser-screentoclient) in the Windows SDK.
19811981

1982-
The second version of this method allows you to convert the coordinates of a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure.
1982+
The second version of this method allows you to convert the coordinates of a [RECT](/windows/win32/api/windef/ns-windef-rect) structure.
19831983

19841984
## <a name="scrollwindow"></a> CWindow::ScrollWindow
19851985

@@ -2450,7 +2450,7 @@ BOOL SetWindowPos(
24502450
24512451
See [SetWindowPos](/windows/win32/api/winuser/nf-winuser-setwindowpos) in the Windows SDK.
24522452
2453-
The second version of this method uses a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure to set the window's new position, width, and height.
2453+
The second version of this method uses a [RECT](/windows/win32/api/windef/ns-windef-rect) structure to set the window's new position, width, and height.
24542454
24552455
## <a name="setwindowrgn"></a> CWindow::SetWindowRgn
24562456

docs/atl/reference/cwindowimpl-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ HWND Create(
127127
[in] The handle to the parent or owner window.
128128

129129
*rect*<br/>
130-
[in] A [RECT](/previous-versions/dd162897\(v=vs.85\)) structure specifying the position of the window. The `RECT` can be passed by pointer or by reference.
130+
[in] A [RECT](/windows/win32/api/windef/ns-windef-rect) structure specifying the position of the window. The `RECT` can be passed by pointer or by reference.
131131

132132
*szWindowName*<br/>
133133
[in] Specifies the name of the window. The default value is NULL.

0 commit comments

Comments
 (0)