November 2020 - Wine-commits

Jacek Caban : server: Rename console_input to console.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 6f3cf86a56f176b12d9b37c94389201399ecc294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3cf86a56f176b12d9b37c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:13:30 2020 +0100 server: Rename console_input to console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 201 +++++++++++++++++++++++++++---------------------------- server/process.h | 4 +- 2 files changed, 102 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f3cf86a56f176b12d9b…

1 0

Jacek Caban : server: Rename create_console_output to create_screen_buffer.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: b2e1c37381f04964d43c68a99b49cffbe0e1968c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e1c37381f04964d43c68a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:13:37 2020 +0100 server: Rename create_console_output to create_screen_buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/console.c b/server/console.c index 0d2c768f8e5..f1ce9b27dbd 100644 --- a/server/console.c +++ b/server/console.c @@ -551,7 +551,7 @@ static void set_active_screen_buffer( struct console *console, struct screen_buf screen_buffer->id, NULL, NULL ); } -static struct object *create_console_output( struct console *console ) +static struct object *create_screen_buffer( struct console *console ) { struct screen_buffer *screen_buffer; @@ -814,7 +814,7 @@ static struct object *console_server_lookup_name( struct object *obj, struct uni return 0; } if (!(server->console = (struct console *)create_console())) return NULL; - if (!(screen_buffer = (struct screen_buffer *)create_console_output( server->console ))) + if (!(screen_buffer = (struct screen_buffer *)create_screen_buffer( server->console ))) { release_object( server->console ); server->console = NULL; @@ -1231,7 +1231,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return NULL; } name->len = 0; - return create_console_output( current->process->console ); + return create_screen_buffer( current->process->console ); } if (name->len == sizeof(serverW) && !memcmp( name->str, serverW, name->len ))

1 0

Jacek Caban : server: Rename unbound devices to console_input and console_output.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 946da4f3d86202ca2cfc6b59cb37d5602802c9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=946da4f3d86202ca2cfc6b59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:13:51 2020 +0100 server: Rename unbound devices to console_input and console_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/server/console.c b/server/console.c index f1ce9b27dbd..91a00df0998 100644 --- a/server/console.c +++ b/server/console.c @@ -290,23 +290,23 @@ static const struct object_ops console_device_ops = no_destroy /* destroy */ }; -static void input_device_dump( struct object *obj, int verbose ); -static struct object *input_device_open_file( struct object *obj, unsigned int access, - unsigned int sharing, unsigned int options ); -static int input_device_add_queue( struct object *obj, struct wait_queue_entry *entry ); -static struct fd *input_device_get_fd( struct object *obj ); +static void console_input_dump( struct object *obj, int verbose ); +static struct object *console_input_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); +static int console_input_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *console_input_get_fd( struct object *obj ); -static const struct object_ops input_device_ops = +static const struct object_ops console_input_ops = { sizeof(struct object), /* size */ - input_device_dump, /* dump */ + console_input_dump, /* dump */ console_device_get_type, /* get_type */ - input_device_add_queue, /* add_queue */ + console_input_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - input_device_get_fd, /* get_fd */ + console_input_get_fd, /* get_fd */ no_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -314,29 +314,29 @@ static const struct object_ops input_device_ops = no_lookup_name, /* lookup_name */ directory_link_name, /* link_name */ default_unlink_name, /* unlink_name */ - input_device_open_file, /* open_file */ + console_input_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ no_destroy /* destroy */ }; -static void output_device_dump( struct object *obj, int verbose ); -static int output_device_add_queue( struct object *obj, struct wait_queue_entry *entry ); -static struct fd *output_device_get_fd( struct object *obj ); -static struct object *output_device_open_file( struct object *obj, unsigned int access, - unsigned int sharing, unsigned int options ); +static void console_output_dump( struct object *obj, int verbose ); +static int console_output_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *console_output_get_fd( struct object *obj ); +static struct object *console_output_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); -static const struct object_ops output_device_ops = +static const struct object_ops console_output_ops = { sizeof(struct object), /* size */ - output_device_dump, /* dump */ + console_output_dump, /* dump */ console_device_get_type, /* get_type */ - output_device_add_queue, /* add_queue */ + console_output_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - output_device_get_fd, /* get_fd */ + console_output_get_fd, /* get_fd */ no_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -344,7 +344,7 @@ static const struct object_ops output_device_ops = no_lookup_name, /* lookup_name */ directory_link_name, /* link_name */ default_unlink_name, /* unlink_name */ - output_device_open_file, /* open_file */ + console_output_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ no_destroy /* destroy */ @@ -1214,13 +1214,13 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni if (name->len == sizeof(inputW) && !memcmp( name->str, inputW, name->len )) { name->len = 0; - return alloc_object( &input_device_ops ); + return alloc_object( &console_input_ops ); } if (name->len == sizeof(outputW) && !memcmp( name->str, outputW, name->len )) { name->len = 0; - return alloc_object( &output_device_ops ); + return alloc_object( &console_output_ops ); } if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) @@ -1268,12 +1268,12 @@ static struct object *console_device_open_file( struct object *obj, unsigned int return is_output ? grab_object( current->process->console->active ) : grab_object( current->process->console ); } -static void input_device_dump( struct object *obj, int verbose ) +static void console_input_dump( struct object *obj, int verbose ) { fputs( "console Input device\n", stderr ); } -static int input_device_add_queue( struct object *obj, struct wait_queue_entry *entry ) +static int console_input_add_queue( struct object *obj, struct wait_queue_entry *entry ) { if (!current->process->console) { @@ -1283,7 +1283,7 @@ static int input_device_add_queue( struct object *obj, struct wait_queue_entry * return add_queue( &current->process->console->obj, entry ); } -static struct fd *input_device_get_fd( struct object *obj ) +static struct fd *console_input_get_fd( struct object *obj ) { if (!current->process->console) { @@ -1293,18 +1293,18 @@ static struct fd *input_device_get_fd( struct object *obj ) return get_obj_fd( &current->process->console->obj ); } -static struct object *input_device_open_file( struct object *obj, unsigned int access, - unsigned int sharing, unsigned int options ) +static struct object *console_input_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) { return grab_object( obj ); } -static void output_device_dump( struct object *obj, int verbose ) +static void console_output_dump( struct object *obj, int verbose ) { fputs( "console Output device\n", stderr ); } -static int output_device_add_queue( struct object *obj, struct wait_queue_entry *entry ) +static int console_output_add_queue( struct object *obj, struct wait_queue_entry *entry ) { if (!current->process->console || !current->process->console->active) { @@ -1314,7 +1314,7 @@ static int output_device_add_queue( struct object *obj, struct wait_queue_entry return add_queue( &current->process->console->obj, entry ); } -static struct fd *output_device_get_fd( struct object *obj ) +static struct fd *console_output_get_fd( struct object *obj ) { if (!current->process->console || !current->process->console->active) { @@ -1325,8 +1325,8 @@ static struct fd *output_device_get_fd( struct object *obj ) return get_obj_fd( &current->process->console->active->obj ); } -static struct object *output_device_open_file( struct object *obj, unsigned int access, - unsigned int sharing, unsigned int options ) +static struct object *console_output_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) { return grab_object( obj ); }

1 0

Jacek Caban : server: Use separated fd ops for unbound console input.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: a61188bfa5bf20443b11f397d8ef6e7e5fd4bdf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a61188bfa5bf20443b11f397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:13:59 2020 +0100 server: Use separated fd ops for unbound console input. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 18 ++++++++- server/console.c | 94 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 101 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0376d00892e..5e604e949f6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3776,15 +3776,20 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { - HANDLE handle, unbound_output = NULL; + HANDLE handle, unbound_output = NULL, unbound_input = NULL; DWORD size, mode; WCHAR title[16]; + char buf[32]; HWND hwnd; UINT cp; BOOL ret; ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); - if (!skip_nt) unbound_output = create_unbound_handle(TRUE, TRUE); + if (!skip_nt) + { + unbound_input = create_unbound_handle(FALSE, TRUE); + unbound_output = create_unbound_handle(TRUE, TRUE); + } ret = FreeConsole(); ok(ret, "FreeConsole failed: %u\n", GetLastError()); @@ -3865,10 +3870,19 @@ static void test_FreeConsole(void) handle = GetConsoleInputWaitHandle(); ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); + ret = ReadFile(unbound_input, buf, sizeof(buf), &size, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadFile returned %x %u\n", ret, GetLastError()); + + ret = FlushFileBuffers(unbound_input); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadFile returned %x %u\n", ret, GetLastError()); + ret = GetConsoleMode(unbound_output, &mode); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode returned %x %u\n", ret, GetLastError()); + CloseHandle(unbound_input); CloseHandle(unbound_output); } diff --git a/server/console.c b/server/console.c index 91a00df0998..7cffa512f0e 100644 --- a/server/console.c +++ b/server/console.c @@ -290,15 +290,22 @@ static const struct object_ops console_device_ops = no_destroy /* destroy */ }; +struct console_input +{ + struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd */ +}; + static void console_input_dump( struct object *obj, int verbose ); static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static int console_input_add_queue( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_get_fd( struct object *obj ); +static void console_input_destroy( struct object *obj ); static const struct object_ops console_input_ops = { - sizeof(struct object), /* size */ + sizeof(struct console_input), /* size */ console_input_dump, /* dump */ console_device_get_type, /* get_type */ console_input_add_queue, /* add_queue */ @@ -317,7 +324,26 @@ static const struct object_ops console_input_ops = console_input_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ - no_destroy /* destroy */ + console_input_destroy /* destroy */ +}; + +static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); +static int console_input_flush( struct fd *fd, struct async *async ); +static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + +static const struct fd_ops console_input_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + console_get_fd_type, /* get_fd_type */ + console_input_read, /* read */ + no_fd_write, /* write */ + console_input_flush, /* flush */ + console_get_file_info, /* get_file_info */ + console_get_volume_info, /* get_volume_info */ + console_input_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ }; static void console_output_dump( struct object *obj, int verbose ); @@ -1213,8 +1239,17 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni if (name->len == sizeof(inputW) && !memcmp( name->str, inputW, name->len )) { + struct console_input *console_input; name->len = 0; - return alloc_object( &console_input_ops ); + if (!(console_input = alloc_object( &console_input_ops ))) return NULL; + console_input->fd = alloc_pseudo_fd( &console_input_fd_ops, &console_input->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); + if (!console_input->fd) + { + release_object( console_input ); + return NULL; + } + return &console_input->obj; } if (name->len == sizeof(outputW) && !memcmp( name->str, outputW, name->len )) @@ -1285,12 +1320,9 @@ static int console_input_add_queue( struct object *obj, struct wait_queue_entry static struct fd *console_input_get_fd( struct object *obj ) { - if (!current->process->console) - { - set_error( STATUS_ACCESS_DENIED ); - return 0; - } - return get_obj_fd( &current->process->console->obj ); + struct console_input *console_input = (struct console_input *)obj; + assert( obj->ops == &console_input_ops ); + return (struct fd *)grab_object( console_input->fd ); } static struct object *console_input_open_file( struct object *obj, unsigned int access, @@ -1299,6 +1331,50 @@ static struct object *console_input_open_file( struct object *obj, unsigned int return grab_object( obj ); } +static void console_input_destroy( struct object *obj ) +{ + struct console_input *console_input = (struct console_input *)obj; + + assert( obj->ops == &console_input_ops ); + if (console_input->fd) release_object( console_input->fd ); +} + +static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console *console = current->process->console; + + if (!console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return console_ioctl( console->fd, code, async ); +} + +static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ) +{ + struct console *console = current->process->console; + + if (!console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return console_read( console->fd, async, pos ); +} + +static int console_input_flush( struct fd *fd, struct async *async ) +{ + struct console *console = current->process->console; + + if (!console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return console_flush( console->fd, async ); +} + static void console_output_dump( struct object *obj, int verbose ) { fputs( "console Output device\n", stderr );

1 0

Derek Lesho : mf/samplegrabber: Evaluate type compatibility by comparison to the initial type.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 133ba763e1f419dc23fd58ac82c6d8a73014ae22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=133ba763e1f419dc23fd58ac… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Nov 26 12:42:31 2020 +0300 mf/samplegrabber: Evaluate type compatibility by comparison to the initial type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 17 +++++--- dlls/mf/tests/mf.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 54e28b466c5..f60ce2a8433 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -72,6 +72,7 @@ struct sample_grabber IMFSampleGrabberSinkCallback *callback; IMFSampleGrabberSinkCallback2 *callback2; IMFMediaType *media_type; + IMFMediaType *current_media_type; BOOL is_shut_down; IMFMediaEventQueue *event_queue; IMFMediaEventQueue *stream_event_queue; @@ -572,7 +573,8 @@ static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandl static HRESULT sample_grabber_stream_is_media_type_supported(struct sample_grabber *grabber, IMFMediaType *in_type) { - const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | + MF_MEDIATYPE_EQUAL_FORMAT_DATA; DWORD flags; if (grabber->is_shut_down) @@ -631,9 +633,9 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMF if (FAILED(hr = sample_grabber_stream_is_media_type_supported(grabber, media_type))) return hr; - IMFMediaType_Release(grabber->media_type); - grabber->media_type = media_type; - IMFMediaType_AddRef(grabber->media_type); + IMFMediaType_Release(grabber->current_media_type); + grabber->current_media_type = media_type; + IMFMediaType_AddRef(grabber->current_media_type); return S_OK; } @@ -651,7 +653,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMF if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; - *media_type = grabber->media_type; + *media_type = grabber->current_media_type; IMFMediaType_AddRef(*media_type); return S_OK; @@ -669,7 +671,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTy if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; - return IMFMediaType_GetMajorType(grabber->media_type, type); + return IMFMediaType_GetMajorType(grabber->current_media_type, type); } static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = @@ -840,6 +842,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback_Release(grabber->callback); if (grabber->callback2) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); + IMFMediaType_Release(grabber->current_media_type); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) IMFMediaEventQueue_Release(grabber->event_queue); @@ -1411,6 +1414,8 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use } object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); + object->current_media_type = context->media_type; + IMFMediaType_AddRef(object->current_media_type); IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); IMFAttributes_GetUINT64(attributes, &MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, &object->sample_time_offset); list_init(&object->items); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 41ca385cc2b..fda80974724 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2562,6 +2562,109 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_sample_grabber_is_mediatype_supported(void) +{ + IMFMediaType *media_type, *media_type2, *media_type3; + IMFMediaTypeHandler *handler; + IMFActivate *activate; + IMFStreamSink *stream; + IMFMediaSink *sink; + ULONG refcount; + HRESULT hr; + GUID guid; + + /* IsMediaTypeSupported checks are done against the creation type, and check format data */ + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream); + ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + IMFStreamSink_Release(stream); + + IMFMediaSink_Release(sink); + + /* On Win8+ this initialization happens automatically. */ + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Failed to set media type, hr %#x.\n", hr); + + /* Make it match grabber type sample rate. */ + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type3); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + ok(media_type3 == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type3); + + /* Change original type. */ + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + + IMFMediaTypeHandler_Release(handler); + + refcount = IMFActivate_Release(activate); + ok(!refcount, "Unexpected refcount %u.\n", refcount); +} + static BOOL is_supported_video_type(const GUID *guid) { return IsEqualGUID(guid, &MFVideoFormat_L8) @@ -4263,6 +4366,7 @@ START_TEST(mf) test_MFShutdownObject(); test_presentation_clock(); test_sample_grabber(); + test_sample_grabber_is_mediatype_supported(); test_video_processor(); test_quality_manager(); test_sar();

1 0

Alexandre Julliard : msxml3: Clear one extra variant in collection enumeration.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: b00e2df3e82bcf3213825bd12f1c2fb0237c47dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00e2df3e82bcf3213825bd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 11:36:37 2020 +0100 msxml3: Clear one extra variant in collection enumeration. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmldoc.c | 7 +++++-- dlls/msxml3/xmlelem.c | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 7ad6e3177f7..94b5ea01f3b 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -647,7 +647,7 @@ static void test_xmlelem_collection(void) WCHAR path[MAX_PATH]; LONG length, type; ULONG num_vars; - VARIANT var[3], dummy, vIndex, vName; + VARIANT var[4], dummy, vIndex, vName; BSTR url, str; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, @@ -789,12 +789,15 @@ static void test_xmlelem_collection(void) VariantClear(&var[1]); VariantClear(&var[0]); + memset( var, 0xcc, sizeof(var)); + /* request more elements than available */ - hr = IEnumVARIANT_Next(enumVar, 3, var, &num_vars); + hr = IEnumVARIANT_Next(enumVar, 4, var, &num_vars); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); ok(V_VT(&var[0]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[0])); ok(V_VT(&var[1]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[1])); ok(V_VT(&var[2]) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&var[2])); + ok(V_VT(&var[3]) == 0xcccc, "Expected invalid, got %x\n", V_VT(&var[3])); ok(num_vars == 2, "Expected 2, got %d\n", num_vars); hr = IDispatch_QueryInterface(V_DISPATCH(&var[1]), &IID_IXMLElement, (LPVOID *)&child); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 3addcbd19b5..f8778aae91d 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -774,11 +774,13 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next( hr = XMLElement_create(This->current, (void **)&V_DISPATCH(rgVar), FALSE); if (FAILED(hr)) return hr; This->current = This->current->next; - if (--celt && This->current) ++rgVar; if (fetched) ++*fetched; + rgVar++; + celt--; } - - return celt == 0 ? S_OK : S_FALSE; + if (!celt) return S_OK; + V_VT(rgVar) = VT_EMPTY; + return S_FALSE; } static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(

1 0

Alexandre Julliard : msxml3: Only allow ASCII characters in number conversion.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: a75cc9e6262af8efbbc553bfbdc3a928773fd618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a75cc9e6262af8efbbc553bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 14:31:40 2020 +0100 msxml3: Only allow ASCII characters in number conversion. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/element.c | 2 +- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/nodemap.c | 2 +- dlls/msxml3/selection.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index a352621bfb3..05255508d4e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -520,7 +520,7 @@ static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) if(*p == '.') { p++; - while(isdigitW(*p)) p++; + while (*p >= '0' && *p <= '9') p++; } } diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 2c1d10efb6a..57b8ea823c1 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -312,7 +312,7 @@ static HRESULT xmlnodelist_get_dispid(IUnknown *iface, BSTR name, DWORD flags, D WCHAR *ptr; int idx = 0; - for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + for(ptr = name; *ptr >= '0' && *ptr <= '9'; ptr++) idx = idx*10 + (*ptr-'0'); if(*ptr) return DISP_E_UNKNOWNNAME; diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index a9fef4769dc..5ea083c4495 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -371,7 +371,7 @@ static HRESULT xmlnodemap_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DI WCHAR *ptr; int idx = 0; - for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + for(ptr = name; *ptr >= '0' && *ptr <= '9'; ptr++) idx = idx*10 + (*ptr-'0'); if(*ptr) return DISP_E_UNKNOWNNAME; diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index ede80627d7b..d05a1d6ffcb 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -595,7 +595,7 @@ static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, WCHAR *ptr; int idx = 0; - for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + for(ptr = name; *ptr >= '0' && *ptr <= '9'; ptr++) idx = idx*10 + (*ptr-'0'); if(*ptr) return DISP_E_UNKNOWNNAME;

1 0

Alexandre Julliard : msvcp: Use a constant string as fprintf format.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 375278ccb7693a946b8ff5f79e8c4c489f9d9c56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=375278ccb7693a946b8ff5f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 11:37:21 2020 +0100 msvcp: Use a constant string as fprintf format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 2 +- dlls/msvcp90/tests/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index dc4700d518b..806090b9667 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1467,7 +1467,7 @@ static void test_istream_tellg(void) /* filebuf */ file = fopen(testfile, "wt"); - fprintf(file, tests[i].str); + fprintf(file, "%s", tests[i].str); fclose(file); /* fstream<char> version */ diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index d9066fedd8d..6957f4ccba9 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1969,7 +1969,7 @@ static void test_istream_tellg(void) /* filebuf */ file = fopen(testfile, "wt"); - fprintf(file, tests[i].str); + fprintf(file, "%s", tests[i].str); fclose(file); /* fstream<char> version */

1 0

Alexandre Julliard : ntdll: Avoid closing an invalid handle on process creation failure.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 4e6c1dff5859ab9e02446c54dc436480d1859472 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e6c1dff5859ab9e02446c54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 13:05:01 2020 +0100 ntdll: Avoid closing an invalid handle on process creation failure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index ad15a5cf66d..57bb8002dfa 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -406,6 +406,7 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; + *handle = 0; memset( info, 0, sizeof(*info) ); InitializeObjectAttributes( &attr, path, OBJ_CASE_INSENSITIVE, 0, 0 ); if ((status = NtOpenFile( handle, GENERIC_READ, &attr, &io, @@ -422,7 +423,6 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image #else info->cpu = client_cpu; #endif - *handle = 0; return STATUS_SUCCESS; } return status;

1 0

Alexandre Julliard : server: Use l_intl.nls for case mappings.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 48c11f1e805ffa32e2150427ae64f9ffc0e3bafa URL: https://source.winehq.org/git/wine.git/?a=commit;h=48c11f1e805ffa32e2150427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 16:40:37 2020 +0100 server: Use l_intl.nls for case mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/Makefile.in | 2 ++ server/main.c | 2 ++ server/unicode.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- server/unicode.h | 1 + 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index e90c5d1336c..4264e3db108 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -50,3 +50,5 @@ MANPAGES = \ wineserver.man.in EXTRALIBS = $(LDEXECFLAGS) $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) + +unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" diff --git a/server/main.c b/server/main.c index efb205f5292..5d7881a6af9 100644 --- a/server/main.c +++ b/server/main.c @@ -36,6 +36,7 @@ #include "file.h" #include "thread.h" #include "request.h" +#include "unicode.h" /* command-line options */ int debug_level = 0; @@ -143,6 +144,7 @@ int main( int argc, char *argv[] ) if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); set_current_time(); init_signals(); + load_intl_file(); init_directories(); init_registry(); main_loop(); diff --git a/server/unicode.c b/server/unicode.c index 8d6c411cb66..0dde757313b 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -24,6 +24,7 @@ #include <ctype.h> #include <stdio.h> +#include "request.h" #include "unicode.h" /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */ @@ -45,6 +46,8 @@ static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; /* minimum Unicode value depending on UTF-8 sequence length */ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; +static unsigned short *casemap; + static inline char to_hex( char ch ) { if (isdigit(ch)) return ch - '0'; @@ -53,8 +56,7 @@ static inline char to_hex( char ch ) static inline WCHAR to_lower( WCHAR ch ) { - extern const WCHAR wine_casemap_lower[]; - return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; + return ch + casemap[casemap[casemap[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0x0f)]; } int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len ) @@ -224,3 +226,73 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] count += pos - buffer; return count; } + +static char *get_nls_dir(void) +{ + char *p, *dir, *ret; + const char *nlsdir = BIN_TO_NLSDIR; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( server_argv0, NULL ); +#endif + if (!dir) return NULL; + if (!(p = strrchr( dir, '/' ))) + { + free( dir ); + return NULL; + } + *(++p) = 0; + if (p > dir + 8 && !strcmp( p - 8, "/server/" )) nlsdir = "../nls"; /* inside build tree */ + if ((ret = malloc( strlen(dir) + strlen( nlsdir ) + 1 ))) + { + strcpy( ret, dir ); + strcat( ret, nlsdir ); + } + free( dir ); + return ret; +} + +/* load the case mapping table */ +void load_intl_file(void) +{ + static const char *nls_dirs[] = { NULL, NLSDIR, "/usr/local/share/wine/nls", "/usr/share/wine/nls" }; + unsigned int i, offset, size; + unsigned short data; + char *path; + int unix_fd = -1; + + nls_dirs[0] = get_nls_dir(); + for (i = 0; i < ARRAY_SIZE( nls_dirs ); i++) + { + if (!nls_dirs[i]) continue; + if (!(path = malloc( strlen(nls_dirs[i]) + sizeof("/l_intl.nls" )))) continue; + strcpy( path, nls_dirs[i] ); + strcat( path, "/l_intl.nls" ); + if ((unix_fd = open( path, O_RDONLY )) != -1) break; + free( path ); + } + if (unix_fd == -1) fatal_error( "failed to load l_intl.nls\n" ); + /* read initial offset */ + if (pread( unix_fd, &data, sizeof(data), 0 ) != sizeof(data) || !data) goto failed; + offset = data; + /* read size of uppercase table */ + if (pread( unix_fd, &data, sizeof(data), offset * 2 ) != sizeof(data) || !data) goto failed; + offset += data; + /* read size of lowercase table */ + if (pread( unix_fd, &data, sizeof(data), offset * 2 ) != sizeof(data) || !data) goto failed; + offset++; + size = data - 1; + /* read lowercase table */ + if (!(casemap = malloc( size * 2 ))) goto failed; + if (pread( unix_fd, casemap, size * 2, offset * 2 ) != size * 2) goto failed; + close( unix_fd ); + free( path ); + return; + +failed: + fatal_error( "invalid format for casemap table %s\n", path ); +} diff --git a/server/unicode.h b/server/unicode.h index c280fb8e7d1..ddbbe4b5cfc 100644 --- a/server/unicode.h +++ b/server/unicode.h @@ -31,5 +31,6 @@ extern unsigned int hash_strW( const WCHAR *str, data_size_t len, unsigned int h extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ); extern int parse_strW( WCHAR *buffer, data_size_t *len, const char *src, char endchar ); extern int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] ); +extern void load_intl_file(void); #endif /* __WINE_SERVER_UNICODE_H */

1 0