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

Dmitry Timoshkov : gdi32: Add support for disk-based metafiles to GetMetaFileBitsEx.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 8744c10a389d2d8171c38ffed9828bec10200cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8744c10a389d2d8171c38ffed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Mar 16 12:20:24 2013 +0900 gdi32: Add support for disk-based metafiles to GetMetaFileBitsEx. --- dlls/gdi32/metafile.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index dbbffee..406728e 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1088,17 +1088,27 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) { METAHEADER *mh = GDI_GetObjPtr( hmf, OBJ_METAFILE ); UINT mfSize; + BOOL mf_copy = FALSE; TRACE("(%p,%d,%p)\n", hmf, nSize, buf); if (!mh) return 0; /* FIXME: error code */ if(mh->mtType == METAFILE_DISK) - FIXME("Disk-based metafile?\n"); + { + mh = MF_LoadDiskBasedMetaFile( mh ); + if (!mh) + { + GDI_ReleaseObj( hmf ); + return 0; + } + mf_copy = TRUE; + } mfSize = mh->mtSize * 2; if (buf) { if(mfSize > nSize) mfSize = nSize; memmove(buf, mh, mfSize); } + if (mf_copy) HeapFree( GetProcessHeap(), 0, mh ); GDI_ReleaseObj( hmf ); TRACE("returning size %d\n", mfSize); return mfSize;

1 0

Marcus Meissner : windowscodecs: Do not leak profile on errors (Coverity).
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 4641ed5c9552adf665c733633a1928a487acf407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4641ed5c9552adf665c733633… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 15 20:09:14 2013 +0100 windowscodecs: Do not leak profile on errors (Coverity). --- dlls/windowscodecs/colorcontext.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index ca40184..268b6ef 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -126,8 +126,16 @@ static HRESULT load_profile(const WCHAR *filename, BYTE **profile, UINT *len) } ret = ReadFile(handle, *profile, size.u.LowPart, &count, NULL); CloseHandle(handle); - if (!ret) return HRESULT_FROM_WIN32(GetLastError()); - if (count != size.u.LowPart) return E_FAIL; + if (!ret) { + HeapFree (GetProcessHeap(),0,*profile); + *profile = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } + if (count != size.u.LowPart) { + HeapFree (GetProcessHeap(),0,*profile); + *profile = NULL; + return E_FAIL; + } *len = count; return S_OK; }

1 0

Marcus Meissner : jscript: Check the correct heap return condition ( Coverity).
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 339ec9c4ed7386c220b222354a0d2c82f89a6088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339ec9c4ed7386c220b222354… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 15 19:42:12 2013 +0100 jscript: Check the correct heap return condition (Coverity). --- dlls/jscript/jsregexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 61e9a95..3863142 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -609,7 +609,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->jsregexp = regexp_new(ctx, &ctx->tmp_heap, regexp->str->str, jsstr_length(regexp->str), flags, FALSE); - if(FAILED(hres)) { + if(!regexp->jsregexp) { WARN("regexp_new failed\n"); jsdisp_release(&regexp->dispex); return E_FAIL;

1 0

Francois Gouget : testbot: A few spelling fixes and small wording tweaks.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 05e70279bbf0a872bf3e7d5d8136869380e4e00f URL: http://source.winehq.org/git/tools.git/?a=commit;h=05e70279bbf0a872bf3e7d5d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:41:35 2013 +0100 testbot: A few spelling fixes and small wording tweaks. --- testbot/bin/Engine.pl | 2 +- testbot/lib/ObjectModel/Item.pm | 2 +- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 6 +++--- testbot/web/ForgotPassword.pl | 2 +- testbot/web/JobDetails.pl | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 489c686..da3e54c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -415,7 +415,7 @@ sub InitVMs() =item C<SafetyNet()> -This is called on startup and regularly after that to catch thing that fall +This is called on startup and regularly after that to catch things that fall through the cracks, possibly because of an Engine restart. Specifically it updates the status of all the current Jobs, Steps and Tasks, then schedules Tasks to be run, checks the staging directory for diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 94ad8e6..48864f4 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -184,7 +184,7 @@ sub AUTOLOAD my $self = shift; my $PropertyName = $ObjectModel::Item::AUTOLOAD; - # strip fully-qualfied portion + # strip fully-qualified portion $PropertyName =~ s/.*://; if ($PropertyName eq "DESTROY") { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4c20948..cd6c427 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -155,7 +155,7 @@ sub UpdateStatus($) # Inherit the steps most significant status with some caveats: # - if one of the steps is still queued then this job is still running # - if a step is skipped it's either because a previous step failed or because - # the user cancelled the job. In both cases mark the job as failed + # the user canceled the job. In both cases mark the job as failed # - if all the steps are still queued, then this job's original status, # 'queued', is still valid foreach my $StepStatus ("running", "failed", "skipped", "completed") diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index c2262c7..22e00e1 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -386,7 +386,7 @@ sub IsTestPatch =item C<NewPatch()> -Creates a WineTestBot::Patch object for the given message. If that the message +Creates a WineTestBot::Patch object for the given message. If the message does impact Wine's tests then the Patch object disposition is set and no further action is performed. Otherwise if the patch is part of a series then it gets tied to a WineTestBot::PendingPatchSet object by diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 810d5c4..f49fa68 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -108,7 +108,7 @@ BEGIN CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("ChildPid", "Process id of child process", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index fa53b07..56028d8 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -206,7 +206,7 @@ BEGIN CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("ChildPid", "Process id of child process", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index ed3282c..fd064a1 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -586,7 +586,7 @@ sub CountPoweredOnNonBaseVMs { my $self = shift; - my $PowerdOnVMs = 0; + my $PoweredOnVMs = 0; foreach my $VM (@{$self->GetItems()}) { my $VMStatus = $VM->Status; @@ -596,11 +596,11 @@ sub CountPoweredOnNonBaseVMs $VMStatus eq "idle" || $VMStatus eq "running")) { - $PowerdOnVMs++; + $PoweredOnVMs++; } } - return $PowerdOnVMs; + return $PoweredOnVMs; } sub SortKeysBySortOrder diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 5a9d71f..a22d441 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -44,7 +44,7 @@ sub _initialize sub GetTitle { - return "Reset passwor"; + return "Reset password"; } sub GetHeaderText diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index b191327..11bb122 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -245,7 +245,7 @@ sub GenerateBody my $Action = $self->GetParam("Action"); if ($Action eq "Cancel job") { - print "<p>Job will be cancelled.</p>\n"; + print "<p>Job will be canceled.</p>\n"; } elsif ($Action eq "Restart job") {

1 0

Francois Gouget : testbot/WineRunTask: Make it possible to use the standard 'Name <address>' syntax for the administrator.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 63f2ce8b8154a41ddad5bafa61829e5854345ab5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=63f2ce8b8154a41ddad5bafa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:39:29 2013 +0100 testbot/WineRunTask: Make it possible to use the standard 'Name <address>' syntax for the administrator. --- testbot/bin/WineRunTask.pl | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 57a4537..bcfda06 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -278,11 +278,15 @@ elsif ($Step->Type eq "suite") $Info .= ": " if ($Info ne ""); $Info .= $VM->Details; } - # Escape the info argument for cmd's command interpreter - $Info =~ s/\\/\\\\/g; + # Escape the arguments for cmd's command interpreter + my $EMail = $AdminEMail; + $EMail =~ s/"/\\"/g; + $EMail =~ s/%/%%/g; + $EMail =~ s/%/%%/g; $Info =~ s/"/\\"/g; $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $Tag -m $AdminEMail -i \"$Info\"\r\n" . + $Info =~ s/%/%%/g; + $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n" . "$FileName -q -s $RptFileName\r\n"; } if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE))

1 0

Francois Gouget : testbot/WineSendLog: Jobs are canceled at the initiative of the user and thus are not testbot errors .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 5f7b8d1b8469ae097656fdb082b21042f1af142a URL: http://source.winehq.org/git/tools.git/?a=commit;h=5f7b8d1b8469ae097656fdb0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:39:54 2013 +0100 testbot/WineSendLog: Jobs are canceled at the initiative of the user and thus are not testbot errors. Furthermore, when killed WineRunTask.pl, no longer prints the canceled message in the error log so that check was moot. --- testbot/bin/WineSendLog.pl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ac522c1..4e678bd 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -57,8 +57,7 @@ sub IsBotFailure { my $ErrLine = $_[0]; - return ($ErrLine =~ m/Cancelled/ || - $ErrLine =~ m/Can't set VM status to running/ || + return ($ErrLine =~ m/Can't set VM status to running/ || $ErrLine =~ m/Can't copy exe to VM/ || $ErrLine =~ m/Can't copy log from VM/ || $ErrLine =~ m/Can't copy generated executable from VM/);

1 0

Francois Gouget : testbot/WineRunTask: GenFixEnv. exe is not needed anymore so remove it.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: fb04605452507ee3790e4702509a5d09da3be9dc URL: http://source.winehq.org/git/tools.git/?a=commit;h=fb04605452507ee3790e4702… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:38:42 2013 +0100 testbot/WineRunTask: GenFixEnv.exe is not needed anymore so remove it. TestAgentd runs in a normal user account so the environment is already set up. --- testbot/bin/WineRunTask.pl | 7 -- testbot/bin/windows/GenFixEnv.exe | Bin 7680 -> 0 bytes testbot/src/GenFixEnv/GenFixEnv.c | 164 ------------------------------------- testbot/src/GenFixEnv/Makefile | 10 -- 4 files changed, 0 insertions(+), 181 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index abb92e0..57a4537 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -241,19 +241,12 @@ if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0)) FatalError "Can't copy TestLauncher to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -if (!$TA->SendFile("$BinDir/windows/GenFixEnv.exe", "GenFixEnv.exe", 0)) -{ - $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy GenFixEnv to VM: $ErrMessage\n", - $FullErrFileName, $Job, $Step, $Task; -} my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; if ($Step->ReportSuccessfulTests) { $Script .= "set WINETEST_REPORT_SUCCESS=1\r\n"; } -$Script .= "GenFixEnv FixEnv.bat\r\ncall FixEnv.bat\r\ndel FixEnv.bat\r\n"; if ($Step->Type eq "single") { $Script .= "$TestLauncher -t " . $Task->Timeout . " $FileName "; diff --git a/testbot/bin/windows/GenFixEnv.exe b/testbot/bin/windows/GenFixEnv.exe deleted file mode 100755 index b2e7d3c..0000000 Binary files a/testbot/bin/windows/GenFixEnv.exe and /dev/null differ diff --git a/testbot/src/GenFixEnv/GenFixEnv.c b/testbot/src/GenFixEnv/GenFixEnv.c deleted file mode 100644 index 8272eb6..0000000 --- a/testbot/src/GenFixEnv/GenFixEnv.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Generates a batch file that sets up the environment. - * This can be used in case the mechanism for running a process in the VM - * does not properly set up the environment for the currently logged in user. - * - * Copyright 2009 Ge van Geldorp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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 <windows.h> -#include <shlobj.h> - -static void GenerateFromReg(FILE *BatchFile) -{ - LONG Err; - HKEY UserEnvironment; - DWORD Index; - char ValueName[256]; - DWORD ValueNameSize; - DWORD Type; - char Data[1024]; - DWORD DataSize; - - Err = RegOpenKeyExA(HKEY_CURRENT_USER, "Environment", 0, KEY_QUERY_VALUE, - &UserEnvironment); - if (Err != ERROR_SUCCESS) - return; - - Index = 0; - do - { - ValueNameSize = sizeof(ValueName); - DataSize = sizeof(Data); - Err = RegEnumValueA(UserEnvironment, Index, ValueName, &ValueNameSize, - NULL, &Type, (LPBYTE) Data, &DataSize); - if (Err == ERROR_SUCCESS) - { - if (Type == REG_EXPAND_SZ) - { - char Expanded[sizeof(Data)]; - DWORD ExpandedSize; - ExpandedSize = ExpandEnvironmentStringsA(Data, Expanded, - sizeof(Expanded)); - memcpy(Data, Expanded, ExpandedSize); - Type = REG_SZ; - } - if (Type == REG_SZ) - { - if (strcmp(ValueName, "TEMP") != 0 && strcmp(ValueName, "TMP") != 0) - fprintf(BatchFile, "SET \"%s=%s\"\n", ValueName, Data); - else - { - char Short[sizeof(Data)]; - GetShortPathNameA(Data, Short, sizeof(Short)); - fprintf(BatchFile, "SET \"%s=%s\"\n", ValueName, Short); - } - } - } - Index++; - } - while (Err == ERROR_SUCCESS); - - RegCloseKey(UserEnvironment); -} - -static void GenerateUserProfile(FILE *BatchFile) -{ - BOOL (WINAPI *pOpenProcessToken)(HANDLE,DWORD,PHANDLE); - BOOL (WINAPI *pGetUserProfileDirectoryA)(HANDLE,LPSTR,LPDWORD); - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - HMODULE huserenv = LoadLibraryA("userenv.dll"); - HANDLE Token; - char Data[1024]; - DWORD DataSize; - - pOpenProcessToken = (void *)GetProcAddress(hadvapi32, "OpenProcessToken"); - pGetUserProfileDirectoryA = (void *)GetProcAddress(huserenv, - "GetUserProfileDirectoryA"); - if (pOpenProcessToken == NULL || pGetUserProfileDirectoryA == NULL) - return; - - if (! pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token)) - return; - DataSize = sizeof(Data); - if (! pGetUserProfileDirectoryA(Token, Data, &DataSize)) - return; - fprintf(BatchFile, "SET \"USERPROFILE=%s\"\n", Data); - CloseHandle(Token); -} - -static void GenerateCSIDL(FILE *BatchFile) -{ - char Path[_MAX_PATH]; - HMODULE Mod; - HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); - HRESULT Res; - - Mod = LoadLibraryA("shell32.dll"); - pSHGetFolderPathA = (void *) GetProcAddress(Mod, "SHGetFolderPathA"); - if (pSHGetFolderPathA == NULL) - { - FreeLibrary(Mod); - Mod = LoadLibraryA("shfolder.dll"); - pSHGetFolderPathA = (void *) GetProcAddress(Mod, "SHGetFolderPathA"); - } - if (pSHGetFolderPathA != NULL) - { - if (GetEnvironmentVariable("APPDATA", Path, sizeof(Path)) == 0) - { - Res = pSHGetFolderPathA(NULL, CSIDL_APPDATA, NULL, - SHGFP_TYPE_CURRENT, Path); - if (SUCCEEDED(Res)) - fprintf(BatchFile, "SET \"APPDATA=%s\"\n", Path); - } - if (GetEnvironmentVariable("LOCALAPPDATA", Path, sizeof(Path)) == 0) - { - Res = pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, - SHGFP_TYPE_CURRENT, Path); - if (SUCCEEDED(Res)) - fprintf(BatchFile, "SET \"LOCALAPPDATA=%s\"\n", Path); - } - } - FreeLibrary(Mod); -} - -int main(int argc, char *argv[]) -{ - FILE *BatchFile; - if (argc != 2) - { - fprintf(stderr, "Usage: GenFixEnv <BatchFile>\n"); - exit(1); - } - - BatchFile = fopen(argv[1], "w"); - if (BatchFile == NULL) - { - perror("Unable to open output file"); - exit(1); - } - - fprintf(BatchFile, "@echo off\n"); - GenerateFromReg(BatchFile); - GenerateUserProfile(BatchFile); - GenerateCSIDL(BatchFile); - - fclose(BatchFile); - - return 0; -} diff --git a/testbot/src/GenFixEnv/Makefile b/testbot/src/GenFixEnv/Makefile deleted file mode 100644 index a485094..0000000 --- a/testbot/src/GenFixEnv/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -bindir = ../../bin/windows - -CROSSCC32 = i686-w64-mingw32-gcc -CROSSSTRIP32 = i686-w64-mingw32-strip - -all: $(bindir)/GenFixEnv.exe - -$(bindir)/GenFixEnv.exe: GenFixEnv.c - $(CROSSCC32) -Wall -o $@ $< - $(CROSSSTRIP32) $@

1 0

Francois Gouget : testbot/Engine: The ExpectWinetestUpdate notification is unused. Remove it.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 55cd61671e43197cd026a62f77ed06095baa278e URL: http://source.winehq.org/git/tools.git/?a=commit;h=55cd61671e43197cd026a62f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:41:00 2013 +0100 testbot/Engine: The ExpectWinetestUpdate notification is unused. Remove it. --- testbot/bin/Engine.pl | 66 +----------------------------- testbot/lib/WineTestBot/Engine/Notify.pm | 18 +-------- 2 files changed, 2 insertions(+), 82 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 3f9c9b4..489c686 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -236,79 +236,16 @@ sub HandleVMStatusChange return "1OK"; } -sub CheckForWinetestUpdate -{ - my $Bits = $_[0]; - - $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); - my $Pid = fork; - if (!defined $Pid) - { - LogMsg "Unable to fork for CheckForWinetestUpdate.pl: $!\n"; - } - elsif (!$Pid) - { - WineTestBot::Log::SetupRedirects(); - exec("$BinDir/CheckForWinetestUpdate.pl $Bits") or - LogMsg "Unable to exec CheckForWinetestUpdate.pl: $!\n"; - exit(1); - } -} - -sub CheckForWinetestUpdate32 -{ - CheckForWinetestUpdate(32); -} - -sub CheckForWinetestUpdate64 -{ - CheckForWinetestUpdate(64); -} - -sub GiveUpOnWinetestUpdate -{ - DeleteEvent("CheckForWinetestUpdate32"); - DeleteEvent("CheckForWinetestUpdate64"); - LogMsg "Giving up on winetest.exe update\n"; -} - -sub HandleExpectWinetestUpdate -{ - if (EventScheduled("GiveUpOnWinetestUpdate")) - { - DeleteEvent("GiveUpOnWinetestUpdate"); - } - else - { - AddEvent("CheckForWinetestUpdate32", 300, 1, \&CheckForWinetestUpdate32); - AddEvent("CheckForWinetestUpdate64", 300, 1, \&CheckForWinetestUpdate64); - } - AddEvent("GiveUpOnWinetestUpdate", 3660, 0, \&GiveUpOnWinetestUpdate); - - return "1OK"; -} - sub HandleFoundWinetestUpdate { my $Bits = $_[0]; - if ($Bits =~ m/^(32|64)$/) - { - $Bits = $1; - } - else + if ($Bits !~ /^(?:32|64)$/) { LogMsg "Invalid number of bits in foundwinetestupdate message\n"; return "0Invalid number of bits"; } - DeleteEvent("CheckForWinetestUpdate${Bits}"); - if (! EventScheduled("CheckForWinetestUpdate32") && - ! EventScheduled("CheckForWinetestUpdate64")) - { - DeleteEvent("GiveUpOnWinetestUpdate"); - } - my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { @@ -418,7 +355,6 @@ sub HandleGetScreenshot } my %Handlers=( - "expectwinetestupdate" => \&HandleExpectWinetestUpdate, "foundwinetestupdate" => \&HandleFoundWinetestUpdate, "getscreenshot" => \&HandleGetScreenshot, "jobcancel" => \&HandleJobCancel, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index c0793d5..8452615 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -34,8 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&PingEngine &JobSubmit &JobStatusChange &JobCancel &JobRestart - &TaskComplete &VMStatusChange - &ExpectWinetestUpdate &FoundWinetestUpdate + &TaskComplete &VMStatusChange &FoundWinetestUpdate &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -183,21 +182,6 @@ sub VMStatusChange return substr($Reply, 1); } -sub ExpectWinetestUpdate -{ - my $Reply = SendCmdReceiveReply("expectwinetestupdate\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub FoundWinetestUpdate { my $Bits = $_[0];

1 0

Francois Gouget : testbot: Give a '.diff' extension to the mailed-in patches.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: f113f4164551c0bab165a7b0f3b62baf447fe534 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f113f4164551c0bab165a7b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:38:24 2013 +0100 testbot: Give a '.diff' extension to the mailed-in patches. This way the web server knows what MIME type to give them and they get opened in an editor on download. --- testbot/lib/WineTestBot/Patches.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 11c355f..c2262c7 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -207,12 +207,12 @@ sub Submit my $NewStep = $Steps->Add(); # Create a link to the patch file in the staging dir my $FileNameRandomPart = GenerateRandomString(32); - while (-e ("$DataDir/staging/${FileNameRandomPart}_patch")) + while (-e ("$DataDir/staging/${FileNameRandomPart}_patch.diff")) { $FileNameRandomPart = GenerateRandomString(32); } - link $PatchFileName, "$DataDir/staging/${FileNameRandomPart}_patch"; - $NewStep->FileName($FileNameRandomPart . " patch"); + link $PatchFileName, "$DataDir/staging/${FileNameRandomPart}_patch.diff"; + $NewStep->FileName($FileNameRandomPart . " patch.diff"); my @Keys = keys %{$Targets{$BaseName}}; $NewStep->FileType($Targets{$BaseName}{$Keys[0]}); $NewStep->InStaging(1);

1 0

Francois Gouget : testbot/lib: Fix an error message by adding a space between the property name and its value .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: f024ea3c27009f87f8038b17eba822cbe5c6112a URL: http://source.winehq.org/git/tools.git/?a=commit;h=f024ea3c27009f87f8038b17… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:37:05 2013 +0100 testbot/lib: Fix an error message by adding a space between the property name and its value. --- testbot/lib/ObjectModel/Collection.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 3d7f78c..a81a5d9 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -289,7 +289,7 @@ sub Validate my $ExistingItem = $self->GetBackEnd()->LoadItem($self, $Item->GetKey()); if (defined($ExistingItem)) { - $ErrMessage = $self->GetItemName() . $ErrMessage . + $ErrMessage = $self->GetItemName() . " " . $ErrMessage . " already exists"; return ($Item->GetKey(), undef, $ErrMessage); }

1 0