January 2016 - Wine-commits

Alexandre Julliard : server: Pass full object attributes in the create_key request.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: d01deff9cf6ad791b3335c4925a3ba3db8b916f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01deff9cf6ad791b3335c492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 15:03:37 2016 +0900 server: Pass full object attributes in the create_key request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 11 +++++++---- include/wine/server_protocol.h | 8 +++----- server/protocol.def | 5 +---- server/registry.c | 37 +++++++++++++++++++------------------ server/request.h | 9 +++------ server/trace.c | 7 ++----- 6 files changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index be95a2a..ed9d155 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -56,6 +56,8 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT PULONG dispos ) { NTSTATUS ret; + data_size_t len; + struct object_attributes *objattr; if (!retkey || !attr) return STATUS_ACCESS_VIOLATION; if (attr->Length > sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER; @@ -64,14 +66,13 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT TRACE( "(%p,%s,%s,%x,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), debugstr_us(class), options, access, retkey ); + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + SERVER_START_REQ( create_key ) { - req->parent = wine_server_obj_handle( attr->RootDirectory ); req->access = access; - req->attributes = attr->Attributes; req->options = options; - req->namelen = attr->ObjectName->Length; - wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + wine_server_add_data( req, objattr, len ); if (class) wine_server_add_data( req, class->Buffer, class->Length ); if (!(ret = wine_server_call( req ))) { @@ -80,7 +81,9 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT } } SERVER_END_REQ; + TRACE("<- %p\n", *retkey); + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 19ea2fc..caa2dc9 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2393,13 +2393,11 @@ struct write_process_memory_reply struct create_key_request { struct request_header __header; - obj_handle_t parent; unsigned int access; - unsigned int attributes; unsigned int options; - data_size_t namelen; - /* VARARG(name,unicode_str,namelen); */ + /* VARARG(objattr,object_attributes); */ /* VARARG(class,unicode_str); */ + char __pad_20[4]; }; struct create_key_reply { @@ -6159,6 +6157,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 497 +#define SERVER_PROTOCOL_VERSION 498 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 390651d..a391c88 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1820,12 +1820,9 @@ enum char_info_mode /* Create a registry key */ @REQ(create_key) - obj_handle_t parent; /* handle to the parent key */ unsigned int access; /* desired access rights */ - unsigned int attributes; /* object attributes */ unsigned int options; /* creation options */ - data_size_t namelen; /* length of key name in bytes */ - VARARG(name,unicode_str,namelen); /* key name */ + VARARG(objattr,object_attributes); /* object attributes */ VARARG(class,unicode_str); /* class name */ @REPLY obj_handle_t hkey; /* handle to the created key */ diff --git a/server/registry.c b/server/registry.c index a3c1390..adf2892 100644 --- a/server/registry.c +++ b/server/registry.c @@ -759,7 +759,8 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un /* create a subkey */ static struct key *create_key( struct key *key, const struct unicode_str *name, const struct unicode_str *class, unsigned int options, - unsigned int access, unsigned int attributes, int *created ) + unsigned int access, unsigned int attributes, + const struct security_descriptor *sd, int *created ) { int index; struct unicode_str token, next; @@ -807,6 +808,9 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, if (options & REG_OPTION_VOLATILE) key->flags |= KEY_VOLATILE; else key->flags |= KEY_DIRTY; + if (sd) default_set_sd( &key->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); + if (debug_level > 1) dump_operation( key, NULL, "Create" ); if (class && class->len) { @@ -2021,33 +2025,30 @@ DECL_HANDLER(create_key) struct key *key = NULL, *parent; struct unicode_str name, class; unsigned int access = req->access; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); + + if (!objattr) return; if (!is_wow64_thread( current )) access = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY; - reply->hkey = 0; + class.str = get_req_data_after_objattr( objattr, &class.len ); + class.len = (class.len / sizeof(WCHAR)) * sizeof(WCHAR); - if (req->namelen > get_req_data_size()) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - class.str = (const WCHAR *)get_req_data() + req->namelen / sizeof(WCHAR); - class.len = ((get_req_data_size() - req->namelen) / sizeof(WCHAR)) * sizeof(WCHAR); - get_req_path( &name, !req->parent ); - if (name.str > class.str) + if (!objattr->rootdir && name.len >= sizeof(root_name) && + !memicmpW( name.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) { - set_error( STATUS_INVALID_PARAMETER ); - return; + name.str += sizeof(root_name)/sizeof(WCHAR); + name.len -= sizeof(root_name); } - name.len = (class.str - name.str) * sizeof(WCHAR); /* NOTE: no access rights are required from the parent handle to create a key */ - if ((parent = get_parent_hkey_obj( req->parent ))) + if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { if ((key = create_key( parent, &name, &class, req->options, access, - req->attributes, &reply->created ))) + objattr->attributes, sd, &reply->created ))) { - reply->hkey = alloc_handle( current->process, key, access, req->attributes ); + reply->hkey = alloc_handle( current->process, key, access, objattr->attributes ); release_object( key ); } release_object( parent ); @@ -2194,7 +2195,7 @@ DECL_HANDLER(load_registry) { int dummy; get_req_path( &name, !req->hkey ); - if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, &dummy ))) + if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, NULL, &dummy ))) { load_registry( key, req->file ); release_object( key ); diff --git a/server/request.h b/server/request.h index caaa30e..87cae73 100644 --- a/server/request.h +++ b/server/request.h @@ -1287,12 +1287,9 @@ C_ASSERT( sizeof(struct read_process_memory_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct write_process_memory_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct write_process_memory_request, addr) == 16 ); C_ASSERT( sizeof(struct write_process_memory_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, parent) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, attributes) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, options) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, namelen) == 28 ); -C_ASSERT( sizeof(struct create_key_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct create_key_request, access) == 12 ); +C_ASSERT( FIELD_OFFSET(struct create_key_request, options) == 16 ); +C_ASSERT( sizeof(struct create_key_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_key_reply, hkey) == 8 ); C_ASSERT( FIELD_OFFSET(struct create_key_reply, created) == 12 ); C_ASSERT( sizeof(struct create_key_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index edbc8c9..89ecdfb 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2308,12 +2308,9 @@ static void dump_write_process_memory_request( const struct write_process_memory static void dump_create_key_request( const struct create_key_request *req ) { - fprintf( stderr, " parent=%04x", req->parent ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + fprintf( stderr, " access=%08x", req->access ); fprintf( stderr, ", options=%08x", req->options ); - fprintf( stderr, ", namelen=%u", req->namelen ); - dump_varargs_unicode_str( ", name=", min(cur_size,req->namelen) ); + dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_unicode_str( ", class=", cur_size ); }

1 0

Alexandre Julliard : server: Pass full object attributes in the load_registry request.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: b99d1525decf61c71586ffec3f835ae8d2ca2072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99d1525decf61c71586ffec3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 15:17:00 2016 +0900 server: Pass full object attributes in the load_registry request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 9 ++++++--- include/wine/server_protocol.h | 6 ++---- server/protocol.def | 3 +-- server/registry.c | 14 +++++++++++--- server/request.h | 5 ++--- server/trace.c | 5 ++--- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index ed9d155..c0e213a 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -660,6 +660,8 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil NTSTATUS ret; HANDLE hive; IO_STATUS_BLOCK io; + data_size_t len; + struct object_attributes *objattr; TRACE("(%p,%p)\n", attr, file); @@ -667,17 +669,18 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil FILE_OPEN, 0, NULL, 0); if (ret) return ret; + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + SERVER_START_REQ( load_registry ) { - req->hkey = wine_server_obj_handle( attr->RootDirectory ); req->file = wine_server_obj_handle( hive ); - wine_server_add_data(req, attr->ObjectName->Buffer, attr->ObjectName->Length); + wine_server_add_data( req, objattr, len ); ret = wine_server_call( req ); } SERVER_END_REQ; NtClose(hive); - + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index caa2dc9..753f8e3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2541,10 +2541,8 @@ struct delete_key_value_reply struct load_registry_request { struct request_header __header; - obj_handle_t hkey; obj_handle_t file; - /* VARARG(name,unicode_str); */ - char __pad_20[4]; + /* VARARG(objattr,object_attributes); */ }; struct load_registry_reply { @@ -6157,6 +6155,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 498 +#define SERVER_PROTOCOL_VERSION 499 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a391c88..08c5bc1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1916,9 +1916,8 @@ enum char_info_mode /* Load a registry branch from a file */ @REQ(load_registry) - obj_handle_t hkey; /* root key to load to */ obj_handle_t file; /* file to load from */ - VARARG(name,unicode_str); /* subkey name */ + VARARG(objattr,object_attributes); /* object attributes */ @END diff --git a/server/registry.c b/server/registry.c index adf2892..e1d66d3 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2184,6 +2184,8 @@ DECL_HANDLER(load_registry) { struct key *key, *parent; struct unicode_str name; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); if (!thread_single_check_privilege( current, &SeRestorePrivilege )) { @@ -2191,11 +2193,17 @@ DECL_HANDLER(load_registry) return; } - if ((parent = get_parent_hkey_obj( req->hkey ))) + if (!objattr->rootdir && name.len >= sizeof(root_name) && + !memicmpW( name.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) + { + name.str += sizeof(root_name)/sizeof(WCHAR); + name.len -= sizeof(root_name); + } + + if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { int dummy; - get_req_path( &name, !req->hkey ); - if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, NULL, &dummy ))) + if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, sd, &dummy ))) { load_registry( key, req->file ); release_object( key ); diff --git a/server/request.h b/server/request.h index 87cae73..d21a539 100644 --- a/server/request.h +++ b/server/request.h @@ -1336,9 +1336,8 @@ C_ASSERT( FIELD_OFFSET(struct enum_key_value_reply, namelen) == 16 ); C_ASSERT( sizeof(struct enum_key_value_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct delete_key_value_request, hkey) == 12 ); C_ASSERT( sizeof(struct delete_key_value_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct load_registry_request, hkey) == 12 ); -C_ASSERT( FIELD_OFFSET(struct load_registry_request, file) == 16 ); -C_ASSERT( sizeof(struct load_registry_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct load_registry_request, file) == 12 ); +C_ASSERT( sizeof(struct load_registry_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct unload_registry_request, hkey) == 12 ); C_ASSERT( sizeof(struct unload_registry_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct save_registry_request, hkey) == 12 ); diff --git a/server/trace.c b/server/trace.c index 89ecdfb..84ed113 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2411,9 +2411,8 @@ static void dump_delete_key_value_request( const struct delete_key_value_request static void dump_load_registry_request( const struct load_registry_request *req ) { - fprintf( stderr, " hkey=%04x", req->hkey ); - fprintf( stderr, ", file=%04x", req->file ); - dump_varargs_unicode_str( ", name=", cur_size ); + fprintf( stderr, " file=%04x", req->file ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_unload_registry_request( const struct unload_registry_request *req )

1 0

Alexandre Julliard : server: Fix constraints on the length of NT object names.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: cd6e9c38e441edd4a16f77c8e85a7b3bde1bb327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6e9c38e441edd4a16f77c8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 15:52:35 2016 +0900 server: Fix constraints on the length of NT object names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 9 +-- dlls/ntdll/sync.c | 6 +- dlls/ntdll/tests/om.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++ server/registry.c | 4 +- server/request.c | 8 +- 5 files changed, 215 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd6e9c38e441edd4a16f7…

1 0

Alex Henrie : winex11: Fix overflow in remove_startup_notification.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: e330c40df90c60845d3f62662a8fe738e4c78fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e330c40df90c60845d3f62662… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 18 23:52:10 2016 -0700 winex11: Fix overflow in remove_startup_notification. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 836e62c..4a047e2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -128,7 +128,7 @@ static void remove_startup_notification(Display *display, Window window) pos = snprintf(message, sizeof(message), "remove: ID="); message[pos++] = '"'; - for (i = 0; id[i] && pos < sizeof(message) - 2; i++) + for (i = 0; id[i] && pos < sizeof(message) - 3; i++) { if (id[i] == '"' || id[i] == '\\') message[pos++] = '\\';

1 0

Jactry Zeng : user32/tests: Fix a leak.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: e632187b1923f5ae9b406883c9b656d002edae4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e632187b1923f5ae9b406883c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jan 18 16:42:55 2016 +0800 user32/tests: Fix a leak. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 984076b..f2e3cea 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2457,7 +2457,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); size = DdeGetData(hdata, NULL, 0, 0); - ok((buffer = HeapAlloc(GetProcessHeap(), 0, size)) != NULL, "should not be null\n"); + ok((buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size)) != NULL, "should not be null\n"); rsize = DdeGetData(hdata, buffer, size, 0); ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", size, rsize, msg_index); @@ -2550,6 +2550,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok( 0, "Invalid message %u\n", msg_index ); break; } + HeapFree(GetProcessHeap(), 0, buffer); return (HDDEDATA) DDE_FACK; } case XTYP_DISCONNECT:

1 0

Francois Gouget : shell32/tests: Use the shell_execute{_ex}() call site for its traces and error messages.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 09dac2f48280e0064fe6fa25b8eda35e50ace729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dac2f48280e0064fe6fa25b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 18 03:23:41 2016 +0100 shell32/tests: Use the shell_execute{_ex}() call site for its traces and error messages. This makes it easier to match their internal test failures with the site of the real test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 64 ++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index cc6e06a..a1e797c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -67,7 +67,7 @@ static HANDLE dde_ready_event; * ShellExecute wrappers * ***/ -static void dump_child(void); +static void dump_child_(const char* file, int line); static HANDLE hEvent; static void init_event(const char* child_file) @@ -95,21 +95,21 @@ static int _todo_wait = 0; static char shell_call[2048]=""; static int bad_shellexecute = 0; -static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR directory) +static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR filename, LPCSTR parameters, LPCSTR directory) { INT_PTR rc, rcEmpty = 0; if(!verb) - rcEmpty = shell_execute("", file, parameters, directory); + rcEmpty = shell_execute_(file, line, "", filename, parameters, directory); strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", file); + strcat_param(shell_call, "file", filename); strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); if (winetest_debug > 1) - trace("%s\n", shell_call); + trace_(file, line)("Called %s\n", shell_call); DeleteFileA(child_file); SetLastError(0xcafebabe); @@ -118,7 +118,7 @@ static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR * association it displays the 'Open With' dialog and I could not find * a flag to prevent this. */ - rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_HIDE); + rc=(INT_PTR)ShellExecuteA(NULL, verb, filename, parameters, directory, SW_HIDE); if (rc > 32) { @@ -138,31 +138,36 @@ static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR } } if (!_todo_wait) - ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); + ok_(file, line)(wait_rc==WAIT_OBJECT_0 || rc <= 32, + "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); else todo_wine - ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); + ok_(file, line)(wait_rc==WAIT_OBJECT_0 || rc <= 32, + "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); } /* The child process may have changed the result file, so let profile * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (rc > 32) - dump_child(); + dump_child_(file, line); if(!verb) { if (rc != rcEmpty && rcEmpty == SE_ERR_NOASSOC) /* NT4 */ bad_shellexecute = 1; - ok(rc == rcEmpty || broken(rc != rcEmpty && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, - "%s Got different return value with empty string: %lu %lu\n", shell_call, rc, rcEmpty); + ok_(file, line)(rc == rcEmpty || broken(rc != rcEmpty && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, + "%s Got different return value with empty string: %lu %lu\n", shell_call, rc, rcEmpty); } return rc; } +#define shell_execute(verb, filename, parameters, directory) \ + shell_execute_(__FILE__, __LINE__, verb, filename, parameters, directory) -static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, - LPCSTR parameters, LPCSTR directory, - LPCSTR class) +static INT_PTR shell_execute_ex_(const char* file, int line, + DWORD mask, LPCSTR verb, LPCSTR filename, + LPCSTR parameters, LPCSTR directory, + LPCSTR class) { char smask[11]; SHELLEXECUTEINFOA sei; @@ -176,19 +181,19 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, sprintf(smask, "0x%x", mask); strcat_param(shell_call, "mask", smask); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", file); + strcat_param(shell_call, "file", filename); strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); strcat_param(shell_call, "class", class); strcat(shell_call, ")"); if (winetest_debug > 1) - trace("%s\n", shell_call); + trace_(file, line)("Called %s\n", shell_call); sei.cbSize=sizeof(sei); sei.fMask=mask; sei.hwnd=NULL; sei.lpVerb=verb; - sei.lpFile=file; + sei.lpFile=filename; sei.lpParameters=parameters; sei.lpDirectory=directory; sei.nShow=SW_SHOWNORMAL; @@ -204,8 +209,8 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, SetLastError(0xcafebabe); success=ShellExecuteExA(&sei); rc=(INT_PTR)sei.hInstApp; - ok((success && rc > 32) || (!success && rc <= 32), - "%s rc=%d and hInstApp=%ld is not allowed\n", shell_call, success, rc); + ok_(file, line)((success && rc > 32) || (!success && rc <= 32), + "%s rc=%d and hInstApp=%ld is not allowed\n", shell_call, success, rc); if (rc > 32) { @@ -213,27 +218,28 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, if (sei.hProcess!=NULL) { wait_rc=WaitForSingleObject(sei.hProcess, 5000); - ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); + ok_(file, line)(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); } wait_rc=WaitForSingleObject(hEvent, 5000); if (!_todo_wait) - ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); + ok_(file, line)(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); else todo_wine - ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); + ok_(file, line)(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); } else - ok(sei.hProcess==NULL, "%s returned a process handle %p\n", shell_call, sei.hProcess); + ok_(file, line)(sei.hProcess==NULL, "%s returned a process handle %p\n", shell_call, sei.hProcess); /* The child process may have changed the result file, so let profile * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (rc > 32) - dump_child(); + dump_child_(file, line); return rc; } - +#define shell_execute_ex(mask, verb, filename, parameters, directory, class) \ + shell_execute_ex_(__FILE__, __LINE__, mask, verb, filename, parameters, directory, class) /*** @@ -661,7 +667,7 @@ static char* getChildString(const char* sect, const char* key) return ret; } -static void dump_child(void) +static void dump_child_(const char* file, int line) { if (winetest_debug > 1) { @@ -670,14 +676,14 @@ static void dump_child(void) int i, c; str=getChildString("Arguments", "cmdlineA"); - trace("cmdlineA='%s'\n", str); + trace_(file, line)("cmdlineA='%s'\n", str); c=GetPrivateProfileIntA("Arguments", "argcA", -1, child_file); - trace("argcA=%d\n",c); + trace_(file, line)("argcA=%d\n",c); for (i=0;i<c;i++) { sprintf(key, "argvA%d", i); str=getChildString("Arguments", key); - trace("%s='%s'\n", key, str); + trace_(file, line)("%s='%s'\n", key, str); } } }

1 0

Aric Stewart : usp10: Rewrite ScriptXtoCP.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: c160ad9e89fd9488e1d81c668780a5e5488af599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c160ad9e89fd9488e1d81c668… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 18 07:50:44 2016 -0600 usp10: Rewrite ScriptXtoCP. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 107 +++++++++++++++- dlls/usp10/usp10.c | 311 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 318 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c160ad9e89fd9488e1d81…

1 0

Stefan Leichter : kernel32: Add stub for GetSystemPreferredUILanguages.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 1c3c9f06c517b6f5e35632d792b376c403ddb07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3c9f06c517b6f5e35632d79… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Sun Jan 17 10:00:51 2016 +0100 kernel32: Add stub for GetSystemPreferredUILanguages. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 26 ++++++++++++++++++++++ include/winnls.h | 1 + 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 60da5fe..bdbcbb8 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -23,7 +23,7 @@ @ stub GetProcessPreferredUILanguages @ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID @ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID -@ stub GetSystemPreferredUILanguages +@ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) kernel32.GetSystemPreferredUILanguages @ stdcall GetThreadLocale() kernel32.GetThreadLocale @ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) kernel32.GetThreadPreferredUILanguages @ stdcall GetThreadUILanguage() kernel32.GetThreadUILanguage diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index 3a29cb7..98ec923 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -24,7 +24,7 @@ @ stub GetProcessPreferredUILanguages @ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID @ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID -@ stub GetSystemPreferredUILanguages +@ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) kernel32.GetSystemPreferredUILanguages @ stdcall GetThreadLocale() kernel32.GetThreadLocale @ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) kernel32.GetThreadPreferredUILanguages @ stdcall GetThreadUILanguage() kernel32.GetThreadUILanguage diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9fecbd7..9171558 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -824,7 +824,7 @@ @ stdcall GetSystemFirmwareTable(long long ptr long) @ stdcall GetSystemInfo(ptr) @ stdcall GetSystemPowerStatus(ptr) -# @ stub GetSystemPreferredUILanguages +@ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) @ stdcall GetSystemRegistryQuota(ptr ptr) @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5e7ca90..8ecbb0c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1049,6 +1049,32 @@ INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) } /*********************************************************************** + * GetSystemPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) +{ + if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if ((flags & MUI_LANGUAGE_NAME) && (flags & MUI_LANGUAGE_ID)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (*size && !buffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + FIXME("(0x%x %p %p %p) stub\n", flags, count, buffer, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * GetUserDefaultUILanguage (KERNEL32.@) * * Get the default user interface language Id for the current user. diff --git a/include/winnls.h b/include/winnls.h index 4b4eb77..603c408 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -906,6 +906,7 @@ WINBASEAPI BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD); WINBASEAPI LANGID WINAPI GetSystemDefaultLangID(void); WINBASEAPI LCID WINAPI GetSystemDefaultLCID(void); WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); +WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); WINBASEAPI LCID WINAPI GetThreadLocale(void); WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT);

1 0

Stefan Leichter : kernel32/tests: Add tests for GetSystemPreferredUILanguages.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: cfaca5ea5c4edaaf537459120a06bafa1b37bc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfaca5ea5c4edaaf537459120… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Sun Jan 17 10:00:55 2016 +0100 kernel32/tests: Add tests for GetSystemPreferredUILanguages. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 201 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7b0212e..b760e9a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -97,6 +97,7 @@ static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); +static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static void InitFunctionPointers(void) { @@ -125,6 +126,7 @@ static void InitFunctionPointers(void) X(GetGeoInfoA); X(GetGeoInfoW); X(EnumSystemGeoID); + X(GetSystemPreferredUILanguages); #undef X } @@ -4559,6 +4561,204 @@ static void test_invariant(void) } } +static void test_GetSystemPreferredUILanguages(void) +{ + BOOL ret; + ULONG count, size, size_id, size_name, size_buffer; + WCHAR *buffer; + + + if (!pGetSystemPreferredUILanguages) + { + win_skip("GetSystemPreferredUILanguages is not available.\n"); + return; + } + + /* (in)valid first parameter */ + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(0, &count, NULL, &size); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_FULL_LANGUAGE, &count, NULL, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_FULL_LANGUAGE, &count, NULL, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_LANGUAGE_NAME, &count, NULL, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + + /* second parameter + * ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, NULL, NULL, &size); + * -> unhandled exception c0000005 + */ + + /* invalid third parameter */ + count = 0xdeadbeef; + size = 1; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* fourth parameter + * ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, NULL); + * -> unhandled exception c0000005 + */ + + count = 0xdeadbeef; + size_id = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); + + count = 0xdeadbeef; + size_name = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); + todo_wine + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + todo_wine + ok(size_name % 6 == 1, "Expected size (%d) %% 6 == 1\n", size_name); + + size_buffer = max(size_id, size_name); + if(!size_buffer) + { + skip("No vaild buffer size\n"); + return; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, size_buffer * sizeof(WCHAR)); + if (!buffer) + { + skip("Failed to allocate memory with size %d\n", size_buffer * sizeof(WCHAR)); + return; + } + + count = 0xdeadbeef; + size = size_buffer; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(0, &count, buffer, &size); + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + if (ret && size % 6 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = size_buffer; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); + if (ret && size % 5 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = size_buffer; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, buffer, &size); + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + if (ret && size % 5 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); + ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + if (ret && size % 6 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = 1; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = size_id -1; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = size_id -2; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(0, &count, buffer, &size); + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +} + START_TEST(locale) { InitFunctionPointers(); @@ -4600,6 +4800,7 @@ START_TEST(locale) test_GetGeoInfo(); test_EnumSystemGeoID(); test_invariant(); + test_GetSystemPreferredUILanguages(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Pierre Schweitzer : mpr: Implement WNetAddConnectionW(), WNetAddConnection2W(), WNetAddConnection3W().
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 092c60e98cec9956127145f7c8a5db88082ce7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092c60e98cec9956127145f7c… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Jan 16 09:47:59 2016 +0100 mpr: Implement WNetAddConnectionW(), WNetAddConnection2W(), WNetAddConnection3W(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index dd34969..941cada 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1500,11 +1500,12 @@ DWORD WINAPI WNetAddConnectionA( LPCSTR lpRemoteName, LPCSTR lpPassword, DWORD WINAPI WNetAddConnectionW( LPCWSTR lpRemoteName, LPCWSTR lpPassword, LPCWSTR lpLocalName ) { - FIXME( "(%s, %p, %s): stub\n", - debugstr_w(lpRemoteName), lpPassword, debugstr_w(lpLocalName) ); + NETRESOURCEW resourcesW; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + memset(&resourcesW, 0, sizeof(resourcesW)); + resourcesW.lpRemoteName = (LPWSTR)lpRemoteName; + resourcesW.lpLocalName = (LPWSTR)lpLocalName; + return WNetUseConnectionW(NULL, &resourcesW, lpPassword, NULL, 0, NULL, 0, NULL); } /********************************************************************* @@ -1528,11 +1529,8 @@ DWORD WINAPI WNetAddConnection2W( LPNETRESOURCEW lpNetResource, LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %s, 0x%08X): stub\n", - lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionW(NULL, lpNetResource, lpPassword, lpUserID, dwFlags, + NULL, 0, NULL); } /********************************************************************* @@ -1556,11 +1554,8 @@ DWORD WINAPI WNetAddConnection3W( HWND hwndOwner, LPNETRESOURCEW lpNetResource, LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %p, %s, 0x%08X), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags ); - - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + return WNetUseConnectionW(hwndOwner, lpNetResource, lpPassword, lpUserID, + dwFlags, NULL, 0, NULL); } /*****************************************************************

1 0