wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Sven Baars : d3dx9: Add two more DT_SINGLELINE tests.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 787d98f47ce7254dda7f644fa6d033fe1776ae38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=787d98f47ce7254dda7f644f… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Mar 16 11:23:19 2020 +0100 d3dx9: Add two more DT_SINGLELINE tests. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 6fae8bf8d5..fb55a547a0 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -782,12 +782,18 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) height = ID3DXFont_DrawTextW(font, NULL, L"a\na", -1, &rect, DT_SINGLELINE, 0xff00ff); ok(height == 12, "Got unexpected height %d.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, DT_SINGLELINE, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, 0, 0xff00ff); ok(height == 24, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, DT_WORDBREAK, 0xff00ff); ok(height == 36, "Got unexpected height %d.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, L"a\naaaaa aaaa", -1, &rect, DT_WORDBREAK | DT_SINGLELINE, 0xff00ff); + ok(height == 12, "Got unexpected height %d.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, 0, 0xff00ff); ok(height == 48, "Got unexpected height %d.\n", height);

1 0

Alexandre Julliard : unicode: Store downloaded data files in the cache directory.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: ec19bbf43f6ced7c05ce7f4337a3ec8d8f013afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec19bbf43f6ced7c05ce7f43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 13:13:42 2020 +0100 unicode: Store downloaded data files in the cache directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 86a180259f..ec5d8eafb4 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -475,29 +475,32 @@ sub to_utf16(@) sub open_data_file($$) { my ($base, $name) = @_; - (my $dir = "data/$name") =~ s/\/[^\/]+$//; + my $cache = ($ENV{XDG_CACHE_HOME} || "$ENV{HOME}/.cache") . "/wine"; + (my $dir = "$cache/$name") =~ s/\/[^\/]+$//; + my $suffix = ($base =~ /\/\Q$UNIVERSION\E/) ? "-$UNIVERSION" : ""; local *FILE; if ($base =~ /.*\/([^\/]+)\.zip$/) { - my $zip = $1; - unless (-f "data/$zip") + my $zip = "$1$suffix.zip"; + unless (-f "$cache/$zip") { - mkdir "data"; + system "mkdir", "-p", $cache; print "Fetching $base...\n"; - !system "wget", "-q", "-O", "data/$zip", $base or die "cannot fetch $base"; + !system "wget", "-q", "-O", "$cache/$zip", $base or die "cannot fetch $base"; } - open FILE, "-|", "unzip", "-p", "data/$zip", $name or die "cannot extract $name from $zip"; + open FILE, "-|", "unzip", "-p", "$cache/$zip", $name or die "cannot extract $name from $zip"; } else { - unless (-f "data/$name") + (my $dest = "$cache/$name") =~ s/(.*)(\.[^\/.]+)$/$1$suffix$2/; + unless (-f $dest) { system "mkdir", "-p", $dir; print "Fetching $base/$name...\n"; - !system "wget", "-q", "-O", "data/$name", "$base/$name" or die "cannot fetch $base/$name"; + !system "wget", "-q", "-O", $dest, "$base/$name" or die "cannot fetch $base/$name"; } - open FILE, "<data/$name" or die "cannot open data/$name"; + open FILE, "<$dest" or die "cannot open $dest"; } return *FILE; }

1 0

Alexandre Julliard : server: Don't use wine/unicode.h.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 8286b780a4ba4bb3ac3ff7a1c278f284f43fe70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8286b780a4ba4bb3ac3ff7a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 12:48:31 2020 +0100 server: Don't use wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 1 - server/mailslot.c | 1 - server/token.c | 2 -- server/unicode.h | 1 - 4 files changed, 5 deletions(-) diff --git a/server/completion.c b/server/completion.c index be5ffe585c..db04727b93 100644 --- a/server/completion.c +++ b/server/completion.c @@ -37,7 +37,6 @@ #include "windef.h" #include "winternl.h" -#include "wine/unicode.h" #include "object.h" #include "file.h" #include "handle.h" diff --git a/server/mailslot.c b/server/mailslot.c index 49e79e9acd..781e6f3141 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -24,7 +24,6 @@ #include "wine/port.h" #include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/unicode.h" #include <assert.h> #include <fcntl.h> diff --git a/server/token.c b/server/token.c index e0f28c6da6..2fa95e17aa 100644 --- a/server/token.c +++ b/server/token.c @@ -39,8 +39,6 @@ #include "request.h" #include "security.h" -#include "wine/unicode.h" - #define MAX_SUBAUTH_COUNT 1 const LUID SeIncreaseQuotaPrivilege = { 5, 0 }; diff --git a/server/unicode.h b/server/unicode.h index cfeceb88b9..c280fb8e7d 100644 --- a/server/unicode.h +++ b/server/unicode.h @@ -24,7 +24,6 @@ #include <stdio.h> #include "windef.h" -#include "wine/unicode.h" #include "object.h" extern int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len );

1 0

Alexandre Julliard : server: Add a helper function for hashing a Unicode string.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 6db1232567018bc0312767246ff566c35f11a537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6db1232567018bc031276724… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 12:48:26 2020 +0100 server: Add a helper function for hashing a Unicode string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 16 ++++------------ server/object.c | 12 ++---------- server/unicode.c | 8 ++++++++ server/unicode.h | 1 + 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/server/atom.c b/server/atom.c index 11f4b46ffb..57aff7b891 100644 --- a/server/atom.c +++ b/server/atom.c @@ -163,15 +163,6 @@ static atom_t add_atom_entry( struct atom_table *table, struct atom_entry *entry return entry->atom; } -/* compute the hash code for a string */ -static unsigned short atom_hash( struct atom_table *table, const struct unicode_str *str ) -{ - unsigned int i; - unsigned short hash = 0; - for (i = 0; i < str->len / sizeof(WCHAR); i++) hash ^= toupperW(str->str[i]) + i; - return hash % table->entries_count; -} - /* dump an atom table */ static void atom_table_dump( struct object *obj, int verbose ) { @@ -224,7 +215,7 @@ static struct atom_entry *find_atom_entry( struct atom_table *table, const struc static atom_t add_atom( struct atom_table *table, const struct unicode_str *str ) { struct atom_entry *entry; - unsigned short hash = atom_hash( table, str ); + unsigned short hash = hash_strW( str->str, str->len, table->entries_count ); atom_t atom = 0; if (!str->len) @@ -293,7 +284,8 @@ static atom_t find_atom( struct atom_table *table, const struct unicode_str *str set_error( STATUS_INVALID_PARAMETER ); return 0; } - if (table && (entry = find_atom_entry( table, str, atom_hash(table, str) ))) + if (table && (entry = find_atom_entry( table, str, + hash_strW( str->str, str->len, table->entries_count )))) return entry->atom; set_error( STATUS_OBJECT_NAME_NOT_FOUND ); return 0; @@ -350,7 +342,7 @@ atom_t find_global_atom( struct winstation *winstation, const struct unicode_str struct atom_entry *entry; if (!str->len || str->len > MAX_ATOM_LEN || !table) return 0; - if ((entry = find_atom_entry( table, str, atom_hash(table, str) ))) + if ((entry = find_atom_entry( table, str, hash_strW( str->str, str->len, table->entries_count )))) return entry->atom; return 0; } diff --git a/server/object.c b/server/object.c index 0cac62ca6d..dacfe1d71a 100644 --- a/server/object.c +++ b/server/object.c @@ -127,17 +127,9 @@ void *memdup( const void *data, size_t len ) /*****************************************************************/ -static int get_name_hash( const struct namespace *namespace, const WCHAR *name, data_size_t len ) -{ - WCHAR hash = 0; - len /= sizeof(WCHAR); - while (len--) hash ^= tolowerW(*name++); - return hash % namespace->hash_size; -} - void namespace_add( struct namespace *namespace, struct object_name *ptr ) { - int hash = get_name_hash( namespace, ptr->name, ptr->len ); + unsigned int hash = hash_strW( ptr->name, ptr->len, namespace->hash_size ); list_add_head( &namespace->names[hash], &ptr->entry ); } @@ -450,7 +442,7 @@ struct object *find_object( const struct namespace *namespace, const struct unic if (!name || !name->len) return NULL; - list = &namespace->names[ get_name_hash( namespace, name->str, name->len ) ]; + list = &namespace->names[ hash_strW( name->str, name->len, namespace->hash_size ) ]; LIST_FOR_EACH( p, list ) { const struct object_name *ptr = LIST_ENTRY( p, struct object_name, entry ); diff --git a/server/unicode.c b/server/unicode.c index eb06284c56..8d6c411cb6 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -66,6 +66,14 @@ int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len ) return ret; } +unsigned int hash_strW( const WCHAR *str, data_size_t len, unsigned int hash_size ) +{ + unsigned int i, hash = 0; + + for (i = 0; i < len / sizeof(WCHAR); i++) hash = hash * 65599 + to_lower( str[i] ); + return hash % hash_size; +} + WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ) { data_size_t i, len = strlen(str); diff --git a/server/unicode.h b/server/unicode.h index 99f248bd68..cfeceb88b9 100644 --- a/server/unicode.h +++ b/server/unicode.h @@ -28,6 +28,7 @@ #include "object.h" extern int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len ); +extern unsigned int hash_strW( const WCHAR *str, data_size_t len, unsigned int hash_size ); extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ); extern int parse_strW( WCHAR *buffer, data_size_t *len, const char *src, char endchar ); extern int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] );

1 0

Alexandre Julliard : server: Add a helper function for case-insensitive Unicode string comparisons.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 5721d5f8da0ca59248b11f8e0b0b93c7fc667290 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5721d5f8da0ca59248b11f8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 12:48:19 2020 +0100 server: Add a helper function for case-insensitive Unicode string comparisons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 2 +- server/object.c | 2 +- server/registry.c | 20 +++++++++----------- server/unicode.c | 15 +++++++++++++++ server/unicode.h | 1 + 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/server/atom.c b/server/atom.c index cd1508322c..11f4b46ffb 100644 --- a/server/atom.c +++ b/server/atom.c @@ -214,7 +214,7 @@ static struct atom_entry *find_atom_entry( struct atom_table *table, const struc struct atom_entry *entry = table->entries[hash]; while (entry) { - if (entry->len == str->len && !memicmpW( entry->str, str->str, str->len/sizeof(WCHAR) )) break; + if (entry->len == str->len && !memicmp_strW( entry->str, str->str, str->len )) break; entry = entry->next; } return entry; diff --git a/server/object.c b/server/object.c index ee89b8698d..0cac62ca6d 100644 --- a/server/object.c +++ b/server/object.c @@ -457,7 +457,7 @@ struct object *find_object( const struct namespace *namespace, const struct unic if (ptr->len != name->len) continue; if (attributes & OBJ_CASE_INSENSITIVE) { - if (!strncmpiW( ptr->name, name->str, name->len/sizeof(WCHAR) )) + if (!memicmp_strW( ptr->name, name->str, name->len )) return grab_object( ptr->obj ); } else diff --git a/server/registry.c b/server/registry.c index 54a6d6918b..dcbb3f791e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -177,8 +177,7 @@ static const struct object_ops key_ops = static inline int is_wow6432node( const WCHAR *name, unsigned int len ) { - return (len == sizeof(wow6432node) && - !memicmpW( name, wow6432node, ARRAY_SIZE( wow6432node ))); + return (len == sizeof(wow6432node) && !memicmp_strW( name, wow6432node, sizeof( wow6432node ))); } /* @@ -438,8 +437,7 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); - if (skip_root && str->len >= sizeof(root_name) && - !memicmpW( str->str, root_name, ARRAY_SIZE( root_name ))) + if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) { str->str += ARRAY_SIZE( root_name ); str->len -= sizeof(root_name); @@ -647,7 +645,7 @@ static struct key *find_subkey( const struct key *key, const struct unicode_str { i = (min + max) / 2; len = min( key->subkeys[i]->namelen, name->len ); - res = memicmpW( key->subkeys[i]->name, name->str, len / sizeof(WCHAR) ); + res = memicmp_strW( key->subkeys[i]->name, name->str, len ); if (!res) res = key->subkeys[i]->namelen - name->len; if (!res) { @@ -691,7 +689,7 @@ static struct key *follow_symlink( struct key *key, int iteration ) path.str = value->data; path.len = (value->len / sizeof(WCHAR)) * sizeof(WCHAR); if (path.len <= sizeof(root_name)) return NULL; - if (memicmpW( path.str, root_name, ARRAY_SIZE( root_name ))) return NULL; + if (memicmp_strW( path.str, root_name, sizeof(root_name) )) return NULL; path.str += ARRAY_SIZE( root_name ); path.len -= sizeof(root_name); @@ -1054,7 +1052,7 @@ static struct key_value *find_value( const struct key *key, const struct unicode { i = (min + max) / 2; len = min( key->values[i].namelen, name->len ); - res = memicmpW( key->values[i].name, name->str, len / sizeof(WCHAR) ); + res = memicmp_strW( key->values[i].name, name->str, len ); if (!res) res = key->values[i].namelen - name->len; if (!res) { @@ -1116,7 +1114,7 @@ static void set_value( struct key *key, const struct unicode_str *name, if (key->flags & KEY_SYMLINK) { if (type != REG_LINK || name->len != symlink_str.len || - memicmpW( name->str, symlink_str.str, name->len / sizeof(WCHAR) )) + memicmp_strW( name->str, symlink_str.str, name->len )) { set_error( STATUS_ACCESS_DENIED ); return; @@ -1614,7 +1612,7 @@ static int get_prefix_len( struct key *key, const char *name, struct file_load_i len = (p - info->tmp) * sizeof(WCHAR); for (res = 1; key != root_key; res++) { - if (len == key->namelen && !memicmpW( info->tmp, key->name, len / sizeof(WCHAR) )) break; + if (len == key->namelen && !memicmp_strW( info->tmp, key->name, len )) break; key = key->parent; } if (key == root_key) res = 0; /* no matching name */ @@ -2051,7 +2049,7 @@ DECL_HANDLER(create_key) class.len = (class.len / sizeof(WCHAR)) * sizeof(WCHAR); if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmpW( name.str, root_name, ARRAY_SIZE( root_name ))) + !memicmp_strW( name.str, root_name, sizeof(root_name) )) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); @@ -2209,7 +2207,7 @@ DECL_HANDLER(load_registry) } if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmpW( name.str, root_name, ARRAY_SIZE( root_name ))) + !memicmp_strW( name.str, root_name, sizeof(root_name) )) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); diff --git a/server/unicode.c b/server/unicode.c index f77aa95ff2..eb06284c56 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -51,6 +51,21 @@ static inline char to_hex( char ch ) return tolower(ch) - 'a' + 10; } +static inline WCHAR to_lower( WCHAR ch ) +{ + extern const WCHAR wine_casemap_lower[]; + return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; +} + +int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len ) +{ + int ret = 0; + + for (len /= sizeof(WCHAR); len; str1++, str2++, len--) + if ((ret = to_lower(*str1) - to_lower(*str2))) break; + return ret; +} + WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ) { data_size_t i, len = strlen(str); diff --git a/server/unicode.h b/server/unicode.h index b69557363f..99f248bd68 100644 --- a/server/unicode.h +++ b/server/unicode.h @@ -27,6 +27,7 @@ #include "wine/unicode.h" #include "object.h" +extern int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len ); extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ); extern int parse_strW( WCHAR *buffer, data_size_t *len, const char *src, char endchar ); extern int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] );

1 0

Alexandre Julliard : server: Add a helper function for creating a Unicode string.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: faaea5cd00c1b698faca165684e7ba10c6a9f8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=faaea5cd00c1b698faca1656… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 12:47:44 2020 +0100 server: Add a helper function for creating a Unicode string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 10 +++++----- server/registry.c | 25 ++++++++----------------- server/unicode.c | 11 +++++++++++ server/unicode.h | 7 +------ 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/server/directory.c b/server/directory.c index 8ee9a97a99..30cdd79b4a 100644 --- a/server/directory.c +++ b/server/directory.c @@ -270,12 +270,12 @@ static void create_session( unsigned int id ) static const struct unicode_str link_local_str = {link_localW, sizeof(link_localW)}; static const struct unicode_str link_session_str = {link_sessionW, sizeof(link_sessionW)}; - static const WCHAR fmt_u[] = {'%','u',0}; static struct directory *dir_bno_global, *dir_sessions, *dir_bnolinks; struct directory *dir_id, *dir_bno, *dir_dosdevices, *dir_windows, *dir_winstation; struct object *link_global, *link_local, *link_session, *link_bno, *link_windows; struct unicode_str id_str; - WCHAR id_strW[10]; + char id_strA[10]; + WCHAR *id_strW; if (!id) { @@ -287,9 +287,8 @@ static void create_session( unsigned int id ) make_object_static( (struct object *)dir_sessions ); } - sprintfW( id_strW, fmt_u, id ); - id_str.str = id_strW; - id_str.len = strlenW( id_strW ) * sizeof(WCHAR); + sprintf( id_strA, "%u", id ); + id_strW = ascii_to_unicode_str( id_strA, &id_str ); dir_id = create_directory( &dir_sessions->obj, &id_str, 0, HASH_SIZE, NULL ); dir_dosdevices = create_directory( &dir_id->obj, &dir_dosdevices_str, 0, HASH_SIZE, NULL ); @@ -325,6 +324,7 @@ static void create_session( unsigned int id ) release_object( dir_windows ); release_object( dir_bno ); release_object( dir_id ); + free( id_strW ); } void init_directories(void) diff --git a/server/registry.c b/server/registry.c index bb65bb4818..54a6d6918b 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1740,25 +1740,16 @@ static int load_init_registry_from_file( const char *filename, struct key *key ) static WCHAR *format_user_registry_path( const SID *sid, struct unicode_str *path ) { - static const WCHAR prefixW[] = {'U','s','e','r','\\','S',0}; - static const WCHAR formatW[] = {'-','%','u',0}; - WCHAR buffer[7 + 10 + 10 + 10 * SID_MAX_SUB_AUTHORITIES]; - WCHAR *p = buffer; + char buffer[7 + 11 + 11 + 11 * SID_MAX_SUB_AUTHORITIES], *p = buffer; unsigned int i; - strcpyW( p, prefixW ); - p += strlenW( prefixW ); - p += sprintfW( p, formatW, sid->Revision ); - p += sprintfW( p, formatW, MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], - sid->IdentifierAuthority.Value[4] ), - MAKEWORD( sid->IdentifierAuthority.Value[3], - sid->IdentifierAuthority.Value[2] ))); - for (i = 0; i < sid->SubAuthorityCount; i++) - p += sprintfW( p, formatW, sid->SubAuthority[i] ); - - path->len = (p - buffer) * sizeof(WCHAR); - path->str = p = memdup( buffer, path->len ); - return p; + p += sprintf( p, "User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], + sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], + sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) p += sprintf( p, "-%u", sid->SubAuthority[i] ); + return ascii_to_unicode_str( buffer, path ); } /* get the cpu architectures that can be supported in the current prefix */ diff --git a/server/unicode.c b/server/unicode.c index 02233e22cf..f77aa95ff2 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -51,6 +51,17 @@ static inline char to_hex( char ch ) return tolower(ch) - 'a' + 10; } +WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ) +{ + data_size_t i, len = strlen(str); + WCHAR *p; + + ret->len = len * sizeof(WCHAR); + ret->str = p = mem_alloc( ret->len ); + if (p) for (i = 0; i < len; i++) p[i] = (unsigned char)str[i]; + return p; +} + /* parse an escaped string back into Unicode */ /* return the number of chars read from the input, or -1 on output overflow */ int parse_strW( WCHAR *buffer, data_size_t *len, const char *src, char endchar ) diff --git a/server/unicode.h b/server/unicode.h index dd922db020..b69557363f 100644 --- a/server/unicode.h +++ b/server/unicode.h @@ -27,12 +27,7 @@ #include "wine/unicode.h" #include "object.h" -static inline WCHAR *strdupW( const WCHAR *str ) -{ - size_t len = (strlenW(str) + 1) * sizeof(WCHAR); - return memdup( str, len ); -} - +extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ); extern int parse_strW( WCHAR *buffer, data_size_t *len, const char *src, char endchar ); extern int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] );

1 0

Alexandre Julliard : server: Add a helper function for splitting a path into individual elements.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 7b41b7510f5315518fce5dfc5e396fa778b8701a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b41b7510f5315518fce5dfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 12:47:31 2020 +0100 server: Add a helper function for splitting a path into individual elements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 26 ++++++++++++-------------- server/object.c | 9 +++++++++ server/object.h | 1 + server/winstation.c | 5 ++--- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/server/directory.c b/server/directory.c index c995487f59..8ee9a97a99 100644 --- a/server/directory.c +++ b/server/directory.c @@ -142,30 +142,28 @@ static struct object *directory_lookup_name( struct object *obj, struct unicode_ struct directory *dir = (struct directory *)obj; struct object *found; struct unicode_str tmp; - const WCHAR *p; assert( obj->ops == &directory_ops ); if (!name) return NULL; /* open the directory itself */ - if (!(p = memchrW( name->str, '\\', name->len / sizeof(WCHAR) ))) - /* Last element in the path name */ - tmp.len = name->len; - else - tmp.len = (p - name->str) * sizeof(WCHAR); - tmp.str = name->str; + tmp.len = get_path_element( name->str, name->len ); + if ((found = find_object( dir->entries, &tmp, attr ))) { - /* Skip trailing \\ */ - if (p) + /* Skip trailing \\ and move to the next element */ + if (tmp.len < name->len) { - p++; tmp.len += sizeof(WCHAR); + name->str += tmp.len / sizeof(WCHAR); + name->len -= tmp.len; + } + else + { + name->str = NULL; + name->len = 0; } - /* Move to the next element*/ - name->str = p; - name->len -= tmp.len; return found; } @@ -173,7 +171,7 @@ static struct object *directory_lookup_name( struct object *obj, struct unicode_ { if (tmp.len == 0) /* Double backslash */ set_error( STATUS_OBJECT_NAME_INVALID ); - else if (p) /* Path still has backslashes */ + else if (tmp.len < name->len) /* Path still has backslashes */ set_error( STATUS_OBJECT_PATH_NOT_FOUND ); } return NULL; diff --git a/server/object.c b/server/object.c index 94a48c909b..ee89b8698d 100644 --- a/server/object.c +++ b/server/object.c @@ -276,6 +276,15 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st return parent; } +/* return length of first path element in name */ +data_size_t get_path_element( const WCHAR *name, data_size_t len ) +{ + data_size_t i; + + for (i = 0; i < len / sizeof(WCHAR); i++) if (name[i] == '\\') break; + return i * sizeof(WCHAR); +} + static struct object *create_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, const struct security_descriptor *sd ) { diff --git a/server/object.h b/server/object.h index 4a486e0d63..8114a8fb6b 100644 --- a/server/object.h +++ b/server/object.h @@ -135,6 +135,7 @@ extern WCHAR *get_object_full_name( struct object *obj, data_size_t *ret_len ); extern void dump_object_name( struct object *obj ); extern struct object *lookup_named_object( struct object *root, const struct unicode_str *name, unsigned int attr, struct unicode_str *name_left ); +extern data_size_t get_path_element( const WCHAR *name, data_size_t len ); extern void *create_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes, const struct security_descriptor *sd ); diff --git a/server/winstation.c b/server/winstation.c index b53e367fc1..43d112334d 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -38,7 +38,6 @@ #include "user.h" #include "file.h" #include "security.h" -#include "wine/unicode.h" static struct list winstation_list = LIST_INIT(winstation_list); @@ -163,7 +162,7 @@ static struct object *winstation_lookup_name( struct object *obj, struct unicode if (!name) return NULL; /* open the winstation itself */ - if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ + if (get_path_element( name->str, name->len ) < name->len) /* no backslash allowed in name */ { set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); return NULL; @@ -262,7 +261,7 @@ static int desktop_link_name( struct object *obj, struct object_name *name, stru set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; } - if (memchrW( name->name, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ + if (get_path_element( name->name, name->len ) < name->len) /* no backslash allowed in name */ { set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); return 0;

1 0

Jacek Caban : dbghelp: Pass process struct to image_uses_split_segs.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 2a5160c4f2eb80dcc8770cd10d702a5d8233314f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a5160c4f2eb80dcc8770cd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 24 01:54:46 2020 +0100 dbghelp: Pass process struct to image_uses_split_segs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4847a434fd..73d0575a4b 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1255,18 +1255,17 @@ found: * The image header has to be loaded from the process's memory * because the relevant flag is only set in memory, not in the file. */ -static BOOL image_uses_split_segs(HANDLE process, unsigned long load_addr) +static BOOL image_uses_split_segs(struct process* process, unsigned long load_addr) { BOOL split_segs = FALSE; - if (process && load_addr) + if (load_addr) { - struct process *pcs = process_find_by_handle(process); - cpu_type_t target_cpu = (pcs->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; - uint32_t target_magic = (pcs->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; + cpu_type_t target_cpu = (process->is_64bit) ? CPU_TYPE_X86_64 : CPU_TYPE_X86; + uint32_t target_magic = (process->is_64bit) ? MH_MAGIC_64 : MH_MAGIC; struct mach_header header; - if (ReadProcessMemory(process, (void*)load_addr, &header, sizeof(header), NULL) && + if (ReadProcessMemory(process->handle, (void*)load_addr, &header, sizeof(header), NULL) && header.magic == target_magic && header.cputype == target_cpu && header.flags & MACHO_DYLD_IN_SHARED_CACHE) { @@ -1351,7 +1350,7 @@ static BOOL macho_fetch_file_info(struct process* process, const WCHAR* name, UL TRACE("(%s, %p, %p, %p)\n", debugstr_w(name), base, size, checksum); - split_segs = image_uses_split_segs(process->handle, load_addr); + split_segs = image_uses_split_segs(process, load_addr); if (!macho_map_file(process, name, split_segs, &fmap)) return FALSE; if (base) *base = fmap.u.macho.segs_start; *size = fmap.u.macho.segs_size; @@ -1449,7 +1448,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, TRACE("(%p/%p, %s, 0x%08lx, %p/0x%08x)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, macho_info, macho_info->flags); - split_segs = image_uses_split_segs(pcs->handle, load_addr); + split_segs = image_uses_split_segs(pcs, load_addr); if (!macho_map_file(pcs, filename, split_segs, &fmap)) return FALSE; /* Find the dynamic loader's table of images loaded into the process.

1 0

Jacek Caban : dbghelp: Use loader_ops for fetch_file_info.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: 1bbd54409a546c26af8ac2a64f2603114d73a18c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bbd54409a546c26af8ac2a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 24 01:54:36 2020 +0100 dbghelp: Use loader_ops for fetch_file_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 3 +-- dlls/dbghelp/elf_module.c | 10 ++-------- dlls/dbghelp/macho_module.c | 19 +++++-------------- dlls/dbghelp/minidump.c | 36 +++++------------------------------- dlls/dbghelp/module.c | 7 +++++++ 5 files changed, 20 insertions(+), 55 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ab1644265f..a9138227ea 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -390,6 +390,7 @@ struct module struct loader_ops { BOOL (*synchronize_module_list)(struct process* process); + BOOL (*fetch_file_info)(struct process* process, const WCHAR* name, ULONG_PTR load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum); }; struct process @@ -601,7 +602,6 @@ typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); /* elf_module.c */ extern BOOL elf_enum_modules(struct process*, enum_modules_cb, void*) DECLSPEC_HIDDEN; -extern BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; struct image_file_map; extern BOOL elf_load_debug_info(struct module* module) DECLSPEC_HIDDEN; extern struct module* @@ -612,7 +612,6 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th /* macho_module.c */ extern BOOL macho_enum_modules(struct process*, enum_modules_cb, void*) DECLSPEC_HIDDEN; -extern BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; extern BOOL macho_load_debug_info(struct process *pcs, struct module* module) DECLSPEC_HIDDEN; extern struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsigned long) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 2a4b349c49..dba4573afe 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1068,8 +1068,7 @@ BOOL elf_load_debug_info(struct module* module) * * Gathers some more information for an ELF module from a given file */ -BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, - DWORD* size, DWORD* checksum) +static BOOL elf_fetch_file_info(struct process* process, const WCHAR* name, ULONG_PTR load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum) { struct image_file_map fmap; @@ -1707,6 +1706,7 @@ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) static const struct loader_ops elf_loader_ops = { elf_synchronize_module_list, + elf_fetch_file_info, }; /****************************************************************** @@ -1734,12 +1734,6 @@ BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) return FALSE; } -BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, - DWORD* size, DWORD* checksum) -{ - return FALSE; -} - BOOL elf_read_wine_loader_dbg_info(struct process* pcs) { return FALSE; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 071d7bed5c..4847a434fd 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1343,20 +1343,16 @@ BOOL macho_load_debug_info(struct process *pcs, struct module* module) * * Gathers some more information for a Mach-O module from a given file */ -BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load_addr, DWORD_PTR* base, - DWORD* size, DWORD* checksum) +static BOOL macho_fetch_file_info(struct process* process, const WCHAR* name, ULONG_PTR load_addr, DWORD_PTR* base, + DWORD* size, DWORD* checksum) { struct image_file_map fmap; - struct process *pcs; BOOL split_segs; TRACE("(%s, %p, %p, %p)\n", debugstr_w(name), base, size, checksum); - pcs = process_find_by_handle(process); - if (!pcs) return FALSE; - - split_segs = image_uses_split_segs(process, load_addr); - if (!macho_map_file(pcs, name, split_segs, &fmap)) return FALSE; + split_segs = image_uses_split_segs(process->handle, load_addr); + if (!macho_map_file(process, name, split_segs, &fmap)) return FALSE; if (base) *base = fmap.u.macho.segs_start; *size = fmap.u.macho.segs_size; *checksum = calc_crc32(fmap.u.macho.handle); @@ -1911,6 +1907,7 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in static const struct loader_ops macho_loader_ops = { macho_synchronize_module_list, + macho_fetch_file_info, }; /****************************************************************** @@ -1934,12 +1931,6 @@ BOOL macho_read_wine_loader_dbg_info(struct process* pcs) #else /* HAVE_MACH_O_LOADER_H */ -BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load_addr, DWORD_PTR* base, - DWORD* size, DWORD* checksum) -{ - return FALSE; -} - BOOL macho_read_wine_loader_dbg_info(struct process* pcs) { return FALSE; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index c7c8561bf7..82516bf60c 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -253,9 +253,9 @@ static BOOL WINAPI fetch_pe_module_info_cb(PCWSTR name, DWORD64 base, ULONG size /****************************************************************** * fetch_elf_module_info_cb * - * Callback for accumulating in dump_context an ELF modules set + * Callback for accumulating in dump_context an host modules set */ -static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, +static BOOL fetch_host_module_info_cb(const WCHAR* name, unsigned long base, void* user) { struct dump_context* dc = user; @@ -263,33 +263,7 @@ static BOOL fetch_elf_module_info_cb(const WCHAR* name, unsigned long base, DWORD size, checksum; /* FIXME: there's no relevant timestamp on ELF modules */ - /* NB: if we have a non-null base from the live-target use it (whenever - * the ELF module is relocatable or not). If we have a null base (ELF - * module isn't relocatable) then grab its base address from ELF file - */ - if (!elf_fetch_file_info(name, &rbase, &size, &checksum)) - size = checksum = 0; - add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); - return TRUE; -} - -/****************************************************************** - * fetch_macho_module_info_cb - * - * Callback for accumulating in dump_context a Mach-O modules set - */ -static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, - void* user) -{ - struct dump_context* dc = (struct dump_context*)user; - DWORD_PTR rbase; - DWORD size, checksum; - - /* FIXME: there's no relevant timestamp on Mach-O modules */ - /* NB: if we have a non-null base from the live-target use it. If we have - * a null base, then grab its base address from Mach-O file. - */ - if (!macho_fetch_file_info(dc->process->handle, name, base, &rbase, &size, &checksum)) + if (!dc->process->loader->fetch_file_info(dc->process, name, base, &rbase, &size, &checksum)) size = checksum = 0; add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); return TRUE; @@ -348,8 +322,8 @@ static void fetch_modules_info(struct dump_context* dc) */ if (dc->process->dbg_hdr_addr) { - elf_enum_modules(dc->process, fetch_elf_module_info_cb, dc); - macho_enum_modules(dc->process, fetch_macho_module_info_cb, dc); + elf_enum_modules(dc->process, fetch_host_module_info_cb, dc); + macho_enum_modules(dc->process, fetch_host_module_info_cb, dc); } } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 5ff7e02905..59c0a3c56c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1431,7 +1431,14 @@ static BOOL native_synchronize_module_list(struct process* pcs) return FALSE; } +static BOOL native_fetch_file_info(struct process* process, const WCHAR* name, ULONG_PTR load_addr, DWORD_PTR* base, + DWORD* size, DWORD* checksum) +{ + return FALSE; +} + const struct loader_ops no_loader_ops = { native_synchronize_module_list, + native_fetch_file_info, };

1 0

Jacek Caban : dbghelp: Don't use elf_fetch_file_info and macho_fetch_file_info in module_find_cb.
by Alexandre Julliard 24 Mar '20

24 Mar '20

Module: wine Branch: master Commit: adecdb1d01487af16f5f708ae92a05ba4707187e URL: https://source.winehq.org/git/wine.git/?a=commit;h=adecdb1d01487af16f5f708a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 24 01:54:19 2020 +0100 dbghelp: Don't use elf_fetch_file_info and macho_fetch_file_info in module_find_cb. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 15e5d344e7..55571e6eff 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -24,6 +24,7 @@ #include <string.h> #include "dbghelp_private.h" +#include "image_private.h" #include "winnls.h" #include "winternl.h" #include "wine/debug.h" @@ -523,34 +524,28 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) if (timestamp == mf->dw1 && size == mf->dw2) matched++; } break; - case DMT_ELF: - if (elf_fetch_file_info(buffer, 0, &size, &checksum)) - { - matched++; - if (checksum == mf->dw1) matched++; - else - WARN("Found %s, but wrong checksums: %08x %08x\n", - debugstr_w(buffer), checksum, mf->dw1); - } - else - { - WARN("Couldn't read %s\n", debugstr_w(buffer)); - return FALSE; - } - break; case DMT_MACHO: - if (macho_fetch_file_info(NULL, buffer, 0, 0, &size, &checksum)) + case DMT_ELF: { - matched++; - if (checksum == mf->dw1) matched++; + HANDLE file; + + file = CreateFileW(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) break; + + checksum = calc_crc32(file); + if (checksum == mf->dw1) matched += 2; else - WARN("Found %s, but wrong checksums: %08x %08x\n", - debugstr_w(buffer), checksum, mf->dw1); - } - else - { - WARN("Couldn't read %s\n", debugstr_w(buffer)); - return FALSE; + { + struct image_file_map fmap; + WARN("Found %s, but wrong checksums: %08x %08x\n", debugstr_w(buffer), checksum, mf->dw1); + if (elf_map_handle(file, &fmap)) /* FIXME: validate macho files */ + { + image_unmap_file(&fmap); + matched++; + } + } + CloseHandle(file); } break; case DMT_PDB:

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 March 2020