Merge pull request #5898 from TylerMSFT/UUF

JillGrant615 · web-flow · commit b6a4fe8528f7 · 2025-05-01T14:43:27.000-06:00
UUF fixes and update gaming link on Hub page
diff --git a/docs/assembler/masm/masm-for-x64-ml64-exe.md b/docs/assembler/masm/masm-for-x64-ml64-exe.md
@@ -3,11 +3,10 @@ description: "Learn more about: Microsoft Macro Assembler (MASM) for x64 (ml64.e
 title: "MASM for x64 (ml64.exe)"
 ms.date: 09/21/2021
 helpviewer_keywords: ["ml64", "ml64.exe", "masm for x64"]
-ms.assetid: 89059103-f372-4968-80ea-0c7f90bb9c91
 ---
 # MASM for x64 (ml64.exe)
 
-Visual Studio includes both 32-bit and 64-bit hosted versions of MASM (the Microsoft Macro Assembler) to target x64 code. Named ml64.exe, it's the assembler that accepts x64 assembler language. The MASM command-line tools are installed when you choose a C++ workload during Visual Studio installation. The MASM tools aren't available as a separate download. For instructions on how to download and install a copy of Visual Studio, see [Install Visual Studio](/visualstudio/install/install-visual-studio). If you only want the command-line tools, not the full IDE, download the [Build Tools for Visual Studio](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022).
+Visual Studio includes both 32-bit and 64-bit hosted versions of MASM (the Microsoft Macro Assembler) to target x64 code. Named ml64.exe, it's the assembler that accepts x64 assembly language. The MASM command-line tools are installed when you choose a C++ workload during Visual Studio installation. The MASM tools aren't available as a separate download. For instructions on how to download and install a copy of Visual Studio, see [Install Visual Studio](/visualstudio/install/install-visual-studio). If you only want the command-line tools, not the full IDE, download the [Build Tools for Visual Studio](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022).
 
 To use ml64.exe on the command line, start a developer command prompt for x64 targets. A developer command prompt sets the required path and other environment variables. For information on how to start a developer command prompt, see [Build C/C++ code on the command line](../../build/building-on-the-command-line.md).
 
diff --git a/docs/build/reference/running-nmake.md b/docs/build/reference/running-nmake.md
@@ -12,6 +12,8 @@ helpviewer_keywords: ["targets, building", "response files, NMAKE", "targets", "
 
 ## Remarks
 
+NMAKE must run in a Developer Command Prompt window. A Developer Command Prompt window has the environment variables set for the tools, libraries, and include file paths required to build at the command line. For details on how to open a Developer Command Prompt window, see [Use the MSVC toolset from the command line](../building-on-the-command-line.md).
+
 NMAKE builds only specified *targets* or, when none is specified, the first target in the makefile. The first makefile target can be a [pseudotarget](description-blocks.md#pseudotargets) that builds other targets. NMAKE uses makefiles specified with **`/F`**, or if **`/F`** isn't specified, the Makefile file in the current directory. If no makefile is specified, it uses inference rules to build command-line *targets*.
 
 The *command-file* text file (or response file) contains command-line input. Other input can precede or follow \@*command-file*. A path is permitted. In *command-file*, line breaks are treated as spaces. Enclose macro definitions in quotation marks if they contain spaces.
diff --git a/docs/code-quality/c6386.md b/docs/code-quality/c6386.md
@@ -1,10 +1,9 @@
 ---
 description: "Learn more about: Warning C6386"
 title: Warning C6386
-ms.date: 11/04/2016
+ms.date: 4/30/2025
 f1_keywords: ["C6386", "WRITE_OVERRUN", "__WARNING_WRITE_OVERRUN"]
 helpviewer_keywords: ["C6386"]
-ms.assetid: 84e69fe8-8f03-4bb3-b194-e5551882e214
 ---
 # Warning C6386
 
@@ -23,24 +22,22 @@ The following code generates both this warning and [C6201](../code-quality/c6201
 ```cpp
 #define MAX 25
 
-void f ( )
+void f()
 {
-  char ar[MAX];
-  // code ...
-  ar[MAX] = '\0';
+  char a[MAX];
+  a[MAX] = '\0'; // this writes one element past the end of the buffer
 }
 ```
 
-To correct both warnings, use the following code:
+To correct the warning, use the following code which accounts for the fact that array indexes are zero-based. Thus `MAX - 1` is the last element in the buffer: 
 
 ```cpp
 #define MAX 25
 
 void f ( )
 {
    char a[MAX];
-   // code ...
-   a[MAX - 1] = '\0';
+   a[MAX-1] = '\0';
 }
 ```
 
diff --git a/docs/index.yml b/docs/index.yml
@@ -172,7 +172,7 @@ additionalContent:
             - text: Mobile development
               url: cross-platform/index.yml
             - text: Game development
-              url: /windows/uwp/gaming/e2e/
+              url: /visualstudio/gamedev/
         # Card
         - title: Features
           links:
diff --git a/docs/preprocessor/warning.md b/docs/preprocessor/warning.md
@@ -1,7 +1,7 @@
 ---
 title: "warning pragma"
 description: "Learn more about the warning pragma in Microsoft C/C++"
-ms.date: 01/22/2021
+ms.date: 4/30/2025
 f1_keywords: ["warning_CPP", "vc-pragma.warning"]
 helpviewer_keywords: ["pragma, warning", "push pragma warning", "pop warning pragma", "warning pragma"]
 no-loc: ["pragma"]
@@ -24,7 +24,7 @@ The following warning-specifier parameters are available.
 
 | warning-specifier | Meaning |
 |--|--|
-| `1`, `2`, `3`, `4` | Apply the given level to the specified warnings. Also turns on a specified warning that is off by default. |
+| `1`, `2`, `3`, `4` | Apply the given level to the specified warnings. For example: `#pragma warning (3 : 5033)` turns off warning 5033 (normally a level 1 warning) unless the warning level is set to `/w3` or higher. Also can be used to turn on a specified warning that is off by default. |
 | `default` | Reset warning behavior to its default value. Also turns on a specified warning that is off by default. The warning will be generated at its default, documented, level.<br /><br /> For more information, see [Compiler warnings that are off by default](../preprocessor/compiler-warnings-that-are-off-by-default.md). |
 | `disable` | Don't issue the specified warning messages. The optional **`justification`** property is allowed. |
 | `error` | Report the specified warnings as errors. |
@@ -34,7 +34,7 @@ The following warning-specifier parameters are available.
 The following code statement illustrates that a *`warning-number-list`* parameter can contain multiple warning numbers, and that multiple *`warning-specifier`* parameters can be specified in the same pragma directive.
 
 ```cpp
-#pragma warning( disable : 4507 34; once : 4385; error : 164 )
+#pragma warning( disable : 4507 4034; once : 4385; error : 164 )
 ```
 
 However, when the **`justification`** field is present, only one warning number can be specified. The following code statement illustrates the use of the **`justification`** field.
@@ -50,13 +50,13 @@ This directive is functionally equivalent to the following code:
 
 ```cpp
 // Disable warning messages 4507 and 4034.
-#pragma warning( disable : 4507 34 )
+#pragma warning(disable : 4507 4034)
 
 // Issue warning C4385 only once.
-#pragma warning( once : 4385 )
+#pragma warning(once : 4385)
 
 // Report warning C4164 as an error.
-#pragma warning( error : 164 )
+#pragma warning(error : 164)
 ```
 
 The compiler adds 4000 to any warning number that is between 0 and 999.
@@ -67,15 +67,17 @@ Warning numbers in the range 4700-4999 are associated with code generation. For
 // pragma_warning.cpp
 // compile with: /W1
 #pragma warning(disable:4700)
-void Test() {
+void Test()
+{
    int x;
-   int y = x;   // no C4700 here
-   #pragma warning(default:4700)   // C4700 enabled after Test ends
+   int y = x; // no C4700 here
+   #pragma warning(default:4700)   // C4700 enabled after compiling Test()
 }
 
-int main() {
+int main()
+{
    int x;
-   int y = x;   // C4700
+   int y = x; // C4700
 }
 ```
 
