April 2019 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfreadwrite: Add partial implementation of ReadSample().
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 020d2202ea06d395a37b9840b00dd50d26be6d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=020d2202ea06d395a37b9840… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 10:52:27 2019 +0300 mfreadwrite: Add partial implementation of ReadSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 109 +++++++++++++++++++++++++++++++++++++--- dlls/mfreadwrite/tests/mfplat.c | 7 +++ 2 files changed, 109 insertions(+), 7 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 43dfd4e..8145e5b 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -79,13 +79,21 @@ struct sample IMFSample *sample; }; +enum media_stream_state +{ + STREAM_STATE_READY = 0, + STREAM_STATE_EOS, +}; + struct media_stream { IMFMediaStream *stream; IMFMediaType *current; DWORD id; CRITICAL_SECTION cs; + CONDITION_VARIABLE sample_event; struct list samples; + enum media_stream_state state; }; typedef struct source_reader @@ -359,6 +367,8 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, list_add_tail(&reader->streams[i].samples, &pending_sample->entry); LeaveCriticalSection(&reader->streams[i].cs); + WakeAllConditionVariable(&reader->streams[i].sample_event); + break; } } @@ -698,14 +708,98 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG return IMFMediaSource_Start(reader->source, reader->descriptor, format, position); } -static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, - DWORD flags, DWORD *actualindex, DWORD *sampleflags, LONGLONG *timestamp, - IMFSample **sample) +static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *stream_flags) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, 0x%08x, %p, %p, %p, %p\n", This, index, flags, actualindex, - sampleflags, timestamp, sample); - return E_NOTIMPL; + IMFSample *ret = NULL; + struct list *head; + + if ((head = list_head(&stream->samples))) + { + struct sample *pending_sample = LIST_ENTRY(head, struct sample, entry); + ret = pending_sample->sample; + list_remove(&pending_sample->entry); + heap_free(pending_sample); + } + + *stream_flags = stream->state == STREAM_STATE_EOS ? MF_SOURCE_READERF_ENDOFSTREAM : 0; + + return ret; +} + +static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, + DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) +{ + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + case MF_SOURCE_READER_ANY_STREAM: + FIXME("Non-specific requests are not supported.\n"); + return E_NOTIMPL; + default: + ; + } + + /* FIXME: probably should happen once */ + IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL); + + if (reader->async_callback) + { + FIXME("Async mode is not implemented.\n"); + return E_NOTIMPL; + } + else + { + struct media_stream *stream; + + if (!stream_flags || !sample) + return E_POINTER; + + if (actual_index) + *actual_index = index; + + *sample = NULL; + + if (index >= reader->stream_count) + { + *stream_flags = MF_SOURCE_READERF_ERROR; + return MF_E_INVALIDSTREAMNUMBER; + } + + stream = &reader->streams[index]; + + EnterCriticalSection(&stream->cs); + + if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) + { + while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) + { + if (stream->stream) + { + if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) + WARN("Sample request failed, hr %#x.\n", hr); + } + SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); + } + } + + *sample = media_stream_pop_sample(stream, stream_flags); + + LeaveCriticalSection(&stream->cs); + + TRACE("Got sample %p.\n", *sample); + } + + return S_OK; } static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) @@ -922,6 +1016,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri break; InitializeCriticalSection(&object->streams[i].cs); + InitializeConditionVariable(&object->streams[i].sample_event); list_init(&object->streams[i].samples); } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 29e8e08..b86fb06 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -315,6 +315,13 @@ todo_wine ok(actual_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM, "Unexpected stream index %u\n", actual_index); ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#x.\n", stream_flags); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, &stream_flags, &timestamp, + &sample); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, NULL, &timestamp, &sample); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr);

1 0

Nikolay Sivov : mfreadwrite: Wake also on new streams.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 279f6dbd0cb1e4f2c48340ce6fd3e43e6fa681eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=279f6dbd0cb1e4f2c48340ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 10:52:29 2019 +0300 mfreadwrite: Wake also on new streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e27fe82..490f238 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -253,6 +253,9 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM { WARN("Failed to subscribe to stream events, hr %#x.\n", hr); } + + /* Wake so any waiting ReadSample() calls have a chance to make requests. */ + WakeAllConditionVariable(&reader->streams[i].sample_event); } break; }

1 0

Alexandre Julliard : ntdll: Move open_dll_file() to avoid forward declarations.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: f7cf3c18064b07ac01bc42ebdf8773ea83327e3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7cf3c18064b07ac01bc42eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 11:34:55 2019 +0200 ntdll: Move open_dll_file() to avoid forward declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 158 ++++++++++++++++++++++++++-------------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d7dbe57..fa8d1f8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1986,6 +1986,85 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) } +/*********************************************************************** + * open_dll_file + * + * Open a file for a new dll. Helper for find_dll_file. + */ +static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_MODREF **pwm, + void **module, pe_image_info_t *image_info, struct stat *st ) +{ + FILE_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + LARGE_INTEGER size; + SIZE_T len = 0; + NTSTATUS status; + HANDLE handle, mapping; + int fd, needs_close; + + nt_name->Buffer = NULL; + if ((status = RtlDosPathNameToNtPathName_U_WithStatus( name, nt_name, NULL, NULL ))) return status; + + if ((*pwm = find_fullname_module( nt_name ))) return STATUS_SUCCESS; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = nt_name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + if ((status = NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) + { + if (status != STATUS_OBJECT_PATH_NOT_FOUND && + status != STATUS_OBJECT_NAME_NOT_FOUND && + !NtQueryAttributesFile( &attr, &info )) + { + /* if the file exists but failed to open, report the error */ + return status; + } + /* otherwise continue searching */ + return STATUS_DLL_NOT_FOUND; + } + + if (!server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )) + { + fstat( fd, st ); + if (needs_close) close( fd ); + if ((*pwm = find_fileid_module( st ))) + { + TRACE( "%s is the same file as existing module %p %s\n", debugstr_w( nt_name->Buffer ), + (*pwm)->ldr.BaseAddress, debugstr_w( (*pwm)->ldr.FullDllName.Buffer )); + NtClose( handle ); + return STATUS_SUCCESS; + } + } + + size.QuadPart = 0; + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | + SECTION_MAP_READ | SECTION_MAP_EXECUTE, + NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); + NtClose( handle ); + + if (!status) + { + status = virtual_map_section( mapping, module, 0, 0, NULL, &len, + PAGE_EXECUTE_READ, image_info ); + if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; + NtClose( mapping ); + } + if (!status && !is_valid_binary( *module, image_info )) + { + TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->machine ); + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + } + return status; +} + + /****************************************************************************** * load_native_dll (internal) */ @@ -2289,85 +2368,6 @@ done: /*********************************************************************** - * open_dll_file - * - * Open a file for a new dll. Helper for find_dll_file. - */ -static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_MODREF **pwm, - void **module, pe_image_info_t *image_info, struct stat *st ) -{ - FILE_BASIC_INFORMATION info; - OBJECT_ATTRIBUTES attr; - IO_STATUS_BLOCK io; - LARGE_INTEGER size; - SIZE_T len = 0; - NTSTATUS status; - HANDLE handle, mapping; - int fd, needs_close; - - nt_name->Buffer = NULL; - if ((status = RtlDosPathNameToNtPathName_U_WithStatus( name, nt_name, NULL, NULL ))) return status; - - if ((*pwm = find_fullname_module( nt_name ))) return STATUS_SUCCESS; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.ObjectName = nt_name; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if ((status = NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) - { - if (status != STATUS_OBJECT_PATH_NOT_FOUND && - status != STATUS_OBJECT_NAME_NOT_FOUND && - !NtQueryAttributesFile( &attr, &info )) - { - /* if the file exists but failed to open, report the error */ - return status; - } - /* otherwise continue searching */ - return STATUS_DLL_NOT_FOUND; - } - - if (!server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )) - { - fstat( fd, st ); - if (needs_close) close( fd ); - if ((*pwm = find_fileid_module( st ))) - { - TRACE( "%s is the same file as existing module %p %s\n", debugstr_w( nt_name->Buffer ), - (*pwm)->ldr.BaseAddress, debugstr_w( (*pwm)->ldr.FullDllName.Buffer )); - NtClose( handle ); - return STATUS_SUCCESS; - } - } - - size.QuadPart = 0; - status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | - SECTION_MAP_READ | SECTION_MAP_EXECUTE, - NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); - NtClose( handle ); - - if (!status) - { - status = virtual_map_section( mapping, module, 0, 0, NULL, &len, - PAGE_EXECUTE_READ, image_info ); - if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - NtClose( mapping ); - } - if (!status && !is_valid_binary( *module, image_info )) - { - TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->machine ); - NtUnmapViewOfSection( NtCurrentProcess(), *module ); - status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - } - return status; -} - - -/*********************************************************************** * search_dll_file * * Search for dll in the specified paths.

1 0

Alexandre Julliard : ntdll: Only pass the NT path name to open_dll_file().
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: ea9cc97e2ef3133d2da7b48d8c11786fe61abbbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9cc97e2ef3133d2da7b48d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 11:36:39 2019 +0200 ntdll: Only pass the NT path name to open_dll_file(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fa8d1f8..de218c7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1991,7 +1991,7 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) * * Open a file for a new dll. Helper for find_dll_file. */ -static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_MODREF **pwm, +static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void **module, pe_image_info_t *image_info, struct stat *st ) { FILE_BASIC_INFORMATION info; @@ -2003,9 +2003,6 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ HANDLE handle, mapping; int fd, needs_close; - nt_name->Buffer = NULL; - if ((status = RtlDosPathNameToNtPathName_U_WithStatus( name, nt_name, NULL, NULL ))) return status; - if ((*pwm = find_fullname_module( nt_name ))) return STATUS_SUCCESS; attr.Length = sizeof(attr); @@ -2397,7 +2394,11 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * memcpy( name, paths, len * sizeof(WCHAR) ); if (len && name[len - 1] != '\\') name[len++] = '\\'; strcpyW( name + len, search ); - status = open_dll_file( name, nt_name, pwm, module, image_info, st ); + + nt_name->Buffer = NULL; + if ((status = RtlDosPathNameToNtPathName_U_WithStatus( name, nt_name, NULL, NULL ))) goto done; + + status = open_dll_file( nt_name, pwm, module, image_info, st ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( nt_name ); @@ -2466,8 +2467,8 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) status = search_dll_file( load_path, libname, nt_name, pwm, module, image_info, st ); - else - status = open_dll_file( libname, nt_name, pwm, module, image_info, st ); + else if (!(status = RtlDosPathNameToNtPathName_U_WithStatus( libname, nt_name, NULL, NULL ))) + status = open_dll_file( nt_name, pwm, module, image_info, st ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) status = STATUS_INVALID_IMAGE_FORMAT;

1 0

Alexandre Julliard : ntdll: Add support for loading PE builtin dlls.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 948fc851867da01f09c84ad83df6f4eddc74fdf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948fc851867da01f09c84ad8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 11:36:54 2019 +0200 ntdll: Add support for loading PE builtin dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 208 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=948fc851867da01f09c8…

1 0

Alexandre Julliard : setupapi: Add support for installing PE builtins as fake dlls.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 510e746718bb11f45fff58517582e72c09f1055a URL: https://source.winehq.org/git/wine.git/?a=commit;h=510e746718bb11f45fff5851… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 11:40:41 2019 +0200 setupapi: Add support for installing PE builtins as fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 53 ++++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e0d012a..260eb1e 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -51,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +static const char builtin_signature[] = "Wine builtin DLL"; static const char fakedll_signature[] = "Wine placeholder DLL"; static const unsigned int file_alignment = 512; @@ -191,14 +192,15 @@ failed: /* read in the contents of a file into the global file buffer */ /* return 1 on success, 0 on nonexistent file, -1 on other error */ -static int read_file( const char *name, void **data, SIZE_T *size ) +static int read_file( const char *name, void **data, SIZE_T *size, BOOL expect_builtin ) { struct stat st; int fd, ret = -1; size_t header_size; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - const size_t min_size = sizeof(*dos) + sizeof(fakedll_signature) + + const char *signature = expect_builtin ? builtin_signature : fakedll_signature; + const size_t min_size = sizeof(*dos) + 32 + FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader.MajorLinkerVersion ); if ((fd = open( name, O_RDONLY | O_BINARY )) == -1) return 0; @@ -220,8 +222,8 @@ static int read_file( const char *name, void **data, SIZE_T *size ) if (pread( fd, file_buffer, header_size, 0 ) != header_size) goto done; dos = file_buffer; if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto done; - if (dos->e_lfanew < sizeof(fakedll_signature)) goto done; - if (memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) goto done; + if (dos->e_lfanew < strlen(signature) + 1) goto done; + if (memcmp( dos + 1, signature, strlen(signature) + 1 )) goto done; if (dos->e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader.MajorLinkerVersion) > header_size) goto done; nt = (IMAGE_NT_HEADERS *)((char *)file_buffer + dos->e_lfanew); @@ -354,14 +356,15 @@ static BOOL is_fake_dll( HANDLE h ) { IMAGE_DOS_HEADER *dos; DWORD size; - BYTE buffer[sizeof(*dos) + sizeof(fakedll_signature)]; + BYTE buffer[sizeof(*dos) + 32]; if (!ReadFile( h, buffer, sizeof(buffer), &size, NULL ) || size != sizeof(buffer)) return FALSE; dos = (IMAGE_DOS_HEADER *)buffer; if (dos->e_magic != IMAGE_DOS_SIGNATURE) return FALSE; if (dos->e_lfanew < size) return FALSE; - return !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) ); + return (!memcmp( dos + 1, builtin_signature, sizeof(builtin_signature) ) || + !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )); } /* create directories leading to a given file */ @@ -417,33 +420,39 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) if (build_dir) { - strcpy( file + pos + len + 1, ".fake" ); - /* try as a dll */ ptr = file + pos; namelen = len + 1; + file[pos + len + 1] = 0; if (namelen > 4 && !memcmp( ptr + namelen - 4, ".dll", 4 )) namelen -= 4; ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - if ((res = read_file( ptr, &data, size ))) goto done; + if ((res = read_file( ptr, &data, size, TRUE ))) goto done; + strcpy( file + pos + len + 1, ".fake" ); + if ((res = read_file( ptr, &data, size, FALSE ))) goto done; /* now as a program */ ptr = file + pos; namelen = len + 1; + file[pos + len + 1] = 0; if (namelen > 4 && !memcmp( ptr + namelen - 4, ".exe", 4 )) namelen -= 4; ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - if ((res = read_file( ptr, &data, size ))) goto done; + if ((res = read_file( ptr, &data, size, TRUE ))) goto done; + strcpy( file + pos + len + 1, ".fake" ); + if ((res = read_file( ptr, &data, size, FALSE ))) goto done; } file[pos + len + 1] = 0; for (i = 0; (path = wine_dll_enum_load_path( i )); i++) { + ptr = prepend( file + pos, path, strlen(path) ); + if ((res = read_file( ptr, &data, size, TRUE ))) break; ptr = prepend( file + pos, "/fakedlls", sizeof("/fakedlls") - 1 ); ptr = prepend( ptr, path, strlen(path) ); - if ((res = read_file( ptr, &data, size ))) break; + if ((res = read_file( ptr, &data, size, FALSE ))) break; } done: @@ -842,7 +851,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size } /* copy a fake dll file to the dest directory */ -static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) +static int install_fake_dll( WCHAR *dest, char *file, const char *ext, BOOL expect_builtin ) { int ret; SIZE_T size; @@ -852,8 +861,8 @@ static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) char *name = strrchr( file, '/' ) + 1; char *end = name + strlen(name); - if (ext) strcpy( end, ext ); - if (!(ret = read_file( file, &data, &size ))) return; + strcpy( end, ext ); + if (!(ret = read_file( file, &data, &size, expect_builtin ))) return 0; if (end > name + 2 && !strncmp( end - 2, "16", 2 )) end -= 2; /* remove "16" suffix */ dll_name_AtoW( destname, name, end - name ); @@ -875,10 +884,11 @@ static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) } } *destname = 0; /* restore it for next file */ + return ret; } /* find and install all fake dlls in a given lib directory */ -static void install_lib_dir( WCHAR *dest, char *file, const char *default_ext ) +static void install_lib_dir( WCHAR *dest, char *file, const char *default_ext, BOOL expect_builtin ) { DIR *dir; struct dirent *de; @@ -898,9 +908,10 @@ static void install_lib_dir( WCHAR *dest, char *file, const char *default_ext ) strcat( name, "/" ); strcat( name, de->d_name ); if (!strchr( de->d_name, '.' )) strcat( name, default_ext ); - install_fake_dll( dest, file, ".fake" ); + if (!install_fake_dll( dest, file, "", expect_builtin )) + install_fake_dll( dest, file, ".fake", FALSE ); } - else install_fake_dll( dest, file, NULL ); + else install_fake_dll( dest, file, "", expect_builtin ); } closedir( dir ); } @@ -931,16 +942,18 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname ) { strcpy( file, build_dir ); strcat( file, "/dlls" ); - install_lib_dir( dest, file, ".dll" ); + install_lib_dir( dest, file, ".dll", TRUE ); strcpy( file, build_dir ); strcat( file, "/programs" ); - install_lib_dir( dest, file, ".exe" ); + install_lib_dir( dest, file, ".exe", TRUE ); } for (i = 0; (path = wine_dll_enum_load_path( i )); i++) { strcpy( file, path ); + install_lib_dir( dest, file, NULL, TRUE ); + strcpy( file, path ); strcat( file, "/fakedlls" ); - install_lib_dir( dest, file, NULL ); + install_lib_dir( dest, file, NULL, FALSE ); } HeapFree( GetProcessHeap(), 0, file ); HeapFree( GetProcessHeap(), 0, dest );

1 0

Alexandre Julliard : makefiles: Build modules that don' t contain code as PE builtins.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 0189cf21ce4b96372d1f49e5d452ab61a21fbcd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0189cf21ce4b96372d1f49e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 11:51:04 2019 +0200 makefiles: Build modules that don't contain code as PE builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 104 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 74 insertions(+), 30 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 227d589..584c5a0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2051,6 +2051,37 @@ static const char *get_static_lib( const struct makefile *make, const char *name /******************************************************************* + * get_parent_makefile + */ +static struct makefile *get_parent_makefile( struct makefile *make ) +{ + char *dir, *p; + int i; + + if (!make->base_dir) return NULL; + dir = xstrdup( make->base_dir ); + if (!(p = strrchr( dir, '/' ))) return NULL; + *p = 0; + for (i = 0; i < top_makefile->subdirs.count; i++) + if (!strcmp( top_makefile->submakes[i]->base_dir, dir )) return top_makefile->submakes[i]; + return NULL; +} + + +/******************************************************************* + * is_cross_compiled + */ +static int is_cross_compiled( struct makefile *make ) +{ + return (crosstarget && + !make->is_win16 && + !strarray_exists( &make->imports, "kernel" ) && + (make->testdll || + !make->object_files.count)); +} + + +/******************************************************************* * add_default_libraries */ static struct strarray add_default_libraries( const struct makefile *make, struct strarray *deps ) @@ -2289,6 +2320,10 @@ static void output_install_commands( struct makefile *make, const struct makefil if (submake) file = base_dir_path( submake, file ); switch (*files.str[i + 1]) { + case 'c': /* cross-compiled program */ + output( "\tSTRIPPROG=%s-strip %s -m 644 $(INSTALL_PROGRAM_FLAGS) %s %s\n", + crosstarget, install_sh, obj_dir_path( make, file ), dest ); + break; case 'd': /* data file */ output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s %s\n", install_sh, obj_dir_path( make, file ), dest ); @@ -3069,47 +3104,61 @@ static void output_module( struct makefile *make ) char *module_path = obj_dir_path( make, make->module ); char *spec_file = NULL; unsigned int i; + int need_cross = is_cross_compiled( make ); if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); - add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ - strarray_addall( &all_libs, add_default_libraries( make, &dep_libs )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, need_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, need_cross )); + add_import_libs( make, &dep_libs, get_default_imports( make ), need_cross ); /* dependencies only */ - if (*dll_ext) + if (need_cross) { - for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); - strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); - strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); - add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), - strmake( "p$(dlldir)/%s%s", make->module, dll_ext )); - add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d$(dlldir)/fakedlls/%s", make->module )); - output( "%s%s %s.fake:", module_path, dll_ext, module_path ); + strarray_add( &make->all_targets, strmake( "%s", make->module )); + add_install_rule( make, make->module, strmake( "%s", make->module ), + strmake( "c$(dlldir)/%s", make->module )); + output( "%s:", module_path ); } else { - strarray_add( &make->all_targets, make->module ); - add_install_rule( make, make->module, make->module, - strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); - output( "%s:", module_path ); + strarray_addall( &all_libs, add_default_libraries( make, &dep_libs )); + + if (*dll_ext) + { + for (i = 0; i < make->delayimports.count; i++) + strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); + strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); + strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); + add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), + strmake( "p$(dlldir)/%s%s", make->module, dll_ext )); + add_install_rule( make, make->module, strmake( "%s.fake", make->module ), + strmake( "d$(dlldir)/fakedlls/%s", make->module )); + output( "%s%s %s.fake:", module_path, dll_ext, module_path ); + } + else + { + strarray_add( &make->all_targets, make->module ); + add_install_rule( make, make->module, make->module, + strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); + output( "%s:", module_path ); + } } + if (spec_file) output_filename( spec_file ); - output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, need_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output_winegcc_command( make, 0 ); + output_winegcc_command( make, need_cross ); + if (need_cross) output_filename( "-Wl,--wine-builtin" ); if (spec_file) { output_filename( "-shared" ); output_filename( spec_file ); } output_filenames( make->extradllflags ); - output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, need_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); @@ -3247,8 +3296,9 @@ static void output_test_module( struct makefile *make ) char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); struct strarray dep_libs = empty_strarray; struct strarray all_libs = add_import_libs( make, &dep_libs, make->imports, !!crosstarget ); - int parent_disabled = 0; + struct makefile *parent = get_parent_makefile( make ); const char *ext = crosstarget ? "" : dll_ext; + const char *parent_ext = parent && is_cross_compiled( parent ) ? "" : dll_ext; add_import_libs( make, &dep_libs, get_default_imports( make ), !!crosstarget ); /* dependencies only */ strarray_addall( &all_libs, libs ); @@ -3287,16 +3337,10 @@ static void output_test_module( struct makefile *make ) output( "\techo \"%s TESTRES \\\"%s%s\\\"\" | %s -o $@\n", testmodule, obj_dir_path( make, stripped ), ext, tools_path( make, "wrc" )); - if (strendswith( make->base_dir, "/tests" )) - { - char *dir = xstrdup( make->base_dir ); - dir[strlen( dir ) - 6] = 0; - parent_disabled = strarray_exists( &disabled_dirs, dir ); - } output_filenames_obj_dir( make, make->ok_files ); - output( ": %s%s ../%s%s\n", testmodule, ext, make->testdll, dll_ext ); + output( ": %s%s ../%s%s\n", testmodule, ext, make->testdll, parent_ext ); output( "check test:" ); - if (!make->disabled && !parent_disabled) output_filenames_obj_dir( make, make->ok_files ); + if (!make->disabled && parent && !parent->disabled) output_filenames_obj_dir( make, make->ok_files ); output( "\n" ); strarray_add( &make->phony_targets, "check" ); strarray_add( &make->phony_targets, "test" );

1 0

Jacek Caban : jscript: Fix handling empty string regexp matches in String.prototype.split implementation.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: b48cc9614e924198d41569db6a3a36295904f9c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b48cc9614e924198d41569db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 22 13:04:37 2019 +0200 jscript: Fix handling empty string regexp matches in String.prototype.split implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 49 ++++++++++++++++++++++++++++++++--------------- dlls/jscript/tests/api.js | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 79d7884..d88ed1c 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1131,21 +1131,20 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi jsval_t *r) { match_state_t match_result, *match_ptr = &match_result; - DWORD length, i, match_len = 0; + size_t length, i = 0, match_len = 0; const WCHAR *ptr, *ptr2, *str, *match_str = NULL; unsigned limit = ~0u; jsdisp_t *array, *regexp = NULL; jsstr_t *jsstr, *match_jsstr, *tmp_str; HRESULT hres; - TRACE("\n"); - hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); if(FAILED(hres)) return hres; - length = jsstr_length(jsstr); + TRACE("%s\n", debugstr_wn(str, length)); + if(!argc || (is_undefined(argv[0]) && ctx->version >= SCRIPTLANGUAGEVERSION_ES5)) { if(!r) return S_OK; @@ -1203,11 +1202,29 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(SUCCEEDED(hres)) { ptr = str; match_result.cp = str; - for(i=0; i<limit; i++) { + while(i < limit) { if(regexp) { hres = regexp_match_next(ctx, regexp, REM_NO_PARENS, jsstr, &match_ptr); if(hres != S_OK) break; + TRACE("got match %d %d\n", (int)(match_result.cp - match_result.match_len - str), match_result.match_len); + if(!match_result.match_len) { + /* If an empty string is matched, prevent including any match in the result */ + if(!length) { + limit = 0; + break; + } + if(match_result.cp == ptr) { + match_result.cp++; + hres = regexp_match_next(ctx, regexp, REM_NO_PARENS, jsstr, &match_ptr); + if(hres != S_OK) + break; + TRACE("retried, got match %d %d\n", (int)(match_result.cp - match_result.match_len - str), + match_result.match_len); + } + if(!match_result.match_len && match_result.cp == str + length) + break; + } ptr2 = match_result.cp - match_result.match_len; }else if(match_str) { ptr2 = strstrW(ptr, match_str); @@ -1219,16 +1236,18 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi ptr2 = ptr+1; } - tmp_str = jsstr_alloc_len(ptr, ptr2-ptr); - if(!tmp_str) { - hres = E_OUTOFMEMORY; - break; - } + if(!regexp || ptr2 > ptr) { + tmp_str = jsstr_alloc_len(ptr, ptr2-ptr); + if(!tmp_str) { + hres = E_OUTOFMEMORY; + break; + } - hres = jsdisp_propput_idx(array, i, jsval_string(tmp_str)); - jsstr_release(tmp_str); - if(FAILED(hres)) - break; + hres = jsdisp_propput_idx(array, i++, jsval_string(tmp_str)); + jsstr_release(tmp_str); + if(FAILED(hres)) + break; + } if(regexp) ptr = match_result.cp; @@ -1242,7 +1261,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(SUCCEEDED(hres) && (match_str || regexp) && i<limit) { DWORD len = (str+length) - ptr; - if(len || match_str) { + if(len || match_str || !length) { tmp_str = jsstr_alloc_len(ptr, len); if(tmp_str) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 78c0958..f3d07f8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -644,6 +644,43 @@ ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); ok(r.length === 1, "r.length = " + r.length); ok(r[0] === "", "r[0] = " + r[0]); +(function() { + function test(string, separator, result) { + var r = string.split(separator); + ok(r == result, "\"" + string + "\".split(" + separator + ") returned " + r + " expected " + result); + } + + test("test", /^|\s+/, "test"); + test("test", /$|\s+/, "test"); + test("test", /^|./, "t"); + test("test", /.*/, ""); + test("test", /x*/, "t,e,s,t"); + test("test", /$|x*/, "t,e,s,t"); + test("test", /^|x*/, "t,e,s,t"); + test("test", /t*/, "e,s"); + test("xaabaax", /a*|b*/, "x,b,x"); + test("xaabaax", /a+|b+/, "x,x"); + test("xaabaax", /a+|b*/, "x,x"); + test("xaaxbaax", /b+|a+/, "x,x,x"); + test("test", /^|t/, "tes"); + test("test", /^|t/, "tes"); + test("a,,b", /,/, "a,b"); + test("ab", /a*/, "b"); + test("aab", "a", ",,b"); + test("a", "a", ","); + + function test_length(string, separator, len) { + var r = string.split(separator); + ok(r.length === len, "\"" + string + "\".split(" + separator + ").length = " + + r.length + " expected " + len); + } + + test_length("", /a*/, 0); + test_length("", /a+/, 1); + test_length("", "", 0); + test_length("", "x", 1); +})(); + tmp = "abcd".indexOf("bc",0); ok(tmp === 1, "indexOf = " + tmp); tmp = "abcd".indexOf("bc",1);

1 0

Jacek Caban : jscript: Don' t skip empty strings in String.prototype.split in ES5 mode.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 88d2576ae71a8727b658a70200f382f66cb651c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d2576ae71a8727b658a702… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 22 13:04:45 2019 +0200 jscript: Don't skip empty strings in String.prototype.split in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 4 ++-- dlls/mshtml/tests/es5.js | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d88ed1c..5b00cd6 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1236,7 +1236,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi ptr2 = ptr+1; } - if(!regexp || ptr2 > ptr) { + if(!regexp || ptr2 > ptr || ctx->version >= SCRIPTLANGUAGEVERSION_ES5) { tmp_str = jsstr_alloc_len(ptr, ptr2-ptr); if(!tmp_str) { hres = E_OUTOFMEMORY; @@ -1261,7 +1261,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(SUCCEEDED(hres) && (match_str || regexp) && i<limit) { DWORD len = (str+length) - ptr; - if(len || match_str || !length) { + if(len || match_str || !length || ctx->version >= SCRIPTLANGUAGEVERSION_ES5) { tmp_str = jsstr_alloc_len(ptr, len); if(tmp_str) { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7afdf97..69c0d86 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -615,6 +615,41 @@ function test_string_split() { return; } + function test(string, separator, result) { + var r = string.split(separator); + ok(r == result, "\"" + string + "\".split(" + separator + ") returned " + r + " expected " + result); + } + + test("test", /^|\s+/, "test"); + test("test", /$|\s+/, "test"); + test("test", /^|./, "t,,,"); + test("test", /.*/, ","); + test("test", /x*/, "t,e,s,t"); + test("test", /$|x*/, "t,e,s,t"); + test("test", /^|x*/, "t,e,s,t"); + test("test", /t*/, ",e,s,"); + test("xaabaax", /a*|b*/, "x,b,x"); + test("xaabaax", /a+|b+/, "x,,,x"); + test("xaabaax", /a+|b*/, "x,,,x"); + test("xaaxbaax", /b+|a+/, "x,x,,x"); + test("test", /^|t/, "tes,"); + test("test", /^|t/, "tes,"); + test("a,,b", /,/, "a,,b"); + test("ab", /a*/, ",b"); + test("aab", "a", ",,b"); + test("a", "a", ","); + + function test_length(string, separator, len) { + var r = string.split(separator); + ok(r.length === len, "\"" + string + "\".split(" + separator + ").length = " + + r.length + " expected " + len); + } + + test_length("", /a*/, 0); + test_length("", /a+/, 1); + test_length("", "", 0); + test_length("", "x", 1); + r = "1,2,3".split(undefined); ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); ok(r.length === 1, "r.length = " + r.length);

1 0

Zebediah Figura : amstream: Reference the returned IMediaStream pointer in IAMMultiMediaStream:: AddMediaStream().
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: eec4a05e768560df3d71ca5408fe38d042e385e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eec4a05e768560df3d71ca54… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 21 15:22:40 2019 -0500 amstream: Reference the returned IMediaStream pointer in IAMMultiMediaStream::AddMediaStream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index f9c9abf..8354df8 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -380,7 +380,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream This->nbStreams++; if (ppNewStream) - *ppNewStream = (IMediaStream*)pStream; + { + IMediaStream_AddRef(*ppNewStream = (IMediaStream*)pStream); + } } if (SUCCEEDED(hr))

1 0