Skip to content

Commit 23917e6

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#796 from MicrosoftDocs/master636855936902738582
Fix git push error for protected CLA branch
2 parents 5c441af + f4be868 commit 23917e6

21 files changed

Lines changed: 573 additions & 819 deletions

‎.openpublishing.redirection.json‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7925,6 +7925,61 @@
79257925
"redirect_url": "/cpp/windows/changing-unassigned-symbols",
79267926
"redirect_document_id": false
79277927
},
7928+
{
7929+
"source_path": "docs/windows/dialog-editor-states-guides-and-grids.md",
7930+
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
7931+
"redirect_document_id": false
7932+
},
7933+
{
7934+
"source_path": "docs/windows/grouping-radio-buttons-on-a-dialog-box.md",
7935+
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
7936+
"redirect_document_id": false
7937+
},
7938+
{
7939+
"source_path": "docs/windows/aligning-groups-of-controls.md",
7940+
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
7941+
"redirect_document_id": false
7942+
},
7943+
{
7944+
"source_path": "docs/windows/changing-the-tab-order-of-controls.md",
7945+
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
7946+
"redirect_document_id": false
7947+
},
7948+
{
7949+
"source_path": "docs/windows/how-to-create-a-resource.md",
7950+
"redirect_url": "/cpp/windows/how-to-create-a-resource-script-file",
7951+
"redirect_document_id": false
7952+
},
7953+
{
7954+
"source_path": "docs/windows/how-to-use-resource-templates.md",
7955+
"redirect_url": "/cpp/windows/how-to-create-a-resource-script-file",
7956+
"redirect_document_id": false
7957+
},
7958+
{
7959+
"source_path": "docs/windows/editing-managed-resource-files.md",
7960+
"redirect_url": "/cpp/windows/how-to-copy-resources",
7961+
"redirect_document_id": false
7962+
},
7963+
{
7964+
"source_path": "docs/windows/how-to-import-and-export-resources.md",
7965+
"redirect_url": "/cpp/windows/how-to-copy-resources",
7966+
"redirect_document_id": false
7967+
},
7968+
{
7969+
"source_path": "docs/windows/how-to-search-for-symbols-in-resources.md",
7970+
"redirect_url": "/cpp/windows/how-to-include-resources-at-compile-time",
7971+
"redirect_document_id": false
7972+
},
7973+
{
7974+
"source_path": "docs/windows/editable-file-types-for-resources.md",
7975+
"redirect_url": "/cpp/windows/resource-files-visual-studio",
7976+
"redirect_document_id": false
7977+
},
7978+
{
7979+
"source_path": "docs/windows/manifest-resources.md",
7980+
"redirect_url": "/cpp/windows/resource-files-visual-studio",
7981+
"redirect_document_id": false
7982+
},
79287983
{
79297984
"source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
79307985
"redirect_url": "/cpp/windows/activationfactory-class#activationfactory",

‎docs/data/oledb/macros-and-global-functions-for-ole-db-consumer-templates.md‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Macros and Global Functions for OLE DB Consumer Templates"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/11/2019"
44
f1_keywords: ["vc.templates.ole", "ATL.AtlTraceErrorRecords", "ATL::AtlTraceErrorRecords", "AtlTraceErrorRecords", "BEGIN_ACCESSOR", "BEGIN_ACCESSOR_MAP", "END_ACCESSOR", "END_ACCESSOR_MAP", "BEGIN_COLUMN_MAP", "BLOB_ENTRY", "BLOB_ENTRY_LENGTH", "BLOB_ENTRY_LENGTH_STATUS", "BLOB_ENTRY_STATUS", "BLOB_NAME", "BLOB_NAME_LENGTH", "BLOB_NAME_LENGTH_STATUS", "BLOB_NAME_STATUS", "BOOKMARK_ENTRY", "COLUMN_ENTRY", "COLUMN_ENTRY_EX", "COLUMN_ENTRY_LENGTH", "COLUMN_ENTRY_LENGTH_STATUS", "COLUMN_ENTRY_PS", "COLUMN_ENTRY_PS_LENGTH", "COLUMN_ENTRY_PS_LENGTH_STATUS", "COLUMN_ENTRY_PS_STATUS", "COLUMN_ENTRY_STATUS", "COLUMN_ENTRY_TYPE", "COLUMN_ENTRY_TYPE_SIZE", "COLUMN_NAME", "COLUMN_NAME_EX", "COLUMN_NAME_LENGTH", "COLUMN_NAME_LENGTH_STATUS", "COLUMN_NAME_PS", "COLUMN_NAME_PS_LENGTH", "COLUMN_NAME_PS_LENGTH_STATUS", "COLUMN_NAME_PS_STATUS", "COLUMN_NAME_STATUS", "COLUMN_NAME_TYPE", "COLUMN_NAME_TYPE_PS", "COLUMN_NAME_TYPE_SIZE", "COLUMN_NAME_TYPE_STATUS", "END_COLUMN_MAP", "DEFINE_COMMAND", "DEFINE_COMMAND_EX", "BEGIN_PARAM_MAP", "END_PARAM_MAP", "SET_PARAM_TYPE"]
55
helpviewer_keywords: ["OLE DB consumer templates, macros", "macros, OLE DB consumer template", "AtlTraceErrorRecords function", "BEGIN_ACCESSOR macro, syntax", "BEGIN_ACCESSOR macro", "BEGIN_ACCESSOR_MAP macro", "END_ACCESSOR macro", "END_ACCESSOR_MAP macro", "BEGIN_COLUMN_MAP macro", "BLOB_ENTRY macro", "BLOB_ENTRY_LENGTH macro", "BLOB_ENTRY_LENGTH_STATUS macro", "BLOB_ENTRY_STATUS macro", "BLOB_NAME macro", "BLOB_NAME_LENGTH macro", "BLOB_NAME_LENGTH_STATUS macro", "BLOB_NAME_STATUS macro", "BOOKMARK_ENTRY macro", "COLUMN_ENTRY macro", "COLUMN_ENTRY_EX macro", "COLUMN_ENTRY_LENGTH macro", "COLUMN_ENTRY_LENGTH_STATUS macro", "COLUMN_ENTRY_PS macro", "COLUMN_ENTRY_PS_LENGTH macro", "COLUMN_ENTRY_PS_LENGTH_STATUS macro", "COLUMN_ENTRY_PS_STATUS macro", "COLUMN_ENTRY_STATUS macro", "COLUMN_ENTRY_TYPE macro", "COLUMN_ENTRY_TYPE_SIZE macro", "COLUMN_NAME macro", "COLUMN_NAME_EX macro", "COLUMN_NAME_LENGTH macro", "COLUMN_NAME_LENGTH_STATUS macro", "COLUMN_NAME_PS macro", "COLUMN_NAME_PS_LENGTH macro", "COLUMN_NAME_PS_LENGTH_STATUS macro", "COLUMN_NAME_PS_STATUS macro", "COLUMN_NAME_STATUS macro", "COLUMN_NAME_TYPE macro", "COLUMN_NAME_TYPE_PS macro", "COLUMN_NAME_TYPE_SIZE macro", "COLUMN_NAME_TYPE_STATUS macro", "END_COLUMN_MAP macro", "DEFINE_COMMAND macro", "DEFINE_COMMAND_EX macro", "BEGIN_PARAM_MAP macro", "END_PARAM_MAP macro", "SET_PARAM_TYPE macro"]
66
ms.assetid: 8765eb7b-32dd-407c-bacf-8890ef959837
@@ -96,11 +96,7 @@ inline void AtlTraceErrorRecords(HRESULT hrErr = S_OK);
9696
9797
#### Remarks
9898
99-
If *hErr* is not S_OK, `AtlTraceErrorRecords` dumps OLE DB Error Record information to the dump device (the **Debug** tab of the Output window or a file). The Error Record information, which is obtained from the provider, includes row number, source, description, help file, context, and GUID for each error record entry. `AtlTraceErrorRecords` dumps this information only in debug builds. In release builds, it is an empty stub that is optimized out.
100-
101-
#### See Also
102-
103-
[CDBErrorInfo Class](../../data/oledb/cdberrorinfo-class.md)
99+
If *hErr* is not S_OK, `AtlTraceErrorRecords` dumps OLE DB Error Record information to the dump device (the **Debug** tab of the Output window or a file). The Error Record information, which is obtained from the provider, includes row number, source, description, help file, context, and GUID for each error record entry. `AtlTraceErrorRecords` dumps this information only in debug builds. In release builds, it is an empty stub that is optimized out. For more information, see [CDBErrorInfo Class](../../data/oledb/cdberrorinfo-class.md).
104100
105101
### <a name="begin_accessor"></a> BEGIN_ACCESSOR
106102
@@ -567,10 +563,7 @@ END_COLUMN_MAP()
567563
};
568564
```
569565
570-
#### See Also
571-
572-
[CBookmark Class](../../data/oledb/cbookmark-class.md)<br/>
573-
[DBPROP_BOOKMARKS](https://docs.microsoft.com/previous-versions/windows/desktop/ms709728(v=vs.85))
566+
For more information, see [Using Bookmarks](using-bookmarks.md) and [CBookmark Class](../../data/oledb/cbookmark-class.md).
574567
575568
### <a name="column_entry"></a> COLUMN_ENTRY
576569
@@ -1538,7 +1531,7 @@ END_COLUMN_MAP()
15381531

15391532
**Header:** atldbcli.h
15401533

1541-
## See Also
1534+
## See also
15421535

15431536
[Macros and Global Functions for OLE DB Consumer Templates](../../data/oledb/macros-and-global-functions-for-ole-db-consumer-templates.md)<br/>
15441537
[OLE DB Consumer Templates](../../data/oledb/ole-db-consumer-templates-cpp.md)<br/>

‎docs/data/oledb/macros-for-ole-db-provider-templates.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Macros for OLE DB Provider Templates"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/11/2019"
44
f1_keywords: ["vc.templates.ole", "BEGIN_PROPERTY_SET", "BEGIN_PROPERTY_SET_EX", "BEGIN_PROPSET_MAP", "CHAIN_PROPERTY_SET", "END_PROPERTY_SET", "END_PROPSET_MAP", "PROPERTY_INFO_ENTRY", "PROPERTY_INFO_ENTRY_EX", "PROPERTY_INFO_ENTRY_VALUE", "BEGIN_PROVIDER_COLUMN_MAP", "END_PROVIDER_COLUMN_MAP", "PROVIDER_COLUMN_ENTRY", "PROVIDER_COLUMN_ENTRY_FIXED", "PROVIDER_COLUMN_ENTRY_GN", "PROVIDER_COLUMN_ENTRY_LENGTH", "PROVIDER_COLUMN_ENTRY_STR", "PROVIDER_COLUMN_ENTRY_TYPE_LENGTH", "PROVIDER_COLUMN_ENTRY_WSTR", "BEGIN_SCHEMA_MAP", "END_SCHEMA_MAP", "SCHEMA_ENTRY"]
55
helpviewer_keywords: ["OLE DB provider templates, macros", "macros, OLE DB Provider Templates", "Provider Template macros (OLE DB)", "OLE DB Provider Template macros", "BEGIN_PROPERTY_SET macro", "BEGIN_PROPERTY_SET_EX macro", "BEGIN_PROPSET_MAP macro", "CHAIN_PROPERTY_SET macro", "END_PROPERTY_SET macro", "END_PROPSET_MAP macro", "PROPERTY_INFO_ENTRY macro", "PROPERTY_INFO_ENTRY_EX macro", "PROPERTY_INFO_ENTRY_VALUE macro", "BEGIN_PROVIDER_COLUMN_MAP macro", "END_PROVIDER_COLUMN_MAP macro", "PROVIDER_COLUMN_ENTRY macro", "PROVIDER_COLUMN_ENTRY_FIXED macro", "PROVIDER_COLUMN_ENTRY_GN macro", "PROVIDER_COLUMN_ENTRY_LENGTH macro", "PROVIDER_COLUMN_ENTRY_STR macro", "PROVIDER_COLUMN_ENTRY_TYPE_LENGTH macro", "PROVIDER_COLUMN_ENTRY_WSTR macro", "BEGIN_SCHEMA_MAP macro", "END_SCHEMA_MAP macro", "SCHEMA_ENTRY macro"]
66
ms.assetid: 909482c5-64ab-4e52-84a9-1c07091db183
@@ -530,9 +530,9 @@ Denotes the end of the schema map.
530530
END_SCHEMA_MAP()
531531
```
532532

533-
#### See Also
533+
#### Remarks
534534

535-
[IDBSchemaRowsetImpl Class](../../data/oledb/idbschemarowsetimpl-class.md)
535+
For more information, see [IDBSchemaRowsetImpl Class](../../data/oledb/idbschemarowsetimpl-class.md).
536536

537537
### <a name="schema_entry"></a> SCHEMA_ENTRY
538538

@@ -573,7 +573,7 @@ This `Execute` function populates the rowset's data. The ATL Project Wizard crea
573573

574574
The wizard also adds three corresponding entries in the schema map. See [Creating an OLE DB Template Provider](../../data/oledb/creating-an-ole-db-provider.md) for more information about using the wizard to create a provider.
575575

576-
## See Also
576+
## See also
577577

578578
[OLE DB Provider Templates](../../data/oledb/ole-db-provider-templates-cpp.md)<br/>
579579
[OLE DB Provider Template Architecture](../../data/oledb/ole-db-provider-template-architecture.md)<br/>

‎docs/windows/TOC.md‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,9 @@
1010
## [Adding Files to an Empty Win32 Applications](adding-files-to-an-empty-win32-applications.md)
1111
## [Working with Resource Files](working-with-resource-files.md)
1212
### [Resource Files (Visual Studio)](resource-files-visual-studio.md)
13-
#### [How to: Create a Resource Script File](how-to-create-a-resource-script-file.md)
14-
#### [How to: Create a Resource](how-to-create-a-resource.md)
13+
#### [How to: Create Resources](how-to-create-a-resource-script-file.md)
14+
#### [How to: Manage Resources](how-to-copy-resources.md)
1515
#### [How to: Include Resources at Compile Time](how-to-include-resources-at-compile-time.md)
16-
#### [How to: Copy Resources](how-to-copy-resources.md)
17-
#### [How to: Search for Symbols in Resources](how-to-search-for-symbols-in-resources.md)
18-
#### [How to: Use Resource Templates](how-to-use-resource-templates.md)
19-
#### [How to: Import and Export Resources](how-to-import-and-export-resources.md)
20-
#### [Editable File Types for Resources](editable-file-types-for-resources.md)
21-
#### [Editing Managed Resource Files](editing-managed-resource-files.md)
22-
#### [Manifest Resources](manifest-resources.md)
2316
### [Symbols: Resource Identifiers](symbols-resource-identifiers.md)
2417
#### [Viewing Resource Symbols](viewing-resource-symbols.md)
2518
#### [Creating New Symbols](creating-new-symbols.md)
@@ -48,10 +41,6 @@
4841
###### [Sizing Controls](sizing-individual-controls.md)
4942
###### [Adding Values to a Combo Box Control](adding-values-to-a-combo-box-control.md)
5043
###### [Arrangement of Controls on Dialog Boxes](arrangement-of-controls-on-dialog-boxes.md)
51-
####### [Dialog Editor States (Guides and Grids)](dialog-editor-states-guides-and-grids.md)
52-
####### [Grouping Radio Buttons on a Dialog Box](grouping-radio-buttons-on-a-dialog-box.md)
53-
####### [Align Controls](aligning-groups-of-controls.md)
54-
####### [Changing the Tab Order of Controls](changing-the-tab-order-of-controls.md)
5544
###### [Custom Controls in the Dialog Editor](custom-controls-in-the-dialog-editor.md)
5645
###### [Defining Mnemonics (Access Keys)](defining-mnemonics-access-keys.md)
5746
###### [Designing a Dialog Box](testing-a-dialog-box.md)

‎docs/windows/aligning-groups-of-controls.md‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)