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

Brendan Shanks : win32u: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 726472fef69341ff20bea068b80da84c3a689bab URL: https://gitlab.winehq.org/wine/wine/-/commit/726472fef69341ff20bea068b80da8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 3 09:40:44 2023 -0700 win32u: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/win32u/dc.c | 2 +- dlls/win32u/dib.c | 2 +- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/syscall.c | 11 +++++++++++ dlls/win32u/win32u_private.h | 11 ++--------- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 0b7d2cd023d..0ff624068cb 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -112,7 +112,7 @@ static DC_ATTR *alloc_dc_attr(void) { SIZE_T size = system_info.AllocationGranularity; bucket->entries = NULL; - if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, zero_bits(), + if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, zero_bits, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) { bucket->next_free = NULL; diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c index acd3f442e49..23dbfbcbfaf 100644 --- a/dlls/win32u/dib.c +++ b/dlls/win32u/dib.c @@ -1549,7 +1549,7 @@ HBITMAP WINAPI NtGdiCreateDIBSection( HDC hdc, HANDLE section, DWORD offset, con { SIZE_T size = bmp->dib.dsBmih.biSizeImage; offset = 0; - if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, zero_bits(), + if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, zero_bits, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) goto error; } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 2201ac4b01e..057988e99e9 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -566,7 +566,7 @@ static void init_gdi_shared(void) { SIZE_T size = sizeof(*gdi_shared); - if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, zero_bits(), + if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, zero_bits, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) return; next_unused = gdi_shared->Handles + FIRST_GDI_HANDLE; diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 4004df3f3d6..99fd7859250 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -33,6 +33,7 @@ #include "ntuser.h" #include "wine/unixlib.h" +ULONG_PTR zero_bits = 0; static void * const syscalls[] = { @@ -450,6 +451,16 @@ static SYSTEM_SERVICE_TABLE syscall_table = static NTSTATUS init( void *dispatcher ) { +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return ntdll_init_syscalls( 1, &syscall_table, dispatcher ); } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 922fd22fe46..005ab53cc01 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -271,6 +271,8 @@ extern HKEY hkcu_key DECLSPEC_HIDDEN; extern const struct user_driver_funcs *user_driver DECLSPEC_HIDDEN; +extern ULONG_PTR zero_bits DECLSPEC_HIDDEN; + static inline BOOL set_ntstatus( NTSTATUS status ) { if (status) RtlSetLastWin32Error( RtlNtStatusToDosError( status )); @@ -330,15 +332,6 @@ static inline BOOL is_win9x(void) return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s; } -static inline ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>";

1 0

Piotr Caban : wineps: Buffer data sent to printer port.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: d5373ef6f92d36971859db0746600188ada22a7d URL: https://gitlab.winehq.org/wine/wine/-/commit/d5373ef6f92d36971859db07466001… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 9 13:05:42 2023 +0200 wineps: Buffer data sent to printer port. --- dlls/wineps.drv/escape.c | 32 ++++++++++++++++++++++++++++++-- dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 5 ++++- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 2c1b18fb711..19c1125e50c 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -38,13 +38,41 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +BOOL flush_spool( print_ctx *ctx ) +{ + DWORD written; + + if (ctx->job.data_cnt) + { + if (!WritePrinter(ctx->job.hprinter, ctx->job.data, ctx->job.data_cnt, &written) || + written != ctx->job.data_cnt) + return FALSE; + } + ctx->job.data_cnt = 0; + return TRUE; +} + DWORD write_spool( print_ctx *ctx, const void *data, DWORD num ) { DWORD written; - if (!WritePrinter(ctx->job.hprinter, (LPBYTE) data, num, &written) || (written != num)) - return SP_OUTOFDISK; + if (ctx->job.data_cnt + num > ARRAY_SIZE(ctx->job.data)) + { + if (!flush_spool(ctx)) + return SP_OUTOFDISK; + } + if (ctx->job.data_cnt + num > ARRAY_SIZE(ctx->job.data)) + { + if (!WritePrinter(ctx->job.hprinter, (LPBYTE) data, num, &written) || + written != num) + return SP_OUTOFDISK; + } + else + { + memcpy(ctx->job.data + ctx->job.data_cnt, data, num); + ctx->job.data_cnt += num; + } return num; } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a8050abe19b..f9f54fa9bc6 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -502,7 +502,7 @@ INT PSDRV_WriteFooter( print_ctx *ctx ) sprintf(buf, psfooter, ctx->job.PageNo); - if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) ) { + if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) || !flush_spool(ctx) ) { WARN("WriteSpool error\n"); ret = 0; } diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 7b0582bd258..58b5062a01a 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -352,6 +352,8 @@ typedef struct { INT PageNo; BOOL quiet; /* Don't actually output anything */ enum passthrough passthrough_state; + BYTE data[4096]; + int data_cnt; } JOB; typedef struct @@ -519,7 +521,8 @@ extern BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical); extern BOOL PSDRV_WriteDownloadGlyphShow(print_ctx *ctx, const WORD *glyphs, UINT count); extern BOOL PSDRV_EmptyDownloadList(print_ctx *ctx, BOOL write_undef); -extern DWORD write_spool( print_ctx *ctx, const void *data, DWORD num ); +extern BOOL flush_spool(print_ctx *ctx); +extern DWORD write_spool(print_ctx *ctx, const void *data, DWORD num); #define MAX_G_NAME 31 /* max length of PS glyph name */ extern void get_glyph_name(HDC hdc, WORD index, char *name);

1 0

Piotr Caban : wineps: Fix SetTextJustification playback with 0 count parameter.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 75e87c30ad18af6332bd13fb7effa7448293d558 URL: https://gitlab.winehq.org/wine/wine/-/commit/75e87c30ad18af6332bd13fb7effa7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 9 12:34:21 2023 +0200 wineps: Fix SetTextJustification playback with 0 count parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55078 --- dlls/wineps.drv/printproc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 9cd1efd5d5d..72e5540b5be 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2792,8 +2792,16 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { const EMRSETTEXTJUSTIFICATION *p = (const EMRSETTEXTJUSTIFICATION *)rec; - data->break_extra = p->break_extra / p->break_count; - data->break_rem = p->break_extra - data->break_extra * p->break_count; + if (p->break_count) + { + data->break_extra = p->break_extra / p->break_count; + data->break_rem = p->break_extra - data->break_extra * p->break_count; + } + else + { + data->break_extra = 0; + data->break_rem = 0; + } return PlayEnhMetaFileRecord(data->ctx->hdc, htable, rec, handle_count); }

1 0

Fabian Maurer : user32/tests: Remove DrawTextEx tests that overrun stack variable.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 029bac07e9758b709648d3cbadac94b8508379a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/029bac07e9758b709648d3cbadac94… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jul 9 21:27:36 2023 +0200 user32/tests: Remove DrawTextEx tests that overrun stack variable. Fixes regression introduced by 35c8f15bc67f7602438fe0c39a69ff6ddf6b8297 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55215 --- dlls/user32/tests/text.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 90fe7421b02..a2990a9706b 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -521,10 +521,6 @@ static void test_DrawTextCalcRect(void) } /* When passing invalid DC, other parameters must be ignored - no crashes on invalid pointers */ - SetLastError(0xdeadbeef); - textheight = DrawTextExW((HDC)0xdeadbeef, emptystringW, 100000, (LPRECT)0xdeadbeef, 0, 0); - ok(textheight == 0, "Got textheight from DrawTextExW\n"); - ok(GetLastError() == 0xdeadbeef,"Got error %lu\n", GetLastError()); SetLastError(0xdeadbeef); textheight = DrawTextExW((HDC)0xdeadbeef, (LPWSTR)0xdeadbeef, 100000, &rect, 0, 0); @@ -536,11 +532,6 @@ static void test_DrawTextCalcRect(void) ok(textheight == 0, "Got textheight from DrawTextExW\n"); ok(GetLastError() == 0xdeadbeef,"Got error %lu\n", GetLastError()); - SetLastError(0xdeadbeef); - textheight = DrawTextExA((HDC)0xdeadbeef, emptystring, 100000, (LPRECT)0xdeadbeef, 0, 0); - ok(textheight == 0, "Got textheight from DrawTextExA\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_HANDLE,"Got error %lu\n", GetLastError()); - SetLastError(0xdeadbeef); textheight = DrawTextExA((HDC)0xdeadbeef, 0, -1, (LPRECT)0xdeadbeef, DT_CALCRECT, 0); ok(textheight == 0, "Got textheight from DrawTextExA\n");

1 0

Fabian Maurer : geolocation: Rename from windows.devices.geolocation.geolocator.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 54e38a95fc76ee400fcdbd5cdf0b938c8a0fdbe4 URL: https://gitlab.winehq.org/wine/wine/-/commit/54e38a95fc76ee400fcdbd5cdf0b93… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jul 7 23:06:23 2023 +0200 geolocation: Rename from windows.devices.geolocation.geolocator. --- configure | 6 +++--- configure.ac | 4 ++-- .../Makefile.in | 2 +- .../classes.idl | 2 +- .../geolocation.spec} | 0 dlls/{windows.devices.geolocation.geolocator => geolocation}/main.c | 0 .../private.h | 4 ++-- dlls/geolocation/tests/Makefile.in | 5 +++++ .../tests/geolocator.c | 0 dlls/windows.devices.geolocation.geolocator/tests/Makefile.in | 5 ----- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure b/configure index e4cdaacd5e2..a8f85ebe05c 100755 --- a/configure +++ b/configure @@ -1141,6 +1141,7 @@ enable_gameux enable_gamingtcui enable_gdi32 enable_gdiplus +enable_geolocation enable_glu32 enable_gphoto2_ds enable_gpkcsp @@ -1457,7 +1458,6 @@ enable_wimgapi enable_win32u enable_windows_devices_bluetooth enable_windows_devices_enumeration -enable_windows_devices_geolocation_geolocator enable_windows_gaming_input enable_windows_gaming_ui_gamebar enable_windows_globalization @@ -21436,6 +21436,8 @@ wine_fn_config_makefile dlls/gdi32 enable_gdi32 wine_fn_config_makefile dlls/gdi32/tests enable_tests wine_fn_config_makefile dlls/gdiplus enable_gdiplus wine_fn_config_makefile dlls/gdiplus/tests enable_tests +wine_fn_config_makefile dlls/geolocation enable_geolocation +wine_fn_config_makefile dlls/geolocation/tests enable_tests wine_fn_config_makefile dlls/glu32 enable_glu32 wine_fn_config_makefile dlls/gphoto2.ds enable_gphoto2_ds wine_fn_config_makefile dlls/gpkcsp enable_gpkcsp @@ -21945,8 +21947,6 @@ wine_fn_config_makefile dlls/windows.devices.bluetooth enable_windows_devices_bl wine_fn_config_makefile dlls/windows.devices.bluetooth/tests enable_tests wine_fn_config_makefile dlls/windows.devices.enumeration enable_windows_devices_enumeration wine_fn_config_makefile dlls/windows.devices.enumeration/tests enable_tests -wine_fn_config_makefile dlls/windows.devices.geolocation.geolocator enable_windows_devices_geolocation_geolocator -wine_fn_config_makefile dlls/windows.devices.geolocation.geolocator/tests enable_tests wine_fn_config_makefile dlls/windows.gaming.input enable_windows_gaming_input wine_fn_config_makefile dlls/windows.gaming.input/tests enable_tests wine_fn_config_makefile dlls/windows.gaming.ui.gamebar enable_windows_gaming_ui_gamebar diff --git a/configure.ac b/configure.ac index 87a05fa903d..d1c5063201f 100644 --- a/configure.ac +++ b/configure.ac @@ -2631,6 +2631,8 @@ WINE_CONFIG_MAKEFILE(dlls/gdi32) WINE_CONFIG_MAKEFILE(dlls/gdi32/tests) WINE_CONFIG_MAKEFILE(dlls/gdiplus) WINE_CONFIG_MAKEFILE(dlls/gdiplus/tests) +WINE_CONFIG_MAKEFILE(dlls/geolocation) +WINE_CONFIG_MAKEFILE(dlls/geolocation/tests) WINE_CONFIG_MAKEFILE(dlls/glu32) WINE_CONFIG_MAKEFILE(dlls/gphoto2.ds) WINE_CONFIG_MAKEFILE(dlls/gpkcsp) @@ -3140,8 +3142,6 @@ WINE_CONFIG_MAKEFILE(dlls/windows.devices.bluetooth) WINE_CONFIG_MAKEFILE(dlls/windows.devices.bluetooth/tests) WINE_CONFIG_MAKEFILE(dlls/windows.devices.enumeration) WINE_CONFIG_MAKEFILE(dlls/windows.devices.enumeration/tests) -WINE_CONFIG_MAKEFILE(dlls/windows.devices.geolocation.geolocator) -WINE_CONFIG_MAKEFILE(dlls/windows.devices.geolocation.geolocator/tests) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.ui.gamebar) diff --git a/dlls/windows.devices.geolocation.geolocator/Makefile.in b/dlls/geolocation/Makefile.in similarity index 56% rename from dlls/windows.devices.geolocation.geolocator/Makefile.in rename to dlls/geolocation/Makefile.in index 42b5e50442b..b1274a1e2c8 100644 --- a/dlls/windows.devices.geolocation.geolocator/Makefile.in +++ b/dlls/geolocation/Makefile.in @@ -1,4 +1,4 @@ -MODULE = windows.devices.geolocation.geolocator.dll +MODULE = geolocation.dll IMPORTS = combase uuid C_SRCS = \ diff --git a/dlls/windows.devices.geolocation.geolocator/classes.idl b/dlls/geolocation/classes.idl similarity index 93% rename from dlls/windows.devices.geolocation.geolocator/classes.idl rename to dlls/geolocation/classes.idl index 9c55cf20446..9a21dba5edc 100644 --- a/dlls/windows.devices.geolocation.geolocator/classes.idl +++ b/dlls/geolocation/classes.idl @@ -1,4 +1,4 @@ -/* Runtime Classes for windows.devices.geolocation.geolocator.dll +/* Runtime Classes for geolocation.dll * * Copyright 2023 Fabian Maurer * diff --git a/dlls/windows.devices.geolocation.geolocator/windows.devices.geolocation.geolocator.spec b/dlls/geolocation/geolocation.spec similarity index 100% rename from dlls/windows.devices.geolocation.geolocator/windows.devices.geolocation.geolocator.spec rename to dlls/geolocation/geolocation.spec diff --git a/dlls/windows.devices.geolocation.geolocator/main.c b/dlls/geolocation/main.c similarity index 100% rename from dlls/windows.devices.geolocation.geolocator/main.c rename to dlls/geolocation/main.c diff --git a/dlls/windows.devices.geolocation.geolocator/private.h b/dlls/geolocation/private.h similarity index 90% rename from dlls/windows.devices.geolocation.geolocator/private.h rename to dlls/geolocation/private.h index 7250bc1fe36..a188b5dacf3 100644 --- a/dlls/windows.devices.geolocation.geolocator/private.h +++ b/dlls/geolocation/private.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_WINDOWS_DEVICES_GEOLOCATION_GEOLOCATOR_PRIVATE_H -#define __WINE_WINDOWS_DEVICES_GEOLOCATION_GEOLOCATOR_PRIVATE_H +#ifndef __WINE_GEOLOCATION_PRIVATE_H +#define __WINE_GEOLOCATION_PRIVATE_H #include <stdarg.h> diff --git a/dlls/geolocation/tests/Makefile.in b/dlls/geolocation/tests/Makefile.in new file mode 100644 index 00000000000..216e741fea8 --- /dev/null +++ b/dlls/geolocation/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = geolocation.dll +IMPORTS = combase uuid + +C_SRCS = \ + geolocator.c diff --git a/dlls/windows.devices.geolocation.geolocator/tests/geolocator.c b/dlls/geolocation/tests/geolocator.c similarity index 100% rename from dlls/windows.devices.geolocation.geolocator/tests/geolocator.c rename to dlls/geolocation/tests/geolocator.c diff --git a/dlls/windows.devices.geolocation.geolocator/tests/Makefile.in b/dlls/windows.devices.geolocation.geolocator/tests/Makefile.in deleted file mode 100644 index 1be5ca78258..00000000000 --- a/dlls/windows.devices.geolocation.geolocator/tests/Makefile.in +++ /dev/null @@ -1,5 +0,0 @@ -TESTDLL = windows.devices.geolocation.geolocator.dll -IMPORTS = combase uuid - -C_SRCS = \ - geolocator.c

1 0

Connor McAdams : uiautomationcore: Allow for refusal of HWND providers on node creation by non-nested node providers.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 68d0c88b069d838efd8683da135f591fd17a0ff6 URL: https://gitlab.winehq.org/wine/wine/-/commit/68d0c88b069d838efd8683da135f59… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jun 15 13:08:57 2023 -0400 uiautomationcore: Allow for refusal of HWND providers on node creation by non-nested node providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 14 ++++++++------ dlls/uiautomationcore/uia_private.h | 1 + dlls/uiautomationcore/uia_provider.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 8dac22db066..d9a13647246 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1334,13 +1334,14 @@ static ULONG WINAPI uia_provider_Release(IWineUiaProvider *iface) } static HRESULT get_variant_for_elprov_node(IRawElementProviderSimple *elprov, BOOL out_nested, - VARIANT *v) + BOOL refuse_hwnd_providers, VARIANT *v) { HUIANODE node; HRESULT hr; VariantInit(v); - hr = create_uia_node_from_elprov(elprov, &node, !out_nested); + + hr = create_uia_node_from_elprov(elprov, &node, !refuse_hwnd_providers); IRawElementProviderSimple_Release(elprov); if (SUCCEEDED(hr)) { @@ -1444,7 +1445,7 @@ static HRESULT uia_provider_get_elem_prop_val(struct uia_provider *prov, if (FAILED(hr)) goto exit; - hr = get_variant_for_elprov_node(elprov, prov->return_nested_node, ret_val); + hr = get_variant_for_elprov_node(elprov, prov->return_nested_node, prov->refuse_hwnd_node_providers, ret_val); if (FAILED(hr)) return hr; @@ -1770,7 +1771,7 @@ static HRESULT WINAPI uia_provider_navigate(IWineUiaProvider *iface, int nav_dir if (FAILED(hr) || !elprov) return hr; - hr = get_variant_for_elprov_node(elprov, prov->return_nested_node, out_val); + hr = get_variant_for_elprov_node(elprov, prov->return_nested_node, prov->refuse_hwnd_node_providers, out_val); if (FAILED(hr)) return hr; } @@ -1802,7 +1803,7 @@ static HRESULT WINAPI uia_provider_get_focus(IWineUiaProvider *iface, VARIANT *o IRawElementProviderFragment_Release(elfrag); if (SUCCEEDED(hr)) { - hr = get_variant_for_elprov_node(elprov, prov->return_nested_node, out_val); + hr = get_variant_for_elprov_node(elprov, prov->return_nested_node, prov->refuse_hwnd_node_providers, out_val); if (FAILED(hr)) VariantClear(out_val); } @@ -1881,7 +1882,7 @@ static HRESULT WINAPI uia_provider_attach_event(IWineUiaProvider *iface, LONG_PT if (FAILED(hr)) goto exit; - hr = create_uia_node_from_elprov(elprov, &node, !prov->return_nested_node); + hr = create_uia_node_from_elprov(elprov, &node, !prov->refuse_hwnd_node_providers); IRawElementProviderSimple_Release(elprov); if (SUCCEEDED(hr)) { @@ -2437,6 +2438,7 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU IWineUiaProvider_AddRef(provider_iface); prov_data = impl_from_IWineUiaProvider(provider_iface); + prov_data->refuse_hwnd_node_providers = FALSE; prov_data->return_nested_node = FALSE; prov_data->parent_check_ran = FALSE; diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 807ca134521..11cab86651c 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -84,6 +84,7 @@ struct uia_provider { LONG ref; IRawElementProviderSimple *elprov; + BOOL refuse_hwnd_node_providers; BOOL return_nested_node; BOOL parent_check_ran; BOOL has_parent; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 38ddcd8678f..f13b028cad6 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1751,7 +1751,7 @@ static HRESULT uia_provider_thread_add_node(HUIANODE node, SAFEARRAY *rt_id) HRESULT hr = S_OK; prov_data = impl_from_IWineUiaProvider(node_data->prov[prov_type]); - node_data->nested_node = prov_data->return_nested_node = TRUE; + node_data->nested_node = prov_data->return_nested_node = prov_data->refuse_hwnd_node_providers = TRUE; TRACE("Adding node %p\n", node);

1 0

Connor McAdams : uiautomationcore: Add support for matching serverside events through navigation.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 2622745083cfd7a4f0b70978304c9469ae4fc5a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2622745083cfd7a4f0b70978304c94… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 3 12:04:06 2023 -0400 uiautomationcore: Add support for matching serverside events through navigation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 +- dlls/uiautomationcore/uia_classes.idl | 2 +- dlls/uiautomationcore/uia_event.c | 153 +++++++++++++++++++++-------- 3 files changed, 117 insertions(+), 48 deletions(-)

1 0

Andrey Gusev : vkd3d-shader/spirv: Add support for VKD3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE interpolation qualifier.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: vkd3d Branch: master Commit: d4d960cb8b4f503ce3de51d9f29267ca938f3183 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d4d960cb8b4f503ce3de51d9f2926… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jun 19 21:01:50 2023 +0300 vkd3d-shader/spirv: Add support for VKD3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE interpolation qualifier. Used by F1 2018. --- libs/vkd3d-shader/spirv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5535a650..9725a5c7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3998,6 +3998,11 @@ static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); break; + case VKD3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); + vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); + break; default: FIXME("Unhandled interpolation mode %#x.\n", mode); break;

1 0

Alexandre Julliard : Wine release 8.12
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: website Branch: master Commit: 61554cf3ea9ecedbe585594701970f58140b5a82 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/61554cf3ea9ecedbe585594701… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 7 22:27:14 2023 +0200 Wine release 8.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023070701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2023070701.xml b/news/en/2023070701.xml new file mode 100644 index 00000000..5703eff4 --- /dev/null +++ b/news/en/2023070701.xml @@ -0,0 +1,15 @@ +<news> +<date>July 7, 2023</date> +<title>Wine 8.12 Released</title> +<body> + The Wine development release 8.12 is now available. + <a href="{$root}/announce/8.12">What's new</a> in this release: +<ul> + <li>Initial support for painting windows in the Wayland driver.</li> + <li>Command stream performance improvements in WineD3D.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.12.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.12 : Alexandre Julliard : Release 8.12
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: refs/tags/wine-8.12 Tag: a4530fe8bbee045447f484fd751d7abb0ed991f9 URL: https://gitlab.winehq.org/wine/wine/-/tags/a4530fe8bbee045447f484fd751d7abb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 7 22:24:27 2023 +0200 Release 8.12

1 0