December 2012 - Wine-Commits

Andrew Talbot : dbghelp: Indentation fix.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 9feb4053fed8154ba7866ed65104025c919b186a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9feb4053fed8154ba7866ed65… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:27 2012 +0000 dbghelp: Indentation fix. --- dlls/dbghelp/elf_module.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 52060e0..92b4a31 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -678,11 +678,11 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table ((struct symt_data*)sym)->container); if (symp) { - if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr && - ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value) - FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", - sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, - ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); + if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr && + ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value) + FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", + sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, + ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); ((struct symt_data*)sym)->u.var.offset = elf_info->elf_addr + symp->st_value; ((struct symt_data*)sym)->kind = (ELF32_ST_BIND(symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal;

1 0

Alexandre Julliard : user32: Properly fixup font system parameters with positive height.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 71bb8c5e7c2373904a362a7a0afef7e7524a5b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bb8c5e7c2373904a362a7a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 15 21:59:09 2012 +0100 user32: Properly fixup font system parameters with positive height. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f17db6e..07795ba 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -915,9 +915,9 @@ static BOOL get_font_entry( union sysparam_all_entry *entry, UINT int_param, voi switch (load_entry( &entry->hdr, &font, sizeof(font) )) { case sizeof(font): - entry->font.val = font; if (font.lfHeight > 0) /* positive height value means points ( inch/72 ) */ font.lfHeight = -MulDiv( font.lfHeight, get_display_dpi(), 72 ); + entry->font.val = font; break; case sizeof(LOGFONT16): /* win9x-winME format */ SYSPARAMS_LogFont16To32W( (LOGFONT16 *)&font, &entry->font.val );

1 0

Andrew Talbot : comdlg32: Indentation fix.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: c8092a04ced5c133eb6b8de72f89c10680f182a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8092a04ced5c133eb6b8de72… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:22 2012 +0000 comdlg32: Indentation fix. --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0c674c5..eeac384 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1793,8 +1793,8 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) flags |= SWP_NOSIZE; SetRectEmpty(&rc); } - SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, - 0, 0, rc.right, rc.bottom, flags); + SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, + 0, 0, rc.right, rc.bottom, flags); } else {

1 0

Alexandre Julliard : user32: Fix copy/paste typo.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 72b3dfca7c9026b6fe718e5392b0b654ad1a6253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b3dfca7c9026b6fe718e539… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 14:12:02 2012 +0100 user32: Fix copy/paste typo. --- dlls/user32/sysparams.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 07795ba..5029902 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1126,8 +1126,8 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) name ##_VALNAME }, data, sizeof(data) } #define PATH_ENTRY(name) \ - struct sysparam_binary_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \ - name ##_VALNAME } } + struct sysparam_path_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \ + name ##_VALNAME } } #define FONT_ENTRY(name,weight) \ struct sysparam_font_entry entry_##name = { { get_font_entry, set_font_entry, init_font_entry, \

1 0

Andrew Talbot : gdi32: Indentation fix.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 0653f7a64d7c5c26b8b3ed255d9169ae208a58c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0653f7a64d7c5c26b8b3ed255… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 18:55:12 2012 +0000 gdi32: Indentation fix. --- dlls/gdi32/font.c | 101 +++++++++++++++++++++++++++------------------------- 1 files changed, 52 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 33e603c..6574761 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3127,13 +3127,13 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, */ DWORD WINAPI GetCharacterPlacementW( - HDC hdc, /* [in] Device context for which the rendering is to be done */ - LPCWSTR lpString, /* [in] The string for which information is to be returned */ - INT uCount, /* [in] Number of WORDS in string. */ - INT nMaxExtent, /* [in] Maximum extent the string is to take (in HDC logical units) */ - GCP_RESULTSW *lpResults,/* [in/out] A pointer to a GCP_RESULTSW struct */ - DWORD dwFlags /* [in] Flags specifying how to process the string */ - ) + HDC hdc, /* [in] Device context for which the rendering is to be done */ + LPCWSTR lpString, /* [in] The string for which information is to be returned */ + INT uCount, /* [in] Number of WORDS in string. */ + INT nMaxExtent, /* [in] Maximum extent the string is to take (in HDC logical units) */ + GCP_RESULTSW *lpResults, /* [in/out] A pointer to a GCP_RESULTSW struct */ + DWORD dwFlags /* [in] Flags specifying how to process the string */ + ) { DWORD ret=0; SIZE size; @@ -3144,66 +3144,69 @@ GetCharacterPlacementW( TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n" "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n", - lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, - lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, - lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - - if(dwFlags&(~GCP_REORDER)) FIXME("flags 0x%08x ignored\n", dwFlags); - if(lpResults->lpClass) FIXME("classes not implemented\n"); + lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, + lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, + lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); + + if(dwFlags&(~GCP_REORDER)) + FIXME("flags 0x%08x ignored\n", dwFlags); + if(lpResults->lpClass) + FIXME("classes not implemented\n"); if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER)) FIXME("Caret positions for complex scripts not implemented\n"); - nSet = (UINT)uCount; - if(nSet > lpResults->nGlyphs) - nSet = lpResults->nGlyphs; + nSet = (UINT)uCount; + if(nSet > lpResults->nGlyphs) + nSet = lpResults->nGlyphs; - /* return number of initialized fields */ - lpResults->nGlyphs = nSet; + /* return number of initialized fields */ + lpResults->nGlyphs = nSet; - if((dwFlags&GCP_REORDER)==0 ) - { - /* Treat the case where no special handling was requested in a fastpath way */ - /* copy will do if the GCP_REORDER flag is not set */ - if(lpResults->lpOutString) - memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR)); - - if(lpResults->lpOrder) - { - for(i = 0; i < nSet; i++) - lpResults->lpOrder[i] = i; - } - } else - { - BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL, NULL ); - } + if((dwFlags&GCP_REORDER)==0 ) + { + /* Treat the case where no special handling was requested in a fastpath way */ + /* copy will do if the GCP_REORDER flag is not set */ + if(lpResults->lpOutString) + memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR)); - /* FIXME: Will use the placement chars */ - if (lpResults->lpDx) - { - int c; - for (i = 0; i < nSet; i++) - { - if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) - lpResults->lpDx[i]= c; - } - } + if(lpResults->lpOrder) + { + for(i = 0; i < nSet; i++) + lpResults->lpOrder[i] = i; + } + } + else + { + BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, + nSet, lpResults->lpOrder, NULL, NULL ); + } + + /* FIXME: Will use the placement chars */ + if (lpResults->lpDx) + { + int c; + for (i = 0; i < nSet; i++) + { + if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) + lpResults->lpDx[i]= c; + } + } if (lpResults->lpCaretPos && !(dwFlags & GCP_REORDER)) { int pos = 0; - + lpResults->lpCaretPos[0] = 0; for (i = 1; i < nSet; i++) if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size)) lpResults->lpCaretPos[i] = (pos += size.cx); } - + if(lpResults->lpGlyphs) - GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); + GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) - ret = MAKELONG(size.cx, size.cy); + ret = MAKELONG(size.cx, size.cy); return ret; }

1 0

Andrew Talbot : dsound: Indentation fix.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: b0e95d27a9f816ba3319ce5e48e51f175f44713c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e95d27a9f816ba3319ce5e4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:30 2012 +0000 dsound: Indentation fix. --- dlls/dsound/buffer.c | 8 +++----- dlls/dsound/primary.c | 14 ++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cf4d2ec..e8fc5f3 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -607,11 +607,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (!p2) x2 = 0; - if((p1 && ((BYTE*)p1 < This->buffer->memory || - (BYTE*)p1 >= This->buffer->memory + This->buflen)) || - (p2 && ((BYTE*)p2 < This->buffer->memory || - (BYTE*)p2 >= This->buffer->memory + This->buflen))) - return DSERR_INVALIDPARAM; + if((p1 && ((BYTE*)p1 < This->buffer->memory || (BYTE*)p1 >= This->buffer->memory + This->buflen)) || + (p2 && ((BYTE*)p2 < This->buffer->memory || (BYTE*)p2 >= This->buffer->memory + This->buflen))) + return DSERR_INVALIDPARAM; if (x1 || x2) { diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0964f9b..3ac928b 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -293,9 +293,9 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) else device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; - FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); - FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - device->playpos = 0; + FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); + FillMemory(device->mix_buffer, device->mix_buffer_len, 0); + device->playpos = 0; if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && @@ -1085,11 +1085,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void * return DSERR_PRIOLEVELNEEDED; } - if((p1 && ((BYTE*)p1 < device->buffer || - (BYTE*)p1 >= device->buffer + device->buflen)) || - (p2 && ((BYTE*)p2 < device->buffer || - (BYTE*)p2 >= device->buffer + device->buflen))) - return DSERR_INVALIDPARAM; + if ((p1 && ((BYTE*)p1 < device->buffer || (BYTE*)p1 >= device->buffer + device->buflen)) || + (p2 && ((BYTE*)p2 < device->buffer || (BYTE*)p2 >= device->buffer + device->buflen))) + return DSERR_INVALIDPARAM; return DS_OK; }

1 0

Francois Gouget : testbot/build: Don' t force WineTestBot to be installed in the same location on the build VM and the WineTestBot server .
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: tools Branch: master Commit: 320347551427fb2998a7cd493c25393d855bbbb0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=320347551427fb2998a7cd49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:01:24 2012 +0100 testbot/build: Don't force WineTestBot to be installed in the same location on the build VM and the WineTestBot server. --- testbot/bin/WineRunBuild.pl | 15 +++++++-------- testbot/bin/WineRunReconfig.pl | 8 +++----- testbot/doc/INSTALL.txt | 3 ++- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 9fd23a7..faf777e 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -237,14 +237,14 @@ if (defined($ErrMessage)) } my $FileName = $Step->FileName; $ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", - "$DataDir/staging/$FileName"); + "staging/$FileName"); if (defined($ErrMessage)) { FatalError "Can't copy patch to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } my $Script = "#!/bin/sh\n"; -$Script .= "$BinDir/build/Build.pl $FileName " . $Step->FileType . +$Script .= "../bin/build/Build.pl $FileName " . $Step->FileType . " $BaseName 32"; if ($Run64) { @@ -254,15 +254,14 @@ $Script .= "\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { - $VM->CopyFileFromGuestToHost("$LogDir/Build.log", - $FullRawlogFileName); + $VM->CopyFileFromGuestToHost("Build.log", $FullRawlogFileName); ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -$ErrMessage = $VM->CopyFileFromGuestToHost("$LogDir/Build.log", - $FullRawlogFileName); +$ErrMessage = $VM->CopyFileFromGuestToHost("Build.log", $FullRawlogFileName); +LogMsg "263 ErrMessage=[", $ErrMessage || "<undef>", "]\n"; if (defined($ErrMessage)) { FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, @@ -285,11 +284,11 @@ foreach my $OtherStep (@{$Job->Steps->GetItems()}) my $TestExecutable; if ($Step->FileType ne "patchprograms") { - $TestExecutable = "$DataDir/build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; + $TestExecutable = "build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; } else { - $TestExecutable = "$DataDir/build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; + $TestExecutable = "build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; } $ErrMessage = $VM->CopyFileFromGuestToHost($TestExecutable, "$OtherStepDir/$OtherFileName"); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 47ac72e..4f86e10 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -198,19 +198,17 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n$BinDir/build/Reconfig.pl\n"; +my $Script = "#!/bin/sh\n../bin/build/Reconfig.pl\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { - $VM->CopyFileFromGuestToHost("$LogDir/Reconfig.log", - $FullRawlogFileName); + $VM->CopyFileFromGuestToHost("Reconfig.log", $FullRawlogFileName); ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -$ErrMessage = $VM->CopyFileFromGuestToHost("$LogDir/Reconfig.log", - $FullRawlogFileName); +$ErrMessage = $VM->CopyFileFromGuestToHost("Reconfig.log", $FullRawlogFileName); if (defined($ErrMessage)) { FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index b780de0..f57ed17 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -144,7 +144,8 @@ Dependencies: - In the winehq account, run Reconfig.pl. Check $HOME/tools/testbot/log/Reconfig.log to make sure it succeeded. -- Start the TestAgent server: ./bin/build/testagentd PORT SRCHOST +- Start the TestAgent server from the var directory: + cd $HOME/tools/testbot/var && ../bin/build/testagentd PORT SRCHOST Where PORT is the $AgentPort that was configured in ConfigLocal.pl on the WineTestBot server, and SRCHOST is either omitted or the hostname of the WineTestBot server.

1 0

Francois Gouget : testbot: Document the move of the ConfigLocal.pl file.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: tools Branch: master Commit: 180ef4eba16f09400fbe1ab9c1e1b8dabc84145f URL: http://source.winehq.org/git/tools.git/?a=commit;h=180ef4eba16f09400fbe1ab9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 09:57:23 2012 +0100 testbot: Document the move of the ConfigLocal.pl file. --- testbot/doc/INSTALL.txt | 4 ++-- testbot/lib/WineTestBot/Config.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 95b2a08..b780de0 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -49,8 +49,8 @@ General setup for the web site: - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. (typically "chkconfig winetestbot on" or "service winetestbot start") -- Copy lib/WineTestBot/ConfigLocalTemplate.pl to - lib/WineTestBot/ConfigLocal.pl and fill in the options for your site. +- Copy lib/WineTestBot/ConfigLocalTemplate.pl to ConfigLocal.pl in TestBot's + root directory and fill in the options for your site. - Restart Apache, you should now be able to browse to the home page. - Register a new account for yourself. - Using the mysql client, set the ResetCode in your Users entry to a diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 8d96c36..bb1cabb 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -88,12 +88,12 @@ $JobArchiveDays = 0; if (!$::BuildEnv) { $::BuildEnv = 0; - eval 'require "$::RootDir/ConfigLocal.pl";'; + eval 'require "$::RootDir/ConfigLocal.pl"'; if ($@) { - print STDERR "Please create a valid $::RootDir/ConfigLocal.pl, " . + print STDERR "Please create a valid $::RootDir/ConfigLocal.pl file; " . "use $::RootDir/lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; - exit; + exit 1; } require ObjectModel::DBIBackEnd;

1 0

Francois Gouget : testbot: Don' t try to dereference $TunnelDefaults if it is undefined.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: tools Branch: master Commit: 25e1f7303e908b69d022330a8581d32be11088e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=25e1f7303e908b69d022330a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 17:09:29 2012 +0100 testbot: Don't try to dereference $TunnelDefaults if it is undefined. --- testbot/lib/WineTestBot/VMs.pm | 3 ++- testbot/scripts/TestAgent | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f41453e..ccfa9f2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -369,7 +369,8 @@ sub _GetTunnel($) { my $ParsedURI = URI->new($URI); - my %TunnelInfo = %$TunnelDefaults; + my %TunnelInfo; + %TunnelInfo = %$TunnelDefaults if ($TunnelDefaults); $TunnelInfo{sshhost} = $ParsedURI->host; $TunnelInfo{sshport} = $ParsedURI->port; $TunnelInfo{username} = $ParsedURI->userinfo; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index f72531c..a4c8e1a 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -244,7 +244,7 @@ my $TunnelInfo; if ($TunnelOpt) { my $ParsedURI = URI->new($TunnelOpt); - %$TunnelInfo = %$TunnelDefaults; + %$TunnelInfo = %$TunnelDefaults if ($TunnelDefaults); $TunnelInfo->{sshhost} = $ParsedURI->host; $TunnelInfo->{sshport} = $ParsedURI->port; $TunnelInfo->{username} = $ParsedURI->userinfo;

1 0

Francois Gouget : testbot/TestAgent: Fix the check for the id_dsa and id_rsa keys.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: tools Branch: master Commit: a273816ac6c7816a485490d622ef6abe080f7f86 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a273816ac6c7816a485490d6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 16:39:52 2012 +0100 testbot/TestAgent: Fix the check for the id_dsa and id_rsa keys. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index cb63cfd..6b8bff7 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -807,7 +807,7 @@ sub _Connect($) if (defined $ENV{HOME} and !exists $AuthOptions{"privatekey"} and !exists $AuthOptions{"publickey"}) { - foreach my $key ("dsa", "rsa") + foreach my $key ("id_dsa", "id_rsa") { if (-f "$ENV{HOME}/.ssh/$key" and -f "$ENV{HOME}/.ssh/$key.pub") {

1 0