June 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : wineandroid: Implement SetLayeredWindowAttributes.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: wine Branch: master Commit: 52f53fe82e7cf4bd4b621c9dace8b34d0595a5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f53fe82e7cf4bd4b621c9da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:26:37 2017 +0200 wineandroid: Implement SetLayeredWindowAttributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 63 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 2 + 2 files changed, 65 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 78ce952..ef849f8 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -761,6 +761,27 @@ failed: return NULL; } +/*********************************************************************** + * set_surface_layered + */ +static void set_surface_layered( struct window_surface *window_surface, BYTE alpha, COLORREF color_key ) +{ + struct android_window_surface *surface = get_android_surface( window_surface ); + COLORREF prev_key; + BYTE prev_alpha; + + if (window_surface->funcs != &android_surface_funcs) return; /* we may get the null surface */ + + window_surface->funcs->lock( window_surface ); + prev_key = surface->color_key; + prev_alpha = surface->alpha; + surface->alpha = alpha; + set_color_key( surface, color_key ); + if (alpha != prev_alpha || surface->color_key != prev_key) /* refresh */ + *window_surface->funcs->get_bounds( window_surface ) = surface->header.rect; + window_surface->funcs->unlock( window_surface ); +} + static WNDPROC desktop_orig_wndproc; @@ -978,6 +999,30 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag /*********************************************************************** + * ANDROID_SetWindowStyle + */ +void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) +{ + struct android_win_data *data; + DWORD changed = style->styleNew ^ style->styleOld; + + if (hwnd == GetDesktopWindow()) return; + if (!(data = get_win_data( hwnd ))) return; + + if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ + { + if (is_argb_surface( data->surface )) + { + if (data->surface) window_surface_release( data->surface ); + data->surface = NULL; + } + else if (data->surface) set_surface_layered( data->surface, 255, CLR_INVALID ); + } + release_win_data( data ); +} + + +/*********************************************************************** * ANDROID_SetWindowRgn */ void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) @@ -993,6 +1038,24 @@ void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) } +/*********************************************************************** + * ANDROID_SetLayeredWindowAttributes + */ +void CDECL ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) +{ + struct android_win_data *data; + + if (!(flags & LWA_ALPHA)) alpha = 255; + if (!(flags & LWA_COLORKEY)) key = CLR_INVALID; + + if ((data = get_win_data( hwnd ))) + { + if (data->surface) set_surface_layered( data->surface, alpha, key ); + release_win_data( data ); + } +} + + /********************************************************************** * ANDROID_WindowMessage */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 766cc2c..8a6e72d 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,7 +9,9 @@ @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx +@ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn +@ cdecl SetWindowStyle(ptr long ptr) ANDROID_SetWindowStyle @ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0

Dmitry Timoshkov : oleaut32: Add an arguments check to LoadTypeLibEx.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: wine Branch: master Commit: cf45f3bcc81337ad6642a2856521e8294282c711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf45f3bcc81337ad6642a2856… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 7 00:29:37 2017 +0300 oleaut32: Add an arguments check to LoadTypeLibEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1c00d71..b88e663 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -472,6 +472,9 @@ HRESULT WINAPI LoadTypeLibEx( TRACE("(%s,%d,%p)\n",debugstr_w(szFile), regkind, pptLib); + if (!szFile || !pptLib) + return E_INVALIDARG; + *pptLib = NULL; res = TLB_ReadTypeLib(szFile, szPath, MAX_PATH + 1, (ITypeLib2**)pptLib);

1 0

Alexandre Julliard : wineandroid: Implement SetWindowRgn.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: wine Branch: master Commit: d61bcb9a2f5cb33bee16eb5b44e020359c72b03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61bcb9a2f5cb33bee16eb5b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:25:48 2017 +0200 wineandroid: Implement SetWindowRgn. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 16 ++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 17 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 203492a..78ce952 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -977,6 +977,22 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag } +/*********************************************************************** + * ANDROID_SetWindowRgn + */ +void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +{ + struct android_win_data *data; + + if ((data = get_win_data( hwnd ))) + { + if (data->surface) set_surface_region( data->surface, hrgn ); + release_win_data( data ); + } + else FIXME( "not supported on other process window %p\n", hwnd ); +} + + /********************************************************************** * ANDROID_WindowMessage */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 7379458..766cc2c 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx +@ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn @ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0

Nikolay Sivov : mpr/tests: Remove NT4 version check.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: wine Branch: master Commit: 7569f6c62e46bd58f084974ac2068a56e19bac58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7569f6c62e46bd58f084974ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 7 00:27:12 2017 +0300 mpr/tests: Remove NT4 version check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 085ecda..364ac2c 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -127,13 +127,13 @@ static void test_WNetGetRemoteName(void) ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - todo_wine{ - if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */ - (drive_type == DRIVE_REMOTE)) + todo_wine { + if(drive_type == DRIVE_REMOTE) ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, - "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); } + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); + } fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,

1 0

Nikolay Sivov : oleaut32/tests: Basic test for invalid arguments in LoadTypeLib/LoadTypeLibEx.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: wine Branch: master Commit: 19b944d49c28d1d8bb285621dc923cc5e7aef707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b944d49c28d1d8bb285621d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 7 00:29:38 2017 +0300 oleaut32/tests: Basic test for invalid arguments in LoadTypeLib/LoadTypeLibEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6d0585a..d8ff310 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4996,6 +4996,22 @@ static void test_LoadTypeLib(void) hres = LoadTypeLib(kernel32_dllW, &tl); ok(hres == TYPE_E_CANTLOADLIBRARY, "LoadTypeLib returned: %08x, expected TYPE_E_CANTLOADLIBRARY\n", hres); + + hres = LoadTypeLib(NULL, NULL); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + + tl = (void *)0xdeadbeef; + hres = LoadTypeLib(NULL, &tl); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + ok(tl == (void *)0xdeadbeef, "Got %p.\n", tl); + + hres = LoadTypeLibEx(NULL, REGKIND_NONE, NULL); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + + tl = (void *)0xdeadbeef; + hres = LoadTypeLibEx(NULL, REGKIND_NONE, &tl); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + ok(tl == (void *)0xdeadbeef, "Got %p.\n", tl); } static void test_SetVarHelpContext(void)

1 0

Rosanne DiMesio : Return 0 for empty wine-staging checkbox.
by Jeremy Newman June 7, 2017

June 7, 2017

Module: appdb Branch: master Commit: 638563248caa9eef00f212f2a9eb9ab520d5b6ec URL: http://source.winehq.org/git/appdb.git/?a=commit;h=638563248caa9eef00f212f2… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jun 7 11:53:17 2017 -0500 Return 0 for empty wine-staging checkbox. Based on a patch by Jeremy Newman. Fixes bug 43145. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/testData.php b/include/testData.php index 6a375ba..61b23a0 100644 --- a/include/testData.php +++ b/include/testData.php @@ -970,10 +970,14 @@ class testData{ // Ask for confirmation if changing the tested Wine versions, becase we want users // to submit new reports instead of updating existing ones when testing new Wines $oOldTest = new testData($this->iTestingId); - if($this->iTestingId && $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) && - getInput('bConfirmTestedVersionChange', $aValues) != 'true' - || $this->iTestingId && $oOldTest->iStaging != getInput('iStaging', $aValues) && - getInput('bConfirmTestedVersionChange', $aValues) != 'true') + if ( + $this->iTestingId + && (getInput('bConfirmTestedVersionChange', $aValues) != 'true') + && ( + $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) + || $oOldTest->iStaging != intval(getInput('iStaging', $aValues)) + ) + ) { $errors .= '<li>Are you sure you want to change the Wine version of the report? Please submit a new '. 'test report for every Wine version you test; this is useful for tracking Wine\'s progress. '. @@ -1029,7 +1033,7 @@ class testData{ $this->sTestedDate = $aValues['sTestedDate']; $this->iDistributionId = $aValues['iDistributionId']; $this->sTestedRelease = $aValues['sTestedRelease']; - $this->iStaging = $aValues['iStaging']; + $this->iStaging = intval($aValues['iStaging']); $this->sInstalls = $aValues['sInstalls']; $this->sRuns = $aValues['sRuns']; $this->sTestedRating = $aValues['sTestedRating'];

1 0

Francois Gouget : winetest: Improve quoting in the winetest.cron script.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: tools Branch: master Commit: d8888cc30f0ec1b224ecb13c34e5282dd8817f43 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d8888cc30f0ec1b224ecb13c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 11:09:17 2017 +0200 winetest: Improve quoting in the winetest.cron script. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 6b59f4f..7418f9e 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -30,20 +30,21 @@ then echo "$name0:error: you must specify the work directory as the first parameter" >&2 exit 1 fi -lock=/tmp/winetest.lock +lock="/tmp/winetest.lock" # expiration age (in days) before results get archived expire=120 -if [ ! -f $lock ]; then - touch $lock - cd $workdir +if [ ! -f "$lock" ] +then + touch "$lock" + cd "$workdir" refresh_index="" refresh_errors="" while true do - $tools/dissect + "$tools/dissect" case $? in 0) refresh_index=1 ;; 1) refresh_errors=1 ;; @@ -52,7 +53,7 @@ if [ ! -f $lock ]; then done if [ -n "$refresh_index" ] then - while $tools/gather; do true; done + while "$tools/gather"; do true; done fi if [ ! -d data/tests -o ! -d old-data ] then @@ -60,18 +61,18 @@ if [ ! -f $lock ]; then refresh_index=1 refresh_errors=1 fi - [ -n "$refresh_index" ] && $tools/build-index - [ -n "$refresh_errors" ] && $tools/build-errors + [ -n "$refresh_index" ] && "$tools/build-index" + [ -n "$refresh_errors" ] && "$tools/build-errors" # archive old results ( set -e cd old-data - dir=`find . -maxdepth 1 -mtime +$expire -type d -print -quit` + dir=`find . -maxdepth 1 -mtime "+$expire" -type d -print -quit` test -n "$dir" - tar cfj $dir.tar.bz2 $dir - touch -r $dir $dir.tar.bz2 - rm -rf $dir + tar cfj "$dir.tar.bz2" "$dir" + touch -r "$dir" "$dir.tar.bz2" + rm -rf "$dir" ) # remove old test builds @@ -79,13 +80,13 @@ if [ ! -f $lock ]; then set -e mkdir -p builds cd builds - find . -mtime +$expire -name winetest\*.exe -print0 | \ + find . -mtime "+$expire" -name "winetest*.exe" -print0 | \ xargs -0 rm -f ) # remove old queue files - find queue -maxdepth 1 -mtime +30 -name err\* -print0 | xargs -0 rm -rf - find queue -maxdepth 1 -mtime +30 -name CGI\* -print0 | xargs -0 rm -f + find queue -maxdepth 1 -mtime +30 -name "err*" -print0 | xargs -0 rm -rf + find queue -maxdepth 1 -mtime +30 -name "CGI*" -print0 | xargs -0 rm -f - rm $lock + rm "$lock" fi

1 0

Francois Gouget : winetest: Let the scripts autodetect the work directory.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: tools Branch: master Commit: c9170c8554a3837712b40f529c56165bbbc9f347 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c9170c8554a3837712b40f52… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 11:07:29 2017 +0200 winetest: Let the scripts autodetect the work directory. The scripts now automatically recognize the work directory if it is the current directory as is the case when invoked from the cron script. This makes winetest.conf's $workdir setting unnecessary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 1 - winetest/build-errors | 10 ++++++++-- winetest/build-index | 13 ++++++++++--- winetest/dissect | 13 ++++++++++--- winetest/gather | 14 ++++++++++---- winetest/winetest.conf | 2 -- 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index d13d1cf..b10788c 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -32,7 +32,6 @@ Read-only source code account: should be available as $HOME/tools/winetest/INSTALL.txt). git clone git://source.winehq.org/git/tools.git - Edit $HOME/tools/winetest/winetest.conf to set: - $workdir = "/home/winehq/sites/winetest"; $gitdir = "/home/wine/wine.git"; Web site account: diff --git a/winetest/build-errors b/winetest/build-errors index 2d25ae3..f41824f 100755 --- a/winetest/build-errors +++ b/winetest/build-errors @@ -33,8 +33,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir/; -require "winetest.conf"; + my $name0=$0; $name0 =~ s+^.*/++; @@ -63,6 +62,13 @@ sub long_date($) # Generate a table of the errors encountered during processing # +require Cwd; +my $workdir = Cwd::cwd(); +if (!-f "$workdir/report.css") +{ + error("'$workdir' is not a valid work directory\n"); + exit 2; +} chdir($workdir) or die "could not chdir to the work directory: $!"; my @errors; diff --git a/winetest/build-index b/winetest/build-index index dcd9795..dc413cd 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -34,7 +34,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -62,11 +62,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -113,6 +113,13 @@ my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \% # Grab the build list and archive the old results # +require Cwd; +my $workdir = Cwd::cwd(); +if (!-f "$workdir/report.css") +{ + error("'$workdir' is not a valid work directory\n"); + exit 2; +} chdir($workdir) or die "could not chdir to the work directory: $!"; my @builds; diff --git a/winetest/dissect b/winetest/dissect index 99e50fb..1e4a5fe 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -48,7 +48,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; +use vars qw/$gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; my $name0=$0; @@ -81,11 +81,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -105,6 +105,13 @@ sub short_date($) # Command line processing # +require Cwd; +my $workdir = Cwd::cwd(); +if (!-f "$workdir/report.css") +{ + error("'$workdir' is not a valid work directory\n"); + exit 2; +} chdir($workdir) or die "could not chdir to the work directory: $!"; my ($update, $report); diff --git a/winetest/gather b/winetest/gather index 94f3541..28227a3 100755 --- a/winetest/gather +++ b/winetest/gather @@ -45,7 +45,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -76,11 +76,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -175,7 +175,13 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Pick a build to work on # - +require Cwd; +my $workdir = Cwd::cwd(); +if (!-f "$workdir/report.css") +{ + error("'$workdir' is not a valid work directory\n"); + exit 2; +} chdir($workdir) or die "could not chdir to the work directory: $!"; my ($outdated,undef) = glob "data/*/outdated"; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index ba15514..0d35d11 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -1,7 +1,5 @@ # Hey Emacs! This is a -*-cperl-*- file! -$workdir = "/home/winehq/opt/winetest"; - $gitdir = "/home/winehq/opt/source/git/wine.git"; $gitweb = "//source.winehq.org/git/wine.git";

1 0

Francois Gouget : winetest: Get the work directory directly from the web server.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: tools Branch: master Commit: 0708ab216e005ae740a5346ca6ae1bb308cbe6a5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0708ab216e005ae740a5346c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 11:07:22 2017 +0200 winetest: Get the work directory directly from the web server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/vhost_winetest.conf | 1 + winetest/winetest.cgi | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf index 797aac3..6d72ccc 100644 --- a/winetest/vhost_winetest.conf +++ b/winetest/vhost_winetest.conf @@ -17,6 +17,7 @@ BEGIN { unshift @INC, "/home/wine/tools/winetest"; + $::workdir = "/home/winehq/sites/winetest"; } </Perl> diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 9a4ad71..a2aebef 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -18,7 +18,7 @@ use strict; use warnings; -use vars qw/$workdir $maxfilesize/; +use vars qw/$maxfilesize/; BEGIN { require "winetest.conf"; @@ -29,7 +29,7 @@ use File::Temp qw(tempdir); use CGI qw(:standard); # Cater for some overhead $CGI::POST_MAX = $maxfilesize + 1024; -$ENV{TMPDIR} = "$workdir/queue"; +$ENV{TMPDIR} = "$::workdir/queue"; my $name = param ("reportfile"); my $error = cgi_error (); @@ -47,7 +47,7 @@ sub move_file($) { my ($filename) = @_; my $orig = tmpFileName($filename); - my $tmpdir = tempdir ("repXXXXX", DIR => "$workdir/queue"); + my $tmpdir = tempdir ("repXXXXX", DIR => "$::workdir/queue"); chmod 0777, $tmpdir; chmod 0666&~umask, $orig; my $size = -s $orig;

1 0

Francois Gouget : winetest/build-errors: Fix updating the errors.html file.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: tools Branch: master Commit: c42fe965c4cc18f562c51c24adc43fbd60e8eefc URL: http://source.winehq.org/git/tools.git/?a=commit;h=c42fe965c4cc18f562c51c24… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 10:53:17 2017 +0200 winetest/build-errors: Fix updating the errors.html file. build-errors expects the $filename variable to be set so it can use it to move the new file into place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/build-errors b/winetest/build-errors index f9ac4aa..2d25ae3 100755 --- a/winetest/build-errors +++ b/winetest/build-errors @@ -80,7 +80,8 @@ foreach my $dir (readdir DIR) } closedir DIR; -open OUT, ">data/errors.html.new" or die "cannot create 'data/errors.html.new'"; +my $filename = "data/errors.html"; +open OUT, ">$filename.new" or die "cannot create 'data/$filename.new'"; print OUT start_html( -title => "Errors caught during Wine test report processing", -style => {src => "/summary.css"},

1 0