[janderwald] 33312: - define LPD3DVECTOR_DEFINED when d3d9 and dsound header is used - sync mscat.h from wine and add a few required definitions

Author: janderwald
Date: Tue May  6 02:18:38 2008
New Revision: 33312

URL: http://svn.reactos.org/svn/reactos?rev=33312&view=rev
Log:
- define LPD3DVECTOR_DEFINED when d3d9 and dsound header is used
- sync mscat.h from wine and add a few required definitions

Modified:
    trunk/reactos/include/psdk/dsound.h
    trunk/reactos/include/psdk/mscat.h

Modified: trunk/reactos/include/psdk/dsound.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsound.h?rev=3...
==============================================================================
--- trunk/reactos/include/psdk/dsound.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/dsound.h [iso-8859-1] Tue May  6 02:18:38 2008
@@ -55,9 +55,16 @@
     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 */

Modified: trunk/reactos/include/psdk/mscat.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mscat.h?rev=33...
==============================================================================
--- trunk/reactos/include/psdk/mscat.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/mscat.h [iso-8859-1] Tue May  6 02:18:38 2008
@@ -29,6 +29,12 @@
 #endif

+#define CRYPTCAT_OPEN_CREATENEW  1
+#define CRYPTCAT_OPEN_ALWAYS     2
+#define CRYPTCAT_OPEN_EXISTING   4
+
+
+
 #include <pshpack8.h>

typedef struct CRYPTCATMEMBER_ {
@@ -45,16 +51,39 @@
     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 <poppack.h>

-
 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
 }