Skip to content

Commit f76663d

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/cpp-docs-pr (branch live)
2 parents 3068240 + e98671a commit f76663d

71 files changed

Lines changed: 1284 additions & 754 deletions

File tree

Some content is hidden

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

‎.openpublishing.redirection.json‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7640,6 +7640,86 @@
76407640
"redirect_url": "/cpp/windows/creating-a-device-image-image-editor-for-icons",
76417641
"redirect_document_id": false
76427642
},
7643+
{
7644+
"source_path": "docs/windows/using-the-256-color-palette-image-editor-for-icons.md",
7645+
"redirect_url": "/cpp/windows/creating-a-256-color-icon-or-cursor-image-editor-for-icons",
7646+
"redirect_document_id": false
7647+
},
7648+
{
7649+
"source_path": "docs/windows/inserting-a-new-menu-between-existing-menus.md",
7650+
"redirect_url": "/cpp/windows/creating-a-menu",
7651+
"redirect_document_id": false
7652+
},
7653+
{
7654+
"source_path": "docs/windows/adding-commands-to-a-menu.md",
7655+
"redirect_url": "/cpp/windows/creating-a-menu",
7656+
"redirect_document_id": false
7657+
},
7658+
{
7659+
"source_path": "docs/windows/connecting-a-pop-up-menu-to-your-application.md",
7660+
"redirect_url": "/cpp/windows/creating-pop-up-menus",
7661+
"redirect_document_id": false
7662+
},
7663+
{
7664+
"source_path": "docs/windows/viewing-a-menu-as-a-pop-up-menu.md",
7665+
"redirect_url": "/cpp/windows/creating-pop-up-menus",
7666+
"redirect_document_id": false
7667+
},
7668+
{
7669+
"source_path": "docs/windows/moving-and-copying-menus-and-menu-commands.md",
7670+
"redirect_url": "/cpp/windows/selecting-multiple-menus-or-menu-commands",
7671+
"redirect_document_id": false
7672+
},
7673+
{
7674+
"source_path": "docs/windows/deleting-menus-and-menu-commands.md",
7675+
"redirect_url": "/cpp/windows/selecting-multiple-menus-or-menu-commands",
7676+
"redirect_document_id": false
7677+
},
7678+
{
7679+
"source_path": "docs/windows/associating-menu-commands-with-status-bar-text-in-mfc-applications.md",
7680+
"redirect_url": "/cpp/windows/associating-a-menu-command-with-an-accelerator-key",
7681+
"redirect_document_id": false
7682+
},
7683+
{
7684+
"source_path": "docs/windows/assigning-access-keys-to-menu-commands.md",
7685+
"redirect_url": "/cpp/windows/associating-a-menu-command-with-an-accelerator-key",
7686+
"redirect_document_id": false
7687+
},
7688+
{
7689+
"source_path": "docs/windows/finding-a-string.md",
7690+
"redirect_url": "/cpp/windows/string-editor",
7691+
"redirect_document_id": false
7692+
},
7693+
{
7694+
"source_path": "docs/windows/adding-or-deleting-a-string.md",
7695+
"redirect_url": "/cpp/windows/string-editor",
7696+
"redirect_document_id": false
7697+
},
7698+
{
7699+
"source_path": "docs/windows/moving-a-string-from-one-resource-file-to-another.md",
7700+
"redirect_url": "/cpp/windows/string-editor",
7701+
"redirect_document_id": false
7702+
},
7703+
{
7704+
"source_path": "docs/windows/changing-the-properties-of-a-string.md",
7705+
"redirect_url": "/cpp/windows/string-editor",
7706+
"redirect_document_id": false
7707+
},
7708+
{
7709+
"source_path": "docs/windows/changing-the-caption-property-of-multiple-strings.md",
7710+
"redirect_url": "/cpp/windows/string-editor",
7711+
"redirect_document_id": false
7712+
},
7713+
{
7714+
"source_path": "docs/windows/adding-formatting-or-special-characters-to-a-string.md",
7715+
"redirect_url": "/cpp/windows/string-editor",
7716+
"redirect_document_id": false
7717+
},
7718+
{
7719+
"source_path": "docs/windows/new-toolbar-resource-dialog-box.md",
7720+
"redirect_url": "/cpp/windows/converting-bitmaps-to-toolbars",
7721+
"redirect_document_id": false
7722+
},
76437723
{
76447724
"source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
76457725
"redirect_url": "/cpp/windows/activationfactory-class#activationfactory",

‎docs/build/reference/TOC.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@
193193
### [/ASSEMBLYMODULE (Add a MSIL Module to the Assembly)](assemblymodule-add-a-msil-module-to-the-assembly.md)
194194
### [/ASSEMBLYRESOURCE (Embed a Managed Resource)](assemblyresource-embed-a-managed-resource.md)
195195
### [/BASE (Base Address)](base-base-address.md)
196+
### [/CETCOMPAT (Control-flow Enforcement Technology compatible)](cetcompat.md)
196197
### [/CGTHREADS (Compiler Threads)](cgthreads-compiler-threads.md)
197198
### [/CLRIMAGETYPE (Specify Type of CLR Image)](clrimagetype-specify-type-of-clr-image.md)
198199
### [/CLRSUPPORTLASTERROR (Preserve Last Error Code for PInvoke Calls)](clrsupportlasterror-preserve-last-error-code-for-pinvoke-calls.md)

‎docs/build/reference/cetcompat.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
title: "/CETCOMPAT (Control-flow Enforcement Technology compatible)"
3+
ms.date: "02/01/2019"
4+
f1_keywords: ["/CETCOMPAT"]
5+
helpviewer_keywords: ["/CETCOMPAT linker option", "/CETCOMPAT"]
6+
---
7+
# /CETCOMPAT (Control-flow Enforcement Technology compatible)
8+
9+
Specifies whether to mark an executable image as compatible with Control-flow Enforcement Technology (CET).
10+
11+
## Syntax
12+
13+
> **/CETCOMPAT**\[**:NO**]
14+
15+
## Arguments
16+
17+
**NO**<br/>
18+
Specifies that the executalbe should not be marked compatible with CET.
19+
20+
## Remarks
21+
22+
Control-flow Enforcement Technology (CET) is a computer processor feature that provides capabilities to defend against certain kinds of malware attacks. For more information, see [Intel Control-flow Enforcement Technology Preview](https://software.intel.com/sites/default/files/managed/4d/2a/control-flow-enforcement-technology-preview.pdf).
23+
24+
The **/CETCOMPAT** linker option tells the linker to mark the binary as CET-compatible. **/CETCOMPAT:NO** marks the binary as not compatible with CET. If both options are specified on the command line, the last one specified is used. This switch is currently only applicable to x86 and x64 architectures.
25+
26+
The **/CETCOMPAT** option is available beginning in the Visual Studio 2019 Preview 3 toolset.
27+
28+
### To set the /CETCOMPAT linker option in Visual Studio
29+
30+
1. Open the **Property Pages** dialog box for the project. For more information, see [Working with Project Properties](../../ide/working-with-project-properties.md).
31+
32+
1. Select the **Configuration Properties** > **Linker** > **Command Line** property page.
33+
34+
1. In the **Additional options** box, add **/CETCOMPAT** or **/CETCOMPAT:NO** and then choose **OK** or **Apply** to save your changes.
35+
36+
### To set this linker option programmatically
37+
38+
- This option does not have a programmatic equivalent.
39+
40+
## See also
41+
42+
[Setting Linker Options](../../build/reference/setting-linker-options.md)<br/>
43+
[Linker Options](../../build/reference/linker-options.md)

‎docs/build/x64-software-conventions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ _declspec(align(8)) struct {
133133
#### Example 3
134134

135135
```C
136-
// Total size = 22 bytes, alignment = 4 bytes (doubleword).
136+
// Total size = 12 bytes, alignment = 4 bytes (doubleword).
137137

138138
_declspec(align(4)) struct {
139139
char a; // +0; size = 1 byte

‎docs/c-runtime-library/ciatan.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "_CIatan"
33
ms.date: "11/04/2016"
44
apiname: ["_CIatan"]
5-
apilocation: ["msvcr120.dll", "msvcr110.dll", "msvcrt.dll", "msvcr80.dll", "msvcr100.dll", "msvcr90.dll", "msvcr110_clr0400.dll"]
5+
apilocation: ["msvcr120.dll", "msvcr110.dll", "msvcrt.dll", "msvcr80.dll", "msvcr100.dll", "msvcr90.dll", "msvcr110_clr0400.dll", "api-ms-win-crt-math-l1-1-0.dll"]
66
apitype: "DLLExport"
77
f1_keywords: ["_CIatan", "CIatan"]
88
helpviewer_keywords: ["CIatan intrinsic", "_CIatan intrinsic"]

‎docs/c-runtime-library/ciatan2.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "_CIatan2"
33
ms.date: "11/04/2016"
44
apiname: ["_CIatan2"]
5-
apilocation: ["msvcr80.dll", "msvcrt.dll", "msvcr120.dll", "msvcr110_clr0400.dll", "msvcr110.dll", "msvcr100.dll", "msvcr90.dll"]
5+
apilocation: ["msvcr80.dll", "msvcrt.dll", "msvcr120.dll", "msvcr110_clr0400.dll", "msvcr110.dll", "msvcr100.dll", "msvcr90.dll", "api-ms-win-crt-math-l1-1-0.dll"]
66
apitype: "DLLExport"
77
f1_keywords: ["CIatan2", "_CIatan2"]
88
helpviewer_keywords: ["_CIatan2 intrinsic", "CIatan2 intrinsic"]

‎docs/c-runtime-library/cicos.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "_CIcos"
33
ms.date: "04/11/2018"
44
apiname: ["_CIcos"]
5-
apilocation: ["msvcr90.dll", "msvcrt.dll", "msvcr120.dll", "msvcr100.dll", "msvcr80.dll", "msvcr110_clr0400.dll", "msvcr110.dll"]
5+
apilocation: ["msvcr90.dll", "msvcrt.dll", "msvcr120.dll", "msvcr100.dll", "msvcr80.dll", "msvcr110_clr0400.dll", "msvcr110.dll", "api-ms-win-crt-math-l1-1-0.dll"]
66
apitype: "DLLExport"
77
f1_keywords: ["CIcos", "_CIcos"]
88
helpviewer_keywords: ["_CIcos intrinsic", "CIcos intrinsic"]

‎docs/c-runtime-library/ciexp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "_CIexp"
33
ms.date: "11/04/2016"
44
apiname: ["_CIexp"]
5-
apilocation: ["msvcr120.dll", "msvcr80.dll", "msvcr110.dll", "msvcr100.dll", "msvcrt.dll", "msvcr110_clr0400.dll", "msvcr90.dll"]
5+
apilocation: ["msvcr120.dll", "msvcr80.dll", "msvcr110.dll", "msvcr100.dll", "msvcrt.dll", "msvcr110_clr0400.dll", "msvcr90.dll", "api-ms-win-crt-math-l1-1-0.dll"]
66
apitype: "DLLExport"
77
f1_keywords: ["CIexp", "_CIexp"]
88
helpviewer_keywords: ["CIexp intrinsic", "_CIexp intrinsic"]

‎docs/c-runtime-library/cifmod.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "_CIfmod"
33
ms.date: "11/04/2016"
44
apiname: ["_CIfmod"]
5-
apilocation: ["msvcrt.dll", "msvcr110_clr0400.dll", "msvcr100.dll", "msvcr80.dll", "msvcr90.dll", "msvcr120.dll", "msvcr110.dll"]
5+
apilocation: ["msvcrt.dll", "msvcr110_clr0400.dll", "msvcr100.dll", "msvcr80.dll", "msvcr90.dll", "msvcr120.dll", "msvcr110.dll", "api-ms-win-crt-math-l1-1-0.dll"]
66
apitype: "DLLExport"
77
f1_keywords: ["_CIfmod", "CIfmod"]
88
helpviewer_keywords: ["CIfmod intrinsic", "_CIfmod intrinsic"]

‎docs/c-runtime-library/cilog.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "_CIlog"
33
ms.date: "11/04/2016"
44
apiname: ["_CIlog"]
5-
apilocation: ["msvcr90.dll", "msvcr120.dll", "msvcr80.dll", "msvcr110.dll", "msvcr110_clr0400.dll", "msvcr100.dll", "msvcrt.dll"]
5+
apilocation: ["msvcr90.dll", "msvcr120.dll", "msvcr80.dll", "msvcr110.dll", "msvcr110_clr0400.dll", "msvcr100.dll", "msvcrt.dll", "api-ms-win-crt-math-l1-1-0.dll"]
66
apitype: "DLLExport"
77
f1_keywords: ["_CIlog", "CIlog"]
88
helpviewer_keywords: ["_CIlog intrinsic", "CIlog intrinsic"]

0 commit comments

Comments
 (0)