September 2018 - Wine-commits

Nikolay Sivov : opcservices: Improve parameter validation in CreateRelationship().
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 65aa7242d27081becc47add43072a023c8c972ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=65aa7242d27081becc47add4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 20 10:09:12 2018 +0300 opcservices: Improve parameter validation in CreateRelationship(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 10 ++++++++++ dlls/opcservices/tests/opcservices.c | 9 ++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 074f3c8..e526ebf 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1301,13 +1301,23 @@ static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSe const WCHAR *type, IUri *target_uri, OPC_URI_TARGET_MODE target_mode, IOpcRelationship **relationship) { struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); + DWORD length; TRACE("iface %p, id %s, type %s, target_uri %p, target_mode %d, relationship %p.\n", iface, debugstr_w(id), debugstr_w(type), target_uri, target_mode, relationship); + if (!relationship) + return E_POINTER; + + *relationship = NULL; + if (!type || !target_uri) return E_POINTER; + if (IUri_GetPropertyLength(target_uri, Uri_PROPERTY_SCHEME_NAME, &length, 0) == S_OK && length != 0 + && target_mode == OPC_URI_TARGET_MODE_INTERNAL) + return OPC_E_INVALID_RELATIONSHIP_TARGET; + return opc_relationship_create(relationship_set, id, type, target_uri, target_mode, relationship); } diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 764dca1..c5c8ee2 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -362,21 +362,24 @@ static void test_relationship(void) hr = IOpcPackage_GetRelationshipSet(package, &rels); ok(SUCCEEDED(hr), "Failed to get part set, hr %#x.\n", hr); + rel = (void *)0xdeadbeef; hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, NULL, NULL, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(rel == NULL, "Unexpected instance %p.\n", rel); + rel = (void *)0xdeadbeef; hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, NULL, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(rel == NULL, "Unexpected instance %p.\n", rel); hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, NULL, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); /* Absolute target uri with internal mode */ + rel = (void *)0xdeadbeef; hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri2, OPC_URI_TARGET_MODE_INTERNAL, &rel); -todo_wine ok(hr == OPC_E_INVALID_RELATIONSHIP_TARGET, "Unexpected hr %#x.\n", hr); - if (hr == S_OK) - IOpcRelationship_Release(rel); + ok(rel == NULL, "Unexpected instance %p.\n", rel); hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr);

1 0

Nikolay Sivov : opcservices: Enforce unique relationship id.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 5efe50e4d9b75b12c3255bcb3f195aa33a8d9cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5efe50e4d9b75b12c3255bcb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 20 10:09:13 2018 +0300 opcservices: Enforce unique relationship id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 44 ++++++++++++++++++++++-------------- dlls/opcservices/tests/opcservices.c | 12 +++++++--- include/opcbase.idl | 1 + 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index e526ebf..22bf793 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1160,6 +1160,20 @@ static const IOpcRelationshipVtbl opc_relationship_vtbl = opc_relationship_GetTargetMode, }; +static struct opc_relationship *opc_relationshipset_get_rel(struct opc_relationship_set *relationship_set, + const WCHAR *id) +{ + size_t i; + + for (i = 0; i < relationship_set->count; i++) + { + if (!strcmpW(id, relationship_set->relationships[i]->id)) + return relationship_set->relationships[i]; + } + + return NULL; +} + static HRESULT opc_relationship_create(struct opc_relationship_set *set, const WCHAR *id, const WCHAR *type, IUri *target_uri, OPC_URI_TARGET_MODE target_mode, IOpcRelationship **out) { @@ -1179,7 +1193,6 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W relationship->source_uri = set->source_uri; IOpcUri_AddRef(relationship->source_uri); - /* FIXME: test that id is unique */ if (id) relationship->id = opc_strdupW(id); else @@ -1190,8 +1203,16 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W static const WCHAR fmtW[] = {'R','%','0','8','X',0}; DWORD generated; + /* FIXME: test that generated id is unique */ RtlGenRandom(&generated, sizeof(generated)); sprintfW(relationship->id, fmtW, generated); + + if (opc_relationshipset_get_rel(set, relationship->id)) + { + WARN("Newly generated id %s already exists.\n", debugstr_w(relationship->id)); + IOpcRelationship_Release(&relationship->IOpcRelationship_iface); + return E_FAIL; + } } } @@ -1258,20 +1279,6 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) return refcount; } -static struct opc_relationship *opc_relationshipset_get_item(struct opc_relationship_set *relationship_set, - const WCHAR *id) -{ - size_t i; - - for (i = 0; i < relationship_set->count; i++) - { - if (!strcmpW(id, relationship_set->relationships[i]->id)) - return relationship_set->relationships[i]; - } - - return NULL; -} - static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, IOpcRelationship **relationship) { @@ -1288,7 +1295,7 @@ static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet * if (!id) return E_POINTER; - if ((ret = opc_relationshipset_get_item(relationship_set, id))) + if ((ret = opc_relationshipset_get_rel(relationship_set, id))) { *relationship = &ret->IOpcRelationship_iface; IOpcRelationship_AddRef(*relationship); @@ -1314,6 +1321,9 @@ static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSe if (!type || !target_uri) return E_POINTER; + if (id && opc_relationshipset_get_rel(relationship_set, id)) + return OPC_E_DUPLICATE_RELATIONSHIP; + if (IUri_GetPropertyLength(target_uri, Uri_PROPERTY_SCHEME_NAME, &length, 0) == S_OK && length != 0 && target_mode == OPC_URI_TARGET_MODE_INTERNAL) return OPC_E_INVALID_RELATIONSHIP_TARGET; @@ -1337,7 +1347,7 @@ static HRESULT WINAPI opc_relationship_set_RelationshipExists(IOpcRelationshipSe if (!id || !exists) return E_POINTER; - *exists = opc_relationshipset_get_item(relationship_set, id) != NULL; + *exists = opc_relationshipset_get_rel(relationship_set, id) != NULL; return S_OK; } diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index c5c8ee2..2ef5677 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -384,14 +384,20 @@ static void test_relationship(void) hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); - hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel2); - ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); - /* Autogenerated relationship id */ hr = IOpcRelationship_GetId(rel, &id); ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + hr = IOpcRelationshipSet_CreateRelationship(rels, id, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel2); + ok(hr == OPC_E_DUPLICATE_RELATIONSHIP, "Failed to create relationship, hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(rels, id, typeW, target_uri2, OPC_URI_TARGET_MODE_INTERNAL, &rel2); + ok(hr == OPC_E_DUPLICATE_RELATIONSHIP, "Failed to create relationship, hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel2); + ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + ret = 123; hr = IOpcRelationshipSet_RelationshipExists(rels, NULL, &ret); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); diff --git a/include/opcbase.idl b/include/opcbase.idl index d850753..3df2df8 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -45,6 +45,7 @@ cpp_quote("#define OPC_E_NONCONFORMING_URI MAKE_HRESULT(SEVERITY_ERROR, FACILITY cpp_quote("#define OPC_E_RELATIONSHIP_URI_REQUIRED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x3)") cpp_quote("#define OPC_E_DUPLICATE_PART MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0xb)") cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") +cpp_quote("#define OPC_E_DUPLICATE_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x13)") cpp_quote("#define OPC_E_NO_SUCH_PART MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x18)") cpp_quote("#define OPC_E_NO_SUCH_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x48)") cpp_quote("#define OPC_E_ENUM_COLLECTION_CHANGED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x50)")

1 0

Nikolay Sivov : opcservices: Initialize archive write position.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: f5156fd44412a5bb89c4e1393acbe7b713209f8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5156fd44412a5bb89c4e139… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 20 10:09:14 2018 +0300 opcservices: Initialize archive write position. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/compress.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index 0f4555b..cf49f17 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -134,6 +134,7 @@ HRESULT compress_create_archive(IStream *output, struct zip_archive **out) archive->output = output; IStream_AddRef(archive->output); + archive->position = 0; GetSystemTimeAsFileTime(&ft); FileTimeToDosDateTime(&ft, &date, &time);

1 0

Nikolay Sivov : opcservices: Fix relationship stream names.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 1b55ac75097a436d460c17b20bf558ac0edd2460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b55ac75097a436d460c17b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 20 10:09:15 2018 +0300 opcservices: Fix relationship stream names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 22bf793..d7467a5 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1888,7 +1888,10 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations if (SUCCEEDED(hr)) hr = IOpcPartUri_GetRawUri(rels_uri, &rels_part_uri); if (SUCCEEDED(hr)) - hr = compress_add_file(archive, rels_part_uri, content, OPC_COMPRESSION_NORMAL); + { + /* Relationship part names always start with root '/', skip it. */ + hr = compress_add_file(archive, rels_part_uri + 1, content, OPC_COMPRESSION_NORMAL); + } SysFreeString(rels_part_uri); IStream_Release(content);

1 0

Huw Davies : setupapi: For consistency use __x86_64__ instead of __x86_64.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: a6d89db61566b5dcccd66cb1cb5a51dfa0cc0f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d89db61566b5dcccd66cb1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 20 10:16:05 2018 +0100 setupapi: For consistency use __x86_64__ instead of __x86_64. Spotted by Ken Thomases. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 2 +- dlls/setupapi/query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 5b2d4b8..1453f52 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1200,7 +1200,7 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I { #ifdef __i386__ static const WCHAR nt_platformW[] = {'.','n','t','x','8','6',0}; -#elif defined(__x86_64) +#elif defined(__x86_64__) static const WCHAR nt_platformW[] = {'.','n','t','a','m','d','6','4',0}; #else /* FIXME: other platforms */ static const WCHAR nt_platformW[] = {'.','n','t',0}; diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 627c543..ba6d01d 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -38,7 +38,7 @@ static const WCHAR source_disks_names_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','x','8','6',0}; static const WCHAR source_disks_files_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','x','8','6',0}; -#elif defined(__x86_64) +#elif defined(__x86_64__) static const WCHAR source_disks_names_platform[] = {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; static const WCHAR source_disks_files_platform[] =

1 0

Alexandre Julliard : server: Align object attributes to a DWORD-boundary.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: be40b01c37fdda79bead85eb21ad3e8de961c55a URL: https://source.winehq.org/git/wine.git/?a=commit;h=be40b01c37fdda79bead85eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 12:59:32 2018 +0200 server: Align object attributes to a DWORD-boundary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 2 ++ include/wine/server_protocol.h | 2 +- server/request.c | 9 ++++----- server/trace.c | 3 +-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 8e406ce..bb462f2 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -114,6 +114,8 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a } else if (attr->RootDirectory) return STATUS_OBJECT_NAME_INVALID; + len = (len + 3) & ~3; /* DWORD-align the entire structure */ + *ret = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); if (!*ret) return STATUS_NO_MEMORY; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0b61b91..24eb95b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -6535,6 +6535,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 559 +#define SERVER_PROTOCOL_VERSION 560 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/request.c b/server/request.c index 77f4f71..2dd84fb 100644 --- a/server/request.c +++ b/server/request.c @@ -214,16 +214,15 @@ const struct object_attributes *get_req_object_attributes( const struct security /* return a pointer to the request data following an object attributes structure */ const void *get_req_data_after_objattr( const struct object_attributes *attr, data_size_t *len ) { - const void *ptr; + data_size_t size = (sizeof(*attr) + (attr->sd_len & ~1) + (attr->name_len & ~1) + 3) & ~3; - if (attr == &empty_attributes) + if (attr == &empty_attributes || size >= get_req_data_size()) { *len = 0; return NULL; } - ptr = (const WCHAR *)(attr + 1) + attr->sd_len / sizeof(WCHAR) + attr->name_len / sizeof(WCHAR); - *len = get_req_data_size() - ((const char *)ptr - (const char *)get_req_data()); - return ptr; + *len = get_req_data_size() - size; + return (const char *)get_req_data() + size; } /* write the remaining part of the reply */ diff --git a/server/trace.c b/server/trace.c index 3c0d592..1a28cac 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1119,8 +1119,7 @@ static void dump_varargs_object_attributes( const char *prefix, data_size_t size fprintf( stderr, ",name=L\"" ); dump_strW( str, objattr->name_len / sizeof(WCHAR), stderr, "\"\"" ); fputc( '\"', stderr ); - remove_data( ((sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR) + - (objattr->name_len / sizeof(WCHAR)) * sizeof(WCHAR) ); + remove_data( (sizeof(*objattr) + (objattr->sd_len & ~1) + (objattr->name_len & ~1) + 3) & ~3 ); } fputc( '}', stderr ); }

1 0

Alexandre Julliard : server: Allow specifying the security descriptor for a new thread.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 4a328e08aca20a46ecbee634ffba873e0ab29b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a328e08aca20a46ecbee634… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 13:06:12 2018 +0200 server: Allow specifying the security descriptor for a new thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 2 +- dlls/ntdll/thread.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 5 ++--- include/winternl.h | 2 +- server/process.c | 2 +- server/protocol.def | 2 +- server/request.h | 7 +++---- server/thread.c | 19 ++++++++++++++++--- server/thread.h | 3 ++- server/trace.c | 2 +- 10 files changed, 45 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a328e08aca20a46ecbe…

1 0

Alexandre Julliard : server: Move initial thread creation out of the create_process() function.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: af8f3ae3339336ff23acad5cdaf8d39812146e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8f3ae3339336ff23acad5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 13:18:19 2018 +0200 server: Move initial thread creation out of the create_process() function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 55 +++++++++++++++++++------------------------------------ server/process.h | 2 +- server/request.c | 7 ++++++- server/thread.c | 18 ++++++++++++++++++ 4 files changed, 44 insertions(+), 38 deletions(-) diff --git a/server/process.c b/server/process.c index 8b808de..0698887 100644 --- a/server/process.c +++ b/server/process.c @@ -232,16 +232,6 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi static void add_job_process( struct job *job, struct process *process ) { - if (!process->running_threads) - { - set_error( STATUS_PROCESS_IS_TERMINATING ); - return; - } - if (process->job) - { - set_error( STATUS_ACCESS_DENIED ); - return; - } process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); job->num_processes++; @@ -493,13 +483,11 @@ static void start_sigkill_timer( struct process *process ) process_died( process ); } -/* create a new process and its main thread */ +/* create a new process */ /* if the function fails the fd is closed */ -struct thread *create_process( int fd, struct thread *parent_thread, int inherit_all ) +struct process *create_process( int fd, struct thread *parent_thread, int inherit_all ) { struct process *process; - struct thread *thread = NULL; - int request_pipe[2]; if (!(process = alloc_object( &process_ops ))) { @@ -577,24 +565,8 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit if (!token_assign_label( process->token, security_high_label_sid )) goto error; - /* create the main thread */ - if (pipe( request_pipe ) == -1) - { - file_set_error(); - goto error; - } - if (send_client_fd( process, request_pipe[1], SERVER_PROTOCOL_VERSION ) == -1) - { - close( request_pipe[0] ); - close( request_pipe[1] ); - goto error; - } - close( request_pipe[1] ); - if (!(thread = create_thread( request_pipe[0], process, NULL ))) goto error; - set_fd_events( process->msg_fd, POLLIN ); /* start listening to events */ - release_object( process ); - return thread; + return process; error: if (process) release_object( process ); @@ -1090,7 +1062,7 @@ DECL_HANDLER(new_process) { struct startup_info *info; struct thread *thread; - struct process *process; + struct process *process = NULL; struct process *parent = current->process; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); @@ -1127,7 +1099,11 @@ DECL_HANDLER(new_process) if (!req->info_size) /* create an orphaned process */ { - create_process( socket_fd, NULL, 0 ); + if ((process = create_process( socket_fd, NULL, 0 ))) + { + create_thread( -1, process, NULL ); + release_object( process ); + } return; } @@ -1189,8 +1165,9 @@ DECL_HANDLER(new_process) #undef FIXUP_LEN } - if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; - process = thread->process; + if (!(process = create_process( socket_fd, current, req->inherit_all ))) goto done; + if (!(thread = create_thread( -1, process, NULL ))) goto done; + process->startup_info = (struct startup_info *)grab_object( info ); if (parent->job @@ -1252,6 +1229,7 @@ DECL_HANDLER(new_process) reply->thandle = alloc_handle( parent, thread, req->thread_access, req->thread_attr ); done: + if (process) release_object( process ); release_object( info ); } @@ -1618,7 +1596,12 @@ DECL_HANDLER(assign_job) if ((process = get_process_from_handle( req->process, PROCESS_SET_QUOTA | PROCESS_TERMINATE ))) { - add_job_process( job, process ); + if (!process->running_threads) + set_error( STATUS_PROCESS_IS_TERMINATING ); + else if (process->job) + set_error( STATUS_ACCESS_DENIED ); + else + add_job_process( job, process ); release_object( process ); } release_object( job ); diff --git a/server/process.h b/server/process.h index f22c128..c9d00aa 100644 --- a/server/process.h +++ b/server/process.h @@ -114,7 +114,7 @@ struct process_snapshot extern unsigned int alloc_ptid( void *ptr ); extern void free_ptid( unsigned int id ); extern void *get_ptid_entry( unsigned int id ); -extern struct thread *create_process( int fd, struct thread *parent_thread, int inherit_all ); +extern struct process *create_process( int fd, struct thread *parent_thread, int inherit_all ); extern data_size_t init_process( struct thread *thread ); extern struct thread *get_process_first_thread( struct process *process ); extern struct process *get_process_from_id( process_id_t id ); diff --git a/server/request.c b/server/request.c index 2dd84fb..40f532b8 100644 --- a/server/request.c +++ b/server/request.c @@ -571,12 +571,17 @@ static void master_socket_poll_event( struct fd *fd, int event ) } else if (event & POLLIN) { + struct process *process; struct sockaddr_un dummy; socklen_t len = sizeof(dummy); int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); - create_process( client, NULL, 0 ); + if ((process = create_process( client, NULL, 0 ))) + { + create_thread( -1, process, NULL ); + release_object( process ); + } } } diff --git a/server/thread.c b/server/thread.c index 9ee846d..d671377 100644 --- a/server/thread.c +++ b/server/thread.c @@ -221,6 +221,24 @@ static inline int is_valid_address( client_ptr_t addr ) struct thread *create_thread( int fd, struct process *process, const struct security_descriptor *sd ) { struct thread *thread; + int request_pipe[2]; + + if (fd == -1) + { + if (pipe( request_pipe ) == -1) + { + file_set_error(); + return NULL; + } + if (send_client_fd( process, request_pipe[1], SERVER_PROTOCOL_VERSION ) == -1) + { + close( request_pipe[0] ); + close( request_pipe[1] ); + return NULL; + } + close( request_pipe[1] ); + fd = request_pipe[0]; + } if (process->is_terminating) {

1 0

Alexandre Julliard : server: Specify the process in which to create a new thread.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 0fd450af5bad816f7134b5ce6a5b81fb7b962b44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd450af5bad816f7134b5ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 13:19:49 2018 +0200 server: Specify the process in which to create a new thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 1 + include/wine/server_protocol.h | 4 +++- server/protocol.def | 3 ++- server/request.h | 9 +++++---- server/thread.c | 31 +++++++++++++++++++++++++++---- server/trace.c | 3 ++- 6 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7fa087d..8171638 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -605,6 +605,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, SERVER_START_REQ( new_thread ) { + req->process = wine_server_obj_handle( process ); req->access = THREAD_ALL_ACCESS; req->suspend = suspended; req->request_fd = request_pipe[0]; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d31a1d4..02734bc 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -766,10 +766,12 @@ struct get_new_process_info_reply struct new_thread_request { struct request_header __header; + obj_handle_t process; unsigned int access; int suspend; int request_fd; /* VARARG(objattr,object_attributes); */ + char __pad_28[4]; }; struct new_thread_reply { @@ -6534,6 +6536,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 561 +#define SERVER_PROTOCOL_VERSION 562 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 46669d6..1c2e130 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -766,8 +766,9 @@ struct rawinput_device @END -/* Create a new thread from the context of the parent */ +/* Create a new thread */ @REQ(new_thread) + obj_handle_t process; /* process in which to create thread */ unsigned int access; /* wanted access rights */ int suspend; /* new thread should be suspended on creation */ int request_fd; /* fd for request pipe */ diff --git a/server/request.h b/server/request.h index ff2da53..d7a4c8d 100644 --- a/server/request.h +++ b/server/request.h @@ -752,10 +752,11 @@ C_ASSERT( sizeof(struct get_new_process_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_reply, success) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_reply, exit_code) == 12 ); C_ASSERT( sizeof(struct get_new_process_info_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct new_thread_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct new_thread_request, suspend) == 16 ); -C_ASSERT( FIELD_OFFSET(struct new_thread_request, request_fd) == 20 ); -C_ASSERT( sizeof(struct new_thread_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct new_thread_request, process) == 12 ); +C_ASSERT( FIELD_OFFSET(struct new_thread_request, access) == 16 ); +C_ASSERT( FIELD_OFFSET(struct new_thread_request, suspend) == 20 ); +C_ASSERT( FIELD_OFFSET(struct new_thread_request, request_fd) == 24 ); +C_ASSERT( sizeof(struct new_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct new_thread_reply, tid) == 8 ); C_ASSERT( FIELD_OFFSET(struct new_thread_reply, handle) == 12 ); C_ASSERT( sizeof(struct new_thread_reply) == 16 ); diff --git a/server/thread.c b/server/thread.c index d671377..7162fc3 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1271,19 +1271,40 @@ unsigned int get_supported_cpu_mask(void) DECL_HANDLER(new_thread) { struct thread *thread; + struct process *process; struct unicode_str name; const struct security_descriptor *sd; const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); int request_fd = thread_get_inflight_fd( current, req->request_fd ); - if (request_fd == -1 || fcntl( request_fd, F_SETFL, O_NONBLOCK ) == -1) + if (!(process = get_process_from_handle( req->process, PROCESS_CREATE_THREAD ))) { if (request_fd != -1) close( request_fd ); - set_error( STATUS_INVALID_HANDLE ); return; } - if ((thread = create_thread( request_fd, current->process, sd ))) + if (process != current->process) + { + if (request_fd != -1) /* can't create a request fd in a different process */ + { + close( request_fd ); + set_error( STATUS_INVALID_PARAMETER ); + goto done; + } + if (process->running_threads) /* only the initial thread can be created in another process */ + { + set_error( STATUS_ACCESS_DENIED ); + goto done; + } + } + else if (request_fd == -1 || fcntl( request_fd, F_SETFL, O_NONBLOCK ) == -1) + { + if (request_fd != -1) close( request_fd ); + set_error( STATUS_INVALID_HANDLE ); + goto done; + } + + if ((thread = create_thread( request_fd, process, sd ))) { thread->system_regs = current->system_regs; if (req->suspend) thread->suspend++; @@ -1292,10 +1313,12 @@ DECL_HANDLER(new_thread) req->access, objattr->attributes ))) { /* thread object will be released when the thread gets killed */ - return; + goto done; } kill_thread( thread, 1 ); } +done: + release_object( process ); } /* initialize a new thread */ diff --git a/server/trace.c b/server/trace.c index 3054a18..a419ddf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1261,7 +1261,8 @@ static void dump_get_new_process_info_reply( const struct get_new_process_info_r static void dump_new_thread_request( const struct new_thread_request *req ) { - fprintf( stderr, " access=%08x", req->access ); + fprintf( stderr, " process=%04x", req->process ); + fprintf( stderr, ", access=%08x", req->access ); fprintf( stderr, ", suspend=%d", req->suspend ); fprintf( stderr, ", request_fd=%d", req->request_fd ); dump_varargs_object_attributes( ", objattr=", cur_size );

1 0

Alexandre Julliard : server: Create the initial thread as a separate request.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 39afcaac4a7a713188c5c23f5fe5114fc360c8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39afcaac4a7a713188c5c23f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 13:26:35 2018 +0200 server: Create the initial thread as a separate request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 1 - dlls/kernel32/process.c | 98 ++++++++++++++++++++++++++++++++++++++---- include/wine/server_protocol.h | 16 +++---- server/process.c | 9 +--- server/protocol.def | 10 ++--- server/request.h | 18 +++----- server/trace.c | 10 ++--- 7 files changed, 110 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39afcaac4a7a713188c5…

1 0