wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Zebediah Figura : msi/tests: Test registration of a valid typelib.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: f5da1902aa24433375fc3c99eaadad00917daa9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5da1902aa24433375fc3c99… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 30 10:22:24 2018 +0200 msi/tests: Test registration of a valid typelib. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 4 +++- dlls/msi/tests/action.c | 49 ++++++++++++++++++++++++++++++++++++++-------- dlls/msi/tests/rsrc.rc | 22 +++++++++++++++++++++ dlls/msi/tests/typelib.idl | 29 +++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 18a6457..5c7e81e 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -15,5 +15,7 @@ SOURCES = \ package.c \ patch.c \ record.c \ + rsrc.rc \ source.c \ - suminfo.c + suminfo.c \ + typelib.idl diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ea8c0e8..1cf9e9e 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> +#define COBJMACROS #include <windows.h> #include <msiquery.h> #include <msidefs.h> @@ -36,6 +37,7 @@ #include "wine/test.h" #include "utils.h" +#include "typelib.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); @@ -1003,10 +1005,10 @@ static const char tl_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" - "RemoveFiles\t\t1700\n" - "InstallFiles\t\t2000\n" - "RegisterTypeLibraries\tREGISTER_TYPELIB=1\t3000\n" "UnregisterTypeLibraries\t\t3100\n" + "RemoveFiles\t\t3200\n" + "InstallFiles\t\t3300\n" + "RegisterTypeLibraries\t\t3400\n" "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" @@ -2647,6 +2649,24 @@ static DWORD get_estimated_size(void) return size; } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_register_product(void) { UINT r; @@ -5594,6 +5614,8 @@ error: static void test_register_typelib(void) { + ITypeLib *tlb; + HRESULT hr; UINT r; if (is_process_limited()) @@ -5602,26 +5624,37 @@ static void test_register_typelib(void) return; } + /* UnregisterTypeLibraries action fails in 64-bit Windows <= 7 */ + if (sizeof(void *) == 8) + { + win_skip("broken on 64-bit Windows\n"); + return; + } + create_test_files(); - create_file("msitest\\typelib.dll", 1000); + extract_resource("typelib.tlb", "TYPELIB", "msitest\\typelib.dll"); create_database(msifile, tl_tables, sizeof(tl_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - r = MsiInstallProductA(msifile, "REGISTER_TYPELIB=1"); + r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); goto error; } - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(r == ERROR_SUCCESS, "got %u\n", r); - r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); + ok(hr == S_OK, "got %#x\n", hr); + ITypeLib_Release(tlb); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); + ok(hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); + ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); diff --git a/dlls/msi/tests/rsrc.rc b/dlls/msi/tests/rsrc.rc new file mode 100644 index 0000000..eca1ae5 --- /dev/null +++ b/dlls/msi/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: typelib.tlb */ +typelib.tlb TYPELIB typelib.tlb diff --git a/dlls/msi/tests/typelib.idl b/dlls/msi/tests/typelib.idl new file mode 100644 index 0000000..f447c60 --- /dev/null +++ b/dlls/msi/tests/typelib.idl @@ -0,0 +1,29 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep ident +#pragma makedep typelib +#pragma makedep header + +[ + uuid(eac5166a-9734-4d91-878f-1dd02304c66c), + version(7.1) +] +library register_test +{ +}

1 0

Zebediah Figura : widl: Prefer types defined in the same typelib to imported types.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: d5a1d6134b1898b6fa5ad0285e630879a806e3ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a1d6134b1898b6fa5ad028… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 29 21:25:50 2018 -0500 widl: Prefer types defined in the same typelib to imported types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 56 +++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 52c68b4..f7e53e4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -993,7 +993,13 @@ static int encode_type( importinfo_t *importinfo; int typeinfo_offset; - if ((importinfo = find_importinfo(typelib, type->name))) + if (type->typelib_idx > -1) + { + chat("encode_type: VT_USERDEFINED - found already defined type %s at %d\n", + type->name, type->typelib_idx); + typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + } + else if ((importinfo = find_importinfo(typelib, type->name))) { chat("encode_type: VT_USERDEFINED - found imported type %s in %s\n", type->name, importinfo->importlib->name); @@ -1003,36 +1009,32 @@ static int encode_type( else { /* typedef'd types without public attribute aren't included in the typelib */ - while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) + while (type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) type = type_alias_get_aliasee(type); - chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, - type->name, type_get_type(type), type->typelib_idx); + chat("encode_type: VT_USERDEFINED - adding new type %s, real type %d\n", + type->name, type_get_type(type)); - if (type->typelib_idx == -1) + switch (type_get_type(type)) { - chat("encode_type: trying to ref not added type\n"); - switch (type_get_type(type)) - { - case TYPE_STRUCT: - add_structure_typeinfo(typelib, type); - break; - case TYPE_INTERFACE: - add_interface_typeinfo(typelib, type); - break; - case TYPE_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TYPE_UNION: - add_union_typeinfo(typelib, type); - break; - case TYPE_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("encode_type: VT_USERDEFINED - unhandled type %d\n", - type_get_type(type)); - } + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("encode_type: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); } typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx];

1 0

Owen Rudge : wsdapi/tests: Expand ProbeHandler tests.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: e207300b4443f551ea1dd368b0d51d579749275a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e207300b4443f551ea1dd368… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 29 23:14:51 2018 +0100 wsdapi/tests: Expand ProbeHandler tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 113 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 102 insertions(+), 11 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index e73ee77..cfdd41f 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -47,8 +47,27 @@ static const char testProbeMessage[] = "<?xml version=\"1.0\" encoding=\"utf-8\" "xmlns:wsd=\"http://schemas.xmlsoap.org/ws/2005/04/discovery\" " "xmlns:grog=\"http://more.tests/\"><soap:Header><wsa:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery</wsa:To>" "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</wsa:Action>" - "<wsa:MessageID>urn:uuid:%s</wsa:MessageID></soap:Header>" - "<soap:Body><wsd:Probe><wsd:Types>grog:Cider</wsd:Types></wsd:Probe></soap:Body></soap:Envelope>"; + "<wsa:MessageID>urn:uuid:%s</wsa:MessageID>" + "<grog:Perry>ExtraInfo</grog:Perry></soap:Header>" + "<soap:Body><wsd:Probe><wsd:Types>grog:Cider</wsd:Types><grog:Lager>MoreInfo</grog:Lager></wsd:Probe></soap:Body></soap:Envelope>"; + +static const WCHAR discoveryTo[] = { + 'u','r','n',':', + 's','c','h','e','m','a','s','-','x','m','l','s','o','a','p','-','o','r','g',':', + 'w','s',':','2','0','0','5',':','0','4',':', + 'd','i','s','c','o','v','e','r','y', 0 }; + +static const WCHAR actionProbe[] = { + 'h','t','t','p',':','/','/', + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', + 'w','s','/','2','0','0','5','/','0','4','/', + 'd','i','s','c','o','v','e','r','y','/', + 'P','r','o','b','e', 0 }; + +static const WCHAR uri_more_tests[] = { 'h','t','t','p',':','/','/','m','o','r','e','.','t','e','s','t','s','/', 0 }; +static const WCHAR uri_more_tests_no_slash[] = { 'h','t','t','p',':','/','/','m','o','r','e','.','t','e','s','t','s', 0 }; +static const WCHAR prefix_grog[] = { 'g','r','o','g', 0 }; +static const WCHAR name_cider[] = { 'C','i','d','e','r', 0 }; static HANDLE probe_event = NULL; static UUID probe_message_id; @@ -449,6 +468,53 @@ static ULONG WINAPI IWSDiscoveryPublisherNotifyImpl_Release(IWSDiscoveryPublishe return ref; } +static void verify_wsdxml_name(const char *debug_prefix, WSDXML_NAME *name, LPCWSTR uri, LPCWSTR prefix, + LPCWSTR local_name) +{ + ok(name != NULL, "%s: name == NULL\n", debug_prefix); + if (name == NULL) return; + + ok(name->LocalName != NULL && lstrcmpW(name->LocalName, local_name) == 0, + "%s: Local name = '%s'\n", debug_prefix, wine_dbgstr_w(name->LocalName)); + + ok(name->Space != NULL, "%s: Space == NULL\n", debug_prefix); + if (name->Space == NULL) return; + + ok(name->Space->Uri != NULL && lstrcmpW(name->Space->Uri, uri) == 0, + "%s: URI == '%s'\n", debug_prefix, wine_dbgstr_w(name->Space->Uri)); + ok(name->Space->PreferredPrefix != NULL && lstrcmpW(name->Space->PreferredPrefix, prefix) == 0, + "%s: Prefix = '%s'\n", debug_prefix, wine_dbgstr_w(name->Space->PreferredPrefix)); +} + +static void verify_wsdxml_any_text(const char *debug_prefix, WSDXML_ELEMENT *any, LPCWSTR uri, LPCWSTR prefix, + LPCWSTR local_name, LPCWSTR value) +{ + WSDXML_TEXT *child; + + ok(any != NULL, "%s: any == NULL\n", debug_prefix); + if (any == NULL) return; + + child = (WSDXML_TEXT *) any->FirstChild; + + ok(any->Node.Type == ElementType, "%s: Node type == %d\n", debug_prefix, any->Node.Type); + ok(any->Node.Parent == NULL, "%s: Parent == %p\n", debug_prefix, any->Node.Parent); + ok(any->Node.Next == NULL, "%s: Next == %p\n", debug_prefix, any->Node.Next); + verify_wsdxml_name(debug_prefix, any->Name, uri, prefix, local_name); + + ok(child != NULL, "%s: First child == NULL\n", debug_prefix); + + if (child != NULL) + { + ok(child->Node.Type == TextType, "%s: Node type == %d\n", debug_prefix, child->Node.Type); + ok(child->Node.Parent == any, "%s: Parent == %p\n", debug_prefix, child->Node.Parent); + ok(child->Node.Next == NULL, "%s: Next == %p\n", debug_prefix, child->Node.Next); + + if (child->Node.Type == TextType) + ok(child->Text != NULL && lstrcmpW(child->Text, value) == 0, + "%s: Text == '%s'\n", debug_prefix, wine_dbgstr_w(child->Text)); + } +} + static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryPublisherNotify *This, const WSD_SOAP_MESSAGE *pSoap, IWSDMessageParameters *pMessageParameters) { trace("IWSDiscoveryPublisherNotifyImpl_ProbeHandler called (%p, %p, %p)\n", This, pSoap, pMessageParameters); @@ -464,8 +530,15 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP if (pSoap != NULL) { + static const WCHAR perry[] = {'P','e','r','r','y',0}; + static const WCHAR extra_info[] = {'E','x','t','r','a','I','n','f','o',0}; + WSD_PROBE *probe_msg = (WSD_PROBE *) pSoap->Body; + ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); - ok(pSoap->Header.To != NULL, "pSoap->Header.To == NULL\n"); + ok(pSoap->Header.To != NULL && lstrcmpW(pSoap->Header.To, discoveryTo) == 0, + "pSoap->Header.To == '%s'\n", wine_dbgstr_w(pSoap->Header.To)); + ok(pSoap->Header.Action != NULL && lstrcmpW(pSoap->Header.Action, actionProbe) == 0, + "pSoap->Header.Action == '%s'\n", wine_dbgstr_w(pSoap->Header.Action)); ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL"); @@ -482,6 +555,27 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP ignore it and wait for another message. */ if ((ret != RPC_S_OK) || (UuidEqual(&uuid, &probe_message_id, &ret) == FALSE)) return S_OK; } + + verify_wsdxml_any_text("pSoap->Header.AnyHeaders", pSoap->Header.AnyHeaders, uri_more_tests_no_slash, + prefix_grog, perry, extra_info); + + if (probe_msg != NULL) + { + static const WCHAR lager[] = {'L','a','g','e','r',0}; + static const WCHAR more_info[] = {'M','o','r','e','I','n','f','o',0}; + + ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); + + if (probe_msg->Types != NULL) + { + verify_wsdxml_name("probe_msg->Types->Element", probe_msg->Types->Element, uri_more_tests_no_slash, + prefix_grog, name_cider); + ok(probe_msg->Types->Next == NULL, "probe_msg->Types->Next == %p\n", probe_msg->Types->Next); + } + + ok(probe_msg->Scopes == NULL, "Probe message Scopes != NULL\n"); + verify_wsdxml_any_text("probe_msg->Any", probe_msg->Any, uri_more_tests_no_slash, prefix_grog, lager, more_info); + } } SetEvent(probe_event); @@ -628,15 +722,12 @@ static void Publish_tests(void) WSDXML_NAME header_any_name, another_name; WSDXML_NAMESPACE ns, ns2; WCHAR header_any_name_text[] = {'B','e','e','r',0}; - WCHAR another_name_text[] = {'C','i','d','e','r',0}; static const WCHAR header_any_text[] = {'P','u','b','l','i','s','h','T','e','s','t',0}; static const WCHAR body_any_text[] = {'B','o','d','y','T','e','s','t',0}; static const WCHAR endpoint_any_text[] = {'E','n','d','P','T','e','s','t',0}; static const WCHAR ref_param_any_text[] = {'R','e','f','P','T','e','s','t',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'w','i','n','e',0}; - static const WCHAR uri2[] = {'h','t','t','p',':','/','/','m','o','r','e','.','t','e','s','t','s','/',0}; - static const WCHAR prefix2[] = {'g','r','o','g',0}; static const WCHAR uri3[] = {'h','t','t','p',':','/','/','t','h','i','r','d','.','u','r','l','/',0}; WSD_NAME_LIST types_list; WSD_URI_LIST scopes_list, xaddrs_list; @@ -722,10 +813,10 @@ static void Publish_tests(void) ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); /* Create types list */ - ns2.Uri = uri2; - ns2.PreferredPrefix = prefix2; + ns2.Uri = uri_more_tests; + ns2.PreferredPrefix = prefix_grog; - another_name.LocalName = another_name_text; + another_name.LocalName = (WCHAR *) name_cider; another_name.Space = &ns2; types_list.Next = malloc(sizeof(WSD_NAME_LIST)); @@ -739,10 +830,10 @@ static void Publish_tests(void) scopes_list.Element = uri; scopes_list.Next->Next = NULL; - scopes_list.Next->Element = uri2; + scopes_list.Next->Element = uri_more_tests; xaddrs_list.Next = malloc(sizeof(WSD_URI_LIST)); - xaddrs_list.Element = uri2; + xaddrs_list.Element = uri_more_tests; xaddrs_list.Next->Next = NULL; xaddrs_list.Next->Element = uri3;

1 0

Owen Rudge : wsdapi/tests: Ensure probe message is given unique GUID.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 5cefe40f54212f80a7616c625cd371929797575b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cefe40f54212f80a7616c62… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 29 23:14:04 2018 +0100 wsdapi/tests: Ensure probe message is given unique GUID. This patch fixes a potential issue on the Wine test VMs where messages can be received by other VMs before they are ready to process them. wsdapi.dll then filters out the subsequent duplicate messages from the correct VM and the test fails. Avoid this by not using a hard-coded GUID. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index b76ffaf..eaefa3a 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 iphlpapi +IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 iphlpapi rpcrt4 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index ae2fa39..e73ee77 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -47,10 +47,11 @@ static const char testProbeMessage[] = "<?xml version=\"1.0\" encoding=\"utf-8\" "xmlns:wsd=\"http://schemas.xmlsoap.org/ws/2005/04/discovery\" " "xmlns:grog=\"http://more.tests/\"><soap:Header><wsa:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery</wsa:To>" "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</wsa:Action>" - "<wsa:MessageID>urn:uuid:aa3eb169-9440-4eb7-9090-88402664cc6a</wsa:MessageID></soap:Header>" + "<wsa:MessageID>urn:uuid:%s</wsa:MessageID></soap:Header>" "<soap:Body><wsd:Probe><wsd:Types>grog:Cider</wsd:Types></wsd:Probe></soap:Body></soap:Envelope>"; static HANDLE probe_event = NULL; +static UUID probe_message_id; #define MAX_CACHED_MESSAGES 5 #define MAX_LISTENING_THREADS 20 @@ -465,6 +466,22 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP { ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); ok(pSoap->Header.To != NULL, "pSoap->Header.To == NULL\n"); + + ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL"); + + /* Ensure the message ID is at least 9 characters long (to skip past the 'urn:uuid:' prefix) */ + if ((pSoap->Header.MessageID != NULL) && (lstrlenW(pSoap->Header.MessageID) > 9)) + { + UUID uuid; + RPC_STATUS ret = UuidFromStringW((LPWSTR)pSoap->Header.MessageID + 9, &uuid); + + trace("Received message with UUID '%s' (expected UUID '%s')\n", wine_dbgstr_guid(&uuid), + wine_dbgstr_guid(&probe_message_id)); + + /* Check if we've either received a message without a UUID, or the UUID isn't the one we sent. If so, + ignore it and wait for another message. */ + if ((ret != RPC_S_OK) || (UuidEqual(&uuid, &probe_message_id, &ret) == FALSE)) return S_OK; + } } SetEvent(probe_event); @@ -623,6 +640,7 @@ static void Publish_tests(void) static const WCHAR uri3[] = {'h','t','t','p',':','/','/','t','h','i','r','d','.','u','r','l','/',0}; WSD_NAME_LIST types_list; WSD_URI_LIST scopes_list, xaddrs_list; + unsigned char *probe_uuid_str; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); @@ -818,8 +836,23 @@ after_publish_test: /* Test the receiving of a probe message */ probe_event = CreateEventW(NULL, TRUE, FALSE, NULL); - ok(send_udp_multicast_of_type(testProbeMessage, sizeof(testProbeMessage) - 1, AF_INET) == TRUE, "Sending Probe message failed\n"); - todo_wine ok(WaitForSingleObject(probe_event, 2000) == WAIT_OBJECT_0, "Probe message not received\n"); + + UuidCreate(&probe_message_id); + UuidToStringA(&probe_message_id, &probe_uuid_str); + + ok(probe_uuid_str != NULL, "Failed to create UUID for probe message\n"); + + if (probe_uuid_str != NULL) + { + char probe_message[sizeof(testProbeMessage) + 50]; + sprintf(probe_message, testProbeMessage, probe_uuid_str); + + ok(send_udp_multicast_of_type(probe_message, strlen(probe_message), AF_INET) == TRUE, "Sending Probe message failed\n"); + todo_wine ok(WaitForSingleObject(probe_event, 2000) == WAIT_OBJECT_0, "Probe message not received\n"); + + RpcStringFreeA(&probe_uuid_str); + } + CloseHandle(probe_event); ref = IWSDiscoveryPublisher_Release(publisher);

1 0

Alistair Leslie-Hughes : include: Add more definitions to wdm.h.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: d28fdb041a7030ee61d30580dfdcd722772adf96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d28fdb041a7030ee61d30580… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 30 04:15:47 2018 +0000 include: Add more definitions to wdm.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index d6b808f..5abe18b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1408,9 +1408,12 @@ void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); +void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG); +void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); +LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN);

1 0

Michael Stefaniuc : d3d10_1/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: be12dcf9da2ce14b70ebc935924de9db62bc81b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be12dcf9da2ce14b70ebc935… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:26 2018 +0200 d3d10_1/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 7c2b3ba..f6abea0 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -104,7 +104,7 @@ static void test_create_device(void) HWND window; HRESULT hr; - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { if (SUCCEEDED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, d3d10_feature_levels[i], D3D10_1_SDK_VERSION, &device))) @@ -279,7 +279,7 @@ static void test_device_interfaces(void) unsigned int i; HRESULT hr; - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { struct device_desc device_desc; @@ -320,7 +320,7 @@ static void test_device_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { struct device_desc device_desc; @@ -614,7 +614,7 @@ static void test_create_blend_state(void) refcount = ID3D10BlendState1_Release(blend_state2); ok(!refcount, "Blend state has %u references left.\n", refcount); - for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + for (i = 0; i < ARRAY_SIZE(desc_conversion_tests); ++i) { const D3D10_BLEND_DESC1 *current_desc = &desc_conversion_tests[i];

1 0

Michael Stefaniuc : wer/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: a237867ca7b31c1b04b6d15b808dbbd5439dd581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a237867ca7b31c1b04b6d15b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:35 2018 +0200 wer/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/tests/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index b10a819..11a02fb 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -66,7 +66,7 @@ static void test_WerAddExcludedApplication(void) ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); /* appname has a path */ - res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + res = GetWindowsDirectoryW(buffer, ARRAY_SIZE(buffer)); if (res > 0) { /* the last part from the path is added to the inclusion list */ hr = WerAddExcludedApplication(buffer, FALSE); @@ -118,7 +118,7 @@ static void test_WerRemoveExcludedApplication(void) "got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); /* appname has a path */ - res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + res = GetWindowsDirectoryW(buffer, ARRAY_SIZE(buffer)); if (res > 0) { hr = WerRemoveExcludedApplication(buffer, FALSE); ok((hr == E_FAIL) || (hr == __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND)), @@ -223,7 +223,7 @@ static void test_WerReportCreate(void) /* multiple active reports are possible */ memset(table, 0, sizeof(table)); - for (i = 0; i < (sizeof(table) / sizeof(table[0]) -1); i++) { + for (i = 0; i < (ARRAY_SIZE(table) - 1); i++) { report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]);

1 0

Michael Stefaniuc : xinput/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 4fbd3a7c3a494cab54c44e07581df4d33ccdc841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fbd3a7c3a494cab54c44e07… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:34 2018 +0200 xinput/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index f26fda9..e5eb504 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -292,7 +292,7 @@ START_TEST(xinput) void *pXInputGetStateEx_Ordinal; int i; - for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++) + for (i = 0; i < ARRAY_SIZE(libs); i++) { hXinput = LoadLibraryA( libs[i].name );

1 0

Michael Stefaniuc : wintrust/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 6ff4365fb3092ce2390c5f243a68ad2f2d6adeee URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff4365fb3092ce2390c5f24… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:32 2018 +0200 wintrust/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 6e7913f..81153a2 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -287,7 +287,7 @@ static HANDLE create_temp_file(WCHAR *temp_file) HANDLE file = INVALID_HANDLE_VALUE; WCHAR temp_path[MAX_PATH]; - if (GetTempPathW(sizeof(temp_path) / sizeof(temp_path[0]), temp_path)) + if (GetTempPathW(ARRAY_SIZE(temp_path), temp_path)) { static const WCHAR img[] = { 'i','m','g',0 };

1 0

Michael Stefaniuc : mlang/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 May '18

30 May '18

Module: wine Branch: master Commit: 032af1923cf620d79439fd4b861ad1949c7fed22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=032af1923cf620d79439fd4b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:31 2018 +0200 mlang/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index bcb2fd0..b5d6fc6 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -577,7 +577,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = 0; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == 0, "expected lenA 0, got %u\n", lenA); @@ -585,12 +585,12 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = -1; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); - if (lenW < sizeof(bufW)/sizeof(bufW[0])) { + if (lenW < ARRAY_SIZE(bufW)) { /* can only happen if the convert call fails */ ok(bufW[lenW] != 0, "buf should not be 0 terminated\n"); bufW[lenW] = 0; /* -1 doesn't include 0 terminator */ @@ -608,7 +608,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = -1; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, CP_UNICODE, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); @@ -628,7 +628,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = lstrlenA(stringA); - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = pConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW); ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); @@ -1039,7 +1039,7 @@ static void test_GetCharsetInfo_other(IMultiLanguage *ml) HRESULT hr; int i; - for (i = 0; i < sizeof(other)/sizeof(*other); i++) + for (i = 0; i < ARRAY_SIZE(other); i++) { hr = IMultiLanguage_GetCharsetInfo(ml, other[i].charset, &info); @@ -1356,7 +1356,7 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) static WCHAR english[] = { 'e','n','g','l','i','s','h',0 }; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { lcid = -1; MultiByteToWideChar(CP_ACP, 0, lcid_table[i].rfc1766, -1, rfc1766W, MAX_RFC1766_NAME); ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, rfc1766W); @@ -1410,7 +1410,7 @@ static void test_Rfc1766ToLcid(void) HRESULT ret; DWORD i; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { lcid = -1; ret = pRfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); @@ -1454,7 +1454,7 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) HRESULT hr; BSTR rfcstr; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { buffer[0] = '\0'; rfcstr = NULL; @@ -1488,7 +1488,7 @@ static void test_LcidToRfc1766(void) HRESULT hr; DWORD i; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; @@ -1542,7 +1542,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) HRESULT ret; DWORD i; - for(i = 0; i < sizeof(info_table) / sizeof(info_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(info_table); i++) { memset(buffer, 'x', sizeof(RFC1766INFO) + 2); buffer[sizeof(buffer) -1] = 0; buffer[sizeof(buffer) -2] = 0; @@ -2167,7 +2167,7 @@ static void test_CodePageToScriptID(IMLangFontLink2 *font_link) {CP_UNICODE, 0, E_FAIL} }; - for (i = 0; i < sizeof(cp_sid)/sizeof(cp_sid[0]); i++) + for (i = 0; i < ARRAY_SIZE(cp_sid); i++) { hr = IMLangFontLink2_CodePageToScriptID(font_link, cp_sid[i].cp, &sid); ok(hr == cp_sid[i].hr, "%u CodePageToScriptID failed 0x%08x %u\n", i, hr, GetLastError()); @@ -2460,21 +2460,21 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); nb_detected = 1; memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), NULL, &nb_detected, NULL); + ARRAY_SIZE(preferred), NULL, &nb_detected, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); nb_detected = 1; memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); ok(nb_detected == 1, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2483,7 +2483,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 2, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2493,7 +2493,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2504,7 +2504,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2516,7 +2516,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred2, - sizeof(preferred2)/sizeof(preferred2[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred2), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2536,7 +2536,7 @@ static void test_GetCodePageInfo(IMultiLanguage2 *iML2) HRESULT ret; test_data = iml2_cpinfo_data; - test_data_num = sizeof(iml2_cpinfo_data) / sizeof(iml2_cpinfo_data[0]); + test_data_num = ARRAY_SIZE(iml2_cpinfo_data); for (i = 0; i < test_data_num; i++) { ret = IMultiLanguage2_GetCodePageInfo(iML2, test_data[i].cpinfo.uiCodePage, LANG_NEUTRAL, &cpinfo);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018