Skip to content

Commit 8fd49f8

Browse files
authored
Merge pull request #2966 from MicrosoftDocs/master
6/29/2020 AM Publish
2 parents 8645408 + 7296f94 commit 8fd49f8

14 files changed

Lines changed: 181 additions & 93 deletions

‎.markdownlint.json‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,32 @@
11
{
22
"default": true,
3-
"MD002": false,
43
"DOCSMD006": false,
4+
"MD001": false,
55
"MD013": false,
6-
"MD024": { "siblings_only": true },
7-
"MD025": { "front_matter_title": "" },
6+
"MD024": {
7+
"siblings_only": true
8+
},
9+
"MD025": {
10+
"front_matter_title": ""
11+
},
812
"MD026": false,
913
"MD028": false,
10-
"MD038": false,
11-
"MD033": { "allowed_elements": ["a", "br", "em", "strong", "sub", "sup"] }
12-
}
14+
"MD033": {
15+
"allowed_elements": [
16+
"a",
17+
"br",
18+
"em",
19+
"iframe",
20+
"strong",
21+
"sub",
22+
"sup"
23+
]
24+
},
25+
"MD036": false,
26+
"MD037": false,
27+
"MD040": false,
28+
"MD041": false,
29+
"MD046": {
30+
"style": "fenced"
31+
}
32+
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "ATL Wizards and Dialog Boxes"
3-
ms.date: "11/04/2016"
3+
ms.date: "06/26/2020"
44
helpviewer_keywords: ["ATL, class wizards"]
55
ms.assetid: 51cf002a-83bc-41ba-aeb8-364ea2331375
66
---
@@ -14,11 +14,11 @@ The Active Template Library (ATL) wizards generate boilerplate code for various
1414
|-----------|-----------------|
1515
|[Creating an ATL Project](../../atl/reference/creating-an-atl-project.md)|Describes the ATL project wizard and its settings.|
1616
|[ATL Simple Object](../../atl/reference/adding-an-atl-simple-object.md)|Creates a basic object.|
17-
|[ATL Property Page](../../atl/reference/adding-an-atl-property-page.md)|Creates a basic property page.|
18-
|[ATL OLE DB Provider](../../atl/reference/adding-an-atl-ole-db-provider.md)|Creates a basic OLE DB provider.|
19-
|[ATL OLE DB Consumer](../../atl/reference/adding-an-atl-ole-db-consumer.md)|Creates a basic OLE DB consumer.|
17+
|[ATL Property Page](../../atl/reference/adding-an-atl-property-page.md)|Creates a basic property page.</br>Not available in Visual Studio 2019 and later.|
18+
|[ATL OLE DB Provider](../../atl/reference/adding-an-atl-ole-db-provider.md)|Creates a basic OLE DB provider.</br>Not available in Visual Studio 2019 and later.|
19+
|[ATL OLE DB Consumer](../../atl/reference/adding-an-atl-ole-db-consumer.md)|Creates a basic OLE DB consumer.</br>Not available in Visual Studio 2019 and later.|
2020
|[ATL Dialog Box](../../atl/reference/adding-an-atl-dialog-box.md)|Creates a basic dialog box.|
2121
|[ATL Control](../../atl/reference/adding-an-atl-control.md)|Creates a basic ActiveX control.|
22-
|[ATL COM+ 1.0 Component](../../atl/reference/adding-an-atl-com-plus-1-0-component.md)|Creates a basic ATL COM+ 1.0 component|
23-
|[ATL Active Server Page Component](../../atl/reference/adding-an-atl-active-server-page-component.md)|Creates a basic ATL Active Server Page component.|
22+
|[ATL COM+ 1.0 Component](../../atl/reference/adding-an-atl-com-plus-1-0-component.md)|Creates a basic ATL COM+ 1.0 component.</br>Not available in Visual Studio 2019 and later.|
23+
|[ATL Active Server Page Component](../../atl/reference/adding-an-atl-active-server-page-component.md)|Creates a basic ATL Active Server Page component.</br>Not available in Visual Studio 2019 and later.|
2424
|[ATL COM Desktop Components](../../atl/atl-com-desktop-components.md)|Links to the ATL documentation.|

‎docs/c-runtime-library/reference/clock.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For additional compatibility information, see [Compatibility](../../c-runtime-li
4949
#include <stdlib.h>
5050
#include <time.h>
5151
52-
// Pauses for a specified number of milliseconds.
52+
// Pauses for a specified number of clock cycles.
5353
void do_sleep( clock_t wait )
5454
{
5555
clock_t goal;

‎docs/c-runtime-library/reference/strtod-strtod-l-wcstod-wcstod-l.md‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,17 @@ The locale to use.
4949

5050
## Return Value
5151

52-
**strtod** returns the value of the floating-point number, except when the representation would cause an overflow, in which case the function returns +/-**HUGE_VAL**. The sign of **HUGE_VAL** matches the sign of the value that cannot be represented. **strtod** returns 0 if no conversion can be performed or an underflow occurs.
52+
**strtod** returns the value of the floating-point number, except when the representation would cause an overflow, in which case the function returns +/-**HUGE_VAL**. The sign of **HUGE_VAL** matches the sign of the value that cannot be represented. **strtod** returns `0` if no conversion can be performed or an underflow occurs.
5353

54-
**wcstod** returns values analogously to **strtod**. For both functions, **errno** is set to **ERANGE** if overflow or underflow occurs and the invalid parameter handler is invoked, as described in [Parameter Validation](../../c-runtime-library/parameter-validation.md). See [_doserrno, errno, _sys_errlist, and _sys_nerr](../../c-runtime-library/errno-doserrno-sys-errlist-and-sys-nerr.md) for more information on this and other return codes.
54+
**wcstod** returns values analogously to **strtod**:
55+
- For both functions, **errno** is set to **ERANGE** if overflow or underflow occurs.
56+
- If there are invalid parameters, **errno** is set to **EINVAL** and the invalid parameter handler is invoked, as described in [Parameter Validation](../../c-runtime-library/parameter-validation.md).
57+
58+
For more information on this and other return codes, see [_doserrno, errno, _sys_errlist, and _sys_nerr](../../c-runtime-library/errno-doserrno-sys-errlist-and-sys-nerr.md).
5559

5660
## Remarks
5761

58-
Each function converts the input string *strSource* to a **double**. The **strtod** function converts *strSource* to a double-precision value. **strtod** stops reading the string *strSource* at the first character it cannot recognize as part of a number. This may be the terminating null character. **wcstod** is a wide-character version of **strtod**; its *strSource* argument is a wide-character string. These functions behave identically otherwise.
62+
Each function converts the input string *strSource* to a **double**. The **strtod** function converts *strSource* to a double-precision value. **strtod** stops reading the string *strSource* at the first character it cannot recognize as part of a number. This character may be the terminating null character. **wcstod** is a wide-character version of **strtod**; its *strSource* argument is a wide-character string. These functions behave identically otherwise.
5963

6064
By default, this function's global state is scoped to the application. To change this, see [Global state in the CRT](../global-state.md).
6165

@@ -66,9 +70,9 @@ By default, this function's global state is scoped to the application. To change
6670
|**_tcstod**|**strtod**|**strtod**|**wcstod**|
6771
|**_tcstod_l**|**_strtod_l**|**_strtod_l**|**_wcstod_l**|
6872

69-
The **LC_NUMERIC** category setting of the current locale determines recognition of the radix point character in *strSource*. For more information, see [setlocale](setlocale-wsetlocale.md). The functions without the **_l** suffix use the current locale; **_strtod_l** is identical to **_strtod_l** except that they use the *locale* passed in instead. For more information, see [Locale](../../c-runtime-library/locale.md).
73+
The **LC_NUMERIC** category setting of the current locale determines recognition of the radix point character in *strSource*. For more information, see [setlocale](setlocale-wsetlocale.md). The functions without the **_l** suffix use the current locale; **_strtod_l** is identical to **_strtod_l** except they use the *locale* passed in instead. For more information, see [Locale](../../c-runtime-library/locale.md).
7074

71-
If *endptr* is not **NULL**, a pointer to the character that stopped the scan is stored at the location pointed to by *endptr*. If no conversion can be performed (no valid digits were found or an invalid base was specified), the value of *strSource* is stored at the location pointed to by *endptr*.
75+
If *endptr* isn't **NULL**, a pointer to the character that stopped the scan is stored at the location pointed to by *endptr*. If no conversion can be performed (no valid digits were found or an invalid base was specified), the value of *strSource* is stored at the location pointed to by *endptr*.
7276

7377
**strtod** expects *strSource* to point to a string of one of the following forms:
7478

@@ -77,9 +81,9 @@ If *endptr* is not **NULL**, a pointer to the character that stopped the scan is
7781
[*whitespace*] [*sign*] {**INF** &#124; **INFINITY**}
7882
[*whitespace*] [*sign*] **NAN** [*sequence*]
7983

80-
The optional leading *whitespace* may consist of space and tab characters, which are ignored; *sign* is either plus (+) or minus (-); *digits* are one or more decimal digits; *hexdigits* are one or more hexadecimal digits; *radix* is the radix point character, either a period (.) in the default "C" locale, or the locale-specific value if the current locale is different or when *locale* is specified; a *sequence* is a sequence of alphanumeric or underscore characters. In both decimal and hexadecimal number forms, if no digits appear before the radix point character, at least one must appear after the radix point character. In the decimal form, the decimal digits can be followed by an exponent, which consists of an introductory letter (**e** or **E**) and an optionally signed integer. In the hexadecimal form, the hexadecimal digits can be followed by an exponent, which consists of an introductory letter (**p** or **P**) and an optionally signed hexadecimal integer that represents the exponent as a power of 2. In either form, if neither an exponent part nor a radix point character appears, a radix point character is assumed to follow the last digit in the string. Case is ignored in both the **INF** and **NAN** forms. The first character that does not fit one of these forms stops the scan.
84+
The optional leading *whitespace* may consist of space and tab characters, which are ignored; *sign* is either plus (+) or minus (-); *digits* are one or more decimal digits; *hexdigits* are one or more hexadecimal digits; *radix* is the radix point character, either a period (.) in the default "C" locale, or the locale-specific value if the current locale is different or when *locale* is specified; a *sequence* is a sequence of alphanumeric or underscore characters. In both decimal and hexadecimal number forms, if no digits appear before the radix point character, at least one must appear after the radix point character. In the decimal form, the decimal digits can be followed by an exponent, which consists of an introductory letter (**e** or **E**) and an optionally signed integer. In the hexadecimal form, the hexadecimal digits can be followed by an exponent, which consists of an introductory letter (**p** or **P**) and an optionally signed hexadecimal integer that represents the exponent as a power of 2. In either form, if there isn't an exponent part or a radix point character, a radix point character is assumed to follow the last digit in the string. Case is ignored in both the **INF** and **NAN** forms. The first character that doesn't fit one of these forms stops the scan.
8185

82-
The UCRT versions of these functions do not support conversion of Fortran-style (**d** or **D**) exponent letters. This non-standard extension was supported by earlier versions of the CRT, and may be a breaking change for your code. The UCRT versions support hexadecimal strings and round-tripping of INF and NAN values, which were not supported in earlier versions. This can also cause breaking changes in your code. For example, the string "0x1a" would be interpreted by **strtod** as 0.0 in previous versions, but as 26.0 in the UCRT version.
86+
The UCRT versions of these functions don't support conversion of Fortran-style (**d** or **D**) exponent letters. This non-standard extension was supported by earlier versions of the CRT, and may be a breaking change for your code. The UCRT versions support hexadecimal strings and round-tripping of INF and NAN values, which weren't supported in earlier versions. This can also cause breaking changes in your code. For example, the string "0x1a" would be interpreted by **strtod** as 0.0 in previous versions, but as 26.0 in the UCRT version.
8387

8488
## Requirements
8589

‎docs/c-runtime-library/reference/strtok-strtok-l-wcstok-wcstok-l-mbstok-mbstok-l.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "strtok, _strtok_l, wcstok, _wcstok_l, _mbstok, _mbstok_l"
3-
ms.date: "4/2/2020"
3+
ms.date: "6/24/2020"
44
api_name: ["_mbstok_l", "_mbstok", "wcstok", "_mbstok", "strtok", "_wcstok_l", "_o__mbstok", "_o__mbstok_l", "_o_strtok", "_o_wcstok"]
55
api_location: ["msvcrt.dll", "msvcr80.dll", "msvcr90.dll", "msvcr100.dll", "msvcr100_clr0400.dll", "msvcr110.dll", "msvcr110_clr0400.dll", "msvcr120.dll", "msvcr120_clr0400.dll", "ucrtbase.dll", "api-ms-win-crt-multibyte-l1-1-0.dll", "api-ms-win-crt-string-l1-1-0.dll", "api-ms-win-crt-private-l1-1-0.dll"]
66
api_type: ["DLLExport"]
@@ -32,6 +32,11 @@ wchar_t *wcstok(
3232
wchar_t *strToken,
3333
const wchar_t *strDelimit
3434
);
35+
wchar_t *wcstok(
36+
wchar_t *strToken,
37+
const wchar_t *strDelimit,
38+
wchar_t **context
39+
);
3540
wchar_t *wcstok_l(
3641
wchar_t *strToken,
3742
const wchar_t *strDelimit,
@@ -59,6 +64,9 @@ Set of delimiter characters.
5964
*locale*<br/>
6065
Locale to use.
6166

67+
*context*<br/>
68+
Points to memory used to store the internal state of the parser so that the parser can continue from where it left off the next time you call **wcstok**.
69+
6270
## Return Value
6371

6472
Returns a pointer to the next token found in *strToken*. The functions return **NULL** when no more tokens are found. Each call modifies *strToken* by substituting a null character for the first delimiter that occurs after the returned token.
@@ -67,6 +75,8 @@ Returns a pointer to the next token found in *strToken*. The functions return **
6775

6876
The **strtok** function finds the next token in *strToken*. The set of characters in *strDelimit* specifies possible delimiters of the token to be found in *strToken* on the current call. **wcstok** and **_mbstok** are wide-character and multibyte-character versions of **strtok**. The arguments and return value of **wcstok** are wide-character strings; those of **_mbstok** are multibyte-character strings. These three functions behave identically otherwise.
6977

78+
The two argument version of **wcstok** is not standard. If you need to use that version, you'll need to define `_CRT_NON_CONFORMING_WCSTOK` before you `#include <wchar.h>` (or `#include <string.h>`).
79+
7080
> [!IMPORTANT]
7181
> These functions incur a potential threat brought about by a buffer overrun problem. Buffer overrun problems are a frequent method of system attack, resulting in an unwarranted elevation of privilege. For more information, see [Avoiding Buffer Overruns](/windows/win32/SecBP/avoiding-buffer-overruns).
7282
@@ -94,6 +104,7 @@ By default, this function's global state is scoped to the application. To change
94104
|-------------|---------------------|
95105
|**strtok**|\<string.h>|
96106
|**wcstok**|\<string.h> or \<wchar.h>|
107+
|**_wcstok_l**|<tchar.h>|
97108
|**_mbstok**, **_mbstok_l**|\<mbstring.h>|
98109

99110
For additional compatibility information, see [Compatibility](../../c-runtime-library/compatibility.md).

0 commit comments

Comments
 (0)