March 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Add support for parsing application settings in manifests.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: fc14442970dc6b97032c3cdd76cab33d774dc1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc14442970dc6b97032c3cdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:12:52 2018 +0100 ntdll: Add support for parsing application settings in manifests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 14d71bc..f8dd3fc 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -464,6 +464,11 @@ struct entity WCHAR *clsid; WCHAR *version; } clrsurrogate; + struct + { + WCHAR *name; + WCHAR *value; + } settings; } u; }; @@ -546,6 +551,7 @@ struct actctx_loader static const WCHAR asmv1W[] = {'a','s','m','v','1',':',0}; static const WCHAR asmv2W[] = {'a','s','m','v','2',':',0}; +static const WCHAR asmv3W[] = {'a','s','m','v','3',':',0}; static const WCHAR assemblyW[] = {'a','s','s','e','m','b','l','y',0}; static const WCHAR assemblyIdentityW[] = {'a','s','s','e','m','b','l','y','I','d','e','n','t','i','t','y',0}; static const WCHAR bindingRedirectW[] = {'b','i','n','d','i','n','g','R','e','d','i','r','e','c','t',0}; @@ -635,6 +641,18 @@ static const WCHAR requestedExecutionLevelW[] = {'r','e','q','u','e','s','t','e' static const WCHAR requestedPrivilegesW[] = {'r','e','q','u','e','s','t','e','d','P','r','i','v','i','l','e','g','e','s',0}; static const WCHAR securityW[] = {'s','e','c','u','r','i','t','y',0}; static const WCHAR trustInfoW[] = {'t','r','u','s','t','I','n','f','o',0}; +static const WCHAR windowsSettingsW[] = {'w','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR autoElevateW[] = {'a','u','t','o','E','l','e','v','a','t','e',0}; +static const WCHAR disableThemingW[] = {'d','i','s','a','b','l','e','T','h','e','m','i','n','g',0}; +static const WCHAR disableWindowFilteringW[] = {'d','i','s','a','b','l','e','W','i','n','d','o','w','F','i','l','t','e','r','i','n','g',0}; +static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; +static const WCHAR dpiAwarenessW[] = {'d','p','i','A','w','a','r','e','n','e','s','s',0}; +static const WCHAR gdiScalingW[] = {'g','d','i','S','c','a','l','i','n','g',0}; +static const WCHAR highResolutionScrollingAwareW[] = {'h','i','g','h','R','e','s','o','l','u','t','i','o','n','S','c','r','o','l','l','i','n','g','A','w','a','r','e',0}; +static const WCHAR longPathAwareW[] = {'l','o','n','g','P','a','t','h','A','w','a','r','e',0}; +static const WCHAR magicFutureSettingW[] = {'m','a','g','i','c','F','u','t','u','r','e','S','e','t','t','i','n','g',0}; +static const WCHAR printerDriverIsolationW[] = {'p','r','i','n','t','e','r','D','r','i','v','e','r','I','s','o','l','a','t','i','o','n',0}; +static const WCHAR ultraHighResolutionScrollingAwareW[] = {'u','l','t','r','a','H','i','g','h','R','e','s','o','l','u','t','i','o','n','S','c','r','o','l','l','i','n','g','A','w','a','r','e',0}; struct olemisc_entry { @@ -899,6 +917,10 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.clsid); RtlFreeHeap(GetProcessHeap(), 0, entity->u.clrsurrogate.version); break; + case ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS: + RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.value); + break; default: FIXME("Unknown entity kind %d\n", entity->kind); } @@ -2337,6 +2359,107 @@ static BOOL parse_compatibility_elem(xmlbuf_t* xmlbuf, struct assembly* assembly return ret; } +static BOOL parse_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl, + xmlstr_t *parent ) +{ + xmlstr_t elem, content, attr_name, attr_value; + BOOL end = FALSE, ret = TRUE, error = FALSE; + struct entity *entity; + + while (next_xml_attr( xmlbuf, &attr_name, &attr_value, &error, &end )) + { + if (xmlstr_cmp( &attr_name, xmlnsW )) continue; + WARN( "unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value) ); + } + + if (error) return FALSE; + if (end) return TRUE; + + if (!parse_text_content( xmlbuf, &content )) return FALSE; + TRACE( "got %s %s\n", debugstr_xmlstr(parent), debugstr_xmlstr(&content) ); + + entity = add_entity( &assembly->entities, ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS ); + if (!entity) return FALSE; + entity->u.settings.name = xmlstrdupW( parent ); + entity->u.settings.value = xmlstrdupW( &content ); + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end( &elem, entity->u.settings.name )) + { + ret = parse_end_element( xmlbuf ); + break; + } + else + { + WARN( "unknown elem %s\n", debugstr_xmlstr(&elem) ); + ret = parse_unknown_elem( xmlbuf, &elem ); + } + } + return ret; +} + +static BOOL parse_windows_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl ) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem( xmlbuf, &elem ))) + { + if (xmlstr_cmp_end( &elem, windowsSettingsW )) + { + ret = parse_end_element( xmlbuf ); + break; + } + else if (xmlstr_cmp( &elem, autoElevateW ) || + xmlstr_cmp( &elem, disableThemingW ) || + xmlstr_cmp( &elem, disableWindowFilteringW ) || + xmlstr_cmp( &elem, dpiAwareW ) || + xmlstr_cmp( &elem, dpiAwarenessW ) || + xmlstr_cmp( &elem, gdiScalingW ) || + xmlstr_cmp( &elem, highResolutionScrollingAwareW ) || + xmlstr_cmp( &elem, longPathAwareW ) || + xmlstr_cmp( &elem, magicFutureSettingW ) || + xmlstr_cmp( &elem, printerDriverIsolationW ) || + xmlstr_cmp( &elem, ultraHighResolutionScrollingAwareW )) + { + ret = parse_settings_elem( xmlbuf, assembly, acl, &elem ); + } + else + { + WARN( "unknown elem %s\n", debugstr_xmlstr(&elem) ); + ret = parse_unknown_elem( xmlbuf, &elem ); + } + } + return ret; +} + +static BOOL parse_application_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t elem; + BOOL ret = TRUE; + + while (ret && (ret = next_xml_elem( xmlbuf, &elem ))) + { + if (xmlstr_cmp_end( &elem, applicationW )) + { + ret = parse_end_element( xmlbuf ); + break; + } + else if (xmlstr_cmp( &elem, windowsSettingsW )) + { + ret = parse_windows_settings_elem( xmlbuf, assembly, acl ); + } + else + { + WARN( "unknown elem %s\n", debugstr_xmlstr(&elem) ); + ret = parse_unknown_elem( xmlbuf, &elem ); + } + } + return ret; +} + static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) { static const WCHAR levelW[] = {'l','e','v','e','l',0}; @@ -2598,6 +2721,10 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_compatibility_elem(xmlbuf, assembly, acl); } + else if (xml_elem_cmp(&elem, applicationW, asmv3W)) + { + ret = parse_application_elem(xmlbuf, assembly, acl); + } else { WARN("unknown element %s\n", debugstr_xmlstr(&elem)); diff --git a/include/winnt.h b/include/winnt.h index 3c19af9..16d96d8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5807,6 +5807,8 @@ typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { #define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7 #define ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE 8 #define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 +#define ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS 10 +#define ACTIVATION_CONTEXT_SECTION_COMPATIBILITY_INFO 11 typedef enum _JOBOBJECTINFOCLASS {

1 0

Henri Verbeet : wined3d: Use upper-case enum elements in the projection_types enum.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: 06a4f978acf8448bf5ada07494be06601ac8deb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06a4f978acf8448bf5ada074… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 23 15:32:30 2018 +0430 wined3d: Use upper-case enum elements in the projection_types enum. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 48 ++++++++++++++++++++++++++------------ dlls/wined3d/ati_fragment_shader.c | 18 ++++++-------- dlls/wined3d/glsl_shader.c | 14 +++++------ dlls/wined3d/utils.c | 10 ++++---- dlls/wined3d/wined3d_private.h | 8 +++---- 5 files changed, 56 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06a4f978acf8448bf5ad…

1 0

Henri Verbeet : wined3d: Use upper-case enum elements in the vertexprocessing_mode enum.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: 9cdc8876b00e5c2b5d1a1b478339ffea9b1ff948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cdc8876b00e5c2b5d1a1b47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 23 15:32:29 2018 +0430 wined3d: Use upper-case enum elements in the vertexprocessing_mode enum. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 125 ++++++++++++++++++-------------------- dlls/wined3d/glsl_shader.c | 10 +-- dlls/wined3d/shader.c | 8 +-- dlls/wined3d/wined3d_private.h | 11 ++-- 4 files changed, 75 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cdc8876b00e5c2b5d1a…

1 0

Alexandre Julliard : ntdll: Implement RtlQueryActivationContextApplicationSettings.
by Alexandre Julliard March 24, 2018

March 24, 2018

Module: wine Branch: master Commit: 14b9a5af0b44d7e2ca5232ad810c77e561d5d30c URL: https://source.winehq.org/git/wine.git/?a=commit;h=14b9a5af0b44d7e2ca5232ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:13:31 2018 +0100 ntdll: Implement RtlQueryActivationContextApplicationSettings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 3 files changed, 55 insertions(+) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f8dd3fc..4dc0c98 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4891,6 +4891,24 @@ static NTSTATUS find_guid(ACTIVATION_CONTEXT* actctx, ULONG section_kind, return STATUS_SUCCESS; } +static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR *settings ) +{ + unsigned int i, j; + + for (i = 0; i < actctx->num_assemblies; i++) + { + struct assembly *assembly = &actctx->assemblies[i]; + for (j = 0; j < assembly->entities.num; j++) + { + struct entity *entity = &assembly->entities.base[j]; + if (entity->kind == ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS && + !strcmpW( entity->u.settings.name, settings )) + return entity->u.settings.value; + } + } + return NULL; +} + /* initialize the activation context for the current process */ void actctx_init(void) { @@ -5524,3 +5542,38 @@ NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *ex return status; } + + +/*********************************************************************** + * RtlQueryActivationContextApplicationSettings (NTDLL.@) + */ +NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDLE handle, const WCHAR *ns, + const WCHAR *settings, WCHAR *buffer, + SIZE_T size, SIZE_T *written ) +{ + static const WCHAR namespaceW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0',0}; + ACTIVATION_CONTEXT *actctx = check_actctx( handle ); + const WCHAR *res; + + if (flags) + { + WARN( "unknown flags %08x\n", flags ); + return STATUS_INVALID_PARAMETER; + } + + if (ns && strncmpW( ns, namespaceW, strlenW(namespaceW) )) + { + WARN( "unknown namespace %s\n", debugstr_w(ns) ); + return STATUS_INVALID_PARAMETER; + } + + if (!handle) handle = process_actctx; + if (!(actctx = check_actctx( handle ))) return STATUS_INVALID_PARAMETER; + + if (!(res = find_app_settings( actctx, settings ))) return STATUS_SXS_KEY_NOT_FOUND; + + if (written) *written = strlenW(res) + 1; + if (size < strlenW(res)) return STATUS_BUFFER_TOO_SMALL; + strcpyW( buffer, res ); + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 04e108c..0107932 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -803,6 +803,7 @@ @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap @ stdcall RtlPushFrame(ptr) +@ stdcall RtlQueryActivationContextApplicationSettings(long ptr wstr wstr ptr long ptr) @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) diff --git a/include/winternl.h b/include/winternl.h index f01344c..ed54229 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2694,6 +2694,7 @@ NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); +NTSYSAPI NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlQueryDynamicTimeZoneInformation(RTL_DYNAMIC_TIME_ZONE_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING);

1 0

Francois Gouget : testbot: Standardize on push to append to an array.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: tools Branch: master Commit: e377b8d508144f057a2e6111fc85e125c564948c URL: https://source.winehq.org/git/tools.git/?a=commit;h=e377b8d508144f057a2e611… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 23 01:19:15 2018 +0100 testbot: Standardize on push to append to an array. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 +++--- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/lib/ObjectModel/CGI/ItemPage.pm | 3 +-- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 +++++----- testbot/lib/ObjectModel/Item.pm | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a03fa06..f39ec5f 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -813,9 +813,9 @@ sub main() { if (PrepareSocket($NewClientSocket)) { - $Clients[@Clients] = {Socket => $NewClientSocket, - InBuf => "", - OutBuf => ""}; + push @Clients, {Socket => $NewClientSocket, + InBuf => "", + OutBuf => ""}; } else { diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ec9a587..2a89427 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -106,13 +106,13 @@ sub ReadLog($$$) { if ($Line =~ m/${BaseName}:${TestSet} done $258$/) { - $Messages[@Messages] = "The test timed out"; + push @Messages, "The test timed out"; } $Found = 1; } else { - $Messages[@Messages] = $Line; + push @Messages, $Line; } } } diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 5723554..ca2c6d3 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -373,7 +373,7 @@ sub GetActions($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - $Actions[@Actions] = 'Cancel'; + push @Actions, "Cancel"; } return \@Actions; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 74ce14e..4086a93 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -116,8 +116,7 @@ sub GetActions($) my ($self) = @_; my @Actions = @{$self->SUPER::GetActions()}; - $Actions[@Actions] = "OK"; - $Actions[@Actions] = "Cancel"; + push @Actions, "OK", "Cancel"; return \@Actions; } diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 60e68d8..a508f66 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -385,8 +385,8 @@ sub GetInsertData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $self->ToDb($Item->GetColValue($ColName), - $PropertyDescriptor); + push @Data, $self->ToDb($Item->GetColValue($ColName), + $PropertyDescriptor); } } @@ -434,8 +434,8 @@ sub GetUpdateData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $self->ToDb($Item->GetColValue($ColName), - $PropertyDescriptor); + push @Data, $self->ToDb($Item->GetColValue($ColName), + $PropertyDescriptor); } } } @@ -451,7 +451,7 @@ sub GetUpdateData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Data[@Data] = $Item->GetColValue($ColName); + push @Data, $Item->GetColValue($ColName); } } } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index e90ebbe..424826f 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -386,7 +386,7 @@ sub GetKeyComponents($) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $KeyComponents[@KeyComponents] = $self->{ColValues}{$ColName}; + push @KeyComponents, $self->{ColValues}{$ColName}; } } }

1 0

Francois Gouget : testbot: Standardize some pushes.
by Alexandre Julliard March 23, 2018

March 23, 2018

Module: tools Branch: master Commit: f318eb5bd4c16c4cc833333d1c66836486e487ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=f318eb5bd4c16c4cc833333… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 23 01:19:18 2018 +0100 testbot: Standardize some pushes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 16 ++++++++-------- testbot/web/Feedback.pl | 2 +- testbot/web/ForgotPassword.pl | 2 +- testbot/web/Login.pl | 2 +- testbot/web/ResetPassword.pl | 2 +- testbot/web/Submit.pl | 8 ++++---- testbot/web/admin/Log.pl | 2 +- testbot/web/admin/UserDetails.pl | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index a508f66..0016e19 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -198,7 +198,7 @@ sub LoadCollection($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } my $Filters = $Collection->GetFilters(); @@ -299,11 +299,11 @@ sub LoadItem($$$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), "", $Where); - push(@Data, $Collection->SplitKey($RequestedKey)); + push @Data, $Collection->SplitKey($RequestedKey); my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); if ($Where ne "") @@ -378,7 +378,7 @@ sub GetInsertData($$$) my @Data; if (defined($MasterColValues)) { - push(@Data, @$MasterColValues); + push @Data, @$MasterColValues; } foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -442,7 +442,7 @@ sub GetUpdateData($$$) if (defined($MasterColValues)) { - push(@Data, @$MasterColValues); + push @Data, @$MasterColValues; } foreach my $PropertyDescriptor (@{$Item->GetPropertyDescriptors()}) @@ -550,11 +550,11 @@ sub DeleteItem($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), "", $Where); - push(@Data, $Item->GetKeyComponents()); + push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " . $Item->GetTableName() . @@ -575,7 +575,7 @@ sub DeleteAll($$) if (defined($MasterColNames)) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; - push(@Data, @{$MasterColValues}); + push @Data, @{$MasterColValues}; } my $Query = "DELETE FROM " . $Collection->GetTableName(); diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index ded705a..2480243 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -68,7 +68,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Send"); + push @$Actions, "Send"; return $Actions; } diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index c6240e7..3c94c27 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -61,7 +61,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Reset password"); + push @$Actions, "Reset password"; return $Actions; } diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index f17d60e..b5b6365 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -89,7 +89,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Log in"); + push @$Actions, "Log in"; return $Actions; } diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 431a4da..db129db 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -75,7 +75,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Change password"); + push @$Actions, "Change password"; return $Actions; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 875384e..9bf1781 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -358,19 +358,19 @@ sub GetActions($) my $Actions = $self->SUPER::GetActions(); if ($self->{Page} == 1) { - push(@$Actions, "Next >"); + push @$Actions, "Next >"; } elsif ($self->{Page} == 2) { - push(@$Actions, "< Prev", "Next >"); + push @$Actions, "< Prev", "Next >"; } elsif ($self->{Page} == 3) { - push(@$Actions, "< Prev", "Submit"); + push @$Actions, "< Prev", "Submit"; } elsif ($self->{Page} == 4) { - push(@$Actions, "OK"); + push @$Actions, "OK"; } return $Actions; diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index b9754bd..3ad35a4 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -59,7 +59,7 @@ sub GetActions($) my ($self) = @_; my $Actions = $self->SUPER::GetActions(); - push(@$Actions, "Download"); + push @$Actions, "Download"; return $Actions; } diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index d24e675..28eb4b5 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -61,7 +61,7 @@ sub GetActions($) push @Actions, "Reject" if ($self->{Item}->Name); } - push(@Actions, @{$self->SUPER::GetActions()}); + push @Actions, @{$self->SUPER::GetActions()}; return \@Actions; }

1 0

Matteo Bruni : d3dx9: Disentangle ID3DXEffectCompiler implementation from struct d3dx9_base_effect.
by Alexandre Julliard March 22, 2018

March 22, 2018

Module: wine Branch: master Commit: afef57f872433bcd3032c2ccbc0453bef5b62178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afef57f872433bcd3032c2cc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:08 2018 +0100 d3dx9: Disentangle ID3DXEffectCompiler implementation from struct d3dx9_base_effect. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 365 ++++++++++++++----------------------------- dlls/d3dx9_36/tests/effect.c | 2 +- 2 files changed, 117 insertions(+), 250 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afef57f872433bcd3032…

1 0

Piotr Caban : msvcrt/tests: Add _strupr tests.
by Alexandre Julliard March 22, 2018

March 22, 2018

Module: wine Branch: master Commit: 9a7cb34d0fa72f2a024dd32326fd22cd1784372c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a7cb34d0fa72f2a024dd323… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 22 18:51:56 2018 +0100 msvcrt/tests: Add _strupr tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b270366..2e963dc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3346,6 +3346,49 @@ static void test__memicmp_l(void) ok(errno == 0xdeadbeef, "errno is %d, expected 0xdeadbeef\n", errno); } +static void test__strupr(void) +{ + const char str[] = "123"; + char str2[4]; + char *mem, *p; + DWORD prot; + + mem = VirtualAlloc(NULL, sizeof(str), MEM_COMMIT, PAGE_READWRITE); + ok(mem != NULL, "VirtualAlloc failed\n"); + memcpy(mem, str, sizeof(str)); + ok(VirtualProtect(mem, sizeof(str), PAGE_READONLY, &prot), "VirtualProtect failed\n"); + + strcpy(str2, "aBc"); + p = _strupr(str2); + ok(p == str2, "_strupr returned %p\n", p); + ok(!strcmp(str2, "ABC"), "str2 = %s\n", str2); + + p = _strupr(mem); + ok(p == mem, "_strupr returned %p\n", p); + ok(!strcmp(mem, "123"), "mem = %s\n", mem); + + if(!setlocale(LC_ALL, "english")) { + VirtualFree(mem, sizeof(str), MEM_RELEASE); + win_skip("English locale _strupr tests\n"); + return; + } + + strcpy(str2, "aBc"); + p = _strupr(str2); + ok(p == str2, "_strupr returned %p\n", p); + ok(!strcmp(str2, "ABC"), "str2 = %s\n", str2); + + if (0) /* crashes on Windows */ + { + p = _strupr(mem); + ok(p == mem, "_strupr returned %p\n", p); + ok(!strcmp(mem, "123"), "mem = %s\n", mem); + } + + setlocale(LC_ALL, "C"); + VirtualFree(mem, sizeof(str), MEM_RELEASE); +} + START_TEST(string) { char mem[100]; @@ -3468,4 +3511,5 @@ START_TEST(string) test__ismbclx(); test__memicmp(); test__memicmp_l(); + test__strupr(); }

1 0

Matteo Bruni : d3dx9: Implement FindNextValidTechnique().
by Alexandre Julliard March 22, 2018

March 22, 2018

Module: wine Branch: master Commit: c3342644e418358e63273580f46cce2d05de9e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3342644e418358e63273580… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:06 2018 +0100 d3dx9: Implement FindNextValidTechnique(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7675f17..1e91a7b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4038,13 +4038,45 @@ done: return ret; } -static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, D3DXHANDLE technique, D3DXHANDLE* next_technique) +static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, + D3DXHANDLE technique, D3DXHANDLE *next_technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_base_effect *base = &effect->base_effect; + struct d3dx_technique *prev_tech, *tech; + unsigned int i; - FIXME("(%p)->(%p, %p): stub\n", This, technique, next_technique); + TRACE("iface %p, technique %p, next_technique %p.\n", iface, technique, next_technique); - return E_NOTIMPL; + if (technique) + { + if (!(prev_tech = get_valid_technique(base, technique))) + return D3DERR_INVALIDCALL; + + for (i = 0; i < base->technique_count; ++i) + { + tech = &base->techniques[i]; + if (tech == prev_tech) + break; + } + } + else + { + i = 0; + } + + for (++i; i < base->technique_count; ++i) + { + tech = &base->techniques[i]; + if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) + { + *next_technique = get_technique_handle(tech); + return D3D_OK; + } + } + + *next_technique = get_technique_handle(&base->techniques[0]); + return S_FALSE; } static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,

1 0

Piotr Caban : msvcrt: Optimize _strupr implementation in C locale.
by Alexandre Julliard March 22, 2018

March 22, 2018

Module: wine Branch: master Commit: 52415cabb078bac172d21c1a41dc81520eeca1f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52415cabb078bac172d21c1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 22 18:51:50 2018 +0100 msvcrt: Optimize _strupr implementation in C locale. Don't write to input buffer when there's nothing to change. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 2c05e37..d70f235 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -117,6 +117,7 @@ char* CDECL MSVCRT__strlwr(char *str) */ int CDECL MSVCRT__strupr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) { + MSVCRT_pthreadlocinfo locinfo; char *ptr = str; if (!str || !len) @@ -138,10 +139,27 @@ int CDECL MSVCRT__strupr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t loca return MSVCRT_EINVAL; } - while (*str) + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { - *str = MSVCRT__toupper_l((unsigned char)*str, locale); - str++; + while (*str) + { + if (*str >= 'a' && *str <= 'z') + *str -= 'a' - 'A'; + str++; + } + } + else + { + while (*str) + { + *str = MSVCRT__toupper_l((unsigned char)*str, locale); + str++; + } } return 0;

1 0