November 2008 - Wine-commits

Dylan Smith : include: Added missing macros for EM_SETIMESTATUS and EM_GETIMESTATUS.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: c51f100f2f83b531c664dc0e0fdbae1d88234200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51f100f2f83b531c664dc0e0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Nov 15 21:01:40 2008 -0500 include: Added missing macros for EM_SETIMESTATUS and EM_GETIMESTATUS. --- include/winuser.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 142837f..8382a07 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -965,6 +965,8 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define EM_GETLIMITTEXT 0x00d5 #define EM_POSFROMCHAR 0x00d6 #define EM_CHARFROMPOS 0x00d7 +#define EM_SETIMESTATUS 0x00d8 +#define EM_GETIMESTATUS 0x00d9 /* a name change since win95 */ #define EM_SETLIMITTEXT EM_LIMITTEXT

1 0

Juan Lang : crypt32: Implement CryptFormatObject for alternate names.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 83f7f9b0ff2ff23e588c38f2463c4ba4dfb1d86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f7f9b0ff2ff23e588c38f24… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 12:31:28 2008 -0800 crypt32: Implement CryptFormatObject for alternate names. --- dlls/crypt32/object.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index eb19ed4..fdab616 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1002,6 +1002,24 @@ static BOOL CRYPT_FormatAltNameInfo(DWORD dwFormatStrType, DWORD indentLevel, static const WCHAR colonSep[] = { ':',' ',0 }; +static BOOL WINAPI CRYPT_FormatAltName(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + BOOL ret; + CERT_ALT_NAME_INFO *info; + DWORD size; + + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_ALTERNATE_NAME, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size))) + { + ret = CRYPT_FormatAltNameInfo(dwFormatStrType, 0, info, pbFormat, pcbFormat); + LocalFree(info); + } + return ret; +} + static BOOL CRYPT_FormatCertIssuer(DWORD dwFormatStrType, CERT_ALT_NAME_INFO *issuer, LPWSTR str, DWORD *pcbStr) { @@ -1956,6 +1974,9 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, { switch (LOWORD(lpszStructType)) { + case LOWORD(X509_ALTERNATE_NAME): + format = CRYPT_FormatAltName; + break; case LOWORD(X509_BASIC_CONSTRAINTS2): format = CRYPT_FormatBasicConstraints2; break; @@ -1976,6 +1997,14 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, break; } } + else if (!strcmp(lpszStructType, szOID_SUBJECT_ALT_NAME)) + format = CRYPT_FormatAltName; + else if (!strcmp(lpszStructType, szOID_ISSUER_ALT_NAME)) + format = CRYPT_FormatAltName; + else if (!strcmp(lpszStructType, szOID_SUBJECT_ALT_NAME2)) + format = CRYPT_FormatAltName; + else if (!strcmp(lpszStructType, szOID_ISSUER_ALT_NAME2)) + format = CRYPT_FormatAltName; else if (!strcmp(lpszStructType, szOID_BASIC_CONSTRAINTS2)) format = CRYPT_FormatBasicConstraints2; else if (!strcmp(lpszStructType, szOID_AUTHORITY_INFO_ACCESS))

1 0

Maarten Lankhorst : Revert "quartz: Reaching a renderer in the filtergraph is not an error."
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: f57896484c147f7c937f780c322a2d1cc55cff60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57896484c147f7c937f780c3… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Nov 14 22:50:34 2008 +0100 Revert "quartz: Reaching a renderer in the filtergraph is not an error." This is plain wrong, input pin and output pin are supposed to be connected to each other, not the input pin being connected to a renderer pin and NOT reaching output pin --- dlls/quartz/filtergraph.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8b68d2f..7b773ef 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1030,8 +1030,9 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, if (SUCCEEDED(hr)) { unsigned int i; if (nb == 0) { - TRACE("Reached a renderer\n"); - break; + IPin_Disconnect(ppinfilter); + IPin_Disconnect(ppinOut); + goto error; } TRACE("pins to consider: %d\n", nb); for(i = 0; i < nb; i++)

1 0

Juan Lang : crypt32: Indent directory name when formatting an alt name entry.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 4c3474c0ed5cd8895d99da3e161c262b7841dd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3474c0ed5cd8895d99da3e1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 10:02:10 2008 -0800 crypt32: Indent directory name when formatting an alt name entry. --- dlls/crypt32/object.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 6f8d8fc..0bbc6a3 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -761,6 +761,7 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, WCHAR ipAddrBuf[32]; WCHAR maskBuf[16]; DWORD bytesNeeded = sizeof(WCHAR); + DWORD strType = CERT_X500_NAME_STR | CERT_NAME_STR_REVERSE_FLAG; if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) bytesNeeded += indentLevel * strlenW(indent) * sizeof(WCHAR); @@ -780,11 +781,12 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, break; case CERT_ALT_NAME_DIRECTORY_NAME: { - DWORD strType = dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE - ? CERT_NAME_STR_CRLF_FLAG : 0; - DWORD directoryNameLen = CertNameToStrW(X509_ASN_ENCODING, - &entry->u.DirectoryName, strType, NULL, 0); + DWORD directoryNameLen; + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + strType |= CERT_NAME_STR_CRLF_FLAG; + directoryNameLen = cert_name_to_str_with_indent(X509_ASN_ENCODING, + indentLevel + 1, &entry->u.DirectoryName, strType, NULL, 0); LoadStringW(hInstance, IDS_ALT_NAME_DIRECTORY_NAME, buf, sizeof(buf) / sizeof(buf[0])); bytesNeeded += (directoryNameLen - 1) * sizeof(WCHAR); @@ -891,14 +893,10 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, strcpyW(str, entry->u.pwszURL); break; case CERT_ALT_NAME_DIRECTORY_NAME: - { - DWORD strType = dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE - ? CERT_NAME_STR_CRLF_FLAG : 0; - - CertNameToStrW(X509_ASN_ENCODING, &entry->u.DirectoryName, - strType, str, bytesNeeded / sizeof(WCHAR)); + cert_name_to_str_with_indent(X509_ASN_ENCODING, + indentLevel + 1, &entry->u.DirectoryName, strType, str, + bytesNeeded / sizeof(WCHAR)); break; - } case CERT_ALT_NAME_IP_ADDRESS: if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) {

1 0

Juan Lang : crypt32: When formatting a directory name as a multiline string , put a newline between the heading and the value.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: d3cfe743a1a4a480c11ec1b44ac67bb715615fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cfe743a1a4a480c11ec1b44… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 10:25:40 2008 -0800 crypt32: When formatting a directory name as a multiline string, put a newline between the heading and the value. --- dlls/crypt32/crypt32_En.rc | 2 +- dlls/crypt32/object.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 5744d5c..1f6876b 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -181,7 +181,7 @@ STRINGTABLE DISCARDABLE IDS_ALT_NAME_OTHER_NAME "Other Name=" IDS_ALT_NAME_RFC822_NAME "Email Address=" IDS_ALT_NAME_DNS_NAME "DNS Name=" - IDS_ALT_NAME_DIRECTORY_NAME "Directory Name=" + IDS_ALT_NAME_DIRECTORY_NAME "Directory Address" IDS_ALT_NAME_URL "URL=" IDS_ALT_NAME_IP_ADDRESS "IP Address=" IDS_ALT_NAME_MASK "Mask=" diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 0bbc6a3..eb19ed4 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -751,6 +751,7 @@ static BOOL CRYPT_FormatCertSerialNumber(CRYPT_DATA_BLOB *serialNum, LPWSTR str, } static const WCHAR indent[] = { ' ',' ',' ',' ',' ',0 }; +static const WCHAR colonCrlf[] = { ':','\r','\n',0 }; static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, CERT_ALT_NAME_ENTRY *entry, LPWSTR str, DWORD *pcbStr) @@ -790,6 +791,10 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, LoadStringW(hInstance, IDS_ALT_NAME_DIRECTORY_NAME, buf, sizeof(buf) / sizeof(buf[0])); bytesNeeded += (directoryNameLen - 1) * sizeof(WCHAR); + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + bytesNeeded += strlenW(colonCrlf) * sizeof(WCHAR); + else + bytesNeeded += sizeof(WCHAR); /* '=' */ ret = TRUE; break; } @@ -893,6 +898,13 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, strcpyW(str, entry->u.pwszURL); break; case CERT_ALT_NAME_DIRECTORY_NAME: + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + strcpyW(str, colonCrlf); + str += strlenW(colonCrlf); + } + else + *str++ = '='; cert_name_to_str_with_indent(X509_ASN_ENCODING, indentLevel + 1, &entry->u.DirectoryName, strType, str, bytesNeeded / sizeof(WCHAR)); @@ -988,7 +1000,6 @@ static BOOL CRYPT_FormatAltNameInfo(DWORD dwFormatStrType, DWORD indentLevel, return ret; } -static const WCHAR colonCrlf[] = { ':','\r','\n',0 }; static const WCHAR colonSep[] = { ':',' ',0 }; static BOOL CRYPT_FormatCertIssuer(DWORD dwFormatStrType,

1 0

Juan Lang : crypt32: Use correct string for directory names in a CERT_ALT_NAME_ENTRY.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 3b81c62b5ceb144738f88d5a5ffc8005790e67d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b81c62b5ceb144738f88d5a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 09:01:16 2008 -0800 crypt32: Use correct string for directory names in a CERT_ALT_NAME_ENTRY. --- dlls/crypt32/object.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 2893f6f..6f8d8fc 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -785,7 +785,7 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, DWORD directoryNameLen = CertNameToStrW(X509_ASN_ENCODING, &entry->u.DirectoryName, strType, NULL, 0); - LoadStringW(hInstance, IDS_ALT_NAME_OTHER_NAME, buf, + LoadStringW(hInstance, IDS_ALT_NAME_DIRECTORY_NAME, buf, sizeof(buf) / sizeof(buf[0])); bytesNeeded += (directoryNameLen - 1) * sizeof(WCHAR); ret = TRUE;

1 0

Juan Lang : crypt32: Add a function to format a CERT_NAME_BLOB as an indented string, and implement CertNameToStrW on top of it.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: e9352b90f8fae23de3c0ba8188bbe108dd029c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9352b90f8fae23de3c0ba818… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 09:59:00 2008 -0800 crypt32: Add a function to format a CERT_NAME_BLOB as an indented string, and implement CertNameToStrW on top of it. --- dlls/crypt32/crypt32_private.h | 7 +++++++ dlls/crypt32/str.c | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 119e30e..b0f6101 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -287,6 +287,13 @@ BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store); void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info); /** + * String functions + */ + +DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indent, + PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz); + +/** * Context functions */ diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index b1ccc91..d3bca2b 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -338,8 +338,10 @@ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) return chars; } -DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, - DWORD dwStrType, LPWSTR psz, DWORD csz) +static const WCHAR indent[] = { ' ',' ',' ',' ',' ',0 }; + +DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, + PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz) { static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG | CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG; @@ -352,8 +354,6 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, BOOL bRet; CERT_NAME_INFO *info; - TRACE("(%d, %p, %08x, %p, %d)\n", dwCertEncodingType, pName, dwStrType, - psz, csz); if (dwStrType & unsupportedFlags) FIXME("unsupported flags: %08x\n", dwStrType & unsupportedFlags); @@ -402,6 +402,22 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, else prefixA = rdn->rgRDNAttr[j].pszObjId; } + if (dwStrType & CERT_NAME_STR_CRLF_FLAG) + { + DWORD k; + + for (k = 0; k < indentLevel; k++) + { + if (psz) + { + chars = min(strlenW(indent), csz - ret - 1); + memcpy(psz + ret, indent, chars * sizeof(WCHAR)); + } + else + chars = strlenW(indent); + ret += chars; + } + } if (prefixW) { /* - 1 is needed to account for the NULL terminator. */ @@ -448,6 +464,19 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, } else ret++; + return ret; +} + +DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, + DWORD dwStrType, LPWSTR psz, DWORD csz) +{ + BOOL ret; + + TRACE("(%d, %p, %08x, %p, %d)\n", dwCertEncodingType, pName, dwStrType, + psz, csz); + + ret = cert_name_to_str_with_indent(dwCertEncodingType, 0, pName, dwStrType, + psz, csz); TRACE("Returning %s\n", debugstr_w(psz)); return ret; }

1 0

Ricardo Filipe : crypt32: Added Portuguese translation.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 42944e82e558beeb69e41012ddce4df7eb88bf03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42944e82e558beeb69e41012d… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 12 11:47:45 2008 +0000 crypt32: Added Portuguese translation. --- dlls/crypt32/crypt32.rc | 1 + dlls/crypt32/crypt32_Pt.rc | 220 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42944e82e558beeb69e41…

1 0

Ricardo Filipe : winspool.drv: Added Portuguese translation.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 6555ea262c065f6fa8aa92dd592ccf09d4b86eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6555ea262c065f6fa8aa92dd5… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 12 11:52:56 2008 +0000 winspool.drv: Added Portuguese translation. --- dlls/winspool.drv/Pt.rc | 39 +++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.rc | 1 + 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Pt.rc b/dlls/winspool.drv/Pt.rc new file mode 100644 index 0000000..f00dc0c --- /dev/null +++ b/dlls/winspool.drv/Pt.rc @@ -0,0 +1,39 @@ +/* + * Portuguese resources for winspool + * + * Copyright 2008 Ricardo Filipe + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Imprimir para Ficheiro" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nome de Ficheiro de Destino:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "Porta Local" + IDS_FILE_EXISTS "O ficheiro de destino j� existe. Clique OK para reescrever." + IDS_CANNOT_OPEN "Imposs�vel criar o ficheiro de destino." +} diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index 8fd7cb5..805dab6 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -52,6 +52,7 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Pt.rc" #include "Ru.rc" #include "Si.rc" #include "Sv.rc"

1 0

Juan Lang : crypt32: Correct heading for a certificate issuer in a CERT_AUTHORITY_KEY_ID2.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: e987ecc3e7b3d4f45a7db83ad8f93b2c9fe818ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e987ecc3e7b3d4f45a7db83ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 09:00:23 2008 -0800 crypt32: Correct heading for a certificate issuer in a CERT_AUTHORITY_KEY_ID2. --- dlls/crypt32/crypt32_En.rc | 2 +- dlls/crypt32/object.c | 31 ++++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 3e08476..5744d5c 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -176,7 +176,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { IDS_KEY_ID "KeyID=" - IDS_CERT_ISSUER "Certificate Issuer: " + IDS_CERT_ISSUER "Certificate Issuer" IDS_CERT_SERIAL_NUMBER "Certificate Serial Number=" IDS_ALT_NAME_OTHER_NAME "Other Name=" IDS_ALT_NAME_RFC822_NAME "Email Address=" diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 6e79038..2893f6f 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -990,17 +990,32 @@ static BOOL CRYPT_FormatAltNameInfo(DWORD dwFormatStrType, DWORD indentLevel, return ret; } +static const WCHAR colonCrlf[] = { ':','\r','\n',0 }; +static const WCHAR colonSep[] = { ':',' ',0 }; + static BOOL CRYPT_FormatCertIssuer(DWORD dwFormatStrType, CERT_ALT_NAME_INFO *issuer, LPWSTR str, DWORD *pcbStr) { WCHAR buf[MAX_STRING_RESOURCE_LEN]; - DWORD bytesNeeded; + DWORD bytesNeeded, sepLen; + LPCWSTR sep; BOOL ret; LoadStringW(hInstance, IDS_CERT_ISSUER, buf, sizeof(buf) / sizeof(buf[0])); - ret = CRYPT_FormatAltNameInfo(dwFormatStrType, 0, issuer, NULL, + ret = CRYPT_FormatAltNameInfo(dwFormatStrType, 1, issuer, NULL, &bytesNeeded); bytesNeeded += strlenW(buf) * sizeof(WCHAR); + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + sep = colonCrlf; + sepLen = strlenW(colonCrlf) * sizeof(WCHAR); + } + else + { + sep = colonSep; + sepLen = strlenW(colonSep) * sizeof(WCHAR); + } + bytesNeeded += sepLen; if (ret) { if (!str) @@ -1015,9 +1030,11 @@ static BOOL CRYPT_FormatCertIssuer(DWORD dwFormatStrType, { *pcbStr = bytesNeeded; strcpyW(str, buf); - str += strlenW(str); bytesNeeded -= strlenW(str) * sizeof(WCHAR); - ret = CRYPT_FormatAltNameInfo(dwFormatStrType, 0, issuer, str, + str += strlenW(str); + strcpyW(str, sep); + str += sepLen / sizeof(WCHAR); + ret = CRYPT_FormatAltNameInfo(dwFormatStrType, 1, issuer, str, &bytesNeeded); } } @@ -1157,16 +1174,14 @@ static BOOL WINAPI CRYPT_FormatAuthorityKeyId2(DWORD dwCertEncodingType, return ret; } -static const WCHAR colonCrlf[] = { ':','\r','\n',0 }; - static WCHAR aia[MAX_STRING_RESOURCE_LEN]; static WCHAR accessMethod[MAX_STRING_RESOURCE_LEN]; static WCHAR ocsp[MAX_STRING_RESOURCE_LEN]; static WCHAR caIssuers[MAX_STRING_RESOURCE_LEN]; static WCHAR unknown[MAX_STRING_RESOURCE_LEN]; static WCHAR accessLocation[MAX_STRING_RESOURCE_LEN]; -static BOOL WINAPI CRYPT_FormatAuthorityInfoAccess(DWORD dwCertEncodingType, +static BOOL WINAPI CRYPT_FormatAuthorityInfoAccess(DWORD dwCertEncodingType, DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, DWORD *pcbFormat) @@ -1209,7 +1224,6 @@ static BOOL WINAPI CRYPT_FormatAuthorityInfoAccess(DWORD dwCertEncodingType, } else { - static const WCHAR colonSep[] = { ':',' ',0 }; static const WCHAR numFmt[] = { '%','d',0 }; static const WCHAR equal[] = { '=',0 }; static BOOL stringsLoaded = FALSE; @@ -1492,7 +1506,6 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType, pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size))) { static const WCHAR numFmt[] = { '%','d',0 }; - static const WCHAR colonSep[] = { ':',' ',0 }; static const WCHAR commaSep[] = { ',',' ',0 }; static const WCHAR colon[] = { ':',0 }; static BOOL stringsLoaded = FALSE;

1 0