wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

André Hentschel : shell32/tests: Mark win10 failure as broken.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 410a9832d1c78c372deeb8544460ce4807495ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=410a9832d1c78c372deeb8544… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 2 14:48:55 2016 +0200 shell32/tests: Mark win10 failure as broken. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1591b7b..90418bd 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1588,7 +1588,8 @@ static void test_FolderShortcut(void) { if (hr != S_OK) return; hr = IShellFolder_GetDisplayNameOf(pShellFolder, NULL, SHGDN_FORPARSING, &strret); - ok(hr == S_OK, "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* win10 */, + "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(pShellFolder); return;

1 0

Gerald Pfeifer : wininet: Increase buffer in _test_status_code to avoid potential potential overflow.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 3cb027c7436d0299c5179fb1e19fa1416e0ca6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb027c7436d0299c5179fb1e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 2 12:15:40 2016 +0200 wininet: Increase buffer in _test_status_code to avoid potential potential overflow. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fc68fe1..f2fe25c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -200,7 +200,7 @@ static BOOL proxy_active(void) static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL is_todo) { DWORD code, size, index; - char exbuf[10], bufa[10]; + char exbuf[12], bufa[10]; WCHAR bufw[10]; BOOL res;

1 0

Gerald Pfeifer : winedbg: Extend buffer in packet_query_monitor_process to avoid avoid overrun/ truncation.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: cf48fbcf362462969e463d123aa6e529be7f3eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf48fbcf362462969e463d123… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 2 07:40:36 2016 +0200 winedbg: Extend buffer in packet_query_monitor_process to avoid avoid overrun/truncation. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 7f0a8c9..f94fef5 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1710,7 +1710,7 @@ static void packet_query_monitor_wnd(struct gdb_context* gdbctx, int len, const static void packet_query_monitor_process(struct gdb_context* gdbctx, int len, const char* str) { HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); - char buffer[128]; + char buffer[31+MAX_PATH]; char deco; PROCESSENTRY32 entry; BOOL ok;

1 0

Alexandre Julliard : Wine release 1.9.20
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: website Branch: master Commit: 1c8806b92973a1a9810e5f814bce43e60fb3c744 URL: http://source.winehq.org/git/website.git/?a=commit;h=1c8806b92973a1a9810e5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:34:54 2016 +0200 Wine release 1.9.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016100101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016100101.xml b/news/en/2016100101.xml new file mode 100644 index 0000000..58cd9b5 --- /dev/null +++ b/news/en/2016100101.xml @@ -0,0 +1,15 @@ +<news> +<date>October 1, 2016</date> +<title>Wine 1.9.20 Released</title> +<body> + The Wine development release 1.9.20 is now available. + <a href="{$root}/announce/1.9.20">What's new</a> in this release: +<ul> + <li>Reimplementation of the clipboard API.</li> + <li>Message handling in WebServices.</li> + <li>Many more API Set libraries.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.20.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

Tag wine-1.9.20 : Alexandre Julliard : Release 1.9.20
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: refs/tags/wine-1.9.20 Tag: 43e53e9057964b4e4c886ed042007f7b9d7bb928 URL: http://source.winehq.org/git/wine.git/?a=tag;h=43e53e9057964b4e4c886ed04200… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:29:06 2016 +0200 Release 1.9.20

1 0

Alexandre Julliard : Release 1.9.20.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: 8a92dd9a5720c4b6b334e4f13629c0b0f5a72e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a92dd9a5720c4b6b334e4f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:29:06 2016 +0200 Release 1.9.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 480 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 252 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a92dd9a5720c4b6b334e…

1 0

Detlef Riekenberg : scrrun/tests: Use case insensitive compare for filenames.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: b488a67bafbfe231579bfd2a47f45db7d7decf7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b488a67bafbfe231579bfd2a4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 29 23:56:56 2016 +0200 scrrun/tests: Use case insensitive compare for filenames. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 8457714..cd0e6d6 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -621,7 +621,7 @@ static void test_GetFile(void) hr = IFile_get_Path(file, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, pathW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpiW(str, pathW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); #define FILE_ATTR_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \

1 0

Detlef Riekenberg : ntdll/tests: Use case insensitive compare for filenames.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: 1ebbfb1a1d54c4573d79367261030d259e2925cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebbfb1a1d54c4573d7936726… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 29 23:07:47 2016 +0200 ntdll/tests: Use case insensitive compare for filenames. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 649b6b4..586b2c9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1571,7 +1571,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -1741,7 +1741,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2147,7 +2147,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - todo_wine ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + todo_wine ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2203,7 +2203,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2373,7 +2373,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2776,7 +2776,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni );

1 0

Sebastian Lackner : user32: Also release GMEM_FIXED data in free_cached_data.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: df3c2a4a41f969869e0d8617d44cc8be4b9ad0bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3c2a4a41f969869e0d8617d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 1 14:55:05 2016 +0200 user32: Also release GMEM_FIXED data in free_cached_data. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 6 +----- dlls/user32/tests/clipboard.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 0d48984..d33459c 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -326,11 +326,7 @@ static void free_cached_data( struct cached_format *cache ) GlobalFree( cache->handle ); break; default: - if ((ptr = GlobalLock( cache->handle )) && ptr != cache->handle) - { - GlobalUnlock( cache->handle ); - GlobalFree( cache->handle ); - } + GlobalFree( cache->handle ); break; } list_remove( &cache->entry ); diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 832eca6..69bdba8 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1590,9 +1590,7 @@ static BOOL is_fixed( HANDLE handle ) static BOOL is_freed( HANDLE handle ) { - void *ptr = GlobalLock( handle ); - if (ptr) GlobalUnlock( handle ); - return !ptr; + return !GlobalSize( handle ); } static UINT format_id; @@ -1602,7 +1600,8 @@ static const LOGPALETTE logpalette = { 0x300, 1, {{ 0x12, 0x34, 0x56, 0x78 }}}; static void test_handles( HWND hwnd ) { - HGLOBAL h, htext, htext2, htext3, htext4, htext5, hfixed, hmoveable, empty_fixed, empty_moveable; + HGLOBAL h, htext, htext2, htext3, htext4, htext5; + HGLOBAL hfixed, hfixed2, hmoveable, empty_fixed, empty_moveable; void *ptr; UINT format_id2 = RegisterClipboardFormatA( "another format" ); BOOL r; @@ -1622,6 +1621,7 @@ static void test_handles( HWND hwnd ) palette = CreatePalette( &logpalette ); hfixed = GlobalAlloc( GMEM_FIXED, 17 ); + hfixed2 = GlobalAlloc( GMEM_FIXED, 17 ); ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed ); ok( GlobalSize( hfixed ) == 17, "wrong size %lu\n", GlobalSize( hfixed )); @@ -1682,8 +1682,8 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( format_id2, empty_fixed ); ok( h == empty_fixed, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); - h = SetClipboardData( 0xdeadbeef, hfixed ); - ok( h == hfixed, "got %p\n", h ); + h = SetClipboardData( 0xdeadbeef, hfixed2 ); + ok( h == hfixed2, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); h = SetClipboardData( 0xdeadbabe, hmoveable ); ok( h == hmoveable, "got %p\n", h ); @@ -1719,7 +1719,7 @@ static void test_handles( HWND hwnd ) ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( 0xdeadbeef ); - ok( data == hfixed, "wrong data %p\n", data ); + ok( data == hfixed2, "wrong data %p\n", data ); ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( 0xdeadbabe ); @@ -1734,6 +1734,11 @@ static void test_handles( HWND hwnd ) ok( is_moveable( h ), "expected moveable mem %p\n", h ); ok( is_freed( htext5 ), "expected freed mem %p\n", htext5 ); + h = SetClipboardData( 0xdeadbeef, hfixed ); + ok( h == hfixed, "got %p\n", h ); + ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ok( is_freed( hfixed2 ) || broken( !is_freed( hfixed2 )) /* < Vista */, "expected freed mem %p\n", hfixed2 ); + r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Sebastian Lackner : server: Handle error when memdup fails in synthesize_formats.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: b6b54fa14abe58d35e7d68afe2b8af5319c8983a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b54fa14abe58d35e7d68afe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Sep 30 03:41:38 2016 +0200 server: Handle error when memdup fails in synthesize_formats. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/clipboard.c b/server/clipboard.c index d8b5f96..89ce835 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -206,7 +206,7 @@ static int synthesize_formats( struct clipboard *clipboard ) (HAS_FORMAT( map, CF_TEXT ) || HAS_FORMAT( map, CF_OEMTEXT ) || HAS_FORMAT( map, CF_UNICODETEXT ))) { void *data = memdup( &clipboard->lcid, sizeof(clipboard->lcid) ); - if ((format = add_format( clipboard, CF_LOCALE ))) + if (data && (format = add_format( clipboard, CF_LOCALE ))) { format->seqno = clipboard->seqno++; format->data = data;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016