Skip to content

Commit ea960f2

Browse files
author
mikeblome
committed
fixed merge conflicts
2 parents 9cfbdc9 + d4e4e83 commit ea960f2

2,933 files changed

Lines changed: 357230 additions & 322004 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: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6410,6 +6410,41 @@
64106410
"redirect_url": "/cpp/windows/overview-of-windows-programming-in-cpp",
64116411
"redirect_document_id": false
64126412
},
6413+
{
6414+
"source_path": "docs/windows/classfactory-addref-method.md",
6415+
"redirect_url": "/cpp/windows/classfactory-class#addref",
6416+
"redirect_document_id": false
6417+
},
6418+
{
6419+
"source_path": "docs/windows/classfactory-classfactory-constructor.md",
6420+
"redirect_url": "/cpp/windows/classfactory-class#classfactory",
6421+
"redirect_document_id": false
6422+
},
6423+
{
6424+
"source_path": "docs/windows/classfactory-lockserver-method.md",
6425+
"redirect_url": "/cpp/windows/classfactory-class#lockserver",
6426+
"redirect_document_id": false
6427+
},
6428+
{
6429+
"source_path": "docs/windows/classfactory-queryinterface-method.md",
6430+
"redirect_url": "/cpp/windows/classfactory-class#queryinterface",
6431+
"redirect_document_id": false
6432+
},
6433+
{
6434+
"source_path": "docs/windows/classfactory-release-method.md",
6435+
"redirect_url": "/cpp/windows/classfactory-class#release",
6436+
"redirect_document_id": false
6437+
},
6438+
{
6439+
"source_path": "docs/windows/deferrableeventargs-getdeferral-method.md",
6440+
"redirect_url": "/cpp/windows/deferrableeventargs-class#getdeferral",
6441+
"redirect_document_id": false
6442+
},
6443+
{
6444+
"source_path": "docs/windows/deferrableeventargs-invokeallfinished-method.md",
6445+
"redirect_url": "/cpp/windows/deferrableeventargs-class#invokeallfinished",
6446+
"redirect_document_id": false
6447+
},
64136448
{
64146449
"source_path": "docs/windows/eventsource-add-method.md",
64156450
"redirect_url": "/cpp/windows/eventsource-class#add",

‎docs/atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ In general, the rules for allocating and releasing memory allocated for `BSTR`s
3636

3737
## See Also
3838

39-
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
40-
[CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)
41-
[SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)
39+
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
40+
[CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)<br/>
41+
[SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)<br/>
4242
[SysFreeString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysfreestring)
4343

‎docs/atl-mfc-shared/atl-mfc-concepts.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This section provides conceptual and task-based topics to help you program using
1717

1818
## In This Section
1919

20-
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
20+
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
2121
Describes how to manage string data in applications.
2222

2323
## See Also

‎docs/atl-mfc-shared/atl-mfc-shared-classes.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ These utility classes can be used in any native C++ project without requiring an
1818

1919
## In This Section
2020

21-
[Classes Shared Between MFC and ATL](../atl-mfc-shared/reference/classes-shared-by-mfc-and-atl.md)
21+
[Classes Shared Between MFC and ATL](../atl-mfc-shared/reference/classes-shared-by-mfc-and-atl.md)<br/>
2222
Provides links to the classes shared between MFC and ATL.
2323

2424
## Related Sections
2525

26-
[Active Template Library (ATL) Reference](../atl/atl-com-desktop-components.md)
26+
[Active Template Library (ATL) Reference](../atl/atl-com-desktop-components.md)<br/>
2727
Provides reference material for the ATL Library, a set of template-based C++ classes that simplify the programming of COM objects.
2828

29-
[Microsoft Foundation Class Library (MFC) Reference](../mfc/mfc-desktop-applications.md)
29+
[Microsoft Foundation Class Library (MFC) Reference](../mfc/mfc-desktop-applications.md)<br/>
3030
Provides reference material for the MFC Library, a set of classes in that constitute an application framework, which is the framework of an application written for the Windows API.
3131

32-
[Debugging](/visualstudio/debugger/debugging-in-visual-studio)
32+
[Debugging](/visualstudio/debugger/debugging-in-visual-studio)<br/>
3333
Provides links to using the Visual Studio debugger to correct logic errors in your application or stored procedures.

‎docs/atl-mfc-shared/basic-cstring-operations.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ Without the cast, `cs` is treated as a `void*` and `wcout` prints the address of
9797

9898
## See Also
9999

100-
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
101-
[CStringT Class](../atl-mfc-shared/reference/cstringt-class.md)
102-
[Template Specialization](../cpp/template-specialization-cpp.md)
100+
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
101+
[CStringT Class](../atl-mfc-shared/reference/cstringt-class.md)<br/>
102+
[Template Specialization](../cpp/template-specialization-cpp.md)<br/>
103103
[How to: Convert Between Various String Types](../text/how-to-convert-between-various-string-types.md)
104104

‎docs/atl-mfc-shared/cstring-exception-cleanup.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ Under the C++ exception handling mechanism that MFC now uses, you do not have to
1919

2020
## See Also
2121

22-
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
22+
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
2323
[Exception Handling](../mfc/exception-handling-in-mfc.md)
2424

‎docs/atl-mfc-shared/cstring-operations-relating-to-c-style-strings.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ For most function results, you can simply return a `CString` object by value.
9090

9191
## See Also
9292

93-
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)
93+
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
9494
[CString Argument Passing](../atl-mfc-shared/cstring-argument-passing.md)
9595

‎docs/atl-mfc-shared/date-and-time.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ MFC supports several different ways of working with dates and times. These inclu
3131

3232
## See Also
3333

34-
[Concepts](../mfc/mfc-concepts.md)
34+
[Concepts](../mfc/mfc-concepts.md)<br/>
3535
[General MFC Topics](../mfc/general-mfc-topics.md)
3636

‎docs/atl-mfc-shared/date-type.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ More information on issues related to the DATE and `COleDateTime` types can be f
6060

6161
## See Also
6262

63-
[Date and Time](../atl-mfc-shared/date-and-time.md)
63+
[Date and Time](../atl-mfc-shared/date-and-time.md)<br/>
6464
[COleDateTime Class](../atl-mfc-shared/reference/coledatetime-class.md)
6565

‎docs/atl-mfc-shared/exporting-string-classes-using-cstringt.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ There are several caveats:
5555

5656
## See Also
5757

58-
[Using CStringT](../atl-mfc-shared/using-cstringt.md)
58+
[Using CStringT](../atl-mfc-shared/using-cstringt.md)<br/>
5959
[Using CString](../atl-mfc-shared/using-cstring.md)
6060

0 commit comments

Comments
 (0)