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

Nikolay Sivov : wmic: Use CRT allocation functions.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 89f10a0f4bc2de6235cc1f9058d87a7a6d429d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f10a0f4bc2de6235cc1f90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 12:27:53 2022 +0300 wmic: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 50c28ebec5d..15b590098e7 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -61,15 +61,6 @@ static const WCHAR *find_class( const WCHAR *alias ) return NULL; } -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; - lstrcpyW( dst, src ); - return dst; -} - static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) { SAFEARRAY *sa; @@ -85,7 +76,7 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) SafeArrayGetElement( sa, &i, &str ); if (!wcsicmp( str, prop )) { - ret = strdupW( str ); + ret = wcsdup( str ); break; } } @@ -228,7 +219,7 @@ done: SysFreeString( path ); SysFreeString( query ); SysFreeString( wql ); - HeapFree( GetProcessHeap(), 0, prop ); + free( prop ); CoUninitialize(); return ret; }

1 0

Eric Pouech : iphlpapi: Don't cast SIZE_T to DWORD in trace, use %I instead.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 7f6adab1bd198d1bf96fd727551265f052f8f5be URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f6adab1bd198d1bf96fd727… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 7 08:41:18 2022 +0200 iphlpapi: Don't cast SIZE_T to DWORD in trace, use %I instead. 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/iphlpapi/iphlpapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index afc400d26c1..0bd7cdc06c8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4183,7 +4183,7 @@ DWORD WINAPI ConvertInterfaceLuidToAlias( const NET_LUID *luid, WCHAR *alias, SI DWORD err; IF_COUNTED_STRING name; - TRACE( "(%p %p %lu)\n", luid, alias, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, alias, len ); if (!luid || !alias) return ERROR_INVALID_PARAMETER; @@ -4243,7 +4243,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_ DWORD err; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - TRACE( "(%p %p %lu)\n", luid, name, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, name, len ); if (!luid) return ERROR_INVALID_PARAMETER; if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY; @@ -4283,7 +4283,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE const WCHAR *prefix = NULL; WCHAR buf[IF_MAX_STRING_SIZE + 1]; - TRACE( "(%p %p %lu)\n", luid, name, (DWORD)len ); + TRACE( "(%p %p %Iu)\n", luid, name, len ); if (!luid || !name) return ERROR_INVALID_PARAMETER;

1 0

Eric Pouech : mstask: Don't cast size_t to DWORD in trace, use %I instead.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: f56e7a9b5848f6204d38be1d95a0b8c98d5095cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f56e7a9b5848f6204d38be1d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 7 08:41:22 2022 +0200 mstask: Don't cast size_t to DWORD in trace, use %I instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 23e9af7f0f3..72592b27c09 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1396,8 +1396,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER))); + TRACE("trigger_offset %04x, triggers end at %04Ix\n", fixed->trigger_offset, + fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER)); task_trigger = (TASK_TRIGGER *)(data + sizeof(USHORT));

1 0

Eric Pouech : schedvc: Don't cast size_t to DWORD in trace, use %I instead.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 5b88083a1925b67e682525f2f3b2dfb2e4901cff URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b88083a1925b67e682525f2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 7 08:41:25 2022 +0200 schedvc: Don't cast size_t to DWORD in trace, use %I instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 0a47e37089b..e8ea1b25c6f 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -491,8 +491,8 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, - (DWORD)(fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER))); + TRACE("trigger_offset %04x, triggers end at %04Ix\n", fixed->trigger_offset, + fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER)); info->trigger_count = *(const USHORT *)data; TRACE("trigger_count %u\n", info->trigger_count);

1 0

Eric Pouech : dmstyle: Don't cast size_t to DWORD in trace, use %I instead.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 151abafa54de15440df73f49afbfee3b439804b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=151abafa54de15440df73f49… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 7 08:41:13 2022 +0200 dmstyle: Don't cast size_t to DWORD in trace, use %I instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 87b7eed0902..9048984adea 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -508,7 +508,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; @@ -524,7 +524,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL;

1 0

Nikolay Sivov : localui/tests: Use CRT allocation functions.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 7efa1498aa658283c11326e09a08d013d28d3149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7efa1498aa658283c11326e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 10:50:40 2022 +0300 localui/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/tests/localui.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 28cecaabd50..b504bd870f7 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -69,7 +69,7 @@ static PORT_INFO_2W * find_portinfo2(LPCWSTR pPort) return NULL; } ok(!res, "EnumPorts succeeded: got %ld\n", res); - pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); + pi_buffer = malloc(pi_needed); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); ok(res == 1, "EnumPorts failed: got %ld\n", res); } @@ -105,21 +105,6 @@ static LPCSTR load_functions(void) return NULL; } -/* ########################### - * strdupW [internal] - */ - -static LPWSTR strdupW(LPCWSTR strW) -{ - LPWSTR ptr; - - ptr = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(strW) + 1) * sizeof(WCHAR)); - if (ptr) { - lstrcpyW(ptr, strW); - } - return ptr; -} - /* ########################### */ static void test_AddPortUI(void) @@ -267,7 +252,6 @@ START_TEST(localui) DWORD numentries; PORT_INFO_2W * pi2; WCHAR bufferW[16]; - CHAR bufferA[16]; DWORD id; /* localui.dll does not exist before w2k */ @@ -302,29 +286,26 @@ START_TEST(localui) /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "LPT%lu:", id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); + swprintf(bufferW, ARRAY_SIZE(bufferW), L"LPT%lu:", id); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; - if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); + if (!pi2 && (lpt_absent == NULL)) lpt_absent = wcsdup(bufferW); } id = 0; /* "COM1:" - "COM9:" */ while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "COM%lu:", id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); + swprintf(bufferW, ARRAY_SIZE(bufferW), L"COM%lu:", id); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; - if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); + if (!pi2 && (com_absent == NULL)) com_absent = wcsdup(bufferW); } test_AddPortUI(); test_ConfigurePortUI(); - /* cleanup */ - HeapFree(GetProcessHeap(), 0, lpt_absent); - HeapFree(GetProcessHeap(), 0, com_absent); - HeapFree(GetProcessHeap(), 0, pi_buffer); + free(lpt_absent); + free(com_absent); + free(pi_buffer); }

1 0

Nikolay Sivov : qmgr: Use CRT allocation functions.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 0448e1f78f6ed5e09509d29a02dafc8b0c870fb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0448e1f78f6ed5e09509d29a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 10:52:40 2022 +0300 qmgr: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/enum_files.c | 11 +++++------ dlls/qmgr/enum_jobs.c | 11 +++++------ dlls/qmgr/file.c | 23 +++++++++-------------- dlls/qmgr/job.c | 50 ++++++++++++++++++++++++-------------------------- dlls/qmgr/qmgr.h | 7 ------- 5 files changed, 43 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0448e1f78f6ed5e09509…

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Assert that bool values are not bit-shifted.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: vkd3d Branch: master Commit: 95df144c69cb94ff0982b519afd653fd0140843d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=95df144c69cb94ff0982b51… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 6 21:24:47 2022 +0200 vkd3d-shader/hlsl: Assert that bool values are not bit-shifted. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f5e48173..1eefe450 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1765,6 +1765,7 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, case HLSL_OP2_LSHIFT: assert(type_is_integer(dst_type)); + assert(dst_type->base_type != HLSL_TYPE_BOOL); write_sm4_binary_op(buffer, VKD3D_SM4_OP_ISHL, &expr->node, arg1, arg2); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 right shift instructions.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: vkd3d Branch: master Commit: 53d743305487a2453b3cfc2a4ff5cbd03b8c00fe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=53d743305487a2453b3cfc2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 6 21:24:48 2022 +0200 vkd3d-shader/hlsl: Write SM4 right shift instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 2c049cb5..f08bb926 100644 --- a/Makefile.am +++ b/Makefile.am @@ -318,7 +318,6 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ tests/arithmetic-float.shader_test \ tests/arithmetic-int.shader_test \ - tests/bitwise.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1eefe450..76f08339 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1866,6 +1866,13 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_RSHIFT: + assert(type_is_integer(dst_type)); + assert(dst_type->base_type != HLSL_TYPE_BOOL); + write_sm4_binary_op(buffer, dst_type->base_type == HLSL_TYPE_INT ? VKD3D_SM4_OP_ISHR : VKD3D_SM4_OP_USHR, + &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 %s expression.", debug_hlsl_expr_op(expr->op)); }

1 0

Zebediah Figura : tests: Mark some more tests as requiring shader model 4.0.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: vkd3d Branch: master Commit: 94fcd52031c707e48e52460688f7d7c1c072f1bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=94fcd52031c707e48e52460… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 6 16:05:37 2022 -0500 tests: Mark some more tests as requiring shader model 4.0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-struct-array.shader_test | 3 +++ tests/texture-load-typed.shader_test | 3 +++ tests/texture-load.shader_test | 3 +++ 3 files changed, 9 insertions(+) diff --git a/tests/hlsl-struct-array.shader_test b/tests/hlsl-struct-array.shader_test index a5df9cdb..aff0a677 100644 --- a/tests/hlsl-struct-array.shader_test +++ b/tests/hlsl-struct-array.shader_test @@ -1,5 +1,8 @@ % In SM4, array elements are always aligned to the next vec4, although structs are not. +[require] +shader model >= 4.0 + [pixel shader] uniform struct { diff --git a/tests/texture-load-typed.shader_test b/tests/texture-load-typed.shader_test index c0c3568a..c9227337 100644 --- a/tests/texture-load-typed.shader_test +++ b/tests/texture-load-typed.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [pixel shader fail] texture<float> t; diff --git a/tests/texture-load.shader_test b/tests/texture-load.shader_test index 86b36af4..951ee3ea 100644 --- a/tests/texture-load.shader_test +++ b/tests/texture-load.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [texture 0] size (2, 2) 0.1 0.2 0.3 0.4 0.5 0.7 0.6 0.8

1 0