Skip to content

Commit 5e40353

Browse files
authored
Merge branch 'main' into patch-13
2 parents 46fee4d + addc134 commit 5e40353

File tree

914 files changed

+9868
-6259
lines changed

Some content is hidden

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

914 files changed

+9868
-6259
lines changed

.openpublishing.build.ps1

Lines changed: 0 additions & 17 deletions
This file was deleted.

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "docs/windows/desktop-applications-visual-cpp.md",
5+
"redirect_url": "/cpp/windows/overview-of-windows-programming-in-cpp",
6+
"redirect_document_id": true
7+
},
38
{
49
"source_path": "docs/cpp-conformance-improvements-2017.md",
510
"redirect_url": "/cpp/overview/cpp-conformance-improvements",
@@ -7745,6 +7750,21 @@
77457750
"redirect_url": "/cpp/error-messages/compiler-errors-2/compiler-errors-c2500-through-c2599",
77467751
"redirect_document_id": false
77477752
},
7753+
{
7754+
"source_path": "docs/error-messages/compiler-errors-1/fatal-error-c999.md",
7755+
"redirect_url": "/cpp/error-messages/compiler-errors-1/c-cpp-build-errors",
7756+
"redirect_document_id": false
7757+
},
7758+
{
7759+
"source_path": "docs/error-messages/compiler-errors-1/fatal-error-c1000-c1999.md",
7760+
"redirect_url": "/cpp/error-messages/compiler-errors-1/c-cpp-build-errors",
7761+
"redirect_document_id": false
7762+
},
7763+
{
7764+
"source_path": "docs/error-messages/compiler-warnings/compiler-warning-level-1-c4999.md",
7765+
"redirect_url": "/cpp/error-messages/compiler-errors-1/c-cpp-build-errors",
7766+
"redirect_document_id": false
7767+
},
77487768
{
77497769
"source_path": "docs/error-messages/compiler-warnings/index.md",
77507770
"redirect_url": "/cpp/error-messages/compiler-warnings/compiler-warnings-c4000-through-c4199",

.whatsnew.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
2+
"$schema": "https://github.com/dotnet/docs-tools/blob/main/WhatsNew.Infrastructure/Configuration/reposettings.schema.json",
33
"docSetProductName": "C++, C, and Assembler",
44
"rootDirectory": "docs/",
55
"docLinkSettings": {
@@ -10,7 +10,8 @@
1010
"minAdditionsToFile": 2,
1111
"pullRequestTitlesToIgnore": [
1212
"^Confirm merge from FromPublicMasterBranch",
13-
"^Repo sync for protected CLA branch"
13+
"^Repo sync for protected CLA branch",
14+
"^Repo sync for protected branch"
1415
],
1516
"omitPullRequestTitles": false
1617
},

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Security
44

5-
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
5+
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, such as [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), and [our GitHub organizations](https://opensource.microsoft.com/).
66

77
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
88

docs/assembler/arm/arm-assembler-command-line-reference.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
title: "ARM Assembler command-line reference"
33
description: "Reference guide to the Microsoft ARM assembler command-line options."
44
ms.date: 05/09/2022
5-
ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
65
---
76
# ARM Assembler command-line reference
87

@@ -98,7 +97,7 @@ A combination of zero or more of the following options:
9897
For more information, see the [ARM Compiler armasm Reference Guide](https://developer.arm.com/documentation/dui0802/latest/).
9998

10099
- **`-sourcelink:`** *sourcelink_filename*\
101-
*sourcelink_filename* specifies a JSON-formatted configuration file that contains a simple mapping of local file paths to URLs for source files to display in the debugger. For more information on the format of this file, see [Source Link JSON Schema](https://github.com/dotnet/designs/blob/master/accepted/2020/diagnostics/source-link.md#source-link-json-schema). Source Link is a language- and source-control agnostic system for providing source debugging for binaries. Source Link is supported for native binaries starting in Visual Studio 2017 version 15.8. For an overview of Source Link, see [Source Link](https://github.com/dotnet/designs/blob/master/accepted/2020/diagnostics/source-link.md). For information on how to use Source Link in your projects, and how to generate the SourceLink file as part of your project, see [Using Source Link](https://github.com/dotnet/sourcelink#using-source-link-in-c-projects).
100+
*sourcelink_filename* specifies a JSON-formatted configuration file that contains a simple mapping of local file paths to URLs for source files to display in the debugger. For more information on the format of this file, see [Source Link JSON Schema](https://github.com/dotnet/designs/blob/main/accepted/2020/diagnostics/source-link.md#source-link-json-schema). Source Link is a language- and source-control agnostic system for providing source debugging for binaries. Source Link is supported for native binaries starting in Visual Studio 2017 version 15.8. For an overview of Source Link, see [Source Link](https://github.com/dotnet/designs/blob/main/accepted/2020/diagnostics/source-link.md). For information on how to use Source Link in your projects, and how to generate the SourceLink file as part of your project, see [Using Source Link](https://github.com/dotnet/sourcelink#using-source-link-in-c-projects).
102101

103102
- **`-via`** *filename*\
104103
Read extra command-line arguments from *filename*.

docs/assembler/masm/dot-code.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ ms.assetid: 2b8c882c-c0d2-4fa3-8335-e6b12717a4f4
88
---
99
# .CODE
1010

11-
(32-bit MASM only.) When used with [.MODEL](dot-model.md), indicates the start of a code segment.
11+
Indicates the start of a code segment.
12+
13+
When using 32-bit MASM, this should be used along with [.MODEL](dot-model.md).
1214

1315
## Syntax
1416

docs/assembler/masm/dot-data.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ ms.assetid: 32797935-9c79-46e0-bf6f-07d0c2bf1dc1
88
---
99
# .DATA
1010

11-
(32-bit MASM only.) When used with [.MODEL](dot-model.md), starts a near data segment for initialized data (segment name _DATA).
11+
Indicates the start of a data segment.
12+
13+
When using 32-bit MASM, this starts a near data segment for initialized data (segment name _DATA) and should be used along with [.MODEL](dot-model.md).
1214

1315
## Syntax
1416

docs/assembler/masm/dot-nolistif.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: .NOLISTIF"
32
title: ".NOLISTIF"
3+
description: "Learn more about: .NOLISTIF"
44
ms.date: "12/16/2019"
55
f1_keywords: [".NOLISTIF"]
66
helpviewer_keywords: [".NOLISTIF directive"]
7-
ms.assetid: 9243af7a-7221-4531-bbc3-281b6b292bfd
87
---
98
# .NOLISTIF
109

@@ -20,5 +19,5 @@ This is the default. Same as [.SFCOND](dot-sfcond.md).
2019

2120
## See also
2221

23-
[Directives reference](directives-reference.md)
22+
[Directives reference](directives-reference.md)\
2423
[MASM BNF Grammar](masm-bnf-grammar.md)

docs/assembler/masm/extern-masm.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
2-
description: "Learn more about: EXTERN"
2+
description: "Learn more about the MASM directive: EXTERN"
33
title: "EXTERN (MASM)"
4-
ms.date: "12/06/2019"
4+
ms.date: 1/10/2025
55
helpviewer_keywords: ["EXTERN directive"]
6-
ms.assetid: 667d703d-3aaf-4139-a586-29bc5dab1aff
76
---
87
# EXTERN
98

@@ -17,7 +16,9 @@ Defines one or more external variables, labels, or symbols called *name* whose t
1716

1817
The *language-type* argument is valid in 32-bit MASM only.
1918

20-
The *type* can be [ABS](operator-abs.md), which imports *name* as a constant. Same as [EXTRN](extrn.md).
19+
The *type* can be [`ABS`](operator-abs.md), which imports *name* as a constant. Same as [`EXTRN`](extrn.md).
20+
21+
The *type* can also be [`PROC`](proc.md), in which case *name* is treated as an external procedure.
2122

2223
## See also
2324

docs/assembler/masm/microsoft-macro-assembler-reference.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ helpviewer_keywords: ["MASM (Microsoft Macro Assembler), reference", "MASM (Micr
66
---
77
# Microsoft Macro Assembler reference
88

9-
The Microsoft Macro Assembler (MASM) provides several advantages over inline assembly. MASM contains a macro language that has features such as looping, arithmetic, and text string processing. MASM gives you greater control over the hardware. By using MASM, you also can reduce time and memory overhead in your code.
9+
The Microsoft Macro Assembler (MASM) provides several advantages over inline assembly. MASM contains a macro language that has features such as looping, arithmetic, and string processing. MASM gives you greater control over the hardware. By using MASM, you also can reduce time and memory overhead in your code.
1010

1111
## In This Section
1212

13-
[ML and ML64 command-line option](ml-and-ml64-command-line-reference.md)\
13+
[ML and ML64 command-line options](ml-and-ml64-command-line-reference.md)\
1414
Describes the ML and ML64 command-line options.
1515

1616
[MASM for x64 (ml64.exe)](masm-for-x64-ml64-exe.md)\
@@ -34,8 +34,7 @@ Describes fatal and nonfatal error messages and warnings.
3434
[Processor Manufacturer Programming Manuals](processor-manufacturer-programming-manuals.md)\
3535
Provides links to programming information about processors not manufactured, sold, or supported by Microsoft.
3636

37-
[MASM BNF Grammar](masm-bnf-grammar.md)
38-
37+
[MASM BNF Grammar](masm-bnf-grammar.md)\
3938
Formal BNF description of MASM for x64.
4039

4140
## Related Sections

0 commit comments

Comments
 (0)