wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Francois Gouget : shell32/tests: Fix the PathResolve() tests on Windows 8.1, early 10.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 0e64e056005a6a729fd10cf591b8127d9c5b0eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e64e056005a6a729fd10cf5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:42:03 2021 +0200 shell32/tests: Fix the PathResolve() tests on Windows 8.1, early 10. Some Windows 8.1 and Windows 10 1507 versions return PATH_NOT_FOUND instead of FILE_NOT_FOUND. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 07bde45a66f..df9d4ecc949 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -3014,7 +3014,9 @@ static void test_PathResolve(void) ok(!lstrcmpiW(path, tests[i].expected_path), "expected %s, got %s\n", wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_PATH_NOT_FOUND /* some win 8.1 & 10 */), + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); winetest_pop_context(); }

1 0

Francois Gouget : shell32/tests: Use WineTest contexts to simplify shellpath.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 865029ae3f2340f8a3b5f8955586a8ab599324d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865029ae3f2340f8a3b5f895… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:42:00 2021 +0200 shell32/tests: Use WineTest contexts to simplify shellpath. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 96bfd1d94ef..07bde45a66f 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2641,8 +2641,9 @@ static void test_DoEnvironmentSubst(void) "%HOMEDRIVE%%HOMEPATH%", "%OS% %windir%"}; /* always the last entry in the table */ - for (i = 0; i < (ARRAY_SIZE(names)); i++) + for (i = 0; i < ARRAY_SIZE(names); i++) { + winetest_push_context("%d", i); memset(bufferA, '#', MAX_PATH - 1); bufferA[MAX_PATH - 1] = 0; lstrcpyA(bufferA, names[i]); @@ -2655,19 +2656,21 @@ static void test_DoEnvironmentSubst(void) if (!i && HIWORD(res) && (LOWORD(res) == (lstrlenA(bufferA)))) { win_skip("DoEnvironmentSubstA/W are broken on NT 4\n"); + winetest_pop_context(); return; } ok(HIWORD(res) && (LOWORD(res) == res2), - "%d: got %d/%d (expected TRUE/%d)\n", i, HIWORD(res), LOWORD(res), res2); + "got %d/%d (expected TRUE/%d)\n", HIWORD(res), LOWORD(res), res2); ok(!lstrcmpA(bufferA, expectedA), - "%d: got %s (expected %s)\n", i, bufferA, expectedA); + "got %s (expected %s)\n", bufferA, expectedA); res2 = ExpandEnvironmentStringsW(bufferW, expectedW, MAX_PATH); res = DoEnvironmentSubstW(bufferW, MAX_PATH); ok(HIWORD(res) && (LOWORD(res) == res2), - "%d: got %d/%d (expected TRUE/%d)\n", i, HIWORD(res), LOWORD(res), res2); + "got %d/%d (expected TRUE/%d)\n", HIWORD(res), LOWORD(res), res2); ok(!lstrcmpW(bufferW, expectedW), - "%d: got %s (expected %s)\n", i, wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); + "got %s (expected %s)\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); + winetest_pop_context(); } i--; /* reuse data in the last table entry */ @@ -3002,15 +3005,17 @@ static void test_PathResolve(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { + winetest_push_context("test %d", i); lstrcpyW(path, tests[i].path); if (!tests[i].expected) SetLastError(0xdeadbeef); ret = pPathResolve(path, dirs, tests[i].flags); - ok(ret == tests[i].expected, "test %d: expected %d, got %d\n", i, tests[i].expected, ret); + ok(ret == tests[i].expected, "expected %d, got %d\n", tests[i].expected, ret); ok(!lstrcmpiW(path, tests[i].expected_path), - "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); + "expected %s, got %s\n", wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + winetest_pop_context(); } CloseHandle(file);

1 0

Francois Gouget : shell32/test: Fix an ok() message.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: d6d46299dd8bcf58ce25d14f42b8d04efbdc7c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d46299dd8bcf58ce25d14f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:41:57 2021 +0200 shell32/test: Fix an ok() message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ea6f92ce827..96bfd1d94ef 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -3010,7 +3010,7 @@ static void test_PathResolve(void) ok(!lstrcmpiW(path, tests[i].expected_path), "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); } CloseHandle(file);

1 0

Francois Gouget : user32/tests: Fix the wording of an ok() message.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: f593babf6d357f4a425473077e2f38c59bf014ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f593babf6d357f4a42547307… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 4 15:41:02 2021 +0200 user32/tests: Fix the wording of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 469c193c1a3..9867e319d58 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5272,7 +5272,7 @@ static void test_WM_DEVICECHANGE(HWND hwnd) ret = PostMessageA(hwnd, WM_DEVICECHANGE, wparams[i], 0); if (wparams[i] & 0x8000) { - ok(ret == FALSE, "PostMessage should returned %d\n", ret); + ok(ret == FALSE, "PostMessage returned %d\n", ret); ok(GetLastError() == ERROR_MESSAGE_SYNC_ONLY, "PostMessage error %08x\n", GetLastError()); } else

1 0

Francois Gouget : user32/tests: Use WineTest contexts to simplify test_mdi().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: ce0b7342c0eecc814ab75497bd111e1c02939f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0b7342c0eecc814ab75497… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:40:06 2021 +0200 user32/tests: Use WineTest contexts to simplify test_mdi(). This also fixes the many ok() calls that were missing context information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c1a9ba50df1..228395e0469 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2145,6 +2145,7 @@ static void test_mdi(void) SCROLLINFO si; BOOL ret, gotit; + winetest_push_context("style %#x", style[i]); mdi_client = CreateWindowExA(0, "mdiclient", NULL, WS_CHILD | style[i], 0, 0, rc.right, rc.bottom, @@ -2183,7 +2184,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2191,12 +2192,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2204,7 +2205,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); SetWindowPos(mdi_child, 0, -100, -100, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE); @@ -2213,7 +2214,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2221,12 +2222,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2234,7 +2235,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); gotit = FALSE; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) @@ -2261,7 +2262,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2270,12 +2271,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2284,11 +2285,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); DestroyMenu(child_menu); DestroyWindow(mdi_child); DestroyWindow(mdi_client); + winetest_pop_context(); } SetMenu(mdi_hwndMain, frame_menu);

1 0

Huw Davies : maintainers: Add a Network Store Interface section.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 151ae36abc1f5529d1e8931f9832c68a915400e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=151ae36abc1f5529d1e8931f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 5 08:51:11 2021 +0100 maintainers: Add a Network Store Interface section. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1bc8658e02..e85151e9bd2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,9 +181,14 @@ F: programs/netstat/ Network P: Bruno Jesus <00cpxxx(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> -F: dlls/iphlpapi/ F: dlls/ws2_32/ +Network Store Interface +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/iphlpapi/ +F: dlls/nsi/ +F: dlls/nsiproxy.sys/ + OLE Embedding M: Huw Davies <huw(a)codeweavers.com> F: dlls/ole32/clipboard.c

1 0

Gerald Pfeifer : nsiproxy: Include netinet/in.h before if_ether.h.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: cefe9f6b9132e5166a381dd2b085f1f80cf8150c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cefe9f6b9132e5166a381dd2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 3 09:02:43 2021 +0200 nsiproxy: Include netinet/in.h before if_ether.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 38e6802e3bd..332df7159b9 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -38,6 +38,10 @@ #include <net/if_arp.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif

1 0

Alexandre Julliard : Wine release 6.12
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: website Branch: master Commit: bf6df5ada8e4f5f33a1aef2bf8915a74fd86559a URL: https://source.winehq.org/git/website.git/?a=commit;h=bf6df5ada8e4f5f33a1ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 21:46:55 2021 +0200 Wine release 6.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021070201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021070201.xml b/news/en/2021070201.xml new file mode 100644 index 00000000..8f3e0e59 --- /dev/null +++ b/news/en/2021070201.xml @@ -0,0 +1,17 @@ +<news> +<date>July 2, 2021</date> +<title>Wine 6.12 Released</title> +<body> + The Wine development release 6.12 is now available. + <a href="{$root}/announce/6.12">What's new</a> in this release: +<ul> + <li>Builtin "Blue" and "Classic Blue" themes.</li> + <li>More work towards WinSock PE conversion.</li> + <li>Beginnings of the NSI (Network Store Interface) implementation.</li> + <li>Support for 32/64-bit registry views in reg.exe.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.12.tar.xz">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-6.12 : Alexandre Julliard : Release 6.12
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: refs/tags/wine-6.12 Tag: e78e2e92dc221332c3627b4a8a3e4583cc6e2701 URL: https://source.winehq.org/git/wine.git/?a=tag;h=e78e2e92dc221332c3627b4a8a3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 21:45:02 2021 +0200 Release 6.12

1 0

Alexandre Julliard : Release 6.12.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 12d33d21d33788fd46898ea42e9592d33b6e7c8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=12d33d21d33788fd46898ea4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 21:45:02 2021 +0200 Release 6.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 881 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 487 insertions(+), 417 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12d33d21d33788fd4689…

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
73
Older →

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 July 2021