Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 60009: [KERNEL32] - Improve a DPRINT in CreateProcessInternalW. Patch by Víctor Martínez Calvo CORE-7452 #resolve
by tfaber＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: tfaber Date: Tue Sep 10 17:12:21 2013 New Revision: 60009 URL: http://svn.reactos.org/svn/reactos?rev=60009&view=rev Log: [KERNEL32] - Improve a DPRINT in CreateProcessInternalW. Patch by Víctor Martínez Calvo CORE-7452 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Sep 10 17:12:21 2013 @@ -2744,7 +2744,7 @@ } } - DPRINT1("Length: %lx Buffer: %S\n", Length, NameBuffer); + DPRINT1("Length: %lu Buffer: %S\n", Length, NameBuffer); /* Check if there was a failure in SearchPathW */ if ((Length) && (Length < MAX_PATH))

1 0

[dreimer] 60008: Woops, modified the Description to be a bit more helpful.
by dreimer＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: dreimer Date: Tue Sep 10 16:59:13 2013 New Revision: 60008 URL: http://svn.reactos.org/svn/reactos?rev=60008&view=rev Log: Woops, modified the Description to be a bit more helpful. Modified: trunk/reactos/base/applications/rapps/rapps/lautus.txt Modified: trunk/reactos/base/applications/rapps/rapps/lautus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lautus.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lautus.txt [iso-8859-1] Tue Sep 10 16:59:13 2013 @@ -4,7 +4,7 @@ Name = Lautus UXTheme Version = 1.0 License = GPLv2 -Description = Theme made specially for ReactOS. +Description = Theme made specially for ReactOS. Unzip in the "ReactOS" folder, then set the themeing service to "Automatic" and start it. URLSite = http://www.reactos.org/forum/viewtopic.php?f=25&t=9293 Size = 341kB Category = 15 @@ -12,4 +12,4 @@ CDPath = none [Section.0407] -Description = Theme, der speziell fÃ¼r ReactOS entwickelt wird. +Description = Theme, der speziell fÃ¼r ReactOS entwickelt wird. Entpacken in das "ReactOS"-Verzeichnis, dann den Design Dienst auf "Automatisch" stellen und starten.

1 0

[akhaldi] 60007: [NTDLL_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 16:49:44 2013 New Revision: 60007 URL: http://svn.reactos.org/svn/reactos?rev=60007&view=rev Log: [NTDLL_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/ntdll/directory.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/ntdll/rtlstr.c Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -32,4 +32,5 @@ add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) allow_warnings(ntdll_winetest) + add_target_compile_flags(ntdll_winetest "-Wno-format") endif() Modified: trunk/rostests/winetests/ntdll/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory… ============================================================================== --- trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -162,11 +162,12 @@ } static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char *testdirA, + UNICODE_STRING *mask, BOOLEAN single_entry, BOOLEAN restart_flag) { HANDLE dirh; IO_STATUS_BLOCK io; - UINT data_pos; + UINT data_pos, data_size; UINT data_len; /* length of dir data */ BYTE data[8192]; /* directory data */ FILE_BOTH_DIRECTORY_INFORMATION *dir_info; @@ -175,6 +176,8 @@ int i; reset_found_files(); + + data_size = mask ? offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] ) : sizeof(data); /* Read the directory and note which files are found */ status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_OPEN, @@ -185,9 +188,9 @@ return; } - pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, single_entry, NULL, restart_flag ); - ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); + pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, single_entry, mask, restart_flag ); + ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); data_len = io.Information; ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); @@ -199,11 +202,11 @@ tally_test_file(dir_info); if (dir_info->NextEntryOffset == 0) { - pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, single_entry, NULL, FALSE ); + pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, single_entry, mask, FALSE ); if (U(io).Status == STATUS_NO_MORE_FILES) break; - ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); + ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); data_len = io.Information; if (data_len < sizeof(FILE_BOTH_DIRECTORY_INFORMATION)) break; @@ -215,10 +218,16 @@ } ok(numfiles < max_test_dir_size, "too many loops\n"); - for (i=0; testfiles[i].name; i++) - ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (ReturnSingleEntry=%d,RestartScan=%d)\n", - testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); - + if (mask) + for (i=0; testfiles[i].name; i++) + ok(testfiles[i].nfound == (testfiles[i].nameW == mask->Buffer), + "Wrong number %d of %s files found (single_entry=%d,mask=%s)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, + wine_dbgstr_wn(mask->Buffer, mask->Length/sizeof(WCHAR) )); + else + for (i=0; testfiles[i].name; i++) + ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (single_entry=%d,restart=%d)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); pNtClose(dirh); } @@ -228,6 +237,7 @@ UNICODE_STRING ntdirname; char testdirA[MAX_PATH]; WCHAR testdirW[MAX_PATH]; + int i; /* Clean up from prior aborted run, if any, then set up test files */ ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); @@ -243,10 +253,23 @@ } InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); - test_flags_NtQueryDirectoryFile(&attr, testdirA, FALSE, TRUE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, FALSE, FALSE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, TRUE, TRUE); - test_flags_NtQueryDirectoryFile(&attr, testdirA, TRUE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, FALSE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, FALSE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, TRUE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, NULL, TRUE, FALSE); + + for (i = 0; testfiles[i].name; i++) + { + UNICODE_STRING mask; + + if (testfiles[i].nameW[0] == '.') continue; /* . and .. as masks are broken on Windows */ + mask.Buffer = testfiles[i].nameW; + mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, FALSE); + } done: tear_down_attribute_test(testdirA); Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -72,7 +72,7 @@ static NTSTATUS (WINAPI *pNtOpenIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtQueryIoCompletion)(HANDLE, IO_COMPLETION_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtRemoveIoCompletion)(HANDLE, PULONG_PTR, PULONG_PTR, PIO_STATUS_BLOCK, PLARGE_INTEGER); -static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, ULONG); +static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, SIZE_T); 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, @@ -81,7 +81,7 @@ static inline BOOL is_signaled( HANDLE obj ) { - return WaitForSingleObject( obj, 0 ) == 0; + return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c" @@ -101,10 +101,11 @@ static HANDLE create_temp_file( ULONG flags ) { - char buffer[MAX_PATH]; + char path[MAX_PATH], buffer[MAX_PATH]; HANDLE handle; - GetTempFileNameA( ".", "foo", 0, buffer ); + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foo", 0, buffer ); handle = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, flags | FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); @@ -505,7 +506,8 @@ ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -530,7 +532,8 @@ ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -548,7 +551,8 @@ U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; ResetEvent( event ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); status = pNtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); @@ -571,7 +575,8 @@ ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); - WriteFile( write, buffer, 1, &written, NULL ); + ret = WriteFile( write, buffer, 1, &written, NULL ); + ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* partial read is good enough */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( is_signaled( event ), "event is signaled\n" ); @@ -777,6 +782,8 @@ iosb.Information = 0xdeadbeef; offset.QuadPart = strlen(text) + 2; status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); +todo_wine + ok(status == STATUS_PENDING || broken(status == STATUS_END_OF_FILE) /* before Vista */, "expected STATUS_PENDING, got %#x\n", status); if (status == STATUS_PENDING) /* vista */ { WaitForSingleObject( event, 1000 ); @@ -786,16 +793,6 @@ ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); - } - else - { - ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); - ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); - ok( !is_signaled( event ), "event is signaled\n" ); - ok( !apc_count, "apc was called\n" ); - SleepEx( 1, TRUE ); /* alertable sleep */ - ok( !apc_count, "apc was called\n" ); } CloseHandle( handle ); @@ -859,9 +856,10 @@ NTSTATUS status; IO_STATUS_BLOCK iosb; DWORD written; - char buffer[128]; - - GetTempFileNameA( ".", "foo", 0, buffer ); + char path[MAX_PATH], buffer[MAX_PATH]; + + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foo", 0, buffer ); /* It is possible to open a file with only FILE_APPEND_DATA access flags. It matches the O_WRONLY|O_APPEND open() posix behavior */ handle = CreateFileA(buffer, FILE_APPEND_DATA, 0, NULL, CREATE_ALWAYS, @@ -990,8 +988,11 @@ { NTSTATUS res; ULONG count; - - res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, 3 ); + SIZE_T size = 3; + + if (sizeof(size) > 4) size |= (ULONGLONG)0x12345678 << 32; + + res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size ); ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %x\n", res ); count = get_pending_msgs(h); @@ -1000,7 +1001,7 @@ if (get_msg(h)) { ok( completionKey == CKEY_FIRST, "Invalid completion key: %lx\n", completionKey ); - ok( ioSb.Information == 3, "Invalid ioSb.Information: %ld\n", ioSb.Information ); + ok( ioSb.Information == size, "Invalid ioSb.Information: %lu\n", ioSb.Information ); ok( U(ioSb).Status == STATUS_INVALID_DEVICE_REQUEST, "Invalid ioSb.Status: %x\n", U(ioSb).Status); ok( completionValue == CVALUE_FIRST, "Invalid completion value: %lx\n", completionValue ); } @@ -1299,6 +1300,158 @@ CloseHandle( h ); } +static void test_file_disposition_information(void) +{ + char buffer[MAX_PATH + 16]; + DWORD dirpos; + HANDLE handle, handle2; + NTSTATUS res; + IO_STATUS_BLOCK io; + FILE_DISPOSITION_INFORMATION fdi; + BOOL fileDeleted; + + /* cannot set disposition on file not opened with delete access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + res = pNtQueryInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %x)\n", res ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + DeleteFileA( buffer ); + + /* can set disposition on file opened with proper access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* cannot set disposition on readonly file */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); + DeleteFileA( buffer ); + + /* can set disposition on file and then reset it */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + DeleteFileA( buffer ); + + /* Delete-on-close flag doesn't change file disposition until a handle is closed */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* Delete-on-close flag sets disposition when a handle is closed and then it could be changed back */ + GetTempFileNameA( ".", "dis", 0, buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); + CloseHandle( handle ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle2 ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "File should have been deleted\n" ); + DeleteFileA( buffer ); + + /* can set disposition on a directory opened with proper access */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine + ok( fileDeleted, "Directory should have been deleted\n" ); + RemoveDirectoryA( buffer ); + + /* RemoveDirectory sets directory disposition and it can be undone */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + RemoveDirectoryA( buffer ); + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + RemoveDirectoryA( buffer ); + + /* cannot set disposition on a non-empty directory */ + GetTempFileNameA( ".", "dis", 0, buffer ); + DeleteFileA( buffer ); + ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); + handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); + dirpos = lstrlenA( buffer ); + lstrcpyA( buffer + dirpos, "\\tst" ); + handle2 = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + CloseHandle( handle2 ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + todo_wine + ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %x)\n", res ); + DeleteFileA( buffer ); + buffer[dirpos] = '\0'; + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + RemoveDirectoryA( buffer ); +} + static void test_iocompletion(void) { HANDLE h = INVALID_HANDLE_VALUE; @@ -1630,6 +1783,52 @@ ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %d\n", ffvi->VolumeLabelLength); trace("VolumeSerialNumber: %x VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel)); + + CloseHandle( dir ); +} + +static void test_query_attribute_information_file(void) +{ + NTSTATUS status; + HANDLE dir; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + FILE_FS_ATTRIBUTE_INFORMATION *ffai; + BYTE buf[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + + GetWindowsDirectoryW( path, MAX_PATH ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + + ZeroMemory( buf, sizeof(buf) ); + U(io).Status = 0xdadadada; + io.Information = 0xcacacaca; + + status = pNtQueryVolumeInformationFile( dir, &io, buf, sizeof(buf), FileFsAttributeInformation ); + + ffai = (FILE_FS_ATTRIBUTE_INFORMATION *)buf; + + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); + ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); + ok(ffai->FileSystemAttribute != 0, "Missing FileSystemAttribute\n"); + ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n"); + ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n"); + + trace("FileSystemAttribute: %x MaximumComponentNameLength: %x FileSystemName: %s\n", + ffai->FileSystemAttribute, ffai->MaximumComponentNameLength, + wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR))); CloseHandle( dir ); } @@ -1662,7 +1861,6 @@ /*18*/{ FILE_SUPERSEDE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, TRUE } }; static const WCHAR fooW[] = {'f','o','o',0}; - static const WCHAR dotW[] = {'.',0}; NTSTATUS status; HANDLE handle; WCHAR path[MAX_PATH]; @@ -1671,7 +1869,8 @@ UNICODE_STRING nameW; DWORD ret, i; - GetTempFileNameW(dotW, fooW, 0, path); + GetTempPathW(MAX_PATH, path); + GetTempFileNameW(path, fooW, 0, path); DeleteFileW(path); pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); @@ -1718,6 +1917,420 @@ SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); DeleteFileW( path ); +} + +static void test_read_write(void) +{ + static const char contents[] = "1234567890abcd"; + char buf[256]; + HANDLE hfile; + OVERLAPPED ovl; + IO_STATUS_BLOCK iob; + DWORD ret, bytes, status; + LARGE_INTEGER offset; + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + hfile = create_temp_file(0); + if (!hfile) return; + + iob.Status = -1; + iob.Information = -1; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); + + SetFilePointer(hfile, sizeof(contents) - 4, NULL, FILE_BEGIN); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + bytes = 0; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); +todo_wine + ok(iob.Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); +todo_wine + ok(iob.Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); + ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); +todo_wine + ok(iob.Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = sizeof(contents) - 4; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); + + S(U(ovl)).Offset = sizeof(contents) - 4; + S(U(ovl)).OffsetHigh = 0; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); + ok(ret, "WriteFile error %d\n", GetLastError()); + ok(bytes == 4, "bytes %u\n", bytes); + + S(U(ovl)).Offset = 0; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "ABCD", 4), "file contents mismatch\n"); + + CloseHandle(hfile); + + hfile = create_temp_file(FILE_FLAG_OVERLAPPED); + if (!hfile) return; + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); +todo_wine + ok(!ret, "WriteFile should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); +todo_wine + ok(bytes == 0, "bytes %u\n", bytes); + + iob.Status = -1; + iob.Information = -1; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL); +todo_wine + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); +todo_wine + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); +todo_wine + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); +todo_wine + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); +todo_wine + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); +todo_wine + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* see below */, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + /* even fully updated XP passes this test, but it looks like some VMs + * in a testbot get never updated, so overlapped IO is broken. Instead + * of fighting with broken tests and adding a bunch of broken() statements + * it's better to skip further tests completely. + */ + if (status != STATUS_PENDING) + { +todo_wine + win_skip("broken overlapped IO implementation, update your OS\n"); + CloseHandle(hfile); + return; + } + + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); + + offset.QuadPart = sizeof(contents); + S(U(ovl)).Offset = offset.u.LowPart; + S(U(ovl)).OffsetHigh = offset.u.HighPart; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING || broken(GetLastError() == ERROR_HANDLE_EOF), "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + /* even fully updated XP passes this test, but it looks like some VMs + * in a testbot get never updated, so overlapped IO is broken. Instead + * of fighting with broken tests and adding a bunch of broken() statements + * it's better to skip further tests completely. + */ + if (GetLastError() != ERROR_IO_PENDING) + { + win_skip("broken overlapped IO implementation, update your OS\n"); + CloseHandle(hfile); + return; + } + ok(bytes == 0, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(!ret, "GetOverlappedResult should report FALSE\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, read %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = sizeof(contents); + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", iob.Status); + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + S(U(ovl)).Offset = offset.u.LowPart; + S(U(ovl)).OffsetHigh = offset.u.HighPart; + ovl.Internal = iob.Status; + ovl.InternalHigh = iob.Information; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(!ret, "GetOverlappedResult should report FALSE\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, read %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + + SetFilePointer(hfile, 0, NULL, FILE_BEGIN); + + S(U(ovl)).Offset = 0; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n"); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = sizeof(contents) - 4; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); + + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); + + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n"); + + S(U(ovl)).Offset = sizeof(contents) - 4; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); + ok(!ret || broken(ret) /* before Vista */, "WriteFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING || broken(GetLastError() == 0xdeadbeef) /* before Vista */, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(bytes == 0 || broken(bytes == 4) /* before Vista */, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 4, "expected 4, got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult error %d\n", GetLastError()); + ok(bytes == 4, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 4, "expected 4, got %lu\n", ovl.InternalHigh); + + S(U(ovl)).Offset = 0; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); + ok(!ret, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult error %d\n", GetLastError()); + ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); + ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); + ok(!memcmp(buf + sizeof(contents) - 4, "ABCD", 4), "file contents mismatch\n"); + + CloseHandle(hfile); } START_TEST(file) @@ -1756,6 +2369,7 @@ pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); + test_read_write(); test_NtCreateFile(); create_file_test(); open_file_test(); @@ -1769,5 +2383,7 @@ test_file_both_information(); test_file_name_information(); test_file_all_name_information(); + test_file_disposition_information(); test_query_volume_information_file(); -} + test_query_attribute_information_file(); +} Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/info.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -505,18 +505,51 @@ { NTSTATUS status; ULONG ReturnLength; - SYSTEM_CACHE_INFORMATION sci; - - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, sizeof(sci), &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength); - - status = pNtQuerySystemInformation(SystemCacheInformation, &sci, sizeof(sci) + 2, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + BYTE buffer[128]; + SYSTEM_CACHE_INFORMATION *sci = (SYSTEM_CACHE_INFORMATION *) buffer; + ULONG expected; + INT i; + + /* the large SYSTEM_CACHE_INFORMATION on WIN64 is not documented */ + expected = sizeof(SYSTEM_CACHE_INFORMATION); + for (i = sizeof(buffer); i>= expected; i--) + { + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok(!status && (ReturnLength == expected), + "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected); + } + + /* buffer too small for the full result. + Up to win7, the function succeeds with a partial result. */ + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + if (!status) + { + expected = offsetof(SYSTEM_CACHE_INFORMATION, MinimumWorkingSet); + for (; i>= expected; i--) + { + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok(!status && (ReturnLength == expected), + "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected); + } + } + + /* buffer too small for the result, this call will always fail */ + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, i, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH && + ((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)), + "%d: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", i, status, ReturnLength, expected); + + if (0) { + /* this crashes on some vista / win7 machines */ + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCacheInformation, sci, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH && + ((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)), + "0: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", status, ReturnLength, expected); + } } static void test_query_interrupt(void) Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… ============================================================================== --- trunk/rostests/winetests/ntdll/om.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/om.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -30,6 +30,9 @@ static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN, BOOLEAN); +static NTSTATUS (WINAPI *pNtOpenEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES); +static NTSTATUS (WINAPI *pNtPulseEvent) ( HANDLE, PULONG ); +static NTSTATUS (WINAPI *pNtQueryEvent) ( HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); static NTSTATUS (WINAPI *pNtCreateMutant)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN ); static NTSTATUS (WINAPI *pNtOpenMutant) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG ); @@ -46,8 +49,15 @@ static NTSTATUS (WINAPI *pNtCreateSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PUNICODE_STRING); static NTSTATUS (WINAPI *pNtQuerySymbolicLinkObject)(HANDLE,PUNICODE_STRING,PULONG); static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); -static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE handle, ULONG count, PULONG previous); - +static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE, ULONG, PULONG); +static NTSTATUS (WINAPI *pNtCreateKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, ULONG ); +static NTSTATUS (WINAPI *pNtOpenKeyedEvent)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES * ); +static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); + +#define KEYEDEVENT_WAIT 0x0001 +#define KEYEDEVENT_WAKE 0x0002 +#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) static void test_case_sensitive (void) { @@ -798,6 +808,230 @@ pNtClose( h ); } +static void test_event(void) +{ + HANDLE Event; + HANDLE Event2; + NTSTATUS status; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + EVENT_BASIC_INFORMATION info; + static const WCHAR eventName[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s','\\','t','e','s','t','E','v','e','n','t',0}; + + pRtlInitUnicodeString(&str, eventName); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 1, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + + status = pNtPulseEvent(Event, NULL); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); + + status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == 1 && info.EventState == 0, + "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + + status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); + + status = pNtClose(Event); + + status = pNtQueryEvent(Event2, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == 1 && info.EventState == 0, + "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + + status = pNtClose(Event2); +} + +static const WCHAR keyed_nameW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', + '\\','W','i','n','e','T','e','s','t','E','v','e','n','t',0}; + +static DWORD WINAPI keyed_event_thread( void *arg ) +{ + HANDLE handle; + NTSTATUS status; + LARGE_INTEGER timeout; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + ULONG_PTR i; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &str; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &str, keyed_nameW ); + + status = pNtOpenKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr ); + ok( !status, "NtOpenKeyedEvent failed %x\n", status ); + + for (i = 0; i < 20; i++) + { + if (i & 1) + status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + else + status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + Sleep( 20 - i ); + } + + status = pNtReleaseKeyedEvent( handle, (void *)0x1234, 0, NULL ); + ok( status == STATUS_SUCCESS, "NtReleaseKeyedEvent %x\n", status ); + + timeout.QuadPart = -10000; + status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + NtClose( handle ); + return 0; +} + +static void test_keyed_events(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + HANDLE handle, event, thread; + NTSTATUS status; + LARGE_INTEGER timeout; + ULONG_PTR i; + + if (!pNtCreateKeyedEvent) + { + win_skip( "Keyed events not supported\n" ); + return; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &str; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &str, keyed_nameW ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS | SYNCHRONIZE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + + status = WaitForSingleObject( handle, 1000 ); + ok( status == 0, "WaitForSingleObject %x\n", status ); + + timeout.QuadPart = -100000; + status = pNtWaitForKeyedEvent( handle, (void *)255, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)255, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( handle, (void *)254, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)254, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( handle, NULL, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + + status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); + ok( status == STATUS_INVALID_HANDLE, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); + ok( status == STATUS_INVALID_HANDLE, "NtReleaseKeyedEvent %x\n", status ); + + thread = CreateThread( NULL, 0, keyed_event_thread, 0, 0, NULL ); + for (i = 0; i < 20; i++) + { + if (i & 1) + status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + else + status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); + ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + Sleep( i ); + } + status = pNtWaitForKeyedEvent( handle, (void *)0x1234, 0, &timeout ); + ok( status == STATUS_SUCCESS, "NtWaitForKeyedEvent %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + ok( WaitForSingleObject( thread, 30000 ) == 0, "wait failed\n" ); + + NtClose( handle ); + + /* test access rights */ + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAIT, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAKE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = WaitForSingleObject( handle, 1000 ); + ok( status == WAIT_FAILED && GetLastError() == ERROR_ACCESS_DENIED, + "WaitForSingleObject %x err %u\n", status, GetLastError() ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + /* GENERIC_READ gives wait access */ + status = pNtCreateKeyedEvent( &handle, GENERIC_READ, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + NtClose( handle ); + + /* GENERIC_WRITE gives wake access */ + status = pNtCreateKeyedEvent( &handle, GENERIC_WRITE, &attr, 0 ); + ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + + /* it's not an event */ + status = pNtPulseEvent( handle, NULL ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); + + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, + "CreateEvent %x\n", status ); + + NtClose( handle ); + + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + ok( status == 0, "CreateEvent %x\n", status ); + status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); + status = pNtReleaseKeyedEvent( event, (void *)8, 0, &timeout ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %x\n", status ); + NtClose( event ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -815,6 +1049,9 @@ pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pNtCreateEvent = (void *)GetProcAddress(hntdll, "NtCreateEvent"); pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant"); + pNtOpenEvent = (void *)GetProcAddress(hntdll, "NtOpenEvent"); + pNtQueryEvent = (void *)GetProcAddress(hntdll, "NtQueryEvent"); + pNtPulseEvent = (void *)GetProcAddress(hntdll, "NtPulseEvent"); pNtOpenMutant = (void *)GetProcAddress(hntdll, "NtOpenMutant"); pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); @@ -830,6 +1067,10 @@ pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection"); pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject"); pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore"); + pNtCreateKeyedEvent = (void *)GetProcAddress(hntdll, "NtCreateKeyedEvent"); + pNtOpenKeyedEvent = (void *)GetProcAddress(hntdll, "NtOpenKeyedEvent"); + pNtWaitForKeyedEvent = (void *)GetProcAddress(hntdll, "NtWaitForKeyedEvent"); + pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); test_case_sensitive(); test_namespace_pipe(); @@ -838,4 +1079,9 @@ test_symboliclink(); test_query_object(); test_type_mismatch(); -} + test_event(); + if (winetest_interactive) + test_keyed_events(); + else + skip("Skipping test_keyed_events(). ROSTESTS-118.\n"); +} Modified: trunk/rostests/winetests/ntdll/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtlstr.c?… ============================================================================== --- trunk/rostests/winetests/ntdll/rtlstr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtlstr.c [iso-8859-1] Tue Sep 10 16:49:44 2013 @@ -29,6 +29,9 @@ #include "ntdll_test.h" #include "winnls.h" #include "guiddef.h" + +#define HASH_STRING_ALGORITHM_X65599 1 +#define HASH_STRING_ALGORITHM_INVALID 0xffffffff /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; @@ -64,6 +67,7 @@ static NTSTATUS (WINAPI *pRtlGUIDFromString)(const UNICODE_STRING*,GUID*); static NTSTATUS (WINAPI *pRtlStringFromGUID)(const GUID*, UNICODE_STRING*); static BOOLEAN (WINAPI *pRtlIsTextUnicode)(LPVOID, INT, INT *); +static NTSTATUS (WINAPI *pRtlHashUnicodeString)(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); /*static VOID (WINAPI *pRtlFreeOemString)(PSTRING);*/ /*static VOID (WINAPI *pRtlCopyUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *);*/ @@ -132,9 +136,9 @@ pRtlGUIDFromString = (void *)GetProcAddress(hntdll, "RtlGUIDFromString"); pRtlStringFromGUID = (void *)GetProcAddress(hntdll, "RtlStringFromGUID"); pRtlIsTextUnicode = (void *)GetProcAddress(hntdll, "RtlIsTextUnicode"); - } -} - + pRtlHashUnicodeString = (void*)GetProcAddress(hntdll, "RtlHashUnicodeString"); + } +} static void test_RtlInitString(void) { @@ -191,6 +195,12 @@ WCHAR *teststring2; UNICODE_STRING uni; NTSTATUS result; + + if (!pRtlInitUnicodeStringEx) + { + win_skip("RtlInitUnicodeStringEx is not available\n"); + return; + } teststring2 = HeapAlloc(GetProcessHeap(), 0, (TESTSTRING2_LEN + 1) * sizeof(WCHAR)); memset(teststring2, 'X', TESTSTRING2_LEN * sizeof(WCHAR)); @@ -406,6 +416,12 @@ NTSTATUS result; unsigned int test_num; + if (!pRtlDuplicateUnicodeString) + { + win_skip("RtlDuplicateUnicodeString is not available\n"); + return; + } + for (test_num = 0; test_num < NB_DUPL_USTR; test_num++) { source_str.Length = dupl_ustr[test_num].source_Length; source_str.MaximumLength = dupl_ustr[test_num].source_MaximumLength; @@ -1179,6 +1195,12 @@ NTSTATUS result; unsigned int idx; unsigned int test_num; + + if (!pRtlFindCharInUnicodeString) + { + win_skip("RtlFindCharInUnicodeString is not available\n"); + return; + } for (test_num = 0; test_num < NB_FIND_CH_IN_USTR; test_num++) { if (find_ch_in_ustr[test_num].main_str != NULL) { @@ -1710,6 +1732,12 @@ int flags; int i; + if (!pRtlIsTextUnicode) + { + win_skip("RtlIsTextUnicode is not available\n"); + return; + } + ok(!pRtlIsTextUnicode(ascii, sizeof(ascii), NULL), "ASCII text detected as Unicode\n"); res = pRtlIsTextUnicode(unicode, sizeof(unicode), NULL); @@ -1839,6 +1867,12 @@ UNICODE_STRING str; NTSTATUS ret; + if (!pRtlGUIDFromString) + { + win_skip("RtlGUIDFromString is not available\n"); + return; + } + str.Length = str.MaximumLength = sizeof(szGuid) - sizeof(WCHAR); str.Buffer = (LPWSTR)szGuid; @@ -1857,6 +1891,12 @@ { UNICODE_STRING str; NTSTATUS ret; + + if (!pRtlStringFromGUID) + { + win_skip("RtlStringFromGUID is not available\n"); + return; + } str.Length = str.MaximumLength = 0; str.Buffer = NULL; @@ -1865,6 +1905,70 @@ ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); ok(str.Buffer && !lstrcmpiW(str.Buffer, szGuid), "Endianness broken\n"); pRtlFreeUnicodeString(&str); +} + +struct hash_unicodestring_test { + WCHAR str[50]; + BOOLEAN case_insensitive; + ULONG hash; +}; + +static const struct hash_unicodestring_test hash_test[] = { + { {'T',0}, FALSE, 0x00000054 }, + { {'T','e','s','t',0}, FALSE, 0x766bb952 }, + { {'T','e','S','t',0}, FALSE, 0x764bb172 }, + { {'t','e','s','t',0}, FALSE, 0x4745d132 }, + { {'t','e','s','t',0}, TRUE, 0x6689c132 }, + { {'T','E','S','T',0}, TRUE, 0x6689c132 }, + { {'T','E','S','T',0}, FALSE, 0x6689c132 }, + { {'a','b','c','d','e','f',0}, FALSE, 0x971318c3 }, + { { 0 } } +}; + +static void test_RtlHashUnicodeString(void) +{ + static const WCHAR strW[] = {'T','e','s','t',0,'1',0}; + const struct hash_unicodestring_test *ptr; + UNICODE_STRING str; + NTSTATUS status; + ULONG hash; + + if (!pRtlHashUnicodeString) + { + win_skip("RtlHashUnicodeString is not available\n"); + return; + } + + status = pRtlHashUnicodeString(NULL, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + RtlInitUnicodeString(&str, strW); + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_INVALID, &hash); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + + /* embedded null */ + str.Buffer = (PWSTR)strW; + str.Length = sizeof(strW) - sizeof(WCHAR); + str.MaximumLength = sizeof(strW); + status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_SUCCESS, "got status 0x%08x\n", status); + ok(hash == 0x32803083, "got 0x%08x\n", hash); + + ptr = hash_test; + while (*ptr->str) + { + RtlInitUnicodeString(&str, ptr->str); + hash = 0; + status = pRtlHashUnicodeString(&str, ptr->case_insensitive, HASH_STRING_ALGORITHM_X65599, &hash); + ok(status == STATUS_SUCCESS, "got status 0x%08x for %s\n", status, wine_dbgstr_w(ptr->str)); + ok(hash == ptr->hash, "got wrong hash 0x%08x, expected 0x%08x, for %s, mode %d\n", hash, ptr->hash, + wine_dbgstr_w(ptr->str), ptr->case_insensitive); + + ptr++; + } } START_TEST(rtlstr) @@ -1887,22 +1991,17 @@ test_RtlAppendUnicodeStringToString(); } - if (pRtlInitUnicodeStringEx) - test_RtlInitUnicodeStringEx(); - if (pRtlDuplicateUnicodeString) - test_RtlDuplicateUnicodeString(); - if (pRtlFindCharInUnicodeString) - test_RtlFindCharInUnicodeString(); - if (pRtlGUIDFromString) - test_RtlGUIDFromString(); - if (pRtlStringFromGUID) - test_RtlStringFromGUID(); - if (pRtlIsTextUnicode) - test_RtlIsTextUnicode(); + test_RtlInitUnicodeStringEx(); + test_RtlDuplicateUnicodeString(); + test_RtlFindCharInUnicodeString(); + test_RtlGUIDFromString(); + test_RtlStringFromGUID(); + test_RtlIsTextUnicode(); if(0) { test_RtlUpcaseUnicodeChar(); test_RtlUpcaseUnicodeString(); test_RtlDowncaseUnicodeString(); } -} + test_RtlHashUnicodeString(); +}

1 0

[dreimer] 60006: Commit some Rapps Database regarding patches. CORE-7312 #resolve #comment Committed in r60006. Thank you. CORE-7352 #resolve #comment Committed in r60006. Thank you. ROSAPPS-284 #r...
by dreimer＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: dreimer Date: Tue Sep 10 16:49:30 2013 New Revision: 60006 URL: http://svn.reactos.org/svn/reactos?rev=60006&view=rev Log: Commit some Rapps Database regarding patches. CORE-7312 #resolve #comment Committed in r60006. Thank you. CORE-7352 #resolve #comment Committed in r60006. Thank you. ROSAPPS-284 #resolve #comment Committed in r60006. Thank you. ROSAPPS-283 #resolve #comment Committed in r60006. Thank you. Added: trunk/reactos/base/applications/rapps/rapps/Pingus.txt (with props) trunk/reactos/base/applications/rapps/rapps/alreader.txt (with props) trunk/reactos/base/applications/rapps/rapps/boswars.txt (with props) trunk/reactos/base/applications/rapps/rapps/chromium.txt (with props) trunk/reactos/base/applications/rapps/rapps/globulation2.txt (with props) trunk/reactos/base/applications/rapps/rapps/hover.txt (with props) trunk/reactos/base/applications/rapps/rapps/indiftpd.txt (with props) trunk/reactos/base/applications/rapps/rapps/kyodai.txt (with props) trunk/reactos/base/applications/rapps/rapps/lautus.txt (with props) trunk/reactos/base/applications/rapps/rapps/pengupop.txt (with props) trunk/reactos/base/applications/rapps/rapps/pspad.txt (with props) trunk/reactos/base/applications/rapps/rapps/stamina.txt (with props) trunk/reactos/base/applications/rapps/rapps/supertux.txt (with props) trunk/reactos/base/applications/rapps/rapps/zaz.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt Added: trunk/reactos/base/applications/rapps/rapps/Pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/Pingus.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/Pingus.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Pingus +Version = 0.7.6 +Licence = GPL +Description = Pingus is a free Lemmings-like puzzle game. +Size = 16.0MB +Category = 4 +URLSite = http://pingus.seul.org +URLDownload = http://pingus.googlecode.com/files/Pingus-0.7.6.exe +CDPath = none + +[Section.0407] +Description = Pingus ist ein freies Lemings-Ã¤hnliches Puzzle Spiel. Propchange: trunk/reactos/base/applications/rapps/rapps/Pingus.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/alreader.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/alreader.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,13 @@ +ï»¿; UTF-8 + +[Section] +Name = AlReader +Description = A FB2 eBook Reader. +URLSite = http://www.alreader.com +Size = 4.6MB +Category = 6 +URLDownload = http://svn.reactos.org/packages/AlReader2Setup.exe +CDPath = none + +[Section.0407] +Description = Ein FB2 eBook Reader. Propchange: trunk/reactos/base/applications/rapps/rapps/alreader.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/boswars.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/boswars.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Bos Wars +Version = 2.6.1 +Licence = GPL +Description = Bos Wars is a futuristic real time strategy game. To start the game, install Microsoft Visual C++ 2008 runtime. +Size = 62.3MB +Category = 4 +URLSite = http://www.boswars.org +URLDownload = http://www.boswars.org/dist/releases/BosWars-2.6.1.exe +CDPath = none + +[Section.0407] +Description = Bos Wars ist ein futuristisches Echtzeitstrategiespiel. Um das Spiel zu starten, installieren Sie die Microsoft Visual C++ 2008 Runtime. Propchange: trunk/reactos/base/applications/rapps/rapps/boswars.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/chromium.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/chromium.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Chromium B.S.U. +Version = 0.9.13.2 +Licence = GPL +Description = Chromium B.S.U. is an arcade-style, top-scrolling space shooter. +Size = 2.3MB +Category = 4 +URLSite = http://chromium-bsu.sourceforge.net +URLDownload = http://files1.freesoft.ru/rep/701665/chromium-0.9.13.2.exe +CDPath = none + +[Section.0407] +Description = Chromium B.S.U. ist ein Arcade-Style, Top-Scrolling Space Shooter. Propchange: trunk/reactos/base/applications/rapps/rapps/chromium.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/globulation2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/globulation2.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/globulation2.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Globulation2 +Version = 0.9.4.4 +Licence = GPL +Description = Globulation 2 is a real-time strategy game. The game minimizes gaming micromanagement by automatically assigning tasks to units. +Size = 13.5MB +Category = 4 +URLSite = http://www.globulation2.org +URLDownload = http://dl.sv.nongnu.org/releases/glob2/0.9.4/glob2-0.9.4.4.exe +CDPath = none + +[Section.0407] +Description = Globulation 2 ist ein Echtzeitstrategiespiel. Das Spiel vereinfacht das Mikromanagement, indem es Einheiten automatisch mit AuftrÃ¤gen versieht. Propchange: trunk/reactos/base/applications/rapps/rapps/globulation2.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/hover.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/hover.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,14 @@ +ï»¿; UTF-8 + +[Section] +Name = Hover! +Version = 1.0 +Licence = MS EULA +Description = The classic Hover CTF game which was found on the Windows 95 CD. +Size = 6.2MB +Category = 4 +URLDownload = http://svn.reactos.org/packages/Hover.exe +CDPath = none + +[Section.0407] +Description = Das klassische Hover CTF Spiel, dass auf der Windows 95 CD zu finden war. Propchange: trunk/reactos/base/applications/rapps/rapps/hover.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/indiftpd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/indiftpd.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/indiftpd.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = IndiFTPD +Version = 1.0.9 Beta +Licence = GPL +Description = IndiFTPD is a standalone FTP server that functions as a single executable. It is designed for situations when a user does not want to install/configure a server on the system (or does not have permission to do so) and wants to quickly get a server running. +Size = 556kB +Category = 5 +URLSite = http://www.dftpd.com/products.php#indiftpd +URLDownload = http://www.dftpd.com/files/IndiFTPD/1.0.9_beta/Windows/Intel/indiftpd.exe +CDPath = none + +[Section.0407] +Description = IndiFTPD ist ein eigenstÃ¤ndiger FTP Server in einer einzigen Anwendung. Er wurde erstellt fÃ¼r Situationen, in denen ein Anwender keinen Server auf dem System installieren/konfigurieren mÃ¶chte (oder nicht die Recte dafÃ¼r besitzt) und schnell einen Server lauffÃ¤hig bekommen will. Propchange: trunk/reactos/base/applications/rapps/rapps/indiftpd.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/kyodai.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kyodai.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/kyodai.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,14 @@ +ï»¿; UTF-8 + +[Section] +Name = Kyodai Mahjongg +Version = 21.42 +Licence = Shareware +Description = One of the best Mahjongg Solitaire games out there. +Size = 13.8MB +Category = 4 +URLDownload = http://files.cynagames.com/kyo2006.exe +CDPath = none + +[Section.0407] +Description = Eines der besten Mahjongg Solitaire Spiele im Netz. Propchange: trunk/reactos/base/applications/rapps/rapps/kyodai.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/lautus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lautus.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/lautus.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Lautus UXTheme +Version = 1.0 +License = GPLv2 +Description = Theme made specially for ReactOS. +URLSite = http://www.reactos.org/forum/viewtopic.php?f=25&t=9293 +Size = 341kB +Category = 15 +URLDownload = http://svn.reactos.org/packages/Lautus.exe +CDPath = none + +[Section.0407] +Description = Theme, der speziell fÃ¼r ReactOS entwickelt wird. Propchange: trunk/reactos/base/applications/rapps/rapps/lautus.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -1,64 +1,62 @@ ï»¿; UTF-8 [Section] -Name = OpenOffice 3.4 -Version = 3.4.1 +Name = OpenOffice 4.0 +Version = 4.0.0 Licence = LGPL Description = THE Open Source Office Suite. -Size = 129.64MB +Size = 136.79MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/stable/3.4.1/… +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. URLSite = http://de.openoffice.org/ -Size = 145.2MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/de/… +Size = 154.88MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ -Size = 119.19MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/es/… +Size = 126.29MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.040c] Description = LA suite bureautique open source. URLSite = http://fr.openoffice.org/ -Size = 120,18 Mo -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/fr/… +Size = 127,22 Mo +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.0410] URLSite = http://it.openoffice.org/ -Size = 120.0MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/it/… +Size = 132.39MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.0413] Description = Open-bron Office Pakket. URLSite = http://nl.openoffice.org/ -Size = 124.13MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/nl/… +Size = 132.11MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.0415] Description = Otwarty pakiet biurowy. URLSite = http://pl.openoffice.org/ -Size = 120.29MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/pl/… +Size = 136.79MB [Section.0419] Description = Suita de aplicaÈii de biroticÄ open-source. -Size = 129,64 Mo +Size = 136,79 Mo URLSite = http://www.openoffice.org/ro/ [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. URLSite = http://ua.openoffice.org/ -Size = 123.22MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/ru/… +Size = 136.79MB [Section.0813] Description = Open-bron Office Pakket. URLSite = http://nl.openoffice.org/ -Size = 124.13MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/nl/… +Size = 132.11MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… Added: trunk/reactos/base/applications/rapps/rapps/pengupop.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/pengupop.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/pengupop.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,14 @@ +ï»¿; UTF-8 + +[Section] +Name = Pengupop +Version = 2.2.3 +Licence = GPL +Description = The purpose of this game is to shoot colored orbs into your playfield, so they form groups of three or more. +Size = 384KB +Category = 4 +URLDownload = http://svn.reactos.org/packages/Pengupop.exe +CDPath = none + +[Section.0407] +Description = Das Ziel des Spiels ist es farbige Orbs ins Spielfeld zu feuern, so dass diese Gruppen von drei oder mehr bilden. Propchange: trunk/reactos/base/applications/rapps/rapps/pengupop.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/pspad.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/pspad.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,47 @@ +ï»¿; UTF-8 + +[Section] +Name = PSPad +Version = 4.5.7 +Licence = Freeware +Description = A text editor. +Size = 4.46MB +Category = 6 +URLSite = http://www.pspad.com +URLDownload = http://31.31.78.126/pspad/pspad457inst_en.exe +CDPath = none + +[Section.0407] +Description = Ein Texteditor. + +[Section.040a] +Description = Un editor de text. + +[Section.040c] +Description = Un Ã©diteur de texte. +Size = 4,46 Mo + +[Section.0410] +Description = Un editor di testo. + +[Section.0413] +Description = Een teksteditor. + +[Section.0415] +Description = Edytor tekstu. + +[Section.0418] +Description = A text editor. +Size = 4,46 Mo + +[Section.0419] +Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. + +[Section.041b] +Description = TextovÃ½ editor. + +[Section.0422] +Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. + +[Section.0813] +Description = Een teksteditor. Propchange: trunk/reactos/base/applications/rapps/rapps/pspad.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/stamina.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/stamina.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,13 @@ +ï»¿; UTF-8 + +[Section] +Name = Stamina +Description = Free typing tutor. Russian only. +URLSite = http://stamina.ru +Size = 4.7MB +Category = 8 +URLDownload = http://stamina.ru/files/StaminaSetup.exe +CDPath = none + +[Section.0407] +Description = Ein freies Schreiblernprogramm in Russisch. Propchange: trunk/reactos/base/applications/rapps/rapps/stamina.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/supertux.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/supertux.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = SuperTux +Version = 0.1.3 +Licence = GPL +Description = SuperTux is a free, open-source two-dimensional platform game. +Size = 7.3MB +Category = 4 +URLSite = http://www.supertux.lethargik.org +URLDownload = http://files1.freesoft.ru/rep/694851/supertux-0.1.3-setup.exe +CDPath = none + +[Section.0407] +Description = SuperTux ist ein zweidimensionales, freies, Open Source Plattformspiel. Propchange: trunk/reactos/base/applications/rapps/rapps/supertux.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/zaz.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/zaz.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Zaz +Version = 1.0.0 +Licence = GPL +Description = Zaz is a free software arcade action puzzle computer game, a little bit like Frozen Bubble. +Size = 21.0MB +Category = 4 +URLSite = http://zaz.sourceforge.net +URLDownload = http://files1.freesoft.ru/rep/704321/Zaz-1.0.0-Setup.exe +CDPath = none + +[Section.0407] +Description = Zaz ist ein freies Arcade Action Puzzle Spiel, ein wenig wie Frozen Bubble. Propchange: trunk/reactos/base/applications/rapps/rapps/zaz.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60005: [PSDK] * Import Wine's (broken) winioctl.h. * Remove FILE_FS_VOLUME_INFORMATION from winternl.h. It doesn't belong there. [NTDLL_WINETEST] * Be more specific about winioctl.h inclu...
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 16:39:37 2013 New Revision: 60005 URL: http://svn.reactos.org/svn/reactos?rev=60005&view=rev Log: [PSDK] * Import Wine's (broken) winioctl.h. * Remove FILE_FS_VOLUME_INFORMATION from winternl.h. It doesn't belong there. [NTDLL_WINETEST] * Be more specific about winioctl.h inclusion. Added: trunk/reactos/include/reactos/wine/winioctl.h (with props) Modified: trunk/reactos/include/psdk/winternl.h trunk/rostests/winetests/ntdll/file.c Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Tue Sep 10 16:39:37 2013 @@ -2513,14 +2513,7 @@ return e; } -typedef struct _FILE_FS_VOLUME_INFORMATION -{ - LARGE_INTEGER VolumeCreationTime; - ULONG VolumeSerialNumber; - ULONG VolumeLabelLength; - BOOLEAN SupportsObjects; - WCHAR VolumeLabel[1]; -} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; + #define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #ifdef __cplusplus Added: trunk/reactos/include/reactos/wine/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winio… ============================================================================== --- trunk/reactos/include/reactos/wine/winioctl.h (added) +++ trunk/reactos/include/reactos/wine/winioctl.h [iso-8859-1] Tue Sep 10 16:39:37 2013 @@ -0,0 +1,471 @@ +/* + * Copyright (C) the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINIOCTL_H +#define __WINE_WINIOCTL_H + +#define CTL_CODE( DeviceType, Function, Method, Access ) ( \ + (DWORD)((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \ +) + +#define DEVICE_TYPE DWORD + +#define FILE_DEVICE_BEEP 0x00000001 +#define FILE_DEVICE_CD_ROM 0x00000002 +#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 +#define FILE_DEVICE_CONTROLLER 0x00000004 +#define FILE_DEVICE_DATALINK 0x00000005 +#define FILE_DEVICE_DFS 0x00000006 +#define FILE_DEVICE_DISK 0x00000007 +#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 +#define FILE_DEVICE_FILE_SYSTEM 0x00000009 +#define FILE_DEVICE_INPORT_PORT 0x0000000a +#define FILE_DEVICE_KEYBOARD 0x0000000b +#define FILE_DEVICE_MAILSLOT 0x0000000c +#define FILE_DEVICE_MIDI_IN 0x0000000d +#define FILE_DEVICE_MIDI_OUT 0x0000000e +#define FILE_DEVICE_MOUSE 0x0000000f +#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010 +#define FILE_DEVICE_NAMED_PIPE 0x00000011 +#define FILE_DEVICE_NETWORK 0x00000012 +#define FILE_DEVICE_NETWORK_BROWSER 0x00000013 +#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 +#define FILE_DEVICE_NULL 0x00000015 +#define FILE_DEVICE_PARALLEL_PORT 0x00000016 +#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017 +#define FILE_DEVICE_PRINTER 0x00000018 +#define FILE_DEVICE_SCANNER 0x00000019 +#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001a +#define FILE_DEVICE_SERIAL_PORT 0x0000001b +#define FILE_DEVICE_SCREEN 0x0000001c +#define FILE_DEVICE_SOUND 0x0000001d +#define FILE_DEVICE_STREAMS 0x0000001e +#define FILE_DEVICE_TAPE 0x0000001f +#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 +#define FILE_DEVICE_TRANSPORT 0x00000021 +#define FILE_DEVICE_UNKNOWN 0x00000022 +#define FILE_DEVICE_VIDEO 0x00000023 +#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 +#define FILE_DEVICE_WAVE_IN 0x00000025 +#define FILE_DEVICE_WAVE_OUT 0x00000026 +#define FILE_DEVICE_8042_PORT 0x00000027 +#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 +#define FILE_DEVICE_BATTERY 0x00000029 +#define FILE_DEVICE_BUS_EXTENDER 0x0000002a +#define FILE_DEVICE_MODEM 0x0000002b +#define FILE_DEVICE_VDM 0x0000002c +#define FILE_DEVICE_MASS_STORAGE 0x0000002d +#define FILE_DEVICE_SMB 0x0000002e +#define FILE_DEVICE_KS 0x0000002f +#define FILE_DEVICE_CHANGER 0x00000030 +#define FILE_DEVICE_SMARTCARD 0x00000031 +#define FILE_DEVICE_ACPI 0x00000032 +#define FILE_DEVICE_DVD 0x00000033 +#define FILE_DEVICE_FULLSCREEN_VIDEO 0x00000034 +#define FILE_DEVICE_DFS_FILE_SYSTEM 0x00000035 +#define FILE_DEVICE_DFS_VOLUME 0x00000036 +#define FILE_DEVICE_SERENUM 0x00000037 +#define FILE_DEVICE_TERMSRV 0x00000038 +#define FILE_DEVICE_KSEC 0x00000039 + +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 + +#define FILE_ANY_ACCESS 0 +#define FILE_SPECIAL_ACCESS 0 +#define FILE_READ_ACCESS FILE_READ_DATA /* file & pipe */ +#define FILE_WRITE_ACCESS FILE_WRITE_DATA /* file & pipe */ + +#define FSCTL_REQUEST_OPLOCK_LEVEL_1 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_REQUEST_OPLOCK_LEVEL_2 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_REQUEST_BATCH_OPLOCK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_OPLOCK_BREAK_ACKNOWLEDGE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 3, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_OPBATCH_ACK_CLOSE_PENDING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_OPLOCK_BREAK_NOTIFY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 5, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_LOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_UNLOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DISMOUNT_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 8, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_IS_VOLUME_MOUNTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 10, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_IS_PATHNAME_VALID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 11, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_MARK_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_QUERY_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 14, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_GET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_MARK_AS_SYSTEM_HIVE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 19, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_OPLOCK_BREAK_ACK_NO_2 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_INVALIDATE_VOLUMES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 21, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_QUERY_FAT_BPB CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 22, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_REQUEST_FILTER_OPLOCK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 23, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_FILESYSTEM_GET_STATISTICS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_NTFS_VOLUME_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 25, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_NTFS_FILE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 26, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 27, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 28, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_HFS_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 31, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_ALLOW_EXTENDED_DASD_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_READ_PROPERTY_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 33, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_WRITE_PROPERTY_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 34, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_FIND_FILES_BY_SID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_DUMP_PROPERTY_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 37, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DELETE_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_ENUM_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SECURITY_ID_CHECK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_READ_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SET_OBJECT_ID_EXTENDED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 47, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_CREATE_OR_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 48, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_ZERO_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_QUERY_ALLOCATED_RANGES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_ENABLE_UPGRADE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 52, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_SET_ENCRYPTION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_ENCRYPTION_FSCTL_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 54, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_WRITE_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55, METHOD_NEITHER, FILE_SPECIAL_ACCESS) +#define FSCTL_READ_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56, METHOD_NEITHER, FILE_SPECIAL_ACCESS) +#define FSCTL_CREATE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_READ_FILE_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_WRITE_USN_CLOSE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_EXTEND_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 60, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_QUERY_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 61, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DELETE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 62, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_MARK_HANDLE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SIS_COPYFILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 64, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SIS_LINK_FILES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 65, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_HSM_MSG CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 66, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_HSM_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 68, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_RECALL_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 69, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_READ_FROM_PLEX CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 71, METHOD_OUT_DIRECT,FILE_READ_DATA) +#define FSCTL_FILE_PREFETCH CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_MAKE_MEDIA_COMPATIBLE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 76, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_SET_DEFECT_MANAGEMENT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 77, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_QUERY_SPARING_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 78, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_QUERY_ON_DISK_VOLUME_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 79, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_VOLUME_COMPRESSION_STATE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 80, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_TXFS_MODIFY_RM CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 81, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_QUERY_RM_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 82, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_ROLLFORWARD_REDO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 84, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_ROLLFORWARD_UNDO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 85, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_START_RM CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 86, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_SHUTDOWN_RM CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 87, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_READ_BACKUP_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 88, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_WRITE_BACKUP_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 89, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_CREATE_SECONDARY_RM CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 90, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_GET_METADATA_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 91, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_GET_TRANSACTED_VERSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 92, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_CREATE_MINIVERSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 95, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_TRANSACTION_ACTIVE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 99, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_SET_ZERO_ON_DEALLOCATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 101, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 102, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 103, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_WAIT_FOR_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 104, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_INITIATE_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 106, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_CSC_INTERNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 107, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SHRINK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 108, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_SHORT_NAME_BEHAVIOR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 109, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DFSR_SET_GHOST_HANDLE_STATE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 110, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_TXFS_LIST_TRANSACTION_LOCKED_FILES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 120, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_LIST_TRANSACTIONS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 121, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_QUERY_PAGEFILE_ENCRYPTION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 122, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define FSCTL_PIPE_ASSIGN_EVENT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_DISCONNECT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_PEEK CTL_CODE(FILE_DEVICE_NAMED_PIPE, 3, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_PIPE_QUERY_EVENT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_TRANSCEIVE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 5, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_PIPE_WAIT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_IMPERSONATE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_SET_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_QUERY_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_INTERNAL_READ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2045, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_PIPE_INTERNAL_WRITE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2046, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_PIPE_INTERNAL_TRANSCEIVE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2047, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_PIPE_INTERNAL_READ_OVFLOW CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA) + +#define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE +#define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_CHECK_VERIFY2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MEDIA_REMOVAL CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_EJECT_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_RESERVE CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_RELEASE CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MCN_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_BREAK_RESERVATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS|FILE_WRITE_ACCESS) + +#define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_DISK_BASE FILE_DEVICE_DISK +#define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_GET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_SET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_SET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_VERIFY CTL_CODE(IOCTL_DISK_BASE, 0x0005, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_FORMAT_TRACKS CTL_CODE(IOCTL_DISK_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_REASSIGN_BLOCKS CTL_CODE(IOCTL_DISK_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_PERFORMANCE CTL_CODE(IOCTL_DISK_BASE, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_IS_WRITABLE CTL_CODE(IOCTL_DISK_BASE, 0x0009, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_LOGGING CTL_CODE(IOCTL_DISK_BASE, 0x000a, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_FORMAT_TRACKS_EX CTL_CODE(IOCTL_DISK_BASE, 0x000b, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_HISTOGRAM_STRUCTURE CTL_CODE(IOCTL_DISK_BASE, 0x000c, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_HISTOGRAM_DATA CTL_CODE(IOCTL_DISK_BASE, 0x000d, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_HISTOGRAM_RESET CTL_CODE(IOCTL_DISK_BASE, 0x000e, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_REQUEST_STRUCTURE CTL_CODE(IOCTL_DISK_BASE, 0x000f, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_REQUEST_DATA CTL_CODE(IOCTL_DISK_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_CHECK_VERIFY CTL_CODE(IOCTL_DISK_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_MEDIA_REMOVAL CTL_CODE(IOCTL_DISK_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_EJECT_MEDIA CTL_CODE(IOCTL_DISK_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_LOAD_MEDIA CTL_CODE(IOCTL_DISK_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_RESERVE CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_RELEASE CTL_CODE(IOCTL_DISK_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_FIND_NEW_DEVICES CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_GET_MEDIA_TYPES CTL_CODE(IOCTL_DISK_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) + + +#define IOCTL_DISK_CONTROLLER_NUMBER CTL_CODE(IOCTL_DISK_BASE, 0x0011, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define SMART_GET_VERSION CTL_CODE(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS) +#define SMART_SEND_DRIVE_COMMAND CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define SMART_RCV_DRIVE_DATA CTL_CODE(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX CTL_CODE(IOCTL_DISK_BASE, 0x0028, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_VOLUME_BASE ((DWORD)'V') +#define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_SERIAL_LSRMST_INSERT CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS) + + +/* Return Codes... should these be the same as something somewhere? */ +#define PARTITION_ENTRY_UNUSED 0x00 /* Entry unused */ +#define PARTITION_FAT_12 0x01 /* 12-bit FAT entries */ +#define PARTITION_XENIX_1 0x02 /* Xenix */ +#define PARTITION_XENIX_2 0x03 /* Xenix */ +#define PARTITION_FAT_16 0x04 /* 16-bit FAT entries */ +#define PARTITION_EXTENDED 0x05 /* Extended partition entry */ +#define PARTITION_HUGE 0x06 /* Huge partition MS-DOS V4 */ +#define PARTITION_IFS 0x07 /* IFS Partition */ +#define PARTITION_FAT32 0x0B /* FAT32 */ +#define PARTITION_FAT32_XINT13 0x0C /* FAT32 using extended int13 services */ +#define PARTITION_XINT13 0x0E /* Win95 partition using extended int13 services */ +#define PARTITION_XINT13_EXTENDED 0x0F /* Same as type 5 but uses extended int13 services */ +#define PARTITION_PREP 0x41 /* PowerPC Reference Platform (PReP) Boot Partition */ +#define PARTITION_LDM 0x42 /* Logical Disk Manager partition */ +#define PARTITION_UNIX 0x63 /* Unix */ + +typedef enum _MEDIA_TYPE { + Unknown, F5_1Pt2_512, F3_1Pt44_512, F3_2Pt88_512, F3_20Pt8_512, F3_720_512, F5_360_512, + F5_320_512, F5_320_1024, F5_180_512, F5_160_512, RemovableMedia, FixedMedia, F3_120M_512, + F3_640_512, F5_640_512, F5_720_512, F3_1Pt2_512, F3_1Pt23_1024, F5_1Pt23_1024, F3_128Mb_512, + F3_230Mb_512, F8_256_128 +} MEDIA_TYPE, *PMEDIA_TYPE; + +typedef struct _FORMAT_PARAMETERS { + MEDIA_TYPE MediaType; + DWORD StartCylinderNumber; + DWORD EndCylinderNumber; + DWORD StartHeadNumber; + DWORD EndHeadNumber; +} FORMAT_PARAMETERS, *PFORMAT_PARAMETERS; + +typedef WORD BAD_TRACK_NUMBER; +typedef WORD *PBAD_TRACK_NUMBER; + +typedef struct _FORMAT_EX_PARAMETERS { + MEDIA_TYPE MediaType; + DWORD StartCylinderNumber; + DWORD EndCylinderNumber; + DWORD StartHeadNumber; + DWORD EndHeadNumber; + WORD FormatGapLength; + WORD SectorsPerTrack; + WORD SectorNumber[1]; +} FORMAT_EX_PARAMETERS, *PFORMAT_EX_PARAMETERS; + +typedef struct _DISK_GEOMETRY { + LARGE_INTEGER Cylinders; + MEDIA_TYPE MediaType; + DWORD TracksPerCylinder; + DWORD SectorsPerTrack; + DWORD BytesPerSector; +} DISK_GEOMETRY, *PDISK_GEOMETRY; + +typedef struct _DISK_GEOMETRY_EX { + DISK_GEOMETRY Geometry; + LARGE_INTEGER DiskSize; + BYTE Data[1]; +} DISK_GEOMETRY_EX, *PDISK_GEOMETRY_EX; + +typedef struct _PARTITION_INFORMATION { + LARGE_INTEGER StartingOffset; + LARGE_INTEGER PartitionLength; + DWORD HiddenSectors; + DWORD PartitionNumber; + BYTE PartitionType; + BOOLEAN BootIndicator; + BOOLEAN RecognizedPartition; + BOOLEAN RewritePartition; +} PARTITION_INFORMATION, *PPARTITION_INFORMATION; + +typedef struct _SET_PARTITION_INFORMATION { + BYTE PartitionType; +} SET_PARTITION_INFORMATION, *PSET_PARTITION_INFORMATION; + +typedef struct _DRIVE_LAYOUT_INFORMATION { + DWORD PartitionCount; + DWORD Signature; + PARTITION_INFORMATION PartitionEntry[1]; +} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION; + +typedef struct _VERIFY_INFORMATION { + LARGE_INTEGER StartingOffset; + DWORD Length; +} VERIFY_INFORMATION, *PVERIFY_INFORMATION; + +typedef struct _REASSIGN_BLOCKS { + WORD Reserved; + WORD Count; + DWORD BlockNumber[1]; +} REASSIGN_BLOCKS, *PREASSIGN_BLOCKS; + +/* Start: _WIN32_WINNT >= 0x0400 */ + +typedef struct _DISK_CONTROLLER_NUMBER { + DWORD ControllerNumber; + DWORD DiskNumber; +} DISK_CONTROLLER_NUMBER, *PDISK_CONTROLLER_NUMBER; + +/* VOLUME_GET_VOLUME_DISK_EXTENTS */ +typedef struct _DISK_EXTENT { + DWORD DiskNumber; + LARGE_INTEGER StartingOffset; + LARGE_INTEGER ExtentLength; +} DISK_EXTENT; + +typedef struct _VOLUME_DISK_EXTENTS { + DWORD NumberOfDiskExtents; + DISK_EXTENT Extents[1]; +} VOLUME_DISK_EXTENTS; + +typedef struct RETRIEVAL_POINTERS_BUFFER { + DWORD ExtentCount; + LARGE_INTEGER StartingVcn; + struct { + LARGE_INTEGER NextVcn; + LARGE_INTEGER Lcn; + } Extents[1]; +} RETRIEVAL_POINTERS_BUFFER, *PRETRIEVAL_POINTERS_BUFFER; + +/* End: _WIN32_WINNT >= 0x0400 */ + +/* + * NT I/O-Manager + */ + +/* + * structures for NtQueryVolumeInformationFile + * (wdm.h) + */ + +/* FileFsVolumeInformation = 1 */ +typedef struct _FILE_FS_VOLUME_INFORMATION { + LARGE_INTEGER VolumeCreationTime; + ULONG VolumeSerialNumber; + ULONG VolumeLabelLength; + BOOLEAN SupportsObjects; + WCHAR VolumeLabel[1]; +} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; + +/* FileFsLabelInformation = 2 */ +/* + unknown +*/ + +/* FileFsSizeInformation = 3 */ +typedef struct _FILE_FS_SIZE_INFORMATION { + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER AvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; + +/* FileFsDeviceInformation = 4 */ +typedef struct _FILE_FS_DEVICE_INFORMATION { + DEVICE_TYPE DeviceType; + ULONG Characteristics; +} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; + +/* FileFsAttributeInformation = 5 */ +typedef struct _FILE_FS_ATTRIBUTE_INFORMATION { + ULONG FileSystemAttribute; + LONG MaximumComponentNameLength; + ULONG FileSystemNameLength; + WCHAR FileSystemName[1]; +} FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION; + +typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { + LARGE_INTEGER Timeout; + ULONG NameLength; + BOOLEAN TimeoutSpecified; + WCHAR Name[1]; +} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; + +typedef struct _FILE_PIPE_PEEK_BUFFER { + ULONG NamedPipeState; + ULONG ReadDataAvailable; + ULONG NumberOfMessages; + ULONG MessageLength; + CHAR Data[1]; +} FILE_PIPE_PEEK_BUFFER, *PFILE_PIPE_PEEK_BUFFER; + +/* Device GUIDs */ +#ifdef DEFINE_GUID + +DEFINE_GUID(GUID_DEVINTERFACE_COMPORT, 0x86E0D1E0, 0x8089, + 0x11D0, 0x9C, 0xE4, 0x08, 0x00, 0x3E, 0x30, 0x1F, 0x73); +DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978, 0xE325, + 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); + +/* obsolete GUID names */ +#define GUID_CLASS_COMPORT GUID_DEVINTERFACE_COMPORT +#define GUID_SERENUM_BUS_ENUMERATOR GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR + +#endif /* DEFINE_GUID */ + +#endif Propchange: trunk/reactos/include/reactos/wine/winioctl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Tue Sep 10 16:39:37 2013 @@ -36,7 +36,7 @@ #include "wine/test.h" #include "winternl.h" #include "winuser.h" -#include "winioctl.h" +#include "wine/winioctl.h" #ifndef IO_COMPLETION_ALL_ACCESS #define IO_COMPLETION_ALL_ACCESS 0x001F0003

1 0

[akhaldi] 60004: [USER32] * Be more specific about the commctrl.h inclusion. * We no longer need to add include/reactos/wine as a global inclusions folder.
by akhaldi＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: akhaldi Date: Tue Sep 10 16:28:05 2013 New Revision: 60004 URL: http://svn.reactos.org/svn/reactos?rev=60004&view=rev Log: [USER32] * Be more specific about the commctrl.h inclusion. * We no longer need to add include/reactos/wine as a global inclusions folder. Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/windows/spy.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Tue Sep 10 16:28:05 2013 @@ -2,7 +2,6 @@ spec2def(user32.dll user32.spec ADD_IMPORTLIB) include_directories( - BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/include/reactos/subsys include ${REACTOS_SOURCE_DIR}/win32ss/include) Modified: trunk/reactos/win32ss/user/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] Tue Sep 10 16:28:05 2013 @@ -20,7 +20,7 @@ */ #include <user32.h> -#include <commctrl.h> +#include <wine/commctrl.h> #include <commdlg.h> #include <richedit.h> #include <prsht.h>

1 0

[pschweitzer] 60003: [NTOSKRNL] Fix string size to store GPT GUIDs. This was causing a buffer overflow (with ending null char) and thus a stack corruption. The side effect of the stack corruption w...
by pschweitzer＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: pschweitzer Date: Tue Sep 10 13:42:34 2013 New Revision: 60003 URL: http://svn.reactos.org/svn/reactos?rev=60003&view=rev Log: [NTOSKRNL] Fix string size to store GPT GUIDs. This was causing a buffer overflow (with ending null char) and thus a stack corruption. The side effect of the stack corruption was that the debug code (display) was looping forever while attempting to read partition table making ntoskrnl unable to boot with a machine where there's a GPT disk. Kernel is now able again to handle GPT disks (and they can be used again in user-land). This was magically hidding before r59923 or by disabling NDEBUG. Lovely Heisenbugs :-). Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Tue Sep 10 13:42:34 2013 @@ -86,6 +86,8 @@ #define EFI_HEADER_REVISION_1 0x00010000 /* Defines system type for MBR showing that a GPT is following */ #define EFI_PMBR_OSTYPE_EFI 0xEE +/* Defines size to store a complete GUID + null char */ +#define EFI_GUID_STRING_SIZE 0x27 #define IS_VALID_DISK_INFO(Disk) \ (Disk) && \ @@ -534,7 +536,7 @@ FstubDbgPrintDriveLayoutEx(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout) { ULONG i; - CHAR Guid[38]; + CHAR Guid[EFI_GUID_STRING_SIZE]; PAGED_CODE(); DPRINT("FSTUB: DRIVE_LAYOUT_INFORMATION_EX: %p\n", DriveLayout); @@ -575,7 +577,7 @@ FstubDbgPrintPartitionEx(IN PPARTITION_INFORMATION_EX PartitionEntry, IN ULONG PartitionNumber) { - CHAR Guid[38]; + CHAR Guid[EFI_GUID_STRING_SIZE]; PAGED_CODE(); DPRINT("Printing partition %lu\n", PartitionNumber); @@ -614,7 +616,7 @@ FstubDbgPrintSetPartitionEx(IN PSET_PARTITION_INFORMATION_EX PartitionEntry, IN ULONG PartitionNumber) { - CHAR Guid[38]; + CHAR Guid[EFI_GUID_STRING_SIZE]; PAGED_CODE(); DPRINT("FSTUB: SET_PARTITION_INFORMATION_EX: %p\n", PartitionEntry);

1 0

[ion] 60002: [NTOSKRNL]: Implement ExAllocatePoolWithQuotaTag. However PsChargeProcessPoolQuota is still unimplemented so nothing really gets charged (we do write the owner process, though).
by ion＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: ion Date: Tue Sep 10 10:02:27 2013 New Revision: 60002 URL: http://svn.reactos.org/svn/reactos?rev=60002&view=rev Log: [NTOSKRNL]: Implement ExAllocatePoolWithQuotaTag. However PsChargeProcessPoolQuota is still unimplemented so nothing really gets charged (we do write the owner process, though). Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Tue Sep 10 10:02:27 2013 @@ -2511,11 +2511,114 @@ IN SIZE_T NumberOfBytes, IN ULONG Tag) { - // - // Allocate the pool - // - UNIMPLEMENTED; - return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); + BOOLEAN Raise = TRUE; + PVOID Buffer; + PPOOL_HEADER Entry; + NTSTATUS Status; + PEPROCESS Process = PsGetCurrentProcess(); + + // + // Check if we should fail intead of raising an exception + // + if (PoolType & POOL_QUOTA_FAIL_INSTEAD_OF_RAISE) + { + Raise = FALSE; + PoolType &= ~POOL_QUOTA_FAIL_INSTEAD_OF_RAISE; + } + + // + // Inject the pool quota mask + // + PoolType += QUOTA_POOL_MASK; + + // + // Check if we have enough space to add the quota owner process, as long as + // this isn't the system process, which never gets charged quota + // + ASSERT(NumberOfBytes != 0); + if ((NumberOfBytes <= (PAGE_SIZE - sizeof(POOL_BLOCK_SIZE) - sizeof(PVOID))) && + (Process != PsInitialSystemProcess)) + { + // + // Add space for our EPROCESS pointer + // + NumberOfBytes += sizeof(PEPROCESS); + } + else + { + // + // We won't be able to store the pointer, so don't use quota for this + // + PoolType -= QUOTA_POOL_MASK; + } + + // + // Allocate the pool buffer now + // + Buffer = ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); + + // + // If the buffer is page-aligned, this is a large page allocation and we + // won't touch it + // + if (PAGE_ALIGN(Buffer) != Buffer) + { + // + // Also if special pool is enabled, and this was allocated from there, + // we won't touch it either + // + if ((ExpPoolFlags & POOL_FLAG_SPECIAL_POOL) && + (MmIsSpecialPoolAddress(Buffer))) + { + return Buffer; + } + + // + // If it wasn't actually allocated with quota charges, ignore it too + // + if (!(PoolType & QUOTA_POOL_MASK)) return Buffer; + + // + // If this is the system process, we don't charge quota, so ignore + // + if (Process == PsInitialSystemProcess) return Buffer; + + // + // Actually go and charge quota for the process now + // + Entry = POOL_ENTRY(Buffer); + Status = PsChargeProcessPoolQuota(Process, + PoolType & BASE_POOL_TYPE_MASK, + Entry->BlockSize * sizeof(POOL_BLOCK_SIZE)); + if (!NT_SUCCESS(Status)) + { + // + // Quota failed, back out the allocation, clear the owner, and fail + // + *(PVOID*)((ULONG_PTR)POOL_NEXT_BLOCK(Entry) - sizeof(PVOID)) = NULL; + ExFreePoolWithTag(Buffer, Tag); + if (Raise) RtlRaiseStatus(Status); + return NULL; + } + + // + // Quota worked, write the owner and then reference it before returning + // + *(PVOID*)((ULONG_PTR)POOL_NEXT_BLOCK(Entry) - sizeof(PVOID)) = Process; + ObReferenceObject(Process); + } + else if (!(Buffer) && (Raise)) + { + // + // The allocation failed, raise an error if we are in raise mode + // + RtlRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + // + // Return the allocated buffer + // + return Buffer; } #if DBG && KDBG

1 0

[ion] 60001: [CSRSRV]: Update CSR_SERVER_DLL definition to Server 2003 instead of XP. Get rid of the whole initialization event stuff. This should make Windows CSRSS+CSRSRV work with our BASESRV. T...
by ion＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: ion Date: Tue Sep 10 08:55:09 2013 New Revision: 60001 URL: http://svn.reactos.org/svn/reactos?rev=60001&view=rev Log: [CSRSRV]: Update CSR_SERVER_DLL definition to Server 2003 instead of XP. Get rid of the whole initialization event stuff. This should make Windows CSRSS+CSRSRV work with our BASESRV. Thanks to Hermes for discovering there was a structure issue. Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/subsystems/win32/csrsrv/init.c trunk/reactos/subsystems/win32/csrsrv/server.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Tue Sep 10 08:55:09 2013 @@ -208,7 +208,6 @@ typedef struct _CSR_SERVER_DLL { ULONG Length; - HANDLE Event; ANSI_STRING Name; HANDLE ServerHandle; ULONG ServerId; @@ -227,7 +226,7 @@ PCSR_SHUTDOWNPROCESS_CALLBACK ShutdownProcessCallback; ULONG Unknown2[3]; } CSR_SERVER_DLL, *PCSR_SERVER_DLL; - +C_ASSERT(FIELD_OFFSET(CSR_SERVER_DLL, SharedSection) == 0x3C); typedef NTSTATUS Modified: trunk/reactos/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/in… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] Tue Sep 10 08:55:09 2013 @@ -32,7 +32,6 @@ HANDLE BNOLinksDirectory; HANDLE SessionObjectDirectory; HANDLE DosDevicesDirectory; -HANDLE CsrInitializationEvent; SYSTEM_BASIC_INFORMATION CsrNtSysInfo; @@ -963,19 +962,6 @@ { NTSTATUS Status = STATUS_SUCCESS; - /* Create the Init Event */ - Status = NtCreateEvent(&CsrInitializationEvent, - EVENT_ALL_ACCESS, - NULL, - SynchronizationEvent, - FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSRV:%s: NtCreateEvent failed (Status=%08lx)\n", - __FUNCTION__, Status); - return Status; - } - /* Cache System Basic Information so we don't always request it */ Status = NtQuerySystemInformation(SystemBasicInformation, &CsrNtSysInfo, @@ -1065,18 +1051,6 @@ __FUNCTION__, Status); return Status; } - - /* Finito! Signal the event */ - Status = NtSetEvent(CsrInitializationEvent, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSRV:%s: NtSetEvent failed (Status=%08lx)\n", - __FUNCTION__, Status); - return Status; - } - - /* Close the event handle now */ - NtClose(CsrInitializationEvent); /* Have us handle Hard Errors */ Status = NtSetDefaultHardErrorPort(CsrApiPort); Modified: trunk/reactos/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] Tue Sep 10 08:55:09 2013 @@ -168,7 +168,6 @@ /* Set up the Object */ ServerDll->Length = Size; ServerDll->SharedSection = CsrSrvSharedSectionHeap; // Send to the server dll our shared heap pointer. - ServerDll->Event = CsrInitializationEvent; ServerDll->Name.Length = DllName.Length; ServerDll->Name.MaximumLength = DllName.MaximumLength; ServerDll->Name.Buffer = (PCHAR)(ServerDll + 1);

1 0

[ion] 60000: For our 60000th commit, I bring you a complete rewrite of the Named Pipe File System. It is not yet "active", but I consider this to now be largely code complete and worthy of the priz...
by ion＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: ion Date: Tue Sep 10 08:36:25 2013 New Revision: 60000 URL: http://svn.reactos.org/svn/reactos?rev=60000&view=rev Log: For our 60000th commit, I bring you a complete rewrite of the Named Pipe File System. It is not yet "active", but I consider this to now be largely code complete and worthy of the prize (and I didn't want to delay other commiters any further). Once the code is reviewed, fixed, tested, and commented, it will replace our old and aging NPFS. This driver is cross-compatible with Windows Server 2003. It is expected to fix winetest incompatiblities, speed up performance, and reduce bizare RPC/SCM issues. This commit is dedicated to my best friend Rachel, who has not only always been there for me, but was also the motivating factor behind my return to my passion -- ReactOS :) [NPFS-NEW]: Implement QueryVolume, QuerySecurity, SetSecurity. Everything but Directory Query, Fast I/O, and a few rare FSCTLs is implemented now. The former two will come in an upcoming commit. [NPFS-NEW]: Major cleanup in the way some member variables were being addressed. Reference them as array members based on the correct FILE_PIPE defines from now on. Also fix a lot of formatting issues. Fix a bunch of bugs that were found. Use FILE_PIPE_SERVER_END and FILE_PIPE_CLIENT_END intead of a BOOLEAN. Use TRUE/FALSE/STATUS_SUCCESS/NULL/etc when needed intead of 0/1. The code formatting can/should still be improved, but this was a big help. Added: trunk/reactos/drivers/filesystems/npfs_new/seinfo.c (with props) trunk/reactos/drivers/filesystems/npfs_new/volinfo.c (with props) Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs_new/cleanup.c trunk/reactos/drivers/filesystems/npfs_new/close.c trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c trunk/reactos/drivers/filesystems/npfs_new/read.c trunk/reactos/drivers/filesystems/npfs_new/readsup.c trunk/reactos/drivers/filesystems/npfs_new/secursup.c trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/strucsup.c trunk/reactos/drivers/filesystems/npfs_new/waitsup.c trunk/reactos/drivers/filesystems/npfs_new/write.c trunk/reactos/drivers/filesystems/npfs_new/writesup.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/readsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Added: trunk/reactos/drivers/filesystems/npfs_new/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Added: trunk/reactos/drivers/filesystems/npfs_new/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/writesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs