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

[PATCH 1/5] shell32/autocomplete: Implement ResetEnumerator
by Gabriel Ivăncescu Nov. 8, 2018

Nov. 8, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index a6404ca..8437d2d 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -24,8 +24,6 @@ - implement ACO_SEARCH style - implement ACO_FILTERPREFIXES style - implement ACO_RTLREADING style - - implement ResetEnumerator - */ #include "config.h" @@ -1041,9 +1039,15 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnResetEnumerator( { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + if (This->initialized) + { + free_enum_strs(This); + if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) + autocomplete_text(This, This->hwndEdit, autoappend_flag_displayempty); + } + return S_OK; } /************************************************************************** -- 2.19.1

2 9

[PATCH 2/2] webservices: Fix handling of union fields that match noneEnumValue.
by Hans Leidekker Nov. 8, 2018

Nov. 8, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/writer.c | 31 ++++++++++++++++++++++++++++--- dlls/webservices/writer.c | 19 +++---------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f46578ba3b..a55da605e8 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3913,11 +3913,11 @@ static void test_union_type(void) { static const WCHAR testW[] = {'t','e','s','t',0}; static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; - static WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; + static WS_XML_STRING str_none = {4, (BYTE *)"none"}, str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; HRESULT hr; WS_XML_WRITER *writer; WS_UNION_DESCRIPTION u; - WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_UNION_FIELD_DESCRIPTION f, f2, f3, *fields[3]; WS_FIELD_DESCRIPTION f_struct, *fields_struct[1]; WS_STRUCT_DESCRIPTION s; enum choice {CHOICE_A = 30, CHOICE_B = 20, CHOICE_C = 10, CHOICE_NONE = 0}; @@ -3929,6 +3929,7 @@ static void test_union_type(void) { const WCHAR *a; UINT32 b; + BOOL none; } value; } test; @@ -4020,11 +4021,35 @@ static void test_union_type(void) WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + /* field value equals noneEnumValue */ + memset( &f3, 0, sizeof(f3) ); + f3.value = CHOICE_NONE; + f3.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f3.field.localName = &str_none; + f3.field.ns = &str_ns; + f3.field.type = WS_BOOL_TYPE; + f3.field.offset = FIELD_OFFSET(struct test, value.none); + fields[2] = &f3; + + u.fieldCount = 3; + u.valueIndices = NULL; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + test.choice = CHOICE_NONE; + test.value.none = TRUE; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><none>true</none></t>", __LINE__ ); + hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - test.choice = CHOICE_NONE; f_struct.options = WS_FIELD_OPTIONAL; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0f20049b7a..0a28d9dc84 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3626,24 +3626,11 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI int enum_value; HRESULT hr; - if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; - if (size < sizeof(enum_value)) return E_INVALIDARG; - if ((enum_value = *(int *)(char *)ptr + desc->enumOffset) == desc->noneEnumValue) - { - switch (option) - { - case WS_WRITE_REQUIRED_VALUE: - return WS_E_INVALID_FORMAT; - - case WS_WRITE_NILLABLE_VALUE: - return S_OK; + if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; - default: - ERR( "unhandled write option %u\n", option ); - return E_INVALIDARG; - } - } + enum_value = *(int *)(char *)ptr + desc->enumOffset; + if (enum_value == desc->noneEnumValue && option == WS_WRITE_NILLABLE_VALUE) return S_OK; if ((hr = find_index( desc, enum_value, &i )) != S_OK) return hr; return write_type_field( writer, &desc->fields[i]->field, ptr, desc->fields[i]->field.offset ); -- 2.11.0

1 0

[PATCH 1/2] webservices: Use the search index to look up the union field, if available.
by Hans Leidekker Nov. 8, 2018

Nov. 8, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/writer.c | 13 +++++++++- dlls/webservices/writer.c | 56 ++++++++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index e33c38951e..f46578ba3b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3920,7 +3920,8 @@ static void test_union_type(void) WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; WS_FIELD_DESCRIPTION f_struct, *fields_struct[1]; WS_STRUCT_DESCRIPTION s; - enum choice {CHOICE_A, CHOICE_B, CHOICE_NONE}; + enum choice {CHOICE_A = 30, CHOICE_B = 20, CHOICE_C = 10, CHOICE_NONE = 0}; + ULONG index[2] = {1, 0}; struct test { enum choice choice; @@ -3987,6 +3988,7 @@ static void test_union_type(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t><a>test</a></t>", __LINE__ ); + u.valueIndices = index; hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); @@ -4004,6 +4006,15 @@ static void test_union_type(void) ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + test.choice = CHOICE_C; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); test.choice = CHOICE_NONE; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ff633a656c..0f20049b7a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3580,15 +3580,48 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) } } -static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); +static HRESULT find_index( const WS_UNION_DESCRIPTION *desc, int value, ULONG *idx ) +{ + ULONG i; -static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, - const void *, ULONG ); + if (desc->valueIndices) + { + int c, min = 0, max = desc->fieldCount - 1; + while (min <= max) + { + i = (min + max) / 2; + c = value - desc->fields[desc->valueIndices[i]]->value; + if (c < 0) + max = i - 1; + else if (c > 0) + min = i + 1; + else + { + *idx = desc->valueIndices[i]; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; + } + + /* fall back to linear search */ + for (i = 0; i < desc->fieldCount; i++) + { + if (desc->fields[i]->value == value) + { + *idx = i; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; +} + +static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - ULONG i, offset; + ULONG i; const void *ptr; int enum_value; HRESULT hr; @@ -3612,18 +3645,13 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI } } - for (i = 0; i < desc->fieldCount; i++) - { - if (desc->fields[i]->value == enum_value) - { - offset = desc->fields[i]->field.offset; - return write_type_field( writer, &desc->fields[i]->field, ptr, offset ); - } - } - - return E_INVALIDARG; + if ((hr = find_index( desc, enum_value, &i )) != S_OK) return hr; + return write_type_field( writer, &desc->fields[i]->field, ptr, desc->fields[i]->field.offset ); } +static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, + const void *, ULONG ); + static HRESULT write_type_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, ULONG count ) { -- 2.11.0

1 0

[PATCH v2] mfplat/tests: Use correct interface macro.
by Alistair Leslie-Hughes Nov. 8, 2018

Nov. 8, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/tests/mfplat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 61cfbbf..2ee81ce 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -307,7 +307,7 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); @@ -321,7 +321,7 @@ static void test_MFCreateMFByteStreamOnStream(void) ref = IMFByteStream_Release(bytestream2); ok(ref == 1, "got %u\n", ref); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK || /* w7pro64 */ @@ -337,14 +337,14 @@ static void test_MFCreateMFByteStreamOnStream(void) ok(attributes != NULL, "got NULL\n"); - hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + hr = IMFAttributes_QueryInterface(attributes, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); ref = IUnknown_Release(unknown); ok(ref == 2, "got %u\n", ref); - hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + hr = IMFAttributes_QueryInterface(attributes, &IID_IMFByteStream, (void **)&bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(bytestream2 == bytestream, "got %p\n", bytestream2); @@ -375,7 +375,7 @@ static void test_MFCreateFile(void) MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); ok(attributes != NULL, "got NULL\n"); -- 1.9.1

1 0

[PATCH] mfplat/tests: Use correct interface macro.
by Alistair Leslie-Hughes Nov. 7, 2018

Nov. 7, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/tests/mfplat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f9e0996..8009f1f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -236,7 +236,7 @@ static void test_source_resolver(void) MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, file_type); @@ -352,7 +352,7 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); @@ -366,7 +366,7 @@ static void test_MFCreateMFByteStreamOnStream(void) ref = IMFByteStream_Release(bytestream2); ok(ref == 1, "got %u\n", ref); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK || /* w7pro64 */ @@ -382,14 +382,14 @@ static void test_MFCreateMFByteStreamOnStream(void) ok(attributes != NULL, "got NULL\n"); - hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + hr = IMFAttributes_QueryInterface(attributes, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); ref = IUnknown_Release(unknown); ok(ref == 2, "got %u\n", ref); - hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + hr = IMFAttributes_QueryInterface(attributes, &IID_IMFByteStream, (void **)&bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(bytestream2 == bytestream, "got %p\n", bytestream2); -- 1.9.1

2 1

[PATCH] libs/port: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc Nov. 7, 2018

Nov. 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/port/cptable.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/port/cptable.c b/libs/port/cptable.c index 03264f3dd5..73000c2816 100644 --- a/libs/port/cptable.c +++ b/libs/port/cptable.c @@ -175,8 +175,6 @@ static const union cptable * const cptables[72] = /* ### cpmap end ### */ /* Everything above this line is generated automatically by make_unicode */ -#define NB_CODEPAGES (sizeof(cptables)/sizeof(cptables[0])) - static int cmp_codepage( const void *codepage, const void *entry ) { @@ -189,7 +187,7 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) { const union cptable **res; - if (!(res = bsearch( &codepage, cptables, NB_CODEPAGES, + if (!(res = bsearch( &codepage, cptables, ARRAY_SIZE( cptables ), sizeof(cptables[0]), cmp_codepage ))) return NULL; return *res; } @@ -198,6 +196,6 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) /* enum valid codepages */ const union cptable *wine_cp_enum_table( unsigned int index ) { - if (index >= NB_CODEPAGES) return NULL; + if (index >= ARRAY_SIZE( cptables )) return NULL; return cptables[index]; } -- 2.14.5

1 0

[PATCH 7/7] widl: Generate async interface table.
by Jacek Caban Nov. 7, 2018

Nov. 7, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/proxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] widl: Support async interfaces proxy.
by Jacek Caban Nov. 7, 2018

Nov. 7, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/proxy.c | 19 ++++++++++++++++--- tools/widl/typegen.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-)

1 0

[PATCH 5/7] widl: Use for_each_iface in get_size_procformatstring.
by Jacek Caban Nov. 7, 2018

Nov. 7, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-)

1 0

[PATCH 4/7] widl: Use for_each_iface in process_tfs.
by Jacek Caban Nov. 7, 2018

Nov. 7, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 51 +++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 34 deletions(-)

1 0