Skip to content

Commit afd6fac

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#1559 from MicrosoftDocs/master
11/9 AM Publish
2 parents 1819bd2 + 7c5a50f commit afd6fac

346 files changed

Lines changed: 893 additions & 1201 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-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ In general, the rules for allocating and releasing memory allocated for `BSTR`s
3131

3232
[Strings (ATL/MFC)](../atl-mfc-shared/strings-atl-mfc.md)<br/>
3333
[CStringT::AllocSysString](../atl-mfc-shared/reference/cstringt-class.md#allocsysstring)<br/>
34-
[SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)<br/>
35-
[SysFreeString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysfreestring)
34+
[SysAllocString](/windows/desktop/api/oleauto/nf-oleauto-sysallocstring)<br/>
35+
[SysFreeString](/windows/desktop/api/oleauto/nf-oleauto-sysfreestring)
3636

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,10 @@ For information about converting CString objects to other string types, see [How
7979

8080
To use a CString with `wcout` you must explicitly cast the object to a `const wchar_t*` as shown in the following example:
8181

82-
```
82+
```cpp
8383
CString cs("meow");
8484

85-
wcout <<(const wchar_t*) cs <<endl;
86-
85+
wcout << (const wchar_t*) cs << endl;
8786
```
8887
8988
Without the cast, `cs` is treated as a `void*` and `wcout` prints the address of the object. This behavior is caused by subtle interactions between template argument deduction and overload resolution which are in themselves correct and conformant with the C++ standard.

‎docs/atl-mfc-shared/reference/coledatetime-class.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class COleDateTime
6868

6969
`COleDateTime` does not have a base class.
7070

71-
It is one of the possible types for the [VARIANT](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagvariant) data type of OLE automation. A `COleDateTime` value represents an absolute date and time value.
71+
It is one of the possible types for the [VARIANT](/windows/desktop/api/oaidl/ns-oaidl-tagvariant) data type of OLE automation. A `COleDateTime` value represents an absolute date and time value.
7272

7373
The `DATE` type is implemented as a floating-point value. Days are measured from December 30, 1899, at midnight. The following table shows some dates and their associated values:
7474

@@ -792,19 +792,19 @@ These overloaded assignment operators copy the source date/time value into this
792792

793793
- **operator =(** `dateSrc` **)** The value and status of the operand are copied into this `COleDateTime` object.
794794

795-
- **operator =(** *varSrc* **)** If the conversion of the [VARIANT](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagvariant) value (or [COleVariant](../../mfc/reference/colevariant-class.md) object) to a date/time (VT_DATE) is successful, the converted value is copied into this `COleDateTime` object and its status is set to valid. If the conversion is not successful, the value of this object is set to zero (30 December 1899, midnight) and its status to invalid.
795+
- **operator =(** *varSrc* **)** If the conversion of the [VARIANT](/windows/desktop/api/oaidl/ns-oaidl-tagvariant) value (or [COleVariant](../../mfc/reference/colevariant-class.md) object) to a date/time (VT_DATE) is successful, the converted value is copied into this `COleDateTime` object and its status is set to valid. If the conversion is not successful, the value of this object is set to zero (30 December 1899, midnight) and its status to invalid.
796796

797797
- **operator =(** `dtSrc` **)** The `DATE` value is copied into this `COleDateTime` object and its status is set to valid.
798798

799799
- **operator =(** `timeSrc` **)** The `time_t` or `__time64_t` value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; if unsuccessful, it is set to invalid.
800800

801801
- **operator =(** *systimeSrc* **)** The [SYSTEMTIME](https://msdn.microsoft.com/library/windows/desktop/ms724950) value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; if unsuccessful, it is set to invalid.
802802

803-
- **operator =(** `udate` **)** The `UDATE` value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; if unsuccessful, it is set to invalid. A `UDATE` structure represents an "unpacked" date. See the function [VarDateFromUdate](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-vardatefromudate) for more details.
803+
- **operator =(** `udate` **)** The `UDATE` value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; if unsuccessful, it is set to invalid. A `UDATE` structure represents an "unpacked" date. See the function [VarDateFromUdate](/windows/desktop/api/oleauto/nf-oleauto-vardatefromudate) for more details.
804804

805805
- **operator =(** `filetimeSrc` **)** The [FILETIME](https://msdn.microsoft.com/library/windows/desktop/ms724284) value is converted and copied into this `COleDateTime` object. If the conversion is successful, the status of this object is set to valid; otherwise it is set to invalid. `FILETIME` uses Universal Coordinated Time (UTC), so if you pass a UTC time in the structure, your results will be converted from UTC time to local time, and will be stored as variant time. This behavior is the same as in Visual C++ 6.0 and Visual C++.NET 2003 SP2. See [File Times](/windows/desktop/SysInfo/file-times) in the Windows SDK for more information.
806806

807-
For more information, see the [VARIANT](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagvariant) entry in the Windows SDK.
807+
For more information, see the [VARIANT](/windows/desktop/api/oaidl/ns-oaidl-tagvariant) entry in the Windows SDK.
808808

809809
For more information on the `time_t` data type, see the [time](../../c-runtime-library/reference/time-time32-time64.md) function in the *Run-Time Library Reference*.
810810

@@ -1047,7 +1047,7 @@ See the following table for bounds for the parameter values:
10471047
|*nMin*|0 - 59|
10481048
|*nSec*|0 - 59|
10491049

1050-
If the day of the month overflows, it is converted to the correct day of the next month and the month and/or year is incremented accordingly. A day value of zero indicates the last day of the previous month. The behavior is the same as [SystemTimeToVariantTime](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-systemtimetovarianttime).
1050+
If the day of the month overflows, it is converted to the correct day of the next month and the month and/or year is incremented accordingly. A day value of zero indicates the last day of the previous month. The behavior is the same as [SystemTimeToVariantTime](/windows/desktop/api/oleauto/nf-oleauto-systemtimetovarianttime).
10511051

10521052
If the date or time value specified by the parameters is not valid, the status of this object is set to invalid and the value of this object is not changed.
10531053

‎docs/atl-mfc-shared/reference/crect-class.md‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,11 @@ Nonzero if the two rectangles have the same top, left, bottom, and right values;
407407
### Example
408408
409409
```cpp
410-
CRect rect1(35, 150, 10, 25);
411-
CRect rect2(35, 150, 10, 25);
412-
CRect rect3(98, 999, 6, 3);
410+
CRect rect1(35, 150, 10, 25);
411+
CRect rect2(35, 150, 10, 25);
412+
CRect rect3(98, 999, 6, 3);
413413
ASSERT(rect1.EqualRect(rect2));
414-
ASSERT(!rect1.EqualRect(rect3));
414+
ASSERT(!rect1.EqualRect(rect3));
415415
// works just fine against RECTs, as well
416416
417417
RECT test;
@@ -448,12 +448,8 @@ The resulting value can be negative.
448448
CRect rect(20, 30, 80, 70);
449449
int nHt = rect.Height();
450450

451-
```cpp
452-
CRect rect(20, 30, 80, 70);
453-
int nHt = rect.Height();
454-
455-
// nHt is now 40
456-
ASSERT(nHt == 40);
451+
// nHt is now 40
452+
ASSERT(nHt == 40);
457453
```
458454
459455
## <a name="inflaterect"></a> CRect::InflateRect
@@ -542,7 +538,6 @@ The intersection is the largest rectangle contained in both existing rectangles.
542538
CRect rectOne(125, 0, 150, 200);
543539
CRect rectTwo(0, 75, 350, 95);
544540
CRect rectInter;
545-
546541
```cpp
547542
CRect rectOne(125, 0, 150, 200);
548543
CRect rectTwo(0, 75, 350, 95);
@@ -581,7 +576,6 @@ A rectangle is empty if the width and/or height are 0 or negative. Differs from
581576
```cpp
582577
CRect rectNone(0, 0, 0, 0);
583578
CRect rectSome(35, 50, 135, 150);
584-
585579
```cpp
586580
CRect rectNone(0, 0, 0, 0);
587581
CRect rectSome(35, 50, 135, 150);
@@ -612,7 +606,6 @@ Differs from `IsRectEmpty`, which determines whether the rectangle is empty.
612606
```cpp
613607
CRect rectNone(0, 0, 0, 0);
614608
CRect rectSome(35, 50, 135, 150);
615-
616609
```cpp
617610
CRect rectNone(0, 0, 0, 0);
618611
CRect rectSome(35, 50, 135, 150);
@@ -642,7 +635,6 @@ The absolute x-coordinate for the upper-left corner of the rectangle.
642635
```cpp
643636
CRect rect(0, 0, 100, 100);
644637
rect.MoveToX(10);
645-
646638
```cpp
647639
CRect rect(0, 0, 100, 100);
648640
rect.MoveToX(10);
@@ -676,7 +668,6 @@ A `POINT` structure specifying the absolute upper-left corner of the rectangle.
676668
```cpp
677669
CRect rect(0, 0, 100, 100);
678670
rect.MoveToXY(10, 10);
679-
680671
```cpp
681672
CRect rect(0, 0, 100, 100);
682673
rect.MoveToXY(10, 10);

‎docs/atl-mfc-shared/reference/cstringt-class.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ The newly allocated string.
210210

211211
In MFC programs, a [CMemoryException Class](../../mfc/reference/cmemoryexception-class.md) is thrown if insufficient memory exists. In ATL programs, a [CAtlException](../../atl/reference/catlexception-class.md) is thrown. This function is normally used to return strings for Automation.
212212

213-
Commonly, if this string is passed to a COM function as an [in] parameter, then this requires the caller to free the string. This can be done by using [SysFreeString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysfreestring), as described in the Windows SDK. For more information, see [Allocating and Releasing Memory for a BSTR](../../atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md).
213+
Commonly, if this string is passed to a COM function as an [in] parameter, then this requires the caller to free the string. This can be done by using [SysFreeString](/windows/desktop/api/oleauto/nf-oleauto-sysfreestring), as described in the Windows SDK. For more information, see [Allocating and Releasing Memory for a BSTR](../../atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md).
214214

215-
For more information about OLE allocation functions in Windows, see [SysAllocString](/previous-versions/windows/desktop/api/oleauto/nf-oleauto-sysallocstring) in the Windows SDK.
215+
For more information about OLE allocation functions in Windows, see [SysAllocString](/windows/desktop/api/oleauto/nf-oleauto-sysallocstring) in the Windows SDK.
216216

217217
### Example
218218

‎docs/atl/collection-classes.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ The following classes provide support for arrays, lists, maps, and also traits m
2525

2626
- [CComQIPtrElementTraits](../atl/reference/ccomqiptrelementtraits-class.md) This class provides methods, static functions, and typedefs useful when creating collections of COM interface pointers.
2727

28-
- [CComSafeArray](../atl/reference/ccomsafearray-class.md) This class is a wrapper for the [SAFEARRAY Data Type](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagsafearray) structure.
28+
- [CComSafeArray](../atl/reference/ccomsafearray-class.md) This class is a wrapper for the [SAFEARRAY Data Type](/windows/desktop/api/oaidl/ns-oaidl-tagsafearray) structure.
2929

30-
- [CComSafeArrayBound](../atl/reference/ccomsafearraybound-class.md) This class is a wrapper for a [SAFEARRAYBOUND](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagsafearraybound) structure.
30+
- [CComSafeArrayBound](../atl/reference/ccomsafearraybound-class.md) This class is a wrapper for a [SAFEARRAYBOUND](/windows/desktop/api/oaidl/ns-oaidl-tagsafearraybound) structure.
3131

3232
- [CComUnkArray](../atl/reference/ccomunkarray-class.md) This class stores **IUnknown** pointers and is designed to be used as a parameter to the [IConnectionPointImpl](../atl/reference/iconnectionpointimpl-class.md) template class.
3333

‎docs/atl/error-information-classes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.assetid: ba40c8fb-81fd-4f61-8f47-fa2cb540e274
1010

1111
The following class indicates how error information is handled:
1212

13-
- [ISupportErrorInfoImpl](../atl/reference/isupporterrorinfoimpl-class.md) Determines whether the object supports the [IErrorInfo](/previous-versions/windows/desktop/api/oaidl/nn-oaidl-ierrorinfo) interface. `IErrorInfo` allows error information to be propagated back to the client.
13+
- [ISupportErrorInfoImpl](../atl/reference/isupporterrorinfoimpl-class.md) Determines whether the object supports the [IErrorInfo](/windows/desktop/api/oaidl/nn-oaidl-ierrorinfo) interface. `IErrorInfo` allows error information to be propagated back to the client.
1414

1515
## See Also
1616

‎docs/atl/reference/atl-ole-db-consumer-wizard.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ This wizard sets up an OLE DB consumer class with the data bindings necessary to
7474

7575
**Other:** In **Connect timeout**, specify the number of seconds of idle time allowed before a timeout occurs. In **Access permissions**, specify the access permissions on the data connection.
7676

77-
For more information about advanced initialization properties, refer to the documentation provided with each specific OLE DB provider.
77+
For more information about advanced initialization properties, refer to the documentation provided with each specific OLE DB provider.
7878

7979
- **All** tab
8080

8181
This tab displays a summary of the initialization properties for the data source and connection you have specified. You can edit these values.
8282

83-
Click **OK** to finish. The **Select Database Object** dialog box appears. From this dialog box, select the table, view, or stored procedure that the consumer will use.
83+
Click **OK** to finish. The **Select Database Object** dialog box appears. From this dialog box, select the table, view, or stored procedure that the consumer will use.
8484

8585
- **Class**
8686

‎docs/atl/reference/ccomsafearray-class.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The type of data to be stored in the array.
7070

7171
## Remarks
7272

73-
`CComSafeArray` provides a wrapper for the [SAFEARRAY Data Type](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagsafearray) class, making it a simple matter to create and manage single- and multidimensional arrays of almost any of the VARIANT-supported types.
73+
`CComSafeArray` provides a wrapper for the [SAFEARRAY Data Type](/windows/desktop/api/oaidl/ns-oaidl-tagsafearray) class, making it a simple matter to create and manage single- and multidimensional arrays of almost any of the VARIANT-supported types.
7474

7575
`CComSafeArray` simplifies passing arrays between processes, and in addition provides extra security by checking array index values against upper and lower bounds.
7676

@@ -632,7 +632,7 @@ The *bCopy* flag is taken into account when elements of type BSTR or VARIANT are
632632

633633
## See Also
634634

635-
[SAFEARRAY Data Type](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagsafearray)<br/>
635+
[SAFEARRAY Data Type](/windows/desktop/api/oaidl/ns-oaidl-tagsafearray)<br/>
636636
[CComSafeArray::Create](#create)<br/>
637637
[CComSafeArray::Destroy](#destroy)<br/>
638638
[Class Overview](../../atl/atl-class-overview.md)

‎docs/atl/reference/ccomsafearraybound-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.assetid: dd6299db-5f84-4630-bbf0-f5add5318437
77
---
88
# CComSafeArrayBound Class
99

10-
This class is a wrapper for a [SAFEARRAYBOUND](/previous-versions/windows/desktop/api/oaidl/ns-oaidl-tagsafearraybound) structure.
10+
This class is a wrapper for a [SAFEARRAYBOUND](/windows/desktop/api/oaidl/ns-oaidl-tagsafearraybound) structure.
1111

1212
## Syntax
1313

0 commit comments

Comments
 (0)