December 2019 - Wine-Commits

Nikolay Sivov : ntdll: Use better type for thread description info structure.
by Alexandre Julliard Dec. 3, 2019

Dec. 3, 2019

Module: wine Branch: master Commit: 7082ebc6081e7b94b7489a11fff9f6d28338828d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7082ebc6081e7b94b7489a11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 3 12:05:21 2019 +0300 ntdll: Use better type for thread description info structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 28 ++++++++++++++-------------- dlls/kernelbase/thread.c | 14 ++++++-------- dlls/ntdll/thread.c | 12 +++++------- include/winternl.h | 3 +-- 4 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 8ff34ba5f3..9a8ad9151c 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2145,14 +2145,15 @@ static void test_thread_description(void) ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); len2 = 0; - thread_desc->Length = 1; - thread_desc->Description = (WCHAR *)thread_desc; + thread_desc->Description.Length = 1; + thread_desc->Description.MaximumLength = 0; + thread_desc->Description.Buffer = (WCHAR *)thread_desc; status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, len, &len2); ok(!status, "Failed to get thread info, status %#x.\n", status); ok(len2 == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); - ok(!thread_desc->Length, "Unexpected description length %#x.\n", thread_desc->Length); - ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", - thread_desc->Description, thread_desc); + ok(!thread_desc->Description.Length, "Unexpected description length %#x.\n", thread_desc->Description.Length); + ok(thread_desc->Description.Buffer == (WCHAR *)(thread_desc + 1), + "Unexpected description string pointer %p, %p.\n", thread_desc->Description.Buffer, thread_desc); hr = pSetThreadDescription(GetCurrentThread(), NULL); ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); @@ -2176,11 +2177,11 @@ static void test_thread_description(void) ok(!status, "Failed to get thread info.\n"); ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); - ok(thread_desc->Length == (desc_len << 16 | desc_len), "Unexpected description length %#x.\n", - thread_desc->Length); - ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", - thread_desc->Description, thread_desc); - ok(!memcmp(thread_desc->Description, desc, desc_len), "Unexpected description string.\n"); + ok(thread_desc->Description.Length == desc_len && thread_desc->Description.MaximumLength == desc_len, + "Unexpected description length %u.\n", thread_desc->Description.Length); + ok(thread_desc->Description.Buffer == (WCHAR *)(thread_desc + 1), + "Unexpected description string pointer %p, %p.\n", thread_desc->Description.Buffer, thread_desc); + ok(!memcmp(thread_desc->Description.Buffer, desc, desc_len), "Unexpected description string.\n"); /* Partial results. */ len = 0; @@ -2193,7 +2194,7 @@ static void test_thread_description(void) ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); /* Change description. */ - thread_desc->Length = 8 << 16 | 8; + thread_desc->Description.Length = thread_desc->Description.MaximumLength = 8; lstrcpyW((WCHAR *)(thread_desc + 1), L"desc"); status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); @@ -2211,7 +2212,7 @@ static void test_thread_description(void) status = NtSetInformationThread(GetCurrentThread(), ThreadDescription, NULL, sizeof(*thread_desc)); ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); - thread_desc->Description = NULL; + thread_desc->Description.Buffer = NULL; status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); @@ -2228,8 +2229,7 @@ static void test_thread_description(void) hr = pSetThreadDescription(GetCurrentThread(), L"123"); ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); - thread_desc->Length = 0; - thread_desc->Description = NULL; + memset(thread_desc, 0, sizeof(*thread_desc)); status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); ok(!status, "Failed to set thread description, status %#x.\n", status); diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 521d3be079..2f0bcb7dde 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -404,8 +404,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR des if (length > USHRT_MAX) return HRESULT_FROM_NT(STATUS_INVALID_PARAMETER); - info.Length = length << 16 | length; - info.Description = (WCHAR *)description; + info.Description.Length = info.Description.MaximumLength = length; + info.Description.Buffer = (WCHAR *)description; return HRESULT_FROM_NT(NtSetInformationThread( thread, ThreadDescription, &info, sizeof(info) )); } @@ -434,15 +434,13 @@ HRESULT WINAPI DECLSPEC_HOTPATCH GetThreadDescription( HANDLE thread, WCHAR **de status = NtQueryInformationThread( thread, ThreadDescription, info, length, &length ); if (!status) { - length = info->Length & 0xffff; - - if (!(*description = LocalAlloc( 0, length + sizeof(WCHAR)))) + if (!(*description = LocalAlloc( 0, info->Description.Length + sizeof(WCHAR)))) status = STATUS_NO_MEMORY; else { - if (length) - memcpy(*description, info->Description, length); - (*description)[length / sizeof(WCHAR)] = 0; + if (info->Description.Length) + memcpy(*description, info->Description.Buffer, info->Description.Length); + (*description)[info->Description.Length / sizeof(WCHAR)] = 0; } } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6079a6c195..fd8d388403 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1137,8 +1137,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, status = STATUS_BUFFER_TOO_SMALL; else if (status == STATUS_SUCCESS) { - info->Length = desc_len << 16 | desc_len; - info->Description = ptr; + info->Description.Length = info->Description.MaximumLength = desc_len; + info->Description.Buffer = ptr; } if (ret_len && (status == STATUS_SUCCESS || status == STATUS_BUFFER_TOO_SMALL)) @@ -1303,20 +1303,18 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadDescription: { const THREAD_DESCRIPTION_INFORMATION *info = data; - data_size_t desc_len; if (length != sizeof(*info)) return STATUS_INFO_LENGTH_MISMATCH; if (!info) return STATUS_ACCESS_VIOLATION; - desc_len = info->Length & 0xffff; - if (info->Length >> 16 != desc_len) return STATUS_INVALID_PARAMETER; - if (info->Length && !info->Description) return STATUS_ACCESS_VIOLATION; + if (info->Description.Length != info->Description.MaximumLength) return STATUS_INVALID_PARAMETER; + if (info->Description.Length && !info->Description.Buffer) return STATUS_ACCESS_VIOLATION; SERVER_START_REQ( set_thread_info ) { req->handle = wine_server_obj_handle( handle ); req->mask = SET_THREAD_INFO_DESCRIPTION; - wine_server_add_data( req, info->Description, desc_len ); + wine_server_add_data( req, info->Description.Buffer, info->Description.Length ); status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/winternl.h b/include/winternl.h index ccd4a7e10b..847e55e216 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1030,8 +1030,7 @@ typedef struct _THREAD_DESCRIPTOR_INFORMATION typedef struct _THREAD_DESCRIPTION_INFORMATION { - DWORD Length; - WCHAR *Description; + UNICODE_STRING Description; } THREAD_DESCRIPTION_INFORMATION, *PTHREAD_DESCRIPTION_INFORMATION; typedef struct _KERNEL_USER_TIMES {

1 0

Alexandre Julliard : kernel32: Fix assumptions about 0-size output buffer in ntdll Unicode conversion functions.
by Alexandre Julliard Dec. 3, 2019

Dec. 3, 2019

Module: wine Branch: master Commit: 9e8db5a27adae286025ff7ad1067386bba76da85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8db5a27adae286025ff7ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:31:51 2019 +0100 kernel32: Fix assumptions about 0-size output buffer in ntdll Unicode conversion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index ef94741093..4dbf17c898 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -273,10 +273,25 @@ DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DWORD ret; if (srclen < 0) srclen = strlenW( src ) + 1; - if (!AreFileApisANSI()) - RtlUnicodeToOemN( dest, destlen, &ret, src, srclen * sizeof(WCHAR) ); + if (!destlen) + { + if (!AreFileApisANSI()) + { + UNICODE_STRING strW; + strW.Buffer = (WCHAR *)src; + strW.Length = srclen * sizeof(WCHAR); + ret = RtlUnicodeStringToOemSize( &strW ) - 1; + } + else + RtlUnicodeToMultiByteSize( &ret, src, srclen * sizeof(WCHAR) ); + } else - RtlUnicodeToMultiByteN( dest, destlen, &ret, src, srclen * sizeof(WCHAR) ); + { + if (!AreFileApisANSI()) + RtlUnicodeToOemN( dest, destlen, &ret, src, srclen * sizeof(WCHAR) ); + else + RtlUnicodeToMultiByteN( dest, destlen, &ret, src, srclen * sizeof(WCHAR) ); + } return ret; }

1 0

Alexandre Julliard : ntdll: Avoid memory allocations in RtlUpcaseUnicodeString functions.
by Alexandre Julliard Dec. 3, 2019

Dec. 3, 2019

Module: wine Branch: master Commit: b7fcb956efcbac336a6fc7f6ca4b5ce936d5cc43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7fcb956efcbac336a6fc7f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:41:57 2019 +0100 ntdll: Avoid memory allocations in RtlUpcaseUnicodeString functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtlstr.c | 92 ++++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 43 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 0eeb14ed65..5c00767835 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1100,18 +1100,29 @@ NTSTATUS WINAPI RtlDowncaseUnicodeString( * NOTES * writes terminating 0 */ -NTSTATUS WINAPI RtlUpcaseUnicodeStringToAnsiString( STRING *dst, - const UNICODE_STRING *src, +NTSTATUS WINAPI RtlUpcaseUnicodeStringToAnsiString( STRING *ansi, + const UNICODE_STRING *uni, BOOLEAN doalloc ) { - NTSTATUS ret; - UNICODE_STRING upcase; + NTSTATUS ret = STATUS_SUCCESS; + DWORD len = RtlUnicodeStringToAnsiSize( uni ); - if (!(ret = RtlUpcaseUnicodeString( &upcase, src, TRUE ))) + ansi->Length = len - 1; + if (doalloc) + { + ansi->MaximumLength = len; + if (!(ansi->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len ))) + return STATUS_NO_MEMORY; + } + else if (ansi->MaximumLength < len) { - ret = RtlUnicodeStringToAnsiString( dst, &upcase, doalloc ); - RtlFreeUnicodeString( &upcase ); + if (!ansi->MaximumLength) return STATUS_BUFFER_OVERFLOW; + ansi->Length = ansi->MaximumLength - 1; + ret = STATUS_BUFFER_OVERFLOW; } + + RtlUpcaseUnicodeToMultiByteN( ansi->Buffer, ansi->Length, NULL, uni->Buffer, uni->Length ); + ansi->Buffer[ansi->Length] = 0; return ret; } @@ -1128,18 +1139,29 @@ NTSTATUS WINAPI RtlUpcaseUnicodeStringToAnsiString( STRING *dst, * NOTES * writes terminating 0 */ -NTSTATUS WINAPI RtlUpcaseUnicodeStringToOemString( STRING *dst, - const UNICODE_STRING *src, +NTSTATUS WINAPI RtlUpcaseUnicodeStringToOemString( STRING *oem, + const UNICODE_STRING *uni, BOOLEAN doalloc ) { - NTSTATUS ret; - UNICODE_STRING upcase; + NTSTATUS ret = STATUS_SUCCESS; + DWORD len = RtlUnicodeStringToAnsiSize( uni ); - if (!(ret = RtlUpcaseUnicodeString( &upcase, src, TRUE ))) + oem->Length = len - 1; + if (doalloc) { - ret = RtlUnicodeStringToOemString( dst, &upcase, doalloc ); - RtlFreeUnicodeString( &upcase ); + oem->MaximumLength = len; + if (!(oem->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len ))) + return STATUS_NO_MEMORY; } + else if (oem->MaximumLength < len) + { + if (!oem->MaximumLength) return STATUS_BUFFER_OVERFLOW; + oem->Length = oem->MaximumLength - 1; + ret = STATUS_BUFFER_OVERFLOW; + } + + RtlUpcaseUnicodeToOemN( oem->Buffer, oem->Length, NULL, uni->Buffer, uni->Length ); + oem->Buffer[oem->Length] = 0; return ret; } @@ -1160,38 +1182,22 @@ NTSTATUS WINAPI RtlUpcaseUnicodeStringToCountedOemString( STRING *oem, const UNICODE_STRING *uni, BOOLEAN doalloc ) { - NTSTATUS ret; - UNICODE_STRING upcase; - WCHAR tmp[32]; - - upcase.Buffer = tmp; - upcase.MaximumLength = sizeof(tmp); - ret = RtlUpcaseUnicodeString( &upcase, uni, FALSE ); - if (ret == STATUS_BUFFER_OVERFLOW) ret = RtlUpcaseUnicodeString( &upcase, uni, TRUE ); + NTSTATUS ret = STATUS_SUCCESS; + DWORD len = RtlUnicodeStringToOemSize( uni ) - 1; - if (!ret) + oem->Length = len; + if (doalloc) { - DWORD len = RtlUnicodeStringToOemSize( &upcase ) - 1; - oem->Length = len; - if (doalloc) - { - oem->MaximumLength = len; - if (!(oem->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len ))) - { - ret = STATUS_NO_MEMORY; - goto done; - } - } - else if (oem->MaximumLength < len) - { - ret = STATUS_BUFFER_OVERFLOW; - oem->Length = oem->MaximumLength; - if (!oem->MaximumLength) goto done; - } - RtlUnicodeToOemN( oem->Buffer, oem->Length, NULL, upcase.Buffer, upcase.Length ); - done: - if (upcase.Buffer != tmp) RtlFreeUnicodeString( &upcase ); + oem->MaximumLength = len; + if (!(oem->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len ))) return STATUS_NO_MEMORY; + } + else if (oem->MaximumLength < len) + { + ret = STATUS_BUFFER_OVERFLOW; + oem->Length = oem->MaximumLength; + if (!oem->MaximumLength) return ret; } + RtlUpcaseUnicodeToOemN( oem->Buffer, oem->Length, NULL, uni->Buffer, uni->Length ); return ret; }

1 0

Alexandre Julliard : ntdll: Reimplement multibyte to Unicode conversion functions using the Win32-format tables.
by Alexandre Julliard Dec. 3, 2019

Dec. 3, 2019

Module: wine Branch: master Commit: e13c4d859e36d474197c9d3df17c102d6913b196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e13c4d859e36d474197c9d3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:43:08 2019 +0100 ntdll: Reimplement multibyte to Unicode conversion functions using the Win32-format tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 83 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/rtlstr.c | 110 ---------------------------------------------------- 2 files changed, 83 insertions(+), 110 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index c11c82b3d8..b1c1c5ef9a 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -103,6 +103,24 @@ static NTSTATUS load_string( ULONG id, LANGID lang, WCHAR *buffer, ULONG len ) } +static DWORD mbtowc_size( const CPTABLEINFO *info, LPCSTR str, UINT len ) +{ + DWORD res; + + if (!info->DBCSCodePage) return len; + + for (res = 0; len; len--, str++, res++) + { + if (info->DBCSOffsets[(unsigned char)*str] && len > 1) + { + str++; + len--; + } + } + return res; +} + + static WCHAR casemap( USHORT *table, WCHAR ch ) { return ch + table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0x0f)]; @@ -781,6 +799,24 @@ void WINAPI RtlResetRtlTranslations( const NLSTABLEINFO *info ) } +/************************************************************************** + * RtlAnsiCharToUnicodeChar (NTDLL.@) + */ +WCHAR WINAPI RtlAnsiCharToUnicodeChar( char **ansi ) +{ + if (nls_info.AnsiTableInfo.DBCSOffsets) + { + USHORT off = nls_info.AnsiTableInfo.DBCSOffsets[(unsigned char)**ansi]; + if (off && (*ansi)[1]) + { + (*ansi)++; + return nls_info.AnsiTableInfo.MultiByteTable[off + (unsigned char)*(*ansi)++]; + } + } + return nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)*(*ansi)++]; +} + + /************************************************************************** * RtlCustomCPToUnicodeN (NTDLL.@) */ @@ -851,6 +887,53 @@ NTSTATUS WINAPI RtlUnicodeToCustomCPN( CPTABLEINFO *info, char *dst, DWORD dstle } +/************************************************************************** + * RtlMultiByteToUnicodeN (NTDLL.@) + */ +NTSTATUS WINAPI RtlMultiByteToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, + const char *src, DWORD srclen ) +{ + if (nls_info.AnsiTableInfo.WideCharTable) + return RtlCustomCPToUnicodeN( &nls_info.AnsiTableInfo, dst, dstlen, reslen, src, srclen ); + + /* locale not setup yet */ + dstlen = min( srclen, dstlen / sizeof(WCHAR) ); + if (reslen) *reslen = dstlen * sizeof(WCHAR); + while (dstlen--) *dst++ = *src++ & 0x7f; + return STATUS_SUCCESS; +} + + +/************************************************************************** + * RtlMultiByteToUnicodeSize (NTDLL.@) + */ +NTSTATUS WINAPI RtlMultiByteToUnicodeSize( DWORD *size, const char *str, DWORD len ) +{ + *size = mbtowc_size( &nls_info.AnsiTableInfo, str, len ) * sizeof(WCHAR); + return STATUS_SUCCESS; +} + + +/************************************************************************** + * RtlOemToUnicodeN (NTDLL.@) + */ +NTSTATUS WINAPI RtlOemToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, + const char *src, DWORD srclen ) +{ + return RtlCustomCPToUnicodeN( &nls_info.OemTableInfo, dst, dstlen, reslen, src, srclen ); +} + + +/************************************************************************** + * RtlOemStringToUnicodeSize (NTDLL.@) + * RtlxOemStringToUnicodeSize (NTDLL.@) + */ +DWORD WINAPI RtlOemStringToUnicodeSize( const STRING *str ) +{ + return (mbtowc_size( &nls_info.OemTableInfo, str->Buffer, str->Length ) + 1) * sizeof(WCHAR); +} + + /************************************************************************** * RtlUpcaseUnicodeToCustomCPN (NTDLL.@) */ diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 5c00767835..f30d33111c 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -605,35 +605,6 @@ NTSTATUS WINAPI RtlEqualDomainName(const UNICODE_STRING *left, } -/************************************************************************** - * RtlAnsiCharToUnicodeChar (NTDLL.@) - * - * Converts the first ansi character to a unicode character. - * - * PARAMS - * ansi [I/O] Pointer to the ansi string. - * - * RETURNS - * Unicode representation of the first character in the ansi string. - * - * NOTES - * Upon successful completion, the char pointer ansi points to is - * incremented by the size of the character. - */ -WCHAR WINAPI RtlAnsiCharToUnicodeChar(LPSTR *ansi) -{ - WCHAR str; - DWORD charSize = sizeof(CHAR); - - if (wine_is_dbcs_leadbyte(ansi_table, **ansi)) - charSize++; - - RtlMultiByteToUnicodeN(&str, sizeof(WCHAR), NULL, *ansi, charSize); - *ansi += charSize; - - return str; -} - /* COPY BETWEEN ANSI_STRING or UNICODE_STRING there is no parameter checking, it just crashes @@ -802,46 +773,6 @@ NTSTATUS WINAPI RtlUnicodeStringToOemString( STRING *oem, } -/************************************************************************** - * RtlMultiByteToUnicodeN (NTDLL.@) - * - * Converts a multi-byte string to a Unicode string. - * - * RETURNS - * NTSTATUS code - * - * NOTES - * Performs a partial copy if dst is too small. - */ -NTSTATUS WINAPI RtlMultiByteToUnicodeN( LPWSTR dst, DWORD dstlen, LPDWORD reslen, - LPCSTR src, DWORD srclen ) -{ - - int ret = wine_cp_mbstowcs( ansi_table, 0, src, srclen, dst, dstlen/sizeof(WCHAR) ); - if (reslen) - *reslen = (ret >= 0) ? ret*sizeof(WCHAR) : dstlen; /* overflow -> we filled up to dstlen */ - return STATUS_SUCCESS; -} - - -/************************************************************************** - * RtlOemToUnicodeN (NTDLL.@) - * - * Converts a multi-byte string in the OEM code page to a Unicode string. - * - * RETURNS - * NTSTATUS code - */ -NTSTATUS WINAPI RtlOemToUnicodeN( LPWSTR dst, DWORD dstlen, LPDWORD reslen, - LPCSTR src, DWORD srclen ) -{ - int ret = wine_cp_mbstowcs( oem_table, 0, src, srclen, dst, dstlen/sizeof(WCHAR) ); - if (reslen) - *reslen = (ret >= 0) ? ret*sizeof(WCHAR) : dstlen; /* overflow -> we filled up to dstlen */ - return STATUS_SUCCESS; -} - - /************************************************************************** * RtlUnicodeToMultiByteN (NTDLL.@) * @@ -1253,26 +1184,6 @@ NTSTATUS WINAPI RtlUpcaseUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen, */ -/************************************************************************** - * RtlOemStringToUnicodeSize (NTDLL.@) - * RtlxOemStringToUnicodeSize (NTDLL.@) - * - * Calculate the size in bytes necessary for the Unicode conversion of str, - * including the terminating '\0'. - * - * PARAMS - * str [I] String to calculate the size of - * - * RETURNS - * The calculated size. - */ -UINT WINAPI RtlOemStringToUnicodeSize( const STRING *str ) -{ - int ret = wine_cp_mbstowcs( oem_table, 0, str->Buffer, str->Length, NULL, 0 ); - return (ret + 1) * sizeof(WCHAR); -} - - /************************************************************************** * RtlAnsiStringToUnicodeSize (NTDLL.@) * RtlxAnsiStringToUnicodeSize (NTDLL.@) @@ -1294,27 +1205,6 @@ DWORD WINAPI RtlAnsiStringToUnicodeSize( const STRING *str ) } -/************************************************************************** - * RtlMultiByteToUnicodeSize (NTDLL.@) - * - * Compute the size in bytes necessary for the Unicode conversion of str, - * without the terminating '\0'. - * - * PARAMS - * size [O] Destination for size - * str [I] String to calculate the size of - * len [I] Length of str - * - * RETURNS - * STATUS_SUCCESS. - */ -NTSTATUS WINAPI RtlMultiByteToUnicodeSize( DWORD *size, LPCSTR str, UINT len ) -{ - *size = wine_cp_mbstowcs( ansi_table, 0, str, len, NULL, 0 ) * sizeof(WCHAR); - return STATUS_SUCCESS; -} - - /************************************************************************** * RtlUnicodeToMultiByteSize (NTDLL.@) *

1 0

Alexandre Julliard : kernelbase: Fix assumptions about 0-size output buffer in ntdll Unicode conversion functions.
by Alexandre Julliard Dec. 3, 2019

Dec. 3, 2019

Module: wine Branch: master Commit: 94d2b4742c358e15d336d4a48e2c1354efa5de5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=94d2b4742c358e15d336d4a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:30:36 2019 +0100 kernelbase: Fix assumptions about 0-size output buffer in ntdll Unicode conversion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 21 ++++++++++++++++++--- dlls/kernelbase/registry.c | 16 +++++++++------- dlls/kernelbase/string.c | 3 +-- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 77a7398580..23ca5629a3 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -292,10 +292,25 @@ DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DWORD ret; if (srclen < 0) srclen = lstrlenW( src ) + 1; - if (oem_file_apis) - RtlUnicodeToOemN( dest, destlen, &ret, src, srclen * sizeof(WCHAR) ); + if (!destlen) + { + if (oem_file_apis) + { + UNICODE_STRING strW; + strW.Buffer = (WCHAR *)src; + strW.Length = srclen * sizeof(WCHAR); + ret = RtlUnicodeStringToOemSize( &strW ) - 1; + } + else + RtlUnicodeToMultiByteSize( &ret, src, srclen * sizeof(WCHAR) ); + } else - RtlUnicodeToMultiByteN( dest, destlen, &ret, src, srclen * sizeof(WCHAR) ); + { + if (oem_file_apis) + RtlUnicodeToOemN( dest, destlen, &ret, src, srclen * sizeof(WCHAR) ); + else + RtlUnicodeToMultiByteN( dest, destlen, &ret, src, srclen * sizeof(WCHAR) ); + } return ret; } diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index d3364dbcee..1fee41ec5e 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -915,7 +915,7 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW NTSTATUS status; char buffer[256], *buf_ptr = buffer; KEY_FULL_INFORMATION *info = (KEY_FULL_INFORMATION *)buffer; - DWORD total_size, len; + DWORD total_size; TRACE( "(%p,%p,%d,%p,%p,%p,%p,%p,%p,%p,%p)\n", hkey, class, class_len ? *class_len : 0, reserved, subkeys, max_subkey, values, max_value, max_data, security, modif ); @@ -940,19 +940,21 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW if (status) goto done; - len = 0; - if (class && class_len) len = *class_len; - RtlUnicodeToMultiByteN( class, len, class_len, - (WCHAR *)(buf_ptr + info->ClassOffset), info->ClassLength ); - if (len) + if (class && class_len && *class_len) { - if (*class_len + 1 > len) + DWORD len = *class_len; + RtlUnicodeToMultiByteN( class, len, class_len, + (WCHAR *)(buf_ptr + info->ClassOffset), info->ClassLength ); + if (*class_len == len) { status = STATUS_BUFFER_OVERFLOW; *class_len -= 1; } class[*class_len] = 0; } + else if (class_len) + RtlUnicodeToMultiByteSize( class_len, + (WCHAR *)(buf_ptr + info->ClassOffset), info->ClassLength ); } else status = STATUS_SUCCESS; diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 7bea47942e..668fd4fa37 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -1382,8 +1382,7 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringA(HINSTANCE instance, UINT resource_id, L while (id--) p += *p + 1; - if (buflen != 1) - RtlUnicodeToMultiByteN(buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR)); + RtlUnicodeToMultiByteN(buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR)); } buffer[retval] = 0; TRACE("returning %s\n", debugstr_a(buffer));

1 0

Alexandre Julliard : ntdll: Implement custom codepage conversion functions.
by Alexandre Julliard Dec. 3, 2019

Dec. 3, 2019

Module: wine Branch: master Commit: 0e97fe86fd790c04b2f1c8d0c82827f1924b6af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e97fe86fd790c04b2f1c8d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:42:23 2019 +0100 ntdll: Implement custom codepage conversion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 113 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 6 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +- include/winternl.h | 3 + 4 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 16287c83a1..c11c82b3d8 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -103,6 +103,12 @@ static NTSTATUS load_string( ULONG id, LANGID lang, WCHAR *buffer, ULONG len ) } +static WCHAR casemap( USHORT *table, WCHAR ch ) +{ + return ch + table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0x0f)]; +} + + static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) { static const WCHAR pathfmtW[] = {'\\','?','?','\\','%','s','%','s',0}; @@ -775,6 +781,113 @@ void WINAPI RtlResetRtlTranslations( const NLSTABLEINFO *info ) } +/************************************************************************** + * RtlCustomCPToUnicodeN (NTDLL.@) + */ +NTSTATUS WINAPI RtlCustomCPToUnicodeN( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, DWORD *reslen, + const char *src, DWORD srclen ) +{ + DWORD i, ret; + + dstlen /= sizeof(WCHAR); + if (info->DBCSOffsets) + { + for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) + { + USHORT off = info->DBCSOffsets[(unsigned char)*src]; + if (off && srclen > 1 && src[1]) + { + src++; + srclen--; + *dst = info->MultiByteTable[off + (unsigned char)*src]; + } + else *dst = info->MultiByteTable[(unsigned char)*src]; + } + ret = dstlen - i; + } + else + { + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = info->MultiByteTable[(unsigned char)src[i]]; + } + if (reslen) *reslen = ret * sizeof(WCHAR); + return STATUS_SUCCESS; +} + + +/************************************************************************** + * RtlUnicodeToCustomCPN (NTDLL.@) + */ +NTSTATUS WINAPI RtlUnicodeToCustomCPN( CPTABLEINFO *info, char *dst, DWORD dstlen, DWORD *reslen, + const WCHAR *src, DWORD srclen ) +{ + DWORD i, ret; + + srclen /= sizeof(WCHAR); + if (info->DBCSCodePage) + { + WCHAR *uni2cp = info->WideCharTable; + + for (i = dstlen; srclen && i; i--, srclen--, src++) + { + if (uni2cp[*src] & 0xff00) + { + if (i == 1) break; /* do not output a partial char */ + i--; + *dst++ = uni2cp[*src] >> 8; + } + *dst++ = (char)uni2cp[*src]; + } + ret = dstlen - i; + } + else + { + char *uni2cp = info->WideCharTable; + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = uni2cp[src[i]]; + } + if (reslen) *reslen = ret; + return STATUS_SUCCESS; +} + + +/************************************************************************** + * RtlUpcaseUnicodeToCustomCPN (NTDLL.@) + */ +NTSTATUS WINAPI RtlUpcaseUnicodeToCustomCPN( CPTABLEINFO *info, char *dst, DWORD dstlen, DWORD *reslen, + const WCHAR *src, DWORD srclen ) +{ + DWORD i, ret; + + srclen /= sizeof(WCHAR); + if (info->DBCSCodePage) + { + WCHAR *uni2cp = info->WideCharTable; + + for (i = dstlen; srclen && i; i--, srclen--, src++) + { + WCHAR ch = casemap( nls_info.UpperCaseTable, *src ); + if (uni2cp[ch] & 0xff00) + { + if (i == 1) break; /* do not output a partial char */ + i--; + *dst++ = uni2cp[ch] >> 8; + } + *dst++ = (char)uni2cp[ch]; + } + ret = dstlen - i; + } + else + { + char *uni2cp = info->WideCharTable; + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = uni2cp[casemap( nls_info.UpperCaseTable, src[i] )]; + } + if (reslen) *reslen = ret; + return STATUS_SUCCESS; +} + + /****************************************************************** * RtlLocaleNameToLcid (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 899b044c74..8dd2350c83 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -557,7 +557,7 @@ @ stub RtlCreateUserSecurityObject @ stdcall RtlCreateUserStack(long long long long long ptr) @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) -@ stub RtlCustomCPToUnicodeN +@ stdcall RtlCustomCPToUnicodeN(ptr ptr long ptr str long) @ stub RtlCutoverTimeToSystemTime @ stdcall RtlDeNormalizeProcessParams(ptr) @ stdcall RtlDeactivateActivationContext(long long) @@ -991,7 +991,7 @@ @ stdcall RtlUnicodeStringToInteger(ptr long ptr) @ stdcall RtlUnicodeStringToOemSize(ptr) @ stdcall RtlUnicodeStringToOemString(ptr ptr long) -@ stub RtlUnicodeToCustomCPN +@ stdcall RtlUnicodeToCustomCPN(ptr ptr long ptr wstr long) @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) @@ -1007,7 +1007,7 @@ @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToCountedOemString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToOemString(ptr ptr long) -@ stub RtlUpcaseUnicodeToCustomCPN +@ stdcall RtlUpcaseUnicodeToCustomCPN(ptr ptr long ptr wstr long) @ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr ptr long) @ stdcall RtlUpdateTimer(ptr ptr long long) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d59e500187..695b375698 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1003,7 +1003,7 @@ @ stdcall RtlCreateSecurityDescriptor(ptr long) @ stub RtlCreateSystemVolumeInformationFolder @ stdcall RtlCreateUnicodeString(ptr wstr) -@ stub RtlCustomCPToUnicodeN +@ stdcall RtlCustomCPToUnicodeN(ptr ptr long ptr str long) ntdll.RtlCustomCPToUnicodeN @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @ stub RtlDecompressChunks @ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) @@ -1204,7 +1204,7 @@ @ stdcall RtlUnicodeStringToInteger(ptr long ptr) @ stdcall RtlUnicodeStringToOemSize(ptr) @ stdcall RtlUnicodeStringToOemString(ptr ptr long) -@ stub RtlUnicodeToCustomCPN +@ stdcall RtlUnicodeToCustomCPN(ptr ptr long ptr wstr long) ntdll.RtlUnicodeToCustomCPN @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) @@ -1216,7 +1216,7 @@ @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToCountedOemString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToOemString(ptr ptr long) -@ stub RtlUpcaseUnicodeToCustomCPN +@ stdcall RtlUpcaseUnicodeToCustomCPN(ptr ptr long ptr wstr long) ntdll.RtlUpcaseUnicodeToCustomCPN @ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr ptr long) @ stdcall RtlUpperChar(long) diff --git a/include/winternl.h b/include/winternl.h index 1477932d10..ccd4a7e10b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2674,6 +2674,7 @@ NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCST NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); NTSYSAPI NTSTATUS WINAPI RtlCreateUserStack(SIZE_T,SIZE_T,ULONG,SIZE_T,SIZE_T,INITIAL_TEB*); +NTSYSAPI NTSTATUS WINAPI RtlCustomCPToUnicodeN(CPTABLEINFO*,WCHAR*,DWORD,DWORD*,const char*,DWORD); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID); NTSYSAPI NTSTATUS WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG); @@ -2907,6 +2908,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToAnsiString(PANSI_STRING,PCUNICODE_ST NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToInteger(const UNICODE_STRING *,ULONG,ULONG *); NTSYSAPI DWORD WINAPI RtlUnicodeStringToOemSize(const UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToOemString(POEM_STRING,PCUNICODE_STRING,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlUnicodeToCustomCPN(CPTABLEINFO*,char*,DWORD,DWORD*,const WCHAR*,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteSize(PULONG,PCWSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); @@ -2925,6 +2927,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeString(UNICODE_STRING*,const UNICODE_S NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeStringToAnsiString(STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeStringToCountedOemString(STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeStringToOemString(STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeToCustomCPN(CPTABLEINFO*,char*,DWORD,DWORD*,const WCHAR*,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUpdateTimer(HANDLE, HANDLE, DWORD, DWORD);

1 0

Andrey Gusev : uianimation: Remove duplicate WINAPI.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 22c925b8ab8771fdab96e0f1d5f1b3a64fe6cb45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c925b8ab8771fdab96e0f1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:38:01 2019 +0200 uianimation: Remove duplicate WINAPI. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 492c1b757a..c0c7367e09 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -132,7 +132,7 @@ struct animation_storyboard *impl_from_IUIAnimationStoryboard( IUIAnimationStory return CONTAINING_RECORD( iface, struct animation_storyboard, IUIAnimationStoryboard_iface ); } -static HRESULT WINAPI WINAPI animation_storyboard_QueryInterface( IUIAnimationStoryboard *iface, +static HRESULT WINAPI animation_storyboard_QueryInterface( IUIAnimationStoryboard *iface, REFIID iid, void **obj ) { struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); @@ -352,7 +352,7 @@ struct animation_var *impl_from_IUIAnimationVariable( IUIAnimationVariable *ifac return CONTAINING_RECORD( iface, struct animation_var, IUIAnimationVariable_iface ); } -static HRESULT WINAPI WINAPI animation_var_QueryInterface( IUIAnimationVariable *iface, +static HRESULT WINAPI animation_var_QueryInterface( IUIAnimationVariable *iface, REFIID iid, void **obj ) { struct animation_var *This = impl_from_IUIAnimationVariable( iface ); @@ -998,7 +998,7 @@ struct tr_library *impl_from_IUIAnimationTransitionLibrary( IUIAnimationTransiti return CONTAINING_RECORD( iface, struct tr_library, IUIAnimationTransitionLibrary_iface ); } -static HRESULT WINAPI WINAPI tr_library_QueryInterface( IUIAnimationTransitionLibrary *iface, +static HRESULT WINAPI tr_library_QueryInterface( IUIAnimationTransitionLibrary *iface, REFIID iid, void **obj ) { struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );

1 0

Andrey Gusev : kernelbase/tests: Fix a typo in ok() message.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 2a64dd44bc87f8a1c9d93b633270623e290e3a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64dd44bc87f8a1c9d93b63… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:11:07 2019 +0200 kernelbase/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index abe586b0a2..93303bafc3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -797,7 +797,7 @@ static void test_PathCchAddBackslashEx(void) } else { - ok(ptrW == NULL, "%u: unexpecred end pointer.\n", i); + ok(ptrW == NULL, "%u: unexpected end pointer.\n", i); ok(remaining == 0, "%u: unexpected remaining buffer length.\n", i); } }

1 0

Nikolay Sivov : dwrite/tests: Add some tests for IDWriteFontResource.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 85691e732aeb743a1bea280249c07d08db8744f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85691e732aeb743a1bea2802… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 2 15:53:54 2019 +0300 dwrite/tests: Add some tests for IDWriteFontResource. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3cd41efc91..d565eee331 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9234,6 +9234,81 @@ todo_wine ok(ref == 0, "factory not released, %u\n", ref); } +static void test_font_resource(void) +{ + IDWriteFontFaceReference1 *reference, *reference2; + IDWriteFontResource *resource, *resource2; + IDWriteFontFile *fontfile, *fontfile2; + IDWriteFontFace5 *fontface5; + IDWriteFontFace *fontface; + IDWriteFactory6 *factory; + UINT32 count, index; + HRESULT hr; + ULONG ref; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory6))) + { + skip("IDWriteFactory6 is not supported.\n"); + return; + } + + fontface = create_fontface((IDWriteFactory *)factory); + + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &fontfile); + ok(hr == S_OK, "Failed to get file object, hr %#x.\n", hr); + + hr = IDWriteFactory6_CreateFontResource(factory, fontfile, 0, &resource); + ok(hr == S_OK, "Failed to create font resource, hr %#x.\n", hr); + + hr = IDWriteFactory6_CreateFontResource(factory, fontfile, 0, &resource2); + ok(hr == S_OK, "Failed to create font resource, hr %#x.\n", hr); + ok(resource != resource2, "Unexpected instance.\n"); + IDWriteFontResource_Release(resource2); + + hr = IDWriteFontResource_GetFontFile(resource, &fontfile2); + ok(hr == S_OK, "Failed to get font file, hr %#x.\n", hr); + ok(fontfile2 == fontfile, "Unexpected file instance.\n"); + IDWriteFontFile_Release(fontfile2); + + index = IDWriteFontResource_GetFontFaceIndex(resource); + ok(!index, "Unexpected index %u.\n", index); + + hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, &reference); + ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); + + hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, &reference2); + ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); + ok(reference != reference2, "Unexpected reference instance.\n"); + IDWriteFontFaceReference1_Release(reference2); + IDWriteFontFaceReference1_Release(reference); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IDWriteFontFace5_GetFontResource(fontface5, &resource2); + ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); + ok(resource != resource2, "Unexpected resource instance.\n"); + IDWriteFontResource_Release(resource); + + hr = IDWriteFontFace5_GetFontResource(fontface5, &resource); + ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); + ok(resource != resource2, "Unexpected resource instance.\n"); + EXPECT_REF(resource, 1); + + IDWriteFontResource_Release(resource); + IDWriteFontResource_Release(resource2); + + IDWriteFontFace5_Release(fontface5); + + IDWriteFontResource_Release(resource); + IDWriteFontFile_Release(fontfile); + + IDWriteFontFace_Release(fontface); + ref = IDWriteFactory6_Release(factory); + ok(ref == 0, "Factory wasn't released, %u.\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -9301,6 +9376,7 @@ START_TEST(font) test_localfontfileloader(); test_AnalyzeContainerType(); test_fontsetbuilder(); + test_font_resource(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Update to IDWriteFactory7 stub.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 5536df1ee1042c6cf20a7d96c43520003a547092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5536df1ee1042c6cf20a7d96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 2 15:53:55 2019 +0300 dwrite: Update to IDWriteFactory7 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 528 ++++++++++++++++++++++++++--------------------- dlls/dwrite/tests/font.c | 11 +- 2 files changed, 301 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5536df1ee1042c6cf20a…

1 0