June 2017 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the GIF decoder.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: d3280c867bc7b7e36657aa0f50db26d7258a15b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3280c867bc7b7e36657aa0f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:59 2017 +0800 windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the GIF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 01ef089..f63a7f3 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1247,8 +1247,13 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet static HRESULT WINAPI GifDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { + GifDecoder *This = impl_from_IWICBitmapDecoder(iface); + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI GifDecoder_GetPreview(IWICBitmapDecoder *iface,

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetRemoteAddress.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: b0fc3197c5cf3599186444e03577c779a744b682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc3197c5cf3599186444e03… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:26:10 2017 +0100 wsdapi/tests: Add tests for Get/SetRemoteAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/msgparams.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index d4a300a..ba0590f 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -124,12 +124,71 @@ static void LocalAddress_tests(void) ok(ret == 0, "WSACleanup failed: %d\n", ret); } +static void RemoteAddress_tests(void) +{ + IWSDUdpAddress *origUdpAddress = NULL; + IWSDAddress *returnedAddress = NULL; + IWSDUdpMessageParameters *udpMessageParams = NULL; + WCHAR address[] = {'1','.','2','.','3','.','4',0}; + WSADATA wsaData; + HRESULT rc; + int ret; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, NULL); + todo_wine ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc); + ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); + + rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); + todo_wine ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc); + ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); + + rc = WSDCreateUdpAddress(&origUdpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08x\n", rc); + ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); + + rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, address); + todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + + rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); + todo_wine ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc); + + rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); + todo_wine ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); + + /* Check if GetRemoteAddress returns the same object */ + todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); + + ret = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); + + if (returnedAddress != NULL) + { + ret = IWSDAddress_Release(returnedAddress); + ok(ret == 1, "IWSDAddress_Release() has %d references, should have 1\n", ret); + } + + ret = IWSDUdpAddress_Release(origUdpAddress); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(msgparams) { CoInitialize(NULL); CreateUdpMessageParameters_tests(); LocalAddress_tests(); + RemoteAddress_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for CreateUdpMessageParameters.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: d0abe772739ac9642653e3d61a0d29be5a6ffd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0abe772739ac9642653e3d61… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:25:54 2017 +0100 wsdapi/tests: Add tests for CreateUdpMessageParameters. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 1 + dlls/wsdapi/tests/msgparams.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index e2f6642..cd4b418 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -5,4 +5,5 @@ C_SRCS = \ address.c \ discovery.c \ memory.c \ + msgparams.c \ xml.c diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c new file mode 100644 index 0000000..0de1860 --- /dev/null +++ b/dlls/wsdapi/tests/msgparams.c @@ -0,0 +1,76 @@ +/* + * Web Services on Devices + * Message Parameters tests + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <winsock2.h> +#include <windows.h> + +#include "wine/test.h" +#include "objbase.h" +#include "wsdapi.h" + +static void CreateUdpMessageParameters_tests(void) +{ + IWSDUdpMessageParameters *udpMessageParams = NULL, *udpMessageParams2 = NULL; + IWSDMessageParameters *messageParams = NULL; + IUnknown *unknown; + HRESULT rc; + ULONG ref; + + rc = WSDCreateUdpMessageParameters(NULL); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUdpMessageParameters(NULL) failed: %08x\n", rc); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + /* Try to query for objects */ + rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IWSDUdpMessageParameters, (LPVOID*)&udpMessageParams2); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IWSDUdpMessageParameters) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDUdpMessageParameters_Release(udpMessageParams2); + + rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IWSDMessageParameters, (LPVOID*)&messageParams); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_WSDMessageParameters) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDMessageParameters_Release(messageParams); + + rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IUnknown, (LPVOID*)&unknown); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + + if (rc == S_OK) + IUnknown_Release(unknown); + + ref = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ref == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ref); +} + +START_TEST(msgparams) +{ + CoInitialize(NULL); + + CreateUdpMessageParameters_tests(); + + CoUninitialize(); +}

1 0

Owen Rudge : wsdapi: Add stub implementation of IWSDUdpMessageParameters and WSDCreateUdpMessageParameters.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: 240c703896dfcf2fba4267ca8d8e779195bc4caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=240c703896dfcf2fba4267ca8… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:25:50 2017 +0100 wsdapi: Add stub implementation of IWSDUdpMessageParameters and WSDCreateUdpMessageParameters. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/msgparams.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 2 +- 3 files changed, 230 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 30862cc..0f28ce5 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -7,4 +7,5 @@ C_SRCS = \ discovery.c \ main.c \ memory.c \ + msgparams.c \ xml.c diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c new file mode 100644 index 0000000..a7a2f0a --- /dev/null +++ b/dlls/wsdapi/msgparams.c @@ -0,0 +1,228 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "wsdapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +typedef struct IWSDMessageParametersImpl { + IWSDMessageParameters IWSDMessageParameters_iface; + LONG ref; +} IWSDMessageParametersImpl; + +typedef struct IWSDUdpMessageParametersImpl { + IWSDMessageParametersImpl base; +} IWSDUdpMessageParametersImpl; + +static inline IWSDMessageParametersImpl *impl_from_IWSDMessageParameters(IWSDMessageParameters *iface) +{ + return CONTAINING_RECORD(iface, IWSDMessageParametersImpl, IWSDMessageParameters_iface); +} + +static inline IWSDUdpMessageParametersImpl *impl_from_IWSDUdpMessageParameters(IWSDUdpMessageParameters *iface) +{ + return CONTAINING_RECORD(iface, IWSDUdpMessageParametersImpl, base.IWSDMessageParameters_iface); +} + +/* IWSDMessageParameters implementation */ + +static ULONG WINAPI IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface) +{ + IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface) +{ + IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) +{ + FIXME("(%p, %p)\n", This, ppAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) +{ + FIXME("(%p, %p)\n", This, pAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) +{ + FIXME("(%p, %p)\n", This, ppAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) +{ + FIXME("(%p, %p)\n", This, pAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams) +{ + FIXME("(%p, %p)\n", This, ppTxParams); + return E_NOTIMPL; +} + +/* IWSDUdpMessageParameters implementation */ +static HRESULT WINAPI IWSDUdpMessageParametersImpl_QueryInterface(IWSDUdpMessageParameters *iface, REFIID riid, void **ppv) +{ + IWSDUdpMessageParametersImpl *This = impl_from_IWSDUdpMessageParameters(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + { + WARN("Invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWSDMessageParameters) || + IsEqualIID(riid, &IID_IWSDUdpMessageParameters)) + { + *ppv = &This->base.IWSDMessageParameters_iface; + } + else + { + WARN("Unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IWSDUdpMessageParametersImpl_AddRef(IWSDUdpMessageParameters *iface) +{ + return IWSDMessageParametersImpl_AddRef((IWSDMessageParameters *)iface); +} + +static ULONG WINAPI IWSDUdpMessageParametersImpl_Release(IWSDUdpMessageParameters *iface) +{ + return IWSDMessageParametersImpl_Release((IWSDMessageParameters *)iface); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetLocalAddress(IWSDUdpMessageParameters *This, IWSDAddress **ppAddress) +{ + return IWSDMessageParametersImpl_GetLocalAddress((IWSDMessageParameters *)This, ppAddress); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_SetLocalAddress(IWSDUdpMessageParameters *This, IWSDAddress *pAddress) +{ + return IWSDMessageParametersImpl_SetLocalAddress((IWSDMessageParameters *)This, pAddress); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetRemoteAddress(IWSDUdpMessageParameters *This, IWSDAddress **ppAddress) +{ + return IWSDMessageParametersImpl_GetRemoteAddress((IWSDMessageParameters *)This, ppAddress); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_SetRemoteAddress(IWSDUdpMessageParameters *This, IWSDAddress *pAddress) +{ + return IWSDMessageParametersImpl_SetRemoteAddress((IWSDMessageParameters *)This, pAddress); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetLowerParameters(IWSDUdpMessageParameters *This, IWSDMessageParameters **ppTxParams) +{ + return IWSDMessageParametersImpl_GetLowerParameters((IWSDMessageParameters *)This, ppTxParams); +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_SetRetransmitParams(IWSDUdpMessageParameters *This, const WSDUdpRetransmitParams *pParams) +{ + FIXME("(%p, %p)\n", This, pParams); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpMessageParametersImpl_GetRetransmitParams(IWSDUdpMessageParameters *This, WSDUdpRetransmitParams *pParams) +{ + FIXME("(%p, %p)\n", This, pParams); + return E_NOTIMPL; +} + +static const IWSDUdpMessageParametersVtbl udpMsgParamsVtbl = +{ + /* IUnknown */ + IWSDUdpMessageParametersImpl_QueryInterface, + IWSDUdpMessageParametersImpl_AddRef, + IWSDUdpMessageParametersImpl_Release, + + /* IWSDMessageParameters */ + IWSDUdpMessageParametersImpl_GetLocalAddress, + IWSDUdpMessageParametersImpl_SetLocalAddress, + IWSDUdpMessageParametersImpl_GetRemoteAddress, + IWSDUdpMessageParametersImpl_SetRemoteAddress, + IWSDUdpMessageParametersImpl_GetLowerParameters, + + /* IWSDUdpMessageParameters */ + IWSDUdpMessageParametersImpl_SetRetransmitParams, + IWSDUdpMessageParametersImpl_GetRetransmitParams +}; + +HRESULT WINAPI WSDCreateUdpMessageParameters(IWSDUdpMessageParameters **ppTxParams) +{ + IWSDUdpMessageParametersImpl *obj; + + TRACE("(%p)\n", ppTxParams); + + if (ppTxParams == NULL) + { + WARN("Invalid parameter: ppTxParams == NULL\n"); + return E_POINTER; + } + + *ppTxParams = NULL; + + obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + if (!obj) return E_OUTOFMEMORY; + + obj->base.IWSDMessageParameters_iface.lpVtbl = (IWSDMessageParametersVtbl *)&udpMsgParamsVtbl; + obj->base.ref = 1; + + *ppTxParams = (IWSDUdpMessageParameters *)&obj->base.IWSDMessageParameters_iface; + TRACE("Returning iface %p\n", *ppTxParams); + + return S_OK; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index a8f1aaa..41d62bb 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -24,7 +24,7 @@ @ stub WSDCreateMetadataAgent @ stub WSDCreateOutboundAttachment @ stdcall WSDCreateUdpAddress(ptr) -@ stub WSDCreateUdpMessageParameters +@ stdcall WSDCreateUdpMessageParameters(ptr) @ stub WSDCreateUdpTransport @ stdcall WSDDetachLinkedMemory(ptr) @ stdcall WSDFreeLinkedMemory(ptr)

1 0

Clemens Tamme : gdiplus: Write API for GdipAddPathLine and GdipAddPathLineI.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: f96e319ab5b890e0d174d617ee93c7b3ecc9dec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96e319ab5b890e0d174d617e… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Wed Jun 21 19:50:41 2017 +0200 gdiplus: Write API for GdipAddPathLine and GdipAddPathLineI. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index e34f4ed..90d15bb 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -646,6 +646,30 @@ GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath *path, GDIPCONST GpPoint *points, I return stat; } +/************************************************************************* + * GdipAddPathLine [GDIPLUS.21] + * + * Add two points to the given path. + * + * PARAMS + * path [I/O] Path that the line is appended to + * x1 [I] X coordinate of the first point of the line + * y1 [I] Y coordinate of the first point of the line + * x2 [I] X coordinate of the second point of the line + * y2 [I] Y coordinate of the second point of the line + * + * RETURNS + * InvalidParameter If the first parameter is not a valid path + * OutOfMemory If the path cannot be lengthened, i.e. memory allocation fails + * Ok If everything works out as expected + * + * NOTES + * This functions takes the newfigure value of the given path into account, + * i.e. the two new points are connected to the end of the given path if it + * was set to FALSE, otherwise the first point is given the PathPointTypeStart + * value. In both cases, the value of newfigure of the given path is FALSE + * afterwards. + */ GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2) { INT old_count; @@ -675,6 +699,11 @@ GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REA return Ok; } +/************************************************************************* + * GdipAddPathLineI [GDIPLUS.21] + * + * See GdipAddPathLine + */ GpStatus WINGDIPAPI GdipAddPathLineI(GpPath *path, INT x1, INT y1, INT x2, INT y2) { TRACE("(%p, %d, %d, %d, %d)\n", path, x1, y1, x2, y2);

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICMetadataQueryReader:: GetLocation.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: c94bf3cf277969ed61170234b9d48ea7e86645d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94bf3cf277969ed61170234b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:56 2017 +0800 windowscodecs: Implement IWICMetadataQueryReader::GetLocation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/imgfactory.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/metadataquery.c | 35 +++++++++++++++++++++++++++------- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tiffformat.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 15 ++++++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index d24db25..01ef089 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -821,7 +821,7 @@ static HRESULT WINAPI GifFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecod if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI GifFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index bf63494..e1bcc89 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1101,7 +1101,7 @@ static HRESULT WINAPI ComponentFactory_CreateQueryReaderFromBlockReader(IWICComp if (!block_reader || !query_reader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(block_reader, query_reader); + return MetadataQueryReader_CreateInstance(block_reader, NULL, query_reader); } static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromBlockWriter(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index b7998be..acc262e 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -695,7 +695,7 @@ static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDe if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 29df42e..0b7eb6c 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -35,10 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { IWICMetadataQueryReader IWICMetadataQueryReader_iface; - LONG ref; - IWICMetadataBlockReader *block; + WCHAR *root; } QueryReader; static inline QueryReader *impl_from_IWICMetadataQueryReader(IWICMetadataQueryReader *iface) @@ -84,6 +83,7 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) if (!ref) { IWICMetadataBlockReader_Release(This->block); + HeapFree(GetProcessHeap(), 0, This->root); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -98,12 +98,31 @@ static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, GUI return IWICMetadataBlockReader_GetContainerFormat(This->block, format); } -static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, - UINT cchMaxLength, WCHAR *wzNamespace, UINT *pcchActualLength) +static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, UINT len, WCHAR *location, UINT *ret_len) { + static const WCHAR rootW[] = { '/',0 }; QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%u,%p,%p)\n", This, cchMaxLength, wzNamespace, pcchActualLength); - return E_NOTIMPL; + const WCHAR *root; + UINT actual_len; + + TRACE("(%p,%u,%p,%p)\n", This, len, location, ret_len); + + if (!ret_len) return E_INVALIDARG; + + root = This->root ? This->root : rootW; + actual_len = lstrlenW(root) + 1; + + if (location) + { + if (len < actual_len) + return WINCODEC_ERR_INSUFFICIENTBUFFER; + + memcpy(location, root, actual_len * sizeof(WCHAR)); + } + + *ret_len = actual_len; + + return S_OK; } static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, @@ -132,7 +151,7 @@ static IWICMetadataQueryReaderVtbl mqr_vtbl = { mqr_GetEnumerator }; -HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) +HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const WCHAR *root, IWICMetadataQueryReader **out) { QueryReader *obj; @@ -146,6 +165,8 @@ HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMet IWICMetadataBlockReader_AddRef(mbr); obj->block = mbr; + obj->root = root ? heap_strdupW(root) : NULL; + *out = &obj->IWICMetadataQueryReader_iface; return S_OK; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c98a6a7..e8325c7 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1105,7 +1105,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDec if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b39bcac..b613409 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1172,7 +1172,7 @@ static HRESULT WINAPI TiffFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDeco if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index a8af0d6..2249c13 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -21,6 +21,7 @@ #include "wincodec.h" #include "wincodecsdk.h" +#include "wine/unicode.h" DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04); @@ -162,9 +163,17 @@ extern HRESULT IMDReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GCEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT APEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GifCommentReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; - -extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) DECLSPEC_HIDDEN; - +extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *, const WCHAR *, IWICMetadataQueryReader **) DECLSPEC_HIDDEN; extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + SIZE_T len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = HeapAlloc(GetProcessHeap(), 0, len))) memcpy(dst, src, len); + return dst; +} + #endif /* WINCODECS_PRIVATE_H */

1 0

Dmitry Timoshkov : windowscodecs: Use PropVariantCompareEx to compare metadata items.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: 3059668de3ded265ab8919702cd2b8eb1e42049d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3059668de3ded265ab8919702… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:51 2017 +0800 windowscodecs: Use PropVariantCompareEx to compare metadata items. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/metadatahandler.c | 67 +++--------------------------------- 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 78e2059..3505e80 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,6 +1,6 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 +IMPORTS = uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32 EXTRAINCL = $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) EXTRALIBS = $(APPLICATIONSERVICES_LIBS) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 10f9f06..cdd7420 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winternl.h" #include "objbase.h" +#include "propvarutil.h" #include "wincodecs_private.h" @@ -211,66 +212,6 @@ static HRESULT WINAPI MetadataHandler_GetValueByIndex(IWICMetadataWriter *iface, return hr; } -static BOOL get_int_value(const PROPVARIANT *pv, LONGLONG *value) -{ - switch (pv->vt) - { - case VT_NULL: - case VT_EMPTY: - *value = 0; - break; - case VT_I1: - *value = pv->u.cVal; - break; - case VT_UI1: - *value = pv->u.bVal; - break; - case VT_I2: - *value = pv->u.iVal; - break; - case VT_UI2: - *value = pv->u.uiVal; - break; - case VT_I4: - *value = pv->u.lVal; - break; - case VT_UI4: - *value = pv->u.ulVal; - break; - case VT_I8: - case VT_UI8: - *value = pv->u.hVal.QuadPart; - break; - default: - FIXME("not supported variant type %d\n", pv->vt); - return FALSE; - } - return TRUE; -} - -/* FiXME: Use propsys.PropVariantCompareEx once it's implemented */ -static int propvar_cmp(const PROPVARIANT *v1, const PROPVARIANT *v2) -{ - LONGLONG value1, value2; - - if (v1->vt == VT_LPSTR && v2->vt == VT_LPSTR) - { - return lstrcmpA(v1->u.pszVal, v2->u.pszVal); - } - - if (v1->vt == VT_LPWSTR && v2->vt == VT_LPWSTR) - { - return lstrcmpiW(v1->u.pwszVal, v2->u.pwszVal); - } - - if (!get_int_value(v1, &value1)) return -1; - if (!get_int_value(v2, &value2)) return -1; - - value1 -= value2; - if (value1) return value1 < 0 ? -1 : 1; - return 0; -} - static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, const PROPVARIANT *schema, const PROPVARIANT *id, PROPVARIANT *value) { @@ -278,7 +219,7 @@ static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, HRESULT hr = WINCODEC_ERR_PROPERTYNOTFOUND; MetadataHandler *This = impl_from_IWICMetadataWriter(iface); - TRACE("(%p,%p,%p,%p)\n", iface, schema, id, value); + TRACE("(%p,%s,%s,%p)\n", iface, wine_dbgstr_variant((const VARIANT *)schema), wine_dbgstr_variant((const VARIANT *)id), value); if (!id) return E_INVALIDARG; @@ -288,10 +229,10 @@ static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, { if (schema && This->items[i].schema.vt != VT_EMPTY) { - if (propvar_cmp(schema, &This->items[i].schema) != 0) continue; + if (PropVariantCompareEx(schema, &This->items[i].schema, 0, PVCF_USESTRCMPI) != 0) continue; } - if (propvar_cmp(id, &This->items[i].id) != 0) continue; + if (PropVariantCompareEx(id, &This->items[i].id, 0, PVCF_USESTRCMPI) != 0) continue; hr = value ? PropVariantCopy(value, &This->items[i].value) : S_OK; break;

1 0

Clemens Tamme : gdiplus: Write API documentation for GdipAddPathArc and GdipAddPathArcI.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: c95877da42c2eb03085edf54a114cd0c766ad184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95877da42c2eb03085edf54a… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Thu Jun 22 18:47:42 2017 +0200 gdiplus: Write API documentation for GdipAddPathArc and GdipAddPathArcI. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 815ce34..5fedd07 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -166,6 +166,32 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R return TRUE; } +/******************************************************************************* + * GdipAddPathArc [GDIPLUS.1] + * + * Add an elliptical arc to the given path. + * + * PARAMS + * path [I/O] Path that the arc is appended to + * x1 [I] X coordinate of the boundary box + * y1 [I] Y coordinate of the boundary box + * x2 [I] Width of the boundary box + * y2 [I] Height of the boundary box + * startAngle [I] Starting angle of the arc, clockwise + * sweepAngle [I] Angle of the arc, clockwise + * + * RETURNS + * InvalidParameter If the given path is invalid + * OutOfMemory If memory allocation fails, i.e. the path cannot be lengthened + * Ok If everything works out as expected + * + * NOTES + * This functions takes the newfigure value of the given path into account, + * i.e. the arc is connected to the end of the given path if it was set to + * FALSE, otherwise the arc's first point gets the the PathPointTypeStart + * value. In both cases, the value of newfigure of the given path is FALSE + * afterwards. + */ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2, REAL startAngle, REAL sweepAngle) { @@ -200,6 +226,11 @@ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2, return Ok; } +/******************************************************************************* + * GdipAddPathArcI [GDUPLUS.2] + * + * See GdipAddPathArc + */ GpStatus WINGDIPAPI GdipAddPathArcI(GpPath *path, INT x1, INT y1, INT x2, INT y2, REAL startAngle, REAL sweepAngle) {

1 0

Rosanne DiMesio : Add Keywords filter to Browse Apps page
by Jeremy Newman June 26, 2017

June 26, 2017

Module: appdb Branch: master Commit: 6dacbd9dd79d0a5428d038def8269bb90f586764 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6dacbd9dd79d0a5428d038de… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 26 13:50:40 2017 -0500 Add Keywords filter to Browse Apps page Fixes bug 38168. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/application.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/application.php b/include/application.php index 75d13ee..8962915 100644 --- a/include/application.php +++ b/include/application.php @@ -1122,7 +1122,9 @@ EOT; $oFilter->AddFilterInfo('appCategory', 'Category', array(FILTER_OPTION_ENUM), FILTER_VALUES_OPTION_ENUM, $aCatIds, $aCatNames); $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); $oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); + $oFilter->AddFilterInfo('appFamily.keywords', 'Keywords', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); $oFilter->AddFilterInfo('onlyDownloadable', 'Only show downloadable apps', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; }

1 0

Rosanne DiMesio : viewbugs.php: order display by appName
by Jeremy Newman June 26, 2017

June 26, 2017

Module: appdb Branch: master Commit: 6d372a8c42520994968639645b56dd930b826731 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6d372a8c4252099496863964… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 26 12:18:08 2017 -0500 viewbugs.php: order display by appName Fixes bug 27807. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- viewbugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewbugs.php b/viewbugs.php index f9646da..a75ef30 100644 --- a/viewbugs.php +++ b/viewbugs.php @@ -26,7 +26,7 @@ $hResult = query_parameters("SELECT appFamily.description as appDescription, WHERE appFamily.appId = appVersion.appId and buglinks.versionId = appVersion.versionId AND buglinks.bug_id = '?' - ORDER BY versionName", $aClean['iBugId']); + ORDER BY appName, versionName", $aClean['iBugId']); if(query_num_rows($hResult)) {

1 0