July 2014 - Wine-Commits - list.winehq.org

Francois Gouget : testbot: Don' t let the scripts blindly overwrite the VM status.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: tools Branch: master Commit: b1653d3e85f37e711be0e5232e81f063c0d8c7df URL: http://source.winehq.org/git/tools.git/?a=commit;h=b1653d3e85f37e711be0e523… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 25 11:23:53 2014 +0200 testbot: Don't let the scripts blindly overwrite the VM status. This makes it possible for the administrator to step in and mark a VM for maintenance while a script is using it. --- testbot/bin/RevertVM.pl | 19 +++++++++++++++---- testbot/bin/WineRunBuild.pl | 21 ++++++++++++--------- testbot/bin/WineRunReconfig.pl | 26 ++++++++++++-------------- testbot/bin/WineRunTask.pl | 29 +++++++++++++++++------------ 4 files changed, 56 insertions(+), 39 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 3712c4d..17eb800 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -48,11 +48,16 @@ sub FatalError($$) LogMsg $ErrMessage, "\n"; - $VM->Status("offline"); - $VM->ChildPid(undef); - $VM->Save(); - + # Get the up-to-date VM status and update it if nobody else changed it my $VMKey = $VM->GetKey(); + $VM = CreateVMs()->GetItem($VMKey); + if ($VM->Status eq "reverting" or $VM->Status eq "sleeping") + { + $VM->Status("offline"); + $VM->ChildPid(undef); + $VM->Save(); + } + my $VMSnapshot = $VM->IdleSnapshot; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; @@ -110,6 +115,9 @@ if (defined($ErrMessage)) $VM; } +# Get the up-to-date VM status and exit if someone else changed it +$VM = CreateVMs()->GetItem($VMKey); +exit 1 if ($VM->Status ne "reverting"); $VM->Status("sleeping"); ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -134,6 +142,9 @@ if ($SleepAfterRevert != 0) sleep($SleepAfterRevert); } +# Get the up-to-date VM status and exit if someone else changed it +$VM = CreateVMs()->GetItem($VMKey); +exit 1 if ($VM->Status ne "sleeping"); $VM->Status("idle"); $VM->ChildPid(undef); ($ErrProperty, $ErrMessage) = $VM->Save(); diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b07454b..8f1defa 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -39,6 +39,7 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::Engine::Notify; @@ -69,14 +70,15 @@ sub FatalError($$$$) $Task->Save(); $Job->UpdateStatus(); - my $VM = $Task->VM; + # Get the up-to-date VM status and update it if nobody else changed it + my $VM = CreateVMs()->GetItem($Task->VM->GetKey()); if ($VM->Status eq 'running') { $VM->Status('dirty'); $VM->Save(); + RescheduleJobs(); } - RescheduleJobs(); exit 1; } @@ -326,14 +328,15 @@ $Task->ChildPid(undef); $Task->Ended(time); $Task->Save(); $Job->UpdateStatus(); -$VM->Status('dirty'); -$VM->Save(); - -$Task = undef; -$Step = undef; -$Job = undef; -RescheduleJobs(); +# Get the up-to-date VM status and update it if nobody else changed it +$VM = CreateVMs()->GetItem($VM->GetKey()); +if ($VM->Status eq 'running') +{ + $VM->Status('dirty'); + $VM->Save(); + RescheduleJobs(); +} LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 555f4e4..c898a52 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -39,6 +39,7 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::Engine::Notify; @@ -69,14 +70,15 @@ sub FatalError($$$$) $Task->Save(); $Job->UpdateStatus(); - my $VM = $Task->VM; + # Get the up-to-date VM status and update it if nobody else changed it + my $VM = CreateVMs()->GetItem($Task->VM->GetKey()); if ($VM->Status eq 'running') { $VM->Status('dirty'); $VM->Save(); + RescheduleJobs(); } - RescheduleJobs(); exit 1; } @@ -272,12 +274,6 @@ if ($NewStatus eq "completed") FatalError "Can't take snapshot: $ErrMessage\n", $FullErrFileName, $Job, $Task; } - - $VM->Status("idle"); -} -else -{ - $VM->Status("dirty"); } $Task->Status($NewStatus); @@ -285,13 +281,15 @@ $Task->ChildPid(undef); $Task->Ended(time); $Task->Save(); $Job->UpdateStatus(); -$VM->Save(); -$Task = undef; -$Step = undef; -$Job = undef; - -RescheduleJobs(); +# Get the up-to-date VM status and update it if nobody else changed it +$VM = CreateVMs()->GetItem($VM->GetKey()); +if ($VM->Status eq 'running') +{ + $VM->Status($NewStatus eq 'completed' ? 'idle' : 'dirty'); + $VM->Save(); + RescheduleJobs(); +} LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 86073e6..353b9b4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -38,6 +38,7 @@ sub BEGIN use POSIX qw(:fcntl_h); use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::Engine::Notify; @@ -80,11 +81,15 @@ sub FatalError($$$$$) $Task->Save(); $Job->UpdateStatus(); - my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + # Get the up-to-date VM status and update it if nobody else changed it + my $VM = CreateVMs()->GetItem($Task->VM->GetKey()); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + RescheduleJobs(); + } - RescheduleJobs(); exit 1; } @@ -376,14 +381,14 @@ $Task->Ended(time); $Task->Save(); $Job->UpdateStatus(); -$VM->Status('dirty'); -$VM->Save(); - -$Task = undef; -$Step = undef; -$Job = undef; - -RescheduleJobs(); +# Get the up-to-date VM status and update it if nobody else changed it +$VM = CreateVMs()->GetItem($VM->GetKey()); +if ($VM->Status eq 'running') +{ + $VM->Status('dirty'); + $VM->Save(); + RescheduleJobs(); +} LogMsg "Task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") completed\n"; exit 0;

1 0

Francois Gouget : winetest: Consistently use strict and warnings in the error.cgi and service.cgi scripts.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: tools Branch: master Commit: c98dfc11aedd2054ba203c3fee7250f038b9b92a URL: http://source.winehq.org/git/tools.git/?a=commit;h=c98dfc11aedd2054ba203c3f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 25 10:20:20 2014 +0200 winetest: Consistently use strict and warnings in the error.cgi and service.cgi scripts. --- winetest/error.cgi | 4 ++++ winetest/service.cgi | 26 +++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/winetest/error.cgi b/winetest/error.cgi index ea77204..4c1bc8a 100755 --- a/winetest/error.cgi +++ b/winetest/error.cgi @@ -19,6 +19,10 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # + +use strict; +use warnings; + use CGI qw(:standard); $CGI::POST_MAX = 50 * 1024; diff --git a/winetest/service.cgi b/winetest/service.cgi index 53e5f10..f9f4563 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -38,13 +38,16 @@ # <name>.cookie contains a unique identifier of a program that # winrash clients can download, must be writable +use strict; +use warnings; + use Digest::MD5; use CGI qw(:standard); $CGI::POST_MAX = 50 * 1024; -$data_root="/home/winehq/opt/winetest"; -$lynx="/usr/bin/lynx"; -(a)valid_programs=("winrash", "winetest"); +my $data_root="/home/winehq/opt/winetest"; +my $lynx="/usr/bin/lynx"; +my @valid_programs=("winrash", "winetest"); ########################################################################## @@ -67,7 +70,7 @@ sub debug($) sub md5sum($) { my ($string) = @_; - local $md5 = Digest::MD5->new; + my $md5 = Digest::MD5->new; $md5->add($string); return $md5->hexdigest; } @@ -88,7 +91,7 @@ sub read_one_line($) my ($filename) = @_; open(GENERIC_FH, $filename) or ( debug("Can't open $filename."), die ); - $this_line = <GENERIC_FH>; + my $this_line = <GENERIC_FH>; close(GENERIC_FH); chomp $this_line; @@ -124,8 +127,8 @@ sub releases_read($) my ($project) = @_; my (%urls, %cookies, $thisrelease); - @files = split(/\n/, `ls $data_root/*/$project/*.url`); - foreach $file (@files) { + my @files = split(/\n/, `ls $data_root/*/$project/*.url`); + foreach my $file (@files) { if (open(GENERIC_FH, $file)) { my ($cookiefile, $key, $url, $this_line); $this_line = <GENERIC_FH>; @@ -168,7 +171,7 @@ sub releases_make($) ($program, $build, $publisher, @other) = split(/-/, $name); # check that it's a recognized program - foreach $prg (@valid_programs) { + foreach my $prg (@valid_programs) { if ($prg eq $program) { $program_ok = 1; last; @@ -199,9 +202,9 @@ sub releases_make($) } # check to see that the URL has the right format - $base_path = "$data_root/$publisher/$program"; + my $base_path = "$data_root/$publisher/$program"; - $url_mask = read_one_line("<$base_path/url.mask"); + my $url_mask = read_one_line("<$base_path/url.mask"); if (!($url =~ $url_mask)) { return "Unrecognized URL format"; } @@ -292,7 +295,8 @@ sub main() } # for each of the programs we know about, see if they need an update - foreach $program (@valid_programs) { + my ($winetest_history, $update_sent); + foreach my $program (@valid_programs) { ($build, $urls, $cookies) = releases_read($program); if (param($program)) { my @history = split(/,/, param("$program" . "_history"));

1 0

Francois Gouget : testbot: Handle the umask in a consistent way in the WineRun* scripts.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: tools Branch: master Commit: 169d1eba31fd66d7dbbccd4d43adbeedf5735489 URL: http://source.winehq.org/git/tools.git/?a=commit;h=169d1eba31fd66d7dbbccd4d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 25 11:24:16 2014 +0200 testbot: Handle the umask in a consistent way in the WineRun* scripts. Don't set it at startup to avoid impacting other modules. --- testbot/bin/WineRunBuild.pl | 6 +++++- testbot/bin/WineRunReconfig.pl | 6 +++++- testbot/bin/WineRunTask.pl | 7 +++++-- testbot/bin/build/Build.pl | 8 ++++---- testbot/bin/build/Reconfig.pl | 4 ++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 8f1defa..5c6e897 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -46,13 +46,16 @@ use WineTestBot::Engine::Notify; sub LogTaskError($$) { my ($ErrMessage, $FullErrFileName) = @_; + my $OldUMask = umask(002); if (open(my $ErrFile, ">>", $FullErrFileName)) { + umask($OldUMask); print $ErrFile $ErrMessage; close($ErrFile); } else { + umask($OldUMask); LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; } } @@ -182,10 +185,11 @@ if (!defined $Task) exit 1; } -umask(002); +my $OldUMask = umask(002); mkdir "$DataDir/jobs/$JobId"; mkdir "$DataDir/jobs/$JobId/$StepNo"; mkdir "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; +umask($OldUMask); my $VM = $Task->VM; my $TA = $VM->GetAgent(); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c898a52..2c36afc 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,13 +46,16 @@ use WineTestBot::Engine::Notify; sub LogTaskError($$) { my ($ErrMessage, $FullErrFileName) = @_; + my $OldUMask = umask(002); if (open(my $ErrFile, ">>", $FullErrFileName)) { + umask($OldUMask); print $ErrFile $ErrMessage; close($ErrFile); } else { + umask($OldUMask); LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; } } @@ -182,10 +185,11 @@ if (!defined $Task) exit 1; } -umask(002); +my $OldUMask = umask(002); mkdir "$DataDir/jobs/$JobId"; mkdir "$DataDir/jobs/$JobId/$StepNo"; mkdir "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; +umask($OldUMask); my $VM = $Task->VM; my $TA = $VM->GetAgent(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 353b9b4..9b8f43f 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -100,13 +100,16 @@ sub TakeScreenshot($$) my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); if (! defined($ErrMessage)) { + my $OldUMask = umask(002); if (open SCREENSHOT, ">$FullScreenshotFileName") { + umask($OldUMask); print SCREENSHOT $ImageBytes; close SCREENSHOT; } else { + umask($OldUMask); LogMsg "Can't save screenshot: $!\n"; } } @@ -201,11 +204,11 @@ if (!defined $Task) exit 1; } -my $oldumask = umask(002); +my $OldUMask = umask(002); mkdir "$DataDir/jobs/$JobId"; mkdir "$DataDir/jobs/$JobId/$StepNo"; mkdir "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; -umask($oldumask); +umask($OldUMask); my $VM = $Task->VM; my $TA = $VM->GetAgent(); diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index f94b87e..fb3235d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -42,24 +42,24 @@ use WineTestBot::Config; sub InfoMsg(@) { - my $oldumask = umask(002); + my $OldUMask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") { print LOGFILE @_; close LOGFILE; } - umask($oldumask); + umask($OldUMask); } sub LogMsg(@) { - my $oldumask = umask(002); + my $OldUMask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") { print LOGFILE "Build: ", @_; close LOGFILE; } - umask($oldumask); + umask($OldUMask); } sub FatalError(@) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index f5ffcab..81a487f 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -42,13 +42,13 @@ use WineTestBot::Config; sub LogMsg(@) { - my $oldumask = umask(002); + my $OldUMask = umask(002); if (open LOGFILE, ">>$LogDir/Reconfig.log") { print LOGFILE "Reconfig: ", @_; close LOGFILE; } - umask($oldumask); + umask($OldUMask); } sub FatalError(@)

1 0

Alexandre Julliard : scrrun/tests: Allow the drive total size to fit into an int.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: b27735e807043b6e24af971f74237b9e58aa75d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27735e807043b6e24af971f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 21:13:43 2014 +0200 scrrun/tests: Allow the drive total size to fit into an int. --- dlls/scrrun/tests/filesystem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6042241..faa0b0c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1289,8 +1289,11 @@ static void test_DriveCollection(void) V_VT(&size) = VT_EMPTY; hr = IDrive_get_TotalSize(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_AvailableSpace(drive, &size);

1 0

Alexandre Julliard : ntdll: Define arch_prctl since it is missing on Android.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: d7f6f8ee6cec032fb375cb53182436de0500208c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f6f8ee6cec032fb375cb531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:43:33 2014 +0200 ntdll: Define arch_prctl since it is missing on Android. --- dlls/ntdll/signal_x86_64.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 5658537..05581c2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -38,6 +38,13 @@ #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif +#ifdef HAVE_SYSCALL_H +# include <syscall.h> +#else +# ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +# endif +#endif #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif @@ -131,7 +138,7 @@ struct MSVCRT_JUMP_BUFFER #ifdef linux #include <asm/prctl.h> -extern int arch_prctl(int func, void *ptr); +static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } #define RAX_sig(context) ((context)->uc_mcontext.gregs[REG_RAX]) #define RBX_sig(context) ((context)->uc_mcontext.gregs[REG_RBX])

1 0

Francois Gouget : ntdll: Fix the compilation by using the right mcontext_t field names for the signal context on FreeBSD.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 09ffb97fddacbd5f6c424fcd6eb1320aff2f9f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09ffb97fddacbd5f6c424fcd6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 24 19:23:55 2014 +0200 ntdll: Fix the compilation by using the right mcontext_t field names for the signal context on FreeBSD. --- dlls/ntdll/signal_i386.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 447e97c..12aa5a4 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -265,27 +265,27 @@ typedef struct trapframe ucontext_t; #include <machine/trap.h> -#define EAX_sig(context) ((context)->sc_eax) -#define EBX_sig(context) ((context)->sc_ebx) -#define ECX_sig(context) ((context)->sc_ecx) -#define EDX_sig(context) ((context)->sc_edx) -#define ESI_sig(context) ((context)->sc_esi) -#define EDI_sig(context) ((context)->sc_edi) -#define EBP_sig(context) ((context)->sc_ebp) - -#define CS_sig(context) ((context)->sc_cs) -#define DS_sig(context) ((context)->sc_ds) -#define ES_sig(context) ((context)->sc_es) -#define FS_sig(context) ((context)->sc_fs) -#define GS_sig(context) ((context)->sc_gs) -#define SS_sig(context) ((context)->sc_ss) - -#define TRAP_sig(context) ((context)->sc_trapno) -#define ERROR_sig(context) ((context)->sc_err) -#define EFL_sig(context) ((context)->sc_eflags) - -#define EIP_sig(context) ((context)->sc_eip) -#define ESP_sig(context) ((context)->sc_esp) +#define EAX_sig(context) ((context)->uc_mcontext.mc_eax) +#define EBX_sig(context) ((context)->uc_mcontext.mc_ebx) +#define ECX_sig(context) ((context)->uc_mcontext.mc_ecx) +#define EDX_sig(context) ((context)->uc_mcontext.mc_edx) +#define ESI_sig(context) ((context)->uc_mcontext.mc_esi) +#define EDI_sig(context) ((context)->uc_mcontext.mc_edi) +#define EBP_sig(context) ((context)->uc_mcontext.mc_ebp) + +#define CS_sig(context) ((context)->uc_mcontext.mc_cs) +#define DS_sig(context) ((context)->uc_mcontext.mc_ds) +#define ES_sig(context) ((context)->uc_mcontext.mc_es) +#define FS_sig(context) ((context)->uc_mcontext.mc_fs) +#define GS_sig(context) ((context)->uc_mcontext.mc_gs) +#define SS_sig(context) ((context)->uc_mcontext.mc_ss) + +#define TRAP_sig(context) ((context)->uc_mcontext.mc_trapno) +#define ERROR_sig(context) ((context)->uc_mcontext.mc_err) +#define EFL_sig(context) ((context)->uc_mcontext.mc_eflags) + +#define EIP_sig(context) ((context)->uc_mcontext.mc_eip) +#define ESP_sig(context) ((context)->uc_mcontext.mc_esp) #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */

1 0

Alexandre Julliard : loader: Avoid ELF32_ST_INFO macro that is missing on Android.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 8b4ed00b59397c4d8658ff588c058feaa233e0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4ed00b59397c4d8658ff588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:34:39 2014 +0200 loader: Avoid ELF32_ST_INFO macro that is missing on Android. --- loader/preloader.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index f38e17a..25aaacd 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -999,7 +999,8 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int do { if ((chains[idx] & ~1u) == (hash & ~1u) && - symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && + ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && !wld_strcmp( strings + symtab[idx].st_name, var )) goto found; } while (!(chains[idx++] & 1u)); @@ -1011,9 +1012,10 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int const Elf32_Word *buckets = hashtab + 2; const Elf32_Word *chains = buckets + nbuckets; - for (idx = buckets[hash % nbuckets]; idx != STN_UNDEF; idx = chains[idx]) + for (idx = buckets[hash % nbuckets]; idx; idx = chains[idx]) { - if (symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && + if (ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && !wld_strcmp( strings + symtab[idx].st_name, var )) goto found; }

1 0

Alexandre Julliard : winhttp/tests: Include winsock2.h before other headers.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 97d8ae9e7edd3892731a2be00891891b409fff56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d8ae9e7edd3892731a2be00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:10:33 2014 +0200 winhttp/tests: Include winsock2.h before other headers. --- dlls/winhttp/tests/winhttp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 354f46f..6a2d8c6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -20,9 +20,7 @@ #define COBJMACROS #include <stdarg.h> -#include <stdlib.h> #include <windef.h> -#include <winbase.h> #include <winsock2.h> #include <ws2tcpip.h> #include <winhttp.h>

1 0

Alexandre Julliard : secur32/tests: Include winsock2.h before other headers.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: d0d6dcb70eb90462301e520a8969291fa3a5b1de URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d6dcb70eb90462301e520a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 19:51:52 2014 +0200 secur32/tests: Include winsock2.h before other headers. --- dlls/secur32/tests/schannel.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 078aec7..2b68c3d 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -17,15 +17,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> + #include <stdarg.h> #include <windef.h> -#include <winbase.h> +#include <winsock2.h> +#include <ws2tcpip.h> #define SECURITY_WIN32 #include <security.h> #include <schannel.h> -#include <winsock2.h> -#include <ws2tcpip.h> #include "wine/test.h"

1 0

Jacek Caban : wine/debug.h: Added wine_dbgstr_variant and wine_dbgstr_vt implementations.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: e18ef3cf4c8b2b831203a4fa7bed74a25415ba24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18ef3cf4c8b2b831203a4fa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 16:26:02 2014 +0200 wine/debug.h: Added wine_dbgstr_variant and wine_dbgstr_vt implementations. --- dlls/oleaut32/variant.c | 75 +----------------------------- include/wine/debug.h | 118 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 73 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index addc5a0..21d1941 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -44,7 +44,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); - static const char * const variant_types[] = { "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", @@ -81,82 +80,12 @@ static const char * const variant_flags[16] = const char *debugstr_vt(VARTYPE vt) { - if(vt & ~VT_TYPEMASK) - return wine_dbg_sprintf("%s%s", debugstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12]); - - if(vt < sizeof(variant_types)/sizeof(*variant_types)) - return variant_types[vt]; - - if(vt == VT_BSTR_BLOB) - return "VT_BSTR_BLOB"; - - return wine_dbg_sprintf("vt(invalid %x)", vt); + return wine_dbgstr_vt(vt); } const char *debugstr_variant(const VARIANT *v) { - if(!v) - return "(null)"; - - if(V_VT(v) & VT_BYREF) { - if(V_VT(v) == (VT_VARIANT|VT_BYREF)) - return wine_dbg_sprintf("%p {VT_VARIANT|VT_BYREF: %s}", v, debugstr_variant(V_VARIANTREF(v))); - return wine_dbg_sprintf("%p {%s %p}", v, debugstr_vt(V_VT(v)), V_BYREF(v)); - } - - if(V_ISARRAY(v) || V_ISVECTOR(v)) - return wine_dbg_sprintf("%p {%s %p}", v, debugstr_vt(V_VT(v)), V_ARRAY(v)); - - switch(V_VT(v)) { - case VT_EMPTY: - return wine_dbg_sprintf("%p {VT_EMPTY}", v); - case VT_NULL: - return wine_dbg_sprintf("%p {VT_NULL}", v); - case VT_I2: - return wine_dbg_sprintf("%p {VT_I2: %d}", v, V_I2(v)); - case VT_I4: - return wine_dbg_sprintf("%p {VT_I4: %d}", v, V_I4(v)); - case VT_R4: - return wine_dbg_sprintf("%p {VT_R4: %f}", v, V_R4(v)); - case VT_R8: - return wine_dbg_sprintf("%p {VT_R8: %lf}", v, V_R8(v)); - case VT_CY: - return wine_dbg_sprintf("%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64)); - case VT_DATE: - return wine_dbg_sprintf("%p {VT_DATE: %lf}", v, V_DATE(v)); - case VT_BSTR: - return wine_dbg_sprintf("%p {VT_BSTR: %s}", v, debugstr_w(V_BSTR(v))); - case VT_DISPATCH: - return wine_dbg_sprintf("%p {VT_DISPATCH: %p}", v, V_DISPATCH(v)); - case VT_ERROR: - return wine_dbg_sprintf("%p {VT_ERROR: %08x}", v, V_ERROR(v)); - case VT_BOOL: - return wine_dbg_sprintf("%p {VT_BOOL: %x}", v, V_BOOL(v)); - case VT_UNKNOWN: - return wine_dbg_sprintf("%p {VT_UNKNOWN: %p}", v, V_UNKNOWN(v)); - case VT_I1: - return wine_dbg_sprintf("%p {VT_I1: %d}", v, V_I1(v)); - case VT_UI1: - return wine_dbg_sprintf("%p {VT_UI1: %u}", v, V_UI1(v)); - case VT_UI2: - return wine_dbg_sprintf("%p {VT_UI2: %d}", v, V_UI2(v)); - case VT_UI4: - return wine_dbg_sprintf("%p {VT_UI4: %d}", v, V_UI4(v)); - case VT_I8: - return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v))); - case VT_UI8: - return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(V_UI8(v))); - case VT_INT: - return wine_dbg_sprintf("%p {VT_INT: %d}", v, V_INT(v)); - case VT_UINT: - return wine_dbg_sprintf("%p {VT_UINT: %u}", v, V_UINT(v)); - case VT_VOID: - return wine_dbg_sprintf("%p {VT_VOID}", v); - case VT_RECORD: - return wine_dbg_sprintf("%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo); - default: - return wine_dbg_sprintf("%p {vt %s}", v, debugstr_vt(V_VT(v))); - } + return wine_dbgstr_variant(v); } /* Convert a variant from one type to another */ diff --git a/include/wine/debug.h b/include/wine/debug.h index ba6fabe..ca25e0a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -219,6 +219,124 @@ static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) else return wine_dbg_sprintf( "%lx", (unsigned long)ll ); } +#if defined(__oaidl_h__) && defined(V_VT) + +static inline const char *wine_dbgstr_vt( VARTYPE vt ) +{ + static const char *const variant_types[] = + { + "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", + "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", + "VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8", + "VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY", + "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35", + "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", + "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", + "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", + "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", + "VT_VERSIONED_STREAM" + }; + + static const char *const variant_flags[16] = + { + "", + "|VT_VECTOR", + "|VT_ARRAY", + "|VT_VECTOR|VT_ARRAY", + "|VT_BYREF", + "|VT_VECTOR|VT_ARRAY", + "|VT_ARRAY|VT_BYREF", + "|VT_VECTOR|VT_ARRAY|VT_BYREF", + "|VT_RESERVED", + "|VT_VECTOR|VT_RESERVED", + "|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_ARRAY|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", + }; + + if (vt & ~VT_TYPEMASK) + return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); + + if (vt < sizeof(variant_types)/sizeof(*variant_types)) + return variant_types[vt]; + + if (vt == VT_BSTR_BLOB) + return "VT_BSTR_BLOB"; + + return wine_dbg_sprintf( "vt(invalid %x)", vt ); +} + +static inline const char *wine_dbgstr_variant( const VARIANT *v ) +{ + if (!v) + return "(null)"; + + if (V_VT(v) & VT_BYREF) { + if (V_VT(v) == (VT_VARIANT|VT_BYREF)) + return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); + return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); + } + + if (V_ISARRAY(v) || V_ISVECTOR(v)) + return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_ARRAY(v) ); + + switch(V_VT(v)) { + case VT_EMPTY: + return wine_dbg_sprintf( "%p {VT_EMPTY}", v ); + case VT_NULL: + return wine_dbg_sprintf( "%p {VT_NULL}", v ); + case VT_I2: + return wine_dbg_sprintf( "%p {VT_I2: %d}", v, V_I2(v) ); + case VT_I4: + return wine_dbg_sprintf( "%p {VT_I4: %d}", v, V_I4(v) ); + case VT_R4: + return wine_dbg_sprintf( "%p {VT_R4: %f}", v, V_R4(v) ); + case VT_R8: + return wine_dbg_sprintf( "%p {VT_R8: %lf}", v, V_R8(v) ); + case VT_CY: + return wine_dbg_sprintf( "%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64) ); + case VT_DATE: + return wine_dbg_sprintf( "%p {VT_DATE: %lf}", v, V_DATE(v) ); + case VT_BSTR: + return wine_dbg_sprintf( "%p {VT_BSTR: %s}", v, wine_dbgstr_w(V_BSTR(v)) ); + case VT_DISPATCH: + return wine_dbg_sprintf( "%p {VT_DISPATCH: %p}", v, V_DISPATCH(v) ); + case VT_ERROR: + return wine_dbg_sprintf( "%p {VT_ERROR: %08x}", v, V_ERROR(v) ); + case VT_BOOL: + return wine_dbg_sprintf( "%p {VT_BOOL: %x}", v, V_BOOL(v) ); + case VT_UNKNOWN: + return wine_dbg_sprintf( "%p {VT_UNKNOWN: %p}", v, V_UNKNOWN(v) ); + case VT_I1: + return wine_dbg_sprintf( "%p {VT_I1: %d}", v, V_I1(v) ); + case VT_UI1: + return wine_dbg_sprintf( "%p {VT_UI1: %u}", v, V_UI1(v) ); + case VT_UI2: + return wine_dbg_sprintf( "%p {VT_UI2: %d}", v, V_UI2(v) ); + case VT_UI4: + return wine_dbg_sprintf( "%p {VT_UI4: %d}", v, V_UI4(v) ); + case VT_I8: + return wine_dbg_sprintf( "%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v)) ); + case VT_UI8: + return wine_dbg_sprintf( "%p {VT_UI8: %s}", v, wine_dbgstr_longlong(V_UI8(v)) ); + case VT_INT: + return wine_dbg_sprintf( "%p {VT_INT: %d}", v, V_INT(v) ); + case VT_UINT: + return wine_dbg_sprintf( "%p {VT_UINT: %u}", v, V_UINT(v) ); + case VT_VOID: + return wine_dbg_sprintf( "%p {VT_VOID}", v ); + case VT_RECORD: + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + default: + return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); + } +} + +#endif /* defined(__oaidl_h__) && defined(V_VT) */ + #ifndef WINE_TRACE #define WINE_TRACE __WINE_DPRINTF(_TRACE,__wine_dbch___default) #define WINE_TRACE_(ch) __WINE_DPRINTF(_TRACE,&__wine_dbch_##ch)

1 0