July 2023 - Wine-commits - list.winehq.org

Fabian Maurer : windows.devices.geolocation.geolocator: Fake success for PositionChanged_add.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: fc2814623ea1c6caf18ce5555f42b7739f497c90 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc2814623ea1c6caf18ce5555f42b7… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jun 28 22:13:47 2023 +0200 windows.devices.geolocation.geolocator: Fake success for PositionChanged_add. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55126 --- dlls/windows.devices.geolocation.geolocator/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.devices.geolocation.geolocator/main.c b/dlls/windows.devices.geolocation.geolocator/main.c index 3bbd6396caa..ac3641e1ec3 100644 --- a/dlls/windows.devices.geolocation.geolocator/main.c +++ b/dlls/windows.devices.geolocation.geolocator/main.c @@ -153,7 +153,7 @@ HRESULT WINAPI geolocator_GetGeopositionAsyncWithAgeAndTimeout(IGeolocator *ifac HRESULT WINAPI geolocator_add_PositionChanged(IGeolocator *iface, ITypedEventHandler_Geolocator_PositionChangedEventArgs *handler, EventRegistrationToken *token) { FIXME("iface %p, handler %p, token %p stub.\n", iface, handler, token); - return E_NOTIMPL; + return S_OK; } HRESULT WINAPI geolocator_remove_PositionChanged(IGeolocator *iface, EventRegistrationToken token)

1 0

Fabian Maurer : windows.devices.geolocation.geolocator: Implement IWeakReferenceSource.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: f40c3f63235ee0a815f6623201b3ec218d27c681 URL: https://gitlab.winehq.org/wine/wine/-/commit/f40c3f63235ee0a815f6623201b3ec… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jun 28 22:29:25 2023 +0200 windows.devices.geolocation.geolocator: Implement IWeakReferenceSource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55126 --- dlls/windows.devices.geolocation.geolocator/main.c | 47 ++++++++++++++++++++++ .../private.h | 1 + .../tests/geolocator.c | 6 +++ 3 files changed, 54 insertions(+) diff --git a/dlls/windows.devices.geolocation.geolocator/main.c b/dlls/windows.devices.geolocation.geolocator/main.c index ac3641e1ec3..4ea40ce3405 100644 --- a/dlls/windows.devices.geolocation.geolocator/main.c +++ b/dlls/windows.devices.geolocation.geolocator/main.c @@ -33,6 +33,7 @@ struct geolocator_statics struct geolocator { IGeolocator IGeolocator_iface; + IWeakReferenceSource IWeakReferenceSource_iface; LONG ref; }; @@ -57,6 +58,13 @@ static HRESULT WINAPI geolocator_QueryInterface(IGeolocator *iface, REFIID iid, return S_OK; } + if (IsEqualGUID(iid, &IID_IWeakReferenceSource)) + { + *out = &impl->IWeakReferenceSource_iface; + IInspectable_AddRef(*out); + return S_OK; + } + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -199,6 +207,44 @@ static const struct IGeolocatorVtbl geolocator_vtbl = geolocator_remove_StatusChanged, }; +static inline struct geolocator *impl_from_IWeakReferenceSource(IWeakReferenceSource *iface) +{ + return CONTAINING_RECORD(iface, struct geolocator, IWeakReferenceSource_iface); +} + +static HRESULT WINAPI weak_reference_source_QueryInterface(IWeakReferenceSource *iface, REFIID iid, void **out) +{ + struct geolocator *impl = impl_from_IWeakReferenceSource(iface); + return geolocator_QueryInterface(&impl->IGeolocator_iface, iid, out); +} + +static ULONG WINAPI weak_reference_source_AddRef(IWeakReferenceSource *iface) +{ + struct geolocator *impl = impl_from_IWeakReferenceSource(iface); + return geolocator_AddRef(&impl->IGeolocator_iface); +} + +static ULONG WINAPI weak_reference_source_Release(IWeakReferenceSource *iface) +{ + struct geolocator *impl = impl_from_IWeakReferenceSource(iface); + return geolocator_Release(&impl->IGeolocator_iface); +} + +static HRESULT WINAPI weak_reference_source_GetWeakReference(IWeakReferenceSource *iface, IWeakReference **ref) +{ + FIXME("iface %p, ref %p stub.\n", iface, ref); + return E_NOTIMPL; +} + +static const struct IWeakReferenceSourceVtbl weak_reference_source_vtbl = +{ + weak_reference_source_QueryInterface, + weak_reference_source_AddRef, + weak_reference_source_Release, + /* IWeakReferenceSource methods */ + weak_reference_source_GetWeakReference, +}; + static inline struct geolocator_statics *impl_from_IActivationFactory(IActivationFactory *iface) { return CONTAINING_RECORD(iface, struct geolocator_statics, IActivationFactory_iface); @@ -274,6 +320,7 @@ static HRESULT WINAPI factory_ActivateInstance(IActivationFactory *iface, IInspe } impl->IGeolocator_iface.lpVtbl = &geolocator_vtbl; + impl->IWeakReferenceSource_iface.lpVtbl = &weak_reference_source_vtbl; impl->ref = 1; *instance = (IInspectable *)&impl->IGeolocator_iface; diff --git a/dlls/windows.devices.geolocation.geolocator/private.h b/dlls/windows.devices.geolocation.geolocator/private.h index b03c6cfc9d0..7250bc1fe36 100644 --- a/dlls/windows.devices.geolocation.geolocator/private.h +++ b/dlls/windows.devices.geolocation.geolocator/private.h @@ -28,6 +28,7 @@ #include "winstring.h" #include "activation.h" +#include "weakreference.h" #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections diff --git a/dlls/windows.devices.geolocation.geolocator/tests/geolocator.c b/dlls/windows.devices.geolocation.geolocator/tests/geolocator.c index 4aa3cc35413..058098a5946 100644 --- a/dlls/windows.devices.geolocation.geolocator/tests/geolocator.c +++ b/dlls/windows.devices.geolocation.geolocator/tests/geolocator.c @@ -26,6 +26,7 @@ #include "initguid.h" #include "roapi.h" +#include "weakreference.h" #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" @@ -53,6 +54,7 @@ void test_basic(void) IActivationFactory *factory; IInspectable *inspectable; IGeolocator *geolocator; + IWeakReferenceSource *weak_reference_source; HSTRING str; HRESULT hr; @@ -87,6 +89,10 @@ void test_basic(void) IInspectable_Release(inspectable); inspectable = 0; + hr = IGeolocator_QueryInterface(geolocator, &IID_IWeakReferenceSource, (void **)&weak_reference_source); + ok(hr == S_OK && weak_reference_source, "got hr %#lx.\n", hr); + IWeakReferenceSource_Release(weak_reference_source); + IGeolocator_Release(geolocator); IActivationFactory_Release(factory); }

1 0

Giovanni Mascellani : include: Document vkd3d_acquire_vk_queue() and vkd3d_release_vk_queue().
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: vkd3d Branch: master Commit: b2a1f6b5e4f59fbc7f91ada7e565639dcf4e8e7f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b2a1f6b5e4f59fbc7f91ada7e5656… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 5 13:26:20 2023 +0200 include: Document vkd3d_acquire_vk_queue() and vkd3d_release_vk_queue(). --- include/vkd3d.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index f36d9043..3adce97b 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -207,7 +207,42 @@ VKD3D_API VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); VKD3D_API struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); VKD3D_API uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); + +/** + * Acquire the Vulkan queue backing a command queue. + * + * While a queue is acquired by the client, it is locked so that + * neither the vkd3d library nor other threads can submit work to + * it. For that reason it should be released as soon as possible with + * vkd3d_release_vk_queue(). The lock is not reentrant, so the same + * queue must not be acquired more than once by the same thread. + * + * Work submitted through the Direct3D 12 API exposed by vkd3d is not + * always immediately submitted to the Vulkan queue; sometimes it is + * kept in another internal queue, which might not necessarily be + * empty at the time vkd3d_acquire_vk_queue() is called. For this + * reason, work submitted directly to the Vulkan queue might appear to + * the Vulkan driver as being submitted before other work submitted + * though the Direct3D 12 API. If this is not desired, it is + * recommended to synchronize work submission using an ID3D12Fence + * object, by submitting to the queue a signal operation after all the + * Direct3D 12 work is submitted and waiting for it before calling + * vkd3d_acquire_vk_queue(). + * + * \since 1.0 + */ VKD3D_API VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); + +/** + * Release the Vulkan queue backing a command queue. + * + * This must be paired to an earlier corresponding + * vkd3d_acquire_vk_queue(). After this function is called, the Vulkan + * queue returned by vkd3d_acquire_vk_queue() must not be used any + * more. + * + * \since 1.0 + */ VKD3D_API void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); VKD3D_API HRESULT vkd3d_create_image_resource(ID3D12Device *device,

1 0

Giovanni Mascellani : demos: Use a fence to synchronize D3D12 and Vulkan work.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: vkd3d Branch: master Commit: 2a3413e0f01524f2068bce12100906eb2200c965 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a3413e0f01524f2068bce1210090… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 5 13:56:32 2023 +0200 demos: Use a fence to synchronize D3D12 and Vulkan work. --- demos/demo_xcb.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 5ebe0ff9..f71e89f6 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -113,6 +113,9 @@ struct demo_swapchain VkDevice vk_device; ID3D12CommandQueue *command_queue; + ID3D12Fence *present_fence; + unsigned long long present_count; + uint32_t current_buffer; unsigned int buffer_count; ID3D12Resource *buffers[1]; @@ -529,6 +532,17 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c } swapchain->buffer_count = image_count; free(vk_images); + + if (FAILED(ID3D12Device_CreateFence(d3d12_device, 0, 0, &IID_ID3D12Fence, (void **)&swapchain->present_fence))) + { + for (i = 0; i < image_count; ++i) + { + ID3D12Resource_Release(swapchain->buffers[i]); + } + free(swapchain); + goto fail; + } + swapchain->present_count = 0; ID3D12Device_Release(d3d12_device); ID3D12CommandQueue_AddRef(swapchain->command_queue = command_queue); @@ -574,6 +588,12 @@ static inline void demo_swapchain_present(struct demo_swapchain *swapchain) present_desc.pImageIndices = &swapchain->current_buffer; present_desc.pResults = NULL; + /* Synchronize vkd3d_acquire_vk_queue() with the Direct3D 12 work + * already submitted to the command queue. */ + ++swapchain->present_count; + ID3D12CommandQueue_Signal(swapchain->command_queue, swapchain->present_fence, swapchain->present_count); + ID3D12Fence_SetEventOnCompletion(swapchain->present_fence, swapchain->present_count, NULL); + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); vkQueuePresentKHR(vk_queue, &present_desc); vkd3d_release_vk_queue(swapchain->command_queue); @@ -589,6 +609,7 @@ static inline void demo_swapchain_destroy(struct demo_swapchain *swapchain) unsigned int i; ID3D12CommandQueue_Release(swapchain->command_queue); + ID3D12Fence_Release(swapchain->present_fence); for (i = 0; i < swapchain->buffer_count; ++i) { ID3D12Resource_Release(swapchain->buffers[i]);

1 0

Alex Henrie : include: Add REPARSE_(GUID_)DATA_BUFFER and related constants.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 33b7e4806f44b781cd9b8c9a90ca305c7709368f URL: https://gitlab.winehq.org/wine/wine/-/commit/33b7e4806f44b781cd9b8c9a90ca30… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 5 21:52:16 2023 -0600 include: Add REPARSE_(GUID_)DATA_BUFFER and related constants. Based on a patch by Erich E. Hoover. --- include/ddk/ntifs.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index bd4bd58be26..cedd54a66fe 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -30,6 +30,8 @@ #define PHCM_DISGUISE_FULL_PLACEHOLDERS ((char)3) #define PHCM_MAX ((char)3) +#define SYMLINK_FLAG_RELATIVE 0x00000001 + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -138,6 +140,54 @@ typedef struct _FS_FILTER_CALLBACKS PFS_FILTER_COMPLETION_CALLBACK PostReleaseForModifiedPageWriter; } FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; +typedef struct _REPARSE_DATA_BUFFER +{ + ULONG ReparseTag; + USHORT ReparseDataLength; + USHORT Reserved; + union + { + struct + { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + ULONG Flags; + WCHAR PathBuffer[1]; + } SymbolicLinkReparseBuffer; + + struct + { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + WCHAR PathBuffer[1]; + } MountPointReparseBuffer; + + struct + { + UCHAR DataBuffer[1]; + } GenericReparseBuffer; + + } DUMMYUNIONNAME; +} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; + +typedef struct _REPARSE_GUID_DATA_BUFFER +{ + DWORD ReparseTag; + WORD ReparseDataLength; + WORD Reserved; + GUID ReparseGuid; + struct + { + BYTE DataBuffer[1]; + } GenericReparseBuffer; +} REPARSE_GUID_DATA_BUFFER, *PREPARSE_GUID_DATA_BUFFER; + +#define REPARSE_GUID_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer) + BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); DEVICE_OBJECT * WINAPI IoGetAttachedDevice(DEVICE_OBJECT*); PEPROCESS WINAPI IoGetRequestorProcess(IRP*);

1 0

Alex Henrie : include: Add IsReparseTagNameSurrogate.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: b87dcee5ea6683e8b474e4db4221a267b84131b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b87dcee5ea6683e8b474e4db4221a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 5 22:40:30 2023 -0600 include: Add IsReparseTagNameSurrogate. Based on a patch by Erich E. Hoover. --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 26be0ccaec5..f431753e46a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2483,6 +2483,8 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) #define IO_REPARSE_TAG_ONEDRIVE __MSABI_LONG(0x80000021) #define IO_REPARSE_TAG_GVFS_TOMBSTONE __MSABI_LONG(0xA0000022) +#define IsReparseTagNameSurrogate(x) ((x) & 0x20000000) + /* * File formats definitions */

1 0

Fabian Maurer : kerberos: Avoid potentially uninitialized variable (clang-scan).
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: f841045b2d72ac7d70c60cb40311293998590e13 URL: https://gitlab.winehq.org/wine/wine/-/commit/f841045b2d72ac7d70c60cb4031129… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Dec 15 18:24:37 2022 +0100 kerberos: Avoid potentially uninitialized variable (clang-scan). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kerberos/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 45cf494aa70..8d9b59b58d4 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -305,7 +305,7 @@ static NTSTATUS copy_tickets_to_client( struct ticket_list *list, KERB_QUERY_TKT static NTSTATUS kerberos_fill_ticket_list( struct ticket_list *list ) { - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; krb5_error_code err; krb5_context ctx; krb5_cccol_cursor cursor = NULL;

1 0

Jacek Caban : wow64win: Fix NULL buffer handling in wow64_NtUserBuildHimcList.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 79895921723b043246e8b14b5059f322e665764d URL: https://gitlab.winehq.org/wine/wine/-/commit/79895921723b043246e8b14b5059f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 21:18:01 2023 +0200 wow64win: Fix NULL buffer handling in wow64_NtUserBuildHimcList. Fixes win32u tests on wow64. --- dlls/wow64win/user.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 73854225b7f..8e2853ca0b5 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1186,11 +1186,12 @@ NTSTATUS WINAPI wow64_NtUserBuildHimcList( UINT *args ) UINT32 *buffer32 = get_ptr( &args ); UINT *size = get_ptr( &args ); - HIMC *buffer; + HIMC *buffer = NULL; ULONG i; NTSTATUS status; - if (!(buffer = Wow64AllocateTemp( count * sizeof(*buffer) ))) return STATUS_NO_MEMORY; + if (buffer32 && !(buffer = Wow64AllocateTemp( count * sizeof(*buffer) ))) + return STATUS_NO_MEMORY; if ((status = NtUserBuildHimcList( thread_id, count, buffer, size ))) return status;

1 0

Alexandros Frantzis : winewayland.drv: Use a buffer queue for window_surface.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 4371a2604198b9ab126240400de3fbddd583abf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4371a2604198b9ab126240400de3fb… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu May 18 14:13:27 2023 +0300 winewayland.drv: Use a buffer queue for window_surface. Create a buffer queue to hold the SHM buffers for each window_surface, to be able to reuse released buffers instead of constantly creating new ones. --- dlls/winewayland.drv/wayland_surface.c | 29 +++++- dlls/winewayland.drv/waylanddrv.h | 6 +- dlls/winewayland.drv/window_surface.c | 174 ++++++++++++++++++++++++++++++--- 3 files changed, 192 insertions(+), 17 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Track damaged buffer regions.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: d5b3ac08c9b3709e7c573decc8bef34de132d1ed URL: https://gitlab.winehq.org/wine/wine/-/commit/d5b3ac08c9b3709e7c573decc8bef3… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu May 18 16:20:18 2023 +0300 winewayland.drv: Track damaged buffer regions. Track the buffer regions that require an update since the last buffer commit, and copy only those parts from the window_surface to the buffer. --- dlls/winewayland.drv/wayland_surface.c | 12 +++- dlls/winewayland.drv/waylanddrv.h | 18 +++++ dlls/winewayland.drv/window_surface.c | 122 ++++++++++++++++++++++++++++++++- 3 files changed, 147 insertions(+), 5 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 43ba853c2c5..13218a977a6 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -33,9 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); -/* We only use 4 byte formats. */ -#define WINEWAYLAND_BYTES_PER_PIXEL 4 - /* Protects access to the user data of xdg_surface */ static pthread_mutex_t xdg_data_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -264,6 +261,8 @@ void wayland_shm_buffer_unref(struct wayland_shm_buffer *shm_buffer) wl_buffer_destroy(shm_buffer->wl_buffer); if (shm_buffer->map_data) NtUnmapViewOfSection(GetCurrentProcess(), shm_buffer->map_data); + if (shm_buffer->damage_region) + NtGdiDeleteObjectApp(shm_buffer->damage_region); free(shm_buffer); } @@ -307,6 +306,13 @@ struct wayland_shm_buffer *wayland_shm_buffer_create(int width, int height, shm_buffer->height = height; shm_buffer->map_size = size; + shm_buffer->damage_region = NtGdiCreateRectRgn(0, 0, width, height); + if (!shm_buffer->damage_region) + { + ERR("Failed to create buffer damage region\n"); + goto err; + } + section_size.QuadPart = size; status = NtCreateSection(&handle, GENERIC_READ | SECTION_MAP_READ | SECTION_MAP_WRITE, diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 5abc5ae2d43..992f504e3d7 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -32,11 +32,15 @@ #include "windef.h" #include "winbase.h" +#include "ntgdi.h" #include "wine/gdi_driver.h" #include "wine/rbtree.h" #include "unixlib.h" +/* We only use 4 byte formats. */ +#define WINEWAYLAND_BYTES_PER_PIXEL 4 + /********************************************************************** * Globals */ @@ -114,6 +118,7 @@ struct wayland_shm_buffer size_t map_size; BOOL busy; LONG ref; + HRGN damage_region; }; /********************************************************************** @@ -160,6 +165,19 @@ void wayland_window_surface_update_wayland_surface(struct window_surface *surfac struct wayland_surface *wayland_surface) DECLSPEC_HIDDEN; void wayland_window_flush(HWND hwnd) DECLSPEC_HIDDEN; +/********************************************************************** + * Helpers + */ + +static inline BOOL intersect_rect(RECT *dst, const RECT *src1, const RECT *src2) +{ + dst->left = max(src1->left, src2->left); + dst->top = max(src1->top, src2->top); + dst->right = min(src1->right, src2->right); + dst->bottom = min(src1->bottom, src2->bottom); + return !IsRectEmpty(dst); +} + /********************************************************************** * USER driver functions */ diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 40129a8977a..94051e8fefd 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -205,6 +205,20 @@ out: return shm_buffer; } +/********************************************************************** + * wayland_buffer_queue_add_damage + */ +static void wayland_buffer_queue_add_damage(struct wayland_buffer_queue *queue, HRGN damage) +{ + struct wayland_shm_buffer *shm_buffer; + + wl_list_for_each(shm_buffer, &queue->buffer_list, link) + { + NtGdiCombineRgn(shm_buffer->damage_region, shm_buffer->damage_region, + damage, RGN_OR); + } +} + /*********************************************************************** * wayland_window_surface_lock */ @@ -254,6 +268,95 @@ static void wayland_window_surface_set_region(struct window_surface *window_surf /* TODO */ } +/********************************************************************** + * get_region_data + */ +static RGNDATA *get_region_data(HRGN region) +{ + RGNDATA *data; + DWORD size; + + if (!region) return NULL; + if (!(size = NtGdiGetRegionData(region, 0, NULL))) return NULL; + if (!(data = malloc(size))) return NULL; + if (!NtGdiGetRegionData(region, size, data)) + { + free(data); + return NULL; + } + + return data; +} + +/********************************************************************** + * copy_pixel_region + */ +static void copy_pixel_region(char *src_pixels, RECT *src_rect, + char *dst_pixels, RECT *dst_rect, + HRGN region) +{ + static const int bpp = WINEWAYLAND_BYTES_PER_PIXEL; + RGNDATA *rgndata = get_region_data(region); + RECT *rgn_rect; + RECT *rgn_rect_end; + int src_stride, dst_stride; + + if (!rgndata) return; + + src_stride = (src_rect->right - src_rect->left) * bpp; + dst_stride = (dst_rect->right - dst_rect->left) * bpp; + + rgn_rect = (RECT *)rgndata->Buffer; + rgn_rect_end = rgn_rect + rgndata->rdh.nCount; + + for (;rgn_rect < rgn_rect_end; rgn_rect++) + { + char *src, *dst; + int y, width_bytes, height; + RECT rc; + + TRACE("rect %s\n", wine_dbgstr_rect(rgn_rect)); + + if (!intersect_rect(&rc, rgn_rect, src_rect)) continue; + if (!intersect_rect(&rc, &rc, dst_rect)) continue; + + src = src_pixels + rc.top * src_stride + rc.left * bpp; + dst = dst_pixels + rc.top * dst_stride + rc.left * bpp; + width_bytes = (rc.right - rc.left) * bpp; + height = rc.bottom - rc.top; + + /* Fast path for full width rectangles. */ + if (width_bytes == src_stride && width_bytes == dst_stride) + { + memcpy(dst, src, height * width_bytes); + continue; + } + + for (y = 0; y < height; y++) + { + memcpy(dst, src, width_bytes); + src += src_stride; + dst += dst_stride; + } + } + + free(rgndata); +} + +/********************************************************************** + * wayland_window_surface_copy_to_buffer + */ +static void wayland_window_surface_copy_to_buffer(struct wayland_window_surface *wws, + struct wayland_shm_buffer *buffer, + HRGN region) +{ + RECT wws_rect = {0, 0, wws->info.bmiHeader.biWidth, + abs(wws->info.bmiHeader.biHeight)}; + RECT buffer_rect = {0, 0, buffer->width, buffer->height}; + TRACE("wws=%p buffer=%p\n", wws, buffer); + copy_pixel_region(wws->bits, &wws_rect, buffer->map_data, &buffer_rect, region); +} + /*********************************************************************** * wayland_window_surface_flush */ @@ -262,10 +365,12 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) struct wayland_window_surface *wws = wayland_window_surface_cast(window_surface); struct wayland_shm_buffer *shm_buffer = NULL; BOOL flushed = FALSE; + RECT damage_rect; + HRGN surface_damage_region; wayland_window_surface_lock(window_surface); - if (IsRectEmpty(&wws->bounds)) goto done; + if (!intersect_rect(&damage_rect, &wws->header.rect, &wws->bounds)) goto done; if (!wws->wayland_surface || !wws->wayland_buffer_queue) { @@ -277,6 +382,17 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) TRACE("surface=%p hwnd=%p surface_rect=%s bounds=%s\n", wws, wws->hwnd, wine_dbgstr_rect(&wws->header.rect), wine_dbgstr_rect(&wws->bounds)); + surface_damage_region = NtGdiCreateRectRgn(damage_rect.left, damage_rect.top, + damage_rect.right, damage_rect.bottom); + if (!surface_damage_region) + { + ERR("failed to create surface damage region\n"); + goto done; + } + + wayland_buffer_queue_add_damage(wws->wayland_buffer_queue, surface_damage_region); + NtGdiDeleteObjectApp(surface_damage_region); + shm_buffer = wayland_buffer_queue_get_free_buffer(wws->wayland_buffer_queue); if (!shm_buffer) { @@ -284,7 +400,7 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) goto done; } - memcpy(shm_buffer->map_data, wws->bits, shm_buffer->map_size); + wayland_window_surface_copy_to_buffer(wws, shm_buffer, shm_buffer->damage_region); pthread_mutex_lock(&wws->wayland_surface->mutex); if (wws->wayland_surface->current_serial) @@ -300,6 +416,8 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) pthread_mutex_unlock(&wws->wayland_surface->mutex); wl_display_flush(process_wayland.wl_display); + NtGdiSetRectRgn(shm_buffer->damage_region, 0, 0, 0, 0); + done: if (flushed) reset_bounds(&wws->bounds); wayland_window_surface_unlock(window_surface);

1 0