Skip to content

Commit 3987d9c

Browse files
authored
Merge pull request #3389 from MicrosoftDocs/master
2/2/2021 AM Publish
2 parents beac3dd + d6e9b9d commit 3987d9c

9 files changed

+9
-9
lines changed

docs/build/configuring-programs-for-windows-xp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ Because of differences in platform and library support, the development experien
7878

7979
- **Building HLSL**
8080

81-
The Windows XP toolset doesn't compile HLSL source code files by default. To compile HLSL files, download and install the June 2010 DirectX SDK, and then set the project's VC directories to include it. For more information, see the "DirectX SDK Does Not Register Include/Library Paths with Visual Studio 2010" section of the [June 2010 DirectX SDK download page](https://www.microsoft.com/download/details.aspx?displaylang=en&id=6812).
81+
The Windows XP toolset doesn't compile HLSL source code files by default. To compile HLSL files, download and install the June 2010 DirectX SDK, and then set the project's VC directories to include it. For more information, see the "DirectX SDK Does Not Register Include/Library Paths with Visual Studio 2010" section of the [June 2010 DirectX SDK download page](https://download.cnet.com/DirectX-Software-Development-Kit-June-2010/3000-2069_4-75453831.html).

docs/dotnet/hosting-a-windows-form-user-control-as-an-mfc-dialog-box.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MFC provides the template class [CWinFormsDialog](../mfc/reference/cwinformsdial
1111

1212
The process that `CWinFormsDialog` uses to host the user control is the similar to that described in [Hosting a Windows Form User Control in an MFC Dialog Box](../dotnet/hosting-a-windows-form-user-control-in-an-mfc-dialog-box.md). However, `CWinFormsDialog` manages the initialization and hosting of the user control so that it does not have to be programmed manually.
1313

14-
For a sample application that shows Windows Forms used with MFC, see [MFC and Windows Forms Integration](https://www.microsoft.com/download/details.aspx?id=2113).
14+
For a sample application that shows Windows Forms used with MFC, see [MFC and Windows Forms Integration](https://download.cnet.com/MFC-and-WinForms-Integration/3000-2383_4-75453644.html).
1515

1616
### To create the MFC host application
1717

docs/dotnet/hosting-a-windows-form-user-control-in-an-mfc-dialog-box.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 9f66ee52-b7cb-4ffd-8306-392a5da990d8
99

1010
MFC hosts a Windows Forms control as a special kind of ActiveX control and communicates with the control by using ActiveX interfaces, and properties and methods of the <xref:System.Windows.Forms.Control> class. We recommend that you use .NET Framework properties and methods to operate on the control.
1111

12-
For a sample application that shows Windows Forms used with MFC, see [MFC and Windows Forms Integration](https://www.microsoft.com/download/details.aspx?id=2113).
12+
For a sample application that shows Windows Forms used with MFC, see [MFC and Windows Forms Integration](https://download.cnet.com/MFC-and-WinForms-Integration/3000-2383_4-75453644.html).
1313

1414
> [!NOTE]
1515
> In the current release, a `CDialogBar` object cannot host Windows Forms controls.

docs/dotnet/hosting-a-windows-forms-user-control-as-an-mfc-view.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The end result resembles the model used by the [CFormView Class](../mfc/referenc
1313

1414
Because MFC Windows Forms views are ActiveX controls, they do not have the same `hwnd` as MFC views. Also they cannot be passed as a pointer to a [CView](../mfc/reference/cview-class.md) view. In general, use .NET Framework methods to work with Windows Forms views and rely less on Win32.
1515

16-
For a sample application that shows Windows Forms used with MFC, see [MFC and Windows Forms Integration](https://www.microsoft.com/download/details.aspx?id=2113).
16+
For a sample application that shows Windows Forms used with MFC, see [MFC and Windows Forms Integration](https://download.cnet.com/MFC-and-WinForms-Integration/3000-2383_4-75453644.html).
1717

1818
## In This Section
1919

docs/dotnet/windows-forms-mfc-programming-differences.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ However, if you are accustomed to MFC, you might be used to creating certain typ
1515

1616
For more information about Windows Forms applications, see [Introduction to Windows Forms](/dotnet/framework/winforms/windows-forms-overview).
1717

18-
For a sample application that shows Windows Forms used with MFC, see [MFC and Windows Forms Integration](https://www.microsoft.com/download/details.aspx?id=2113).
18+
For a sample application that shows Windows Forms used with MFC, see [MFC and Windows Forms Integration](https://download.cnet.com/MFC-and-WinForms-Integration/3000-2383_4-75453644.html).
1919

2020
The following MFC view or document and command routing features have no equivalents in Windows Forms:
2121

docs/intrinsics/cpuid-cpuidex.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ This intrinsic stores the supported features and CPU information returned by the
5353

5454
The `__cpuid` intrinsic clears the ECX register before calling the `cpuid` instruction. The `__cpuidex` intrinsic sets the value of the ECX register to *subfunction_id* before it generates the `cpuid` instruction. It enables you to gather additional information about the processor.
5555

56-
For more information about the specific parameters to use and the values returned by these intrinsics on Intel processors, see the documentation for the `cpuid` instruction in [Intel 64 and IA-32 Architectures Software Developers Manual Volume 2: Instruction Set Reference](https://go.microsoft.com/fwlink/p/?LinkID=510021) and [Intel Architecture Instruction Set Extensions Programming Reference](https://go.microsoft.com/fwlink/p/?LinkID=506627). Intel documentation uses the terms "leaf" and "subleaf" for the *function_id* and *subfunction_id* parameters passed in EAX and ECX.
56+
For more information about the specific parameters to use and the values returned by these intrinsics on Intel processors, see the documentation for the `cpuid` instruction in [Intel 64 and IA-32 Architectures Software Developers Manual Volume 2: Instruction Set Reference](https://go.microsoft.com/fwlink/p/?LinkID=510021) and [Intel Architecture Instruction Set Extensions Programming Reference](https://software.intel.com/content/www/us/en/develop/download/intel-architecture-instruction-set-extensions-programming-reference.html). Intel documentation uses the terms "leaf" and "subleaf" for the *function_id* and *subfunction_id* parameters passed in EAX and ECX.
5757

5858
For more information about the specific parameters to use and the values returned by these intrinsics on AMD processors, see the documentation for the `cpuid` instruction in AMD64 Architecture Programmer's Manual Volume 3: General-Purpose and System Instructions, and in the Revision Guides for specific processor families. For links to these documents and other information, see the AMD [Developer Guides, Manuals & ISA Documents](https://go.microsoft.com/fwlink/p/?LinkId=510023) page. AMD documentation uses the terms "function number" and "subfunction number" for the *function_id* and *subfunction_id* parameters passed in EAX and ECX.
5959

docs/overview/how-to-report-a-problem-with-the-visual-cpp-toolset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ A good repro is:
107107

108108
- **Checked against other compilers** if relevant. Repros that involve portable C++ code should verify behavior against other compilers if possible. The C++ standard ultimately determines program correctness, and no compiler is perfect. However, when Clang and GCC accept your code without a diagnostic, and MSVC doesn't, you've probably found a bug in our compiler. (Other possibilities include differences in Unix and Windows behavior, or different levels of C++ standards implementation, and so on.) When all the compilers reject your code, then it's likely that your code is incorrect. Seeing different error messages may help you diagnose the issue yourself.
109109

110-
You can find lists of online compilers to test your code against in [Online C++ compilers](https://isocpp.org/blog/2013/01/online-c-compilers) on the ISO C++ website, or this curated [List of Online C++ Compilers](https://arnemertz.github.io/online-compilers/) on GitHub. Some specific examples include [Wandbox](https://wandbox.org/), [Compiler Explorer](https://godbolt.org/), and [Coliru](https://coliru.stacked-crooked.com/).
110+
You can find lists of online compilers to test your code against in [Online C++ compilers](https://isocpp.org/blog/2013/01/online-c-compilers) on the ISO C++ website, or this curated [List of Online C++ Compilers](https://arnemertz.github.io/online-compilers/) on GitHub. Some specific examples include [Wandbox](https://wandbox.org/), [Compiler Explorer](https://godbolt.org/), and [Coliru](http://coliru.stacked-crooked.com/).
111111

112112
> [!NOTE]
113113
> The online compiler websites are not affiliated with Microsoft. Many online compiler websites are run as personal projects. Some of these sites may be unavailable when you read this, but a search should find others you can use.

docs/standard-library/multimap-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.assetid: 8796ae05-37c4-475a-9e61-75fde9d4a463
88
---
99
# multimap Class
1010

11-
The C++ Standard Library multimap class is used for the storage and retrieval of data from a collection in which the each element is a pair that has both a data value and a sort key. The value of the key doesn't need to be unique and is used to order the data automatically. The value of an element in a multimap, but not its associated key value, may be changed directly. Instead, key values associated with old elements must be deleted and new key values associated with new elements inserted.
11+
The C++ Standard Library multimap class is used for the storage and retrieval of data from a collection in which each element is a pair that has both a data value and a sort key. The value of the key doesn't need to be unique and is used to order the data automatically. The value of an element in a multimap, but not its associated key value, may be changed directly. Instead, key values associated with old elements must be deleted and new key values associated with new elements inserted.
1212

1313
## Syntax
1414

docs/windows/resources-for-creating-a-game-using-directx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Visual C++ is included in all editions of Visual Studio, but it's not installed
1515

1616
For Windows 8.1 and later, the DirectX SDK is included in the Windows SDK. You don't have to download anything extra. For more information, see [Where is the DirectX SDK?](/windows/win32/directx-sdk--august-2009-).
1717

18-
To create DirectX apps for Windows 7, Windows Vista, or Windows XP, you can download the stand-alone [DirectX SDK](https://www.microsoft.com/download/details.aspx?displaylang=en&id=6812).
18+
To create DirectX apps for Windows 7, Windows Vista, or Windows XP, you can download the stand-alone [DirectX SDK](https://download.cnet.com/DirectX-Software-Development-Kit-June-2010/3000-2069_4-75453831.html).
1919

2020
[DirectX Graphics and Gaming](/windows/win32/directx) has information and samples to help you get started with DirectX programming.
2121

0 commit comments

Comments
 (0)