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

Ziqing Hui : d2d1/tests: Add failure tests for ID2D1Effect_GetValue().
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: d6f3e0ec6f8ec5477aa0684be0d77f60a5063c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6f3e0ec6f8ec5477aa0684b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 31 12:24:26 2021 +0800 d2d1/tests: Add failure tests for ID2D1Effect_GetValue(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72487692abf..629bbd65523 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,13 +9680,14 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - unsigned int i, min_inputs, max_inputs; + unsigned int i, min_inputs, max_inputs, str_size; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; ID2D1Effect *effect; + BYTE buffer[64]; BOOL cached; CLSID clsid; HRESULT hr; @@ -9735,6 +9736,33 @@ static void test_effect(BOOL d3d11) todo_wine { + hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size - 1); + ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, 0xdeadbeef, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_UNKNOWN, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : ntdll: Add a magic parameter to NtFreeVirtualMemory() for releasing address space.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 669d1cce03a42ea978faf9a4608552b2d11ef5ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=669d1cce03a42ea978faf9a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 12:02:51 2021 +0200 ntdll: Add a magic parameter to NtFreeVirtualMemory() for releasing address space. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 13 ++++++++- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/unix_private.h | 2 -- dlls/ntdll/unix/virtual.c | 66 +++++++++++++++++++++--------------------- dlls/ntdll/unixlib.h | 5 +--- 5 files changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2b840a864a6..1139a228c2c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3775,6 +3775,17 @@ static void init_wow64( CONTEXT *context ) #endif +/* release some address space once dlls are loaded*/ +static void release_address_space(void) +{ +#ifndef _WIN64 + void *addr = (void *)1; + SIZE_T size = 0; + + NtFreeVirtualMemory( GetCurrentProcess(), &addr, &size, MEM_RELEASE ); +#endif +} + /****************************************************************** * LdrInitializeThunk (NTDLL.@) * @@ -3901,7 +3912,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR NtTerminateProcess( GetCurrentProcess(), status ); } } - unix_funcs->virtual_release_address_space(); + release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e580cd7556..bf5f8048124 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1895,7 +1895,6 @@ static struct unix_funcs unix_funcs = ntdll_sin, ntdll_sqrt, ntdll_tan, - virtual_release_address_space, load_so_dll, init_builtin_dll, init_unix_lib, diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3bb763a5eda..d65807b8057 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -109,8 +109,6 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; - extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index fbdbf79d9d5..cd677cd2c69 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -580,6 +580,20 @@ static void mmap_init( const struct preload_info *preload_info ) #endif } + +/*********************************************************************** + * get_wow_user_space_limit + */ +static void *get_wow_user_space_limit(void) +{ +#ifdef _WIN64 + if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) return (void *)0xc0000000; + return (void *)0x7fff0000; +#endif + return user_space_limit; +} + + /*********************************************************************** * add_builtin_module */ @@ -2703,17 +2717,8 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) info->LowestUserAddress = (void *)0x10000; info->ActiveProcessorsAffinityMask = get_system_affinity_mask(); info->NumberOfProcessors = peb->NumberOfProcessors; -#ifdef _WIN64 - if (wow64) - { - if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) - info->HighestUserAddress = (char *)0xc0000000 - 1; - else - info->HighestUserAddress = (char *)0x7fff0000 - 1; - return; - } -#endif - info->HighestUserAddress = (char *)user_space_limit - 1; + if (wow64) info->HighestUserAddress = (char *)get_wow_user_space_limit() - 1; + else info->HighestUserAddress = (char *)user_space_limit - 1; } @@ -3639,38 +3644,29 @@ static int CDECL free_reserved_memory( void *base, SIZE_T size, void *arg ) * * Release some address space once we have loaded and initialized the app. */ -void CDECL virtual_release_address_space(void) +static void virtual_release_address_space(void) { struct free_range range; - sigset_t sigset; - - if (is_win64) return; - - server_enter_uninterrupted_section( &virtual_mutex, &sigset ); range.base = (char *)0x82000000; - range.limit = user_space_limit; + range.limit = get_wow_user_space_limit(); + + if (range.limit > (char *)0xfffff000) return; /* 64-bit limit, nothing to do */ if (range.limit > range.base) { while (mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */; #ifdef __APPLE__ /* On macOS, we still want to free some of low memory, for OpenGL resources */ - range.base = (char *)0x40000000; + range.base = (char *)0x40000000; #else - range.base = NULL; + return; #endif } - else - range.base = (char *)0x20000000; + else range.base = (char *)0x20000000; - if (range.base) - { - range.limit = (char *)0x7f000000; - while (mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */; - } - - server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + range.limit = (char *)0x7f000000; + while (mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */; } @@ -3884,12 +3880,16 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si size = ROUND_SIZE( addr, size ); base = ROUND_ADDR( addr, page_mask ); - /* avoid freeing the DOS area when a broken app passes a NULL pointer */ - if (!base) return STATUS_INVALID_PARAMETER; - server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - if (!(view = find_view( base, size )) || !is_view_valloc( view )) + /* avoid freeing the DOS area when a broken app passes a NULL pointer */ + if (!base) + { + /* address 1 is magic to mean release reserved space */ + if (addr == (void *)1 && !*size_ptr && type == MEM_RELEASE) virtual_release_address_space(); + else status = STATUS_INVALID_PARAMETER; + } + else if (!(view = find_view( base, size )) || !is_view_valloc( view )) { status = STATUS_INVALID_PARAMETER; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index ba37297a324..8747ec5039f 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 123 +#define NTDLL_UNIXLIB_VERSION 124 struct unix_funcs { @@ -69,9 +69,6 @@ struct unix_funcs double (CDECL *sqrt)( double d ); double (CDECL *tan)( double d ); - /* virtual memory functions */ - void (CDECL *virtual_release_address_space)(void); - /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); void (CDECL *init_builtin_dll)( void *module );

1 0

Zebediah Figura : ieframe: Remove manual IInternetExplorerManager proxy registration.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: f6ef640e0a4d5fd7191d2e2f679541e916113601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ef640e0a4d5fd7191d2e2f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 14:55:14 2021 -0500 ieframe: Remove manual IInternetExplorerManager proxy registration. This is handled automatically when registering ieproxy. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.rgs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/ieframe/ieframe.rgs b/dlls/ieframe/ieframe.rgs index 0b48600321e..f99e6b63523 100644 --- a/dlls/ieframe/ieframe.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -42,13 +42,6 @@ HKCR Control } } - NoRemove Interface - { - '{acc84351-04ff-44f9-b23f-655ed168c6d5}' - { - ProxyStubClsid32 = s '{a4a1a128-768f-41e0-bf75-e4fddd701cba}' - } - } 'InternetShortcut' { val 'EditFlags' = s '2'

1 0

Jan Sikorski : wined3d: Make use of VK_EXT_host_query_reset if available.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: fed705e03fdd571ed1718c0479957a20e2801928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fed705e03fdd571ed1718c04… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Jul 30 10:17:49 2021 +0200 wined3d: Make use of VK_EXT_host_query_reset if available. 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/adapter_vk.c | 10 +++++++++- dlls/wined3d/context_vk.c | 14 +++++++++++--- dlls/wined3d/query.c | 26 ++++++++++++++++++++------ dlls/wined3d/wined3d_vk.h | 5 ++++- 4 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 850e2a6dfdb..c7da02865ea 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -313,6 +313,7 @@ struct wined3d_physical_device_info { VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + VkPhysicalDeviceHostQueryResetFeatures host_query_reset_features; VkPhysicalDeviceFeatures2 features2; }; @@ -403,6 +404,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; + VkPhysicalDeviceHostQueryResetFeatures *host_query_reset_features; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; struct wined3d_physical_device_info physical_device_info; @@ -435,9 +437,13 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; vertex_divisor_features->pNext = xfb_features; + host_query_reset_features = &physical_device_info.host_query_reset_features; + host_query_reset_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES; + host_query_reset_features->pNext = vertex_divisor_features; + features2 = &physical_device_info.features2; features2->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; - features2->pNext = vertex_divisor_features; + features2->pNext = host_query_reset_features; if (vk_info->vk_ops.vkGetPhysicalDeviceFeatures2) VK_CALL(vkGetPhysicalDeviceFeatures2(physical_device, features2)); @@ -2195,6 +2201,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,VK_API_VERSION_1_2}, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1, true}, {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u, true}, + {VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, VK_API_VERSION_1_2}, }; static const struct @@ -2206,6 +2213,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk { {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE}, + {VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, WINED3D_VK_EXT_HOST_QUERY_RESET}, }; if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c718f3facd5..eac4eacff5a 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1398,9 +1398,17 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, return false; } - wined3d_context_vk_end_current_render_pass(context_vk); - VK_CALL(vkCmdResetQueryPool(wined3d_context_vk_get_command_buffer(context_vk), - pool_vk->vk_query_pool, 0, WINED3D_QUERY_POOL_SIZE)); + if (vk_info->supported[WINED3D_VK_EXT_HOST_QUERY_RESET]) + { + VK_CALL(vkResetQueryPoolEXT(wined3d_device_vk(context_vk->c.device)->vk_device, + pool_vk->vk_query_pool, 0, WINED3D_QUERY_POOL_SIZE)); + } + else + { + wined3d_context_vk_end_current_render_pass(context_vk); + VK_CALL(vkCmdResetQueryPool(wined3d_context_vk_get_command_buffer(context_vk), + pool_vk->vk_query_pool, 0, WINED3D_QUERY_POOL_SIZE)); + } if (!wined3d_query_pool_vk_allocate_query(pool_vk, &idx)) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 4628cb98cdc..527d5f6c809 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1351,12 +1351,26 @@ HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_quer static void wined3d_query_pool_vk_mark_complete(struct wined3d_query_pool_vk *pool_vk, size_t idx, struct wined3d_context_vk *context_vk) { - /* Don't reset completed queries right away, as vkCmdResetQueryPool() needs to happen - * outside of a render pass. Queue the query to be reset in wined3d_query_pool_vk_reset() - * instead, which is called when the render pass ends. */ - wined3d_bitmap_set(pool_vk->completed, idx); - if (list_empty(&pool_vk->completed_entry)) - list_add_tail(&context_vk->completed_query_pools, &pool_vk->completed_entry); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + if (vk_info->supported[WINED3D_VK_EXT_HOST_QUERY_RESET]) + { + VK_CALL(vkResetQueryPoolEXT(wined3d_device_vk(context_vk->c.device)->vk_device, + pool_vk->vk_query_pool, idx, 1)); + + wined3d_bitmap_clear(pool_vk->allocated, idx); + if (list_empty(&pool_vk->entry)) + list_add_tail(pool_vk->free_list, &pool_vk->entry); + } + else + { + /* Don't reset completed queries right away, as vkCmdResetQueryPool() needs to happen + * outside of a render pass. Queue the query to be reset in wined3d_query_pool_vk_reset() + * instead, which is called when the render pass ends. */ + wined3d_bitmap_set(pool_vk->completed, idx); + if (list_empty(&pool_vk->completed_entry)) + list_add_tail(&context_vk->completed_query_pools, &pool_vk->completed_entry); + } } bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index a417a795901..91ef8c816cd 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -49,7 +49,9 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceSurfacePresentModesKHR) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) \ /* VK_KHR_win32_surface */ \ - VK_INSTANCE_PFN(vkCreateWin32SurfaceKHR) + VK_INSTANCE_PFN(vkCreateWin32SurfaceKHR) \ + /* VK_EXT_host_query_reset */ \ + VK_INSTANCE_EXT_PFN(vkResetQueryPoolEXT) #define VK_DEVICE_FUNCS() \ VK_DEVICE_PFN(vkAllocateCommandBuffers) \ @@ -210,6 +212,7 @@ enum wined3d_vk_extension WINED3D_VK_EXT_TRANSFORM_FEEDBACK, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, + WINED3D_VK_EXT_HOST_QUERY_RESET, WINED3D_VK_EXT_COUNT, };

1 0

Jacek Caban : gdi32: Use NtGdiPatBlt for PatBlt implementation.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 6f095cea53787f03a159f0464b9881ace3724e6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f095cea53787f03a159f046… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 12:56:49 2021 +0200 gdi32: Use NtGdiPatBlt for PatBlt implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 4 ++-- dlls/gdi32/enhmfdrv/bitblt.c | 27 +++++++++++++++++---------- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 ++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 9 ++++----- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 1 + 9 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 865f44704b0..af9b0cc91f1 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -525,9 +525,9 @@ COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) /*********************************************************************** - * PatBlt (GDI32.@) + * NtGdiPatBlt (win32u.@) */ -BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop) +BOOL WINAPI NtGdiPatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ) { DC * dc; BOOL ret = FALSE; diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index f15acaa1f14..2ef2081be71 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -130,19 +130,26 @@ BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { + /* FIXME: update bound rect */ + return TRUE; +} + +BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, DWORD rop ) +{ + EMFDRV_PDEVICE *emf = dc_attr->emf; EMRBITBLT emr; BOOL ret; emr.emr.iType = EMR_BITBLT; emr.emr.nSize = sizeof(emr); - emr.rclBounds.left = dst->log_x; - emr.rclBounds.top = dst->log_y; - emr.rclBounds.right = dst->log_x + dst->log_width - 1; - emr.rclBounds.bottom = dst->log_y + dst->log_height - 1; - emr.xDest = dst->log_x; - emr.yDest = dst->log_y; - emr.cxDest = dst->log_width; - emr.cyDest = dst->log_height; + emr.rclBounds.left = left; + emr.rclBounds.top = top; + emr.rclBounds.right = left + width - 1; + emr.rclBounds.bottom = top + height - 1; + emr.xDest = left; + emr.yDest = top; + emr.cxDest = width; + emr.cyDest = height; emr.dwRop = rop; emr.xSrc = 0; emr.ySrc = 0; @@ -159,9 +166,9 @@ BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) emr.offBitsSrc = 0; emr.cbBitsSrc = 0; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); + ret = EMFDRV_WriteRecord( &emf->dev, &emr.emr ); if(ret) - EMFDRV_UpdateBBox( dev, &emr.rclBounds ); + EMFDRV_UpdateBBox( &emf->dev, &emr.rclBounds ); return ret; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f72759f4514..77e8e3ca1d6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5693,7 +5693,7 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT { orig = NtGdiSelectBrush( dev->hdc, brush ); dp_to_lp( dc, (POINT *)&rc, 2 ); - PatBlt( dev->hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); + NtGdiPatBlt( dev->hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); NtGdiSelectBrush( dev->hdc, orig ); DeleteObject( brush ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 68d692fbab3..f4be6e151e1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -58,6 +58,7 @@ extern BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL METADC_PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_PolyPolygon( HDC hdc, const POINT *points, const INT *counts, @@ -101,6 +102,7 @@ extern BOOL EMFDC_InvertRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PaintRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, DWORD rop ); extern BOOL EMFDC_PolyBezier( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyBezierTo( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *points, const BYTE *types, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index bc02beea429..7b6f1f39883 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -984,6 +984,20 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, return NtGdiExtTextOutW( hdc, x, y, flags, rect, str, count, dx, 0 ); } +/*********************************************************************** + * PatBlt (GDI32.@) + */ +BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_PatBlt( hdc, left, top, width, height, rop ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_PatBlt( dc_attr, left, top, width, height, rop )) + return FALSE; + return NtGdiPatBlt( hdc, left, top, width, height, rop ); +} + /*********************************************************************** * BeginPath (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index 1379ea94c6f..a08d6ef6608 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -26,13 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); /*********************************************************************** - * MFDRV_PatBlt + * METADC_PatBlt */ -BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +BOOL METADC_PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ) { - MFDRV_MetaParam6( dev, META_PATBLT, dst->log_x, dst->log_y, dst->log_width, dst->log_height, - HIWORD(rop), LOWORD(rop) ); - return TRUE; + return metadc_param6( hdc, META_PATBLT, left, top, width, height, + HIWORD(rop), LOWORD(rop) ); } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 73b3ce7365b..f6448b19a25 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -168,7 +168,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ - MFDRV_PatBlt, /* pPatBlt */ + NULL, /* pPatBlt */ NULL, /* pPie */ MFDRV_PolyBezier, /* pPolyBezier */ MFDRV_PolyBezierTo, /* pPolyBezierTo */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index b3104318223..9d00f4c5c69 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -92,7 +92,6 @@ extern INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT r extern INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; diff --git a/include/ntgdi.h b/include/ntgdi.h index 1698aa17054..c2f61fca6df 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -209,6 +209,7 @@ BOOL WINAPI NtGdiLineTo( HDC hdc, INT x, INT y ); BOOL WINAPI NtGdiMoveTo( HDC hdc, INT x, INT y, POINT *pt ); INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ); INT WINAPI NtGdiOffsetRgn( HRGN hrgn, INT x, INT y ); +BOOL WINAPI NtGdiPatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); HRGN WINAPI NtGdiPathToRegion( HDC hdc ); BOOL WINAPI NtGdiPolyDraw(HDC hdc, const POINT *points, const BYTE *types, DWORD count ); ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts,

1 0

Jacek Caban : gdi32: Store brush origin in DC_ATTR.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 802907025717dd11e7cc8307fc1a92958869043d URL: https://source.winehq.org/git/wine.git/?a=commit;h=802907025717dd11e7cc8307… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 12:56:21 2021 +0200 gdi32: Store brush origin in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/brush.c | 6 +++--- dlls/gdi32/dc.c | 20 +++----------------- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/ntgdi_private.h | 2 -- include/ntgdi.h | 1 + 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 638e7fc7fed..a59fee700ce 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -390,10 +390,10 @@ BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg ) if (!dc) return FALSE; if (oldorg) - *oldorg = dc->brush_org; + *oldorg = dc->attr->brush_org; - dc->brush_org.x = x; - dc->brush_org.y = y; + dc->attr->brush_org.x = x; + dc->attr->brush_org.y = y; release_dc_ptr( dc ); return TRUE; } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8c2ac20fb49..8c03392c513 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -91,8 +91,8 @@ static void set_initial_dc_state( DC *dc ) dc->attr->brush_color = RGB( 255, 255, 255 ); dc->attr->pen_color = RGB( 0, 0, 0 ); dc->attr->text_color = RGB( 0, 0, 0 ); - dc->brush_org.x = 0; - dc->brush_org.y = 0; + dc->attr->brush_org.x = 0; + dc->attr->brush_org.y = 0; dc->mapperFlags = 0; dc->attr->text_align = TA_LEFT | TA_TOP | TA_NOUPDATECP; dc->charExtra = 0; @@ -410,7 +410,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->text_color = dcs->attr->text_color; dc->attr->brush_color = dcs->attr->brush_color; dc->attr->pen_color = dcs->attr->pen_color; - dc->brush_org = dcs->brush_org; + dc->attr->brush_org = dcs->attr->brush_org; dc->mapperFlags = dcs->mapperFlags; dc->attr->text_align = dcs->attr->text_align; dc->charExtra = dcs->charExtra; @@ -544,7 +544,6 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->brush_org = dc->brush_org; newdc->mapperFlags = dc->mapperFlags; newdc->charExtra = dc->charExtra; newdc->breakExtra = dc->breakExtra; @@ -1274,19 +1273,6 @@ UINT WINAPI NtGdiSetBoundsRect( HDC hdc, const RECT *rect, UINT flags ) } -/*********************************************************************** - * GetBrushOrgEx (GDI32.@) - */ -BOOL WINAPI GetBrushOrgEx( HDC hdc, LPPOINT pt ) -{ - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - *pt = dc->brush_org; - release_dc_ptr( dc ); - return TRUE; -} - - /*********************************************************************** * SetLayout (GDI32.@) * diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 35413ccb942..dabdf01a591 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1030,7 +1030,7 @@ DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, } else ret = execute_rop( pdev, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, - &dc->brush_org, rop ); + &dc->attr->brush_org, rop ); free_clipped_rects( &clipped_rects ); } free_dib_info( &src_dib ); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e4e2de8f99f..c6f11ae6a69 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -73,7 +73,7 @@ static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, - &dc->brush_org, dc->attr->rop_mode ); + &dc->attr->brush_org, dc->attr->rop_mode ); free_clipped_rects( &clipped_rects ); return ret; } @@ -1203,7 +1203,7 @@ BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) break; default: ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, - &dc->brush_org, rop2 ); + &dc->attr->brush_org, rop2 ); break; } free_clipped_rects( &clipped_rects ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index e2138508d87..a0af23c169d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -330,6 +330,17 @@ INT WINAPI GetStretchBltMode( HDC hdc ) return dc_attr ? dc_attr->stretch_blt_mode : 0; } +/*********************************************************************** + * GetBrushOrgEx (GDI32.@) + */ +BOOL WINAPI GetBrushOrgEx( HDC hdc, POINT *point ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + *point = dc_attr->brush_org; + return TRUE; +} + /*********************************************************************** * GetDCOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 5dd685e07ec..c3ae797ddf6 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -110,8 +110,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - POINT brush_org; - DWORD mapperFlags; /* Font mapper flags */ INT charExtra; /* Spacing from SetTextCharacterExtra() */ INT breakExtra; /* breakTotalExtra / breakCount */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 38a2dfd3835..1698aa17054 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -116,6 +116,7 @@ typedef struct DC_ATTR INT map_mode; RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miter_limit; + POINT brush_org; /* brush origin */ POINT wnd_org; /* window origin */ SIZE wnd_ext; /* window extent */ POINT vport_org; /* viewport origin */

1 0

Jacek Caban : gdi32: Store window origin in DC_ATTR.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 3a0d08d23338f50a5f8ba3906ebd7787fb7ee834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a0d08d23338f50a5f8ba390… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 12:56:01 2021 +0200 gdi32: Store window origin in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 24 +++++------------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index cf060f8da3b..4d80ffdc449 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -71,8 +71,8 @@ static inline DC *get_dc_obj( HDC hdc ) */ static void set_initial_dc_state( DC *dc ) { - dc->wnd_org.x = 0; - dc->wnd_org.y = 0; + dc->attr->wnd_org.x = 0; + dc->attr->wnd_org.y = 0; dc->wnd_ext.cx = 1; dc->wnd_ext.cy = 1; dc->attr->vport_org.x = 0; @@ -327,8 +327,8 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) xform->eM12 = 0.0; xform->eM21 = 0.0; xform->eM22 = scaleY; - xform->eDx = (double)dc->attr->vport_org.x - scaleX * (double)dc->wnd_org.x; - xform->eDy = (double)dc->attr->vport_org.y - scaleY * (double)dc->wnd_org.y; + xform->eDx = (double)dc->attr->vport_org.x - scaleX * (double)dc->attr->wnd_org.x; + xform->eDy = (double)dc->attr->vport_org.y - scaleY * (double)dc->attr->wnd_org.y; if (dc->attr->layout & LAYOUT_RTL) xform->eDx = dc->attr->vis_rect.right - dc->attr->vis_rect.left - 1 - xform->eDx; } @@ -424,7 +424,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->xformWorld2Vport = dcs->xformWorld2Vport; dc->xformVport2World = dcs->xformVport2World; dc->vport2WorldValid = dcs->vport2WorldValid; - dc->wnd_org = dcs->wnd_org; + dc->attr->wnd_org = dcs->attr->wnd_org; dc->wnd_ext = dcs->wnd_ext; dc->attr->vport_org = dcs->attr->vport_org; dc->attr->vport_ext = dcs->attr->vport_ext; @@ -553,7 +553,6 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->xformWorld2Vport = dc->xformWorld2Vport; newdc->xformVport2World = dc->xformVport2World; newdc->vport2WorldValid = dc->vport2WorldValid; - newdc->wnd_org = dc->wnd_org; newdc->wnd_ext = dc->wnd_ext; newdc->virtual_res = dc->virtual_res; newdc->virtual_size = dc->virtual_size; @@ -1302,19 +1301,6 @@ BOOL WINAPI GetWindowExtEx( HDC hdc, LPSIZE size ) } -/*********************************************************************** - * GetWindowOrgEx (GDI32.@) - */ -BOOL WINAPI GetWindowOrgEx( HDC hdc, LPPOINT pt ) -{ - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - *pt = dc->wnd_org; - release_dc_ptr( dc ); - return TRUE; -} - - /*********************************************************************** * SetLayout (GDI32.@) * diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0b8586e8463..06d8e3f807f 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -342,6 +342,17 @@ BOOL WINAPI GetDCOrgEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * GetWindowOrgEx (GDI32.@) + */ +BOOL WINAPI GetWindowOrgEx( HDC hdc, POINT *point ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + *point = dc_attr->wnd_org; + return TRUE; +} + /*********************************************************************** * GetViewportExtEx (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index d3d7ee60255..a385bf7eac5 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -103,10 +103,10 @@ BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DC *dc = get_nulldrv_dc( dev ); if (pt) - *pt = dc->wnd_org; + *pt = dc->attr->wnd_org; - dc->wnd_org.x += x; - dc->wnd_org.y += y; + dc->attr->wnd_org.x += x; + dc->attr->wnd_org.y += y; DC_UpdateXforms( dc ); return TRUE; } @@ -262,10 +262,10 @@ BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DC *dc = get_nulldrv_dc( dev ); if (pt) - *pt = dc->wnd_org; + *pt = dc->attr->wnd_org; - dc->wnd_org.x = x; - dc->wnd_org.y = y; + dc->attr->wnd_org.x = x; + dc->attr->wnd_org.y = y; DC_UpdateXforms( dc ); return TRUE; } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index a966aaeb637..6cd18b20b0b 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -87,7 +87,6 @@ typedef struct tagDC BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ - POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ diff --git a/include/ntgdi.h b/include/ntgdi.h index e2500d924a3..1bef584a719 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -116,6 +116,7 @@ typedef struct DC_ATTR INT map_mode; RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miter_limit; + POINT wnd_org; /* window origin */ POINT vport_org; /* viewport origin */ SIZE vport_ext; /* viewport extent */ void *emf;

1 0

Jacek Caban : gdi32: Store viewport origin in DC_ATTR.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: e349a4a13132c201ecff9757f20d74966deb14f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e349a4a13132c201ecff9757… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 12:55:55 2021 +0200 gdi32: Store viewport origin in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 24 +++++------------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mapping.c | 13 ++++++------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 6 files changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index eb48415ace5..cf060f8da3b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -75,8 +75,8 @@ static void set_initial_dc_state( DC *dc ) dc->wnd_org.y = 0; dc->wnd_ext.cx = 1; dc->wnd_ext.cy = 1; - dc->vport_org.x = 0; - dc->vport_org.y = 0; + dc->attr->vport_org.x = 0; + dc->attr->vport_org.y = 0; dc->attr->vport_ext.cx = 1; dc->attr->vport_ext.cy = 1; dc->attr->miter_limit = 10.0f; /* 10.0 is the default, from MSDN */ @@ -327,8 +327,8 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) xform->eM12 = 0.0; xform->eM21 = 0.0; xform->eM22 = scaleY; - xform->eDx = (double)dc->vport_org.x - scaleX * (double)dc->wnd_org.x; - xform->eDy = (double)dc->vport_org.y - scaleY * (double)dc->wnd_org.y; + xform->eDx = (double)dc->attr->vport_org.x - scaleX * (double)dc->wnd_org.x; + xform->eDy = (double)dc->attr->vport_org.y - scaleY * (double)dc->wnd_org.y; if (dc->attr->layout & LAYOUT_RTL) xform->eDx = dc->attr->vis_rect.right - dc->attr->vis_rect.left - 1 - xform->eDx; } @@ -426,7 +426,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->vport2WorldValid = dcs->vport2WorldValid; dc->wnd_org = dcs->wnd_org; dc->wnd_ext = dcs->wnd_ext; - dc->vport_org = dcs->vport_org; + dc->attr->vport_org = dcs->attr->vport_org; dc->attr->vport_ext = dcs->attr->vport_ext; dc->virtual_res = dcs->virtual_res; dc->virtual_size = dcs->virtual_size; @@ -555,7 +555,6 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->vport2WorldValid = dc->vport2WorldValid; newdc->wnd_org = dc->wnd_org; newdc->wnd_ext = dc->wnd_ext; - newdc->vport_org = dc->vport_org; newdc->virtual_res = dc->virtual_res; newdc->virtual_size = dc->virtual_size; @@ -1290,19 +1289,6 @@ BOOL WINAPI GetBrushOrgEx( HDC hdc, LPPOINT pt ) } -/*********************************************************************** - * GetViewportOrgEx (GDI32.@) - */ -BOOL WINAPI GetViewportOrgEx( HDC hdc, LPPOINT pt ) -{ - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - *pt = dc->vport_org; - release_dc_ptr( dc ); - return TRUE; -} - - /*********************************************************************** * GetWindowExtEx (GDI32.@) */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 34710dd2136..0b8586e8463 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -353,6 +353,17 @@ BOOL WINAPI GetViewportExtEx( HDC hdc, SIZE *size ) return TRUE; } +/*********************************************************************** + * GetViewportOrgEx (GDI32.@) + */ +BOOL WINAPI GetViewportOrgEx( HDC hdc, POINT *point ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + *point = dc_attr->vport_org; + return TRUE; +} + /*********************************************************************** * SetStretchBltMode (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 6e97a03e02b..d3d7ee60255 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -90,11 +90,10 @@ BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { DC *dc = get_nulldrv_dc( dev ); - if (pt) - *pt = dc->vport_org; + if (pt) *pt = dc->attr->vport_org; - dc->vport_org.x += x; - dc->vport_org.y += y; + dc->attr->vport_org.x += x; + dc->attr->vport_org.y += y; DC_UpdateXforms( dc ); return TRUE; } @@ -231,10 +230,10 @@ BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DC *dc = get_nulldrv_dc( dev ); if (pt) - *pt = dc->vport_org; + *pt = dc->attr->vport_org; - dc->vport_org.x = x; - dc->vport_org.y = y; + dc->attr->vport_org.x = x; + dc->attr->vport_org.y = y; DC_UpdateXforms( dc ); return TRUE; } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index e57f0df03c1..a966aaeb637 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -89,7 +89,6 @@ typedef struct tagDC POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ - POINT vport_org; /* Viewport origin */ SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ RECT device_rect; /* rectangle for the whole device */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 52e5df8181a..cf5fb8005af 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -863,7 +863,7 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = GetViewportOrgEx(hdcMetafile, &pt); - todo_wine ok (!ret, "GetViewportOrgEx should fail\n"); + ok(!ret, "GetViewportOrgEx should fail\n"); ret = GetViewportExtEx(hdcMetafile, &size); ok(!ret, "GetViewportExtEx should fail\n"); ret = SaveDC(hdcMetafile); diff --git a/include/ntgdi.h b/include/ntgdi.h index f5600b4957a..e2500d924a3 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -116,6 +116,7 @@ typedef struct DC_ATTR INT map_mode; RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miter_limit; + POINT vport_org; /* viewport origin */ SIZE vport_ext; /* viewport extent */ void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Store viewport extent in DC_ATTR.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 81dbf2db45a46b4fc1aecff8109dc23efabe68c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81dbf2db45a46b4fc1aecff8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 12:55:47 2021 +0200 gdi32: Store viewport extent in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/dc.c | 24 ++++--------------- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdidc.c | 11 +++++++++ dlls/gdi32/mapping.c | 58 +++++++++++++++++++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 8 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81dbf2db45a46b4fc1ae…

1 0

Martin Storsjö : winebuild: Fix building for arm with older versions of binutils.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: wine Branch: master Commit: 5de4766475ac606ad917f27ec86154b1406ea9a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5de4766475ac606ad917f27e… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Aug 3 12:47:21 2021 +0300 winebuild: Fix building for arm with older versions of binutils. Use an explicit "movw" instead of a plain "mov", as the immediates might not fit in a narrow thumb mov instruction. Newer versions of binutils deduces this implicitly. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 02029056b30..d944f8179af 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -312,7 +312,7 @@ static void output_relay_debug( DLLSPEC *spec ) if (has_float) output( "\tvpush {s0-s15}\n" ); output( "\tpush {LR}\n" ); output( "\tsub SP, #4\n"); - output( "\tmov r1,#%u\n", i - spec->base ); + output( "\tmovw r1,#%u\n", i - spec->base ); output( "\tmovt r1,#%u\n", odp->u.func.args_str_offset ); if (UsePIC) {

1 0