March 2016 - Wine-commits - list.winehq.org

Hugh McMaster : reg: Allow values to be added, deleted or modified in root keys.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: ead76c7e47e17ab92277700ea7a2844252e74525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead76c7e47e17ab92277700ea… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 21 16:00:33 2016 +1100 reg: Allow values to be added, deleted or modified in root keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 9dbce32..b2066e0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -355,12 +355,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; p = strchrW(key_name,'\\'); - if (!p) - { - output_message(STRING_INVALID_KEY); - return 1; - } - p++; + if (p) p++; root = path_get_rootkey(key_name); if (!root) @@ -440,12 +435,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; p = strchrW(key_name,'\\'); - if (!p) - { - output_message(STRING_INVALID_KEY); - return 1; - } - p++; + if (p) p++; root = path_get_rootkey(key_name); if (!root)

1 0

Nikolay Sivov : include: Added shimgdata.idl.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 233545efcb8ecc41c4bdf160db647eb402f005b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233545efcb8ecc41c4bdf160d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 21 11:56:21 2016 +0300 include: Added shimgdata.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/shimgdata.idl | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 596c0c9..8283616 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -137,6 +137,7 @@ IDL_SRCS = \ servprov.idl \ sesprp.idl \ shdeprecated.idl \ + shimgdata.idl \ shldisp.idl \ shobjidl.idl \ shtypes.idl \ diff --git a/include/shimgdata.idl b/include/shimgdata.idl new file mode 100644 index 0000000..2e84298 --- /dev/null +++ b/include/shimgdata.idl @@ -0,0 +1,93 @@ +/* + * Copyright 2016 Nikolay Sivov For CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "propidl.idl"; + +cpp_quote("#ifndef _GDIPLUSPIXELFORMATS_H") +typedef DWORD PixelFormat; +cpp_quote("#endif") + +cpp_quote("#ifndef _GDIPLUSENUMS_H") +typedef DWORD InterpolationMode; +cpp_quote("#endif") + +cpp_quote("#ifndef _GDIPLUSHEADERS_H") +typedef BYTE EncoderParameters; +typedef BYTE Image; +cpp_quote("#endif") + +[ + object, + uuid(53fb8e58-50c0-4003-b4aa-0c8df28e7f3a) +] +interface IShellImageDataAbort : IUnknown +{ + HRESULT QueryAbort(); +} + +[ + object, + local, + uuid(bfdeec12-8040-4403-a5ea-9e07dafcf530) +] +interface IShellImageData : IUnknown +{ + HRESULT Decode([in] DWORD flags, [in] ULONG cx_desired, [in] ULONG cy_desired); + HRESULT Draw([in] HDC hdc, [in] RECT *dest, [in] RECT *src); + HRESULT NextFrame(); + HRESULT NextPage(); + HRESULT PrevPage(); + HRESULT IsTransparent(); + HRESULT IsAnimated(); + HRESULT IsVector(); + HRESULT IsMultipage(); + HRESULT IsEditable(); + HRESULT IsPrintable(); + HRESULT IsDecoded(); + HRESULT GetCurrentPage([out] ULONG *page); + HRESULT GetPageCount([out] ULONG *count); + HRESULT SelectPage([in] ULONG page); + HRESULT GetSize([out] SIZE *size); + HRESULT GetRawDataFormat([out] GUID *format); + HRESULT GetPixelFormat([out] PixelFormat *format); + HRESULT GetDelay([out] DWORD *delay); + HRESULT GetProperties([in] DWORD mode, [out] IPropertySetStorage **props); + HRESULT Rotate([in] DWORD angle); + HRESULT Scale([in] ULONG cx, [in] ULONG cy, [in] InterpolationMode mode); + HRESULT DiscardEdit(); + HRESULT SetEncoderParams([in] IPropertyBag *params); + HRESULT DisplayName([size_is(count), in, out] LPWSTR name, UINT count); + HRESULT GetResolution([out] ULONG *res_x, [out] ULONG *res_y); + HRESULT GetEncoderParams([in] GUID *format, [out] EncoderParameters **params); + HRESULT RegisterAbort([in] IShellImageDataAbort *abort, [out] IShellImageDataAbort **prev); + HRESULT CloneFrame([out] Image **frame); + HRESULT ReplaceFrame([in] Image *frame); +} + +[ + object, + uuid(9be8ed5c-edab-4d75-90f3-bd5bdbb21c82) +] +interface IShellImageDataFactory : IUnknown +{ + HRESULT CreateIShellImageData([out] IShellImageData **data); + HRESULT CreateImageFromFile([in] LPCWSTR path, [out] IShellImageData **data); + HRESULT CreateImageFromStream([in] IStream *stream, [out] IShellImageData **data); + HRESULT GetDataFormatFromPath([in] LPCWSTR path, [out] GUID *format); +}

1 0

Józef Kucia : d3d10core/tests: Add test for copying buffer resources.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: aaf36fb7b0bc79d2f515d0fc8ab2b2c0b077d310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf36fb7b0bc79d2f515d0fc8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 20 23:15:28 2016 +0100 d3d10core/tests: Add test for copying buffer resources. 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 | 110 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b7ac197..a402d60 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4990,11 +4990,14 @@ static void test_copy_subresource_region(void) { struct d3d10core_test_context test_context; ID3D10Texture2D *dst_texture, *src_texture; + ID3D10Buffer *dst_buffer, *src_buffer; D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; ID3D10SamplerState *sampler_state; ID3D10ShaderResourceView *ps_srv; D3D10_SAMPLER_DESC sampler_desc; + D3D10_BUFFER_DESC buffer_desc; + struct vec4 float_colors[16]; struct texture_readback rb; ID3D10PixelShader *ps; ID3D10Device *device; @@ -5029,6 +5032,31 @@ static void test_copy_subresource_region(void) 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; + static const DWORD ps_buffer_code[] = + { +#if 0 + float4 buffer[16]; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float2 p = (float2)4; + p *= float2(position.x / 640.0f, position.y / 480.0f); + return buffer[(int)p.y * 4 + (int)p.x]; + } +#endif + 0x43425844, 0x57e7139f, 0x4f0c9e52, 0x598b77e3, 0x5a239132, 0x00000001, 0x0000016c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000d0, 0x00000040, + 0x00000034, 0x04000859, 0x00208e46, 0x00000000, 0x00000010, 0x04002064, 0x00101032, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, + 0x00000000, 0x00101516, 0x00000000, 0x00004002, 0x3c088889, 0x3bcccccd, 0x00000000, 0x00000000, + 0x0500001b, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x07000029, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x0700001e, 0x00100012, 0x00000000, 0x0010000a, + 0x00000000, 0x0010001a, 0x00000000, 0x07000036, 0x001020f2, 0x00000000, 0x04208e46, 0x00000000, + 0x0010000a, 0x00000000, 0x0100003e, + }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; static const DWORD bitmap_data[] = { @@ -5152,10 +5180,90 @@ static void test_copy_subresource_region(void) release_texture_readback(&rb); ID3D10PixelShader_Release(ps); - ID3D10SamplerState_Release(sampler_state); + hr = ID3D10Device_CreatePixelShader(device, ps_buffer_code, sizeof(ps_buffer_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10ShaderResourceView_Release(ps_srv); + ps_srv = NULL; + + ID3D10SamplerState_Release(sampler_state); + sampler_state = NULL; + ID3D10Texture2D_Release(dst_texture); ID3D10Texture2D_Release(src_texture); + + ID3D10Device_PSSetShaderResources(device, 0, 1, &ps_srv); + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); + ID3D10Device_PSSetShader(device, ps); + + buffer_desc.ByteWidth = sizeof(float_colors); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &dst_buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &dst_buffer); + + buffer_desc.ByteWidth = 256 * sizeof(*float_colors); + buffer_desc.BindFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &src_buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + float_colors[j + i * 4].x = ((bitmap_data[j + i * 4] >> 0) & 0xff) / 255.0f; + float_colors[j + i * 4].y = ((bitmap_data[j + i * 4] >> 8) & 0xff) / 255.0f; + float_colors[j + i * 4].z = ((bitmap_data[j + i * 4] >> 16) & 0xff) / 255.0f; + float_colors[j + i * 4].w = ((bitmap_data[j + i * 4] >> 24) & 0xff) / 255.0f; + } + } + set_box(&box, 0, 0, 0, sizeof(float_colors), 1, 1); + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)src_buffer, 0, &box, float_colors, 0, 0); + + set_box(&box, 0, 0, 0, sizeof(float_colors), 0, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_buffer, 0, + 0, 0, 0, (ID3D10Resource *)src_buffer, 0, &box); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 0); + + set_box(&box, 0, 0, 0, sizeof(float_colors), 1, 0); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_buffer, 0, + 0, 0, 0, (ID3D10Resource *)src_buffer, 0, &box); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 0); + + set_box(&box, 0, 0, 0, sizeof(float_colors), 0, 0); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_buffer, 0, + 0, 0, 0, (ID3D10Resource *)src_buffer, 0, &box); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 0); + + set_box(&box, 0, 0, 0, sizeof(float_colors), 1, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_buffer, 0, + 0, 0, 0, (ID3D10Resource *)src_buffer, 0, &box); + draw_quad(&test_context); + get_texture_readback(test_context.backbuffer, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_texture_readback(&rb); + + ID3D10Buffer_Release(dst_buffer); + ID3D10Buffer_Release(src_buffer); + ID3D10PixelShader_Release(ps); release_test_context(&test_context); }

1 0

Frédéric Delanoy : French translation for release 1.9.6
by Jeremy Newman 21 Mar '16

21 Mar '16

Module: website Branch: master Commit: 9b42fc5359d8f1041442baa599a6276120f6bd6f URL: http://source.winehq.org/git/website.git/?a=commit;h=9b42fc5359d8f1041442ba… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 18 21:16:39 2016 +0100 French translation for release 1.9.6 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016031801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2016031801.xml b/news/fr/2016031801.xml new file mode 100644 index 0000000..7a81ab8 --- /dev/null +++ b/news/fr/2016031801.xml @@ -0,0 +1,14 @@ +<news> +<date>18 mars 2016</date> +<title>Sortie de Wine 1.9.6</title> +<body> +La version de développement 1.9.6 de Wine est disponible. +<a href="{$root}/announce/1.9.6">Nouveautés</a> de cette version : +<ul> + <li>Meilleurs détection des cartes vidéo lorsque Mesa est utilisé.</li> + <li>Prise en charge des shaders Shader Model 5.</li> + <li>Améliorations dans le traitement des exceptions C++.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Francois Gouget : testbot: Let the WineRunTask script take screenshots.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: tools Branch: master Commit: 8d728648bed2b17b73c34749ae79e9a083b028ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=8d728648bed2b17b73c34749… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 20 07:35:22 2016 +0100 testbot: Let the WineRunTask script take screenshots. Taking a screenshot is a blocking operation that takes time. So it must not be done from the Engine. But taking screenshots from the task scripts is fine. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 5 ++++- testbot/lib/WineTestBot/VMs.pm | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 75a8851..956f180 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -523,7 +523,10 @@ sub HandleGetScreenshot($) return "0Unknown VM $VMName"; } - my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); + # FIXME: Taking a screenshot leaks libvirt connections, takes a long time and + # blocks the Engine during the whole operation. So live screenshots are + # disabled for now. + my ($ErrMessage, $ImageSize, $ImageBytes) = ("Screenshotting has been disabled for the time being", undef, undef); #$VM->CaptureScreenImage(); if (defined($ErrMessage)) { LogMsg "Failed to take screenshot of $VMName: $ErrMessage\n"; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2400efc..c41b77a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -432,9 +432,6 @@ sub CaptureScreenImage($) { my ($self) = @_; - # FIXME: Disable screenshots for now - return ("Screenshotting has been disabled for the time being", undef, undef); - my ($ErrMessage, $Domain) = $self->_GetDomain(); return ($ErrMessage, undef, undef) if (defined $ErrMessage);

1 0

Jeremy Newman : fix opening PHP tag for PHP 5.6
by Jeremy Newman 21 Mar '16

21 Mar '16

Module: website Branch: master Commit: 174c1335fc2650d31b4c37d83241912ba78f636d URL: http://source.winehq.org/git/website.git/?a=commit;h=174c1335fc2650d31b4c37… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Mar 21 08:45:49 2016 -0500 fix opening PHP tag for PHP 5.6 --- include/wwn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wwn.php b/include/wwn.php index 1d81e7c..7203b2f 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -1,4 +1,4 @@ -<? +<?php /* WineHQ

1 0

Alexandre Julliard : Wine release 1.9.6
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: website Branch: master Commit: 83070d379296c35588419df138066d75c338f752 URL: http://source.winehq.org/git/website.git/?a=commit;h=83070d379296c35588419d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 22:33:14 2016 +0900 Wine release 1.9.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016031801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016031801.xml b/news/en/2016031801.xml new file mode 100644 index 0000000..83393e1 --- /dev/null +++ b/news/en/2016031801.xml @@ -0,0 +1,15 @@ +<news> +<date>March 18, 2016</date> +<title>Wine 1.9.6 Released</title> +<body> + The Wine development release 1.9.6 is now available. + <a href="{$root}/announce/1.9.6">What's new</a> in this release: +<ul> + <li>Better video card detection when using Mesa.</li> + <li>Support for Shader Model 5 shaders.</li> + <li>C++ exception handling improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.tar.bz2">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

Henri Verbeet : wined3d: Get rid of the WINED3DUSAGE_OVERLAY check in gdi_surface_private_setup().
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 687642fafaaa7220e847d33398945d5c77a2bb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687642fafaaa7220e847d3339… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 16:30:06 2016 +0100 wined3d: Get rid of the WINED3DUSAGE_OVERLAY check in gdi_surface_private_setup(). Overlays shouldn't be any more broken for "GDI" surfaces than for regular surfaces. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 846b78f..297a34d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1094,12 +1094,6 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (surface->resource.usage & WINED3DUSAGE_OVERLAY) - { - ERR("Overlays not yet supported by GDI surfaces.\n"); - return WINED3DERR_INVALIDCALL; - } - /* Sysmem textures have memory already allocated - release it, * this avoids an unnecessary memcpy. */ hr = surface_create_dib_section(surface);

1 0

Stefan Dösinger : wined3d: Avoid storing a material pointer in struct wined3d_cs_set_material.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: cecc496ecf4f0c3cafe889c3a0e80e487d113314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecc496ecf4f0c3cafe889c3a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 17 16:30:07 2016 +0100 wined3d: Avoid storing a material pointer in struct wined3d_cs_set_material. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 21310e4..965bcff 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -242,7 +242,7 @@ struct wined3d_cs_set_clip_plane struct wined3d_cs_set_material { enum wined3d_cs_op opcode; - const struct wined3d_material *material; + struct wined3d_material material; }; struct wined3d_cs_reset_state @@ -979,7 +979,7 @@ static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data { const struct wined3d_cs_set_material *op = data; - cs->state.material = *op->material; + cs->state.material = op->material; device_invalidate_state(cs->device, STATE_MATERIAL); } @@ -989,7 +989,7 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_SET_MATERIAL; - op->material = material; + op->material = *material; cs->ops->submit(cs); }

1 0

Francois Gouget : shlwapi/tests: Fix a test failure on Windows 10.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 637799db984c7a7595c6b2df88ebd9fba50452cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=637799db984c7a7595c6b2df8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 17 23:38:42 2016 +0100 shlwapi/tests: Fix a test failure on Windows 10. AssocQueryString() can return S_FALSE with the size of the required buffer. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/assoc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index cbc40ce..266f3fd 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -102,9 +102,11 @@ static void test_getstring_bad(void) hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || - hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND) /* Win8 */ || + hr == S_FALSE, /* Win10 */ "Unexpected result : %08x\n", hr); - ok(len == 0xdeadbeef, "got %u\n", len); + ok((hr == S_FALSE && len < sizeof(buf)/sizeof(buf[0])) || len == 0xdeadbeef, + "got hr=%08x and len=%u\n", hr, len); len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len);

1 0