wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Francois Gouget : shell32/tests: Fix test_dde_default_app() on Windows XP SP1.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: cc240bdb143672da29adc0d86f0e3097a64324d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc240bdb143672da29adc0d86… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 8 05:22:48 2016 +0100 shell32/tests: Fix test_dde_default_app() on Windows XP SP1. There are three possible sets of results: Windows <= 2000, XP SP1 and >= XP SP2. Use the first two tests to figure out which results to expect. Only accept the >= XP SP2 results in Wine. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 67 ++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0fd7cea..9d57ca9 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2469,7 +2469,7 @@ static void test_dde(void) hook_WaitForInputIdle((void *) WaitForInputIdle); } -#define DDE_DEFAULT_APP_VARIANTS 2 +#define DDE_DEFAULT_APP_VARIANTS 3 typedef struct { const char* command; @@ -2480,42 +2480,44 @@ typedef struct static dde_default_app_tests_t dde_default_app_tests[] = { - /* Windows XP and 98 handle default DDE app names in different ways. - * The application name we see in the first test determines the pattern - * of application names and return codes we will look for. */ + /* There are three possible sets of results: Windows <= 2000, XP SP1 and + * >= XP SP2. Use the first two tests to determine which results to expect. + */ + + /* Test unquoted existing filename with a space */ + {"%s\\test file.exe", {"test file", "test file", "test"}, 0x0, {33, 33, 33}}, + {"%s\\test2 file.exe", {"test2", "", "test2"}, 0x0, {33, 5, 33}}, /* Test unquoted existing filename with a space */ - {"%s\\test file.exe", {"test file", "test"}, 0x0, {33, 33}}, - {"%s\\test file.exe param", {"test file", "test"}, 0x0, {33, 33}}, + {"%s\\test file.exe param", {"test file", "test file", "test"}, 0x0, {33, 33, 33}}, /* Test quoted existing filename with a space */ - {"\"%s\\test file.exe\"", {"test file", "test file"}, 0x0, {33, 33}}, - {"\"%s\\test file.exe\" param", {"test file", "test file"}, 0x0, {33, 33}}, + {"\"%s\\test file.exe\"", {"test file", "test file", "test file"}, 0x0, {33, 33, 33}}, + {"\"%s\\test file.exe\" param", {"test file", "test file", "test file"}, 0x0, {33, 33, 33}}, /* Test unquoted filename with a space that doesn't exist, but * test2.exe does */ - {"%s\\test2 file.exe", {"test2", "test2"}, 0x0, {33, 33}}, - {"%s\\test2 file.exe param", {"test2", "test2"}, 0x0, {33, 33}}, + {"%s\\test2 file.exe param", {"test2", "", "test2"}, 0x0, {33, 5, 33}}, /* Test quoted filename with a space that does not exist */ - {"\"%s\\test2 file.exe\"", {"", "test2 file"}, 0x0, {5, 33}}, - {"\"%s\\test2 file.exe\" param", {"", "test2 file"}, 0x0, {5, 33}}, + {"\"%s\\test2 file.exe\"", {"", "", "test2 file"}, 0x0, {5, 2, 33}}, + {"\"%s\\test2 file.exe\" param", {"", "", "test2 file"}, 0x0, {5, 2, 33}}, /* Test filename supplied without the extension */ - {"%s\\test2", {"test2", "test2"}, 0x0, {33, 33}}, - {"%s\\test2 param", {"test2", "test2"}, 0x0, {33, 33}}, + {"%s\\test2", {"test2", "", "test2"}, 0x0, {33, 5, 33}}, + {"%s\\test2 param", {"test2", "", "test2"}, 0x0, {33, 5, 33}}, /* Test an unquoted nonexistent filename */ - {"%s\\notexist.exe", {"", "notexist"}, 0x0, {5, 33}}, - {"%s\\notexist.exe param", {"", "notexist"}, 0x0, {5, 33}}, + {"%s\\notexist.exe", {"", "", "notexist"}, 0x0, {5, 2, 33}}, + {"%s\\notexist.exe param", {"", "", "notexist"}, 0x0, {5, 2, 33}}, /* Test an application that will be found on the path */ - {"cmd", {"cmd", "cmd"}, 0x0, {33, 33}}, - {"cmd param", {"cmd", "cmd"}, 0x0, {33, 33}}, + {"cmd", {"cmd", "cmd", "cmd"}, 0x0, {33, 33, 33}}, + {"cmd param", {"cmd", "cmd", "cmd"}, 0x0, {33, 33, 33}}, /* Test an application that will not be found on the path */ - {"xyzwxyzwxyz", {"", "xyzwxyzwxyz"}, 0x0, {5, 33}}, - {"xyzwxyzwxyz param", {"", "xyzwxyzwxyz"}, 0x0, {5, 33}}, + {"xyzwxyzwxyz", {"", "", "xyzwxyzwxyz"}, 0x0, {5, 2, 33}}, + {"xyzwxyzwxyz param", {"", "", "xyzwxyzwxyz"}, 0x0, {5, 2, 33}}, {NULL, {NULL}, 0, {0}} }; @@ -2592,20 +2594,23 @@ static void test_dde_default_app(void) while (GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); rc = msg.wParam > 32 ? 33 : msg.wParam; - /* First test, find which set of test data we expect to see */ - if (test == dde_default_app_tests) + /* The first two tests determine which set of results to expect. + * First check the platform as only the first set of results is + * acceptable for Wine. + */ + if (strcmp(winetest_platform, "wine")) { - int i; - for (i=0; i<DDE_DEFAULT_APP_VARIANTS; i++) + if (test == dde_default_app_tests) { - if (!strcmp(ddeApplication, test->expectedDdeApplication[i])) - { - which = i; - break; - } + if (strcmp(ddeApplication, test->expectedDdeApplication[0])) + which = 2; + } + else if (test == dde_default_app_tests + 1) + { + if (which == 0 && rc == test->rc[1]) + which = 1; + trace("DDE result variant %d\n", which); } - if (i == DDE_DEFAULT_APP_VARIANTS) - skip("Default DDE application test does not match any available results, using first expected data set.\n"); } if ((test->todo & 0x1)==0)

1 0

Francois Gouget : shell32/tests: Fix the DDE tests on Windows 10.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: b742145cab84c7bbc3672a27090a3af5093e236c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b742145cab84c7bbc3672a270… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 05:21:33 2016 +0100 shell32/tests: Fix the DDE tests on Windows 10. Windows 10 does not call WaitForInputIdle() if the DDE server is a console application. So force the call by adding SEE_MASK_WAITFORINPUTIDLE. Also Windows calls WaitForInputIdle() with a 60s timeout and while we should not hit it, trace and cap it to 5s anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e62d3ed..0fd7cea 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2297,10 +2297,13 @@ static dde_tests_t dde_tests[] = {NULL} }; +static int waitforinputidle_count; static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) { + waitforinputidle_count++; if (winetest_debug > 1) - trace("WaitForInputIdle() waiting for dde event\n"); + trace("WaitForInputIdle() waiting for dde event timeout=min(%u,5s)\n", timeout); + timeout = timeout < 5000 ? timeout : 5000; return WaitForSingleObject(dde_ready_event, timeout); } @@ -2382,6 +2385,7 @@ static void test_dde(void) INT_PTR rc; HANDLE map; char *shared_block; + DWORD ddeflags; hook_WaitForInputIdle(hooked_WaitForInputIdle); @@ -2395,6 +2399,7 @@ static void test_dde(void) 4096, "winetest_shlexec_dde_map"); shared_block = MapViewOfFile(map, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 4096); + ddeflags = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI; test = dde_tests; while (test->command) { @@ -2418,10 +2423,28 @@ static void test_dde(void) } ddeExec[0] = 0; - dde_ready_event = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); - rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL, NULL); + waitforinputidle_count = 0; + dde_ready_event = CreateEventA(NULL, TRUE, FALSE, "winetest_shlexec_dde_ready"); + rc = shell_execute_ex(ddeflags, NULL, filename, NULL, NULL, NULL); CloseHandle(dde_ready_event); + if (!(ddeflags & SEE_MASK_WAITFORINPUTIDLE) && rc == SE_ERR_DDEFAIL && + GetLastError() == ERROR_FILE_NOT_FOUND && + strcmp(winetest_platform, "windows") == 0) + { + /* Windows 10 does not call WaitForInputIdle() for DDE, which + * breaks the tests. So force the call by adding + * SEE_MASK_WAITFORINPUTIDLE. + */ + trace("Adding SEE_MASK_WAITFORINPUTIDLE for Windows 10\n"); + ddeflags |= SEE_MASK_WAITFORINPUTIDLE; + delete_test_association(".sde"); + continue; + } okShell(32 < rc, "failed: rc=%lu err=%u\n", rc, GetLastError()); + if (test->ddeexec) + ok(waitforinputidle_count == 1, "WaitForInputIdle() was called %u times\n", waitforinputidle_count); + else + ok(waitforinputidle_count == 0, "WaitForInputIdle() was called %u times for a non-DDE case\n", waitforinputidle_count); if (32 < rc) {

1 0

Alexandre Julliard : server: Use the generic named object functions for named pipes.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 7646df9f4bb94cd88d73845f82b967e8e329b551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7646df9f4bb94cd88d73845f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 14:30:07 2016 +0900 server: Use the generic named object functions for named pipes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 50 +++----------------------------------------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 1e4169d..934b6a3 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -668,47 +668,6 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a } } -static struct named_pipe *create_named_pipe( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct security_descriptor *sd ) -{ - struct object *obj; - struct named_pipe *pipe = NULL; - struct unicode_str new_name; - - if (!name || !name->len) - { - if ((pipe = alloc_object( &named_pipe_ops ))) clear_error(); - return pipe; - } - - if (!(obj = find_object_dir( root, name, attr, &new_name ))) - { - set_error( STATUS_OBJECT_NAME_INVALID ); - return NULL; - } - if (!new_name.len) - { - if (attr & OBJ_OPENIF && obj->ops == &named_pipe_ops) - set_error( STATUS_OBJECT_NAME_EXISTS ); - else - { - release_object( obj ); - obj = NULL; - if (attr & OBJ_OPENIF) - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - else - set_error( STATUS_OBJECT_NAME_COLLISION ); - } - return (struct named_pipe *)obj; - } - - if ((pipe = create_object( obj, &named_pipe_ops, &new_name ))) - clear_error(); - - release_object( obj ); - return pipe; -} - static struct pipe_server *get_pipe_server_obj( struct process *process, obj_handle_t handle, unsigned int access ) { @@ -896,11 +855,8 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, } name.str = buffer->Name; name.len = (buffer->NameLength / sizeof(WCHAR)) * sizeof(WCHAR); - if (!(pipe = (struct named_pipe *)find_object( device->pipes, &name, OBJ_CASE_INSENSITIVE ))) - { - set_error( STATUS_OBJECT_NAME_NOT_FOUND ); - return 0; - } + if (!(pipe = open_named_object( &device->obj, &named_pipe_ops, &name, 0 ))) return 0; + if (!(server = find_available_server( pipe ))) { struct async *async; @@ -957,7 +913,7 @@ DECL_HANDLER(create_named_pipe) else if (!(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; } - pipe = create_named_pipe( root, &name, objattr->attributes | OBJ_OPENIF, sd ); + pipe = create_named_object_dir( root, &name, objattr->attributes | OBJ_OPENIF, &named_pipe_ops ); if (root) release_object( root ); if (!pipe) return;

1 0

Alexandre Julliard : server: Use the generic named object functions for mailslots.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 4e380b9e2b6d74cfb19586276426ca914d253499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e380b9e2b6d74cfb19586276… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 14:28:54 2016 +0900 server: Use the generic named object functions for mailslots. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mailslot.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/server/mailslot.c b/server/mailslot.c index a0fa6e2..eb3c0a6 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -418,41 +418,10 @@ static struct mailslot *create_mailslot( struct directory *root, int max_msgsize, timeout_t read_timeout, const struct security_descriptor *sd ) { - struct object *obj; - struct unicode_str new_name; struct mailslot *mailslot; int fds[2]; - if (!name || !name->len) - { - mailslot = alloc_object( &mailslot_ops ); - goto init; - } - - if (!(obj = find_object_dir( root, name, attr, &new_name ))) - { - set_error( STATUS_OBJECT_NAME_INVALID ); - return NULL; - } - - if (!new_name.len) - { - if (attr & OBJ_OPENIF && obj->ops == &mailslot_ops) - /* it already exists - there can only be one mailslot to read from */ - set_error( STATUS_OBJECT_NAME_EXISTS ); - else if (attr & OBJ_OPENIF) - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - else - set_error( STATUS_OBJECT_NAME_COLLISION ); - release_object( obj ); - return NULL; - } - - mailslot = create_object( obj, &mailslot_ops, &new_name ); - release_object( obj ); - -init: - if (!mailslot) return NULL; + if (!(mailslot = create_named_object_dir( root, name, attr, &mailslot_ops ))) return NULL; mailslot->fd = NULL; mailslot->write_fd = -1;

1 0

Alexandre Julliard : server: Add a function to open a named object inside any parent, not only directories.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 7a5b14d456d8b86265bbc823048952da3f3dc2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5b14d456d8b86265bbc8230… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 16:53:31 2016 +0900 server: Add a function to open a named object inside any parent, not only directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 2 -- server/directory.c | 16 +--------------- server/object.c | 21 +++++++++++++++++++++ server/object.h | 2 ++ server/winstation.c | 4 +--- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7f87eb5..20d68b2 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -278,7 +278,6 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); d2 = OpenDesktopA( "", 0, TRUE, DESKTOP_ALL_ACCESS ); ok( !d2, "open mepty desktop succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); @@ -289,7 +288,6 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); d2 = OpenDesktopA( "foo\\bar", 0, TRUE, DESKTOP_ALL_ACCESS ); ok( !d2, "open desktop succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %u\n", GetLastError() ); d2 = CreateDesktopA( "foobar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); diff --git a/server/directory.c b/server/directory.c index 9b85ac7..15ace1e 100644 --- a/server/directory.c +++ b/server/directory.c @@ -261,21 +261,7 @@ void *create_named_object_dir( struct directory *root, const struct unicode_str void *open_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, const struct object_ops *ops ) { - struct unicode_str name_left; - struct object *obj; - - if ((obj = find_object_dir( root, name, attr, &name_left ))) - { - if (name_left.len) /* not fully parsed */ - set_error( STATUS_OBJECT_NAME_NOT_FOUND ); - else if (ops && obj->ops != ops) - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - else - return obj; - - release_object( obj ); - } - return NULL; + return open_named_object( &root->obj, ops, name, attr ); } /* retrieve an object type, creating it if needed */ diff --git a/server/object.c b/server/object.c index c8e799b..6137c7a 100644 --- a/server/object.c +++ b/server/object.c @@ -316,6 +316,27 @@ void *create_named_object( struct object *parent, const struct object_ops *ops, return new_obj; } +/* open a object by name under the specified parent */ +void *open_named_object( struct object *parent, const struct object_ops *ops, + const struct unicode_str *name, unsigned int attributes ) +{ + struct unicode_str name_left; + struct object *obj; + + if ((obj = lookup_named_object( parent, name, attributes, &name_left ))) + { + if (name_left.len) /* not fully parsed */ + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); + else if (ops && obj->ops != ops) + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + else + return obj; + + release_object( obj ); + } + return NULL; +} + /* recursive helper for dump_object_name */ static void dump_name( struct object *obj ) { diff --git a/server/object.h b/server/object.h index 287015e..f51fc71 100644 --- a/server/object.h +++ b/server/object.h @@ -138,6 +138,8 @@ extern void *create_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name ); extern void *create_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); +extern void *open_named_object( struct object *parent, const struct object_ops *ops, + const struct unicode_str *name, unsigned int attributes ); extern void unlink_named_object( struct object *obj ); extern void make_object_static( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); diff --git a/server/winstation.c b/server/winstation.c index 4131a82..6cfbf1d 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -534,13 +534,11 @@ DECL_HANDLER(open_desktop) if (!winstation) return; - if ((obj = find_object( winstation->desktop_names, &name, req->attributes ))) + if ((obj = open_named_object( &winstation->obj, &desktop_ops, &name, req->attributes ))) { - assert( obj->ops == &desktop_ops ); reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); release_object( obj ); } - else set_error( STATUS_OBJECT_NAME_NOT_FOUND ); release_object( winstation ); }

1 0

Alexandre Julliard : server: Use the lookup_name operation when creating a named object.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: 0458a7d0e3f4fb293a1e5160a6868fda1d065330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0458a7d0e3f4fb293a1e5160a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 14:10:18 2016 +0900 server: Use the lookup_name operation when creating a named object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 31 +------------------------------ server/object.c | 24 ++++++++++++++---------- server/object.h | 2 +- server/winstation.c | 2 +- 4 files changed, 17 insertions(+), 42 deletions(-) diff --git a/server/directory.c b/server/directory.c index cba3a35..9b85ac7 100644 --- a/server/directory.c +++ b/server/directory.c @@ -254,36 +254,7 @@ struct object *find_object_dir( struct directory *root, const struct unicode_str void *create_named_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attributes, const struct object_ops *ops ) { - struct object *obj, *new_obj = NULL; - struct unicode_str new_name; - - if (!name || !name->len) - { - if ((new_obj = alloc_object( ops ))) clear_error(); - return new_obj; - } - - if (!(obj = find_object_dir( root, name, attributes, &new_name ))) return NULL; - if (!new_name.len) - { - if (attributes & OBJ_OPENIF && obj->ops == ops) - set_error( STATUS_OBJECT_NAME_EXISTS ); - else - { - release_object( obj ); - obj = NULL; - if (attributes & OBJ_OPENIF) - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - else - set_error( STATUS_OBJECT_NAME_COLLISION ); - } - return obj; - } - - if ((new_obj = create_object( obj, ops, &new_name ))) clear_error(); - - release_object( obj ); - return new_obj; + return create_named_object( &root->obj, ops, name, attributes ); } /* open a new handle to an existing object */ diff --git a/server/object.c b/server/object.c index 297a5b3..c8e799b 100644 --- a/server/object.c +++ b/server/object.c @@ -282,18 +282,20 @@ void *create_object( struct object *parent, const struct object_ops *ops, const return obj; } -void *create_named_object( struct object *parent, struct namespace *namespace, const struct object_ops *ops, +/* create an object as named child under the specified parent */ +void *create_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ) { - struct object *obj; + struct object *obj, *new_obj; + struct unicode_str new_name; - if (!name || !name->len) - { - if ((obj = alloc_object( ops ))) clear_error(); - return obj; - } + clear_error(); - if ((obj = find_object( namespace, name, attributes ))) + if (!name || !name->len) return alloc_object( ops ); + + if (!(obj = lookup_named_object( parent, name, attributes, &new_name ))) return NULL; + + if (!new_name.len) { if (attributes & OBJ_OPENIF && obj->ops == ops) set_error( STATUS_OBJECT_NAME_EXISTS ); @@ -308,8 +310,10 @@ void *create_named_object( struct object *parent, struct namespace *namespace, c } return obj; } - if ((obj = create_object( parent, ops, name ))) clear_error(); - return obj; + + new_obj = create_object( obj, ops, &new_name ); + release_object( obj ); + return new_obj; } /* recursive helper for dump_object_name */ diff --git a/server/object.h b/server/object.h index 90112d7..287015e 100644 --- a/server/object.h +++ b/server/object.h @@ -136,7 +136,7 @@ extern struct object *lookup_named_object( struct object *root, const struct uni unsigned int attr, struct unicode_str *name_left ); extern void *create_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name ); -extern void *create_named_object( struct object *parent, struct namespace *namespace, const struct object_ops *ops, +extern void *create_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); extern void unlink_named_object( struct object *obj ); extern void make_object_static( struct object *obj ); diff --git a/server/winstation.c b/server/winstation.c index dbfece0..4131a82 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -217,7 +217,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned { struct desktop *desktop; - if ((desktop = create_named_object( &winstation->obj, winstation->desktop_names, &desktop_ops, name, attr ))) + if ((desktop = create_named_object( &winstation->obj, &desktop_ops, name, attr ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) {

1 0

Alexandre Julliard : server: Implement the lookup_name operation for window stations.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: e2ccc978a3dfcb7302e1535d1cf5759b5afe2d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ccc978a3dfcb7302e1535d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 14:02:45 2016 +0900 server: Implement the lookup_name operation for window stations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/winstation.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/server/winstation.c b/server/winstation.c index 9dc348d..dbfece0 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -46,6 +46,8 @@ static struct list winstation_list = LIST_INIT(winstation_list); static void winstation_dump( struct object *obj, int verbose ); static struct object_type *winstation_get_type( struct object *obj ); static int winstation_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); +static struct object *winstation_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr ); static void winstation_destroy( struct object *obj ); static unsigned int winstation_map_access( struct object *obj, unsigned int access ); static void desktop_dump( struct object *obj, int verbose ); @@ -69,7 +71,7 @@ static const struct object_ops winstation_ops = winstation_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ + winstation_lookup_name, /* lookup_name */ directory_link_name, /* link_name */ default_unlink_name, /* unlink_name */ no_open_file, /* open_file */ @@ -155,6 +157,26 @@ static int winstation_close_handle( struct object *obj, struct process *process, return (process->winstation != handle); } +static struct object *winstation_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr ) +{ + struct winstation *winstation = (struct winstation *)obj; + struct object *found; + + assert( obj->ops == &winstation_ops ); + + if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ + { + set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); + return NULL; + } + + if ((found = find_object( winstation->desktop_names, name, attr ))) + name->len = 0; + + return found; +} + static void winstation_destroy( struct object *obj ) { struct winstation *winstation = (struct winstation *)obj;

1 0

Alexandre Julliard : server: Add a function to lookup an object by name inside any parent, not only directories.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: bfd0dff215a954dace516b74430c55c6cb7abeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd0dff215a954dace516b744… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 14:09:36 2016 +0900 server: Add a function to lookup an object by name inside any parent, not only directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 55 ++++++------------------------------------------------ server/object.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ server/object.h | 3 +++ 3 files changed, 59 insertions(+), 49 deletions(-) diff --git a/server/directory.c b/server/directory.c index 45683b9..cba3a35 100644 --- a/server/directory.c +++ b/server/directory.c @@ -218,6 +218,11 @@ static struct directory *create_directory( struct directory *root, const struct return dir; } +struct object *get_root_directory(void) +{ + return grab_object( root_directory ); +} + struct directory *get_directory_obj( struct process *process, obj_handle_t handle, unsigned int access ) { return (struct directory *)get_handle_obj( process, handle, access, &directory_ops ); @@ -242,55 +247,7 @@ struct directory *get_directory_obj( struct process *process, obj_handle_t handl struct object *find_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, struct unicode_str *name_left ) { - struct object *obj, *parent; - struct unicode_str name_tmp; - - if (name) name_tmp = *name; - else name_tmp.len = 0; - - /* Arguments check: - * - Either rootdir or name have to be specified - * - If root is specified path shouldn't start with backslash */ - if (root) - { - if (name_tmp.len && name_tmp.str[0] == '\\') - { - set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); - return NULL; - } - parent = grab_object( root ); - } - else - { - if (!name_tmp.len || name_tmp.str[0] != '\\') - { - set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); - return NULL; - } - parent = grab_object( &root_directory->obj ); - /* skip leading backslash */ - name_tmp.str++; - name_tmp.len -= sizeof(WCHAR); - } - - /* Special case for opening RootDirectory */ - if (!name_tmp.len) goto done; - - while ((obj = parent->ops->lookup_name( parent, &name_tmp, attr ))) - { - /* move to the next element */ - release_object ( parent ); - parent = obj; - } - if (get_error()) - { - release_object( parent ); - return NULL; - } - - done: - if (name_left) *name_left = name_tmp; - return parent; + return lookup_named_object( &root->obj, name, attr, name_left ); } /* create a named (if name is present) or unnamed object. */ diff --git a/server/object.c b/server/object.c index c8098ca..297a5b3 100644 --- a/server/object.c +++ b/server/object.c @@ -211,6 +211,56 @@ void free_object( struct object *obj ) free( obj ); } +/* find an object by name starting from the specified root */ +/* if it doesn't exist, its parent is returned, and name_left contains the remaining name */ +struct object *lookup_named_object( struct object *root, const struct unicode_str *name, + unsigned int attr, struct unicode_str *name_left ) +{ + struct object *obj, *parent; + struct unicode_str name_tmp = *name; + + if (root) + { + /* if root is specified path shouldn't start with backslash */ + if (name_tmp.len && name_tmp.str[0] == '\\') + { + set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); + return NULL; + } + parent = grab_object( root ); + } + else + { + if (!name_tmp.len || name_tmp.str[0] != '\\') + { + set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); + return NULL; + } + /* skip leading backslash */ + name_tmp.str++; + name_tmp.len -= sizeof(WCHAR); + parent = get_root_directory(); + } + + if (!name_tmp.len) goto done; + + while ((obj = parent->ops->lookup_name( parent, &name_tmp, attr ))) + { + /* move to the next element */ + release_object ( parent ); + parent = obj; + } + if (get_error()) + { + release_object( parent ); + return NULL; + } + + done: + if (name_left) *name_left = name_tmp; + return parent; +} + void *create_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name ) { struct object *obj; diff --git a/server/object.h b/server/object.h index c4bc40b..90112d7 100644 --- a/server/object.h +++ b/server/object.h @@ -132,6 +132,8 @@ extern void namespace_add( struct namespace *namespace, struct object_name *ptr extern const WCHAR *get_object_name( struct object *obj, data_size_t *len ); 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 void *create_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name ); extern void *create_named_object( struct object *parent, struct namespace *namespace, const struct object_ops *ops, @@ -225,6 +227,7 @@ extern void release_global_atom( struct winstation *winstation, atom_t atom ); /* directory functions */ +extern struct object *get_root_directory(void); extern struct directory *get_directory_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct object *find_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, struct unicode_str *name_left );

1 0

Francois Gouget : shell32/tests: Fix okShell()' s tracing so it takes todo and other flags into account.
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: a090eff243cd064dd7489727b455a76ceba2aec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a090eff243cd064dd7489727b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 6 09:11:10 2016 +0100 shell32/tests: Fix okShell()'s tracing so it takes todo and other flags into account. This also causes the ShellExecute() and association descriptions to be printed with each failing test. This makes the messages more readable in TestBot's abbreviated logs, at the cost of a lot more redundancy. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index fc27ed6..e62d3ed 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -348,30 +348,22 @@ static void dump_child_(const char* file, int line) ***/ static char shell_call[2048]; -static char assoc_desc[2048]; -static int shell_call_traced; static void WINETEST_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) { va_list valist; + char buffer[2048]; - /* Note: if winetest_debug > 1 the ShellExecute() command has already been - * traced. - */ - if (!condition && winetest_debug <= 1 && !shell_call_traced) - { - printf("Called %s\n", shell_call); - if (*assoc_desc) - printf("%s\n", assoc_desc); - shell_call_traced=1; - } - + strcpy(buffer, shell_call); + strcat(buffer, " "); va_start(valist, msg); - winetest_vok(condition, msg, valist); + vsprintf(buffer+strlen(buffer), msg, valist); va_end(valist); + winetest_ok(condition, "%s", buffer); } #define okShell_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : _okShell #define okShell okShell_(__FILE__, __LINE__) +static char assoc_desc[2048]; void reset_association_description(void) { *assoc_desc = '\0'; @@ -494,20 +486,15 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi if(!verb) rcEmpty = shell_execute_(file, line, "", filename, parameters, directory); - shell_call_traced=0; strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, "verb", verb); strcat_param(shell_call, "file", filename); strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); + strcat(shell_call, assoc_desc); if (winetest_debug > 1) - { trace_(file, line)("Called %s\n", shell_call); - if (*assoc_desc) - trace_(file, line)("%s\n", assoc_desc); - shell_call_traced=1; - } DeleteFileA(child_file); SetLastError(0xcafebabe); @@ -584,7 +571,6 @@ static INT_PTR shell_execute_ex_(const char* file, int line, /* Add some flags so we can wait for the child process */ mask |= SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE; - shell_call_traced=0; strcpy(shell_call, "ShellExecuteEx("); sprintf(smask, "0x%x", mask); strcat_param(shell_call, "mask", smask); @@ -594,13 +580,9 @@ static INT_PTR shell_execute_ex_(const char* file, int line, strcat_param(shell_call, "dir", directory); strcat_param(shell_call, "class", class); strcat(shell_call, ")"); + strcat(shell_call, assoc_desc); if (winetest_debug > 1) - { trace_(file, line)("Called %s\n", shell_call); - if (*assoc_desc) - trace_(file, line)("%s\n", assoc_desc); - shell_call_traced=1; - } sei.cbSize=sizeof(sei); sei.fMask=mask; @@ -800,7 +782,7 @@ static void create_test_verb_dde(const char* extension, const char* verb, char* cmd; LONG rc; - strcpy(assoc_desc, "Assoc "); + strcpy(assoc_desc, " Assoc "); strcat_param(assoc_desc, "ext", extension); strcat_param(assoc_desc, "verb", verb); sprintf(shell, "%d", rawcmd);

1 0

Marcus Meissner : ntdll: Cast left shifted 1 to be ulong wide (Coverity).
by Alexandre Julliard 08 Feb '16

08 Feb '16

Module: wine Branch: master Commit: de853e2b65e54593e247c1eeac50738078abd386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de853e2b65e54593e247c1eea… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 6 15:30:59 2016 +0100 ntdll: Cast left shifted 1 to be ulong wide (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 9b750e4..5c8b7fd 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1520,7 +1520,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** fclose(f); } else r = 0; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorPackage, r, 1 << i)) + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorPackage, r, (ULONG_PTR)1 << i)) { fclose(fcpu_list); return STATUS_NO_MEMORY; @@ -1534,7 +1534,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** fclose(f); } else r = i; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, 1 << i)) + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, (ULONG_PTR)1 << i)) { fclose(fcpu_list); return STATUS_NO_MEMORY;

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
76
Older →

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 February 2016