December 2017 - Wine-commits

Józef Kucia : d3d10core/tests: Add test for relative addressing of vertex shader inputs.
by Alexandre Julliard 11 Dec '17

11 Dec '17

Module: wine Branch: master Commit: e7400d20aac30edcb0aa527f1a8a1cc7a0b044bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7400d20aac30edcb0aa527f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 11 10:25:29 2017 +0100 d3d10core/tests: Add test for relative addressing of vertex shader inputs. 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/d3d10core/tests/device.c | 119 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8eb11da..6aaeb33 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8419,6 +8419,124 @@ float4 main(const ps_in v) : SV_TARGET release_test_context(&test_context); } +static void test_vs_input_relative_addressing(void) +{ + struct d3d10core_test_context test_context; + unsigned int offset, stride; + unsigned int index[4] = {0}; + ID3D10PixelShader *ps; + ID3D10Buffer *vb, *cb; + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vertex + { + float4 position : POSITION; + float4 colors[4] : COLOR; + }; + + uint index; + + void main(vertex vin, out float4 position : SV_Position, + out float4 color : COLOR) + { + position = vin.position; + color = vin.colors[index]; + } +#endif + 0x43425844, 0x8623dd89, 0xe37fecf5, 0xea3fdfe1, 0xdf36e4e4, 0x00000001, 0x000001f4, 0x00000003, + 0x0000002c, 0x000000c4, 0x00000118, 0x4e475349, 0x00000090, 0x00000005, 0x00000008, 0x00000080, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000089, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x00000089, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000f0f, 0x00000089, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x00000f0f, 0x00000089, + 0x00000003, 0x00000000, 0x00000003, 0x00000004, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, + 0xab00524f, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x000000d4, + 0x00010040, 0x00000035, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005f, 0x001010f2, + 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x0300005f, 0x001010f2, 0x00000002, 0x0300005f, + 0x001010f2, 0x00000003, 0x0300005f, 0x001010f2, 0x00000004, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, 0x001010f2, + 0x00000001, 0x00000004, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x06000036, + 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, 0x001020f2, 0x00000001, + 0x00d01e46, 0x00000001, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + struct vs_out + { + float4 position : SV_POSITION; + float4 color : COLOR; + }; + + float4 main(struct vs_out i) : SV_TARGET + { + return i.color; + } +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 0, D3D10_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 1, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 4, D3D10_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 2, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 8, D3D10_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 3, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 12, D3D10_INPUT_PER_INSTANCE_DATA, 1}, + }; + static const unsigned int colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000, 0xff0f0f0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(index), NULL); + ID3D10Device_VSSetConstantBuffers(device, 0, 1, &cb); + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(colors), colors); + stride = sizeof(colors); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 1, 1, &vb, &stride, &offset); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &test_context.vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + for (i = 0; i < ARRAY_SIZE(colors); ++i) + { + *index = i; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, index, 0, 0); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, colors[i], 1); + } + + ID3D10Buffer_Release(cb); + ID3D10Buffer_Release(vb); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + static void test_swapchain_formats(void) { DXGI_SWAP_CHAIN_DESC swapchain_desc; @@ -13531,6 +13649,7 @@ START_TEST(device) test_copy_subresource_region(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); + test_vs_input_relative_addressing(); test_swapchain_formats(); test_swapchain_views(); test_swapchain_flip();

1 0

Józef Kucia : d3d10core/tests: Add test for initial depth stencil state.
by Alexandre Julliard 11 Dec '17

11 Dec '17

Module: wine Branch: master Commit: 8a8b50901b4d1c2f1bd1d36764173c7179f31e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8b50901b4d1c2f1bd1d3676… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 11 10:25:30 2017 +0100 d3d10core/tests: Add test for initial depth stencil state. 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/d3d10core/tests/device.c | 74 ++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6aaeb33..7bbd7a7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9074,10 +9074,58 @@ static void test_clear_depth_stencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_initial_depth_stencil_state(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsv; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int count; + D3D10_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D10Device_RSGetViewports(device, &count, &vp); + + /* check if depth function is D3D10_COMPARISON_LESS */ + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 0.5f, 0); + vp.MinDepth = vp.MaxDepth = 0.4f; + ID3D10Device_RSSetViewports(device, 1, &vp); + draw_color_quad(&test_context, &green); + draw_color_quad(&test_context, &red); + vp.MinDepth = vp.MaxDepth = 0.6f; + ID3D10Device_RSSetViewports(device, 1, &vp); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + check_texture_float(texture, 0.4f, 1); + + ID3D10DepthStencilView_Release(dsv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_draw_depth_only(void) { - ID3D10DepthStencilState *depth_stencil_state; - D3D10_DEPTH_STENCIL_DESC depth_stencil_desc; struct d3d10core_test_context test_context; ID3D10PixelShader *ps_color, *ps_depth; D3D10_TEXTURE2D_DESC texture_desc; @@ -9132,32 +9180,15 @@ static void test_draw_depth_only(void) cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(depth), NULL); - texture_desc.Width = 640; - texture_desc.Height = 480; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); texture_desc.Format = DXGI_FORMAT_D32_FLOAT; - texture_desc.SampleDesc.Count = 1; - texture_desc.SampleDesc.Quality = 0; - texture_desc.Usage = D3D10_USAGE_DEFAULT; texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; - texture_desc.CPUAccessFlags = 0; - texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsv); ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); - depth_stencil_desc.DepthEnable = TRUE; - depth_stencil_desc.DepthWriteMask = D3D10_DEPTH_WRITE_MASK_ALL; - depth_stencil_desc.DepthFunc = D3D10_COMPARISON_LESS; - depth_stencil_desc.StencilEnable = FALSE; - - hr = ID3D10Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_stencil_state); - ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); - hr = ID3D10Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), &ps_color); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); hr = ID3D10Device_CreatePixelShader(device, ps_depth_code, sizeof(ps_depth_code), &ps_depth); @@ -9166,7 +9197,6 @@ static void test_draw_depth_only(void) ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); ID3D10Device_PSSetShader(device, ps_color); ID3D10Device_OMSetRenderTargets(device, 0, NULL, dsv); - ID3D10Device_OMSetDepthStencilState(device, depth_stencil_state, 0); ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); check_texture_float(texture, 1.0f, 1); @@ -9231,7 +9261,6 @@ static void test_draw_depth_only(void) ID3D10PixelShader_Release(ps_color); ID3D10PixelShader_Release(ps_depth); ID3D10DepthStencilView_Release(dsv); - ID3D10DepthStencilState_Release(depth_stencil_state); ID3D10Texture2D_Release(texture); release_test_context(&test_context); } @@ -13655,6 +13684,7 @@ START_TEST(device) test_swapchain_flip(); test_clear_render_target_view(); test_clear_depth_stencil_view(); + test_initial_depth_stencil_state(); test_draw_depth_only(); test_shader_stage_input_output_matching(); test_shader_interstage_interface();

1 0

Alexandre Julliard : Wine release 3.0-rc1
by Alexandre Julliard 08 Dec '17

08 Dec '17

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: Enable dictionary lookup after setting the output buffer.
by Alexandre Julliard 08 Dec '17

08 Dec '17

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: Don't use the dictionary for UTF-16 text.
by Alexandre Julliard 08 Dec '17

08 Dec '17

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

Alexandre Julliard : Release 3.0-rc1.
by Alexandre Julliard 08 Dec '17

08 Dec '17

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

Tag wine-3.0-rc1 : Alexandre Julliard : Release 3.0-rc1
by Alexandre Julliard 08 Dec '17

08 Dec '17

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

Sergio Gómez Del Real : ole32: Refactor OLE's data cache Save implementation.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 07af05fa8002b104fffeec94b6812c9484c2bd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07af05fa8002b104fffeec94b… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Dec 6 10:52:23 2017 -0500 ole32: Refactor OLE's data cache Save implementation. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 239 ++++++++++++++++++++++++------------------------- 1 file changed, 119 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07af05fa8002b104fffee…

1 0

Sergio Gómez Del Real : ole32: Add support for saving DIBs to CONTENTS streams.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 65b3d01fae0a501b2f69553250ed356631df336b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b3d01fae0a501b2f6955325… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Dec 6 10:52:24 2017 -0500 ole32: Add support for saving DIBs to CONTENTS streams. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index f46f712..945d2fe 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -823,6 +823,19 @@ static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) if (hr == S_OK && data_size) hr = IStream_Write(stream, bmi, data_size, NULL); } + else + { + BITMAPFILEHEADER bmp_fhdr; + + bmp_fhdr.bfType = 0x4d42; + bmp_fhdr.bfSize = data_size + sizeof(BITMAPFILEHEADER); + bmp_fhdr.bfReserved1 = bmp_fhdr.bfReserved2 = 0; + if (data_size) + bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); + hr = IStream_Write(stream, &bmp_fhdr, sizeof(BITMAPFILEHEADER), NULL); + if (hr == S_OK && data_size) + hr = IStream_Write(stream, bmi, data_size, NULL); + } end: if (bmi) GlobalUnlock(entry->stgmedium.u.hGlobal);

1 0

Sergio Gómez Del Real : ole32: Add support for saving metafiles to CONTENTS streams.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 8dd207a219789c5fe43b5ef0344ab3d8a3f3ba1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd207a219789c5fe43b5ef03… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Dec 6 10:52:25 2017 -0500 ole32: Add support for saving metafiles to CONTENTS streams. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 945d2fe..869f122 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -842,6 +842,18 @@ end: return hr; } +#include <pshpack2.h> +struct meta_placeable +{ + DWORD key; + WORD hwmf; + WORD bounding_box[4]; + WORD inch; + DWORD reserved; + WORD checksum; +}; +#include <poppack.h> + static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream) { HRESULT hr = S_OK; @@ -879,6 +891,50 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } + else + { + struct meta_placeable meta_place_rec; + WORD *check; + + if (entry->stgmedium.tymed != TYMED_NULL) + { + mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); + if (!mfpict) + return DV_E_STGMEDIUM; + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!data) + { + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + return E_OUTOFMEMORY; + } + GetMetaFileBitsEx(mfpict->hMF, data_size, data); + } + + /* units are in 1/8th of a point (1 point is 1/72th of an inch) */ + meta_place_rec.key = 0x9ac6cdd7; + meta_place_rec.hwmf = 0; + meta_place_rec.inch = 576; + meta_place_rec.bounding_box[0] = 0; + meta_place_rec.bounding_box[1] = 0; + meta_place_rec.bounding_box[2] = 0; + meta_place_rec.bounding_box[3] = 0; + meta_place_rec.checksum = 0; + meta_place_rec.reserved = 0; + if (mfpict) + { + /* These values are rounded down so MulDiv won't do the right thing */ + meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; + meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + } + for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) + meta_place_rec.checksum ^= *check; + hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); + if (hr == S_OK && data_size) + hr = IStream_Write(stream, data, data_size, NULL); + HeapFree(GetProcessHeap(), 0, data); + } return hr; }

1 0