December 2019 - Wine-commits

Henri Verbeet : wined3d: Do not set depth/stencil sizes on colour formats.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 2b01830f74cb6828016ef75d71706185c6da6bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b01830f74cb6828016ef75d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 20:23:57 2019 +0330 wined3d: Do not set depth/stencil sizes on colour formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 41 ++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ac821ce732..453bee6256 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -151,13 +151,13 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R32G32B32_TYPELESS, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, {WINED3DFMT_R16G16B16A16_TYPELESS, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, {WINED3DFMT_R32G32_TYPELESS, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, - {WINED3DFMT_R32G8X24_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 8, 32, 8}, + {WINED3DFMT_R32G8X24_TYPELESS, 32, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0}, {WINED3DFMT_R10G10B10A2_TYPELESS, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R10G10B10X2_TYPELESS, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_TYPELESS, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R16G16_TYPELESS, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R32_TYPELESS, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, - {WINED3DFMT_R24G8_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, + {WINED3DFMT_R24G8_TYPELESS, 24, 8, 0, 0, 0, 0, 0, 0, 4, 0, 0}, {WINED3DFMT_R8G8_TYPELESS, 8, 8, 0, 0, 0, 8, 0, 0, 2, 0, 0}, {WINED3DFMT_R16_TYPELESS, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_R8_TYPELESS, 8, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -220,9 +220,9 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32G32_UINT, WINED3DFMT_R32G32_TYPELESS, "UU"}, {WINED3DFMT_R32G32_SINT, WINED3DFMT_R32G32_TYPELESS, "II"}, {WINED3DFMT_R32G32_FLOAT, WINED3DFMT_R32G32_TYPELESS, "FF"}, - {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_R32G8X24_TYPELESS, "DX"}, - {WINED3DFMT_X32_TYPELESS_G8X24_UINT, WINED3DFMT_R32G8X24_TYPELESS, "XS"}, - {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_R32G8X24_TYPELESS, "DS"}, + {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_R32G8X24_TYPELESS, "FXX"}, + {WINED3DFMT_X32_TYPELESS_G8X24_UINT, WINED3DFMT_R32G8X24_TYPELESS, "XUX"}, + {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_R32G8X24_TYPELESS, "DSX"}, {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, @@ -242,8 +242,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, - {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "DX"}, - {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XS"}, + {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "uX"}, + {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XU"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, @@ -2099,6 +2099,12 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) format->depth_size = format->red_size; format->red_size = format->red_offset = 0; } + + if (channel_type == WINED3D_CHANNEL_TYPE_STENCIL && !format->stencil_size) + { + format->stencil_size = format->green_size; + format->green_size = format->green_offset = 0; + } } format->component_count = component_count; @@ -3785,27 +3791,24 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); } - if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) + if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) + && typeless_depth_stencil_formats[i].separate_depth_view_format) { if (!(depth_view_format = get_format_internal(adapter, format_id))) return FALSE; - if (typeless_depth_stencil_formats[i].separate_depth_view_format) - { - copy_format(adapter, depth_view_format, ds_format); - depth_view_format->stencil_size = 0; - } - else - { - depth_view_format->depth_size = ds_format->depth_size; - } + copy_format(adapter, depth_view_format, ds_format); + depth_view_format->red_size = depth_view_format->depth_size; + depth_view_format->depth_size = 0; + depth_view_format->stencil_size = 0; } if ((format_id = typeless_depth_stencil_formats[i].stencil_view_id)) { if (!(stencil_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(adapter, stencil_view_format, ds_format); - if (typeless_depth_stencil_formats[i].separate_depth_view_format) - stencil_view_format->depth_size = 0; + stencil_view_format->green_size = stencil_view_format->stencil_size; + stencil_view_format->depth_size = 0; + stencil_view_format->stencil_size = 0; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c48bddd00c..b33cd09c08 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5235,8 +5235,8 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { - return !srv_format || (srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) - || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); + return !srv_format || (srv_format->red_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) + || (srv_format->green_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state,

1 0

Alexandre Julliard : kernelbase: Fix assumptions about 0-size output buffer in ntdll Unicode conversion functions.
by Alexandre Julliard 03 Dec '19

03 Dec '19

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 : kernel32: Fix assumptions about 0-size output buffer in ntdll Unicode conversion functions.
by Alexandre Julliard 03 Dec '19

03 Dec '19

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: Implement custom codepage conversion functions.
by Alexandre Julliard 03 Dec '19

03 Dec '19

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

Alexandre Julliard : ntdll: Avoid memory allocations in RtlUpcaseUnicodeString functions.
by Alexandre Julliard 03 Dec '19

03 Dec '19

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 03 Dec '19

03 Dec '19

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

Andrey Gusev : uianimation: Remove duplicate WINAPI.
by Alexandre Julliard 02 Dec '19

02 Dec '19

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 : mapi32: Reorder the WINAPI with the HRESULT.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 6c89fb106a38af3ca8a5966aa0d227948dcacb78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c89fb106a38af3ca8a5966a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:45:59 2019 +0200 mapi32: Reorder the WINAPI with the HRESULT. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 55baf9129a..b217035e2c 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1497,7 +1497,7 @@ static inline void IMAPIPROP_Unlock(IPropDataImpl *This) * Inherited method from the IUnknown Interface. * See IUnknown_QueryInterface. */ -static WINAPI HRESULT IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) { IPropDataImpl *This = impl_from_IPropData(iface);

1 0

Andrey Gusev : kernel32/tests: Reorder the WINAPI with the void.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: a9bf1ad81e7706a7e2e216665b398e4c85568e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9bf1ad81e7706a7e2e21666… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:53:59 2019 +0200 kernel32/tests: Reorder the WINAPI with the void. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/dummy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c index 14d0d90dea..b8eab8c219 100644 --- a/dlls/kernel32/tests/dummy.c +++ b/dlls/kernel32/tests/dummy.c @@ -14,7 +14,7 @@ BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) return TRUE; } -WINAPI void get_path(char *buffer, int buffer_size) +void WINAPI get_path(char *buffer, int buffer_size) { GetModuleFileNameA(instance, buffer, buffer_size); }

1 0

Andrey Gusev : sapiaut.idl: Fix a typo.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: acd0eb3672b02668d6cc14f6256da80aacae21a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd0eb3672b02668d6cc14f6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 14:59:44 2019 +0200 sapiaut.idl: Fix a typo. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index ecd6908163..94ac72a209 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -1784,7 +1784,7 @@ interface ISpeechRecoGrammar : IDispatch HRESULT CmdLoadFromObject([in]const BSTR classid, [in] const BSTR grammarname, [in, defaultvalue(SLOStatic)] SpeechLoadOption option); [id(DISPID_SRGCmdLoadFromResource)] - HRESULT CmdLoadFromResource([in]long mod, [in] VARIANT name, [in] VARIANT yype, [in] SpeechLanguageId language, + HRESULT CmdLoadFromResource([in]long mod, [in] VARIANT name, [in] VARIANT type, [in] SpeechLanguageId language, [in, defaultvalue(SLOStatic)] SpeechLoadOption option); [id(DISPID_SRGCmdLoadFromMemory)]

1 0