November 2020 - Wine-commits

Derek Lesho : mf/topoloader: Add partial topology resolution tests.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: de8930ff52509ac5b5ba1a6b5039efa140540999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8930ff52509ac5b5ba1a6b… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:12 2020 +0300 mf/topoloader: Add partial topology resolution tests. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 2 - dlls/mf/tests/mf.c | 705 +++++++++++++++++++++++++++++++++++++++------- dlls/mf/tests/resource.rc | 22 -- dlls/mf/tests/test.wav | Bin 4488 -> 0 bytes 4 files changed, 597 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de8930ff52509ac5b5ba…

1 0

Derek Lesho : mf/topoloader: Move node connection responsibility to connection function.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: eb28343c477705b7ca64b5865fc950e3f6500095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb28343c477705b7ca64b586… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:13 2020 +0300 mf/topoloader: Move node connection responsibility to connection function. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 8032e438b73..a09f6ef0ef4 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2022,8 +2022,6 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context if (FAILED(IMFTopology_GetNodeByID(context->output_topology, id, &node))) topology_loader_clone_node(context, downstream_node, &node, context->marker + 1); - IMFTopologyNode_ConnectOutput(upstream_node, output_index, node, input_index); - IMFTopologyNode_GetNodeType(upstream_node, &u_type); IMFTopologyNode_GetNodeType(downstream_node, &d_type); @@ -2033,7 +2031,7 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context return E_FAIL; } - return connectors[u_type][d_type](context, upstream_node, output_index, downstream_node, input_index); + return connectors[u_type][d_type](context, upstream_node, output_index, node, input_index); } static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size)

1 0

Derek Lesho : mf/topoloader: Implement source node to sink node branch resolver.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: d61e9f7535efcedab4e7b2d9e741d44566a7cb42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61e9f7535efcedab4e7b2d9… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 10:59:40 2020 -0500 mf/topoloader: Implement source node to sink node branch resolver. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d61e9f7535efcedab4e7…

1 0

Derek Lesho : mf/topoloader: Unstub IMFTopologyLoader::Load.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 7c9e6a1c96712de4a152c4fb086d00a151e4e59e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9e6a1c96712de4a152c4fb… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:15 2020 +0300 mf/topoloader: Unstub IMFTopologyLoader::Load. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++---- dlls/mf/topology.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5e5c30ec6fc..20e3e8713c6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1735,7 +1735,6 @@ static void test_topology_loader(void) MF_CONNECT_DIRECT, MF_E_INVALIDMEDIATYPE, - LOADER_TODO, }, { @@ -1766,7 +1765,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_CONVERTER, S_OK, - LOADER_EXPECTED_CONVERTER, + LOADER_EXPECTED_CONVERTER | LOADER_TODO, }, { @@ -1794,7 +1793,6 @@ static void test_topology_loader(void) MF_CONNECT_DIRECT, MF_E_INVALIDMEDIATYPE, - LOADER_TODO, }, { @@ -1850,7 +1848,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_DECODER, S_OK, - LOADER_EXPECTED_DECODER, + LOADER_EXPECTED_DECODER | LOADER_TODO, }, }; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e3a4dfd5141..7001a33f088 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2429,11 +2429,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in break; } - /* For now return original topology. */ - *ret_topology = output_topology; - return IMFTopology_CloneFrom(output_topology, input_topology); + return hr; } static const IMFTopoLoaderVtbl topologyloadervtbl =

1 0

Andrey Gusev : bcrypt: BCryptCreateHash is no longer a stub.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 111540ebc7d21b12c8feafcbd5d894f1e0daa3bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=111540ebc7d21b12c8feafcb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 30 15:08:38 2020 +0200 bcrypt: BCryptCreateHash is no longer a stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 380d9105e48..1b7881d4910 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -799,7 +799,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL struct hash *hash; NTSTATUS status; - TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, object_len, + TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) {

1 0

Matteo Bruni : wined3d: Introduce wined3d_context_gl_destroy_bo().
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 0638d50b22f6192be734694634050523ea01d5d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0638d50b22f6192be7346946… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 30 18:29:21 2020 +0330 wined3d: Introduce wined3d_context_gl_destroy_bo(). 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> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/buffer.c | 5 +---- dlls/wined3d/context_gl.c | 12 ++++++++++++ dlls/wined3d/texture.c | 14 +++++--------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 140948beb6d..cb382cd6734 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4778,7 +4778,7 @@ static void wined3d_view_gl_destroy_object(void *object) gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); } if (counter_id) - GL_EXTCALL(glDeleteBuffers(1, &counter_id)); + wined3d_context_gl_destroy_bo(wined3d_context_gl(context), ctx->counter_bo); checkGLcall("delete resources"); context_release(context); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f2817eeee04..2b24e071c05 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -142,7 +142,6 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; struct wined3d_buffer *buffer = &buffer_gl->b; struct wined3d_cs *cs = resource->device->cs; @@ -185,10 +184,8 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu } } - GL_EXTCALL(glDeleteBuffers(1, &buffer_gl->bo.id)); - checkGLcall("glDeleteBuffers"); + wined3d_context_gl_destroy_bo(context_gl, &buffer_gl->bo); buffer_gl->b.buffer_object = 0; - buffer_gl->bo.id = 0; if (buffer_gl->b.fence) { diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f2b5e8697b6..3a5718e6308 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2681,6 +2681,18 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } } +void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + TRACE("context_gl %p, bo %p.\n", context_gl, bo); + + TRACE("Destroying GL buffer %u.\n", bo->id); + GL_EXTCALL(glDeleteBuffers(1, &bo->id)); + checkGLcall("buffer object destruction"); + bo->id = 0; +} + static void wined3d_context_gl_set_render_offscreen(struct wined3d_context_gl *context_gl, BOOL offscreen) { if (context_gl->c.render_offscreen == offscreen) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 41e4415f13f..0aef891547a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -751,18 +751,14 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su /* Context activation is done by the caller. */ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, - unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) + unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl) { struct wined3d_bo_gl *bo = &texture->sub_resources[sub_resource_idx].bo; - GL_EXTCALL(glDeleteBuffers(1, &bo->id)); - checkGLcall("glDeleteBuffers"); - - TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", - bo->id, texture, sub_resource_idx); + TRACE("texture %p, sub_resource_idx %u, context_gl %p.\n", texture, sub_resource_idx, context_gl); + wined3d_context_gl_destroy_bo(context_gl, bo); wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); - bo->id = 0; } static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) @@ -781,7 +777,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) && !wined3d_texture_load_location(texture, i, context, map_binding)) ERR("Failed to load location %s.\n", wined3d_debug_location(map_binding)); if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER) - wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)->gl_info); + wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)); } context_release(context); @@ -3223,7 +3219,7 @@ static void wined3d_texture_gl_unload_location(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { if (texture_gl->t.sub_resources[i].bo.id) - wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl->gl_info); + wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl); } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15380f5ac81..fa718501e45 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2256,6 +2256,7 @@ void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *contex void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : server: Release the l_intl fd once the mapping is created.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 9494fa6986e40fdd563436df3e705feb44f747ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9494fa6986e40fdd563436df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 28 14:59:19 2020 +0100 server: Release the l_intl fd once the mapping is created. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50204 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/directory.c b/server/directory.c index 81d02d6f64e..ca9f978ff7f 100644 --- a/server/directory.c +++ b/server/directory.c @@ -444,6 +444,7 @@ void init_directories( struct fd *intl_fd ) /* mappings */ release_object( create_fd_mapping( &dir_nls->obj, &intl_str, intl_fd, OBJ_PERMANENT, NULL )); release_object( create_user_data_mapping( &dir_kernel->obj, &user_data_str, OBJ_PERMANENT, NULL )); + release_object( intl_fd ); release_object( named_pipe_device ); release_object( mailslot_device );

1 0

Alexandre Julliard : libport: Add both inline and non-inline versions for every Unicode function.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 0e03ad249c2ae7d53671bc75b0c57e2fb1665113 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e03ad249c2ae7d53671bc75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 28 21:49:20 2020 +0100 libport: Add both inline and non-inline versions for every Unicode function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 138 ++++++++++++++++++++++++++++++++++-- libs/port/string.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++- libs/wine/port.c | 1 - 3 files changed, 316 insertions(+), 8 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 8d30e9f4477..f42a94c7e0d 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -79,12 +79,6 @@ union cptable struct dbcs_table dbcs; }; -extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); -extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); -extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); -extern WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ); -extern long int strtolW( const WCHAR *nptr, WCHAR **endptr, int base ); -extern unsigned long int strtoulW( const WCHAR *nptr, WCHAR **endptr, int base ); extern int sprintfW( WCHAR *str, const WCHAR *format, ... ); extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); @@ -265,6 +259,138 @@ WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) return ret; } +WINE_UNICODE_INLINE int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) +{ + for (;;) + { + int ret = tolowerW(*str1) - tolowerW(*str2); + if (ret || !*str1) return ret; + str1++; + str2++; + } +} + +WINE_UNICODE_INLINE int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + int ret = 0; + for ( ; n > 0; n--, str1++, str2++) + if ((ret = tolowerW(*str1) - tolowerW(*str2)) || !*str1) break; + return ret; +} + +WINE_UNICODE_INLINE int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + int ret = 0; + for ( ; n > 0; n--, str1++, str2++) + if ((ret = tolowerW(*str1) - tolowerW(*str2))) break; + return ret; +} + +WINE_UNICODE_INLINE WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; +} + +WINE_UNICODE_INLINE LONG strtolW( LPCWSTR s, LPWSTR *end, INT base ) +{ + BOOL negative = FALSE, empty = TRUE; + LONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (isspaceW(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = s[0] != '0' ? 10 : 8; + + while (*s) + { + int v; + + if ('0' <= *s && *s <= '9') v = *s - '0'; + else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; + else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; + else break; + if (v >= base) break; + if (negative) v = -v; + s++; + empty = FALSE; + + if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) + ret = MAXLONG; + else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) + ret = MINLONG; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return ret; +} + +WINE_UNICODE_INLINE ULONG strtoulW( LPCWSTR s, LPWSTR *end, INT base ) +{ + BOOL negative = FALSE, empty = TRUE; + ULONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (isspaceW(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = s[0] != '0' ? 10 : 8; + + while (*s) + { + int v; + + if ('0' <= *s && *s <= '9') v = *s - '0'; + else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; + else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; + else break; + if (v >= base) break; + s++; + empty = FALSE; + + if (ret > MAXDWORD / base || ret * base > MAXDWORD - v) + ret = MAXDWORD; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return negative ? -ret : ret; +} + WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) { return strtolW( str, (WCHAR **)0, 10 ); diff --git a/libs/port/string.c b/libs/port/string.c index c3388bcc7da..62b972399bf 100644 --- a/libs/port/string.c +++ b/libs/port/string.c @@ -22,8 +22,181 @@ #include <errno.h> #include <limits.h> #include <stdio.h> +#include <stdarg.h> -#include "wine/unicode.h" +#include <windef.h> +#include <winbase.h> +#include <winnls.h> + +WCHAR tolowerW( WCHAR ch ) +{ + extern const WCHAR wine_casemap_lower[]; + return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; +} + +WCHAR toupperW( WCHAR ch ) +{ + extern const WCHAR wine_casemap_upper[]; + return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; +} + +/* the character type contains the C1_* flags in the low 12 bits */ +/* and the C2_* type in the high 4 bits */ +unsigned short get_char_typeW( WCHAR ch ) +{ + extern const unsigned short wine_wctype_table[]; + return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; +} + +int iscntrlW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_CNTRL; +} + +int ispunctW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_PUNCT; +} + +int isspaceW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_SPACE; +} + +int isdigitW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_DIGIT; +} + +int isxdigitW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_XDIGIT; +} + +int islowerW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_LOWER; +} + +int isupperW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_UPPER; +} + +int isalnumW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +int isalphaW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); +} + +int isgraphW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +int isprintW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +unsigned int strlenW( const WCHAR *str ) +{ + const WCHAR *s = str; + while (*s) s++; + return s - str; +} + +WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return dst; +} + +int strcmpW( const WCHAR *str1, const WCHAR *str2 ) +{ + while (*str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + +int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + +WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) +{ + strcpyW( dst + strlenW(dst), src ); + return dst; +} + +WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; +} + +WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) +{ + WCHAR *ret = NULL; + do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); + return ret; +} + +WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) +{ + for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; + return NULL; +} + +size_t strspnW( const WCHAR *str, const WCHAR *accept ) +{ + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (!strchrW( accept, *ptr )) break; + return ptr - str; +} + +size_t strcspnW( const WCHAR *str, const WCHAR *reject ) +{ + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (strchrW( reject, *ptr )) break; + return ptr - str; +} + +WCHAR *strlwrW( WCHAR *str ) +{ + WCHAR *ret; + for (ret = str; *str; str++) *str = tolowerW(*str); + return ret; +} + +WCHAR *struprW( WCHAR *str ) +{ + WCHAR *ret; + for (ret = str; *str; str++) *str = toupperW(*str); + return ret; +} + +WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) +{ + const WCHAR *end; + for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)(ULONG_PTR)ptr; + return NULL; +} + +WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) +{ + const WCHAR *end; + WCHAR *ret = NULL; + for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; + return ret; +} int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) { @@ -300,6 +473,16 @@ noconv: return 0L; } +long int atolW( const WCHAR *str ) +{ + return strtolW( str, (WCHAR **)0, 10 ); +} + +int atoiW( const WCHAR *str ) +{ + return (int)atolW( str ); +} + /* format a WCHAR string according to a printf format; helper for vsnprintfW */ static size_t format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str, int str_len ) diff --git a/libs/wine/port.c b/libs/wine/port.c index 259ff084e88..62d5c2abcdb 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -28,7 +28,6 @@ #include <string.h> #include <sys/types.h> -#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" /* functions from libwine_port that are also exported from libwine for backwards compatibility,

1 0

Alexandre Julliard : libport: Move the non-inline version of the string functions to libwine.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 1fdbf850eeef751bbde914f177bf659e402344d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fdbf850eeef751bbde914f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 29 21:21:49 2020 +0100 libport: Move the non-inline version of the string functions to libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 29 +++++++++++++++++++++++------ libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/wine/port.c | 12 ++---------- libs/{port => wine}/string.c | 6 ++++++ 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index f42a94c7e0d..069b5ce2624 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -40,7 +40,7 @@ extern "C" { #endif #ifndef WINE_UNICODE_INLINE -#define WINE_UNICODE_INLINE static inline +#define WINE_UNICODE_INLINE static FORCEINLINE #endif /* code page info common to SBCS and DBCS */ @@ -79,11 +79,6 @@ union cptable struct dbcs_table dbcs; }; -extern int sprintfW( WCHAR *str, const WCHAR *format, ... ); -extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); -extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); -extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); - WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { extern const WCHAR wine_casemap_lower[]; @@ -401,6 +396,28 @@ WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) return (int)atolW( str ); } +NTSYSAPI int __cdecl _vsnwprintf(WCHAR*,size_t,const WCHAR*,__ms_va_list); + +static inline int WINAPIV snprintfW( WCHAR *str, size_t len, const WCHAR *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = _vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return retval; +} + +static inline int WINAPIV sprintfW( WCHAR *str, const WCHAR *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = _vsnwprintf(str, MAXLONG, format, valist); + __ms_va_end(valist); + return retval; +} + #undef WINE_UNICODE_INLINE #ifdef __cplusplus diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7bc67fa3fee..aabcc833ec6 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ rint.c \ spawn.c \ statvfs.c \ - string.c \ strnlen.c \ symlink.c \ usleep.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 65a07895027..74ffc0d5f83 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -81,6 +81,7 @@ C_SRCS = \ mmap.c \ port.c \ sortkey.c \ + string.c \ utf8.c \ wctomb.c diff --git a/libs/wine/port.c b/libs/wine/port.c index 62d5c2abcdb..8e56ada52aa 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -27,16 +27,8 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> - -#include "wine/unicode.h" - -/* functions from libwine_port that are also exported from libwine for backwards compatibility, - * on platforms that require it */ -const void *libwine_port_functions[] = -{ - strtolW, - vsnprintfW, -}; +#include <stdarg.h> +#include <windef.h> /* no longer used, for backwards compatibility only */ struct wine_pthread_functions; diff --git a/libs/port/string.c b/libs/wine/string.c similarity index 99% rename from libs/port/string.c rename to libs/wine/string.c index 62b972399bf..d6fb88f8eca 100644 --- a/libs/port/string.c +++ b/libs/wine/string.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include <assert.h> #include <errno.h> #include <limits.h> @@ -711,3 +715,5 @@ int sprintfW( WCHAR *str, const WCHAR *format, ...) va_end(valist); return retval; } + +#endif /* __ASM_OBSOLETE */

1 0

Alexandre Julliard : libwine: Move libwine private definitions out of the global wine/unicode.h
by Alexandre Julliard 30 Nov '20

30 Nov '20

1 0