Merge pull request #1866 from MicrosoftDocs/master

3/25/2019 AM Publish

Author: Taojunshen

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

@@ -50,7 +50,7 @@ unsigned char* _mbstok_s(
    char** context
 );
 
-unsigned char* _mbstok_s(
+unsigned char* _mbstok_s_l(
    unsigned char* str,
    const unsigned char* delimiters,
    char** context,

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

@@ -22,15 +22,25 @@ char *strtok(
    char *strToken,
    const char *strDelimit
 );
+char *strtok_l(
+   char *strToken,
+   const char *strDelimit,
+   _locale_t locale
+);
 wchar_t *wcstok(
    wchar_t *strToken,
    const wchar_t *strDelimit
 );
+wchar_t *wcstok_l(
+   wchar_t *strToken,
+   const wchar_t *strDelimit,
+   _locale_t locale
+);
 unsigned char *_mbstok(
    unsigned char*strToken,
    const unsigned char *strDelimit
 );
-unsigned char *_mbstok(
+unsigned char *_mbstok_l(
    unsigned char*strToken,
    const unsigned char *strDelimit,
    _locale_t locale

docs/cpp/TOC.md

@@ -318,6 +318,7 @@
 ### [__declspec](declspec.md)
 #### [align](align-cpp.md)
 #### [allocate](allocate.md)
+#### [allocator](allocator.md)
 #### [appdomain](appdomain.md)
 #### [code_seg (__declspec)](code-seg-declspec.md)
 #### [deprecated](deprecated-cpp.md)

docs/cpp/allocator.md

@@ -0,0 +1,27 @@
+---
+title: "allocator"
+ms.date: "03/21/2019"
+f1_keywords: ["allocator_cpp"]
+helpviewer_keywords: ["__declspec keyword [C++], allocator", "allocator __declspec keyword"]
+---
+# allocator
+
+**Microsoft Specific**
+
+The **allocator** declaration specifier can be applied to custom memory-allocation functions to make the allocations visible via Event Tracing for Windows (ETW).
+
+## Syntax
+
+```
+   __declspec(allocator) 
+```
+
+## Remarks
+
+The native memory profiler in Visual Studio works by collecting allocation ETW event data emitted by during runtime. Allocators in the CRT and Windows SDK have been annotated at the source level so that their allocation data can be captured. If you are writing your own allocators, then any functions that return a pointer to newly allocated heap memory can be decorated with `__declspec(allocator)`, as seen in this example for myMalloc:
+
+```cpp
+__declspec(allocator) void* myMalloc(size_t size)
+```
+
+For more information, see [Measure memory usage in Visual Studio](/visualstudio/profiling/memory-usage) and [Custom native ETW heap events](/visualstudio/profiling/custom-native-etw-heap-events).

docs/cpp/declspec.md

@@ -1,6 +1,6 @@
 ---
 title: "__declspec"
-ms.date: "10/09/2018"
+ms.date: "03/21/2019"
 f1_keywords: ["__declspec_cpp", "__declspec", "_declspec"]
 helpviewer_keywords: ["__declspec keyword [C++]"]
 ---
@@ -22,6 +22,7 @@ The extended attribute syntax for specifying storage-class information uses the
 *extended-decl-modifier*:<br/>
 &nbsp;&nbsp;&nbsp;&nbsp;**align(** *#* **)**<br/>
 &nbsp;&nbsp;&nbsp;&nbsp;**allocate("** *segname* **")**<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;**allocator**<br/>
 &nbsp;&nbsp;&nbsp;&nbsp;**appdomain**<br/>
 &nbsp;&nbsp;&nbsp;&nbsp;**code_seg("** *segname* **")**<br/>
 &nbsp;&nbsp;&nbsp;&nbsp;**deprecated**<br/>
@@ -45,7 +46,7 @@ The extended attribute syntax for specifying storage-class information uses the
 
 White space separates the declaration modifier sequence. Examples appear in later sections.
 
-Extended attribute grammar supports these Microsoft-specific storage-class attributes: [align](../cpp/align-cpp.md), [allocate](../cpp/allocate.md), [appdomain](../cpp/appdomain.md), [code_seg](../cpp/code-seg-declspec.md), [deprecated](../cpp/deprecated-cpp.md), [dllexport](../cpp/dllexport-dllimport.md), [dllimport](../cpp/dllexport-dllimport.md), [jitintrinsic](../cpp/jitintrinsic.md), [naked](../cpp/naked-cpp.md), [noalias](../cpp/noalias.md), [noinline](../cpp/noinline.md), [noreturn](../cpp/noreturn.md), [nothrow](../cpp/nothrow-cpp.md), [novtable](../cpp/novtable.md), [process](../cpp/process.md), [restrict](../cpp/restrict.md), [safebuffers](../cpp/safebuffers.md), [selectany](../cpp/selectany.md), [spectre](../cpp/spectre.md), and [thread](../cpp/thread.md). It also supports these COM-object attributes: [property](../cpp/property-cpp.md) and [uuid](../cpp/uuid-cpp.md).
+Extended attribute grammar supports these Microsoft-specific storage-class attributes: [align](../cpp/align-cpp.md), [allocate](../cpp/allocate.md), [allocator](../cpp/allocator.md), [appdomain](../cpp/appdomain.md), [code_seg](../cpp/code-seg-declspec.md), [deprecated](../cpp/deprecated-cpp.md), [dllexport](../cpp/dllexport-dllimport.md), [dllimport](../cpp/dllexport-dllimport.md), [jitintrinsic](../cpp/jitintrinsic.md), [naked](../cpp/naked-cpp.md), [noalias](../cpp/noalias.md), [noinline](../cpp/noinline.md), [noreturn](../cpp/noreturn.md), [nothrow](../cpp/nothrow-cpp.md), [novtable](../cpp/novtable.md), [process](../cpp/process.md), [restrict](../cpp/restrict.md), [safebuffers](../cpp/safebuffers.md), [selectany](../cpp/selectany.md), [spectre](../cpp/spectre.md), and [thread](../cpp/thread.md). It also supports these COM-object attributes: [property](../cpp/property-cpp.md) and [uuid](../cpp/uuid-cpp.md).
 
 The **code_seg**, **dllexport**, **dllimport**, **naked**, **noalias**, **nothrow**, **property**, **restrict**, **selectany**, **thread**, and **uuid** storage-class attributes are properties only of the declaration of the object or function to which they are applied. The **thread** attribute affects data and objects only. The **naked** and **spectre** attributes affect functions only. The **dllimport** and **dllexport** attributes affect functions, data, and objects. The **property**, **selectany**, and **uuid** attributes affect COM objects.
 

docs/mfc/reference/cedit-class.md

@@ -474,11 +474,11 @@ UINT GetLimitText() const;
 
 ### Return Value
 
-The current text limit, in bytes, for this `CEdit` object.
+The current text limit, in TCHARs, for this `CEdit` object.
 
 ### Remarks
 
-The text limit is the maximum amount of text, in bytes, that the edit control can accept.
+The text limit is the maximum amount of text, in TCHARs, that the edit control can accept.
 
 > [!NOTE]
 >  This member function is available beginning with Windows 95 and Windows NT 4.0.
@@ -510,14 +510,14 @@ int GetLine(
 Specifies the line number to retrieve from a multiple-line edit control. Line numbers are zero-based; a value of 0 specifies the first line. This parameter is ignored by a single-line edit control.
 
 *lpszBuffer*<br/>
-Points to the buffer that receives a copy of the line. The first word of the buffer must specify the maximum number of characters that can be copied to the buffer.
+Points to the buffer that receives a copy of the line. The first word of the buffer must specify the maximum number of TCHARs that can be copied to the buffer.
 
 *nMaxLength*<br/>
-Specifies the maximum number of bytes that can be copied to the buffer. `GetLine` places this value in the first word of *lpszBuffer* before making the call to Windows.
+Specifies the maximum number of TCHAR characters that can be copied to the buffer. `GetLine` places this value in the first word of *lpszBuffer* before making the call to Windows.
 
 ### Return Value
 
-The number of bytes actually copied. The return value is 0 if the line number specified by *nIndex* is greater than the number of lines in the edit control.
+The number of characters actually copied. The return value is 0 if the line number specified by *nIndex* is greater than the number of lines in the edit control.
 
 ### Remarks
 
@@ -704,7 +704,7 @@ void LimitText(int nChars = 0);
 ### Parameters
 
 *nChars*<br/>
-Specifies the length (in bytes) of the text that the user can enter. If this parameter is 0, the text length is set to UINT_MAX bytes. This is the default behavior.
+Specifies the length (in TCHARs) of the text that the user can enter. If this parameter is 0, the text length is set to UINT_MAX bytes. This is the default behavior.
 
 ### Remarks