Author: akhaldi Date: Mon Dec 10 14:54:25 2012 New Revision: 57863
URL: http://svn.reactos.org/svn/reactos?rev=57863&view=rev Log: [PSDK] * Update some headers.
Modified: trunk/reactos/include/psdk/wincred.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winsvc.h trunk/reactos/include/reactos/idl/svcctl.idl
Modified: trunk/reactos/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincred.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/wincred.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincred.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -23,6 +23,12 @@ extern "C" { #endif
+#ifdef _ADVAPI32_ +#define WINADVAPI +#else +#define WINADVAPI DECLSPEC_IMPORT +#endif + #ifndef __SECHANDLE_DEFINED__ #define __SECHANDLE_DEFINED__ typedef struct _SecHandle @@ -32,8 +38,11 @@ } SecHandle, *PSecHandle; #endif
+#ifndef __WINE_CTXTHANDLE_DEFINED__ +#define __WINE_CTXTHANDLE_DEFINED__ typedef SecHandle CtxtHandle; typedef PSecHandle PCtxtHandle; +#endif
typedef struct _CREDENTIAL_ATTRIBUTEA { @@ -89,30 +98,8 @@ DECL_WINELIB_TYPE_AW(CREDENTIAL) DECL_WINELIB_TYPE_AW(PCREDENTIAL)
-typedef struct _CREDUI_INFOA -{ - DWORD cbSize; - HWND hwndParent; - PCSTR pszMessageText; - PCSTR pszCaptionText; - HBITMAP hbmBanner; -} CREDUI_INFOA, *PCREDUI_INFOA; - -typedef struct _CREDUI_INFOW -{ - DWORD cbSize; - HWND hwndParent; - PCWSTR pszMessageText; - PCWSTR pszCaptionText; - HBITMAP hbmBanner; -} CREDUI_INFOW, *PCREDUI_INFOW; - -typedef enum _CRED_MARSHAL_TYPE { - CertCredential = 1, - UsernameTargetCredential -} CRED_MARSHAL_TYPE, *PCRED_MARSHAL_TYPE; - -typedef struct _CREDENTIAL_TARGET_INFORMATIONA { +typedef struct _CREDENTIAL_TARGET_INFORMATIONA +{ LPSTR TargetName; LPSTR NetbiosServerName; LPSTR DnsServerName; @@ -120,12 +107,13 @@ LPSTR DnsDomainName; LPSTR DnsTreeName; LPSTR PackageName; - ULONG Flags; + DWORD Flags; DWORD CredTypeCount; LPDWORD CredTypes; } CREDENTIAL_TARGET_INFORMATIONA, *PCREDENTIAL_TARGET_INFORMATIONA;
-typedef struct _CREDENTIAL_TARGET_INFORMATIONW { +typedef struct _CREDENTIAL_TARGET_INFORMATIONW +{ LPWSTR TargetName; LPWSTR NetbiosServerName; LPWSTR DnsServerName; @@ -133,21 +121,60 @@ LPWSTR DnsDomainName; LPWSTR DnsTreeName; LPWSTR PackageName; - ULONG Flags; + DWORD Flags; DWORD CredTypeCount; LPDWORD CredTypes; } CREDENTIAL_TARGET_INFORMATIONW, *PCREDENTIAL_TARGET_INFORMATIONW;
-#ifdef UNICODE -typedef CREDENTIAL_TARGET_INFORMATIONW CREDENTIAL_TARGET_INFORMATION; -typedef PCREDENTIAL_TARGET_INFORMATIONW PCREDENTIAL_TARGET_INFORMATION; -#else -typedef CREDENTIAL_TARGET_INFORMATIONA CREDENTIAL_TARGET_INFORMATION; -typedef PCREDENTIAL_TARGET_INFORMATIONA PCREDENTIAL_TARGET_INFORMATION; -#endif /* UNICODE */ +DECL_WINELIB_TYPE_AW(CREDENTIAL_TARGET_INFORMATION) +DECL_WINELIB_TYPE_AW(PCREDENTIAL_TARGET_INFORMATION) + +typedef struct _CREDUI_INFOA +{ + DWORD cbSize; + HWND hwndParent; + PCSTR pszMessageText; + PCSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOA, *PCREDUI_INFOA; + +typedef struct _CREDUI_INFOW +{ + DWORD cbSize; + HWND hwndParent; + PCWSTR pszMessageText; + PCWSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOW, *PCREDUI_INFOW;
DECL_WINELIB_TYPE_AW(CREDUI_INFO) DECL_WINELIB_TYPE_AW(PCREDUI_INFO) + +typedef enum _CRED_MARSHAL_TYPE +{ + CertCredential = 1, + UsernameTargetCredential, + BinaryBlobCredential +} CRED_MARSHAL_TYPE, *PCRED_MARSHAL_TYPE; + +#define CERT_HASH_LENGTH 20 + +typedef struct _CERT_CREDENTIAL_INFO +{ + ULONG cbSize; + UCHAR rgbHashOfCert[CERT_HASH_LENGTH]; +} CERT_CREDENTIAL_INFO, *PCERT_CREDENTIAL_INFO; + +typedef struct _USERNAME_TARGET_CREDENTIAL_INFO +{ + LPWSTR UserName; +} USERNAME_TARGET_CREDENTIAL_INFO; + +typedef struct _BINARY_BLOB_CREDENTIAL_INFO +{ + ULONG cbBlob; + LPBYTE pbBlob; +} BINARY_BLOB_CREDENTIAL_INFO, *PBINARY_BLOB_CREDENTIAL_INFO;
#define CRED_MAX_STRING_LENGTH 256 #define CRED_MAX_USERNAME_LENGTH 513 @@ -177,13 +204,20 @@ #define CRED_TYPE_DOMAIN_PASSWORD 2 #define CRED_TYPE_DOMAIN_CERTIFICATE 3 #define CRED_TYPE_DOMAIN_VISIBLE_PASSWORD 4 -#define CRED_TYPE_MAXIMUM 5 +#define CRED_TYPE_GENERIC_CERTIFICATE 5 +#define CRED_TYPE_MAXIMUM 6 +#define CRED_TYPE_MAXIMUM_EX (CRED_TYPE_MAXIMUM+1000)
/* values for CREDENTIAL::Persist */ #define CRED_PERSIST_NONE 0 #define CRED_PERSIST_SESSION 1 #define CRED_PERSIST_LOCAL_MACHINE 2 #define CRED_PERSIST_ENTERPRISE 3 + +/* values for CREDENTIAL_TARGET_INFORMATION::Flags */ +#define CRED_TI_SERVER_FORMAT_UNKNOWN 1 +#define CRED_TI_DOMAIN_FORMAT_UNKNOWN 2 +#define CRED_TI_ONLY_PASSWORD_REQUIRED 4
#define CREDUI_FLAGS_INCORRECT_PASSWORD 0x00000001 #define CREDUI_FLAGS_DO_NOT_PERSIST 0x00000002 @@ -206,22 +240,35 @@ /* flags for CredWrite and CredWriteDomainCredentials */ #define CRED_PRESERVE_CREDENTIAL_BLOB 0x00000001
-BOOL WINAPI CredDeleteA(LPCSTR,DWORD,DWORD); -BOOL WINAPI CredDeleteW(LPCWSTR,DWORD,DWORD); -#define CredDelete WINELIB_NAME_AW(CredDelete) -BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); -BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); -#define CredEnumerate WINELIB_NAME_AW(CredEnumerate) -VOID WINAPI CredFree(PVOID); -BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); -BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); -#define CredRead WINELIB_NAME_AW(CredRead) -BOOL WINAPI CredRenameA(LPCSTR,LPCSTR,DWORD,DWORD); -BOOL WINAPI CredRenameW(LPCWSTR,LPCWSTR,DWORD,DWORD); -#define CredRename WINELIB_NAME_AW(CredRename) -BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); -BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); -#define CredWrite WINELIB_NAME_AW(CredWrite) +WINADVAPI BOOL WINAPI CredDeleteA(LPCSTR,DWORD,DWORD); +WINADVAPI BOOL WINAPI CredDeleteW(LPCWSTR,DWORD,DWORD); +#define CredDelete WINELIB_NAME_AW(CredDelete) +WINADVAPI BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); +WINADVAPI BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); +#define CredEnumerate WINELIB_NAME_AW(CredEnumerate) +WINADVAPI VOID WINAPI CredFree(PVOID); +WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD,LPDWORD); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialA(LPCSTR); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR); +#define CredIsMarshaledCredential WINELIB_NAME_AW(CredIsMarshaledCredential) +WINADVAPI BOOL WINAPI CredMarshalCredentialA(CRED_MARSHAL_TYPE,PVOID,LPSTR *); +WINADVAPI BOOL WINAPI CredMarshalCredentialW(CRED_MARSHAL_TYPE,PVOID,LPWSTR *); +#define CredMarshalCredential WINELIB_NAME_AW(CredMarshalCredential) +WINADVAPI BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); +WINADVAPI BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); +#define CredRead WINELIB_NAME_AW(CredRead) +WINADVAPI BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA,DWORD,DWORD *,PCREDENTIALA **); +WINADVAPI BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW,DWORD,DWORD *,PCREDENTIALW **); +#define CredReadDomainCredentials WINELIB_NAME_AW(CredReadDomainCredentials) +WINADVAPI BOOL WINAPI CredRenameA(LPCSTR,LPCSTR,DWORD,DWORD); +WINADVAPI BOOL WINAPI CredRenameW(LPCWSTR,LPCWSTR,DWORD,DWORD); +#define CredRename WINELIB_NAME_AW(CredRename) +WINADVAPI BOOL WINAPI CredUnmarshalCredentialA(LPCSTR,PCRED_MARSHAL_TYPE,PVOID *); +WINADVAPI BOOL WINAPI CredUnmarshalCredentialW(LPCWSTR,PCRED_MARSHAL_TYPE,PVOID *); +#define CredUnmarshalCredential WINELIB_NAME_AW(CredUnmarshalCredential) +WINADVAPI BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); +WINADVAPI BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); +#define CredWrite WINELIB_NAME_AW(CredWrite)
DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); @@ -240,23 +287,6 @@ DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); /* Note: no CredUIReadSSOCredA in PSDK header */
-BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, DWORD Flags, DWORD *Count, PCREDENTIALW **Credential); -BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, DWORD Flags, DWORD *Count, PCREDENTIALA **Credential); -BOOL WINAPI CredWriteDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, PCREDENTIALW Credential, DWORD Flags); -BOOL WINAPI CredWriteDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, PCREDENTIALA Credential, DWORD Flags); -BOOL WINAPI CredUnmarshalCredentialW(LPCWSTR MarshaledCredential, PCRED_MARSHAL_TYPE CredType, PVOID *Credential); -BOOL WINAPI CredUnmarshalCredentialA(LPCSTR MarshaledCredential, PCRED_MARSHAL_TYPE CredType, PVOID *Credential); - -#ifdef UNICODE -#define CredReadDomainCredentials CredReadDomainCredentialsW -#define CredWriteDomainCredentials CredWriteDomainCredentialsW -#define CredUnmarshalCredential CredUnmarshalCredentialW -#else -#define CredReadDomainCredentials CredReadDomainCredentialsA -#define CredWriteDomainCredentials CredWriteDomainCredentialsA -#define CredUnmarshalCredential CredUnmarshalCredentialA -#endif /* UNICODE */ - #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=57... ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -931,13 +931,17 @@ #define SE_MANAGE_VOLUME_NAME TEXT("SeManageVolumePrivilege") #define SE_IMPERSONATE_NAME TEXT("SeImpersonatePrivilege") #define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") -#define SE_GROUP_MANDATORY 1 -#define SE_GROUP_ENABLED_BY_DEFAULT 2 -#define SE_GROUP_ENABLED 4 -#define SE_GROUP_OWNER 8 -#define SE_GROUP_USE_FOR_DENY_ONLY 16 -#define SE_GROUP_LOGON_ID 3221225472U -#define SE_GROUP_RESOURCE 536870912 + +#define SE_GROUP_MANDATORY 0x00000001 +#define SE_GROUP_ENABLED_BY_DEFAULT 0x00000002 +#define SE_GROUP_ENABLED 0x00000004 +#define SE_GROUP_OWNER 0x00000008 +#define SE_GROUP_USE_FOR_DENY_ONLY 0x00000010 +#define SE_GROUP_INTEGRITY 0x00000020 +#define SE_GROUP_INTEGRITY_ENABLED 0x00000040 +#define SE_GROUP_LOGON_ID 0xC0000000 +#define SE_GROUP_RESOURCE 0x20000000 +#define SE_GROUP_VALID_ATTRIBUTES 0xE000007F
/* * Product types @@ -3481,6 +3485,10 @@ TokenElevationTypeLimited, } TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE;
+typedef struct _TOKEN_MANDATORY_LABEL { + SID_AND_ATTRIBUTES Label; +} TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; + #include <pshpack4.h> typedef struct _TOKEN_STATISTICS { LUID TokenId;
Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=5... ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -61,8 +61,24 @@ #define SERVICE_USER_DEFINED_CONTROL 256 #define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVICE_QUERY_CONFIG|SERVICE_CHANGE_CONFIG|SERVICE_QUERY_STATUS|SERVICE_ENUMERATE_DEPENDENTS|SERVICE_START|SERVICE_STOP|SERVICE_PAUSE_CONTINUE|SERVICE_INTERROGATE|SERVICE_USER_DEFINED_CONTROL) #define SERVICE_RUNS_IN_SYSTEM_PROCESS 1 -#define SERVICE_CONFIG_DESCRIPTION 1 -#define SERVICE_CONFIG_FAILURE_ACTIONS 2 + +#define SERVICE_CONFIG_DESCRIPTION 1 +#define SERVICE_CONFIG_FAILURE_ACTIONS 2 +#define SERVICE_CONFIG_DELAYED_AUTO_START_INFO 3 +#define SERVICE_CONFIG_FAILURE_ACTIONS_FLAG 4 +#define SERVICE_CONFIG_SERVICE_SID_INFO 5 +#define SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO 6 +#define SERVICE_CONFIG_PRESHUTDOWN_INFO 7 +#define SERVICE_CONFIG_TRIGGER_INFO 8 +#define SERVICE_CONFIG_PREFERRED_NODE 9 +#define SERVICE_CONFIG_RUNLEVEL_INFO 10 + +#ifndef _SERVICE_PRESHUTDOWN_INFO_DEFINED_ +#define _SERVICE_PRESHUTDOWN_INFO_DEFINED_ +typedef struct _SERVICE_PRESHUTDOWN_INFO { + DWORD dwPreshutdownTimeout; +} SERVICE_PRESHUTDOWN_INFO, *LPSERVICE_PRESHUTDOWN_INFO; +#endif
typedef struct _SERVICE_STATUS { DWORD dwServiceType;
Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl.... ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -174,9 +174,12 @@ [size_is(cbRequiredPrivileges)] PBYTE pRequiredPrivileges; } SERVICE_RPC_REQUIRED_PRIVILEGES_INFO, *LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO;
+cpp_quote("#ifndef _SERVICE_PRESHUTDOWN_INFO_DEFINED_") +cpp_quote("#define _SERVICE_PRESHUTDOWN_INFO_DEFINED_") typedef struct _SERVICE_PRESHUTDOWN_INFO { DWORD dwPreshutdownTimeout; } SERVICE_PRESHUTDOWN_INFO, *LPSERVICE_PRESHUTDOWN_INFO; +cpp_quote("#endif")
typedef struct _SC_RPC_CONFIG_INFOA { DWORD dwInfoLevel;