Skip to content

Fix git push error for protected CLA branch #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 5, 2019
Merged
20 changes: 10 additions & 10 deletions docs/atl-mfc-shared/reference/cimage-class.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ An alpha transparency value to be used on the entire source bitmap. The default
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.

*pointDest*<br/>
A reference to a [POINT](https://msdn.microsoft.com/library/windows/desktop/dd162805) structure that identifies the upper left corner of the destination rectangle, in logical units.
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.

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

*rectDest*<br/>
A reference to a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure, identifying the destination.
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure, identifying the destination.

*rectSrc*<br/>
A reference to a `RECT` structure, identifying the source.
Expand Down Expand Up @@ -312,7 +312,7 @@ The logical y-coordinate of the upper left corner of the destination rectangle.
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/desktop/api/wingdi/nf-wingdi-bitblt) in the Windows SDK for a list of other raster-operation codes and their descriptions.

*pointDest*<br/>
A [POINT](https://msdn.microsoft.com/library/windows/desktop/dd162805) structure indicating the upper left corner of the destination rectangle.
A [POINT](/previous-versions/dd162805\(v=vs.85\)) structure indicating the upper left corner of the destination rectangle.

*nDestWidth*<br/>
The width, in logical units, of the destination rectangle.
Expand All @@ -327,7 +327,7 @@ The logical x-coordinate of the upper left corner of the source rectangle.
The logical y-coordinate of the upper left corner of the source rectangle.

*rectDest*<br/>
A [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure indicating the destination rectangle.
A [RECT](/previous-versions/dd162897\(v=vs.85\)) structure indicating the destination rectangle.

*pointSrc*<br/>
A `POINT` structure indicating the upper left corner of the source rectangle.
Expand Down Expand Up @@ -539,13 +539,13 @@ The width, in logical units, of the source rectangle.
The height, in logical units, of the source rectangle.

*rectDest*<br/>
A reference to a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure, identifying the destination.
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure, identifying the destination.

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

*pointDest*<br/>
A reference to a [POINT](https://msdn.microsoft.com/library/windows/desktop/dd162805) structure that identifies the upper left corner of the destination rectangle, in logical units.
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.

### Return Value

Expand Down Expand Up @@ -1203,10 +1203,10 @@ The x-coordinate of the upper left corner of the monochrome bitmap.
The y-coordinate of the upper left corner of the monochrome bitmap.

*rectSrc*<br/>
A reference to a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure specifying the coordinates of the source rectangle.
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure specifying the coordinates of the source rectangle.

*pointMask*<br/>
A [POINT](https://msdn.microsoft.com/library/windows/desktop/dd162805) structure indicating the upper left corner of the mask bitmap.
A [POINT](/previous-versions/dd162805\(v=vs.85\)) structure indicating the upper left corner of the mask bitmap.

### Return Value

Expand Down Expand Up @@ -1463,7 +1463,7 @@ The height, in logical units, of the destination rectangle.
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/desktop/api/wingdi/nf-wingdi-bitblt) in the Windows SDK for a list of other raster-operation codes and their descriptions.

*rectDest*<br/>
A reference to a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure, identifying the destination.
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure, identifying the destination.

*xSrc*<br/>
The x-coordinate, in logical units, of the upper left corner of the source rectangle.
Expand Down Expand Up @@ -1546,7 +1546,7 @@ The height, in logical units, of the destination rectangle.
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.

*rectDest*<br/>
A reference to a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure, identifying the destination.
A reference to a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure, identifying the destination.

*xSrc*<br/>
The x-coordinate, in logical units, of the upper left corner of the source rectangle.
Expand Down
8 changes: 4 additions & 4 deletions docs/atl-mfc-shared/reference/csize-class.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ See the following descriptions of the individual operators:

- **operator +(** *point* **)**

This operation offsets (moves) a [POINT](https://msdn.microsoft.com/library/windows/desktop/dd162805) (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/desktop/api/windef/ns-windef-tagsize) parameter.
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/desktop/api/windef/ns-windef-tagsize) parameter.

- **operator +(** *lpRect* **)**

This operation offsets (moves) a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) (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/desktop/api/windef/ns-windef-tagsize) parameter.
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/desktop/api/windef/ns-windef-tagsize) parameter.

### Example

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

- **operator -(** *point* **)**

This operation offsets (moves) a [POINT](https://msdn.microsoft.com/library/windows/desktop/dd162805) 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/desktop/api/windef/ns-windef-tagsize) parameter.
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/desktop/api/windef/ns-windef-tagsize) parameter.

- **operator -(** *lpRect* **)**

This operation offsets (moves) a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) 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/desktop/api/windef/ns-windef-tagsize) parameter.
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/desktop/api/windef/ns-windef-tagsize) parameter.

- **operator -()**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ A DHTML control is similar to any ATL control, except:

- It creates an HTML resource for the control UI.

- It allows access to the DHTML object model through the member variable `m_spBrowser`, which is a smart pointer of type [IWebBrowser2](https://msdn.microsoft.com/library/aa752127.aspx). Use this pointer to access any part of the DHTML object model.
- It allows access to the DHTML object model through the member variable `m_spBrowser`, which is a smart pointer of type [IWebBrowser2](/previous-versions/windows/internet-explorer/ie-developer/platform-apis/aa752127\(v=vs.85\)). Use this pointer to access any part of the DHTML object model.

The following graphic illustrates the relationship between your DLL, the DHTML control, the Web browser, and the HTML resource.

Expand Down
2 changes: 1 addition & 1 deletion docs/atl/reference/ccontainedwindowt-class.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ HWND Create(
[in] The handle to the parent or owner window.

*rect*<br/>
[in] A [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure specifying the position of the window. The `RECT` can be passed by pointer or by reference.
[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.

*szWindowName*<br/>
[in] Specifies the name of the window. The default value is NULL.
Expand Down
2 changes: 1 addition & 1 deletion docs/atl/reference/cdialogimpl-class.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ HWND Create(
[in] The handle to the owner window.

**RECT&** *rect*
[in] A [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure specifying the dialog's size and position.
[in] A [RECT](/previous-versions/dd162897\(v=vs.85\)) structure specifying the dialog's size and position.

*dwInitParam*<br/>
[in] Specifies the value to pass to the dialog box in the *lParam* parameter of the WM_INITDIALOG message.
Expand Down
10 changes: 5 additions & 5 deletions docs/atl/reference/cwindow-class.md
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ BOOL ClientToScreen(LPRECT lpRect) const throw();

See [ClientToScreen](/windows/desktop/api/winuser/nf-winuser-clienttoscreen) in the Windows SDK.

The second version of this method allows you to convert the coordinates of a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure.
The second version of this method allows you to convert the coordinates of a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure.

## <a name="create"></a> CWindow::Create

Expand Down Expand Up @@ -1634,7 +1634,7 @@ int MapWindowPoints(

See [MapWindowPoints](/windows/desktop/api/winuser/nf-winuser-mapwindowpoints) in the Windows SDK.

The second version of this method allows you to convert the coordinates of a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure.
The second version of this method allows you to convert the coordinates of a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure.

## <a name="messagebox"></a> CWindow::MessageBox

Expand Down Expand Up @@ -1768,7 +1768,7 @@ BOOL MoveWindow(

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.

The second version of this method uses a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure to determine the window's new position, width, and height.
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.

## <a name="nextdlgctrl"></a> CWindow::NextDlgCtrl

Expand Down Expand Up @@ -1979,7 +1979,7 @@ BOOL ScreenToClient(LPRECT lpRect) const throw();

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

The second version of this method allows you to convert the coordinates of a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure.
The second version of this method allows you to convert the coordinates of a [RECT](/previous-versions/dd162897\(v=vs.85\)) structure.

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

Expand Down Expand Up @@ -2450,7 +2450,7 @@ BOOL SetWindowPos(

See [SetWindowPos](/windows/desktop/api/winuser/nf-winuser-setwindowpos) in the Windows SDK.

The second version of this method uses a [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure to set the window's new position, width, and height.
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.

## <a name="setwindowrgn"></a> CWindow::SetWindowRgn

Expand Down
2 changes: 1 addition & 1 deletion docs/atl/reference/cwindowimpl-class.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ HWND Create(
[in] The handle to the parent or owner window.

*rect*<br/>
[in] A [RECT](https://msdn.microsoft.com/library/windows/desktop/dd162897) structure specifying the position of the window. The `RECT` can be passed by pointer or by reference.
[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.

*szWindowName*<br/>
[in] Specifies the name of the window. The default value is NULL.
Expand Down
2 changes: 1 addition & 1 deletion docs/atl/reference/iaxwinambientdispatch-interface.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ interface IAxWinAmbientDispatch : IDispatch

This interface is exposed by ATL's ActiveX control hosting objects. Call the methods on this interface to set the ambient properties available to the hosted control or to specify other aspects of the container's behavior. To supplement the properties provided by `IAxWinAmbientDispatch`, use [IAxWinAmbientDispatchEx](../../atl/reference/iaxwinambientdispatchex-interface.md).

[AXHost](https://msdn.microsoft.com/library/system.windows.forms.axhost.aspx) will try to load type information about `IAxWinAmbientDispatch` and `IAxWinAmbientDispatchEx` from the typelib that contains the code.
<xref:System.Windows.Forms.AxHost> will try to load type information about `IAxWinAmbientDispatch` and `IAxWinAmbientDispatchEx` from the typelib that contains the code.

If you are linking to ATL90.dll, **AXHost** will load the type information from the typelib in the DLL.

Expand Down
2 changes: 1 addition & 1 deletion docs/atl/reference/iaxwinambientdispatchex-interface.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Include this interface in ATL applications that are statically linked to ATL and

This interface is exposed by ATL's ActiveX control hosting objects. Derived from [IAxWinAmbientDispatch](../../atl/reference/iaxwinambientdispatch-interface.md), `IAxWinAmbientDispatchEx` adds a method that allows you to supplement the ambient property interface provided by ATL with one of your own.

[AXHost](https://msdn.microsoft.com/library/system.windows.forms.axhost.aspx) will try to load type information about `IAxWinAmbientDispatch` and `IAxWinAmbientDispatchEx` from the type library that contains the code.
<xref:System.Windows.Forms.AxHost> will try to load type information about `IAxWinAmbientDispatch` and `IAxWinAmbientDispatchEx` from the type library that contains the code.

If you are linking to ATL90.dll, **AXHost** will load the type information from the type library in the DLL.

Expand Down
Loading