Skip to content

Commit ed2544e

Browse files
authored
Merge pull request #1249 from MicrosoftDocs/master
8/15 AM Publish
2 parents a41c4d0 + 074aed8 commit ed2544e

File tree

93 files changed

+754
-722
lines changed

Some content is hidden

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

93 files changed

+754
-722
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"redirections": [
33
{
44
"source_path": "docs/assembler/arm/index.md",
@@ -240,6 +240,11 @@
240240
"redirect_url": "/cpp/cpp/extern-cpp",
241241
"redirect_document_id": false
242242
},
243+
{
244+
"source_path": "docs/cpp/using-structured-exception-handling-with-cpp.md",
245+
"redirect_url": "/cpp/cpp/exception-handling-differences",
246+
"redirect_document_id": false
247+
},
243248
{
244249
"source_path": "docs/cpp/support-for-cpp11-14-17-features-modern-cpp.md",
245250
"redirect_url": "/cpp/visual-cpp-language-conformance",

docs/atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ When you create `BSTR`s and pass them between COM objects, you must take care in
3636
## See Also
3737
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
3838
[CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)
39-
[SysAllocString](https://msdn.microsoft.com/library/windows/desktop/ms221458.aspx)
40-
[SysFreeString](https://msdn.microsoft.com/library/windows/desktop/ms221481.aspx)
39+
[SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)
40+
[SysFreeString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysfreestring)
4141

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ BSTR AllocSysString() const;
213213
In MFC programs, a [CMemoryException Class](../../mfc/reference/cmemoryexception-class.md) is thrown if insufficient memory exists. In ATL programs, a [CAtlException](../../atl/reference/catlexception-class.md) is thrown. This function is normally used to return strings for Automation.
214214

215215

216-
Commonly, if this string is passed to a COM function as an [in] parameter, then this requires the caller to free the string. This can be done by using [SysFreeString](https://msdn.microsoft.com/library/windows/desktop/ms221481.aspx), as described in the Windows SDK. For more information, see [Allocating and Releasing Memory for a BSTR](../../atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md).
216+
Commonly, if this string is passed to a COM function as an [in] parameter, then this requires the caller to free the string. This can be done by using [SysFreeString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysfreestring), as described in the Windows SDK. For more information, see [Allocating and Releasing Memory for a BSTR](../../atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md).
217217

218-
For more information about OLE allocation functions in Windows, see [SysAllocString](https://msdn.microsoft.com/library/windows/desktop/ms221458.aspx) in the Windows SDK.
218+
For more information about OLE allocation functions in Windows, see [SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring) in the Windows SDK.
219219

220220

221221
### Example

docs/atl/reference/cregkey-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ LONG SetStringValue(
829829
If the method succeeds, the return value is ERROR_SUCCESS. If the method fails, the return value is a nonzero error code defined in WINERROR.H.
830830

831831
### Remarks
832-
This method uses [RegSetValueEx](http://msdn.microsoft.com/library/windows/desktop/ms724923\(v=vs.85\).aspx) to write the value to the registry.
832+
This method uses [RegSetValueEx](/windows/desktop/api/winreg/nf-winreg-regsetvalueexa) to write the value to the registry.
833833

834834
## <a name="setvalue"></a> CRegKey::SetValue
835835
Call this method to store data in the specified value field of [m_hKey](#m_hkey). Earlier versions of this method are no longer supported and are marked as ATL_DEPRECATED.

docs/atl/reference/csid-class.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,13 @@ bool LoadAccount(
306306
The system name. This string can be the name of a remote computer. If this string is NULL, the local system is used instead.
307307

308308
*pSid*
309-
A pointer to a [SID](http://msdn.microsoft.com/library/windows/desktop/aa379594\(v=vs.85\).aspx) structure.
309+
A pointer to a [SID](/windows/desktop/api/winnt/ns-winnt-_sid) structure.
310310

311311
### Return Value
312312
Returns TRUE on success, FALSE on failure. To get extended error information, call `GetLastError`.
313313

314314
### Remarks
315-
`LoadAccount` attempts to find a security identifier for the specified name. See [LookupAccountSid](http://msdn.microsoft.com/library/windows/desktop/aa379166\(v=vs.85\).aspx) for more details.
315+
`LoadAccount` attempts to find a security identifier for the specified name. See [LookupAccountSid](/windows/desktop/api/winbase/nf-winbase-lookupaccountsida) for more details.
316316

317317
## <a name="operator_eq"></a> CSid::operator =
318318
Assignment operator.

docs/atl/reference/cwin32heap-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ CWin32Heap(
141141

142142
The parameter HEAP_NO_SERIALIZE specifies that mutual exclusion will not be used when the heap functions allocate and free memory, with an according increase in performance.
143143

144-
The third parameter defaults to 0, which allows the heap to grow as required. See [HeapCreate](http://msdn.microsoft.com/library/windows/desktop/aa366599\(v=vs.85\).aspx) for an explanation of the memory sizes and flags.
144+
The third parameter defaults to 0, which allows the heap to grow as required. See [HeapCreate](/windows/desktop/api/heapapi/nf-heapapi-heapcreate) for an explanation of the memory sizes and flags.
145145

146146
## <a name="dtor"></a> CWin32Heap::~CWin32Heap
147147
The destructor.

docs/atl/reference/idispeventsimpleimpl-class.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ STDMETHOD(GetIDsOfNames)(
169169
```
170170

171171
### Remarks
172-
See [IDispatch::GetIDsOfNames](http://msdn.microsoft.com/6f6cf233-3481-436e-8d6a-51f93bf91619) in the Windows SDK.
172+
See [IDispatch::GetIDsOfNames](/previous-versions/windows/desktop/api/oaidl/nf-oaidl-idispatch-getidsofnames) in the Windows SDK.
173173

174174
## <a name="gettypeinfo"></a> IDispEventSimpleImpl::GetTypeInfo
175175
This implementation of `IDispatch::GetTypeInfo` returns E_NOTIMPL.
@@ -182,7 +182,7 @@ STDMETHOD(GetTypeInfo)(
182182
```
183183

184184
### Remarks
185-
See [IDispatch::GetTypeInfo](http://msdn.microsoft.com/cc1ec9aa-6c40-4e70-819c-a7c6dd6b8c99) in the Windows SDK.
185+
See [IDispatch::GetTypeInfo](/previous-versions/windows/desktop/api/oaidl/nf-oaidl-idispatch-gettypeinfo) in the Windows SDK.
186186

187187
## <a name="gettypeinfocount"></a> IDispEventSimpleImpl::GetTypeInfoCount
188188
This implementation of `IDispatch::GetTypeInfoCount` returns E_NOTIMPL.
@@ -192,7 +192,7 @@ STDMETHOD(GetTypeInfoCount)(UINT* /* pctinfo */);
192192
```
193193

194194
### Remarks
195-
See [IDispatch::GetTypeInfoCount](http://msdn.microsoft.com/da876d53-cb8a-465c-a43e-c0eb272e2a12) in the Windows SDK.
195+
See [IDispatch::GetTypeInfoCount](/previous-versions/windows/desktop/api/oaidl/nf-oaidl-idispatch-gettypeinfocount) in the Windows SDK.
196196

197197
## <a name="invoke"></a> IDispEventSimpleImpl::Invoke
198198
This implementation of `IDispatch::Invoke` calls the event handlers listed in the event sink map.
@@ -210,7 +210,7 @@ STDMETHOD(Invoke)(
210210
```
211211

212212
### Remarks
213-
See [IDispatch::Invoke](http://msdn.microsoft.com/964ade8e-9d8a-4d32-bd47-aa678912a54d).
213+
See [IDispatch::Invoke](/previous-versions/windows/desktop/api/oaidl/nf-oaidl-idispatch-invoke).
214214

215215
## <a name="unadvise"></a> IDispEventSimpleImpl::Unadvise
216216
Breaks the connection with the event source represented by *pUnk*.

docs/atl/reference/isupporterrorinfoimpl-class.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: "mblome"
1313
ms.workload: ["cplusplus"]
1414
---
1515
# ISupportErrorInfoImpl Class
16-
This class provides a default implementation of the [ISupportErrorInfo Interface](http://msdn.microsoft.com/42d33066-36b4-4a5b-aa5d-46682e560f32) and can be used when only a single interface generates errors on an object.
16+
This class provides a default implementation of the [ISupportErrorInfo Interface](/previous-versions/windows/desktop/api/oaidl/nn-oaidl-isupporterrorinfo) and can be used when only a single interface generates errors on an object.
1717

1818
> [!IMPORTANT]
1919
> This class and its members cannot be used in applications that execute in the Windows Runtime.
@@ -28,18 +28,18 @@ class ATL_NO_VTABLE ISupportErrorInfoImpl
2828

2929
#### Parameters
3030
*piid*
31-
A pointer to the IID of an interface that supports [IErrorInfo](http://msdn.microsoft.com/4dda6909-2d9a-4727-ae0c-b5f90dcfa447).
31+
A pointer to the IID of an interface that supports [IErrorInfo](/previous-versions/windows/desktop/api/oaidl/nn-oaidl-ierrorinfo).
3232

3333
## Members
3434

3535
### Public Methods
3636

3737
|Name|Description|
3838
|----------|-----------------|
39-
|[ISupportErrorInfoImpl::InterfaceSupportsErrorInfo](#interfacesupportserrorinfo)|Indicates whether the interface identified by `riid` supports the [IErrorInfo](http://msdn.microsoft.com/4dda6909-2d9a-4727-ae0c-b5f90dcfa447) interface.|
39+
|[ISupportErrorInfoImpl::InterfaceSupportsErrorInfo](#interfacesupportserrorinfo)|Indicates whether the interface identified by `riid` supports the [IErrorInfo](/previous-versions/windows/desktop/api/oaidl/nn-oaidl-ierrorinfo) interface.|
4040

4141
## Remarks
42-
The [ISupportErrorInfo Interface](http://msdn.microsoft.com/42d33066-36b4-4a5b-aa5d-46682e560f32) ensures that error information can be returned to the client. Objects that use `IErrorInfo` must implement `ISupportErrorInfo`.
42+
The [ISupportErrorInfo Interface](/previous-versions/windows/desktop/api/oaidl/nn-oaidl-isupporterrorinfo) ensures that error information can be returned to the client. Objects that use `IErrorInfo` must implement `ISupportErrorInfo`.
4343

4444
Class `ISupportErrorInfoImpl` provides a default implementation of `ISupportErrorInfo` and can be used when only a single interface generates errors on an object. For example:
4545

@@ -54,14 +54,14 @@ class ATL_NO_VTABLE ISupportErrorInfoImpl
5454
**Header:** atlcom.h
5555

5656
## <a name="interfacesupportserrorinfo"></a> ISupportErrorInfoImpl::InterfaceSupportsErrorInfo
57-
Indicates whether the interface identified by `riid` supports the [IErrorInfo](http://msdn.microsoft.com/4dda6909-2d9a-4727-ae0c-b5f90dcfa447) interface.
57+
Indicates whether the interface identified by `riid` supports the [IErrorInfo](/previous-versions/windows/desktop/api/oaidl/nn-oaidl-ierrorinfo) interface.
5858

5959
```
6060
STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
6161
```
6262

6363
### Remarks
64-
See [ISupportErrorInfo::InterfaceSupportsErrorInfo](http://msdn.microsoft.com/a54ef18d-ee3f-4483-ac4a-99d758f0960a) in the Windows SDK.
64+
See [ISupportErrorInfo::InterfaceSupportsErrorInfo](/previous-versions/windows/desktop/api/oaidl/nf-oaidl-isupporterrorinfo-interfacesupportserrorinfo) in the Windows SDK.
6565

6666
## <a name="getsize"></a> IThreadPoolConfig::GetSize
6767
Call this method to get the number of threads in the pool.

docs/build/dlls-in-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ The following topics provide detailed information about how to program DLLs in V
8585
[FreeLibrary and AfxFreeLibrary](../build/freelibrary-and-afxfreelibrary.md)
8686
Discusses using **FreeLibrary** and `AfxFreeLibrary` when the DLL module is no longer needed.
8787

88-
[Dynamic-Link Library Search Order](https://msdn.microsoft.com/library/windows/desktop/ms682586.aspx)
88+
[Dynamic-Link Library Search Order](/windows/desktop/Dlls/dynamic-link-library-search-order)
8989
Describes the search path that the Windows operating system uses to locate a DLL on the system.
9090

9191
[Module States of a Regular MFC DLL Dynamically Linked to MFC](../build/module-states-of-a-regular-dll-dynamically-linked-to-mfc.md)

docs/build/linking-an-executable-to-a-dll.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Unlike in this example, in most cases you should call `LoadLibrary` and `FreeLib
134134
135135
- [Working with Import Libraries and Export Files](../build/reference/working-with-import-libraries-and-export-files.md)
136136
137-
- [Dynamic-Link Library Search Order](https://msdn.microsoft.com/library/windows/desktop/ms682586.aspx)
137+
- [Dynamic-Link Library Search Order](/windows/desktop/Dlls/dynamic-link-library-search-order)
138138
139139
## See Also
140140
[DLLs in Visual C++](../build/dlls-in-visual-cpp.md)

docs/build/loadlibrary-and-afxloadlibrary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If Windows cannot load the DLL, the process can attempt to recover from the erro
3535

3636
## What do you want to know more about?
3737

38-
- [Dynamic-Link Library Search Order](https://msdn.microsoft.com/library/windows/desktop/ms682586.aspx)
38+
- [Dynamic-Link Library Search Order](/windows/desktop/Dlls/dynamic-link-library-search-order)
3939

4040
- [FreeLibrary and AfxFreeLibrary](../build/freelibrary-and-afxfreelibrary.md)
4141

docs/build/reference/allowbind-prevent-dll-binding.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ ms.workload: ["cplusplus"]
3737
## See Also
3838
[Setting Linker Options](../../build/reference/setting-linker-options.md)
3939
[Linker Options](../../build/reference/linker-options.md)
40-
[BindImage function](http://msdn.microsoft.com/library/windows/desktop/ms679278.aspx)
41-
[BindImageEx function](http://msdn.microsoft.com/library/windows/desktop/ms679279.aspx)
40+
[BindImage function](/windows/desktop/api/imagehlp/nf-imagehlp-bindimage)
41+
[BindImageEx function](/windows/desktop/api/imagehlp/nf-imagehlp-bindimageex)

docs/build/reference/allowisolation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ Specifies behavior for manifest lookup.
3434
## See Also
3535
[EDITBIN Options](../../build/reference/editbin-options.md)
3636
[/ALLOWISOLATION (Manifest Lookup)](../../build/reference/allowisolation-manifest-lookup.md)
37-
[Manifest Files Reference](http://msdn.microsoft.com/library/aa375632.aspx)
37+
[Manifest Files Reference](/windows/desktop/SbsCs/manifest-files-reference)

docs/build/reference/constraints-of-delay-loading-dlls.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ There are constraints regarding the delay loading of imports.
3333
[LoadLibrary function](http://msdn.microsoft.com/library/windows/desktop/ms684175.aspx)
3434
[GetModuleHandle function](http://msdn.microsoft.com/library/windows/desktop/ms683199.aspx)
3535
[GetProcAddress function](http://msdn.microsoft.com/library/windows/desktop/ms683212.aspx)
36-
[TlsAlloc function](http://msdn.microsoft.com/library/windows/desktop/ms686801.aspx)
37-
[TlsFree function](http://msdn.microsoft.com/library/windows/desktop/ms686804.aspx)
38-
[TlsGetValue function](http://msdn.microsoft.com/library/windows/desktop/ms686812.aspx)
39-
[TlsSetValue function](http://msdn.microsoft.com/library/windows/desktop/ms686818.aspx)
36+
[TlsAlloc function](/windows/desktop/api/processthreadsapi/nf-processthreadsapi-tlsalloc)
37+
[TlsFree function](/windows/desktop/api/processthreadsapi/nf-processthreadsapi-tlsfree)
38+
[TlsGetValue function](/windows/desktop/api/processthreadsapi/nf-processthreadsapi-tlsgetvalue)
39+
[TlsSetValue function](/windows/desktop/api/processthreadsapi/nf-processthreadsapi-tlssetvalue)

docs/build/reference/dependentloadflag.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This option is new in Visual Studio 2017, and applies only to apps running on Wi
3232

3333
On supported operating systems, this option has the effect of changing calls to `LoadLibrary("dependent.dll")` to the equivalent of `LoadLibraryEx("dependent.dll", 0, loadflags)`. Calls to [LoadLibraryEx](https://go.microsoft.com/fwlink/p/?LinkID=236091) are unaffected. This option does not apply recursively to DLLs loaded by your app.
3434

35-
This flag can be used to prevent DLL planting attacks. For example, if an app uses `LoadLibrary` to load a dependent DLL, an attacker could plant a DLL with the same name in the search path used by `LoadLibrary`, such as the current directory, which may be checked before system directories if safe DLL search mode is disabled. Safe DLL search mode places the user's current directory later in the search order, and is enabled by default on Windows XP SP2 and later versions. For more information, see [Dynamic-Link Library Search Order](https://msdn.microsoft.com/library/windows/desktop/ms682586.aspx).
35+
This flag can be used to prevent DLL planting attacks. For example, if an app uses `LoadLibrary` to load a dependent DLL, an attacker could plant a DLL with the same name in the search path used by `LoadLibrary`, such as the current directory, which may be checked before system directories if safe DLL search mode is disabled. Safe DLL search mode places the user's current directory later in the search order, and is enabled by default on Windows XP SP2 and later versions. For more information, see [Dynamic-Link Library Search Order](/windows/desktop/Dlls/dynamic-link-library-search-order).
3636

3737
If you specify the link option `/DEPENDENTLOADFLAG:0xA00` (the value of the combined flags `LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32`), then even if safe DLL search mode is disabled on the user's computer, the DLL search path is limited to protected directories that are more difficult for an attacker to change. For information on the flags available, and their symbolic and numeric values, see the *dwFlags* parameter description in [LoadLibraryEx](https://go.microsoft.com/fwlink/p/?LinkID=236091).
3838

@@ -56,4 +56,4 @@ If you specify the link option `/DEPENDENTLOADFLAG:0xA00` (the value of the comb
5656
- [Determine which linking method to use](../linking-an-executable-to-a-dll.md#determining-which-linking-method-to-use)
5757
- [LoadLibrary](https://go.microsoft.com/fwlink/p/?LinkID=259187)
5858
- [LoadLibraryEx](https://go.microsoft.com/fwlink/p/?LinkID=236091)
59-
- [Dynamic-Link Library Search Order](https://msdn.microsoft.com/library/windows/desktop/ms682586.aspx)
59+
- [Dynamic-Link Library Search Order](/windows/desktop/Dlls/dynamic-link-library-search-order)

0 commit comments

Comments
 (0)