January 2017 - Wine-commits

Francois Gouget : dxgi/tests: Some spelling fixes in ok() messages.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 442bbe921c7cf88c736f670cb91c8040eaa36ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442bbe921c7cf88c736f670cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:42:07 2017 +0100 dxgi/tests: Some spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d9cedff..db4c57e 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1260,7 +1260,7 @@ static void test_get_containing_output(void) output_count = 0; while (IDXGIAdapter_EnumOutputs(adapter, output_count, &output) != DXGI_ERROR_NOT_FOUND) { - ok(SUCCEEDED(hr), "Failed to enumarate output %u, hr %#x.\n", output_count, hr); + ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr); IDXGIOutput_Release(output); ++output_count; } @@ -1309,7 +1309,7 @@ static void test_get_containing_output(void) output_idx = 0; while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)) != DXGI_ERROR_NOT_FOUND) { - ok(SUCCEEDED(hr), "Failed to enumarate output %u, hr %#x.\n", output_idx, hr); + ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_idx, hr); hr = IDXGIOutput_GetDesc(output, &output_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); @@ -1708,7 +1708,7 @@ static void test_default_fullscreen_target_output(void) output_idx = 0; while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)) != DXGI_ERROR_NOT_FOUND) { - ok(SUCCEEDED(hr), "Failed to enumarate output %u, hr %#x.\n", output_idx, hr); + ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_idx, hr); hr = IDXGIOutput_GetDesc(output, &output_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);

1 0

Francois Gouget : ddraw/tests: Spelling fixes in a few comments.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 45a7e7482aaadc5941e1c2c54b88e4e5dcbecf33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a7e7482aaadc5941e1c2c54… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:46:44 2017 +0100 ddraw/tests: Spelling fixes in a few comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4a9ed7e..7ef70c1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3423,7 +3423,7 @@ static void test_coop_level_activateapp(void) ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); ok(activateapp_testdata.received, "Expected WM_ACTIVATEAPP, but did not receive it.\n"); - /* DDraw is in exlusive mode now. */ + /* DDraw is in exclusive mode now. */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; @@ -9482,7 +9482,7 @@ static void test_transform_vertices(void) /* Test the effect of Matrices. * - * Basically the x coodinate ends up as ((x + 1) * 2 + 0) * 5 and + * Basically the x coordinate ends up as ((x + 1) * 2 + 0) * 5 and * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 611ccac..e72a1fa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1087,7 +1087,7 @@ static void test_depth_blit(void) SetRect(&dst_rect, 320, 240, 640, 480); hr = IDirectDrawSurface_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); - /* Streched. */ + /* Stretched. */ SetRect(&src_rect, 0, 0, 320, 240); SetRect(&dst_rect, 0, 0, 640, 480); hr = IDirectDrawSurface_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); @@ -3945,7 +3945,7 @@ static void test_coop_level_activateapp(void) ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); ok(activateapp_testdata.received, "Expected WM_ACTIVATEAPP, but did not receive it.\n"); - /* DDraw is in exlusive mode now. */ + /* DDraw is in exclusive mode now. */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; @@ -10874,7 +10874,7 @@ static void test_transform_vertices(void) /* Test the effect of Matrices. * - * Basically the x coodinate ends up as ((x + 1) * 2 + 0) * 5 and + * Basically the x coordinate ends up as ((x + 1) * 2 + 0) * 5 and * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b74b754..6cce150 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1262,7 +1262,7 @@ static void test_depth_blit(void) SetRect(&dst_rect, 320, 240, 640, 480); hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); - /* Streched. */ + /* Stretched. */ SetRect(&src_rect, 0, 0, 320, 240); SetRect(&dst_rect, 0, 0, 640, 480); hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); @@ -4810,7 +4810,7 @@ static void test_coop_level_activateapp(void) ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); ok(activateapp_testdata.received, "Expected WM_ACTIVATEAPP, but did not receive it.\n"); - /* DDraw is in exlusive mode now. */ + /* DDraw is in exclusive mode now. */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; @@ -12174,7 +12174,7 @@ static void test_transform_vertices(void) /* Test the effect of Matrices. * - * Basically the x coodinate ends up as ((x + 1) * 2 + 0) * 5 and + * Basically the x coordinate ends up as ((x + 1) * 2 + 0) * 5 and * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e00bbcd..4027220 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1148,7 +1148,7 @@ static void test_depth_blit(void) SetRect(&dst_rect, 320, 240, 640, 480); hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); - /* Streched. */ + /* Stretched. */ SetRect(&src_rect, 0, 0, 320, 240); SetRect(&dst_rect, 0, 0, 640, 480); hr = IDirectDrawSurface7_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); @@ -4598,7 +4598,7 @@ static void test_coop_level_activateapp(void) ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); ok(activateapp_testdata.received, "Expected WM_ACTIVATEAPP, but did not receive it.\n"); - /* DDraw is in exlusive mode now. */ + /* DDraw is in exclusive mode now. */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT;

1 0

Francois Gouget : dxgi: Make wined3d_scanline_ordering_from_dxgi() static.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 0ed0e6785dbc1e699b2f50f83dfdaa8cfd5e6c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed0e6785dbc1e699b2f50f83… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:41:33 2017 +0100 dxgi: Make wined3d_scanline_ordering_from_dxgi() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 2 -- dlls/dxgi/utils.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 06892e2..34bb6fc 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -85,8 +85,6 @@ void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int l DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; UINT dxgi_rational_to_uint(const DXGI_RATIONAL *rational) DECLSPEC_HIDDEN; -enum wined3d_scanline_ordering wined3d_scanline_ordering_from_dxgi( - DXGI_MODE_SCANLINE_ORDER scanline_order) DECLSPEC_HIDDEN; void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index b940b15..f41b0a8 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -407,7 +407,7 @@ UINT dxgi_rational_to_uint(const DXGI_RATIONAL *rational) return rational->Numerator; } -enum wined3d_scanline_ordering wined3d_scanline_ordering_from_dxgi(DXGI_MODE_SCANLINE_ORDER scanline_order) +static enum wined3d_scanline_ordering wined3d_scanline_ordering_from_dxgi(DXGI_MODE_SCANLINE_ORDER scanline_order) { switch (scanline_order) {

1 0

Francois Gouget : winapi: Add support for DECLSPEC_HOTPATCH function declarations.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 5a61202f3ea2d77c27a765d404593917fd6b7970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a61202f3ea2d77c27a765d40… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:37:23 2017 +0100 winapi: Add support for DECLSPEC_HOTPATCH function declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_parser.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 01774cd..3092a7d 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -381,6 +381,7 @@ sub parse_c_file($$) { next; } elsif(/(extern\s+|static\s+)?((interface\s+|struct\s+|union\s+|enum\s+|signed\s+|unsigned\s+)?\w+((\s*\*)+\s*|\s+)) (($CALL_CONVENTION)\s+)? + (?:DECLSPEC_HOTPATCH\s+)? (\w+($\w+$)?)\s*$(.*?)$\s*(\{|\;)/sx) { my @lines = split(/\n/, $&);

1 0

Francois Gouget : qcap/tests: A spelling fix in an ok() message.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: fdbfd0f0b33bb40921c1fe06ae65818b709ab434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbfd0f0b33bb40921c1fe06a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:02 2017 +0100 qcap/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 32f88e3..d7fe288 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1556,7 +1556,7 @@ static void test_AviMux(char *arg) props.cbAlign = 0xdeadbee3; props.cbPrefix = 0xdeadbee4; hr = IMemInputPin_GetAllocatorRequirements(memin, &props); - ok(hr==S_OK || broken(hr==E_INVALIDARG), "GetAllocatorRequirments returned %x\n", hr); + ok(hr==S_OK || broken(hr==E_INVALIDARG), "GetAllocatorRequirements returned %x\n", hr); if(hr == S_OK) { ok(props.cBuffers == 0xdeadbee1, "cBuffers = %d\n", props.cBuffers); ok(props.cbBuffer == 0xdeadbee2, "cbBuffer = %d\n", props.cbBuffer);

1 0

Francois Gouget : testbot: Keep failed task files around until they are rerun.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: tools Branch: master Commit: efd987b4035a717401760075dd89acedf9512c58 URL: http://source.winehq.org/git/tools.git/?a=commit;h=efd987b4035a717401760075… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 9 00:56:43 2017 +0100 testbot: Keep failed task files around until they are rerun. When a task needs to be rerun, typically due to a problem with the VM host, keep its files around until it actually gets rerun. This makes it possible to access its logs until then. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 3 +-- testbot/bin/WineRunReconfig.pl | 3 +-- testbot/bin/WineRunTask.pl | 3 +-- testbot/lib/WineTestBot/Tasks.pm | 4 +++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index d410949..0757247 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -39,7 +39,6 @@ sub BEGIN my $Name0 = $0; $Name0 =~ s+^.*/++; -use File::Path; use WineTestBot::Config; use WineTestBot::Jobs; @@ -203,7 +202,7 @@ sub WrapUpAndExit($) { $Task->Started(undef); $Task->Ended(undef); - Error "Unable to delete '$TaskDir': $!\n" if (!rmtree($TaskDir)); + # Leave the Task files around so they can be seen until the next run } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index cc07359..2c8e2fb 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -39,7 +39,6 @@ sub BEGIN my $Name0 = $0; $Name0 =~ s+^.*/++; -use File::Path; use WineTestBot::Config; use WineTestBot::Jobs; @@ -203,7 +202,7 @@ sub WrapUpAndExit($) { $Task->Started(undef); $Task->Ended(undef); - Error "Unable to delete '$TaskDir': $!\n" if (!rmtree($TaskDir)); + # Leave the Task files around so they can be seen until the next run } else { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index d703d39..875213b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -38,7 +38,6 @@ sub BEGIN my $Name0 = $0; $Name0 =~ s+^.*/++; -use File::Path; use WineTestBot::Config; use WineTestBot::Jobs; @@ -231,7 +230,7 @@ sub WrapUpAndExit($;$) { $Task->Started(undef); $Task->Ended(undef); - Error "Unable to delete '$TaskDir': $!\n" if (!rmtree($TaskDir)); + # Leave the Task files around so they can be seen until the next run } else { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 6ba23a7..8020bd0 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -33,6 +33,7 @@ virtual machine that the test must be performed in. =cut use POSIX qw(:errno_h); +use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Jobs; @@ -108,8 +109,9 @@ sub Run($$) # Capture Perl errors in the task's generic error log my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; + # Remove the previous run's files if any + rmtree $TaskDir; mkdir $TaskDir; - unlink "$TaskDir/err"; # truncate the log since this is a new run if (open(STDERR, ">>", "$TaskDir/err")) { # Make sure stderr still flushes after each print

1 0

Francois Gouget : testbot/WineRun*: Simplify umask handling in the WineRun* scripts.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: tools Branch: master Commit: 0d51b110ac80b5689d7481cd421a06023daec768 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0d51b110ac80b5689d7481cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 9 00:56:52 2017 +0100 testbot/WineRun*: Simplify umask handling in the WineRun* scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 3 +-- testbot/bin/WineRunReconfig.pl | 3 +-- testbot/bin/WineRunTask.pl | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 0757247..119b988 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -180,15 +180,14 @@ sub LogTaskError($) my $OldUMask = umask(002); if (open(my $ErrFile, ">>", $FullErrFileName)) { - umask($OldUMask); print $ErrFile $ErrMessage; close($ErrFile); } else { - umask($OldUMask); Error "Unable to open '$FullErrFileName' for writing: $!\n"; } + umask($OldUMask); } sub WrapUpAndExit($) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2c8e2fb..1bc5c4c 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -180,15 +180,14 @@ sub LogTaskError($) my $OldUMask = umask(002); if (open(my $ErrFile, ">>", $FullErrFileName)) { - umask($OldUMask); print $ErrFile $ErrMessage; close($ErrFile); } else { - umask($OldUMask); Error "Unable to open '$FullErrFileName' for writing: $!\n"; } + umask($OldUMask); } sub WrapUpAndExit($) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 875213b..c3260bc 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -68,15 +68,14 @@ sub TakeScreenshot($$) my $OldUMask = umask(002); if (open SCREENSHOT, ">$FullScreenshotFileName") { - umask($OldUMask); print SCREENSHOT $ImageBytes; close SCREENSHOT; } else { - umask($OldUMask); Error "Can't save screenshot: $!\n"; } + umask($OldUMask); } else { @@ -207,15 +206,14 @@ sub LogTaskError($) my $OldUMask = umask(002); if (open(my $ErrFile, ">>", $FullErrFileName)) { - umask($OldUMask); print $ErrFile $ErrMessage; close($ErrFile); } else { - umask($OldUMask); Error "Unable to open '$FullErrFileName' for writing: $!\n"; } + umask($OldUMask); } sub WrapUpAndExit($;$)

1 0

Francois Gouget : testbot/WineRunTask: Use the modern open() to save the screenshot.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: tools Branch: master Commit: 42559042033e7e8b9b31ef8cdc0e5eb3e598259c URL: http://source.winehq.org/git/tools.git/?a=commit;h=42559042033e7e8b9b31ef8c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 9 00:57:02 2017 +0100 testbot/WineRunTask: Use the modern open() to save the screenshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index c3260bc..e109874 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -66,14 +66,14 @@ sub TakeScreenshot($$) if (! defined($ErrMessage)) { my $OldUMask = umask(002); - if (open SCREENSHOT, ">$FullScreenshotFileName") + if (open(my $Screenshot, ">", $FullScreenshotFileName)) { - print SCREENSHOT $ImageBytes; - close SCREENSHOT; + print $Screenshot $ImageBytes; + close($Screenshot); } else { - Error "Can't save screenshot: $!\n"; + Error "Could not open the screenshot file for writing: $!\n"; } umask($OldUMask); }

1 0

André Hentschel : Add WWN 405
by Jeremy Newman 08 Jan '17

08 Jan '17

Module: website Branch: master Commit: c09e0df6dde6362af84e9351563643ee55e77f8f URL: http://source.winehq.org/git/website.git/?a=commit;h=c09e0df6dde6362af84e93… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 8 13:30:20 2017 +0100 Add WWN 405 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017010801.xml | 12 + news/en/2017010801.xml | 12 + wwn/en/wn20170108_405.xml | 1273 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1297 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=c09e0df6dde6362af8…

1 0

Alexandre Julliard : Wine release 2.0-rc4
by Alexandre Julliard 06 Jan '17

06 Jan '17

Module: website Branch: master Commit: f36c416b5cd518399b5403f80a64b80b797722d7 URL: http://source.winehq.org/git/website.git/?a=commit;h=f36c416b5cd518399b5403… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 20:54:21 2017 +0100 Wine release 2.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017010601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2017010601.xml b/news/en/2017010601.xml new file mode 100644 index 0000000..81b1da8 --- /dev/null +++ b/news/en/2017010601.xml @@ -0,0 +1,12 @@ +<news> +<date>January 6, 2017</date> +<title>Wine 2.0-rc4 Released</title> +<body> + The Wine development release 2.0-rc4 is now available. + <a href="{$root}/announce/2.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc4.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0