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

Eric Pouech : wininet/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: e146f4c753a4c210083db575cb4ed95c01604e51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e146f4c753a4c210083db575… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:22:48 2022 +0100 wininet/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/Makefile.in | 1 - dlls/wininet/tests/ftp.c | 204 +++--- dlls/wininet/tests/http.c | 1420 ++++++++++++++++++++-------------------- dlls/wininet/tests/internet.c | 364 +++++----- dlls/wininet/tests/url.c | 166 ++--- dlls/wininet/tests/urlcache.c | 306 ++++----- 6 files changed, 1230 insertions(+), 1231 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e146f4c753a4c210083d…

1 0

Eric Pouech : wintab32/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 9e46e114ec1e53d923e8037156993e5ecbaf9e25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e46e114ec1e53d923e80371… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:23:28 2022 +0100 wintab32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/tests/Makefile.in | 1 - dlls/wintab32/tests/context.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wintab32/tests/Makefile.in b/dlls/wintab32/tests/Makefile.in index 921d97284dc..635e03fd5d6 100644 --- a/dlls/wintab32/tests/Makefile.in +++ b/dlls/wintab32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wintab32.dll IMPORTS = user32 diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index a88e4bb845d..4359412785a 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -165,40 +165,40 @@ static void test_WTInfoA(void) ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); - trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_X %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_Y, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_Y size %d\n", ret); - trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_Y %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); if(ret) - trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_Z %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); else trace("DVC_Z not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); - trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_NPRESSURE %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); if(ret) - trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_TPRESSURE %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); else trace("DVC_TPRESSURE not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret); - trace("DVC_ORIENTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); - trace("DVC_ORIENTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); - trace("DVC_ORIENTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + trace("DVC_ORIENTATION0 %ld, %ld, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ORIENTATION1 %ld, %ld, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ORIENTATION2 %ld, %ld, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_ROTATION, &orientation ); if(ret) { - trace("DVC_ROTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); - trace("DVC_ROTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); - trace("DVC_ROTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + trace("DVC_ROTATION0 %ld, %ld, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ROTATION1 %ld, %ld, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ROTATION2 %ld, %ld, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); } else trace("DVC_ROTATION not supported\n");

1 0

Eric Pouech : wintrust/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 457044cb47e534be35ba8f33d19259854fd3274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=457044cb47e534be35ba8f33… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:23:37 2022 +0100 wintrust/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/Makefile.in | 1 - dlls/wintrust/tests/asn.c | 208 ++++++++++++++++++------------------- dlls/wintrust/tests/crypt.c | 222 ++++++++++++++++++++-------------------- dlls/wintrust/tests/register.c | 44 ++++---- dlls/wintrust/tests/softpub.c | 144 +++++++++++++------------- 5 files changed, 309 insertions(+), 310 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=457044cb47e534be35ba…

1 0

Eric Pouech : winspool.drv/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 52be4b270981016f664d15d3692a8db31aadd970 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52be4b270981016f664d15d3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:23:13 2022 +0100 winspool.drv/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/Makefile.in | 1 - dlls/winspool.drv/tests/info.c | 508 ++++++++++++++++++------------------ 2 files changed, 254 insertions(+), 255 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52be4b270981016f664d…

1 0

Eric Pouech : kernel32/tests/change: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 04531cf6bb38dad04f3c2eafa8e68e65774fc3ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=04531cf6bb38dad04f3c2eaf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:19:20 2022 +0100 kernel32/tests/change: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/change.c | 159 ++++++++++++++++++++++--------------------- 1 file changed, 80 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04531cf6bb38dad04f3c…

1 0

Eric Pouech : kernel32/tests/time: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: c9631780d4b9549d44872c3cdbe65c6e118a8d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9631780d4b9549d44872c3c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:19:20 2022 +0100 kernel32/tests/time: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 139 +++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9631780d4b9549d4487…

1 0

Eric Pouech : kernel32/tests: Use correct integral type.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: b38d52cef438082eec409b04273d4c35b603f5ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=b38d52cef438082eec409b04… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:19:40 2022 +0100 kernel32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 9ae45c2091b..3503520bdcf 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -285,6 +285,7 @@ static void test_FiberLocalStorage(void) PEB *peb = teb->Peb; NTSTATUS status; HANDLE hthread; + ULONG index2; SIZE_T size; void* val; BOOL ret; @@ -407,13 +408,13 @@ static void test_FiberLocalStorage(void) g_fls_data->fls_callback_chunks[j]->callbacks[index].callback); fls_data->fls_data_chunks[j][index + 1] = (void *)(ULONG_PTR)0x28; - status = pRtlFlsAlloc(test_fls_callback, &i); + status = pRtlFlsAlloc(test_fls_callback, &index2); ok(!status, "Got unexpected status %#x.\n", status); - ok(i == fls_indices[0x10], "Got unexpected index %u.\n", i); + ok(index2 == fls_indices[0x10], "Got unexpected index %u.\n", index2); ok(fls_data->fls_data_chunks[j][index + 1] == (void *)(ULONG_PTR)0x28, "Got unexpected data %p.\n", fls_data->fls_data_chunks[j][index + 1]); - status = pRtlFlsSetValue(i, (void *)(ULONG_PTR)0x11); + status = pRtlFlsSetValue(index2, (void *)(ULONG_PTR)0x11); ok(!status, "Got unexpected status %#x.\n", status); teb->FlsSlots = NULL;

1 0

Eric Pouech : kernel32/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: c971429419b62f80dfd9ccd40955c3dfa55f3d38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c971429419b62f80dfd9ccd4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:19:58 2022 +0100 kernel32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/directory.c | 105 +++++++++++++++---------------- dlls/kernel32/tests/fiber.c | 135 ++++++++++++++++++++-------------------- dlls/kernel32/tests/version.c | 81 ++++++++++++------------ 3 files changed, 162 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c971429419b62f80dfd9…

1 0

Eric Pouech : kernel32/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 9ed10e4841cbd369b9b0cd5de2c43e066de2d1c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ed10e4841cbd369b9b0cd5d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:20:21 2022 +0100 kernel32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/atom.c | 33 +++++++++++++------------- dlls/kernel32/tests/drive.c | 37 +++++++++++++++-------------- dlls/kernel32/tests/mailslot.c | 53 +++++++++++++++++++++--------------------- dlls/kernel32/tests/power.c | 11 +++++---- dlls/kernel32/tests/resource.c | 47 +++++++++++++++++++------------------ dlls/kernel32/tests/timer.c | 29 ++++++++++++----------- dlls/kernel32/tests/toolhelp.c | 17 +++++++------- 7 files changed, 117 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ed10e4841cbd369b9b0…

1 0

David Gow : vkd3d: Handle D3D12_APPEND_ALIGNED_ELEMENT for <4 byte wide elements.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: vkd3d Branch: master Commit: 13ca6322c73d33049e40d957a6cf03a3ffca7fbd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=13ca6322c73d33049e40d95… Author: David Gow <david(a)ingeniumdigital.com> Date: Wed Mar 9 23:24:37 2022 +1000 vkd3d: Handle D3D12_APPEND_ALIGNED_ELEMENT for <4 byte wide elements. In d3d12, input element alignment needs to be the _minimum_ of 4 and the size of the type. See the D3D11 spec, section 4.4.6, which behaves similarly: https://microsoft.github.io/DirectX-Specs/d3d/archive/D3D11_3_FunctionalSpe… This is correctly taken into account when generating, e.g., the vertex_buffer_stride_align_mask used for validation, but is not taken into account when D3D12_APPEND_ALIGNED_ELEMENT is used to automatically place input elements. Currently, vkd3d always assumes the alignment is 4. This means that, for example, bytes or shorts should be packed tightly together when D3D12_APPEND_ALIGNED_ELEMENT is used, but are instead padded to 4 bytes. Fixing this makes units appear in Age of Empires IV. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 0e7800a4..72422897 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2430,9 +2430,9 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, if (e->AlignedByteOffset != D3D12_APPEND_ALIGNED_ELEMENT) offsets[i] = e->AlignedByteOffset; else - offsets[i] = input_slot_offsets[e->InputSlot]; + offsets[i] = align(input_slot_offsets[e->InputSlot], min(4, format->byte_count)); - input_slot_offsets[e->InputSlot] = align(offsets[i] + format->byte_count, 4); + input_slot_offsets[e->InputSlot] = offsets[i] + format->byte_count; } return S_OK;

1 0