- Wine-Devel - list.winehq.org

[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

[PATCH] winevulkan: Update Vulkan XML URL to use raw.githubusercontent.com.
by Brendan Shanks July 23, 2020

July 23, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Files are served from raw.githubusercontent.com, and raw.github.com is a redirect: https://developer.github.com/changes/2014-04-25-user-content-security/ dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index dd86016117b..71b56fcf54d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3115,7 +3115,7 @@ def set_working_directory(): os.chdir(path) def download_vk_xml(filename): - url = "https://raw.github.com/KhronosGroup/Vulkan-Docs/v{0}/xml/vk.xml".format(VK_XML_VERSION) + url = "https://raw.githubusercontent.com/KhronosGroup/Vulkan-Docs/v{0}/xml/vk.xml".format(VK_XML_VERSION) if not os.path.isfile(filename): urllib.request.urlretrieve(url, filename) -- 2.26.2

1 0

[PATCH] jscript: Fix `this` within IDispatchEx::InvokeEx.
by Jacek Caban July 23, 2020

July 23, 2020

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Latent bug revealed by 614ea7e6243ead003bcfe4624895154972f3445f; Now that cross-context calls go through disp_call* instead of jsdisp_call*, and thus through InvokeEx, the `this` pointer is lost when calling methods inherited from a prototype. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Back to Kevin's version, sorry for messing this. dlls/jscript/dispex.c | 8 ++-- dlls/jscript/tests/run.c | 89 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-)

1 0

[PATCH] jscript: Fix `this` within IDispatchEx::InvokeEx
by Jacek Caban July 23, 2020

July 23, 2020

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Latent bug revealed by 614ea7e6243ead003bcfe4624895154972f3445f; Now that cross-context calls go through disp_call* instead of jsdisp_call*, and thus through InvokeEx, the `this` pointer is lost when calling methods inherited from a prototype. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 8 ++-- dlls/jscript/tests/run.c | 89 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 92 insertions(+), 5 deletions(-)

2 1

[PATCH] vbscript: implement case insensitive comparison functionality in InStr
by Dmitry Kislyuk July 23, 2020

July 23, 2020

3 2

[PATCH] winemac.drv: Fix warnings for constants deprecated by macOS 10.12.
by Brendan Shanks July 23, 2020

July 23, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 74 +++++++++++++++------- dlls/winemac.drv/cocoa_event.m | 15 ++++- dlls/winemac.drv/cocoa_opengl.m | 6 +- dlls/winemac.drv/cocoa_status_item.m | 13 +++- dlls/winemac.drv/cocoa_window.m | 91 ++++++++++++++++------------ 5 files changed, 133 insertions(+), 66 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8e66721da11..f2059132a82 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -25,6 +25,30 @@ #import "cocoa_event.h" #import "cocoa_window.h" +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ +#define NSEventMaskAny NSAnyEventMask +#define NSEventModifierFlagCommand NSCommandKeyMask +#define NSEventModifierFlagControl NSControlKeyMask +#define NSEventModifierFlagOption NSAlternateKeyMask +#define NSEventTypeAppKitDefined NSAppKitDefined +#define NSEventTypeFlagsChanged NSFlagsChanged +#define NSEventTypeKeyDown NSKeyDown +#define NSEventTypeKeyUp NSKeyUp +#define NSEventTypeLeftMouseDown NSLeftMouseDown +#define NSEventTypeLeftMouseDragged NSLeftMouseDragged +#define NSEventTypeLeftMouseUp NSLeftMouseUp +#define NSEventTypeMouseMoved NSMouseMoved +#define NSEventTypeOtherMouseDown NSOtherMouseDown +#define NSEventTypeOtherMouseDragged NSOtherMouseDragged +#define NSEventTypeOtherMouseUp NSOtherMouseUp +#define NSEventTypeRightMouseDown NSRightMouseDown +#define NSEventTypeRightMouseUp NSRightMouseUp +#define NSEventTypeRightMouseDragged NSRightMouseDragged +#define NSEventTypeScrollWheel NSScrollWheel +#define NSWindowStyleMaskResizable NSResizableWindowMask +#define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask +#endif static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponseMode"; @@ -258,7 +282,7 @@ - (void) transformProcessToForeground item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_HIDE_OTHERS) action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption]; item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_SHOW_ALL) action:@selector(unhideAllApplications:) @@ -271,7 +295,7 @@ - (void) transformProcessToForeground else title = WineLocalizedString(STRING_MENU_ITEM_QUIT); item = [submenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption]; item = [[[NSMenuItem alloc] init] autorelease]; [item setTitle:WineLocalizedString(STRING_MENU_WINE)]; [item setSubmenu:submenu]; @@ -290,7 +314,9 @@ - (void) transformProcessToForeground item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) action:@selector(toggleFullScreen:) keyEquivalent:@"f"]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask | NSControlKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | + NSEventModifierFlagOption | + NSEventModifierFlagControl]; } [submenu addItem:[NSMenuItem separatorItem]]; [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_BRING_ALL_TO_FRONT) @@ -317,7 +343,7 @@ - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(B if (processEvents) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask + NSEvent* event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:timeout inMode:NSDefaultRunLoopMode dequeue:YES]; @@ -1607,7 +1633,7 @@ - (void) handleWindowDrag:(NSEvent*)anEvent begin:(BOOL)begin - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; - BOOL drag = [anEvent type] != NSMouseMoved; + BOOL drag = [anEvent type] != NSEventTypeMouseMoved; if ([windowsBeingDragged count]) targetWindow = nil; @@ -1758,11 +1784,11 @@ - (void) handleMouseButton:(NSEvent*)theEvent WineWindow* windowBroughtForward = nil; BOOL process = FALSE; - if (type == NSLeftMouseUp && [windowsBeingDragged count]) + if (type == NSEventTypeLeftMouseUp && [windowsBeingDragged count]) [self handleWindowDrag:theEvent begin:NO]; if ([window isKindOfClass:[WineWindow class]] && - type == NSLeftMouseDown && + type == NSEventTypeLeftMouseDown && ![theEvent wine_commandKeyDown]) { NSWindowButton windowButton; @@ -1795,7 +1821,9 @@ - (void) handleMouseButton:(NSEvent*)theEvent if ([window isKindOfClass:[WineWindow class]]) { - BOOL pressed = (type == NSLeftMouseDown || type == NSRightMouseDown || type == NSOtherMouseDown); + BOOL pressed = (type == NSEventTypeLeftMouseDown || + type == NSEventTypeRightMouseDown || + type == NSEventTypeOtherMouseDown); CGPoint pt = CGEventGetLocation([theEvent CGEvent]); if (clippingCursor) @@ -1811,7 +1839,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; process = NSMouseInRect(nspoint, contentRect, NO); - if (process && [window styleMask] & NSResizableWindowMask) + if (process && [window styleMask] & NSWindowStyleMaskResizable) { // Ignore clicks in the grow box (resize widget). HIPoint origin = { 0, 0 }; @@ -1821,7 +1849,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent info.kind = kHIThemeGrowBoxKindNormal; info.direction = kThemeGrowRight | kThemeGrowDown; - if ([window styleMask] & NSUtilityWindowMask) + if ([window styleMask] & NSWindowStyleMaskUtilityWindow) info.size = kHIThemeGrowBoxSizeSmall; else info.size = kHIThemeGrowBoxSizeNormal; @@ -2063,27 +2091,27 @@ - (BOOL) handleEvent:(NSEvent*)anEvent BOOL ret = FALSE; NSEventType type = [anEvent type]; - if (type == NSFlagsChanged) + if (type == NSEventTypeFlagsChanged) self.lastFlagsChanged = anEvent; - else if (type == NSMouseMoved || type == NSLeftMouseDragged || - type == NSRightMouseDragged || type == NSOtherMouseDragged) + else if (type == NSEventTypeMouseMoved || type == NSEventTypeLeftMouseDragged || + type == NSEventTypeRightMouseDragged || type == NSEventTypeOtherMouseDragged) { [self handleMouseMove:anEvent]; ret = mouseCaptureWindow && ![windowsBeingDragged count]; } - else if (type == NSLeftMouseDown || type == NSLeftMouseUp || - type == NSRightMouseDown || type == NSRightMouseUp || - type == NSOtherMouseDown || type == NSOtherMouseUp) + else if (type == NSEventTypeLeftMouseDown || type == NSEventTypeLeftMouseUp || + type == NSEventTypeRightMouseDown || type == NSEventTypeRightMouseUp || + type == NSEventTypeOtherMouseDown || type == NSEventTypeOtherMouseUp) { [self handleMouseButton:anEvent]; ret = mouseCaptureWindow && ![windowsBeingDragged count]; } - else if (type == NSScrollWheel) + else if (type == NSEventTypeScrollWheel) { [self handleScrollWheel:anEvent]; ret = mouseCaptureWindow != nil; } - else if (type == NSKeyDown) + else if (type == NSEventTypeKeyDown) { // -[NSApplication sendEvent:] seems to consume presses of the Help // key (Insert key on PC keyboards), so we have to bypass it and @@ -2094,7 +2122,7 @@ - (BOOL) handleEvent:(NSEvent*)anEvent ret = TRUE; } } - else if (type == NSKeyUp) + else if (type == NSEventTypeKeyUp) { uint16_t keyCode = [anEvent keyCode]; if ([self isKeyPressed:keyCode]) @@ -2105,7 +2133,7 @@ - (BOOL) handleEvent:(NSEvent*)anEvent [window postKeyEvent:anEvent]; } } - else if (type == NSAppKitDefined) + else if (type == NSEventTypeAppKitDefined) { short subtype = [anEvent subtype]; @@ -2123,11 +2151,11 @@ - (void) didSendEvent:(NSEvent*)anEvent { NSEventType type = [anEvent type]; - if (type == NSKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) + if (type == NSEventTypeKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) { NSUInteger modifiers = [anEvent modifierFlags]; - if ((modifiers & NSCommandKeyMask) && - !(modifiers & (NSControlKeyMask | NSAlternateKeyMask))) + if ((modifiers & NSEventModifierFlagCommand) && + !(modifiers & (NSEventModifierFlagControl | NSEventModifierFlagOption))) { // Command-Tab and Command-Shift-Tab would normally be intercepted // by the system to switch applications. If we're seeing it, it's diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 40066ffda5e..163261e1d16 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -29,6 +29,14 @@ #import "cocoa_app.h" #import "cocoa_window.h" +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ +#define NSEventModifierFlagCommand NSCommandKeyMask +#define NSEventModifierFlagControl NSControlKeyMask +#define NSEventModifierFlagOption NSAlternateKeyMask +#define NSEventModifierFlagShift NSShiftKeyMask +#define NSEventTypeApplicationDefined NSApplicationDefined +#endif static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThreadDictionaryKey"; @@ -44,7 +52,10 @@ @implementation NSEvent (WineExtensions) static BOOL wine_commandKeyDown(NSUInteger flags) { - return ((flags & (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)) == NSCommandKeyMask); + return ((flags & (NSEventModifierFlagShift | + NSEventModifierFlagControl | + NSEventModifierFlagOption | + NSEventModifierFlagCommand)) == NSEventModifierFlagCommand); } + (BOOL) wine_commandKeyDown @@ -754,7 +765,7 @@ void macdrv_set_query_done(macdrv_query *query) query->done = TRUE; macdrv_release_query(query); - event = [NSEvent otherEventWithType:NSApplicationDefined + event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined location:NSZeroPoint modifierFlags:0 timestamp:[[NSProcessInfo processInfo] systemUptime] diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 96e27b76e5d..eef4d16fcc8 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -25,6 +25,10 @@ #include "macdrv_cocoa.h" #include "cocoa_event.h" +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ +#define NSWindowStyleMaskBorderless NSBorderlessWindowMask +#endif @interface WineOpenGLContext () @property (retain, nonatomic) NSView* latentView; @@ -53,7 +57,7 @@ + (NSView*) dummyView dispatch_once(&once, ^{ OnMainThread(^{ dummyWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) - styleMask:NSBorderlessWindowMask + styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]; }); diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 23d78059585..5b36a25038b 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -23,6 +23,13 @@ #import "cocoa_app.h" #import "cocoa_event.h" +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ +#define NSCompositingOperationSourceOver NSCompositeSourceOver +#define NSEventMaskLeftMouseDown NSLeftMouseDownMask +#define NSEventMaskOtherMouseDown NSOtherMouseDownMask +#define NSEventMaskRightMouseDown NSRightMouseDownMask +#endif @interface WineStatusItem : NSView { @@ -117,7 +124,9 @@ - (void) postMouseButtonEvent:(NSEvent*)nsevent; event = macdrv_create_event(STATUS_ITEM_MOUSE_BUTTON, nil); event->status_item_mouse_button.item = (macdrv_status_item)self; event->status_item_mouse_button.button = [nsevent buttonNumber]; - event->status_item_mouse_button.down = (typeMask & (NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask)) != 0; + event->status_item_mouse_button.down = (typeMask & (NSEventMaskLeftMouseDown | + NSEventMaskRightMouseDown | + NSEventMaskOtherMouseDown)) != 0; event->status_item_mouse_button.count = [nsevent clickCount]; event->status_item_mouse_button.x = floor(point.x); event->status_item_mouse_button.y = floor(point.y); @@ -147,7 +156,7 @@ - (void) drawRect:(NSRect)rect [image drawAtPoint:imageOrigin fromRect:NSZeroRect - operation:NSCompositeSourceOver + operation:NSCompositingOperationSourceOver fraction:1]; } } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9c2ffb1623d..4fc1bd9bbe3 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -35,13 +35,28 @@ #import "cocoa_event.h" #import "cocoa_opengl.h" +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ +#define NSCompositingOperationSourceOver NSCompositeSourceOver +#define NSEventTypeKeyDown NSKeyDown +#define NSEventTypeLeftMouseDown NSLeftMouseDown +#define NSEventTypeLeftMouseDragged NSLeftMouseDragged +#define NSEventTypeLeftMouseUp NSLeftMouseUp +#define NSWindowStyleMaskBorderless NSBorderlessWindowMask +#define NSWindowStyleMaskClosable NSClosableWindowMask +#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask +#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask +#define NSWindowStyleMaskResizable NSResizableWindowMask +#define NSWindowStyleMaskTitled NSTitledWindowMask +#define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask +#endif #if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 enum { NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7, NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8, NSWindowFullScreenButton = 7, - NSFullScreenWindowMask = 1 << 14, + NSWindowStyleMaskFullScreen = 1 << 14, }; @interface NSWindow (WineFullScreenExtensions) @@ -64,13 +79,13 @@ static NSUInteger style_mask_for_features(const struct macdrv_window_features* w if (wf->title_bar) { - style_mask = NSTitledWindowMask; - if (wf->close_button) style_mask |= NSClosableWindowMask; - if (wf->minimize_button) style_mask |= NSMiniaturizableWindowMask; - if (wf->resizable || wf->maximize_button) style_mask |= NSResizableWindowMask; - if (wf->utility) style_mask |= NSUtilityWindowMask; + style_mask = NSWindowStyleMaskTitled; + if (wf->close_button) style_mask |= NSWindowStyleMaskClosable; + if (wf->minimize_button) style_mask |= NSWindowStyleMaskMiniaturizable; + if (wf->resizable || wf->maximize_button) style_mask |= NSWindowStyleMaskResizable; + if (wf->utility) style_mask |= NSWindowStyleMaskUtilityWindow; } - else style_mask = NSBorderlessWindowMask; + else style_mask = NSWindowStyleMaskBorderless; return style_mask; } @@ -1058,7 +1073,7 @@ - (void) dealloc - (BOOL) preventResizing { BOOL preventForClipping = cursor_clipping_locks_windows && [[WineApplicationController sharedController] clippingCursor]; - return ([self styleMask] & NSResizableWindowMask) && (disabled || !resizable || preventForClipping); + return ([self styleMask] & NSWindowStyleMaskResizable) && (disabled || !resizable || preventForClipping); } - (BOOL) allowsMovingWithMaximized:(BOOL)inMaximized @@ -1075,11 +1090,11 @@ - (void) adjustFeaturesForState { NSUInteger style = [self styleMask]; - if (style & NSClosableWindowMask) + if (style & NSWindowStyleMaskClosable) [[self standardWindowButton:NSWindowCloseButton] setEnabled:!self.disabled]; - if (style & NSMiniaturizableWindowMask) + if (style & NSWindowStyleMaskMiniaturizable) [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; - if (style & NSResizableWindowMask) + if (style & NSWindowStyleMaskResizable) [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; if ([self respondsToSelector:@selector(toggleFullScreen:)]) { @@ -1110,7 +1125,7 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior NSUInteger style = [self styleMask]; if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSResizableWindowMask && !(style & NSUtilityWindowMask) && !maximized && + style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && !(self.parentWindow || self.latentParentWindow)) { behavior |= NSWindowCollectionBehaviorFullScreenPrimary; @@ -1120,7 +1135,7 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior { behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; - if (style & NSFullScreenWindowMask) + if (style & NSWindowStyleMaskFullScreen) [super toggleFullScreen:nil]; } } @@ -1134,24 +1149,24 @@ - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { - static const NSUInteger usedStyles = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | - NSResizableWindowMask | NSUtilityWindowMask | NSBorderlessWindowMask; + static const NSUInteger usedStyles = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | + NSWindowStyleMaskResizable | NSWindowStyleMaskUtilityWindow | NSWindowStyleMaskBorderless; NSUInteger currentStyle = [self styleMask]; NSUInteger newStyle = style_mask_for_features(wf) | (currentStyle & ~usedStyles); if (newStyle != currentStyle) { NSString* title = [[[self title] copy] autorelease]; - BOOL showingButtons = (currentStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; - BOOL shouldShowButtons = (newStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; - if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSClosableWindowMask)) + BOOL showingButtons = (currentStyle & (NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable)) != 0; + BOOL shouldShowButtons = (newStyle & (NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable)) != 0; + if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSWindowStyleMaskClosable)) { - // -setStyleMask: is buggy on 10.7+ with respect to NSResizableWindowMask. - // If transitioning from NSTitledWindowMask | NSResizableWindowMask to - // just NSTitledWindowMask, the window buttons should disappear rather + // -setStyleMask: is buggy on 10.7+ with respect to NSWindowStyleMaskResizable. + // If transitioning from NSWindowStyleMaskTitled | NSWindowStyleMaskResizable to + // just NSWindowStyleMaskTitled, the window buttons should disappear rather // than just being disabled. But they don't. Similarly in reverse. - // The workaround is to also toggle NSClosableWindowMask at the same time. - [self setStyleMask:newStyle ^ NSClosableWindowMask]; + // The workaround is to also toggle NSWindowStyleMaskClosable at the same time. + [self setStyleMask:newStyle ^ NSWindowStyleMaskClosable]; } [self setStyleMask:newStyle]; @@ -1283,14 +1298,14 @@ - (void) setMacDrvState:(const struct macdrv_window_state*)state { if ([self wouldBeVisible]) { - if ([self styleMask] & NSFullScreenWindowMask) + if ([self styleMask] & NSWindowStyleMaskFullScreen) { [self postDidUnminimizeEvent]; discard &= ~event_mask_for_type(WINDOW_DID_UNMINIMIZE); } else { - [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; + [self setStyleMask:([self styleMask] | NSWindowStyleMaskMiniaturizable)]; [super miniaturize:nil]; discard |= event_mask_for_type(WINDOW_BROUGHT_FORWARD) | event_mask_for_type(WINDOW_GOT_FOCUS) | @@ -1765,7 +1780,7 @@ - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)a if (pendingMinimize) { - [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; + [self setStyleMask:([self styleMask] | NSWindowStyleMaskMiniaturizable)]; [super miniaturize:nil]; pendingMinimize = FALSE; } @@ -1814,7 +1829,7 @@ - (void) doOrderOut [parent grabDockIconSnapshotFromWindow:self force:NO]; [self becameIneligibleParentOrChild]; - if ([self isMiniaturized] || [self styleMask] & NSFullScreenWindowMask) + if ([self isMiniaturized] || [self styleMask] & NSWindowStyleMaskFullScreen) { fakingClose = TRUE; [self close]; @@ -1844,7 +1859,7 @@ - (void) doOrderOut - (void) updateFullscreen { NSRect contentRect = [self contentRectForFrameRect:self.wine_fractionalFrame]; - BOOL nowFullscreen = !([self styleMask] & NSFullScreenWindowMask) && screen_covered_by_rect(contentRect, [NSScreen screens]); + BOOL nowFullscreen = !([self styleMask] & NSWindowStyleMaskFullScreen) && screen_covered_by_rect(contentRect, [NSScreen screens]); if (nowFullscreen != fullscreen) { @@ -2077,7 +2092,7 @@ - (void) postKeyEvent:(NSEvent *)theEvent { [self flagsChanged:theEvent]; [self postKey:[theEvent keyCode] - pressed:[theEvent type] == NSKeyDown + pressed:[theEvent type] == NSEventTypeKeyDown modifiers:adjusted_modifiers_for_settings([theEvent modifierFlags]) event:theEvent]; } @@ -2120,9 +2135,9 @@ - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resi NSUInteger style = self.styleMask; if (isFullscreen) - style |= NSFullScreenWindowMask; + style |= NSWindowStyleMaskFullScreen; else - style &= ~NSFullScreenWindowMask; + style &= ~NSWindowStyleMaskFullScreen; frame = [[self class] contentRectForFrameRect:frame styleMask:style]; [[WineApplicationController sharedController] flipRect:&frame]; @@ -2302,7 +2317,7 @@ - (void) grabDockIconSnapshotFromWindow:(WineWindow*)window force:(BOOL)force CGContextDrawImage(cgcontext, rect, windowImage); [appImage drawInRect:NSMakeRect(156, 4, 96, 96) fromRect:NSZeroRect - operation:NSCompositeSourceOver + operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil]; @@ -2431,13 +2446,13 @@ - (void) sendEvent:(NSEvent*)event interface control. For example, Control-Tab switches focus among views. We want to bypass that feature, so directly route key-down events to -keyDown:. */ - if (type == NSKeyDown) + if (type == NSEventTypeKeyDown) [[self firstResponder] keyDown:event]; else { if (!draggingPhase && maximized && ![self isMovable] && ![self allowsMovingWithMaximized:YES] && [self allowsMovingWithMaximized:NO] && - type == NSLeftMouseDown && (self.styleMask & NSTitledWindowMask)) + type == NSEventTypeLeftMouseDown && (self.styleMask & NSWindowStyleMaskTitled)) { NSRect titleBar = self.frame; NSRect contentRect = [self contentRectForFrameRect:titleBar]; @@ -2480,7 +2495,7 @@ - (void) sendEvent:(NSEvent*)event } } } - else if (draggingPhase && (type == NSLeftMouseDragged || type == NSLeftMouseUp)) + else if (draggingPhase && (type == NSEventTypeLeftMouseDragged || type == NSEventTypeLeftMouseUp)) { if ([self isMovable]) { @@ -2502,7 +2517,7 @@ - (void) sendEvent:(NSEvent*)event [self setFrameTopLeftPoint:newTopLeft]; } - else if (draggingPhase == 1 && type == NSLeftMouseDragged) + else if (draggingPhase == 1 && type == NSEventTypeLeftMouseDragged) { macdrv_event* event; NSRect frame = [self contentRectForFrameRect:self.frame]; @@ -2518,7 +2533,7 @@ - (void) sendEvent:(NSEvent*)event draggingPhase = 2; } - if (type == NSLeftMouseUp) + if (type == NSEventTypeLeftMouseUp) [self endWindowDragging]; } @@ -2919,7 +2934,7 @@ - (void)windowDidResize:(NSNotification *)notification } [self postWindowFrameChanged:frame - fullscreen:([self styleMask] & NSFullScreenWindowMask) != 0 + fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 resizing:[self inLiveResize]]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; -- 2.26.2

2 2

[PATCH 6/7] server: Remove no longer used write_console_output request.
by Jacek Caban July 23, 2020

July 23, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 8 +++++ server/console.c | 84 ------------------------------------------- server/protocol.def | 22 ------------ 3 files changed, 8 insertions(+), 106 deletions(-)

2 1