- Wine-Commits - list.winehq.org

Piotr Caban : wineps: Handle EMR_SETWORLDTRANSFORM record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 5c7c1c22c359f3c755fb1e0755d35b4d8b0ebcb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c7c1c22c359f3c755fb1e0755d35b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:21:43 2023 +0100 wineps: Handle EMR_SETWORLDTRANSFORM record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 2d0c7c9780b..6419000acbc 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -212,6 +212,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_MOVETOEX: + case EMR_SETWORLDTRANSFORM: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0

Piotr Caban : wineps: Handle EMR_POLYPOLYLINE record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: fd107041ae04a1c98f7b6a20fec2e36fd08f4bae URL: https://gitlab.winehq.org/wine/wine/-/commit/fd107041ae04a1c98f7b6a20fec2e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:25:03 2023 +0100 wineps: Handle EMR_POLYPOLYLINE record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index b2f61a98fe7..3c9f506c885 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -151,6 +151,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_PolyBezier(&data->pdev->dev, (const POINT *)p->aptl, p->cptl); } + case EMR_POLYPOLYLINE: + { + const EMRPOLYPOLYLINE *p = (const EMRPOLYPOLYLINE *)rec; + + return PSDRV_PolyPolyline(&data->pdev->dev, + (const POINT *)(p->aPolyCounts + p->nPolys), + p->aPolyCounts, p->nPolys); + } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); case EMR_SELECTOBJECT:

1 0

Piotr Caban : wineps: Handle EMR_CREATEDIBPATTERNBRUSHPT record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 18bdfd1e9ffa34297c6168cd014b2c346aaef876 URL: https://gitlab.winehq.org/wine/wine/-/commit/18bdfd1e9ffa34297c6168cd014b2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:19:36 2023 +0100 wineps: Handle EMR_CREATEDIBPATTERNBRUSHPT record in spool files. --- dlls/wineps.drv/printproc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f3678d110ec..2d0c7c9780b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -199,6 +199,17 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; return 1; } + case EMR_CREATEDIBPATTERNBRUSHPT: + { + const EMRCREATEDIBPATTERNBRUSHPT *p = (const EMRCREATEDIBPATTERNBRUSHPT *)rec; + + if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n)) + return 0; + data->patterns[p->ihBrush].usage = p->iUsage; + data->patterns[p->ihBrush].info = (BITMAPINFO *)((BYTE *)p + p->offBmi); + data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; + return 1; + } case EMR_MOVETOEX: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n);

1 0

Piotr Caban : wineps: Handle EMR_CREATEMONOBRUSH record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 4c02a51d9777dc8ce9a2e2bcabbdef520b78e980 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c02a51d9777dc8ce9a2e2bcabbdef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:18:40 2023 +0100 wineps: Handle EMR_CREATEMONOBRUSH record in spool files. --- dlls/wineps.drv/printproc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 30ca6ef0ce9..f3678d110ec 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -188,6 +188,17 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_LineTo(&data->pdev->dev, line->ptl.x, line->ptl.y) && MoveToEx(data->pdev->dev.hdc, line->ptl.x, line->ptl.y, NULL); } + case EMR_CREATEMONOBRUSH: + { + const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec; + + if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n)) + return 0; + data->patterns[p->ihBrush].usage = p->iUsage; + data->patterns[p->ihBrush].info = (BITMAPINFO *)((BYTE *)p + p->offBmi); + data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; + return 1; + } case EMR_MOVETOEX: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n);

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.7.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 75ab8431145a014c7303cca3b4b6b18de2cd08d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/75ab8431145a014c7303cca3b4b6b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 12:55:34 2023 +0100 vkd3d: Import upstream release 1.7. --- include/d3d12.idl | 1 + include/wine/list.h | 24 + libs/vkd3d/AUTHORS | 1 + libs/vkd3d/COPYING | 2 +- libs/vkd3d/include/vkd3d.h | 13 + libs/vkd3d/include/vkd3d_shader.h | 213 ++- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 110 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 366 ++++-- libs/vkd3d/libs/vkd3d-shader/glsl.c | 26 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 770 +++++++++-- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 290 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 6 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 1372 ++++++++++++++++---- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 1025 ++++++++++++--- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 10 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 179 ++- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 264 ++-- libs/vkd3d/libs/vkd3d-shader/sm4.h | 3 + libs/vkd3d/libs/vkd3d-shader/spirv.c | 48 +- libs/vkd3d/libs/vkd3d-shader/trace.c | 36 +- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 160 ++- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 105 +- libs/vkd3d/libs/vkd3d/command.c | 603 ++++----- libs/vkd3d/libs/vkd3d/device.c | 245 +--- libs/vkd3d/libs/vkd3d/resource.c | 198 ++- libs/vkd3d/libs/vkd3d/state.c | 44 +- libs/vkd3d/libs/vkd3d/utils.c | 21 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 184 +-- 28 files changed, 4509 insertions(+), 1810 deletions(-)

1 0

Alexandre Julliard : ntdll: Convert WoW context to native context when running in 32-bit code.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 5031c6d938f119580e8dbc7817ef68724d17954e URL: https://gitlab.winehq.org/wine/wine/-/commit/5031c6d938f119580e8dbc7817ef68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 14:40:46 2023 +0100 ntdll: Convert WoW context to native context when running in 32-bit code. It fixes single-stepping in the kernel32:debugger tests. --- dlls/ntdll/unix/thread.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index bf025a38188..4c8c04cf9fc 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1068,7 +1068,10 @@ static void contexts_from_server( CONTEXT *context, context_t server_contexts[2] if (native_context) { context_from_server( native_context, &server_contexts[0], native_machine ); - if (wow_context) context_from_server( wow_context, &server_contexts[1], main_image_info.Machine ); + if (wow_context) + context_from_server( wow_context, &server_contexts[1], main_image_info.Machine ); + else + context_from_server( native_context, &server_contexts[1], native_machine ); } else context_from_server( wow_context, &server_contexts[0], main_image_info.Machine ); }

1 0

Alexandre Julliard : ntdll: One more fix for CPU information in old Wow64 mode.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 7686cba10523d5ff9a5b427c9ecc15b18cfbc677 URL: https://gitlab.winehq.org/wine/wine/-/commit/7686cba10523d5ff9a5b427c9ecc15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 13:17:27 2023 +0100 ntdll: One more fix for CPU information in old Wow64 mode. --- dlls/ntdll/tests/info.c | 1 - dlls/ntdll/unix/system.c | 9 +-------- dlls/ntdll/unix/virtual.c | 13 ++++++++++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f500fc09092..ae1c8c7c89d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -322,7 +322,6 @@ static void test_query_cpu(void) { ok( sci.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", sci.ProcessorArchitecture ); - todo_wine ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 || sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64, "ProcessorArchitecture wrong %x\n", sci2.ProcessorArchitecture ); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3eecccc4972..04755fac5ea 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2568,14 +2568,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } case SystemCpuInformation: /* 1 */ - if (size >= (len = sizeof(cpu_info))) - { - SYSTEM_CPU_INFORMATION cpu = cpu_info; - - if (is_old_wow64() && cpu.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) - cpu.ProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; - memcpy(info, &cpu, len); - } + if (size >= (len = sizeof(cpu_info))) memcpy(info, &cpu_info, len); else ret = STATUS_INFO_LENGTH_MISMATCH; break; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1d07744ed1a..0faf3e343e3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -5319,10 +5319,21 @@ NTSTATUS WINAPI NtWow64WriteVirtualMemory64( HANDLE process, ULONG64 addr, const NTSTATUS WINAPI NtWow64GetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG len, ULONG *retlen ) { + NTSTATUS status; + switch (class) { - case SystemBasicInformation: case SystemCpuInformation: + status = NtQuerySystemInformation( class, info, len, retlen ); + if (!status && is_old_wow64()) + { + SYSTEM_CPU_INFORMATION *cpu = info; + + if (cpu->ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + cpu->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; + } + return status; + case SystemBasicInformation: case SystemEmulationBasicInformation: case SystemEmulationProcessorInformation: return NtQuerySystemInformation( class, info, len, retlen );

1 0

Alexandre Julliard : kernelbase: Fix pattern checking for genitive month names in get_date_format().
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 94456eb46db4f3cf04e89928c6f71c962ed94c82 URL: https://gitlab.winehq.org/wine/wine/-/commit/94456eb46db4f3cf04e89928c6f71c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 16:05:39 2023 +0100 kernelbase: Fix pattern checking for genitive month names in get_date_format(). --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 632f5b6d88a..45180f4bb8a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -7771,7 +7771,7 @@ static int get_date_format( const NLS_LOCALE_DATA *locale, DWORD flags, const SY val = (count == 3 ? LOCALE_SABBREVMONTHNAME1 : LOCALE_SMONTHNAME1) + time.wMonth - 1; if (!genitive) { - for (i = count; format[i]; i += get_pattern_len( format, L"yMd" )) + for (i = count; format[i]; i += get_pattern_len( format + i, L"yMd" )) { if (format[i] != 'd') continue; if (format[i + 1] != 'd' || format[i + 2] != 'd')

1 0

Alexandre Julliard : ntdll: Fully initialize the i386 FPU context on ARM64.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: d4f36570cd08260d9ac66c8795f74d87a50a8592 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4f36570cd08260d9ac66c8795f74d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 15:44:14 2023 +0100 ntdll: Fully initialize the i386 FPU context on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 2736c43e3b5..da78a7a8036 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1615,6 +1615,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B if ((i386_context = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) { + XMM_SAVE_AREA32 *fpu = (XMM_SAVE_AREA32 *)i386_context->ExtendedRegisters; i386_context->ContextFlags = CONTEXT_I386_ALL; i386_context->Eax = (ULONG_PTR)entry; i386_context->Ebx = (arg == peb ? (ULONG_PTR)wow_peb : (ULONG_PTR)arg); @@ -1627,8 +1628,9 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B i386_context->SegGs = 0x2b; i386_context->SegSs = 0x2b; i386_context->EFlags = 0x202; - i386_context->FloatSave.ControlWord = 0x27f; - ((XSAVE_FORMAT *)i386_context->ExtendedRegisters)->MxCsr = 0x1f80; + fpu->ControlWord = 0x27f; + fpu->MxCsr = 0x1f80; + fpux_to_fpu( &i386_context->FloatSave, fpu ); } else if ((arm_context = get_cpu_area( IMAGE_FILE_MACHINE_ARMNT ))) {

1 0

Tag vkd3d-1.7 : Alexandre Julliard : Release 1.7
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: vkd3d Branch: refs/tags/vkd3d-1.7 Tag: f4975128f055b98e5521d32101abda34cc08be1f URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/f4975128f055b98e5521d32101abda3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 12:51:01 2023 +0100 Release 1.7

1 0