diff --git a/reactos/include/psdk/dsound.h b/reactos/include/psdk/dsound.h index 83672f8c0cb..c04db2ab819 100644 --- a/reactos/include/psdk/dsound.h +++ b/reactos/include/psdk/dsound.h @@ -55,10 +55,17 @@ typedef struct _D3DVECTOR { float x; float y; float z; -} D3DVECTOR, *LPD3DVECTOR; +} D3DVECTOR; #define D3DVECTOR_DEFINED #endif +#ifndef LPD3DVECTOR_DEFINED +typedef D3DVECTOR *LPD3DVECTOR; +#define LPD3DVECTOR_DEFINED +#endif + + + #define DX_SHARED_DEFINES #endif /* DX_SHARED_DEFINES */ diff --git a/reactos/include/psdk/mscat.h b/reactos/include/psdk/mscat.h index f7a739a07cb..1fa5638ff56 100644 --- a/reactos/include/psdk/mscat.h +++ b/reactos/include/psdk/mscat.h @@ -29,6 +29,12 @@ extern "C" { #endif +#define CRYPTCAT_OPEN_CREATENEW 1 +#define CRYPTCAT_OPEN_ALWAYS 2 +#define CRYPTCAT_OPEN_EXISTING 4 + + + #include typedef struct CRYPTCATMEMBER_ { @@ -45,16 +51,39 @@ typedef struct CRYPTCATMEMBER_ { CRYPT_ATTR_BLOB sEncodedMemberInfo; } CRYPTCATMEMBER; +typedef struct CRYPTCATATTRIBUTE_ +{ + DWORD cbStruct; + LPWSTR pwszReferenceTag; + DWORD dwAttrTypeAndAction; + DWORD cbValue; + BYTE *pbValue; + DWORD dwReserved; +}CRYPTCATATTRIBUTE; + +typedef struct CATALOG_INFO_ +{ + DWORD cbStruct; + WCHAR wszCatalogFile[MAX_PATH]; +} CATALOG_INFO; + + #include - BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); +BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); +BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD); BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); +BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD); BOOL WINAPI CryptCATClose(HANDLE); +BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO,CATALOG_INFO*,DWORD); + CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +CRYPTCATATTRIBUTE* WINAPI CryptCATEnumerateAttr(HANDLE hCatalog, CRYPTCATMEMBER*,CRYPTCATATTRIBUTE*); +CRYPTCATATTRIBUTE* WINAPI CryptCATEnumerateCatAttr(HANDLE,CRYPTCATATTRIBUTE*); #ifdef __cplusplus }