Skip to content

Commit 573b36b

Browse files
authored
Merge pull request #2556 from MicrosoftDocs/master
12/10/2019 AM Publish
2 parents 2cac015 + d8b152c commit 573b36b

File tree

202 files changed

+398
-410
lines changed

Some content is hidden

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

202 files changed

+398
-410
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"moniker_ranges": [
1111
">= vs-2015"
1212
],
13+
"xref_query_tags": ["/dotnet", "/uwp/api"],
1314
"open_to_public_contributors": true,
1415
"type_mapping": {
1516
"Conceptual": "Content",

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,16 @@
835835
"redirect_url": "/cpp/c-runtime-library/c-run-time-library-reference",
836836
"redirect_document_id": false
837837
},
838+
{
839+
"source_path": "docs/c-runtime-library/inp-inpw.md",
840+
"redirect_url": "/cpp/c-runtime-library/inp-inpw-inpd",
841+
"redirect_document_id": true
842+
},
843+
{
844+
"source_path": "docs/c-runtime-library/outp-outpw.md",
845+
"redirect_url": "/cpp/c-runtime-library/outp-outpw-outpd",
846+
"redirect_document_id": true
847+
},
838848
{
839849
"source_path": "docs/c-runtime-library/precision-specification.md",
840850
"redirect_url": "/cpp/c-runtime-library/format-specification-syntax-printf-and-wprintf-functions#precision",

docs/assembler/masm/comm.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "COMM"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["COMM"]
55
helpviewer_keywords: ["COMM directive"]
66
ms.assetid: a23548c4-ad04-41fa-91da-945f228de742
@@ -21,6 +21,8 @@ Each *definition* has the following form:
2121

2222
*language-type*⟧ ⟦**NEAR** | **FAR**_label_**:**_type_**:**_count_
2323

24+
The *language-type*, **NEAR**, and **FAR** arguments are valid only in 32-bit MASM.
25+
2426
The optional *language-type* sets the naming conventions for the name that follows. It overrides any language specified by the **.MODEL** directive. The optional **NEAR** or **FAR** override the current memory model. The *label* is the name of the variable. The *type* can be any type specifier ([BYTE](../../assembler/masm/byte-masm.md), [WORD](../../assembler/masm/word.md), and so on) or an integer specifying the number of bytes. The optional *count* specifies the number of elements in the declared data object. The default *count* is one.
2527

2628
## Example

docs/assembler/masm/dot-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: ".CODE"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: [".CODE"]
55
helpviewer_keywords: [".CODE directive"]
66
ms.assetid: 2b8c882c-c0d2-4fa3-8335-e6b12717a4f4
77
---
8-
# .CODE
8+
# .CODE (32-bit MASM)
99

1010
When used with [.MODEL](../../assembler/masm/dot-model.md), indicates the start of a code segment.
1111

docs/assembler/masm/dot-const.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: ".CONST"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: [".CONST"]
55
helpviewer_keywords: [".CONST directive"]
66
ms.assetid: d5c1d795-174c-48d2-8359-92fbbd7d4c6c
77
---
8-
# .CONST
8+
# .CONST (32-bit MASM)
99

1010
When used with [.MODEL](../../assembler/masm/dot-model.md), starts a constant data segment (with segment name **CONST**).
1111

docs/assembler/masm/dot-data-q.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: ".DATA?"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: [".DATA?"]
55
helpviewer_keywords: [".DATA? directive"]
66
ms.assetid: f454f8d7-e23b-458c-a2c4-8441f1afdc82
77
---
8-
# .DATA?
8+
# .DATA? (32-bit MASM)
99

1010
When used with [.MODEL](../../assembler/masm/dot-model.md), starts a near data segment for uninitialized data (segment name _BSS).
1111

docs/assembler/masm/dot-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: ".DATA"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: [".DATA"]
55
helpviewer_keywords: [".DATA directive"]
66
ms.assetid: 32797935-9c79-46e0-bf6f-07d0c2bf1dc1
77
---
8-
# .DATA
8+
# .DATA (32-bit MASM)
99

1010
When used with [.MODEL](../../assembler/masm/dot-model.md), starts a near data segment for initialized data (segment name _DATA).
1111

docs/assembler/masm/end-masm.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "END (MASM)"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["end"]
55
helpviewer_keywords: ["END directive"]
66
ms.assetid: 128d1c17-f4c4-4ac6-bdb7-d14b4a9a7f4c
@@ -13,6 +13,10 @@ Marks the end of a module and, optionally, sets the program entry point to *addr
1313

1414
> **END***address*
1515
16+
## Remarks
17+
18+
The *address* argument is valid in 32-bit MASM only.
19+
1620
## See also
1721

1822
[Directives reference](directives-reference.md)

docs/assembler/masm/extern-masm.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "EXTERN (MASM)"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["extern"]
55
helpviewer_keywords: ["EXTERN directive"]
66
ms.assetid: 667d703d-3aaf-4139-a586-29bc5dab1aff
@@ -15,6 +15,8 @@ Defines one or more external variables, labels, or symbols called *name* whose t
1515
1616
## Remarks
1717

18+
The *language-type* argument is valid in 32-bit MASM only.
19+
1820
The *type* can be [ABS](../../assembler/masm/operator-abs.md), which imports *name* as a constant. Same as [EXTRN](../../assembler/masm/extrn.md).
1921

2022
## See also

docs/assembler/masm/externdef.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "EXTERNDEF"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["EXTERNDEF"]
55
helpviewer_keywords: ["EXTERNDEF directive"]
66
ms.assetid: 95a10de6-c345-4428-a2f2-90f7d411dc86
@@ -15,6 +15,8 @@ Defines one or more external variables, labels, or symbols called *name* whose t
1515
1616
## Remarks
1717

18+
The *language-type* argument is valid in 32-bit MASM only.
19+
1820
If *name* is defined in the module, it is treated as [PUBLIC](../../assembler/masm/public-masm.md). If *name* is referenced in the module, it is treated as [EXTERN](../../assembler/masm/extern-masm.md). If *name* is not referenced, it is ignored. The *type* can be [ABS](../../assembler/masm/operator-abs.md), which imports *name* as a constant. Normally used in include files.
1921

2022
## See also

docs/assembler/masm/popcontext.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: "POPCONTEXT"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["POPCONTEXT"]
55
helpviewer_keywords: ["POPCONTEXT directive"]
66
ms.assetid: 19f59290-a54d-477d-88d8-97d3f63ed417
77
---
88
# POPCONTEXT
99

10-
Restores part or all of the current *context* (saved by the [PUSHCONTEXT](../../assembler/masm/pushcontext.md) directive). The *context* can be **ASSUMES**, **RADIX**, **LISTING**, **CPU**, or **ALL**.
10+
Restores part or all of the current *context* (saved by the [PUSHCONTEXT](../../assembler/masm/pushcontext.md) directive). The *context* can be **ASSUMES** (32-bit MASSM only), **RADIX**, **LISTING**, **CPU** (32-bit MASSM only), or **ALL**.
1111

1212
## Syntax
1313

docs/assembler/masm/proc.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "PROC"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["PROC"]
55
helpviewer_keywords: ["PROC directive"]
66
ms.assetid: ee5bb6b6-fa15-4d73-b0cf-e650178539a9
@@ -18,6 +18,8 @@ Marks start and end of a procedure block called *label*. The statements in the b
1818
1919
## Remarks
2020

21+
The ⟦*distance*⟧ and ⟦*language-type*⟧ arguments are valid only in 32-bit MASM.
22+
2123
**FRAME**__:__*ehandler-address*⟧ ⟧ is only valid with ml64.exe, and causes MASM to generate a function table entry in .pdata and unwind information in .xdata for a function's structured exception handling unwind behavior.
2224

2325
When the **FRAME** attribute is used, it must be followed by an [.ENDPROLOG](../../assembler/masm/dot-endprolog.md) directive.

docs/assembler/masm/proto.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "PROTO"
3-
ms.date: "10/22/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["PROTO"]
55
helpviewer_keywords: ["PROTO directive"]
66
ms.assetid: 0487ee16-9dc7-43d1-9445-cd1601f5a080
@@ -18,10 +18,10 @@ Prototypes a function or procedure. You can call the function prototyped by the
1818
*label*\
1919
The name of the prototyped function.
2020

21-
*distance*\
21+
*distance* (32-bit MASM only.)\
2222
(Optional) Used in 16-bit memory models to override the default and indicate **NEAR** or **FAR** calls.
2323

24-
*language-type*\
24+
*language-type* (32-bit MASM only.)\
2525
(Optional) Sets the calling and naming convention for procedures and public symbols. Supported conventions are:
2626

2727
- 32-bit **FLAT** model: **C**, **STDCALL**

docs/assembler/masm/public-masm.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "PUBLIC (MASM)"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["public"]
55
helpviewer_keywords: ["PUBLIC directive"]
66
ms.assetid: 56e15a68-8a35-4bdd-b1ec-a38cbbf1c582
@@ -11,7 +11,11 @@ Makes each variable, label, or absolute symbol specified as *name* available to
1111

1212
## Syntax
1313

14-
> **PUBLIC** ⟦language-type⟧ *name*__,__ ⟦language-type⟧ *name* ...⟧
14+
> **PUBLIC***language-type**name*__,__*language-type**name* ...⟧
15+
16+
## Remarks
17+
18+
The *language-type* argument is valid in 32-bit MASM only.
1519

1620
## See also
1721

docs/assembler/masm/pushcontext.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: "PUSHCONTEXT"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["PUSHCONTEXT"]
55
helpviewer_keywords: ["PUSHCONTEXT directive"]
66
ms.assetid: 18e528ee-df6c-4ce6-8823-b35b40f757fd
77
---
88
# PUSHCONTEXT
99

10-
Saves part or all of the current *context*: segment register assumes, radix value, listing and cref flags, or processor/coprocessor values. The *context* can be **ASSUMES**, **RADIX**, **LISTING**, **CPU**, or **ALL**.
10+
Saves part or all of the current *context*: segment register assumes, radix value, listing and cref flags, or processor/coprocessor values. The *context* can be **ASSUMES** (32-bit MASM only), **RADIX**, **LISTING**, **CPU** (32-bit MASM only), or **ALL**.
1111

1212
## Syntax
1313

docs/assembler/masm/segment.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "SEGMENT"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["SEGMENT"]
55
helpviewer_keywords: ["SEGMENT directive"]
66
ms.assetid: e6f68367-6714-4f06-a79c-edfa88014430
@@ -31,10 +31,10 @@ The range of memory addresses from which a starting address for the segment can
3131

3232
If this parameter is not specified, **PARA** is used by default.
3333

34-
*combine*\
34+
*combine* (32-bit MASM only)\
3535
**PUBLIC**, **STACK**, **COMMON**, **MEMORY**, **AT**<em>address</em>, **PRIVATE**
3636

37-
*use*\
37+
*use* (32-bit MASM only)\
3838
**USE16**, **USE32**, **FLAT**
3939

4040
*characteristics*\

docs/assembler/masm/struct-masm.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "STRUCT (MASM)"
3-
ms.date: "08/30/2018"
3+
ms.date: "12/06/2019"
44
f1_keywords: ["struct"]
55
helpviewer_keywords: ["STRUCT directive"]
66
ms.assetid: 70c3ba6b-00db-461e-8dd9-eafd3ae5b3c8
@@ -15,6 +15,10 @@ Declares a structure type having the specified *field-declarations*. Each field
1515
> *field-declarations*\
1616
> *name* **ENDS**
1717
18+
## Remarks
19+
20+
The *name* argument must be the same in the opening and closing statement.
21+
1822
## See also
1923

2024
[Directives reference](../../assembler/masm/directives-reference.md)

docs/build/reference/c-preserve-comments-during-preprocessing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This compiler option requires the **/E**, **/P**, or **/EP** option.
2121

2222
The following code sample will display the source code comment.
2323

24-
```
24+
```cpp
2525
// C_compiler_option.cpp
2626
// compile with: /E /C /c
2727
int i; // a variable

docs/build/reference/clrsupportlasterror-preserve-last-error-code-for-pinvoke-calls.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ You can minimize the performance impact by linking with **/CLRSUPPORTLASTERROR:S
7575

7676
The following sample defines a native DLL with one exported function that modifies last error.
7777

78-
```
78+
```cpp
7979
// CLRSUPPORTLASTERROR_dll.cpp
8080
// compile with: /LD
8181
#include <windows.h>
@@ -92,7 +92,7 @@ __declspec(dllexport) double MySqrt(__int64 n) {
9292
9393
The following sample consumes the DLL, demonstrating how to use **/CLRSUPPORTLASTERROR**.
9494
95-
```
95+
```cpp
9696
// CLRSUPPORTLASTERROR_client.cpp
9797
// compile with: /clr CLRSUPPORTLASTERROR_dll.lib /link /clrsupportlasterror:systemdll
9898
// processor: x86

docs/build/reference/common-macros-for-build-commands-and-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ This table describes a commonly used subset of the available macros; there are m
5151
|**$(TargetPath)**|The absolute path name of the primary output file for the build (defined as drive + path + base name + file extension).|
5252
|**$(VCInstallDir)**|The directory that contains the C++ content of your Visual Studio installation. This property contains the version of the targeted Microsoft C++ (MSVC) toolset, which might be different that the host Visual Studio. For example, when building with `$(PlatformToolset) = v140`, **$(VCInstallDir)** contains the path to the Visual Studio 2015 installation.|
5353
|**$(VSInstallDir)**|The directory into which you installed Visual Studio. This property contains the version of the targeted Visual Studio toolset, which might be different that the host Visual Studio. For example, when building with `$(PlatformToolset) = v110`, **$(VSInstallDir)** contains the path to the Visual Studio 2012 installation.|
54-
|**$(WebDeployPath)**|The relative path from the web deployment root to where the project outputs belong. Returns the same value as <xref:Microsoft.VisualStudio.VCProjectEngine.VCWebDeploymentTool.RelativePath%2A>.|
54+
|**$(WebDeployPath)**|The relative path from the web deployment root to where the project outputs belong.|
5555
|**$(WebDeployRoot)**|The absolute path to the location of **\<localhost>**. For example, c:\inetpub\wwwroot.|
5656

5757
## Obsolete macros

docs/build/reference/example-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Compile with [/doc](doc-process-documentation-comments-c-cpp.md) to process docu
2626

2727
## Example
2828

29-
```
29+
```cpp
3030
// xml_example_tag.cpp
3131
// compile with: /clr /doc /LD
3232
// post-build command: xdcmake xml_example_tag.dll

docs/build/reference/exception-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The MSVC compiler will attempt to resolve cref references in one pass through th
3535

3636
## Example
3737

38-
```
38+
```cpp
3939
// xml_exception_tag.cpp
4040
// compile with: /clr /doc /LD
4141
// post-build command: xdcmake xml_exception_tag.dll

docs/build/reference/paramref-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Compile with [/doc](doc-process-documentation-comments-c-cpp.md) to process docu
2626

2727
## Example
2828

29-
```
29+
```cpp
3030
// xml_paramref_tag.cpp
3131
// compile with: /clr /doc /LD
3232
// post-build command: xdcmake xml_paramref_tag.dll

docs/build/reference/permission-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The MSVC compiler will attempt to resolve cref references in one pass through th
3535

3636
## Example
3737

38-
```
38+
```cpp
3939
// xml_permission_tag.cpp
4040
// compile with: /clr /doc /LD
4141
// post-build command: xdcmake xml_permission_tag.dll

docs/build/reference/remarks-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Compile with [/doc](doc-process-documentation-comments-c-cpp.md) to process docu
2626

2727
## Example
2828

29-
```
29+
```cpp
3030
// xml_remarks_tag.cpp
3131
// compile with: /LD /clr /doc
3232
// post-build command: xdcmake xml_remarks_tag.dll

docs/build/reference/returns-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Compile with [/doc](doc-process-documentation-comments-c-cpp.md) to process docu
2626

2727
## Example
2828

29-
```
29+
```cpp
3030
// xml_returns_tag.cpp
3131
// compile with: /LD /clr /doc
3232
// post-build command: xdcmake xml_returns_tag.dll

docs/build/reference/see-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The MSVC compiler will attempt to resolve cref references in one pass through th
3434

3535
The following sample shows how you can make cref reference to a generic type, such that, the compiler will resolve the reference.
3636

37-
```
37+
```cpp
3838
// xml_see_cref_example.cpp
3939
// compile with: /LD /clr /doc
4040
// the following cref shows how to specify the reference, such that,

docs/build/reference/seealso-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The MSVC compiler will attempt to resolve cref references in one pass through th
3636

3737
In the following sample, an unresolved symbol is referenced in a cref. The XML comment for the cref to B::Test will be `<seealso cref="!:B::Test" />`, whereas the reference to A::Test is well-formed `<seealso cref="M:A.Test" />`.
3838

39-
```
39+
```cpp
4040
// xml_seealso_tag.cpp
4141
// compile with: /LD /clr /doc
4242
// post-build command: xdcmake xml_seealso_tag.dll

docs/build/reference/summary-visual-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Compile with [/doc](doc-process-documentation-comments-c-cpp.md) to process docu
2828

2929
## Example
3030

31-
```
31+
```cpp
3232
// xml_summary_tag.cpp
3333
// compile with: /LD /clr /doc
3434
// post-build command: xdcmake xml_summary_tag.dll

0 commit comments

Comments
 (0)