August 2021 - Wine-commits - list.winehq.org

Zebediah Figura : kernel32: Call kernelbase DeviceIoControl() in kernel32 DeviceIoControl().
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: c4ff18f765b5d932f5e25aaf705522f13c6c0a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ff18f765b5d932f5e25aaf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 26 20:54:11 2021 -0500 kernel32: Call kernelbase DeviceIoControl() in kernel32 DeviceIoControl(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 57 +++++++-------------------------------------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 10 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 92022063ecc..4d6f893c92d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -389,21 +389,16 @@ HANDLE WINAPI OpenVxDHandle(HANDLE hHandleRing3) /**************************************************************************** * DeviceIoControl (KERNEL32.@) */ -BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, - LPVOID lpvInBuffer, DWORD cbInBuffer, - LPVOID lpvOutBuffer, DWORD cbOutBuffer, - LPDWORD lpcbBytesReturned, - LPOVERLAPPED lpOverlapped) +BOOL WINAPI KERNEL32_DeviceIoControl( HANDLE handle, DWORD code, void *in_buff, DWORD in_count, + void *out_buff, DWORD out_count, DWORD *returned, + OVERLAPPED *overlapped ) { - NTSTATUS status; - - TRACE( "(%p,%x,%p,%d,%p,%d,%p,%p)\n", - hDevice,dwIoControlCode,lpvInBuffer,cbInBuffer, - lpvOutBuffer,cbOutBuffer,lpcbBytesReturned,lpOverlapped ); + TRACE( "(%p,%#x,%p,%d,%p,%d,%p,%p)\n", + handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped ); /* Check if this is a user defined control code for a VxD */ - if (HIWORD( dwIoControlCode ) == 0 && (GetVersion() & 0x80000000)) + if (HIWORD( code ) == 0 && (GetVersion() & 0x80000000)) { typedef BOOL (WINAPI *DeviceIoProc)(DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPOVERLAPPED); static DeviceIoProc (*vxd_get_proc)(HANDLE); @@ -411,45 +406,11 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleW(L"krnl386.exe16"), "__wine_vxd_get_proc" ); - if (vxd_get_proc) proc = vxd_get_proc( hDevice ); - if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpOverlapped ); + if (vxd_get_proc) proc = vxd_get_proc( handle ); + if (proc) return proc( code, in_buff, in_count, out_buff, out_count, returned, overlapped ); } - /* Not a VxD, let ntdll handle it */ - - if (lpOverlapped) - { - LPVOID cvalue = ((ULONG_PTR)lpOverlapped->hEvent & 1) ? NULL : lpOverlapped; - lpOverlapped->Internal = STATUS_PENDING; - lpOverlapped->InternalHigh = 0; - if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) - status = NtFsControlFile(hDevice, lpOverlapped->hEvent, - NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped, - dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer); - else - status = NtDeviceIoControlFile(hDevice, lpOverlapped->hEvent, - NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped, - dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer); - if (lpcbBytesReturned) *lpcbBytesReturned = lpOverlapped->InternalHigh; - } - else - { - IO_STATUS_BLOCK iosb; - - if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) - status = NtFsControlFile(hDevice, NULL, NULL, NULL, &iosb, - dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer); - else - status = NtDeviceIoControlFile(hDevice, NULL, NULL, NULL, &iosb, - dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer); - if (lpcbBytesReturned) *lpcbBytesReturned = iosb.Information; - } - return set_ntstatus( status ); + return DeviceIoControl( handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped ); } diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6c02b17c7cf..90b503af19f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -377,7 +377,7 @@ @ stdcall DeleteVolumeMountPointA(str) @ stdcall -import DeleteVolumeMountPointW(wstr) @ stdcall -arch=x86_64 DequeueUmsCompletionListItems(ptr long ptr) -@ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) +@ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) KERNEL32_DeviceIoControl @ stdcall -import DisableThreadLibraryCalls(long) @ stdcall -import DisconnectNamedPipe(long) @ stdcall DnsHostnameToComputerNameA (str ptr ptr)

1 0

Francois Gouget : user32/tests: Use WineTest contexts to simplify test_LoadImage{Bitmap,File}().
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 261956b6fd6a67acfb7485d4fab598d059029058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=261956b6fd6a67acfb7485d4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 27 15:44:09 2021 +0200 user32/tests: Use WineTest contexts to simplify test_LoadImage{Bitmap,File}(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index f84312f3ea2..33ca2e3cb63 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1139,7 +1139,7 @@ static const DWORD biSize_tests[] = { 0xffffffff }; -static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) +static void test_LoadImageBitmap(HBITMAP hbm) { BITMAP bm; BITMAPINFO bmi; @@ -1157,9 +1157,9 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) bmi.bmiHeader.biBitCount= 24; bmi.bmiHeader.biCompression= BI_RGB; ret = GetDIBits(hdc, hbm, 0, bm.bmHeight, &pixel, &bmi, DIB_RGB_COLORS); - ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight); + ok(ret == bm.bmHeight, "%d lines were converted, not %d\n", ret, bm.bmHeight); - ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); + ok(color_match(pixel, 0x00ffffff), "Pixel is 0x%08x\n", pixel); ReleaseDC(NULL, hdc); } @@ -1172,6 +1172,7 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima DWORD error, bytes_written; char filename[64]; + winetest_push_context("%s", test_desc); strcpy(filename, "test."); strcat(filename, ext); @@ -1186,7 +1187,7 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima /* Load as cursor. For all tested formats, this should fail */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); - ok(handle == NULL, "%s: IMAGE_CURSOR succeeded incorrectly.\n", test_desc); + ok(handle == NULL, "IMAGE_CURSOR succeeded incorrectly\n"); error = GetLastError(); ok(error == 0 || broken(error == 0xdeadbeef) || /* Win9x */ @@ -1197,7 +1198,7 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima /* Load as icon. For all tested formats, this should fail */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_ICON, 0, 0, LR_LOADFROMFILE); - ok(handle == NULL, "%s: IMAGE_ICON succeeded incorrectly.\n", test_desc); + ok(handle == NULL, "IMAGE_ICON succeeded incorrectly\n"); error = GetLastError(); ok(error == 0 || broken(error == 0xdeadbeef) || /* Win9x */ @@ -1214,13 +1215,14 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima "Last error: %u\n", error); if (expect_success) { - ok(handle != NULL, "%s: IMAGE_BITMAP failed.\n", test_desc); - if (handle != NULL) test_LoadImageBitmap(test_desc, handle); + ok(handle != NULL, "IMAGE_BITMAP failed\n"); + if (handle != NULL) test_LoadImageBitmap(handle); } - else ok(handle == NULL, "%s: IMAGE_BITMAP succeeded incorrectly.\n", test_desc); + else ok(handle == NULL, "IMAGE_BITMAP succeeded incorrectly\n"); if (handle != NULL) DeleteObject(handle); DeleteFileA(filename); + winetest_pop_context(); } typedef struct {

1 0

Francois Gouget : gdiplus: GdipGetFamilyName() should not crash when given a NULL name.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: ad663360fae6b4a9ee3d7786857404e0a4917329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad663360fae6b4a9ee3d7786… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 26 13:16:12 2021 +0200 gdiplus: GdipGetFamilyName() should not crash when given a NULL name. It used to crash on Windows XP and Vista but does not since Windows 7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 7 +++++-- dlls/gdiplus/tests/font.c | 9 +++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 64604367da3..44431ea2ac8 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -798,17 +798,20 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clo * FAILURE: InvalidParameter if family is NULL * * NOTES - * If name is a NULL ptr, then both XP and Vista will crash (so we do as well) + * If name is NULL, XP and Vista crash but not Windows 7+ */ GpStatus WINGDIPAPI GdipGetFamilyName (GDIPCONST GpFontFamily *family, WCHAR *name, LANGID language) { static int lang_fixme; + TRACE("%p, %p, %d\n", family, name, language); + if (family == NULL) return InvalidParameter; - TRACE("%p, %p, %d\n", family, name, language); + if (name == NULL) + return Ok; if (language != LANG_NEUTRAL && !lang_fixme++) FIXME("No support for handling of multiple languages!\n"); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b208989c054..4ffa9e823fc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -388,12 +388,9 @@ static void test_fontfamily (void) expect (Ok, stat); expect (0, lstrcmpiW(itsName, L"Tahoma")); - if (0) - { - /* Crashes on Windows XP SP2, Vista, and so Wine as well */ - stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); - expect (Ok, stat); - } + /* Crashes on Windows XP SP2 and Vista */ + stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); + expect (Ok, stat); /* Make sure we don't read old data */ ZeroMemory (itsName, sizeof(itsName));

1 0

Francois Gouget : gdiplus/tests: Fix a font test crash when "MS Shell Dlg" is not found.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 53371cc55666fb9805aaeb6bef42b7baf410b15c URL: https://source.winehq.org/git/wine.git/?a=commit;h=53371cc55666fb9805aaeb6b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 26 16:40:05 2021 +0200 gdiplus/tests: Fix a font test crash when "MS Shell Dlg" is not found. When "MS Shell Dlg" is missing GdipCreateFontFamilyFromName() leaves the GpFontFamily* pointer uninitialised. So initialize it to NULL in order to get clean failures instead of a crash. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 4ffa9e823fc..031e4688c6c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -883,8 +883,10 @@ static void test_font_substitution(void) ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n"); GdipDeleteFont(font); + family = NULL; status = GdipCreateFontFamilyFromName(L"MS Shell Dlg", NULL, &family); expect(Ok, status); + font = NULL; status = GdipCreateFont(family, 12, FontStyleRegular, UnitPoint, &font); expect(Ok, status); memset(&lf, 0xfe, sizeof(lf));

1 0

Jan Sikorski : wined3d: Avoid read-to-read resource barriers.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: b4e03a7c6e9df260657588a493147f976a8dfc0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4e03a7c6e9df260657588a4… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Aug 23 17:13:50 2021 +0200 wined3d: Avoid read-to-read resource barriers. Guard against the most recent write operation instead. Accumulate read bindings to a) not issue unnecessary barriers when a resource has multiple read-only usages, and b) synchronize with all previous read bindings when writing. This is motivated by an issue where a program using a single buffer to store both indices and vertex attributes causes superfluous barriers on each draw call. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 25 ++++++++++++++++++++----- dlls/wined3d/texture.c | 27 +++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4420885b15f..da61f36af45 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1582,22 +1582,38 @@ HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, struct wined3d_context_vk *context_vk, uint32_t bind_mask) { + uint32_t src_bind_mask = 0; + TRACE("buffer_vk %p, context_vk %p, bind_mask %s.\n", buffer_vk, context_vk, wined3d_debug_bind_flags(bind_mask)); - if (buffer_vk->bind_mask && buffer_vk->bind_mask != bind_mask) + if (bind_mask & ~WINED3D_READ_ONLY_BIND_MASK) + { + src_bind_mask = buffer_vk->bind_mask & WINED3D_READ_ONLY_BIND_MASK; + if (!src_bind_mask) + src_bind_mask = buffer_vk->bind_mask; + + buffer_vk->bind_mask = bind_mask; + } + else if ((buffer_vk->bind_mask & bind_mask) != bind_mask) + { + src_bind_mask = buffer_vk->bind_mask & ~WINED3D_READ_ONLY_BIND_MASK; + buffer_vk->bind_mask |= bind_mask; + } + + if (src_bind_mask) { const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkBufferMemoryBarrier vk_barrier; TRACE(" %s -> %s.\n", - wined3d_debug_bind_flags(buffer_vk->bind_mask), wined3d_debug_bind_flags(bind_mask)); + wined3d_debug_bind_flags(src_bind_mask), wined3d_debug_bind_flags(bind_mask)); wined3d_context_vk_end_current_render_pass(context_vk); vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; - vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(buffer_vk->bind_mask); + vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(src_bind_mask); vk_barrier.dstAccessMask = vk_access_mask_from_bind_flags(bind_mask); vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; @@ -1605,11 +1621,10 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, vk_barrier.offset = buffer_vk->bo.buffer_offset; vk_barrier.size = buffer_vk->b.resource.size; VK_CALL(vkCmdPipelineBarrier(wined3d_context_vk_get_command_buffer(context_vk), - vk_pipeline_stage_mask_from_bind_flags(buffer_vk->bind_mask), + vk_pipeline_stage_mask_from_bind_flags(src_bind_mask), vk_pipeline_stage_mask_from_bind_flags(bind_mask), 0, 0, NULL, 1, &vk_barrier, 0, NULL)); } - buffer_vk->bind_mask = bind_mask; } HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c1247fbc56b..f5f7fab49a6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5244,15 +5244,31 @@ HRESULT wined3d_texture_vk_init(struct wined3d_texture_vk *texture_vk, struct wi void wined3d_texture_vk_barrier(struct wined3d_texture_vk *texture_vk, struct wined3d_context_vk *context_vk, uint32_t bind_mask) { - VkImageSubresourceRange vk_range; + uint32_t src_bind_mask = 0; TRACE("texture_vk %p, context_vk %p, bind_mask %s.\n", texture_vk, context_vk, wined3d_debug_bind_flags(bind_mask)); - if (texture_vk->bind_mask && texture_vk->bind_mask != bind_mask) + if (bind_mask & ~WINED3D_READ_ONLY_BIND_MASK) { + src_bind_mask = texture_vk->bind_mask & WINED3D_READ_ONLY_BIND_MASK; + if (!src_bind_mask) + src_bind_mask = texture_vk->bind_mask; + + texture_vk->bind_mask = bind_mask; + } + else if ((texture_vk->bind_mask & bind_mask) != bind_mask) + { + src_bind_mask = texture_vk->bind_mask & ~WINED3D_READ_ONLY_BIND_MASK; + texture_vk->bind_mask |= bind_mask; + } + + if (src_bind_mask) + { + VkImageSubresourceRange vk_range; + TRACE(" %s -> %s.\n", - wined3d_debug_bind_flags(texture_vk->bind_mask), wined3d_debug_bind_flags(bind_mask)); + wined3d_debug_bind_flags(src_bind_mask), wined3d_debug_bind_flags(bind_mask)); vk_range.aspectMask = vk_aspect_mask_from_format(texture_vk->t.resource.format); vk_range.baseMipLevel = 0; @@ -5261,12 +5277,11 @@ void wined3d_texture_vk_barrier(struct wined3d_texture_vk *texture_vk, vk_range.layerCount = VK_REMAINING_ARRAY_LAYERS; wined3d_context_vk_image_barrier(context_vk, wined3d_context_vk_get_command_buffer(context_vk), - vk_pipeline_stage_mask_from_bind_flags(texture_vk->bind_mask), + vk_pipeline_stage_mask_from_bind_flags(src_bind_mask), vk_pipeline_stage_mask_from_bind_flags(bind_mask), - vk_access_mask_from_bind_flags(texture_vk->bind_mask), vk_access_mask_from_bind_flags(bind_mask), + vk_access_mask_from_bind_flags(src_bind_mask), vk_access_mask_from_bind_flags(bind_mask), texture_vk->layout, texture_vk->layout, texture_vk->image.vk_image, &vk_range); } - texture_vk->bind_mask = bind_mask; } static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86eae149306..6e9f3884724 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -310,6 +310,9 @@ struct min_lookup extern const struct min_lookup minMipLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; +static const uint32_t WINED3D_READ_ONLY_BIND_MASK = WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER + | WINED3D_BIND_CONSTANT_BUFFER | WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_INDIRECT_BUFFER; + GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : Release 6.16.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 8e2df64cf8979334618a3e2672d19cb9b891fa3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e2df64cf8979334618a3e26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 22:01:52 2021 +0200 Release 6.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1045 +++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 549 insertions(+), 517 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e2df64cf8979334618a…

1 0

Tag wine-6.16 : Alexandre Julliard : Release 6.16
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: refs/tags/wine-6.16 Tag: 0f78c64b397abc0d406d8fbfce5559c196cf304f URL: https://source.winehq.org/git/wine.git/?a=tag;h=0f78c64b397abc0d406d8fbfce5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 22:01:52 2021 +0200 Release 6.16

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_GetObjectInfo.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: ef7432d86e3d7ee1edf3c814efd4ef36dbed1020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7432d86e3d7ee1edf3c814… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:27 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_GetObjectInfo. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index d58a8f5d919..4a05afe30c7 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -536,6 +536,43 @@ static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, return DI_OK; } +static BOOL get_object_info( struct hid_joystick *impl, struct hid_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + DIDEVICEOBJECTINSTANCEW *dest = data; + memcpy( dest, instance, dest->dwSize ); + return DIENUM_STOP; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, DIDEVICEOBJECTINSTANCEW *instance, + DWORD obj, DWORD how ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + const DIPROPHEADER filter = + { + .dwSize = sizeof(filter), + .dwHeaderSize = sizeof(filter), + .dwHow = how, + .dwObj = obj + }; + BOOL ret; + + TRACE( "iface %p, instance %p, obj %#x, how %#x.\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + if (ret != DIENUM_CONTINUE) return S_OK; + ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + if (ret != DIENUM_CONTINUE) return S_OK; + enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + + return S_OK; +} + static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); @@ -592,7 +629,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, - IDirectInputDevice2WImpl_GetObjectInfo, + hid_joystick_GetObjectInfo, hid_joystick_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize,

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_EnumObjects.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 1117f9f072020b5a95410301244703f4d94ff484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1117f9f072020b5a95410301… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:28 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_EnumObjects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4a05afe30c7..3e706dea0b1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -427,6 +427,49 @@ static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, return DI_OK; } +struct enum_objects_params +{ + LPDIENUMDEVICEOBJECTSCALLBACKW callback; + void *context; +}; + +static BOOL enum_objects_callback( struct hid_joystick *impl, struct hid_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct enum_objects_params *params = data; + return params->callback( instance, params->context ); +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *context, DWORD flags ) +{ + static const DIPROPHEADER filter = + { + .dwSize = sizeof(filter), + .dwHeaderSize = sizeof(filter), + .dwHow = DIPH_DEVICE, + }; + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct enum_objects_params params = + { + .callback = callback, + .context = context, + }; + BOOL ret; + + TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + ret = enum_value_objects( impl, &filter, flags, enum_objects_callback, &params ); + if (ret != DIENUM_CONTINUE) return S_OK; + ret = enum_button_objects( impl, &filter, flags, enum_objects_callback, &params ); + if (ret != DIENUM_CONTINUE) return S_OK; + enum_collections_objects( impl, &filter, flags, enum_objects_callback, &params ); + + return S_OK; +} + static BOOL get_property_prop_range( struct hid_joystick *impl, struct hid_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { @@ -619,7 +662,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = hid_joystick_Release, /*** IDirectInputDevice methods ***/ hid_joystick_GetCapabilities, - IDirectInputDevice2WImpl_EnumObjects, + hid_joystick_EnumObjects, hid_joystick_GetProperty, hid_joystick_SetProperty, IDirectInputDevice2WImpl_Acquire,

1 0

Rémi Bernon : dinput: Read HID reports from the internal thread.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: d1e0c5a732236f99c334f50a5d694543a58ba05d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e0c5a732236f99c334f50a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:29 2021 +0200 dinput: Read HID reports from the internal thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 245 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 242 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1e0c5a732236f99c334…

1 0