June 2018 - Wine-Devel - list.winehq.org

[PATCH v2 2/2] msvcrt: Don't reimplement call_unwind_func().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/except_i386.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 3f22f3e..5812d10 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -59,7 +59,7 @@ typedef struct __catchblock_info UINT flags; /* flags (see below) */ const type_info *type_info; /* C++ type caught by this block */ int offset; /* stack offset to copy exception object to */ - void (*handler)(void);/* catch block handler code */ + void * (*handler)(void);/* catch block handler code */ } catchblock_info; #define TYPE_FLAG_CONST 1 #define TYPE_FLAG_VOLATILE 2 @@ -78,8 +78,8 @@ typedef struct __tryblock_info /* info about the unwind handler for a given trylevel */ typedef struct __unwind_info { - int prev; /* prev trylevel unwind handler, to run after this one */ - void (*handler)(void);/* unwind handler */ + int prev; /* prev trylevel unwind handler, to run after this one */ + void * (*handler)(void);/* unwind handler */ } unwind_info; /* descriptor of all try blocks of a given function */ @@ -137,22 +137,6 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame const cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) DECLSPEC_HIDDEN; -/* call a function with a given ebp */ -static inline void *call_ebp_func( void *func, void *ebp ) -{ - void *ret; - int dummy; - __asm__ __volatile__ ("pushl %%ebx\n\t" - "pushl %%ebp\n\t" - "movl %4,%%ebp\n\t" - "call *%%eax\n\t" - "popl %%ebp\n\t" - "popl %%ebx" - : "=a" (ret), "=S" (dummy), "=D" (dummy) - : "0" (func), "1" (ebp) : "ecx", "edx", "memory" ); - return ret; -} - /* call a copy constructor */ extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); @@ -326,7 +310,7 @@ static void copy_exception( void *object, cxx_exception_frame *frame, /* unwind the local function up to a given trylevel */ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_descr *descr, int last_level) { - void (*handler)(void); + void * (*handler)(void); int trylevel = frame->trylevel; while (trylevel != last_level) @@ -341,7 +325,7 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des { TRACE( "calling unwind handler %p trylevel %d last %d ebp %p\n", handler, trylevel, last_level, &frame->ebp ); - call_ebp_func( handler, &frame->ebp ); + call_handler( handler, &frame->ebp ); } trylevel = descr->unwind_table[trylevel].prev; } @@ -478,7 +462,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, nested_frame.trylevel = nested_trylevel + 1; __wine_push_frame( &nested_frame.frame ); - addr = call_ebp_func( catchblock->handler, &frame->ebp ); + addr = call_handler( catchblock->handler, &frame->ebp ); __wine_pop_frame( &nested_frame.frame ); ((DWORD*)frame)[-1] = save_esp; -- 2.7.4

June 11, 2018

[PATCH v2 1/2] msvcrt: Avoid using inline assembly in call_unwind_func().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: rename to call_handler() and use void * as return type. dlls/msvcrt/except_i386.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 29540cd..3f22f3e 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -107,7 +107,7 @@ typedef struct _SCOPETABLE { int previousTryLevel; int (*lpfnFilter)(PEXCEPTION_POINTERS); - int (*lpfnHandler)(void); + void * (*lpfnHandler)(void); } SCOPETABLE, *PSCOPETABLE; typedef struct _MSVCRT_EXCEPTION_FRAME @@ -198,24 +198,20 @@ __ASM_GLOBAL_FUNC( call_filter, "popl %ebp\n\t" "ret" ); -static inline int call_unwind_func( int (*func)(void), void *ebp ) -{ - int ret; - __asm__ __volatile__ ("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl %%esi\n\t" - "pushl %%edi\n\t" - "movl %2,%%ebp\n\t" - "call *%0\n\t" - "popl %%edi\n\t" - "popl %%esi\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (ret) - : "0" (func), "r" (ebp) - : "ecx", "edx", "memory" ); - return ret; -} +extern void *call_handler( void * (*func)(void), void *ebp ); + +__ASM_GLOBAL_FUNC( call_handler, + "pushl %ebp\n\t" + "pushl %ebx\n\t" + "pushl %esi\n\t" + "pushl %edi\n\t" + "movl 24(%esp), %ebp\n\t" + "call *20(%esp)\n\t" + "popl %edi\n\t" + "popl %esi\n\t" + "popl %ebx\n\t" + "popl %ebp\n\t" + "ret" ); static inline void dump_type( const cxx_type_info *type ) { @@ -806,7 +802,7 @@ static void msvcrt_local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel, vo { TRACE( "__try block cleanup level %d handler %p ebp %p\n", level, frame->scopetable[level].lpfnHandler, ebp ); - call_unwind_func( frame->scopetable[level].lpfnHandler, ebp ); + call_handler( frame->scopetable[level].lpfnHandler, ebp ); } } __wine_pop_frame(&reg); @@ -833,7 +829,7 @@ static void msvcrt_local_unwind4( ULONG *cookie, MSVCRT_EXCEPTION_FRAME* frame, { TRACE( "__try block cleanup level %d handler %p ebp %p\n", level, scopetable->entries[level].lpfnHandler, ebp ); - call_unwind_func( scopetable->entries[level].lpfnHandler, ebp ); + call_handler( scopetable->entries[level].lpfnHandler, ebp ); } } __wine_pop_frame(&reg); -- 2.7.4

June 11, 2018

[PATCH 7/7] wsdapi: Build types list when parsing Probe message.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 91 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- dlls/wsdapi/wsdapi_internal.h | 1 + dlls/wsdapi/xml.c | 16 ++++++++ 4 files changed, 108 insertions(+), 2 deletions(-)

June 11, 2018

[PATCH 6/7] wsdapi: Implement probe message parsing.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 41 insertions(+), 3 deletions(-)

June 11, 2018

[PATCH 5/7] wsdapi: Return "any" headers in read_message.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-)

June 11, 2018

[PATCH 4/7] wsdapi: Add initial support for reading messages; identify Probe message.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 388 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 6 +- 2 files changed, 389 insertions(+), 5 deletions(-)

June 11, 2018

[PATCH 3/7] wsdapi: Add stub for Probe message parsing, prepare notification sink message.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 60 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/soap.c | 6 +++++ dlls/wsdapi/wsdapi_internal.h | 5 ++++ 3 files changed, 70 insertions(+), 1 deletion(-)

June 11, 2018

[PATCH 2/7] wsdapi: Add critical section around notification sinks.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 9 +++++++++ dlls/wsdapi/wsdapi_internal.h | 1 + 2 files changed, 10 insertions(+)

June 11, 2018

[PATCH 1/7] wsdapi: Add support for listening for UDP multicast broadcasts.

by Owen Rudge

v2: Returns HRESULT from functions where applicable, adds Probe message body parsing to avoid leaving todo_wine statements in place. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 281 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/wsdapi_internal.h | 4 + 2 files changed, 284 insertions(+), 1 deletion(-)

June 11, 2018

[PATCH] msxml3/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 24 ++++++++++++------------ dlls/msxml3/tests/httpreq.c | 4 ++-- dlls/msxml3/tests/saxreader.c | 32 ++++++++++++++++---------------- dlls/msxml3/tests/schema.c | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 23c17ea978..d5f30fec62 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -102,7 +102,7 @@ static void get_class_support_data(struct msxmlsupported_data_t *table) HRESULT hr; int i; - for (i = 0; i < sizeof(table->ifaces)/sizeof(table->ifaces[0]) && table->ifaces[i] != NULL; i++) + for (i = 0; i < ARRAY_SIZE(table->ifaces) && table->ifaces[i] != NULL; i++) { hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, table->ifaces[i], (void**)&unk); if (hr == S_OK) IUnknown_Release(unk); @@ -124,7 +124,7 @@ static BOOL is_clsid_supported(const GUID *clsid, REFIID riid) { int i; - for (i = 0; i < sizeof(table->ifaces)/sizeof(table->ifaces[0]) && table->ifaces[i] != NULL; i++) + for (i = 0; i < ARRAY_SIZE(table->ifaces) && table->ifaces[i] != NULL; i++) if (table->ifaces[i] == riid) return table->supported[i]; } @@ -1238,7 +1238,7 @@ static int alloced_bstrs_count; static BSTR _bstr_(const char *str) { - assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); + assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); return alloced_bstrs[alloced_bstrs_count++]; } @@ -10834,13 +10834,13 @@ static void test_mxnamespacemanager_override(void) &IID_IMXNamespaceManager, (void**)&nsmgr); EXPECT_HR(hr, S_OK); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW)); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len); EXPECT_HR(hr, E_FAIL); @@ -10859,7 +10859,7 @@ static void test_mxnamespacemanager_override(void) hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri")); EXPECT_HR(hr, S_OK); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len); EXPECT_HR(hr, S_OK); @@ -10868,19 +10868,19 @@ static void test_mxnamespacemanager_override(void) hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns0"), _bstr_("ns0 uri")); EXPECT_HR(hr, S_OK); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW)); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(buffW, _bstr_("ns0")), "got prefix %s\n", wine_dbgstr_w(buffW)); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 2, buffW, &len); EXPECT_HR(hr, S_OK); @@ -10890,7 +10890,7 @@ static void test_mxnamespacemanager_override(void) hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns1"), _bstr_("ns1 uri")); EXPECT_HR(hr, S_OK); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len); EXPECT_HR(hr, S_OK); @@ -10911,13 +10911,13 @@ static void test_mxnamespacemanager_override(void) hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri override")); EXPECT_HR(hr, S_FALSE); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(buffW, _bstr_("ns0 uri override")), "got uri %s\n", wine_dbgstr_w(buffW)); - len = sizeof(buffW)/sizeof(WCHAR); + len = ARRAY_SIZE(buffW); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 3, buffW, &len); EXPECT_HR(hr, S_OK); diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index f20f18fb63..ae0a95a2f1 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -97,7 +97,7 @@ static int g_unexpectedcall, g_expectedcall; static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -117,7 +117,7 @@ static BSTR _bstr_(const char *str) if(!str) return NULL; - assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); + assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); return alloced_bstrs[alloced_bstrs_count++]; } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 3ed332edb6..eeef5b64c1 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -90,7 +90,7 @@ static int alloced_bstrs_count; static BSTR _bstr_(const char *str) { - assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); + assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); return alloced_bstrs[alloced_bstrs_count++]; } @@ -144,7 +144,7 @@ static void test_saxstr(const char *file, unsigned line, BSTR str, const char *e /* exit earlier on length mismatch */ if (lenexp != len) return; - MultiByteToWideChar(CP_ACP, 0, expected, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, expected, -1, buf, ARRAY_SIZE(buf)); cmp = memcmp(str, buf, lenexp*sizeof(WCHAR)); if (cmp && todo) @@ -2952,7 +2952,7 @@ static void test_mxwriter_handlers(void) EXPECT_REF(writer, 1); - for (i = 0; i < sizeof(riids)/sizeof(REFIID); i++) + for (i = 0; i < ARRAY_SIZE(riids); i++) { IUnknown *handler; IMXWriter *writer2; @@ -3976,7 +3976,7 @@ static void test_mxwriter_characters(void) hr = ISAXContentHandler_characters(content, chardataW, 0); EXPECT_HR(hr, S_OK); - hr = ISAXContentHandler_characters(content, chardataW, sizeof(chardataW)/sizeof(WCHAR) - 1); + hr = ISAXContentHandler_characters(content, chardataW, ARRAY_SIZE(chardataW) - 1); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4166,7 +4166,7 @@ static void test_mxwriter_stream(void) IStream *stream; LARGE_INTEGER pos; ULARGE_INTEGER pos2; - DWORD test_count = sizeof(mxwriter_stream_tests)/sizeof(mxwriter_stream_tests[0]); + DWORD test_count = ARRAY_SIZE(mxwriter_stream_tests); for(current_stream_test_index = 0; current_stream_test_index < test_count; ++current_stream_test_index) { const mxwriter_stream_test *test = mxwriter_stream_tests+current_stream_test_index; @@ -4640,7 +4640,7 @@ static void test_mxwriter_comment(void) ok(!lstrcmpW(_bstr_("\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); - hr = ISAXLexicalHandler_comment(lexical, commentW, sizeof(commentW)/sizeof(WCHAR)-1); + hr = ISAXLexicalHandler_comment(lexical, commentW, ARRAY_SIZE(commentW) - 1); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4865,16 +4865,16 @@ static void test_mxwriter_dtd(void) hr = IVBSAXLexicalHandler_startDTD(vblexical, NULL, NULL, NULL); EXPECT_HR(hr, E_POINTER); - hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, sizeof(pubW)/sizeof(WCHAR), NULL, 0); + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, ARRAY_SIZE(pubW), NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, NULL, 0, sysW, sizeof(sysW)/sizeof(WCHAR)); + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, NULL, 0, sysW, ARRAY_SIZE(sysW)); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, sizeof(pubW)/sizeof(WCHAR), sysW, sizeof(sysW)/sizeof(WCHAR)); + hr = ISAXLexicalHandler_startDTD(lexical, NULL, 0, pubW, ARRAY_SIZE(pubW), sysW, ARRAY_SIZE(sysW)); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, 0, NULL, 0); + hr = ISAXLexicalHandler_startDTD(lexical, nameW, ARRAY_SIZE(nameW), NULL, 0, NULL, 0); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4885,11 +4885,11 @@ static void test_mxwriter_dtd(void) VariantClear(&dest); /* system id is required if public is present */ - hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), pubW, sizeof(pubW)/sizeof(WCHAR), NULL, 0); + hr = ISAXLexicalHandler_startDTD(lexical, nameW, ARRAY_SIZE(nameW), pubW, ARRAY_SIZE(pubW), NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXLexicalHandler_startDTD(lexical, nameW, sizeof(nameW)/sizeof(WCHAR), - pubW, sizeof(pubW)/sizeof(WCHAR), sysW, sizeof(sysW)/sizeof(WCHAR)); + hr = ISAXLexicalHandler_startDTD(lexical, nameW, ARRAY_SIZE(nameW), + pubW, ARRAY_SIZE(pubW), sysW, ARRAY_SIZE(sysW)); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4926,10 +4926,10 @@ static void test_mxwriter_dtd(void) hr = IVBSAXDeclHandler_elementDecl(vbdecl, NULL, NULL); EXPECT_HR(hr, E_POINTER); - hr = ISAXDeclHandler_elementDecl(decl, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, 0); + hr = ISAXDeclHandler_elementDecl(decl, nameW, ARRAY_SIZE(nameW), NULL, 0); EXPECT_HR(hr, E_INVALIDARG); - hr = ISAXDeclHandler_elementDecl(decl, nameW, sizeof(nameW)/sizeof(WCHAR), contentW, sizeof(contentW)/sizeof(WCHAR)); + hr = ISAXDeclHandler_elementDecl(decl, nameW, ARRAY_SIZE(nameW), contentW, ARRAY_SIZE(contentW)); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -4944,7 +4944,7 @@ static void test_mxwriter_dtd(void) hr = IMXWriter_put_output(writer, dest); EXPECT_HR(hr, S_OK); - hr = ISAXDeclHandler_elementDecl(decl, nameW, sizeof(nameW)/sizeof(WCHAR), contentW, 0); + hr = ISAXDeclHandler_elementDecl(decl, nameW, ARRAY_SIZE(nameW), contentW, 0); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 48d1c5bce4..9e5116f38f 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -452,7 +452,7 @@ static BSTR alloc_str_from_narrow(const char *str) static BSTR _bstr_(const char *str) { - assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); + assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); return alloced_bstrs[alloced_bstrs_count++]; } -- 2.14.4

June 11, 2018