wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Henri Verbeet : wined3d: Get rid of ENTER_GL / LEAVE_GL.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 78984cf46cd10a9359879273390b04d2659f704c URL: http://source.winehq.org/git/wine.git/?a=commit;h=78984cf46cd10a93598792733… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 10 21:54:36 2012 +0100 wined3d: Get rid of ENTER_GL / LEAVE_GL. --- dlls/wined3d/arb_program_shader.c | 74 ++++++++-------------------- dlls/wined3d/ati_fragment_shader.c | 6 +-- dlls/wined3d/buffer.c | 34 ------------- dlls/wined3d/context.c | 84 ++++++++----------------------- dlls/wined3d/device.c | 26 ---------- dlls/wined3d/directx.c | 35 +------------ dlls/wined3d/drawprim.c | 28 ++++------ dlls/wined3d/glsl_shader.c | 78 +++++++++-------------------- dlls/wined3d/nvidia_texture_shader.c | 4 +- dlls/wined3d/query.c | 20 -------- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 90 ++-------------------------------- dlls/wined3d/swapchain.c | 4 -- dlls/wined3d/texture.c | 10 +--- dlls/wined3d/utils.c | 32 +++--------- dlls/wined3d/volume.c | 2 - dlls/wined3d/wined3d_private.h | 9 --- 17 files changed, 100 insertions(+), 440 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78984cf46cd10a9359879…

1 0

Henri Verbeet : d3d10core: Get rid of a FIXME in d3d10_device_CreateGeometryShader().
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: fc50e2b70bcc91ae6f863f0f4433cbeb306feda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc50e2b70bcc91ae6f863f0f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 10 21:54:35 2012 +0100 d3d10core: Get rid of a FIXME in d3d10_device_CreateGeometryShader(). --- dlls/d3d10core/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7e909a9..8074380 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1314,7 +1314,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device struct d3d10_geometry_shader *object; HRESULT hr; - FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", + TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p.\n", iface, byte_code, byte_code_length, shader); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));

1 0

Henri Verbeet : ddraw: Avoid LPDDDEVICEIDENTIFIER2.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: a6289a21a1ca3aa184d012cae01764ea31831647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6289a21a1ca3aa184d012cae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 10 21:54:34 2012 +0100 ddraw: Avoid LPDDDEVICEIDENTIFIER2. --- include/ddraw.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 7666199..f643811 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1788,7 +1788,7 @@ DECLARE_INTERFACE_(IDirectDraw7,IUnknown) /*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface7 **surface) PURE; /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; /*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE; -/*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) PURE; +/*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ DDDEVICEIDENTIFIER2 *identifier, DWORD flags) PURE; /* added in v7 */ /*70*/ STDMETHOD(StartModeTest)(THIS_ LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) PURE; /*74*/ STDMETHOD(EvaluateMode)(THIS_ DWORD dwFlags, DWORD *pTimeout) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDDDEVICEIDENTIFIER.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 3f8f10128843cb0e10307e37d6e0ea933afdc024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f8f10128843cb0e10307e37d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 10 21:54:33 2012 +0100 ddraw: Avoid LPDDDEVICEIDENTIFIER. --- include/ddraw.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 638776a..7666199 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1670,7 +1670,7 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) /*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface4 **surface) PURE; /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; /*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE; -/*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) PURE; +/*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ DDDEVICEIDENTIFIER *identifier, DWORD flags) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : ddraw: Avoid LPDDBLTBATCH.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 22fb3269396782e95c5d08285205324564b3b502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fb3269396782e95c5d08285… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 10 21:54:32 2012 +0100 ddraw: Avoid LPDDBLTBATCH. --- include/ddraw.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 5f08c89..638776a 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1885,7 +1885,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) /*10*/ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; /*14*/ STDMETHOD(Blt)(THIS_ RECT *dst_rect, IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) PURE; -/*18*/ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; +/*18*/ STDMETHOD(BltBatch)(THIS_ DDBLTBATCH *batch, DWORD count, DWORD flags) PURE; /*1c*/ STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags) PURE; /*20*/ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface *attachment) PURE; @@ -2019,7 +2019,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; STDMETHOD(Blt)(THIS_ RECT *dst_rect, IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) PURE; - STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; + STDMETHOD(BltBatch)(THIS_ DDBLTBATCH *batch, DWORD count, DWORD flags) PURE; STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags) PURE; STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface2 *attachment) PURE; @@ -2165,7 +2165,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; STDMETHOD(Blt)(THIS_ RECT *dst_rest, IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) PURE; - STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; + STDMETHOD(BltBatch)(THIS_ DDBLTBATCH *batch, DWORD count, DWORD flags) PURE; STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags) PURE; STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface3 *attachment) PURE; @@ -2316,7 +2316,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; STDMETHOD(Blt)(THIS_ RECT *dst_rect, IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) PURE; - STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; + STDMETHOD(BltBatch)(THIS_ DDBLTBATCH *batch, DWORD count, DWORD flags) PURE; STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags) PURE; STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface4 *attachment) PURE; @@ -2483,7 +2483,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; STDMETHOD(Blt)(THIS_ RECT *dst_rect, IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) PURE; - STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; + STDMETHOD(BltBatch)(THIS_ DDBLTBATCH *batch, DWORD count, DWORD flags) PURE; STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD flags) PURE; STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface7 *attachment) PURE;

1 0

Alexandre Julliard : gdi32: Add a level of pointers to the glyph cache to avoid the need for locking individual glyphs .
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: a3cf48afada1ab525ed5c60cea8dcbf64f94c0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3cf48afada1ab525ed5c60ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 21:42:18 2012 +0100 gdi32: Add a level of pointers to the glyph cache to avoid the need for locking individual glyphs. --- dlls/gdi32/dibdrv/graphics.c | 65 +++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index aadd9b5..bb4ec81 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -40,6 +40,9 @@ enum glyph_type GLYPH_NBTYPES }; +#define GLYPH_CACHE_PAGE_SIZE 0x100 +#define GLYPH_CACHE_PAGES (0x10000 / GLYPH_CACHE_PAGE_SIZE) + struct cached_font { struct list entry; @@ -48,8 +51,7 @@ struct cached_font LOGFONTW lf; XFORM xform; UINT aa_flags; - UINT nb_glyphs[GLYPH_NBTYPES]; - struct cached_glyph **glyphs[GLYPH_NBTYPES]; + struct cached_glyph **glyphs[GLYPH_NBTYPES][GLYPH_CACHE_PAGES]; }; static struct list font_cache = LIST_INIT( font_cache ); @@ -494,7 +496,7 @@ static int font_cache_cmp( const struct cached_font *p1, const struct cached_fon static struct cached_font *add_cached_font( HDC hdc, HFONT hfont, UINT aa_flags ) { struct cached_font font, *ptr, *last_unused = NULL; - UINT i = 0, j; + UINT i = 0, j, k; GetObjectW( hfont, sizeof(font.lf), &font.lf ); GetTransform( hdc, 0x204, &font.xform ); @@ -530,8 +532,13 @@ static struct cached_font *add_cached_font( HDC hdc, HFONT hfont, UINT aa_flags ptr = last_unused; for (i = 0; i < GLYPH_NBTYPES; i++) { - for (j = 0; j < ptr->nb_glyphs[i]; j++) HeapFree( GetProcessHeap(), 0, ptr->glyphs[i][j] ); - HeapFree( GetProcessHeap(), 0, ptr->glyphs[i] ); + for (j = 0; j < GLYPH_CACHE_PAGES; j++) + { + if (!ptr->glyphs[i][j]) continue; + for (k = 0; k < GLYPH_CACHE_PAGE_SIZE; k++) + HeapFree( GetProcessHeap(), 0, ptr->glyphs[i][j][k] ); + HeapFree( GetProcessHeap(), 0, ptr->glyphs[i][j] ); + } } list_remove( &ptr->entry ); } @@ -543,11 +550,7 @@ static struct cached_font *add_cached_font( HDC hdc, HFONT hfont, UINT aa_flags *ptr = font; ptr->ref = 1; - for (i = 0; i < GLYPH_NBTYPES; i++) - { - ptr->glyphs[i] = NULL; - ptr->nb_glyphs[i] = 0; - } + memset( ptr->glyphs, 0, sizeof(ptr->glyphs) ); done: list_add_head( &font_cache, &ptr->entry ); LeaveCriticalSection( &font_cache_cs ); @@ -560,33 +563,40 @@ void release_cached_font( struct cached_font *font ) if (font) InterlockedDecrement( &font->ref ); } -static void add_cached_glyph( struct cached_font *font, UINT index, UINT flags, struct cached_glyph *glyph ) +static struct cached_glyph *add_cached_glyph( struct cached_font *font, UINT index, UINT flags, + struct cached_glyph *glyph ) { + struct cached_glyph *ret; enum glyph_type type = (flags & ETO_GLYPH_INDEX) ? GLYPH_INDEX : GLYPH_WCHAR; + UINT page = index / GLYPH_CACHE_PAGE_SIZE; + UINT entry = index % GLYPH_CACHE_PAGE_SIZE; - if (index >= font->nb_glyphs[type]) + if (!font->glyphs[type][page]) { - UINT new_count = (index + 128) & ~127; - struct cached_glyph **new; + struct cached_glyph **ptr; - if (font->glyphs[type]) - new = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - font->glyphs[type], new_count * sizeof(*new) ); - else - new = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*new) ); - if (!new) return; - font->glyphs[type] = new; - font->nb_glyphs[type] = new_count; + ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, GLYPH_CACHE_PAGE_SIZE * sizeof(*ptr) ); + if (!ptr) + { + HeapFree( GetProcessHeap(), 0, glyph ); + return NULL; + } + if (InterlockedCompareExchangePointer( (void **)&font->glyphs[type][page], ptr, NULL )) + HeapFree( GetProcessHeap(), 0, ptr ); } - font->glyphs[type][index] = glyph; + ret = InterlockedCompareExchangePointer( (void **)&font->glyphs[type][page][entry], glyph, NULL ); + if (!ret) ret = glyph; + else HeapFree( GetProcessHeap(), 0, glyph ); + return ret; } static struct cached_glyph *get_cached_glyph( struct cached_font *font, UINT index, UINT flags ) { enum glyph_type type = (flags & ETO_GLYPH_INDEX) ? GLYPH_INDEX : GLYPH_WCHAR; + UINT page = index / GLYPH_CACHE_PAGE_SIZE; - if (index < font->nb_glyphs[type]) return font->glyphs[type][index]; - return NULL; + if (!font->glyphs[type][page]) return NULL; + return font->glyphs[type][page][index % GLYPH_CACHE_PAGE_SIZE]; } /********************************************************************** @@ -733,8 +743,7 @@ static struct cached_glyph *cache_glyph_bitmap( HDC hdc, struct cached_font *fon done: glyph->metrics = metrics; - add_cached_glyph( font, index, flags, glyph ); - return glyph; + return add_cached_glyph( font, index, flags, glyph ); } static void render_string( HDC hdc, dib_info *dib, struct cached_font *font, INT x, INT y, @@ -758,7 +767,6 @@ static void render_string( HDC hdc, dib_info *dib, struct cached_font *font, INT if (glyph_dib.bit_count == 8) get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); - EnterCriticalSection( &font_cache_cs ); for (i = 0; i < count; i++) { if (!(glyph = get_cached_glyph( font, str[i], flags )) && @@ -789,7 +797,6 @@ static void render_string( HDC hdc, dib_info *dib, struct cached_font *font, INT y += glyph->metrics.gmCellIncY; } } - LeaveCriticalSection( &font_cache_cs ); } BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits *bits,

1 0

Francois Gouget : testbot/TestAgent: Automatically use the id_dsa and id_rsa keys for Net:SSH2.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: ada73ac9601d41eb84849b564d61a3ab362ddb91 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ada73ac9601d41eb84849b56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 17:55:09 2012 +0100 testbot/TestAgent: Automatically use the id_dsa and id_rsa keys for Net:SSH2. Newer Net:SSH2 versions will automatically detect and use the id_dsa keys but older ones don't autodetect anything. --- testbot/lib/WineTestBot/TestAgent.pm | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index e04827a..cb63cfd 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -802,6 +802,21 @@ sub _Connect($) { $AuthOptions{$Key} = $Tunnel->{$Key} if (defined $Tunnel->{$Key}); } + # Old versions of Net::SSH2 won't automatically find DSA keys, and new ones + # still won't automatically find RSA ones. + if (defined $ENV{HOME} and !exists $AuthOptions{"privatekey"} and + !exists $AuthOptions{"publickey"}) + { + foreach my $key ("dsa", "rsa") + { + if (-f "$ENV{HOME}/.ssh/$key" and -f "$ENV{HOME}/.ssh/$key.pub") + { + $AuthOptions{"privatekey"} = "$ENV{HOME}/.ssh/$key"; + $AuthOptions{"publickey"} = "$ENV{HOME}/.ssh/$key.pub"; + last; + } + } + } # Interactive authentication makes no sense with automatic reconnects $AuthOptions{interact} = 0; if (!$self->{ssh}->auth(%AuthOptions))

1 0

Francois Gouget : testbot/TestAgent: Small fixes in the authentication data setup.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: f49d5bd90360276afbea2603f398a5850d29bf01 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f49d5bd90360276afbea2603… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 17:46:17 2012 +0100 testbot/TestAgent: Small fixes in the authentication data setup. We don't allow interactive login methods so there's no point merging the 'interact' setting from the configuration defaults. Also Net::SSH2 does not like getting undefined settings so don't override potentially defined values with undefined ones. --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 92d20bb..e04827a 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -798,9 +798,9 @@ sub _Connect($) my $Tunnel = $self->{tunnel}; my %AuthOptions=(username => $Tunnel->{username} || $ENV{USER}); foreach my $Key ("username", "password", "publickey", "privatekey", - "hostname", "local_username", "interact") + "hostname", "local_username") { - $AuthOptions{$Key} = $Tunnel->{$Key} if (exists $Tunnel->{$Key}); + $AuthOptions{$Key} = $Tunnel->{$Key} if (defined $Tunnel->{$Key}); } # Interactive authentication makes no sense with automatic reconnects $AuthOptions{interact} = 0;

1 0

Francois Gouget : testbot/TestAgent: Add global configuration options for the SSH tunneling.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: f486603d9079ce1905e8241d4794d06180489745 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f486603d9079ce1905e8241d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 17:46:00 2012 +0100 testbot/TestAgent: Add global configuration options for the SSH tunneling. This makes it possible to use other SSH keys than just id_dsa. This also makes it possible to disable SSH tunneling entirely or to hardcode the SSH tunnel to use instead of using whatever VirtURI specifies. --- testbot/lib/WineTestBot/Config.pm | 8 ++++---- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 21 +++++++++++++++++++++ testbot/lib/WineTestBot/VMs.pm | 22 ++++++++++++---------- testbot/scripts/TestAgent | 20 +++++++++++--------- 4 files changed, 48 insertions(+), 23 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 9a16fe6..8d96c36 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -32,8 +32,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter - $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort - $JobPurgeDays $JobArchiveDays $WebHostName); + $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); require Exporter; @ISA = qw(Exporter); @@ -44,8 +44,8 @@ require Exporter; $SingleTimeout $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter - $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort - $JobPurgeDays $JobArchiveDays $WebHostName); + $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); if ($::RootDir !~ m=^/=) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 06afb77..38e6a3a 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -83,4 +83,25 @@ $WineTestBot::Config::LDAPEMailAttribute = undef; # The port the VM agents are listening on $WineTestBot::Config::AgentPort = undef; +# This specifies if and how to do SSH tunneling. +# - If unset then tunneling is automatic based on the VM's VirtURI setting. +# - If set to an SSH URI, then tunneling is performed using these parameters. +# - Any other setting disables SSH tunneling. In particular to disable +# tunneling for SSH VirtURIs it is recommended to set this to 'never'. +$Tunnel = undef; + +# If set this specifies the SSH tunnel parameters to be used for the +# TestAgent connection. This is mostly useful for parameters that cannot be +# specified through the SSH URI, like the key filenames. Listed below are +# the supported settings. For a full reference, see the Net::SSH2::auth() +# documentation. Note though that interactive methods are disabled. +# - username +# - password +# - publickey +# - privatekey +# - hostname +# - local_username +$WineTestBot::Config::TunnelDefaults = undef; + + 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index a42fb12..2d1c1fd 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -361,17 +361,19 @@ sub _GetTunnel($) { my ($self) = @_; - # Auto-detect the SSH settings based on the libvirt URI - my $VirtURI = $self->VirtURI; - if ($VirtURI =~ s/^[a-z]+\+(?:ssh|libssh2):/ssh:/) + # Use either the tunnel specified in the configuration file + # or autodetect the settings based on the VM's VirtURI setting. + my $URI = $Tunnel || $self->VirtURI; + + if ($URI =~ s/^(?:[a-z]+\+)?(?:ssh|libssh2):/ssh:/) { - my $URI = URI->new($VirtURI); - my $TunnelInfo = { - sshhost => $URI->host, - sshport => $URI->port, - username => $URI->userinfo, - }; - return $TunnelInfo; + my $ParsedURI = URI->new($URI); + + my %TunnelInfo = %$TunnelDefaults; + $TunnelInfo{sshhost} = $ParsedURI->host; + $TunnelInfo{sshport} = $ParsedURI->port; + $TunnelInfo{username} = $ParsedURI->userinfo; + return \%TunnelInfo; } return undef; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 6d241b5..f72531c 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -53,7 +53,7 @@ my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); my (@Run, $RunIn, $RunOut, $RunErr); my $SendFlags = 0; my $RunFlags = 0; -my ($Port, $ConnectTimeout, $Timeout, $Tunnel); +my ($Port, $ConnectTimeout, $Timeout, $TunnelOpt); my $Usage; sub check_opt_val($$) @@ -95,7 +95,7 @@ while (@ARGV) } elsif ($arg eq "--tunnel") { - $Tunnel = check_opt_val($arg, $Tunnel); + $TunnelOpt = check_opt_val($arg, $TunnelOpt); } elsif ($arg eq "--sendfile-exe") { @@ -189,9 +189,9 @@ if (!defined $Usage) $Usage = 2; } $AgentPort = $Port if (defined $Port); - if (defined $Tunnel and $Tunnel !~ /^ssh:/) + if ($TunnelOpt and $TunnelOpt !~ /^ssh:/) { - error("only SSH proxies are supported\n"); + error("only SSH tunnels are supported\n"); $Usage = 2; } } @@ -239,13 +239,15 @@ if (defined $Usage) exit 0; } +$TunnelOpt = $Tunnel if (!defined $TunnelOpt); my $TunnelInfo; -if (defined $Tunnel) +if ($TunnelOpt) { - my $URI = URI->new($Tunnel); - $TunnelInfo = {sshhost => $URI->host, - sshport => $URI->port, - username => $URI->userinfo}; + my $ParsedURI = URI->new($TunnelOpt); + %$TunnelInfo = %$TunnelDefaults; + $TunnelInfo->{sshhost} = $ParsedURI->host; + $TunnelInfo->{sshport} = $ParsedURI->port; + $TunnelInfo->{username} = $ParsedURI->userinfo; } my $TA = TestAgent->new($Hostname, $AgentPort, $TunnelInfo);

1 0

Francois Gouget : testbot/testagentd: Reset the status when handling a new client.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 23453c79aa6a08d2891d7b32ad84f2006b7b07e7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=23453c79aa6a08d2891d7b32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:17:13 2012 +0100 testbot/testagentd: Reset the status when handling a new client. Otherwise, once the status has been set to FATAL, it cannot be set to anything else anymore, even for other clients. --- testbot/src/testagentd/testagentd.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index fc3a840..13d16e4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -155,6 +155,8 @@ void set_status(int newstatus, const char* format, ...) status = newstatus; if (newstatus == ST_FATAL) broken = 1; + else if (newstatus == ST_OK) + broken = 0; va_start(valist, format); vset_status_msg(format, valist); va_end(valist); @@ -1145,7 +1147,9 @@ int main(int argc, char** argv) { if (is_host_allowed(client, opt_srchost, addrlen)) { - broken = 0; + /* Reset the status so new non-fatal errors can be set */ + set_status(ST_OK, "ok"); + /* Send the version right away */ send_string(client, PROTOCOL_VERSION);

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012