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

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHMultiply3().
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 31fcb336a2d0d76a5b7dd7d988ffc2276c0f241b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fcb336a2d0d76a5b7dd7d98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 23 11:04:31 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHMultiply3(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4341368..3843abe 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3274,7 +3274,7 @@ static void test_D3DXSHMultiply3(void) 1.17999995e+00f, 1.19000006e+00f, }; - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { a[i] = 1.0f + i / 100.0f; b[i] = 3.0f - i / 100.0f; @@ -3282,7 +3282,7 @@ static void test_D3DXSHMultiply3(void) } D3DXSHMultiply3(c, a, b); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(expected); ++i) { equal = compare_float(c[i], expected[i], 4); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[i], c[i]); @@ -3290,7 +3290,7 @@ static void test_D3DXSHMultiply3(void) memcpy(c, a, sizeof(c)); D3DXSHMultiply3(c, c, b); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(expected_aliased); ++i) { equal = compare_float(c[i], expected_aliased[i], 32); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected_aliased[i], c[i]);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 5d718d62a93818881d838c0cad3350d04f11cb1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d718d62a93818881d838c0ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 25 02:27:06 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 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3799a9b..cfd094d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-26 10:24+0300\n" +"PO-Revision-Date: 2017-05-25 02:24+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11764,11 +11764,8 @@ msgid "&About Registry Editor" msgstr "&О редакторе реестра" #: regedit.rc:91 regedit.rc:98 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "развернуто" +msgstr "Развернуть" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -12245,11 +12242,8 @@ msgid "" msgstr "Вы точно хотите удалить ключ реестра «%1» и все вложенные ключи?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "свернуто" +msgstr "Свернуть" #: regsvr32.rc:32 msgid ""

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: db000d21285ae72b3c4801b539d1c4da1710782e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db000d21285ae72b3c4801b53… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 25 08:06:10 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2d64d32..39a02a1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-26 09:05+0300\n" +"PO-Revision-Date: 2017-05-25 08:05+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7256,12 +7256,12 @@ msgstr "numatytasis" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "išplėstas" +msgstr "išskleistas" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "sutrauktas" +msgstr "suskleistas" #: oleacc.rc:109 msgctxt "object state" @@ -11732,7 +11732,7 @@ msgstr "&Kelių eilučių reikšmė" #: regedit.rc:55 regedit.rc:107 regedit.rc:129 msgid "&Expandable String Value" -msgstr "&Išskleidžiama eilutės reikšmė" +msgstr "&Išplečiama eilutės reikšmė" #: regedit.rc:59 regedit.rc:112 msgid "&Rename\tF2" @@ -11767,11 +11767,8 @@ msgid "&About Registry Editor" msgstr "&Apie Registro tvarkytuvę" #: regedit.rc:91 regedit.rc:98 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "išplėstas" +msgstr "Išskleisti" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -12251,11 +12248,8 @@ msgid "" msgstr "Ar tikrai norite pašalinti registro raktą „%1“ ir visus jo porakčius?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "sutrauktas" +msgstr "Suskleisti" #: regsvr32.rc:32 msgid ""

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 8b4a31ebd5d741dd5caed3b6fe284b1ce9e55f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4a31ebd5d741dd5caed3b6f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 25 12:50:31 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5e7f597..c1fa0c5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7235,7 +7235,7 @@ msgstr "vain luku" #: oleacc.rc:105 msgctxt "object state" msgid "hot tracked" -msgstr "osoitettu" +msgstr "pikajäljitetty" #: oleacc.rc:106 msgctxt "object state" @@ -7250,7 +7250,7 @@ msgstr "laajennettu" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "kutistettu" +msgstr "tiivistetty" #: oleacc.rc:109 msgctxt "object state" @@ -7260,7 +7260,7 @@ msgstr "varattu" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "kelluva" +msgstr "irrallinen" #: oleacc.rc:111 msgctxt "object state" @@ -7315,7 +7315,7 @@ msgstr "linkitetty" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "käyty" +msgstr "läpikäyty" #: oleacc.rc:122 msgctxt "object state" @@ -11742,11 +11742,8 @@ msgid "&About Registry Editor" msgstr "&Tietoja rekisterieditorista" #: regedit.rc:91 regedit.rc:98 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "laajennettu" +msgstr "Laajenna" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -12222,11 +12219,8 @@ msgid "" msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1' ja sen aliavaimet?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "kutistettu" +msgstr "Tiivistä" #: regsvr32.rc:32 msgid ""

1 0

Stefan Dösinger : iphlpapi: Implement if_nametoindex.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: a1026df4031292eeb8b33b2c0ca970560dc8b038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1026df4031292eeb8b33b2c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 24 19:09:53 2017 +0200 iphlpapi: Implement if_nametoindex. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 23 ++++++++++++++++++++++- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4e01926..4e5970c 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -160,7 +160,7 @@ @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) #@ stub if_indextoname -#@ stub if_nametoindex +@ stdcall if_nametoindex(str) IPHLP_if_nametoindex #@ stub InitializeIpForwardEntry #@ stub InitializeIpInterfaceEntry #@ stub InitializeUnicastIpAddressEntry diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 796950e..c592a90 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3208,3 +3208,17 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) luid->Info.IfType = row.dwType; return NO_ERROR; } + +/****************************************************************** + * if_nametoindex (IPHLPAPI.@) + */ +IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) +{ + IF_INDEX idx; + + TRACE("(%s)\n", name); + if (getInterfaceIndexByName(name, &idx) == NO_ERROR) + return idx; + + return 0; +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 5fb23fb..3369f78 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -96,6 +96,8 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); + static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); @@ -144,6 +146,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } } @@ -1792,7 +1795,7 @@ static void test_interface_identifier_conversion(void) SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; char nameA[IF_MAX_STRING_SIZE + 1]; - NET_IFINDEX index; + NET_IFINDEX index, index2; if (!pConvertInterfaceIndexToLuid) { @@ -1951,6 +1954,24 @@ static void test_interface_identifier_conversion(void) ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + + /* if_nametoindex */ + if (pif_nametoindex) + { + index2 = pif_nametoindex( NULL ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( nameA ); + ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); + /* Wargaming.net Game Center passes a GUID-like string. */ + index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); + ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + } + else + { + skip("if_nametoindex not supported\n"); + } } static void test_GetIfEntry2(void)

1 0

Jacek Caban : ws2_32: Added GetAddrInfoExCancel stub implementation.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 3cb6d50cd678ba9a92ffdaf4b61edf07dad7d960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb6d50cd678ba9a92ffdaf4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 21:01:47 2017 +0200 ws2_32: Added GetAddrInfoExCancel stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 9 +++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2tcpip.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 44bd667..1524192 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6813,6 +6813,15 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp } /*********************************************************************** + * GetAddrInfoExCancel (WS2_32.@) + */ +int WINAPI GetAddrInfoExCancel(HANDLE *handle) +{ + FIXME("(%p)\n", handle); + return WSA_INVALID_HANDLE; +} + +/*********************************************************************** * GetAddrInfoW (WS2_32.@) */ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index df5e9d3..db34fc1 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -52,6 +52,7 @@ @ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) +@ stdcall GetAddrInfoExCancel(ptr) @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index e14a660..934c727 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -178,6 +178,7 @@ int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct timeval*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); #define GetAddrInfoEx WINELIB_NAME_AW(GetAddrInfoExW) +int WINAPI GetAddrInfoExCancel(HANDLE*); int WINAPI WS(getnameinfo)(const SOCKADDR*,WS(socklen_t),PCHAR,DWORD,PCHAR,DWORD,INT); #define GetNameInfoA WS(getnameinfo) INT WINAPI GetNameInfoW(const SOCKADDR*,WS(socklen_t),PWCHAR,DWORD,PWCHAR,DWORD,INT);

1 0

Austin English : comsvcs: Label ordinal.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 5abe62410213a07122f718c1cc52d3848040dbeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5abe62410213a07122f718c1c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 00:17:21 2017 -0500 comsvcs: Label ordinal. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/comsvcs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comsvcs/comsvcs.spec b/dlls/comsvcs/comsvcs.spec index 6bd6ec9..3ace366 100644 --- a/dlls/comsvcs/comsvcs.spec +++ b/dlls/comsvcs/comsvcs.spec @@ -1,4 +1,4 @@ -@ stub CosGetCallContext +5 stub CosGetCallContext @ stub CoCreateActivity @ stub CoEnterServiceDomain @ stub CoLeaveServiceDomain

1 0

Alistair Leslie-Hughes : oleaut32/tests: Add more VarCat tests.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: e0b5496ccbafa33a5b2e78b12fa9d445804a57e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b5496ccbafa33a5b2e78b12… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 23 00:41:00 2017 +0000 oleaut32/tests: Add more VarCat tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 206 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 0e86ffb..a271c50 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -97,6 +97,150 @@ static BOOL has_i8; #define R8_MAX DBL_MAX #define R8_MIN DBL_MIN +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(dispatch_invoke); + +typedef struct +{ + IDispatch IDispatch_iface; + VARTYPE vt; + HRESULT result; +} DummyDispatch; + +static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) +{ + return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); +} + +static ULONG WINAPI DummyDispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI DummyDispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI DummyDispatch_QueryInterface(IDispatch *iface, + REFIID riid, + void** ppvObject) +{ + *ppvObject = NULL; + + if (IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + IDispatch_AddRef(iface); + } + + return *ppvObject ? S_OK : E_NOINTERFACE; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfo(IDispatch *iface, UINT tinfo, LCID lcid, ITypeInfo **ti) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, + UINT cnames, LCID lcid, DISPID *dispid) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, + DISPID dispid, REFIID riid, + LCID lcid, WORD wFlags, + DISPPARAMS *params, + VARIANT *res, + EXCEPINFO *ei, + UINT *arg_err) +{ + DummyDispatch *This = impl_from_IDispatch(iface); + + CHECK_EXPECT(dispatch_invoke); + + ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", wine_dbgstr_guid(riid)); + ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); + + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); + ok(params->cArgs == 0, "got %d\n", params->cArgs); + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); + + ok(res != NULL, "got %p\n", res); + ok(V_VT(res) == VT_EMPTY, "got %d\n", V_VT(res)); + ok(ei == NULL, "got %p\n", ei); + ok(arg_err == NULL, "got %p\n", arg_err); + + if (FAILED(This->result)) + return This->result; + + V_VT(res) = This->vt; + if (This->vt == VT_UI1) + V_UI1(res) = 34; + else if (This->vt == VT_NULL) + { + V_VT(res) = VT_NULL; + V_BSTR(res) = NULL; + } + else + memset(res, 0, sizeof(*res)); + + return S_OK; +} + +static const IDispatchVtbl DummyDispatch_VTable = +{ + DummyDispatch_QueryInterface, + DummyDispatch_AddRef, + DummyDispatch_Release, + DummyDispatch_GetTypeInfoCount, + DummyDispatch_GetTypeInfo, + DummyDispatch_GetIDsOfNames, + DummyDispatch_Invoke +}; + +static void init_test_dispatch(VARTYPE vt, DummyDispatch *dispatch) +{ + dispatch->IDispatch_iface.lpVtbl = &DummyDispatch_VTable; + dispatch->vt = vt; + dispatch->result = S_OK; +} + typedef struct IRecordInfoImpl { IRecordInfo IRecordInfo_iface; @@ -5607,6 +5751,7 @@ static void test_VarCat(void) HRESULT hres; HRESULT expected_error_num; int cmp; + DummyDispatch dispatch; CHECKPTR(VarCat); @@ -5941,6 +6086,67 @@ static void test_VarCat(void) VariantClear(&result); VariantClear(&expected); + /* Dispatch conversion */ + init_test_dispatch(VT_NULL, &dispatch); + V_VT(&left) = VT_DISPATCH; + V_DISPATCH(&left) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_UI1, &dispatch); + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + V_VT(&left) = VT_BSTR; + V_BSTR(&left) = SysAllocString(sz12); + SET_EXPECT(dispatch_invoke); + hres = pVarCat(&left,&right,&result); + ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + ok(!strcmp_wa(V_BSTR(&result), "1234"), "got %s\n", wine_dbgstr_w(V_BSTR(&result))); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + dispatch.result = E_OUTOFMEMORY; + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + /* Test boolean conversion */ V_VT(&left) = VT_BOOL; V_BOOL(&left) = VARIANT_TRUE;

1 0

Hans Leidekker : webservices: Add support for writing comments in binary mode.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: df5c1b6ed8c7e920be1616b6a988ee5d7a585666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5c1b6ed8c7e920be1616b6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:38 2017 +0200 webservices: Add support for writing comments in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 18 ++++++++++++++++-- dlls/webservices/writer.c | 24 +++++++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3e8dad4..2102c15 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3130,8 +3130,10 @@ static void test_repeating_element(void) static const WS_XML_STRING *init_xmlstring( const char *src, WS_XML_STRING *str ) { if (!src) return NULL; - str->length = strlen( src ); - str->bytes = (BYTE *)src; + str->length = strlen( src ); + str->bytes = (BYTE *)src; + str->dictionary = NULL; + str->id = 0; return str; } @@ -3453,6 +3455,8 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0x05,0x02,'p','2',0x01,'t',0x98,0x00,0x09,0x02,'p','2',0x02,'n','s',0x01}; static const char res103[] = {0x40,0x01,'t',0x05,0x02,'p','2',0x01,'t',0x98,0x04,'t','e','s','t',0x09,0x02,'p','2',0x02,'n','s',0x01}; + static const char res200[] = + {0x02,0x07,'c','o','m','m','e','n','t'}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; static const char prefix[] = "p", prefix2[] = "p2"; @@ -3460,6 +3464,7 @@ static void test_binary_encoding(void) const WS_XML_STRING *prefix_ptr, *localname_ptr, *ns_ptr; WS_XML_STRING str, str2, str3, localname2 = {1, (BYTE *)"t"}, empty = {0, NULL}; WS_XML_UTF8_TEXT utf8 = {{WS_XML_TEXT_TYPE_UTF8}}; + WS_XML_COMMENT_NODE comment = {{WS_XML_NODE_TYPE_COMMENT}}; WS_XML_WRITER *writer; HRESULT hr; ULONG i; @@ -3549,6 +3554,15 @@ static void test_binary_encoding(void) if (hr == S_OK) check_output_bin( writer, attr_tests[i].result, attr_tests[i].len_result, __LINE__ ); } + hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + comment.value.bytes = (BYTE *)"comment"; + comment.value.length = sizeof("comment") - 1; + hr = WsWriteNode( writer, &comment.node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr == S_OK) check_output_bin( writer, res200, sizeof(res200), __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index adf110d..bbd969d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3551,7 +3551,7 @@ static HRESULT write_add_comment_node( struct writer *writer, const WS_XML_STRIN return S_OK; } -static HRESULT write_comment( struct writer *writer ) +static HRESULT write_comment_text( struct writer *writer ) { const WS_XML_COMMENT_NODE *comment = (const WS_XML_COMMENT_NODE *)writer->current; HRESULT hr; @@ -3563,6 +3563,28 @@ static HRESULT write_comment( struct writer *writer ) return S_OK; } +static HRESULT write_comment_bin( struct writer *writer ) +{ + const WS_XML_COMMENT_NODE *comment = (const WS_XML_COMMENT_NODE *)writer->current; + HRESULT hr; + + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, RECORD_COMMENT ); + return write_string( writer, comment->value.bytes, comment->value.length ); +} + +static HRESULT write_comment( struct writer *writer ) +{ + switch (writer->output_enc) + { + case WS_XML_WRITER_ENCODING_TYPE_TEXT: return write_comment_text( writer ); + case WS_XML_WRITER_ENCODING_TYPE_BINARY: return write_comment_bin( writer ); + default: + ERR( "unhandled encoding %u\n", writer->output_enc ); + return WS_E_NOT_SUPPORTED; + } +} + static HRESULT write_comment_node( struct writer *writer, const WS_XML_STRING *value ) { HRESULT hr;

1 0

Hans Leidekker : webservices/tests: Add a test to show that the reader converts text to UTF-8.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 2ac34925376040cd0b88c7a101d2979f01b4621d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac34925376040cd0b88c7a10… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:39 2017 +0200 webservices/tests: Add a test to show that the reader converts text to UTF-8. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 93b7ed5..b7c3c75 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -439,14 +439,18 @@ static void test_WsSetInput(void) static char test21[] = {0,0}; static char test22[] = {0,0,0}; static char test23[] = {'<',0,'?',0,'x',0,'m',0,'l',0}; + static char test24[] = {'<',0,'a',0,'>',0,'b',0,'<',0,'/',0,'>',0}; HRESULT hr; WS_XML_READER *reader; WS_XML_READER_PROPERTY prop; WS_XML_READER_TEXT_ENCODING enc; WS_XML_READER_BUFFER_INPUT input; + WS_XML_TEXT_NODE *text; + WS_XML_UTF8_TEXT *utf8; WS_CHARSET charset; const WS_XML_NODE *node; ULONG i, size, max_depth; + BOOL found; static const struct { void *data; @@ -552,6 +556,35 @@ static void test_WsSetInput(void) hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( max_depth == 16, "got %u\n", max_depth ); + + /* show that the reader converts text to UTF-8 */ + enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; + enc.charSet = WS_CHARSET_UTF16LE; + input.encodedData = (void *)test24; + input.encodedDataSize = sizeof(test24); + hr = WsSetInput( reader, &enc.encoding, &input.input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + if (hr == S_OK) + { + ok( found == TRUE, "got %d\n", found ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + text = (WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + ok( text->text != NULL, "text not set\n" ); + utf8 = (WS_XML_UTF8_TEXT *)text->text; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + ok( utf8->value.length == 1, "got %u\n", utf8->value.length ); + ok( utf8->value.bytes[0] == 'b', "wrong data\n" ); + } WsFreeReader( reader ); }

1 0