May 2022 - Wine-Devel - list.winehq.org

[PATCH 0/1] MR152: include: Make IShellItem::BindToHandler's pbc parameter as [unique].
by Jinoh Kang (＠iamahuman) May 30, 2022

May 30, 2022

The Windows SDK headers makes it clear that the IBindCtx parameter of BindToHandler is optional. Bring Wine's definition in sync with those. Thanks @nsivov for pointing this out. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/152

2 1

[PATCH 0/1] MR150: win32u: Create a dummy bitmap for display device contexts.
by Zhiyi Zhang (＠zhiyi) May 30, 2022

May 30, 2022

On Windows 7 and older versions of Windows, calling GetCurrentObject(hdc, OBJ_BITMAP) for a display device context will return a valid handle. However, this handle will fail for GetObject(). On newer versions of Windows, GetCurrentObject(hdc, OBJ_BITMAP) for display device contexts returns a bitmap of virtual screen size and its size changes after display mode changes. This behavior is tested in the _check_display_dc() function in user32/tests/monitor.c. The screen shot function of WeChat depends on GetObject() to either return failure or a valid size for the bitmap from display device contexts. Since Wine currently report Windows 7 as default and to save memory, the Windows 7 behavior is implemented. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/150

3 2

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi May 30, 2022

May 30, 2022

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..22901ad721c 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_BGRA_8; break; + case BM_xBGRQUADS: ret = TYPE_RGBA_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

1 0

[PATCH 0/5] MR151: ntdll: Improve heap block size compat.
by Rémi Bernon May 30, 2022

May 30, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/151

2 7

[PATCH v3] ntdll: Avoid reqeuests with null pointer but invalid size.
by Bernhard Übelacker May 30, 2022

May 30, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51770 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- v1: https://www.winehq.org/pipermail/wine-devel/2021-December/202913.html https://www.winehq.org/pipermail/wine-devel/2022-April/213866.html https://www.winehq.org/pipermail/wine-devel/2022-April/214075.html v2: Validate pointer before calling wine_server_add_data. https://www.winehq.org/pipermail/wine-devel/2022-April/214306.html https://www.winehq.org/pipermail/wine-devel/2022-May/215635.html v3: Move check to DeviceIoControl. Always use fixed values for IOCTL_STORAGE_GET_DEVICE_NUMBER. Remove warning at expected hang. --- dlls/kernel32/tests/volume.c | 16 ++++++++++++++++ dlls/kernelbase/file.c | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9166cf228d9..4bee4207a37 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -618,6 +618,7 @@ static void test_disk_query_property(void) STORAGE_PROPERTY_QUERY query = {0}; STORAGE_DESCRIPTOR_HEADER header = {0}; STORAGE_DEVICE_DESCRIPTOR descriptor = {0}; + STORAGE_DEVICE_NUMBER device_number = {0}; HANDLE handle; DWORD error; DWORD size; @@ -654,6 +655,21 @@ static void test_disk_query_property(void) ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %ld\n", descriptor.Version); ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %ld\n", descriptor.Size); + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + + /* unclean call with valid in_buffer=NULL but incorrect in_size=4 */ + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 4, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + CloseHandle(handle); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 8ae982294f6..21df197da2c 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -4111,6 +4111,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeviceIoControl( HANDLE handle, DWORD code, void * TRACE( "(%p,%lx,%p,%ld,%p,%ld,%p,%p)\n", handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped ); + if (code == IOCTL_STORAGE_GET_DEVICE_NUMBER) { + in_buff = NULL; + in_count = 0; + } + if (overlapped) { piosb = (IO_STATUS_BLOCK *)overlapped; -- 2.35.1

1 0

[PATCH v2] ntdll: Avoid reqeuests with null pointer but invalid size.
by Bernhard Übelacker May 30, 2022

May 30, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51770 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- v1: https://www.winehq.org/pipermail/wine-devel/2021-December/202913.html https://www.winehq.org/pipermail/wine-devel/2022-April/213866.html v2: Validate pointer before calling wine_server_add_data. --- dlls/kernel32/tests/volume.c | 16 ++++++++++++++++ dlls/ntdll/unix/file.c | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9166cf228d9..4bee4207a37 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -618,6 +618,7 @@ static void test_disk_query_property(void) STORAGE_PROPERTY_QUERY query = {0}; STORAGE_DESCRIPTOR_HEADER header = {0}; STORAGE_DEVICE_DESCRIPTOR descriptor = {0}; + STORAGE_DEVICE_NUMBER device_number = {0}; HANDLE handle; DWORD error; DWORD size; @@ -654,6 +655,21 @@ static void test_disk_query_property(void) ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %ld\n", descriptor.Version); ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %ld\n", descriptor.Size); + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + + /* unclean call with valid in_buffer=NULL but incorrect in_size=4 */ + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 4, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + CloseHandle(handle); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cc8bf0c6e82..92b67280500 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4893,7 +4893,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, { req->code = code; req->async = server_async( handle, &async->io, event, apc, apc_context, iosb_client_ptr(io) ); - wine_server_add_data( req, in_buffer, in_size ); + if (in_buffer) wine_server_add_data( req, in_buffer, in_size ); if ((code & 3) != METHOD_BUFFERED) wine_server_add_data( req, out_buffer, out_size ); wine_server_set_reply( req, out_buffer, out_size ); status = virtual_locked_server_call( req ); @@ -4913,6 +4913,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (status != STATUS_PENDING) free( async ); + if (wait_handle && status == STATUS_ACCESS_VIOLATION) + ERR("Sending request failed but wait requested. Expect the application to hang.\n"); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT) ); return status; } -- 2.35.1

2 2

[PATCH 0/1] MR148: ntoskrnl: Add ExNotifyCallback stub.
by Alex Henrie (＠alexhenrie) May 29, 2022

May 29, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53051 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/148

2 1

[PATCH 0/6] MR147: d2d1: Implement bitmap mapping methods.
by Nikolay Sivov (＠nsivov) May 29, 2022

May 29, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/147

4 7

[PATCH 1/2] scrrun: Check for null arguments in MoveFile.
by Robert Wilhelm May 28, 2022

May 28, 2022

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 3 +++ dlls/scrrun/tests/filesystem.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d7ad255e517..35b43e2f124 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3758,6 +3758,9 @@ static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR de { TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination)); + if(!source || !destination) + return E_INVALIDARG; + return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 79af87591ff..1ba0e81a2d1 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2591,6 +2591,13 @@ static void test_MoveFile(void) hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); + + str = SysAllocString(L"null.txt"); + hr = IFileSystem3_MoveFile(fs3, str, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = IFileSystem3_MoveFile(fs3, NULL, str); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + SysFreeString(str); } static void test_DoOpenPipeStream(void) -- 2.36.1

2 1

[PATCH 1/4] tapi32: Add lineGetCallInfoW stub.
by Roman Pišl May 28, 2022

May 28, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53061 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 75bfe837f3d..2dbca2aba3e 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -296,6 +296,15 @@ DWORD WINAPI lineGetCallInfoA(HCALL hCall, LPLINECALLINFO lpCallInfo) return 0; } +/*********************************************************************** + * lineGetCallInfoW (TAPI32.@) + */ +DWORD WINAPI lineGetCallInfoW(HCALL hCall, LPLINECALLINFO lpCallInfo) +{ + FIXME("(%p, %p): stub.\n", hCall, lpCallInfo); + return 0; +} + /*********************************************************************** * lineGetCallStatus (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 6c01a870479..757e387c8d2 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -39,6 +39,7 @@ @ stdcall lineGetAppPriorityA(str long ptr long ptr ptr) @ stdcall lineGetCallInfo(long ptr) lineGetCallInfoA @ stdcall lineGetCallInfoA(long ptr) +@ stdcall lineGetCallInfoW(long ptr) @ stdcall lineGetCallStatus(long ptr) @ stdcall lineGetConfRelatedCalls(long ptr) @ stdcall lineGetCountry(long long ptr) lineGetCountryA -- 2.30.2

1 3