March 2020 - Wine-Commits - list.winehq.org

Derek Lesho : mfreadwrite: Configure stream decoder on SetCurrentMediaType() if necessary.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: ecf70b83e2bcc7ec184438ab7013332f2fa64000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf70b83e2bcc7ec184438ab… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Mar 20 15:16:56 2020 +0300 mfreadwrite: Configure stream decoder on SetCurrentMediaType() if necessary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 196 insertions(+), 7 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 56ec036089..d3c10a4d11 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -94,6 +94,7 @@ struct media_stream { IMFMediaStream *stream; IMFMediaType *current; + IMFTransform *decoder; DWORD id; CRITICAL_SECTION cs; CONDITION_VARIABLE sample_event; @@ -576,6 +577,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaStream_Release(stream->stream); if (stream->current) IMFMediaType_Release(stream->current); + if (stream->decoder) + IMFTransform_Release(stream->decoder); DeleteCriticalSection(&stream->cs); LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->samples, struct sample, entry) @@ -669,18 +672,15 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR return S_OK; } -static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD type_index, - IMFMediaType **type) +static HRESULT source_reader_get_native_media_type(struct source_reader *reader, DWORD index, DWORD type_index, + IMFMediaType **type) { - struct source_reader *reader = impl_from_IMFSourceReader(iface); IMFMediaTypeHandler *handler; IMFStreamDescriptor *sd; IMFMediaType *src_type; BOOL selected; HRESULT hr; - TRACE("%p, %#x, %#x, %p.\n", iface, index, type_index, type); - switch (index) { case MF_SOURCE_READER_FIRST_VIDEO_STREAM: @@ -717,6 +717,16 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR return hr; } +static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD type_index, + IMFMediaType **type) +{ + struct source_reader *reader = impl_from_IMFSourceReader(iface); + + TRACE("%p, %#x, %#x, %p.\n", iface, index, type_index, type); + + return source_reader_get_native_media_type(reader, index, type_index, type); +} + static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWORD index, IMFMediaType **type) { struct source_reader *reader = impl_from_IMFSourceReader(iface); @@ -751,6 +761,184 @@ static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWO return hr; } +static HRESULT source_reader_get_source_type_handler(struct source_reader *reader, DWORD index, + IMFMediaTypeHandler **handler) +{ + IMFStreamDescriptor *sd; + BOOL selected; + HRESULT hr; + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, &selected, &sd))) + return hr; + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, handler); + IMFStreamDescriptor_Release(sd); + + return hr; +} + +static HRESULT source_reader_set_compatible_media_type(struct source_reader *reader, DWORD index, IMFMediaType *type) +{ + IMFMediaTypeHandler *type_handler; + IMFMediaType *native_type; + BOOL type_set = FALSE; + unsigned int i = 0; + DWORD flags; + HRESULT hr; + + if (FAILED(hr = IMFMediaType_IsEqual(type, reader->streams[index].current, &flags))) + return hr; + + if (!(flags & MF_MEDIATYPE_EQUAL_MAJOR_TYPES)) + return MF_E_INVALIDMEDIATYPE; + + /* No need for a decoder or type change. */ + if (flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES) + return S_OK; + + if (FAILED(hr = source_reader_get_source_type_handler(reader, index, &type_handler))) + return hr; + + while (!type_set && IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, i++, &native_type) == S_OK) + { + static const DWORD compare_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + + if (SUCCEEDED(IMFMediaType_IsEqual(native_type, type, &flags)) && (flags & compare_flags) == compare_flags) + { + if ((type_set = SUCCEEDED(IMFMediaTypeHandler_SetCurrentMediaType(type_handler, native_type)))) + IMFMediaType_CopyAllItems(native_type, (IMFAttributes *)reader->streams[index].current); + } + + IMFMediaType_Release(native_type); + } + + IMFMediaTypeHandler_Release(type_handler); + + return type_set ? S_OK : S_FALSE; +} + +static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWORD index, const CLSID *clsid, + IMFMediaType *input_type, IMFMediaType *output_type) +{ + IMFMediaTypeHandler *type_handler; + IMFTransform *transform = NULL; + IMFMediaType *type = NULL; + DWORD flags; + HRESULT hr; + int i = 0; + + if (FAILED(hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform))) + { + WARN("Failed to create transform object, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0))) + { + WARN("Failed to set decoder input type, hr %#x.\n", hr); + IMFTransform_Release(transform); + return hr; + } + + /* Find the relevant output type. */ + while (IMFTransform_GetOutputAvailableType(transform, 0, i++, &type) == S_OK) + { + flags = 0; + + if (SUCCEEDED(IMFMediaType_IsEqual(type, output_type, &flags))) + { + if (flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES) + { + if (SUCCEEDED(IMFTransform_SetOutputType(transform, 0, type, 0))) + { + if (SUCCEEDED(source_reader_get_source_type_handler(reader, index, &type_handler))) + { + IMFMediaTypeHandler_SetCurrentMediaType(type_handler, input_type); + IMFMediaTypeHandler_Release(type_handler); + } + + if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current))) + WARN("Failed to copy attributes, hr %#x.\n", hr); + IMFMediaType_Release(type); + + if (reader->streams[index].decoder) + IMFTransform_Release(reader->streams[index].decoder); + + reader->streams[index].decoder = transform; + + return S_OK; + } + } + } + + IMFMediaType_Release(type); + } + + WARN("Failed to find suitable decoder output type.\n"); + + IMFTransform_Release(transform); + + return MF_E_TOPO_CODEC_NOT_FOUND; +} + +static HRESULT source_reader_create_decoder_for_stream(struct source_reader *reader, DWORD index, IMFMediaType *output_type) +{ + MFT_REGISTER_TYPE_INFO in_type, out_type; + CLSID *clsids, mft_clsid, category; + unsigned int i = 0, count; + IMFMediaType *input_type; + HRESULT hr; + + /* TODO: should we check if the source type is compressed? */ + + if (FAILED(hr = IMFMediaType_GetMajorType(output_type, &out_type.guidMajorType))) + return hr; + + if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Video)) + { + category = MFT_CATEGORY_VIDEO_DECODER; + } + else if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Audio)) + { + category = MFT_CATEGORY_AUDIO_DECODER; + } + else + { + WARN("Unhandled major type %s.\n", debugstr_guid(&out_type.guidMajorType)); + return MF_E_TOPO_CODEC_NOT_FOUND; + } + + if (FAILED(hr = IMFMediaType_GetGUID(output_type, &MF_MT_SUBTYPE, &out_type.guidSubtype))) + return hr; + + in_type.guidMajorType = out_type.guidMajorType; + + while (source_reader_get_native_media_type(reader, index, i++, &input_type) == S_OK) + { + if (SUCCEEDED(IMFMediaType_GetGUID(input_type, &MF_MT_SUBTYPE, &in_type.guidSubtype))) + { + count = 0; + if (SUCCEEDED(hr = MFTEnum(category, 0, &in_type, &out_type, NULL, &clsids, &count)) && count) + { + mft_clsid = clsids[0]; + CoTaskMemFree(clsids); + + /* TODO: Should we iterate over all of them? */ + if (SUCCEEDED(source_reader_configure_decoder(reader, index, &mft_clsid, input_type, output_type))) + { + IMFMediaType_Release(input_type); + return S_OK; + } + + } + } + + IMFMediaType_Release(input_type); + } + + return MF_E_TOPO_CODEC_NOT_FOUND; +} + static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWORD index, DWORD *reserved, IMFMediaType *type) { @@ -774,11 +962,12 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO if (index >= reader->stream_count) return MF_E_INVALIDSTREAMNUMBER; - /* FIXME: validate passed type and current presentation state. */ + /* FIXME: setting the output type while streaming should trigger a flush */ EnterCriticalSection(&reader->cs); - hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current); + if ((hr = source_reader_set_compatible_media_type(reader, index, type)) == S_FALSE) + hr = source_reader_create_decoder_for_stream(reader, index, type); LeaveCriticalSection(&reader->cs);

1 0

Jacek Caban : dbghelp: Use page size from sysinfo.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: 1ece841d9354296f374228b9e16246a076f57196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ece841d9354296f374228b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 18:09:25 2020 +0100 dbghelp: Use page size from sysinfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 5a6bef947a..a11e73a0e1 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -403,7 +403,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* { static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; unsigned int i; - size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; + size_t tmp, page_mask = sysinfo.dwPageSize - 1; WCHAR *dos_path; unsigned char e_ident[EI_NIDENT]; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index f10dc78eec..8fa05d312a 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -569,7 +569,7 @@ static int macho_load_section_info(struct image_file_map* ifm, const struct load struct section_info* info = user; BOOL ignore; int i; - unsigned long tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; + unsigned long tmp, page_mask = sysinfo.dwPageSize - 1; uint64_t vmaddr, vmsize; char segname[16]; uint32_t nsects;

1 0

Hans Leidekker : webservices: Implement WS_TYPE_ATTRIBUTE_FIELD_MAPPING for the writer.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: 234115c8cc81d43e4e43f67e3a100e9d8b431f90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=234115c8cc81d43e4e43f67e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 20 16:03:53 2020 +0100 webservices: Implement WS_TYPE_ATTRIBUTE_FIELD_MAPPING for the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 56 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 22 ++++++++++++++-- 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index e996e4972b..1d76918901 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -4793,6 +4793,61 @@ static void test_stream_output(void) WsFreeWriter( writer ); } +static void test_description_type(void) +{ + static WS_XML_STRING ns = {0, NULL}, localname = {1, (BYTE *)"t"}, val = {3, (BYTE *)"val"}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_STRUCT_DESCRIPTION s; + struct test + { + const WS_STRUCT_DESCRIPTION *desc; + INT32 val; + } test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TYPE_ATTRIBUTE_FIELD_MAPPING; + f.type = WS_DESCRIPTION_TYPE; + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ATTRIBUTE_FIELD_MAPPING; + f2.localName = &val; + f2.ns = &ns; + f2.offset = FIELD_OFFSET(struct test, val); + f2.type = WS_INT32_TYPE; + fields[1] = &f2; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 2; + s.typeLocalName = &localname; + s.typeNs = &ns; + + test.desc = &s; + test.val = -1; + + hr = set_output( writer ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t val=\"-1\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -4837,4 +4892,5 @@ START_TEST(writer) test_text_types_binary(); test_repeating_element_choice(); test_stream_output(); + test_description_type(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 989ea0986d..28df4a3c4e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3760,8 +3760,8 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI return E_NOTIMPL; } - /* zero-terminated strings are always pointers */ - if (desc->type == WS_WSZ_TYPE) field_options |= WS_FIELD_POINTER; + /* zero-terminated strings and descriptions are always pointers */ + if (desc->type == WS_WSZ_TYPE || desc->type == WS_DESCRIPTION_TYPE) field_options |= WS_FIELD_POINTER; if (field_options & WS_FIELD_POINTER) size = sizeof(const void *); @@ -3790,6 +3790,10 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI switch (desc->mapping) { + case WS_TYPE_ATTRIBUTE_FIELD_MAPPING: + mapping = WS_ATTRIBUTE_TYPE_MAPPING; + break; + case WS_ATTRIBUTE_FIELD_MAPPING: if (!desc->localName || !desc->ns) return E_INVALIDARG; if ((hr = write_add_attribute( writer, NULL, desc->localName, desc->ns, FALSE )) != S_OK) @@ -3910,6 +3914,17 @@ static HRESULT write_type_enum( struct writer *writer, WS_TYPE_MAPPING mapping, return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_description( struct writer *writer, WS_TYPE_MAPPING mapping, + WS_WRITE_OPTION option, const void *value, ULONG size ) +{ + const WS_STRUCT_DESCRIPTION *ptr; + HRESULT hr; + + if ((hr = get_value_ptr( option, value, size, sizeof(*ptr), (const void **)&ptr )) != S_OK) return hr; + if (ptr) FIXME( "ignoring type description %p\n", ptr ); + return S_OK; +} + static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -3970,6 +3985,9 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_XML_QNAME_TYPE: return write_type_qname( writer, mapping, desc, option, value, size ); + case WS_DESCRIPTION_TYPE: + return write_type_description( writer, mapping, option, value, size ); + case WS_STRUCT_TYPE: return write_type_struct( writer, mapping, desc, option, value, size );

1 0

Jacek Caban : makedep: Build builtin DLLs with ucrtbase.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: 05b774fb48dac5f412e3490313c6e70199013568 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b774fb48dac5f412e34903… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 14:36:37 2020 +0100 makedep: Build builtin DLLs with ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c415c5e84f..4f19231e7c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4268,16 +4268,16 @@ static void load_sources( struct makefile *make ) if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); crt_dll = make->imports.str[i]; } - if (!crt_dll) + if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) { - if (make->use_msvcrt && make->is_exe) + if (make->use_msvcrt && !make->testdll && !make->staticlib) { strarray_add( &make->imports, "ucrtbase" ); crt_dll = "ucrtbase"; } else crt_dll = "msvcrt"; } - if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); + if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); } LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 );

1 0

Jacek Caban : wininet: Use _ltow instead of sprintf for port number in InternetCreateUrl.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: 9fe900532eb310d114c04d15a8d0b986ec831552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe900532eb310d114c04d15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 14:35:43 2020 +0100 wininet: Use _ltow instead of sprintf for port number in InternetCreateUrl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cdafbfa139..4b7cdad66e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4263,9 +4263,10 @@ static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - char szPort[MAX_WORD_DIGITS+1]; + WCHAR port[MAX_WORD_DIGITS + 1]; - *lpdwUrlLength += sprintf(szPort, "%d", lpUrlComponents->nPort); + _ltow(lpUrlComponents->nPort, port, 10); + *lpdwUrlLength += lstrlenW(port); *lpdwUrlLength += strlen(":"); } @@ -4421,10 +4422,8 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, { DWORD dwLen; INTERNET_SCHEME nScheme; - WCHAR *start = lpszUrl; static const WCHAR slashSlashW[] = {'/','/'}; - static const WCHAR fmtW[] = {'%','u',0}; TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); @@ -4509,9 +4508,9 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - *lpszUrl = ':'; - lpszUrl++; - lpszUrl += swprintf(lpszUrl, *lpdwUrlLength - (lpszUrl - start), fmtW, lpUrlComponents->nPort); + *lpszUrl++ = ':'; + _ltow(lpUrlComponents->nPort, lpszUrl, 10); + lpszUrl += lstrlenW(lpszUrl); } /* add slash between hostname and path if necessary */

1 0

Jacek Caban : jscript: Simplify Object.prototype.toString implementation.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: 2be65404d2607de718d71271f6f77fb21aebc25d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2be65404d2607de718d71271… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 14:35:27 2020 +0100 jscript: Simplify Object.prototype.toString implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index bfc1a892df..580e11833e 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -56,27 +56,31 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u jsdisp_t *jsdisp; const WCHAR *str; - static const WCHAR formatW[] = {'[','o','b','j','e','c','t',' ','%','s',']',0}; - - static const WCHAR arrayW[] = {'A','r','r','a','y',0}; - static const WCHAR booleanW[] = {'B','o','o','l','e','a','n',0}; - static const WCHAR dateW[] = {'D','a','t','e',0}; - static const WCHAR errorW[] = {'E','r','r','o','r',0}; - static const WCHAR functionW[] = {'F','u','n','c','t','i','o','n',0}; - static const WCHAR mathW[] = {'M','a','t','h',0}; - static const WCHAR numberW[] = {'N','u','m','b','e','r',0}; - static const WCHAR objectW[] = {'O','b','j','e','c','t',0}; - static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; - static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, objectW, errorW, - functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW, objectW}; + static const WCHAR *names[] = { + NULL, + L"[object Array]", + L"[object Boolean]", + L"[object Date]", + L"[object Object]", + L"[object Error]", + L"[object Function]", + NULL, + L"[object Math]", + L"[object Number]", + L"[object Object]", + L"[object RegExp]", + L"[object String]", + L"[object Object]", + L"[object Object]", + L"[object Object]" + }; TRACE("\n"); jsdisp = get_jsdisp(jsthis); if(!jsdisp) { - str = objectW; + str = L"[object Object]"; }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; }else { @@ -87,13 +91,9 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u if(r) { jsstr_t *ret; - WCHAR *ptr; - - ret = jsstr_alloc_buf(9+lstrlenW(str), &ptr); + ret = jsstr_alloc(str); if(!ret) return E_OUTOFMEMORY; - - swprintf(ptr, 9 + lstrlenW(str), formatW, str); *r = jsval_string(ret); }

1 0

Piotr Caban : msvcp140: Don't load __processing_throw dynamically.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: e91be162836d2e6b54f6a16653d1c41047e78a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91be162836d2e6b54f6a166… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 20 14:32:36 2020 +0100 msvcp140: Don't load __processing_throw dynamically. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 3 ++- dlls/msvcp90/msvcp90.h | 4 ---- dlls/msvcp90/msvcp_main.c | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 74529e9019..e75b8cc729 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); +int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) typedef const char **exception_name; @@ -947,7 +948,7 @@ MSVCP_bool __cdecl MSVCP__uncaught_exception(void) #if _MSVCP_VER >= 140 int __cdecl __uncaught_exceptions(void) { - return *UCRTBASE___processing_throw(); + return *__processing_throw(); } typedef struct diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 497ca126e4..9a9390d699 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -49,10 +49,6 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*); -#if _MSVCP_VER >= 140 -extern int* (__cdecl *UCRTBASE___processing_throw)(void); -#endif - #if _MSVCP_VER >= 110 /* keep in sync with msvcrt/lock.c */ typedef struct cs_queue diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 82bbf84c25..816a95c29e 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -58,10 +58,6 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); -#if _MSVCP_VER >= 140 -int* (__cdecl *UCRTBASE___processing_throw)(void); -#endif - #if _MSVCP_VER >= 110 critical_section* (__thiscall *critical_section_ctor)(critical_section*); void (__thiscall *critical_section_dtor)(critical_section*); @@ -129,7 +125,6 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = operator_new; MSVCRT_operator_delete = operator_delete; MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); - UCRTBASE___processing_throw = (void*)GetProcAddress(hmod, "__processing_throw"); hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) ); if (!hcon) FIXME( "%s not loaded\n", CONCRT_NAME(_MSVCP_VER) );

1 0

Piotr Caban : msvcp140: Remove custom standard streams definition.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: 6160e0ea58358d81ae39ff275772b052acda59b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6160e0ea58358d81ae39ff27… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 20 14:32:30 2020 +0100 msvcp140: Remove custom standard streams definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a632659f9a..8513965dd7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -35,16 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define TICKSPERSEC 10000000 #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) -#if _MSVCP_VER >= 140 -FILE* __cdecl __acrt_iob_func(unsigned); -#undef stdin -#undef stdout -#undef stderr -#define stdin __acrt_iob_func(STDIN_FILENO) -#define stdout __acrt_iob_func(STDOUT_FILENO) -#define stderr __acrt_iob_func(STDERR_FILENO) -#endif - /* ?_Index(a)ios_base@std@@0HA */ int ios_base_Index = 0; /* ?_Sync(a)ios_base@std@@0_NA */

1 0

Nikolay Sivov : include: Add some missing symbols to mftransform.idl.
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: 197a37fe4ca8e2b14d64915e3e88d8893eba7422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197a37fe4ca8e2b14d64915e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 15:05:50 2020 +0300 include: Add some missing symbols to mftransform.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mftransform.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/mftransform.idl b/include/mftransform.idl index 59e40f95f7..6b9c79572a 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -59,6 +59,11 @@ enum _MFT_INPUT_STATUS_FLAGS MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, }; +enum _MFT_INPUT_DATA_BUFFER_FLAGS +{ + MFT_INPUT_DATA_BUFFER_PLACEHOLDER = 0xffffffff, +}; + enum _MFT_OUTPUT_STREAM_INFO_FLAGS { MFT_OUTPUT_STREAM_WHOLE_SAMPLES = 0x00000001, @@ -185,6 +190,7 @@ interface IMFTransform : IUnknown cpp_quote("HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate);") cpp_quote("EXTERN_GUID(MF_SA_D3D_AWARE, 0xeaa35c29, 0x775e, 0x488e, 0x9b, 0x61, 0xb3, 0x28, 0x3e, 0x49, 0x58, 0x3b);") +cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT, 0x18802c61, 0x324b, 0x4952, 0xab, 0xd0, 0x17, 0x6f, 0xf5, 0xc6, 0x96, 0xff);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC, 0xf81a699a, 0x649a, 0x497d, 0x8c, 0x73, 0x29, 0xf8, 0xfe, 0xd6, 0xad, 0x7a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC_UNLOCK, 0xe5666d6b, 0x3422, 0x4eb6, 0xa4, 0x21, 0xda, 0x7d, 0xb1, 0xf8, 0xe2, 0x07);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_CATEGORY_Attribute, 0xceabba49, 0x506d, 0x4757, 0xa6, 0xff, 0x66, 0xc1, 0x84, 0x98, 0x7e, 0x4e);") @@ -208,3 +214,8 @@ cpp_quote("EXTERN_GUID(MFT_PROCESS_LOCAL_Attribute, 0x543186e4, 0x46 cpp_quote("EXTERN_GUID(MFT_REMUX_MARK_I_PICTURE_AS_CLEAN_POINT, 0x364e8f85, 0x3f2e, 0x436c, 0xb2, 0xa2, 0x44, 0x40, 0xa0, 0x12, 0xa9, 0xe8);") cpp_quote("EXTERN_GUID(MFT_SUPPORT_3DVIDEO, 0x093f81b1, 0x4f2e, 0x4631, 0x81, 0x68, 0x79, 0x34, 0x03, 0x2a, 0x01, 0xd3);") cpp_quote("EXTERN_GUID(MFT_TRANSFORM_CLSID_Attribute, 0x6821c42b, 0x65a4, 0x4e82, 0x99, 0xbc, 0x9a, 0x88, 0x20, 0x5e, 0xcd, 0x0c);") + +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_CLSID, 0xc57a84c0, 0x1a80, 0x40a3, 0x97, 0xb5, 0x92, 0x72, 0xa4, 0x03, 0xc8, 0xae, 1);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_CATEGORY, 0xc57a84c0, 0x1a80, 0x40a3, 0x97, 0xb5, 0x92, 0x72, 0xa4, 0x03, 0xc8, 0xae, 2);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_EXATTRIBUTE_SUPPORTED, 0x456fe843, 0x3c87, 0x40c0, 0x94, 0x9d, 0x14, 0x09, 0xc9, 0x7d, 0xab, 0x2c, 1);") +cpp_quote("DEFINE_PROPERTYKEY(MFPKEY_MULTICHANNEL_CHANNEL_MASK, 0x58bdaf8c, 0x3224, 0x4692, 0x86, 0xd0, 0x44, 0xd6, 0x5c, 0x5b, 0xf8, 0x2b, 1);")

1 0

Alexandre Julliard : kernelbase: Implement IsValidNLSVersion().
by Alexandre Julliard March 20, 2020

March 20, 2020

Module: wine Branch: master Commit: 84cca2baae23c6afa0c8070f5009fdcfa218e039 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cca2baae23c6afa0c8070f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 14:43:45 2020 +0100 kernelbase: Implement IsValidNLSVersion(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/locale.c | 80 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 33 +++++++++++++++++ include/winnls.h | 1 + 5 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1cccaf2209..2e2f7c9a84 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -995,6 +995,7 @@ @ stdcall -import IsValidLanguageGroup(long long) @ stdcall -import IsValidLocale(long long) @ stdcall -import IsValidLocaleName(wstr) +@ stdcall -import IsValidNLSVersion(long wstr ptr) # @ stub IsValidUILanguage @ stdcall -import IsWow64Process(ptr ptr) @ stdcall K32EmptyWorkingSet(long) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3f755aa2b9..4c1e1b4d73 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -87,6 +87,7 @@ static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCWSTR, INT, BOOL); static BOOL (WINAPI *pGetNLSVersion)(NLS_FUNCTION,LCID,NLSVERSIONINFO*); static BOOL (WINAPI *pGetNLSVersionEx)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); +static DWORD (WINAPI *pIsValidNLSVersion)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); static NTSTATUS (WINAPI *pRtlNormalizeString)(ULONG, LPCWSTR, INT, LPWSTR, INT*); static NTSTATUS (WINAPI *pRtlIsNormalizedString)(ULONG, LPCWSTR, INT, BOOLEAN*); static NTSTATUS (WINAPI *pNtGetNlsSectionPtr)(ULONG,ULONG,void*,void**,SIZE_T*); @@ -129,6 +130,7 @@ static void InitFunctionPointers(void) X(FindStringOrdinal); X(GetNLSVersion); X(GetNLSVersionEx); + X(IsValidNLSVersion); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -6763,6 +6765,84 @@ static void test_NLSVersion(void) else ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); } else win_skip( "GetNLSVersionEx not available\n" ); + + if (pIsValidNLSVersion) + { + info.dwNLSVersionInfoSize = sizeof(info); + pGetNLSVersion( COMPARE_STRING, LOCALE_USER_DEFAULT, (NLSVERSIONINFO *)&info ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsValidNLSVersion( COMPARE_STRING, L"ja-JP", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = offsetof( NLSVERSIONINFO, dwEffectiveId ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsValidNLSVersion( 2, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsValidNLSVersion( COMPARE_STRING, L"foobar", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + memset( &info, 0xcc, sizeof(info) ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + + info.dwNLSVersionInfoSize = sizeof(info); + pGetNLSVersion( COMPARE_STRING, LOCALE_USER_DEFAULT, (NLSVERSIONINFO *)&info ); + info.dwNLSVersion++; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + info.dwNLSVersion += 0x100; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError() ); + + info.dwNLSVersion -= 0x200; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError() ); + + info.dwNLSVersion += 0x100; + info.dwDefinedVersion += 0x100; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + + info.dwDefinedVersion -= 0x100; + info.guidCustomVersion.Data1 = 0x123; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( !ret, "IsValidNLSVersion succeeded\n" ); + ok( GetLastError() == 0, "wrong error %u\n", GetLastError() ); + + info.guidCustomVersion = guid_null; + SetLastError( 0xdeadbeef ); + ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); + ok( ret, "IsValidNLSVersion failed err %u\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + } + else win_skip( "IsValidNLSVersion not available\n" ); } START_TEST(locale) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fbcae55e98..d74f65c8f1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -878,7 +878,7 @@ @ stdcall IsValidLanguageGroup(long long) @ stdcall IsValidLocale(long long) @ stdcall IsValidLocaleName(wstr) -# @ stub IsValidNLSVersion +@ stdcall IsValidNLSVersion(long wstr ptr) @ stub IsValidRelativeSecurityDescriptor @ stdcall IsValidSecurityDescriptor(ptr) @ stdcall IsValidSid(ptr) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index b9a53b0ef3..623cb01280 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4860,6 +4860,39 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocaleName( const WCHAR *locale ) } +/****************************************************************************** + * IsValidNLSVersion (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH IsValidNLSVersion( NLS_FUNCTION func, const WCHAR *locale, + NLSVERSIONINFOEX *info ) +{ + static const GUID GUID_NULL; + NLSVERSIONINFOEX infoex; + DWORD ret; + + if (func != COMPARE_STRING) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (info->dwNLSVersionInfoSize < sizeof(*info) && + (info->dwNLSVersionInfoSize != offsetof( NLSVERSIONINFO, dwEffectiveId ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + infoex.dwNLSVersionInfoSize = sizeof(infoex); + if (!GetNLSVersionEx( func, locale, &infoex )) return FALSE; + + ret = (infoex.dwNLSVersion & ~0xff) == (info->dwNLSVersion & ~0xff); + if (ret && !IsEqualGUID( &info->guidCustomVersion, &GUID_NULL )) + ret = find_sortguid( &info->guidCustomVersion ) != NULL; + + if (!ret) SetLastError( ERROR_SUCCESS ); + return ret; +} + + /*********************************************************************** * LCIDToLocaleName (kernelbase.@) */ diff --git a/include/winnls.h b/include/winnls.h index e563968cf9..e7b478b1c6 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -957,6 +957,7 @@ WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); WINBASEAPI BOOL WINAPI IsValidLocaleName(LPCWSTR); +WINBASEAPI DWORD WINAPI IsValidNLSVersion(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); WINBASEAPI INT WINAPI LCIDToLocaleName(LCID,LPWSTR,INT,DWORD); WINBASEAPI INT WINAPI LCMapStringA(LCID,DWORD,LPCSTR,INT,LPSTR,INT); WINBASEAPI INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT);

1 0