October 2007 - Wine-commits

Alexandre Julliard : winebuild: Add a -ordinal flag for entry points that must be imported by ordinal but exported by name .
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 324331121435cfbc43d36cfe8616ef9d098810ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=324331121435cfbc43d36cfe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 12:47:40 2007 +0200 winebuild: Add a -ordinal flag for entry points that must be imported by ordinal but exported by name. --- tools/winebuild/build.h | 7 ++++--- tools/winebuild/parser.c | 21 ++++++++++++++++----- tools/winebuild/spec32.c | 2 +- tools/winebuild/winebuild.man.in | 7 ++++++- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 5668271..85309ad 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -124,15 +124,16 @@ extern enum target_platform target_platform; /* entry point flags */ #define FLAG_NORELAY 0x01 /* don't use relay debugging for this function */ -#define FLAG_NONAME 0x02 /* don't import function by name */ +#define FLAG_NONAME 0x02 /* don't export function by name */ #define FLAG_RET16 0x04 /* function returns a 16-bit value */ #define FLAG_RET64 0x08 /* function returns a 64-bit value */ #define FLAG_I386 0x10 /* function is i386 only */ #define FLAG_REGISTER 0x20 /* use register calling convention */ #define FLAG_PRIVATE 0x40 /* function is private (cannot be imported) */ +#define FLAG_ORDINAL 0x80 /* function should be imported by ordinal */ -#define FLAG_FORWARD 0x80 /* function is a forwarded name */ -#define FLAG_EXT_LINK 0x100 /* function links to an external symbol */ +#define FLAG_FORWARD 0x100 /* function is a forwarded name */ +#define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ #define MAX_ORDINALS 65535 diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 9246fd2..bcbf951 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -70,6 +70,7 @@ static const char * const FlagNames[] = "i386", /* FLAG_I386 */ "register", /* FLAG_REGISTER */ "private", /* FLAG_PRIVATE */ + "ordinal", /* FLAG_ORDINAL */ NULL }; @@ -545,11 +546,14 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) } } - if (!strcmp( odp->name, "@" ) || odp->flags & FLAG_NONAME) + if (!strcmp( odp->name, "@" ) || odp->flags & (FLAG_NONAME | FLAG_ORDINAL)) { if (ordinal == -1) { - error( "Nameless function needs an explicit ordinal number\n" ); + if (!strcmp( odp->name, "@" )) + error( "Nameless function needs an explicit ordinal number\n" ); + else + error( "Function imported by ordinal needs an explicit ordinal number\n" ); goto error; } if (spec->type != SPEC_WIN32) @@ -557,9 +561,16 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) error( "Nameless functions not supported for Win16\n" ); goto error; } - if (!strcmp( odp->name, "@" )) free( odp->name ); - else odp->export_name = odp->name; - odp->name = NULL; + if (!strcmp( odp->name, "@" )) + { + free( odp->name ); + odp->name = NULL; + } + else if (!(odp->flags & FLAG_ORDINAL)) /* -ordinal only affects the import library */ + { + odp->export_name = odp->name; + odp->name = NULL; + } } return 1; diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 26e66b8..8df5b85 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -552,7 +552,7 @@ void BuildDef32File( DLLSPEC *spec ) assert(0); } output( " @%d", odp->ordinal ); - if (!odp->name) output( " NONAME" ); + if (!odp->name || (odp->flags & FLAG_ORDINAL)) output( " NONAME" ); if (is_data) output( " DATA" ); if (odp->flags & FLAG_PRIVATE) output( " PRIVATE" ); output( "\n" ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 87f47f8..d135968 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -260,7 +260,8 @@ The entry point is not displayed in relay debugging traces (Win32 only). .TP .B -noname -The entry point will be imported by ordinal instead of by name. +The entry point will be exported by ordinal instead of by name. The +name is still available for importing. .TP .B -ret16 The function returns a 16-bit value (Win16 only). @@ -277,6 +278,10 @@ The function uses CPU register to pass arguments. .B -private The function cannot be imported from other dlls, it can only be accessed through GetProcAddress. +.TP +.B -ordinal +The entry point will be imported by ordinal instead of by name. The +name is still exported. .SS "Function ordinals" Syntax: .br

1 0

Mikolaj Zalewski : advapi32: Fix CreateWellKnownSid test on Windows XP.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: e7d423ce480104ae85c0e2f75e68f8745c4cd658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d423ce480104ae85c0e2f75… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Oct 25 11:41:43 2007 -0700 advapi32: Fix CreateWellKnownSid test on Windows XP. --- dlls/advapi32/tests/security.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4b75a9d..b666c74 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1111,12 +1111,13 @@ struct well_known_sid_value /* 46 */ {FALSE, "S-1-5-21-12-23-34-45-56-517"}, {FALSE, "S-1-5-21-12-23-34-45-56-518"}, /* 48 */ {FALSE, "S-1-5-21-12-23-34-45-56-519"}, {FALSE, "S-1-5-21-12-23-34-45-56-520"}, /* 50 */ {FALSE, "S-1-5-21-12-23-34-45-56-553"}, +/* Added in Windows Server 2003 */ /* 51 */ {TRUE, "S-1-5-64-10"}, {TRUE, "S-1-5-64-21"}, {TRUE, "S-1-5-64-14"}, /* 54 */ {TRUE, "S-1-5-15"}, {TRUE, "S-1-5-1000"}, {FALSE, "S-1-5-32-557"}, /* 57 */ {TRUE, "S-1-5-32-558"}, {TRUE, "S-1-5-32-559"}, {TRUE, "S-1-5-32-560"}, -/* 60 */ {TRUE, "S-1-5-32-561"}, +/* 60 */ {TRUE, "S-1-5-32-561"}, {TRUE, "S-1-5-32-562"}, /* Added in Windows Vista: */ -/* 61 */ {TRUE, "S-1-5-32-562"}, {TRUE, "S-1-5-32-568"}, +/* 62 */ {TRUE, "S-1-5-32-568"}, /* 63 */ {TRUE, "S-1-5-17"}, {FALSE, "S-1-5-32-569"}, {TRUE, "S-1-16-0"}, /* 66 */ {TRUE, "S-1-16-4096"}, {TRUE, "S-1-16-8192"}, {TRUE, "S-1-16-12288"}, /* 69 */ {TRUE, "S-1-16-16384"}, {TRUE, "S-1-5-33"}, {TRUE, "S-1-3-4"}, @@ -1149,7 +1150,7 @@ static void test_CreateWellKnownSid() if (value->sid_string == NULL) continue; - if (i >= WinBuiltinTerminalServerLicenseServersSid + 1) + if (i > WinAccountRasAndIasServersSid) { /* These SIDs aren't implemented by all Windows versions - detect it and break the loop */ cb = sizeof(sid_buffer);

1 0

Mikolaj Zalewski : advapi32: Add a well known sid.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: a1e0f773e03ac3da9f552184aa20b4b4fa6cb835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e0f773e03ac3da9f552184a… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Oct 25 11:53:46 2007 -0700 advapi32: Add a well known sid. --- dlls/advapi32/security.c | 1 + include/winnt.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 82de97b..1c55d0a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -127,6 +127,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {0,0}, WinBuiltinPerfLoggingUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_LOGGING_USERS } } }, { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, + { {0,0}, WinBuiltinDCOMUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_DCOM_USERS } } }, }; /* these SIDs must be constructed as relative to some domain - only the RID is well-kown */ diff --git a/include/winnt.h b/include/winnt.h index cd81087..1a21c5a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3693,7 +3693,8 @@ typedef enum { WinBuiltinPerfMonitoringUsersSid = 57, WinBuiltinPerfLoggingUsersSid = 58, WinBuiltinAuthorizationAccessSid = 59, - WinBuiltinTerminalServerLicenseServersSid = 60 + WinBuiltinTerminalServerLicenseServersSid = 60, + WinBuiltinDCOMUsersSid = 61 } WELL_KNOWN_SID_TYPE; /*

1 0

Aric Stewart : kernel32: Set last error to ERROR_INSUFFICIENT_BUFFER in LCMapString when the sort key buffer is too small .
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 6a8219a6b1f2a4703179cd2b514a2133e3342bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8219a6b1f2a4703179cd2b5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 25 14:53:01 2007 -0500 kernel32: Set last error to ERROR_INSUFFICIENT_BUFFER in LCMapString when the sort key buffer is too small. --- dlls/kernel32/locale.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1ecda49..ea39c52 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2349,6 +2349,7 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, if (flags & LCMAP_SORTKEY) { + INT ret; if (src == dst) { SetLastError(ERROR_INVALID_FLAGS); @@ -2360,7 +2361,10 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); - return wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen); + ret = wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen); + if (ret == 0) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return ret; } /* SORT_STRINGSORT must be used exclusively with LCMAP_SORTKEY */ @@ -2497,6 +2501,8 @@ INT WINAPI LCMapStringA(LCID lcid, DWORD flags, LPCSTR src, INT srclen, goto map_string_exit; } ret = wine_get_sortkey(flags, srcW, srclenW, dst, dstlen); + if (ret == 0) + SetLastError(ERROR_INSUFFICIENT_BUFFER); goto map_string_exit; }

1 0

Jacek Caban : urlmon: Added emulated http tests.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: f4f0c8fbcd0a3a8ce5397bd807accc7c25dade7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f0c8fbcd0a3a8ce5397bd80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 25 21:55:24 2007 +0200 urlmon: Added emulated http tests. --- dlls/urlmon/tests/url.c | 370 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 356 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4f0c8fbcd0a3a8ce5397…

1 0

Rob Shearman : server: Ignore ACEs with the INHERIT_ONLY_ACE flag set during access checks.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: e51f8490f2f72b669b0c03f6867714c7232ba08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51f8490f2f72b669b0c03f68… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 25 16:19:54 2007 +0100 server: Ignore ACEs with the INHERIT_ONLY_ACE flag set during access checks. --- dlls/advapi32/tests/security.c | 2 -- server/token.c | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7a5c074..4b75a9d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -908,10 +908,8 @@ static void test_AccessCheck(void) PrivSet, &PrivSetLen, &Access, &AccessStatus); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); err = GetLastError(); - todo_wine ok(!AccessStatus && err == ERROR_ACCESS_DENIED, "AccessCheck should have failed " "with ERROR_ACCESS_DENIED, instead of %d\n", err); - todo_wine ok(!Access, "Should have failed to grant any access, got 0x%08x\n", Access); CloseHandle(Token); diff --git a/server/token.c b/server/token.c index b6ba50d..665ed48 100644 --- a/server/token.c +++ b/server/token.c @@ -895,11 +895,15 @@ static unsigned int token_access_check( struct token *token, /* 4: Grant rights according to the DACL */ ace = (const ACE_HEADER *)(dacl + 1); - for (i = 0; i < dacl->AceCount; i++) + for (i = 0; i < dacl->AceCount; i++, ace = ace_next( ace )) { const ACCESS_ALLOWED_ACE *aa_ace; const ACCESS_DENIED_ACE *ad_ace; const SID *sid; + + if (ace->AceFlags & INHERIT_ONLY_ACE) + continue; + switch (ace->AceType) { case ACCESS_DENIED_ACE_TYPE: @@ -937,8 +941,6 @@ static unsigned int token_access_check( struct token *token, * rights we need */ if (desired_access == *granted_access) break; - - ace = ace_next( ace ); } done:

1 0

Juan Lang : setupapi: Include enumerator string as part of device instance ID.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: e2f1f39b52715f61b574f11d5e4de584d8b440b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f1f39b52715f61b574f11d5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 25 08:10:59 2007 -0700 setupapi: Include enumerator string as part of device instance ID. --- dlls/setupapi/devinst.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 531597d..9f27333 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2176,16 +2176,17 @@ static void SETUPDI_EnumerateMatchingDeviceInstances(struct DeviceInfoSet *set, if ((flags & DIGCF_ALLCLASSES) || IsEqualGUID(class, &deviceClass)) { - static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR fmt[] = + {'%','s','\\','%','s','\\','%','s',0}; LPWSTR instanceId; instanceId = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(deviceName) + - lstrlenW(deviceInstance) + 2) * sizeof(WCHAR)); + (lstrlenW(enumerator) + lstrlenW(deviceName) + + lstrlenW(deviceInstance) + 3) * sizeof(WCHAR)); if (instanceId) { - sprintfW(instanceId, fmt, deviceName, - deviceInstance); + sprintfW(instanceId, fmt, enumerator, + deviceName, deviceInstance); SETUPDI_AddDeviceToSet(set, &deviceClass, 0 /* FIXME: DevInst */, instanceId, FALSE, NULL);

1 0

Juan Lang : crypt32: Remove a test because of a Windows 2003 SP1 bug.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 8240395073cc44c4d698e4037ebb14731a0450b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8240395073cc44c4d698e4037… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 25 09:05:38 2007 -0700 crypt32: Remove a test because of a Windows 2003 SP1 bug. --- dlls/crypt32/tests/cert.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 3c6aaa4..14549eb 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1374,17 +1374,11 @@ static void testGetIssuerCert(void) flags); if (parent) CertFreeCertificateContext(parent); - /* Now check just the time */ - flags = CERT_STORE_TIME_VALIDITY_FLAG; - parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); - ok(parent != NULL, "CertGetIssuerCertificateFromStore failed: %08x\n", - GetLastError()); - /* Oops: the child is not expired, so the time validity check actually - * succeeds, even though the signing cert is expired. + /* Checking time validity is not productive, because while most Windows + * versions return 0 (time valid) because the child is not expired, + * Windows 2003 SP1 returns that it is expired. Thus the range of + * possibilities is covered, and a test verifies nothing. */ - ok(!flags, "Expected check to succeed, got %08x\n", flags); - if (parent) - CertFreeCertificateContext(parent); CertFreeCertificateContext(child); CertCloseStore(store, 0);

1 0

Juan Lang : crypt32: Remove iTunes chain from certificate policy tests, there's no guarantee the root cert is trusted.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 8170acfc35ac86298534794a52489ec14c3dcf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8170acfc35ac86298534794a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 25 09:08:03 2007 -0700 crypt32: Remove iTunes chain from certificate policy tests, there's no guarantee the root cert is trusted. --- dlls/crypt32/tests/chain.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index b89888b..9d6950d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1662,8 +1662,6 @@ static ChainPolicyCheck basePolicyCheck[] = { { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, 0 }, - { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, - { 0, 0, -1, -1, NULL }, 0 }, }; static ChainPolicyCheck authenticodePolicyCheck[] = { @@ -1695,8 +1693,6 @@ static ChainPolicyCheck authenticodePolicyCheck[] = { { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, 0 }, - { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, - { 0, 0, -1, -1, NULL }, 0 }, }; static ChainPolicyCheck basicConstraintsPolicyCheck[] = { @@ -1730,8 +1726,6 @@ static ChainPolicyCheck basicConstraintsPolicyCheck[] = { { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { 0, 0, -1, -1, NULL }, 0 }, - { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, - { 0, 0, -1, -1, NULL }, 0 }, }; static void checkChainPolicyStatus(LPCSTR policy, ChainPolicyCheck *check,

1 0

Rob Shearman : server: Make create_semaphore use struct object_attributes and set the security descriptor of semaphore objects .
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: b0e5fb4384163324fb81dda800557408745aa718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e5fb4384163324fb81dda80… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 25 15:42:53 2007 +0100 server: Make create_semaphore use struct object_attributes and set the security descriptor of semaphore objects. --- dlls/ntdll/sync.c | 16 +++++++++++++++- include/wine/server_protocol.h | 5 ++--- server/protocol.def | 3 +-- server/semaphore.c | 24 ++++++++++++++++++++---- server/trace.c | 5 ++--- 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b2b3069..10a31d1 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -144,23 +144,37 @@ NTSTATUS WINAPI NtCreateSemaphore( OUT PHANDLE SemaphoreHandle, { DWORD len = attr && attr->ObjectName ? attr->ObjectName->Length : 0; NTSTATUS ret; + struct object_attributes objattr; + struct security_descriptor *sd = NULL; if (MaximumCount <= 0 || InitialCount < 0 || InitialCount > MaximumCount) return STATUS_INVALID_PARAMETER; if (len >= MAX_PATH * sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; + objattr.rootdir = attr ? attr->RootDirectory : 0; + objattr.sd_len = 0; + if (attr) + { + ret = create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); + if (ret != STATUS_SUCCESS) return ret; + } + SERVER_START_REQ( create_semaphore ) { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = attr ? attr->RootDirectory : 0; req->initial = InitialCount; req->max = MaximumCount; + wine_server_add_data( req, &objattr, sizeof(objattr) ); + if (objattr.sd_len) wine_server_add_data( req, sd, objattr.sd_len ); if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); ret = wine_server_call( req ); *SemaphoreHandle = reply->handle; } SERVER_END_REQ; + + free_struct_sd( sd ); + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 312d822..80ee6f6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -960,10 +960,9 @@ struct create_semaphore_request struct request_header __header; unsigned int access; unsigned int attributes; - obj_handle_t rootdir; unsigned int initial; unsigned int max; - /* VARARG(name,unicode_str); */ + /* VARARG(objattr,object_attributes); */ }; struct create_semaphore_reply { @@ -4880,6 +4879,6 @@ union generic_reply struct set_completion_info_reply set_completion_info_reply; }; -#define SERVER_PROTOCOL_VERSION 318 +#define SERVER_PROTOCOL_VERSION 319 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 41f71ca..b2ece5e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -812,10 +812,9 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; @REQ(create_semaphore) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ unsigned int initial; /* initial count */ unsigned int max; /* maximum count */ - VARARG(name,unicode_str); /* object name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the semaphore */ @END diff --git a/server/semaphore.c b/server/semaphore.c index af651e9..a8318cd 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -34,6 +34,7 @@ #include "handle.h" #include "thread.h" #include "request.h" +#include "security.h" struct semaphore { @@ -69,7 +70,8 @@ static const struct object_ops semaphore_ops = static struct semaphore *create_semaphore( struct directory *root, const struct unicode_str *name, - unsigned int attr, unsigned int initial, unsigned int max ) + unsigned int attr, unsigned int initial, unsigned int max, + const struct security_descriptor *sd ) { struct semaphore *sem; @@ -85,6 +87,10 @@ static struct semaphore *create_semaphore( struct directory *root, const struct /* initialize it if it didn't already exist */ sem->count = initial; sem->max = max; + if (sd) default_set_sd( &sem->obj, sd, OWNER_SECURITY_INFORMATION| + GROUP_SECURITY_INFORMATION| + DACL_SECURITY_INFORMATION| + SACL_SECURITY_INFORMATION ); } } return sem; @@ -165,13 +171,23 @@ DECL_HANDLER(create_semaphore) struct semaphore *sem; struct unicode_str name; struct directory *root = NULL; + const struct object_attributes *objattr = get_req_data(); + const struct security_descriptor *sd; reply->handle = 0; - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + + if (!objattr_is_valid( objattr, get_req_data_size() )) + return; + + sd = objattr->sd_len ? (const struct security_descriptor *)(objattr + 1) : NULL; + + /* get unicode string */ + name.len = ((get_req_data_size() - sizeof(*objattr) - objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR); + name.str = (const WCHAR *)get_req_data() + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max ))) + if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max, sd ))) { reply->handle = alloc_handle( current->process, sem, req->access, req->attributes ); release_object( sem ); diff --git a/server/trace.c b/server/trace.c index 4abdb55..dd2ef1e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1230,11 +1230,10 @@ static void dump_create_semaphore_request( const struct create_semaphore_request { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); - fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " initial=%08x,", req->initial ); fprintf( stderr, " max=%08x,", req->max ); - fprintf( stderr, " name=" ); - dump_varargs_unicode_str( cur_size ); + fprintf( stderr, " objattr=" ); + dump_varargs_object_attributes( cur_size ); } static void dump_create_semaphore_reply( const struct create_semaphore_reply *req )

1 0