- Wine-Commits - list.winehq.org

Eric Pouech : winedbg: Improve size management in watch command.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: f01ce56a4935449be0bfbb994eb904c84363c90e URL: https://gitlab.winehq.org/wine/wine/-/commit/f01ce56a4935449be0bfbb994eb904… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 17 18:43:53 2023 +0200 winedbg: Improve size management in watch command. - support 8 byte targets - default to CPU pointer size if size isn't present nor supported. - detect unaligned requests Signed-off-by: Eric Pouech <eric.pouech(a)codeweavers.com> --- programs/winedbg/break.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index c9abb737487..8001ba1707b 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -398,7 +398,7 @@ void break_check_delayed_bp(void) void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) { int num; - DWORD64 l = 4; + DWORD l = ADDRSIZE; if (!lvalue->in_debuggee) { @@ -409,21 +409,30 @@ void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) &lvalue->addr); if (num == -1) return; + /* FIXME: this validation part should be moved to CPU backends (likely in a new method) */ if (lvalue->type.id != dbg_itype_none) { - if (types_get_info(&lvalue->type, TI_GET_LENGTH, &l)) + DWORD64 l64; + if (types_get_info(&lvalue->type, TI_GET_LENGTH, &l64)) { - switch (l) + /* Only allow size of a power of 2, smaller than CPU's pointer size. + * (Validation is done by CPU backend with insert_Xpoint method) + */ + if (!(l64 & (l64 - 1)) && l64 <= l) + l = l64; + else + dbg_printf("Unsupported length (%I64x) for watch-points, defaulting to %lu\n", l64, l); + /* most CPUs request watch address to be aligned on length */ + if (lvalue->addr.Offset & (l - 1)) { - case 4: case 2: case 1: break; - default: - dbg_printf("Unsupported length (%I64x) for watch-points, defaulting to 4\n", l); - break; + dbg_printf("Watchpoint on unaligned address is not supported\n"); + dbg_curr_process->bp[num].refcount = 0; + return; } } - else dbg_printf("Cannot get watch size, defaulting to 4\n"); + else dbg_printf("Cannot get watch size, defaulting to %lu\n", l); } - dbg_curr_process->bp[num].w.len = (DWORD)l - 1; + dbg_curr_process->bp[num].w.len = l - 1; if (!get_watched_value(num, &dbg_curr_process->bp[num].w.oldval)) {

1 0

Alexandre Julliard : include: Add some CHPE definitions.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 6e348640c57e15c92277a8c5f79a606dc8909a68 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e348640c57e15c92277a8c5f79a60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 17:45:06 2023 +0200 include: Add some CHPE definitions. --- include/winnt.h | 159 +++++++++++++++++++++++++++++++++++++++++----------- tools/winedump/pe.c | 17 +++--- 2 files changed, 136 insertions(+), 40 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 15c254fbcff..a905507c0d4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2497,39 +2497,41 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_BYTES_REVERSED_HI 0x8000 /* These are the settings of the Machine field. */ -#define IMAGE_FILE_MACHINE_UNKNOWN 0 -#define IMAGE_FILE_MACHINE_TARGET_HOST 0x0001 -#define IMAGE_FILE_MACHINE_I860 0x014d -#define IMAGE_FILE_MACHINE_I386 0x014c -#define IMAGE_FILE_MACHINE_R3000 0x0162 -#define IMAGE_FILE_MACHINE_R4000 0x0166 -#define IMAGE_FILE_MACHINE_R10000 0x0168 -#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169 -#define IMAGE_FILE_MACHINE_ALPHA 0x0184 -#define IMAGE_FILE_MACHINE_SH3 0x01a2 -#define IMAGE_FILE_MACHINE_SH3DSP 0x01a3 -#define IMAGE_FILE_MACHINE_SH3E 0x01a4 -#define IMAGE_FILE_MACHINE_SH4 0x01a6 -#define IMAGE_FILE_MACHINE_SH5 0x01a8 -#define IMAGE_FILE_MACHINE_ARM 0x01c0 -#define IMAGE_FILE_MACHINE_THUMB 0x01c2 -#define IMAGE_FILE_MACHINE_ARMNT 0x01c4 -#define IMAGE_FILE_MACHINE_ARM64 0xaa64 -#define IMAGE_FILE_MACHINE_AM33 0x01d3 -#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 -#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 -#define IMAGE_FILE_MACHINE_IA64 0x0200 -#define IMAGE_FILE_MACHINE_MIPS16 0x0266 -#define IMAGE_FILE_MACHINE_ALPHA64 0x0284 -#define IMAGE_FILE_MACHINE_MIPSFPU 0x0366 -#define IMAGE_FILE_MACHINE_MIPSFPU16 0x0466 -#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 -#define IMAGE_FILE_MACHINE_TRICORE 0x0520 -#define IMAGE_FILE_MACHINE_CEF 0x0cef -#define IMAGE_FILE_MACHINE_EBC 0x0ebc -#define IMAGE_FILE_MACHINE_AMD64 0x8664 -#define IMAGE_FILE_MACHINE_M32R 0x9041 -#define IMAGE_FILE_MACHINE_CEE 0xc0ee +#define IMAGE_FILE_MACHINE_UNKNOWN 0 +#define IMAGE_FILE_MACHINE_TARGET_HOST 0x0001 +#define IMAGE_FILE_MACHINE_I386 0x014c +#define IMAGE_FILE_MACHINE_R3000 0x0162 +#define IMAGE_FILE_MACHINE_R4000 0x0166 +#define IMAGE_FILE_MACHINE_R10000 0x0168 +#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169 +#define IMAGE_FILE_MACHINE_ALPHA 0x0184 +#define IMAGE_FILE_MACHINE_SH3 0x01a2 +#define IMAGE_FILE_MACHINE_SH3DSP 0x01a3 +#define IMAGE_FILE_MACHINE_SH3E 0x01a4 +#define IMAGE_FILE_MACHINE_SH4 0x01a6 +#define IMAGE_FILE_MACHINE_SH5 0x01a8 +#define IMAGE_FILE_MACHINE_ARM 0x01c0 +#define IMAGE_FILE_MACHINE_THUMB 0x01c2 +#define IMAGE_FILE_MACHINE_ARMNT 0x01c4 +#define IMAGE_FILE_MACHINE_AM33 0x01d3 +#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 +#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 +#define IMAGE_FILE_MACHINE_IA64 0x0200 +#define IMAGE_FILE_MACHINE_MIPS16 0x0266 +#define IMAGE_FILE_MACHINE_ALPHA64 0x0284 +#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 +#define IMAGE_FILE_MACHINE_MIPSFPU 0x0366 +#define IMAGE_FILE_MACHINE_MIPSFPU16 0x0466 +#define IMAGE_FILE_MACHINE_TRICORE 0x0520 +#define IMAGE_FILE_MACHINE_CEF 0x0cef +#define IMAGE_FILE_MACHINE_EBC 0x0ebc +#define IMAGE_FILE_MACHINE_CHPE_X86 0x3a64 +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_FILE_MACHINE_M32R 0x9041 +#define IMAGE_FILE_MACHINE_ARM64EC 0xa641 +#define IMAGE_FILE_MACHINE_ARM64X 0xa64e +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 +#define IMAGE_FILE_MACHINE_CEE 0xc0ee #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56 @@ -3788,6 +3790,97 @@ typedef PIMAGE_DYNAMIC_RELOCATION32_V2 PIMAGE_DYNAMIC_RELOCATION_V2; #define IMAGE_DYNAMIC_RELOCATION_GUARD_SWITCHTABLE_BRANCH 5 #define IMAGE_DYNAMIC_RELOCATION_ARM64X 6 +typedef struct _IMAGE_CHPE_METADATA_X86 +{ + ULONG Version; + ULONG CHPECodeAddressRangeOffset; + ULONG CHPECodeAddressRangeCount; + ULONG WowA64ExceptionHandlerFunctionPointer; + ULONG WowA64DispatchCallFunctionPointer; + ULONG WowA64DispatchIndirectCallFunctionPointer; + ULONG WowA64DispatchIndirectCallCfgFunctionPointer; + ULONG WowA64DispatchRetFunctionPointer; + ULONG WowA64DispatchRetLeafFunctionPointer; + ULONG WowA64DispatchJumpFunctionPointer; + ULONG CompilerIATPointer; + ULONG WowA64RdtscFunctionPointer; + ULONG unknown[4]; +} IMAGE_CHPE_METADATA_X86, *PIMAGE_CHPE_METADATA_X86; + +typedef struct _IMAGE_CHPE_RANGE_ENTRY +{ + union + { + ULONG StartOffset; + struct + { + ULONG NativeCode : 1; + ULONG AddressBits : 31; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + ULONG Length; +} IMAGE_CHPE_RANGE_ENTRY, *PIMAGE_CHPE_RANGE_ENTRY; + +typedef struct _IMAGE_ARM64EC_METADATA +{ + ULONG Version; + ULONG CodeMap; + ULONG CodeMapCount; + ULONG CodeRangesToEntryPoints; + ULONG RedirectionMetadata; + ULONG __os_arm64x_dispatch_call_no_redirect; + ULONG __os_arm64x_dispatch_ret; + ULONG __os_arm64x_dispatch_call; + ULONG __os_arm64x_dispatch_icall; + ULONG __os_arm64x_dispatch_icall_cfg; + ULONG AlternateEntryPoint; + ULONG AuxiliaryIAT; + ULONG CodeRangesToEntryPointsCount; + ULONG RedirectionMetadataCount; + ULONG GetX64InformationFunctionPointer; + ULONG SetX64InformationFunctionPointer; + ULONG ExtraRFETable; + ULONG ExtraRFETableSize; + ULONG __os_arm64x_dispatch_fptr; + ULONG AuxiliaryIATCopy; +} IMAGE_ARM64EC_METADATA; + +typedef struct _IMAGE_ARM64EC_REDIRECTION_ENTRY +{ + ULONG Source; + ULONG Destination; +} IMAGE_ARM64EC_REDIRECTION_ENTRY; + +typedef struct _IMAGE_ARM64EC_CODE_RANGE_ENTRY_POINT +{ + ULONG StartRva; + ULONG EndRva; + ULONG EntryPoint; +} IMAGE_ARM64EC_CODE_RANGE_ENTRY_POINT; + +#define IMAGE_DVRT_ARM64X_FIXUP_TYPE_ZEROFILL 0 +#define IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE 1 +#define IMAGE_DVRT_ARM64X_FIXUP_TYPE_DELTA 2 + +#define IMAGE_DVRT_ARM64X_FIXUP_SIZE_2BYTES 1 +#define IMAGE_DVRT_ARM64X_FIXUP_SIZE_4BYTES 2 +#define IMAGE_DVRT_ARM64X_FIXUP_SIZE_8BYTES 3 + +typedef struct _IMAGE_DVRT_ARM64X_FIXUP_RECORD +{ + USHORT Offset : 12; + USHORT Type : 2; + USHORT Size : 2; +} IMAGE_DVRT_ARM64X_FIXUP_RECORD, *PIMAGE_DVRT_ARM64X_FIXUP_RECORD; + +typedef struct _IMAGE_DVRT_ARM64X_DELTA_FIXUP_RECORD +{ + USHORT Offset : 12; + USHORT Type : 2; + USHORT Sign : 1; + USHORT Scale : 1; +} IMAGE_DVRT_ARM64X_DELTA_FIXUP_RECORD, *PIMAGE_DVRT_ARM64X_DELTA_FIXUP_RECORD; + typedef struct _IMAGE_FUNCTION_ENTRY { DWORD StartingAddress; DWORD EndingAddress; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f9ae75fadb2..40e45d144e9 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -43,7 +43,6 @@ const char *get_machine_str(int mach) switch (mach) { case IMAGE_FILE_MACHINE_UNKNOWN: return "Unknown"; - case IMAGE_FILE_MACHINE_I860: return "i860"; case IMAGE_FILE_MACHINE_I386: return "i386"; case IMAGE_FILE_MACHINE_R3000: return "R3000"; case IMAGE_FILE_MACHINE_R4000: return "R4000"; @@ -56,6 +55,10 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_ARM: return "ARM"; case IMAGE_FILE_MACHINE_ARMNT: return "ARMNT"; case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb"; + case IMAGE_FILE_MACHINE_ALPHA64: return "Alpha64"; + case IMAGE_FILE_MACHINE_CHPE_X86: return "CHPE-x86"; + case IMAGE_FILE_MACHINE_ARM64EC: return "ARM64EC"; + case IMAGE_FILE_MACHINE_ARM64X: return "ARM64X"; } return "???"; } @@ -2196,16 +2199,16 @@ static void dump_dynamic_relocs_arm64x( const IMAGE_BASE_RELOCATION *base_reloc, rel++; switch (type) { - case 0: /* zero-fill */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_ZEROFILL: printf( " off %04x zero-fill %u bytes\n", offset, 1 << arg ); break; - case 1: /* set value */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE: printf( " off %04x set %u bytes value ", offset, 1 << arg ); for (i = (1 << arg ) / sizeof(USHORT); i > 0; i--) printf( "%04x", rel[i - 1] ); rel += (1 << arg) / sizeof(USHORT); printf( "\n" ); break; - case 2: /* add value */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_DELTA: printf( " off %04x add offset ", offset ); if (arg & 1) printf( "-" ); printf( "%08x\n", (UINT)*rel++ * ((arg & 2) ? 8 : 4) ); @@ -2408,14 +2411,14 @@ static BOOL get_alt_header( void ) rel++; switch (type) { - case 0: /* zero-fill */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_ZEROFILL: memset( page + offset, 0, 1 << arg ); break; - case 1: /* set value */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE: memcpy( page + offset, rel, 1 << arg ); rel += (1 << arg) / sizeof(USHORT); break; - case 2: /* add value */ + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_DELTA: val = (unsigned int)*rel++ * ((arg & 2) ? 8 : 4); if (arg & 1) val = -val; *(int *)(page + offset) += val;

1 0

Alexandre Julliard : winedump: Dump hybrid metadata also for i386 CHPE modules.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: fe693a70476c0ed3624f8545e2333a68fa9d5be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe693a70476c0ed3624f8545e2333a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 17:49:51 2023 +0200 winedump: Dump hybrid metadata also for i386 CHPE modules. --- tools/winedump/pe.c | 242 +++++++++++++++++++++++++++++----------------------- 1 file changed, 133 insertions(+), 109 deletions(-)

1 0

Zebediah Figura : wined3d: Disable shaderTessellationAndGeometryPointSize.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: f19555c866bb5850c83e1b9c2d373e3924f1674e URL: https://gitlab.winehq.org/wine/wine/-/commit/f19555c866bb5850c83e1b9c2d373e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 26 15:43:15 2023 -0600 wined3d: Disable shaderTessellationAndGeometryPointSize. --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/shader_spirv.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 65d04b67dc3..5b6042659aa 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -265,6 +265,7 @@ static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info features->shaderInt16 = VK_FALSE; features->shaderResourceResidency = VK_FALSE; features->shaderResourceMinLod = VK_FALSE; + features->shaderTessellationAndGeometryPointSize = VK_FALSE; features->sparseBinding = VK_FALSE; features->sparseResidencyBuffer = VK_FALSE; features->sparseResidencyImage2D = VK_FALSE; diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 57912249f05..ad0a8f1b3e8 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -25,7 +25,8 @@ static const struct wined3d_shader_backend_ops spirv_shader_backend_vk; static const struct vkd3d_shader_compile_option spirv_compile_options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_7}, + {VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE, 0}, }; struct shader_spirv_resource_bindings

1 0

Zebediah Figura : ddraw: Retrieve the frontbuffer directly from wined3d.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: f74de8e0ab15a9bdefd3aac3568ced27454ffb2f URL: https://gitlab.winehq.org/wine/wine/-/commit/f74de8e0ab15a9bdefd3aac3568ced… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 27 12:28:45 2022 -0600 ddraw: Retrieve the frontbuffer directly from wined3d. --- dlls/ddraw/ddraw.c | 24 ++---------------------- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 2 +- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d6570739a51..c56226fb71d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -938,7 +938,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, } rtv = wined3d_device_context_get_rendertarget_view(ddraw->immediate_context, 0); - /* Rendering to ddraw->wined3d_frontbuffer. */ + /* Rendering to the wined3d frontbuffer. */ if (rtv && !wined3d_rendertarget_view_get_sub_resource_parent(rtv)) rtv = NULL; else if (rtv) @@ -5042,43 +5042,23 @@ static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_d return DD_OK; } -static void STDMETHODCALLTYPE ddraw_frontbuffer_destroyed(void *parent) -{ - struct ddraw *ddraw = parent; - ddraw->wined3d_frontbuffer = NULL; -} - -static const struct wined3d_parent_ops ddraw_frontbuffer_parent_ops = -{ - ddraw_frontbuffer_destroyed, -}; - static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, void *container_parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, struct wined3d_texture **texture) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - const struct wined3d_parent_ops *parent_ops; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#lx, texture %p.\n", device_parent, container_parent, desc, texture_flags, texture); - if (!ddraw->wined3d_frontbuffer) - parent_ops = &ddraw_frontbuffer_parent_ops; - else - parent_ops = &ddraw_null_wined3d_parent_ops; - if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, desc, 1, 1, - texture_flags, NULL, ddraw, parent_ops, texture))) + texture_flags, NULL, ddraw, &ddraw_null_wined3d_parent_ops, texture))) { WARN("Failed to create texture, hr %#lx.\n", hr); return hr; } - if (!ddraw->wined3d_frontbuffer) - ddraw->wined3d_frontbuffer = *texture; - return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1be3df5f2c9..a3f309f89f0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -103,7 +103,6 @@ struct ddraw struct ddraw_surface *primary; RECT primary_lock; - struct wined3d_texture *wined3d_frontbuffer; struct wined3d_texture *gdi_surface; struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_state_parent state_parent; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b601104049f..52ca900441c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -133,7 +133,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (swap_interval) dst_texture = wined3d_swapchain_get_back_buffer(ddraw->wined3d_swapchain, 0); else - dst_texture = ddraw->wined3d_frontbuffer; + dst_texture = wined3d_swapchain_get_front_buffer(ddraw->wined3d_swapchain); if (SUCCEEDED(hr = wined3d_device_context_blt(ddraw->immediate_context, dst_texture, 0, rect, ddraw_surface_get_any_texture(surface, DDRAW_SURFACE_READ), surface->sub_resource_idx, rect, 0,

1 0

Martin Garton : msvcrt: Fix typo in #define.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 0dda5753c5a25d64b2a47ada515d78c684558268 URL: https://gitlab.winehq.org/wine/wine/-/commit/0dda5753c5a25d64b2a47ada515d78… Author: Martin Garton <garton(a)gmail.com> Date: Wed Jan 27 10:32:29 2021 +0000 msvcrt: Fix typo in #define. --- include/msvcrt/fcntl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/fcntl.h b/include/msvcrt/fcntl.h index a4ad38b64a4..f02a39b49ef 100644 --- a/include/msvcrt/fcntl.h +++ b/include/msvcrt/fcntl.h @@ -37,7 +37,7 @@ #define O_ACCMODE _O_ACCMODE #define O_APPEND _O_APPEND #define O_RANDOM _O_RANDOM -#define O_SEQENTIAL _O_SEQUENTIAL +#define O_SEQUENTIAL _O_SEQUENTIAL #define O_TEMPORARY _O_TEMPORARY #define O_NOINHERIT _O_NOINHERIT #define O_CREAT _O_CREAT

1 0

Zebediah Figura : wined3d: Allow retrieving the frontbuffer from a wined3d swapchain.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 83518a6810e2dd1f2386b22d8cbe57b4b00542af URL: https://gitlab.winehq.org/wine/wine/-/commit/83518a6810e2dd1f2386b22d8cbe57… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 27 12:28:25 2022 -0600 wined3d: Allow retrieving the frontbuffer from a wined3d swapchain. For ddraw. --- dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bd4472d746a..b31c3393767 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -275,6 +275,13 @@ struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wi return swapchain->back_buffers[back_buffer_idx]; } +struct wined3d_texture * CDECL wined3d_swapchain_get_front_buffer(const struct wined3d_swapchain *swapchain) +{ + TRACE("swapchain %p.\n", swapchain); + + return swapchain->front_buffer; +} + struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapchain *swapchain) { TRACE("swapchain %p.\n", swapchain); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5a406377bf5..e905684ce23 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -270,6 +270,7 @@ @ cdecl wined3d_swapchain_get_desc(ptr ptr) @ cdecl wined3d_swapchain_get_device(ptr) @ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) +@ cdecl wined3d_swapchain_get_front_buffer(ptr) @ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr long) @ cdecl wined3d_swapchain_get_gamma_ramp(ptr ptr) @ cdecl wined3d_swapchain_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0e921a9a6ad..32a1a70b040 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2809,6 +2809,7 @@ struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); +struct wined3d_texture * __cdecl wined3d_swapchain_get_front_buffer(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_texture *dst_texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain,

1 0

Brendan Shanks : winemac: Don't constrain surface dimensions to the onscreen part of a window.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 06011209d7fac818c1ffd268ef083dafea6c013b URL: https://gitlab.winehq.org/wine/wine/-/commit/06011209d7fac818c1ffd268ef083d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Mar 30 16:32:21 2023 -0700 winemac: Don't constrain surface dimensions to the onscreen part of a window. Fixes an issue where a window's image would be stretched as it was moved further offscreen. The offscreen part of a window also did not display correctly in Exposé. --- dlls/winemac.drv/window.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a3690585127..104100a0770 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2037,10 +2037,8 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) static inline RECT get_surface_rect(const RECT *visible_rect) { - RECT rect; - RECT desktop_rect = rect_from_cgrect(macdrv_get_desktop_rect()); + RECT rect = *visible_rect; - intersect_rect(&rect, visible_rect, &desktop_rect); OffsetRect(&rect, -visible_rect->left, -visible_rect->top); rect.left &= ~127; rect.top &= ~127;

1 0

Brendan Shanks : winemac: Set the Cocoa window contentMaxSize to the size limits from constrain_window_frame().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 88a09dd3348c57595e7076d705af25fc0e9267ab URL: https://gitlab.winehq.org/wine/wine/-/commit/88a09dd3348c57595e7076d705af25… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 17 14:27:57 2023 -0700 winemac: Set the Cocoa window contentMaxSize to the size limits from constrain_window_frame(). --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 2a7998762ac..a3690585127 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -641,6 +641,8 @@ static void sync_window_min_max_info(HWND hwnd) max_size = CGSizeMake(max_rect.right - max_rect.left, max_rect.bottom - max_rect.top); } + constrain_window_frame(NULL, &max_size); + TRACE("min_size (%g,%g) max_size (%g,%g)\n", min_size.width, min_size.height, max_size.width, max_size.height); macdrv_set_window_min_max_sizes(data->cocoa_window, min_size, max_size); }

1 0

Brendan Shanks : winemac: Refactor constrain_window_frame() to use separate origin and size arguments.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 51f9bb766add67278093ed1020b37d0272687454 URL: https://gitlab.winehq.org/wine/wine/-/commit/51f9bb766add67278093ed1020b37d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 17 14:16:45 2023 -0700 winemac: Refactor constrain_window_frame() to use separate origin and size arguments. --- dlls/winemac.drv/window.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 896efb6a68e..2a7998762ac 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -216,7 +216,7 @@ static void macdrv_mac_to_window_rect(struct macdrv_win_data *data, RECT *rect) * Alter a window frame rectangle to fit within a) Cocoa's documented * limits, and b) sane sizes, like twice the desktop rect. */ -static void constrain_window_frame(CGRect* frame) +static void constrain_window_frame(CGPoint* origin, CGSize* size) { CGRect desktop_rect = macdrv_get_desktop_rect(); int max_width, max_height; @@ -224,12 +224,18 @@ static void constrain_window_frame(CGRect* frame) max_width = min(32000, 2 * CGRectGetWidth(desktop_rect)); max_height = min(32000, 2 * CGRectGetHeight(desktop_rect)); - if (frame->origin.x < -16000) frame->origin.x = -16000; - if (frame->origin.y < -16000) frame->origin.y = -16000; - if (frame->origin.x > 16000) frame->origin.x = 16000; - if (frame->origin.y > 16000) frame->origin.y = 16000; - if (frame->size.width > max_width) frame->size.width = max_width; - if (frame->size.height > max_height) frame->size.height = max_height; + if (origin) + { + if (origin->x < -16000) origin->x = -16000; + if (origin->y < -16000) origin->y = -16000; + if (origin->x > 16000) origin->x = 16000; + if (origin->y > 16000) origin->y = 16000; + } + if (size) + { + if (size->width > max_width) size->width = max_width; + if (size->height > max_height) size->height = max_height; + } } @@ -698,7 +704,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) get_cocoa_window_features(data, style, ex_style, &wf, &data->window_rect, &data->client_rect); frame = cgrect_from_rect(data->whole_rect); - constrain_window_frame(&frame); + constrain_window_frame(&frame.origin, &frame.size); if (frame.size.width < 1 || frame.size.height < 1) frame.size.width = frame.size.height = 1; @@ -1139,7 +1145,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c { if (data->minimized) return; - constrain_window_frame(&frame); + constrain_window_frame(&frame.origin, &frame.size); if (frame.size.width < 1 || frame.size.height < 1) frame.size.width = frame.size.height = 1;

1 0