| userenv.h (6.3.9600.17415-Windows 8.1) | | userenv.h (10.0.10586.0-Windows 10 1511 10586.494) |
|---|
| | |
| skipping to change at line 16 | | skipping to change at line 16 |
|---|
| // Copyright (c) Microsoft Corporation 1995-2002 | | // Copyright (c) Microsoft Corporation 1995-2002 |
| // All rights reserved | | // All rights reserved |
| // | | // |
| //============================================================================= | | //============================================================================= |
| | |
| #ifndef _INC_USERENV | | #ifndef _INC_USERENV |
| #define _INC_USERENV | | #define _INC_USERENV |
| | |
| #include <winapifamily.h> | | #include <winapifamily.h> |
| | |
|
| #pragma region Desktop Family | | #pragma region Desktop Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) |
| | |
| #include <wbemcli.h> | | #include <wbemcli.h> |
| | |
| // | | // |
| // Define API decoration for direct importing of DLL references. | | // Define API decoration for direct importing of DLL references. |
| // | | // |
| | |
| #if !defined(_USERENV_) | | #if !defined(_USERENV_) |
| #define USERENVAPI DECLSPEC_IMPORT | | #define USERENVAPI DECLSPEC_IMPORT |
| #else | | #else |
| | |
| skipping to change at line 1510 | | skipping to change at line 1510 |
|---|
| | |
| USERENVAPI | | USERENVAPI |
| HRESULT | | HRESULT |
| WINAPI | | WINAPI |
| DeriveAppContainerSidFromAppContainerName( | | DeriveAppContainerSidFromAppContainerName( |
| _In_ PCWSTR pszAppContainerName, | | _In_ PCWSTR pszAppContainerName, |
| _Outptr_ PSID *ppsidAppContainerSid); | | _Outptr_ PSID *ppsidAppContainerSid); |
| | |
| #endif /* WINVER >= 0x0602 */ | | #endif /* WINVER >= 0x0602 */ |
| | |
|
| | //============================================================================= |
| | // |
| | // DeriveRestrictedAppContainerSidFromAppContainerSidAndRestrictedName() |
| | // |
| | // Derives the SID of an AppContainer from its name. |
| | // |
| | // psidAppContainerSid - The SID of the AppContainer. |
| | // pszRestrictedAppContainerName - The name of the Restricted AppContainer. |
| | // ppsidRestrictedAppContainerSid - Derived SID. Must be freed using FreeSid. |
| | // |
| | // Return: S_OK : Successfully created the profile |
| | // E_INVALIDARG : NULL or invalid name was provided. |
| | // Others : Standard HRESULT error codes. |
| | // |
| | // Comments: |
| | //============================================================================= |
| | |
| | #if(WINVER >= 0x0603) |
| | |
| | USERENVAPI |
| | HRESULT |
| | WINAPI |
| | DeriveRestrictedAppContainerSidFromAppContainerSidAndRestrictedName( |
| | _In_ PSID psidAppContainerSid, |
| | _In_ PCWSTR pszRestrictedAppContainerName, |
| | _Outptr_ PSID *ppsidRestrictedAppContainerSid |
| | ); |
| | |
| | #endif /* WINVER >= 0x0603 */ |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY
STEM) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif // _INC_USERENV | | #endif // _INC_USERENV |
| | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 33 lines changed or added |
|---|
|