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

Alexandre Julliard : kernel32: Implement QueryActCtxSettingsW.
by Alexandre Julliard 24 Mar '18

24 Mar '18

Module: wine Branch: master Commit: ff8471eb070179a093a9c57ecff9ee2c184206ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8471eb070179a093a9c57e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:14:12 2018 +0100 kernel32: Implement QueryActCtxSettingsW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/actctx.c | 17 +++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/winbase.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 2eb1c2a..17067ed 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -309,3 +309,20 @@ BOOL WINAPI QueryActCtxW(DWORD dwFlags, HANDLE hActCtx, PVOID pvSubInst, } return TRUE; } + +/*********************************************************************** + * QueryActCtxSettingsW (KERNEL32.@) + */ +BOOL WINAPI QueryActCtxSettingsW( DWORD flags, HANDLE ctx, const WCHAR *ns, const WCHAR *settings, + WCHAR *buffer, SIZE_T size, SIZE_T *written ) +{ + NTSTATUS status; + + if ((status = RtlQueryActivationContextApplicationSettings( flags, ctx, ns, settings, + buffer, size, written ))) + { + SetLastError( RtlNtStatusToDosError( status )); + return FALSE; + } + return TRUE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index aae22eb..445b84f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1155,7 +1155,7 @@ @ stdcall PulseEvent(long) @ stdcall PurgeComm(long long) @ stdcall -i386 -private -norelay QT_Thunk() krnl386.exe16.QT_Thunk -# @ stub QueryActCtxSettingsW +@ stdcall QueryActCtxSettingsW(long ptr wstr wstr ptr long ptr) @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) diff --git a/include/winbase.h b/include/winbase.h index c99993a..e31ebca 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2475,6 +2475,7 @@ WINADVAPI BOOL WINAPI PrivilegedServiceAuditAlarmW(LPCWSTR,LPCWSTR,HANDL #define PrivilegedServiceAuditAlarm WINELIB_NAME_AW(PrivilegedServiceAuditAlarm) WINBASEAPI BOOL WINAPI PulseEvent(HANDLE); WINBASEAPI BOOL WINAPI PurgeComm(HANDLE,DWORD); +WINBASEAPI BOOL WINAPI QueryActCtxSettingsW(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); WINBASEAPI BOOL WINAPI QueryActCtxW(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T *); WINBASEAPI USHORT WINAPI QueryDepthSList(PSLIST_HEADER); WINBASEAPI DWORD WINAPI QueryDosDeviceA(LPCSTR,LPSTR,DWORD);

1 0

Alexandre Julliard : kernel32/tests: Add tests for QueryActCtxSettingsW.
by Alexandre Julliard 24 Mar '18

24 Mar '18

Module: wine Branch: master Commit: 678c5544c15352411dfdb5c717834724f21d8c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=678c5544c15352411dfdb5c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 23 09:14:21 2018 +0100 kernel32/tests: Add tests for QueryActCtxSettingsW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9aa081f..b63abac 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWS static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); +static BOOL (WINAPI *pQueryActCtxSettingsW)(DWORD,HANDLE,LPCWSTR,LPCWSTR,LPWSTR,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); static BOOL (WINAPI *pZombifyActCtx)(HANDLE); @@ -457,6 +458,16 @@ static const char compat_manifest_other_guid[] = " </compatibility>" "</assembly>"; +static const char settings_manifest[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <application xmlns=\"urn:schemas-microsoft-com:asm.v3\">" +" <windowsSettings>" +" <dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">true</dpiAware>" +" </windowsSettings>" +" </application>" +"</assembly>"; + DEFINE_GUID(VISTA_COMPAT_GUID, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); DEFINE_GUID(WIN7_COMPAT_GUID, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); DEFINE_GUID(WIN8_COMPAT_GUID, 0x4a2f28e3, 0x53b9, 0x4441, 0xba, 0x9c, 0xd6, 0x9d, 0x4a, 0x4a, 0x6e, 0x38); @@ -2695,6 +2706,7 @@ static BOOL init_funcs(void) X(ReleaseActCtx); X(FindActCtxSectionGuid); X(ZombifyActCtx); + pQueryActCtxSettingsW = (void *)GetProcAddress( hLibrary, "QueryActCtxSettingsW" ); hLibrary = GetModuleHandleA("ntdll.dll"); X(RtlFindActivationContextSectionString); @@ -2949,6 +2961,81 @@ static void test_compatibility(void) } } +static void test_settings(void) +{ + static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + 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','5','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; + WCHAR buffer[80]; + SIZE_T size; + HANDLE handle; + BOOL ret; + + if (!pQueryActCtxSettingsW) + { + win_skip( "QueryActCtxSettingsW is missing\n" ); + return; + } + create_manifest_file( "manifest_settings.manifest", settings_manifest, -1, NULL, NULL ); + handle = test_create("manifest_settings.manifest"); + ok( handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError() ); + DeleteFileA( "manifest_settings.manifest" ); + + SetLastError( 0xdeadbeef ); + ret = pQueryActCtxSettingsW( 1, handle, NULL, dpiAwareW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pQueryActCtxSettingsW( 0, handle, dummyW, dpiAwareW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, 80, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == lstrlenW( buffer ) + 1, "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dummyW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespaceW, dpiAwareW, buffer, 80, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespaceW, dpiAwareW, buffer, lstrlenW(trueW) + 1, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW), &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW) - 1, &size ); + ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + pReleaseActCtx(handle); +} + START_TEST(actctx) { int argc; @@ -2975,4 +3062,5 @@ START_TEST(actctx) test_ZombifyActCtx(); run_child_process(); test_compatibility(); + test_settings(); }

1 0

Henri Verbeet : wined3d: Use upper-case enum elements in the vertexprocessing_mode enum.
by Alexandre Julliard 24 Mar '18

24 Mar '18

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

Henri Verbeet : wined3d: Use upper-case enum elements in the projection_types enum.
by Alexandre Julliard 24 Mar '18

24 Mar '18

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

Francois Gouget : testbot: Standardize on push to append to an array.
by Alexandre Julliard 23 Mar '18

23 Mar '18

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 23 Mar '18

23 Mar '18

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

Hans Leidekker : windowscodecs: Implement WICCreateBitmapFromSectionEx.
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: 1184f9d969c247b455df34d4955f3b8789cb5afa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1184f9d969c247b455df34d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 21 10:28:27 2018 +0100 windowscodecs: Implement WICCreateBitmapFromSectionEx. Based on a patch by Dmitry Timoshkov. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bitmap.c | 22 +++++--- dlls/windowscodecs/imgfactory.c | 95 ++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/bitmap.c | 60 +++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 +- dlls/windowscodecs/windowscodecs.spec | 3 +- include/wincodec.idl | 8 +++ 6 files changed, 175 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1184f9d969c247b455df…

1 0

Piotr Caban : msvcrt: Optimize _strupr implementation in C locale.
by Alexandre Julliard 22 Mar '18

22 Mar '18

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

Piotr Caban : msvcrt/tests: Add _strupr tests.
by Alexandre Julliard 22 Mar '18

22 Mar '18

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: Fix handling of includes in D3DXCreateEffectFromFileExW().
by Alexandre Julliard 22 Mar '18

22 Mar '18

Module: wine Branch: master Commit: f5b888a708544e8f4c6583d76e4d51d64626da44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5b888a708544e8f4c6583d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:04 2018 +0100 d3dx9: Fix handling of includes in D3DXCreateEffectFromFileExW(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 8 ++++++++ dlls/d3dx9_36/effect.c | 37 ++++++++++++++++++++++++++++++------- dlls/d3dx9_36/shader.c | 38 +++++++++++++++++--------------------- 3 files changed, 55 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 2044b2a..6cc1126 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -69,6 +69,14 @@ struct pixel_format_desc { void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette); }; +struct d3dx_include_from_file +{ + ID3DXInclude ID3DXInclude_iface; +}; + +extern CRITICAL_SECTION from_file_mutex DECLSPEC_HIDDEN; +extern const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl DECLSPEC_HIDDEN; + static inline BOOL is_conversion_from_supported(const struct pixel_format_desc *format) { if (format->type == FORMAT_ARGB || format->type == FORMAT_ARGBF16 diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 33e0fc4..7675f17 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6664,8 +6664,10 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, #endif unsigned int i, j; - TRACE("base %p, data %p, data_size %lu, effect %p, pool %p, skip_constants %s.\n", - base, data, data_size, effect, pool, debugstr_a(skip_constants_string)); + TRACE("base %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " + "effect %p, pool %p, skip_constants %s.\n", + base, data, data_size, defines, include, eflags, errors, effect, pool, + debugstr_a(skip_constants_string)); base->effect = effect; base->pool = pool; @@ -7041,9 +7043,11 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(struct IDirect3DDevice9 *device, cons const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors) { - void *buffer; + struct d3dx_include_from_file include_from_file; + const void *buffer; + unsigned int size; + char *filename_a; HRESULT ret; - DWORD size; TRACE("device %p, srcfile %s, defines %p, include %p, skipconstants %s, " "flags %#x, pool %p, effect %p, compilationerrors %p.\n", @@ -7053,14 +7057,33 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(struct IDirect3DDevice9 *device, cons if (!device || !srcfile) return D3DERR_INVALIDCALL; - ret = map_view_of_file(srcfile, &buffer, &size); + if (!include) + { + include_from_file.ID3DXInclude_iface.lpVtbl = &d3dx_include_from_file_vtbl; + include = &include_from_file.ID3DXInclude_iface; + } + size = WideCharToMultiByte(CP_ACP, 0, srcfile, -1, NULL, 0, NULL, NULL); + filename_a = heap_alloc(size); + if (!filename_a) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, srcfile, -1, filename_a, size, NULL, NULL); + + EnterCriticalSection(&from_file_mutex); + ret = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &size); if (FAILED(ret)) + { + LeaveCriticalSection(&from_file_mutex); + heap_free(filename_a); return D3DXERR_INVALIDDATA; + } - ret = D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors); - UnmapViewOfFile(buffer); + ret = D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, + effect, compilationerrors); + ID3DXInclude_Close(include, buffer); + LeaveCriticalSection(&from_file_mutex); + heap_free(filename_a); return ret; } diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index f372494..acbbf07 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -214,7 +214,6 @@ HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMAC static const void *main_file_data; -static CRITICAL_SECTION from_file_mutex; static CRITICAL_SECTION_DEBUG from_file_mutex_debug = { 0, 0, &from_file_mutex, @@ -224,14 +223,14 @@ static CRITICAL_SECTION_DEBUG from_file_mutex_debug = }, 0, 0, {(DWORD_PTR)(__FILE__ ": from_file_mutex")} }; -static CRITICAL_SECTION from_file_mutex = {&from_file_mutex_debug, -1, 0, 0, 0, 0}; +CRITICAL_SECTION from_file_mutex = {&from_file_mutex_debug, -1, 0, 0, 0, 0}; /* D3DXInclude private implementation, used to implement * D3DXAssembleShaderFromFile() from D3DXAssembleShader(). */ /* To be able to correctly resolve include search paths we have to store the * pathname of each include file. We store the pathname pointer right before * the file data. */ -static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE include_type, +static HRESULT WINAPI d3dx_include_from_file_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE include_type, const char *filename, const void *parent_data, const void **data, UINT *bytes) { const char *p, *parent_name = ""; @@ -250,7 +249,7 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T parent_name = *((const char **)main_file_data - 1); } - TRACE("Looking up for include file %s, parent %s\n", debugstr_a(filename), debugstr_a(parent_name)); + TRACE("Looking up include file %s, parent %s.\n", debugstr_a(filename), debugstr_a(parent_name)); if ((p = strrchr(parent_name, '\\'))) ++p; @@ -301,7 +300,7 @@ error: return HRESULT_FROM_WIN32(GetLastError()); } -static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, const void *data) +static HRESULT WINAPI d3dx_include_from_file_close(ID3DXInclude *iface, const void *data) { HeapFree(GetProcessHeap(), 0, *((char **)data - 1)); HeapFree(GetProcessHeap(), 0, (char **)data - 1); @@ -310,13 +309,10 @@ static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, const void * return S_OK; } -static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = { - d3dincludefromfile_open, - d3dincludefromfile_close -}; - -struct D3DXIncludeImpl { - ID3DXInclude ID3DXInclude_iface; +const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl = +{ + d3dx_include_from_file_open, + d3dx_include_from_file_close }; HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines, @@ -348,7 +344,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR const void *buffer; DWORD len; HRESULT hr; - struct D3DXIncludeImpl includefromfile; + struct d3dx_include_from_file include_from_file; char *filename_a; TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", @@ -356,8 +352,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR if(!include) { - includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; - include = &includefromfile.ID3DXInclude_iface; + include_from_file.ID3DXInclude_iface.lpVtbl = &d3dx_include_from_file_vtbl; + include = &include_from_file.ID3DXInclude_iface; } len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); @@ -481,7 +477,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO const void *buffer; DWORD len, filename_len; HRESULT hr; - struct D3DXIncludeImpl includefromfile; + struct d3dx_include_from_file include_from_file; char *filename_a; TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, " @@ -491,8 +487,8 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO if (!include) { - includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; - include = &includefromfile.ID3DXInclude_iface; + include_from_file.ID3DXInclude_iface.lpVtbl = &d3dx_include_from_file_vtbl; + include = &include_from_file.ID3DXInclude_iface; } filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); @@ -606,7 +602,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA const void *buffer; DWORD len; HRESULT hr; - struct D3DXIncludeImpl includefromfile; + struct d3dx_include_from_file include_from_file; char *filename_a; TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", @@ -614,8 +610,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA if (!include) { - includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; - include = &includefromfile.ID3DXInclude_iface; + include_from_file.ID3DXInclude_iface.lpVtbl = &d3dx_include_from_file_vtbl; + include = &include_from_file.ID3DXInclude_iface; } len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL);

1 0