Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRYPT32] Sync with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=66805
This commit is contained in:
Amine Khaldi 2015-03-19 12:37:00 +00:00
parent 846061565a
commit fd10f42deb
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/crypt32/cert.c
View file

@ -975,7 +975,7 @@ static BOOL container_matches_cert(PCCERT_CONTEXT pCert, LPCSTR container,
{ {
CRYPT_KEY_PROV_INFO copy; CRYPT_KEY_PROV_INFO copy;
WCHAR containerW[MAX_PATH]; WCHAR containerW[MAX_PATH];
BOOL matches = FALSE; BOOL matches;
MultiByteToWideChar(CP_ACP, 0, container, -1, MultiByteToWideChar(CP_ACP, 0, container, -1,
containerW, sizeof(containerW) / sizeof(containerW[0])); containerW, sizeof(containerW) / sizeof(containerW[0]));
@ -1133,7 +1133,7 @@ static BOOL cert_prov_info_matches_cert(PCCERT_CONTEXT pCert)
BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert, BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert,
DWORD dwFlags, void *pvReserved) DWORD dwFlags, void *pvReserved)
{ {
BOOL matches = FALSE; BOOL matches;
TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved); TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved);
@ -2878,7 +2878,7 @@ static void CRYPT_SetBitInField(struct BitField *field, DWORD bit)
static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit) static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit)
{ {
BOOL set = FALSE; BOOL set;
DWORD indexIndex = bit / BITS_PER_DWORD; DWORD indexIndex = bit / BITS_PER_DWORD;
assert(field->cIndexes); assert(field->cIndexes);
@ -3090,7 +3090,6 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context,
CryptMemFree(szProvider); CryptMemFree(szProvider);
} }
} }
size = sizeof(info.dwKeySpec);
/* in case no CRYPT_KEY_PROV_INFO given, /* in case no CRYPT_KEY_PROV_INFO given,
* we always use AT_SIGNATURE key spec * we always use AT_SIGNATURE key spec
*/ */

1
reactos/dll/win32/crypt32/rootstore.c
View file

@ -482,6 +482,7 @@ static const char * const CRYPT_knownLocations[] = {
"/usr/share/ca-certificates/ca-bundle.crt", "/usr/share/ca-certificates/ca-bundle.crt",
"/usr/local/share/certs/", "/usr/local/share/certs/",
"/etc/sfw/openssl/certs", "/etc/sfw/openssl/certs",
"/etc/security/cacerts", /* Android */
}; };
static const BYTE authenticode[] = { static const BYTE authenticode[] = {

2
reactos/media/doc/README.WINE
View file

@ -65,7 +65,7 @@ reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.37
reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37
reactos/dll/win32/compstui # Synced to Wine-1.7.27 reactos/dll/win32/compstui # Synced to Wine-1.7.27
reactos/dll/win32/credui # Synced to Wine-1.7.27 reactos/dll/win32/credui # Synced to Wine-1.7.27
reactos/dll/win32/crypt32 # Synced to Wine-1.7.27 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.37
reactos/dll/win32/cryptdlg # Synced to Wine-1.7.27 reactos/dll/win32/cryptdlg # Synced to Wine-1.7.27
reactos/dll/win32/cryptdll # Synced to Wine-1.7.27 reactos/dll/win32/cryptdll # Synced to Wine-1.7.27
reactos/dll/win32/cryptnet # Synced to Wine-1.7.27 reactos/dll/win32/cryptnet # Synced to Wine-1.7.27