Skip to content

Fix git push error for protected CLA branch #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
eb41411
resource file consolidation pr47
Feb 11, 2019
3fb23e6
Merge pull request #1751 from msebolt/resource-file-consolidation-pr47
TrishaMc Feb 11, 2019
82cbcba
resource file consolidation pr48
Feb 11, 2019
1e324e9
major revision
Feb 11, 2019
05ad779
minor revision
Feb 11, 2019
efd3054
Merge pull request #1753 from msebolt/resource-file-consolidation-pr48
ktoliver Feb 11, 2019
18ac9c8
resource file consolidation pr49
Feb 11, 2019
27a92f5
validation fix
Feb 11, 2019
dca9870
Merge pull request #1754 from msebolt/resource-file-consolidation-pr49
ktoliver Feb 12, 2019
d372fcb
resource file consolidation pr50
Feb 12, 2019
7d49662
Merge pull request #1755 from msebolt/resource-file-consolidation-pr50
Ja-Dunn Feb 12, 2019
0786294
resource file consolidation pr51
Feb 12, 2019
69f06fc
Merge pull request #1756 from msebolt/resource-file-consolidation-pr51
ktoliver Feb 12, 2019
c17b994
Fix stray see-also sections.
Feb 12, 2019
e21d29e
Merge pull request #1750 from MicrosoftDocs/FromPublicMasterBranch
Feb 12, 2019
404a882
Merge pull request #1757 from corob-msft/cr-see-also
PRMerger17 Feb 12, 2019
f4be868
Merge pull request #1758 from MicrosoftDocs/master
Taojunshen Feb 12, 2019
e5d515e
resource file consolidation pr52
Feb 12, 2019
c5efe89
manage symbols addition
Feb 12, 2019
01418c8
touch-ups
Feb 12, 2019
2832f1f
Merge pull request #1759 from msebolt/resource-file-consolidation-pr52
TrishaMc Feb 12, 2019
f66b3a3
resource file consolidation pr53
Feb 12, 2019
cd33bb1
Merge pull request #1760 from msebolt/resource-file-consolidation-pr53
Ja-Dunn Feb 12, 2019
6387cac
resource file consolidation pr54
Feb 12, 2019
d1f56b1
Merge pull request #1761 from msebolt/resource-file-consolidation-pr54
rjagiewich Feb 12, 2019
bec1480
Merge pull request #1763 from MicrosoftDocs/master
Taojunshen Feb 13, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 90 additions & 0 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -7925,6 +7925,96 @@
"redirect_url": "/cpp/windows/changing-unassigned-symbols",
"redirect_document_id": false
},
{
"source_path": "docs/windows/dialog-editor-states-guides-and-grids.md",
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
"redirect_document_id": false
},
{
"source_path": "docs/windows/grouping-radio-buttons-on-a-dialog-box.md",
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
"redirect_document_id": false
},
{
"source_path": "docs/windows/aligning-groups-of-controls.md",
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
"redirect_document_id": false
},
{
"source_path": "docs/windows/changing-the-tab-order-of-controls.md",
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
"redirect_document_id": false
},
{
"source_path": "docs/windows/how-to-create-a-resource.md",
"redirect_url": "/cpp/windows/how-to-create-a-resource-script-file",
"redirect_document_id": false
},
{
"source_path": "docs/windows/how-to-use-resource-templates.md",
"redirect_url": "/cpp/windows/how-to-create-a-resource-script-file",
"redirect_document_id": false
},
{
"source_path": "docs/windows/editing-managed-resource-files.md",
"redirect_url": "/cpp/windows/how-to-copy-resources",
"redirect_document_id": false
},
{
"source_path": "docs/windows/how-to-import-and-export-resources.md",
"redirect_url": "/cpp/windows/how-to-copy-resources",
"redirect_document_id": false
},
{
"source_path": "docs/windows/how-to-search-for-symbols-in-resources.md",
"redirect_url": "/cpp/windows/how-to-include-resources-at-compile-time",
"redirect_document_id": false
},
{
"source_path": "docs/windows/editable-file-types-for-resources.md",
"redirect_url": "/cpp/windows/resource-files-visual-studio",
"redirect_document_id": false
},
{
"source_path": "docs/windows/manifest-resources.md",
"redirect_url": "/cpp/windows/resource-files-visual-studio",
"redirect_document_id": false
},
{
"source_path": "docs/windows/viewing-resource-symbols.md",
"redirect_url": "/cpp/windows/creating-new-symbols",
"redirect_document_id": false
},
{
"source_path": "docs/windows/opening-the-resource-editor-for-a-given-symbol.md",
"redirect_url": "/cpp/windows/creating-new-symbols",
"redirect_document_id": false
},
{
"source_path": "docs/windows/changing-unassigned-symbols.md",
"redirect_url": "/cpp/windows/changing-a-symbol-or-symbol-name-id",
"redirect_document_id": false
},
{
"source_path": "docs/windows/including-shared-read-only-or-calculated-symbols.md",
"redirect_url": "/cpp/windows/changing-a-symbol-or-symbol-name-id",
"redirect_document_id": false
},
{
"source_path": "docs/windows/viewing-and-editing-resources-in-a-resource-editor.md",
"redirect_url": "/cpp/windows/resource-editors",
"redirect_document_id": false
},
{
"source_path": "docs/windows/setting-accelerator-properties.md",
"redirect_url": "/cpp/windows/accelerator-editor",
"redirect_document_id": false
},
{
"source_path": "docs/windows/editing-accelerator-tables.md",
"redirect_url": "/cpp/windows/accelerator-editor",
"redirect_document_id": false
},
{
"source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
"redirect_url": "/cpp/windows/activationfactory-class#activationfactory",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Macros and Global Functions for OLE DB Consumer Templates"
ms.date: "11/04/2016"
ms.date: "02/11/2019"
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"]
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"]
ms.assetid: 8765eb7b-32dd-407c-bacf-8890ef959837
Expand Down Expand Up @@ -96,11 +96,7 @@ inline void AtlTraceErrorRecords(HRESULT hrErr = S_OK);

#### Remarks

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.

#### See Also

[CDBErrorInfo Class](../../data/oledb/cdberrorinfo-class.md)
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).

### <a name="begin_accessor"></a> BEGIN_ACCESSOR

Expand Down Expand Up @@ -567,10 +563,7 @@ END_COLUMN_MAP()
};
```

#### See Also

[CBookmark Class](../../data/oledb/cbookmark-class.md)<br/>
[DBPROP_BOOKMARKS](https://docs.microsoft.com/previous-versions/windows/desktop/ms709728(v=vs.85))
For more information, see [Using Bookmarks](using-bookmarks.md) and [CBookmark Class](../../data/oledb/cbookmark-class.md).

### <a name="column_entry"></a> COLUMN_ENTRY

Expand Down Expand Up @@ -1538,7 +1531,7 @@ END_COLUMN_MAP()

**Header:** atldbcli.h

## See Also
## See also

[Macros and Global Functions for OLE DB Consumer Templates](../../data/oledb/macros-and-global-functions-for-ole-db-consumer-templates.md)<br/>
[OLE DB Consumer Templates](../../data/oledb/ole-db-consumer-templates-cpp.md)<br/>
Expand Down
8 changes: 4 additions & 4 deletions docs/data/oledb/macros-for-ole-db-provider-templates.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Macros for OLE DB Provider Templates"
ms.date: "11/04/2016"
ms.date: "02/11/2019"
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"]
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"]
ms.assetid: 909482c5-64ab-4e52-84a9-1c07091db183
Expand Down Expand Up @@ -530,9 +530,9 @@ Denotes the end of the schema map.
END_SCHEMA_MAP()
```

#### See Also
#### Remarks

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

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

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

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.

## See Also
## See also

[OLE DB Provider Templates](../../data/oledb/ole-db-provider-templates-cpp.md)<br/>
[OLE DB Provider Template Architecture](../../data/oledb/ole-db-provider-template-architecture.md)<br/>
Expand Down
26 changes: 4 additions & 22 deletions docs/windows/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,18 @@
## [Adding Files to an Empty Win32 Applications](adding-files-to-an-empty-win32-applications.md)
## [Working with Resource Files](working-with-resource-files.md)
### [Resource Files (Visual Studio)](resource-files-visual-studio.md)
#### [How to: Create a Resource Script File](how-to-create-a-resource-script-file.md)
#### [How to: Create a Resource](how-to-create-a-resource.md)
#### [How to: Create Resources](how-to-create-a-resource-script-file.md)
#### [How to: Manage Resources](how-to-copy-resources.md)
#### [How to: Include Resources at Compile Time](how-to-include-resources-at-compile-time.md)
#### [How to: Copy Resources](how-to-copy-resources.md)
#### [How to: Search for Symbols in Resources](how-to-search-for-symbols-in-resources.md)
#### [How to: Use Resource Templates](how-to-use-resource-templates.md)
#### [How to: Import and Export Resources](how-to-import-and-export-resources.md)
#### [Editable File Types for Resources](editable-file-types-for-resources.md)
#### [Editing Managed Resource Files](editing-managed-resource-files.md)
#### [Manifest Resources](manifest-resources.md)
### [Symbols: Resource Identifiers](symbols-resource-identifiers.md)
#### [Viewing Resource Symbols](viewing-resource-symbols.md)
#### [Creating New Symbols](creating-new-symbols.md)
#### [Changing or Deleting Unassigned Symbols](changing-unassigned-symbols.md)
#### [Opening the Resource Editor for a Given Symbol](opening-the-resource-editor-for-a-given-symbol.md)
#### [Changing a Symbol](changing-a-symbol-or-symbol-name-id.md)
#### [Including Shared (Read-Only) or Calculated Symbols](including-shared-read-only-or-calculated-symbols.md)
#### [How to: Create Symbols](creating-new-symbols.md)
#### [How to: Manage Symbols](changing-a-symbol-or-symbol-name-id.md)
#### [Predefined Symbol IDs](predefined-symbol-ids.md)
##### [ATL Predefined Symbols](atl-predefined-symbols.md)
##### [MFC Predefined Symbols](mfc-predefined-symbols.md)
##### [Win32 Predefined Symbols](win32-predefined-symbols.md)
### [Resource Editors](resource-editors.md)
#### [Viewing and Editing Resources in a Resource Editor](viewing-and-editing-resources-in-a-resource-editor.md)
#### [Accelerator Editor](accelerator-editor.md)
##### [Setting Accelerator Properties](setting-accelerator-properties.md)
##### [Editing Accelerator Tables](editing-accelerator-tables.md)
##### [Accelerator Keys](predefined-accelerator-keys.md)
#### [Binary Editor](binary-editor.md)
#### [Dialog Editor](dialog-editor.md)
Expand All @@ -48,10 +34,6 @@
###### [Sizing Controls](sizing-individual-controls.md)
###### [Adding Values to a Combo Box Control](adding-values-to-a-combo-box-control.md)
###### [Arrangement of Controls on Dialog Boxes](arrangement-of-controls-on-dialog-boxes.md)
####### [Dialog Editor States (Guides and Grids)](dialog-editor-states-guides-and-grids.md)
####### [Grouping Radio Buttons on a Dialog Box](grouping-radio-buttons-on-a-dialog-box.md)
####### [Align Controls](aligning-groups-of-controls.md)
####### [Changing the Tab Order of Controls](changing-the-tab-order-of-controls.md)
###### [Custom Controls in the Dialog Editor](custom-controls-in-the-dialog-editor.md)
###### [Defining Mnemonics (Access Keys)](defining-mnemonics-access-keys.md)
###### [Designing a Dialog Box](testing-a-dialog-box.md)
Expand Down
Loading