September 2021 - Wine-Commits

Eric Pouech : dbghelp/dwarf: Handle DW_FORM_GNU_strp_alt (string located in an alternate DWZ file).
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 9f74ac4b3b8d0e1496ddc0730c8e88291f41df1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f74ac4b3b8d0e1496ddc073… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:03 2021 +0200 dbghelp/dwarf: Handle DW_FORM_GNU_strp_alt (string located in an alternate DWZ file). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index af0244c8311..e3d1e35c179 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -682,9 +682,27 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, attr->u.uvalue = 0; return FALSE; case DW_FORM_GNU_strp_alt: - FIXME("Unhandled FORM_GNU_strp_alt\n"); - attr->u.string = NULL; - return FALSE; + if (ctx->module_ctx->dwz) + { + ULONG_PTR ofs = dwarf2_get_addr(data, ctx->head.offset_size); + if (ofs < ctx->module_ctx->dwz->sections[section_string].size) + { + attr->u.string = (const char*)ctx->module_ctx->dwz->sections[section_string].address + ofs; + TRACE("strp_alt<%s>\n", debugstr_a(attr->u.string)); + } + else + { + ERR("out of bounds strp_alt: 0x%lx 0x%x (%u)\n", ofs, ctx->module_ctx->dwz->sections[section_string].size, ctx->head.offset_size); + attr->u.string = "<<outofbounds-strpalt>>"; + } + } + else + { + ERR("No DWZ file present for GNU_strp_alt in %s\n", debugstr_w(ctx->module_ctx->module->modulename)); + attr->u.string = "<<noDWZ-strpalt>>"; + } + break; + default: FIXME("Unhandled attribute form %lx\n", abbrev_attr->form); break;

1 0

Eric Pouech : dbghelp/dwarf: Store a potential link to an external DWZ file in the dwarf2 module's information.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 16d66561632261e64eb341248bb14cbf87253b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16d66561632261e64eb34124… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:09:57 2021 +0200 dbghelp/dwarf: Store a potential link to an external DWZ file in the dwarf2 module's information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 90addb9a6b7..af0244c8311 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -182,9 +182,17 @@ typedef struct dwarf2_parse_module_context_s const struct elf_thunk_area*thunks; struct symt* symt_cache[sc_num]; /* void, unknown */ struct vector unit_contexts; + struct dwarf2_dwz_alternate_s* dwz; DWORD cu_versions; } dwarf2_parse_module_context_t; +typedef struct dwarf2_dwz_alternate_s +{ + struct image_file_map* fmap; + dwarf2_section_t sections[section_max]; + struct image_section_map sectmap[section_max]; +} dwarf2_dwz_alternate_t; + enum unit_status { UNIT_ERROR, @@ -3663,6 +3671,49 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf HeapFree(GetProcessHeap(), 0, modfmt); } +static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, struct module* module) +{ + struct image_file_map* fmap_dwz; + dwarf2_dwz_alternate_t* dwz; + + fmap_dwz = image_load_debugaltlink(fmap, module); + if (!fmap_dwz) return NULL; + if (!(dwz = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwz)))) + { + image_unmap_file(fmap_dwz); + HeapFree(GetProcessHeap(), 0, fmap_dwz); + return NULL; + } + + dwz->fmap = fmap_dwz; + dwarf2_init_section(&dwz->sections[section_debug], fmap_dwz, ".debug_info", ".zdebug_info", &dwz->sectmap[section_debug]); + dwarf2_init_section(&dwz->sections[section_abbrev], fmap_dwz, ".debug_abbrev", ".zdebug_abbrev", &dwz->sectmap[section_abbrev]); + dwarf2_init_section(&dwz->sections[section_string], fmap_dwz, ".debug_str", ".zdebug_str", &dwz->sectmap[section_string]); + dwarf2_init_section(&dwz->sections[section_line], fmap_dwz, ".debug_line", ".zdebug_line", &dwz->sectmap[section_line]); + dwarf2_init_section(&dwz->sections[section_ranges], fmap_dwz, ".debug_ranges", ".zdebug_ranges", &dwz->sectmap[section_ranges]); + + return dwz; +} + +static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz) +{ + if (!dwz) return; + dwarf2_fini_section(&dwz->sections[section_debug]); + dwarf2_fini_section(&dwz->sections[section_abbrev]); + dwarf2_fini_section(&dwz->sections[section_string]); + dwarf2_fini_section(&dwz->sections[section_line]); + dwarf2_fini_section(&dwz->sections[section_ranges]); + + image_unmap_section(&dwz->sectmap[section_debug]); + image_unmap_section(&dwz->sectmap[section_abbrev]); + image_unmap_section(&dwz->sectmap[section_string]); + image_unmap_section(&dwz->sectmap[section_line]); + image_unmap_section(&dwz->sectmap[section_ranges]); + + image_unmap_file(dwz->fmap); + HeapFree(GetProcessHeap(), 0, dwz); +} + BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, const struct elf_thunk_area* thunks, struct image_file_map* fmap) @@ -3676,6 +3727,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_parse_module_context_t module_ctx; unsigned i; + module_ctx.dwz = dwarf2_load_dwz(fmap, module); + if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) /* lld produces .eh_fram to avoid generating a long name */ dwarf2_init_section(&eh_frame, fmap, ".eh_fram", NULL, &eh_frame_sect); @@ -3772,6 +3825,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, } leave: + dwarf2_unload_dwz(module_ctx.dwz); + dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]); dwarf2_fini_section(&section[section_string]);

1 0

Zhiyi Zhang : winex11.drv: Register GUID_DEVINTERFACE_MONITOR interface for monitors.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 12411935c8be35a32583814899a47971d5f0f3f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12411935c8be35a325838148… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 16 15:10:35 2021 +0800 winex11.drv: Register GUID_DEVINTERFACE_MONITOR interface for monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 19c5d95a562..c8c216c8302 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -665,6 +665,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) goto done; + /* Register GUID_DEVINTERFACE_MONITOR */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DEVINTERFACE_MONITOR, NULL, 0, NULL)) + goto done; + + if (!link_device(bufferW, &GUID_DEVINTERFACE_MONITOR)) + goto done; + /* Write HardwareID registry property */ if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW)))

1 0

Michael Stefaniuc : sxs: Don't assign a COM object to the 3rd param of QueryInterface.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 67ea78c881394503785868b65eb5588d73b6b80c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67ea78c881394503785868b6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 15 20:31:47 2021 +0200 sxs: Don't assign a COM object to the 3rd param of QueryInterface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/cache.c | 10 ++++------ dlls/sxs/name.c | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 0acf012032d..e4fdda8c860 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -57,19 +57,17 @@ static inline struct cache *impl_from_IAssemblyCache(IAssemblyCache *iface) static HRESULT WINAPI cache_QueryInterface( IAssemblyCache *iface, REFIID riid, - void **obj ) + void **ret_iface ) { - struct cache *cache = impl_from_IAssemblyCache(iface); - - TRACE("%p, %s, %p\n", cache, debugstr_guid(riid), obj); + TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), ret_iface); - *obj = NULL; + *ret_iface = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCache)) { IAssemblyCache_AddRef( iface ); - *obj = cache; + *ret_iface = iface; return S_OK; } diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 6b3ae5197ac..0fab45c5018 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -56,19 +56,17 @@ static inline struct name *impl_from_IAssemblyName( IAssemblyName *iface ) static HRESULT WINAPI name_QueryInterface( IAssemblyName *iface, REFIID riid, - void **obj ) + void **ret_iface ) { - struct name *name = impl_from_IAssemblyName( iface ); - - TRACE("%p, %s, %p\n", name, debugstr_guid(riid), obj); + TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), ret_iface); - *obj = NULL; + *ret_iface = NULL; if (IsEqualIID( riid, &IID_IUnknown ) || IsEqualIID( riid, &IID_IAssemblyName )) { IAssemblyName_AddRef( iface ); - *obj = name; + *ret_iface = iface; return S_OK; }

1 0

Paul Gofman : winex11.drv: Register GUID_DISPLAY_DEVICE_ARRIVAL interface for GPUs.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 6d290cf2296d879099fdad93ac1c5c2ea355cdd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d290cf2296d879099fdad93… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 16 15:10:27 2021 +0800 winex11.drv: Register GUID_DISPLAY_DEVICE_ARRIVAL interface for GPUs. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 7 +++++++ include/ntddvdeo.h | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 1ef728791fa..19c5d95a562 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -494,6 +494,13 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (!link_device(instanceW, &GUID_DEVINTERFACE_DISPLAY_ADAPTER)) goto done; + /* Register GUID_DISPLAY_DEVICE_ARRIVAL */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DISPLAY_DEVICE_ARRIVAL, NULL, 0, NULL)) + goto done; + + if (!link_device(instanceW, &GUID_DISPLAY_DEVICE_ARRIVAL)) + goto done; + /* Write HardwareID registry property, REG_MULTI_SZ */ written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); bufferW[written + 1] = 0; diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h index 9523e37f7b4..8736c6cc845 100644 --- a/include/ntddvdeo.h +++ b/include/ntddvdeo.h @@ -21,5 +21,6 @@ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); +DEFINE_GUID(GUID_DISPLAY_DEVICE_ARRIVAL, 0x1ca05180, 0xa699, 0x450a, 0x9a, 0x0c, 0xde, 0x4f, 0xbe, 0x3d, 0xdd, 0x89); #endif

1 0

Zebediah Figura : winegstreamer: Properly clean up from failure in wg_parser_connect().
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 721b1eb2ebe5c3eaab8ac3fb1e4f4648cbee5b4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=721b1eb2ebe5c3eaab8ac3fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 15 18:00:07 2021 -0500 winegstreamer: Properly clean up from failure in wg_parser_connect(). In particular, unset the sink_connected value, and make sure that subsequent wg_parser_get_read_request calls don't hang. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 76 +++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index bf5a51aeaf4..119cbffbd88 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1034,6 +1034,30 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) return stream; } +static void free_stream(struct wg_parser_stream *stream) +{ + if (stream->their_src) + { + if (stream->post_sink) + { + gst_pad_unlink(stream->their_src, stream->post_sink); + gst_pad_unlink(stream->post_src, stream->my_sink); + gst_object_unref(stream->post_src); + gst_object_unref(stream->post_sink); + stream->post_src = stream->post_sink = NULL; + } + else + gst_pad_unlink(stream->their_src, stream->my_sink); + gst_object_unref(stream->their_src); + } + gst_object_unref(stream->my_sink); + + pthread_cond_destroy(&stream->event_cond); + pthread_cond_destroy(&stream->event_empty_cond); + + free(stream); +} + static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) { struct wg_parser *parser = user; @@ -1520,14 +1544,14 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s parser->error = false; if (!parser->init_gst(parser)) - return E_FAIL; + goto out; gst_element_set_state(parser->container, GST_STATE_PAUSED); ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { GST_ERROR("Failed to play stream.\n"); - return E_FAIL; + goto out; } pthread_mutex_lock(&parser->mutex); @@ -1537,7 +1561,7 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s if (parser->error) { pthread_mutex_unlock(&parser->mutex); - return E_FAIL; + goto out; } for (i = 0; i < parser->stream_count; ++i) @@ -1577,7 +1601,7 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s if (parser->error) { pthread_mutex_unlock(&parser->mutex); - return E_FAIL; + goto out; } if (gst_pad_query_duration(stream->their_src, GST_FORMAT_TIME, &duration)) { @@ -1614,30 +1638,36 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s parser->next_offset = 0; return S_OK; -} -static void free_stream(struct wg_parser_stream *stream) -{ - if (stream->their_src) +out: + if (parser->container) + gst_element_set_state(parser->container, GST_STATE_NULL); + if (parser->their_sink) { - if (stream->post_sink) - { - gst_pad_unlink(stream->their_src, stream->post_sink); - gst_pad_unlink(stream->post_src, stream->my_sink); - gst_object_unref(stream->post_src); - gst_object_unref(stream->post_sink); - stream->post_src = stream->post_sink = NULL; - } - else - gst_pad_unlink(stream->their_src, stream->my_sink); - gst_object_unref(stream->their_src); + gst_pad_unlink(parser->my_src, parser->their_sink); + gst_object_unref(parser->their_sink); + parser->my_src = parser->their_sink = NULL; } - gst_object_unref(stream->my_sink); - pthread_cond_destroy(&stream->event_cond); - pthread_cond_destroy(&stream->event_empty_cond); + for (i = 0; i < parser->stream_count; ++i) + free_stream(parser->streams[i]); + parser->stream_count = 0; + free(parser->streams); + parser->streams = NULL; - free(stream); + if (parser->container) + { + gst_element_set_bus(parser->container, NULL); + gst_object_unref(parser->container); + parser->container = NULL; + } + + pthread_mutex_lock(&parser->mutex); + parser->sink_connected = false; + pthread_mutex_unlock(&parser->mutex); + pthread_cond_signal(&parser->read_cond); + + return E_FAIL; } static void CDECL wg_parser_disconnect(struct wg_parser *parser)

1 0

Zebediah Figura : winegstreamer: Factor out more of the init_gst callback into wg_parser_connect().
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 830efe873a967dbbb0c9a65be6a66b124a5fa826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=830efe873a967dbbb0c9a65b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 15 18:00:06 2021 -0500 winegstreamer: Factor out more of the init_gst callback into wg_parser_connect(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 78 +++++++++++++----------------------------- 1 file changed, 24 insertions(+), 54 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index cd12a23d0c8..bf5a51aeaf4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1494,6 +1494,7 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); unsigned int i; + int ret; parser->file_size = file_size; parser->sink_connected = true; @@ -1516,12 +1517,29 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s parser->start_offset = parser->next_offset = parser->stop_offset = 0; parser->next_pull_offset = 0; + parser->error = false; if (!parser->init_gst(parser)) return E_FAIL; + gst_element_set_state(parser->container, GST_STATE_PAUSED); + ret = gst_element_get_state(parser->container, NULL, NULL, -1); + if (ret == GST_STATE_CHANGE_FAILURE) + { + GST_ERROR("Failed to play stream.\n"); + return E_FAIL; + } + pthread_mutex_lock(&parser->mutex); + while (!parser->no_more_pads && !parser->error) + pthread_cond_wait(&parser->init_cond, &parser->mutex); + if (parser->error) + { + pthread_mutex_unlock(&parser->mutex); + return E_FAIL; + } + for (i = 0; i < parser->stream_count; ++i) { struct wg_parser_stream *stream = parser->streams[i]; @@ -1677,7 +1695,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&parser->mutex); - parser->no_more_pads = parser->error = false; + parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) @@ -1686,24 +1704,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) return FALSE; } - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } - - pthread_mutex_lock(&parser->mutex); - while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &parser->mutex); - if (parser->error) - { - pthread_mutex_unlock(&parser->mutex); - return FALSE; - } - pthread_mutex_unlock(&parser->mutex); - return TRUE; } @@ -1724,7 +1724,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&parser->mutex); - parser->no_more_pads = parser->error = false; + parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) @@ -1733,24 +1733,6 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) return FALSE; } - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } - - pthread_mutex_lock(&parser->mutex); - while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &parser->mutex); - if (parser->error) - { - pthread_mutex_unlock(&parser->mutex); - return FALSE; - } - pthread_mutex_unlock(&parser->mutex); - return TRUE; } @@ -1781,15 +1763,9 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; } - gst_pad_set_active(stream->my_sink, 1); - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } + + parser->no_more_pads = true; return TRUE; } @@ -1822,15 +1798,9 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; } - gst_pad_set_active(stream->my_sink, 1); - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } + + parser->no_more_pads = true; return TRUE; }

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_SetCooperativeLevel tests.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 2975ad8134d81368b32f642204824a5914cc4e5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2975ad8134d81368b32f6422… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:42 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SetCooperativeLevel tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index fbf1b894fd1..2cfa8f2e09e 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3409,6 +3409,7 @@ static void test_simple_joystick(void) HRESULT hr; WCHAR *tmp; ULONG ref; + HWND hwnd; GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); @@ -3700,6 +3701,31 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetEventNotification( device, event ); ok( hr == DI_OK, "IDirectInputDevice8_SetEventNotification returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, 0 ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); + ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); + ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + + hwnd = CreateWindowW( L"static", L"dinput", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, + NULL, NULL, NULL, NULL ); + + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); + ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); + ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + DestroyWindow( hwnd ); + + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_SetDataFormat tests.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 7fcca74881c8b8189c7a35df9b8026486ecf7437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fcca74881c8b8189c7a35df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:40 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SetDataFormat tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 898dd7a6cdf..2bbf7a9e978 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3401,6 +3401,7 @@ static void test_simple_joystick(void) }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEINSTANCEW devinst = {0}; + DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; IDirectInput8W *di; @@ -3676,6 +3677,20 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_NOTINITIALIZED, "IDirectInputDevice8_GetProperty DIPROP_APPDATA returned %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + dataformat.dwSize = sizeof(DIDATAFORMAT); + hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + dataformat.dwObjSize = sizeof(DIOBJECTDATAFORMAT); + hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); + ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

Rémi Bernon : winebus.sys: Use Rtl heap functions.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 35a6148acff836fe442ce78016dc7f0f4f4b0291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35a6148acff836fe442ce780… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:56 2021 +0200 winebus.sys: Use Rtl heap functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 8 ++++---- dlls/winebus.sys/bus_udev.c | 12 ++++++------ dlls/winebus.sys/hid.c | 8 ++++---- dlls/winebus.sys/main.c | 30 +++++++++++++++--------------- dlls/winebus.sys/unixlib.c | 14 +++++++------- 6 files changed, 37 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35a6148acff836fe442c…

1 0