January 2007 - Wine-commits

Alexandre Julliard : widl: Add a few more fields in the stub descriptor.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 1a25936ca976f381d4588c1750acef4d3a3a8b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a25936ca976f381d4588c175… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:08:51 2007 +0100 widl: Add a few more fields in the stub descriptor. --- tools/widl/proxy.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3268e5d..2f71cd9 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -67,18 +67,31 @@ static int print_proxy( const char *form static void write_stubdescproto(void) { - print_proxy( "extern const MIDL_STUB_DESC Object_StubDesc;\n"); + print_proxy( "static const MIDL_STUB_DESC Object_StubDesc;\n"); print_proxy( "\n"); } static void write_stubdesc(void) { - print_proxy( "const MIDL_STUB_DESC Object_StubDesc = {\n"); - print_proxy( " 0,\n"); - print_proxy( " NdrOleAllocate,\n"); - print_proxy( " NdrOleFree,\n"); - print_proxy( " {0}, 0, 0, 0, 0,\n"); - print_proxy( " 0 /* __MIDL_TypeFormatString.Format */\n"); + print_proxy( "static const MIDL_STUB_DESC Object_StubDesc =\n{\n"); + indent++; + print_proxy( "0,\n"); + print_proxy( "NdrOleAllocate,\n"); + print_proxy( "NdrOleFree,\n"); + print_proxy( "{0}, 0, 0, 0, 0,\n"); + print_proxy( "__MIDL_TypeFormatString.Format,\n"); + print_proxy( "1, /* -error bounds_check flag */\n"); + print_proxy( "0x10001, /* Ndr library version */\n"); + print_proxy( "0,\n"); + print_proxy( "0x50100a4, /* MIDL Version 5.1.164 */\n"); + print_proxy( "0,\n"); + print_proxy( "0,\n"); + print_proxy( "0, /* notify & notify_flag routine table */\n"); + print_proxy( "1, /* Flags */\n"); + print_proxy( "0, /* Reserved3 */\n"); + print_proxy( "0, /* Reserved4 */\n"); + print_proxy( "0 /* Reserved5 */\n"); + indent--; print_proxy( "};\n"); print_proxy( "\n"); }

1 0

Alexandre Julliard : widl: Define __midl_proxy in the generated proxy code.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 9505b50ccf5aae050e0ab11c08b3a38f131be403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9505b50ccf5aae050e0ab11c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:09:03 2007 +0100 widl: Define __midl_proxy in the generated proxy code. --- tools/widl/proxy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 2f71cd9..c5a0532 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -107,6 +107,7 @@ static void init_proxy(ifref_list_t *ifa print_proxy( "#define __REQUIRED_RPCPROXY_H_VERSION__ 440\n"); print_proxy( "#endif /* __REDQ_RPCPROXY_H_VERSION__ */\n"); print_proxy( "\n"); + print_proxy( "#define __midl_proxy\n"); print_proxy( "#include \"objbase.h\"\n"); print_proxy( "#include \"rpcproxy.h\"\n"); print_proxy( "#ifndef __RPCPROXY_H_VERSION__\n");

1 0

Alexandre Julliard : widl: Avoid dependency on COBJMACROS in generated code .
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 2b9c01eed280958166242fd0a18f42514ee79224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9c01eed280958166242fd0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:09:14 2007 +0100 widl: Avoid dependency on COBJMACROS in generated code. --- tools/widl/proxy.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c5a0532..f3a32fb 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -401,9 +401,12 @@ static void gen_stub(type_t *iface, cons fprintf(proxy, "\n"); print_proxy(""); if (has_ret) fprintf(proxy, "_RetVal = "); - fprintf(proxy, "%s_", iface->name); - if (cas) fprintf(proxy, "%s_Stub", cas); - else write_name(proxy, def); + if (cas) fprintf(proxy, "%s_%s_Stub", iface->name, cas); + else + { + fprintf(proxy, "_This->lpVtbl->"); + write_name(proxy, def); + } fprintf(proxy, "(_This"); if (cur->args)

1 0

Alexandre Julliard : widl: Copy the UserMarshal support into the generic code.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 9f1e9ad326de7ab32c02a61f437eab9a2078668f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1e9ad326de7ab32c02a61f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 11:59:58 2007 +0100 widl: Copy the UserMarshal support into the generic code. --- tools/widl/typegen.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4b4f4cf..36a6228 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -159,6 +159,20 @@ void write_formatstringsdecl(FILE *f, in print_file(f, indent, "\n"); } +static int is_user_derived(const var_t *v) +{ + const type_t *type = v->type; + + if (v->attrs && is_attr( v->attrs, ATTR_WIREMARSHAL )) return 1; + + while (type) + { + if (type->attrs && is_attr( type->attrs, ATTR_WIREMARSHAL )) return 1; + type = type->ref; + } + return 0; +} + static inline int is_base_type(unsigned char type) { switch (type) @@ -1835,7 +1849,11 @@ void write_remoting_arguments(FILE *file rtype = type->type; - if (is_string_type(var->attrs, var->ptr_level, var->array)) + if (is_user_derived( var )) + { + print_phase_function(file, indent, "UserMarshal", phase, var->name, *type_offset); + } + else if (is_string_type(var->attrs, var->ptr_level, var->array)) { if (var->array && !is_conformant_array(var->array)) print_phase_function(file, indent, "NonConformantString", phase, var->name, *type_offset);

1 0

Alexandre Julliard : widl: Use the typegen function for marshalling/ unmarshalling in proxies.
by Alexandre Julliard 26 Jan '07

26 Jan '07

Module: wine Branch: master Commit: 9e6acf818f18acc269b48abeb63bc4c7a333f7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6acf818f18acc269b48abeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:00:42 2007 +0100 widl: Use the typegen function for marshalling/unmarshalling in proxies. --- tools/widl/proxy.c | 536 +++++----------------------------------------------- 1 files changed, 45 insertions(+), 491 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e6acf818f18acc269b48…

1 0

lostwages/ include/winehq.conf news/2007012501.xml
by Alexandre Julliard 25 Jan '07

25 Jan '07

ChangeSet ID: 30909 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/01/25 10:31:17 Modified files: include : winehq.conf Added files: news : 2007012501.xml Log message: Release 0.9.30 Patch: http://cvs.winehq.org/patch.py?id=30909 Old revision New revision Changes Path 1.52 1.53 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007012501.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.52 lostwages/include/winehq.conf:1.53 --- lostwages/include/winehq.conf:1.52 25 Jan 2007 16:31:17 -0000 +++ lostwages/include/winehq.conf 25 Jan 2007 16:31:17 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.29 +snapshot_date: 0.9.30 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007012501.xml diff -u -p /dev/null lostwages/news/2007012501.xml:1.1 --- /dev/null 25 Jan 2007 16:31:17 -0000 +++ lostwages/news/2007012501.xml 25 Jan 2007 16:31:17 -0000 @@ -0,0 +1,24 @@ +<news> +<date>January 25, 2007</date> +<title>Wine 0.9.30 Released</title> +<body> +<p>Wine 0.9.30 was released today, with the following main changes:</p> + +<ul> +<li>Many improvements to Direct3D shaders and state management.</li> +<li>Support for inter-process memory allocations.</li> +<li>OLE32 marshalling fixes.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.30.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.30">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.30.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 790e80b2981b906e09d6c3f610e9a0c710220e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=790e80b2981b906e09d6c3f61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 25 16:53:50 2007 +0100 Release 0.9.30. --- ANNOUNCE | 1089 ++++++++++++++++---------------- ChangeLog | 2086 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2650 insertions(+), 545 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=790e80b2981b906e09d6c…

1 0

Tag wine-0.9.30 : Alexandre Julliard : Release 0.9.30
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: refs/tags/wine-0.9.30 Tag: 026b1929e01e6a6311c28f33f7ee06ebf5cbe57d URL: http://source.winehq.org/git/wine.git/?a=tag;h=026b1929e01e6a6311c28f33f7ee… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 25 16:53:50 2007 +0100 Release 0.9.30

1 0

Vitaliy Margolen : server/ntdll: Simplistic implementation of NtQueryObject (ObjectBasicInformation).
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: bae75024a430dd4486e4f5d7861cf8d6d4b85990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae75024a430dd4486e4f5d78… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 24 23:43:04 2007 -0700 server/ntdll: Simplistic implementation of NtQueryObject(ObjectBasicInformation). --- dlls/ntdll/om.c | 22 ++++++++++++++++++++++ include/wine/server_protocol.h | 19 ++++++++++++++++++- server/handle.c | 15 +++++++++++++-- server/protocol.def | 9 +++++++++ server/request.h | 2 ++ server/trace.c | 14 ++++++++++++++ 6 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 6057caa..35ce1be 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -63,6 +63,28 @@ NTSTATUS WINAPI NtQueryObject(IN HANDLE switch (info_class) { + case ObjectBasicInformation: + { + POBJECT_BASIC_INFORMATION p = (POBJECT_BASIC_INFORMATION)ptr; + + if (len < sizeof(*p)) return STATUS_INVALID_BUFFER_SIZE; + + SERVER_START_REQ( get_object_info ) + { + req->handle = handle; + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + memset( p, 0, sizeof(*p) ); + p->GrantedAccess = reply->access; + p->PointerCount = reply->ref_count; + p->HandleCount = 1; /* at least one */ + if (used_len) *used_len = sizeof(*p); + } + } + SERVER_END_REQ; + } + break; case ObjectDataInformation: { OBJECT_DATA_INFORMATION* p = (OBJECT_DATA_INFORMATION*)ptr; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6a18286..be21fc4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3967,6 +3967,20 @@ struct query_symlink_reply }; + +struct get_object_info_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_object_info_reply +{ + struct reply_header __header; + unsigned int access; + unsigned int ref_count; +}; + + enum request { REQ_new_process, @@ -4183,6 +4197,7 @@ enum request REQ_create_symlink, REQ_open_symlink, REQ_query_symlink, + REQ_get_object_info, REQ_NB_REQUESTS }; @@ -4404,6 +4419,7 @@ union generic_request struct create_symlink_request create_symlink_request; struct open_symlink_request open_symlink_request; struct query_symlink_request query_symlink_request; + struct get_object_info_request get_object_info_request; }; union generic_reply { @@ -4623,8 +4639,9 @@ union generic_reply struct create_symlink_reply create_symlink_reply; struct open_symlink_reply open_symlink_reply; struct query_symlink_reply query_symlink_reply; + struct get_object_info_reply get_object_info_reply; }; -#define SERVER_PROTOCOL_VERSION 274 +#define SERVER_PROTOCOL_VERSION 275 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/handle.c b/server/handle.c index f8f007d..f0c58a8 100644 --- a/server/handle.c +++ b/server/handle.c @@ -399,9 +399,9 @@ unsigned int get_handle_access( struct p { struct handle_entry *entry; - if (get_magic_handle( handle )) return ~0U; /* magic handles have all access rights */ + if (get_magic_handle( handle )) return ~RESERVED_ALL; /* magic handles have all access rights */ if (!(entry = get_handle( process, handle ))) return 0; - return entry->access; + return entry->access & ~RESERVED_ALL; } /* find the first inherited handle of the given type */ @@ -540,3 +540,14 @@ DECL_HANDLER(dup_handle) release_object( src ); } } + +DECL_HANDLER(get_object_info) +{ + struct object *obj; + + if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; + + reply->access = get_handle_access( current->process, req->handle ); + reply->ref_count = obj->refcount; + release_object( obj ); +} diff --git a/server/protocol.def b/server/protocol.def index 72157fd..f49f331 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2848,3 +2848,12 @@ enum message_type @REPLY VARARG(target_name,unicode_str); /* target name */ @END + + +/* Query basic object information */ +(a)REQ(get_object_info) + obj_handle_t handle; /* handle to the object */ +(a)REPLY + unsigned int access; /* granted access mask */ + unsigned int ref_count; /* object ref count */ +(a)END diff --git a/server/request.h b/server/request.h index 5a7dcfc..b52c1aa 100644 --- a/server/request.h +++ b/server/request.h @@ -324,6 +324,7 @@ DECL_HANDLER(open_directory); DECL_HANDLER(create_symlink); DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); +DECL_HANDLER(get_object_info); #ifdef WANT_REQUEST_HANDLERS @@ -544,6 +545,7 @@ static const req_handler req_handlers[RE (req_handler)req_create_symlink, (req_handler)req_open_symlink, (req_handler)req_query_symlink, + (req_handler)req_get_object_info, }; #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 0c0798e..f9ff323 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3424,6 +3424,17 @@ static void dump_query_symlink_reply( co dump_varargs_unicode_str( cur_size ); } +static void dump_get_object_info_request( const struct get_object_info_request *req ) +{ + fprintf( stderr, " handle=%p", req->handle ); +} + +static void dump_get_object_info_reply( const struct get_object_info_reply *req ) +{ + fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " ref_count=%08x", req->ref_count ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3639,6 +3650,7 @@ static const dump_func req_dumpers[REQ_N (dump_func)dump_create_symlink_request, (dump_func)dump_open_symlink_request, (dump_func)dump_query_symlink_request, + (dump_func)dump_get_object_info_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -3856,6 +3868,7 @@ static const dump_func reply_dumpers[REQ (dump_func)dump_create_symlink_reply, (dump_func)dump_open_symlink_reply, (dump_func)dump_query_symlink_reply, + (dump_func)dump_get_object_info_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4073,6 +4086,7 @@ static const char * const req_names[REQ_ "create_symlink", "open_symlink", "query_symlink", + "get_object_info", }; static const struct

1 0

Vitaliy Margolen : advapi32: Add more tests for granted access mask. Fix test on Wine.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: c04e7e7878fae6591f7fe0df0a6adf2336dc5716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04e7e7878fae6591f7fe0df0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 24 23:43:18 2007 -0700 advapi32: Add more tests for granted access mask. Fix test on Wine. --- dlls/advapi32/tests/security.c | 138 +++++++++++++++++++++++++++++++++++++++- server/handle.c | 2 +- 2 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4fc9fad..bb5954c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -31,6 +31,7 @@ #include "sddl.h" #include "ntsecapi.h" #include "lmcons.h" +#include "winternl.h" #include "wine/test.h" @@ -59,8 +60,11 @@ typedef NTSTATUS (WINAPI *fnLsaQueryInfo typedef NTSTATUS (WINAPI *fnLsaClose)(LSA_HANDLE); typedef NTSTATUS (WINAPI *fnLsaFreeMemory)(PVOID); typedef NTSTATUS (WINAPI *fnLsaOpenPolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE); +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); static HMODULE hmod; +static int myARGC; +static char** myARGV; fnBuildTrusteeWithSidA pBuildTrusteeWithSidA; fnBuildTrusteeWithNameA pBuildTrusteeWithNameA; @@ -85,7 +89,12 @@ struct sidRef static void init(void) { + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + hmod = GetModuleHandle("advapi32.dll"); + myARGC = winetest_get_mainargs( &myARGV ); + + pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" ); } static void test_str_sid(const char *str_sid) @@ -673,7 +682,7 @@ static void test_AccessCheck(void) res = InitializeAcl(Acl, 256, ACL_REVISION); if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("ACLs not implemented - skipping tests\n"); + skip("ACLs not implemented - skipping tests\n"); return; } ok(res, "InitializeAcl failed with error %d\n", GetLastError()); @@ -1347,10 +1356,136 @@ static void test_LookupAccountName(void) HeapFree(GetProcessHeap(), 0, domain); } +#define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__) +static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) +{ + OBJECT_BASIC_INFORMATION obj_info; + NTSTATUS status; + + if (!pNtQueryObject) + { + skip_(__FILE__, line)("Not NT platform - skipping tests\n"); + return; + } + + status = pNtQueryObject( handle, ObjectBasicInformation, &obj_info, + sizeof(obj_info), NULL ); + ok_(__FILE__, line)(!status, "NtQueryObject with err: %08x\n", status); + ok_(__FILE__, line)(obj_info.GrantedAccess == access, "Gratned access should " + "be 0x%08x, instead of 0x%08x\n", access, obj_info.GrantedAccess); +} + +static void test_process_security(void) +{ + BOOL res; + PSID AdminSid = NULL, UsersSid = NULL; + PACL Acl = NULL; + SECURITY_DESCRIPTOR *SecurityDescriptor = NULL; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; + char buffer[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + SECURITY_ATTRIBUTES psa; + + Acl = HeapAlloc(GetProcessHeap(), 0, 256); + res = InitializeAcl(Acl, 256, ACL_REVISION); + if (!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("ACLs not implemented - skipping tests\n"); + return; + } + ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + + res = AllocateAndInitializeSid( &SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdminSid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + res = AllocateAndInitializeSid( &SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &UsersSid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + res = AddAccessDeniedAce(Acl, ACL_REVISION, PROCESS_VM_READ, AdminSid); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); + res = AddAccessAllowedAce(Acl, ACL_REVISION, PROCESS_ALL_ACCESS, AdminSid); + ok(res, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); + + SecurityDescriptor = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); + res = InitializeSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); + ok(res, "InitializeSecurityDescriptor failed with error %d\n", GetLastError()); + + /* Set owner and group and dacl */ + res = SetSecurityDescriptorOwner(SecurityDescriptor, AdminSid, FALSE); + ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorGroup(SecurityDescriptor, UsersSid, TRUE); + ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); + ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + + + sprintf(buffer, "%s tests/security.c test", myARGV[0]); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + psa.nLength = sizeof(psa); + psa.lpSecurityDescriptor = SecurityDescriptor; + psa.bInheritHandle = TRUE; + + /* Doesn't matter what ACL say we should get full access for ourselves */ + ok(CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ), + "CreateProcess with err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( info.hProcess, PROCESS_ALL_ACCESS ); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + + if (AdminSid) FreeSid(AdminSid); + if (UsersSid) FreeSid(UsersSid); + HeapFree(GetProcessHeap(), 0, Acl); + HeapFree(GetProcessHeap(), 0, SecurityDescriptor); +} + +static void test_process_security_child(void) +{ + HANDLE handle, handle1; + + handle = OpenProcess( PROCESS_TERMINATE, FALSE, GetCurrentProcessId() ); + ok(handle != NULL, "OpenProcess(PROCESS_TERMINATE) with err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE ); + + ok(DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), + &handle1, PROCESS_ALL_ACCESS, TRUE, DUPLICATE_SAME_ACCESS), + "duplicating handle err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE ); + + CloseHandle( handle1 ); + CloseHandle( handle ); + + /* These two should fail - they are denied by ACL */ + handle = OpenProcess( PROCESS_VM_READ, FALSE, GetCurrentProcessId() ); + todo_wine + ok(handle == NULL, "OpenProcess(PROCESS_VM_READ) should have failed\n"); + handle = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); + todo_wine + ok(handle == NULL, "OpenProcess(PROCESS_ALL_ACCESS) should have failed\n"); + + /* Documented privilege elevation */ + ok(DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &handle, PROCESS_ALL_ACCESS, TRUE, DUPLICATE_SAME_ACCESS), + "duplicating handle err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( handle, PROCESS_ALL_ACCESS ); + + CloseHandle( handle ); +} + START_TEST(security) { init(); if (!hmod) return; + + if (myARGC >= 3) + { + test_process_security_child(); + return; + } test_sid(); test_trustee(); test_luid(); @@ -1359,4 +1494,5 @@ START_TEST(security) test_token_attr(); test_LookupAccountSid(); test_LookupAccountName(); + test_process_security(); } diff --git a/server/handle.c b/server/handle.c index f0c58a8..4b52280 100644 --- a/server/handle.c +++ b/server/handle.c @@ -459,7 +459,7 @@ obj_handle_t duplicate_handle( struct pr access = entry->access; else /* pseudo-handle, give it full access */ { - access = STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL; + access = obj->ops->map_access( obj, GENERIC_ALL ); clear_error(); } }

1 0