April 2015 - Wine-commits - list.winehq.org

Francois Gouget : winedbg: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: c4f791880145ba41d41690f887e7c700b23209af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f791880145ba41d41690f88… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:24:55 2015 +0200 winedbg: Remove unneeded NONAMELESSXXX directives. --- programs/winedbg/be_x86_64.c | 2 ++ programs/winedbg/debugger.h | 2 -- programs/winedbg/symbol.c | 3 --- programs/winedbg/tgt_module.c | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 029f9f1..17feb88 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "debugger.h" #include "wine/debug.h" diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ba49f1e..e8a4d73 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -24,8 +24,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #define WIN32_LEAN_AND_MEAN diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 3069d66..c43cba9 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdlib.h> #include <stdio.h> diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 44e3c9f..58c4282 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdlib.h>

1 0

Francois Gouget : rpcss: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 546b1c4cea1ce96ecef948363970d4eccef2d6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=546b1c4cea1ce96ecef948363… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:11 2015 +0200 rpcss: Remove unneeded NONAMELESSXXX directives. --- programs/rpcss/rpcss_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 661da4a..1d246ea 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -48,8 +48,6 @@ #include <limits.h> #include <assert.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnt.h"

1 0

Francois Gouget : regedit: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 1402201cd61b4412331c5c1f469a5940991b6a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1402201cd61b4412331c5c1f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:02 2015 +0200 regedit: Remove an unneeded NONAMELESSSTRUCT directive. --- programs/regedit/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 97a0bf2..0ac5252 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -22,7 +22,7 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include <windows.h> #include <commctrl.h> #include <stdlib.h>

1 0

Andrew Cook : kernel32/tests: Extend IsProcessInJob tests.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: e30a6bbcbd41d2eac9ad4529dda70c5e0c20060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30a6bbcbd41d2eac9ad4529d… Author: Andrew Cook <ariscop(a)gmail.com> Date: Wed Apr 1 12:48:34 2015 +1100 kernel32/tests: Extend IsProcessInJob tests. --- dlls/kernel32/tests/process.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fd3ce7f..9318b89 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2168,7 +2168,7 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION static void test_IsProcessInJob(void) { - HANDLE job; + HANDLE job, job2; PROCESS_INFORMATION pi; BOOL ret, out; DWORD dwret; @@ -2182,6 +2182,9 @@ static void test_IsProcessInJob(void) job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, NULL); + ok(job2 != NULL, "CreateJobObject error %u\n", GetLastError()); + create_process("wait", &pi); out = TRUE; @@ -2189,6 +2192,16 @@ static void test_IsProcessInJob(void) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + out = TRUE; + ret = pIsProcessInJob(pi.hProcess, job2, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = TRUE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); @@ -2198,6 +2211,17 @@ static void test_IsProcessInJob(void) todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); + out = TRUE; + ret = pIsProcessInJob(pi.hProcess, job2, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + todo_wine + ok(out, "IsProcessInJob returned out=%u\n", out); + TerminateProcess(pi.hProcess, 0); dwret = WaitForSingleObject(pi.hProcess, 1000); @@ -2212,6 +2236,7 @@ static void test_IsProcessInJob(void) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(job); + CloseHandle(job2); } static void test_TerminateJobObject(void)

1 0

Andrew Cook : server: Implement CreateJobObject.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 0e78b0248d4812c2f4379f59bb4545453e85484f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e78b0248d4812c2f4379f59b… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Feb 26 12:25:23 2015 +1100 server: Implement CreateJobObject. --- dlls/ntdll/sync.c | 33 +++++++++++-- include/wine/server_protocol.h | 22 ++++++++- server/process.c | 110 +++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 10 ++++ server/request.h | 7 +++ server/trace.c | 15 ++++++ 6 files changed, 193 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e78b0248d4812c2f4379…

1 0

Andrew Cook : server: Implement AssignProcessToJobObject.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 98132f03644669e4df5202592d4aaa87e5fae9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=98132f03644669e4df5202592… Author: Andrew Cook <ariscop(a)gmail.com> Date: Wed Apr 1 09:10:16 2015 +1100 server: Implement AssignProcessToJobObject. --- dlls/kernel32/tests/process.c | 2 -- dlls/ntdll/sync.c | 15 ++++++++-- include/wine/server_protocol.h | 19 +++++++++++- server/process.c | 68 +++++++++++++++++++++++++++++++++++++++++- server/process.h | 2 ++ server/protocol.def | 7 +++++ server/request.h | 5 ++++ server/trace.c | 9 ++++++ 8 files changed, 121 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98132f03644669e4df520…

1 0

Andrew Cook : server: Implement IsProcessInJob.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 3affd63b34b042ec8f3538a51b7cd1cb76db7fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3affd63b34b042ec8f3538a51… Author: Andrew Cook <ariscop(a)gmail.com> Date: Wed Apr 1 09:27:34 2015 +1100 server: Implement IsProcessInJob. --- dlls/kernel32/tests/process.c | 3 --- dlls/ntdll/sync.c | 15 +++++++++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 22 ++++++++++++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 10 ++++++++++ 7 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 55cd42f..fd47951 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2208,7 +2208,6 @@ static void test_IsProcessInJob(void) out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); out = TRUE; @@ -2219,7 +2218,6 @@ static void test_IsProcessInJob(void) out = FALSE; ret = pIsProcessInJob(pi.hProcess, NULL, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); TerminateProcess(pi.hProcess, 0); @@ -2230,7 +2228,6 @@ static void test_IsProcessInJob(void) out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); CloseHandle(pi.hProcess); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index de5e36f..ce1a635 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -644,8 +644,19 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla */ NTSTATUS WINAPI NtIsProcessInJob( HANDLE process, HANDLE job ) { - FIXME( "stub: %p %p\n", process, job ); - return STATUS_PROCESS_NOT_IN_JOB; + NTSTATUS status; + + TRACE( "(%p %p)\n", job, process ); + + SERVER_START_REQ( process_in_job ) + { + req->job = wine_server_obj_handle( job ); + req->process = wine_server_obj_handle( process ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + + return status; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 300ad37..5a9f3ab 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5113,6 +5113,20 @@ struct assign_job_reply }; + +struct process_in_job_request +{ + struct request_header __header; + obj_handle_t job; + obj_handle_t process; + char __pad_20[4]; +}; +struct process_in_job_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -5373,6 +5387,7 @@ enum request REQ_set_suspend_context, REQ_create_job, REQ_assign_job, + REQ_process_in_job, REQ_NB_REQUESTS }; @@ -5638,6 +5653,7 @@ union generic_request struct set_suspend_context_request set_suspend_context_request; struct create_job_request create_job_request; struct assign_job_request assign_job_request; + struct process_in_job_request process_in_job_request; }; union generic_reply { @@ -5901,8 +5917,9 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; struct create_job_reply create_job_reply; struct assign_job_reply assign_job_reply; + struct process_in_job_reply process_in_job_reply; }; -#define SERVER_PROTOCOL_VERSION 462 +#define SERVER_PROTOCOL_VERSION 463 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index fd08178..9534f90 100644 --- a/server/process.c +++ b/server/process.c @@ -1484,3 +1484,25 @@ DECL_HANDLER(assign_job) } release_object( job ); } + + +/* check if a process is associated with a job */ +DECL_HANDLER(process_in_job) +{ + struct process *process; + struct job *job; + + if (!(process = get_process_from_handle( req->process, PROCESS_QUERY_INFORMATION ))) + return; + + if (!req->job) + { + set_error( process->job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + } + else if ((job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ))) + { + set_error( process->job == job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + release_object( job ); + } + release_object( process ); +} diff --git a/server/protocol.def b/server/protocol.def index fa5577f..b85adca 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3521,3 +3521,10 @@ enum coords_relative obj_handle_t job; /* handle to the job */ obj_handle_t process; /* handle to the process */ @END + + +/* Check if a process is associated with a job */ +(a)REQ(process_in_job) + obj_handle_t job; /* handle to the job */ + obj_handle_t process; /* handle to the process */ +(a)END diff --git a/server/request.h b/server/request.h index 87f55c6..aef316a 100644 --- a/server/request.h +++ b/server/request.h @@ -364,6 +364,7 @@ DECL_HANDLER(get_suspend_context); DECL_HANDLER(set_suspend_context); DECL_HANDLER(create_job); DECL_HANDLER(assign_job); +DECL_HANDLER(process_in_job); #ifdef WANT_REQUEST_HANDLERS @@ -628,6 +629,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_suspend_context, (req_handler)req_create_job, (req_handler)req_assign_job, + (req_handler)req_process_in_job, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2216,6 +2218,9 @@ C_ASSERT( sizeof(struct create_job_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct assign_job_request, job) == 12 ); C_ASSERT( FIELD_OFFSET(struct assign_job_request, process) == 16 ); C_ASSERT( sizeof(struct assign_job_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct process_in_job_request, job) == 12 ); +C_ASSERT( FIELD_OFFSET(struct process_in_job_request, process) == 16 ); +C_ASSERT( sizeof(struct process_in_job_request) == 24 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index aa5327c..cba15a3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4113,6 +4113,12 @@ static void dump_assign_job_request( const struct assign_job_request *req ) fprintf( stderr, ", process=%04x", req->process ); } +static void dump_process_in_job_request( const struct process_in_job_request *req ) +{ + fprintf( stderr, " job=%04x", req->job ); + fprintf( stderr, ", process=%04x", req->process ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4372,6 +4378,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_suspend_context_request, (dump_func)dump_create_job_request, (dump_func)dump_assign_job_request, + (dump_func)dump_process_in_job_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4633,6 +4640,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_create_job_reply, NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4894,6 +4902,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_suspend_context", "create_job", "assign_job", + "process_in_job", }; static const struct @@ -4996,6 +5005,7 @@ static const struct { "PIPE_LISTENING", STATUS_PIPE_LISTENING }, { "PIPE_NOT_AVAILABLE", STATUS_PIPE_NOT_AVAILABLE }, { "PRIVILEGE_NOT_HELD", STATUS_PRIVILEGE_NOT_HELD }, + { "PROCESS_IN_JOB", STATUS_PROCESS_IN_JOB }, { "PROCESS_IS_TERMINATING", STATUS_PROCESS_IS_TERMINATING }, { "SECTION_TOO_BIG", STATUS_SECTION_TOO_BIG }, { "SEMAPHORE_LIMIT_EXCEEDED", STATUS_SEMAPHORE_LIMIT_EXCEEDED },

1 0

Sebastian Lackner : advapi32/tests: Merge common code to test DACL descriptors in a helper function.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: bfcfceec3939340c5d2d676194c6e2d4efcf1208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcfceec3939340c5d2d67619… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 1 08:58:56 2015 +0200 advapi32/tests: Merge common code to test DACL descriptors in a helper function. --- dlls/advapi32/tests/security.c | 174 +++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 94 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4bee951..0ff773c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3110,6 +3110,80 @@ static void get_nt_pathW(const char *name, UNICODE_STRING *nameW) RtlFreeUnicodeString(&strW); } +static void test_inherited_dacl(PACL dacl, PSID admin_sid, PSID user_sid, DWORD flags, DWORD mask, + BOOL todo_count, BOOL todo_sid, BOOL todo_flags, int line) +{ + ACL_SIZE_INFORMATION acl_size; + ACCESS_ALLOWED_ACE *ace; + BOOL bret; + + bret = pGetAclInformation(dacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok_(__FILE__, line)(bret, "GetAclInformation failed\n"); + + if (todo_count) + todo_wine + ok_(__FILE__, line)(acl_size.AceCount == 2, + "GetAclInformation returned unexpected entry count (%d != 2)\n", + acl_size.AceCount); + else + ok_(__FILE__, line)(acl_size.AceCount == 2, + "GetAclInformation returned unexpected entry count (%d != 2)\n", + acl_size.AceCount); + + if (acl_size.AceCount > 0) + { + bret = pGetAce(dacl, 0, (VOID **)&ace); + ok_(__FILE__, line)(bret, "Failed to get Current User ACE\n"); + + bret = EqualSid(&ace->SidStart, user_sid); + if (todo_sid) + todo_wine + ok_(__FILE__, line)(bret, "Current User ACE != Current User SID\n"); + else + ok_(__FILE__, line)(bret, "Current User ACE != Current User SID\n"); + + if (todo_flags) + todo_wine + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Current User ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + else + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Current User ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + + ok_(__FILE__, line)(ace->Mask == mask, + "Current User ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(dacl, 1, (VOID **)&ace); + ok_(__FILE__, line)(bret, "Failed to get Administators Group ACE\n"); + + bret = EqualSid(&ace->SidStart, admin_sid); + if (todo_sid) + todo_wine + ok_(__FILE__, line)(bret, "Administators Group ACE != Administators Group SID\n"); + else + ok_(__FILE__, line)(bret, "Administators Group ACE != Administators Group SID\n"); + + if (todo_flags) + todo_wine + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + else + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + + ok_(__FILE__, line)(ace->Mask == mask, + "Administators Group ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, mask); + } +} + static void test_CreateDirectoryA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; @@ -3119,7 +3193,6 @@ static void test_CreateDirectoryA(void) PSECURITY_DESCRIPTOR pSD = &sd; ACL_SIZE_INFORMATION acl_size; UNICODE_STRING tmpfileW; - ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; OBJECT_ATTRIBUTES attr; char tmpfile[MAX_PATH]; @@ -3190,35 +3263,8 @@ static void test_CreateDirectoryA(void) goto done; } ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - - bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); - ok(bret, "GetAclInformation failed\n"); - ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", - acl_size.AceCount); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - todo_wine ok(bret, "Current User ACE != Current User SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Current User ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } + test_inherited_dacl(pDacl, admin_sid, user_sid, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, + 0x1f01ff, FALSE, TRUE, FALSE, __LINE__); LocalFree(pSD); /* Test inheritance of ACLs */ @@ -3233,38 +3279,8 @@ static void test_CreateDirectoryA(void) OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, (PSID *)&owner, NULL, &pDacl, NULL, &pSD); ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); - - bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); - ok(bret, "GetAclInformation failed\n"); - todo_wine - ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", - acl_size.AceCount); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Inherited Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - todo_wine - ok(bret, "Inherited Current User ACE != Current User SID.\n"); - todo_wine - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, - "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Inherited Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine - ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); - todo_wine - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, - "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } + test_inherited_dacl(pDacl, admin_sid, user_sid, INHERITED_ACE, + 0x1f01ff, TRUE, TRUE, TRUE, __LINE__); LocalFree(pSD); CloseHandle(hTemp); @@ -3289,38 +3305,8 @@ static void test_CreateDirectoryA(void) OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, (PSID *)&owner, NULL, &pDacl, NULL, &pSD); ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); - - bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); - ok(bret, "GetAclInformation failed\n"); - todo_wine - ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", - acl_size.AceCount); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Inherited Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - todo_wine - ok(bret, "Inherited Current User ACE != Current User SID.\n"); - todo_wine - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, - "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Inherited Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine - ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); - todo_wine - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, - "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } + test_inherited_dacl(pDacl, admin_sid, user_sid, INHERITED_ACE, + 0x1f01ff, TRUE, TRUE, TRUE, __LINE__); LocalFree(pSD); CloseHandle(hTemp);

1 0

Sebastian Lackner : advapi32/tests: Add tests for CreateFile with set security descriptor.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 9e0045e1674350af9ddaf8e21c0ca3eecd5bf1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0045e1674350af9ddaf8e21… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 1 09:06:10 2015 +0200 advapi32/tests: Add tests for CreateFile with set security descriptor. --- dlls/advapi32/tests/security.c | 55 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0ff773c..3789d72 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3267,7 +3267,7 @@ static void test_CreateDirectoryA(void) 0x1f01ff, FALSE, TRUE, FALSE, __LINE__); LocalFree(pSD); - /* Test inheritance of ACLs */ + /* Test inheritance of ACLs in CreateFile without security descriptor */ strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); @@ -3284,7 +3284,55 @@ static void test_CreateDirectoryA(void) LocalFree(pSD); CloseHandle(hTemp); - /* Repeat the same test with ntdll functions */ + /* Test inheritance of ACLs in CreateFile with security descriptor - + * When a security descriptor is set, then inheritance doesn't take effect */ + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor\n"); + + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = TRUE; + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, &sa, + CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(hTemp != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + todo_wine + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + if (error == ERROR_SUCCESS) + { + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + } + CloseHandle(hTemp); + + /* Test inheritance of ACLs in NtCreateFile without security descriptor */ strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); get_nt_pathW(tmpfile, &tmpfileW); @@ -3310,7 +3358,8 @@ static void test_CreateDirectoryA(void) LocalFree(pSD); CloseHandle(hTemp); - /* When a security descriptor is set, then inheritance doesn't take effect */ + /* Test inheritance of ACLs in NtCreateFile with security descriptor - + * When a security descriptor is set, then inheritance doesn't take effect */ pSD = &sd; InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL));

1 0

Hans Leidekker : msi: Import mspatcha instead of loading it dynamically.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 2acc11c215c822fac348459aca74a0439ee8a60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2acc11c215c822fac348459ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:24:57 2015 +0200 msi: Import mspatcha instead of loading it dynamically. --- configure | 2 +- configure.ac | 2 +- dlls/msi/Makefile.in | 2 +- dlls/msi/files.c | 38 +------------------------------------- dlls/mspatcha/Makefile.in | 3 ++- 5 files changed, 6 insertions(+), 41 deletions(-) diff --git a/configure b/configure index 4596844..3b8dfb1 100755 --- a/configure +++ b/configure @@ -17372,7 +17372,7 @@ wine_fn_config_dll msisip enable_msisip wine_fn_config_dll msisys.ocx enable_msisys_ocx wine_fn_config_dll msls31 enable_msls31 wine_fn_config_dll msnet32 enable_msnet32 -wine_fn_config_dll mspatcha enable_mspatcha +wine_fn_config_dll mspatcha enable_mspatcha implib wine_fn_config_dll msrle32 enable_msrle32 po wine_fn_config_test dlls/msrle32/tests msrle32_test wine_fn_config_dll mssign32 enable_mssign32 diff --git a/configure.ac b/configure.ac index 1fc7873..688ab26 100644 --- a/configure.ac +++ b/configure.ac @@ -3074,7 +3074,7 @@ WINE_CONFIG_DLL(msisip) WINE_CONFIG_DLL(msisys.ocx) WINE_CONFIG_DLL(msls31) WINE_CONFIG_DLL(msnet32) -WINE_CONFIG_DLL(mspatcha) +WINE_CONFIG_DLL(mspatcha,,[implib]) WINE_CONFIG_DLL(msrle32,,[po]) WINE_CONFIG_TEST(dlls/msrle32/tests) WINE_CONFIG_DLL(mssign32) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index f355e33..79704ad 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,7 +1,7 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 -DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp +DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp mspatcha C_SRCS = \ action.c \ diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 40cc3f6..dff00df 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -43,13 +43,11 @@ #include "winuser.h" #include "winreg.h" #include "shlwapi.h" +#include "patchapi.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); -static HMODULE hmspatcha; -static BOOL (WINAPI *ApplyPatchToFileW)(LPCWSTR, LPCWSTR, LPCWSTR, ULONG); - static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *action ) { MSIRECORD *uirow; @@ -438,30 +436,6 @@ done: return rc; } -static BOOL load_mspatcha(void) -{ - hmspatcha = LoadLibraryA("mspatcha.dll"); - if (!hmspatcha) - { - ERR("Failed to load mspatcha.dll: %d\n", GetLastError()); - return FALSE; - } - - ApplyPatchToFileW = (void*)GetProcAddress(hmspatcha, "ApplyPatchToFileW"); - if(!ApplyPatchToFileW) - { - ERR("GetProcAddress(ApplyPatchToFileW) failed: %d.\n", GetLastError()); - return FALSE; - } - - return TRUE; -} - -static void unload_mspatch(void) -{ - FreeLibrary(hmspatcha); -} - static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) { MSIFILEPATCH *patch; @@ -525,7 +499,6 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) MSIFILEPATCH *patch; MSIMEDIAINFO *mi; UINT rc = ERROR_SUCCESS; - BOOL mspatcha_loaded = FALSE; TRACE("%p\n", package); @@ -557,13 +530,6 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) goto done; } - if (!mspatcha_loaded && !load_mspatcha()) - { - rc = ERROR_FUNCTION_FAILED; - goto done; - } - mspatcha_loaded = TRUE; - data.mi = mi; data.package = package; data.cb = patchfiles_cb; @@ -587,8 +553,6 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) done: msi_free_media_info(mi); - if (mspatcha_loaded) - unload_mspatch(); return rc; } diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index b1ddb50..bd0da7d 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -1,4 +1,5 @@ -MODULE = mspatcha.dll +MODULE = mspatcha.dll +IMPORTLIB = mspatcha C_SRCS = \ mspatcha_main.c

1 0