September 2016 - Wine-commits

Józef Kucia : d3d11/tests: Run test_*() functions for each feature level separately.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 93ae9dd1d2bcb0c94c863be22ff1386877245588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ae9dd1d2bcb0c94c863be22… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 18 16:18:18 2016 +0200 d3d11/tests: Run test_*() functions for each feature level separately. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 711 +++++++++++++++++++++++------------------------ 1 file changed, 346 insertions(+), 365 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93ae9dd1d2bcb0c94c863…

1 0

Józef Kucia : d3d11/tests: Trace optional format support.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 5a6332231ec49ecf54ba35f2d0e4f3b1e5ba718a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6332231ec49ecf54ba35f2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 18 16:18:19 2016 +0200 d3d11/tests: Trace optional format support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 66ea202..ed4987e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10609,7 +10609,12 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE } if (formats[i].fl_optional && formats[i].fl_optional <= feature_level) + { + if (supported) + trace("Optional format %#x - %s supported, feature level %#x.\n", + format, feature_name, feature_level); continue; + } ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]);

1 0

Huw Davies : user32/tests: BITMAPCOREINFO icons are no longer supported on Win 8.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: b981d18a5581f44f4a1bde318dda66f72166e294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b981d18a5581f44f4a1bde318… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 19 12:38:49 2016 +0100 user32/tests: BITMAPCOREINFO icons are no longer supported on Win 8. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 4b79d46..61b32e0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2622,7 +2622,9 @@ static void test_monochrome_icon(void) CloseHandle(handle); handle = LoadImageA(NULL, "icon.ico", IMAGE_ICON, 0, 0, LR_LOADFROMFILE); - ok(handle != NULL, "LoadImage() failed with %u.\n", GetLastError()); + ok(handle != NULL || + broken(use_core_info && handle == NULL), /* Win 8, 10 */ + "LoadImage() failed with %u.\n", GetLastError()); if (handle == NULL) { skip("Icon failed to load: %s, %s\n",

1 0

Aric Stewart : ntoskrnl.exe: Implement DevicePropertyEnumeratorName for IoGetDeviceProperty.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 2abe5573526b8a05daea1136981cea844fc78c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abe5573526b8a05daea11369… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 19 15:13:58 2016 +0200 ntoskrnl.exe: Implement DevicePropertyEnumeratorName for IoGetDeviceProperty. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bc7ac86..93029a4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -94,6 +94,8 @@ struct wine_driver DRIVER_EXTENSION driver_extension; }; +static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ); + static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) { const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); @@ -1132,6 +1134,30 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP property_buffer, result_length ); switch (device_property) { + case DevicePropertyEnumeratorName: + { + WCHAR *id, *ptr; + + status = get_device_id( device, BusQueryInstanceID, &id ); + if (status != STATUS_SUCCESS) + { + ERR( "Failed to get device id\n" ); + break; + } + + struprW( id ); + ptr = strchrW( id, '\\' ); + if (ptr) *ptr = 0; + + *result_length = sizeof(WCHAR) * (strlenW(id) + 1); + if (buffer_length >= *result_length) + memcpy( property_buffer, id, *result_length ); + else + status = STATUS_BUFFER_TOO_SMALL; + + HeapFree( GetProcessHeap(), 0, id ); + break; + } case DevicePropertyPhysicalDeviceObjectName: { ULONG used_len, len = buffer_length + sizeof(OBJECT_NAME_INFORMATION);

1 0

Hadrien Boizard : ole32: Use debugstr_guid() in TRACES.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 5a9f7ef06df15e26acf46b0210dd7697356da7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9f7ef06df15e26acf46b021… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Thu Sep 15 23:15:59 2016 +0200 ole32: Use debugstr_guid() in TRACES. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 8 ++++---- dlls/ole32/classmoniker.c | 2 +- dlls/ole32/compositemoniker.c | 10 +++++----- dlls/ole32/itemmoniker.c | 2 +- dlls/ole32/moniker.c | 4 ++-- dlls/ole32/pointermoniker.c | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 83eb71b..a99b1b7 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -61,7 +61,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { AntiMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( ppvObject==0 ) @@ -229,7 +229,7 @@ static HRESULT WINAPI AntiMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) { - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); return E_NOTIMPL; } @@ -240,7 +240,7 @@ static HRESULT WINAPI AntiMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) { - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); return E_NOTIMPL; } @@ -495,7 +495,7 @@ AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObje { AntiMonikerImpl *This = impl_from_IROTData(iface); - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); return AntiMonikerImpl_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 877c3ec..22c76bf 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -65,7 +65,7 @@ static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker* iface,REFIID riid,vo { ClassMoniker *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if (!ppvObject) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 6c92771..579fe4c 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -87,7 +87,7 @@ CompositeMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject { CompositeMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( ppvObject==0 ) @@ -336,7 +336,7 @@ CompositeMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker *tempMk,*antiMk,*rightMostMk; IEnumMoniker *enumMoniker; - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); if (ppvResult==NULL) return E_POINTER; @@ -389,7 +389,7 @@ CompositeMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker *tempMk,*antiMk,*rightMostMk,*leftMk; IEnumMoniker *enumMoniker; - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); *ppvResult=0; @@ -1195,7 +1195,7 @@ CompositeMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid, { CompositeMonikerImpl *This = impl_from_IROTData(iface); - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); return CompositeMonikerImpl_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } @@ -1499,7 +1499,7 @@ EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( ppvObject==0 ) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index eaf76a3..67bef5f 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -775,7 +775,7 @@ static HRESULT WINAPI ItemMonikerROTDataImpl_QueryInterface(IROTData *iface,REFI ItemMonikerImpl *This = impl_from_IROTData(iface); - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); return ItemMonikerImpl_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 320a561..ffbaa61 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -326,7 +326,7 @@ RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface, { RunningObjectTableImpl *This = impl_from_IRunningObjectTable(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* validate arguments */ @@ -1314,7 +1314,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* validate arguments */ if (ppvObject == NULL) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 3589685..3737600 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -56,7 +56,7 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { PointerMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( (This==0) || (ppvObject==0) ) @@ -200,7 +200,7 @@ PointerMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToL { PointerMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); if (!This->pObject) return E_UNEXPECTED; @@ -217,7 +217,7 @@ PointerMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkTo { PointerMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); if (!This->pObject) return E_UNEXPECTED;

1 0

Vincent Povirk : gdiplus: Implement GdipBeginContainer.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: f5b14a7ab6695c7046cb01233f0abc0294d8b75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b14a7ab6695c7046cb01233… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 16 14:37:27 2016 -0500 gdiplus: Implement GdipBeginContainer. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 62 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 14b9db9..06a0c95 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5200,14 +5200,68 @@ GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics *graphics, GDIPCONST GpRectF *dstrect, GDIPCONST GpRectF *srcrect, GpUnit unit, GraphicsContainer *state) { - FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); - return NotImplemented; + GraphicsContainerItem *container; + GpMatrix transform; + GpStatus stat; + GpRectF scaled_srcrect; + REAL scale_x, scale_y; + + TRACE("(%p, %s, %s, %d, %p)\n", graphics, debugstr_rectf(dstrect), debugstr_rectf(srcrect), unit, state); + + if(!graphics || !dstrect || !srcrect || unit < UnitPixel || unit > UnitMillimeter || !state) + return InvalidParameter; + + stat = init_container(&container, graphics, BEGIN_CONTAINER); + if(stat != Ok) + return stat; + + list_add_head(&graphics->containers, &container->entry); + *state = graphics->contid = container->contid; + + scale_x = units_to_pixels(1.0, unit, graphics->xres); + scale_y = units_to_pixels(1.0, unit, graphics->yres); + + scaled_srcrect.X = scale_x * srcrect->X; + scaled_srcrect.Y = scale_y * srcrect->Y; + scaled_srcrect.Width = scale_x * srcrect->Width; + scaled_srcrect.Height = scale_y * srcrect->Height; + + transform.matrix[0] = dstrect->Width / scaled_srcrect.Width; + transform.matrix[1] = 0.0; + transform.matrix[2] = 0.0; + transform.matrix[3] = dstrect->Height / scaled_srcrect.Height; + transform.matrix[4] = dstrect->X - scaled_srcrect.X; + transform.matrix[5] = dstrect->Y - scaled_srcrect.Y; + + GdipMultiplyMatrix(&graphics->worldtrans, &transform, MatrixOrderPrepend); + + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + FIXME("Write to metafile\n"); + } + + return Ok; } GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics *graphics, GDIPCONST GpRect *dstrect, GDIPCONST GpRect *srcrect, GpUnit unit, GraphicsContainer *state) { - FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); - return NotImplemented; + GpRectF dstrectf, srcrectf; + + TRACE("(%p, %p, %p, %d, %p)\n", graphics, dstrect, srcrect, unit, state); + + if (!dstrect || !srcrect) + return InvalidParameter; + + dstrectf.X = dstrect->X; + dstrectf.Y = dstrect->Y; + dstrectf.Width = dstrect->Width; + dstrectf.Height = dstrect->Height; + + srcrectf.X = srcrect->X; + srcrectf.Y = srcrect->Y; + srcrectf.Width = srcrect->Width; + srcrectf.Height = srcrect->Height; + + return GdipBeginContainer(graphics, &dstrectf, &srcrectf, unit, state); } GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST BYTE *data)

1 0

Vincent Povirk : gdiplus/tests: Add tests for GdipBeginContainer.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 18964c9665164c958b7f63012408f519f7010a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=18964c9665164c958b7f63012… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 16 14:37:28 2016 -0500 gdiplus/tests: Add tests for GdipBeginContainer. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 173 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f747a2d..d86f49d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5897,6 +5897,178 @@ static void test_GdipGetVisibleClipBounds_memoryDC(void) ReleaseDC(hwnd, dc); } +static void test_container_rects(void) +{ + GpStatus status; + GpGraphics *graphics; + HDC hdc = GetDC( hwnd ); + GpRectF dstrect, srcrect; + GraphicsContainer state; + static const GpPointF test_points[3] = {{0.0,0.0}, {1.0,0.0}, {0.0,1.0}}; + GpPointF points[3]; + REAL dpix, dpiy; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + dstrect.X = 0.0; + dstrect.Y = 0.0; + dstrect.Width = 1.0; + dstrect.Height = 1.0; + srcrect = dstrect; + + status = GdipGetDpiX(graphics, &dpix); + expect(Ok, status); + + status = GdipGetDpiY(graphics, &dpiy); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitWorld, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitDisplay, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitMillimeter+1, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(NULL, &dstrect, &srcrect, UnitPixel, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, NULL, &srcrect, UnitPixel, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, NULL, UnitPixel, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, -1, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitPixel, NULL); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitPixel, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(0.0, points[0].X); + expectf(0.0, points[0].Y); + expectf(1.0, points[1].X); + expectf(0.0, points[1].Y); + expectf(0.0, points[2].X); + expectf(1.0, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitInch, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(0.0, points[0].X); + expectf(0.0, points[0].Y); + expectf(1.0/dpix, points[1].X); + expectf(0.0, points[1].Y); + expectf(0.0, points[2].X); + expectf(1.0/dpiy, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, status); + + dstrect.X = 1.0; + dstrect.Height = 3.0; + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitPixel, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(2.0, points[0].X); + expectf(0.0, points[0].Y); + expectf(4.0, points[1].X); + expectf(0.0, points[1].Y); + expectf(2.0, points[2].X); + expectf(6.0, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(0.0, points[0].X); + expectf(0.0, points[0].Y); + expectf(2.0, points[1].X); + expectf(0.0, points[1].Y); + expectf(0.0, points[2].X); + expectf(2.0, points[2].Y); + + status = GdipResetWorldTransform(graphics); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitInch, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(1.0, points[0].X); + expectf(0.0, points[0].Y); + expectf((dpix+1.0)/dpix, points[1].X); + expectf(0.0, points[1].Y); + expectf(1.0, points[2].X); + expectf(3.0/dpiy, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + status = GdipSetPageUnit(graphics, UnitInch); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitPixel, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(dpix, points[0].X); + expectf(0.0, points[0].Y); + expectf(dpix*2, points[1].X); + expectf(0.0, points[1].Y); + expectf(dpix, points[2].X); + expectf(dpiy*3, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitInch, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(dpix, points[0].X); + expectf(0.0, points[0].Y); + expectf(dpix+1.0, points[1].X); + expectf(0.0, points[1].Y); + expectf(dpix, points[2].X); + expectf(3.0, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -5970,6 +6142,7 @@ START_TEST(graphics) test_bitmapfromgraphics(); test_GdipFillRectangles(); test_GdipGetVisibleClipBounds_memoryDC(); + test_container_rects(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Vincent Povirk : gdiplus: Implement BeginContainer metafile record.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 410163a9f2b03fcc16e8e65975647492ac5b938e URL: http://source.winehq.org/git/wine.git/?a=commit;h=410163a9f2b03fcc16e8e6597… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 16 14:37:29 2016 -0500 gdiplus: Implement BeginContainer metafile record. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/metafile.c | 89 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 44 +++++++++++++++++++++ 4 files changed, 136 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 216dd4a..86a29a0 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -101,6 +101,8 @@ extern GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST extern GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_TranslateWorldTransform(GpMetafile* metafile, REAL dx, REAL dy, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_BeginContainer(GpMetafile* metafile, GDIPCONST GpRectF *dstrect, + GDIPCONST GpRectF *srcrect, GpUnit unit, DWORD StackIndex) DECLSPEC_HIDDEN; extern GpStatus METAFILE_BeginContainerNoParams(GpMetafile* metafile, DWORD StackIndex) DECLSPEC_HIDDEN; extern GpStatus METAFILE_EndContainer(GpMetafile* metafile, DWORD StackIndex) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SaveGraphics(GpMetafile* metafile, DWORD StackIndex) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 06a0c95..4ae1f48 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5236,7 +5236,7 @@ GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics *graphics, GDIPCONST GpRectF * GdipMultiplyMatrix(&graphics->worldtrans, &transform, MatrixOrderPrepend); if (graphics->image && graphics->image->type == ImageTypeMetafile) { - FIXME("Write to metafile\n"); + METAFILE_BeginContainer((GpMetafile*)graphics->image, dstrect, srcrect, unit, container->contid); } return Ok; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c0e799c..9de584c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -122,6 +122,14 @@ typedef struct EmfPlusTranslateWorldTransform REAL dy; } EmfPlusTranslateWorldTransform; +typedef struct EmfPlusBeginContainer +{ + EmfPlusRecordHeader Header; + GpRectF DestRect; + GpRectF SrcRect; + DWORD StackIndex; +} EmfPlusBeginContainer; + typedef struct EmfPlusContainerRecord { EmfPlusRecordHeader Header; @@ -782,6 +790,30 @@ GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) return Ok; } +GpStatus METAFILE_BeginContainer(GpMetafile* metafile, GDIPCONST GpRectF *dstrect, + GDIPCONST GpRectF *srcrect, GpUnit unit, DWORD StackIndex) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusBeginContainer *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeBeginContainer; + record->Header.Flags = unit & 0xff; + record->DestRect = *dstrect; + record->SrcRect = *srcrect; + record->StackIndex = StackIndex; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_BeginContainerNoParams(GpMetafile* metafile, DWORD StackIndex) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) @@ -1309,6 +1341,63 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeBeginContainer: + { + EmfPlusBeginContainer *record = (EmfPlusBeginContainer*)header; + container* cont; + GpUnit unit; + REAL scale_x, scale_y; + GpRectF scaled_srcrect; + GpMatrix transform; + + cont = heap_alloc_zero(sizeof(*cont)); + if (!cont) + return OutOfMemory; + + stat = GdipCloneRegion(metafile->clip, &cont->clip); + if (stat != Ok) + { + heap_free(cont); + return stat; + } + + GdipBeginContainer2(metafile->playback_graphics, &cont->state); + + if (stat != Ok) + { + GdipDeleteRegion(cont->clip); + heap_free(cont); + return stat; + } + + cont->id = record->StackIndex; + cont->type = BEGIN_CONTAINER; + cont->world_transform = *metafile->world_transform; + cont->page_unit = metafile->page_unit; + cont->page_scale = metafile->page_scale; + list_add_head(&real_metafile->containers, &cont->entry); + + unit = record->Header.Flags & 0xff; + + scale_x = units_to_pixels(1.0, unit, metafile->image.xres); + scale_y = units_to_pixels(1.0, unit, metafile->image.yres); + + scaled_srcrect.X = scale_x * record->SrcRect.X; + scaled_srcrect.Y = scale_y * record->SrcRect.Y; + scaled_srcrect.Width = scale_x * record->SrcRect.Width; + scaled_srcrect.Height = scale_y * record->SrcRect.Height; + + transform.matrix[0] = record->DestRect.Width / scaled_srcrect.Width; + transform.matrix[1] = 0.0; + transform.matrix[2] = 0.0; + transform.matrix[3] = record->DestRect.Height / scaled_srcrect.Height; + transform.matrix[4] = record->DestRect.X - scaled_srcrect.X; + transform.matrix[5] = record->DestRect.Y - scaled_srcrect.Y; + + GdipMultiplyMatrix(real_metafile->world_transform, &transform, MatrixOrderPrepend); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } case EmfPlusRecordTypeBeginContainerNoParams: case EmfPlusRecordTypeSave: { diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 6a21afa..60890d9 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1846,6 +1846,9 @@ static const emfplus_record container_records[] = { {0, EmfPlusRecordTypeBeginContainerNoParams}, {0, EmfPlusRecordTypeEndContainer}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeBeginContainer}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndContainer}, {0, EmfPlusRecordTypeBeginContainerNoParams}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, @@ -1865,6 +1868,8 @@ static void test_containers(void) static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; GraphicsContainer state1, state2; + GpRectF srcrect, dstrect; + REAL dpix, dpiy; hdc = CreateCompatibleDC(0); @@ -1938,6 +1943,41 @@ static void test_containers(void) stat = GdipFillRectangle(graphics, brush, 20.0, 20.0, 5.0, 5.0); expect(Ok, stat); + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* With transform applied */ + stat = GdipGetDpiX(graphics, &dpix); + expect(Ok, stat); + + stat = GdipGetDpiY(graphics, &dpiy); + expect(Ok, stat); + + srcrect.X = 0.0; + srcrect.Y = 0.0; + srcrect.Width = 1.0; + srcrect.Height = 1.0; + + dstrect.X = 25.0; + dstrect.Y = 0.0; + dstrect.Width = 5.0; + dstrect.Height = 5.0; + + stat = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitInch, &state1); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff00ffff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 0.0, 0.0, dpix, dpiy); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + /* Restoring an invalid state seems to break the graphics object? */ if (0) { stat = GdipEndContainer(graphics, state1); @@ -1979,6 +2019,10 @@ static void test_containers(void) expect(Ok, stat); expect(0xff00ff00, color); + stat = GdipBitmapGetPixel(bitmap, 55, 5, &color); + expect(Ok, stat); + expect(0xff00ffff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus/tests: Check record types in playback tests.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 8b7520ce6d7cae18c2c24920992e0d199e933660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7520ce6d7cae18c2c249209… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 16 14:37:30 2016 -0500 gdiplus/tests: Check record types in playback tests. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 60890d9..7251ff3 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -211,12 +211,16 @@ static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned { todo_wine_if (state->expected[state->count].playback_todo) ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); + todo_wine_if (state->expected[state->count].todo) + ok(state->expected[state->count].record_type == record_type, + "%s.%i: expected record type 0x%x, got 0x%x\n", state->desc, state->count, + state->expected[state->count].record_type, record_type); state->count++; } else { todo_wine_if (state->expected[state->count].playback_todo) - ok(0, "%s: too many records\n", state->desc); + ok(0, "%s: unexpected record 0x%x\n", state->desc, record_type); return FALSE; }

1 0

Alexandre Julliard : winex11: Add separate export functions for the various string types.
by Alexandre Julliard 19 Sep '16

19 Sep '16

Module: wine Branch: master Commit: 63201471abd732cc7461d11e954cf6eae87a0b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63201471abd732cc7461d11e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 17 11:10:31 2016 +0900 winex11: Add separate export functions for the various string types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 60 ++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 190935c..ed304ac 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -140,6 +140,10 @@ static HANDLE export_data(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); static HANDLE export_string(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); +static HANDLE export_utf8_string(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); +static HANDLE export_compound_text(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); static HANDLE export_pixmap(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static HANDLE export_image_bmp(Display *display, Window requestor, Atom aTarget, @@ -192,8 +196,8 @@ static const struct { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, - { 0, CF_UNICODETEXT, XATOM_UTF8_STRING, import_utf8_string, export_string }, - { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_string }, + { 0, CF_UNICODETEXT, XATOM_UTF8_STRING, import_utf8_string, export_utf8_string }, + { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_compound_text }, { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_enhmetafile }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_LOCALE, XATOM_WCF_LOCALE, import_data, export_data }, @@ -1365,17 +1369,19 @@ static HANDLE export_data(Display *display, Window requestor, Atom aTarget, /************************************************************************** - * X11DRV_CLIPBOARD_ExportXAString + * export_string * * Export CF_TEXT converting the string to XA_STRING. - * Helper function for export_string. */ -static HANDLE X11DRV_CLIPBOARD_ExportXAString(LPWINE_CLIPDATA lpData, LPDWORD lpBytes) +static HANDLE export_string(Display *display, Window requestor, Atom aTarget, Atom rprop, + LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { UINT i, j; UINT size; LPSTR text, lpstr = NULL; + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpData)) return 0; + *lpBytes = 0; /* Assume return has zero bytes */ text = GlobalLock(lpData->hData); @@ -1404,18 +1410,20 @@ done: /************************************************************************** - * X11DRV_CLIPBOARD_ExportUTF8String + * export_utf8_string * * Export CF_UNICODE converting the string to UTF8. - * Helper function for export_string. */ -static HANDLE X11DRV_CLIPBOARD_ExportUTF8String(LPWINE_CLIPDATA lpData, LPDWORD lpBytes) +static HANDLE export_utf8_string(Display *display, Window requestor, Atom aTarget, Atom rprop, + LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { UINT i, j; UINT size; LPWSTR uni_text; LPSTR text, lpstr = NULL; + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpData)) return 0; + *lpBytes = 0; /* Assume return has zero bytes */ uni_text = GlobalLock(lpData->hData); @@ -1452,13 +1460,12 @@ done: /************************************************************************** - * X11DRV_CLIPBOARD_ExportCompoundText + * export_compound_text * * Export CF_UNICODE to COMPOUND_TEXT - * Helper function for export_string. */ -static HANDLE X11DRV_CLIPBOARD_ExportCompoundText(Display *display, Window requestor, Atom aTarget, Atom rprop, - LPWINE_CLIPDATA lpData, LPDWORD lpBytes) +static HANDLE export_compound_text(Display *display, Window requestor, Atom aTarget, Atom rprop, + LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { char* lpstr = 0; XTextProperty prop; @@ -1467,6 +1474,8 @@ static HANDLE X11DRV_CLIPBOARD_ExportCompoundText(Display *display, Window reque UINT size; LPWSTR uni_text; + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpData)) return 0; + uni_text = GlobalLock(lpData->hData); size = WideCharToMultiByte(CP_UNIXCP, 0, uni_text, -1, NULL, 0, NULL, NULL); @@ -1504,33 +1513,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportCompoundText(Display *display, Window reque return 0; } -/************************************************************************** - * export_string - * - * Export string - */ -static HANDLE export_string(Display *display, Window requestor, Atom aTarget, Atom rprop, - LPWINE_CLIPDATA lpData, LPDWORD lpBytes) -{ - if (X11DRV_CLIPBOARD_RenderFormat(display, lpData)) - { - if (aTarget == XA_STRING) - return X11DRV_CLIPBOARD_ExportXAString(lpData, lpBytes); - else if (aTarget == x11drv_atom(COMPOUND_TEXT) || aTarget == x11drv_atom(TEXT)) - return X11DRV_CLIPBOARD_ExportCompoundText(display, requestor, aTarget, - rprop, lpData, lpBytes); - else - { - TRACE("Exporting target %ld to default UTF8_STRING\n", aTarget); - return X11DRV_CLIPBOARD_ExportUTF8String(lpData, lpBytes); - } - } - else - ERR("Failed to render %04x format\n", lpData->wFormatID); - - return 0; -} - /************************************************************************** * export_pixmap

1 0