- Wine-Commits - list.winehq.org

Piotr Caban : wineps: Use default devmode if winspool returns fake data.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: 9f578f6a30c37cf550c3085136ea17020106ea91 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f578f6a30c37cf550c3085136ea17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 15:49:09 2023 +0200 wineps: Use default devmode if winspool returns fake data. Fixes regression caused by aa3699dd59c9. --- dlls/wineps.drv/init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index ec015e1c871..78a72303708 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -644,14 +644,16 @@ static PSDRV_DEVMODE *get_devmode( HANDLE printer, const WCHAR *name, BOOL *is_d *is_default = FALSE; - if (dm) + if (dm && (dm->dmPublic.dmFields & DefaultDevmode.dmPublic.dmFields) == + DefaultDevmode.dmPublic.dmFields) { TRACE( "Retrieved devmode from winspool\n" ); return dm; } TRACE( "Using default devmode\n" ); - dm = HeapAlloc( PSDRV_Heap, 0, size ); + if (!dm) + dm = HeapAlloc( PSDRV_Heap, 0, size ); if (dm) { memcpy( dm, &DefaultDevmode, min(sizeof(DefaultDevmode), size) );

1 0

Piotr Caban : winspool: Register wineps print processor before adding printer.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: 9fd82b6156c395f85731291afd57b47ef79dbb55 URL: https://gitlab.winehq.org/wine/wine/-/commit/9fd82b6156c395f85731291afd57b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 16:14:46 2023 +0200 winspool: Register wineps print processor before adding printer. --- dlls/winspool.drv/info.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2f2529ea01b..3c513f1c0e8 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -649,6 +649,8 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) res = !UNIX_CALL( get_ppd, &ppd_params ) || get_internal_fallback_ppd( ppd ); if (!res) goto end; + AddPrintProcessorW(NULL, NULL, driver_nt, (WCHAR *)L"wineps"); + memset( &di3, 0, sizeof(DRIVER_INFO_3W) ); di3.cVersion = 3; di3.pName = (WCHAR *)name;

1 0

Hans Leidekker : webservices: Handle WS_XML_BUFFER_TYPE in get_field_read_option().
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: a894528071e2cb4492e53e070b488371a3cff0b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a894528071e2cb4492e53e070b4883… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 16 13:17:31 2023 +0200 webservices: Handle WS_XML_BUFFER_TYPE in get_field_read_option(). --- dlls/webservices/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b28a5cc107c..41b2adc8724 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6184,6 +6184,7 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) case WS_BYTES_TYPE: case WS_XML_STRING_TYPE: case WS_XML_QNAME_TYPE: + case WS_XML_BUFFER_TYPE: case WS_STRUCT_TYPE: case WS_ENUM_TYPE: case WS_UNION_TYPE:

1 0

Nikolay Sivov : d2d1: Implement IsSupported() for HWND target.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: c9b68daf4419338ec1fef55748703ea9b810bafa URL: https://gitlab.winehq.org/wine/wine/-/commit/c9b68daf4419338ec1fef55748703e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 17 09:30:01 2023 +0200 d2d1: Implement IsSupported() for HWND target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/hwnd_render_target.c | 29 ++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 6 ------ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5dab3fbb2a8..c3714a92511 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -264,6 +264,8 @@ struct d2d_hwnd_render_target IDXGISwapChain *swapchain; UINT sync_interval; HWND hwnd; + + D2D1_RENDER_TARGET_PROPERTIES desc; }; HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target, ID2D1Factory1 *factory, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 4d3fe43a1b3..325eb941782 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -652,10 +652,32 @@ static BOOL STDMETHODCALLTYPE d2d_hwnd_render_target_IsSupported(ID2D1HwndRender const D2D1_RENDER_TARGET_PROPERTIES *desc) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); + const D2D1_RENDER_TARGET_PROPERTIES *target_desc = &render_target->desc; + D2D1_PIXEL_FORMAT pixel_format; TRACE("iface %p, desc %p.\n", iface, desc); - return ID2D1RenderTarget_IsSupported(render_target->dxgi_target, desc); + if (desc->type != D2D1_RENDER_TARGET_TYPE_DEFAULT + && target_desc->type != desc->type) + { + return FALSE; + } + + pixel_format = ID2D1RenderTarget_GetPixelFormat(render_target->dxgi_target); + + if (desc->pixelFormat.format != DXGI_FORMAT_UNKNOWN + && pixel_format.format != desc->pixelFormat.format) + { + return FALSE; + } + + if (desc->pixelFormat.alphaMode != D2D1_ALPHA_MODE_UNKNOWN + && pixel_format.alphaMode != desc->pixelFormat.alphaMode) + { + return FALSE; + } + + return (target_desc->usage & desc->usage) == desc->usage; } static D2D1_WINDOW_STATE STDMETHODCALLTYPE d2d_hwnd_render_target_CheckWindowState(ID2D1HwndRenderTarget *iface) @@ -840,6 +862,11 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target if (dxgi_rt_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) dxgi_rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + render_target->desc = dxgi_rt_desc; + /* FIXME: should be resolved to either HW or SW type. */ + if (render_target->desc.type == D2D1_RENDER_TARGET_TYPE_DEFAULT) + render_target->desc.type = D2D1_RENDER_TARGET_TYPE_HARDWARE; + swapchain_desc.BufferDesc.Width = hwnd_rt_desc->pixelSize.width; swapchain_desc.BufferDesc.Height = hwnd_rt_desc->pixelSize.height; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ecbabe83b77..df1b99776e4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -13429,7 +13429,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) hr = ID2D1Factory_CreateHwndRenderTarget(ctx.factory, &template_desc, &hwnd_rt_desc, &rt); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); supported = ID2D1HwndRenderTarget_IsSupported(rt, &template_desc); - todo_wine ok(supported, "Expected supported.\n"); ID2D1HwndRenderTarget_Release(rt); @@ -13476,7 +13475,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) ok(pixel_format.format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected format %#x.\n", pixel_format.format); ok(pixel_format.alphaMode == D2D1_ALPHA_MODE_PREMULTIPLIED, "Got unexpected alpha %u.\n", pixel_format.alphaMode); supported = ID2D1HwndRenderTarget_IsSupported(rt, &test_desc); - todo_wine ok(supported, "Expected supported.\n"); ID2D1Bitmap1_Release(bitmap); @@ -13497,7 +13495,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) test_desc = template_desc; test_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; supported = ID2D1HwndRenderTarget_IsSupported(rt, &test_desc); - todo_wine ok(supported, "Unexpected return value %d.\n", supported); } else @@ -13514,7 +13511,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) supported = ID2D1HwndRenderTarget_IsSupported(rt, &test_desc); expected = target_types[j] == D2D1_RENDER_TARGET_TYPE_DEFAULT || target_types[i] == target_types[j]; - todo_wine_if(expected) ok(supported == expected, "Unexpected return value %d.\n", supported); winetest_pop_context(); @@ -13556,7 +13552,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) alpha_mode_supported = pixel_formats[j].alphaMode == D2D1_ALPHA_MODE_UNKNOWN || pixel_formats[j].alphaMode == desc.pixelFormat.alphaMode; expected = format_supported && alpha_mode_supported; - todo_wine_if(expected) ok(supported == expected, "Unexpected return value.\n"); winetest_pop_context(); @@ -13589,7 +13584,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) desc.usage = usages[j]; supported = ID2D1HwndRenderTarget_IsSupported(rt, &desc); expected = (usages[i] & usages[j]) == usages[j]; - todo_wine_if(expected) ok(supported == expected, "Unexpected result %d.\n", supported); winetest_pop_context();

1 0

Piotr Caban : wineps: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: 407b01c4c35e07707451d1ae9eb92a9a78be172b URL: https://gitlab.winehq.org/wine/wine/-/commit/407b01c4c35e07707451d1ae9eb92a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 13:56:21 2023 +0200 wineps: Implement Wow64 entry points in the Unix library. --- dlls/wineps.drv/unixlib.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 80331372572..e90d3c31531 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1742,3 +1742,55 @@ const unixlib_entry_t __wine_unix_call_funcs[] = }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count); + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_import_ntf(void *args) +{ + struct + { + PTR32 data; + int size; + } const *params32 = args; + struct import_ntf_params params = { ULongToPtr(params32->data), params32->size }; + + return import_ntf(&params); +} + +static NTSTATUS wow64_open_dc(void *args) +{ + struct + { + PTR32 device; + PTR32 devmode; + PTR32 output; + PTR32 def_devmode; + PTR32 hdc; + } *params32 = args; + struct open_dc_params params = + { + ULongToPtr(params32->device), + ULongToPtr(params32->devmode), + ULongToPtr(params32->output), + ULongToPtr(params32->def_devmode), + 0 + }; + NTSTATUS ret; + + ret = open_dc(&params); + params32->hdc = PtrToUlong(params.hdc); + return ret; +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + free_printer_info, + wow64_import_ntf, + wow64_open_dc, +}; + +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count); + +#endif /* _WIN64 */

1 0

Piotr Caban : wineps: Introduce wine_driver_open_dc wine specific export used to create printer DC.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: ec6062c572509d1b916045f078c55663592ee52a URL: https://gitlab.winehq.org/wine/wine/-/commit/ec6062c572509d1b916045f078c556… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 13:43:28 2023 +0200 wineps: Introduce wine_driver_open_dc wine specific export used to create printer DC. Doing it this way avoids passing Unix library pointers throught PE. --- dlls/gdi32/dc.c | 13 +++++++++---- dlls/win32u/dc.c | 9 ++++----- dlls/wineps.drv/init.c | 35 +++++++++++++++++++---------------- dlls/wineps.drv/unixlib.c | 25 +++++++++++++++++-------- dlls/wineps.drv/unixlib.h | 14 ++++++++------ dlls/wineps.drv/wineps.drv.spec | 2 +- 6 files changed, 58 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 91ab6c43bde..e7f2d8526d1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -42,7 +42,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -typedef const void * (CDECL *driver_entry_point)( unsigned int version, const WCHAR *device ); +typedef HDC (CDECL *driver_entry_point)( const WCHAR *device, + const DEVMODEW *devmode, const WCHAR *output ); struct graphics_driver { @@ -138,7 +139,7 @@ static struct graphics_driver *create_driver( HMODULE module ) driver->module = module; if (module) - driver->entry_point = (void *)GetProcAddress( module, "wine_get_gdi_driver" ); + driver->entry_point = (void *)GetProcAddress( module, "wine_driver_open_dc" ); else driver->entry_point = NULL; @@ -312,8 +313,12 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, device_str.Buffer = (WCHAR *)device; } - ret = NtGdiOpenDCW( device || display ? &device_str : NULL, devmode, output ? &output_str : NULL, - 0, is_display, entry_point, NULL, NULL ); + if (entry_point) + ret = entry_point( device, devmode, output ); + else + ret = NtGdiOpenDCW( device || display ? &device_str : NULL, devmode, + output ? &output_str : NULL, + 0, is_display, entry_point, NULL, NULL ); if (ret && hspool && (dc_attr = get_dc_attr( ret ))) { diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index bcfbed29426..9e8e2f65212 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -717,11 +717,10 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD /* gdi_lock should not be locked */ if (is_display) funcs = get_display_driver(); - else if (hspool) - { - const struct gdi_dc_funcs * (CDECL *wine_get_gdi_driver)( unsigned int, const WCHAR * ) = hspool; - funcs = wine_get_gdi_driver( WINE_GDI_DRIVER_VERSION, device ? device->Buffer : NULL ); - } + else if (type != WINE_GDI_DRIVER_VERSION) + ERR( "version mismatch: %u\n", (unsigned int)type ); + else + funcs = hspool; if (!funcs) { ERR( "no driver found\n" ); diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 136856d5dc0..ec015e1c871 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -897,24 +897,27 @@ fail: } /****************************************************************************** - * PSDRV_get_gdi_driver + * PSDRV_open_printer_dc */ -const struct gdi_dc_funcs * CDECL PSDRV_get_gdi_driver( unsigned int version, const WCHAR *name ) +HDC CDECL PSDRV_open_printer_dc( const WCHAR *device, + const DEVMODEW *devmode, const WCHAR *output ) { - PRINTERINFO *pi = PSDRV_FindPrinterInfo( name ); - struct init_dc_params params; + struct open_dc_params params; + PRINTERINFO *pi; + + if (!device) + return 0; + pi = PSDRV_FindPrinterInfo( device ); if (!pi) - return NULL; - if (version != WINE_GDI_DRIVER_VERSION) - { - ERR( "version mismatch, gdi32 wants %u but wineps has %u\n", version, WINE_GDI_DRIVER_VERSION ); - return NULL; - } - params.name = pi->friendly_name; - params.devmode = pi->Devmode; - params.funcs = NULL; - if (!WINE_UNIX_CALL( unix_init_dc, &params )) - return FALSE; - return params.funcs; + return 0; + + params.device = pi->friendly_name; + params.devmode = devmode; + params.output = output; + params.def_devmode = pi->Devmode; + params.hdc = 0; + if (!WINE_UNIX_CALL( unix_open_dc, &params )) + return 0; + return params.hdc; } diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 68509025eac..80331372572 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1688,23 +1688,32 @@ static NTSTATUS import_ntf(void *arg) return add_ntf_fonts(params->data, params->size); } -static NTSTATUS init_dc(void *arg) +static NTSTATUS open_dc(void *arg) { - struct init_dc_params *params = arg; + UNICODE_STRING device_str, output_str; + struct open_dc_params *params = arg; struct printer_info *pi; - pi = find_printer_info(params->name); + pi = find_printer_info(params->device); if (!pi) { pi = malloc(sizeof(*pi)); if (!pi) return FALSE; - pi->name = params->name; - pi->devmode = params->devmode; + pi->name = params->device; + pi->devmode = params->def_devmode; list_add_head(&printer_info_list, &pi->entry); } - params->funcs = &psdrv_funcs; + device_str.Length = device_str.MaximumLength = lstrlenW(params->device) + 1; + device_str.Buffer = (WCHAR *)params->device; + if (params->output) + { + output_str.Length = output_str.MaximumLength = lstrlenW(params->output) + 1; + output_str.Buffer = (WCHAR *)params->output; + } + params->hdc = NtGdiOpenDCW(&device_str, params->devmode, params->output ? &output_str : NULL, + WINE_GDI_DRIVER_VERSION, 0, (HANDLE)&psdrv_funcs, NULL, NULL); return TRUE; } @@ -1727,9 +1736,9 @@ static NTSTATUS free_printer_info(void *arg) const unixlib_entry_t __wine_unix_call_funcs[] = { - import_ntf, - init_dc, free_printer_info, + import_ntf, + open_dc, }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count); diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index 03459590dc6..e28a4416d09 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -74,9 +74,9 @@ struct installed_font /* Unix calls */ enum wineps_funcs { - unix_import_ntf, - unix_init_dc, unix_free_printer_info, + unix_import_ntf, + unix_open_dc, unix_funcs_count, }; @@ -86,9 +86,11 @@ struct import_ntf_params int size; }; -struct init_dc_params +struct open_dc_params { - const WCHAR *name; - PSDRV_DEVMODE *devmode; - const struct gdi_dc_funcs *funcs; + const WCHAR *device; + const DEVMODEW *devmode; + const WCHAR *output; + PSDRV_DEVMODE *def_devmode; + HDC hdc; }; diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index aca8ed2d10f..f193930a9fe 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -1,4 +1,4 @@ -@ cdecl wine_get_gdi_driver(long str) PSDRV_get_gdi_driver +@ cdecl wine_driver_open_dc(wstr ptr wstr) PSDRV_open_printer_dc @ stdcall -private DllRegisterServer() # Printer driver config exports

1 0

Zhiyi Zhang : d2d1/tests: Add some IsSupported() tests for HWND target.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: 4150d7282e1813dd7120b95f851a2091ab4f7668 URL: https://gitlab.winehq.org/wine/wine/-/commit/4150d7282e1813dd7120b95f851a20… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 17 09:19:43 2023 +0200 d2d1/tests: Add some IsSupported() tests for HWND target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 248 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+)

1 0

Ziqing Hui : mfreadwrite/tests: Add tests for MP4 sink writer.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: cfbcd014c67e440d5a6c239cdd8333823604c7da URL: https://gitlab.winehq.org/wine/wine/-/commit/cfbcd014c67e440d5a6c239cdd8333… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon May 15 11:41:15 2023 +0800 mfreadwrite/tests: Add tests for MP4 sink writer. --- dlls/mfreadwrite/tests/mfplat.c | 82 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 41b2a033a59..3b54aa4ff4c 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1415,7 +1415,7 @@ done: DestroyWindow(window); } -static void test_sink_writer(void) +static void test_sink_writer_create(void) { IMFSinkWriter *writer; HRESULT hr; @@ -1437,6 +1437,83 @@ static void test_sink_writer(void) ok(!writer, "Unexpected pointer %p.\n", writer); } +static void test_sink_writer_mp4(void) +{ + WCHAR tmp_file[MAX_PATH]; + IMFSinkWriter *writer; + IMFByteStream *stream; + IMFAttributes *attr; + IMFMediaSink *sink; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(tmp_file), tmp_file); + wcscat(tmp_file, L"tmp.mp4"); + + hr = MFCreateAttributes(&attr, 1); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetGUID(attr, &MF_TRANSCODE_CONTAINERTYPE, &MFTranscodeContainerType_MPEG4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateTempFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_DELETE_IF_EXIST, MF_FILEFLAGS_NONE, &stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Test MFCreateSinkWriterFromURL. */ + writer = (void *)0xdeadbeef; + hr = MFCreateSinkWriterFromURL(NULL, NULL, attr, &writer); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!writer, "Unexpected pointer %p.\n", writer); + + writer = (void *)0xdeadbeef; + hr = MFCreateSinkWriterFromURL(NULL, stream, NULL, &writer); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!writer, "Unexpected pointer %p.\n", writer); + + hr = MFCreateSinkWriterFromURL(NULL, stream, attr, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + IMFSinkWriter_Release(writer); + + hr = MFCreateSinkWriterFromURL(tmp_file, NULL, NULL, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + IMFSinkWriter_Release(writer); + + hr = MFCreateSinkWriterFromURL(tmp_file, NULL, attr, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + IMFSinkWriter_Release(writer); + + hr = MFCreateSinkWriterFromURL(tmp_file, stream, NULL, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + IMFSinkWriter_Release(writer); + + hr = MFCreateSinkWriterFromURL(tmp_file, stream, attr, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) + { + IMFByteStream_Release(stream); + IMFAttributes_Release(attr); + return; + } + + /* Test GetServiceForStream. */ + sink = (void *)0xdeadbeef; + hr = IMFSinkWriter_GetServiceForStream(writer, MF_SINK_WRITER_MEDIASINK, + &GUID_NULL, &IID_IMFMediaSink, (void **)&sink); + ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#lx.\n", hr); + ok(!sink, "Unexpected pointer %p.\n", sink); + + DeleteFileW(tmp_file); + IMFSinkWriter_Release(writer); + IMFByteStream_Release(stream); + IMFAttributes_Release(attr); +} + START_TEST(mfplat) { HRESULT hr; @@ -1451,7 +1528,8 @@ START_TEST(mfplat) test_source_reader("test.mp4", true); test_source_reader_from_media_source(); test_reader_d3d9(); - test_sink_writer(); + test_sink_writer_create(); + test_sink_writer_mp4(); hr = MFShutdown(); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : quartz: Avoid reading past the end of a buffer (Valgrind).
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: fbfc724d69987aa8a5e529b1a935e2be3379198a URL: https://gitlab.winehq.org/wine/wine/-/commit/fbfc724d69987aa8a5e529b1a935e2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 13 13:03:33 2023 +0200 quartz: Avoid reading past the end of a buffer (Valgrind). --- dlls/quartz/filtermapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 149bc8d1716..dd7c6c41872 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -425,7 +425,7 @@ static int add_data(struct Vector *v, const void *pData, int size) static int find_data(const struct Vector *v, const void *pData, int size) { int index; - for (index = 0; index < v->current; index++) + for (index = 0; index + size <= v->current; index++) if (!memcmp(v->pData + index, pData, size)) return index; /* not found */

1 0

Rémi Bernon : winegstreamer: Remove unnecessary wg_parser their_sink pad.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: f595a3f904dd3f86ff07d1428bac50b3b0d5879b URL: https://gitlab.winehq.org/wine/wine/-/commit/f595a3f904dd3f86ff07d1428bac50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 12 12:10:39 2023 +0200 winegstreamer: Remove unnecessary wg_parser their_sink pad. --- dlls/winegstreamer/wg_parser.c | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 7776f7287df..42e8f7e9e11 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -66,7 +66,7 @@ struct wg_parser GstElement *container, *decodebin; GstBus *bus; - GstPad *my_src, *their_sink; + GstPad *my_src; guint64 file_size, start_offset, next_offset, stop_offset; guint64 next_pull_offset; @@ -1679,11 +1679,8 @@ static NTSTATUS wg_parser_connect(void *args) out: if (parser->container) gst_element_set_state(parser->container, GST_STATE_NULL); - if (parser->their_sink) - { - gst_object_unref(parser->their_sink); - parser->my_src = parser->their_sink = NULL; - } + if (parser->my_src) + gst_object_unref(parser->my_src); for (i = 0; i < parser->stream_count; ++i) free_stream(parser->streams[i]); @@ -1725,8 +1722,7 @@ static NTSTATUS wg_parser_disconnect(void *args) gst_element_set_state(parser->container, GST_STATE_NULL); gst_object_unref(parser->my_src); - gst_object_unref(parser->their_sink); - parser->my_src = parser->their_sink = NULL; + parser->my_src = NULL; pthread_mutex_lock(&parser->mutex); parser->sink_connected = false; @@ -1762,7 +1758,6 @@ static NTSTATUS wg_parser_disconnect(void *args) static BOOL decodebin_parser_init_gst(struct wg_parser *parser) { GstElement *element; - int ret; if (!(element = create_element("decodebin", "base"))) return FALSE; @@ -1783,17 +1778,12 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_select_cb), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_cb), parser); - parser->their_sink = gst_element_get_static_pad(element, "sink"); - pthread_mutex_lock(&parser->mutex); parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); - if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) - { - GST_ERROR("Failed to link pads, error %d.", ret); + if (!link_src_to_element(parser->my_src, element)) return FALSE; - } return TRUE; } @@ -1801,7 +1791,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) static BOOL avi_parser_init_gst(struct wg_parser *parser) { GstElement *element; - int ret; if (!(element = create_element("avidemux", "good"))) return FALSE; @@ -1812,17 +1801,12 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) g_signal_connect(element, "pad-removed", G_CALLBACK(pad_removed_cb), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_cb), parser); - parser->their_sink = gst_element_get_static_pad(element, "sink"); - pthread_mutex_lock(&parser->mutex); parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); - if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) - { - GST_ERROR("Failed to link pads, error %d.", ret); + if (!link_src_to_element(parser->my_src, element)) return FALSE; - } return TRUE; } @@ -1838,12 +1822,8 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); - parser->their_sink = gst_element_get_static_pad(element, "sink"); - if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) - { - GST_ERROR("Failed to link sink pads, error %d.", ret); + if (!link_src_to_element(parser->my_src, element)) return FALSE; - } if (!(stream = create_stream(parser))) return FALSE; @@ -1872,12 +1852,8 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); - parser->their_sink = gst_element_get_static_pad(element, "sink"); - if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) - { - GST_ERROR("Failed to link sink pads, error %d.", ret); + if (!link_src_to_element(parser->my_src, element)) return FALSE; - } if (!(stream = create_stream(parser))) return FALSE;

1 0