September 2016 - Wine-commits

Sebastian Lackner : joy.cpl: Use variable of correct type to store LSTATUS value.
by Alexandre Julliard 13 Sep '16

13 Sep '16

Module: wine Branch: master Commit: 1224bfaa35a6f9e4fbb99cfe3ffd1deb6e1a8ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1224bfaa35a6f9e4fbb99cfe3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 09:03:17 2016 +0200 joy.cpl: Use variable of correct type to store LSTATUS value. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index b5a55fa..fbf6135 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -234,7 +234,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'}; HKEY hkey, appkey; DWORD values = 0; - HRESULT hr; + LSTATUS status; DWORD i; SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); @@ -248,9 +248,9 @@ static void initialize_disabled_joysticks_list(HWND hwnd) DWORD name_len = MAX_PATH, data_len = MAX_PATH; WCHAR buf_name[MAX_PATH + 9], buf_data[MAX_PATH]; - hr = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); + status = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); - if (SUCCEEDED(hr) && !lstrcmpW(disabled_str, buf_data)) + if (status == ERROR_SUCCESS && !lstrcmpW(disabled_str, buf_data)) SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_ADDSTRING, 0, (LPARAM) buf_name); }

1 0

Michael Stefaniuc : mscoree: Use the proper COM method wrappers.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 478f3dd67bab9fc31fcd93069fe37f493bca2df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478f3dd67bab9fc31fcd93069… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 21:24:48 2016 +0200 mscoree: Use the proper COM method wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 5da1102..b8bf882 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -396,13 +396,13 @@ static HRESULT WINAPI ConfigFileHandler_Error_QueryInterface(ISAXErrorHandler *i static ULONG WINAPI ConfigFileHandler_Error_AddRef(ISAXErrorHandler *iface) { ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); - return IUnknown_AddRef((IUnknown*)This); + return ISAXContentHandler_AddRef(&This->ISAXContentHandler_iface); } static ULONG WINAPI ConfigFileHandler_Error_Release(ISAXErrorHandler *iface) { ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); - return IUnknown_Release((IUnknown*)This); + return ISAXContentHandler_Release(&This->ISAXContentHandler_iface); } static HRESULT WINAPI ConfigFileHandler_error(ISAXErrorHandler *iface,

1 0

Michael Stefaniuc : mscoree: There can be only one QI implementation in a COM object.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: cac5a5996a6bba6e9c99de5f3acda59510a0cddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac5a5996a6bba6e9c99de5f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 21:25:27 2016 +0200 mscoree: There can be only one QI implementation in a COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index b8bf882..a52a521 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -73,18 +73,19 @@ static inline ConfigFileHandler *impl_from_ISAXErrorHandler(ISAXErrorHandler *if static HRESULT WINAPI ConfigFileHandler_QueryInterface(ISAXContentHandler *iface, REFIID riid, void **ppvObject) { - if (IsEqualGUID(riid, &IID_ISAXContentHandler) || - IsEqualGUID(riid, &IID_IUnknown)) - { - *ppvObject = iface; - } + ConfigFileHandler *This = impl_from_ISAXContentHandler(iface); + + if (IsEqualGUID(riid, &IID_ISAXContentHandler) || IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = &This->ISAXContentHandler_iface; + else if (IsEqualGUID(riid, &IID_ISAXErrorHandler)) + *ppvObject = &This->ISAXErrorHandler_iface; else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } - ISAXContentHandler_AddRef(iface); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -377,20 +378,8 @@ static const struct ISAXContentHandlerVtbl ConfigFileHandlerVtbl = static HRESULT WINAPI ConfigFileHandler_Error_QueryInterface(ISAXErrorHandler *iface, REFIID riid, void **ppvObject) { - if (IsEqualGUID(riid, &IID_ISAXErrorHandler) || - IsEqualGUID(riid, &IID_IUnknown)) - { - *ppvObject = iface; - } - else - { - WARN("Unsupported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; - } - - ISAXErrorHandler_AddRef(iface); - - return S_OK; + ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); + return ISAXContentHandler_QueryInterface(&This->ISAXContentHandler_iface, riid, ppvObject); } static ULONG WINAPI ConfigFileHandler_Error_AddRef(ISAXErrorHandler *iface)

1 0

Bruno Jesus : ws2_32: Use correct WS_ prefixed family.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 6135a3fa93958e5c8dfdc05f046abf9625e1174c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6135a3fa93958e5c8dfdc05f0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 9 14:33:54 2016 -0300 ws2_32: Use correct WS_ prefixed family. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0dc04f..2d54013 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4701,19 +4701,17 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID addr = inet_addr(ptr->IpAddressList.IpAddress.String); mask = inet_addr(ptr->IpAddressList.IpMask.String); bcast = addr | ~mask; - intArray->iiAddress.AddressIn.sin_family = AF_INET; + intArray->iiAddress.AddressIn.sin_family = WS_AF_INET; intArray->iiAddress.AddressIn.sin_port = 0; - intArray->iiAddress.AddressIn.sin_addr.WS_s_addr = - addr; - intArray->iiNetmask.AddressIn.sin_family = AF_INET; + intArray->iiAddress.AddressIn.sin_addr.WS_s_addr = addr; + + intArray->iiNetmask.AddressIn.sin_family = WS_AF_INET; intArray->iiNetmask.AddressIn.sin_port = 0; - intArray->iiNetmask.AddressIn.sin_addr.WS_s_addr = - mask; - intArray->iiBroadcastAddress.AddressIn.sin_family = - AF_INET; + intArray->iiNetmask.AddressIn.sin_addr.WS_s_addr = mask; + + intArray->iiBroadcastAddress.AddressIn.sin_family = WS_AF_INET; intArray->iiBroadcastAddress.AddressIn.sin_port = 0; - intArray->iiBroadcastAddress.AddressIn.sin_addr. - WS_s_addr = bcast; + intArray->iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = bcast; intArray++; numInt++; } @@ -4797,7 +4795,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; sa[i].iSockaddrLength = sizeof(SOCKADDR); - sockaddr[i].sin_family = AF_INET; + sockaddr[i].sin_family = WS_AF_INET; sockaddr[i].sin_port = 0; sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); i++; @@ -4936,7 +4934,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if (daddr->sa_family != AF_INET) + if (daddr->sa_family != WS_AF_INET) { FIXME("unsupported address family %d\n", daddr->sa_family); status = WSAEAFNOSUPPORT; @@ -4969,7 +4967,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID status = WSAEFAULT; break; } - saddr_in->sin_family = AF_INET; + saddr_in->sin_family = WS_AF_INET; saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; saddr_in->sin_port = 0; total = sizeof(struct WS_sockaddr_in);

1 0

Dmitry Timoshkov : gdiplus: Implement GdipCreateMetafileFromStream.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 3769778917b2cea0590ffb50e1174e354235174c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3769778917b2cea0590ffb50e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 9 13:42:43 2016 -0500 gdiplus: Implement GdipCreateMetafileFromStream. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 71d89ae..b3b4682 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1917,8 +1917,21 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, GpMetafile **metafile) { - FIXME("(%p, %p): stub\n", stream, metafile); - return NotImplemented; + GpStatus stat; + + TRACE("%p %p\n", stream, metafile); + + stat = GdipLoadImageFromStream(stream, (GpImage **)metafile); + if (stat != Ok) return stat; + + if ((*metafile)->image.type != ImageTypeMetafile) + { + GdipDisposeImage(&(*metafile)->image); + *metafile = NULL; + return GenericError; + } + + return Ok; } GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metafile,

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetMetafileHeaderFromMetafile.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 259837a19976f7cd6a59fa316b6593eda1dd60dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=259837a19976f7cd6a59fa316… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 9 13:42:44 2016 -0500 gdiplus: Implement GdipGetMetafileHeaderFromMetafile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 20 ++++++++++++++++---- dlls/gdiplus/tests/image.c | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index b3b4682..d471a13 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1667,17 +1667,29 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics *graphics, GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, MetafileHeader * header) { - static int calls; + GpStatus status; TRACE("(%p, %p)\n", metafile, header); if(!metafile || !header) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (metafile->hemf) + { + status = GdipGetMetafileHeaderFromEmf(metafile->hemf, header); + if (status != Ok) return status; + } + else + { + memset(header, 0, sizeof(*header)); + header->Version = 0xdbc01002; + } - memset(header, 0, sizeof(MetafileHeader)); + header->Type = metafile->metafile_type; + header->DpiX = metafile->image.xres; + header->DpiY = metafile->image.yres; + header->Width = gdip_round(metafile->bounds.Width); + header->Height = gdip_round(metafile->bounds.Height); return Ok; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cabd2fce..8c123b9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1465,17 +1465,17 @@ static void test_loadwmf(void) expect(Ok, stat); if (stat == Ok) { - todo_wine expect(MetafileTypeWmfPlaceable, header.Type); + expect(MetafileTypeWmfPlaceable, header.Type); todo_wine expect(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), header.Size); todo_wine expect(0x300, header.Version); expect(0, header.EmfPlusFlags); - todo_wine expectf(1440.0, header.DpiX); - todo_wine expectf(1440.0, header.DpiY); + expectf(1440.0, header.DpiX); + expectf(1440.0, header.DpiY); expect(0, header.X); expect(0, header.Y); - todo_wine expect(320, header.Width); - todo_wine expect(320, header.Height); - todo_wine expect(1, U(header).WmfHeader.mtType); + expect(320, header.Width); + expect(320, header.Height); + expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY); @@ -1523,17 +1523,17 @@ static void test_createfromwmf(void) expect(Ok, stat); if (stat == Ok) { - todo_wine expect(MetafileTypeWmfPlaceable, header.Type); + expect(MetafileTypeWmfPlaceable, header.Type); todo_wine expect(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), header.Size); todo_wine expect(0x300, header.Version); expect(0, header.EmfPlusFlags); - todo_wine expectf(1440.0, header.DpiX); - todo_wine expectf(1440.0, header.DpiY); + expectf(1440.0, header.DpiX); + expectf(1440.0, header.DpiY); expect(0, header.X); expect(0, header.Y); - todo_wine expect(320, header.Width); - todo_wine expect(320, header.Height); - todo_wine expect(1, U(header).WmfHeader.mtType); + expect(320, header.Width); + expect(320, header.Height); + expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY);

1 0

Vincent Povirk : gdiplus: Add more tests for GdipGetMetafileHeaderFromMetafile.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: f60d2b63cceeec696f0bc8105db37ba6179ea55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60d2b63cceeec696f0bc8105… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 9 13:42:45 2016 -0500 gdiplus: Add more tests for GdipGetMetafileHeaderFromMetafile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 120 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index a965d4c..6a21afa 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -360,6 +360,34 @@ static void test_empty(void) stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); expect(Ok, stat); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmfPlusOnly, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(28, header.EmfPlusHeaderSize); + expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(0, U(header).EmfHeader.rclBounds.left); + expect(0, U(header).EmfHeader.rclBounds.top); + expect(-1, U(header).EmfHeader.rclBounds.right); + expect(-1, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat); @@ -418,6 +446,34 @@ static void test_empty(void) expect(Ok, stat); expectf(header.DpiY, yres); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmfPlusOnly, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(28, header.EmfPlusHeaderSize); + expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(0, U(header).EmfHeader.rclBounds.left); + expect(0, U(header).EmfHeader.rclBounds.top); + expect(-1, U(header).EmfHeader.rclBounds.right); + expect(-1, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); } @@ -603,6 +659,13 @@ static void test_emfonly(void) stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(InvalidParameter, stat); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmf, header.Type); + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + /* The rest is zeroed or seemingly random/uninitialized garbage. */ + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); expect(Ok, stat); @@ -650,6 +713,35 @@ static void test_emfonly(void) stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); expect(Ok, stat); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmf, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + /* For some reason a recoreded EMF Metafile has an EMF+ version. */ + todo_wine ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + expect(0, header.EmfPlusFlags); + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(0, header.EmfPlusHeaderSize); + expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(25, U(header).EmfHeader.rclBounds.left); + expect(25, U(header).EmfHeader.rclBounds.top); + expect(74, U(header).EmfHeader.rclBounds.right); + expect(74, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -765,6 +857,34 @@ static void test_emfonly(void) expect(Ok, stat); expectf(header.DpiY, yres); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmf, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + expect(0x10000, header.Version); + expect(0, header.EmfPlusFlags); + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(0, header.EmfPlusHeaderSize); + expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(25, U(header).EmfHeader.rclBounds.left); + expect(25, U(header).EmfHeader.rclBounds.top); + expect(74, U(header).EmfHeader.rclBounds.right); + expect(74, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); }

1 0

Dmitry Timoshkov : gdiplus: Implement GdipCreateMetafileFromFile.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: b1e77d3fc8cee25152309324aab632f9a9a3dcce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e77d3fc8cee25152309324a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 9 13:42:46 2016 -0500 gdiplus: Implement GdipCreateMetafileFromFile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d471a13..6d58170 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1922,8 +1922,22 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR *file, GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, GpMetafile **metafile) { - FIXME("(%p, %p): stub\n", file, metafile); - return NotImplemented; + GpStatus status; + IStream *stream; + + TRACE("(%p, %p)\n", file, metafile); + + if (!file || !metafile) return InvalidParameter; + + *metafile = NULL; + + status = GdipCreateStreamOnFile(file, GENERIC_READ, &stream); + if (status == Ok) + { + status = GdipCreateMetafileFromStream(stream, metafile); + IStream_Release(stream); + } + return status; } GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream,

1 0

Bruno Jesus : xinput1_4: Remove XInputGetDSoundAudioDeviceGuids and add XInputGetStateEx to spec file.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 2b5c93f77999279896c82a6b2f64a39f1773b18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5c93f77999279896c82a6b2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 10 18:46:25 2016 -0300 xinput1_4: Remove XInputGetDSoundAudioDeviceGuids and add XInputGetStateEx to spec file. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_4/xinput1_4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index 25a79a0..4b88c71 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -3,7 +3,7 @@ 3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState 4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities 5 stdcall XInputEnable(long) xinput1_3.XInputEnable -6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids 7 stdcall XInputGetBatteryInformation(long long ptr) xinput1_3.XInputGetBatteryInformation 8 stdcall XInputGetKeystroke(long long ptr) xinput1_3.XInputGetKeystroke 10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) +100 stdcall XInputGetStateEx(long ptr) xinput1_3.XInputGetStateEx

1 0

Bruno Jesus : xinput1_3: Test every xinput DLL version.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 50cb6434bb5ec4c7258067af7a28696908aef7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cb6434bb5ec4c7258067af7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 10 18:46:26 2016 -0300 xinput1_3: Test every xinput DLL version. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 93 +++++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 30 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index fadacae..ef11b50 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -47,14 +47,14 @@ static void test_set_state(void) result = pXInputSetState(controllerNum, &vibrator); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); - pXInputEnable(0); + if (pXInputEnable) pXInputEnable(0); vibrator.wLeftMotorSpeed = 65535; vibrator.wRightMotorSpeed = 65535; result = pXInputSetState(controllerNum, &vibrator); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); - pXInputEnable(1); + if (pXInputEnable) pXInputEnable(1); } result = pXInputSetState(XUSER_MAX_COUNT+1, &vibrator); @@ -218,37 +218,70 @@ static void test_get_batteryinformation(void) START_TEST(xinput) { + struct + { + const char *name; + int version; + } libs[] = { + { "xinput1_1.dll", 1 }, + { "xinput1_2.dll", 2 }, + { "xinput1_3.dll", 3 }, + { "xinput1_4.dll", 4 }, + { "xinput9_1_0.dll", 0 } /* legacy for XP/Vista */ + }; HMODULE hXinput; void *pXInputGetStateEx_Ordinal; - hXinput = LoadLibraryA( "xinput1_3.dll" ); + int i; - if (!hXinput) + for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++) { - win_skip("Could not load xinput1_3.dll\n"); - return; - } + hXinput = LoadLibraryA( libs[i].name ); + + if (!hXinput) + { + win_skip("Could not load %s\n", libs[i].name); + continue; + } + trace("Testing %s\n", libs[i].name); + + pXInputEnable = (void*)GetProcAddress(hXinput, "XInputEnable"); + pXInputSetState = (void*)GetProcAddress(hXinput, "XInputSetState"); + pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); + pXInputGetStateEx = (void*)GetProcAddress(hXinput, "XInputGetStateEx"); /* Win >= 8 */ + pXInputGetStateEx_Ordinal = (void*)GetProcAddress(hXinput, (LPCSTR) 100); + pXInputGetKeystroke = (void*)GetProcAddress(hXinput, "XInputGetKeystroke"); + pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); + pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); + pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); + + /* XInputGetStateEx may not be present by name, use ordinal in this case */ + if (!pXInputGetStateEx) + pXInputGetStateEx = pXInputGetStateEx_Ordinal; + + test_set_state(); + test_get_state(); + test_get_capabilities(); + + if (libs[i].version != 4) + test_get_dsoundaudiodevice(); + else + ok(!pXInputGetDSoundAudioDeviceGuids, "XInputGetDSoundAudioDeviceGuids exists in %s\n", libs[i].name); + + if (libs[i].version > 2) + { + test_get_keystroke(); + test_get_batteryinformation(); + ok(pXInputGetStateEx != NULL, "XInputGetStateEx not found in %s\n", libs[i].name); + } + else + { + ok(!pXInputGetKeystroke, "XInputGetKeystroke exists in %s\n", libs[i].name); + ok(!pXInputGetStateEx, "XInputGetStateEx exists in %s\n", libs[i].name); + ok(!pXInputGetBatteryInformation, "XInputGetBatteryInformation exists in %s\n", libs[i].name); + if (libs[i].version == 0) + ok(!pXInputEnable, "XInputEnable exists in %s\n", libs[i].name); + } - pXInputEnable = (void*)GetProcAddress(hXinput, "XInputEnable"); - pXInputSetState = (void*)GetProcAddress(hXinput, "XInputSetState"); - pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); - pXInputGetStateEx = (void*)GetProcAddress(hXinput, "XInputGetStateEx"); /* Win >= 8 */ - pXInputGetStateEx_Ordinal = (void*)GetProcAddress(hXinput, (LPCSTR) 100); - pXInputGetKeystroke = (void*)GetProcAddress(hXinput, "XInputGetKeystroke"); - pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); - pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); - pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); - - /* XInputGetStateEx may not be present by name, use ordinal in this case */ - if (!pXInputGetStateEx) - pXInputGetStateEx = pXInputGetStateEx_Ordinal; - ok (pXInputGetStateEx != NULL, "XInputGetStateEx not found in this dll version\n"); - - test_set_state(); - test_get_state(); - test_get_keystroke(); - test_get_capabilities(); - test_get_dsoundaudiodevice(); - test_get_batteryinformation(); - - FreeLibrary(hXinput); + FreeLibrary(hXinput); + } }

1 0