March 2024 - Wine-commits - list.winehq.org

Rémi Bernon : win32u: Use set_reg_ascii_value whenever possible.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 6b8b35f9507f61e435d0b4582e31584c9244fa70 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b8b35f9507f61e435d0b4582e3158… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 26 23:40:52 2024 +0100 win32u: Use set_reg_ascii_value whenever possible. --- dlls/win32u/sysparams.c | 87 +++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 54 deletions(-)

1 0

Rémi Bernon : win32u: Introduce and use new reg_(open|create)_ascii_key helpers.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: e614610aafc9557dda2f34415cd306e3bbb1f3c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e614610aafc9557dda2f34415cd306… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 00:05:38 2024 +0100 win32u: Introduce and use new reg_(open|create)_ascii_key helpers. --- dlls/win32u/font.c | 17 ++- dlls/win32u/sysparams.c | 292 ++++++++++--------------------------------- dlls/win32u/win32u_private.h | 3 + 3 files changed, 86 insertions(+), 226 deletions(-)

1 0

Zebediah Figura : shell32/tests: Add more tests for IDataObject.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: b6128bbb516eaef6019d7fe8afa68e10a3e2f860 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6128bbb516eaef6019d7fe8afa68e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 3 17:16:54 2024 -0600 shell32/tests: Add more tests for IDataObject. --- dlls/shell32/tests/shlfolder.c | 236 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 223 insertions(+), 13 deletions(-)

1 0

Zebediah Figura : shell32: Do not interpret the direction in IDataObject::EnumFormatEtc().
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 0344f3aa855073f204e32992ca874f93cb0cd359 URL: https://gitlab.winehq.org/wine/wine/-/commit/0344f3aa855073f204e32992ca874f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 23:44:45 2024 -0600 shell32: Do not interpret the direction in IDataObject::EnumFormatEtc(). --- dlls/shell32/dataobject.c | 18 ++++++------------ dlls/shell32/tests/shlfolder.c | 5 +---- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 96b9a0ad5dd..2b4ee6bb55b 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -368,21 +368,15 @@ static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, LPFORMATETC pfor return E_NOTIMPL; } -static HRESULT WINAPI IDataObject_fnEnumFormatEtc(IDataObject *iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) +static HRESULT WINAPI IDataObject_fnEnumFormatEtc(IDataObject *iface, DWORD direction, IEnumFORMATETC **out) { - IDataObjectImpl *This = impl_from_IDataObject(iface); - - TRACE("(%p)->()\n", This); - *ppenumFormatEtc=NULL; + IDataObjectImpl *obj = impl_from_IDataObject(iface); - /* only get data */ - if (DATADIR_GET == dwDirection) - { - *ppenumFormatEtc = IEnumFORMATETC_Constructor(MAX_FORMATS, This->pFormatEtc); - return (*ppenumFormatEtc) ? S_OK : E_FAIL; - } + TRACE("iface %p, direction %#lx, out %p.\n", iface, direction, out); - return E_NOTIMPL; + if (!(*out = IEnumFORMATETC_Constructor(MAX_FORMATS, obj->pFormatEtc))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI IDataObject_fnDAdvise(IDataObject *iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index eb77e2113f3..7e85ced8ded 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5478,10 +5478,7 @@ static void test_DataObject(void) for (unsigned int i = 0; i < ARRAY_SIZE(enum_directions); ++i) { hr = IDataObject_EnumFormatEtc(data_obj, enum_directions[i], &enum_format); - todo_wine_if (enum_directions[i] == DATADIR_SET) - ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr != S_OK) - continue; + ok(hr == S_OK, "Got hr %#lx.\n", hr); memset(&fmt, 0xcc, sizeof(fmt)); hr = IEnumFORMATETC_Next(enum_format, 1, &fmt, NULL);

1 0

Zebediah Figura : shell32: Reimplement the data object to store a generic array of HGLOBALs.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 4f02c8ba2dfdc1438fe6e651373c7aa805fb1137 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f02c8ba2dfdc1438fe6e651373c7a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 23:53:38 2024 -0600 shell32: Reimplement the data object to store a generic array of HGLOBALs. --- dlls/shell32/clipboard.c | 8 +- dlls/shell32/dataobject.c | 212 ++++++++++++++++++++--------------------- dlls/shell32/shell32_main.h | 8 +- dlls/shell32/tests/shlfolder.c | 8 +- 4 files changed, 113 insertions(+), 123 deletions(-)

1 0

Zebediah Figura : shell32: Implement IDataObject::SetData().
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: f8ddba3ad03ba17afe8092889d4978659a9bae66 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8ddba3ad03ba17afe8092889d4978… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 23:55:05 2024 -0600 shell32: Implement IDataObject::SetData(). --- dlls/shell32/dataobject.c | 46 ++++++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shlfolder.c | 29 ++++++++++++-------------- 2 files changed, 55 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index dd4d77f6942..d0ed644c437 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -344,11 +344,49 @@ static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(IDataObject *iface, LP return E_NOTIMPL; } -static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) +static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, + FORMATETC *format, STGMEDIUM *medium, BOOL release) { - IDataObjectImpl *This = impl_from_IDataObject(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + IDataObjectImpl *obj = impl_from_IDataObject(iface); + struct data *new_array; + + TRACE("iface %p, format %p, medium %p, release %d.\n", iface, format, medium, release); + + if (!release) + return E_INVALIDARG; + + if (format->tymed != TYMED_HGLOBAL) + { + FIXME("Unhandled format tymed %#lx.\n", format->tymed); + return E_NOTIMPL; + } + + if (medium->tymed != TYMED_HGLOBAL) + { + FIXME("Unhandled medium tymed %#lx.\n", format->tymed); + return E_NOTIMPL; + } + + if (medium->pUnkForRelease) + FIXME("Ignoring IUnknown %p.\n", medium->pUnkForRelease); + + for (size_t i = 0; i < obj->data_count; ++i) + { + if (obj->data[i].cf == format->cfFormat) + { + GlobalFree(obj->data[i].global); + obj->data[i].global = medium->hGlobal; + return S_OK; + } + } + + if (!(new_array = realloc(obj->data, (obj->data_count + 1) * sizeof(*obj->data)))) + return E_OUTOFMEMORY; + obj->data = new_array; + obj->data[obj->data_count].cf = format->cfFormat; + obj->data[obj->data_count].global = medium->hGlobal; + ++obj->data_count; + return S_OK; } static HRESULT WINAPI IDataObject_fnEnumFormatEtc(IDataObject *iface, DWORD direction, IEnumFORMATETC **out) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3f364b49769..b2448938728 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5318,15 +5318,15 @@ static void test_enum_format(IDataObject *data_obj) hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 4); - ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - hr = IEnumFORMATETC_Skip(enum1, 1); todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + hr = IEnumFORMATETC_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 3); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 1); - ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Next(enum1, 1, formats, NULL); todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Next(enum2, 1, formats, NULL); @@ -5342,7 +5342,7 @@ static void test_enum_format(IDataObject *data_obj) formats[0].lindex = -1; formats[0].tymed = TYMED_HGLOBAL; hr = IDataObject_SetData(data_obj, &formats[0], &medium, TRUE); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -5457,23 +5457,20 @@ static void test_DataObject(void) medium.hGlobal = global; fmt.tymed = TYMED_HGLOBAL; hr = IDataObject_SetData(data_obj, &fmt, &medium, FALSE); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IDataObject_SetData(data_obj, &fmt, &medium, TRUE); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IDataObject_QueryGetData(data_obj, &fmt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); memset(&medium, 0xcc, sizeof(medium)); hr = IDataObject_GetData(data_obj, &fmt, &medium); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) - { - ok(medium.hGlobal && medium.hGlobal != global, "Got global %p.\n", medium.hGlobal); - value = GlobalLock(medium.hGlobal); - ok(*value == 0xabacab, "Got value %#x.\n", *value); - GlobalUnlock(medium.hGlobal); - ReleaseStgMedium(&medium); - } + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(medium.hGlobal && medium.hGlobal != global, "Got global %p.\n", medium.hGlobal); + value = GlobalLock(medium.hGlobal); + ok(*value == 0xabacab, "Got value %#x.\n", *value); + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); for (unsigned int i = 0; i < ARRAY_SIZE(enum_directions); ++i) {

1 0

Alexandre Julliard : ntdll: Allocate the data structure and stack for the ARM64EC emulator.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: daea0b9b57a8919be0ce1cff5b6cf36bd36b5c94 URL: https://gitlab.winehq.org/wine/wine/-/commit/daea0b9b57a8919be0ce1cff5b6cf3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 11:04:16 2024 +0100 ntdll: Allocate the data structure and stack for the ARM64EC emulator. --- dlls/ntdll/unix/thread.c | 18 ++++++++++++++++++ dlls/ntdll/unix/virtual.c | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 6a0f2fad346..7f2f1b9a50e 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1218,6 +1218,24 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR limit, SIZE_T reserve_size, SIZE #endif } +#ifdef __aarch64__ + if (is_arm64ec()) + { + CHPE_V2_CPU_AREA_INFO *cpu_area; + const SIZE_T chpev2_stack_size = 0x40000; + + /* emulator stack */ + if ((status = virtual_alloc_thread_stack( &stack, limit_4g, 0, chpev2_stack_size, chpev2_stack_size, FALSE ))) + return status; + + cpu_area = stack.DeallocationStack; + cpu_area->ContextAmd64 = (ARM64EC_NT_CONTEXT *)&cpu_area->EmulatorDataInline; + cpu_area->EmulatorStackBase = (ULONG_PTR)stack.StackBase; + cpu_area->EmulatorStackLimit = (ULONG_PTR)stack.StackLimit + page_size; + teb->ChpeV2CpuAreaInfo = cpu_area; + } +#endif + /* native stack */ if ((status = virtual_alloc_thread_stack( &stack, 0, limit, reserve_size, commit_size, TRUE ))) return status; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2b6ce543531..4b23d9954df 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3758,6 +3758,13 @@ void virtual_free_teb( TEB *teb ) size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); } +#ifdef __aarch64__ + if (teb->ChpeV2CpuAreaInfo) + { + size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), (void **)&teb->ChpeV2CpuAreaInfo, &size, MEM_RELEASE ); + } +#endif if (thread_data->kernel_stack) { size = 0;

1 0

Alexandre Julliard : ntdll: Implement exception dispatching on ARM64EC.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: e6ce5d5df7ea3f89fb295aabc167b7b6f04f8dbd URL: https://gitlab.winehq.org/wine/wine/-/commit/e6ce5d5df7ea3f89fb295aabc167b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 11:06:34 2024 +0100 ntdll: Implement exception dispatching on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 186 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/exception.c | 34 +++++++- 2 files changed, 219 insertions(+), 1 deletion(-)

1 0

Alexandre Julliard : ntdll: Implement KiUserExceptionDispatcher on ARM64EC.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: ec2e266c7643d80f0a466c545e68d29ad5f5e1dd URL: https://gitlab.winehq.org/wine/wine/-/commit/ec2e266c7643d80f0a466c545e68d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 11:23:47 2024 +0100 ntdll: Implement KiUserExceptionDispatcher on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 08284b6a917..f56931a9e4b 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1674,19 +1674,28 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ -NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +static NTSTATUS __attribute__((used)) dispatch_exception_arm64ec( EXCEPTION_RECORD *rec, ARM64_NT_CONTEXT *arm_ctx ) { - FIXME( "not implemented\n" ); - return STATUS_INVALID_DISPOSITION; + ARM64EC_NT_CONTEXT context; + + context_arm_to_x64( &context, arm_ctx ); + return dispatch_exception( rec, &context.AMD64_Context ); } +__ASM_GLOBAL_FUNC( "#KiUserExceptionDispatcher", + ".seh_context\n\t" + ".seh_endprologue\n\t" + "add x0, sp, #0x390\n\t" /* rec (context + 1) */ + "mov x1, sp\n\t" /* context */ + "bl dispatch_exception_arm64ec\n\t" + "brk #1" ) /******************************************************************* * KiUserApcDispatcher (NTDLL.@) */ -void WINAPI dispatch_apc( void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*), - ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, - BOOLEAN alertable, ARM64_NT_CONTEXT *arm_ctx ) +static void __attribute__((used)) dispatch_apc( void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*), + ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, + BOOLEAN alertable, ARM64_NT_CONTEXT *arm_ctx ) { ARM64EC_NT_CONTEXT context;

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.11.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 5bb80251b1f00e4f3ef551761b0de80bb5ebd423 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bb80251b1f00e4f3ef551761b0de8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 12:45:06 2024 +0100 vkd3d: Import upstream release 1.11. --- libs/vkd3d/AUTHORS | 2 + libs/vkd3d/COPYING | 2 +- libs/vkd3d/Makefile.in | 1 + libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 50 +- libs/vkd3d/include/private/vkd3d_debug.h | 27 + libs/vkd3d/include/vkd3d.h | 1 + libs/vkd3d/include/vkd3d_shader.h | 54 +- libs/vkd3d/libs/vkd3d-common/blob.c | 6 +- libs/vkd3d/libs/vkd3d-common/debug.c | 6 +- libs/vkd3d/libs/vkd3d-shader/d3d_asm.c | 237 +- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 210 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 38 +- libs/vkd3d/libs/vkd3d-shader/dxil.c | 3124 ++++++++++++++++++-- libs/vkd3d/libs/vkd3d-shader/fx.c | 966 ++++++ libs/vkd3d/libs/vkd3d-shader/glsl.c | 6 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 155 +- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 105 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 8 + libs/vkd3d/libs/vkd3d-shader/hlsl.y | 803 +++-- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 270 +- libs/vkd3d/libs/vkd3d-shader/ir.c | 2817 ++++++++++++++++-- libs/vkd3d/libs/vkd3d-shader/spirv.c | 1842 ++++++------ libs/vkd3d/libs/vkd3d-shader/tpf.c | 247 +- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 186 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 266 +- libs/vkd3d/libs/vkd3d/command.c | 114 +- libs/vkd3d/libs/vkd3d/device.c | 904 ++++-- libs/vkd3d/libs/vkd3d/resource.c | 292 +- libs/vkd3d/libs/vkd3d/state.c | 78 +- libs/vkd3d/libs/vkd3d/utils.c | 24 +- libs/vkd3d/libs/vkd3d/vkd3d_main.c | 34 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 160 +- 33 files changed, 10567 insertions(+), 2472 deletions(-)

1 0