[ros-diffs] [dchapyshev] 38703: - Sync headers with Wine
dchapyshev at svn.reactos.org
dchapyshev at svn.reactos.org
Sun Jan 11 19:55:30 CET 2009
Author: dchapyshev
Date: Sun Jan 11 12:55:29 2009
New Revision: 38703
URL: http://svn.reactos.org/svn/reactos?rev=38703&view=rev
Log:
- Sync headers with Wine
Modified:
trunk/reactos/include/psdk/clusapi.h
trunk/reactos/include/psdk/wincrypt.h
Modified: trunk/reactos/include/psdk/clusapi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/clusapi.h?rev=38703&r1=38702&r2=38703&view=diff
==============================================================================
--- trunk/reactos/include/psdk/clusapi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/clusapi.h [iso-8859-1] Sun Jan 11 12:55:29 2009
@@ -1,19 +1,40 @@
+/*
+ * Copyright 2006 James Hawkins
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
-#ifndef _CLUSAPI_H
-#define _CLUSAPI_H
+#ifndef __WINE_CLUSAPI_H
+#define __WINE_CLUSAPI_H
#ifdef __cplusplus
extern "C" {
#endif
-DWORD
-WINAPI
-GetNodeClusterState(
- IN LPCWSTR lpszNodeName,
- OUT DWORD *pdwClusterState
- );
+typedef struct _HCLUSTER *HCLUSTER;
+typedef struct _HCLUSENUM *HCLUSENUM;
+
+BOOL WINAPI CloseCluster(HCLUSTER hCluster);
+DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState);
+HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName);
+HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType);
+DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName);
+DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum);
#ifdef __cplusplus
}
#endif
-#endif // _CLUSAPI_H
+
+#endif /* __WINE_CLUSAPI_H */
Modified: trunk/reactos/include/psdk/wincrypt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?rev=38703&r1=38702&r2=38703&view=diff
==============================================================================
--- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Sun Jan 11 12:55:29 2009
@@ -290,10 +290,10 @@
#define CERT_NON_REPUDIATION_KEY_USAGE 0x40
#define CERT_KEY_ENCIPHERMENT_KEY_USAGE 0x20
#define CERT_DATA_ENCIPHERMENT_KEY_USAGE 0x10
-#define CERT_KEY_AGREEMENT_KEY_USAGE 0x80
-#define CERT_KEY_CERT_SIGN_KEY_USAGE 0x40
-#define CERT_OFFLINE_CRL_SIGN_KEY_USAGE 0x20
-#define CERT_CRL_SIGN_KEY_USAGE 0x10
+#define CERT_KEY_AGREEMENT_KEY_USAGE 0x08
+#define CERT_KEY_CERT_SIGN_KEY_USAGE 0x04
+#define CERT_OFFLINE_CRL_SIGN_KEY_USAGE 0x02
+#define CERT_CRL_SIGN_KEY_USAGE 0x02
#define CERT_ENCIPHER_ONLY_KEY_USAGE 0x01
/* byte 1 */
#define CERT_DECIPHER_ONLY_KEY_USAGE 0x80
@@ -860,10 +860,10 @@
#define CERT_TRUST_IS_OFFLINE_REVOCATION 0x01000000
#define CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY 0x02000000
-#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00001000
-#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00002000
-#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00004000
-#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00008000
+#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00010000
+#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00020000
+#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00040000
+#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00080000
#define CERT_TRUST_HAS_EXACT_MATCH_ISSUER 0x00000001
#define CERT_TRUST_HAS_KEY_MATCH_ISSUER 0x00000002
@@ -1082,7 +1082,7 @@
void *pvReserved, void *pvArg);
/* Encode/decode object */
-typedef LPVOID (WINAPI *PFN_CRYPT_ALLOC)(size_t cbsize);
+typedef LPVOID (__WINE_ALLOC_SIZE(1) WINAPI *PFN_CRYPT_ALLOC)(size_t cbsize);
typedef VOID (WINAPI *PFN_CRYPT_FREE)(LPVOID pv);
typedef struct _CRYPT_ENCODE_PARA {
@@ -3087,6 +3087,8 @@
#define szOID_NETSCAPE_CA_POLICY_URL "2.16.840.1.113730.1.8"
#define szOID_NETSCAPE_SSL_SERVER_NAME "2.16.840.1.113730.1.12"
#define szOID_NETSCAPE_COMMENT "2.16.840.1.113730.1.13"
+#define szOID_NETSCAPE_DATA_TYPE "2.16.840.1.113730.2"
+#define szOID_NETSCAPE_CERT_SEQUENCE "2.16.840.1.113730.2.5"
/* Bits for szOID_NETSCAPE_CERT_TYPE */
#define NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE 0x80
@@ -3797,7 +3799,7 @@
WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD);
WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD);
WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *);
-WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD);
+WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR);
WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD);
WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD);
WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);
@@ -3815,8 +3817,8 @@
#define CryptVerifySignature WINELIB_NAME_AW(CryptVerifySignature)
/* crypt32.dll functions */
-LPVOID WINAPI CryptMemAlloc(ULONG cbSize);
-LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize);
+LPVOID WINAPI CryptMemAlloc(ULONG cbSize) __WINE_ALLOC_SIZE(1);
+LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize) __WINE_ALLOC_SIZE(2);
VOID WINAPI CryptMemFree(LPVOID pv);
BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary,
@@ -3880,6 +3882,8 @@
BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags);
BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO pInfo);
+LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName);
+
LPCSTR WINAPI CertAlgIdToOID(DWORD dwAlgId);
DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId);
@@ -4046,7 +4050,7 @@
DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType,
PCERT_PUBLIC_KEY_INFO pPublicKey);
-const void *CertCreateContext(DWORD dwContextType, DWORD dwEncodingType,
+const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType,
const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
PCERT_CREATE_CONTEXT_PARA pCreatePara);
More information about the Ros-diffs
mailing list