January 2016 - Wine-Commits

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 8676f7bae099f0ca20c26a29dfa4bebd828b39b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8676f7bae099f0ca20c26a29d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:28:00 2016 +0100 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 189 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f99705e..8394f7a 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -449,6 +449,193 @@ static void test_WsWriteStartAttribute(void) WsFreeWriter( writer ); } +static void test_WsWriteType(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING prefix = {1, (BYTE*)"p"}, localname = {3, (BYTE *)"str"}, ns = {2, (BYTE *)"ns"}; + const WCHAR *val_str; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + val_str = testW; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), 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, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* required value */ + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_VALUE, NULL, sizeof(testW), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_VALUE, testW, sizeof(testW), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* required pointer */ + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, NULL, sizeof(val_str), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(WCHAR **), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + val_str = testW; + hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str p:str=\"test\" xmlns:p=\"ns\"/>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + val_str = testW; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); + + WsFreeWriter( writer ); +} + +static void test_basic_type(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + ULONG i; + static const struct + { + WS_TYPE type; + INT64 val; + ULONG size; + const char *result; + const char *result2; + } + tests[] = + { + { WS_BOOL_TYPE, TRUE, sizeof(BOOL), "<t>true</t>", "<t t=\"true\"/>" }, + { WS_BOOL_TYPE, FALSE, sizeof(BOOL), "<t>false</t>", "<t t=\"false\"/>" }, + { WS_INT8_TYPE, -128, sizeof(INT8), "<t>-128</t>", "<t t=\"-128\"/>" }, + { WS_INT16_TYPE, -32768, sizeof(INT16), "<t>-32768</t>", "<t t=\"-32768\"/>" }, + { WS_INT32_TYPE, -2147483647 - 1, sizeof(INT32), "<t>-2147483648</t>", + "<t t=\"-2147483648\"/>" }, + { WS_INT64_TYPE, -9223372036854775807 - 1, sizeof(INT64), "<t>-9223372036854775808</t>", + "<t t=\"-9223372036854775808\"/>" }, + { WS_UINT8_TYPE, 255, sizeof(UINT8), "<t>255</t>", "<t t=\"255\"/>" }, + { WS_UINT16_TYPE, 65535, sizeof(UINT16), "<t>65535</t>", "<t t=\"65535\"/>" }, + { WS_UINT32_TYPE, ~0u, sizeof(UINT32), "<t>4294967295</t>", "<t t=\"4294967295\"/>" }, + { WS_UINT64_TYPE, ~0, sizeof(UINT64), "<t>18446744073709551615</t>", + "<t t=\"18446744073709551615\"/>" }, + }; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + /* element content type mapping */ + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + 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 ); + + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + /* element type mapping is the same as element content type mapping for basic types */ + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + 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 ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + /* attribute type mapping */ + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + 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 ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, tests[i].type, NULL, + WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result2, __LINE__ ); + } + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -457,4 +644,6 @@ START_TEST(writer) test_WsSetOutputToBuffer(); test_WsWriteStartElement(); test_WsWriteStartAttribute(); + test_WsWriteType(); + test_basic_type(); }

1 0

Hans Leidekker : webservices: Attributes inherit the prefix from their element.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 44d850c259b7a36007beaf38941a157b31b7c2db URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d850c259b7a36007beaf389… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:55 2016 +0100 webservices: Attributes inherit the prefix from their element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ece5ad1..d36793a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -454,20 +454,24 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) { WS_XML_UTF8_TEXT *text = (WS_XML_UTF8_TEXT *)attr->value; unsigned char quote = attr->singleQuote ? '\'' : '"'; + const WS_XML_STRING *prefix; ULONG size; HRESULT hr; + if (attr->prefix) prefix = attr->prefix; + else prefix = writer->current->hdr.prefix; + /* ' prefix:attr="value"' */ size = attr->localName->length + 4 /* ' =""' */; - if (attr->prefix) size += attr->prefix->length + 1 /* ':' */; + if (prefix) size += prefix->length + 1 /* ':' */; if (text) size += text->value.length; if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_char( writer, ' ' ); - if (attr->prefix) + if (prefix) { - write_bytes( writer, attr->prefix->bytes, attr->prefix->length ); + write_bytes( writer, prefix->bytes, prefix->length ); write_char( writer, ':' ); } write_bytes( writer, attr->localName->bytes, attr->localName->length );

1 0

Riccardo Bortolato : d3d11: Implement d3d11_immediate_context_CopySubresourceRegion().
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: ccbe3a580b69d7a11c56c4b2b06aed89e9cfe1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbe3a580b69d7a11c56c4b2b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Jan 19 22:28:09 2016 +0100 d3d11: Implement d3d11_immediate_context_CopySubresourceRegion(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> 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/d3d11/device.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 38845ec..fb308d0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -820,10 +820,31 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D ID3D11Resource *dst_resource, UINT dst_subresource_idx, UINT dst_x, UINT dst_y, UINT dst_z, ID3D11Resource *src_resource, UINT src_subresource_idx, const D3D11_BOX *src_box) { - FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " - "src_resource %p, src_subresource_idx %u, src_box %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + struct wined3d_box wined3d_src_box; + + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " + "src_resource %p, src_subresource_idx %u, src_box %p.\n", iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + + if (src_box) + { + wined3d_src_box.left = src_box->left; + wined3d_src_box.top = src_box->top; + wined3d_src_box.front = src_box->front; + wined3d_src_box.right = src_box->right; + wined3d_src_box.bottom = src_box->bottom; + wined3d_src_box.back = src_box->back; + } + + wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); + wined3d_mutex_lock(); + wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CopyResource(ID3D11DeviceContext *iface,

1 0

Hans Leidekker : webservices: Simplify handling of quotes in write_attribute.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 4f0b912236fc8f7d72c5d50a6c9b784b80839b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0b912236fc8f7d72c5d50a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:54 2016 +0100 webservices: Simplify handling of quotes in write_attribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e7fa915..ece5ad1 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -453,6 +453,7 @@ static inline void write_bytes( struct writer *writer, const BYTE *bytes, ULONG static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) { WS_XML_UTF8_TEXT *text = (WS_XML_UTF8_TEXT *)attr->value; + unsigned char quote = attr->singleQuote ? '\'' : '"'; ULONG size; HRESULT hr; @@ -471,11 +472,9 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) } write_bytes( writer, attr->localName->bytes, attr->localName->length ); write_char( writer, '=' ); - if (attr->singleQuote) write_char( writer, '\'' ); - else write_char( writer, '"' ); + write_char( writer, quote ); if (text) write_bytes( writer, text->value.bytes, text->value.length ); - if (attr->singleQuote) write_char( writer, '\'' ); - else write_char( writer, '"' ); + write_char( writer, quote ); /* FIXME: ignoring namespace */ return S_OK;

1 0

Nikolay Sivov : d2d1: Support different measuring modes in DrawText().
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 7dd7500327f62864fdfa3124bf24f529adccedec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd7500327f62864fdfa3124b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 21:31:56 2016 +0300 d2d1: Support different measuring modes in DrawText(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index fba1738..091954c 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -888,6 +888,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * const WCHAR *string, UINT32 string_len, IDWriteTextFormat *text_format, const D2D1_RECT_F *layout_rect, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options, DWRITE_MEASURING_MODE measuring_mode) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); IDWriteTextLayout *text_layout; IDWriteFactory *dwrite_factory; D2D1_POINT_2F origin; @@ -898,9 +899,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * iface, debugstr_wn(string, string_len), string_len, text_format, layout_rect, brush, options, measuring_mode); - if (measuring_mode != DWRITE_MEASURING_MODE_NATURAL) - FIXME("Ignoring measuring mode %#x.\n", measuring_mode); - if (FAILED(hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown **)&dwrite_factory))) { @@ -908,8 +906,13 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * return; } - hr = IDWriteFactory_CreateTextLayout(dwrite_factory, string, string_len, text_format, - layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, &text_layout); + if (measuring_mode == DWRITE_MEASURING_MODE_NATURAL) + hr = IDWriteFactory_CreateTextLayout(dwrite_factory, string, string_len, text_format, + layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, &text_layout); + else + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(dwrite_factory, string, string_len, text_format, + layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, render_target->dpi_x / 96.0f, + (DWRITE_MATRIX*)&render_target->drawing_state.transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, &text_layout); IDWriteFactory_Release(dwrite_factory); if (FAILED(hr)) {

1 0

Piotr Caban : msvcrt: Add support for $$B datatype description format in unDName.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 6ac2acc34f266e2e59e1d1dd2de0f299e750ee01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac2acc34f266e2e59e1d1dd2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:23 2016 +0100 msvcrt: Add support for $$B datatype description format in unDName. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 ++ dlls/msvcrt/undname.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index fac1ab5..e67e344 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1321,6 +1321,8 @@ static void test_demangle(void) /* 129 */ {"??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z", "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", "??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z"}, +/* 130 */ {"??_E?$TStrArray@$$BY0BAA(a)D$0BA@@@UAEPAXI(a)Z", + "public: virtual void * __thiscall TStrArray<char [256],16>::`vector deleting destructor'(unsigned int)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 587a602..e6cb61f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -991,7 +991,37 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, } break; case '$': - if (*sym->current == 'C') + if (*sym->current == 'B') + { + unsigned mark = sym->stack.num; + struct datatype_t sub_ct; + const char* arr = NULL; + sym->current++; + + /* multidimensional arrays */ + if (*sym->current == 'Y') + { + const char* n1; + int num; + + sym->current++; + if (!(n1 = get_number(sym))) goto done; + num = atoi(n1); + + while (num--) + arr = str_printf(sym, "%s[%s]", arr, get_number(sym)); + } + + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; + + if (arr) + ct->left = str_printf(sym, "%s %s", sub_ct.left, arr); + else + ct->left = sub_ct.left; + ct->right = sub_ct.right; + sym->stack.num = mark; + } + else if (*sym->current == 'C') { const char *ptr, *ptr_modif;

1 0

Huw Davies : oleaut32: Use IMalloc_GetSize to determine the cache bucket.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 924cad5f3b7d7d3a2574ed6ff5396bcbd2f422ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=924cad5f3b7d7d3a2574ed6ff… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 10:29:51 2016 +0000 oleaut32: Use IMalloc_GetSize to determine the cache bucket. This also has the effect of ignoring non-allocated memory blocks. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 36 +++++++++++++++++++++++++++++++++--- dlls/oleaut32/tests/vartype.c | 10 ++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 07db9ff..00e6daf 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -120,14 +120,27 @@ static inline bstr_t *bstr_from_str(BSTR str) return CONTAINING_RECORD(str, bstr_t, u.str); } -static inline bstr_cache_entry_t *get_cache_entry(size_t size) +static inline bstr_cache_entry_t *get_cache_entry_from_idx(unsigned cache_idx) { - unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)-1])/BUCKET_SIZE; return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) ? bstr_cache + cache_idx : NULL; } +static inline bstr_cache_entry_t *get_cache_entry(size_t size) +{ + unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)-1])/BUCKET_SIZE; + return get_cache_entry_from_idx(cache_idx); +} + +static inline bstr_cache_entry_t *get_cache_entry_from_alloc_size(SIZE_T alloc_size) +{ + unsigned cache_idx; + if (alloc_size < BUCKET_SIZE) return NULL; + cache_idx = (alloc_size - BUCKET_SIZE) / BUCKET_SIZE; + return get_cache_entry_from_idx(cache_idx); +} + static bstr_t *alloc_bstr(size_t size) { bstr_cache_entry_t *cache_entry = get_cache_entry(size); @@ -234,6 +247,16 @@ BSTR WINAPI SysAllocString(LPCOLESTR str) return SysAllocStringLen(str, lstrlenW(str)); } +static inline IMalloc *get_malloc(void) +{ + static IMalloc *malloc; + + if (!malloc) + CoGetMalloc(1, &malloc); + + return malloc; +} + /****************************************************************************** * SysFreeString [OLEAUT32.6] * @@ -253,12 +276,19 @@ void WINAPI SysFreeString(BSTR str) { bstr_cache_entry_t *cache_entry; bstr_t *bstr; + IMalloc *malloc = get_malloc(); + SIZE_T alloc_size; if(!str) return; bstr = bstr_from_str(str); - cache_entry = get_cache_entry(bstr->size); + + alloc_size = IMalloc_GetSize(malloc, bstr); + if (alloc_size == ~0UL) + return; + + cache_entry = get_cache_entry_from_alloc_size(alloc_size); if(cache_entry) { unsigned i; diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index f7df9c5..03f43ec 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6369,9 +6369,15 @@ static void test_bstr_cache(void) ok(str == str2, "str != str2\n"); SysFreeString(str2); - /* Fill the bucket with cached entries. */ + /* Fill the bucket with cached entries. + We roll our own, to show that the cache doesn't use + the bstr length field to determine bucket allocation. */ for(i=0; i < sizeof(strs)/sizeof(*strs); i++) - strs[i] = SysAllocStringLen(NULL, 24); + { + DWORD_PTR *ptr = CoTaskMemAlloc(64); + ptr[0] = 0; + strs[i] = (BSTR)(ptr + 1); + } for(i=0; i < sizeof(strs)/sizeof(*strs); i++) SysFreeString(strs[i]);

1 0

Andrew Eikum : xaudio2: Use an HRESULT return code.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 2b2b179422136d3986229e9b7ff2121f000891f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2b179422136d3986229e9b7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 20 14:08:18 2016 -0600 xaudio2: Use an HRESULT return code. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 4f0a11f..5ca592d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1551,7 +1551,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, if(!deviceId){ if(This->ndevs == 0){ LeaveCriticalSection(&This->lock); - return ERROR_NOT_FOUND; + return E_NOTFOUND; } deviceId = This->devids[0]; }

1 0

Paul Gofman : mscoree: Fix calling convention for mono callback functions.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: b9a0fe18e3cbb4e5c0ac5021b8f041f970ab6c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a0fe18e3cbb4e5c0ac5021b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 20 18:03:40 2016 +0300 mscoree: Fix calling convention for mono callback functions. ms_abi calling convention is required for x86_64 arch. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 12 ++++++------ dlls/mscoree/mscoree_private.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index b0237b3..3d663f1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -110,11 +110,11 @@ static BOOL get_mono_path(LPWSTR path); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); -static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); -static void mono_shutdown_callback_fn(MonoProfiler *prof); +static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof); -static void mono_print_handler_fn(const char *string, INT is_stdout); +static void CDECL mono_print_handler_fn(const char *string, INT is_stdout); static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) @@ -249,12 +249,12 @@ fail: return E_FAIL; } -static void mono_shutdown_callback_fn(MonoProfiler *prof) +static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof) { is_mono_shutdown = TRUE; } -static void mono_print_handler_fn(const char *string, INT is_stdout) +static void CDECL mono_print_handler_fn(const char *string, INT is_stdout) { wine_dbg_printf("%s", string); } @@ -1144,7 +1144,7 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } -static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 0c59c42..7843407 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -128,11 +128,11 @@ typedef enum { MONO_IMAGE_IMAGE_INVALID } MonoImageOpenStatus; -typedef MonoAssembly* (*MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +typedef MonoAssembly* (CDECL *MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); -typedef void (*MonoProfileFunc)(MonoProfiler *prof); +typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); -typedef void (*MonoPrintCallback) (const char *string, INT is_stdout); +typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout); extern BOOL is_mono_started DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Add support for member function pointers demangling in unDName function.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 112ad7fc8766b7b09d5026db19f2e826a9c83d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=112ad7fc8766b7b09d5026db1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:12 2016 +0100 msvcrt: Add support for member function pointers demangling in unDName function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index cbad1c1..fac1ab5 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1318,6 +1318,9 @@ static void test_demangle(void) /* 128 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", "??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", 2}, +/* 129 */ {"??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z", + "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", + "??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 097f036..587a602 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -859,14 +859,55 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'P': /* Pointer */ if (isdigit(*sym->current)) { - /* FIXME: P6 = Function pointer, others who knows.. */ - if (*sym->current++ == '6') + /* FIXME: + * P6 = Function pointer + * P8 = Member function pointer + * others who knows.. */ + if (*sym->current == '8') { char* args = NULL; const char* call_conv; const char* exported; struct datatype_t sub_ct; unsigned mark = sym->stack.num; + const char* class; + const char* modifier; + const char* ptr_modif; + + sym->current++; + + if (!(class = get_class_name(sym))) + goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) + goto done; + if (modifier) + modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if(ptr_modif[0]) + modifier = str_printf(sym, " %s", ptr_modif); + if (!get_calling_convention(*sym->current++, + &call_conv, &exported, + sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE)) + goto done; + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + goto done; + + args = get_args(sym, pmt_ref, TRUE, '(', ')'); + if (!args) goto done; + sym->stack.num = mark; + + ct->left = str_printf(sym, "%s%s (%s %s::*", + sub_ct.left, sub_ct.right, call_conv, class); + ct->right = str_printf(sym, ")%s%s", args, modifier); + } + else if (*sym->current == '6') + { + char* args = NULL; + const char* call_conv; + const char* exported; + struct datatype_t sub_ct; + unsigned mark = sym->stack.num; + + sym->current++; if (!get_calling_convention(*sym->current++, &call_conv, &exported,

1 0