- Wine-Devel - list.winehq.org

[tools 1/2] testbot: Allow for more complex Collection filtering.
by Francois Gouget March 4, 2021

March 4, 2021

The previous scheme used an implicit AND between all the property filters, with no way of replacing it with an OR. The new scheme makes it possible to create almost any where clause (excluding joins). For instance this makes it possible to get all the Jobs that were submitted or completed recently: $Jobs->AddFilter(FilterOr(FilterValue("Submitted", ">=", [$Recent]]), FilterValue("Ended", ">=", [$Recent]))); Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 98 ++++++++++++++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 158 ++++++++++++++++++-------- 2 files changed, 201 insertions(+), 55 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1fe1481f6..782f32c23 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014 Francois Gouget +# Copyright 2012-2014, 2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,7 @@ criteria. =cut use Exporter 'import'; +our @EXPORT = qw(FilterValue FilterNull FilterNotNull FilterAnd FilterOr FilterNot); our @EXPORT_OK = qw(new ComputeMasterKey); use Scalar::Util qw(blessed weaken); @@ -90,7 +91,7 @@ sub new($$$$$;$$@) MasterColNames => $MasterColNames, MasterColValues => $MasterColValues, MasterKey => ComputeMasterKey($MasterColValues), - Filters => {}, + Filter => undef, AllScopeItems => $AllScopeItems || {}, Items => undef}; if ($AllScopeItems) @@ -692,18 +693,99 @@ sub DeleteAll($) return undef; } -sub AddFilter($$$;$) + +# +# Item filtering +# + +my %FilterTypes = ( + 'value' => 1, + 'null' => 1, + 'not null' => 1, + 'and' => 1, + 'or' => 1, + 'not' => 1, +); + +my %ValueComparators = ( + '=' => 1, + '<>' => 1, + '<' => 1, + '<=' => 1, + '>' => 1, + '>=' => 1, + 'LIKE' => 1, + 'NOT LIKE' => 1, +); + +sub FilterValue($$$) { - my ($self, $PropertyName, $Values, $Type) = @_; + my ($PropertyName, $Comparator, $Values) = @_; - $self->{Filters}{$PropertyName} = [($Type || "="), $Values]; + die "unknown '$Comparator' comparator" if (!$ValueComparators{$Comparator}); + return { Type => 'value', + Property => $PropertyName, + Comparator => $Comparator, + Values => $Values, + }; } -sub GetFilters($) +sub FilterNull($) { - my ($self) = @_; + my ($PropertyName) = @_; + + return { Type => 'null', Property => $PropertyName }; +} + +sub FilterNotNull($) +{ + my ($PropertyName) = @_; + + return { Type => 'not null', Property => $PropertyName }; +} + +sub FilterAnd(@) +{ + return { Type => 'and', Terms => [@_] }; +} + +sub FilterOr(@) +{ + + return { Type => 'or', Terms => [@_] }; +} + +sub FilterNot($) +{ + my ($Term) = @_; + + return { Type => 'not', Term => $Term }; +} + +sub AddFilter($$;$$) +{ + my $self = shift; + my $Filter = @_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + + if (!$self->{Filter}) + { + $self->{Filter} = $Filter; + } + elsif ($self->{Filter}->{Type} eq 'and') + { + push @{$self->{Filter}->{Terms}}, $Filter; + } + else + { + $self->{Filter} = FilterAnd($self->{Filter}, $Filter); + } +} + +sub GetFilter($) +{ + my ($self, $PropertyName, $Values, $Type) = @_; - return $self->{Filters}; + return $self->{Filter}; } 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 88ecf8521..10cc1f3c3 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012, 2014 Francois Gouget +# Copyright 2012, 2014, 2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -174,15 +174,108 @@ sub BuildFieldList($$) return $Fields; } -my %_AllowedFilterTypes = ( - "=" => 1, - "<>" => 1, - "<" => 1, - "<=" => 1, - ">" => 1, - ">=" => 1, - "LIKE" => 1, -); +sub ColNameToDb($) +{ + my ($PropertyDescriptor) = @_; + + my $ColNames = $PropertyDescriptor->GetColNames(); + if (@$ColNames != 1) + { + die "cannot filter on Itemref with more than one column name: @$ColNames"; + } + return $ColNames->[0]; +} + +=pod +=over 12 + +=item C<GetFilterWhere()> + +Builds the WHERE clause and its associated data parameter from the specified +collection and filter tree. + +Returns a triplet composed of a boolean which is true if the returned WHERE +clause is composite, that is if it should be enclosed in parentheses before +being combined with other filters ; the WHERE clause string ; and a reference +to the data array. + +=back +=cut + +sub GetFilterWhere($$$); +sub GetFilterWhere($$$) +{ + my ($self, $Collection, $Filter) = @_; + + if ($Filter->{Type} eq 'value') + { + my $Values = $Filter->{Values}; + if (!$Values or @$Values == 0) + { + die "no values for the $Filter->{Property} $Filter->{Comparator} property filter"; + } + + my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); + my (@Wheres, @Data); + foreach my $ColValue (@$Values) + { + my $ColName = ColNameToDb($PropertyDescriptor); + push @Wheres, "$ColName $Filter->{Comparator} ?"; + + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + $ColValue = $ColValue->GetKey(); + } + push @Data, $self->ToDb($ColValue, $PropertyDescriptor); + } + return (@$Values > 1, join(" OR ", @Wheres), \@Data); + } + + if ($Filter->{Type} eq 'and' or $Filter->{Type} eq 'or') + { + my $Terms = $Filter->{Terms}; + if (!$Terms or !@$Terms) + { + die "no terms for the $Filter->{Type} filter"; + } + if (@$Terms == 1) + { + return GetFilterWhere($self, $Collection, $Terms->[0]); + } + + my (@Wheres, @Data); + foreach my $Term (@$Terms) + { + my ($Composite, $TermWhere, $TermData) = GetFilterWhere($self, $Collection, $Term); + push @Wheres, ($Composite ? "($TermWhere)" : $TermWhere); + push @Data, @$TermData; + } + + my $Operator = ($Filter->{Type} eq 'and' ? " AND " : " OR "); + return (1, join($Operator, @Wheres), \@Data); + } + + if ($Filter->{Type} eq 'null' or $Filter->{Type} eq 'not null') + { + my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); + my $ColName = ColNameToDb($PropertyDescriptor); + my $Operator = ($Filter->{Type} eq 'null' ? "IS NULL" : "IS NOT NULL"); + return (0, "$ColName $Operator", []); + } + + if ($Filter->{Type} eq 'not') + { + if (!$Filter->{Term}) + { + die "no term for the not filter"; + } + my ($Composite, $TermWhere, $TermData) = GetFilterWhere($self, $Collection, $Filter->{Term}); + # To avoid confusion add parentheses even it the term is not composite + return (0, "NOT ($TermWhere)", $TermData); + } + + die "unsupported '$Filter->{Type}' filter type"; +} sub LoadCollection($$) { @@ -199,48 +292,19 @@ sub LoadCollection($$) push @Data, @{$MasterColValues}; } - my $Filters = $Collection->GetFilters(); - foreach my $FilterProperty (keys %$Filters) + my $Filter = $Collection->GetFilter(); + if ($Filter) { + my ($Composite, $FilterWhere, $FilterData) = GetFilterWhere($self, $Collection, $Filter); if ($Where ne "") { - $Where .= " AND "; - } - my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($FilterProperty); - my ($FilterType, $FilterValues) = @{$Filters->{$FilterProperty}}; - if (!$_AllowedFilterTypes{$FilterType}) - { - die "unknown '$FilterType' filter type"; - } - if (!@$FilterValues) - { - die "no values for the '$FilterType' filter"; - } - - if (@$FilterValues != 1) - { - $Where .= "("; - } - foreach my $FilterIndex (0 .. @$FilterValues - 1) - { - if ($FilterIndex != 0) - { - $Where .= " OR "; - } - my $ColValue = $FilterValues->[$FilterIndex]; - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColValue = $ColValue->GetKey(); - } - foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) - { - $Where .= "$ColName $FilterType ?"; - $Data[@Data] = $self->ToDb($ColValue, $PropertyDescriptor); - } + $Where .= ($Composite ? " AND ($FilterWhere)" : " AND $FilterWhere"); + push @Data, @$FilterData; } - if (@$FilterValues != 1) + else { - $Where .= ")"; + $Where = $FilterWhere; + @Data = @$FilterData; } } -- 2.20.1

1 1

[PATCH 1/4] windows.media.speech: Add stub dll.
by Rémi Bernon March 4, 2021

March 4, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This DLL is required to run Microsoft Flight Simulator. configure.ac | 1 + dlls/windows.media.speech.dll/Makefile.in | 5 + .../windows.media.speech.spec | 3 + .../windows.media.speech_main.c | 140 ++++++++++++++++++ loader/wine.inf.in | 1 + 5 files changed, 150 insertions(+) create mode 100644 dlls/windows.media.speech.dll/Makefile.in create mode 100644 dlls/windows.media.speech.dll/windows.media.speech.spec create mode 100644 dlls/windows.media.speech.dll/windows.media.speech_main.c diff --git a/configure.ac b/configure.ac index caff5d1fe52..78720ab188f 100644 --- a/configure.ac +++ b/configure.ac @@ -3796,6 +3796,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/windows.media.speech.dll) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.media.speech.dll/Makefile.in b/dlls/windows.media.speech.dll/Makefile.in new file mode 100644 index 00000000000..e1f4b3402bd --- /dev/null +++ b/dlls/windows.media.speech.dll/Makefile.in @@ -0,0 +1,5 @@ +MODULE = windows.media.speech.dll +IMPORTS = combase uuid +EXTRADLLFLAGS = -mno-cygwin +C_SRCS = \ + windows.media.speech_main.c diff --git a/dlls/windows.media.speech.dll/windows.media.speech.spec b/dlls/windows.media.speech.dll/windows.media.speech.spec new file mode 100644 index 00000000000..721493229c2 --- /dev/null +++ b/dlls/windows.media.speech.dll/windows.media.speech.spec @@ -0,0 +1,3 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/windows.media.speech.dll/windows.media.speech_main.c b/dlls/windows.media.speech.dll/windows.media.speech_main.c new file mode 100644 index 00000000000..c7c14deef78 --- /dev/null +++ b/dlls/windows.media.speech.dll/windows.media.speech_main.c @@ -0,0 +1,140 @@ +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#include "windows.foundation.h" +#include "windows.media.speechsynthesis.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_media_speech +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_media_speech *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_speech, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = &impl->IActivationFactory_iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_media_speech_AddRef( + IActivationFactory *iface) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_media_speech_Release( + IActivationFactory *iface) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_media_speech_QueryInterface, + windows_media_speech_AddRef, + windows_media_speech_Release, + /* IInspectable methods */ + windows_media_speech_GetIids, + windows_media_speech_GetRuntimeClassName, + windows_media_speech_GetTrustLevel, + /* IActivationFactory methods */ + windows_media_speech_ActivateInstance, +}; + +static struct windows_media_speech windows_media_speech = +{ + {&activation_factory_vtbl}, + 0 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_media_speech.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d5dd2d5b66b..db816327a51 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -713,6 +713,7 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo" HKLM,%MciExtStr%,"wvx",,"MPEGVideo" [Misc] +HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Media.SpeechSynthesis.SpeechSynthesizer,"DllPath",2,"Windows.Media.Speech.dll" HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000 HKLM,Software\Clients\Mail,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client" -- 2.30.0

2 6

[tools] winetest/dissect: Don't close nonexistent test units.
by Francois Gouget March 4, 2021

March 4, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index fc83726bf..7f4f3271d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -770,7 +770,7 @@ while ($line = <IN>) { # And close the current test unit taking into account # it may have been polluted by the new one. $broken = 1; - close_test_unit(0); + close_test_unit(0) if ($dll ne ""); # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have -- 2.20.1

1 0

[tools] testbot/LogUtils: Don't close nonexistent test units.
by Francois Gouget March 4, 2021

March 4, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This shouldn't really happen unless there is a bug that prevents ParseWineTestReport() from recognizing the initial start line (which is of course what happened). At least this makes it consistent with the other _CloseTestUnit() call. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4d2619ccc..0bd7d19de 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -683,7 +683,7 @@ sub ParseWineTestReport($$$) # First close the current test unit taking into account # it may have been polluted by the new one. $Cur->{IsBroken} = 1; - _CloseTestUnit($LogInfo, $Cur, 0); + _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have -- 2.20.1

1 0

[PATCH] mprapi: Add stub for MprConfigServerConnect().
by Paul Gofman March 4, 2021

March 4, 2021

Fixes ARK Park start failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mprapi/mprapi.c | 12 ++++++++++++ dlls/mprapi/mprapi.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index cfb4259b339..b3d641fe108 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -60,3 +60,15 @@ BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR server) return FALSE; } + +/*********************************************************************** + * MprConfigServerConnect (MPRAPI.@) + */ +DWORD APIENTRY MprConfigServerConnect(LPWSTR server_name, HANDLE *hmprconfig) +{ + FIXME("server_name %s, hmprconfig %p stub.\n", debugstr_w(server_name), hmprconfig); + + *hmprconfig = NULL; + + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/mprapi/mprapi.spec b/dlls/mprapi/mprapi.spec index 4b5937b8806..21d39841db5 100644 --- a/dlls/mprapi/mprapi.spec +++ b/dlls/mprapi/mprapi.spec @@ -82,7 +82,7 @@ @ stub MprConfigInterfaceTransportRemove @ stub MprConfigInterfaceTransportSetInfo @ stub MprConfigServerBackup -@ stub MprConfigServerConnect +@ stdcall MprConfigServerConnect(wstr ptr) @ stub MprConfigServerDisconnect @ stub MprConfigServerGetInfo @ stub MprConfigServerInstall -- 2.29.2

1 0

[PATCH] dwrite/tests: Do not assume that fonts have a en-us name.
by Giovanni Mascellani March 4, 2021

March 4, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 6dd251270c7..0294bbfb719 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1500,7 +1500,10 @@ static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, unsig hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(exists, "Failed to find locale name %d.\n", exists); + + /* Not all fonts have an en-us name! */ + if (!exists) + index = 0; hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); ok(hr == S_OK, "Failed to get name string, hr %#x.\n", hr); -- 2.30.1

2 2

Re: [PATCH] dwrite/tests: Do not assume that fonts have a en-us name.
by Nikolay Sivov March 4, 2021

March 4, 2021

On 3/4/21 12:17 PM, Giovanni Mascellani wrote: > Hi, > > Il 04/03/21 08:45, Nikolay Sivov ha scritto: >> Do you know which font was that? I'd like to test that on Windows first, >> it's possible locale-neutral or "en" entry is still created even when >> not specified explicitly. > > Font is "femkeklaver", attached (I got it from a Debian package). Note > that the font family has the en-us string, but one of the faces does not: > >> 88997.023000:0020:0024:trace:gio:!0x407813:dlls/dwrite/tests/analyzer.c:1772:test_GetGlyphs >> Family name: L"femkeklaver" >> 88997.023000:0020:0024:warn:gio:!0x403e8f:dlls/dwrite/tests/analyzer.c:1512:get_enus_string >> LocalizedStrings without en-us string: L"Normal" >> 88997.023000:0020:0024:trace:gio:!0x407813:dlls/dwrite/tests/analyzer.c:1789:test_GetGlyphs >> Face name: L"Normal" >> 88997.024000:0020:0024:trace:gio:!0x407813:dlls/dwrite/tests/analyzer.c:1789:test_GetGlyphs >> Face name: L"Bold" >> 88997.024000:0020:0024:trace:gio:!0x407813:dlls/dwrite/tests/analyzer.c:1789:test_GetGlyphs >> Face name: L"Oblique" >> 88997.024000:0020:0024:trace:gio:!0x407813:dlls/dwrite/tests/analyzer.c:1789:test_GetGlyphs >> Face name: L"Bold Oblique" > It's not actually true, it does have English entry for nameid = 2 (subfamily aka face name). The thing is that it's mac platform entry, which we skip, and only use in case of emergency. > But you're right: Windows 8 doesn't have this problem, the en-us > string is available there. So the problem is probably elsewhere. There are two problems apparently, first we need to consider mac entries. Second problem is that test will fail same way on Windows if you remove mac platform entry. There will be no artificially added en-us name. Turns out what actually matters is that mac entry is for langid == 0 (English), that's why it's picked up on Windows, if I set langid == 1 (Japanese), there is no en-us or jp* name. I'm going to amend with similar logic. > > Giovanni. >

1 0

[PATCH 1/4] wined3d: Move the wined3d_state field of struct wined3d_cs to a new wined3d_cs_state structure.
by Zebediah Figura March 4, 2021

March 4, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is a proposed approach at implementing deferred contexts. The idea is to create a wined3d_cs object per ID3D11DeviceContext. Deferred contexts will have their own wined3d_cs_ops structure, and some operations (i.e. maps and queries) will be partially split to wined3d_cs_ops methods. The point of this patch is to avoid allocating space for unused wined3d_state objects. Presumably other fields could also be moved to the wined3d_cs_state structure as well. dlls/wined3d/cs.c | 115 +++++++++++++++++---------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++- 3 files changed, 66 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4ee3d97b7fc..9e3ea4c8086 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -532,7 +532,7 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { struct wined3d_texture *logo_texture, *cursor_texture, *back_buffer; - struct wined3d_rendertarget_view *dsv = cs->state.fb.depth_stencil; + struct wined3d_rendertarget_view *dsv = cs->cs_state->state.fb.depth_stencil; const struct wined3d_cs_present *op = data; const struct wined3d_swapchain_desc *desc; struct wined3d_swapchain *swapchain; @@ -690,7 +690,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; - op->fb = &cs->state.fb; + op->fb = &cs->cs_state->state.fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->rasterizer_state && state->rasterizer_state->desc.scissor) IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); @@ -861,7 +861,7 @@ static void release_unordered_access_resources(const struct wined3d_shader *shad static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_dispatch *op = data; - struct wined3d_state *state = &cs->state; + struct wined3d_state *state = &cs->cs_state->state; if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) WARN("No compute shader bound, skipping dispatch.\n"); @@ -925,7 +925,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) const struct wined3d_shader *geometry_shader; struct wined3d_device *device = cs->device; int base_vertex_idx, load_base_vertex_idx; - struct wined3d_state *state = &cs->state; + struct wined3d_state *state = &cs->cs_state->state; const struct wined3d_cs_draw *op = data; unsigned int i; @@ -1111,8 +1111,8 @@ static void wined3d_cs_exec_set_predication(struct wined3d_cs *cs, const void *d { const struct wined3d_cs_set_predication *op = data; - cs->state.predicate = op->predicate; - cs->state.predicate_value = op->value; + cs->cs_state->state.predicate = op->predicate; + cs->cs_state->state.predicate_value = op->value; } void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query *predicate, BOOL value) @@ -1132,10 +1132,10 @@ static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *dat const struct wined3d_cs_set_viewports *op = data; if (op->viewport_count) - memcpy(cs->state.viewports, op->viewports, op->viewport_count * sizeof(*op->viewports)); + memcpy(cs->cs_state->state.viewports, op->viewports, op->viewport_count * sizeof(*op->viewports)); else - memset(cs->state.viewports, 0, sizeof(*cs->state.viewports)); - cs->state.viewport_count = op->viewport_count; + memset(cs->cs_state->state.viewports, 0, sizeof(*cs->cs_state->state.viewports)); + cs->cs_state->state.viewport_count = op->viewport_count; device_invalidate_state(cs->device, STATE_VIEWPORT); } @@ -1158,10 +1158,10 @@ static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void const struct wined3d_cs_set_scissor_rects *op = data; if (op->rect_count) - memcpy(cs->state.scissor_rects, op->rects, op->rect_count * sizeof(*op->rects)); + memcpy(cs->cs_state->state.scissor_rects, op->rects, op->rect_count * sizeof(*op->rects)); else - SetRectEmpty(cs->state.scissor_rects); - cs->state.scissor_rect_count = op->rect_count; + SetRectEmpty(cs->cs_state->state.scissor_rects); + cs->cs_state->state.scissor_rect_count = op->rect_count; device_invalidate_state(cs->device, STATE_SCISSORRECT); } @@ -1184,8 +1184,8 @@ static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const v BOOL prev_alpha_swizzle, curr_alpha_swizzle; struct wined3d_rendertarget_view *prev; - prev = cs->state.fb.render_targets[op->view_idx]; - cs->state.fb.render_targets[op->view_idx] = op->view; + prev = cs->cs_state->state.fb.render_targets[op->view_idx]; + cs->cs_state->state.fb.render_targets[op->view_idx] = op->view; device_invalidate_state(cs->device, STATE_FRAMEBUFFER); prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; @@ -1213,7 +1213,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const struct wined3d_device *device = cs->device; struct wined3d_rendertarget_view *prev; - if ((prev = cs->state.fb.depth_stencil) && prev->resource->type != WINED3D_RTYPE_BUFFER) + if ((prev = cs->cs_state->state.fb.depth_stencil) && prev->resource->type != WINED3D_RTYPE_BUFFER) { struct wined3d_texture *prev_texture = texture_from_resource(prev->resource); @@ -1223,7 +1223,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); } - cs->state.fb.depth_stencil = op->view; + cs->cs_state->state.fb.depth_stencil = op->view; if (!prev != !op->view) { @@ -1258,7 +1258,7 @@ static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const { const struct wined3d_cs_set_vertex_declaration *op = data; - cs->state.vertex_declaration = op->declaration; + cs->cs_state->state.vertex_declaration = op->declaration; device_invalidate_state(cs->device, STATE_VDECL); } @@ -1279,7 +1279,7 @@ static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void struct wined3d_stream_state *stream; struct wined3d_buffer *prev; - stream = &cs->state.streams[op->stream_idx]; + stream = &cs->cs_state->state.streams[op->stream_idx]; prev = stream->buffer; stream->buffer = op->buffer; stream->offset = op->offset; @@ -1313,7 +1313,7 @@ static void wined3d_cs_exec_set_stream_source_freq(struct wined3d_cs *cs, const const struct wined3d_cs_set_stream_source_freq *op = data; struct wined3d_stream_state *stream; - stream = &cs->state.streams[op->stream_idx]; + stream = &cs->cs_state->state.streams[op->stream_idx]; stream->frequency = op->frequency; stream->flags = op->flags; @@ -1339,7 +1339,7 @@ static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void struct wined3d_stream_output *stream; struct wined3d_buffer *prev; - stream = &cs->state.stream_output[op->stream_idx]; + stream = &cs->cs_state->state.stream_output[op->stream_idx]; prev = stream->buffer; stream->buffer = op->buffer; stream->offset = op->offset; @@ -1371,10 +1371,10 @@ static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void * const struct wined3d_cs_set_index_buffer *op = data; struct wined3d_buffer *prev; - prev = cs->state.index_buffer; - cs->state.index_buffer = op->buffer; - cs->state.index_format = op->format_id; - cs->state.index_offset = op->offset; + prev = cs->cs_state->state.index_buffer; + cs->cs_state->state.index_buffer = op->buffer; + cs->cs_state->state.index_format = op->format_id; + cs->cs_state->state.index_offset = op->offset; if (op->buffer) InterlockedIncrement(&op->buffer->resource.bind_count); @@ -1403,8 +1403,8 @@ static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const voi const struct wined3d_cs_set_constant_buffer *op = data; struct wined3d_buffer *prev; - prev = cs->state.cb[op->type][op->cb_idx]; - cs->state.cb[op->type][op->cb_idx] = op->buffer; + prev = cs->cs_state->state.cb[op->type][op->cb_idx]; + cs->cs_state->state.cb[op->type][op->cb_idx] = op->buffer; if (op->buffer) InterlockedIncrement(&op->buffer->resource.bind_count); @@ -1435,8 +1435,8 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) struct wined3d_texture *prev; BOOL old_use_color_key = FALSE, new_use_color_key = FALSE; - prev = cs->state.textures[op->stage]; - cs->state.textures[op->stage] = op->texture; + prev = cs->cs_state->state.textures[op->stage]; + cs->cs_state->state.textures[op->stage] = op->texture; if (op->texture) { @@ -1478,7 +1478,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) TRACE("Searching for other stages the texture is bound to.\n"); for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) { - if (cs->state.textures[i] == prev) + if (cs->cs_state->state.textures[i] == prev) { TRACE("Texture is also bound to stage %u.\n", i); prev->sampler = i; @@ -1523,8 +1523,8 @@ static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, cons const struct wined3d_cs_set_shader_resource_view *op = data; struct wined3d_shader_resource_view *prev; - prev = cs->state.shader_resource_view[op->type][op->view_idx]; - cs->state.shader_resource_view[op->type][op->view_idx] = op->view; + prev = cs->cs_state->state.shader_resource_view[op->type][op->view_idx]; + cs->cs_state->state.shader_resource_view[op->type][op->view_idx] = op->view; if (op->view) InterlockedIncrement(&op->view->resource->bind_count); @@ -1556,8 +1556,8 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con const struct wined3d_cs_set_unordered_access_view *op = data; struct wined3d_unordered_access_view *prev; - prev = cs->state.unordered_access_view[op->pipeline][op->view_idx]; - cs->state.unordered_access_view[op->pipeline][op->view_idx] = op->view; + prev = cs->cs_state->state.unordered_access_view[op->pipeline][op->view_idx]; + cs->cs_state->state.unordered_access_view[op->pipeline][op->view_idx] = op->view; if (op->view) InterlockedIncrement(&op->view->resource->bind_count); @@ -1589,7 +1589,7 @@ static void wined3d_cs_exec_set_sampler(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_sampler *op = data; - cs->state.sampler[op->type][op->sampler_idx] = op->sampler; + cs->cs_state->state.sampler[op->type][op->sampler_idx] = op->sampler; if (op->type != WINED3D_SHADER_TYPE_COMPUTE) device_invalidate_state(cs->device, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); else @@ -1614,7 +1614,7 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_shader *op = data; - cs->state.shader[op->type] = op->shader; + cs->cs_state->state.shader[op->type] = op->shader; device_invalidate_state(cs->device, STATE_SHADER(op->type)); if (op->type != WINED3D_SHADER_TYPE_COMPUTE) device_invalidate_state(cs->device, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); @@ -1637,7 +1637,7 @@ void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type static void wined3d_cs_exec_set_blend_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_blend_state *op = data; - struct wined3d_state *state = &cs->state; + struct wined3d_state *state = &cs->cs_state->state; if (state->blend_state != op->state) { @@ -1667,7 +1667,7 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend static void wined3d_cs_exec_set_depth_stencil_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_depth_stencil_state *op = data; - struct wined3d_state *state = &cs->state; + struct wined3d_state *state = &cs->cs_state->state; if (state->depth_stencil_state != op->state) { @@ -1695,7 +1695,7 @@ static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const vo { const struct wined3d_cs_set_rasterizer_state *op = data; - cs->state.rasterizer_state = op->state; + cs->cs_state->state.rasterizer_state = op->state; device_invalidate_state(cs->device, STATE_RASTERIZER); } @@ -1715,7 +1715,7 @@ static void wined3d_cs_exec_set_render_state(struct wined3d_cs *cs, const void * { const struct wined3d_cs_set_render_state *op = data; - cs->state.render_states[op->state] = op->value; + cs->cs_state->state.render_states[op->state] = op->value; device_invalidate_state(cs->device, STATE_RENDER(op->state)); } @@ -1735,7 +1735,7 @@ static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void { const struct wined3d_cs_set_texture_state *op = data; - cs->state.texture_states[op->stage][op->state] = op->value; + cs->cs_state->state.texture_states[op->stage][op->state] = op->value; device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, op->state)); } @@ -1757,7 +1757,7 @@ static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void { const struct wined3d_cs_set_sampler_state *op = data; - cs->state.sampler_states[op->sampler_idx][op->state] = op->value; + cs->cs_state->state.sampler_states[op->sampler_idx][op->state] = op->value; device_invalidate_state(cs->device, STATE_SAMPLER(op->sampler_idx)); } @@ -1779,7 +1779,7 @@ static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *dat { const struct wined3d_cs_set_transform *op = data; - cs->state.transforms[op->state] = op->matrix; + cs->cs_state->state.transforms[op->state] = op->matrix; if (op->state < WINED3D_TS_WORLD_MATRIX(cs->device->adapter->d3d_info.limits.ffp_vertex_blend_matrices)) device_invalidate_state(cs->device, STATE_TRANSFORM(op->state)); } @@ -1801,7 +1801,7 @@ static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *da { const struct wined3d_cs_set_clip_plane *op = data; - cs->state.clip_planes[op->plane_idx] = op->plane; + cs->cs_state->state.clip_planes[op->plane_idx] = op->plane; device_invalidate_state(cs->device, STATE_CLIPPLANE(op->plane_idx)); } @@ -1837,7 +1837,7 @@ static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *dat break; case WINED3D_CKEY_SRC_BLT: - if (texture == cs->state.textures[0]) + if (texture == cs->cs_state->state.textures[0]) { device_invalidate_state(cs->device, STATE_COLOR_KEY); if (!(texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT)) @@ -1867,7 +1867,7 @@ static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *dat break; case WINED3D_CKEY_SRC_BLT: - if (texture == cs->state.textures[0] && texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT) + if (texture == cs->cs_state->state.textures[0] && texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT) device_invalidate_state(cs->device, STATE_RENDER(WINED3D_RS_COLORKEYENABLE)); texture->async.color_key_flags &= ~WINED3D_CKEY_SRC_BLT; @@ -1904,7 +1904,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->cs_state->state.material = op->material; device_invalidate_state(cs->device, STATE_MATERIAL); } @@ -1927,7 +1927,7 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) light_idx = op->light.OriginalIndex; - if (!(light_info = wined3d_light_state_get_light(&cs->state.light_state, light_idx))) + if (!(light_info = wined3d_light_state_get_light(&cs->cs_state->state.light_state, light_idx))) { TRACE("Adding new light.\n"); if (!(light_info = heap_alloc_zero(sizeof(*light_info)))) @@ -1937,7 +1937,7 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) } hash_idx = LIGHTMAP_HASHFUNC(light_idx); - list_add_head(&cs->state.light_state.light_map[hash_idx], &light_info->entry); + list_add_head(&cs->cs_state->state.light_state.light_map[hash_idx], &light_info->entry); light_info->glIndex = -1; light_info->OriginalIndex = light_idx; } @@ -1974,14 +1974,14 @@ static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void * struct wined3d_light_info *light_info; int prev_idx; - if (!(light_info = wined3d_light_state_get_light(&cs->state.light_state, op->idx))) + if (!(light_info = wined3d_light_state_get_light(&cs->cs_state->state.light_state, op->idx))) { ERR("Light doesn't exist.\n"); return; } prev_idx = light_info->glIndex; - wined3d_light_state_enable_light(&cs->state.light_state, &device->adapter->d3d_info, light_info, op->enable); + wined3d_light_state_enable_light(&cs->cs_state->state.light_state, &device->adapter->d3d_info, light_info, op->enable); if (light_info->glIndex != prev_idx) { device_invalidate_state(device, STATE_LIGHT_TYPE); @@ -2037,7 +2037,7 @@ static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_pus device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count); offset = wined3d_cs_push_constant_info[p].offset + start_idx * wined3d_cs_push_constant_info[p].size; - memcpy((BYTE *)&cs->state + offset, constants, count * wined3d_cs_push_constant_info[p].size); + memcpy((BYTE *)&cs->cs_state->state + offset, constants, count * wined3d_cs_push_constant_info[p].size); for (i = 0, context_count = device->context_count; i < context_count; ++i) { device->contexts[i]->constant_update_mask |= wined3d_cs_push_constant_info[p].mask; @@ -2073,9 +2073,9 @@ static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { struct wined3d_adapter *adapter = cs->device->adapter; - state_cleanup(&cs->state); - memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_cleanup(&cs->cs_state->state); + memset(&cs->cs_state->state, 0, sizeof(cs->cs_state->state)); + state_init(&cs->cs_state->state, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) @@ -2973,7 +2973,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->device = device; cs->serialize_commands = TRACE_ON(d3d_sync) || wined3d_settings.cs_multithreaded & WINED3D_CSMT_SERIALIZE; - state_init(&cs->state, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + cs->cs_state = &device->cs_state; + state_init(&cs->cs_state->state, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = heap_alloc(cs->data_size))) @@ -3013,7 +3014,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) return cs; fail: - state_cleanup(&cs->state); + state_cleanup(&cs->cs_state->state); heap_free(cs); return NULL; } @@ -3028,7 +3029,7 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) ERR("Closing event failed.\n"); } - state_cleanup(&cs->state); + state_cleanup(&cs->cs_state->state); heap_free(cs->data); heap_free(cs); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d6408fb1c7a..17063a09009 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5314,8 +5314,8 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { struct wined3d_rendertarget_view *rtv = rt_count ? fb->render_targets[0] : NULL; + const struct wined3d_state *state = &device->cs->cs_state->state; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - const struct wined3d_state *state = &device->cs->state; struct wined3d_texture *depth_stencil = NULL; unsigned int drawable_width, drawable_height; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56d3ef8fea2..18717b5207f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3745,6 +3745,11 @@ struct wined3d_so_desc_entry struct wined3d_stream_output_element elements[1]; }; +struct wined3d_cs_state +{ + struct wined3d_state state; +}; + struct wined3d_device { LONG ref; @@ -3812,6 +3817,7 @@ struct wined3d_device struct wined3d_sampler *null_sampler; /* Command stream */ + struct wined3d_cs_state cs_state; struct wined3d_cs *cs; /* Context management */ @@ -4684,7 +4690,7 @@ struct wined3d_cs { const struct wined3d_cs_ops *ops; struct wined3d_device *device; - struct wined3d_state state; + struct wined3d_cs_state *cs_state; HMODULE wined3d_module; HANDLE thread; DWORD thread_id; -- 2.20.1

3 12

[PATCH] reg/tests: Pass __FILE__ from the caller so the correct filename is shown in error logs
by Hugh McMaster March 4, 2021

March 4, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 26 ++++++++-------- programs/reg/tests/export.c | 5 ++-- programs/reg/tests/import.c | 2 +- programs/reg/tests/reg_test.h | 56 ++++++++++++++++++----------------- 4 files changed, 47 insertions(+), 42 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index bd0888ae831..a34bcf7c9ac 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -22,7 +22,7 @@ #define TODO_REG_SIZE (0x0002u) #define TODO_REG_DATA (0x0004u) -BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) +BOOL run_reg_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc) { STARTUPINFOA si = {sizeof(STARTUPINFOA)}; PROCESS_INFORMATION pi; @@ -51,8 +51,8 @@ BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) return bret; } -void verify_reg_(unsigned line, HKEY hkey, const char* value, DWORD exp_type, - const void *exp_data, DWORD exp_size, DWORD todo) +void verify_reg_(const char *file, unsigned line, HKEY hkey, const char *value, + DWORD exp_type, const void *exp_data, DWORD exp_size, DWORD todo) { DWORD type, size; BYTE data[256]; @@ -76,7 +76,7 @@ void verify_reg_(unsigned line, HKEY hkey, const char* value, DWORD exp_type, } } -void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) +void verify_reg_nonexist_(const char *file, unsigned line, HKEY hkey, const char *value) { LONG err; @@ -85,7 +85,8 @@ void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) (value && *value) ? value : "(Default)", err); } -void open_key_(unsigned line, const HKEY base, const char *path, const DWORD sam, HKEY *hkey) +void open_key_(const char *file, unsigned line, const HKEY base, const char *path, + const DWORD sam, HKEY *hkey) { LONG err; @@ -93,7 +94,7 @@ void open_key_(unsigned line, const HKEY base, const char *path, const DWORD sam lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", err); } -void close_key_(unsigned line, HKEY hkey) +void close_key_(const char *file, unsigned line, HKEY hkey) { LONG err; @@ -101,7 +102,7 @@ void close_key_(unsigned line, HKEY hkey) lok(err == ERROR_SUCCESS, "RegCloseKey failed: %d\n", err); } -void verify_key_(unsigned line, HKEY key_base, const char *subkey) +void verify_key_(const char *file, unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -113,7 +114,7 @@ void verify_key_(unsigned line, HKEY key_base, const char *subkey) RegCloseKey(hkey); } -void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) +void verify_key_nonexist_(const char *file, unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -126,7 +127,7 @@ void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) RegCloseKey(hkey); } -void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) +void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path, HKEY *subkey) { LONG err; @@ -135,7 +136,7 @@ void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); } -void delete_key_(unsigned line, const HKEY hkey, const char *path) +void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *path) { if (path && *path) { @@ -188,7 +189,8 @@ cleanup: return ret; } -void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size) +void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, + DWORD type, const void *data, size_t size) { LONG err; @@ -196,7 +198,7 @@ void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const vo lok(err == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", err); } -void delete_value_(unsigned line, const HKEY hkey, const char *name) +void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name) { LONG err; diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 9a3f7d5fbf0..32c99e36376 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -20,8 +20,9 @@ #define TODO_REG_COMPARE (0x0008u) -#define compare_export(f,e,todo) compare_export_(__LINE__,f,e,todo) -static BOOL compare_export_(unsigned line, const char *filename, const char *expected, DWORD todo) +#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) +static BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo) { FILE *fp; long file_size; diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 58831625fa5..9b7a90ac99c 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -37,7 +37,7 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD *rc) +BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc) { int lenA; BOOL ret; diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 2f4bdf36437..14afa02930c 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -24,52 +24,54 @@ #include "wine/test.h" /* Common #defines */ -#define lok ok_(__FILE__,line) +#define lok ok_(file,line) #define KEY_WINE "Software\\Wine" #define KEY_BASE KEY_WINE "\\reg_test" #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 /* add.c */ -#define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) -BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc); +#define run_reg_exe(c,r) run_reg_exe_(__FILE__,__LINE__,c,r) +BOOL run_reg_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc); -#define verify_reg(k,v,t,d,s,todo) verify_reg_(__LINE__,k,v,t,d,s,todo) -void verify_reg_(unsigned line, HKEY hkey, const char* value, DWORD exp_type, - const void *exp_data, DWORD exp_size, DWORD todo); +#define verify_reg(k,v,t,d,s,todo) verify_reg_(__FILE__,__LINE__,k,v,t,d,s,todo) +void verify_reg_(const char *file, unsigned line, HKEY hkey, const char *value, + DWORD exp_type, const void *exp_data, DWORD exp_size, DWORD todo); -#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) -void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value); +#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__FILE__,__LINE__,k,v) +void verify_reg_nonexist_(const char *file, unsigned line, HKEY hkey, const char *value); -#define open_key(b,p,s,k) open_key_(__LINE__,b,p,s,k) -void open_key_(unsigned line, const HKEY base, const char *path, const DWORD sam, HKEY *hkey); +#define open_key(b,p,s,k) open_key_(__FILE__,__LINE__,b,p,s,k) +void open_key_(const char *file, unsigned line, const HKEY base, const char *path, + const DWORD sam, HKEY *hkey); -#define close_key(k) close_key_(__LINE__,k) -void close_key_(unsigned line, HKEY hkey); +#define close_key(k) close_key_(__FILE__,__LINE__,k) +void close_key_(const char *file, unsigned line, HKEY hkey); -#define verify_key(k,s) verify_key_(__LINE__,k,s) -void verify_key_(unsigned line, HKEY key_base, const char *subkey); +#define verify_key(k,s) verify_key_(__FILE__,__LINE__,k,s) +void verify_key_(const char *file, unsigned line, HKEY key_base, const char *subkey); -#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) -void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey); +#define verify_key_nonexist(k,s) verify_key_nonexist_(__FILE__,__LINE__,k,s) +void verify_key_nonexist_(const char *file, unsigned line, HKEY key_base, const char *subkey); -#define add_key(k,p,s) add_key_(__LINE__,k,p,s) -void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey); +#define add_key(k,p,s) add_key_(__FILE__,__LINE__,k,p,s) +void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path, HKEY *subkey); -#define delete_key(k,p) delete_key_(__LINE__,k,p) -void delete_key_(unsigned line, const HKEY hkey, const char *path); +#define delete_key(k,p) delete_key_(__FILE__,__LINE__,k,p) +void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *path); LONG delete_tree(const HKEY key, const char *subkey); -#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) -void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size); +#define add_value(k,n,t,d,s) add_value_(__FILE__,__LINE__,k,n,t,d,s) +void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, + DWORD type, const void *data, size_t size); -#define delete_value(k,n) delete_value_(__LINE__,k,n) -void delete_value_(unsigned line, const HKEY hkey, const char *name); +#define delete_value(k,n) delete_value_(__FILE__,__LINE__,k,n) +void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name); /* import.c */ -#define test_import_str(c,r) import_reg(__LINE__,c,FALSE,r) -#define test_import_wstr(c,r) import_reg(__LINE__,c,TRUE,r) -BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD *rc); +#define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) +#define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r) +BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc); #endif /* __REG_TEST_H__ */ -- 2.30.1

1 0

[PATCH] user32: Only get input codepage when needed.
by Rémi Bernon March 4, 2021

March 4, 2021

Calling get_input_codepage involves doing quite a lot of things, and doing it for every message type, when it's not needed, is inneficient. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/message.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b142d296f32..1c6f24713bf 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -602,7 +602,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { char ch[2]; WCHAR wch[2]; - DWORD cp = get_input_codepage(); + DWORD cp; wch[0] = wch[1] = 0; switch(message) @@ -616,6 +616,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; BYTE low = LOBYTE(*wparam); + cp = get_input_codepage(); if (HIBYTE(*wparam)) { @@ -662,12 +663,14 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping case WM_SYSCHAR: case WM_SYSDEADCHAR: case WM_MENUCHAR: + cp = get_input_codepage(); ch[0] = LOBYTE(*wparam); ch[1] = HIBYTE(*wparam); MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); *wparam = MAKEWPARAM(wch[0], wch[1]); break; case WM_IME_CHAR: + cp = get_input_codepage(); ch[0] = HIBYTE(*wparam); ch[1] = LOBYTE(*wparam); if (ch[0]) MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); @@ -689,13 +692,14 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) BYTE ch[4]; WCHAR wch[2]; DWORD len; - DWORD cp = get_input_codepage(); + DWORD cp; switch(msg->message) { case WM_CHAR: if (!HIWORD(msg->wParam)) { + cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); ch[0] = ch[1] = 0; len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); @@ -723,6 +727,7 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) case WM_SYSCHAR: case WM_SYSDEADCHAR: case WM_MENUCHAR: + cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); wch[1] = HIWORD(msg->wParam); ch[0] = ch[1] = 0; @@ -730,6 +735,7 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) msg->wParam = MAKEWPARAM( ch[0] | (ch[1] << 8), 0 ); break; case WM_IME_CHAR: + cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); ch[0] = ch[1] = 0; len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); -- 2.30.0

2 1