- Wine-Devel - list.winehq.org

[PATCH 1/4] gdiplus/tests: Add metafile playback test for EMR_RESTOREDC.
by Shawn M. Chapla June 30, 2020

June 30, 2020

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/gdiplus/tests/metafile.c | 123 ++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 3ffdb7b0e9..3788575309 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2832,6 +2832,128 @@ static void test_fillpath(void) expect(GenericError, stat); } +static const emfplus_record restoredc_records[] = { + { EMR_HEADER }, + { EMR_CREATEBRUSHINDIRECT }, + { EMR_SELECTOBJECT }, + + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + { EMR_SAVEDC }, + { EMR_SETVIEWPORTORGEX }, + + { EMR_RECTANGLE }, + + { EMR_RESTOREDC }, + { EMR_RECTANGLE }, + + { EMR_RESTOREDC }, + { EMR_RECTANGLE }, + + { EMR_SELECTOBJECT }, + { EMR_DELETEOBJECT }, + { EMR_EOF }, + { 0 } +}; + +static void test_restoredc(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 WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + + GpBitmap *bitmap; + GpGraphics *graphics; + GpMetafile *metafile; + GpStatus stat; + HDC hdc, metafile_dc; + HBRUSH hbrush, holdbrush; + ARGB color; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, + description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + hbrush = CreateSolidBrush(0xff0000); + holdbrush = SelectObject(metafile_dc, hbrush); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 20, 20, NULL); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 40, 40, NULL); + + SaveDC(metafile_dc); + SetViewportOrgEx(metafile_dc, 60, 60, NULL); + + Rectangle(metafile_dc, 0, 0, 3, 3); + RestoreDC(metafile_dc, -2); + + Rectangle(metafile_dc, 0, 0, 3, 3); + RestoreDC(metafile_dc, -1); + + Rectangle(metafile_dc, 0, 0, 3, 3); + + SelectObject(metafile_dc, holdbrush); + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, restoredc_records, "restoredc metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "restoredc.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, restoredc_records, "restoredc playback", dst_points, + &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 1, 1, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 21, 21, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 41, 41, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 61, 61, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2880,6 +3002,7 @@ START_TEST(metafile) test_properties(); test_drawpath(); test_fillpath(); + test_restoredc(); GdiplusShutdown(gdiplusToken); } -- 2.27.0

3 9

[PATCH] ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast.
by Jefferson Carpenter June 30, 2020

June 30, 2020

1 0

[PATCH 1/5] amstream: Fix sample refcounting in parent ddraw stream.
by Gijs Vermeulen June 30, 2020

June 30, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 56230ca4e6..ca9826b14a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -980,7 +980,6 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl; object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; - object->sample_refs = 0; InitializeCriticalSection(&object->cs); @@ -1043,12 +1042,11 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - EnterCriticalSection(&sample->parent->cs); - InterlockedDecrement(&sample->parent->sample_refs); - LeaveCriticalSection(&sample->parent->cs); - if (!ref) { + EnterCriticalSection(&sample->parent->cs); + sample->parent->sample_refs--; + LeaveCriticalSection(&sample->parent->cs); if (sample->surface) IDirectDrawSurface_Release(sample->surface); HeapFree(GetProcessHeap(), 0, sample); @@ -1166,7 +1164,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->parent = parent; EnterCriticalSection(&parent->cs); - InterlockedIncrement(&parent->sample_refs); + parent->sample_refs++; LeaveCriticalSection(&parent->cs); if (surface) -- 2.27.0

1 4

[PATCH resend] ntoskrnl.exe/tests: Fix some minor case issues in comments.
by Francois Gouget June 30, 2020

June 30, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- The patch failed to apply yesterday because it got mangled in the mail due to the non-ASCII characters. Putting it as an attachment should avoid that. dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] ntdll/unix: use Pc instead of Rip in signal_arm64
by Biswapriyo Nath June 30, 2020

June 30, 2020

1 0

[PATCH v7 1/9] msscript.ocx: Move IScriptControl::AddObject implementation into a helper.
by Gabriel Ivăncescu June 30, 2020

June 30, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 59 +++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index df63220..bc1811b 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -250,6 +250,40 @@ static HRESULT start_script(ScriptHost *host) return hr; } +static HRESULT add_script_object(ScriptHost *host, BSTR name, IDispatch *object, DWORD flags) +{ + struct named_item *item; + HRESULT hr; + + if (host_get_named_item(host, name)) + return E_INVALIDARG; + + item = heap_alloc(sizeof(*item)); + if (!item) + return E_OUTOFMEMORY; + + item->name = SysAllocString(name); + if (!item->name) + { + heap_free(item); + return E_OUTOFMEMORY; + } + IDispatch_AddRef(item->disp = object); + list_add_tail(&host->named_items, &item->entry); + + hr = IActiveScript_AddNamedItem(host->script, name, flags); + if (FAILED(hr)) + { + list_remove(&item->entry); + IDispatch_Release(item->disp); + SysFreeString(item->name); + heap_free(item); + return hr; + } + + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -1392,8 +1426,6 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, { ScriptControl *This = impl_from_IScriptControl(iface); DWORD flags = SCRIPTITEM_ISVISIBLE | SCRIPTITEM_ISSOURCE; - struct named_item *item; - HRESULT hr; TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(name), object, add_members); @@ -1403,30 +1435,9 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, if (!This->host) return E_FAIL; - if (host_get_named_item(This->host, name)) - return E_INVALIDARG; - - item = heap_alloc(sizeof(*item)); - if (!item) - return E_OUTOFMEMORY; - - item->name = SysAllocString(name); - IDispatch_AddRef(item->disp = object); - list_add_tail(&This->host->named_items, &item->entry); - if (add_members) flags |= SCRIPTITEM_GLOBALMEMBERS; - hr = IActiveScript_AddNamedItem(This->host->script, name, flags); - if (FAILED(hr)) { - list_remove(&item->entry); - IDispatch_Release(item->disp); - SysFreeString(item->name); - heap_free(item); - return hr; - } - - - return hr; + return add_script_object(This->host, name, object, flags); } static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) -- 2.21.0

2 18

[PATCH 8/8 v2] msi: Remove MSICOLUMNINFO.temporary field.
by Piotr Caban June 30, 2020

June 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)

2 1

[PATCH 7/8 v2] msi: Remove column_info.temporary field.
by Piotr Caban June 30, 2020

June 30, 2020

2 1

[PATCH 6/8 v2] msi: Fix adding temporary columns.
by Piotr Caban June 30, 2020

June 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/alter.c | 82 +--------------------------------- dlls/msi/msipriv.h | 2 +- dlls/msi/table.c | 105 ++++++++++++++++++++++++++++++++++---------- dlls/msi/tests/db.c | 10 ++++- 4 files changed, 95 insertions(+), 104 deletions(-)

2 1

[PATCH 5/8 v2] msi: Add table existance tests for tables with temporary columns.
by Piotr Caban June 30, 2020

June 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/db.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

4 3