Skip to content

Commit 1cbe07a

Browse files
author
mikeblome
committed
local merge with master
2 parents 364ae84 + 1b6a099 commit 1cbe07a

640 files changed

Lines changed: 7314 additions & 10127 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: 1364 additions & 233 deletions
Large diffs are not rendered by default.

docs/atl/atl-support-for-dhtml-controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Using ATL, you can create a control with Dynamic HTML (DHTML) capability. An ATL
1212

1313
- Specifies, using HTML, the user interface (UI) of the DHTML control.
1414

15-
- Accesses the WebBrowser object and its methods through its interface, [IWebBrowser2](https://msdn.microsoft.com/library/aa752127.aspx).
15+
- Accesses the WebBrowser object and its methods through its interface, [IWebBrowser2](/previous-versions/windows/internet-explorer/ie-developer/platform-apis/aa752127\(v=vs.85\)).
1616

1717
- Manages communication between C++ code and HTML.
1818

docs/atl/reference/atl-http-utility-functions.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ Returns TRUE on success, FALSE on failure.
7070
7171
Behaves like the current version of [InternetCanonicalizeUrl](/windows/desktop/api/wininet/nf-wininet-internetcanonicalizeurla) but does not require WinInet or Internet Explorer to be installed.
7272
73-
### See Also
74-
75-
[InternetCanonicalizeUrl](/windows/desktop/api/wininet/nf-wininet-internetcanonicalizeurla)
76-
7773
## <a name="atlcombineurl"></a> AtlCombineUrl
7874
7975
Call this function to combine a base URL and a relative URL into a single, canonical URL.
@@ -281,5 +277,6 @@ A reference to a string variable to receive the HTTP date time as defined in RFC
281277

282278
## See Also
283279

284-
[Concepts](../../atl/active-template-library-atl-concepts.md)<br/>
285-
[ATL COM Desktop Components](../../atl/atl-com-desktop-components.md)
280+
[Concepts](../active-template-library-atl-concepts.md)<br/>
281+
[ATL COM Desktop Components](../atl-com-desktop-components.md)<br/>
282+
[InternetCanonicalizeUrl](/windows/desktop/api/wininet/nf-wininet-internetcanonicalizeurla)

docs/atl/reference/atl-text-encoding-functions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ The number of characters required for a buffer that could hold encoded data of *
693693

694694
This uuencoding implementation follows the POSIX P1003.2b/D11 specification.
695695

696-
### See Also
696+
## See Also
697697

698-
[Concepts](../../atl/active-template-library-atl-concepts.md)<br/>
699-
[ATL COM Desktop Components](../../atl/atl-com-desktop-components.md)
698+
[Concepts](../active-template-library-atl-concepts.md)<br/>
699+
[ATL COM Desktop Components](../atl-com-desktop-components.md)

docs/build/reference/TOC.md

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

docs/build/reference/calling-conventions-parameters-and-return-type.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Calling Conventions, Parameters, and Return Type"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/13/2019"
44
helpviewer_keywords: ["calling conventions, helper functions", "helper functions, calling conventions", "helper functions, return types"]
55
ms.assetid: 0ffa4558-6005-4803-be95-7a8ec8837660
66
---
@@ -18,12 +18,12 @@ FARPROC WINAPI __delayLoadHelper2(
1818
### Parameters
1919

2020
*pidd*<br/>
21-
A `const` pointer to a `ImgDelayDescr` (see delayimp.h) that contains the offsets of various import-related data, a timestamp for binding information, and a set of attributes that provide further information about the descriptor content. Currently there is only one attribute, `dlattrRva`, which indicates that the addresses in the descriptor are relative virtual addresses (as opposed to virtual addresses).
21+
A `const` pointer to a `ImgDelayDescr` that contains the offsets of various import-related data, a timestamp for binding information, and a set of attributes that provide further information about the descriptor content. Currently there's only one attribute, `dlattrRva`, which indicates that the addresses in the descriptor are relative virtual addresses. For more information, see the declarations in *delayimp.h*.
2222

2323
For the definition of the `PCImgDelayDescr` structure, see [Structure and Constant Definitions](structure-and-constant-definitions.md).
2424

2525
*ppfnIATEntry*<br/>
26-
A pointer to the slot in the delay load import address table (IAT) to be updated with the address of the imported function. The helper routine needs to store the same value that it will be returning into this location.
26+
A pointer to the slot in the delay load import address table (IAT) that's updated with the address of the imported function. The helper routine needs to store the same value that it returns into this location.
2727

2828
## Expected Return Values
2929

@@ -37,11 +37,11 @@ If the function fails, it raises an exception and returns 0. Three types of exce
3737

3838
- Failure of `GetProcAddress`.
3939

40-
It is your responsibility to handle these exceptions.
40+
It's your responsibility to handle these exceptions.
4141

4242
## Remarks
4343

44-
The calling convention for the helper function is `__stdcall`. The type of the return value is not relevant, so FARPROC is used. This function has C linkage.
44+
The calling convention for the helper function is `__stdcall`. The type of the return value isn't relevant, so FARPROC is used. This function has C linkage.
4545

4646
The return value of the delay load helper needs to be stored in the passed-in function pointer location, unless you want your helper routine to be used as a notification hook. In that case, your code is responsible for finding the appropriate function pointer to return. The thunk code the linker generates then takes that return value as the real target of the import and jumps directly to it.
4747

@@ -122,10 +122,10 @@ FARPROC WINAPI delayHook(unsigned dliNotify, PDelayLoadInfo pdli)
122122

123123
/*
124124
and then at global scope somewhere
125-
PfnDliHook __pfnDliNotifyHook2 = delayHook;
125+
const PfnDliHook __pfnDliNotifyHook2 = delayHook;
126126
*/
127127
```
128128
129-
## See Also
129+
## See also
130130
131131
[Understanding the Helper Function](understanding-the-helper-function.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/19/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 executable 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/reference/compiler-options-listed-by-category.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.assetid: c4750dcf-dba0-4229-99b6-45cdecc11729
88

99
This article contains a categorical list of compiler options. For an alphabetical list, see [Compiler Options Listed Alphabetically](compiler-options-listed-alphabetically.md).
1010

11-
### Optimization
11+
## Optimization
1212

1313
|Option|Purpose|
1414
|------------|-------------|
@@ -24,7 +24,7 @@ This article contains a categorical list of compiler options. For an alphabetica
2424
|[/Oy](oy-frame-pointer-omission.md)|Omits frame pointer. (x86 only)|
2525
|[/favor](favor-optimize-for-architecture-specifics.md)|Produces code that is optimized for a specified architecture, or for a range of architectures.|
2626

27-
### Code generation
27+
## Code generation
2828

2929
|Option|Purpose|
3030
|------------|-------------|
@@ -65,7 +65,7 @@ This article contains a categorical list of compiler options. For an alphabetica
6565
|[/RTC](rtc-run-time-error-checks.md)|Enables run-time error checking.|
6666
|[/volatile](volatile-volatile-keyword-interpretation.md)|Selects how the volatile keyword is interpreted.|
6767

68-
### Output files
68+
## Output files
6969

7070
|Option|Purpose|
7171
|------------|-------------|
@@ -80,7 +80,7 @@ This article contains a categorical list of compiler options. For an alphabetica
8080
|[/Fp](fp-name-dot-pch-file.md)|Specifies a precompiled header file name.|
8181
|[/FR, /Fr](fr-fr-create-dot-sbr-file.md)|Name generated .sbr browser files.|
8282

83-
### Preprocessor
83+
## Preprocessor
8484

8585
|Option|Purpose|
8686
|------------|-------------|
@@ -98,7 +98,7 @@ This article contains a categorical list of compiler options. For an alphabetica
9898
|[/u](u-u-undefine-symbols.md)|Removes all predefined macros.|
9999
|[/X](x-ignore-standard-include-paths.md)|Ignores the standard include directory.|
100100

101-
### Language
101+
## Language
102102

103103
|Option|Purpose|
104104
|------------|-------------|
@@ -122,7 +122,7 @@ This article contains a categorical list of compiler options. For an alphabetica
122122
|[/Zs](zs-syntax-check-only.md)|Checks syntax only.|
123123
|[/ZW](zw-windows-runtime-compilation.md)|Produces an output file to run on the Windows Runtime.|
124124

125-
### Linking
125+
## Linking
126126

127127
|Option|Purpose|
128128
|------------|-------------|
@@ -136,7 +136,7 @@ This article contains a categorical list of compiler options. For an alphabetica
136136
|[/MT](md-mt-ld-use-run-time-library.md)|Compiles to create a multithreaded executable file, by using LIBCMT.lib.|
137137
|[/MTd](md-mt-ld-use-run-time-library.md)|Compiles to create a debug multithreaded executable file, by using LIBCMTD.lib.|
138138

139-
### Miscellaneous
139+
## Miscellaneous
140140

141141
|Option|Purpose|
142142
|------------|-------------|
@@ -188,7 +188,7 @@ This article contains a categorical list of compiler options. For an alphabetica
188188
|[/permissive-](permissive-standards-conformance.md)|Set standard-conformance mode.|
189189
|[/std](std-specify-language-standard-version.md)|C++ standard version compatibility selector.|
190190

191-
### Deprecated and removed compiler options
191+
## Deprecated and removed compiler options
192192

193193
|Option|Purpose|
194194
|------------|-------------|

docs/build/reference/execution-charset-set-execution-character-set.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "/execution-charset (Set Execution Character Set)"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/06/2019"
44
f1_keywords: ["execution-charset", "/execution-charset"]
55
helpviewer_keywords: ["/execution-charset compiler option", "-execution-charset compiler option"]
66
ms.assetid: 0e02f487-2236-45bc-95f3-5760933a8f96
@@ -37,7 +37,7 @@ If you want to set both the source character set and the execution character set
3737

3838
1. Expand the **Configuration Properties**, **C/C++**, **Command Line** folder.
3939

40-
1. In **Advanced Options**, add the **/execution-charset** option, and specify your preferred encoding.
40+
1. In **Additional Options**, add the **/execution-charset** option, and specify your preferred encoding.
4141

4242
1. Choose **OK** to save your changes.
4343

docs/build/reference/hint-files.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 17194f66-cf62-4523-abec-77db0675ab65
99

1010
A *hint file* helps the Visual Studio integrated development environment (IDE) interpret Visual C++ identifiers, such as the names of functions and macros. When you open a Visual C++ project, the IDE's *parsing system* analyzes the code in each source file in the project and gathers information about every identifier. Then the IDE uses that information to support features such as the **Class View** browser and the **Navigation Bar**.
1111

12-
The parsing system, which is introduced in Visual C++ 2010, understands C/C++ syntax but can misinterpret a statement that contains a macro. The statement can be misinterpreted if the macro causes the source code to be syntactically incorrect as written. The statement can become syntactically correct when the source code is compiled and the preprocesser replaces the [macro identifier](../../preprocessor/hash-define-directive-c-cpp.md) with its definition. The parsing system works without having to build the project because it uses hint files to interpret macros. Therefore, a browsing feature such as **Class View** is immediately available.
12+
The parsing system, which is introduced in Visual C++ 2010, understands C/C++ syntax but can misinterpret a statement that contains a macro. The statement can be misinterpreted if the macro causes the source code to be syntactically incorrect as written. The statement can become syntactically correct when the source code is compiled and the preprocessor replaces the [macro identifier](../../preprocessor/hash-define-directive-c-cpp.md) with its definition. The parsing system works without having to build the project because it uses hint files to interpret macros. Therefore, a browsing feature such as **Class View** is immediately available.
1313

1414
A hint file contains user-customizable *hints*, which have the same syntax as C/C++ macro definitions. Visual C++ includes a built-in hint file that is sufficient for most projects, but you can create your own hint files to improve the way Visual Studio handles identifiers.
1515

@@ -86,7 +86,7 @@ Hints use the following syntax.
8686

8787
|Syntax|Meaning|
8888
|------------|-------------|
89-
|`#define` *hint-name* *replacement-string*<br /><br /> `#define` *hint-name* `(` *parameter*, ...`)`*replacement-string*|A preprocesser directive that defines a new hint or redefines an existing hint. After the directive, the preprocessor replaces each occurrence of *hint-name* in source code with *replacement-string*.<br /><br /> The second syntax form defines a function-like hint. If a function-like hint occurs in source code, the preprocessor first replaces each occurrence of *parameter* in *replacement-string* with the corresponding argument in source code, and then replaces *hint-name* with *replacement-string*.|
89+
|`#define` *hint-name* *replacement-string*<br /><br /> `#define` *hint-name* `(` *parameter*, ...`)`*replacement-string*|A preprocessor directive that defines a new hint or redefines an existing hint. After the directive, the preprocessor replaces each occurrence of *hint-name* in source code with *replacement-string*.<br /><br /> The second syntax form defines a function-like hint. If a function-like hint occurs in source code, the preprocessor first replaces each occurrence of *parameter* in *replacement-string* with the corresponding argument in source code, and then replaces *hint-name* with *replacement-string*.|
9090
|`@<`|A hint-file specific *replacement-string* that indicates the start of a set of map elements.|
9191
|`@=`|A hint-file specific *replacement-string* that indicates an intermediate map element. A map can have multiple map elements.|
9292
|`@>`|A hint-file specific *replacement-string* that indicates the end of a set of map elements.|
@@ -309,10 +309,20 @@ The following notes apply to the preceding list.
309309

310310
## See Also
311311

312+
<<<<<<< HEAD:docs/build/reference/hint-files.md
312313
[File Types Created for Visual C++ Projects](file-types-created-for-visual-cpp-projects.md)<br>
313314
[#define Directive (C/C++)](../../preprocessor/hash-define-directive-c-cpp.md)<br>
314315
[#undef Directive (C/C++)](../../preprocessor/hash-undef-directive-c-cpp.md)<br>
315316
[SAL Annotations](../../c-runtime-library/sal-annotations.md)<br>
316317
[Message Maps](../../mfc/reference/message-maps-mfc.md)<br>
317318
[Message Map Macros](../../atl/reference/message-map-macros-atl.md)<br>
318-
[Object Map Macros](../../atl/reference/object-map-macros.md)
319+
[Object Map Macros](../../atl/reference/object-map-macros.md)
320+
=======
321+
[File Types Created for Visual C++ Projects](../ide/file-types-created-for-visual-cpp-projects.md)<br>
322+
[#define Directive (C/C++)](../preprocessor/hash-define-directive-c-cpp.md)<br>
323+
[#undef Directive (C/C++)](../preprocessor/hash-undef-directive-c-cpp.md)<br>
324+
[SAL Annotations](../c-runtime-library/sal-annotations.md)<br>
325+
[Message Maps](../mfc/reference/message-maps-mfc.md)<br>
326+
[Message Map Macros](../atl/reference/message-map-macros-atl.md)<br>
327+
[Object Map Macros](../atl/reference/object-map-macros.md)
328+
>>>>>>> master:docs/ide/hint-files.md

0 commit comments

Comments
 (0)