Skip to content

Commit 7fc064b

Browse files
ghogenghogen
authored
Merge pull request #251 from Microsoft/master
merge to live
2 parents 203e789 + 9b6bd91 commit 7fc064b

1,312 files changed

Lines changed: 2740 additions & 5504 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ inline BOOL AtlCombineUrl(
9696
Pointer to a variable that contains the length in characters of `szBuffer`. If the function succeeds, the variable receives the number of characters written to the buffer not including the terminating null character. If the function fails, the variable receives the required length in bytes of the buffer including space for the terminating null character.
9797

9898
`dwFlags`
99-
Flags controlling the behavior of this function. See [ATL_URL Flags](http://msdn.microsoft.com/library/76e8cc5c-4e17-4eb1-ac29-a94d5256c4a7).
99+
Flags controlling the behavior of this function. See [AtlCanonicalizeUrl](#atlcanonicalizeurl).
100100

101101
### Return Value
102102
Returns **TRUE** on success, **FALSE** on failure.

‎docs/atl/reference/string-conversion-macros.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ translation.priority.ht:
3333
# String Conversion Macros
3434
These macros provide string conversion features.
3535

36-
|||
37-
|-|-|
38-
|[ATL and MFC String Conversion Macros](string-conversion-macros.md)|Set of macros that convert between string types.|
39-
|[DEVMODE and TEXTMETRIC String Conversion Macros](http://msdn.microsoft.com/library/85cebec0-2a18-48e5-9c1c-99d5b7f15425)|Set of macros that convert the strings within `DEVMODE` and `TEXTMETRIC` structures.|
40-
36+
4137
## <a name="atl_and_mfc_string_conversion_macros"></a> ATL and MFC String Conversion Macros
4238
The string conversion macros discussed here are valid for both ATL and MFC. For more information on MFC string conversion, see [TN059: Using MFC MBCS/Unicode Conversion Macros](../../mfc/tn059-using-mfc-mbcs-unicode-conversion-macros.md) and [MFC Macros and Globals](../../mfc/reference/mfc-macros-and-globals.md).
4339

@@ -76,8 +72,6 @@ MACRONAME( address_of_structure )
7672

7773
The following table lists the `DEVMODE` and `TEXTMETRIC` string conversion macros.
7874

79-
### DEVMODE and TEXTMETRIC String Conversion Macros
80-
8175
|||
8276
|-|-|
8377
|`DEVMODEA2W`|`TEXTMETRICA2W`|

‎docs/build/TOC.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
# [Building on the Command Line](building-on-the-command-line.md)
112112
## [Walkthrough: Compiling a Native C++ Program on the Command Line](walkthrough-compiling-a-native-cpp-program-on-the-command-line.md)
113113
## [Walkthrough: Compile a C program on the command line](walkthrough-compile-a-c-program-on-the-command-line.md)
114-
## [Walkthrough: Compiling a C++-CLI Program on the Command Line](walkthrough-compiling-a-cpp-cli-program-on-the-command-line.md)
115-
## [Walkthrough: Compiling a C++-CX Program on the Command Line](walkthrough-compiling-a-cpp-cx-program-on-the-command-line.md)
114+
## [Walkthrough: Compiling a C++/CLI Program on the Command Line](walkthrough-compiling-a-cpp-cli-program-on-the-command-line.md)
115+
## [Walkthrough: Compiling a C++/CX Program on the Command Line](walkthrough-compiling-a-cpp-cx-program-on-the-command-line.md)
116116
## [Setting the Path and Environment Variables for Command-Line Builds](setting-the-path-and-environment-variables-for-command-line-builds.md)
117117
## [NMAKE Reference](nmake-reference.md)
118118
### [Running NMAKE](running-nmake.md)

‎docs/build/freelibrary-and-afxfreelibrary.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ translation.priority.mt:
4545
# FreeLibrary and AfxFreeLibrary
4646
Processes that explicitly link to a DLL call the [FreeLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259188) function when the DLL module is no longer needed. This function decrements the module's reference count and, if the reference count is zero, unmaps it from the address space of the process.
4747

48-
In an MFC application, use [AfxFreeLibrary](http://msdn.microsoft.com/Library/0e06e292-710b-402f-9692-2cdcbab306f9) instead of `FreeLibrary` to unload an extension DLL. The interface (function prototype) for `AfxFreeLibrary` is the same as `FreeLibrary`.
48+
In an MFC application, use [AfxFreeLibrary](../mfc/reference/application-information-and-management.md#afxfreelibrary) instead of `FreeLibrary` to unload an extension DLL. The interface (function prototype) for `AfxFreeLibrary` is the same as `FreeLibrary`.
4949

5050
## What do you want to do?
5151

@@ -62,4 +62,4 @@ Processes that explicitly link to a DLL call the [FreeLibrary](http://go.microso
6262
## See Also
6363
[DLLs in Visual C++](../build/dlls-in-visual-cpp.md)
6464
[FreeLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259188)
65-
[AfxFreeLibrary](http://msdn.microsoft.com/Library/0e06e292-710b-402f-9692-2cdcbab306f9)
65+
[AfxFreeLibrary](../mfc/reference/application-information-and-management.md#afxfreelibrary)

‎docs/build/loadlibrary-and-afxloadlibrary.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ translation.priority.ht:
3939
- "zh-tw"
4040
---
4141
# LoadLibrary and AfxLoadLibrary
42-
Processes call [LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187) (or [AfxLoadLibrary](http://msdn.microsoft.com/Library/1339678b-c843-4474-b9c9-8f3bd9905e2e)) to explicitly link to a DLL. If the function succeeds, it maps the specified DLL into the address space of the calling process and returns a handle to the DLL that can be used with other functions in explicit linking—for example, `GetProcAddress` and `FreeLibrary`.
42+
Processes call [LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187) (or [AfxLoadLibrary](../mfc/reference/application-information-and-management.md#afxloadlibrary)) to explicitly link to a DLL. If the function succeeds, it maps the specified DLL into the address space of the calling process and returns a handle to the DLL that can be used with other functions in explicit linking—for example, `GetProcAddress` and `FreeLibrary`.
4343

4444
`LoadLibrary` attempts to locate the DLL by using the same search sequence that is used for implicit linking. If the system cannot find the DLL or if the entry-point function returns FALSE, `LoadLibrary` returns NULL. If the call to `LoadLibrary` specifies a DLL module that is already mapped into the address space of the calling process, the function returns a handle of the DLL and increments the reference count of the module.
4545

@@ -69,4 +69,4 @@ Processes call [LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187) (o
6969
## See Also
7070
[DLLs in Visual C++](../build/dlls-in-visual-cpp.md)
7171
[LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187)
72-
[AfxLoadLibrary](http://msdn.microsoft.com/Library/1339678b-c843-4474-b9c9-8f3bd9905e2e)
72+
[AfxLoadLibrary](../mfc/reference/application-information-and-management.md#afxloadlibrary)

‎docs/build/reference/optimizing-your-code.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ By optimizing an executable, you can achieve a balance between fast execution sp
8787

8888
The following topics provide more advanced information about how to debug.
8989

90-
- [How to: Debug Optimized Code](http://msdn.microsoft.com/Library/fc8eeeb8-6629-4c9b-99f7-2016aee81dff)
90+
- [How to: Debug Optimized Code](/visualstudio/debugger/how-to-debug-optimized-code)
9191

9292
- [Why Floating-Point Numbers May Lose Precision](../../build/reference/why-floating-point-numbers-may-lose-precision.md)
9393

‎docs/build/reference/using-verify-instead-of-assert.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Suppose that when you run the debug version of your MFC application, there are n
4444

4545
This problem can be caused when you place important code in an ASSERT statement to verify that it performs correctly. Because ASSERT statements are commented out in a release build of an MFC program, the code does not run in a release build.
4646

47-
If you are using ASSERT to confirm that a function call succeeded, consider using [VERIFY](http://msdn.microsoft.com/Library/3e1ab4ee-cbc7-4290-a777-c92f42ce7b96) instead. The VERIFY macro evaluates its own arguments in both debug and release builds of the application.
47+
If you are using ASSERT to confirm that a function call succeeded, consider using [VERIFY](../../mfc/reference/diagnostic-services.md#verify) instead. The VERIFY macro evaluates its own arguments in both debug and release builds of the application.
4848

4949
Another preferred technique is to assign the function's return value to a temporary variable and then test the variable in an ASSERT statement.
5050

‎docs/build/regular-dlls-dynamically-linked-to-mfc.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ AFX_MANAGE_STATE(AfxGetStaticModuleState( ))
6363

6464
- This type of DLL uses the `DllMain` provided by MFC. Place all DLL-specific initialization code in the `InitInstance` member function and termination code in `ExitInstance` as in a normal MFC application.
6565

66-
Because this kind of DLL uses the dynamic-link library version of MFC, you must explicitly set the current module state to the one for the DLL. To do this, use the [AFX_MANAGE_STATE](http://msdn.microsoft.com/Library/620cb840-4227-4a75-b36d-f7d507f44606) macro at the beginning of every function exported from the DLL.
66+
Because this kind of DLL uses the dynamic-link library version of MFC, you must explicitly set the current module state to the one for the DLL. To do this, use the [AFX_MANAGE_STATE](../mfc/reference/extension-dll-macros.md#afx_manage_state) macro at the beginning of every function exported from the DLL.
6767

6868
Regular DLLs must have a `CWinApp`-derived class and a single object of that application class, as does an MFC application. However, the `CWinApp` object of the DLL does not have a main message pump, as does the `CWinApp` object of an application.
6969

@@ -91,7 +91,7 @@ extern "C" __declspec(dllexport) MyExportedFunction( );
9191

9292
It is safe to pass pointers to memory that were allocated by the C run-time libraries between an application and a DLL only if you make a copy of the data. You must not delete or resize these pointers or use them without making a copy of the memory.
9393

94-
When building a regular DLL that dynamically links to MFC, you need to use the macro [AFX_MANAGE_STATE](http://msdn.microsoft.com/Library/620cb840-4227-4a75-b36d-f7d507f44606) to switch the MFC module state correctly. This is done by adding the following line of code to the beginning of functions exported from the DLL:
94+
When building a regular DLL that dynamically links to MFC, you need to use the macro [AFX_MANAGE_STATE](../mfc/reference/extension-dll-macros.md#afx_manage_state) to switch the MFC module state correctly. This is done by adding the following line of code to the beginning of functions exported from the DLL:
9595

9696
```
9797
AFX_MANAGE_STATE(AfxGetStaticModuleState( ))

‎docs/build/walkthrough-compiling-a-cpp-cli-program-on-the-command-line.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Walkthrough: Compiling a C++-CLI Program on the Command Line | Microsoft Docs"
2+
title: "Walkthrough: Compiling a C++/CLI Program on the Command Line | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""

‎docs/build/walkthrough-compiling-a-cpp-cx-program-on-the-command-line.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Walkthrough: Compiling a C++-CX Program on the Command Line | Microsoft Docs"
2+
title: "Walkthrough: Compiling a C++/CX Program on the Command Line | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""

0 commit comments

Comments
 (0)