December 2009 - Wine-Commits

Marcus Meissner : riched20: Check for NULL in rtf reader (Coverity).
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: c848e4ee861c57810772f0c64bd8377607e641f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c848e4ee861c57810772f0c64… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 3 00:33:02 2009 +0100 riched20: Check for NULL in rtf reader (Coverity). --- dlls/riched20/reader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index a589a8e..de468c7 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1109,7 +1109,10 @@ static void ReadStyleSheet(RTF_Info *info) } sep = New (RTFStyleElt); if (sep == NULL) + { ERR ( "%s: cannot allocate style element\n", fn); + break; + } sep->rtfSEClass = info->rtfClass; sep->rtfSEMajor = info->rtfMajor; sep->rtfSEMinor = info->rtfMinor;

1 0

Marcus Meissner : mmsystem.dll16: Check for NULL ptr in mmioRename ( Coverity).
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 40026a7eb7b3fc5500c61b2b2a1496d2322acd2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=40026a7eb7b3fc5500c61b2b2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 3 00:29:24 2009 +0100 mmsystem.dll16: Check for NULL ptr in mmioRename (Coverity). --- dlls/mmsystem.dll16/mmio16.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index d0e24bc..cc13583 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -631,7 +631,8 @@ MMRESULT16 WINAPI mmioRename16(LPCSTR szFileName, LPCSTR szNewFileName, inst = TRUE; } memset(&mmioinfo, 0, sizeof(mmioinfo)); - mmioinfo.fccIOProc = lpmmioinfo->fccIOProc; + if (lpmmioinfo) + mmioinfo.fccIOProc = lpmmioinfo->fccIOProc; ret = mmioRenameA(szFileName, szNewFileName, &mmioinfo, dwRenameFlags); if (inst) { mmioInstallIOProc16(lpmmioinfo->fccIOProc, NULL, MMIO_REMOVEPROC);

1 0

Nikolay Sivov : user32/tests: Restore original procedure to let control clean up.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 48cb3a30b55f9a320e4a27a6c1feb8d7e36938fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=48cb3a30b55f9a320e4a27a6c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 2 23:03:21 2009 +0300 user32/tests: Restore original procedure to let control clean up. --- dlls/user32/tests/class.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 7b42ce3..940550e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -707,6 +707,7 @@ static void test_builtinproc(void) oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); ok(IS_WNDPROC_HANDLE(oldproc) == FALSE, "Class %s shouldn't return a handle\n", NORMAL_CLASSES[i]); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); DestroyWindow(hwnd); } @@ -747,6 +748,8 @@ static void test_builtinproc(void) CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classW, sizeof(classW)) == 0, "WM_GETTEXT invalid return\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); + DestroyWindow(hwnd); hwnd = CreateWindowA(WC_EDITA, classA, WS_OVERLAPPEDWINDOW, @@ -768,7 +771,7 @@ static void test_builtinproc(void) CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classW, sizeof(classW)) == 0, "WM_GETTEXT invalid return\n"); - SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); + oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); SetWindowTextW(hwnd, unistring); CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, unistring, sizeof(unistring)) == 0, "WM_GETTEXT invalid return\n"); @@ -781,6 +784,8 @@ static void test_builtinproc(void) CallWindowProcA((WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classA, sizeof(classA)) == 0, "WM_GETTEXT invalid return\n"); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : user32/edit: Check for edit window to be here in case of destruction during handler execution .
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: aa737174f07153e56622c70d26532e7c27d817d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa737174f07153e56622c70d2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 2 23:22:12 2009 +0300 user32/edit: Check for edit window to be here in case of destruction during handler execution. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f4143b1..b512aa4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5390,7 +5390,7 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, break; } - if (es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result);

1 0

Stefan Leichter : setupapi/tests: Use separate directory for SetupGetInfFileListW.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 941d69e5443db1f21b9c8a38c7f6efd5d867c23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=941d69e5443db1f21b9c8a38c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Dec 2 22:03:12 2009 +0100 setupapi/tests: Use separate directory for SetupGetInfFileListW. --- dlls/setupapi/tests/install.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 9aa5a91..4b718fc 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -478,6 +478,7 @@ static void test_inffilelist(void) "Signature=\"$Chicago$\""; WCHAR *p, *ptr; + char dirA[MAX_PATH]; WCHAR dir[MAX_PATH] = { 0 }; WCHAR buffer[MAX_PATH] = { 0 }; DWORD expected, outsize; @@ -510,9 +511,29 @@ static void test_inffilelist(void) todo_wine ok(!ret, "expected SetupGetInfFileListW to fail!\n"); + /* create a private directory, the temp directory may contain some + * inf files left over from old installations + */ + if (!GetTempFileNameA(CURR_DIR, "inftest", 1, dirA)) + { + win_skip("GetTempFileNameA failed with error %d\n", GetLastError()); + return; + } + if (!CreateDirectoryA(dirA, NULL )) + { + win_skip("CreateDirectoryA failed with error %d\n", GetLastError()); + return; + } + if (!SetCurrentDirectoryA(dirA)) + { + win_skip("SetCurrentDirectoryA failed with error %d\n", GetLastError()); + RemoveDirectoryA(dirA); + return; + } + + MultiByteToWideChar(CP_ACP, 0, dirA, -1, dir, MAX_PATH); /* check a not existing directory */ - MultiByteToWideChar(CP_ACP, 0, CURR_DIR, -1, dir, MAX_PATH); ptr = dir + lstrlenW(dir); MultiByteToWideChar(CP_ACP, 0, "\\not_existent", -1, ptr, MAX_PATH - lstrlenW(dir)); outsize = 0xffffffff; @@ -569,6 +590,8 @@ static void test_inffilelist(void) DeleteFile(inffile); DeleteFile(inffile2); DeleteFile(invalid_inf); + SetCurrentDirectoryA(CURR_DIR); + RemoveDirectoryA(dirA); } START_TEST(install)

1 0

Juan Lang : cryptnet: Fix test failures on Win2k.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

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

Alexandre Julliard : ntdll: Add support for the FILE_OPEN_BY_FILE_ID flag in NtCreateFile.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

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

Juan Lang : cryptnet: Check revocation at an appropriate time.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 1860d2a8d38e003366b4013d0711faa652a419ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1860d2a8d38e003366b4013d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 10:26:48 2009 -0800 cryptnet: Check revocation at an appropriate time. --- dlls/cryptnet/tests/cryptnet.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index a66e912..ee7e1fc 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -486,6 +486,9 @@ static const BYTE rootSignedCRL[] = { BOOL (WINAPI *pCertVerifyRevocation)(DWORD, DWORD, DWORD, void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS); +/* Wednesday, Oct 1, 2007 */ +static SYSTEMTIME oct2007 = { 2007, 10, 1, 1, 0, 0, 0, 0 }; + static void test_verifyRevocation(void) { HMODULE hCryptNet = GetModuleHandleA("cryptnet.dll"); @@ -493,6 +496,7 @@ static void test_verifyRevocation(void) CERT_REVOCATION_STATUS status = { sizeof(status), 0 }; PCCERT_CONTEXT certs[2]; CERT_REVOCATION_PARA revPara = { sizeof(revPara), 0 }; + FILETIME time; pCertVerifyRevocation = (void *)GetProcAddress(hCryptNet, "CertDllVerifyRevocation"); @@ -599,6 +603,16 @@ static void test_verifyRevocation(void) 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); + /* Specifying the time to check: still no change */ + SystemTimeToFileTime(&oct2007, &time); + revPara.pftTimeToUse = &time; + ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, + 1, (void **)&certs[1], 0, &revPara, &status); + ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, + "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, + "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); CertFreeCertificateContext(certs[1]); CertFreeCertificateContext(certs[0]);

1 0

Juan Lang : crypt32: Fix test failure on Win7.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

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

Alexandre Julliard : ntdll/tests: Add some tests for opening files by file id.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

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