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

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_get_device_caps().
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: e6368b9c10a4f98793be9b101f6b0746dc735d92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6368b9c10a4f98793be9b10… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 13 17:35:29 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_get_device_caps(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 9 ++++++++- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 9 ++++++++- dlls/ddraw/ddraw.c | 4 ++-- dlls/dxgi/adapter.c | 4 +--- dlls/wined3d/device.c | 3 +-- dlls/wined3d/directx.c | 13 ++++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 10 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 02b010c22a..4b7c03e4e4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3701,7 +3701,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index cbb638f014..66e7e622f8 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -370,16 +370,23 @@ static HRESULT WINAPI d3d8_CheckDepthStencilMatch(IDirect3D8 *iface, UINT adapte static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS8 *caps) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); + struct wined3d_adapter *wined3d_adapter; struct wined3d_caps wined3d_caps; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, adapter, device_type, caps); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (!caps) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_get_device_caps(d3d8->wined3d, adapter, device_type, &wined3d_caps); + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); + hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec1d18a79f..b4887dff45 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4633,7 +4633,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 6c8ca1c3d3..d79b32515f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -418,18 +418,25 @@ static HRESULT WINAPI d3d9_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS9 *caps) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + struct wined3d_adapter *wined3d_adapter; struct wined3d_caps wined3d_caps; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, adapter, device_type, caps); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (!caps) return D3DERR_INVALIDCALL; memset(caps, 0, sizeof(*caps)); wined3d_mutex_lock(); - hr = wined3d_get_device_caps(d3d9->wined3d, adapter, device_type, &wined3d_caps); + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); + hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e82f9644e3..de45751159 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1227,7 +1227,7 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) memset(&wined3d_caps, 0, sizeof(wined3d_caps)); wined3d_mutex_lock(); - hr = wined3d_get_device_caps(ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, &wined3d_caps); + hr = wined3d_get_device_caps(ddraw->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, &wined3d_caps); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -5017,7 +5017,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de return E_FAIL; } - if (FAILED(hr = wined3d_get_device_caps(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, &caps))) + if (FAILED(hr = wined3d_get_device_caps(ddraw->wined3d_adapter, device_type, &caps))) { ERR("Failed to get device caps, hr %#x.\n", hr); wined3d_decref(ddraw->wined3d); diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 2bd69954e1..d48d4755d0 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -211,7 +211,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; struct wined3d_caps caps; - struct wined3d *wined3d; HRESULT hr; TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version); @@ -230,8 +229,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda adapter_id.device_name_size = 0; wined3d_mutex_lock(); - wined3d = adapter->factory->wined3d; - hr = wined3d_get_device_caps(wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); + hr = wined3d_get_device_caps(adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, &caps); if (SUCCEEDED(hr)) hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 927c9456ec..c3d2d5124b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3810,8 +3810,7 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device { TRACE("device %p, caps %p.\n", device, caps); - return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, - device->create_parms.device_type, caps); + return wined3d_get_device_caps(device->adapter, device->create_parms.device_type, caps); } HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f8933801a..8cf0d77e82 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1874,27 +1874,22 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, return WINED3D_OK; } -HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps) { const struct wined3d_d3d_info *d3d_info; struct wined3d_vertex_caps vertex_caps; - const struct wined3d_adapter *adapter; DWORD ckey_caps, blit_caps, fx_caps; struct fragment_caps fragment_caps; struct shader_caps shader_caps; - TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); + TRACE("adapter %p, device_type %s, caps %p.\n", + adapter, debug_d3ddevicetype(device_type), caps); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; d3d_info = &adapter->d3d_info; caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; - caps->AdapterOrdinal = adapter_idx; + caps->AdapterOrdinal = adapter->ordinal; caps->Caps = 0; caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a25accc237..c06cca22ee 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -11,7 +11,7 @@ @ cdecl wined3d_decref(ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) -@ cdecl wined3d_get_device_caps(ptr long long ptr) +@ cdecl wined3d_get_device_caps(ptr long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0dd09f4a3f..cfb13529b3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2282,7 +2282,7 @@ ULONG __cdecl wined3d_decref(struct wined3d *wined3d); struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); -HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT __cdecl wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_output_desc *desc);

1 0

Zhiyi Zhang : d3d8: Report d3d8 adapter ordinal in device caps.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 2e6dc57f31d70e0fb2ef783e98ea533b9b1b557e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6dc57f31d70e0fb2ef783e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 13 17:35:56 2020 +0800 d3d8: Report d3d8 adapter ordinal in device caps. d3d8 adapters are actually outputs in wined3d. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 8 +++++--- dlls/d3d8/directx.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 488035c7f8..9352641176 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -51,7 +51,8 @@ extern const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops DECLSPEC_HIDDEN; -void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; +void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps, + unsigned int adapter_ordinal) DECLSPEC_HIDDEN; struct d3d8 { @@ -113,6 +114,7 @@ struct d3d8_device struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; + unsigned int adapter_ordinal; IDirect3D8 *d3d_parent; struct d3d8_handle_table handle_table; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4b7c03e4e4..400e1e292a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -310,10 +310,11 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return TRUE; } -void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps) +void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps, + unsigned int adapter_ordinal) { caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType; - caps->AdapterOrdinal = wined3d_caps->AdapterOrdinal; + caps->AdapterOrdinal = adapter_ordinal; caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; @@ -689,7 +690,7 @@ static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, device->adapter_ordinal); return hr; } @@ -3678,6 +3679,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; + device->adapter_ordinal = adapter; device->ref = 1; if (!(device->handle_table.entries = heap_alloc_zero(D3D8_INITIAL_HANDLE_TABLE_SIZE * sizeof(*device->handle_table.entries)))) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 66e7e622f8..343073f351 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -389,7 +389,7 @@ static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEV hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, adapter); return hr; }

1 0

Francois Gouget : testbot/PatchUtils: Detect when make_unicode needs to be run.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: tools Branch: master Commit: 0a640370e6a9f99a4738f463a8e1eda20547c75a URL: https://source.winehq.org/git/tools.git/?a=commit;h=0a640370e6a9f99a4738f46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 13 11:12:19 2020 +0100 testbot/PatchUtils: Detect when make_unicode needs to be run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index cc61e31..c425078 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -157,6 +157,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeUnicode}) + { + InfoMsg "\nRunning make_unicode\n"; + system("cd '$DataDir/$Dir/' && set -x && ./tools/make_unicode"); + if ($? != 0) + { + LogMsg "make_unicode failed\n"; + return undef; + } + } if ($Impacts->{MakeVulkan}) { InfoMsg "\nRunning make_vulkan\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index f55dc4b..eaa9868 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -341,6 +341,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/tools/make_unicode$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new";

1 0

Francois Gouget : testbot/LogUtils: Optimise the _GetLineKey() line cleanup.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: tools Branch: master Commit: 1d3e1efa699fee5564f41ab1dcc03a6ab989ea64 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1d3e1efa699fee5564f41ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 13 11:12:41 2020 +0100 testbot/LogUtils: Optimise the _GetLineKey() line cleanup. Most line cleanups are mutually exclusive so stop trying after the first successful attempt. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bf933a0..57229bc 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1048,15 +1048,15 @@ sub _GetLineKey($) return undef if (!defined $Line); # Remove the line number - $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled - $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; - # and the process id - $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/; + or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ + # or the process id in Wine's exc_filter() lines + or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ # The exact amount of data printed does not change the error - $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; + or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; # Note: The 'done (258)' lines are modified by ParseWineTestReport() and # no longer contain the pid. So they need no further change here.

1 0

Francois Gouget : testbot/WineTest: Rename DailyWineTest() to WineTestSuite().
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: tools Branch: master Commit: ef4821bd07c09537d3cc4e72700a3ff54b8734f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ef4821bd07c09537d3cc4e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 22:53:05 2020 +0100 testbot/WineTest: Rename DailyWineTest() to WineTestSuite(). What matters is that it runs the full WineTest suite, not whether it is run daily. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 88f5e36..1afe9b8 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -90,7 +90,7 @@ sub SetupTest($$) return $BaseName; } -sub DailyWineTest($$$$) +sub WineTestSuite($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; @@ -461,7 +461,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) } elsif ($Action eq "winetest") { - exit(1) if (!DailyWineTest($Mission, $OptNoSubmit, $BaseTag, \@ARGV)); + exit(1) if (!WineTestSuite($Mission, $OptNoSubmit, $BaseTag, \@ARGV)); } elsif (@ARGV) {

1 0

Francois Gouget : testbot: Trace the git HEAD after a repository update.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: tools Branch: master Commit: e10276b895fb2001522ac6f43281aa77cffdb14b URL: https://source.winehq.org/git/tools.git/?a=commit;h=e10276b895fb2001522ac6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 22:53:13 2020 +0100 testbot: Trace the git HEAD after a repository update. 'git pull' already shows the old and new HEAD (if the repository is not already up-to-date), but this provides the commit id in the same format as ApplyPatch() which makes it available to the TestBot server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index c425078..85df900 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -89,7 +89,8 @@ sub GitPull($) else { InfoMsg "\nUpdating the $Dir source\n"; - system("cd '$DataDir/$Dir' && set -x && git pull"); + system("cd '$DataDir/$Dir' && (set -x && git pull) && ". + "echo $Dir:HEAD=`git rev-parse HEAD`"); } if ($? != 0) {

1 0

Alexandre Julliard : Wine release 5.4
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: website Branch: master Commit: 9bcf9d21e7d6a214e9fce514b9ee0c9d6a1f6abd URL: https://source.winehq.org/git/website.git/?a=commit;h=9bcf9d21e7d6a214e9fce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 21:25:00 2020 +0100 Wine release 5.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020031301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020031301.xml b/news/en/2020031301.xml new file mode 100644 index 00000000..c0fd260c --- /dev/null +++ b/news/en/2020031301.xml @@ -0,0 +1,17 @@ +<news> +<date>March 13, 2020</date> +<title>Wine 5.4 Released</title> +<body> + The Wine development release 5.4 is now available. + <a href="{$root}/announce/5.4">What's new</a> in this release: +<ul> + <li>Unicode data updated to Unicode version 13.</li> + <li>Builtin programs use the new UCRTBase C runtime.</li> + <li>More correct support for Internationalized Domain Names.</li> + <li>Support for painting rounded rectangles in Direct2D.</li> + <li>Text drawing in D3DX9.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.4.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

Zebediah Figura : d3dcompiler: Don't add the default matrix majority attribute to variables.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: eb4fc30463ac248f7b49596403db4f2f267336a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb4fc30463ac248f7b495964… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 13 17:34:54 2020 +0100 d3dcompiler: Don't add the default matrix majority attribute to variables. This is a type modifier, and thus does not make a lot of sense on a variable. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index a24d29e5df..498ca4bb59 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -129,15 +129,7 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) BOOL ret; TRACE("Declaring variable %s.\n", decl->name); - if (decl->data_type->type == HLSL_CLASS_MATRIX) - { - if (!(decl->modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR))) - { - decl->modifiers |= hlsl_ctx.matrix_majority == HLSL_ROW_MAJOR - ? HLSL_MODIFIER_ROW_MAJOR : HLSL_MODIFIER_COLUMN_MAJOR; - } - } - else + if (decl->data_type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(decl->modifiers, decl->loc); if (local)

1 0

Zebediah Figura : d3dcompiler: Fail if modifiers are applied to a function.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: afd3a1e388ab720ae6eadad3ac7591ba9fa1614f URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd3a1e388ab720ae6eadad3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 13 17:34:55 2020 +0100 d3dcompiler: Fail if modifiers are applied to a function. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 7 +++++++ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 498ca4bb59..59e0df9d8c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1322,8 +1322,15 @@ func_declaration: func_prototype compound_statement pop_scope(&hlsl_ctx); } + /* var_modifiers is necessary to avoid shift/reduce conflicts. */ func_prototype: var_modifiers type var_identifier '(' parameters ')' colon_attribute { + if ($1) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifiers on a function"); + YYABORT; + } if (get_variable(hlsl_ctx.globals, $3)) { hlsl_report_message(get_location(&@3), diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index b16f6e3454..3edee34d8d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -925,6 +925,11 @@ static void test_fail(void) " float a[(x = 2)];\n" " return float4(0, 0, 0, 0);\n" "}", + + "uniform float4 test() : SV_TARGET\n" + "{\n" + " return float4(0, 0, 0, 0);\n" + "}", }; static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"};

1 0

Zebediah Figura : d3dcompiler: Apply type modifiers to the hlsl_type.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 756ed811c72e692e58def76e76ab19e5418e8d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=756ed811c72e692e58def76e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 13 17:34:56 2020 +0100 d3dcompiler: Apply type modifiers to the hlsl_type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 96 ++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 34 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 59e0df9d8c..6a5dddf5d4 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -168,7 +168,21 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) return TRUE; } -static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); +static DWORD add_modifiers(DWORD modifiers, DWORD mod, const struct source_location loc) +{ + if (modifiers & mod) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifier '%s' already specified", debug_modifiers(mod)); + return modifiers; + } + if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); + return modifiers; + } + return modifiers | mod; +} static BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) { @@ -602,7 +616,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, local = FALSE; } - if (var->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) + if (type->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) { hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "const variable without initializer"); free_declaration(var); @@ -703,6 +717,21 @@ static BOOL add_struct_field(struct list *fields, struct hlsl_struct_field *fiel return TRUE; } +static struct hlsl_type *apply_type_modifiers(struct hlsl_type *type, DWORD *modifiers, struct source_location loc) +{ + struct hlsl_type *new_type; + + if (!(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) + return type; + + if (!(new_type = clone_hlsl_type(type))) + return NULL; + + new_type->modifiers = add_modifiers(new_type->modifiers, *modifiers, loc); + *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; + return new_type; +} + static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -1301,7 +1330,12 @@ fields_list: /* Empty */ field: var_modifiers type variables_def ';' { - $$ = gen_struct_fields($2, $1, $3); + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = gen_struct_fields(type, modifiers, $3); } | unnamed_struct_spec variables_def ';' { @@ -1449,9 +1483,15 @@ param_list: parameter parameter: input_mods var_modifiers type any_identifier colon_attribute { + struct hlsl_type *type; + DWORD modifiers = $2; + + if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2)))) + YYABORT; + $$.modifiers = $1 ? $1 : HLSL_MODIFIER_IN; - $$.modifiers |= $2; - $$.type = $3; + $$.modifiers |= modifiers; + $$.type = type; $$.name = $4; $$.semantic = $5.semantic; $$.reg_reservation = $5.reg_reservation; @@ -1639,7 +1679,12 @@ type_spec: any_identifier array declaration: var_modifiers type variables_def ';' { - $$ = declare_vars($2, $1, $3); + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = declare_vars(type, modifiers, $3); } variables_def_optional: /* Empty */ @@ -1717,47 +1762,47 @@ var_modifiers: /* Empty */ } | KW_EXTERN var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_EXTERN, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_EXTERN, get_location(&@1)); } | KW_NOINTERPOLATION var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_NOINTERPOLATION, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_NOINTERPOLATION, get_location(&@1)); } | KW_PRECISE var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_PRECISE, &@1); + $$ = add_modifiers($2, HLSL_MODIFIER_PRECISE, get_location(&@1)); } | KW_SHARED var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_SHARED, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_SHARED, get_location(&@1)); } | KW_GROUPSHARED var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_GROUPSHARED, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_GROUPSHARED, get_location(&@1)); } | KW_STATIC var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_STATIC, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_STATIC, get_location(&@1)); } | KW_UNIFORM var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_UNIFORM, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_UNIFORM, get_location(&@1)); } | KW_VOLATILE var_modifiers { - $$ = add_modifier($2, HLSL_STORAGE_VOLATILE, &@1); + $$ = add_modifiers($2, HLSL_STORAGE_VOLATILE, get_location(&@1)); } | KW_CONST var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_CONST, &@1); + $$ = add_modifiers($2, HLSL_MODIFIER_CONST, get_location(&@1)); } | KW_ROW_MAJOR var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_ROW_MAJOR, &@1); + $$ = add_modifiers($2, HLSL_MODIFIER_ROW_MAJOR, get_location(&@1)); } | KW_COLUMN_MAJOR var_modifiers { - $$ = add_modifier($2, HLSL_MODIFIER_COLUMN_MAJOR, &@1); + $$ = add_modifiers($2, HLSL_MODIFIER_COLUMN_MAJOR, get_location(&@1)); } complex_initializer: initializer_expr @@ -2486,23 +2531,6 @@ static struct source_location get_location(const struct YYLTYPE *l) return loc; } -static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *l) -{ - if (modifiers & mod) - { - hlsl_report_message(get_location(l), HLSL_LEVEL_ERROR, - "modifier '%s' already specified", debug_modifiers(mod)); - return modifiers; - } - if (mod & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) - && modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) - { - hlsl_report_message(get_location(l), HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); - return modifiers; - } - return modifiers | mod; -} - static void dump_function_decl(struct wine_rb_entry *entry, void *context) { struct hlsl_ir_function_decl *func = WINE_RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry);

1 0