January 2017 - Wine-Commits

Hugh McMaster : regedit: Only allow key renaming via the Edit or Popup menus.
by Alexandre Julliard Jan. 9, 2017

Jan. 9, 2017

Module: wine Branch: master Commit: 1e1bfba1c459182b3a64c6d70b2a375e9e262390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1bfba1c459182b3a64c6d70… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 3 12:33:48 2017 +0000 regedit: Only allow key renaming via the Edit or Popup menus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 8 +++++++- programs/regedit/treeview.c | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 55b11de..08eeec1 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -419,7 +419,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa } case TVN_BEGINLABELEDITW: { HKEY hRootKey; - LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + LPWSTR path; + + if (!GetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA)) + return 1; + + path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); if (!path || !*path) return 1; return 0; } @@ -440,6 +445,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa HeapFree(GetProcessHeap(), 0, fullPath); } HeapFree(GetProcessHeap(), 0, path); + SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); return res; } default: diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 7afc7bf..07e9b41 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -529,6 +529,7 @@ HWND StartKeyRename(HWND hwndTV) HTREEITEM hItem; if(!(hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0))) return 0; + SetWindowLongPtrW(hwndTV, GWLP_USERDATA, 1); return (HWND)SendMessageW(hwndTV, TVM_EDITLABELW, 0, (LPARAM)hItem); }

1 0

Francois Gouget : kernel32/tests: A couple of spelling fixes in ok() messages.
by Alexandre Julliard Jan. 9, 2017

Jan. 9, 2017

Module: wine Branch: master Commit: ae6c2d235ef2199f8e00dddd07d9d5a277f1afcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6c2d235ef2199f8e00dddd0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:42:38 2017 +0100 kernel32/tests: A couple of spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 28bac91..b9ac06c 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1364,8 +1364,8 @@ static void test_CreatePipe(void) ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written); /* and close the write end, read should still succeed*/ ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n"); - ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from broken pipe withe with pending data failed\n"); - ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %d bytes\n", read); + ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from broken pipe with pending data failed\n"); + ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %d bytes\n", read); /* But now we need to get informed that the pipe is closed */ ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n"); ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); @@ -1380,8 +1380,8 @@ static void test_CreatePipe(void) /* and close the write end, read should still succeed*/ ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n"); memset( buffer, 0, size ); - ok(ReadFile(piperead, buffer, size, &read, NULL), "Read from broken pipe withe with pending data failed\n"); - ok(read == size, "Read from anonymous pipe got %d bytes\n", read); + ok(ReadFile(piperead, buffer, size, &read, NULL), "Read from broken pipe with pending data failed\n"); + ok(read == size, "Read from anonymous pipe got %d bytes\n", read); for (i = 0; i < size; i++) ok( buffer[i] == (BYTE)i, "invalid data %x at %x\n", buffer[i], i ); /* But now we need to get informed that the pipe is closed */ ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n");

1 0

Francois Gouget : dxgi: Make wined3d_scanline_ordering_from_dxgi() static.
by Alexandre Julliard Jan. 9, 2017

Jan. 9, 2017

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 some more __stdcall synonyms.
by Alexandre Julliard Jan. 9, 2017

Jan. 9, 2017

Module: wine Branch: master Commit: b9181615a905904de55c43a2f411143b78ea086e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9181615a905904de55c43a2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:55:14 2017 +0100 winapi: Add some more __stdcall synonyms. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/c_parser.pm | 4 ++-- tools/winapi/winapi_function.pm | 4 ++-- tools/winapi/winapi_local.pm | 4 ++-- tools/winapi/winapi_parser.pm | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 8bb40d5..d42e04a 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -37,7 +37,7 @@ use c_type; my $CALL_CONVENTION="__cdecl|__stdcall|" . "__RPC_API|__RPC_STUB|__RPC_USER|" . "CALLBACK|CDECL|NTAPI|PASCAL|RPC_ENTRY|RPC_VAR_ENTRY|" . - "VFWAPI|VFWAPIV|WINAPI|WINAPIV|APIENTRY|"; + "SEC_ENTRY|VFWAPI|VFWAPIV|WINGDIPAPI|WMIAPI|WINAPI|WINAPIV|APIENTRY|"; sub parse_c_function($$$$$); @@ -1735,7 +1735,7 @@ sub parse_c_variable($$$$$$$) $type = $self->_format_c_type($type); last finished; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s+DECLSPEC_[A-Z]+)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { $type = $self->_format_c_type("$sign$1$3"); $name = $2; diff --git a/tools/winapi/winapi_function.pm b/tools/winapi/winapi_function.pm index 023fbf5..633e9ea 100644 --- a/tools/winapi/winapi_function.pm +++ b/tools/winapi/winapi_function.pm @@ -309,7 +309,7 @@ sub calling_convention16($) { } elsif(/^(?:VFWAPIV|WINAPIV)$/) { if(!defined($suffix)) { return undef; } return "pascal$suffix"; # FIXME: Is this correct? - } elsif(/^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif(/^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|SEC_ENTRY|VFWAPI|WINGDIPAPI|WMIAPI|WINAPI|CALLBACK)$/) { if(!defined($suffix)) { return undef; } return "pascal$suffix"; } elsif($_ eq "__asm") { @@ -327,7 +327,7 @@ sub calling_convention32($) { return "cdecl"; } elsif(/^(?:VFWAPIV|WINAPIV)$/) { return "varargs"; - } elsif(/^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif(/^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|SEC_ENTRY|VFWAPI|WINGDIPAPI|WMIAPI|WINAPI|CALLBACK)$/) { return "stdcall"; } elsif($_ eq "__asm") { return "asm"; diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 5a4dcea..42dd146 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -85,7 +85,7 @@ sub _check_function($$$$$$) { $implemented_calling_convention = "cdecl"; } elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) { $implemented_calling_convention = "varargs"; - } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|SEC_ENTRY|VFWAPI|WINGDIPAPI|WMIAPI|WINAPI|CALLBACK)$/) { if(defined($implemented_return_kind) && $implemented_return_kind =~ /^(?:s_word|word|void)$/) { $implemented_calling_convention = "pascal16"; } else { @@ -101,7 +101,7 @@ sub _check_function($$$$$$) { $implemented_calling_convention = "cdecl"; } elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) { $implemented_calling_convention = "varargs"; - } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|APIENTRY|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|APIENTRY|NET_API_FUNCTION|RPC_ENTRY|SEC_ENTRY|VFWAPI|WINGDIPAPI|WMIAPI|WINAPI|CALLBACK)$/) { if(defined($implemented_return_kind) && $implemented_return_kind eq "longlong") { $implemented_calling_convention = "stdcall"; # FIXME: Check entry flags } else { diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 3092a7d..b24ce5f 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -28,7 +28,7 @@ my $CALL_CONVENTION="__cdecl|__stdcall|" . "__RPC_API|__RPC_STUB|__RPC_USER|RPC_ENTRY|" . "RPC_VAR_ENTRY|STDMETHODCALLTYPE|NET_API_FUNCTION|" . "CALLBACK|CDECL|NTAPI|PASCAL|APIENTRY|" . - "VFWAPI|VFWAPIV|WINAPI|WINAPIV|"; + "SEC_ENTRY|VFWAPI|VFWAPIV|WINGDIPAPI|WMIAPI|WINAPI|WINAPIV|"; sub parse_c_file($$) { my $file = shift;

1 0

Nikolay Sivov : shell32/tests: Some tests for ExtractIcon().
by Alexandre Julliard Jan. 9, 2017

Jan. 9, 2017

Module: wine Branch: master Commit: c1645b6dfdd0a42cc51e3200b02db8559db08f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1645b6dfdd0a42cc51e3200b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 21:54:46 2017 +0300 shell32/tests: Some tests for ExtractIcon(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 97 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 8af3c97..293f69c 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1150,6 +1150,102 @@ static void test_propertystore(void) IShellLinkW_Release(linkW); } +static void test_ExtractIcon(void) +{ + static const WCHAR nameW[] = {'\\','e','x','t','r','a','c','t','i','c','o','n','_','t','e','s','t','.','t','x','t',0}; + static const WCHAR shell32W[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; + WCHAR pathW[MAX_PATH]; + HICON hicon, hicon2; + char path[MAX_PATH]; + HANDLE file; + int r; + + /* specified instance handle */ + hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1); + ok(hicon2 != NULL, "Got icon %p\n", hicon2); + + /* existing index */ + hicon = ExtractIconA(NULL, "shell32.dll", 0); + ok(hicon != NULL && HandleToLong(hicon) != -1, "Got icon %p\n", hicon); + DestroyIcon(hicon); + + /* returns number of resources */ + hicon = ExtractIconA(NULL, "shell32.dll", -1); + ok(HandleToLong(hicon) > 1 && hicon == hicon2, "Got icon %p\n", hicon); + + /* invalid index, valid dll name */ + hicon = ExtractIconA(NULL, "shell32.dll", 3000); + ok(hicon == NULL, "Got icon %p\n", hicon); + + /* Create a temporary non-executable file */ + GetTempPathA(sizeof(path), path); + strcat(path, "\\extracticon_test.txt"); + file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create a test file\n"); + CloseHandle(file); + + hicon = ExtractIconA(NULL, path, 0); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconA(NULL, path, -1); + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconA(NULL, path, 1); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + + r = DeleteFileA(path); + ok(r, "failed to delete file %s (%d)\n", path, GetLastError()); + + /* same for W variant */ +if (0) +{ + /* specified instance handle, crashes on XP, 2k3 */ + hicon = ExtractIconW(GetModuleHandleA("shell32.dll"), NULL, 0); + ok(hicon == NULL, "Got icon %p\n", hicon); +} + hicon2 = ExtractIconW(GetModuleHandleA("shell32.dll"), shell32W, -1); + ok(hicon2 != NULL, "Got icon %p\n", hicon2); + + /* existing index */ + hicon = ExtractIconW(NULL, shell32W, 0); + ok(hicon != NULL && HandleToLong(hicon) != -1, "Got icon %p\n", hicon); + DestroyIcon(hicon); + + /* returns number of resources */ + hicon = ExtractIconW(NULL, shell32W, -1); + ok(HandleToLong(hicon) > 1 && hicon == hicon2, "Got icon %p\n", hicon); + + /* invalid index, valid dll name */ + hicon = ExtractIconW(NULL, shell32W, 3000); + ok(hicon == NULL, "Got icon %p\n", hicon); + + /* Create a temporary non-executable file */ + GetTempPathW(sizeof(pathW)/sizeof(pathW[0]), pathW); + lstrcatW(pathW, nameW); + file = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create a test file\n"); + CloseHandle(file); + + hicon = ExtractIconW(NULL, pathW, 0); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconW(NULL, pathW, -1); + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconW(NULL, pathW, 1); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + + r = DeleteFileW(pathW); + ok(r, "failed to delete file %s (%d)\n", path, GetLastError()); +} + START_TEST(shelllink) { HRESULT r; @@ -1178,6 +1274,7 @@ START_TEST(shelllink) test_SHGetStockIconInfo(); test_SHExtractIcons(); test_propertystore(); + test_ExtractIcon(); CoUninitialize(); }

1 0

Francois Gouget : testbot/WineRun*: Simplify umask handling in the WineRun* scripts.
by Alexandre Julliard Jan. 9, 2017

Jan. 9, 2017

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: Keep failed task files around until they are rerun.
by Alexandre Julliard Jan. 9, 2017

Jan. 9, 2017

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/WineRunTask: Use the modern open() to save the screenshot.
by Alexandre Julliard Jan. 9, 2017

Jan. 9, 2017

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 Jan. 8, 2017

Jan. 8, 2017

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 Jan. 6, 2017

Jan. 6, 2017

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