mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
[CRYPTDLG] Sync with Wine Staging 4.18. CORE-16441
This commit is contained in:
Amine Khaldi
parent
98ef8700d2
commit
2fdfd36ca5
2 changed files with 95 additions and 95 deletions
|
|
@ -18,9 +18,10 @@
|
|||
|
||||
#define NONAMELESSUNION
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#ifdef __REACTOS__
|
||||
#include <wchar.h>
|
||||
#endif
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
|
|
@ -33,7 +34,6 @@
|
|||
#include "cryptdlg.h"
|
||||
#include "cryptuiapi.h"
|
||||
#include "cryptres.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(cryptdlg);
|
||||
|
|
@ -501,9 +501,9 @@ static BOOL CRYPT_FormatHexString(const BYTE *pbEncoded, DWORD cbEncoded,
|
|||
for (i = 0; i < cbEncoded; i++)
|
||||
{
|
||||
if (i < cbEncoded - 1)
|
||||
ptr += sprintfW(ptr, fmt, pbEncoded[i]);
|
||||
ptr += swprintf(ptr, fmt, pbEncoded[i]);
|
||||
else
|
||||
ptr += sprintfW(ptr, endFmt, pbEncoded[i]);
|
||||
ptr += swprintf(ptr, endFmt, pbEncoded[i]);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -538,31 +538,31 @@ static BOOL CRYPT_FormatCPS(DWORD dwCertEncodingType,
|
|||
else
|
||||
sep = commaSep;
|
||||
|
||||
sepLen = strlenW(sep);
|
||||
sepLen = lstrlenW(sep);
|
||||
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += 3 * strlenW(indent);
|
||||
charsNeeded += 3 * lstrlenW(indent);
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += cpsValue->Value.cbData / sizeof(WCHAR);
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, (LPWSTR)cpsValue->Value.pbData);
|
||||
lstrcpyW(str, (LPWSTR)cpsValue->Value.pbData);
|
||||
str += cpsValue->Value.cbData / sizeof(WCHAR);
|
||||
}
|
||||
charsNeeded += sepLen;
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, sep);
|
||||
lstrcpyW(str, sep);
|
||||
str += sepLen;
|
||||
}
|
||||
LocalFree(cpsValue);
|
||||
|
|
@ -619,8 +619,8 @@ static BOOL CRYPT_FormatUserNotice(DWORD dwCertEncodingType,
|
|||
headingSep = colonSpace;
|
||||
sep = commaSep;
|
||||
}
|
||||
sepLen = strlenW(sep);
|
||||
headingSepLen = strlenW(headingSep);
|
||||
sepLen = lstrlenW(sep);
|
||||
headingSepLen = lstrlenW(headingSep);
|
||||
|
||||
if (pNoticeRef)
|
||||
{
|
||||
|
|
@ -629,15 +629,15 @@ static BOOL CRYPT_FormatUserNotice(DWORD dwCertEncodingType,
|
|||
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += 3 * strlenW(indent);
|
||||
charsNeeded += 3 * lstrlenW(indent);
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += noticeRefLen;
|
||||
|
|
@ -649,22 +649,22 @@ static BOOL CRYPT_FormatUserNotice(DWORD dwCertEncodingType,
|
|||
charsNeeded += headingSepLen;
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, headingSep);
|
||||
lstrcpyW(str, headingSep);
|
||||
str += headingSepLen;
|
||||
}
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += 4 * strlenW(indent);
|
||||
charsNeeded += 4 * lstrlenW(indent);
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += organizationLen;
|
||||
|
|
@ -681,24 +681,24 @@ static BOOL CRYPT_FormatUserNotice(DWORD dwCertEncodingType,
|
|||
charsNeeded += sepLen;
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, sep);
|
||||
lstrcpyW(str, sep);
|
||||
str += sepLen;
|
||||
}
|
||||
for (k = 0; k < pNoticeRef->cNoticeNumbers; k++)
|
||||
{
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += 4 * strlenW(indent);
|
||||
charsNeeded += 4 * lstrlenW(indent);
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += noticeNumLen;
|
||||
|
|
@ -707,17 +707,17 @@ static BOOL CRYPT_FormatUserNotice(DWORD dwCertEncodingType,
|
|||
memcpy(str, noticeNum, noticeNumLen * sizeof(WCHAR));
|
||||
str += noticeNumLen;
|
||||
}
|
||||
sprintfW(noticeNumStr, numFmt, k + 1);
|
||||
charsNeeded += strlenW(noticeNumStr);
|
||||
swprintf(noticeNumStr, numFmt, k + 1);
|
||||
charsNeeded += lstrlenW(noticeNumStr);
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, noticeNumStr);
|
||||
str += strlenW(noticeNumStr);
|
||||
lstrcpyW(str, noticeNumStr);
|
||||
str += lstrlenW(noticeNumStr);
|
||||
}
|
||||
charsNeeded += sepLen;
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, sep);
|
||||
lstrcpyW(str, sep);
|
||||
str += sepLen;
|
||||
}
|
||||
}
|
||||
|
|
@ -726,15 +726,15 @@ static BOOL CRYPT_FormatUserNotice(DWORD dwCertEncodingType,
|
|||
{
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += 3 * strlenW(indent);
|
||||
charsNeeded += 3 * lstrlenW(indent);
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += noticeTextLen;
|
||||
|
|
@ -743,16 +743,16 @@ static BOOL CRYPT_FormatUserNotice(DWORD dwCertEncodingType,
|
|||
memcpy(str, noticeText, noticeTextLen * sizeof(WCHAR));
|
||||
str += noticeTextLen;
|
||||
}
|
||||
charsNeeded += strlenW(notice->pszDisplayText);
|
||||
charsNeeded += lstrlenW(notice->pszDisplayText);
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, notice->pszDisplayText);
|
||||
str += strlenW(notice->pszDisplayText);
|
||||
lstrcpyW(str, notice->pszDisplayText);
|
||||
str += lstrlenW(notice->pszDisplayText);
|
||||
}
|
||||
charsNeeded += sepLen;
|
||||
if (str && *pcchStr >= charsNeeded)
|
||||
{
|
||||
strcpyW(str, sep);
|
||||
lstrcpyW(str, sep);
|
||||
str += sepLen;
|
||||
}
|
||||
}
|
||||
|
|
@ -826,8 +826,8 @@ BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType,
|
|||
headingSep = colonSpace;
|
||||
sep = commaSep;
|
||||
}
|
||||
sepLen = strlenW(sep);
|
||||
headingSepLen = strlenW(headingSep);
|
||||
sepLen = lstrlenW(sep);
|
||||
headingSepLen = lstrlenW(headingSep);
|
||||
|
||||
for (i = 0; ret && i < policies->cPolicyInfo; i++)
|
||||
{
|
||||
|
|
@ -838,12 +838,12 @@ BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType,
|
|||
charsNeeded += 1; /* '['*/
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
*str++ = '[';
|
||||
sprintfW(policyNum, numFmt, i + 1);
|
||||
charsNeeded += strlenW(policyNum);
|
||||
swprintf(policyNum, numFmt, i + 1);
|
||||
charsNeeded += lstrlenW(policyNum);
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, policyNum);
|
||||
str += strlenW(policyNum);
|
||||
lstrcpyW(str, policyNum);
|
||||
str += lstrlenW(policyNum);
|
||||
}
|
||||
charsNeeded += 1; /* ']'*/
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
|
|
@ -857,16 +857,16 @@ BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType,
|
|||
charsNeeded += headingSepLen;
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, headingSep);
|
||||
lstrcpyW(str, headingSep);
|
||||
str += headingSepLen;
|
||||
}
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += strlenW(indent);
|
||||
charsNeeded += lstrlenW(indent);
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += policyIdLen;
|
||||
|
|
@ -885,7 +885,7 @@ BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType,
|
|||
charsNeeded += sepLen;
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, sep);
|
||||
lstrcpyW(str, sep);
|
||||
str += sepLen;
|
||||
}
|
||||
for (j = 0; j < policy->cPolicyQualifier; j++)
|
||||
|
|
@ -896,31 +896,31 @@ BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType,
|
|||
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += strlenW(indent);
|
||||
charsNeeded += lstrlenW(indent);
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += 1; /* '['*/
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
*str++ = '[';
|
||||
charsNeeded += strlenW(policyNum);
|
||||
charsNeeded += lstrlenW(policyNum);
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, policyNum);
|
||||
str += strlenW(policyNum);
|
||||
lstrcpyW(str, policyNum);
|
||||
str += lstrlenW(policyNum);
|
||||
}
|
||||
charsNeeded += 1; /* ','*/
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
*str++ = ',';
|
||||
sprintfW(policyQualifierNum, numFmt, j + 1);
|
||||
charsNeeded += strlenW(policyQualifierNum);
|
||||
swprintf(policyQualifierNum, numFmt, j + 1);
|
||||
charsNeeded += lstrlenW(policyQualifierNum);
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, policyQualifierNum);
|
||||
str += strlenW(policyQualifierNum);
|
||||
lstrcpyW(str, policyQualifierNum);
|
||||
str += lstrlenW(policyQualifierNum);
|
||||
}
|
||||
charsNeeded += 1; /* ']'*/
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
|
|
@ -935,18 +935,18 @@ BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType,
|
|||
charsNeeded += headingSepLen;
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, headingSep);
|
||||
lstrcpyW(str, headingSep);
|
||||
str += headingSepLen;
|
||||
}
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += 2 * strlenW(indent);
|
||||
charsNeeded += 2 * lstrlenW(indent);
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += policyQualifierIdLen;
|
||||
|
|
@ -989,18 +989,18 @@ BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType,
|
|||
charsNeeded += sepLen;
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, sep);
|
||||
lstrcpyW(str, sep);
|
||||
str += sepLen;
|
||||
}
|
||||
if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
|
||||
{
|
||||
charsNeeded += 2 * strlenW(indent);
|
||||
charsNeeded += 2 * lstrlenW(indent);
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
strcpyW(str, indent);
|
||||
str += strlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
lstrcpyW(str, indent);
|
||||
str += lstrlenW(indent);
|
||||
}
|
||||
}
|
||||
charsNeeded += qualifierLen;
|
||||
|
|
@ -1012,7 +1012,7 @@ BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType,
|
|||
charsNeeded += headingSepLen;
|
||||
if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR))
|
||||
{
|
||||
strcpyW(str, headingSep);
|
||||
lstrcpyW(str, headingSep);
|
||||
str += headingSepLen;
|
||||
}
|
||||
/* This if block is deliberately redundant with the same if
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ dll/win32/comdlg32 # Synced to WineStaging-4.18
|
|||
dll/win32/compstui # Synced to WineStaging-4.18
|
||||
dll/win32/credui # Synced to WineStaging-4.18
|
||||
dll/win32/crypt32 # Synced to WineStaging-4.0
|
||||
dll/win32/cryptdlg # Synced to WineStaging-3.3
|
||||
dll/win32/cryptdlg # Synced to WineStaging-4.18
|
||||
dll/win32/cryptdll # Synced to WineStaging-3.3
|
||||
dll/win32/cryptnet # Synced to WineStaging-3.3
|
||||
dll/win32/cryptui # Synced to WineStaging-4.0
|
||||
|
|
|
|||
Loading…
Reference in a new issue