Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 11:56:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- define LPD3DVECTOR_DEFINED when d3d9 and dsound header is used

Browse source 
- sync mscat.h from wine and add a few required definitions

svn path=/trunk/; revision=33312
This commit is contained in:
Johannes Anderwald 2008-05-06 07:18:38 +00:00
parent 78fb45b54a
commit 611459f151
2 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/include/psdk/dsound.h
View file

@ -55,10 +55,17 @@ typedef struct _D3DVECTOR {
float x; float x;
float y; float y;
float z; float z;
} D3DVECTOR, *LPD3DVECTOR; } D3DVECTOR;
#define D3DVECTOR_DEFINED #define D3DVECTOR_DEFINED
#endif #endif
#ifndef LPD3DVECTOR_DEFINED
typedef D3DVECTOR *LPD3DVECTOR;
#define LPD3DVECTOR_DEFINED
#endif
#define DX_SHARED_DEFINES #define DX_SHARED_DEFINES
#endif /* DX_SHARED_DEFINES */ #endif /* DX_SHARED_DEFINES */

31
reactos/include/psdk/mscat.h
View file

@ -29,6 +29,12 @@ extern "C" {
#endif #endif
#define CRYPTCAT_OPEN_CREATENEW 1
#define CRYPTCAT_OPEN_ALWAYS 2
#define CRYPTCAT_OPEN_EXISTING 4
#include <pshpack8.h> #include <pshpack8.h>
typedef struct CRYPTCATMEMBER_ { typedef struct CRYPTCATMEMBER_ {
@ -45,16 +51,39 @@ typedef struct CRYPTCATMEMBER_ {
CRYPT_ATTR_BLOB sEncodedMemberInfo; CRYPT_ATTR_BLOB sEncodedMemberInfo;
} CRYPTCATMEMBER; } 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 <poppack.h> #include <poppack.h>
BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD);
BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD);
BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD);
HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*);
BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD);
BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD);
BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD);
BOOL WINAPI CryptCATClose(HANDLE); BOOL WINAPI CryptCATClose(HANDLE);
BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO,CATALOG_INFO*,DWORD);
CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*); CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*);
HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD);
CRYPTCATATTRIBUTE* WINAPI CryptCATEnumerateAttr(HANDLE hCatalog, CRYPTCATMEMBER*,CRYPTCATATTRIBUTE*);
CRYPTCATATTRIBUTE* WINAPI CryptCATEnumerateCatAttr(HANDLE,CRYPTCATATTRIBUTE*);
#ifdef __cplusplus #ifdef __cplusplus
} }