wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Zebediah Figura : d3d11: Report D3D11_FORMAT_SUPPORT_BUFFER in CheckFormatSupport().
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 062644361b72729923e2d1be4ad58208c6538ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=062644361b72729923e2d1be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 20:33:30 2021 -0600 d3d11: Report D3D11_FORMAT_SUPPORT_BUFFER in CheckFormatSupport(). Note that native also reports support for DXGI_FORMAT_UNKNOWN; this patch does not implement that behaviour. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a7e1999c07a..8e5beb8893b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3541,6 +3541,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } flag_mapping[] = { + {WINED3D_RTYPE_BUFFER, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_BUFFER}, {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, @@ -3587,6 +3588,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } wined3d_mutex_unlock(); + if (feature_level < D3D_FEATURE_LEVEL_10_0) + *format_support &= ~D3D11_FORMAT_SUPPORT_BUFFER; + if (*format_support & (D3D11_FORMAT_SUPPORT_TEXTURE1D | D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D)) { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index fddb7bfd218..044c1ce5a17 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19950,6 +19950,9 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON), "Unexpected SHADER_SAMPLE_COMPARISON for format %#x, feature level %#x.\n", format, feature_level); + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_BUFFER), + "Unexpected BUFFER for format %#x, feature level %#x.\n", + format, feature_level); } if (feature_level < D3D_FEATURE_LEVEL_10_1) {

1 0

Zebediah Figura : wined3d: Support WINED3D_RTYPE_BUFFER in wined3d_check_device_format().
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: da9726a16c9a785b86be6a847156192c7c622ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9726a16c9a785b86be6a84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 20:33:29 2021 -0600 wined3d: Support WINED3D_RTYPE_BUFFER in wined3d_check_device_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5c0998ba54c..c673f61e429 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1781,6 +1781,19 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_BUFFER: + if (wined3d_format_is_typeless(format)) + { + TRACE("Requested WINED3D_RTYPE_BUFFER, but format %s is typeless.\n", debug_d3dformat(check_format_id)); + return WINED3DERR_NOTAVAILABLE; + } + + allowed_usage = WINED3DUSAGE_DYNAMIC; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_UNORDERED_ACCESS; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; + break; + default: FIXME("Unhandled resource type %s.\n", debug_d3dresourcetype(resource_type)); return WINED3DERR_NOTAVAILABLE;

1 0

Zebediah Figura : winegstreamer: Move wg_parser_destroy() to the Unix library.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 9147fefbb2e3192d2679e7d0b984a621949ccd1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9147fefbb2e3192d2679e7d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:58 2021 -0600 winegstreamer: Move wg_parser_destroy() to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 18 +----------------- dlls/winegstreamer/wg_parser.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 7aaf25e395e..15a20749786 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -210,6 +210,7 @@ struct unix_funcs struct wg_parser *(CDECL *wg_avi_parser_create)(void); struct wg_parser *(CDECL *wg_mpeg_audio_parser_create)(void); struct wg_parser *(CDECL *wg_wave_parser_create)(void); + void (CDECL *wg_parser_destroy)(struct wg_parser *parser); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b4f95df67da..db1825e34a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1225,22 +1225,6 @@ static struct strmbase_pin *parser_get_pin(struct strmbase_filter *base, unsigne return NULL; } -static void wg_parser_destroy(struct wg_parser *parser) -{ - if (parser->bus) - { - gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); - gst_object_unref(parser->bus); - } - - pthread_mutex_destroy(&parser->mutex); - pthread_cond_destroy(&parser->init_cond); - pthread_cond_destroy(&parser->read_cond); - pthread_cond_destroy(&parser->read_done_cond); - - free(parser); -} - static void parser_destroy(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); @@ -1259,7 +1243,7 @@ static void parser_destroy(struct strmbase_filter *iface) IAsyncReader_Release(filter->reader); filter->reader = NULL; - wg_parser_destroy(filter->wg_parser); + unix_funcs->wg_parser_destroy(filter->wg_parser); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 3a67a195dff..071694f77cc 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1011,12 +1011,29 @@ static struct wg_parser * CDECL wg_wave_parser_create(void) return parser; } +static void CDECL wg_parser_destroy(struct wg_parser *parser) +{ + if (parser->bus) + { + gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); + gst_object_unref(parser->bus); + } + + pthread_mutex_destroy(&parser->mutex); + pthread_cond_destroy(&parser->init_cond); + pthread_cond_destroy(&parser->read_cond); + pthread_cond_destroy(&parser->read_done_cond); + + free(parser); +} + static const struct unix_funcs funcs = { wg_decodebin_parser_create, wg_avi_parser_create, wg_mpeg_audio_parser_create, wg_wave_parser_create, + wg_parser_destroy, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : winegstreamer: Move GStreamer library initialization to __wine_init_unix_lib().
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 10dde32dc6c530d755f68a6edfb50d21c6edd2a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10dde32dc6c530d755f68a6e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:57 2021 -0600 winegstreamer: Move GStreamer library initialization to __wine_init_unix_lib(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 46 +++++++++--------------------------------- dlls/winegstreamer/wg_parser.c | 17 ++++++++++++++++ 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 477ed0ad1e6..4e46a99f513 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -174,41 +174,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx) { - BOOL *status = param; - char argv0[] = "wine"; - char argv1[] = "--gst-disable-registry-fork"; - char *args[3]; - char **argv = args; - int argc = 2; - GError *err = NULL; - - TRACE("Initializing...\n"); - - argv[0] = argv0; - argv[1] = argv1; - argv[2] = NULL; - *status = gst_init_check(&argc, &argv, &err); - if (*status) - { - HINSTANCE handle; - - TRACE("Initialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), - GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); + HINSTANCE handle; - /* Unloading glib is a bad idea.. it installs atexit handlers, - * so never unload the dll after loading */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, - (LPCWSTR)winegstreamer_instance, &handle); - if (!handle) - ERR("Failed to pin module %p.\n", winegstreamer_instance); + /* Unloading glib is a bad idea.. it installs atexit handlers, + * so never unload the dll after loading */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + (LPCWSTR)winegstreamer_instance, &handle); + if (!handle) + ERR("Failed to pin module %p.\n", winegstreamer_instance); - start_dispatch_thread(); - } - else if (err) - { - ERR("Failed to initialize gstreamer: %s\n", debugstr_a(err->message)); - g_error_free(err); - } + start_dispatch_thread(); return TRUE; } @@ -216,11 +191,10 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct BOOL init_gstreamer(void) { static INIT_ONCE once = INIT_ONCE_STATIC_INIT; - static BOOL status; - InitOnceExecuteOnce(&once, init_gstreamer_proc, &status, NULL); + InitOnceExecuteOnce(&once, init_gstreamer_proc, NULL, NULL); - return status; + return TRUE; } static const REGPINTYPES reg_audio_mt = {&MEDIATYPE_Audio, &GUID_NULL}; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index a64c3f83497..3a67a195dff 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1023,7 +1023,24 @@ NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *pt { if (reason == DLL_PROCESS_ATTACH) { + char arg0[] = "wine"; + char arg1[] = "--gst-disable-registry-fork"; + char *args[] = {arg0, arg1, NULL}; + int argc = ARRAY_SIZE(args) - 1; + char **argv = args; + GError *err; + + if (!gst_init_check(&argc, &argv, &err)) + { + ERR("Failed to initialize GStreamer: %s\n", debugstr_a(err->message)); + g_error_free(err); + return STATUS_UNSUCCESSFUL; + } + TRACE("GStreamer library version %s; wine built with %d.%d.%d.\n", + gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); + GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); + *(const struct unix_funcs **)ptr_out = &funcs; } return STATUS_SUCCESS;

1 0

Zebediah Figura : winegstreamer: Move wg_parser object creation to a new Unix library.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: dbd927f4adb00b19c2bd97e9726f0e273b2fa743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbd927f4adb00b19c2bd97e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:56 2021 -0600 winegstreamer: Move wg_parser object creation to a new Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/gst_cbs.h | 6 - dlls/winegstreamer/gst_private.h | 88 ++++ dlls/winegstreamer/gstdemux.c | 1029 +------------------------------------ dlls/winegstreamer/main.c | 3 + dlls/winegstreamer/wg_parser.c | 1030 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 1129 insertions(+), 1030 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbd927f4adb00b19c2bd…

1 0

Zebediah Figura : winegstreamer: Separate parser and filter initialization.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: db8746ffe9d9c2022c83d8e10e8cf043aaeb2d3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8746ffe9d9c2022c83d8e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:55 2021 -0600 winegstreamer: Separate parser and filter initialization. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 111 +++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 40 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1e14f073480..384ba9e6687 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -49,6 +49,8 @@ static const GUID MEDIASUBTYPE_MP3 = {WAVE_FORMAT_MPEGLAYER3, 0x0000, 0x0010, { struct wg_parser { + BOOL (*init_gst)(struct wg_parser *parser); + struct wg_parser_stream **streams; unsigned int stream_count; @@ -1939,19 +1941,16 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) parser->start_offset = parser->next_offset = parser->stop_offset = 0; This->next_pull_offset = 0; - if (!This->init_gst(This)) + if (!parser->init_gst(parser)) return E_FAIL; pthread_mutex_lock(&parser->mutex); - for (i = 0; i < This->source_count; ++i) + for (i = 0; i < parser->stream_count; ++i) { - struct parser_source *pin = This->sources[i]; - struct wg_parser_stream *stream = pin->wg_stream; + struct wg_parser_stream *stream = parser->streams[i]; stream->duration = query_duration(stream->their_src); - pin->seek.llDuration = pin->seek.llStop = stream->duration; - pin->seek.llCurrent = 0; while (!stream->has_caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) @@ -2143,6 +2142,7 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons { struct parser *filter = impl_from_strmbase_sink(iface); HRESULT hr = S_OK; + unsigned int i; mark_wine_thread(); @@ -2153,6 +2153,17 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons if (FAILED(hr = GST_Connect(filter, peer))) goto err; + if (!filter->init_gst(filter)) + goto err; + + for (i = 0; i < filter->source_count; ++i) + { + struct parser_source *pin = filter->sources[i]; + + pin->seek.llDuration = pin->seek.llStop = pin->wg_stream->duration; + pin->seek.llCurrent = 0; + } + return S_OK; err: GST_RemoveOutputPins(filter); @@ -2180,13 +2191,9 @@ static const struct strmbase_sink_ops sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL decodebin_parser_init_gst(struct parser *filter) +static BOOL decodebin_parser_init_gst(struct wg_parser *parser) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; GstElement *element = gst_element_factory_make("decodebin", NULL); - struct wg_parser *parser = filter->wg_parser; - WCHAR source_name[20]; - unsigned int i; int ret; if (!element) @@ -2233,6 +2240,16 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) } pthread_mutex_unlock(&parser->mutex); + return TRUE; +} + +static BOOL decodebin_parser_filter_init_gst(struct parser *filter) +{ + static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; + struct wg_parser *parser = filter->wg_parser; + WCHAR source_name[20]; + unsigned int i; + for (i = 0; i < parser->stream_count; ++i) { sprintfW(source_name, formatW, i); @@ -2345,11 +2362,12 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) heap_free(object); return E_OUTOFMEMORY; } + object->wg_parser->init_gst = decodebin_parser_init_gst; strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); - object->init_gst = decodebin_parser_init_gst; + object->init_gst = decodebin_parser_filter_init_gst; object->source_query_accept = decodebin_parser_source_query_accept; object->source_get_media_type = decodebin_parser_source_get_media_type; @@ -2944,12 +2962,9 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL wave_parser_init_gst(struct parser *filter) +static BOOL wave_parser_init_gst(struct wg_parser *parser) { - static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; - struct wg_parser *parser = filter->wg_parser; struct wg_parser_stream *stream; - struct parser_source *pin; GstElement *element; int ret; @@ -2972,12 +2987,6 @@ static BOOL wave_parser_init_gst(struct parser *filter) if (!(stream = create_stream(parser))) return FALSE; - if (!(pin = create_pin(filter, stream, source_name))) - { - free_stream(stream); - return FALSE; - } - stream->their_src = gst_element_get_static_pad(element, "src"); gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) @@ -2998,6 +3007,17 @@ static BOOL wave_parser_init_gst(struct parser *filter) return TRUE; } +static BOOL wave_parser_filter_init_gst(struct parser *filter) +{ + static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; + struct wg_parser *parser = filter->wg_parser; + + if (!create_pin(filter, parser->streams[0], source_name)) + return FALSE; + + return TRUE; +} + static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { struct wg_parser_stream *stream = pin->wg_stream; @@ -3041,10 +3061,11 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) heap_free(object); return E_OUTOFMEMORY; } + object->wg_parser->init_gst = wave_parser_init_gst; strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); - object->init_gst = wave_parser_init_gst; + object->init_gst = wave_parser_filter_init_gst; object->source_query_accept = wave_parser_source_query_accept; object->source_get_media_type = wave_parser_source_get_media_type; @@ -3068,13 +3089,9 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL avi_splitter_init_gst(struct parser *filter) +static BOOL avi_parser_init_gst(struct wg_parser *parser) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; GstElement *element = gst_element_factory_make("avidemux", NULL); - struct wg_parser *parser = filter->wg_parser; - WCHAR source_name[20]; - unsigned int i; int ret; if (!element) @@ -3120,6 +3137,16 @@ static BOOL avi_splitter_init_gst(struct parser *filter) } pthread_mutex_unlock(&parser->mutex); + return TRUE; +} + +static BOOL avi_splitter_filter_init_gst(struct parser *filter) +{ + static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; + struct wg_parser *parser = filter->wg_parser; + WCHAR source_name[20]; + unsigned int i; + for (i = 0; i < parser->stream_count; ++i) { sprintfW(source_name, formatW, i); @@ -3173,10 +3200,11 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) heap_free(object); return E_OUTOFMEMORY; } + object->wg_parser->init_gst = avi_parser_init_gst; strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); - object->init_gst = avi_splitter_init_gst; + object->init_gst = avi_splitter_filter_init_gst; object->source_query_accept = avi_splitter_source_query_accept; object->source_get_media_type = avi_splitter_source_get_media_type; @@ -3205,12 +3233,9 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL mpeg_splitter_init_gst(struct parser *filter) +static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) { - static const WCHAR source_name[] = {'A','u','d','i','o',0}; - struct wg_parser *parser = filter->wg_parser; struct wg_parser_stream *stream; - struct parser_source *pin; GstElement *element; int ret; @@ -3233,12 +3258,6 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) if (!(stream = create_stream(parser))) return FALSE; - if (!(pin = create_pin(filter, stream, source_name))) - { - free_stream(stream); - return FALSE; - } - gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { @@ -3267,6 +3286,17 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) return TRUE; } +static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) +{ + static const WCHAR source_name[] = {'A','u','d','i','o',0}; + struct wg_parser *parser = filter->wg_parser; + + if (!create_pin(filter, parser->streams[0], source_name)) + return FALSE; + + return TRUE; +} + static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { struct wg_parser_stream *stream = pin->wg_stream; @@ -3333,12 +3363,13 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) heap_free(object); return E_OUTOFMEMORY; } + object->wg_parser->init_gst = mpeg_audio_parser_init_gst; strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &mpeg_splitter_sink_ops, NULL); object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; - object->init_gst = mpeg_splitter_init_gst; + object->init_gst = mpeg_splitter_filter_init_gst; object->source_query_accept = mpeg_splitter_source_query_accept; object->source_get_media_type = mpeg_splitter_source_get_media_type; object->enum_sink_first = TRUE;

1 0

Paul Gofman : opengl32: Support PFD_DEPTH_DONTCARE flag in wglChoosePixelFormat().
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 45f8b6924a45188a2fc20504545ef40f62b028da URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f8b6924a45188a2fc20504… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 11 13:04:51 2021 +0300 opengl32: Support PFD_DEPTH_DONTCARE flag in wglChoosePixelFormat(). With this flag set native implementation ignores cDepthBits but cares to find a zero depth format if possible. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 12 ++++++++++++ dlls/opengl32/wgl.c | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 90f06492e81..e93636ed75e 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -330,6 +330,18 @@ static void test_choosepixelformat(void) ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cAuxBuffers = 0; + + pfd.dwFlags |= PFD_DEPTH_DONTCARE; + pfd.cDepthBits = 24; + ok( test_pfd(&pfd, &ret_fmt), "PFD_DEPTH_DONTCARE failed.\n" ); + ok( !ret_fmt.cDepthBits, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "PFD_DEPTH_DONTCARE, depth 24, stencil 8 failed.\n" ); + ok( !ret_fmt.cDepthBits || ret_fmt.cDepthBits == 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + pfd.dwFlags &= ~PFD_DEPTH_DONTCARE; } static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index a1422fbfcd4..cf46c6dfa8a 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -563,7 +563,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } } - if (ppfd->cDepthBits) + if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) { if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) @@ -599,6 +599,9 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } } + if (ppfd->dwFlags & PFD_DEPTH_DONTCARE && format.cDepthBits < best.cDepthBits) + goto found; + continue; found:

1 0

Rémi Bernon : widl: Introduce new strappend helper.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 6341546fde9c17c41fbc40302e47c9fcb28e01e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6341546fde9c17c41fbc4030… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 11 17:37:28 2021 +0100 widl: Introduce new strappend helper. And use it for format_namespace to grow buffer as needed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 46 +++++++++++++++------------------------------- tools/widl/utils.c | 37 +++++++++++++++++++++++++++++++++++++ tools/widl/utils.h | 1 + 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index f696d30a5f5..203fffcdee6 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -89,41 +89,25 @@ const char *type_get_name(const type_t *type, enum name_type name_type) return NULL; } -static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator, const char *abi_prefix) +static size_t append_namespace(char **buf, size_t *len, size_t pos, struct namespace *namespace, const char *separator, const char *abi_prefix) { - if(is_global_namespace(namespace)) { - if(!abi_prefix) return ptr; - strcpy(ptr, abi_prefix); - strcat(ptr, separator); - return ptr + strlen(ptr); - } - - ptr = append_namespace(ptr, namespace->parent, separator, abi_prefix); - strcpy(ptr, namespace->name); - strcat(ptr, separator); - return ptr + strlen(ptr); + int nested = namespace && !is_global_namespace(namespace); + const char *name = nested ? namespace->name : abi_prefix; + size_t n = 0; + if (!name) return 0; + if (nested) n += append_namespace(buf, len, pos + n, namespace->parent, separator, abi_prefix); + n += strappend(buf, len, pos + n, "%s%s", name, separator); + return n; } -char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, - const char *abi_prefix) +char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, const char *abi_prefix) { - unsigned len = strlen(prefix) + strlen(suffix); - unsigned sep_len = strlen(separator); - struct namespace *iter; - char *ret, *ptr; - - if(abi_prefix) - len += strlen(abi_prefix) + sep_len; - - for(iter = namespace; !is_global_namespace(iter); iter = iter->parent) - len += strlen(iter->name) + sep_len; - - ret = xmalloc(len+1); - strcpy(ret, prefix); - ptr = append_namespace(ret + strlen(ret), namespace, separator, abi_prefix); - strcpy(ptr, suffix); - - return ret; + size_t len = 0, pos = 0; + char *buf = NULL; + pos += strappend(&buf, &len, pos, "%s", prefix); + pos += append_namespace(&buf, &len, pos, namespace, separator, abi_prefix); + pos += strappend(&buf, &len, pos, "%s", suffix); + return buf; } type_t *type_new_function(var_list_t *args) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index ea92372c8c7..634bd12a0ba 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -245,6 +245,43 @@ char *strmake( const char* fmt, ... ) } } +size_t strappend(char **buf, size_t *len, size_t pos, const char* fmt, ...) +{ + size_t size; + va_list ap; + char *ptr; + int n; + + assert( buf && len ); + assert( (*len == 0 && *buf == NULL) || (*len != 0 && *buf != NULL) ); + + if (*buf) + { + size = *len; + ptr = *buf; + } + else + { + size = 100; + ptr = xmalloc( size ); + } + + for (;;) + { + va_start( ap, fmt ); + n = vsnprintf( ptr + pos, size - pos, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if (pos + (size_t)n >= size) size = pos + n + 1; + else break; + ptr = xrealloc( ptr, size ); + } + + *len = size; + *buf = ptr; + return n; +} + char *xstrdup(const char *str) { char *s; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 37406656504..82e0a6ae489 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -45,6 +45,7 @@ void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); +size_t strappend(char **buf, size_t *len, size_t pos, const char* fmt, ...) __attribute__((__format__ (__printf__, 4, 5 ))); char *dup_basename(const char *name, const char *ext); size_t widl_getline(char **linep, size_t *lenp, FILE *fp);

1 0

Rémi Bernon : widl: Support WinRT parameterized type parsing.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: ed21c294815d3e1eff9dca861f4af16096cc1ce7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed21c294815d3e1eff9dca86… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 11 17:37:27 2021 +0100 widl: Support WinRT parameterized type parsing. And add IVectorView<T> and IIterator<T> parameterized interfaces to windows.foundation.idl for illustration and future use. They won't generate any additional code until they are fully specialized. This is a WIDL-specific feature, but MIDL has some magic knowledge of these Windows.Foundation.Collections interface templates, and we need a way to instruct WIDL about them too. Having these interfaces declared in the IDL, guarded with __WIDL__ ifdef is easier and more flexible than re-creating the types by hand in WIDL source. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 29 +++++++++++++++ tools/widl/expr.c | 2 ++ tools/widl/header.c | 8 +++-- tools/widl/parser.y | 82 +++++++++++++++++++++++++++++++++++------- tools/widl/typegen.c | 6 ++++ tools/widl/typelib.c | 2 ++ tools/widl/typetree.c | 39 ++++++++++++++++++++ tools/widl/typetree.h | 4 +++ tools/widl/widltypes.h | 9 +++++ 9 files changed, 166 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed21c294815d3e1eff9d…

1 0

Brendan Shanks : ntdll: Always use MAP_FAILED as mmap()'s error value.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: b79b158d6b29a6e9fc8ce49446cc349339bd953d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b79b158d6b29a6e9fc8ce494… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 11 21:37:51 2021 -0800 ntdll: Always use MAP_FAILED as mmap()'s error value. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 26a3ca0d2dd..e0346a28ea3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1807,7 +1807,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { - if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != MAP_FAILED) goto done; switch (errno) @@ -1970,7 +1970,7 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) if (!*removable) { - if (mmap( ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE, fd, 0 ) != (void *)-1) + if (mmap( ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE, fd, 0 ) != MAP_FAILED) return STATUS_SUCCESS; switch (errno)

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021