Skip to content

Commit 05075fc

Browse files
authored
Merge pull request MicrosoftDocs#941 from MicrosoftDocs/master
6/20 AM Publish6/20 AM Publish
2 parents 4cdfff1 + 0d7f9b7 commit 05075fc

9 files changed

Lines changed: 96 additions & 33 deletions

‎.gitattributes‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

‎docs/mfc/reference/chttpfile-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ BOOL AddRequestHeaders(
8484
`dwFlags`
8585
Modifies the semantics of the new headers. Can be one of the following:
8686

87-
- `HTTP_ADDREQ_FLAG_COALESCE` Merges headers of the same name, using the flag to add the first header found to the subsequent header. For example, "Accept: text/*" followed by "Accept: audio/\*" results in the formation of the single header "Accept: text/\*, audio/\*". It is up to the calling application to ensure a cohesive scheme with respect to data received by requests sent with coalesced or separate headers.
87+
- `HTTP_ADDREQ_FLAG_COALESCE` Merges headers of the same name, using the flag to add the first header found to the subsequent header. For example, "Accept: text/\*" followed by "Accept: audio/\*" results in the formation of the single header "Accept: text/\*, audio/\*". It is up to the calling application to ensure a cohesive scheme with respect to data received by requests sent with coalesced or separate headers.
8888

8989
- `HTTP_ADDREQ_FLAG_REPLACE` Performs a remove and add to replace the current header. The header name will be used to remove the current header, and the full value will be used to add the new header. If the header-value is empty and the header is found, it is removed. If not empty, the header-value is replaced.
9090

‎docs/mfc/reference/cinternetsession-class.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,10 @@ CStdioFile* OpenURL(
461461

462462
|URL type|Returns|
463463
|--------------|-------------|
464-
|file://|**CStdioFile\***|
465-
|http://|**CHttpFile\***|
466-
|gopher://|**CGopherFile\***|
467-
|ftp://|**CInternetFile\***|
464+
|file://|**CStdioFile\\\***|
465+
|http://|**CHttpFile\\\***|
466+
|gopher://|**CGopherFile\\\***|
467+
|ftp://|**CInternetFile\\\***|
468468

469469
### Remarks
470470
The parameter `dwFlags` must include either **INTERNET_FLAG_TRANSFER_ASCII** or **INTERNET_FLAG_TRANSFER_BINARY**, but not both. The remaining flags can be combined with the bitwise `OR` operator ( **|**).

‎docs/mfc/reference/dispatch-maps.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,20 @@ DISP_FUNCTION(
150150
|**VTS_DISPATCH**|`LPDISPATCH`|
151151
|**VTS_SCODE**|`SCODE`|
152152
|**VTS_BOOL**|**BOOL**|
153-
|**VTS_VARIANT**|**const VARIANT\*** or **VARIANT&**|
153+
|**VTS_VARIANT**|**const VARIANT\\\*** or **VARIANT&**|
154154
|**VTS_UNKNOWN**|`LPUNKNOWN`|
155-
|**VTS_PI2**|**short\***|
156-
|**VTS_PI4**|**long\***|
157-
|**VTS_PR4**|**float\***|
158-
|**VTS_PR8**|**double\***|
159-
|**VTS_PCY**|**CY\***|
160-
|**VTS_PDATE**|**DATE\***|
161-
|**VTS_PBSTR**|**BSTR\***|
162-
|**VTS_PDISPATCH**|**LPDISPATCH\***|
163-
|**VTS_PSCODE**|**SCODE\***|
164-
|**VTS_PBOOL**|**BOOL\***|
165-
|**VTS_PVARIANT**|**VARIANT\***|
166-
|**VTS_PUNKNOWN**|**LPUNKNOWN\***|
155+
|**VTS_PI2**|**short\\\***|
156+
|**VTS_PI4**|**long\\\***|
157+
|**VTS_PR4**|**float\\\***|
158+
|**VTS_PR8**|**double\\\***|
159+
|**VTS_PCY**|**CY\\\***|
160+
|**VTS_PDATE**|**DATE\\\***|
161+
|**VTS_PBSTR**|**BSTR\\\***|
162+
|**VTS_PDISPATCH**|**LPDISPATCH\\\***|
163+
|**VTS_PSCODE**|**SCODE\\\***|
164+
|**VTS_PBOOL**|**BOOL\\\***|
165+
|**VTS_PVARIANT**|**VARIANT\\\***|
166+
|**VTS_PUNKNOWN**|**LPUNKNOWN\\\***|
167167
|**VTS_NONE**|No parameters|
168168

169169
### Requirements

‎docs/mfc/reference/event-maps.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,17 @@ EVENT_CUSTOM(pszName, pfnFire, vtsParams)
129129
|**VTS_COLOR**|**OLE_COLOR**|
130130
|**VTS_CY**|**CURRENCY**|
131131
|**VTS_DATE**|**DATE**|
132-
|**VTS_BSTR**|**const char\***|
132+
|**VTS_BSTR**|**const char\\\***|
133133
|**VTS_DISPATCH**|`LPDISPATCH`|
134-
|**VTS_FONT**|**IFontDispatch\***|
134+
|**VTS_FONT**|**IFontDispatch\\\***|
135135
|**VTS_HANDLE**|`HANDLE`|
136136
|**VTS_SCODE**|`SCODE`|
137137
|**VTS_BOOL**|**BOOL**|
138-
|**VTS_VARIANT**|**const VARIANT\***|
139-
|**VTS_PVARIANT**|**VARIANT\***|
138+
|**VTS_VARIANT**|**const VARIANT\\\***|
139+
|**VTS_PVARIANT**|**VARIANT\\\***|
140140
|**VTS_UNKNOWN**|`LPUNKNOWN`|
141141
|**VTS_OPTEXCLUSIVE**|**OLE_OPTEXCLUSIVE**|
142-
|**VTS_PICTURE**|**IPictureDisp\***|
142+
|**VTS_PICTURE**|**IPictureDisp\\\***|
143143
|**VTS_TRISTATE**|**OLE_TRISTATE**|
144144
|**VTS_XPOS_PIXELS**|**OLE_XPOS_PIXELS**|
145145
|**VTS_YPOS_PIXELS**|**OLE_YPOS_PIXELS**|

‎docs/mfc/reference/styles-used-by-mfc.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Edit styles apply to [CEdit Class](../../mfc/reference/cedit-class.md) objects.
120120
|`ES_NOHIDESEL`|Normally, an edit control hides the selection when the control loses the input focus and inverts the selection when the control receives the input focus. Specifying `ES_NOHIDESEL` deletes this default action.|
121121
|`ES_NUMBER`|Allows only digits to be entered into the edit control.|
122122
|`ES_OEMCONVERT`|Text entered in the edit control is converted from the ANSI character set to the OEM character set and then back to ANSI. This ensures proper character conversion when the application calls the `AnsiToOem` Windows function to convert an ANSI string in the edit control to OEM characters. This style is most useful for edit controls that contain filenames.|
123-
|`ES_PASSWORD`|Displays all characters as an asterisk (**\***) as they are typed into the edit control. An application can use the `SetPasswordChar` member function to change the character that is displayed.|
123+
|`ES_PASSWORD`|Displays all characters as an asterisk (**\\\***) as they are typed into the edit control. An application can use the `SetPasswordChar` member function to change the character that is displayed.|
124124
|`ES_READONLY`|Prevents the user from entering or editing text in the edit control.|
125125
|`ES_RIGHT`|Right-aligns text in a single-line or multiline edit control.|
126126
|`ES_UPPERCASE`|Converts all characters to uppercase as they are typed into the edit control.|

‎docs/mfc/reference/wm-message-handlers-a-c.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ The following map entries on the left correspond to the function prototypes on t
1717

1818
|Map entry|Function prototype|
1919
|---------------|------------------------|
20-
|ON_WM_ACTIVATE()|afx_msg void [OnActivate](../../mfc/reference/cwnd-class.md#onactivate)(UINT, CWnd*, BOOL);|
20+
|ON_WM_ACTIVATE()|afx_msg void [OnActivate](../../mfc/reference/cwnd-class.md#onactivate)(UINT, CWnd\*, BOOL);|
2121
|ON_WM_ACTIVATEAPP()|afx_msg void [OnActivateApp](../../mfc/reference/cwnd-class.md#onactivateapp)(BOOL, DWORD);|
22-
|ON_WM_APPCOMMAND()|afx_msg void [OnAppCommand](../../mfc/reference/cwnd-class.md#onappcommand)(CWnd*, UINT, UINT, UINT);|
22+
|ON_WM_APPCOMMAND()|afx_msg void [OnAppCommand](../../mfc/reference/cwnd-class.md#onappcommand)(CWnd\*, UINT, UINT, UINT);|
2323
|ON_WM_ASKCBFORMATNAME()|afx_msg void [OnAskCbFormatName](../../mfc/reference/cwnd-class.md#onaskcbformatname)(UINT, LPSTR);|
2424
|ON_WM_CANCELMODE()|afx_msg void [OnCancelMode](../../mfc/reference/cwnd-class.md#oncancelmode)();|
25-
|ON_WM_CAPTURECHANGED()|afx_msg void [OnCaptureChanged](../../mfc/reference/cwnd-class.md#oncapturechanged)(CWnd*);|
25+
|ON_WM_CAPTURECHANGED()|afx_msg void [OnCaptureChanged](../../mfc/reference/cwnd-class.md#oncapturechanged)(CWnd\*);|
2626
|ON_WM_CHANGECBCHAIN()|afx_msg void [OnChangeCbChain](../../mfc/reference/cwnd-class.md#onchangecbchain)(HWND, HWND);|
2727
|ON_WM_CHAR()|afx_msg void [OnChar](../../mfc/reference/cwnd-class.md#onchar)(UINT, UINT, UINT);|
28-
|ON_WM_CHARTOITEM()|afx_msg int [OnCharToItem](../../mfc/reference/cwnd-class.md#onchartoitem)(UINT, CWnd*, UINT);|
28+
|ON_WM_CHARTOITEM()|afx_msg int [OnCharToItem](../../mfc/reference/cwnd-class.md#onchartoitem)(UINT, CWnd\*, UINT);|
2929
|ON_WM_CHILDACTIVATE()|afx_msg void [OnChildActivate](../../mfc/reference/cwnd-class.md#onchildactivate)();|
3030
|ON_WM_CLIPBOARDUPDATE()|afx_msg void [OnClipboardUpdate](../../mfc/reference/cwnd-class.md#onclipboardupdate)();|
3131
|ON_WM_CLOSE()|afx_msg void [OnClose](../../mfc/reference/cwnd-class.md#onclose)();|
3232
|ON_WM_COMPACTING()|afx_msg void [OnCompacting](../../mfc/reference/cwnd-class.md#oncompacting)(UINT);|
3333
|ON_WM_COMPAREITEM()|afx_msg int [OnCompareItem](../../mfc/reference/cwnd-class.md#oncompareitem)(LPCOMPAREITEMSTRUCT);|
34-
|ON_WM_CONTEXTMENU()|afx_msg void [OnContextMenu](../../mfc/reference/cwnd-class.md#oncontextmenu)(CWnd*, CPoint);|
35-
|ON_WM_COPYDATA()|afx_msg BOOL [OnCopyData](../../mfc/reference/cwnd-class.md#oncopydata)(CWnd* pWnd, COPYDATASTRUCT\* pCopyDataStruct);|
34+
|ON_WM_CONTEXTMENU()|afx_msg void [OnContextMenu](../../mfc/reference/cwnd-class.md#oncontextmenu)(CWnd\*, CPoint);|
35+
|ON_WM_COPYDATA()|afx_msg BOOL [OnCopyData](../../mfc/reference/cwnd-class.md#oncopydata)(CWnd\* pWnd, COPYDATASTRUCT\* pCopyDataStruct);|
3636
|ON_WM_CREATE()|afx_msg int [OnCreate](../../mfc/reference/cwnd-class.md#oncreate)(LPCREATESTRUCT);|
37-
|ON_WM_CTLCOLOR()|afx_msg HBRUSH [OnCtlColor](../../mfc/reference/cwnd-class.md#onctlcolor)(CDC*, CWnd\*, UINT);|
37+
|ON_WM_CTLCOLOR()|afx_msg HBRUSH [OnCtlColor](../../mfc/reference/cwnd-class.md#onctlcolor)(CDC\*, CWnd\*, UINT);|
3838

3939
## See Also
4040
[Message Maps](../../mfc/reference/message-maps-mfc.md)

‎docs/mfc/tn055-migrating-mfc-odbc-database-class-applications-to-mfc-dao-classes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ms.workload: ["cplusplus"]
6666
||`DFX_Currency`|
6767
|`RFX_Single`|`DFX_Single`|
6868
|`RFX_Double`|`DFX_Double`|
69-
|**RFX_Date \***|**DFX_Date** (`COleDateTime`-based)|
69+
|**RFX_Date \\\***|**DFX_Date** (`COleDateTime`-based)|
7070
|`RFX_Text`|`DFX_Text`|
7171
|`RFX_Binary`|`DFX_Binary`|
7272
|`RFX_LongBinary`|`DFX_LongBinary`|

‎docs/porting/visual-cpp-what-s-new-2003-through-2015.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ This improved support for ISO C/C++ standards may require changes to existing co
15751575

15761576
- Adds semicolon for class types.
15771577
- Completes parentheses for raw string literals.
1578-
- Completes multi-line comments (/* */)
1578+
- Completes multi-line comments (/\* \*/)
15791579

15801580
**Find All References** now automatically resolves and filters references in the background after it displays the list of textual matches.
15811581

0 commit comments

Comments
 (0)