July 2020 - Wine-Devel - list.winehq.org

[PATCH 2/3] winapi_test: Remove 1 MIDL_STUB_MESSAGE field exclusion.
by Serge Gautherie July 24, 2020

July 24, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Revert 5c033dad7991375a3d5c9abe92d454e7c9d56f77. NB: Wine never renamed this field... PSDK S03R2 and SDK 10.0.16299.0 have it. --- dlls/rpcrt4/tests/generated.c | 6 ++++++ tools/winapi/tests.dat | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index a111bb0..7dd5968 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -623,6 +623,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 97) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 98) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 104) @@ -1481,6 +1484,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 60) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index ccf2934..4881339 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -967,7 +967,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount +MIDL_STUB_MESSAGE MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT -- 2.10.0.windows.1

2 1

[PATCH 1/3] winapi_test: Remove 3 MIDL_STUB_MESSAGE field exclusions.
by Serge Gautherie July 24, 2020

July 24, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to 52911fc66c53816d7df1b417ca50ec25e24f9e88. --- dlls/rpcrt4/tests/generated.c | 18 ++++++++++++++++++ tools/winapi/tests.dat | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 72672cd..a111bb0 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -593,6 +593,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 48) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 56) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 60) @@ -1442,6 +1451,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 28) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 32) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 33) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 34) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 36) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index e6a0992..ccf2934 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -967,7 +967,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount !IsClient !Pad !uFlags2 +MIDL_STUB_MESSAGE: !UniquePtrCount MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT -- 2.10.0.windows.1

2 1

[PATCH 2/6] winex11.drv: Sort display modes.
by Zhiyi Zhang July 24, 2020

July 24, 2020

Although tests show that their order are not always guaranteed on Windows, most of the time it is sorted. It also makes sure that when a 0Hz or 1Hz display mode is specified for ChangeDisplaySettingsExW(), the chosen display mode is the one with the highest frequency. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 28c405ae0e0..02495756179 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include <stdlib.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -333,6 +334,22 @@ BOOL get_primary_adapter(WCHAR *name) return FALSE; } +static int mode_compare(const void *p1, const void *p2) +{ + const DEVMODEW *a = p1, *b = p2; + + if (a->dmBitsPerPel != b->dmBitsPerPel) + return b->dmBitsPerPel - a->dmBitsPerPel; + + if (a->dmPelsWidth != b->dmPelsWidth) + return a->dmPelsWidth - b->dmPelsWidth; + + if (a->dmPelsHeight != b->dmPelsHeight) + return a->dmPelsHeight - b->dmPelsHeight; + + return b->dmDisplayFrequency - a->dmDisplayFrequency; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -379,6 +396,8 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } + qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); + if (cached_modes) handler.free_modes(cached_modes); lstrcpyW(cached_device_name, name); @@ -477,6 +496,7 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) if (!handler.get_modes(id, 0, &modes, &mode_count)) return NULL; + qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); for (mode_idx = 0; mode_idx < mode_count; ++mode_idx) { found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx); -- 2.25.1

2 1

[PATCH 1/5] wine.inf: Map the Desktop section of win.ini to the registry.
by Zebediah Figura July 24, 2020

July 24, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 65b224c37fd..82a6888643b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -565,6 +565,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" -- 2.27.0

2 6

[PATCH 3/3] windowscodecs: Fix alpha mode of DXT3 and DXT5 image.
by Ziqing Hui July 24, 2020

July 24, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 15 ++++++--------- dlls/windowscodecs/tests/ddsformat.c | 1 - 2 files changed, 6 insertions(+), 10 deletions(-)

2 1

[PATCH 2/3] windowscodecs/tests: Add more compressed test DDS images.
by Ziqing Hui July 24, 2020

July 24, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 128 ++++++++++++++++++++++----- 1 file changed, 107 insertions(+), 21 deletions(-)

2 1

[PATCH 1/3] windowscodecs/tests: Add tests for alpha and luminance image.
by Ziqing Hui July 24, 2020

July 24, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 33 +++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)

2 1

[PATCH 1/4] gdiplus/tests: Add metafile LinearGradient brush test.
by Shawn M. Chapla July 24, 2020

July 24, 2020

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 146 ++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index ddb58504c99..bba44d15dae 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3270,6 +3270,151 @@ static void test_fillregion(void) GdipDisposeImage((GpImage*)metafile); } +static const emfplus_record lineargradient_records[] = { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypeBrush << 8, 1 }, + { EmfPlusRecordTypeFillRects, 0x4000, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 1, 1 }, + { EmfPlusRecordTypeFillRects, 0x4000, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2, 1 }, + { EmfPlusRecordTypeFillRects, 0x4000, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 3, 1 }, + { EmfPlusRecordTypeFillRects, 0x4000, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_lineargradient(void) +{ + static const GpPointF dst_points[3] = {{0.0, 0.0}, {100.0, 0.0}, {0.0, 100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpRectF horizrect = {10.0, 10.0, 20.0, 20.0}; + static const GpRectF vertrect = {50.0, 10.0, 20.0, 20.0}; + static const GpRectF blendrect = {10.0, 50.0, 20.0, 20.0}; + static const GpRectF presetrect = {50.0, 50.0, 20.0, 20.0}; + static const REAL blendfac[3] = {0.0, 0.9, 1.0}; + static const REAL blendpos[3] = {0.0, 0.5, 1.0}; + static const ARGB pblendcolor[3] = {0xffff0000, 0xff00ff00, 0xff0000ff}; + static const REAL pblendpos[3] = {0.0, 0.5, 1.0}; + + ARGB color; + GpBitmap *bitmap; + GpBrush *horizbrush, *vertbrush, *blendbrush, *presetbrush; + GpGraphics *graphics; + GpMetafile *metafile; + GpStatus stat; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, + L"winetest", &metafile); + expect(Ok, stat); + DeleteDC(hdc); + hdc = NULL; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* Test various brush types to cover all valid combinations + of optional serialized data. */ + stat = GdipCreateLineBrushFromRect(&horizrect, 0xffff0000, 0xff0000ff, + LinearGradientModeHorizontal, WrapModeTile, (GpLineGradient**)&horizbrush); + expect(Ok, stat); + + stat = GdipCreateLineBrushFromRect(&vertrect, 0xffff0000, 0xff0000ff, + LinearGradientModeVertical, WrapModeTile, (GpLineGradient**)&vertbrush); + expect(Ok, stat); + + stat = GdipCreateLineBrushFromRect(&blendrect, 0xffff0000, 0xff0000ff, + LinearGradientModeHorizontal, WrapModeTile, (GpLineGradient**)&blendbrush); + expect(Ok, stat); + + stat = GdipSetLineBlend((GpLineGradient*)blendbrush, blendfac, blendpos, 3); + expect(Ok, stat); + + stat = GdipCreateLineBrushFromRect(&presetrect, 0xffff0000, 0xff0000ff, + LinearGradientModeVertical, WrapModeTile, (GpLineGradient**)&presetbrush); + expect(Ok, stat); + + stat = GdipSetLinePresetBlend((GpLineGradient*)presetbrush, pblendcolor, pblendpos, 3); + expect(Ok, stat); + + stat = GdipFillRectangles(graphics, vertbrush, &vertrect, 1); + todo_wine expect(Ok, stat); + + stat = GdipFillRectangles(graphics, horizbrush, &horizrect, 1); + todo_wine expect(Ok, stat); + + stat = GdipFillRectangles(graphics, blendbrush, &blendrect, 1); + todo_wine expect(Ok, stat); + + stat = GdipFillRectangles(graphics, presetbrush, &presetrect, 1); + todo_wine expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + graphics = NULL; + expect(Ok, stat); + + check_metafile(metafile, lineargradient_records, "lineargradient metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "lineargradient.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, lineargradient_records, "lineargradient playback", + dst_points, &frame, UnitPixel); + + /* Verify horizontal gradient fill. */ + stat = GdipBitmapGetPixel(bitmap, 10, 10, &color); + expect(Ok, stat); + todo_wine expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 18, 10, &color); + expect(Ok, stat); + todo_wine expect(0xff990066, color); + + /* Verify vertical gradient fill. */ + stat = GdipBitmapGetPixel(bitmap, 50, 10, &color); + expect(Ok, stat); + todo_wine expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 18, &color); + expect(Ok, stat); + todo_wine expect(0xff990066, color); + + /* Verify custom blend gradient fill. */ + stat = GdipBitmapGetPixel(bitmap, 10, 50, &color); + expect(Ok, stat); + todo_wine expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 18, 50, &color); + expect(Ok, stat); + todo_wine expect(0xff4700b8, color); + + /* Verify preset color gradient fill. */ + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + todo_wine expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 60, &color); + expect(Ok, stat); + todo_wine expect(0xff00ff00, color); + + GdipDeleteBrush(vertbrush); + GdipDeleteBrush(horizbrush); + GdipDeleteBrush(blendbrush); + GdipDeleteBrush(presetbrush); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3322,6 +3467,7 @@ START_TEST(metafile) test_drawdriverstring(); test_unknownfontdecode(); test_fillregion(); + test_lineargradient(); GdiplusShutdown(gdiplusToken); } -- 2.28.0.rc1

2 7

[PATCH 1/4] winegstreamer: Preserve the frame rate when converting video formats.
by Zebediah Figura July 24, 2020

July 24, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 20de73c173d..a4371384e34 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1721,13 +1721,18 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, if (!strcmp(type, "video/x-raw") && index < ARRAY_SIZE(video_formats)) { - gint width, height; + gint width, height, fps_n, fps_d; GstVideoInfo info; gst_caps_unref(caps); gst_structure_get_int(structure, "width", &width); gst_structure_get_int(structure, "height", &height); gst_video_info_set_format(&info, video_formats[index], width, height); + if (gst_structure_get_fraction(structure, "framerate", &fps_n, &fps_d) && fps_n) + { + info.fps_n = fps_n; + info.fps_d = fps_d; + } if (!amt_from_gst_video_info(&info, mt)) return E_OUTOFMEMORY; return S_OK; -- 2.27.0

2 4

[PATCH] quartz/vmr9: Allow AdviseSurfaceAllocator() to be called multiple times.
by Zebediah Figura July 24, 2020

July 24, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47161 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 132 ++++++++++++++++++++++++++------------- dlls/quartz/vmr9.c | 21 ++++++- 2 files changed, 109 insertions(+), 44 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index d7065280de..c8b35c266d 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2776,28 +2776,40 @@ out: DestroyWindow(window); } -static IVMRSurfaceAllocator9 allocator_iface; -static IVMRImagePresenter9 presenter_iface; -static LONG allocator_refcount = 1; -static D3DFORMAT allocator_format; -static DWORD allocator_accept_flags; -static IDirect3DSurface9 *allocator_surfaces[5]; -static IVMRSurfaceAllocatorNotify9 *allocator_notify; -static unsigned int allocator_got_PresentImage, allocator_got_TerminateDevice; +struct presenter +{ + IVMRSurfaceAllocator9 IVMRSurfaceAllocator9_iface; + IVMRImagePresenter9 IVMRImagePresenter9_iface; + LONG refcount; + + D3DFORMAT format; + DWORD accept_flags; + IDirect3DSurface9 *surfaces[5]; + IVMRSurfaceAllocatorNotify9 *notify; + unsigned int got_PresentImage, got_TerminateDevice; +}; + +static struct presenter *impl_from_IVMRImagePresenter9(IVMRImagePresenter9 *iface) +{ + return CONTAINING_RECORD(iface, struct presenter, IVMRImagePresenter9_iface); +} static HRESULT WINAPI presenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID iid, void **out) { - return IVMRSurfaceAllocator9_QueryInterface(&allocator_iface, iid, out); + struct presenter *presenter = impl_from_IVMRImagePresenter9(iface); + return IVMRSurfaceAllocator9_QueryInterface(&presenter->IVMRSurfaceAllocator9_iface, iid, out); } static ULONG WINAPI presenter_AddRef(IVMRImagePresenter9 *iface) { - return IVMRSurfaceAllocator9_AddRef(&allocator_iface); + struct presenter *presenter = impl_from_IVMRImagePresenter9(iface); + return IVMRSurfaceAllocator9_AddRef(&presenter->IVMRSurfaceAllocator9_iface); } static ULONG WINAPI presenter_Release(IVMRImagePresenter9 *iface) { - return IVMRSurfaceAllocator9_Release(&allocator_iface); + struct presenter *presenter = impl_from_IVMRImagePresenter9(iface); + return IVMRSurfaceAllocator9_Release(&presenter->IVMRSurfaceAllocator9_iface); } static HRESULT WINAPI presenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR cookie) @@ -2816,7 +2828,9 @@ static HRESULT WINAPI presenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD static HRESULT WINAPI presenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR cookie, VMR9PresentationInfo *info) { + struct presenter *presenter = impl_from_IVMRImagePresenter9(iface); static const RECT rect; + if (winetest_debug > 1) trace("PresentImage()\n"); ok(cookie == 0xabacab, "Got cookie %#lx.\n", cookie); todo_wine ok(info->dwFlags == VMR9Sample_TimeValid, "Got flags %#x.\n", info->dwFlags); @@ -2829,7 +2843,7 @@ static HRESULT WINAPI presenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_P ok(!info->dwReserved1, "Got dwReserved1 %#x.\n", info->dwReserved1); ok(!info->dwReserved2, "Got dwReserved2 %#x.\n", info->dwReserved2); - ++allocator_got_PresentImage; + ++presenter->got_PresentImage; return S_OK; } @@ -2843,14 +2857,21 @@ static const IVMRImagePresenter9Vtbl presenter_vtbl = presenter_PresentImage, }; +static struct presenter *impl_from_IVMRSurfaceAllocator9(IVMRSurfaceAllocator9 *iface) +{ + return CONTAINING_RECORD(iface, struct presenter, IVMRSurfaceAllocator9_iface); +} + static HRESULT WINAPI allocator_QueryInterface(IVMRSurfaceAllocator9 *iface, REFIID iid, void **out) { + struct presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); if (IsEqualGUID(iid, &IID_IVMRImagePresenter9)) { - *out = &presenter_iface; - IVMRImagePresenter9_AddRef(&presenter_iface); + *out = &presenter->IVMRImagePresenter9_iface; + IVMRImagePresenter9_AddRef(&presenter->IVMRImagePresenter9_iface); return S_OK; } ok(!IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorEx9), "Unexpected query for IVMRSurfaceAllocatorEx9.\n"); @@ -2860,17 +2881,21 @@ static HRESULT WINAPI allocator_QueryInterface(IVMRSurfaceAllocator9 *iface, REF static ULONG WINAPI allocator_AddRef(IVMRSurfaceAllocator9 *iface) { - return InterlockedIncrement(&allocator_refcount); + struct presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + return InterlockedIncrement(&presenter->refcount); } static ULONG WINAPI allocator_Release(IVMRSurfaceAllocator9 *iface) { - return InterlockedDecrement(&allocator_refcount); + struct presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + return InterlockedDecrement(&presenter->refcount); } static HRESULT WINAPI allocator_InitializeDevice(IVMRSurfaceAllocator9 *iface, DWORD_PTR cookie, VMR9AllocationInfo *info, DWORD *buffer_count) { + struct presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + if (winetest_debug > 1) trace("InitializeDevice(flags %#x, format %u)\n", info->dwFlags, info->Format); ok(cookie == 0xabacab, "Got cookie %#lx.\n", cookie); @@ -2884,33 +2909,37 @@ static HRESULT WINAPI allocator_InitializeDevice(IVMRSurfaceAllocator9 *iface, ok(info->szNativeSize.cy == 16, "Got native height %d.\n", info->szNativeSize.cy); todo_wine ok(*buffer_count == 5, "Got buffer count %u.\n", *buffer_count); - allocator_format = info->Format; + presenter->format = info->Format; - if (info->dwFlags != allocator_accept_flags) + if (info->dwFlags != presenter->accept_flags) return 0xdeadbeef; - return IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(allocator_notify, - info, buffer_count, allocator_surfaces); + return IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(presenter->notify, + info, buffer_count, presenter->surfaces); } static HRESULT WINAPI allocator_TerminateDevice(IVMRSurfaceAllocator9 *iface, DWORD_PTR cookie) { + struct presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + if (winetest_debug > 1) trace("TerminateDevice()\n"); ok(cookie == 0xabacab, "Got cookie %#lx.\n", cookie); /* Don't dereference the surfaces here, to mimic How to Survive. */ - ++allocator_got_TerminateDevice; + ++presenter->got_TerminateDevice; return E_NOTIMPL; } static HRESULT WINAPI allocator_GetSurface(IVMRSurfaceAllocator9 *iface, DWORD_PTR cookie, DWORD index, DWORD flags, IDirect3DSurface9 **surface) { + struct presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + if (winetest_debug > 1) trace("GetSurface(index %u)\n", index); ok(cookie == 0xabacab, "Got cookie %#lx.\n", cookie); ok(!flags, "Got flags %#x.\n", flags); ok(index < 5, "Got index %u.\n", index); /* Don't reference the surface here, to mimic How to Survive. */ - *surface = allocator_surfaces[index]; + *surface = presenter->surfaces[index]; return S_OK; } @@ -2931,10 +2960,8 @@ static const IVMRSurfaceAllocator9Vtbl allocator_vtbl = allocator_AdviseNotify, }; -static IVMRSurfaceAllocator9 allocator_iface = {&allocator_vtbl}; -static IVMRImagePresenter9 presenter_iface = {&presenter_vtbl}; - -static void test_renderless_present(IFilterGraph2 *graph, IMemInputPin *input) +static void test_renderless_present(struct presenter *presenter, + IFilterGraph2 *graph, IMemInputPin *input) { IMediaControl *control; OAFilterState state; @@ -2943,7 +2970,7 @@ static void test_renderless_present(IFilterGraph2 *graph, IMemInputPin *input) IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - allocator_got_PresentImage = 0; + presenter->got_PresentImage = 0; hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -2954,13 +2981,13 @@ static void test_renderless_present(IFilterGraph2 *graph, IMemInputPin *input) * IMediaControl::Run() from a stopped state and expects that * IMediaControl::GetState() returns S_OK only after PresentImage() has * been called. */ - ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); + ok(presenter->got_PresentImage == 1, "Got %u calls to PresentImage().\n", presenter->got_PresentImage); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); + ok(presenter->got_PresentImage == 1, "Got %u calls to PresentImage().\n", presenter->got_PresentImage); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2986,6 +3013,13 @@ static void test_renderless_formats(void) .pbFormat = (BYTE *)&vih, }; ALLOCATOR_PROPERTIES req_props = {5, 32 * 16 * 4, 1, 0}, ret_props; + struct presenter presenter = + { + .IVMRSurfaceAllocator9_iface.lpVtbl = &allocator_vtbl, + .IVMRImagePresenter9_iface.lpVtbl = &presenter_vtbl, + .refcount = 1, + }; + struct presenter presenter2 = presenter; IVMRSurfaceAllocatorNotify9 *notify; RECT rect = {0, 0, 640, 480}; struct testfilter source; @@ -3047,10 +3081,11 @@ static void test_renderless_formats(void) } ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, &allocator_iface); + hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, + &presenter.IVMRSurfaceAllocator9_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - allocator_notify = notify; + presenter.notify = notify; testfilter_init(&source); graph = create_graph(); @@ -3062,7 +3097,7 @@ static void test_renderless_formats(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { req_mt.subtype = *tests[i].subtype; - allocator_accept_flags = tests[i].flags; + presenter.accept_flags = tests[i].flags; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); /* Connection never fails on Native, but Wine currently creates D3D @@ -3100,10 +3135,14 @@ static void test_renderless_formats(void) hr = IMemAllocator_Commit(allocator); ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); - ok(allocator_format == tests[i].format, "Test %u: Got format %u (%#x).\n", - i, allocator_format, allocator_format); + hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, + &presenter2.IVMRSurfaceAllocator9_iface); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ok(presenter.format == tests[i].format, "Test %u: Got format %u (%#x).\n", + i, presenter.format, presenter.format); - test_renderless_present(graph, input); + test_renderless_present(&presenter, graph, input); hr = IMemAllocator_Decommit(allocator); ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); @@ -3115,6 +3154,9 @@ static void test_renderless_formats(void) ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); } + hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, &presenter2.IVMRSurfaceAllocator9_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); IMemInputPin_Release(input); @@ -3124,7 +3166,8 @@ out: IVMRSurfaceAllocatorNotify9_Release(notify); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); - ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); + ok(presenter.refcount == 1, "Got outstanding refcount %d.\n", presenter.refcount); + ok(presenter2.refcount == 1, "Got outstanding refcount %d.\n", presenter2.refcount); ref = IDirect3DDevice9_Release(device); ok(!ref, "Got outstanding refcount %d.\n", ref); DestroyWindow(window); @@ -3279,25 +3322,30 @@ static void test_clipping_window(void) static void test_surface_allocator_notify_refcount(void) { + struct presenter presenter = + { + .IVMRSurfaceAllocator9_iface.lpVtbl = &allocator_vtbl, + .IVMRImagePresenter9_iface.lpVtbl = &presenter_vtbl, + .refcount = 1, + }; IBaseFilter *filter = create_vmr9(VMR9Mode_Renderless); IVMRSurfaceAllocatorNotify9 *notify; HRESULT hr; ULONG ref; - allocator_got_TerminateDevice = 0; - set_mixing_mode(filter, 2); IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); - hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, &allocator_iface); + hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, + &presenter.IVMRSurfaceAllocator9_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); - ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", - allocator_got_TerminateDevice); - ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); + ok(presenter.got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", + presenter.got_TerminateDevice); + ok(presenter.refcount == 1, "Got outstanding refcount %d.\n", presenter.refcount); ref = IVMRSurfaceAllocatorNotify9_Release(notify); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5557a98b29..3b42dd0ed5 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1985,20 +1985,37 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator( IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR cookie, IVMRSurfaceAllocator9 *allocator) { struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); + IVMRImagePresenter9 *presenter; TRACE("filter %p, cookie %#Ix, allocator %p.\n", filter, cookie, allocator); + EnterCriticalSection(&filter->renderer.filter.csFilter); + filter->cookie = cookie; - if (filter->presenter) + if (filter->renderer.sink.pin.peer) + { + LeaveCriticalSection(&filter->renderer.filter.csFilter); + WARN("Attempt to set allocator while connected; returning VFW_E_WRONG_STATE.\n"); return VFW_E_WRONG_STATE; + } - if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&filter->presenter))) + if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&presenter))) + { + LeaveCriticalSection(&filter->renderer.filter.csFilter); return E_NOINTERFACE; + } + if (filter->allocator) + { + IVMRImagePresenter9_Release(filter->presenter); + IVMRSurfaceAllocator9_Release(filter->allocator); + } filter->allocator = allocator; + filter->presenter = presenter; IVMRSurfaceAllocator9_AddRef(allocator); + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; } -- 2.27.0

1 0