Skip to content

Commit a5916b4

Browse files
authored
Merge pull request #591 from MicrosoftDocs/master
2/7 Publish
2 parents 30ab99c + 9ba8579 commit a5916b4

File tree

49 files changed

+59
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+59
-160
lines changed

docs/atl-mfc-shared/reference/cimage-class.md

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CImage Class | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "02/01/2018"
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology: ["cpp-windows"]
@@ -65,7 +65,7 @@ class CImage
6565
|[CImage::IsDIBSection](#isdibsection)|Determines if the attached bitmap is a DIB section.|
6666
|[CImage::IsIndexed](#isindexed)|Indicates that a bitmap's colors are mapped to an indexed palette.|
6767
|[CImage::IsNull](#isnull)|Indicates if a source bitmap is currently loaded.|
68-
|[CImage::IsTransparencySupported](#istransparencysupported)|Indicates whether the application supports transparent bitmaps and was compiled for Windows 2000 or later.|
68+
|[CImage::IsTransparencySupported](#istransparencysupported)|Indicates whether the application supports transparent bitmaps.|
6969
|[CImage::Load](#load)|Loads an image from the specified file.|
7070
|[CImage::LoadFromResource](#loadfromresource)|Loads an image from the specified resource.|
7171
|[CImage::MaskBlt](#maskblt)|Combines the color data for the source and destination bitmaps using the specified mask and raster operation.|
@@ -144,17 +144,6 @@ void CMyDlg::OnRButtonDown(UINT nFlags, CPoint point)
144144

145145
Through `CImage`, you have access to the actual bits of a DIB section. You can use a `CImage` object anywhere you previously used a Win32 HBITMAP or DIB section.
146146

147-
> [!NOTE]
148-
> The following `CImage` methods have limitations on their use:
149-
150-
|Method|Limitation|
151-
|------------|----------------|
152-
|[PlgBlt](#plgblt)|Works with only Windows NT 4.0 or later. Will not work on applications running on Windows 95/98 or later.|
153-
|[MaskBlt](#maskblt)|Works with only Windows NT 4.0 or later. Will not work on applications running on Windows 95/98 or later.|
154-
|[AlphaBlend](#alphablend)|Works with only Windows 2000, Windows 98, and later systems.|
155-
|[TransparentBlt](#transparentblt)|Works with only Windows 2000, Windows 98, and later systems.|
156-
|[Draw](#draw)|Supports transparency with only Windows 2000, Windows 98, and later systems.|
157-
158147
You can use `CImage` from either MFC or ATL.
159148

160149
> [!NOTE]
@@ -923,7 +912,7 @@ bool IsNull() const throw();
923912
This method returns **True** if a bitmap is not currently loaded; otherwise **False**.
924913
925914
## <a name="istransparencysupported"></a> CImage::IsTransparencySupported
926-
Indicates whether the application supports transparent bitmaps and was compiled for Windows 2000 or later.
915+
Indicates whether the application supports transparent bitmaps.
927916
928917
```
929918
static BOOL IsTransparencySupported() throw();
@@ -935,8 +924,6 @@ static BOOL IsTransparencySupported() throw();
935924
### Remarks
936925
If the return value is nonzero, and transparency is supported, a call to [AlphaBlend](#alphablend), [TransparentBlt](#transparentblt), or [Draw](#draw) will handle transparent colors.
937926
938-
If the application is compiled for use with operating systems before Windows 2000 or Windows 98, this method will always return 0, even on newer operating systems.
939-
940927
941928
## <a name="load"></a> CImage::Load
942929
Loads an image.

docs/atl/reference/caccesstoken-class.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class CAccessToken
8888
|[CAccessToken::SetPrimaryGroup](#setprimarygroup)|Call this method to set the primary group of the `CAccessToken` object.|
8989

9090
## Remarks
91-
An [access token](http://msdn.microsoft.com/library/windows/desktop/aa374909) is an object that describes the security context of a process or thread and is allocated to each user logged onto a Windows NT or Windows 2000 system.
91+
An [access token](http://msdn.microsoft.com/library/windows/desktop/aa374909) is an object that describes the security context of a process or thread and is allocated to each user logged onto a Windows system.
9292

9393
For an introduction to the access control model in Windows, see [Access Control](http://msdn.microsoft.com/library/windows/desktop/aa374860) in the Windows SDK.
9494

@@ -280,9 +280,6 @@ bool CreateRestrictedToken(
280280
### Remarks
281281
`CreateRestrictedToken` uses the [CreateRestrictedToken](http://msdn.microsoft.com/library/windows/desktop/aa446583) Win32 function to create a new `CAccessToken` object, with restrictions.
282282

283-
> [!NOTE]
284-
> This method is only available on Windows 2000 or later.
285-
286283
> [!IMPORTANT]
287284
> When using `CreateRestrictedToken`, ensure the following: the existing token is valid (and not entered by the user) and `SidsToDisable` and `PrivilegesToDelete` are both valid (and not entered by the user). If the method returns false, deny functionality.
288285

docs/atl/reference/cdacl-class.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ bool AddAllowedAce(
110110
### Remarks
111111
A `CDacl` object contains zero or more ACEs (access-control entries) that identify the users and groups who can access the object. This method adds an ACE that allows access to the `CDacl` object.
112112

113-
> [!NOTE]
114-
> The second form of `AddAllowedAce` is only available on Windows 2000 and later.
115-
116113
See [ACE_HEADER](http://msdn.microsoft.com/library/windows/desktop/aa374919) for a description of the various flags which can be set in the `AceFlags` parameter.
117114

118115
## <a name="adddeniedace"></a> CDacl::AddDeniedAce
@@ -154,9 +151,6 @@ bool AddDeniedAce(
154151
### Remarks
155152
A `CDacl` object contains zero or more ACEs (access-control entries) that identify the users and groups who can access the object. This method adds an ACE that denies access to the `CDacl` object.
156153

157-
> [!NOTE]
158-
> The second form of `AddDeniedAce` is only available on Windows 2000 and later.
159-
160154
See [ACE_HEADER](http://msdn.microsoft.com/library/windows/desktop/aa374919) for a description of the various flags which can be set in the `AceFlags` parameter.
161155

162156
## <a name="cdacl"></a> CDacl::CDacl

docs/atl/reference/cprivateobjectsecuritydesc-class.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ bool Create(
165165
### Remarks
166166
This method calls [CreatePrivateObjectSercurity](http://msdn.microsoft.com/library/windows/desktop/aa376405) or [CreatePrivateObjectSecurityEx](http://msdn.microsoft.com/library/windows/desktop/aa446581).
167167

168-
The second method, which permits specifying the object type GUID of the new object or controlling how ACEs are inherited, is only available on systems running Windows 2000 and later.
168+
The second method permits specifying the object type GUID of the new object or controlling how ACEs are inherited.
169169

170170
> [!NOTE]
171171
> A self-relative security descriptor is a security descriptor that stores all of its security information in a contiguous block of memory.
@@ -244,7 +244,7 @@ bool Set(
244244
Returns true on success, false on failure.
245245

246246
### Remarks
247-
The second method, which permits specifying the object type GUID of the object or controlling how ACEs are inherited, is only available on systems running Windows 2000 and later.
247+
The second method permits specifying the object type GUID of the object or controlling how ACEs are inherited.
248248

249249
## See Also
250250
[SECURITY_DESCRIPTOR](http://msdn.microsoft.com/library/windows/desktop/aa379561)

docs/atl/reference/csacl-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ bool AddAuditAce(
117117
Returns **true** if the ACE is added to the `CSacl` object, **false** on failure.
118118

119119
### Remarks
120-
A `CSacl` object contains access-control entries (ACEs) that specify the types of access attempts that generate audit records in the security event log. This method adds such an ACE to the `CSacl` object. The second form of `AddAuditAce` is only available on Windows 2000 and later.
120+
A `CSacl` object contains access-control entries (ACEs) that specify the types of access attempts that generate audit records in the security event log. This method adds such an ACE to the `CSacl` object.
121121

122122
See [ACE_HEADER](http://msdn.microsoft.com/library/windows/desktop/aa374919) for a description of the various flags which can be set in the `AceFlags` parameter.
123123

docs/atl/reference/csecuritydesc-class.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ bool FromString(LPCTSTR pstr) throw(...);
129129
### Remarks
130130
The string can be created by using [CSecurityDesc::ToString](#tostring). Converting the security descriptor into a string makes it easier to store and transmit.
131131

132-
This method is only available with Windows 2000 and later because it calls [ConvertStringSecurityDescriptorToSecurityDescriptor](http://msdn.microsoft.com/library/windows/desktop/aa376401).
132+
This method calls [ConvertStringSecurityDescriptorToSecurityDescriptor](http://msdn.microsoft.com/library/windows/desktop/aa376401).
133133

134134
## <a name="getcontrol"></a> CSecurityDesc::GetControl
135135
Retrieves control information from the security descriptor.
@@ -146,7 +146,7 @@ bool GetControl(SECURITY_DESCRIPTOR_CONTROL* psdc) const throw();
146146
Returns true if the method succeeds, false if it fails.
147147

148148
### Remarks
149-
This method is only meaningful when using Windows 2000 or later, as it calls [GetSecurityDescriptorControl](http://msdn.microsoft.com/library/windows/desktop/aa446647).
149+
This method calls [GetSecurityDescriptorControl](http://msdn.microsoft.com/library/windows/desktop/aa446647).
150150

151151
## <a name="getdacl"></a> CSecurityDesc::GetDacl
152152
Retrieves discretionary access-control list (DACL) information from the security descriptor.
@@ -302,7 +302,7 @@ bool IsDaclProtected() const throw();
302302
### Remarks
303303
To set this flag, use the [CSecurityDesc::SetDacl](#setdacl) method.
304304

305-
This method is only meaningful for Windows 2000 or later, as only Windows 2000 supports automatic propagation of inheritable ACEs.
305+
This method supports automatic propagation of inheritable ACEs.
306306

307307
## <a name="isgroupdefaulted"></a> CSecurityDesc::IsGroupDefaulted
308308
Determines if the security descriptor's group security identifier (SID) was set by default.
@@ -384,7 +384,7 @@ bool IsSaclProtected() const throw();
384384
### Remarks
385385
To set this flag, use the [CSecurityDesc::SetSacl](#setsacl) method.
386386

387-
This method is only meaningful for Windows 2000 or later, as only Windows 2000 supports automatic propagation of inheritable ACEs.
387+
This method supports automatic propagation of inheritable ACEs.
388388

389389
## <a name="isselfrelative"></a> CSecurityDesc::IsSelfRelative
390390
Determines if the security descriptor is in self-relative format.
@@ -464,7 +464,7 @@ bool SetControl(
464464
Returns true on success, false on failure.
465465

466466
### Remarks
467-
This method is available only on Windows 2000 and later, as it calls [SetSecurityDescriptorControl](http://msdn.microsoft.com/library/windows/desktop/aa379582\(v=vs.85\).aspx).
467+
This method calls [SetSecurityDescriptorControl](http://msdn.microsoft.com/library/windows/desktop/aa379582\(v=vs.85\).aspx).
468468

469469
## <a name="setdacl"></a> CSecurityDesc::SetDacl
470470
Sets information in a discretionary access-control list (DACL). If a DACL is already present in the security descriptor, it is replaced.
@@ -582,7 +582,7 @@ bool ToString(
582582

583583
If the DACL is NULL and the SE_DACL_PRESENT control bit is not set in the input security descriptor, the resulting security descriptor string does not have a D: component. See [Security Descriptor String Format](http://msdn.microsoft.com/library/windows/desktop/aa379570) for more details.
584584

585-
This method is only available with Windows 2000 and later, as it calls [ConvertStringSecurityDescriptorToSecurityDescriptor](http://msdn.microsoft.com/library/windows/desktop/aa376401).
585+
This method calls [ConvertStringSecurityDescriptorToSecurityDescriptor](http://msdn.microsoft.com/library/windows/desktop/aa376401).
586586

587587
## See Also
588588
[Security Sample](../../visual-cpp-samples.md)

docs/atl/reference/csid-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ LPCTSTR Sid() const throw(...);
466466
```
467467

468468
### Return Value
469-
Returns the `SID` structure as a string in a format suitable for display, storage, or transmission. Equivalent to [ConvertSidToStringSid](http://msdn.microsoft.com/library/windows/desktop/aa376399), although this function is only available on Windows 2000 or later and so is emulated for earlier operating systems.
469+
Returns the `SID` structure as a string in a format suitable for display, storage, or transmission. Equivalent to [ConvertSidToStringSid](http://msdn.microsoft.com/library/windows/desktop/aa376399).
470470

471471
## <a name="sidnameuse"></a> CSid::SidNameUse
472472
Returns a description of the state of the `CSid` object.

docs/atl/reference/ctokengroups-class.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class CTokenGroups
5959
|[CTokenGroups::operator =](#operator_eq)|Assignment operator.|
6060

6161
## Remarks
62-
An [access token](http://msdn.microsoft.com/library/windows/desktop/aa374909) is an object that describes the security context of a process or thread and is allocated to each user logged onto a Windows NT or Windows 2000 system.
62+
An [access token](http://msdn.microsoft.com/library/windows/desktop/aa374909) is an object that describes the security context of a process or thread and is allocated to each user logged onto a Windows system.
6363

6464
The **CTokenGroups** class is a wrapper for the [TOKEN_GROUPS](http://msdn.microsoft.com/library/windows/desktop/aa379624) structure, containing information about the group security identifiers (SIDs) in an access token.
6565

@@ -205,7 +205,7 @@ bool LookupSid(
205205
Returns true if the `CSid` is found, false otherwise.
206206

207207
### Remarks
208-
Setting `pdwAttributes` to NULL provides a way of confirming the existence of the `CSid` without accessing the attribute. Note that this method should not be used to check access rights as incorrect results may occur under Windows 2000. Applications should instead use the [CAccessToken::CheckTokenMembership](../../atl/reference/caccesstoken-class.md#checktokenmembership) method.
208+
Setting `pdwAttributes` to NULL provides a way of confirming the existence of the `CSid` without accessing the attribute. Note that this method should not be used to check access rights. Applications should instead use the [CAccessToken::CheckTokenMembership](../../atl/reference/caccesstoken-class.md#checktokenmembership) method.
209209

210210
## <a name="operator_eq"></a> CTokenGroups::operator =
211211
Assignment operator.

docs/atl/reference/ctokenprivileges-class.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class CTokenPrivileges
6161
|[CTokenPrivileges::operator =](#operator_eq)|Assignment operator.|
6262

6363
## Remarks
64-
An [access token](http://msdn.microsoft.com/library/windows/desktop/aa374909) is an object that describes the security context of a process or thread and is allocated to each user logged onto a Windows NT or Windows 2000 system.
64+
An [access token](http://msdn.microsoft.com/library/windows/desktop/aa374909) is an object that describes the security context of a process or thread and is allocated to each user logged onto a Windows system.
6565

6666
The access token is used to describe the various security privileges granted to each user. A privilege consists of a 64-bit number called a locally unique identifier ( [LUID](http://msdn.microsoft.com/library/windows/desktop/aa379261)) and a descriptor string.
6767

@@ -137,7 +137,7 @@ bool Delete(LPCTSTR pszPrivilege) throw();
137137
Returns true if the privilege was successfully deleted, false otherwise.
138138

139139
### Remarks
140-
This method is useful as a tool for creating restricted tokens under Windows 2000.
140+
This method is useful as a tool for creating restricted tokens.
141141

142142
## <a name="deleteall"></a> CTokenPrivileges::DeleteAll
143143
Deletes all privileges from the `CTokenPrivileges` access token object.

docs/atl/reference/options-atl-active-server-page-component-wizard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Use this page of the ATL Active Server Page Component Wizard to design for incre
3333
|**Apartment**|Specifies that the object uses apartment threading. Equivalent to single thread apartment. Each object of an apartment-threaded component is assigned an apartment for its thread, for the life of the object; however, multiple threads can be used for multiple objects. Each apartment is tied to a specific thread and has a Windows message pump (default).<br /><br /> See [Single-Threaded Apartments](http://msdn.microsoft.com/library/windows/desktop/ms680112) for more information.|
3434
|**Both**|Specifies that the object can use either apartment or free threading, depending from which kind of a thread it is created.|
3535
|**Free**|Specifies that the object uses free threading. Free threading is equivalent to a multithread apartment model. See [Multithreaded Apartments](http://msdn.microsoft.com/library/windows/desktop/ms693421) for more information.|
36-
|**Neutral** (Windows 2000 only)|Specifies that the object follows the guidelines for multithreaded apartments, but it can execute on any kind of thread.|
36+
|**Neutral**|Specifies that the object follows the guidelines for multithreaded apartments, but it can execute on any kind of thread.|
3737

3838
**Aggregation**
3939
Indicates whether the object uses [aggregation](http://msdn.microsoft.com/library/windows/desktop/ms686558). The aggregate object chooses which interfaces to expose to clients, and the interfaces are exposed as if the aggregate object implemented them. Clients of the aggregate object communicate only with the aggregate object.

docs/atl/reference/options-atl-simple-object-wizard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Use this page of the ATL Simple Object Wizard to design for increased efficiency
3333
|**Apartment**|Specifies that the object uses apartment threading. Equivalent to single thread apartment. Each object of an apartment-threaded component is assigned an apartment for its thread, for the life of the object; however, multiple threads can be used for multiple objects. Each apartment is tied to a specific thread and has a Windows message pump (default).<br /><br /> See [Single-Threaded Apartments](http://msdn.microsoft.com/library/windows/desktop/ms680112) for more information.|
3434
|**Both**|Specifies that the object can use either apartment or free threading, depending from which kind of a thread it is created.|
3535
|**Free**|Specifies that the object uses free threading. Free threading is equivalent to a multithread apartment model. See [Multithreaded Apartments](http://msdn.microsoft.com/library/windows/desktop/ms693421) for more information.|
36-
|**Neutral** (Windows 2000 only)|Specifies that the object follows the guidelines for multithreaded apartments, but it can execute on any kind of thread.|
36+
|**Neutral**|Specifies that the object follows the guidelines for multithreaded apartments, but it can execute on any kind of thread.|
3737

3838
**Aggregation**
3939
Indicates whether the object uses [aggregation](http://msdn.microsoft.com/library/windows/desktop/ms686558). The aggregate object chooses which interfaces to expose to clients, and the interfaces are exposed as if the aggregate object implemented them. Clients of the aggregate object communicate only with the aggregate object.

docs/atl/using-task-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ manager: "ghogen"
1717
ms.workload: ["cplusplus"]
1818
---
1919
# Using Task Manager
20-
One of the simplest ways to debug a service is through the use of the Task Manager in Windows NT 4.0 or Windows 2000. While the service is running, start the Task Manager and click the **Processes** tab. Right-click the name of the EXE and then click **Debug**. This launches Visual C++ attached to that running process. Now, click **Break** on the **Debug** menu to allow you to set breakpoints in your code. Click **Run** to run to your selected breakpoints.
20+
One of the simplest ways to debug a service is through the use of the Task Manager. While the service is running, start the Task Manager and click the **Processes** tab. Right-click the name of the EXE and then click **Debug**. This launches Visual C++ attached to that running process. Now, click **Break** on the **Debug** menu to allow you to set breakpoints in your code. Click **Run** to run to your selected breakpoints.
2121

2222
## See Also
2323
[Debugging Tips](../atl/debugging-tips.md)

docs/build/loadlibrary-and-afxloadlibrary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Processes call [LoadLibrary](http://go.microsoft.com/fwlink/p/?LinkID=259187) (o
2929
If Windows cannot load the DLL, the process can attempt to recover from the error. For example, the process could notify the user of the error and ask the user to specify another path to the DLL.
3030

3131
> [!IMPORTANT]
32-
> If the code is to run under Windows NT 4, Windows 2000, or Windows XP (prior to SP1), make sure to specify the full path of any DLLs. On these operating systems, the current directory is searched first when files are loaded. If you do not qualify the path of the file, a file that is not the intended one might be loaded.
32+
> Make sure to specify the full path of any DLLs. The current directory is searched first when files are loaded. If you do not qualify the path of the file, a file that is not the intended one might be loaded.
3333
3434
## What do you want to do?
3535

0 commit comments

Comments
 (0)