wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Daniel Lehman : ntdll: Implement NtCancelSynchronousIoFile.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 0a02b6a86a71d21c338db52a8d6c6cc2e920ae25 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a02b6a86a71d21c338db52a8d6c6c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Apr 18 22:40:41 2022 -0700 ntdll: Implement NtCancelSynchronousIoFile. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/tests/pipe.c | 12 ------------ dlls/ntdll/unix/file.c | 17 +++++++++++++++-- include/wine/server_protocol.h | 16 +++++++++++++++- server/async.c | 34 ++++++++++++++++++++++++++++++++++ server/protocol.def | 5 +++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 7 files changed, 83 insertions(+), 15 deletions(-)

1 0

Daniel Lehman : ntdll: Add NtCancelSynchronousIoFile stub.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 05d00d5e78b02b10d19ddc8e6310e9b3d84b19b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/05d00d5e78b02b10d19ddc8e6310e9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Apr 18 22:40:41 2022 -0700 ntdll: Add NtCancelSynchronousIoFile stub. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/tests/pipe.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/file.c | 9 +++ dlls/ntdll/unix/loader.c | 1 + dlls/wow64/file.c | 18 ++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 7 files changed, 186 insertions(+)

1 0

Daniel Lehman : kernel32/tests: Add tests for CancelSynchronousIo.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 3a4674f2568c53b4ff64379abc227ec211a18dc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a4674f2568c53b4ff64379abc227e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Apr 18 22:40:41 2022 -0700 kernel32/tests: Add tests for CancelSynchronousIo. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/kernel32/tests/pipe.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7fa3c313d47..55890cc9172 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -37,6 +37,7 @@ static HANDLE alarm_event; static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); static BOOL (WINAPI *pCancelIoEx)(HANDLE handle, LPOVERLAPPED lpOverlapped); +static BOOL (WINAPI *pCancelSynchronousIo)(HANDLE handle); static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); @@ -4202,6 +4203,108 @@ static void test_exit_process_async(void) CloseHandle(server); } +static DWORD CALLBACK synchronousIoThreadMain(void *arg) +{ + HANDLE pipe; + BOOL ret; + + pipe = arg; + SetLastError(0xdeadbeef); + ret = ConnectNamedPipe(pipe, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "got error %lu\n", GetLastError()); + return 0; +} + +static DWORD CALLBACK synchronousIoThreadMain2(void *arg) +{ + OVERLAPPED ov; + HANDLE pipe; + BOOL ret; + + pipe = arg; + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = ConnectNamedPipe(pipe, &ov); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got error %lu\n", GetLastError()); + ret = WaitForSingleObject(ov.hEvent, 1000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", ret); + CloseHandle(ov.hEvent); + return 0; +} + +static void test_CancelSynchronousIo(void) +{ + BOOL res; + DWORD wait; + HANDLE file; + HANDLE pipe; + HANDLE thread; + + /* bogus values */ + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo((HANDLE)0xdeadbeef); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, + "In CancelSynchronousIo failure, expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo(GetCurrentThread()); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND, + "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); + + /* synchronous i/o */ + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %lu\n", GetLastError()); + thread = CreateThread(NULL, 0, synchronousIoThreadMain, pipe, 0, NULL); + /* wait for I/O to start, which transitions the pipe handle from signaled to nonsignaled state. */ + while ((wait = WaitForSingleObject(pipe, 0)) == WAIT_OBJECT_0) Sleep(1); + ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %lu (error %lu)\n", wait, GetLastError()); + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo(thread); + todo_wine + { + ok(res, "CancelSynchronousIo failed with error %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "In CancelSynchronousIo failure, expected 0xdeadbeef got %ld\n", GetLastError()); + } + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + CancelIoEx(pipe, NULL); + wait = WaitForSingleObject(thread, 1000); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %lx\n", wait); + CloseHandle(thread); + CloseHandle(pipe); + + /* asynchronous i/o */ + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %lu\n", GetLastError()); + thread = CreateThread(NULL, 0, synchronousIoThreadMain2, pipe, 0, NULL); + /* wait for I/O to start, which transitions the pipe handle from signaled to nonsignaled state. */ + while ((wait = WaitForSingleObject(pipe, 0)) == WAIT_OBJECT_0) Sleep(1); + ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %lu (error %lu)\n", wait, GetLastError()); + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo(thread); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND, + "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); + file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(file); + CloseHandle(pipe); +} + START_TEST(pipe) { char **argv; @@ -4212,6 +4315,7 @@ START_TEST(pipe) pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); hmod = GetModuleHandleA("kernel32.dll"); pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); + pCancelSynchronousIo = (void *) GetProcAddress(hmod, "CancelSynchronousIo"); pGetNamedPipeClientProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeClientProcessId"); pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); @@ -4282,4 +4386,5 @@ START_TEST(pipe) test_nowait(PIPE_TYPE_MESSAGE); test_GetOverlappedResultEx(); test_exit_process_async(); + test_CancelSynchronousIo(); }

1 0

Akihiro Sagawa : quartz: Fix video flickering.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 45bfd4e1d133e0401e5240d4b85614f5d45fdb5f URL: https://gitlab.winehq.org/wine/wine/-/commit/45bfd4e1d133e0401e5240d4b85614… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 16 22:02:18 2022 +0900 quartz: Fix video flickering. --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/window.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 24f30146981..fccb32d06d0 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2368,7 +2368,7 @@ static void test_video_window(void) ok(tid == GetCurrentThreadId(), "Expected tid %#lx, got %#lx.\n", GetCurrentThreadId(), tid); background = GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND); - todo_wine ok(!background, "Expected NULL brush, got %#Ix\n", background); + ok(!background, "Expected NULL brush, got %#Ix\n", background); hr = IBaseFilter_QueryInterface(filter, &IID_IVideoWindow, (void **)&window); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 3e19d9b582e..2064be7e320 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -101,7 +101,6 @@ HRESULT video_window_create_window(struct video_window *window) winclass.lpfnWndProc = WndProcW; winclass.cbWndExtra = sizeof(window); - winclass.hbrBackground = GetStockObject(BLACK_BRUSH); winclass.lpszClassName = class_name; if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) {

1 0

Akihiro Sagawa : quartz/tests: Add a background brush test for video renderer.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: ee633870dfbedb66e9a1746424b2ac3e52833d5e URL: https://gitlab.winehq.org/wine/wine/-/commit/ee633870dfbedb66e9a1746424b2ac… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 16 22:02:18 2022 +0900 quartz/tests: Add a background brush test for video renderer. --- dlls/quartz/tests/videorenderer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 0c5f7f440ef..24f30146981 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2329,6 +2329,7 @@ static void test_video_window(void) WNDCLASSA window_class = {0}; struct testfilter source; LONG width, height, l; + ULONG_PTR background; IVideoWindow *window; IBaseFilter *filter; HWND hwnd, our_hwnd; @@ -2366,6 +2367,9 @@ static void test_video_window(void) tid = GetWindowThreadProcessId(hwnd, NULL); ok(tid == GetCurrentThreadId(), "Expected tid %#lx, got %#lx.\n", GetCurrentThreadId(), tid); + background = GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND); + todo_wine ok(!background, "Expected NULL brush, got %#Ix\n", background); + hr = IBaseFilter_QueryInterface(filter, &IID_IVideoWindow, (void **)&window); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

David Kahurani : xmllite/writer: Null terminate duplicated strings.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 556b3981b7aab37dcc184ff8c4682f5d079f8be9 URL: https://gitlab.winehq.org/wine/wine/-/commit/556b3981b7aab37dcc184ff8c4682f… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Oct 10 16:01:23 2022 +0300 xmllite/writer: Null terminate duplicated strings. Strings are not being "partially duplicated", but duplicated with explicit length. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/writer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index c4f9ed2f440..065716f7e8c 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -250,7 +250,6 @@ static struct element *pop_element(xmlwriter *writer) static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len) { - size_t size; WCHAR *ret; if (!str) @@ -259,9 +258,12 @@ static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len if (len == -1) len = lstrlenW(str); - size = (len + 1) * sizeof(WCHAR); - ret = writer_alloc(writer, size); - if (ret) memcpy(ret, str, size); + ret = writer_alloc(writer, (len + 1) * sizeof(WCHAR)); + if (ret) + { + memcpy(ret, str, len * sizeof(WCHAR)); + ret[len] = 0; + } return ret; }

1 0

Zebediah Figura : include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 303ce66cef72d33d429dd6a51962fb23567b602a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/303ce66cef72d33d429dd6a51962f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 23 14:55:01 2021 -0600 include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW. The default for MinGW is always ms_printf rather than gnu_printf, but if we are using ucrtbase or ANSI stdio, we want gnu_printf. --- include/private/vkd3d_common.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 9a2de265..78a15c19 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -54,7 +54,11 @@ static inline size_t align(size_t addr, size_t alignment) #ifdef __GNUC__ # define VKD3D_NORETURN __attribute__((noreturn)) -# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args))) +# ifdef __MINGW_PRINTF_FORMAT +# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, args))) +# else +# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args))) +# endif # define VKD3D_UNUSED __attribute__((unused)) # define VKD3D_UNREACHABLE __builtin_unreachable() #else

1 0

Alexandre Julliard : Wine release 7.19
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: website Branch: master Commit: d06c85defe246e8be11c91396b63b801c4a7eaf0 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/d06c85defe246e8be11c91396b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:39:33 2022 +0200 Wine release 7.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022101401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022101401.xml b/news/en/2022101401.xml new file mode 100644 index 00000000..361026e6 --- /dev/null +++ b/news/en/2022101401.xml @@ -0,0 +1,16 @@ +<news> +<date>October 14, 2022</date> +<title>Wine 7.19 Released</title> +<body> + The Wine development release 7.19 is now available. + <a href="{$root}/announce/7.19">What's new</a> in this release: +<ul> + <li>Support for storing DOS attributes on disk.</li> + <li>Bundled vkd3d upgraded to version 1.5.</li> + <li>Support for MPEG-4 audio format.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.19.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-7.19 : Alexandre Julliard : Release 7.19
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: refs/tags/wine-7.19 Tag: 304bddfa3a32af2368b11ce12771ea4e68ce8948 URL: https://gitlab.winehq.org/wine/wine/-/tags/304bddfa3a32af2368b11ce12771ea4e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:36:58 2022 +0200 Release 7.19

1 0

Alexandre Julliard : Release 7.19.
by Alexandre Julliard 14 Oct '22

14 Oct '22

Module: wine Branch: master Commit: e3f00bf7c944f1cde6151fde969f2b49649c3de7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3f00bf7c944f1cde6151fde969f2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 22:36:58 2022 +0200 Release 7.19. --- ANNOUNCE | 678 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 360 insertions(+), 338 deletions(-)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
54
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 October 2022