wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Jacek Caban : winex11: Use ntdll for Unicode conversion.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 0e37ee61b577ca1ec337718ef8681f9a40a8150a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e37ee61b577ca1ec337718e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 21:18:38 2022 +0200 winex11: Use ntdll for Unicode conversion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 56 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 30534af6bf3..506d1a81f0f 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -672,6 +672,35 @@ char *get_unix_file_name( const WCHAR *dosW ) } +static CPTABLEINFO *get_xstring_cp(void) +{ + static CPTABLEINFO cp; + if (!cp.CodePage) + { + USHORT *ptr; + SIZE_T nls_size; + if (NtGetNlsSectionPtr( 11, 28591, NULL, (void **)&ptr, &nls_size )) return NULL; + RtlInitCodePageTable( ptr, &cp ); + } + return &cp; +} + + +static CPTABLEINFO *get_ansi_cp(void) +{ + USHORT utf8_hdr[2] = { 0, CP_UTF8 }; + static CPTABLEINFO cp; + if (!cp.CodePage) + { + if (NtCurrentTeb()->Peb->AnsiCodePageData) + RtlInitCodePageTable( NtCurrentTeb()->Peb->AnsiCodePageData, &cp ); + else + RtlInitCodePageTable( utf8_hdr, &cp ); + } + return &cp; +} + + /*********************************************************************** * uri_to_dos * @@ -788,8 +817,8 @@ static void *import_string( Atom type, const void *data, size_t size, size_t *re WCHAR *ret; if (!(ret = malloc( (size * 2 + 1) * sizeof(WCHAR) ))) return NULL; - str_size = MultiByteToWideChar( 28591, 0, data, size, ret + size, size ); - return unicode_text_from_string( ret, ret + size, str_size, ret_size ); + RtlCustomCPToUnicodeN( get_xstring_cp(), ret + size, size * sizeof(WCHAR), &str_size, data, size ); + return unicode_text_from_string( ret, ret + size, str_size / sizeof(WCHAR), ret_size ); } @@ -1301,7 +1330,7 @@ static BOOL export_string( Display *display, Window win, Atom prop, Atom target, char *text; if (!(text = malloc( size ))) return FALSE; - len = WideCharToMultiByte( 28591, 0, data, size / sizeof(WCHAR), text, size, NULL, NULL ); + RtlUnicodeToCustomCPN( get_xstring_cp(), text, size, &len, data, size ); string_from_unicode_text( text, len, &len ); put_property( display, win, prop, target, 8, text, len ); @@ -1476,14 +1505,19 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, if (!drop_files->fWide) { - char *p, *files = (char *)data + drop_files->pFiles; - p = files; - while (*p) p += strlen( p ) + 1; - p++; - - if (!(unicode_data = malloc( (p - files) * sizeof(WCHAR) ))) goto failed; - MultiByteToWideChar( CP_ACP, 0, files, p - files, unicode_data, p - files ); - ptr = unicode_data; + char *files = (char *)data + drop_files->pFiles; + CPTABLEINFO *cp = get_ansi_cp(); + DWORD len = 0; + + while (files[len]) len += strlen( files + len ) + 1; + len++; + + if (!(ptr = unicode_data = malloc( len * sizeof(WCHAR) ))) goto failed; + + if (cp->CodePage == CP_UTF8) + RtlUTF8ToUnicodeN( unicode_data, len * sizeof(WCHAR), &len, files, len ); + else + RtlCustomCPToUnicodeN( cp, unicode_data, len * sizeof(WCHAR), &len, files, len ); } else ptr = (const WCHAR *)((char *)data + drop_files->pFiles);

1 0

Jacek Caban : winex11: Directly use wine_nt_to_unix_file_name to get Unix path name.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 12326097116b1e60b191e274d9199814323610c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12326097116b1e60b191e274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 21:07:09 2022 +0200 winex11: Directly use wine_nt_to_unix_file_name to get Unix path name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 80 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 430bc6c1c81..30534af6bf3 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -76,6 +76,8 @@ #include <time.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "x11drv.h" #ifdef HAVE_X11_EXTENSIONS_XFIXES_H @@ -598,6 +600,78 @@ static WCHAR *get_dos_file_name( const char *path ) } +/*********************************************************************** + * get_nt_pathname + * + * Simplified version of RtlDosPathNameToNtPathName_U. + */ +static BOOL get_nt_pathname( const WCHAR *name, UNICODE_STRING *nt_name ) +{ + static const WCHAR ntprefixW[] = {'\\','?','?','\\'}; + static const WCHAR uncprefixW[] = {'U','N','C','\\'}; + size_t len = lstrlenW( name ); + WCHAR *ptr; + + nt_name->MaximumLength = (len + 8) * sizeof(WCHAR); + if (!(ptr = malloc( nt_name->MaximumLength ))) return FALSE; + nt_name->Buffer = ptr; + + memcpy( ptr, ntprefixW, sizeof(ntprefixW) ); + ptr += ARRAYSIZE(ntprefixW); + if (name[0] == '\\' && name[1] == '\\') + { + if ((name[2] == '.' || name[2] == '?') && name[3] == '\\') + { + name += 4; + len -= 4; + } + else + { + memcpy( ptr, uncprefixW, sizeof(uncprefixW) ); + ptr += ARRAYSIZE(uncprefixW); + name += 2; + len -= 2; + } + } + memcpy( ptr, name, (len + 1) * sizeof(WCHAR) ); + ptr += len; + nt_name->Length = (ptr - nt_name->Buffer) * sizeof(WCHAR); + return TRUE; +} + + +/* based on wine_get_unix_file_name */ +char *get_unix_file_name( const WCHAR *dosW ) +{ + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + ULONG size = 256; + char *buffer; + + if (!get_nt_pathname( dosW, &nt_name )) return NULL; + InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); + for (;;) + { + if (!(buffer = malloc( size ))) + { + free( nt_name.Buffer ); + return NULL; + } + status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); + if (status != STATUS_BUFFER_TOO_SMALL) break; + free( buffer ); + } + free( nt_name.Buffer ); + if (status) + { + free( buffer ); + return NULL; + } + return buffer; +} + + /*********************************************************************** * uri_to_dos * @@ -1421,7 +1495,7 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, UINT uriSize; UINT u; - unixFilename = wine_get_unix_file_name( ptr ); + unixFilename = get_unix_file_name( ptr ); if (unixFilename == NULL) goto failed; ptr += lstrlenW( ptr ) + 1; @@ -1439,7 +1513,7 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, } else { - HeapFree(GetProcessHeap(), 0, unixFilename); + free( unixFilename ); goto failed; } } @@ -1455,7 +1529,7 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, } textUriList[next++] = '\r'; textUriList[next++] = '\n'; - HeapFree(GetProcessHeap(), 0, unixFilename); + free( unixFilename ); } put_property( display, win, prop, target, 8, textUriList, next ); free( textUriList );

1 0

Jacek Caban : winex11: Use ntdll_umbstowcs and ntdll_wcstoumbs for Unicode conversion.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: c0a8b2dbd55e8d7e1e66960076ec07da645e85d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0a8b2dbd55e8d7e1e669600… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 20:59:57 2022 +0200 winex11: Use ntdll_umbstowcs and ntdll_wcstoumbs for Unicode conversion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 14 +++++++------- dlls/winex11.drv/keyboard.c | 12 ++++++------ dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/wintab.c | 6 +++--- dlls/winex11.drv/x11drv.h | 13 +++++++++++++ dlls/winex11.drv/xim.c | 39 +++++++++++++++------------------------ 7 files changed, 47 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0a8b2dbd55e8d7e1e66…

1 0

Jacek Caban : winex11: Use passed point in handle_position_event.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 03e8991735f9c5f0634821e680015a1dd747f6a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e8991735f9c5f0634821e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 15:13:32 2022 +0200 winex11: Use passed point in handle_position_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 8240bbbf5d6..d5ae510db49 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -185,7 +185,7 @@ static BOOL handle_position_event( struct dnd_position_event_params *params ) int accept = 0; /* Assume we're not accepting */ IDropTarget *dropTarget = NULL; DWORD effect = params->effect; - POINTL pointl; + POINTL pointl = { .x = params->point.x, .y = params->point.y }; HWND targetWindow; HRESULT hr;

1 0

Jacek Caban : win32u: Use NT interface for MsgWaitForMultipleObjectsEx user driver entry point.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: ac9b63580018354c5a7c9164bb5c781b9e2b6cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac9b63580018354c5a7c9164… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 13:23:42 2022 +0200 win32u: Use NT interface for MsgWaitForMultipleObjectsEx user driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dce.c | 3 ++- dlls/win32u/driver.c | 28 ++++++---------------------- dlls/win32u/input.c | 3 ++- dlls/win32u/message.c | 20 ++++++++++++++++++-- dlls/wineandroid.drv/android.h | 5 +++-- dlls/wineandroid.drv/window.c | 9 +++++---- dlls/winemac.drv/event.c | 18 +++++++++--------- dlls/winemac.drv/macdrv.h | 5 +++-- dlls/winex11.drv/event.c | 18 +++++++++--------- dlls/winex11.drv/x11drv.h | 5 +++-- include/wine/gdi_driver.h | 4 ++-- 11 files changed, 62 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9b63580018354c5a7c…

1 0

Jacek Caban : win32u: Move normalize_std_handle call to NtUserMsgWaitForMultipleObjectsEx.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 365bc308bed3391fe3cc9c6ac8fc34c7a484d9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=365bc308bed3391fe3cc9c6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 12:43:13 2022 +0200 win32u: Move normalize_std_handle call to NtUserMsgWaitForMultipleObjectsEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/driver.c | 22 +--------------------- dlls/win32u/message.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 175fde1fa40..ebc512bb4ee 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -792,35 +792,15 @@ static inline LARGE_INTEGER *get_nt_timeout( LARGE_INTEGER *time, DWORD timeout return time; } -static HANDLE normalize_std_handle( HANDLE handle ) -{ - if (handle == (HANDLE)STD_INPUT_HANDLE) - return NtCurrentTeb()->Peb->ProcessParameters->hStdInput; - if (handle == (HANDLE)STD_OUTPUT_HANDLE) - return NtCurrentTeb()->Peb->ProcessParameters->hStdOutput; - if (handle == (HANDLE)STD_ERROR_HANDLE) - return NtCurrentTeb()->Peb->ProcessParameters->hStdError; - - return handle; -} - static DWORD nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { NTSTATUS status; - HANDLE hloc[MAXIMUM_WAIT_OBJECTS]; LARGE_INTEGER time; - unsigned int i; if (!count && !timeout) return WAIT_TIMEOUT; - if (count > MAXIMUM_WAIT_OBJECTS) - { - SetLastError(ERROR_INVALID_PARAMETER); - return WAIT_FAILED; - } - for (i = 0; i < count; i++) hloc[i] = normalize_std_handle( handles[i] ); - status = NtWaitForMultipleObjects( count, hloc, !(flags & MWMO_WAITALL), !!(flags & MWMO_ALERTABLE), + status = NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), !!(flags & MWMO_ALERTABLE), get_nt_timeout( &time, timeout ) ); if (HIWORD(status)) /* is it an error code? */ { diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d43dca723d2..67990e7b1f4 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1963,6 +1963,18 @@ static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, return ret; } +static HANDLE normalize_std_handle( HANDLE handle ) +{ + if (handle == (HANDLE)STD_INPUT_HANDLE) + return NtCurrentTeb()->Peb->ProcessParameters->hStdInput; + if (handle == (HANDLE)STD_OUTPUT_HANDLE) + return NtCurrentTeb()->Peb->ProcessParameters->hStdOutput; + if (handle == (HANDLE)STD_ERROR_HANDLE) + return NtCurrentTeb()->Peb->ProcessParameters->hStdError; + + return handle; +} + /*********************************************************************** * NtUserMsgWaitForMultipleObjectsEx (win32u.@) */ @@ -1979,7 +1991,7 @@ DWORD WINAPI NtUserMsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handl } /* add the queue to the handle list */ - for (i = 0; i < count; i++) wait_handles[i] = handles[i]; + for (i = 0; i < count; i++) wait_handles[i] = normalize_std_handle( handles[i] ); wait_handles[count] = get_server_queue_handle(); return wait_objects( count+1, wait_handles, timeout,

1 0

Eric Pouech : include/msvcrt: Redefine towlower* & towupper* with wint_t types.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 69ab9568b28b594160ffae3ce5fef9439fe74ae3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ab9568b28b594160ffae3c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon May 2 16:10:42 2022 +0200 include/msvcrt: Redefine towlower* & towupper* with wint_t types. It conflicts in C++ compilation with MINGW builtin definitions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wctype.h | 8 ++++---- include/msvcrt/wctype.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index 33f91db9719..9661ab5e596 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -36,8 +36,8 @@ _ACRTIMP int __cdecl _iswprint_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswpunct_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswspace_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswupper_l(wint_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towupper_l(wchar_t,_locale_t); +_ACRTIMP wint_t __cdecl _towlower_l(wint_t,_locale_t); +_ACRTIMP wint_t __cdecl _towupper_l(wint_t,_locale_t); _ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); _ACRTIMP int __cdecl isleadbyte(int); _ACRTIMP int __cdecl iswalnum(wint_t); @@ -54,8 +54,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #ifdef __cplusplus } diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index 2cf4636a88b..27a6adcd922 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -64,8 +64,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #endif /* _WCTYPE_DEFINED */ typedef wchar_t wctrans_t;

1 0

Paul Gofman : crypt32: Reimplement CertNameToStrA() on top of CertNameToStrW().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: c515e55d71b233078009a04e0f7baac4b2450485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c515e55d71b233078009a04e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 14 18:57:26 2022 +0300 crypt32: Reimplement CertNameToStrA() on top of CertNameToStrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/str.c | 250 ++++------------------------------------------- dlls/crypt32/tests/str.c | 107 ++++++++++---------- 2 files changed, 72 insertions(+), 285 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c515e55d71b233078009…

1 0

Paul Gofman : crypt32: Reimplement CertRDNValueToStrA() on top of CertRDNValueToStrW().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: f560aab5f630c3432a9650ce03178ea67bc235db URL: https://source.winehq.org/git/wine.git/?a=commit;h=f560aab5f630c3432a9650ce… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 14 17:49:17 2022 +0300 crypt32: Reimplement CertRDNValueToStrA() on top of CertRDNValueToStrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/str.c | 80 +++++++++++++++--------------------------------- dlls/crypt32/tests/str.c | 52 +++++++++++++++++-------------- 2 files changed, 53 insertions(+), 79 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 5ddad1ff4e6..29882ab771e 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -29,70 +29,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); -DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, - LPSTR psz, DWORD csz) +DWORD WINAPI CertRDNValueToStrA(DWORD type, PCERT_RDN_VALUE_BLOB value_blob, + LPSTR value, DWORD value_len) { - DWORD ret = 0, len; + DWORD len, len_mb, ret; + LPWSTR valueW; - TRACE("(%ld, %p, %p, %ld)\n", dwValueType, pValue, psz, csz); + TRACE("(%ld, %p, %p, %ld)\n", type, value_blob, value, value_len); - switch (dwValueType) - { - case CERT_RDN_ANY_TYPE: - break; - case CERT_RDN_NUMERIC_STRING: - case CERT_RDN_PRINTABLE_STRING: - case CERT_RDN_TELETEX_STRING: - case CERT_RDN_VIDEOTEX_STRING: - case CERT_RDN_IA5_STRING: - case CERT_RDN_GRAPHIC_STRING: - case CERT_RDN_VISIBLE_STRING: - case CERT_RDN_GENERAL_STRING: - len = pValue->cbData; - if (!psz || !csz) - ret = len; - else - { - DWORD chars = min(len, csz - 1); + len = CertRDNValueToStrW(type, value_blob, NULL, 0); - if (chars) - { - memcpy(psz, pValue->pbData, chars); - ret += chars; - csz -= chars; - } - } - break; - case CERT_RDN_BMP_STRING: - case CERT_RDN_UTF8_STRING: - len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)pValue->pbData, - pValue->cbData / sizeof(WCHAR), NULL, 0, NULL, NULL); - if (!psz || !csz) - ret = len; - else - { - DWORD chars = min(pValue->cbData / sizeof(WCHAR), csz - 1); + if (!(valueW = CryptMemAlloc(len * sizeof(*valueW)))) + { + ERR("No memory.\n"); + if (value && value_len) *value = 0; + return 1; + } - if (chars) - { - ret = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)pValue->pbData, - chars, psz, csz - 1, NULL, NULL); - csz -= ret; - } - } - break; - default: - FIXME("string type %ld unimplemented\n", dwValueType); + len = CertRDNValueToStrW(type, value_blob, valueW, len); + len_mb = WideCharToMultiByte(CP_ACP, 0, valueW, len, NULL, 0, NULL, NULL); + if (!value || !value_len) + { + CryptMemFree(valueW); + return len_mb; } - if (psz && csz) + + ret = WideCharToMultiByte(CP_ACP, 0, valueW, len, value, value_len, NULL, NULL); + if (ret < len_mb) { - *(psz + ret) = '\0'; - csz--; - ret++; + value[0] = 0; + ret = 1; } - else - ret++; - TRACE("returning %ld (%s)\n", ret, debugstr_a(psz)); + CryptMemFree(valueW); return ret; } diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 1cfdf8ee7b7..be95a796846 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -31,7 +31,6 @@ typedef struct _CertRDNAttrEncoding { DWORD dwValueType; CERT_RDN_VALUE_BLOB Value; LPCSTR str; - BOOL todo; } CertRDNAttrEncoding, *PCertRDNAttrEncoding; typedef struct _CertRDNAttrEncodingW { @@ -133,33 +132,34 @@ static void test_CertRDNValueToStrA(void) { CertRDNAttrEncoding attrs[] = { { "2.5.4.6", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin1), bin1 }, "US", FALSE }, + { sizeof(bin1), bin1 }, "US" }, { "2.5.4.8", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin2), bin2 }, "Minnesota", FALSE }, + { sizeof(bin2), bin2 }, "Minnesota" }, { "2.5.4.7", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin3), bin3 }, "Minneapolis", FALSE }, + { sizeof(bin3), bin3 }, "Minneapolis" }, { "2.5.4.10", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin4), bin4 }, "CodeWeavers", FALSE }, + { sizeof(bin4), bin4 }, "CodeWeavers" }, { "2.5.4.11", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin5), bin5 }, "Wine Development", FALSE }, + { sizeof(bin5), bin5 }, "Wine Development" }, { "2.5.4.3", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin6), bin6 }, "localhost", FALSE }, + { sizeof(bin6), bin6 }, "localhost" }, { "1.2.840.113549.1.9.1", CERT_RDN_IA5_STRING, - { sizeof(bin7), bin7 }, "aric(a)codeweavers.com", FALSE }, + { sizeof(bin7), bin7 }, "aric(a)codeweavers.com" }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin9), bin9 }, "abc\"def", FALSE }, + { sizeof(bin9), bin9 }, "abc\"def" }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin10), bin10 }, "abc'def", FALSE }, + { sizeof(bin10), bin10 }, "abc'def" }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin11), bin11 }, "abc, def", FALSE }, + { sizeof(bin11), bin11 }, "abc, def" }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin12), bin12 }, " abc ", FALSE }, + { sizeof(bin12), bin12 }, " abc " }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin13), bin13 }, "\"def\"", FALSE }, + { sizeof(bin13), bin13 }, "\"def\"" }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin14), bin14 }, "1;3", FALSE }, + { sizeof(bin14), bin14 }, "1;3" }, }; - DWORD i, ret; + unsigned int i; + DWORD ret, len; char buffer[2000]; CERT_RDN_VALUE_BLOB blob = { 0, NULL }; static const char ePKI[] = "ePKI Root Certification Authority"; @@ -177,15 +177,21 @@ static void test_CertRDNValueToStrA(void) for (i = 0; i < ARRAY_SIZE(attrs); i++) { - ret = CertRDNValueToStrA(attrs[i].dwValueType, &attrs[i].Value, + len = CertRDNValueToStrA(attrs[i].dwValueType, &attrs[i].Value, buffer, sizeof(buffer)); - todo_wine_if (attrs[i].todo) - { - ok(ret == strlen(attrs[i].str) + 1, "Expected length %d, got %ld\n", - lstrlenA(attrs[i].str) + 1, ret); - ok(!strcmp(buffer, attrs[i].str), "Expected %s, got %s\n", - attrs[i].str, buffer); - } + ok(len == strlen(attrs[i].str) + 1, "Expected length %d, got %ld\n", + lstrlenA(attrs[i].str) + 1, ret); + ok(!strcmp(buffer, attrs[i].str), "Expected %s, got %s\n", + attrs[i].str, buffer); + memset(buffer, 0xcc, sizeof(buffer)); + ret = CertRDNValueToStrA(attrs[i].dwValueType, &attrs[i].Value, buffer, len - 1); + ok(ret == 1, "Unexpected ret %lu, expected 1, test %u.\n", ret, i); + ok(!buffer[0], "Unexpected value %#x, test %u.\n", buffer[0], i); + ok(!strncmp(buffer + 1, attrs[i].str + 1, len - 2), "Strings do not match, test %u.\n", i); + memset(buffer, 0xcc, sizeof(buffer)); + ret = CertRDNValueToStrA(attrs[i].dwValueType, &attrs[i].Value, buffer, 0); + ok(ret == len, "Unexpected ret %lu, expected %lu, test %u.\n", ret, len, i); + ok((unsigned char)buffer[0] == 0xcc, "Unexpected value %#x, test %u.\n", buffer[0], i); } blob.pbData = bin8; blob.cbData = sizeof(bin8);

1 0

Paul Gofman : crypt32: Fix filling short output in CertGetNameStringA().
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: bc96cfac1171ec4124b6af5903b3e4ab928d2d7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc96cfac1171ec4124b6af59… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 14 14:09:01 2022 +0300 crypt32: Fix filling short output in CertGetNameStringA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/str.c | 60 +++++++++++++++++++++--------------------------- dlls/crypt32/tests/str.c | 8 +++++-- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index ad0c71d697f..5ddad1ff4e6 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1110,46 +1110,38 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, return ret; } -DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, - DWORD dwFlags, void *pvTypePara, LPSTR pszNameString, DWORD cchNameString) +DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT cert, DWORD type, + DWORD flags, void *type_para, LPSTR name, DWORD name_len) { - DWORD ret; + DWORD len, len_mb, ret; + LPWSTR nameW; - TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", pCertContext, dwType, dwFlags, - pvTypePara, pszNameString, cchNameString); + TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", cert, type, flags, type_para, name, name_len); - if (pszNameString) + len = CertGetNameStringW(cert, type, flags, type_para, NULL, 0); + + if (!(nameW = CryptMemAlloc(len * sizeof(*nameW)))) { - LPWSTR wideName; - DWORD nameLen; + ERR("No memory.\n"); + if (name && name_len) *name = 0; + return 1; + } - nameLen = CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, - NULL, 0); - wideName = CryptMemAlloc(nameLen * sizeof(WCHAR)); - if (wideName) - { - CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, - wideName, nameLen); - nameLen = WideCharToMultiByte(CP_ACP, 0, wideName, nameLen, - pszNameString, cchNameString, NULL, NULL); - if (nameLen <= cchNameString) - ret = nameLen; - else - { - pszNameString[cchNameString - 1] = '\0'; - ret = cchNameString; - } - CryptMemFree(wideName); - } - else - { - *pszNameString = '\0'; - ret = 1; - } + len = CertGetNameStringW(cert, type, flags, type_para, nameW, len); + len_mb = WideCharToMultiByte(CP_ACP, 0, nameW, len, NULL, 0, NULL, NULL); + if (!name || !name_len) + { + CryptMemFree(nameW); + return len_mb; } - else - ret = CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, - NULL, 0); + + ret = WideCharToMultiByte(CP_ACP, 0, nameW, len, name, name_len, NULL, NULL); + if (ret < len_mb) + { + name[0] = 0; + ret = 1; + } + CryptMemFree(nameW); return ret; } diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 3009fb72c03..1cfdf8ee7b7 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -766,9 +766,13 @@ static void test_CertGetNameString_value_(unsigned int line, PCCERT_CONTEXT cont ok(!strcmp(str, expected), "line %u: unexpected value %s.\n", line, str); str[0] = str[1] = 0xcc; retlen = CertGetNameStringA(context, type, 0, type_para, str, len - 1); - todo_wine ok(retlen == 1, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); - todo_wine ok(!str[0], "line %u: unexpected str[0] %#x.\n", line, str[0]); + ok(retlen == 1, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); + ok(!str[0], "line %u: unexpected str[0] %#x.\n", line, str[0]); ok(str[1] == expected[1], "line %u: unexpected str[1] %#x.\n", line, str[1]); + + retlen = CertGetNameStringA(context, type, 0, type_para, str, 0); + ok(retlen == len, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); + retlen = CertGetNameStringW(context, type, 0, type_para, strW, len); ok(retlen == len, "line %u: unexpected len %lu, expected 1.\n", line, retlen); ok(!wcscmp(strW, expectedW), "line %u: unexpected value %s.\n", line, debugstr_w(strW));

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022