wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Juan Lang : crypt32: Fix test failure on Win7.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 63383baed4faa586f17e28d459c9c2180f8d1b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63383baed4faa586f17e28d45… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 10:10:43 2009 -0800 crypt32: Fix test failure on Win7. --- dlls/crypt32/tests/encode.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 316a9f8..0f8ae7f 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1387,8 +1387,9 @@ static void test_decodeNameValue(DWORD dwEncoding) embeddedNullNameValue.encoded, embeddedNullNameValue.encodedSize, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_SHARE_OID_STRING_FLAG, NULL, &buf, &bufSize); - ok(ret, "Value type %d: CryptDecodeObjectEx failed: %08x\n", - embeddedNullNameValue.value.dwValueType, GetLastError()); + /* Some Windows versions disallow name values with embedded NULLs, so + * either success or failure is acceptable. + */ if (ret) { CERT_NAME_VALUE rdnEncodedValue = { CERT_RDN_ENCODED_BLOB,

1 0

Juan Lang : cryptnet: Fix test failures on Win2k.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 052aea2476c224fa4564bf2908a22ce6a658f9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052aea2476c224fa4564bf290… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 10:04:45 2009 -0800 cryptnet: Fix test failures on Win2k. --- dlls/cryptnet/tests/cryptnet.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index e3d9465..a66e912 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -589,9 +589,14 @@ static void test_verifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, + /* Win2k thinks the cert is revoked, and it is, except the CRL is out of + * date, hence the revocation status should be unknown. + */ + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || + broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || + broken(status.dwError == CRYPT_E_REVOKED /* Win2k */), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); CertCloseStore(revPara.hCrlStore, 0);

1 0

Juan Lang : crypt32: Only check revocation on a chain without other errors.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 596cd16fc491db7484ca3cd84f31dc2298826a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=596cd16fc491db7484ca3cd84… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 09:28:51 2009 -0800 crypt32: Only check revocation on a chain without other errors. --- dlls/crypt32/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index de482ae..5cc46b7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2638,7 +2638,8 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, if (!(dwFlags & CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS)) CRYPT_FreeLowerQualityChains(chain); pChain = (PCERT_CHAIN_CONTEXT)chain; - CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); + if (!pChain->TrustStatus.dwErrorStatus) + CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); CRYPT_CheckUsages(pChain, pChainPara); if (ppChainContext) *ppChainContext = pChain;

1 0

Alexandre Julliard : ntdll/tests: Add some tests for opening files by file id.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 8115c6243b0111728cc1538eaac7ae832c7a7b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8115c6243b0111728cc1538ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:36:58 2009 +0100 ntdll/tests: Add some tests for opening files by file id. --- dlls/ntdll/tests/file.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ca0ef28..aeb8cc7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -72,6 +72,8 @@ static NTSTATUS (WINAPI *pNtRemoveIoCompletion)(HANDLE, PULONG_PTR, PULONG_PTR, static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, ULONG); static NTSTATUS (WINAPI *pNtSetInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK, + PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); static inline BOOL is_signaled( HANDLE obj ) { @@ -155,10 +157,12 @@ static void open_file_test(void) NTSTATUS status; HANDLE dir, handle; WCHAR path[MAX_PATH]; + BYTE data[8192]; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; UINT i, len; + BOOL restart = TRUE; len = GetWindowsDirectoryW( path, MAX_PATH ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); @@ -206,6 +210,46 @@ static void open_file_test(void) ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); + /* try open by file id */ + + while (!pNtQueryDirectoryFile( dir, NULL, NULL, NULL, &io, data, sizeof(data), + FileIdBothDirectoryInformation, FALSE, NULL, restart )) + { + FILE_ID_BOTH_DIRECTORY_INFORMATION *info = (FILE_ID_BOTH_DIRECTORY_INFORMATION *)data; + + restart = FALSE; + for (;;) + { + if (!info->FileId.QuadPart) goto next; + nameW.Buffer = (WCHAR *)&info->FileId; + nameW.Length = sizeof(info->FileId); + info->FileName[info->FileNameLength/sizeof(WCHAR)] = 0; + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN_BY_FILE_ID | + ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); + if (!status) + { + FILE_ALL_INFORMATION all_info; + + if (!pNtQueryInformationFile( handle, &io, &all_info, sizeof(all_info), FileAllInformation )) + { + /* check that it's the same file */ + ok( info->EndOfFile.QuadPart == all_info.StandardInformation.EndOfFile.QuadPart, + "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); + ok( info->LastWriteTime.QuadPart == all_info.BasicInformation.LastWriteTime.QuadPart, + "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); + } + CloseHandle( handle ); + } + next: + if (!info->NextEntryOffset) break; + info = (FILE_ID_BOTH_DIRECTORY_INFORMATION *)((char *)info + info->NextEntryOffset); + } + } + CloseHandle( dir ); } @@ -1307,6 +1351,7 @@ START_TEST(file) pNtSetIoCompletion = (void *)GetProcAddress(hntdll, "NtSetIoCompletion"); pNtSetInformationFile = (void *)GetProcAddress(hntdll, "NtSetInformationFile"); pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); + pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); open_file_test(); delete_file_test();

1 0

Alexandre Julliard : ntdll: Add support for the FILE_OPEN_BY_FILE_ID flag in NtCreateFile.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 9c789f40250458bccf9f70b23c54089c24c799a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c789f40250458bccf9f70b23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:35:43 2009 +0100 ntdll: Add support for the FILE_OPEN_BY_FILE_ID flag in NtCreateFile. --- dlls/ntdll/directory.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 7 +++- dlls/ntdll/ntdll_misc.h | 1 + 3 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b01519e..82953c2 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2218,6 +2218,86 @@ static inline int get_dos_prefix_len( const UNICODE_STRING *name ) /****************************************************************************** + * file_id_to_unix_file_name + * + * Lookup a file from its file id instead of its name. + */ +NTSTATUS file_id_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, ANSI_STRING *unix_name_ret ) +{ + enum server_fd_type type; + int old_cwd, root_fd, needs_close; + char *unix_name; + int unix_len; + NTSTATUS status; + ULONGLONG file_id; + struct stat st, root_st; + DIR *dir; + struct dirent *de; + + if (attr->ObjectName->Length != sizeof(ULONGLONG)) return STATUS_OBJECT_PATH_SYNTAX_BAD; + if (!attr->RootDirectory) return STATUS_INVALID_PARAMETER; + memcpy( &file_id, attr->ObjectName->Buffer, sizeof(file_id) ); + + unix_len = MAX_DIR_ENTRY_LEN + 1; + if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len ))) + return STATUS_NO_MEMORY; + unix_name[0] = 0; + + if (!(status = server_get_unix_fd( attr->RootDirectory, FILE_READ_DATA, &root_fd, + &needs_close, &type, NULL ))) + { + if (type != FD_TYPE_DIR) + { + if (needs_close) close( root_fd ); + status = STATUS_OBJECT_TYPE_MISMATCH; + } + else + { + fstat( root_fd, &root_st ); + RtlEnterCriticalSection( &dir_section ); + if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) + { + if (!(dir = opendir( "." ))) status = FILE_GetNtStatus(); + else + { + while ((de = readdir( dir ))) + { + if (stat( de->d_name, &st ) == -1) continue; + if (st.st_dev == root_st.st_dev && st.st_ino == file_id) + { + strcpy( unix_name, de->d_name ); + break; + } + } + closedir( dir ); + if (!unix_name[0]) status = STATUS_OBJECT_NAME_NOT_FOUND; + } + if (fchdir( old_cwd ) == -1) chdir( "/" ); + } + else status = FILE_GetNtStatus(); + RtlLeaveCriticalSection( &dir_section ); + if (old_cwd != -1) close( old_cwd ); + if (needs_close) close( root_fd ); + } + } + + if (status == STATUS_SUCCESS) + { + TRACE( "%s -> %s\n", wine_dbgstr_longlong(file_id), debugstr_a(unix_name) ); + unix_name_ret->Buffer = unix_name; + unix_name_ret->Length = strlen(unix_name); + unix_name_ret->MaximumLength = unix_len; + } + else + { + TRACE( "%s not found in %s\n", wine_dbgstr_longlong(file_id), unix_name ); + RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + } + return status; +} + + +/****************************************************************************** * lookup_unix_name * * Helper for nt_to_unix_file_name diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 56c26c2..1af4116 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -115,7 +115,12 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT if (alloc_size) FIXME( "alloc_size not supported\n" ); - if ((io->u.Status = nt_to_unix_file_name_attr( attr, &unix_name, disposition )) == STATUS_BAD_DEVICE_TYPE) + if (options & FILE_OPEN_BY_FILE_ID) + io->u.Status = file_id_to_unix_file_name( attr, &unix_name ); + else + io->u.Status = nt_to_unix_file_name_attr( attr, &unix_name, disposition ); + + if (io->u.Status == STATUS_BAD_DEVICE_TYPE) { SERVER_START_REQ( open_file_object ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b1e976c..e1e67ea 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -147,6 +147,7 @@ extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ); extern NTSTATUS DIR_unmount_device( HANDLE handle ); extern NTSTATUS DIR_get_unix_cwd( char **cwd ); extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ); +extern NTSTATUS file_id_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, ANSI_STRING *unix_name_ret ); extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING *unix_name_ret, UINT disposition );

1 0

Alexandre Julliard : ntdll: Don' t report a file id for directory entries that are on a different device.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 6677565f34d19a55c3f17f4eef764f0dbc5d9b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6677565f34d19a55c3f17f4ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:33:28 2009 +0100 ntdll: Don't report a file id for directory entries that are on a different device. --- dlls/ntdll/directory.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index de8d57c..b01519e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -166,6 +166,7 @@ static const int is_case_sensitive = FALSE; UNICODE_STRING windows_dir = { 0, 0, NULL }; /* windows directory */ UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ +static struct file_identity curdir; static struct file_identity windir; static RTL_CRITICAL_SECTION dir_section; @@ -1025,6 +1026,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK io->u.Status = STATUS_BUFFER_OVERFLOW; } info = (union file_directory_info *)((char *)info_ptr + io->Information); + if (st.st_dev != curdir.dev) st.st_ino = 0; /* ignore inode if on a different device */ /* all the structures start with a FileDirectoryInformation layout */ fill_stat_info( &st, info, class ); info->dir.NextEntryOffset = total_len; @@ -1713,6 +1715,10 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, cwd = open( ".", O_RDONLY ); if (fchdir( fd ) != -1) { + struct stat st; + fstat( fd, &st ); + curdir.dev = st.st_dev; + curdir.ino = st.st_ino; #ifdef VFAT_IOCTL_READDIR_BOTH if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan, info_class )) != -1) goto done;

1 0

Alexandre Julliard : ntdll: Remove an unnecessary NULL pointer check.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: d189ed6fddda6e444ba87342a30ceb34510f7625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d189ed6fddda6e444ba87342a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:38:05 2009 +0100 ntdll: Remove an unnecessary NULL pointer check. --- dlls/ntdll/file.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 213d083..56c26c2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -142,20 +142,16 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT if (io->u.Status == STATUS_SUCCESS) { - struct security_descriptor *sd = NULL; + struct security_descriptor *sd; struct object_attributes objattr; objattr.rootdir = wine_server_obj_handle( attr->RootDirectory ); - objattr.sd_len = 0; objattr.name_len = 0; - if (attr) + io->u.Status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); + if (io->u.Status != STATUS_SUCCESS) { - io->u.Status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); - if (io->u.Status != STATUS_SUCCESS) - { - RtlFreeAnsiString( &unix_name ); - return io->u.Status; - } + RtlFreeAnsiString( &unix_name ); + return io->u.Status; } SERVER_START_REQ( create_file )

1 0

Alexandre Julliard : ntdll: Fix test failure on recent Windows versions.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 7dc1c2af52176342b82102342c4acc9cb107748e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc1c2af52176342b82102342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 3 10:08:56 2009 +0100 ntdll: Fix test failure on recent Windows versions. --- dlls/ntdll/directory.c | 2 +- dlls/ntdll/tests/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8af2d00..de8d57c 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2349,7 +2349,7 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * name = attr->ObjectName->Buffer; name_len = attr->ObjectName->Length / sizeof(WCHAR); - if (name_len && IS_SEPARATOR(name[0])) return STATUS_OBJECT_PATH_SYNTAX_BAD; + if (name_len && IS_SEPARATOR(name[0])) return STATUS_INVALID_PARAMETER; /* check for invalid characters */ for (p = name; p < name + name_len; p++) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ccec589..ca0ef28 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -195,7 +195,7 @@ static void open_file_test(void) nameW.Length += sizeof(WCHAR); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, + ok( status == STATUS_INVALID_PARAMETER || status == STATUS_OBJECT_PATH_SYNTAX_BAD, /* nt4 */ "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); if (!status) CloseHandle( handle );

1 0

Rob Shearman : inetmib1: Fix off-by-one error in findNextOidInTable.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: d0f93223b1ec6cb94bf57bfb97540fe908cabf71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f93223b1ec6cb94bf57bfb9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 2 14:55:10 2009 +0000 inetmib1: Fix off-by-one error in findNextOidInTable. index is 1-based, so take that into account when calculating the pointer to pass into the compare function. --- dlls/inetmib1/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index b0ff812..1e56710 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -393,7 +393,7 @@ static UINT findNextOidInTable(AsnObjectIdentifier *oid, * an infinite loop. */ for (++index; index <= table->numEntries && compare(key, - &table->entries[tableEntrySize * index]) == 0; ++index) + &table->entries[tableEntrySize * (index - 1)]) == 0; ++index) ; } HeapFree(GetProcessHeap(), 0, key);

1 0

Rob Shearman : advapi32: Fix memory leaks in security tests.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 190a11ddb6ca6f55c7d68bf95ede376991c8ffba URL: http://source.winehq.org/git/wine.git/?a=commit;h=190a11ddb6ca6f55c7d68bf95… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 2 14:32:07 2009 +0000 advapi32: Fix memory leaks in security tests. --- dlls/advapi32/tests/security.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cce2a27..001b909 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -256,6 +256,7 @@ static void test_sid(void) ok(pisid->SubAuthority[0] == 21, "Invalid subauthority 0 - expceted 21, got %d\n", pisid->SubAuthority[0]); ok(pisid->SubAuthority[3] == 4576, "Invalid subauthority 0 - expceted 4576, got %d\n", pisid->SubAuthority[3]); LocalFree(str); + LocalFree(psid); for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ ) { @@ -1248,12 +1249,12 @@ static void test_token_attr(void) DWORD DomainLength = 255; TCHAR Domain[255]; SID_NAME_USE SidNameUse; - pConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); Name[0] = '\0'; Domain[0] = '\0'; ret = LookupAccountSid(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); if (ret) { + pConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); trace("%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); LocalFree(SidString); } @@ -1488,6 +1489,8 @@ static void test_CreateWellKnownSid(void) ok(memcmp(buf2, sid_buffer, cb) == 0, "SID create with domain is different than without (%d)\n", i); } } + + LocalFree(domainsid); } static void test_LookupAccountSid(void) @@ -2773,7 +2776,7 @@ static void test_ConvertStringSecurityDescriptor(void) ret = pConvertStringSecurityDescriptorToSecurityDescriptorW( Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - + LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void) @@ -2885,6 +2888,9 @@ static void test_ConvertSecurityDescriptorToString(void) CHECK_ONE_OF_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", /* XP */ "O:SYG:S-1-5-21-93476-23408-4576D:NO_ACCESS_CONTROLS:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)" /* Vista */); } + + LocalFree(psid2); + LocalFree(psid); } static void test_SetSecurityDescriptorControl (PSECURITY_DESCRIPTOR sec)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009