February 2016 - Wine-commits

Alexandre Julliard : make_unicode: Fix typo in Indic syllable table generation.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: cb65a3fbf995870bb97c442fd7bcce02d5b6607a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb65a3fbf995870bb97c442fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:58:53 2016 +0900 make_unicode: Fix typo in Indic syllable table generation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/indicsyllable.c | 212 +++++++++++++++++++++++++-------------------- tools/make_unicode | 2 +- 2 files changed, 118 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb65a3fbf995870bb97c4…

1 0

Alexandre Julliard : make_unicode: Support sparse arrays for character tables.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 575a979610045a8c80b54ae688be2045b56b97ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=575a979610045a8c80b54ae68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 16:39:54 2016 +0900 make_unicode: Support sparse arrays for character tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 1c81a7e..27d23bf 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -351,8 +351,8 @@ my @tolower_table = (); my @toupper_table = (); my @digitmap_table = (); my @compatmap_table = (); -my @category_table = (0) x 65536; -my @joining_table = (0) x 65536; +my @category_table = (); +my @joining_table = (); my @direction_table = (); my @decomp_table = (); my @compose_table = (); @@ -1176,7 +1176,7 @@ sub get_lb_ranges() sub dump_indic($) { my $filename = shift; - my @indic_table = ($indic_types{'Other'}) x 65536; + my @indic_table; my $INPUT = open_data_file( $UNIDATA, "IndicSyllabicCategory.txt" ); while (<$INPUT>) @@ -1245,7 +1245,7 @@ sub dump_indic($) print OUTPUT "/* and from $UNIDATA/IndicPositionalCategory.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "indic_syllabic_table", @indic_table); + dump_two_level_mapping( "indic_syllabic_table", $indic_types{'Other'}, @indic_table ); close OUTPUT; save_file($filename); @@ -1256,7 +1256,7 @@ sub dump_indic($) sub dump_linebreak($) { my $filename = shift; - my @break_table = ($break_types{'XX'}) x 65536; + my @break_table; my $next_group = 0; my $INPUT = open_data_file( $UNIDATA, "LineBreak.txt" ); @@ -1292,7 +1292,7 @@ sub dump_linebreak($) print OUTPUT "/* generated from $UNIDATA/LineBreak.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "wine_linebreak_table", @break_table); + dump_two_level_mapping( "wine_linebreak_table", $break_types{'XX'}, @break_table ); close OUTPUT; save_file($filename); @@ -1304,7 +1304,7 @@ sub dump_scripts($) { my $filename = shift; my $header = $filename; - my @scripts_table = (0) x 65536; # 0 means unknown script + my @scripts_table; my $script_index; my %scripts; my $i; @@ -1406,7 +1406,7 @@ sub dump_scripts($) print OUTPUT "/* generated from $UNIDATA/Scripts.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "wine_scripts_table", @scripts_table); + dump_two_level_mapping( "wine_scripts_table", 0, @scripts_table ); close OUTPUT; save_file($filename); } @@ -1449,7 +1449,7 @@ sub dump_mirroring($) sub dump_bracket($) { my $filename = shift; - my @bracket_table = (0) x 65536; + my @bracket_table; my $INPUT = open_data_file( $UNIDATA, "BidiBrackets.txt" ); while (<$INPUT>) @@ -1476,7 +1476,7 @@ sub dump_bracket($) print OUTPUT "/* generated from $UNIDATA/BidiBrackets.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "bidi_bracket_table", @bracket_table); + dump_two_level_mapping( "bidi_bracket_table", 0, @bracket_table ); close OUTPUT; save_file($filename); @@ -1516,7 +1516,7 @@ sub dump_shaping($) print OUTPUT "/* generated from $UNIDATA/ArabicShaping.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "wine_shaping_table", @joining_table ); + dump_two_level_mapping( "wine_shaping_table", 0, @joining_table ); print OUTPUT "\nconst unsigned short wine_shaping_forms[256][4] =\n{\n"; for (my $i = 0x600; $i <= 0x6ff; $i++) @@ -1538,7 +1538,7 @@ sub dump_shaping($) sub dump_vertical($) { my $filename = shift; - my @vertical_table = ($vertical_types{'R'}) x 65536; + my @vertical_table; my $INPUT = open_data_file( $VERTICALDATA, "VerticalOrientation-11.txt" ); while (<$INPUT>) @@ -1576,7 +1576,7 @@ sub dump_vertical($) print OUTPUT "/* generated from $VERTICALDATA/VerticalOrientation-11.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "vertical_orientation_table", @vertical_table); + dump_two_level_mapping( "vertical_orientation_table", $vertical_types{'R'}, @vertical_table ); close OUTPUT; save_file($filename); @@ -1672,9 +1672,10 @@ sub DUMP_CASE_TABLE($@) ################################################################ # compress a mapping table by removing identical rows -sub compress_array($@) +sub compress_array($$@) { my $rows = shift; + my $def = shift; my @table = @_; my $len = @table / $rows; my @array = (0) x $rows; @@ -1683,7 +1684,8 @@ sub compress_array($@) # try to merge table rows for (my $row = 0; $row < $rows; $row++) { - my $rowtxt = pack "S*", @table[($row * $len)..($row * $len + $len - 1)]; + my @table_row = map { defined($_) ? $_ : $def; } @table[($row * $len)..($row * $len + $len - 1)]; + my $rowtxt = pack "S*", @table_row; if (defined($sequences{$rowtxt})) { # reuse an existing row @@ -1693,7 +1695,7 @@ sub compress_array($@) { # create a new row $sequences{$rowtxt} = $array[$row] = $#array + 1; - push @array, @table[$row * $len..$row * $len + $len - 1]; + push @array, @table_row; } } return @array; @@ -1701,10 +1703,11 @@ sub compress_array($@) ################################################################ # dump a simple char -> 16-bit value mapping table -sub dump_simple_mapping($@) +sub dump_simple_mapping($$@) { my $name = shift; - my @array = compress_array( 256, @_[0..65535] ); + my $def = shift; + my @array = compress_array( 256, $def, @_[0..65535] ); printf OUTPUT "const unsigned short %s[%d] =\n{\n", $name, $#array+1; printf OUTPUT " /* offsets */\n%s,\n", DUMP_ARRAY( "0x%04x", 0, @array[0..255] ); @@ -1713,11 +1716,12 @@ sub dump_simple_mapping($@) ################################################################ # dump a char -> 16-bit value mapping table using two-level tables -sub dump_two_level_mapping($@) +sub dump_two_level_mapping($$@) { my $name = shift; - my @row_array = compress_array( 4096, @_[0..65535] ); - my @array = compress_array( 256, @row_array[0..4095] ); + my $def = shift; + my @row_array = compress_array( 4096, $def, @_[0..65535] ); + my @array = compress_array( 256, 0, @row_array[0..4095] ); for (my $i = 256; $i < @array; $i++) { $array[$i] += @array - 4096; } @@ -1880,7 +1884,7 @@ sub dump_nameprep($) { my $filename = shift; my @mapping_table = (); - my @flags_table = (0) x 65536; + my @flags_table; my $INPUT = open_data_file( $RFCS, $STRINGPREP ); while (<$INPUT>) @@ -1911,7 +1915,7 @@ sub dump_nameprep($) print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "nameprep_char_type", @flags_table ); + dump_two_level_mapping( "nameprep_char_type", 0, @flags_table ); ######### mapping table # first determine all the 16-char subsets that contain something @@ -2006,7 +2010,7 @@ sub DUMP_CTYPE_TABLES($) $category_table[$i] |= $direction_table[$i] << 12 if defined $direction_table[$i]; } - dump_simple_mapping( "wine_wctype_table", @category_table ); + dump_simple_mapping( "wine_wctype_table", 0, @category_table ); close OUTPUT; save_file($filename);

1 0

Alexandre Julliard : make_unicode: Update vertical orientation table to the latest version.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 232dc29ff869f487a7dcffe8f253c458210da59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=232dc29ff869f487a7dcffe8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 17:23:03 2016 +0900 make_unicode: Update vertical orientation table to the latest version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/vertical.c | 52 ++++++++++++++++++++++++++-------------------- dlls/wineps.drv/vertical.c | 52 ++++++++++++++++++++++++++-------------------- tools/make_unicode | 6 +++--- 3 files changed, 63 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=232dc29ff869f487a7dcf…

1 0

Sebastian Lackner : server: Fix an invalid memory access in subtract_overlapping (Valgrind).
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 79ada317148657b90420c48c8c7620e375afae0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ada317148657b90420c48c8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 9 09:16:49 2016 +0100 server: Fix an invalid memory access in subtract_overlapping (Valgrind). Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/region.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/region.c b/server/region.c index 464c5ad..33e2a54 100644 --- a/server/region.c +++ b/server/region.c @@ -469,7 +469,8 @@ static int subtract_overlapping( struct region *pReg, rect->bottom = bottom; } r1++; - left = r1->left; + if (r1 != r1End) + left = r1->left; } }

1 0

Bernhard Übelacker : include: Implement todo_wine_if for usage in wine tests.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 9a08714c02ba9c5ba2fb18d1060cc27511e04d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a08714c02ba9c5ba2fb18d10… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Feb 9 10:40:01 2016 +0100 include: Implement todo_wine_if for usage in wine tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 29 ++++++++++++-------------- programs/cmd/tests/batch.c | 52 +++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index bed44f9..0d81a24 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -56,9 +56,9 @@ extern int winetest_interactive; extern const char *winetest_platform; extern void winetest_set_location( const char* file, int line ); -extern void winetest_start_todo( const char* platform ); +extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); -extern void winetest_end_todo( const char* platform ); +extern void winetest_end_todo(void); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); extern void winetest_add_failures( LONG new_failures ); @@ -118,10 +118,11 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #define win_skip win_skip_(__FILE__, __LINE__) #define trace trace_(__FILE__, __LINE__) -#define todo(platform) for (winetest_start_todo(platform); \ - winetest_loop_todo(); \ - winetest_end_todo(platform)) -#define todo_wine todo("wine") +#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) +#define todo_wine todo_if(!strcmp(winetest_platform, "wine")) +#define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) #ifdef NONAMELESSUNION @@ -220,7 +221,7 @@ typedef struct { const char* current_file; /* file of current check */ int current_line; /* line of current check */ - int todo_level; /* current todo nesting level */ + unsigned int todo_level; /* current todo nesting level */ int todo_do_loop; char *str_pos; /* position in debug buffer */ char strings[2000]; /* buffer for debug strings */ @@ -395,11 +396,10 @@ void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __winetest_va_end(valist); } -void winetest_start_todo( const char* platform ) +void winetest_start_todo( int is_todo ) { tls_data* data=get_tls_data(); - if (strcmp(winetest_platform,platform)==0) - data->todo_level++; + data->todo_level = (data->todo_level << 1) | (is_todo != 0); data->todo_do_loop=1; } @@ -411,13 +411,10 @@ int winetest_loop_todo(void) return do_loop; } -void winetest_end_todo( const char* platform ) +void winetest_end_todo(void) { - if (strcmp(winetest_platform,platform)==0) - { - tls_data* data=get_tls_data(); - data->todo_level--; - } + tls_data* data=get_tls_data(); + data->todo_level >>= 1; } int winetest_get_mainargs( char*** pargv ) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 9b54089..7196609 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -273,11 +273,11 @@ static const char *compare_line(const char *out_line, const char *out_end, const static void test_output(const char *out_data, DWORD out_size, const char *exp_data, DWORD exp_size) { - const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err; + const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err = NULL; DWORD line = 0; static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; static const char resync_cmd[] = {'-','-','-'}; - BOOL is_todo_wine, is_out_resync, is_exp_resync; + BOOL is_todo_wine, is_out_resync = FALSE, is_exp_resync = FALSE; while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { line++; @@ -287,32 +287,32 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da is_todo_wine = (exp_ptr+sizeof(todo_wine_cmd) <= exp_nl && !memcmp(exp_ptr, todo_wine_cmd, sizeof(todo_wine_cmd))); - if (is_todo_wine) { + if (is_todo_wine) exp_ptr += sizeof(todo_wine_cmd); - winetest_start_todo("wine"); - } - is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && - !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); - is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && - !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); - - err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); - if(err == out_nl) - ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", - line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if(err == exp_nl) - ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", - line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if (!err && is_todo_wine && is_out_resync && is_exp_resync) - /* Consider that the todo_wine was to deal with extra lines, - * not for the resync line itself - */ - err = NULL; - else - ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", - (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - if(is_todo_wine) winetest_end_todo("wine"); + todo_wine_if(is_todo_wine) + { + is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && + !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); + is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && + !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); + + err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); + if(err == out_nl) + ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if(err == exp_nl) + ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if (!err && is_todo_wine && is_out_resync && is_exp_resync) + /* Consider that the todo_wine was to deal with extra lines, + * not for the resync line itself + */ + err = NULL; + else + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + } if (is_exp_resync && err && is_todo_wine) {

1 0

Alexandre Julliard : server: Allow lookup_name to distinguish the case of an empty path.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 7ad32cf56a2ecb23ee81b9f61cb8a240f6cb79bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad32cf56a2ecb23ee81b9f61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:16:27 2016 +0900 server: Allow lookup_name to distinguish the case of an empty path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 1 - server/directory.c | 6 +++--- server/mailslot.c | 2 ++ server/named_pipe.c | 2 ++ server/object.c | 10 ++++++---- server/symlink.c | 4 +++- server/winstation.c | 8 ++------ 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 20d68b2..35c9d0d 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -225,7 +225,6 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL ); ok( !w2, "create station succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); diff --git a/server/directory.c b/server/directory.c index 15ace1e..312a845 100644 --- a/server/directory.c +++ b/server/directory.c @@ -144,6 +144,8 @@ static struct object *directory_lookup_name( struct object *obj, struct unicode_ 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; @@ -165,14 +167,12 @@ static struct object *directory_lookup_name( struct object *obj, struct unicode_ return found; } - if (name->str) + if (name->str) /* not the last element */ { if (tmp.len == 0) /* Double backslash */ set_error( STATUS_OBJECT_NAME_INVALID ); else if (p) /* Path still has backslashes */ set_error( STATUS_OBJECT_PATH_NOT_FOUND ); - else - clear_error(); } return NULL; } diff --git a/server/mailslot.c b/server/mailslot.c index eb3c0a6..262c4f6 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -370,6 +370,8 @@ static struct object *mailslot_device_lookup_name( struct object *obj, struct un assert( obj->ops == &mailslot_device_ops ); + if (!name) return NULL; /* open the device itself */ + if ((found = find_object( device->mailslots, name, attr | OBJ_CASE_INSENSITIVE ))) name->len = 0; diff --git a/server/named_pipe.c b/server/named_pipe.c index 934b6a3..4dbc0f3 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -473,6 +473,8 @@ static struct object *named_pipe_device_lookup_name( struct object *obj, struct assert( obj->ops == &named_pipe_device_ops ); assert( device->pipes ); + if (!name) return NULL; /* open the device itself */ + if ((found = find_object( device->pipes, name, attr | OBJ_CASE_INSENSITIVE ))) name->len = 0; diff --git a/server/object.c b/server/object.c index 2b8b245..2229070 100644 --- a/server/object.c +++ b/server/object.c @@ -217,7 +217,7 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st unsigned int attr, struct unicode_str *name_left ) { struct object *obj, *parent; - struct unicode_str name_tmp = *name; + struct unicode_str name_tmp = *name, *ptr = &name_tmp; if (root) { @@ -242,9 +242,11 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st parent = get_root_directory(); } - if (!name_tmp.len) goto done; + if (!name_tmp.len) ptr = NULL; /* special case for empty path */ - while ((obj = parent->ops->lookup_name( parent, &name_tmp, attr ))) + clear_error(); + + while ((obj = parent->ops->lookup_name( parent, ptr, attr ))) { /* move to the next element */ release_object ( parent ); @@ -256,7 +258,6 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st return NULL; } - done: if (name_left) *name_left = name_tmp; return parent; } @@ -617,6 +618,7 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { + if (!name) set_error( STATUS_OBJECT_TYPE_MISMATCH ); return NULL; } diff --git a/server/symlink.c b/server/symlink.c index bd09d34..048cd5d 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -99,11 +99,13 @@ static struct object *symlink_lookup_name( struct object *obj, struct unicode_st struct object *target; assert( obj->ops == &symlink_ops ); + + if (!name) return NULL; if (!name->len && (attr & OBJ_OPENLINK)) return NULL; target_str.str = symlink->target; target_str.len = symlink->len; - if ((target = find_object_dir( NULL, &target_str, attr, &name_left ))) + if ((target = lookup_named_object( NULL, &target_str, attr, &name_left ))) { if (name_left.len) { diff --git a/server/winstation.c b/server/winstation.c index 6cfbf1d..5d20cdc 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -110,12 +110,6 @@ static struct winstation *create_winstation( struct directory *root, const struc { struct winstation *winstation; - if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ - { - set_error( STATUS_INVALID_PARAMETER ); - return NULL; - } - if ((winstation = create_named_object_dir( root, name, attr, &winstation_ops ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) @@ -165,6 +159,8 @@ static struct object *winstation_lookup_name( struct object *obj, struct unicode assert( obj->ops == &winstation_ops ); + if (!name) return NULL; /* open the winstation itself */ + if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ { set_error( STATUS_OBJECT_PATH_SYNTAX_BAD );

1 0

Alexandre Julliard : server: Support opening objects from any root, not only directories.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 39e60dc68003813c020c9a29d4e69d2f7a809e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e60dc68003813c020c9a29d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:18:20 2016 +0900 server: Support opening objects from any root, not only directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 1 - server/handle.c | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 3d0487c..9d0f501 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -551,7 +551,6 @@ static void test_name_limits(void) status = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSymbolicLinkObject failed %x\n", str.Length, status ); status = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, &attr3 ); - todo_wine ok( status == STATUS_SUCCESS, "%u: NtOpenSymbolicLinkObject failed %x\n", str.Length, status ); pNtClose( ret2 ); pNtClose( ret ); diff --git a/server/handle.c b/server/handle.c index f440f9f..15e5670 100644 --- a/server/handle.c +++ b/server/handle.c @@ -578,8 +578,7 @@ obj_handle_t open_object( struct process *process, obj_handle_t parent, unsigned unsigned int attributes ) { obj_handle_t handle = 0; - struct directory *root = NULL; - struct object *obj; + struct object *obj, *root = NULL; if (name->len >= 65534) { @@ -587,9 +586,9 @@ obj_handle_t open_object( struct process *process, obj_handle_t parent, unsigned return 0; } - if (parent && !(root = get_directory_obj( process, parent, 0 ))) return 0; + if (parent && !(root = get_handle_obj( process, parent, 0, NULL ))) return 0; - if ((obj = open_object_dir( root, name, attributes, ops ))) + if ((obj = open_named_object( root, ops, name, attributes ))) { handle = alloc_handle( process, obj, access, attributes ); release_object( obj );

1 0

Alexandre Julliard : server: Support opening file objects from any root, not only directories.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 6ccefdb7c59d6bea1650b661c9b72bb7096a3a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccefdb7c59d6bea1650b661c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:19:34 2016 +0900 server: Support opening file objects from any root, not only directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 26 ++++++-------------------- server/file.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/server/fd.c b/server/fd.c index 28f5346..e995380 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2393,27 +2393,13 @@ DECL_HANDLER(flush) DECL_HANDLER(open_file_object) { struct unicode_str name = get_req_unicode_str(); - struct directory *root = NULL; - struct object *obj, *result; + struct object *obj, *result, *root = NULL; - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - { - if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) return; - if (!(obj = (struct object *)get_file_obj( current->process, req->rootdir, 0 ))) return; - if (name.len) - { - release_object( obj ); - set_error( STATUS_OBJECT_PATH_NOT_FOUND ); - return; - } - clear_error(); - } - else - { - obj = open_object_dir( root, &name, req->attributes, NULL ); - if (root) release_object( root ); - if (!obj) return; - } + if (req->rootdir && !(root = get_handle_obj( current->process, req->rootdir, 0, NULL ))) return; + + obj = open_named_object( root, NULL, &name, req->attributes ); + if (root) release_object( root ); + if (!obj) return; if ((result = obj->ops->open_file( obj, req->access, req->sharing, req->options ))) { diff --git a/server/file.c b/server/file.c index 15fd411..dacb24a 100644 --- a/server/file.c +++ b/server/file.c @@ -68,6 +68,7 @@ static struct object_type *file_get_type( struct object *obj ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); +static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *file_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static void file_destroy( struct object *obj ); @@ -90,7 +91,7 @@ static const struct object_ops file_ops = default_fd_map_access, /* map_access */ file_get_sd, /* get_sd */ file_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ + file_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ file_open_file, /* open_file */ @@ -609,6 +610,14 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd return 1; } +static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + if (!name || !name->len) return NULL; /* open the file itself */ + + set_error( STATUS_OBJECT_PATH_NOT_FOUND ); + return NULL; +} + static struct object *file_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) {

1 0

Alexandre Julliard : server: Avoid redundant open call when looking for an object type.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: eb6621081a6d0f094d58c30e6850f3e01c88402e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6621081a6d0f094d58c30e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:21:23 2016 +0900 server: Avoid redundant open call when looking for an object type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/directory.c b/server/directory.c index 312a845..67d8089 100644 --- a/server/directory.c +++ b/server/directory.c @@ -269,13 +269,13 @@ struct object_type *get_object_type( const struct unicode_str *name ) { struct object_type *type; - if ((type = open_object_dir( dir_objtype, name, 0, &object_type_ops ))) - return type; - - if ((type = create_named_object_dir( dir_objtype, name, 0, &object_type_ops ))) + if ((type = create_named_object_dir( dir_objtype, name, OBJ_OPENIF, &object_type_ops ))) { - grab_object( type ); - make_object_static( &type->obj ); + if (get_error() != STATUS_OBJECT_NAME_EXISTS) + { + grab_object( type ); + make_object_static( &type->obj ); + } clear_error(); } return type;

1 0

Alexandre Julliard : server: Implement object type for registry keys.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 3cde722e3adde4912c2c5bf1aa30e2a94dc246cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cde722e3adde4912c2c5bf1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:28:49 2016 +0900 server: Implement object type for registry keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 5ca2a52..97b16ed 100644 --- a/server/registry.c +++ b/server/registry.c @@ -146,6 +146,7 @@ struct file_load_info static void key_dump( struct object *obj, int verbose ); +static struct object_type *key_get_type( struct object *obj ); static unsigned int key_map_access( struct object *obj, unsigned int access ); static struct security_descriptor *key_get_sd( struct object *obj ); static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); @@ -155,7 +156,7 @@ static const struct object_ops key_ops = { sizeof(struct key), /* size */ key_dump, /* dump */ - no_get_type, /* get_type */ + key_get_type, /* get_type */ no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -302,6 +303,13 @@ static void key_dump( struct object *obj, int verbose ) fprintf( stderr, "\n" ); } +static struct object_type *key_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'K','e','y'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + /* notify waiter and maybe delete the notification */ static void do_notification( struct key *key, struct notify *notify, int del ) {

1 0