August 2016 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Ignore unimplemented struct options in the writer.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 06fb21c58ab29fc988c3ab9fe445526e8774a915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06fb21c58ab29fc988c3ab9fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:47 2016 +0200 webservices: Ignore unimplemented struct options in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1ee5f1a..89f9465 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1652,11 +1652,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping HRESULT hr; const char *ptr; - if (desc->structOptions) - { - FIXME( "struct options 0x%x not supported\n", desc->structOptions ); - return E_NOTIMPL; - } + if (desc->structOptions) FIXME( "struct options 0x%x not supported\n", desc->structOptions ); for (i = 0; i < desc->fieldCount; i++) {

1 0

Hans Leidekker : webservices: Add support for writing WS_STRING and WS_XML_STRING values.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 864559db02c3077153b270bb24549e45eac270bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=864559db02c3077153b270bb2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:46 2016 +0200 webservices: Add support for writing WS_STRING and WS_XML_STRING values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 52 ++++++++++++++++++++++++++++++++++++++++- dlls/webservices/writer.c | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 58a4544..128e66e 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -577,10 +577,13 @@ static void test_WsWriteType(void) static void test_basic_type(void) { + static WCHAR testW[] = {'t','e','s','t',0}; HRESULT hr; WS_XML_WRITER *writer; - WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}, xmlstr; GUID guid; + WCHAR *str; + WS_STRING string; ULONG i; static const struct { @@ -687,6 +690,53 @@ static void test_basic_type(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t>00000000-0000-0000-0000-000000000000</t>", __LINE__ ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + string.chars = testW; + string.length = 4; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &string, sizeof(string), 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>test</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + str = testW; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, + &str, sizeof(str), 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>test</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + xmlstr.bytes = (BYTE *)"test"; + xmlstr.length = 4; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_XML_STRING_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &xmlstr, sizeof(xmlstr), 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>test</t>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index d3fe269..1ee5f1a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1516,6 +1516,22 @@ static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_string( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_STRING_DESCRIPTION *desc, const WS_STRING *value ) +{ + WS_XML_UTF16_TEXT utf16; + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16.bytes = (BYTE *)value->chars; + utf16.byteCount = value->length * sizeof(WCHAR); + return write_type_text( writer, mapping, &utf16.text ); +} + static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_WSZ_DESCRIPTION *desc, const WCHAR *value ) { @@ -1532,6 +1548,22 @@ static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, return write_type_text( writer, mapping, &utf16.text ); } +static HRESULT write_type_xml_string( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_XML_STRING_DESCRIPTION *desc, const WS_XML_STRING *value ) +{ + WS_XML_UTF8_TEXT utf8; + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = value->bytes; + utf8.value.length = value->length; + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, const void *, ULONG ); @@ -1744,6 +1776,13 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_guid( writer, mapping, desc, ptr ); } + case WS_STRING_TYPE: + { + const WS_STRING *ptr; + if (!option) option = WS_WRITE_REQUIRED_VALUE; + if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; + return write_type_string( writer, mapping, desc, ptr ); + } case WS_WSZ_TYPE: { const WCHAR *ptr; @@ -1754,6 +1793,13 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_wsz( writer, mapping, desc, ptr ); } + case WS_XML_STRING_TYPE: + { + const WS_XML_STRING *ptr; + if (!option) option = WS_WRITE_REQUIRED_VALUE; + if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; + return write_type_xml_string( writer, mapping, desc, ptr ); + } default: FIXME( "type %u not supported\n", type ); return E_NOTIMPL;

1 0

Józef Kucia : wined3d: Introduce wined3d_find_closest_matching_adapter_mode().
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 41d29a79f51cca0452fb37db38dc6b6df4b32dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d29a79f51cca0452fb37db3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:51 2016 +0200 wined3d: Introduce wined3d_find_closest_matching_adapter_mode(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 + 3 files changed, 103 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ff88a8..4213df3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4199,6 +4199,106 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada return WINED3D_OK; } +HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, + unsigned int adapter_idx, struct wined3d_display_mode *mode) +{ + unsigned int i, j, mode_count, matching_mode_count, closest; + struct wined3d_display_mode **matching_modes; + struct wined3d_display_mode *modes; + HRESULT hr; + + TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); + + if (!(mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) + { + WARN("Adapter has 0 matching modes.\n"); + return E_FAIL; + } + + if (!(modes = wined3d_calloc(mode_count, sizeof(*modes)))) + return E_OUTOFMEMORY; + if (!(matching_modes = wined3d_calloc(mode_count, sizeof(*matching_modes)))) + { + HeapFree(GetProcessHeap(), 0, modes); + return E_OUTOFMEMORY; + } + + for (i = 0; i < mode_count; ++i) + { + if (FAILED(hr = wined3d_enum_adapter_modes(wined3d, adapter_idx, + mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i]))) + { + HeapFree(GetProcessHeap(), 0, matching_modes); + HeapFree(GetProcessHeap(), 0, modes); + return hr; + } + matching_modes[i] = &modes[i]; + } + + matching_mode_count = mode_count; + + if (mode->scanline_ordering != WINED3D_SCANLINE_ORDERING_UNKNOWN) + { + for (i = 0, j = 0; i < matching_mode_count; ++i) + { + if (matching_modes[i]->scanline_ordering == mode->scanline_ordering) + matching_modes[j++] = matching_modes[i]; + } + if (j > 0) + matching_mode_count = j; + } + + if (mode->refresh_rate) + { + for (i = 0, j = 0; i < matching_mode_count; ++i) + { + if (matching_modes[i]->refresh_rate == mode->refresh_rate) + matching_modes[j++] = matching_modes[i]; + } + if (j > 0) + matching_mode_count = j; + } + + if (!mode->width || !mode->height) + { + struct wined3d_display_mode current_mode; + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, + &current_mode, NULL))) + { + HeapFree(GetProcessHeap(), 0, matching_modes); + HeapFree(GetProcessHeap(), 0, modes); + return hr; + } + mode->width = current_mode.width; + mode->height = current_mode.height; + } + + closest = ~0u; + for (i = 0, j = 0; i < matching_mode_count; ++i) + { + unsigned int d = abs(mode->width - matching_modes[i]->width) + + abs(mode->height - matching_modes[i]->height); + + if (closest > d) + { + closest = d; + j = i; + } + } + + *mode = *matching_modes[j]; + + HeapFree(GetProcessHeap(), 0, matching_modes); + HeapFree(GetProcessHeap(), 0, modes); + + TRACE("Returning %ux%u@%u %s %#x.\n", mode->width, mode->height, + mode->refresh_rate, debug_d3dformat(mode->format_id), + mode->scanline_ordering); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c3899ed..0db371d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -10,6 +10,7 @@ @ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) +@ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1c9b262..bc343ec 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2105,6 +2105,8 @@ ULONG __cdecl wined3d_decref(struct wined3d *wined3d); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, UINT mode_idx, struct wined3d_display_mode *mode); +HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, + unsigned int adapter_idx, struct wined3d_display_mode *mode); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0

Józef Kucia : dxgi: Implement dxgi_output_FindClosestMatchingMode().
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 8d89d0ec1ee7f50aeee348edb30c6b228f522d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d89d0ec1ee7f50aeee348edb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:52 2016 +0200 dxgi: Implement dxgi_output_FindClosestMatchingMode(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 2 +- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 6d7ca20..0cf8084 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -228,9 +228,42 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput *iface, const DXGI_MODE_DESC *mode, DXGI_MODE_DESC *closest_match, IUnknown *device) { - FIXME("iface %p, mode %p, closest_match %p, device %p stub!\n", iface, mode, closest_match, device); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct wined3d *wined3d; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, mode %p, closest_match %p, device %p.\n", iface, mode, closest_match, device); + + if ((!mode->Width && mode->Height) || (mode->Width && !mode->Height)) + return DXGI_ERROR_INVALID_CALL; + + if (mode->Format == DXGI_FORMAT_UNKNOWN && !device) + return DXGI_ERROR_INVALID_CALL; + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); + if (mode->Format == DXGI_FORMAT_UNKNOWN) + { + FIXME("Matching formats to device not implemented.\n"); + return E_NOTIMPL; + } + + adapter = output->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + wined3d_display_mode_from_dxgi(&wined3d_mode, mode); + hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (SUCCEEDED(hr)) + { + dxgi_mode_from_wined3d(closest_match, &wined3d_mode); + TRACE("Returning %s.\n", debug_dxgi_mode(closest_match)); + } + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput *iface) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 23624eb..8ec65e2 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -225,7 +225,7 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ mode_desc.Width = new_width; mode_desc.Height = new_height; hr = IDXGIOutput_FindClosestMatchingMode(target, &mode_desc, &mode_desc, NULL); - todo_wine ok_(__FILE__, line)(SUCCEEDED(hr), "FindClosestMatchingMode failed, hr %#x.\n", hr); + ok_(__FILE__, line)(SUCCEEDED(hr), "FindClosestMatchingMode failed, hr %#x.\n", hr); new_width = mode_desc.Width; new_height = mode_desc.Height; }

1 0

Nikolay Sivov : oleaut32: Implement IClassFactory::QueryInterface() for StdFont object.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: e57ab97f6f2749906573d93571381c0fb221b480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57ab97f6f2749906573d9357… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 21:50:40 2016 +0300 oleaut32: Implement IClassFactory::QueryInterface() for StdFont object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olefont.c | 20 +++++++++++++++----- dlls/oleaut32/tests/olefont.c | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 7f8ab5d..4b3411e 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -2229,12 +2229,22 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI -SFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); +static HRESULT WINAPI SFCF_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; - FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; + if (IsEqualIID(&IID_IClassFactory, riid) || IsEqualIID(&IID_IUnknown, riid)) + { + *obj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; } static ULONG WINAPI diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 1536619..f9c5625 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -1230,6 +1230,7 @@ static void test_realization(void) static void test_OleCreateFontIndirect(void) { FONTDESC fontdesc; + IUnknown *unk, *unk2; IFont *font; HRESULT hr; @@ -1261,6 +1262,20 @@ static void test_OleCreateFontIndirect(void) hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); EXPECT_HR(hr, S_OK); IFont_Release(font); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoGetClassObject(&CLSID_StdFont, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void**)&unk2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IUnknown_Release(unk); + IUnknown_Release(unk2); + + OleUninitialize(); } START_TEST(olefont)

1 0

Nikolay Sivov : oleaut32: Fix AddFuncDesc() to ignore scodes array length when NULL array pointer is passed.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 37745b093d87596fc85902d4a911c8cd77b8536f URL: http://source.winehq.org/git/wine.git/?a=commit;h=37745b093d87596fc85902d4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 20:57:16 2016 +0300 oleaut32: Fix AddFuncDesc() to ignore scodes array length when NULL array pointer is passed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 2 ++ dlls/oleaut32/typelib.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 4f43cfe..3fdd245 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2033,6 +2033,8 @@ static void test_CreateTypeLib(SYSKIND sys) { funcdesc.lprgelemdescParam = NULL; funcdesc.invkind = INVOKE_FUNC; funcdesc.cParams = 0; + funcdesc.cScodes = 1; + funcdesc.lprgscode = NULL; hres = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b0ee5f2..4fdfbeb 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -10431,11 +10431,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, if (tmp_func_desc.funcdesc.oVft != 0) tmp_func_desc.funcdesc.oVft |= 1; - if (funcDesc->cScodes) { + if (funcDesc->cScodes && funcDesc->lprgscode) { tmp_func_desc.funcdesc.lprgscode = heap_alloc(sizeof(SCODE) * funcDesc->cScodes); memcpy(tmp_func_desc.funcdesc.lprgscode, funcDesc->lprgscode, sizeof(SCODE) * funcDesc->cScodes); - } else + } else { tmp_func_desc.funcdesc.lprgscode = NULL; + tmp_func_desc.funcdesc.cScodes = 0; + } buf_size = TLB_SizeElemDesc(&funcDesc->elemdescFunc); for (i = 0; i < funcDesc->cParams; ++i) {

1 0

Sebastian Lackner : kernel32/tests: Add a missing linebreak to an ok() message.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 355af77a21e50b850c3e3d08f724b78bcd8f89d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355af77a21e50b850c3e3d08f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 26 01:56:58 2016 +0200 kernel32/tests: Add a missing linebreak to an ok() message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 2b752c2..ac09bb8 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1248,7 +1248,7 @@ static void test_RegisterWaitForSingleObject(void) SetLastError(0xdeadbeef); ret = pUnregisterWait(NULL); - ok(!ret, "Expected UnregisterWait to fail"); + ok(!ret, "Expected UnregisterWait to fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); }

1 0

Hans Leidekker : webservices: Flush the writer first in WsWriteXmlBuffer.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 633828f832c301d13082fd4600234732a9e583f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=633828f832c301d13082fd460… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:44 2016 +0200 webservices: Flush the writer first in WsWriteXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1fb5489..177c6e0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1920,6 +1920,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W if (!writer || !xmlbuf) return E_INVALIDARG; + if ((hr = write_flush( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, xmlbuf->size )) != S_OK) return hr; write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); return S_OK;

1 0

Bruno Jesus : msacm32: Add the 16-bit DLL version on acmGetVersion.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: e8d72a0e31ecd418cff758c945967a78d6ee10ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d72a0e31ecd418cff758c94… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 24 20:12:14 2016 -0300 msacm32: Add the 16-bit DLL version on acmGetVersion. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/msacm32_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index a47611c..efe58af 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -84,6 +84,8 @@ DWORD WINAPI acmGetVersion(void) switch (version.dwPlatformId) { case VER_PLATFORM_WIN32_NT: return 0x04000565; /* 4.0.1381 */ + case VER_PLATFORM_WIN32s: + return 0x02010000; /* 2.1 */ default: FIXME("%x not supported\n", version.dwPlatformId); /* fall through */

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: bc7228a4601f867d6d6a8fda974c163fc1ef94c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc7228a4601f867d6d6a8fda9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:43 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 53f851f..5ce7621 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -74,6 +74,7 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; +typedef struct _WS_PROXY_MESSAGE_CALLBACK_CONTEXT WS_PROXY_MESSAGE_CALLBACK_CONTEXT; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -388,6 +389,16 @@ typedef struct _WS_WSZ_DESCRIPTION { ULONG maxCharCount; } WS_WSZ_DESCRIPTION; +typedef struct _WS_STRING_DESCRIPTION { + ULONG minCharCount; + ULONG maxCharCount; +} WS_STRING_DESCRIPTION; + +typedef struct _WS_XML_STRING_DESCRIPTION { + ULONG minByteCount; + ULONG maxByteCount; +} WS_XML_STRING_DESCRIPTION; + struct _WS_ENUM_VALUE { int value; WS_XML_STRING *name; @@ -1346,6 +1357,17 @@ typedef enum typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) (void*); +typedef HRESULT (CALLBACK *WS_PROXY_MESSAGE_CALLBACK) + (WS_MESSAGE*, WS_HEAP*, void*, WS_ERROR*); + +struct _WS_PROXY_MESSAGE_CALLBACK_CONTEXT +{ + WS_PROXY_MESSAGE_CALLBACK callback; + void *state; +}; + +HRESULT WINAPI WsAddCustomHeader(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, ULONG, WS_ERROR*); HRESULT WINAPI WsAddMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_TYPE, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsAddressMessage(WS_MESSAGE*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); @@ -1432,6 +1454,8 @@ HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION**, ULONG, WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsRemoveCustomHeader(WS_MESSAGE*, const WS_XML_STRING*, const WS_XML_STRING*, + WS_ERROR*); HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*);

1 0