15 Jan
2006
15 Jan
'06
9:59 p.m.
wintrust vendor import
Modified: trunk/reactos/baseaddress.xml
Modified: trunk/reactos/bootdata/packages/reactos.dff
Modified: trunk/reactos/lib/directory.xml
Added: trunk/reactos/lib/wintrust/
Added: trunk/reactos/lib/wintrust/wintrust.xml
Modified: trunk/reactos/media/doc/README.WINE
Added: trunk/reactos/w32api/include/mscat.h
Modified: trunk/reactos/w32api/include/wincrypt.h
Added: trunk/reactos/w32api/include/wintrust.h
_____
Modified: trunk/reactos/baseaddress.xml
--- trunk/reactos/baseaddress.xml 2006-01-15 21:54:47 UTC (rev
20904)
+++ trunk/reactos/baseaddress.xml 2006-01-15 21:58:59 UTC (rev
20905)
@@ -85,6 +85,7 @@
<property name="BASEADDRESS_SHFOLDER" value="0x76780000" />
<property name="BASEADDRESS_NTMARTA" value="0x768A0000" />
<property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />
+<property name="BASEADDRESS_WINTRUST" value="0x76c30000" />
<property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" />
<property name="BASEADDRESS_FMIFS" value="0x76df0000" />
<property name="BASEADDRESS_SHELL32" value="0x77260000" />
_____
Modified: trunk/reactos/bootdata/packages/reactos.dff
--- trunk/reactos/bootdata/packages/reactos.dff 2006-01-15 21:54:47 UTC
(rev 20904)
+++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-15 21:58:59 UTC
(rev 20905)
@@ -167,9 +167,10 @@
lib\userenv\userenv.dll 1
lib\uxtheme\uxtheme.dll 1
lib\version\version.dll 1
-lib\winspool\winspool.drv 1
lib\wininet\wininet.dll 1
lib\winmm\winmm.dll 1
+lib\winspool\winspool.drv 1
+lib\wintrust\wintrust.dll 1
lib\ws2_32\ws2_32.dll 1
lib\ws2help\ws2help.dll 1
lib\wshirda\wshirda.dll 1
_____
Modified: trunk/reactos/lib/directory.xml
--- trunk/reactos/lib/directory.xml 2006-01-15 21:54:47 UTC (rev
20904)
+++ trunk/reactos/lib/directory.xml 2006-01-15 21:58:59 UTC (rev
20905)
@@ -338,6 +338,9 @@
<directory name="winspool">
<xi:include href="winspool/winspool.xml" />
</directory>
+<directory name="wintrust">
+ <xi:include href="wintrust/wintrust.xml" />
+</directory>
<directory name="ws2_32">
<xi:include href="ws2_32/ws2_32.xml" />
</directory>
_____
Copied: trunk/reactos/lib/wintrust (from rev 20904,
vendor/wine/dlls/wintrust/current)
Property changes on: trunk/reactos/lib/wintrust
___________________________________________________________________
Name: svn:ignore + GNUmakefile
_____
Added: trunk/reactos/lib/wintrust/wintrust.xml
--- vendor/wine/dlls/wintrust/current/wintrust.xml 2006-01-15
21:54:47 UTC (rev 20904)
+++ trunk/reactos/lib/wintrust/wintrust.xml 2006-01-15 21:58:59 UTC
(rev 20905)
@@ -0,0 +1,12 @@
+<module name="wintrust" type="win32dll"
baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32"
installname="wintrust.dll">
+ <autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
+ <importlibrary definition="wintrust.spec.def" />
+ <include base="wintrust">.</include>
+ <include base="ReactOS">include/wine</include>
+ <define name="__USE_W32API" />
+ <library>wine</library>
+ <library>ntdll</library>
+ <file>wintrust_main.c</file>
+ <file>version.rc</file>
+ <file>wintrust.spec</file>
+</module>
Property changes on: trunk/reactos/lib/wintrust/wintrust.xml
___________________________________________________________________
Name: svn:eol-style
+ native
_____
Modified: trunk/reactos/media/doc/README.WINE
--- trunk/reactos/media/doc/README.WINE 2006-01-15 21:54:47 UTC (rev
20904)
+++ trunk/reactos/media/doc/README.WINE 2006-01-15 21:58:59 UTC (rev
20905)
@@ -79,6 +79,7 @@
reactos/lib/uxtheme # Synced to Wine-0_9_5
reactos/lib/version # Out of sync
reactos/lib/wininet # Out of sync
+reactos/lib/wintrust # Synced to Wine-0_9_5
reactos/lib/winmm # Forked at Wine-20050628
reactos/lib/winmm/midimap # Forked at Wine-20050628
reactos/lib/winmm/wavemap # Forked at Wine-20050628
_____
Added: trunk/reactos/w32api/include/mscat.h
--- trunk/reactos/w32api/include/mscat.h 2006-01-15 21:54:47 UTC
(rev 20904)
+++ trunk/reactos/w32api/include/mscat.h 2006-01-15 21:58:59 UTC
(rev 20905)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2004 Francois Gouget
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ */
+
+#ifndef __WINE_MSCAT_H
+#define __WINE_MSCAT_H
+
+typedef HANDLE HCATADMIN;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const
GUID*,DWORD);
+BOOL WINAPI
CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD);
+BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Property changes on: trunk/reactos/w32api/include/mscat.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
_____
Modified: trunk/reactos/w32api/include/wincrypt.h
--- trunk/reactos/w32api/include/wincrypt.h 2006-01-15 21:54:47 UTC
(rev 20904)
+++ trunk/reactos/w32api/include/wincrypt.h 2006-01-15 21:58:59 UTC
(rev 20905)
@@ -1482,6 +1482,21 @@
DWORD cValue;
PCRYPT_ATTR_BLOB rgValue;
} CRYPT_ATTRIBUTE, *PCRYPT_ATTRIBUTE;
+typedef struct _CRYPT_ATTRIBUTES {
+ DWORD cAttr;
+ PCRYPT_ATTRIBUTE rgAttr;
+} CRYPT_ATTRIBUTES, *PCRYPT_ATTRIBUTES;
+
+typedef struct _CMSG_SIGNER_INFO {
+ DWORD dwVersion;
+ CERT_NAME_BLOB Issuer;
+ CRYPT_INTEGER_BLOB SerialNumber;
+ CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm;
+ CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm;
+ CRYPT_DATA_BLOB EncryptedHash;
+ CRYPT_ATTRIBUTES AuthAttrs;
+ CRYPT_ATTRIBUTES UnauthAttrs;
+} CMSG_SIGNER_INFO, *PCMSG_SIGNER_INFO;
typedef struct _CTL_ENTRY {
CRYPT_DATA_BLOB SubjectIdentifier;
DWORD cAttribute;
_____
Added: trunk/reactos/w32api/include/wintrust.h
--- trunk/reactos/w32api/include/wintrust.h 2006-01-15 21:54:47 UTC
(rev 20904)
+++ trunk/reactos/w32api/include/wintrust.h 2006-01-15 21:58:59 UTC
(rev 20905)
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2004 Francois Gouget
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ */
+
+#ifndef __WINE_WINTRUST_H
+#define __WINE_WINTRUST_H
+
+#include <wincrypt.h>
+
+
+#include <pshpack8.h>
+
+typedef struct WINTRUST_FILE_INFO_
+{
+ DWORD cbStruct;
+ LPCWSTR pcwszFilePath;
+ HANDLE hFile;
+ GUID* pgKnownSubject;
+} WINTRUST_FILE_INFO, *PWINTRUST_FILE_INFO;
+
+typedef struct WINTRUST_CATALOG_INFO_
+{
+ DWORD cbStruct;
+ DWORD dwCatalogVersion;
+ LPCWSTR pcwszCatalogFilePath;
+ LPCWSTR pcwszMemberTag;
+ LPCWSTR pcwszMemberFilePath;
+ HANDLE hMemberFile;
+ BYTE* pbCalculatedFileHash;
+ DWORD cbCalculatedFileHash;
+ PCCTL_CONTEXT pcCatalogContext;
+} WINTRUST_CATALOG_INFO, *PWINTRUST_CATALOG_INFO;
+
+typedef struct WINTRUST_BLOB_INFO_
+{
+ DWORD cbStruct;
+ GUID gSubject;
+ LPCWSTR pcwszDisplayName;
+ DWORD cbMemObject;
+ BYTE* pbMemObject;
+ DWORD cbMemSignedMsg;
+ BYTE* pbMemSignedMsg;
+} WINTRUST_BLOB_INFO, *PWINTRUST_BLOB_INFO;
+
+typedef struct WINTRUST_SGNR_INFO_
+{
+ DWORD cbStruct;
+ LPCWSTR pcwszDisplayName;
+ CMSG_SIGNER_INFO* psSignerInfo;
+ DWORD chStores;
+ HCERTSTORE* pahStores;
+} WINTRUST_SGNR_INFO, *PWINTRUST_SGNR_INFO;
+
+typedef struct WINTRUST_CERT_INFO_
+{
+ DWORD cbStruct;
+ LPCWSTR pcwszDisplayName;
+ CERT_CONTEXT* psCertContext;
+ DWORD chStores;
+ HCERTSTORE* pahStores;
+ DWORD dwFlags;
+ FILETIME* psftVerifyAsOf;
+} WINTRUST_CERT_INFO, *PWINTRUST_CERT_INFO;
+
+
+typedef struct _WINTRUST_DATA
+{
+ DWORD cbStruct;
+ LPVOID pPolicyCallbackData;
+ LPVOID pSIPClientData;
+ DWORD dwUIChoice;
+ DWORD fdwRevocationChecks;
+ DWORD dwUnionChoice;
+ union
+ {
+ struct WINTRUST_FILE_INFO_* pFile;
+ struct WINTRUST_CATALOG_INFO_* pCatalog;
+ struct WINTRUST_BLOB_INFO_* pBlob;
+ struct WINTRUST_SGNR_INFO_* pSgnr;
+ struct WINTRUST_CERT_INFO_* pCert;
+ } DUMMYUNIONNAME;
+
+ DWORD dwStateAction;
+ HANDLE hWVTStateData;
+ WCHAR* pwszURLReference;
+ DWORD dwProvFlags;
+ DWORD dwUIContext;
+} WINTRUST_DATA, *PWINTRUST_DATA;
+
+typedef struct _CRYPT_TRUST_REG_ENTRY
+{
+ DWORD cbStruct;
+ WCHAR *pwszDLLName;
+ WCHAR *pwszFunctionName;
+} CRYPT_TRUST_REG_ENTRY, *PCRYPT_TRUST_REG_ENTRY;
+
+typedef struct _CRYPT_REGISTER_ACTIONID
+{
+ DWORD cbStruct;
+ CRYPT_TRUST_REG_ENTRY sInitProvider;
+ CRYPT_TRUST_REG_ENTRY sObjectProvider;
+ CRYPT_TRUST_REG_ENTRY sSignatureProvider;
+ CRYPT_TRUST_REG_ENTRY sCertificateProvider;
+ CRYPT_TRUST_REG_ENTRY sCertificatePolicyProvider;
+ CRYPT_TRUST_REG_ENTRY sFinalPolicyProvider;
+ CRYPT_TRUST_REG_ENTRY sTestPolicyProvider;
+ CRYPT_TRUST_REG_ENTRY sCleanupProvider;
+} CRYPT_REGISTER_ACTIONID, *PCRYPT_REGISTER_ACTIONID;
+
+#include <poppack.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+BOOL WINAPI
WintrustAddActionID(GUID*,DWORD,CRYPT_REGISTER_ACTIONID*);
+void WINAPI WintrustGetRegPolicyFlags(DWORD*);
+LONG WINAPI WinVerifyTrust(HWND,GUID*,WINTRUST_DATA*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Property changes on: trunk/reactos/w32api/include/wintrust.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native