Skip to content

Commit 1ef2f2b

Browse files
author
mikeblome
committed
merbe conflict
2 parents 8bf61b8 + 2e14fea commit 1ef2f2b

File tree

145 files changed

+301
-306
lines changed

Some content is hidden

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

145 files changed

+301
-306
lines changed

‎docs/assembler/arm/arm-assembler-diagnostic-messages.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The Microsoft ARM assembler (*armasm*) emits diagnostic warnings and errors when
1717

1818
> A2193: this instruction generates unpredictable behavior
1919
20-
The ARM architecture cannot guarantee what happens when this instruction is executed. For details about the well-defined forms of this instruction, consult the [ARM Architecture Reference Manual](http://go.microsoft.com/fwlink/p/?linkid=246464).
20+
The ARM architecture cannot guarantee what happens when this instruction is executed. For details about the well-defined forms of this instruction, consult the [ARM Architecture Reference Manual](https://go.microsoft.com/fwlink/p/?linkid=246464).
2121

2222
```asm
2323
ADD r0, r8, pc ; A2193: this instruction generates unpredictable behavior
@@ -93,7 +93,7 @@ In ARM mode, there is an alternate syntax for specifying constants. Instead of
9393

9494
> A4509: This form of conditional instruction is deprecated
9595
96-
This form of conditional instruction has been deprecated by ARM in the ARMv8 architecture. We recommend that you change the code to use conditional branches. To see which conditional instructions are still supported, consult the [ARM Architecture Reference Manual](http://go.microsoft.com/fwlink/p/?linkid=246464).
96+
This form of conditional instruction has been deprecated by ARM in the ARMv8 architecture. We recommend that you change the code to use conditional branches. To see which conditional instructions are still supported, consult the [ARM Architecture Reference Manual](https://go.microsoft.com/fwlink/p/?linkid=246464).
9797

9898
This warning is not emitted when the **-oldit** command-line switch is used.
9999

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ To determine if an attached bitmap is a DIB section, call [IsDibSection](#isdibs
102102
> [!NOTE]
103103
> Using global `CImage` objects in a DLL is not recommended. If you need to use a global `CImage` object in a DLL, call [CImage::ReleaseGDIPlus](#releasegdiplus) to explicitly release resources used by GDI+.
104104
105-
`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.
105+
`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#fromhandle).
106106

107107
## Example
108108

@@ -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](https://msdn.microsoft.com/library/windows/desktop/dd183376) 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](/previous-versions//dd183376\(v=vs.85\)) 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:
@@ -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](https://msdn.microsoft.com/library/windows/desktop/dd183376) 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](/previous-versions//dd183376\(v=vs.85\)) in the Windows SDK for more information about this value.
596596
597597
## <a name="getcolortable"></a> CImage::GetColorTable
598598

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Indicate the date and time values to be copied into the new `COleDateTime` objec
189189
MS-DOS date and time values to be converted to a date/time value and copied into the new `COleDateTime` object.
190190

191191
*timeStamp*<br/>
192-
A reference to a [DBTimeStamp](https://msdn.microsoft.com/library/system.data.oledb.oledbtype) structure containing the current local time.
192+
A reference to a [DBTimeStamp](/dotnet/api/system.data.oledb.oledbtype) structure containing the current local time.
193193

194194
### Remarks
195195

@@ -311,7 +311,7 @@ bool GetAsDBTIMESTAMP(DBTIMESTAMP& timeStamp) const throw();
311311
### Parameters
312312

313313
*timeStamp*<br/>
314-
A reference to a [DBTimeStamp](https://msdn.microsoft.com/library/system.data.oledb.oledbtype) structure.
314+
A reference to a [DBTimeStamp](/dotnet/api/system.data.oledb.oledbtype) structure.
315315

316316
### Return Value
317317

‎docs/atl/modifying-the-atl-dhtml-control.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The ATL Control Wizard provides starter code so you can build and run the contro
2626

2727
[!code-cpp[NVC_ATL_COM#6](../atl/codesnippet/cpp/modifying-the-atl-dhtml-control_2.cpp)]
2828

29-
1. Add a third method, `GoToURL`, to the interface that does not end in "UI." Implement this method by calling [IWebBrowser2::Navigate](https://msdn.microsoft.com/library/aa752133.aspx), as follows:
29+
1. Add a third method, `GoToURL`, to the interface that does not end in "UI." Implement this method by calling [IWebBrowser2::Navigate](/previous-versions//aa752133\(v=vs.85\)), as follows:
3030

3131
[!code-cpp[NVC_ATL_COM#7](../atl/codesnippet/cpp/modifying-the-atl-dhtml-control_3.cpp)]
3232

‎docs/atl/reference/asp-atl-active-server-page-component-wizard.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Use this page of the ATL Active Server Page Component Wizard to specify optional
1515

1616
- **OnStartPage/OnEndPage**
1717

18-
[OnStartPage](https://msdn.microsoft.com/library/ms691624.aspx) is called the first time the script tries to access the object. **OnEndPage** is called when the object is finished processing the script.
18+
[OnStartPage](/previous-versions//ms691624\(v=vs.85\)) is called the first time the script tries to access the object. **OnEndPage** is called when the object is finished processing the script.
1919

2020
- **Intrinsic object**
2121

‎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](https://msdn.microsoft.com/library/windows/desktop/dd162907) 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](/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.
5454

5555
`prcWBounds`<br/>
5656
If `hdcDraw` is a metafile device context (see [GetDeviceCaps](/windows/desktop/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/caccesstoken-class.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ Pointer to the new `CAccessToken` object.
192192
Specifies the requested access rights for the new token. The default, MAXIMUM_ALLOWED, requests all access rights that are valid for the caller. See [Access Rights and Access Masks](/windows/desktop/SecAuthZ/access-rights-and-access-masks) for more on access rights.
193193

194194
*pTokenAttributes*<br/>
195-
Pointer to a [SECURITY_ATTRIBUTES](https://msdn.microsoft.com/library/windows/desktop/aa379560) structure that specifies a security descriptor for the new token and determines whether child processes can inherit the token. If *pTokenAttributes* is NULL, the token gets a default security descriptor and the handle cannot be inherited.
195+
Pointer to a [SECURITY_ATTRIBUTES](/previous-versions/windows/desktop/legacy/aa379560\(v=vs.85\)) structure that specifies a security descriptor for the new token and determines whether child processes can inherit the token. If *pTokenAttributes* is NULL, the token gets a default security descriptor and the handle cannot be inherited.
196196

197197
### Return Value
198198

@@ -241,10 +241,10 @@ Specifies additional flags that control the priority class and the creation of t
241241
If TRUE, the user's profile is loaded with [LoadUserProfile](/windows/desktop/api/userenv/nf-userenv-loaduserprofilea).
242242

243243
*pProcessAttributes*<br/>
244-
Pointer to a [SECURITY_ATTRIBUTES](https://msdn.microsoft.com/library/windows/desktop/aa379560) structure that specifies a security descriptor for the new process and determines whether child processes can inherit the returned handle. If *pProcessAttributes* is NULL, the process gets a default security descriptor and the handle cannot be inherited.
244+
Pointer to a [SECURITY_ATTRIBUTES](/previous-versions/windows/desktop/legacy/aa379560\(v=vs.85\)) structure that specifies a security descriptor for the new process and determines whether child processes can inherit the returned handle. If *pProcessAttributes* is NULL, the process gets a default security descriptor and the handle cannot be inherited.
245245

246246
*pThreadAttributes*<br/>
247-
Pointer to a [SECURITY_ATTRIBUTES](https://msdn.microsoft.com/library/windows/desktop/aa379560) structure that specifies a security descriptor for the new thread and determines whether child processes can inherit the returned handle. If *pThreadAttributes* is NULL, the thread gets a default security descriptor and the handle cannot be inherited.
247+
Pointer to a [SECURITY_ATTRIBUTES](/previous-versions/windows/desktop/legacy/aa379560\(v=vs.85\)) structure that specifies a security descriptor for the new thread and determines whether child processes can inherit the returned handle. If *pThreadAttributes* is NULL, the thread gets a default security descriptor and the handle cannot be inherited.
248248

249249
*bInherit*<br/>
250250
Indicates whether the new process inherits handles from the calling process. If TRUE, each inheritable open handle in the calling process is inherited by the new process. Inherited handles have the same value and access privileges as the original handles.

‎docs/atl/reference/com-interface-entry-macros.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ These macros enter an object's interfaces into its COM map so that they can be a
1919
|[COM_INTERFACE_ENTRY_AGGREGATE_BLIND](#com_interface_entry_aggregate_blind)|Same as [COM_INTERFACE_ENTRY_AGGREGATE](#com_interface_entry_aggregate), except that querying for any IID results in forwarding the query to *punk*.|
2020
|[COM_INTERFACE_ENTRY_AUTOAGGREGATE](#com_interface_entry_autoaggregate)|Same as [COM_INTERFACE_ENTRY_AGGREGATE](#com_interface_entry_aggregate), except if *punk* is NULL, it automatically creates the aggregate described by the *clsid*.|
2121
|[COM_INTERFACE_ENTRY_AUTOAGGREGATE_BLIND](#com_interface_entry_autoaggregate_blind)|Same as [COM_INTERFACE_ENTRY_AUTOAGGREGATE](#com_interface_entry_autoaggregate), except that querying for any IID results in forwarding the query to *punk*, and if *punk* is NULL, automatically creating the aggregate described by the *clsid*.|
22-
|[COM_INTERFACE_ENTRY_BREAK](#com_interface_entry_break)|Causes your program to call [DebugBreak](https://msdn.microsoft.com/library/windows/desktop/ms679297) when the specified interface is queried for.|
22+
|[COM_INTERFACE_ENTRY_BREAK](#com_interface_entry_break)|Causes your program to call [DebugBreak](/windows/desktop/api/debugapi/nf-debugapi-debugbreak) when the specified interface is queried for.|
2323
|[COM_INTERFACE_ENTRY_CACHED_TEAR_OFF](#com_interface_entry_cached_tear_off)|Saves the interface-specific data for every instance.|
2424
|[COM_INTERFACE_ENTRY_TEAR_OFF](#com_interface_entry_tear_off)|Exposes your tear-off interfaces.|
2525
|[COM_INTERFACE_ENTRY_CHAIN](#com_interface_entry_chain)|Processes the COM map of the base class when the processing reaches this entry in the COM map.|
@@ -223,7 +223,7 @@ If the interface query fails, processing of the COM map continues.
223223
224224
## <a name="com_interface_entry_break"></a> COM_INTERFACE_ENTRY_BREAK
225225
226-
Causes your program to call [DebugBreak](https://msdn.microsoft.com/library/windows/desktop/ms679297) when the specified interface is queried for.
226+
Causes your program to call [DebugBreak](/windows/desktop/api/debugapi/nf-debugapi-debugbreak) when the specified interface is queried for.
227227
228228
```
229229
COM_INTERFACE_ENTRY_BREAK(x)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ Pointer to a `GUID` structure that identifies the type of object associated with
159159
Specifies whether the new object can contain other objects. A value of true indicates that the new object is a container. A value of false indicates that the new object is not a container.
160160

161161
*AutoInheritFlags*<br/>
162-
A set of bit flags that control how access-control entries (ACEs) are inherited from *pParent*. See [CreatePrivateObjectSecurityEx](https://msdn.microsoft.com/library/windows/desktop/aa446581) for more details.
162+
A set of bit flags that control how access-control entries (ACEs) are inherited from *pParent*. See [CreatePrivateObjectSecurityEx](/windows/desktop/api/securitybaseapi/nf-securitybaseapi-createprivateobjectsecurityex) for more details.
163163

164164
### Return Value
165165

166166
Returns true on success, false on failure.
167167

168168
### Remarks
169169

170-
This method calls [CreatePrivateObjectSercurity](/windows/desktop/api/securitybaseapi/nf-securitybaseapi-createprivateobjectsecurity) or [CreatePrivateObjectSecurityEx](https://msdn.microsoft.com/library/windows/desktop/aa446581).
170+
This method calls [CreatePrivateObjectSercurity](/windows/desktop/api/securitybaseapi/nf-securitybaseapi-createprivateobjectsecurity) or [CreatePrivateObjectSecurityEx](/windows/desktop/api/securitybaseapi/nf-securitybaseapi-createprivateobjectsecurityex).
171171

172172
The second method permits specifying the object type GUID of the new object or controlling how ACEs are inherited.
173173

@@ -251,7 +251,7 @@ Pointer to a [GENERIC_MAPPING](/windows/desktop/api/winnt/ns-winnt-_generic_mapp
251251
Reference to the [CAccessToken](../../atl/reference/caccesstoken-class.md) object for the client process on whose behalf the object is being created.
252252

253253
*AutoInheritFlags*<br/>
254-
A set of bit flags that control how access-control entries (ACEs) are inherited from *pParent*. See [CreatePrivateObjectSecurityEx](https://msdn.microsoft.com/library/windows/desktop/aa446581) for more details.
254+
A set of bit flags that control how access-control entries (ACEs) are inherited from *pParent*. See [CreatePrivateObjectSecurityEx](/windows/desktop/api/securitybaseapi/nf-securitybaseapi-createprivateobjectsecurityex) for more details.
255255

256256
### Return Value
257257

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Options for the key. The default value is REG_OPTION_NON_VOLATILE. For a list of
151151
The security access for the key. The default value is KEY_READ &#124; KEY_WRITE. For a list of possible values and descriptions, see `RegCreateKeyEx`.
152152

153153
*lpSecAttr*<br/>
154-
A pointer to a [SECURITY_ATTRIBUTES](https://msdn.microsoft.com/library/windows/desktop/aa379560) structure that indicates whether the handle of the key can be inherited by a child process. By default, this parameter is NULL (meaning the handle cannot be inherited).
154+
A pointer to a [SECURITY_ATTRIBUTES](/previous-versions/windows/desktop/legacy/aa379560\(v=vs.85\)) structure that indicates whether the handle of the key can be inherited by a child process. By default, this parameter is NULL (meaning the handle cannot be inherited).
155155

156156
*lpdwDisposition*<br/>
157157
[out] If non-NULL, retrieves either REG_CREATED_NEW_KEY (if the key did not exist and was created) or REG_OPENED_EXISTING_KEY (if the key existed and was opened).

0 commit comments

Comments
 (0)