December 2017 - Wine-Commits

Józef Kucia : d3d9/tests: Add test for checking D3DUSAGE_AUTOGENMIPMAP support.
by Alexandre Julliard Dec. 11, 2017

Dec. 11, 2017

Module: wine Branch: master Commit: 0ccc7c09bbe740ff94c7164a6c3ab1cab85fd72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ccc7c09bbe740ff94c7164a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 11 10:25:25 2017 +0100 d3d9/tests: Add test for checking D3DUSAGE_AUTOGENMIPMAP support. 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/d3d9/tests/device.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 866f435..1a226ec 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11497,6 +11497,27 @@ static void test_swapchain_parameters(void) static void test_check_device_format(void) { + static const D3DFORMAT adapter_formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + }; + static const D3DFORMAT mipmap_autogen_formats[] = + { + D3DFMT_R8G8B8, + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, + D3DFMT_X1R5G5B5, + D3DFMT_A8P8, + D3DFMT_P8, + D3DFMT_A1R5G5B5, + D3DFMT_A4R4G4B4, + }; + + D3DFORMAT adapter_format, format; + BOOL render_target_supported; + unsigned int i, j; IDirect3D9 *d3d; HRESULT hr; @@ -11538,6 +11559,32 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(adapter_formats); ++i) + { + adapter_format = adapter_formats[i]; + + for (j = 0; j < ARRAY_SIZE(mipmap_autogen_formats); ++j) + { + format = mipmap_autogen_formats[j]; + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, adapter_format, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, format); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + render_target_supported = hr == D3D_OK; + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, adapter_format, + D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, format); + if (render_target_supported) + { + ok(hr == D3D_OK || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x.\n", hr); + } + else + { + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + } + } + } + IDirect3D9_Release(d3d); }

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard Dec. 11, 2017

Dec. 11, 2017

Module: wine Branch: master Commit: 2b622aab2725c8c664761cb7c58e5ede785fbe96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b622aab2725c8c664761cb7c… Author: Can Taşan <betax34(a)hotmail.com> Date: Sat Dec 9 11:57:48 2017 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 433 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 161 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b622aab2725c8c664761…

1 0

Alexandre Julliard : Wine release 3.0-rc1
by Alexandre Julliard Dec. 8, 2017

Dec. 8, 2017

Module: website Branch: master Commit: 3051e9b89fc583b68610f2a1a75bd7f2b12415d7 URL: http://source.winehq.org/git/website.git/?a=commit;h=3051e9b89fc583b68610f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 20:51:46 2017 +0100 Wine release 3.0-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017120801.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/news/en/2017120801.xml b/news/en/2017120801.xml new file mode 100644 index 0000000..ae355d9 --- /dev/null +++ b/news/en/2017120801.xml @@ -0,0 +1,21 @@ +<news> +<date>December 8, 2017</date> +<title>Wine 3.0-rc1 Released</title> +<body> + The Wine development release 3.0-rc1 is now available. + This is the first release candidate for the upcoming Wine 3.0. It marks the beginning of the code freeze period. There have been many last minute changes, so please give this release a good testing to help us make 3.0 as good as possible. + <a href="{$root}/announce/3.0-rc1">What's new</a> in this release: +<ul> + <li>Direct3D 11 enabled by default on AMD and Intel GPUs.</li> + <li>AES encryption support on macOS.</li> + <li>Implementation of the task scheduler.</li> + <li>Registry export support in the reg.exe tool.</li> + <li>Progman DDE support.</li> + <li>OLE data cache improvements.</li> + <li>More event support in MSHTML.</li> + <li>Relay debugging improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Hans Leidekker : webservices: Don't use the dictionary for UTF-16 text.
by Alexandre Julliard Dec. 8, 2017

Dec. 8, 2017

Module: wine Branch: master Commit: f85c6f283a54d8b5987f2e3fd83f93ddeb73efed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85c6f283a54d8b5987f2e3fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 8 15:49:41 2017 +0100 webservices: Don't use the dictionary for UTF-16 text. Although UTF-16 text is converted to UTF-8 before transmission it's stored inline rather than in the dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 12 + dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 1411 +++++++++++++++++--------------- 3 files changed, 754 insertions(+), 670 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f85c6f283a54d8b5987f2…

1 0

Tag wine-3.0-rc1 : Alexandre Julliard : Release 3.0-rc1
by Alexandre Julliard Dec. 8, 2017

Dec. 8, 2017

Module: wine Branch: refs/tags/wine-3.0-rc1 Tag: 1cb401ccf774e21bcef3cb26c83015a99b18d3ff URL: http://source.winehq.org/git/wine.git/?a=tag;h=1cb401ccf774e21bcef3cb26c830… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 20:48:54 2017 +0100 Release 3.0-rc1

1 0

Alexandre Julliard : Release 3.0-rc1.
by Alexandre Julliard Dec. 8, 2017

Dec. 8, 2017

Module: wine Branch: master Commit: 5a7ce7ccb1f9e5c958ba1b7e6dfdaa0cd697f9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7ce7ccb1f9e5c958ba1b7e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 20:48:54 2017 +0100 Release 3.0-rc1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 616 ++++++++++++++++++++++++++++++++++++++++++-------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 426 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a7ce7ccb1f9e5c958ba1…

1 0

Hans Leidekker : webservices: Enable dictionary lookup after setting the output buffer.
by Alexandre Julliard Dec. 8, 2017

Dec. 8, 2017

Module: wine Branch: master Commit: 8b11866534a2f88d73849616c761961943860df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b11866534a2f88d73849616c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 8 15:49:40 2017 +0100 webservices: Enable dictionary lookup after setting the output buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index cce5608..0765e0d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1233,9 +1233,8 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo static HRESULT init_writer( struct channel *channel ) { WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; - WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}}; + WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; - WS_XML_WRITER_ENCODING *encoding; HRESULT hr; if (!channel->writer && (hr = WsCreateWriter( NULL, 0, &channel->writer, NULL )) != S_OK) return hr; @@ -1243,29 +1242,23 @@ static HRESULT init_writer( struct channel *channel ) switch (channel->encoding) { case WS_ENCODING_XML_UTF8: - text.charSet = WS_CHARSET_UTF8; - encoding = &text.encoding; - break; + return WsSetOutput( channel->writer, &text.encoding, &buf.output, NULL, 0, NULL ); case WS_ENCODING_XML_BINARY_SESSION_1: - if ((hr = writer_enable_lookup( channel->writer )) != S_OK) return hr; clear_dict( &channel->dict_send ); bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; bin.dynamicStringCallback = dict_cb; bin.dynamicStringCallbackState = &channel->dict_send; - encoding = &bin.encoding; - break; + if ((hr = WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL )) != S_OK) return hr; + return writer_enable_lookup( channel->writer ); case WS_ENCODING_XML_BINARY_1: - encoding = &bin.encoding; - break; + return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); default: FIXME( "unhandled encoding %u\n", channel->encoding ); return WS_E_NOT_SUPPORTED; } - - return WsSetOutput( channel->writer, encoding, &buf.output, NULL, 0, NULL ); } /**************************************************************************

1 0

Hans Leidekker : webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the writer.
by Alexandre Julliard Dec. 8, 2017

Dec. 8, 2017

Module: wine Branch: master Commit: ca0b46a10c80c56bfaf7007476fa9f5f31f60cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0b46a10c80c56bfaf700747… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 8 15:49:39 2017 +0100 webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 106 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 80 +++++++++++++++++------------- 2 files changed, 151 insertions(+), 35 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d1..15d4569 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -4544,6 +4544,111 @@ static void test_text_types_binary(void) WsFreeWriter( writer ); } +static void test_repeating_element_choice(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"}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_UNION_DESCRIPTION u; + WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_FIELD_DESCRIPTION f_items, *fields_items[1]; + WS_STRUCT_DESCRIPTION s; + enum choice {CHOICE_A, CHOICE_B, CHOICE_NONE}; + struct item + { + enum choice choice; + union + { + const WCHAR *a; + UINT32 b; + } value; + } items[2]; + struct test + { + struct item *items; + ULONG count; + } test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.value = CHOICE_A; + f.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f.field.localName = &str_a; + f.field.ns = &str_ns; + f.field.type = WS_WSZ_TYPE; + f.field.offset = FIELD_OFFSET(struct item, value.a); + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.value = CHOICE_B; + f2.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.field.localName = &str_b; + f2.field.ns = &str_ns; + f2.field.type = WS_UINT32_TYPE; + f2.field.offset = FIELD_OFFSET(struct item, value.b); + fields[1] = &f2; + + memset( &u, 0, sizeof(u) ); + u.size = sizeof(struct item); + u.alignment = TYPE_ALIGNMENT(struct item); + u.fields = fields; + u.fieldCount = 2; + u.enumOffset = FIELD_OFFSET(struct item, choice); + u.noneEnumValue = CHOICE_NONE; + + memset( &f_items, 0, sizeof(f_items) ); + f_items.mapping = WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING; + f_items.localName = &str_t; + f_items.ns = &str_ns; + f_items.type = WS_UNION_TYPE; + f_items.typeDescription = &u; + f_items.countOffset = FIELD_OFFSET(struct test, count); + fields_items[0] = &f_items; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields_items; + s.fieldCount = 1; + s.typeLocalName = &str_s; + s.typeNs = &str_ns; + + items[0].choice = CHOICE_A; + items[0].value.a = testW; + items[1].choice = CHOICE_B; + items[1].value.b = 1; + test.items = items; + test.count = 2; + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + 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 ); + check_output( writer, "<t><a>test</a>1</t>", __LINE__ ); + + items[0].choice = CHOICE_NONE; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + 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 ); + + test.count = 0; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + 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 ); + check_output( writer, "<t/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -4586,4 +4691,5 @@ START_TEST(writer) test_dictionary(); test_union_type(); test_text_types_binary(); + test_repeating_element_choice(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8738f4c..4b24663 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3492,6 +3492,7 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) case WS_XML_QNAME_TYPE: case WS_STRUCT_TYPE: case WS_ENUM_TYPE: + case WS_UNION_TYPE: if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_VALUE; return WS_WRITE_REQUIRED_VALUE; @@ -3506,42 +3507,11 @@ 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 write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, const void *, ULONG ); -static HRESULT write_type_repeating_element( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, - const char *buf, ULONG count ) -{ - HRESULT hr = S_OK; - ULONG i, size, offset = 0; - WS_WRITE_OPTION option; - - if (!(option = get_field_write_option( desc->type, desc->options ))) return E_INVALIDARG; - - /* wrapper element */ - if (desc->localName && ((hr = write_element_node( writer, NULL, desc->localName, desc->ns )) != S_OK)) - return hr; - - if (option == WS_WRITE_REQUIRED_VALUE || option == WS_WRITE_NILLABLE_VALUE) - size = get_type_size( desc->type, desc->typeDescription ); - else - size = sizeof(const void *); - - for (i = 0; i < count; i++) - { - if ((hr = write_element_node( writer, NULL, desc->itemLocalName, desc->itemNs )) != S_OK) return hr; - if ((hr = write_type( writer, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->typeDescription, option, - buf + offset, size )) != S_OK) return hr; - if ((hr = write_endelement_node( writer )) != S_OK) return hr; - offset += size; - } - - if (desc->localName) hr = write_endelement_node( writer ); - return hr; -} - -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 ) { @@ -3581,6 +3551,45 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI return E_INVALIDARG; } +static HRESULT write_type_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, + ULONG count ) +{ + HRESULT hr = S_OK; + ULONG i, size, offset = 0; + WS_WRITE_OPTION option; + + if (!(option = get_field_write_option( desc->type, desc->options ))) return E_INVALIDARG; + + /* wrapper element */ + if (desc->localName && ((hr = write_element_node( writer, NULL, desc->localName, desc->ns )) != S_OK)) + return hr; + + if (option == WS_WRITE_REQUIRED_VALUE || option == WS_WRITE_NILLABLE_VALUE) + size = get_type_size( desc->type, desc->typeDescription ); + else + size = sizeof(const void *); + + for (i = 0; i < count; i++) + { + if (desc->type == WS_UNION_TYPE) + { + if ((hr = write_type_union( writer, desc->typeDescription, option, buf + offset, size )) != S_OK) + return hr; + } + else + { + if ((hr = write_element_node( writer, NULL, desc->itemLocalName, desc->itemNs )) != S_OK) return hr; + if ((hr = write_type( writer, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->typeDescription, option, + buf + offset, size )) != S_OK) return hr; + if ((hr = write_endelement_node( writer )) != S_OK) return hr; + } + offset += size; + } + + if (desc->localName) hr = write_endelement_node( writer ); + return hr; +} + static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, ULONG offset ) { @@ -3646,8 +3655,9 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI return write_type_union( writer, desc->typeDescription, option, ptr, size ); case WS_REPEATING_ELEMENT_FIELD_MAPPING: + case WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING: count = *(const ULONG *)(buf + desc->countOffset); - return write_type_repeating_element( writer, desc, *(const char **)ptr, count ); + return write_type_array( writer, desc, *(const char **)ptr, count ); case WS_TEXT_FIELD_MAPPING: switch (writer->state) @@ -4713,7 +4723,7 @@ static ULONG get_array_len( const WS_PARAMETER_DESCRIPTION *params, ULONG count, static HRESULT write_param_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const void *value, ULONG len ) { - return write_type_repeating_element( writer, desc, value, len ); + return write_type_array( writer, desc, value, len ); } HRESULT write_input_params( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTION *desc,

1 0

Matteo Bruni : wined3d: Fix shader_resource_view_generate_mipmaps() with texture views.
by Alexandre Julliard Dec. 8, 2017

Dec. 8, 2017

Module: wine Branch: master Commit: 1162d62164bd8cdb4631e341df8e3d51409269f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1162d62164bd8cdb4631e341d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 7 22:56:17 2017 +0100 wined3d: Fix shader_resource_view_generate_mipmaps() with texture views. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8651ab..8288458 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -844,14 +844,20 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) wined3d_texture_load_location(texture, i * level_count + base_level, context, location); + if (view->gl_view.name) + { shader_resource_view_bind_and_dirtify(view, context); + } else + { wined3d_texture_bind_and_dirtify(texture, context, srgb); + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, max_level); + } + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) GL_EXTCALL(glBindSampler(context->active_texture, 0)); - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, max_level); gl_tex = wined3d_texture_get_gl_texture(texture, srgb); if (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) { @@ -872,11 +878,11 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } } - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, level_count - 1); - if (srgb) - texture->texture_srgb.base_level = base_level; - else - texture->texture_rgb.base_level = base_level; + if (!view->gl_view.name) + { + gl_tex->base_level = base_level; + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + } context_release(context); }

1 0

Huw Davies : ole32: Don' t clear the dirty flag when saving to another storage.
by Alexandre Julliard Dec. 8, 2017

Dec. 8, 2017

Module: wine Branch: master Commit: 2a4bbb886477a83e6ade0df8d8d58def3838d6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4bbb886477a83e6ade0df8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 8 10:52:45 2017 +0000 ole32: Don't clear the dirty flag when saving to another storage. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 15 ++++++--------- dlls/ole32/tests/ole2.c | 3 +++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 6a13485..75c9611 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1835,17 +1835,14 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) * our responsibility to copy the information when saving to a new * storage. */ -static HRESULT WINAPI DataCache_Save( - IPersistStorage* iface, - IStorage* pStg, - BOOL fSameAsLoad) +static HRESULT WINAPI DataCache_Save(IPersistStorage* iface, IStorage *stg, BOOL same_as_load) { DataCache *This = impl_from_IPersistStorage(iface); DataCacheEntry *cache_entry; HRESULT hr = S_OK; unsigned short stream_number = 0; - TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad); + TRACE("(%p, %p, %d)\n", iface, stg, same_as_load); /* assign stream numbers to the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) @@ -1861,17 +1858,17 @@ static HRESULT WINAPI DataCache_Save( /* write out the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { - if (!fSameAsLoad || cache_entry->dirty) + if (!same_as_load || cache_entry->dirty) { - hr = DataCacheEntry_Save(cache_entry, pStg, fSameAsLoad); + hr = DataCacheEntry_Save(cache_entry, stg, same_as_load); if (FAILED(hr)) break; - cache_entry->dirty = FALSE; + if (same_as_load) cache_entry->dirty = FALSE; } } - This->dirty = FALSE; + if (same_as_load) This->dirty = FALSE; return hr; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index a8cbcde..f42ebe2 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4320,6 +4320,9 @@ static void test_data_cache_save_data(void) hr = IPersistStorage_Save(persist, doc, FALSE); ok(hr == S_OK, "unexpected %#x\n", hr); + hr = IPersistStorage_IsDirty(persist); + ok(hr == S_OK, "unexpected %#x\n", hr); + check_storage_contents(doc, &pdata->stg_def, &enumerated_streams, &matched_streams); ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", enumerated_streams, matched_streams);

1 0