wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Zebediah Figura : tests: Try to avoid using SV_Position from shaders which can be tested with SM1.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: vkd3d Branch: master Commit: 90b4cbc1f2ab2f39b85861b298f8cbd53d957249 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90b4cbc1f2ab2f39b85861b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 7 18:58:16 2022 -0500 tests: Try to avoid using SV_Position from shaders which can be tested with SM1. 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/conditional.shader_test | 14 +++++++++---- tests/hlsl-for.shader_test | 18 +++++++++++------ tests/hlsl-struct-semantics.shader_test | 35 +++++++++++++++++++++++++++------ tests/trigonometry.shader_test | 13 +++++++++--- 4 files changed, 61 insertions(+), 19 deletions(-) diff --git a/tests/conditional.shader_test b/tests/conditional.shader_test index 1a1b8fee..e665ac1d 100644 --- a/tests/conditional.shader_test +++ b/tests/conditional.shader_test @@ -1,7 +1,13 @@ +[vertex shader] +void main(out float tex : texcoord, inout float4 pos : sv_position) +{ + tex = pos.x; +} + [pixel shader] -float4 main(float4 pos : SV_POSITION) : SV_TARGET +float4 main(float tex : texcoord) : SV_TARGET { - if(pos.x > 200.0) + if (tex > 0.0) return float4(0.1, 0.2, 0.3, 0.4); else return float4(0.9, 0.8, 0.7, 0.6); @@ -9,5 +15,5 @@ float4 main(float4 pos : SV_POSITION) : SV_TARGET [test] draw quad -probe rect rgba (0, 0, 200, 480) (0.9, 0.8, 0.7, 0.6) -probe rect rgba (200, 0, 640, 480) (0.1, 0.2, 0.3, 0.4) +probe rect rgba ( 0, 0, 319, 480) (0.9, 0.8, 0.7, 0.6) +probe rect rgba (321, 0, 640, 480) (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-for.shader_test b/tests/hlsl-for.shader_test index b133ce99..4e91ce41 100644 --- a/tests/hlsl-for.shader_test +++ b/tests/hlsl-for.shader_test @@ -1,14 +1,20 @@ +[vertex shader] +void main(out float tex : texcoord, inout float4 pos : sv_position) +{ + tex = pos.x; +} + [pixel shader] -float4 main(float4 pos : SV_POSITION) : SV_TARGET +float4 main(float tex : texcoord) : sv_target { int i; float x = 0.0; for (i = 0; i < 10; i++) { x += i; - if (pos.x == 1.5 && i == 5) + if (tex > 0.5 && i == 5) break; - if (pos.x == 2.5 && i >= 7) + if (tex > -0.5 && i >= 7) continue; x -= 1; } @@ -17,6 +23,6 @@ float4 main(float4 pos : SV_POSITION) : SV_TARGET [test] draw quad -probe rgba (0, 0) (10.0, 35.0, 0.0, 0.0) -probe rgba (1, 0) (5.0, 10.0, 0.0, 0.0) -probe rgba (2, 0) (10.0, 38.0, 0.0, 0.0) +probe rect rgba ( 0, 0, 159, 480) (10.0, 35.0, 0.0, 0.0) +probe rect rgba (161, 0, 479, 480) (10.0, 38.0, 0.0, 0.0) +probe rect rgba (481, 0, 640, 480) ( 5.0, 10.0, 0.0, 0.0) diff --git a/tests/hlsl-struct-semantics.shader_test b/tests/hlsl-struct-semantics.shader_test index b623a998..43b07bb8 100644 --- a/tests/hlsl-struct-semantics.shader_test +++ b/tests/hlsl-struct-semantics.shader_test @@ -1,9 +1,34 @@ +[input layout] +0 r32g32b32a32 float texcoord +0 r32g32 float sv_position + +[vertex buffer 0] +0.0 1.0 0.0 1.0 -2.0 -2.0 +0.0 1.0 0.0 1.0 -2.0 2.0 +0.0 1.0 0.0 1.0 2.0 -2.0 +0.0 1.0 0.0 1.0 2.0 2.0 + +[vertex shader] + +struct vertex +{ + struct + { + float4 texcoord : texcoord; + float4 pos : sv_position; + } m; +}; + +void main(inout struct vertex v) +{ +} + [pixel shader] struct input { struct { - float4 pos : sv_position; + float4 texcoord : texcoord; } m; }; @@ -18,12 +43,10 @@ struct output struct output main(struct input i) { struct output o; - o.m.color = i.m.pos; + o.m.color = i.m.texcoord; return o; } [test] -draw quad -probe rgba (0, 1) (0.5, 1.5, 0.0, 1.0) -probe rgba (1, 0) (1.5, 0.5, 0.0, 1.0) -probe rgba (3, 5) (3.5, 5.5, 0.0, 1.0) +draw triangle strip 4 +probe all rgba (0.0, 1.0, 0.0, 1.0) diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test index 07a280a0..cf53d7a1 100644 --- a/tests/trigonometry.shader_test +++ b/tests/trigonometry.shader_test @@ -1,7 +1,14 @@ +[vertex shader] +void main(out float tex : texcoord, inout float4 pos : sv_position) +{ + tex = (pos.x + 1) * 320; +} + [pixel shader] -float4 main(float4 pos : SV_POSITION) : SV_TARGET +float4 main(float tex : texcoord) : sv_target { - return float4(sin(pos.x - 0.5), cos(pos.x - 0.5), 0, 0); + tex = floor(tex + 0.25); + return float4(sin(tex), cos(tex), 0, 0); } [test] @@ -17,7 +24,7 @@ probe rgba ( 7, 0) ( 0.65698660, 0.75390225, 0.0, 0.0) 1024 probe rgba ( 8, 0) ( 0.98935825, -0.14550003, 0.0, 0.0) 1024 probe rgba ( 9, 0) ( 0.41211849, -0.91113026, 0.0, 0.0) 1024 probe rgba (10, 0) (-0.54402111, -0.83907153, 0.0, 0.0) 1024 -probe rgba (11, 0) (-0.99999021, 0.00442570, 0.0, 0.0) 1024 +probe rgba (11, 0) (-0.99999021, 0.00442570, 0.0, 0.0) 2048 probe rgba (12, 0) (-0.53657292, 0.84385396, 0.0, 0.0) 1024 probe rgba (13, 0) ( 0.42016704, 0.90744678, 0.0, 0.0) 1024 probe rgba (14, 0) ( 0.99060736, 0.13673722, 0.0, 0.0) 1024

1 0

Zebediah Figura : tests: Specify the arguments to "probe rect" as right and bottom, instead of width and height.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: vkd3d Branch: master Commit: d2872fa33a9c2c24cb195e606a9c2839013fa14d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d2872fa33a9c2c24cb195e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 7 18:58:15 2022 -0500 tests: Specify the arguments to "probe rect" as right and bottom, instead of width and height. 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/conditional.shader_test | 2 +- tests/shader_runner.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/conditional.shader_test b/tests/conditional.shader_test index 70718f11..1a1b8fee 100644 --- a/tests/conditional.shader_test +++ b/tests/conditional.shader_test @@ -10,4 +10,4 @@ float4 main(float4 pos : SV_POSITION) : SV_TARGET [test] draw quad probe rect rgba (0, 0, 200, 480) (0.9, 0.8, 0.7, 0.6) -probe rect rgba (200, 0, 440, 480) (0.1, 0.2, 0.3, 0.4) +probe rect rgba (200, 0, 640, 480) (0.1, 0.2, 0.3, 0.4) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 05c0fbe1..6f4c7003 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -419,22 +419,22 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) } else if (match_string(line, "probe rect rgba", &line)) { - unsigned int x, y, w, h, ulps; + unsigned int left, top, right, bottom, ulps; struct vec4 v; RECT rect; int ret; - ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f ) %u", - &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w, &ulps); + ret = sscanf(line, "( %d , %d , %d , %d ) ( %f , %f , %f , %f ) %u", + &left, &top, &right, &bottom, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 8) fatal_error("Malformed probe arguments '%s'.\n", line); if (ret < 9) ulps = 0; - rect.left = x; - rect.right = x + w; - rect.top = y; - rect.bottom = y + h; + rect.left = left; + rect.top = top; + rect.right = right; + rect.bottom = bottom; runner->ops->probe_vec4(runner, &rect, &v, ulps); } else if (match_string(line, "probe rgba", &line))

1 0

Zebediah Figura : tests: Allow skipping shader tests if requirements are not met.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: vkd3d Branch: master Commit: 83a3de85294a24c85e3c4dc8c94a2e203af4b780 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=83a3de85294a24c85e3c4dc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 7 18:58:14 2022 -0500 tests: Allow skipping shader tests if requirements are not met. 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/shader_runner.c | 7 ++++++- tests/shader_runner.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index ffa4cf61..05c0fbe1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -595,11 +595,15 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const { case STATE_INPUT_LAYOUT: case STATE_NONE: - case STATE_REQUIRE: case STATE_SAMPLER: case STATE_TEST: break; + case STATE_REQUIRE: + if (runner->ops->check_requirements && !runner->ops->check_requirements(runner)) + goto out; + break; + case STATE_TEXTURE: case STATE_VERTEX_BUFFER: set_resource(runner, runner->ops->create_resource(runner, &current_resource)); @@ -832,6 +836,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const } } +out: for (i = 0; i < runner->input_element_count; ++i) free(runner->input_elements[i].name); free(runner->input_elements); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index a98917c5..a304ba91 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -110,6 +110,9 @@ struct shader_runner struct shader_runner_ops { + /* Returns false if unable to run the given tests. If NULL, all tests are + * run. */ + bool (*check_requirements)(struct shader_runner *runner); struct resource *(*create_resource)(struct shader_runner *runner, const struct resource_params *params); void (*destroy_resource)(struct shader_runner *runner, struct resource *resource); void (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count);

1 0

Zebediah Figura : tests: Use a vertex buffer to draw quads for shader tests.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: vkd3d Branch: master Commit: c7a7cf498dd844bca5eb1bfc7a9cf8053d42dbde URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7a7cf498dd844bca5eb1bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 7 18:58:13 2022 -0500 tests: Use a vertex buffer to draw quads for shader tests. For compatibility with shader models before 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/shader_runner.c | 69 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index d3d13116..ffa4cf61 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -314,6 +314,24 @@ static void parse_input_layout_directive(struct shader_runner *runner, const cha element->index = 0; } +static void set_resource(struct shader_runner *runner, struct resource *resource) +{ + size_t i; + + for (i = 0; i < runner->resource_count; ++i) + { + if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) + { + runner->ops->destroy_resource(runner, runner->resources[i]); + runner->resources[i] = resource; + return; + } + } + + runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); + runner->resources[runner->resource_count++] = resource; +} + static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) { runner->uniform_count = align(max(runner->uniform_count, offset + count), 4); @@ -326,13 +344,40 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "draw quad", &line)) { + struct resource_params params; + struct input_element *element; + + /* For simplicity, draw a large triangle instead. */ + static const struct vec2 quad[] = + { + {-2.0f, -2.0f}, + {-2.0f, 4.0f}, + { 4.0f, -2.0f}, + }; + static const char vs_source[] = - "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" + "void main(inout float4 position : sv_position)\n" "{\n" - " float2 coords = float2((id << 1) & 2, id & 2);\n" - " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" "}"; + vkd3d_array_reserve((void **)&runner->input_elements, &runner->input_element_capacity, + 1, sizeof(*runner->input_elements)); + element = &runner->input_elements[0]; + element->name = strdup("sv_position"); + element->slot = 0; + element->format = DXGI_FORMAT_R32G32_FLOAT; + element->texel_size = sizeof(*quad); + element->index = 0; + runner->input_element_count = 1; + + memset(&params, 0, sizeof(params)); + params.slot = 0; + params.type = RESOURCE_TYPE_VERTEX_BUFFER; + params.data = malloc(sizeof(quad)); + memcpy(params.data, quad, sizeof(quad)); + params.data_size = sizeof(quad); + set_resource(runner, runner->ops->create_resource(runner, &params)); + if (!runner->vs_source) runner->vs_source = strdup(vs_source); @@ -482,24 +527,6 @@ static struct sampler *get_sampler(struct shader_runner *runner, unsigned int sl return NULL; } -static void set_resource(struct shader_runner *runner, struct resource *resource) -{ - size_t i; - - for (i = 0; i < runner->resource_count; ++i) - { - if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) - { - runner->ops->destroy_resource(runner, runner->resources[i]); - runner->resources[i] = resource; - return; - } - } - - runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); - runner->resources[runner->resource_count++] = resource; -} - unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot) { unsigned int stride = 0;

1 0

Rémi Bernon : kernel32/tests: Cleanup heap pointer alignment tests.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 5b4009e8c27c16bdb9a5638c316a72aaee219158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b4009e8c27c16bdb9a5638c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 7 21:50:19 2022 +0200 kernel32/tests: Cleanup heap pointer alignment tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 74 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 68203f199aa..6f85ecc6425 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -75,46 +75,13 @@ struct heap UINT force_flags; }; -static SIZE_T resize_9x(SIZE_T size) -{ - DWORD dwSizeAligned = (size + 3) & ~3; - return max(dwSizeAligned, 12); /* at least 12 bytes */ -} - -static void test_heap(void) -{ - LPVOID mem; - SIZE_T size; - - /* Heap*() functions */ - mem = HeapAlloc(GetProcessHeap(), 0, 0); - ok(mem != NULL, "memory not allocated for size 0\n"); - HeapFree(GetProcessHeap(), 0, mem); - - for (size = 0; size <= 256; size++) - { - SIZE_T heap_size; - mem = HeapAlloc(GetProcessHeap(), 0, size); - heap_size = HeapSize(GetProcessHeap(), 0, mem); - ok(heap_size == size || heap_size == resize_9x(size), - "HeapSize returned %Iu instead of %Iu or %Iu\n", heap_size, size, resize_9x(size)); - HeapFree(GetProcessHeap(), 0, mem); - } - - /* large blocks must be 16-byte aligned */ - mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024); - ok( mem != NULL, "failed for size 512K\n" ); - ok( (ULONG_PTR)mem % 16 == 0 || broken((ULONG_PTR)mem % 16) /* win9x */, - "512K block not 16-byte aligned\n" ); - HeapFree(GetProcessHeap(), 0, mem); -} - static void test_HeapCreate(void) { - SIZE_T alloc_size = 0x8000 * sizeof(void *), size; + SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; + BYTE *ptr, *ptr1, *ptrs[128]; HANDLE heap, heap1; - BYTE *ptr, *ptr1; + UINT_PTR align; BOOL ret; /* check heap alignment */ @@ -186,6 +153,40 @@ static void test_HeapCreate(void) ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + /* test pointer alignment */ + + align = 0; + for (i = 0; i < ARRAY_SIZE(ptrs); ++i) + { + ptrs[i] = HeapAlloc( heap, 0, alloc_size ); + ok( !!ptrs[i], "HeapAlloc failed, error %lu\n", GetLastError() ); + align |= (UINT_PTR)ptrs[i]; + } + ok( !(align & (2 * sizeof(void *) - 1)), "got wrong alignment\n" ); + ok( align & (2 * sizeof(void *)), "got wrong alignment\n" ); + for (i = 0; i < ARRAY_SIZE(ptrs); ++i) + { + ret = HeapFree( heap, 0, ptrs[i] ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + } + + align = 0; + for (i = 0; i < ARRAY_SIZE(ptrs); ++i) + { + ptrs[i] = HeapAlloc( heap, 0, 4 * alloc_size ); + ok( !!ptrs[i], "HeapAlloc failed, error %lu\n", GetLastError() ); + align |= (UINT_PTR)ptrs[i]; + } + todo_wine_if( sizeof(void *) == 8 ) + ok( !(align & (8 * sizeof(void *) - 1)), "got wrong alignment\n" ); + todo_wine_if( sizeof(void *) == 8 ) + ok( align & (8 * sizeof(void *)), "got wrong alignment\n" ); + for (i = 0; i < ARRAY_SIZE(ptrs); ++i) + { + ret = HeapFree( heap, 0, ptrs[i] ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + } + /* test HEAP_ZERO_MEMORY */ ptr = HeapAlloc( heap, HEAP_ZERO_MEMORY, 1 ); @@ -1680,7 +1681,6 @@ START_TEST(heap) return; } - test_heap(); test_HeapCreate(); test_GlobalAlloc(); test_LocalAlloc();

1 0

Rémi Bernon : kernel32/tests: Cleanup heap allocation functions tests.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 8eb9cbd6e74eea6460e57018e2a05b582a3ce3aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eb9cbd6e74eea6460e57018… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 7 21:50:18 2022 +0200 kernel32/tests: Cleanup heap allocation functions tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 378 +++++++++++++++++++++++++++------------------ 1 file changed, 225 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8eb9cbd6e74eea6460e5…

1 0

Rémi Bernon : kernel32/tests: Load all test function pointers on init.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 60e0ae2f4c69713152155751c00f321bd09fde39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60e0ae2f4c69713152155751… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 7 21:50:17 2022 +0200 kernel32/tests: Load all test function pointers on init. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 7469de223b8..c9d25c55e2d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -40,9 +40,28 @@ /* use function pointers to avoid warnings for invalid parameter tests */ static LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); static LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); -static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); -static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)(ULONGLONG *); -static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); +static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)( ULONGLONG * ); + +#define MAKE_FUNC(f) static typeof(f) *p ## f +MAKE_FUNC( HeapQueryInformation ); +MAKE_FUNC( GlobalFlags ); +MAKE_FUNC( RtlGetNtGlobalFlags ); +#undef MAKE_FUNC + +static void load_functions(void) +{ + HMODULE kernel32 = GetModuleHandleW( L"kernel32.dll" ); + HMODULE ntdll = GetModuleHandleW( L"ntdll.dll" ); + +#define LOAD_FUNC(m, f) p ## f = (void *)GetProcAddress( m, #f ); + LOAD_FUNC( kernel32, HeapAlloc ); + LOAD_FUNC( kernel32, HeapReAlloc ); + LOAD_FUNC( kernel32, HeapQueryInformation ); + LOAD_FUNC( kernel32, GetPhysicallyInstalledSystemMemory ); + LOAD_FUNC( kernel32, GlobalFlags ); + LOAD_FUNC( ntdll, RtlGetNtGlobalFlags ); +#undef LOAD_FUNC +} struct heap { @@ -1079,7 +1098,6 @@ static void test_HeapQueryInformation(void) SIZE_T size; BOOL ret; - pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "HeapQueryInformation"); if (!pHeapQueryInformation) { win_skip("HeapQueryInformation is not available\n"); @@ -1462,12 +1480,10 @@ static void test_child_heap( const char *arg ) static void test_GetPhysicallyInstalledSystemMemory(void) { - HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); MEMORYSTATUSEX memstatus; ULONGLONG total_memory; BOOL ret; - pGetPhysicallyInstalledSystemMemory = (void *)GetProcAddress(kernel32, "GetPhysicallyInstalledSystemMemory"); if (!pGetPhysicallyInstalledSystemMemory) { win_skip("GetPhysicallyInstalledSystemMemory is not available\n"); @@ -1575,10 +1591,7 @@ START_TEST(heap) int argc; char **argv; - pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); - pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); - - pRtlGetNtGlobalFlags = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "RtlGetNtGlobalFlags" ); + load_functions(); argc = winetest_get_mainargs( &argv ); if (argc >= 3)

1 0

Dmitry Timoshkov : ucrtbase/tests: Add a test for wcsnicmp() with limit -1.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 5972691e0868615b5decad851ccd16449579e719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5972691e0868615b5decad85… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 6 11:12:11 2022 +0300 ucrtbase/tests: Add a test for wcsnicmp() with limit -1. To show that it's valid unlike _strnicmp(). Based on _strnicmp() test. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 9446a1e4d5c..806ae08f253 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -491,6 +491,20 @@ static void test__strnicmp(void) ok(!ret, "got %d.\n", ret); } +static void test_wcsnicmp(void) +{ + static const wchar_t str1[] = L"TEST"; + static const wchar_t str2[] = L"test"; + int ret; + + errno = 0xdeadbeef; + ret = wcsnicmp(str1, str2, -1); + ok(!ret, "got %d.\n", ret); + + ret = wcsnicmp(str1, str2, 0x7fffffff); + ok(!ret, "got %d.\n", ret); +} + static void test_SpecialCasing(void) { int i; @@ -602,6 +616,7 @@ START_TEST(string) test_mbsspn(); test_wcstok(); test__strnicmp(); + test_wcsnicmp(); test_SpecialCasing(); test__mbbtype_l(); }

1 0

Rafał Harabień : comctl32/tests: Remove now unused TODO_COUNT in static control tests.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: cfe5184b26791cbf8f00342ed6ba934cfcd8e71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfe5184b26791cbf8f00342e… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Sun Apr 3 01:37:37 2022 +0200 comctl32/tests: Remove now unused TODO_COUNT in static control tests. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index bdae6744aa4..dbd71539a57 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -32,8 +32,6 @@ #include "v6util.h" -#define TODO_COUNT 1 - #define CTRL_ID 1995 static HWND hMainWnd; @@ -79,7 +77,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_updates(int style, int flags) +static void test_updates(int style) { HWND hStatic = create_static(style); RECT r1 = {5, 5, 30, 30}, rcClient; @@ -130,13 +128,7 @@ static void test_updates(int style, int flags) else exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ - if (flags & TODO_COUNT) - todo_wine - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); - else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic); - else - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + ok(g_nReceivedColorStatic == exp, "expected %u, got %u\n", exp, g_nReceivedColorStatic); DestroyWindow(hStatic); } @@ -422,21 +414,21 @@ START_TEST(static) GetModuleHandleA(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - test_updates(0, 0); - test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, 0); - test_updates(SS_WHITERECT, 0); - test_updates(SS_BLACKFRAME, 0); - test_updates(SS_WHITEFRAME, 0); - test_updates(SS_USERITEM, 0); - test_updates(SS_SIMPLE, 0); - test_updates(SS_OWNERDRAW, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, 0); - test_updates(SS_ETCHEDVERT, 0); - test_updates(SS_ETCHEDFRAME, 0); - test_updates(SS_SUNKEN, 0); + test_updates(0); + test_updates(SS_ICON); + test_updates(SS_BLACKRECT); + test_updates(SS_WHITERECT); + test_updates(SS_BLACKFRAME); + test_updates(SS_WHITEFRAME); + test_updates(SS_USERITEM); + test_updates(SS_SIMPLE); + test_updates(SS_OWNERDRAW); + test_updates(SS_BITMAP); + test_updates(SS_BITMAP | SS_CENTERIMAGE); + test_updates(SS_ETCHEDHORZ); + test_updates(SS_ETCHEDVERT); + test_updates(SS_ETCHEDFRAME); + test_updates(SS_SUNKEN); test_set_text(); test_set_image(); test_STM_SETIMAGE();

1 0

Rafał Harabień : comctl32/tests: Fix invalidation in static control tests.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: c1c6b4bcf269c5e5e371513ca219830691851829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c6b4bcf269c5e5e371513c… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Sun Apr 3 01:37:36 2022 +0200 comctl32/tests: Fix invalidation in static control tests. Rectangle used for invalidation was outside of windows rect of static controls with SS_ETCHEDHORZ/SS_ETCHEDVERT style because they resize after creation. Improve test by changing the invalidated rect and add more details in comment about SS_ETCHEDHORZ/SS_ETCHEDVERT styles. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index c8975419b7c..bdae6744aa4 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,7 +82,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}, rcClient; + RECT r1 = {5, 5, 30, 30}, rcClient; int exp; LONG exstyle; @@ -128,7 +128,7 @@ static void test_updates(int style, int flags) if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; else - exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ if (flags & TODO_COUNT) todo_wine

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022