July 2017 - Wine-commits - list.winehq.org

Owen Rudge : wsdapi: Implement IWSDUdpAddress_GetTransportAddress[Ex].
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: d140cd504ab7d0c0d3e9a07668138a9bec80df28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d140cd504ab7d0c0d3e9a0766… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:15 2017 +0100 wsdapi: Implement IWSDUdpAddress_GetTransportAddress[Ex]. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/address.c | 57 ++++++++++++++++++++++++++++++++++++++++----- dlls/wsdapi/tests/address.c | 28 +++++++++++----------- 2 files changed, 65 insertions(+), 20 deletions(-) diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 587d090..05c4bb9 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -35,6 +35,8 @@ typedef struct IWSDUdpAddressImpl { IWSDUdpAddress IWSDUdpAddress_iface; LONG ref; SOCKADDR_STORAGE sockAddr; + WCHAR ipv4Address[25]; + WCHAR ipv6Address[64]; } IWSDUdpAddressImpl; static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) @@ -121,16 +123,59 @@ static HRESULT WINAPI IWSDUdpAddressImpl_SetPort(IWSDUdpAddress *This, WORD wPor return E_NOTIMPL; } -static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddress(IWSDUdpAddress *This, LPCWSTR *ppszAddress) +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) { - FIXME("(%p, %p)\n", This, ppszAddress); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + SOCKADDR_STORAGE storage; + DWORD size; + + TRACE("(%p, %d, %p)\n", This, fSafe, ppszAddress); + + if (ppszAddress == NULL) + return E_POINTER; + + *ppszAddress = NULL; + + switch (((SOCKADDR_IN *) &impl->sockAddr)->sin_family) + { + case AF_INET: + size = sizeof(impl->ipv4Address) / sizeof(WCHAR); + + if (WSAAddressToStringW((LPSOCKADDR) &impl->sockAddr, sizeof(SOCKADDR_IN), NULL, impl->ipv4Address, &size) == 0) + { + *ppszAddress = impl->ipv4Address; + return S_OK; + } + + break; + + case AF_INET6: + size = sizeof(impl->ipv6Address) / sizeof(WCHAR); + + /* Copy the SOCKADDR structure so we can remove the scope ID if not required */ + memcpy(&storage, &impl->sockAddr, sizeof(SOCKADDR_IN6)); + + if (!fSafe) + ((SOCKADDR_IN6 *) &storage)->sin6_scope_id = 0; + + if (WSAAddressToStringW((LPSOCKADDR) &storage, sizeof(SOCKADDR_IN6), NULL, impl->ipv6Address, &size) == 0) + { + *ppszAddress = impl->ipv6Address; + return S_OK; + } + + break; + + default: + return S_OK; + } + + return HRESULT_FROM_WIN32(WSAGetLastError()); } -static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddress(IWSDUdpAddress *This, LPCWSTR *ppszAddress) { - FIXME("(%p, %d, %p)\n", This, fSafe, ppszAddress); - return E_NOTIMPL; + return IWSDUdpAddressImpl_GetTransportAddressEx(This, FALSE, ppszAddress); } static HRESULT WINAPI IWSDUdpAddressImpl_SetTransportAddress(IWSDUdpAddress *This, LPCWSTR pszAddress) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index b26a3b9..2142045 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -95,7 +95,7 @@ static void GetSetTransportAddress_udp_tests(void) ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08x\n", rc); /* Try setting a null address */ @@ -111,12 +111,12 @@ static void GetSetTransportAddress_udp_tests(void) ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); - todo_wine ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); - todo_wine ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); /* Try setting an IPv4 address with a port number */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4AddressWithPort); @@ -127,17 +127,17 @@ static void GetSetTransportAddress_udp_tests(void) ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); - todo_wine ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); /* Try setting an IPv6 address with a port number */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6AddressWithPort); ok(rc == S_OK, "SetTransportAddress(ipv6AddressWithPort) failed: %08x\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); - todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); todo_wine ok(lstrcmpW(returnedAddress, ipv6AddressWithPort) == 0, "Returned address != ipv6AddressWithPort (%s)\n", wine_dbgstr_w(returnedAddress)); /* Release the object */ @@ -324,7 +324,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); todo_wine ok(lstrcmpW(returnedAddress, expectedIpv4TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); @@ -341,7 +341,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); todo_wine ok(lstrcmpW(returnedAddress, expectedIpv4TransportAddrNoPort) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); @@ -364,7 +364,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); todo_wine ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); @@ -381,7 +381,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); todo_wine ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddrNoPort) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress));

1 0

Owen Rudge : wsdapi: Implement IWSDUdpAddress_Get/SetPort.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 52ad4d0e6624041ccc8c13504e4d8480fc92ff9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ad4d0e6624041ccc8c13504… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 28 22:13:18 2017 +0100 wsdapi: Implement IWSDUdpAddress_Get/SetPort. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/address.c | 22 ++++++++++++++++++---- dlls/wsdapi/tests/address.c | 22 +++++++++++----------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 05c4bb9..f225930 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -37,6 +37,7 @@ typedef struct IWSDUdpAddressImpl { SOCKADDR_STORAGE sockAddr; WCHAR ipv4Address[25]; WCHAR ipv6Address[64]; + WORD port; } IWSDUdpAddressImpl; static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) @@ -113,14 +114,27 @@ static HRESULT WINAPI IWSDUdpAddressImpl_Deserialize(IWSDUdpAddress *This, LPCWS static HRESULT WINAPI IWSDUdpAddressImpl_GetPort(IWSDUdpAddress *This, WORD *pwPort) { - FIXME("(%p, %p)\n", This, pwPort); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + + TRACE("(%p, %p)\n", This, pwPort); + + if (pwPort == NULL) + { + return E_POINTER; + } + + *pwPort = impl->port; + return S_OK; } static HRESULT WINAPI IWSDUdpAddressImpl_SetPort(IWSDUdpAddress *This, WORD wPort) { - FIXME("(%p, %d)\n", This, wPort); - return E_NOTIMPL; + IWSDUdpAddressImpl *impl = impl_from_IWSDUdpAddress(This); + + TRACE("(%p, %d)\n", This, wPort); + + impl->port = wPort; + return S_OK; } static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 2142045..1a18f02 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -164,32 +164,32 @@ static void GetSetPort_udp_tests(void) /* No test for GetPort(NULL) as this causes an access violation exception on Windows */ rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); /* Try setting a zero port */ rc = IWSDUdpAddress_SetPort(udpAddress, 0); - todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); /* Set a real port */ rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort1); - todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); - todo_wine ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); /* Now set a different port */ rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort2); - todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); - todo_wine ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); /* Release the object */ ret = IWSDUdpAddress_Release(udpAddress); @@ -330,7 +330,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetPort doesn't return the port set via the socket */ rc = IWSDUdpAddress_GetPort(udpAddress, &port); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); /* Try setting an IPv4 address without a port */ @@ -370,7 +370,7 @@ static void GetSetSockaddr_udp_tests(void) /* Check that GetPort doesn't return the port set via the socket */ rc = IWSDUdpAddress_GetPort(udpAddress, &port); - todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); /* Try setting an IPv6 address without a port */

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 4c85b8e37cf59d5e113ea001e8357553c82d577a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c85b8e37cf59d5e113ea001e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 30 10:41:02 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 280 +++++++++++++++++++++++---------------------------------------- 1 file changed, 100 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c85b8e37cf59d5e113ea…

1 0

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 6f2977c25ef01ff679e5cfeaa3a3eeb34a961e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2977c25ef01ff679e5cfeaa… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Sat Jul 1 14:37:16 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 244 +++++++++++++++++++++------------------------------------------ 1 file changed, 81 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f2977c25ef01ff679e5c…

1 0

Nikolay Sivov : d3drm/tests: Additional test for SetOptions().
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 84d340683e2cef51f719765d4f6f195c3f1cc84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d340683e2cef51f719765d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 30 10:41:21 2017 +0300 d3drm/tests: Additional test for SetOptions(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9b166aa..950edb1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6804,6 +6804,13 @@ static void test_animation(void) ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION), "Unexpected default options %#x.\n", options); + /* Mask contains undefined bits together with valid one. */ + hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000 | D3DRMANIMATION_OPEN); + ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#x.\n", options); + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION); ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);

1 0

Nikolay Sivov : d3drm/tests: Some tests for animation keys handling.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 31763493873e9991e2e0af5b6660ffb7da30366f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31763493873e9991e2e0af5b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 30 10:41:22 2017 +0300 d3drm/tests: Some tests for animation keys handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 950edb1..dcc6dd2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6708,10 +6708,15 @@ static void test_animation(void) IDirect3DRMAnimation *animation; D3DRMANIMATIONOPTIONS options; IDirect3DRMObject *obj, *obj2; + D3DRMANIMATIONKEY keys[10]; IDirect3DRMFrame3 *frame3; IDirect3DRMFrame *frame; + D3DRMANIMATIONKEY key; IDirect3DRM *d3drm1; + D3DRMQUATERNION q; + DWORD count, i; HRESULT hr; + D3DVECTOR v; hr = Direct3DRMCreate(&d3drm1); ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr 0x%08x.\n", hr); @@ -6829,6 +6834,141 @@ static void test_animation(void) options = IDirect3DRMAnimation_GetOptions(animation); ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options); + /* Key management. */ + hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 1.0f, 0.0f, 0.0f); +todo_wine + ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr); + +if (hr == S_OK) +{ + hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f); + ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 2.0f, 0.0f, 0.0f); + ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_AddPositionKey(animation, 99.0f, 3.0f, 1.0f, 0.0f); + ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_AddPositionKey(animation, 80.0f, 4.0f, 1.0f, 0.0f); + ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr); + + v.x = 1.0f; + v.y = 0.0f; + v.z = 0.0f; + D3DRMQuaternionFromRotation(&q, &v, 1.0f); + + hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q); + ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr); + + count = 0; + memset(keys, 0, sizeof(keys)); + hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 99.0f, &count, keys); + ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr); + ok(count == 6, "Unexpected key count %u.\n", count); + + ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType); + ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType); + ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType); + ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType); + ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType); + ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType); + + /* Relative order, keys are returned sorted by time. */ + ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime); + ok(keys[2].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[2].dvTime); + ok(keys[3].dvTime == 80.0f, "Unexpected key time %.8e.\n", keys[3].dvTime); + ok(keys[4].dvTime == 99.0f, "Unexpected key time %.8e.\n", keys[4].dvTime); + + /* For keys with same time, order they were added in is kept. */ + ok(keys[1].dvPositionKey.x == 1.0f, "Unexpected key position x %.8e.\n", keys[1].dvPositionKey.x); + ok(keys[2].dvPositionKey.x == 2.0f, "Unexpected key position x %.8e.\n", keys[2].dvPositionKey.x); + ok(keys[3].dvPositionKey.x == 4.0f, "Unexpected key position x %.8e.\n", keys[3].dvPositionKey.x); + ok(keys[4].dvPositionKey.x == 3.0f, "Unexpected key position x %.8e.\n", keys[4].dvPositionKey.x); + + for (i = 0; i < count; i++) + { + ok(keys[i].dwSize == sizeof(*keys), "%u: unexpected dwSize value %u.\n", i, keys[i].dwSize); + + switch (keys[i].dwKeyType) + { + case D3DRMANIMATION_ROTATEKEY: + ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID); + break; + case D3DRMANIMATION_POSITIONKEY: + ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID); + break; + case D3DRMANIMATION_SCALEKEY: + ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID); + break; + default: + ok(0, "%u: unknown key type %d.\n", i, keys[i].dwKeyType); + } + } + + /* No keys in this range. */ + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, NULL); + ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr); + ok(count == 0, "Unexpected key count %u.\n", count); + + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, keys); + ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr); + ok(count == 0, "Unexpected key count %u.\n", count); + + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 0.0f, &count, NULL); + ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get animation keys, hr %#x.\n", hr); + ok(count == 4, "Unexpected key count %u.\n", count); + + hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + /* Time is 0-based. */ + count = 123; + hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + ok(count == 123, "Unexpected key count %u.\n", count); + + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, &count, NULL); + ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr); + ok(count == 0, "Unexpected key count %u.\n", count); + + count = 10; + hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, 100.0f, &count, NULL); + ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr); + ok(count == 6, "Unexpected key count %u.\n", count); + + /* AddKey() tests. */ + hr = IDirect3DRMAnimation2_AddKey(animation2, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&key, 0, sizeof(key)); + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + hr = IDirect3DRMAnimation2_AddKey(animation2, &key); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&key, 0, sizeof(key)); + key.dwSize = sizeof(key) - 1; + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + hr = IDirect3DRMAnimation2_AddKey(animation2, &key); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&key, 0, sizeof(key)); + key.dwSize = sizeof(key) + 1; + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + hr = IDirect3DRMAnimation2_AddKey(animation2, &key); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + memset(&key, 0, sizeof(key)); + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + hr = IDirect3DRMAnimation2_AddKey(animation2, &key); + ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr); +} IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Nikolay Sivov : d3drm: Use AddKey() method internally to add all types of keys.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 9ba36da7111b696bfd75637b6068f4435f3a7fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba36da7111b696bfd75637b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 30 10:41:23 2017 +0300 d3drm: Use AddKey() method internally to add all types of keys. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 106 +++++++++++++++++++++++++++++++---------------- dlls/d3drm/tests/d3drm.c | 1 + 2 files changed, 71 insertions(+), 36 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 79a3cb0..a2643fb 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3272,27 +3272,91 @@ static HRESULT WINAPI d3drm_animation1_SetOptions(IDirect3DRMAnimation *iface, D return d3drm_animation2_SetOptions(&animation->IDirect3DRMAnimation2_iface, options); } -static HRESULT WINAPI d3drm_animation1_AddRotateKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DRMQUATERNION *q) +static HRESULT WINAPI d3drm_animation2_AddKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) { - FIXME("iface %p, time %.8e, q %p.\n", iface, time, q); + FIXME("iface %p, key %p.\n", iface, key); return E_NOTIMPL; } +static HRESULT WINAPI d3drm_animation2_AddRotateKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, D3DRMQUATERNION *q) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, q %p.\n", iface, time, q); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_ROTATEKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dqRotateKey = *q; + + return d3drm_animation2_AddKey(iface, &key); +} + +static HRESULT WINAPI d3drm_animation1_AddRotateKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DRMQUATERNION *q) +{ + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); + + TRACE("iface %p, time %.8e, q %p.\n", iface, time, q); + + return d3drm_animation2_AddRotateKey(&animation->IDirect3DRMAnimation2_iface, time, q); +} + +static HRESULT WINAPI d3drm_animation2_AddPositionKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, + D3DVALUE x, D3DVALUE y, D3DVALUE z) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dvPositionKey.u1.x = x; + key.u.dvPositionKey.u2.y = y; + key.u.dvPositionKey.u3.z = z; + + return d3drm_animation2_AddKey(iface, &key); +} + static HRESULT WINAPI d3drm_animation1_AddPositionKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + return d3drm_animation2_AddPositionKey(&animation->IDirect3DRMAnimation2_iface, time, x, y, z); +} + +static HRESULT WINAPI d3drm_animation2_AddScaleKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, + D3DVALUE x, D3DVALUE y, D3DVALUE z) +{ + D3DRMANIMATIONKEY key; + + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + key.dwSize = sizeof(key); + key.dwKeyType = D3DRMANIMATION_SCALEKEY; + key.dvTime = time; + key.dwID = 0; + key.u.dvScaleKey.u1.x = x; + key.u.dvScaleKey.u2.y = y; + key.u.dvScaleKey.u3.z = z; + + return d3drm_animation2_AddKey(iface, &key); } static HRESULT WINAPI d3drm_animation1_AddScaleKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); + + return d3drm_animation2_AddScaleKey(&animation->IDirect3DRMAnimation2_iface, time, x, y, z); } static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3DVALUE time) @@ -3346,29 +3410,6 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnima return d3drm_animation2_GetOptions(&animation->IDirect3DRMAnimation2_iface); } -static HRESULT WINAPI d3drm_animation2_AddRotateKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, D3DRMQUATERNION *q) -{ - FIXME("iface %p, time %.8e, q %p.\n", iface, time, q); - - return E_NOTIMPL; -} - -static HRESULT WINAPI d3drm_animation2_AddPositionKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, - D3DVALUE x, D3DVALUE y, D3DVALUE z) -{ - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); - - return E_NOTIMPL; -} - -static HRESULT WINAPI d3drm_animation2_AddScaleKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, - D3DVALUE x, D3DVALUE y, D3DVALUE z) -{ - FIXME("iface %p, time %.8e, x %.8e, y %.8e, z %.8e.\n", iface, time, x, y, z); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D3DVALUE time) { FIXME("iface %p, time %.8e.\n", iface, time); @@ -3417,13 +3458,6 @@ static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *ifac return E_NOTIMPL; } -static HRESULT WINAPI d3drm_animation2_AddKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) -{ - FIXME("iface %p, key %p.\n", iface, key); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3drm_animation2_ModifyKey(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONKEY *key) { FIXME("iface %p, key %p.\n", iface, key); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index dcc6dd2..3613b57 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6858,6 +6858,7 @@ if (hr == S_OK) v.z = 0.0f; D3DRMQuaternionFromRotation(&q, &v, 1.0f); + /* NULL quaternion pointer leads to a crash on Windows. */ hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q); ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);

1 0

Jacek Caban : winhttp/tests: Get rid of unneeded Sleep() call.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: fc33e982d79a9e791e0b22accf7fc72934076dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc33e982d79a9e791e0b22acc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 18:04:22 2017 +0200 winhttp/tests: Get rid of unneeded Sleep() call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 5d76d12..0f0f7b8 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -604,6 +604,5 @@ START_TEST (notification) { test_connection_cache(); test_redirect(); - Sleep(2000); /* make sure previous connection is evicted from cache */ test_async(); }

1 0

Pierre Schweitzer : mpr: Implement WNetConnectionDialog().
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 26192671700360859cd8a0133dabcd96ec1a786b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26192671700360859cd8a0133… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sun Jul 2 11:52:59 2017 +0200 mpr: Implement WNetConnectionDialog(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index bfe6275..7b24693 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2440,10 +2440,18 @@ DWORD WINAPI WNetGetUserW( LPCWSTR lpName, LPWSTR lpUserID, LPDWORD lpBufferSize */ DWORD WINAPI WNetConnectionDialog( HWND hwnd, DWORD dwType ) { - FIXME( "(%p, %08X): stub\n", hwnd, dwType ); + CONNECTDLGSTRUCTW conn_dlg; + NETRESOURCEW net_res; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + ZeroMemory(&conn_dlg, sizeof(conn_dlg)); + ZeroMemory(&net_res, sizeof(net_res)); + + conn_dlg.cbStructure = sizeof(conn_dlg); + conn_dlg.lpConnRes = &net_res; + conn_dlg.hwndOwner = hwnd; + net_res.dwType = dwType; + + return WNetConnectionDialog1W(&conn_dlg); } /*********************************************************************

1 0

Hugh McMaster : reg/tests: Test the effect of whitespace-only lines during hex data concatenation.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 499cce6e765b71cd03f98f7382a09f9042d74e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=499cce6e765b71cd03f98f738… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:16 2017 +0000 reg/tests: Test the effect of whitespace-only lines during hex data concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9a974b4..316a3f6 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2065,6 +2065,16 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60f\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n \n" + " 63,61,74,\\\n\t\n\t\n" + " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" + " 61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine60f", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" " 25,50,41,54,48,25,00\n" "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" @@ -3349,6 +3359,16 @@ static void test_unicode_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60f\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\\n \n" + " 63,00,61,00,74,00,\\\n\t\n\t\n" + " 65,00,6e,00,\\\n\t \t\n\t \t\n\t \t\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine60f", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" " 25,50,41,54,48,25,00\n" "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n"

1 0