December 2012 - Wine-commits

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

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 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 : 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 : 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

André Hentschel : shlwapi/tests: Fix two tests on win8 .
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: b74b8776c02f54e50748e74a9267a6edef2c05e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74b8776c02f54e50748e74a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 10 23:37:13 2012 +0100 shlwapi/tests: Fix two tests on win8. --- dlls/shlwapi/tests/assoc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index a6f5e2d..389a9f5 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -78,7 +78,8 @@ static void test_getstring_bad(void) hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || - hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); @@ -133,7 +134,8 @@ static void test_getstring_basic(void) hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, &len); ok(hr == S_FALSE || - hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* Win9x/NT4 */ + hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win9x/NT4 */ || + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); if (hr != S_FALSE) {

1 0

Francois Gouget : testbot: Allow running the scripts using a relative path.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 1ea3c37de85bc505e9fdd843b7f96facfaca9780 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ea3c37de85bc505e9fdd843… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:06:51 2012 +0100 testbot: Allow running the scripts using a relative path. Just make sure to turn it into an absolute path before we use it for the Perl module include path and for the $::RootDir variable. --- testbot/bin/CheckForWinetestUpdate.pl | 8 +++++++- testbot/bin/Engine.pl | 8 +++++++- testbot/bin/Janitor.pl | 8 +++++++- testbot/bin/PingEngine.pl | 8 +++++++- testbot/bin/RevertVM.pl | 8 +++++++- testbot/bin/WinePatchesMLSubmit.pl | 8 +++++++- testbot/bin/WinePatchesWebGet.pl | 8 +++++++- testbot/bin/WinePatchesWebNotify.pl | 8 +++++++- testbot/bin/WineRunBuild.pl | 8 +++++++- testbot/bin/WineRunReconfig.pl | 8 +++++++- testbot/bin/WineRunTask.pl | 8 +++++++- testbot/bin/WineSendLog.pl | 8 +++++++- testbot/bin/build/Build.pl | 8 +++++++- testbot/bin/build/Reconfig.pl | 8 +++++++- testbot/lib/WineTestBot/Config.pm | 8 ++++++++ testbot/scripts/CheckWineTestBot.pl | 8 +++++++- testbot/scripts/TestAgent | 8 +++++++- 17 files changed, 120 insertions(+), 16 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 89c828f..2e28cdc 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -24,7 +24,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f9be03a..a26ac17 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -22,7 +22,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 57aa172..0c8b77f 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/PingEngine.pl b/testbot/bin/PingEngine.pl index ef43807..2fb1b70 100755 --- a/testbot/bin/PingEngine.pl +++ b/testbot/bin/PingEngine.pl @@ -22,7 +22,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 8fbc22a..2d8bf71 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -25,7 +25,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 7ee4ecf..ffc65cb 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -24,7 +24,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WinePatchesWebGet.pl b/testbot/bin/WinePatchesWebGet.pl index ed84a50..85f7986 100755 --- a/testbot/bin/WinePatchesWebGet.pl +++ b/testbot/bin/WinePatchesWebGet.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WinePatchesWebNotify.pl b/testbot/bin/WinePatchesWebNotify.pl index 6940d76..0fd0318 100755 --- a/testbot/bin/WinePatchesWebNotify.pl +++ b/testbot/bin/WinePatchesWebNotify.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 40c46e4..9fd23a7 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 67bb07b..47ac72e 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index b101aff..8e7aeff 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -22,7 +22,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index b039e2e..04e9009 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index c2e53e6..8ecbd09 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -24,7 +24,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 89296bc..cc8e76e 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -24,7 +24,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 71cf1c6..9a16fe6 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -48,6 +48,14 @@ require Exporter; $JobPurgeDays $JobArchiveDays $WebHostName); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); +if ($::RootDir !~ m=^/=) +{ + require File::Basename; + my $name0 = File::Basename::basename($0); + print STDERR "$name0:error: \$::RootDir must be set to an absolute path\n"; + exit 1; +} + $LogDir = "$::RootDir/var"; $DataDir = "$::RootDir/var"; $BinDir = "$::RootDir/bin"; diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index b749eff..6415dc3 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -22,7 +22,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index db31a3d..b861ba2 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib";

1 0

Francois Gouget : testbot: Capture the worker scripts Perl errors in the general log.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 8bcaf6c8510abeb662b0ad0e61232d7c1c2fa432 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8bcaf6c8510abeb662b0ad0e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:07:45 2012 +0100 testbot: Capture the worker scripts Perl errors in the general log. Also simplify the fork()+exec() code a bit. --- testbot/bin/Engine.pl | 50 +++++++++++++++++---------------------- testbot/lib/WineTestBot/Log.pm | 18 ++++++++++++++ testbot/lib/WineTestBot/VMs.pm | 17 ++++++++----- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a26ac17..e233e80 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -120,18 +120,16 @@ sub HandleJobStatusChange { $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - exec("$BinDir/${ProjectName}SendLog.pl $JobKey"); + LogMsg "Unable to fork for ${ProjectName}SendLog.pl: $!\n"; } - if (defined($Pid) && ! $Pid) + elsif (!$Pid) { - LogMsg "Unable to exec ${ProjectName}SendLog.pl : $!\n"; - exit; - } - if (! defined($Pid)) - { - LogMsg "Unable to fork for ${ProjectName}SendLog.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/${ProjectName}SendLog.pl $JobKey") or + LogMsg "Unable to exec ${ProjectName}SendLog.pl: $!\n"; + exit(1); } } @@ -214,18 +212,16 @@ sub CheckForWinetestUpdate $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) - { - exec("$BinDir/CheckForWinetestUpdate.pl $Bits"); - } - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - LogMsg "Unable to exec CheckForWinetestUpdate.pl : $!\n"; - exit; + LogMsg "Unable to fork for CheckForWinetestUpdate.pl: $!\n"; } - if (! defined($Pid)) + elsif (!$Pid) { - LogMsg "Unable to fork for CheckForWinetestUpdate.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/CheckForWinetestUpdate.pl $Bits") or + LogMsg "Unable to exec CheckForWinetestUpdate.pl: $!\n"; + exit(1); } } @@ -365,19 +361,17 @@ sub HandleWinePatchWebNotification { $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - exec("$BinDir/WinePatchesWebGet.pl " . ($MaxExistingWebPatchId + 1) . - " " . $LatestWebPatchId); - } - if (defined($Pid) && ! $Pid) - { - LogMsg "Unable to exec WinePatchesWebGet.pl : $!\n"; - exit; + LogMsg "Unable to fork for WinePatchesWebGet.pl: $!\n"; } - if (! defined($Pid)) + elsif (!$Pid) { - LogMsg "Unable to fork for WinePatchesWebGet.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/WinePatchesWebGet.pl " . ($MaxExistingWebPatchId + 1) . + " " . $LatestWebPatchId) or + LogMsg "Unable to exec WinePatchesWebGet.pl: $!\n"; + exit(1); } } diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 102b74d..6982943 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -57,4 +57,22 @@ sub LogMsg(@) print $logfile scalar localtime, " ", $logprefix, ": ", @_ if ($logfile); } +sub SetupRedirects() +{ + if (defined $logfile) + { + if (open(STDERR, ">>&", $logfile)) + { + # Make sure stderr still flushes after each print + my $tmp=select(STDERR); + $| = 1; + select($tmp); + } + else + { + LogMsg "unable to redirect stderr to the log file\n"; + } + } +} + 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 82ad379..a42fb12 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -526,16 +526,19 @@ sub RunRevert $self->GetBackEnd()->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - $ENV{PATH} = "/usr/bin:/bin"; - delete $ENV{ENV}; - exec("$BinDir/RevertVM.pl", $self->GetKey()); - exit; + return "Unable to start child process: $!"; } - if (! defined($Pid)) + elsif (!$Pid) { - return "Unable to start child process: $!"; + $ENV{PATH} = "/usr/bin:/bin"; + delete $ENV{ENV}; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/RevertVM.pl", $self->GetKey()) or + require WineTestBot::Log; + WineTestBot::Log::LogMsg "Unable to exec RevertVM.pl: $!\n"; + exit(1); } return undef;

1 0

Francois Gouget : testbot: Capture the task scripts Perl errors in the task 's generic error log.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 2ca0272e36a7c5b3243c88288105ab044535bd80 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ca0272e36a7c5b3243c8828… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:07:53 2012 +0100 testbot: Capture the task scripts Perl errors in the task's generic error log. Also simplify the fork()+exec() code a bit. --- testbot/lib/WineTestBot/Tasks.pm | 56 +++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 19 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index adba173..79622de 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -80,35 +80,53 @@ sub Run $self->Status("running"); $self->Save(); + my $Job = WineTestBot::Jobs::CreateJobs()->GetItem($JobId); + my $Step = $Job->Steps->GetItem($StepNo); + my $RunScript; + if ($Step->Type eq "build") + { + $RunScript = "RunBuild.pl"; + } + elsif ($Step->Type eq "reconfig") + { + $RunScript = "RunReconfig.pl"; + } + else + { + $RunScript = "RunTask.pl"; + } + $Step = undef; + $Job = undef; + $self->GetBackEnd()->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - my $Job = WineTestBot::Jobs::CreateJobs()->GetItem($JobId); - my $Step = $Job->Steps->GetItem($StepNo); - my $RunScript; - if ($Step->Type eq "build") - { - $RunScript = "$BinDir/${ProjectName}RunBuild.pl"; - } - elsif ($Step->Type eq "reconfig") + return "Unable to fork for ${ProjectName}$RunScript: $!"; + } + elsif (!$Pid) + { + # Capture Perl errors in the task's generic error log + my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/" . $self->No; + mkdir $TaskDir; + unlink "$TaskDir/err"; # truncate the log since this is a new run + if (open(STDERR, ">>", "$TaskDir/err")) { - $RunScript = "$BinDir/${ProjectName}RunReconfig.pl"; + # Make sure stderr still flushes after each print + my $tmp=select(STDERR); + $| = 1; + select($tmp); } else { - $RunScript = "$BinDir/${ProjectName}RunTask.pl"; + LogMsg "unable to redirect stderr to '$TaskDir/err'\n"; } - $Step = undef; - $Job = undef; $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; - exec($RunScript, $JobId, $StepNo, $self->No); - exit; - } - if (! defined($Pid)) - { - return "Unable to start child process: $!"; + exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $self->No) or + require WineTestBot::Log; + WineTestBot::Log::LogMsg "Unable to exec ${ProjectName}$RunScript: $!\n"; + exit(1); } $self->ChildPid($Pid);

1 0

Francois Gouget : testbot/TestAgent: Fix the $Debug variable default value and check.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 654bcdd17e53e80ed3b65ab6625e74e03bdb1bfd URL: http://source.winehq.org/git/tools.git/?a=commit;h=654bcdd17e53e80ed3b65ab6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:08:14 2012 +0100 testbot/TestAgent: Fix the $Debug variable default value and check. --- 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 8bc3e59..92d20bb 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -45,7 +45,7 @@ my %RpcNames=( $RPC_RM => 'rm', ); -my $Debug = 1; +my $Debug = 0; sub debug(@) { print STDERR @_ if ($Debug); @@ -787,7 +787,7 @@ sub _Connect($) require Net::SSH2; $self->{ssh} = Net::SSH2->new(); - $self->{ssh}->debug(1) if ($Debug > 2); + $self->{ssh}->debug(1) if ($Debug > 1); if (!$self->{ssh}->connect($self->{sshfd})) { $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror());

1 0