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

Zebediah Figura : tests: Introduce a D3D9 shader runner.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: vkd3d Branch: master Commit: 93c6fd0eb0371455b21d2d030d5db558dc459e1f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=93c6fd0eb0371455b21d2d0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 7 18:58:17 2022 -0500 tests: Introduce a D3D9 shader runner. 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> --- Makefile.am | 1 + tests/shader_runner.c | 2 +- tests/shader_runner.h | 1 + tests/shader_runner_d3d9.c | 546 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 549 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=93c6fd0eb0371455b21…

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

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: 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

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

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: 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

Nikolay Sivov : d3drm: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: c699803ff09a705f6506f88e6f8ed221b4d04965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c699803ff09a705f6506f88e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 14:59:43 2022 +0300 d3drm: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/Makefile.in | 1 - dlls/d3drm/d3drm.c | 56 ++++++++-------- dlls/d3drm/device.c | 50 +++++++-------- dlls/d3drm/face.c | 36 +++++------ dlls/d3drm/frame.c | 82 ++++++++++++------------ dlls/d3drm/light.c | 8 +-- dlls/d3drm/material.c | 6 +- dlls/d3drm/meshbuilder.c | 162 +++++++++++++++++++++++------------------------ dlls/d3drm/texture.c | 52 +++++++-------- dlls/d3drm/viewport.c | 30 ++++----- 10 files changed, 241 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c699803ff09a705f6506…

1 0

Jacek Caban : win32u: Improve string duplication helpers.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: b7f108ed9c91c91adf0f3ce0d5806b1c3e7625e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f108ed9c91c91adf0f3ce0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:24:25 2022 +0200 win32u: Improve string duplication helpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 37 ++++++++++++++++++++++--------------- dlls/win32u/freetype.c | 22 ++-------------------- dlls/win32u/win32u_private.h | 28 +++++++++++++++++++++++----- 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 87ef75f04af..2bf68141d6d 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -277,15 +277,6 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) return pt[1].y - pt[0].y; } -static inline WCHAR *strdupW( const WCHAR *p ) -{ - WCHAR *ret; - DWORD len = (lstrlenW(p) + 1) * sizeof(WCHAR); - ret = malloc( len ); - memcpy(ret, p, len); - return ret; -} - static INT FONT_GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ); static BOOL FONT_DeleteObject( HGDIOBJ handle ); @@ -1201,8 +1192,8 @@ static struct gdi_font_face *create_face( struct gdi_font_family *family, const struct gdi_font_face *face = calloc( 1, sizeof(*face) ); face->refcount = 1; - face->style_name = strdupW( style ); - face->full_name = strdupW( fullname ); + face->style_name = wcsdup( style ); + face->full_name = wcsdup( fullname ); face->face_index = index; face->fs = fs; face->ntmFlags = ntmflags; @@ -1210,7 +1201,7 @@ static struct gdi_font_face *create_face( struct gdi_font_family *family, const face->flags = flags; face->data_ptr = data_ptr; face->data_size = data_size; - if (file) face->file = strdupW( file ); + if (file) face->file = wcsdup( file ); if (size) face->size = *size; else face->scalable = TRUE; if (insert_face_in_family_list( face, family )) return face; @@ -2075,9 +2066,9 @@ static struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const font->ntmFlags = face->ntmFlags; font->aa_flags = HIWORD( face->flags ); if (!family_name) family_name = face->family->family_name; - font->otm.otmpFamilyName = (char *)strdupW( family_name ); - font->otm.otmpStyleName = (char *)strdupW( face->style_name ); - font->otm.otmpFaceName = (char *)strdupW( face->full_name ); + font->otm.otmpFamilyName = (char *)wcsdup( family_name ); + font->otm.otmpStyleName = (char *)wcsdup( face->style_name ); + font->otm.otmpFaceName = (char *)wcsdup( face->full_name ); return font; } @@ -3311,6 +3302,22 @@ DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *sr if (!info && !(info = get_cptable( get_acp() ))) return 0; + if (!dst) + { + /* only compute length */ + if (info->DBCSOffsets) + { + for (ret = 0; srclen--; src++, ret++) + { + if (!info->DBCSOffsets[(unsigned char)*src]) continue; + if (!srclen--) break; + src++; + } + } + else ret = srclen; + return ret * sizeof(WCHAR); + } + dstlen /= sizeof(WCHAR); if (info->DBCSOffsets) { diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index b6063a14570..0703d32740e 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -584,24 +584,6 @@ static BOOL is_subpixel_rendering_enabled( void ) } -static LPWSTR strdupW(LPCWSTR p) -{ - LPWSTR ret; - DWORD len = (lstrlenW(p) + 1) * sizeof(WCHAR); - ret = malloc( len ); - memcpy(ret, p, len); - return ret; -} - -static WCHAR *towstr(const char *str) -{ - DWORD len = strlen(str) + 1; - WCHAR *wstr = malloc( len * sizeof(WCHAR) ); - win32u_mbtowc( NULL, wstr, len * sizeof(WCHAR), str, len ); - return wstr; -} - - static const LANGID mac_langid_table[] = { MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ENGLISH */ @@ -1168,7 +1150,7 @@ static WCHAR *decode_opentype_name( struct opentype_name *name ) if (len == ARRAY_SIZE(buffer)) WARN("Truncated font name %s -> %s\n", debugstr_an(name->bytes, name->length), debugstr_w(buffer)); else buffer[len] = 0; - return strdupW( buffer ); + return wcsdup( buffer ); } struct unix_face @@ -3687,7 +3669,7 @@ static BOOL freetype_set_outline_text_metrics( struct gdi_font *font ) { static const WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w((WCHAR *)font->otm.otmpFamilyName)); - font->otm.otmpFullName = (char *)strdupW(fake_nameW); + font->otm.otmpFullName = (char *)wcsdup( fake_nameW ); } needed = sizeof(font->otm) + (lstrlenW( (WCHAR *)font->otm.otmpFamilyName ) + 1 + lstrlenW( (WCHAR *)font->otm.otmpStyleName ) + 1 + diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 874cc92f4d4..3af6a9409d6 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -571,7 +571,30 @@ static inline ULONG win32u_wcstoul( const WCHAR *s, WCHAR **end, int base ) return negative ? -ret : ret; } +DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, + DWORD srclen ) DECLSPEC_HIDDEN; +DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, + DWORD srclen ) DECLSPEC_HIDDEN; + +static inline WCHAR *win32u_wcsdup( const WCHAR *str ) +{ + DWORD size = (lstrlenW( str ) + 1) * sizeof(WCHAR); + WCHAR *ret = malloc( size ); + if (ret) memcpy( ret, str, size ); + return ret; +} + +static inline WCHAR *towstr( const char *str ) +{ + DWORD len = strlen( str ) + 1; + DWORD size = win32u_mbtowc( NULL, NULL, 0, str, len ); + WCHAR *ret = malloc( size ); + if (ret) win32u_mbtowc( NULL, ret, size, str, len ); + return ret; +} + #define towupper(c) win32u_towupper(c) +#define wcsdup(s) win32u_wcsdup(s) #define wcstol(s,e,b) win32u_wcstol(s,e,b) #define wcstoul(s,e,b) win32u_wcstoul(s,e,b) @@ -587,11 +610,6 @@ static inline UINT asciiz_to_unicode( WCHAR *dst, const char *src ) return (p - dst) * sizeof(WCHAR); } -DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, - DWORD srclen ) DECLSPEC_HIDDEN; -DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, - DWORD srclen ) DECLSPEC_HIDDEN; - static inline BOOL is_win9x(void) { return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s;

1 0

Jacek Caban : win32u: Move default window text setting to from user32.
by Alexandre Julliard 07 Apr '22

07 Apr '22

Module: wine Branch: master Commit: 27cfcaa277764127a28368f8315f7c26cb326f7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=27cfcaa277764127a28368f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:24:55 2022 +0200 win32u: Move default window text setting to from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 112 +++---------------------------------------- dlls/user32/driver.c | 7 +-- dlls/user32/user_main.c | 1 - dlls/win32u/Makefile.in | 1 + dlls/win32u/defwnd.c | 110 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 2 + dlls/win32u/tests/win32u.c | 34 +++++++++++++ dlls/win32u/win32u_private.h | 4 ++ dlls/win32u/window.c | 2 + include/ntuser.h | 1 + 10 files changed, 162 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27cfcaa277764127a283…

1 0