Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[tkreuzer] 38942: improve freeldr debug prints: - include reactos/debug.h - rename DebugPrint to DbgPrintMask - use DbgPrint to DPRINTM, add file and line and get rid of the ugly double brackets

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 19 10:29:02 2009 New Revision: 38942 URL: http://svn.reactos.org/svn/reactos?rev=38942&view=rev Log: improve freeldr debug prints: - include reactos/debug.h - rename DebugPrint to DbgPrintMask - use DbgPrint to DPRINTM, add file and line and get rid of the ugly double brackets Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/cache/blocklist.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/cache/cache.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/disk/disk.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/disk/partition.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/drivemap.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/ext2.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/fat.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/fs.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/fsrec.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/iso.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/ntfs.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/debug.h branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/inifile/inifile.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/inifile/parse.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/linuxboot.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/mm.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/binhive.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/registry.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/setupldr.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/ui/ui.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/conversion.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/wlmemory.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/wlregistry.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/fsrec.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…

15 years, 8 months

[cwittich] 38941: sync crypt32 and wintrust with wine 1.1.13

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 19 10:16:15 2009 New Revision: 38941 URL: http://svn.reactos.org/svn/reactos?rev=38941&view=rev Log: sync crypt32 and wintrust with wine 1.1.13 Modified: trunk/reactos/dll/win32/crypt32/crl.c trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc trunk/reactos/dll/win32/crypt32/ctl.c trunk/reactos/dll/win32/crypt32/msg.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/wintrust/asn.c trunk/reactos/dll/win32/wintrust/crypt.c trunk/reactos/dll/win32/wintrust/wintrust.spec Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -275,7 +275,7 @@ { BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData, pcbData); - if (ret) + if (ret && pvData) { CRYPT_DATA_BLOB blob = { *pcbData, pvData }; Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.spec [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -148,12 +148,12 @@ @ stub CryptMsgCountersign @ stub CryptMsgCountersignEncoded @ stdcall CryptMsgDuplicate(ptr) -@ stub CryptMsgEncodeAndSignCTL +@ stdcall CryptMsgEncodeAndSignCTL(long ptr ptr long ptr ptr) @ stdcall CryptMsgGetAndVerifySigner(ptr long ptr long ptr ptr) @ stdcall CryptMsgGetParam(ptr long long ptr ptr) @ stdcall CryptMsgOpenToDecode(long long long long ptr ptr) @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) -@ stub CryptMsgSignCTL +@ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr) @ stdcall CryptMsgUpdate(ptr ptr long long) @ stub CryptMsgVerifyCountersignatureEncoded @ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) Modified: trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -172,3 +172,65 @@ IDS_LOCALIZEDNAME_CA "Certificatie Tussen-Autoriteiten" IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" } +STRINGTABLE DISCARDABLE +{ + IDS_KEY_ID "SleutelID=" + IDS_CERT_ISSUER "Certificaat verstrekker" + IDS_CERT_SERIAL_NUMBER "Certificaat serienummer=" + IDS_ALT_NAME_OTHER_NAME "Andere naam=" + IDS_ALT_NAME_RFC822_NAME "Email Adres=" + IDS_ALT_NAME_DNS_NAME "DNS naam=" + IDS_ALT_NAME_DIRECTORY_NAME "Directory adres" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "IP adres=" + IDS_ALT_NAME_MASK "Masker=" + IDS_ALT_NAME_REGISTERED_ID "Geregistreerd ID=" + IDS_USAGE_UNKNOWN "Onbekend gebruik van sleutel" + IDS_SUBJECT_TYPE "Onderwerp type=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "Eind Entiteit" + IDS_PATH_LENGTH "Lengte van pad beperking=" + IDS_PATH_LENGTH_NONE "Geen" + IDS_INFO_NOT_AVAILABLE "Informatie niet beschikbaar" + IDS_AIA "Authoriteit Informatie Toegang" + IDS_ACCESS_METHOD "Toegang methode=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "CA verstrekkers" + IDS_ACCESS_METHOD_UNKNOWN "Onbekende toegangsmethode" + IDS_ACCESS_LOCATION "Alternatieve Naam" + IDS_CRL_DIST_POINT "CRL Distributie Punt" + IDS_CRL_DIST_POINT_NAME "Naam distributiepunt" + IDS_CRL_DIST_POINT_FULL_NAME "Volledige naam" + IDS_CRL_DIST_POINT_RDN_NAME "RDN naam" + IDS_CRL_DIST_POINT_REASON "CRL reden=" + IDS_CRL_DIST_POINT_ISSUER "CRL verstrekker" + IDS_REASON_KEY_COMPROMISE "Key Compromie" + IDS_REASON_CA_COMPROMISE "CA Compromie" + IDS_REASON_AFFILIATION_CHANGED "Samenwerking gewijzigd" + IDS_REASON_SUPERSEDED "Verouderd" + IDS_REASON_CESSATION_OF_OPERATION "Werkzaamheden gestaakt" + IDS_REASON_CERTIFICATE_HOLD "Certificaat bevroren" + IDS_FINANCIAL_CRITERIA "Financiele informatie=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Beschikbaar" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Niet beschikbaar" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Past bij criteria=" + IDS_YES "Ja" + IDS_NO "Nee" + IDS_DIGITAL_SIGNATURE "Digitale handtekening" + IDS_NON_REPUDIATION "Non-Repudiatie" + IDS_KEY_ENCIPHERMENT "sleutel codering" + IDS_DATA_ENCIPHERMENT "Data codering" + IDS_KEY_AGREEMENT "Sleutel overeenkomst" + IDS_CERT_SIGN "Certificaat tekenen" + IDS_OFFLINE_CRL_SIGN "Off-line CRL Certificeren" + IDS_CRL_SIGN "CRL Certificeren" + IDS_ENCIPHER_ONLY "Codeer alleen" + IDS_DECIPHER_ONLY "Decodeer alleen" + IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentificatie" + IDS_NETSCAPE_SSL_SERVER "SSL Server Authentificatie" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Handtekening" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "Handtekening CA" +} Modified: trunk/reactos/dll/win32/crypt32/ctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/ctl.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/ctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/ctl.c [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -72,6 +72,27 @@ if (newer < 0) toAdd = CertDuplicateCTLContext(pCtlContext); + else + { + TRACE("existing CTL is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + } + else + toAdd = CertDuplicateCTLContext(pCtlContext); + break; + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + if (existing) + { + LONG newer = CompareFileTime(&existing->pCtlInfo->ThisUpdate, + &pCtlContext->pCtlInfo->ThisUpdate); + + if (newer < 0) + { + toAdd = CertDuplicateCTLContext(pCtlContext); + CtlContext_CopyProperties(existing, pCtlContext); + } else { TRACE("existing CTL is newer, not adding\n"); @@ -484,7 +505,7 @@ { BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData, pcbData); - if (ret) + if (ret && pvData) { CRYPT_DATA_BLOB blob = { *pcbData, pvData }; Modified: trunk/reactos/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -1169,6 +1169,7 @@ typedef struct _CSignedEncodeMsg { CryptMsgBase base; + LPSTR innerOID; CRYPT_DATA_BLOB data; CSignedMsgData msg_data; } CSignedEncodeMsg; @@ -1178,6 +1179,7 @@ CSignedEncodeMsg *msg = (CSignedEncodeMsg *)hCryptMsg; DWORD i; + CryptMemFree(msg->innerOID); CryptMemFree(msg->data.pbData); CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCertEncoded); CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCrlEncoded); @@ -1227,32 +1229,46 @@ case CMSG_BARE_CONTENT_PARAM: { CRYPT_SIGNED_INFO info; - char oid_rsa_data[] = szOID_RSA_data; + BOOL freeContent = FALSE; info = *msg->msg_data.info; - /* Quirk: OID is only encoded messages if an update has happened */ - if (msg->base.state != MsgStateInit) - info.content.pszObjId = oid_rsa_data; - else - info.content.pszObjId = NULL; - if (msg->data.cbData) - { - CRYPT_DATA_BLOB blob = { msg->data.cbData, msg->data.pbData }; - - ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, - &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, - &info.content.Content.pbData, &info.content.Content.cbData); - } - else - { - info.content.Content.cbData = 0; - info.content.Content.pbData = NULL; + if (!msg->innerOID || !strcmp(msg->innerOID, szOID_RSA_data)) + { + char oid_rsa_data[] = szOID_RSA_data; + + /* Quirk: OID is only encoded messages if an update has happened */ + if (msg->base.state != MsgStateInit) + info.content.pszObjId = oid_rsa_data; + else + info.content.pszObjId = NULL; + if (msg->data.cbData) + { + CRYPT_DATA_BLOB blob = { msg->data.cbData, msg->data.pbData }; + + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, + &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, + &info.content.Content.pbData, &info.content.Content.cbData); + freeContent = TRUE; + } + else + { + info.content.Content.cbData = 0; + info.content.Content.pbData = NULL; + ret = TRUE; + } + } + else + { + info.content.pszObjId = msg->innerOID; + info.content.Content.cbData = msg->data.cbData; + info.content.Content.pbData = msg->data.pbData; ret = TRUE; } if (ret) { ret = CRYPT_AsnEncodeCMSSignedInfo(&info, pvData, pcbData); - LocalFree(info.content.Content.pbData); + if (freeContent) + LocalFree(info.content.Content.pbData); } break; } @@ -1357,9 +1373,22 @@ CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, CSignedEncodeMsg_Close, CSignedEncodeMsg_GetParam, CSignedEncodeMsg_Update, CRYPT_DefaultMsgControl); + if (pszInnerContentObjID) + { + msg->innerOID = CryptMemAlloc(strlen(pszInnerContentObjID) + 1); + if (msg->innerOID) + strcpy(msg->innerOID, pszInnerContentObjID); + else + ret = FALSE; + } + else + msg->innerOID = NULL; msg->data.cbData = 0; msg->data.pbData = NULL; - msg->msg_data.info = CryptMemAlloc(sizeof(CRYPT_SIGNED_INFO)); + if (ret) + msg->msg_data.info = CryptMemAlloc(sizeof(CRYPT_SIGNED_INFO)); + else + msg->msg_data.info = NULL; if (msg->msg_data.info) { memset(msg->msg_data.info, 0, sizeof(CRYPT_SIGNED_INFO)); @@ -2896,3 +2925,60 @@ cbSignerInfoCountersignature, dwSignerType, pvSigner, dwFlags, pvReserved); return FALSE; } + +BOOL WINAPI CryptMsgEncodeAndSignCTL(DWORD dwMsgEncodingType, + PCTL_INFO pCtlInfo, PCMSG_SIGNED_ENCODE_INFO pSignInfo, DWORD dwFlags, + BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + BYTE *pbCtlContent; + DWORD cbCtlContent; + + TRACE("(%08x, %p, %p, %08x, %p, %p)\n", dwMsgEncodingType, pCtlInfo, + pSignInfo, dwFlags, pbEncoded, pcbEncoded); + + if (dwFlags) + { + FIXME("unimplemented for flags %08x\n", dwFlags); + return FALSE; + } + if ((ret = CryptEncodeObjectEx(dwMsgEncodingType, PKCS_CTL, pCtlInfo, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &pbCtlContent, &cbCtlContent))) + { + ret = CryptMsgSignCTL(dwMsgEncodingType, pbCtlContent, cbCtlContent, + pSignInfo, dwFlags, pbEncoded, pcbEncoded); + LocalFree(pbCtlContent); + } + return ret; +} + +BOOL WINAPI CryptMsgSignCTL(DWORD dwMsgEncodingType, BYTE *pbCtlContent, + DWORD cbCtlContent, PCMSG_SIGNED_ENCODE_INFO pSignInfo, DWORD dwFlags, + BYTE *pbEncoded, DWORD *pcbEncoded) +{ + static char oid_ctl[] = szOID_CTL; + BOOL ret; + HCRYPTMSG msg; + + TRACE("(%08x, %p, %d, %p, %08x, %p, %p)\n", dwMsgEncodingType, + pbCtlContent, cbCtlContent, pSignInfo, dwFlags, pbEncoded, pcbEncoded); + + if (dwFlags) + { + FIXME("unimplemented for flags %08x\n", dwFlags); + return FALSE; + } + msg = CryptMsgOpenToEncode(dwMsgEncodingType, 0, CMSG_SIGNED, pSignInfo, + oid_ctl, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, pbCtlContent, cbCtlContent, TRUE); + if (ret) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbEncoded, + pcbEncoded); + CryptMsgClose(msg); + } + else + ret = FALSE; + return ret; +} Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -330,8 +330,7 @@ if (ptr - pSerial->pbData != dwStruct) { - ERR("struct size changed!? %u != expected %u\n", - ptr - pSerial->pbData, dwStruct); + ERR("struct size changed!? expected %u\n", dwStruct); LocalFree(pSerial->pbData); pSerial->pbData=NULL; pSerial->cbData=0; Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/store.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/store.c [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -893,6 +893,25 @@ else toAdd = CertDuplicateCertificateContext(pCertContext); break; + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + if (existing) + { + if (CompareFileTime(&existing->pCertInfo->NotBefore, + &pCertContext->pCertInfo->NotBefore) >= 0) + { + TRACE("existing certificate is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + { + toAdd = CertDuplicateCertificateContext(pCertContext); + CertContext_CopyProperties(toAdd, existing); + } + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; default: FIXME("Unimplemented add disposition %d\n", dwAddDisposition); SetLastError(E_INVALIDARG); @@ -1006,6 +1025,27 @@ if (newer < 0) toAdd = CertDuplicateCRLContext(pCrlContext); + else + { + TRACE("existing CRL is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + } + else + toAdd = CertDuplicateCRLContext(pCrlContext); + break; + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + if (existing) + { + LONG newer = CompareFileTime(&existing->pCrlInfo->ThisUpdate, + &pCrlContext->pCrlInfo->ThisUpdate); + + if (newer < 0) + { + toAdd = CertDuplicateCRLContext(pCrlContext); + CrlContext_CopyProperties(toAdd, existing); + } else { TRACE("existing CRL is newer, not adding\n"); Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… ============================================================================== --- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -532,7 +532,7 @@ const char *ptr; int val1, val2; - if (sscanf(pszObjId, "%d.%d.%n", &val1, &val2, &firstPos) != 2) + if (sscanf(pszObjId, "%d.%d%n", &val1, &val2, &firstPos) != 2) { SetLastError(CRYPT_E_ASN1_ERROR); return FALSE; @@ -540,6 +540,11 @@ bytesNeeded++; firstByte = val1 * 40 + val2; ptr = pszObjId + firstPos; + if (*ptr == '.') + { + ptr++; + firstPos++; + } while (ret && *ptr) { int pos; Modified: trunk/reactos/dll/win32/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/crypt.c… ============================================================================== --- trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -30,6 +30,7 @@ #include "mscat.h" #include "mssip.h" #include "imagehlp.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -37,12 +38,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); #define CATADMIN_MAGIC 0x43415441 /* 'CATA' */ +#define CRYPTCAT_MAGIC 0x43415443 /* 'CATC' */ #define CATINFO_MAGIC 0x43415449 /* 'CATI' */ + +struct cryptcat +{ + DWORD magic; + HCRYPTMSG msg; + DWORD encoding; + CTL_INFO *inner; + DWORD inner_len; + GUID subject; + DWORD attr_count; + CRYPTCATATTRIBUTE *attr; +}; struct catadmin { DWORD magic; WCHAR path[MAX_PATH]; + HANDLE find; }; struct catinfo @@ -50,6 +65,20 @@ DWORD magic; WCHAR file[MAX_PATH]; }; + +static HCATINFO create_catinfo(const WCHAR *filename) +{ + struct catinfo *ci; + + if (!(ci = HeapAlloc(GetProcessHeap(), 0, sizeof(*ci)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return INVALID_HANDLE_VALUE; + } + strcpyW(ci->file, filename); + ci->magic = CATINFO_MAGIC; + return ci; +} /*********************************************************************** * CryptCATAdminAcquireContext (WINTRUST.@) @@ -111,6 +140,8 @@ CreateDirectoryW(ca->path, NULL); ca->magic = CATADMIN_MAGIC; + ca->find = INVALID_HANDLE_VALUE; + *catAdmin = ca; return TRUE; } @@ -134,19 +165,19 @@ { FIXME("NULL basename not handled\n"); SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + return NULL; } if (!ca || ca->magic != CATADMIN_MAGIC || !catalogFile || flags) { SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + return NULL; } len = strlenW(ca->path) + strlenW(selectBaseName) + 2; if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) { SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + return NULL; } strcpyW(target, ca->path); strcatW(target, slashW); @@ -161,10 +192,10 @@ { HeapFree(GetProcessHeap(), 0, target); SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + return NULL; } ci->magic = CATINFO_MAGIC; - strcpyW(ci->file, selectBaseName); + strcpyW(ci->file, target); HeapFree(GetProcessHeap(), 0, target); return ci; @@ -234,13 +265,120 @@ /*********************************************************************** * CryptCATAdminEnumCatalogFromHash (WINTRUST.@) */ -HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, - BYTE* pbHash, - DWORD cbHash, - DWORD dwFlags, +HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BYTE* pbHash, + DWORD cbHash, DWORD dwFlags, HCATINFO* phPrevCatInfo ) { - FIXME("%p %p %d %d %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); + static const WCHAR slashW[] = {'\\',0}; + static const WCHAR globW[] = {'\\','*','.','c','a','t',0}; + + struct catadmin *ca = hCatAdmin; + WIN32_FIND_DATAW data; + HCATINFO prev = NULL; + HCRYPTPROV prov; + DWORD size; + BOOL ret; + + TRACE("%p %p %d %x %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); + + if (!ca || ca->magic != CATADMIN_MAGIC || !pbHash || cbHash != 20 || dwFlags) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (phPrevCatInfo) prev = *phPrevCatInfo; + + ret = CryptAcquireContextW(&prov, NULL, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + if (!ret) return NULL; + + if (!prev) + { + WCHAR *path; + + size = strlenW(ca->path) * sizeof(WCHAR) + sizeof(globW); + if (!(path = HeapAlloc(GetProcessHeap(), 0, size))) + { + CryptReleaseContext(prov, 0); + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + strcpyW(path, ca->path); + strcatW(path, globW); + + FindClose(ca->find); + ca->find = FindFirstFileW(path, &data); + + HeapFree(GetProcessHeap(), 0, path); + if (ca->find == INVALID_HANDLE_VALUE) + { + CryptReleaseContext(prov, 0); + return NULL; + } + } + else if (!FindNextFileW(ca->find, &data)) + { + CryptCATAdminReleaseCatalogContext(hCatAdmin, prev, 0); + CryptReleaseContext(prov, 0); + return NULL; + } + + while (1) + { + WCHAR *filename; + CRYPTCATMEMBER *member = NULL; + struct catinfo *ci; + HANDLE hcat; + + size = (strlenW(ca->path) + strlenW(data.cFileName) + 2) * sizeof(WCHAR); + if (!(filename = HeapAlloc(GetProcessHeap(), 0, size))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + strcpyW(filename, ca->path); + strcatW(filename, slashW); + strcatW(filename, data.cFileName); + + hcat = CryptCATOpen(filename, CRYPTCAT_OPEN_EXISTING, prov, 0, 0); + if (hcat == INVALID_HANDLE_VALUE) + { + WARN("couldn't open %s (%u)\n", debugstr_w(filename), GetLastError()); + continue; + } + while ((member = CryptCATEnumerateMember(hcat, member))) + { + if (member->pIndirectData->Digest.cbData != cbHash) + { + WARN("amount of hash bytes differs: %u/%u\n", member->pIndirectData->Digest.cbData, cbHash); + continue; + } + if (!memcmp(member->pIndirectData->Digest.pbData, pbHash, cbHash)) + { + TRACE("file %s matches\n", debugstr_w(data.cFileName)); + + CryptCATClose(hcat); + CryptReleaseContext(prov, 0); + if (!phPrevCatInfo) + { + FindClose(ca->find); + ca->find = INVALID_HANDLE_VALUE; + } + ci = create_catinfo(filename); + HeapFree(GetProcessHeap(), 0, filename); + return ci; + } + } + CryptCATClose(hcat); + HeapFree(GetProcessHeap(), 0, filename); + + if (!FindNextFileW(ca->find, &data)) + { + FindClose(ca->find); + ca->find = INVALID_HANDLE_VALUE; + CryptReleaseContext(prov, 0); + return NULL; + } + } return NULL; } @@ -302,6 +440,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + if (ca->find != INVALID_HANDLE_VALUE) FindClose(ca->find); ca->magic = 0; return HeapFree(GetProcessHeap(), 0, ca); } @@ -332,7 +471,55 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - return DeleteFileW(pwszCatalogFile); + + /* Only delete when there is a filename and no path */ + if (pwszCatalogFile && pwszCatalogFile[0] != 0 && + !strchrW(pwszCatalogFile, '\\') && !strchrW(pwszCatalogFile, '/') && + !strchrW(pwszCatalogFile, ':')) + { + static const WCHAR slashW[] = {'\\',0}; + WCHAR *target; + DWORD len; + + len = strlenW(ca->path) + strlenW(pwszCatalogFile) + 2; + if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + strcpyW(target, ca->path); + strcatW(target, slashW); + strcatW(target, pwszCatalogFile); + + DeleteFileW(target); + + HeapFree(GetProcessHeap(), 0, target); + } + + return TRUE; +} + +/*********************************************************************** + * CryptCATAdminResolveCatalogPath (WINTRUST.@) + */ +BOOL WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN hcatadmin, WCHAR *catalog_file, + CATALOG_INFO *info, DWORD flags) +{ + static const WCHAR slashW[] = {'\\',0}; + struct catadmin *ca = hcatadmin; + + TRACE("%p %s %p %x\n", hcatadmin, debugstr_w(catalog_file), info, flags); + + if (!ca || ca->magic != CATADMIN_MAGIC || !info || info->cbStruct != sizeof(*info) || flags) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + strcpyW(info->wszCatalogFile, ca->path); + strcatW(info->wszCatalogFile, slashW); + strcatW(info->wszCatalogFile, catalog_file); + + return TRUE; } /*********************************************************************** @@ -340,17 +527,313 @@ */ BOOL WINAPI CryptCATClose(HANDLE hCatalog) { - FIXME("(%p) stub\n", hCatalog); + struct cryptcat *cc = hCatalog; + + TRACE("(%p)\n", hCatalog); + + if (!hCatalog || hCatalog == INVALID_HANDLE_VALUE || cc->magic != CRYPTCAT_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc->inner); + CryptMsgClose(cc->msg); + + cc->magic = 0; + HeapFree(GetProcessHeap(), 0, cc); return TRUE; } /*********************************************************************** + * CryptCATGetAttrInfo (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE hCatalog, CRYPTCATMEMBER *member, LPWSTR tag) +{ + struct cryptcat *cc = hCatalog; + + FIXME("%p, %p, %s\n", hCatalog, member, debugstr_w(tag)); + + if (!hCatalog || hCatalog == INVALID_HANDLE_VALUE || cc->magic != CRYPTCAT_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + SetLastError(CRYPT_E_NOT_FOUND); + return NULL; +} + +/*********************************************************************** + * CryptCATGetCatAttrInfo (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE hCatalog, LPWSTR tag) +{ + struct cryptcat *cc = hCatalog; + + FIXME("%p, %s\n", hCatalog, debugstr_w(tag)); + + if (!hCatalog || hCatalog == INVALID_HANDLE_VALUE || cc->magic != CRYPTCAT_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + SetLastError(CRYPT_E_NOT_FOUND); + return NULL; +} + +CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE hCatalog, LPWSTR tag) +{ + struct cryptcat *cc = hCatalog; + + FIXME("%p, %s\n", hCatalog, debugstr_w(tag)); + + if (!hCatalog || hCatalog == INVALID_HANDLE_VALUE || cc->magic != CRYPTCAT_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + SetLastError(CRYPT_E_NOT_FOUND); + return NULL; +} + +/*********************************************************************** + * CryptCATEnumerateAttr (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateAttr(HANDLE hCatalog, CRYPTCATMEMBER *member, CRYPTCATATTRIBUTE *prev) +{ + struct cryptcat *cc = hCatalog; + + FIXME("%p, %p, %p\n", hCatalog, member, prev); + + if (!hCatalog || hCatalog == INVALID_HANDLE_VALUE || cc->magic != CRYPTCAT_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + SetLastError(CRYPT_E_NOT_FOUND); + return NULL; +} + +/*********************************************************************** + * CryptCATEnumerateCatAttr (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateCatAttr(HANDLE hCatalog, CRYPTCATATTRIBUTE *prev) +{ + struct cryptcat *cc = hCatalog; + + FIXME("%p, %p\n", hCatalog, prev); + + if (!hCatalog || hCatalog == INVALID_HANDLE_VALUE || cc->magic != CRYPTCAT_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + SetLastError(CRYPT_E_NOT_FOUND); + return NULL; +} + +/*********************************************************************** * CryptCATEnumerateMember (WINTRUST.@) */ -CRYPTCATMEMBER *WINAPI CryptCATEnumerateMember(HANDLE hCatalog, CRYPTCATMEMBER* pPrevMember) -{ - FIXME("(%p, %p) stub\n", hCatalog, pPrevMember); +CRYPTCATMEMBER * WINAPI CryptCATEnumerateMember(HANDLE hCatalog, CRYPTCATMEMBER *prev) +{ + struct cryptcat *cc = hCatalog; + CRYPTCATMEMBER *member = prev; + CTL_ENTRY *entry; + DWORD size, i; + + TRACE("%p, %p\n", hCatalog, prev); + + if (!hCatalog || hCatalog == INVALID_HANDLE_VALUE || cc->magic != CRYPTCAT_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* dumping the contents makes me think that dwReserved is the iteration number */ + if (!member) + { + if (!(member = HeapAlloc(GetProcessHeap(), 0, sizeof(*member)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + member->cbStruct = sizeof(*member); + member->pwszFileName = member->pwszReferenceTag = NULL; + member->dwReserved = 0; + member->hReserved = NULL; + member->gSubjectType = cc->subject; + member->fdwMemberFlags = 0; + member->pIndirectData = NULL; + member->dwCertVersion = cc->inner->dwVersion; + } + else member->dwReserved++; + + if (member->dwReserved >= cc->inner->cCTLEntry) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto error; + } + + /* list them backwards, like native */ + entry = &cc->inner->rgCTLEntry[cc->inner->cCTLEntry - member->dwReserved - 1]; + + member->sEncodedIndirectData.cbData = member->sEncodedMemberInfo.cbData = 0; + member->sEncodedIndirectData.pbData = member->sEncodedMemberInfo.pbData = NULL; + HeapFree(GetProcessHeap(), 0, member->pIndirectData); + member->pIndirectData = NULL; + + for (i = 0; i < entry->cAttribute; i++) + { + CRYPT_ATTRIBUTE *attr = entry->rgAttribute + i; + + if (attr->cValue != 1) + { + ERR("Can't handle attr->cValue of %u\n", attr->cValue); + continue; + } + if (!strcmp(attr->pszObjId, CAT_MEMBERINFO_OBJID)) + { + CAT_MEMBERINFO *mi; + BOOL ret; + + member->sEncodedMemberInfo.cbData = attr->rgValue->cbData; + member->sEncodedMemberInfo.pbData = attr->rgValue->pbData; + + CryptDecodeObject(cc->encoding, CAT_MEMBERINFO_OBJID, attr->rgValue->pbData, attr->rgValue->cbData, 0, NULL, &size); + + if (!(mi = HeapAlloc(GetProcessHeap(), 0, size))) + { + SetLastError(ERROR_OUTOFMEMORY); + goto error; + } + ret = CryptDecodeObject(cc->encoding, CAT_MEMBERINFO_OBJID, attr->rgValue->pbData, attr->rgValue->cbData, 0, mi, &size); + if (ret) + { + UNICODE_STRING guid; + + member->dwCertVersion = mi->dwCertVersion; + RtlInitUnicodeString(&guid, mi->pwszSubjGuid); + if (RtlGUIDFromString(&guid, &member->gSubjectType)) + { + HeapFree(GetProcessHeap(), 0, mi); + goto error; + } + } + HeapFree(GetProcessHeap(), 0, mi); + if (!ret) goto error; + } + else if (!strcmp(attr->pszObjId, SPC_INDIRECT_DATA_OBJID)) + { + /* SPC_INDIRECT_DATA_CONTENT is equal to SIP_INDIRECT_DATA */ + + member->sEncodedIndirectData.cbData = attr->rgValue->cbData; + member->sEncodedIndirectData.pbData = attr->rgValue->pbData; + + CryptDecodeObject(cc->encoding, SPC_INDIRECT_DATA_OBJID, attr->rgValue->pbData, attr->rgValue->cbData, 0, NULL, &size); + + if (!(member->pIndirectData = HeapAlloc(GetProcessHeap(), 0, size))) + { + SetLastError(ERROR_OUTOFMEMORY); + goto error; + } + CryptDecodeObject(cc->encoding, SPC_INDIRECT_DATA_OBJID, attr->rgValue->pbData, attr->rgValue->cbData, 0, member->pIndirectData, &size); + } + else + /* this object id should probably be handled in CryptCATEnumerateAttr */ + FIXME("unhandled object id \"%s\"\n", attr->pszObjId); + } + + if (!member->sEncodedMemberInfo.cbData || !member->sEncodedIndirectData.cbData) + { + ERR("Corrupted catalog entry?\n"); + SetLastError(CRYPT_E_ATTRIBUTES_MISSING); + goto error; + } + size = (2 * member->pIndirectData->Digest.cbData + 1) * sizeof(WCHAR); + if (member->pwszReferenceTag) + member->pwszReferenceTag = HeapReAlloc(GetProcessHeap(), 0, member->pwszReferenceTag, size); + else + member->pwszReferenceTag = HeapAlloc(GetProcessHeap(), 0, size); + + if (!member->pwszReferenceTag) + { + SetLastError(ERROR_OUTOFMEMORY); + goto error; + } + /* FIXME: reference tag is usually the file hash but doesn't have to be */ + for (i = 0; i < member->pIndirectData->Digest.cbData; i++) + { + DWORD sub; + + sub = member->pIndirectData->Digest.pbData[i] >> 4; + member->pwszReferenceTag[i * 2] = (sub < 10 ? '0' + sub : 'A' + sub - 10); + sub = member->pIndirectData->Digest.pbData[i] & 0xf; + member->pwszReferenceTag[i * 2 + 1] = (sub < 10 ? '0' + sub : 'A' + sub - 10); + } + member->pwszReferenceTag[i * 2] = 0; + return member; + +error: + HeapFree(GetProcessHeap(), 0, member->pIndirectData); + HeapFree(GetProcessHeap(), 0, member->pwszReferenceTag); + HeapFree(GetProcessHeap(), 0, member); return NULL; +} + +static CTL_INFO *decode_inner_content(HANDLE hmsg, DWORD encoding, DWORD *len) +{ + DWORD size; + LPSTR oid = NULL; + BYTE *buffer = NULL; + CTL_INFO *inner = NULL; + + if (!CryptMsgGetParam(hmsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, NULL, &size)) return NULL; + if (!(oid = HeapAlloc(GetProcessHeap(), 0, size))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + if (!CryptMsgGetParam(hmsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, oid, &size)) goto out; + if (!CryptMsgGetParam(hmsg, CMSG_CONTENT_PARAM, 0, NULL, &size)) goto out; + if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size))) + { + SetLastError(ERROR_OUTOFMEMORY); + goto out; + } + if (!CryptMsgGetParam(hmsg, CMSG_CONTENT_PARAM, 0, buffer, &size)) goto out; + if (!CryptDecodeObject(encoding, oid, buffer, size, 0, NULL, &size)) goto out; + if (!(inner = HeapAlloc(GetProcessHeap(), 0, size))) + { + SetLastError(ERROR_OUTOFMEMORY); + goto out; + } + if (!CryptDecodeObject(encoding, oid, buffer, size, 0, inner, &size)) goto out; + *len = size; + +out: + HeapFree(GetProcessHeap(), 0, oid); + HeapFree(GetProcessHeap(), 0, buffer); + return inner; +} + +/*********************************************************************** + * CryptCATCatalogInfoFromContext (WINTRUST.@) + */ +BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info, DWORD flags) +{ + struct catinfo *ci = hcatinfo; + + TRACE("%p, %p, %x\n", hcatinfo, info, flags); + + if (!hcatinfo || hcatinfo == INVALID_HANDLE_VALUE || ci->magic != CATINFO_MAGIC || + flags || !info || info->cbStruct != sizeof(*info)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + strcpyW(info->wszCatalogFile, ci->file); + return TRUE; } /*********************************************************************** @@ -359,9 +842,112 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV hProv, DWORD dwPublicVersion, DWORD dwEncodingType) { - FIXME("(%s, %d, %ld, %d, %d) stub\n", debugstr_w(pwszFileName), fdwOpenFlags, + HANDLE file, hmsg; + BYTE *buffer = NULL; + DWORD size, flags = OPEN_EXISTING; + struct cryptcat *cc; + + TRACE("%s, %x, %lx, %x, %x\n", debugstr_w(pwszFileName), fdwOpenFlags, hProv, dwPublicVersion, dwEncodingType); - return 0; + + if (!pwszFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + if (!dwPublicVersion) dwPublicVersion = 0x00000100; + if (!dwEncodingType) dwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + + if (fdwOpenFlags & CRYPTCAT_OPEN_ALWAYS) flags |= OPEN_ALWAYS; + if (fdwOpenFlags & CRYPTCAT_OPEN_CREATENEW) flags |= CREATE_NEW; + + file = CreateFileW(pwszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, flags, 0, NULL); + if (file == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; + + size = GetFileSize(file, NULL); + if (!(buffer = HeapAlloc(GetProcessHeap(), 0, size))) + { + CloseHandle(file); + SetLastError(ERROR_OUTOFMEMORY); + return INVALID_HANDLE_VALUE; + } + if (!(hmsg = CryptMsgOpenToDecode(dwEncodingType, 0, 0, hProv, NULL, NULL))) + { + CloseHandle(file); + HeapFree(GetProcessHeap(), 0, buffer); + return INVALID_HANDLE_VALUE; + } + if (!ReadFile(file, buffer, size, &size, NULL) || !CryptMsgUpdate(hmsg, buffer, size, TRUE)) + { + CloseHandle(file); + HeapFree(GetProcessHeap(), 0, buffer); + CryptMsgClose(hmsg); + return INVALID_HANDLE_VALUE; + } + HeapFree(GetProcessHeap(), 0, buffer); + CloseHandle(file); + + size = sizeof(DWORD); + if (!(cc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cc)))) + { + CryptMsgClose(hmsg); + SetLastError(ERROR_OUTOFMEMORY); + return INVALID_HANDLE_VALUE; + } + + cc->msg = hmsg; + cc->encoding = dwEncodingType; + if (CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_COUNT_PARAM, 0, &cc->attr_count, &size)) + { + DWORD i, sum = 0; + BYTE *p; + + for (i = 0; i < cc->attr_count; i++) + { + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) + { + CryptMsgClose(hmsg); + return INVALID_HANDLE_VALUE; + } + sum += size; + } + if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) + { + CryptMsgClose(hmsg); + SetLastError(ERROR_OUTOFMEMORY); + return INVALID_HANDLE_VALUE; + } + p = (BYTE *)(cc->attr + cc->attr_count); + for (i = 0; i < cc->attr_count; i++) + { + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) + { + CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc->attr); + return INVALID_HANDLE_VALUE; + } + if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) + { + CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc->attr); + return INVALID_HANDLE_VALUE; + } + p += size; + } + cc->inner = decode_inner_content(hmsg, dwEncodingType, &cc->inner_len); + if (!cc->inner || !CryptSIPRetrieveSubjectGuid(pwszFileName, NULL, &cc->subject)) + { + CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc->inner); + HeapFree(GetProcessHeap(), 0, cc); + return INVALID_HANDLE_VALUE; + } + cc->magic = CRYPTCAT_MAGIC; + return cc; + } + return INVALID_HANDLE_VALUE; } /*********************************************************************** Modified: trunk/reactos/dll/win32/wintrust/wintrust.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.spec [iso-8859-1] Mon Jan 19 10:16:15 2009 @@ -8,7 +8,7 @@ @ stdcall CryptCATAdminReleaseCatalogContext(long long long) @ stdcall CryptCATAdminReleaseContext(long long) @ stdcall CryptCATAdminRemoveCatalog(ptr wstr long) -@ stub CryptCATAdminResolveCatalogPath +@ stdcall CryptCATAdminResolveCatalogPath(ptr wstr ptr long) @ stub CryptCATCDFClose @ stub CryptCATCDFEnumAttributes @ stub CryptCATCDFEnumAttributesWithCDFTag @@ -17,14 +17,14 @@ @ stub CryptCATCDFEnumMembersByCDFTag @ stub CryptCATCDFEnumMembersByCDFTagEx @ stub CryptCATCDFOpen -@ stub CryptCATCatalogInfoFromContext +@ stdcall CryptCATCatalogInfoFromContext(ptr ptr long) @ stdcall CryptCATClose(long) -@ stub CryptCATEnumerateAttr -@ stub CryptCATEnumerateCatAttr +@ stdcall CryptCATEnumerateAttr(ptr ptr ptr) +@ stdcall CryptCATEnumerateCatAttr(ptr ptr) @ stdcall CryptCATEnumerateMember(long ptr) -@ stub CryptCATGetAttrInfo -@ stub CryptCATGetCatAttrInfo -@ stub CryptCATGetMemberInfo +@ stdcall CryptCATGetAttrInfo(ptr ptr wstr) +@ stdcall CryptCATGetCatAttrInfo(ptr wstr ) +@ stdcall CryptCATGetMemberInfo(ptr wstr) @ stub CryptCATHandleFromStore @ stdcall CryptCATOpen(wstr long long long long) @ stub CryptCATPersistStore

15 years, 8 months

[janderwald] 38940: - Experimental implementation of KsiCreateObjectType

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 19 09:55:47 2009 New Revision: 38940 URL: http://svn.reactos.org/svn/reactos?rev=38940&view=rev Log: - Experimental implementation of KsiCreateObjectType Modified: trunk/reactos/dll/directx/ksuser/ksuser.c trunk/reactos/dll/directx/ksuser/ksuser.h Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Mon Jan 19 09:55:47 2009 @@ -34,8 +34,39 @@ ACCESS_MASK DesiredAccess, PHANDLE phHandle) { - UNIMPLEMENTED - return 0; + NTSTATUS Status; + ULONG Length; + ULONG TotalSize; + LPWSTR pStr; + UNICODE_STRING ObjectName; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + + Length = wcslen(IID); + + TotalSize = (Length * sizeof(WCHAR)) + BufferSize + 2 * sizeof(WCHAR); + + pStr = HeapAlloc(GetProcessHeap(), 0, TotalSize); + if (!pStr) + return STATUS_INSUFFICIENT_RESOURCES; + + wcscpy(pStr, (LPWSTR)IID); + pStr[Length] = L'\\'; + memcpy(&pStr[Length+1], Buffer, BufferSize); + pStr[Length+1+BufferSize] = L'\0'; + + RtlInitUnicodeString(&ObjectName, pStr); + + InitializeObjectAttributes(&ObjectAttributes, &ObjectName, OBJ_CASE_INSENSITIVE, hHandle, NULL); + + Status = NtCreateFile(phHandle, DesiredAccess, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, 0, 1, 0, NULL, 0); + HeapFree(GetProcessHeap(), 0, pStr); + if (!NT_SUCCESS(Status)) + { + *phHandle = INVALID_HANDLE_VALUE; + Status = RtlNtStatusToDosError(Status); + } + return Status; } /*++ Modified: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Mon Jan 19 09:55:47 2009 @@ -1,5 +1,22 @@ +#ifndef KSUSER_H__ +#define KSUSER_H__ + #define _KSDDK_ + +#define WIN32_NO_STATUS #include <windows.h> -typedef LONG NTSTATUS; +#include <ndk/ntndk.h> + + #include <ks.h> #include <reactos/helper.h> + +LPVOID +__stdcall +HeapAlloc( + HANDLE hHeap, + DWORD dwFlags, + DWORD dwBytes +); + +#endif

15 years, 8 months

[dchapyshev] 38939: - Change hh.exe location - Fix inf's for .hlp files - Add entries for .chm files

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Mon Jan 19 09:36:26 2009 New Revision: 38939 URL: http://svn.reactos.org/svn/reactos?rev=38939&view=rev Log: - Change hh.exe location - Fix inf's for .hlp files - Add entries for .chm files Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Mon Jan 19 09:36:26 2009 @@ -117,8 +117,15 @@ ; Help Files HKCR,".hlp","",0x00000000,"hlpfile" HKCR,"hlpfile","",0x00000000,"Help File" -HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" +HKCR,"hlpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24" +HKCR,"hlpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\winhlp32.exe %1" + +HKCR,".chm","",0x00000000,"chm.file" +HKCR,"chm.file","",0x00000000,"Help File" +HKCR,"chm.file","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" +HKCR,"chm.file\DefaultIcon","",0x00020000,"%SystemRoot%\hh.exe,0" +HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1" ; set MIME type for .html and .htm because Tiny webserver needs it HKCR,".htm","",0x00000000,"html" Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Mon Jan 19 09:36:26 2009 @@ -117,8 +117,15 @@ ; Help Files HKCR,".hlp","",0x00000000,"hlpfile" HKCR,"hlpfile","",0x00000000,"Help File" -HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" +HKCR,"hlpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24" +HKCR,"hlpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\winhlp32.exe %1" + +HKCR,".chm","",0x00000000,"chm.file" +HKCR,"chm.file","",0x00000000,"Help File" +HKCR,"chm.file","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" +HKCR,"chm.file\DefaultIcon","",0x00020000,"%SystemRoot%\hh.exe,0" +HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1" ; set MIME type for .html and .htm because Tiny webserver needs it HKCR,".htm","",0x00000000,"html" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Jan 19 09:36:26 2009 @@ -44,7 +44,7 @@ base\applications\mscutils\eventvwr\eventvwr.exe 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 -base\applications\hh\hh.exe 1 +base\applications\hh\hh.exe 4 base\applications\kbswitch\kbswitch.exe 1 base\applications\kbswitch\kbsdll\kbsdll.dll 1 base\applications\logoff\logoff.exe 1

15 years, 8 months

[fireball] 38938: - Fix a misnamed var in fastfat.h. - Implement first part of FatMountVolume (before VCB initialization and actual read of a volume).

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jan 19 07:55:46 2009 New Revision: 38938 URL: http://svn.reactos.org/svn/reactos?rev=38938&view=rev Log: - Fix a misnamed var in fastfat.h. - Implement first part of FatMountVolume (before VCB initialization and actual read of a volume). Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Jan 19 07:55:46 2009 @@ -241,7 +241,7 @@ CACHE_MANAGER_CALLBACKS CacheMgrNoopCallbacks; } FAT_GLOBAL_DATA, *VFAT_GLOBAL_DATA; -extern VFAT_GLOBAL_DATA VfatGlobalData; +extern FAT_GLOBAL_DATA FatGlobalData; /* FCB flags */ #define FCB_CACHE_INITIALIZED 0x0001 Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Mon Jan 19 07:55:46 2009 @@ -31,6 +31,22 @@ return STATUS_INVALID_DEVICE_REQUEST; } +VOID +NTAPI +FatiCleanVcbs(PFAT_IRP_CONTEXT IrpContext) +{ + /* Make sure this IRP is waitable */ + ASSERT(IrpContext->Flags & IRPCONTEXT_CANWAIT); + + /* Acquire global resource */ + ExAcquireResourceExclusiveLite(&FatGlobalData.Resource, TRUE); + + /* TODO: Go through all VCBs and delete unmounted ones */ + + /* Release global resource */ + ExReleaseResourceLite(&FatGlobalData.Resource); +} + NTSTATUS NTAPI FatMountVolume(PFAT_IRP_CONTEXT IrpContext, @@ -38,10 +54,55 @@ PVPB Vpb, PDEVICE_OBJECT FsDeviceObject) { + NTSTATUS Status; + PVOLUME_DEVICE_OBJECT VolumeDevice; + DPRINT1("FatMountVolume()\n"); - FatCompleteRequest(IrpContext, IrpContext->Irp, STATUS_INVALID_DEVICE_REQUEST); - return STATUS_INVALID_DEVICE_REQUEST; + /* Make sure this IRP is waitable */ + ASSERT(IrpContext->Flags & IRPCONTEXT_CANWAIT); + + /* TODO: IOCTL_DISK_CHECK_VERIFY */ + /* TODO: Check if data-track present in case of a CD drive */ + /* TODO: IOCTL_DISK_GET_PARTITION_INFO_EX */ + + /* Remove unmounted VCBs */ + FatiCleanVcbs(IrpContext); + + /* Create a new volume device object */ + Status = IoCreateDevice(FatGlobalData.DriverObject, + sizeof(VOLUME_DEVICE_OBJECT) - sizeof(DEVICE_OBJECT), + NULL, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + (PDEVICE_OBJECT *)&VolumeDevice); + + if (!NT_SUCCESS(Status)) return Status; + + /* Match alignment requirements */ + if (TargetDeviceObject->AlignmentRequirement > VolumeDevice->DeviceObject.AlignmentRequirement) + { + VolumeDevice->DeviceObject.AlignmentRequirement = TargetDeviceObject->AlignmentRequirement; + } + + /* Init stack size */ + VolumeDevice->DeviceObject.StackSize = TargetDeviceObject->StackSize + 1; + + /* TODO: IOCTL_DISK_GET_DRIVE_GEOMETRY to obtain BytesPerSector */ + VolumeDevice->DeviceObject.SectorSize = 512; + + /* Signal we're done with initializing */ + VolumeDevice->DeviceObject.Flags &= ~DO_DEVICE_INITIALIZING; + + /* Save device object in a VPB */ + Vpb->DeviceObject = (PDEVICE_OBJECT)VolumeDevice; + + /* TODO: Initialize VCB for this volume */ + + /* Complete the request and return success */ + FatCompleteRequest(IrpContext, IrpContext->Irp, STATUS_SUCCESS); + return STATUS_SUCCESS; }

15 years, 8 months

[cwittich] 38937: fix lots of msxml3 winetest

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 19 06:56:32 2009 New Revision: 38937 URL: http://svn.reactos.org/svn/reactos?rev=38937&view=rev Log: fix lots of msxml3 winetest Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Mon Jan 19 06:56:32 2009 @@ -277,6 +277,8 @@ /* Define if you have the libxml2 library */ #define HAVE_LIBXML2 +#define HAVE_XMLNEWDOCPI +#define HAVE_XMLREADMEMORY /* Define to 1 if you have the <libxml/parser.h> header file. */ #define HAVE_LIBXML_PARSER_H

15 years, 8 months

[fireball] 38936: - Sync widl + rpcrt4 with Wine.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jan 19 06:24:52 2009 New Revision: 38936 URL: http://svn.reactos.org/svn/reactos?rev=38936&view=rev Log: - Sync widl + rpcrt4 with Wine. Modified: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/expr.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.h trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typetree.c trunk/reactos/tools/widl/typetree.h trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_clien… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=38… Modified: trunk/reactos/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.c?rev=3893… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=38… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=38… Modified: trunk/reactos/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.h?rev=38… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=38… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=389… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=38… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=3… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… Modified: trunk/reactos/tools/widl/typetree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.c?rev=… Modified: trunk/reactos/tools/widl/typetree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.h?rev=… Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=389… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

15 years, 8 months

[cwittich] 38935: skip crashing virtual tests

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 19 06:04:09 2009 New Revision: 38935 URL: http://svn.reactos.org/svn/reactos?rev=38935&view=rev Log: skip crashing virtual tests Modified: trunk/rostests/winetests/kernel32/virtual.c Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… ============================================================================== --- trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] Mon Jan 19 06:04:09 2009 @@ -304,6 +304,9 @@ MEMORY_BASIC_INFORMATION info; BOOL ret; + skip("ROS-HACK: Skipping MapViewOfFile tests\n"); + return; + SetLastError(0xdeadbeef); file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); @@ -777,6 +780,9 @@ win_skip( "GetWriteWatch not supported\n" ); return; } + + skip("ROS-HACK: Skipping WriteWatch tests\n"); + return; size = 0x10000; base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE );

15 years, 8 months

[cwittich] 38934: Use WriteEncodedText() for line endings patch by <zooba at aanet dot com dot au> tested by amine48rz See issue #3989 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 19 05:13:31 2009 New Revision: 38934 URL: http://svn.reactos.org/svn/reactos?rev=38934&view=rev Log: Use WriteEncodedText() for line endings patch by <zooba at aanet dot com dot au> tested by amine48rz See issue #3989 for more details. Modified: trunk/reactos/base/applications/notepad/text.c Modified: trunk/reactos/base/applications/notepad/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/text.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/text.c [iso-8859-1] Mon Jan 19 05:13:31 2009 @@ -313,9 +313,8 @@ BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln) { WCHAR wcBom; - BYTE bEoln[2]; - LPBYTE pbEoln = NULL; - DWORD dwDummy, dwPos, dwNext, dwEolnSize = 0; + LPCWSTR pszLF = L"\n"; + DWORD dwPos, dwNext; /* Write the proper byte order marks if not ANSI */ if (iEncoding != ENCODING_ANSI) @@ -323,29 +322,6 @@ wcBom = 0xFEFF; if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) return FALSE; - } - - /* Identify the proper eoln to use */ - switch(iEoln) - { - case EOLN_LF: - bEoln[0] = '\n'; - pbEoln = (LPBYTE) &bEoln; - dwEolnSize = 1; - break; - case EOLN_CR: - bEoln[0] = '\r'; - pbEoln = (LPBYTE) &bEoln; - dwEolnSize = 1; - break; - case EOLN_CRLF: - bEoln[0] = '\r'; - bEoln[1] = '\n'; - pbEoln = (LPBYTE) &bEoln; - dwEolnSize = 2; - break; - default: - return FALSE; } dwPos = 0; @@ -363,14 +339,36 @@ dwNext++; } - /* Write text (without eoln) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) - return FALSE; - - /* Write eoln */ if (dwNext != dwTextLen) { - if (!WriteFile(hFile, pbEoln, dwEolnSize, &dwDummy, NULL)) + switch (iEoln) + { + case EOLN_LF: + /* Write text (without eoln) */ + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) + return FALSE; + /* Write eoln */ + if (!WriteEncodedText(hFile, pszLF, 1, iEncoding)) + return FALSE; + break; + case EOLN_CR: + /* Write text (including \r as eoln) */ + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 1, iEncoding)) + return FALSE; + break; + case EOLN_CRLF: + /* Write text (including \r\n as eoln) */ + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 2, iEncoding)) + return FALSE; + break; + default: + return FALSE; + } + } + else + { + /* Write text (without eoln, since this is the end of the file) */ + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) return FALSE; }

15 years, 8 months

[cwittich] 38933: Use "Small Fonts" (96 dpi) by default patch by <aspotashev at gmail dot com> See issue #4011 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 19 04:51:58 2009 New Revision: 38933 URL: http://svn.reactos.org/svn/reactos?rev=38933&view=rev Log: Use "Small Fonts" (96 dpi) by default patch by <aspotashev at gmail dot com> See issue #4011 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Jan 19 04:51:58 2009 @@ -644,8 +644,8 @@ TM->tmWeight = pOS2->usWeightClass; TM->tmOverhang = 0; - TM->tmDigitizedAspectX = 300; - TM->tmDigitizedAspectY = 300; + TM->tmDigitizedAspectX = 96; + TM->tmDigitizedAspectY = 96; TM->tmFirstChar = pOS2->usFirstCharIndex; TM->tmLastChar = pOS2->usLastCharIndex; TM->tmDefaultChar = pOS2->usDefaultChar;

15 years, 8 months

← Newer
1
...
29
30
31
32
33
34
35
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009