Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[cwittich] 43519: -fix some msvcrt string winetests

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Oct 16 22:40:41 2009 New Revision: 43519 URL: http://svn.reactos.org/svn/reactos?rev=43519&view=rev Log: -fix some msvcrt string winetests Modified: trunk/reactos/lib/sdk/crt/string/strtol.c trunk/reactos/lib/sdk/crt/string/strtoul.c Modified: trunk/reactos/lib/sdk/crt/string/strtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtol.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtol.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtol.c [iso-8859-1] Fri Oct 16 22:40:41 2009 @@ -79,6 +79,7 @@ if (any < 0) { acc = neg ? LONG_MIN : LONG_MAX; + __set_errno(ERANGE); } else if (neg) acc = -acc; Modified: trunk/reactos/lib/sdk/crt/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoul.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoul.c [iso-8859-1] Fri Oct 16 22:40:41 2009 @@ -63,6 +63,7 @@ if (any < 0) { acc = ULONG_MAX; + __set_errno(ERANGE); } else if (neg) acc = -acc;

14 years, 11 months

[cwittich] 43518: sync msvcrt winetest with wine 1.1.31

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Oct 16 22:32:42 2009 New Revision: 43518 URL: http://svn.reactos.org/svn/reactos?rev=43518&view=rev Log: sync msvcrt winetest with wine 1.1.31 Modified: trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/string.c Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] Fri Oct 16 22:32:42 2009 @@ -857,12 +857,89 @@ ok( ret == -1 && errno == EBADF, "Wrong write result in child process on %d (%s)\n", fd, strerror(errno)); } - + +static void create_io_inherit_block( STARTUPINFO *startup, unsigned int count, const HANDLE *handles ) +{ + static BYTE block[1024]; + BYTE *wxflag_ptr; + HANDLE *handle_ptr; + unsigned int i; + + startup->lpReserved2 = block; + startup->cbReserved2 = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * count; + wxflag_ptr = block + sizeof(unsigned); + handle_ptr = (HANDLE *)(wxflag_ptr + count); + + *(unsigned*)block = count; + for (i = 0; i < count; i++) + { + wxflag_ptr[i] = 0x81; + handle_ptr[i] = handles[i]; + } +} + +static const char *read_file( HANDLE file ) +{ + static char buffer[128]; + DWORD ret; + SetFilePointer( file, 0, NULL, FILE_BEGIN ); + if (!ReadFile( file, buffer, sizeof(buffer) - 1, &ret, NULL)) ret = 0; + buffer[ret] = 0; + return buffer; +} + +static void test_stdout_handle( STARTUPINFO *startup, char *cmdline, HANDLE hstdout, BOOL expect_stdout, + const char *descr ) +{ + const char *data; + HANDLE hErrorFile; + SECURITY_ATTRIBUTES sa; + PROCESS_INFORMATION proc; + + /* make file handle inheritable */ + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + + hErrorFile = CreateFileA( "fdopen.err", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + startup->dwFlags = STARTF_USESTDHANDLES; + startup->hStdInput = GetStdHandle( STD_INPUT_HANDLE ); + startup->hStdOutput = hErrorFile; + startup->hStdError = GetStdHandle( STD_ERROR_HANDLE ); + + CreateProcessA( NULL, cmdline, NULL, NULL, TRUE, + CREATE_DEFAULT_ERROR_MODE | NORMAL_PRIORITY_CLASS, NULL, NULL, startup, &proc ); + winetest_wait_child_process( proc.hProcess ); + + data = read_file( hErrorFile ); + if (expect_stdout) + ok( strcmp( data, "Success" ), "%s: Error file shouldn't contain data\n", descr ); + else + ok( !strcmp( data, "Success" ), "%s: Wrong error data (%s)\n", descr, data ); + + if (hstdout) + { + data = read_file( hstdout ); + if (expect_stdout) + ok( !strcmp( data, "Success" ), "%s: Wrong stdout data (%s)\n", descr, data ); + else + ok( strcmp( data, "Success" ), "%s: Stdout file shouldn't contain data\n", descr ); + } + + CloseHandle( hErrorFile ); + DeleteFile( "fdopen.err" ); +} + static void test_file_inherit( const char* selfname ) { int fd; const char* arg_v[5]; char buffer[16]; + char cmdline[MAX_PATH]; + STARTUPINFO startup; + SECURITY_ATTRIBUTES sa; + HANDLE handles[3]; fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); @@ -890,6 +967,64 @@ ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + + /* make file handle inheritable */ + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + sprintf(cmdline, "%s file inherit 1", selfname); + + /* init an empty Reserved2, which should not be recognized as inherit-block */ + ZeroMemory(&startup, sizeof(STARTUPINFO)); + startup.cb = sizeof(startup); + create_io_inherit_block( &startup, 0, NULL ); + test_stdout_handle( &startup, cmdline, 0, FALSE, "empty block" ); + + /* test with valid inheritblock */ + handles[0] = GetStdHandle( STD_INPUT_HANDLE ); + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + handles[2] = GetStdHandle( STD_ERROR_HANDLE ); + create_io_inherit_block( &startup, 3, handles ); + test_stdout_handle( &startup, cmdline, handles[1], TRUE, "valid block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); + + /* test inherit block starting with unsigned zero */ + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + create_io_inherit_block( &startup, 3, handles ); + *(unsigned int *)startup.lpReserved2 = 0; + test_stdout_handle( &startup, cmdline, handles[1], FALSE, "zero count block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); + + /* test inherit block with smaller size */ + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + create_io_inherit_block( &startup, 3, handles ); + startup.cbReserved2 -= 3; + test_stdout_handle( &startup, cmdline, handles[1], TRUE, "small size block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); + + /* test inherit block with even smaller size */ + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + create_io_inherit_block( &startup, 3, handles ); + startup.cbReserved2 = sizeof(unsigned int) + sizeof(HANDLE) + sizeof(char); + test_stdout_handle( &startup, cmdline, handles[1], FALSE, "smaller size block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); + + /* test inherit block with larger size */ + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + create_io_inherit_block( &startup, 3, handles ); + startup.cbReserved2 += 7; + test_stdout_handle( &startup, cmdline, handles[1], TRUE, "large size block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); } static void test_tmpnam( void ) Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] Fri Oct 16 22:32:42 2009 @@ -663,6 +663,46 @@ } } +static void test_strtol(void) +{ + char* e; + LONG l; + ULONG ul; + + /* errno is only set in case of error, so reset errno to EBADF to check for errno modification */ + /* errno is modified on W2K8+ */ + errno = EBADF; + l = strtol("-1234", &e, 0); + ok(l==-1234, "wrong value %d\n", l); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); + errno = EBADF; + ul = strtoul("1234", &e, 0); + ok(ul==1234, "wrong value %u\n", ul); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); + + errno = EBADF; + l = strtol("2147483647L", &e, 0); + ok(l==2147483647, "wrong value %d\n", l); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); + errno = EBADF; + l = strtol("-2147483648L", &e, 0); + ok(l==-2147483647L - 1, "wrong value %d\n", l); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); + errno = EBADF; + ul = strtoul("4294967295UL", &e, 0); + ok(ul==4294967295ul, "wrong value %u\n", ul); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); + + errno = 0; + l = strtol("9223372036854775807L", &e, 0); + ok(l==2147483647, "wrong value %d\n", l); + ok(errno == ERANGE, "wrong errno %d\n", errno); + errno = 0; + ul = strtoul("9223372036854775807L", &e, 0); + ok(ul==4294967295ul, "wrong value %u\n", ul); + ok(errno == ERANGE, "wrong errno %d\n", errno); +} + START_TEST(string) { char mem[100]; @@ -706,4 +746,5 @@ test_mbcjisjms(); test_strtok(); test_wcscpy_s(); -} + test_strtol(); +}

14 years, 11 months

[fireball] 43517: [fastfat_new] - Improve FatCreateDcb so that it sets the dir name. - Implement relative file object open.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 16 20:39:38 2009 New Revision: 43517 URL: http://svn.reactos.org/svn/reactos?rev=43517&view=rev Log: [fastfat_new] - Improve FatCreateDcb so that it sets the dir name. - Implement relative file object open. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Fri Oct 16 20:39:38 2009 @@ -126,8 +126,7 @@ } /* Create a new DCB for this directory */ - Fcb = FatCreateDcb(IrpContext, Vcb, ParentDcb); - Fcb->FatHandle = FileHandle; + Fcb = FatCreateDcb(IrpContext, Vcb, ParentDcb, FileHandle); /* Set share access */ IoSetShareAccess(*DesiredAccess, ShareAccess, FileObject, &Fcb->ShareAccess); @@ -332,9 +331,9 @@ ULONG CreateDisposition; /* Control blocks */ - PVCB Vcb, DecodedVcb; - PFCB Fcb, NextFcb; - PCCB Ccb; + PVCB Vcb, DecodedVcb, RelatedVcb; + PFCB Fcb, NextFcb, RelatedDcb; + PCCB Ccb, RelatedCcb; PFCB ParentDcb; /* IRP data */ @@ -357,6 +356,7 @@ UNICODE_STRING RemainingPart, FirstName, NextName; OEM_STRING AnsiFirstName; FF_ERROR FfError; + TYPE_OF_OPEN TypeOfOpen; Iosb.Status = STATUS_SUCCESS; @@ -533,8 +533,42 @@ /* Check if this is a relative open */ if (RelatedFO) { - // RelatedFO will be a parent directory - UNIMPLEMENTED; + /* Decode the file object */ + TypeOfOpen = FatDecodeFileObject(RelatedFO, + &RelatedVcb, + &RelatedDcb, + &RelatedCcb); + + /* Check open type */ + if (TypeOfOpen != UserFileOpen && + TypeOfOpen != UserDirectoryOpen) + { + DPRINT1("Invalid file object!\n"); + + /* Cleanup and return */ + FatReleaseVcb(IrpContext, Vcb); + return STATUS_OBJECT_PATH_NOT_FOUND; + } + + /* File path must be relative */ + if (FileName.Length != 0 && + FileName.Buffer[0] == L'\\') + { + /* The name is absolute, fail */ + FatReleaseVcb(IrpContext, Vcb); + return STATUS_OBJECT_NAME_INVALID; + } + + /* Make sure volume is the same */ + ASSERT(RelatedVcb == Vcb); + + /* Save VPB */ + FileObject->Vpb = RelatedFO->Vpb; + + /* Set parent DCB */ + ParentDcb = RelatedDcb; + + DPRINT1("Opening file '%wZ' relatively to '%wZ'\n", &FileName, &ParentDcb->FullFileName); } else { @@ -743,7 +777,8 @@ /* Create a DCB for this entry */ ParentDcb = FatCreateDcb(IrpContext, Vcb, - ParentDcb); + ParentDcb, + NULL); /* Set its name */ FatSetFullNameInFcb(ParentDcb, &FirstName); Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Fri Oct 16 20:39:38 2009 @@ -127,7 +127,8 @@ NTAPI FatCreateDcb(IN PFAT_IRP_CONTEXT IrpContext, IN PVCB Vcb, - IN PFCB ParentDcb) + IN PFCB ParentDcb, + IN FF_FILE *FileHandle) { PFCB Fcb; @@ -162,6 +163,13 @@ /* Initialize parent dcb list */ InitializeListHead(&Fcb->Dcb.ParentDcbList); + /* Set FullFAT handle */ + Fcb->FatHandle = FileHandle; + + /* Set names */ + if (FileHandle) + FatSetFcbNames(IrpContext, Fcb); + return Fcb; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Fri Oct 16 20:39:38 2009 @@ -84,7 +84,8 @@ PFCB NTAPI FatCreateDcb(IN PFAT_IRP_CONTEXT IrpContext, IN PVCB Vcb, - IN PFCB ParentDcb); + IN PFCB ParentDcb, + IN FF_FILE *FileHandle); /* -------------------------------------------------------- create.c */

14 years, 11 months

[fireball] 43516: [fastfat_new] - Implement FatiOpenExistingDir.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 16 19:10:12 2009 New Revision: 43516 URL: http://svn.reactos.org/svn/reactos?rev=43516&view=rev Log: [fastfat_new] - Implement FatiOpenExistingDir. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Fri Oct 16 19:10:12 2009 @@ -89,12 +89,60 @@ IN BOOLEAN DeleteOnClose) { IO_STATUS_BLOCK Iosb = {{0}}; - - DPRINT1("Opening directory\n"); - - UNIMPLEMENTED; - - Iosb.Status = STATUS_NOT_IMPLEMENTED; + OEM_STRING AnsiName; + CHAR AnsiNameBuf[512]; + PFCB Fcb; + NTSTATUS Status; + FF_FILE *FileHandle; + + /* Only open is permitted */ + if (CreateDisposition != FILE_OPEN && + CreateDisposition != FILE_OPEN_IF) + { + Iosb.Status = STATUS_OBJECT_NAME_COLLISION; + return Iosb; + } + + // TODO: Check dir access + + /* Convert the name to ANSI */ + AnsiName.Buffer = AnsiNameBuf; + AnsiName.Length = 0; + AnsiName.MaximumLength = sizeof(AnsiNameBuf); + RtlZeroMemory(AnsiNameBuf, sizeof(AnsiNameBuf)); + Status = RtlUpcaseUnicodeStringToCountedOemString(&AnsiName, &FileObject->FileName, FALSE); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + + /* Open the dir with FullFAT */ + FileHandle = FF_Open(Vcb->Ioman, AnsiName.Buffer, FF_MODE_DIR, NULL); + + if (!FileHandle) + { + Iosb.Status = STATUS_OBJECT_NAME_NOT_FOUND; // FIXME: A shortcut for now + return Iosb; + } + + /* Create a new DCB for this directory */ + Fcb = FatCreateDcb(IrpContext, Vcb, ParentDcb); + Fcb->FatHandle = FileHandle; + + /* Set share access */ + IoSetShareAccess(*DesiredAccess, ShareAccess, FileObject, &Fcb->ShareAccess); + + /* Set context and section object pointers */ + FatSetFileObject(FileObject, + UserDirectoryOpen, + Fcb, + FatCreateCcb()); + + Iosb.Status = STATUS_SUCCESS; + Iosb.Information = FILE_OPENED; + + DPRINT1("Successfully opened dir %s\n", AnsiNameBuf); + return Iosb; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Fri Oct 16 19:10:12 2009 @@ -277,6 +277,8 @@ ULONG State; /* Fcb condition */ FCB_CONDITION Condition; + /* Share access */ + SHARE_ACCESS ShareAccess; /* Mcb mapping Vbo->Lbo */ LARGE_MCB Mcb; ULONG FirstCluster;

14 years, 11 months

[cgutman] 43515: - Add rasadhlp to build and bootcd

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Oct 16 16:51:35 2009 New Revision: 43515 URL: http://svn.reactos.org/svn/reactos?rev=43515&view=rev Log: - Add rasadhlp to build and bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Oct 16 16:51:35 2009 @@ -385,6 +385,7 @@ dll\win32\qmgr\qmgr.dll 1 dll\win32\qmgrprxy\qmgrprxy.dll 1 dll\win32\query\query.dll 1 +dll\win32\rasadhlp\rasadhlp.dll 1 dll\win32\rasapi32\rasapi32.dll 1 dll\win32\rasdlg\rasdlg.dll 1 dll\win32\resutils\resutils.dll 1 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Fri Oct 16 16:51:35 2009 @@ -412,6 +412,9 @@ <directory name="query"> <xi:include href="query/query.rbuild" /> </directory> +<directory name="rasadhlp"> + <xi:include href="rasadhlp/rasadhlp.rbuild" /> +</directory> <directory name="rasapi32"> <xi:include href="rasapi32/rasapi32.rbuild" /> </directory>

14 years, 11 months

[sginsberg] 43514: - Remove svn:needs-lock that somehow got added in 43389

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Oct 16 15:22:35 2009 New Revision: 43514 URL: http://svn.reactos.org/svn/reactos?rev=43514&view=rev Log: - Remove svn:needs-lock that somehow got added in 43389 Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S (props changed) trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S (props changed)

14 years, 11 months

[fireball] 43513: [fastfat_new] - Add a function to read the dirent and return status of that object - does it exist, is it a file or a directory. - Branch according to this in FatiCreate and try to open either an existing file or an existing directory. Directory open is stubbed.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 16 15:11:05 2009 New Revision: 43513 URL: http://svn.reactos.org/svn/reactos?rev=43513&view=rev Log: [fastfat_new] - Add a function to read the dirent and return status of that object - does it exist, is it a file or a directory. - Branch according to this in FatiCreate and try to open either an existing file or an existing directory. Directory open is stubbed. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Fri Oct 16 15:11:05 2009 @@ -38,6 +38,63 @@ Iosb.Status = STATUS_NOT_IMPLEMENTED; + return Iosb; +} + +FF_ERROR +NTAPI +FatiTryToOpen(IN PFILE_OBJECT FileObject, + IN PVCB Vcb) +{ + OEM_STRING AnsiName; + CHAR AnsiNameBuf[512]; + FF_ERROR Error; + NTSTATUS Status; + FF_FILE *FileHandle; + + /* Convert the name to ANSI */ + AnsiName.Buffer = AnsiNameBuf; + AnsiName.Length = 0; + AnsiName.MaximumLength = sizeof(AnsiNameBuf); + RtlZeroMemory(AnsiNameBuf, sizeof(AnsiNameBuf)); + Status = RtlUpcaseUnicodeStringToCountedOemString(&AnsiName, &FileObject->FileName, FALSE); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + + /* Open the file with FullFAT */ + FileHandle = FF_Open(Vcb->Ioman, AnsiName.Buffer, FF_MODE_READ, &Error); + + /* Close the handle */ + if (FileHandle) FF_Close(FileHandle); + + /* Return status */ + return Error; +} + +IO_STATUS_BLOCK +NTAPI +FatiOpenExistingDir(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PFCB ParentDcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG AllocationSize, + IN PFILE_FULL_EA_INFORMATION EaBuffer, + IN ULONG EaLength, + IN UCHAR FileAttributes, + IN ULONG CreateDisposition, + IN BOOLEAN DeleteOnClose) +{ + IO_STATUS_BLOCK Iosb = {{0}}; + + DPRINT1("Opening directory\n"); + + UNIMPLEMENTED; + + Iosb.Status = STATUS_NOT_IMPLEMENTED; return Iosb; } @@ -251,6 +308,7 @@ BOOLEAN EndBackslash = FALSE, OpenedAsDos; UNICODE_STRING RemainingPart, FirstName, NextName; OEM_STRING AnsiFirstName; + FF_ERROR FfError; Iosb.Status = STATUS_SUCCESS; @@ -643,7 +701,8 @@ FatSetFullNameInFcb(ParentDcb, &FirstName); } - // TODO: Try to find a directory entry of this path + /* Try to open it and get a result, saying if this is a dir or a file */ + FfError = FatiTryToOpen(FileObject, Vcb); /* Check if we need to open target directory */ if (OpenTargetDirectory) @@ -652,7 +711,46 @@ UNIMPLEMENTED; } - // TODO: Check, if path is a directory or a file + /* Check, if path is a directory or a file */ + if (FfError == FF_ERR_FILE_OBJECT_IS_A_DIR) + { + if (NonDirectoryFile) + { + DPRINT1("Can't open dir as a file\n"); + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + Iosb.Status = STATUS_FILE_IS_A_DIRECTORY; + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + return Iosb.Status; + } + + /* Open this directory */ + Iosb = FatiOpenExistingDir(IrpContext, + FileObject, + Vcb, + ParentDcb, + DesiredAccess, + ShareAccess, + AllocationSize, + EaBuffer, + EaLength, + FileAttributes, + CreateDisposition, + DeleteOnClose); + + Irp->IoStatus.Information = Iosb.Information; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + + return Iosb.Status; + } /* If end backslash here, then it's definately not permitted, since we're opening files here */

14 years, 11 months

[fireball] 43512: [fastfat_new] - Minor comments/TODO improvement in FatiCreate.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 16 14:29:34 2009 New Revision: 43512 URL: http://svn.reactos.org/svn/reactos?rev=43512&view=rev Log: [fastfat_new] - Minor comments/TODO improvement in FatiCreate. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Fri Oct 16 14:29:34 2009 @@ -643,7 +643,16 @@ FatSetFullNameInFcb(ParentDcb, &FirstName); } - // TODO: Try to open directory + // TODO: Try to find a directory entry of this path + + /* Check if we need to open target directory */ + if (OpenTargetDirectory) + { + // TODO: Open target directory + UNIMPLEMENTED; + } + + // TODO: Check, if path is a directory or a file /* If end backslash here, then it's definately not permitted, since we're opening files here */

14 years, 11 months

[cgutman] 43511: - Fix build

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Oct 16 06:41:40 2009 New Revision: 43511 URL: http://svn.reactos.org/svn/reactos?rev=43511&view=rev Log: - Fix build Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] Fri Oct 16 06:41:40 2009 @@ -103,7 +103,7 @@ getxyDataEnt(IN OUT PCHAR *Results, IN DWORD Length, IN LPSTR Name, - IN LPGUID Type, + IN LPCGUID Type, IN LPSTR *NewName) { PWSAQUERYSETA WsaQuery = (PWSAQUERYSETA)*Results; @@ -119,7 +119,7 @@ RtlZeroMemory(WsaQuery, sizeof(*WsaQuery)); WsaQuery->dwSize = sizeof(*WsaQuery); WsaQuery->lpszServiceInstanceName = Name; - WsaQuery->lpServiceClassId = Type; + WsaQuery->lpServiceClassId = (LPGUID)Type; WsaQuery->dwNameSpace = NS_ALL; WsaQuery->dwNumberOfProtocols = 2; WsaQuery->lpafpProtocols = &afp[0];

14 years, 11 months

[cgutman] 43510: - Add Alex's rasadhlp - It builds on my WC but it may not build on trunk (because of our lacking headers)

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Oct 16 06:33:22 2009 New Revision: 43510 URL: http://svn.reactos.org/svn/reactos?rev=43510&view=rev Log: - Add Alex's rasadhlp - It builds on my WC but it may not build on trunk (because of our lacking headers) Added: trunk/reactos/dll/win32/rasadhlp/ trunk/reactos/dll/win32/rasadhlp/autodial.c (with props) trunk/reactos/dll/win32/rasadhlp/init.c (with props) trunk/reactos/dll/win32/rasadhlp/precomp.h (with props) trunk/reactos/dll/win32/rasadhlp/rasadhlp.rbuild (with props) trunk/reactos/dll/win32/rasadhlp/rasadhlp.spec (with props) trunk/reactos/dll/win32/rasadhlp/winsock.c (with props) Added: trunk/reactos/dll/win32/rasadhlp/autodial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasadhlp/autodia… ============================================================================== --- trunk/reactos/dll/win32/rasadhlp/autodial.c (added) +++ trunk/reactos/dll/win32/rasadhlp/autodial.c [iso-8859-1] Fri Oct 16 06:33:22 2009 @@ -1,0 +1,123 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Winsock 2 SPI + * FILE: lib/mswsock/lib/init.c + * PURPOSE: DLL Initialization + */ + +/* INCLUDES ******************************************************************/ +#include "precomp.h" + +/* DATA **********************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +WINAPI +AcsHlpSendCommand(IN PAUTODIAL_COMMAND Command) +{ + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"\\Device\\RasAcd"); + NTSTATUS Status; + HANDLE DriverHandle; + HANDLE EventHandle = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + + /* Initialize the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &DriverName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open a handle to it */ + Status = NtCreateFile(&DriverHandle, + FILE_READ_DATA | FILE_WRITE_DATA, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Create an event */ + EventHandle = CreateEvent(NULL, FALSE, FALSE, NULL); + if (!EventHandle) + { + /* Event failed, fail us */ + CloseHandle(DriverHandle); + return FALSE; + } + + /* Connect to the driver */ + Status = NtDeviceIoControlFile(DriverHandle, + EventHandle, + NULL, + NULL, + &IoStatusBlock, + IOCTL_ACD_CONNECT_ADDRESS, + Command, + sizeof(AUTODIAL_COMMAND), + NULL, + 0); + + /* Check if we need to wait */ + if (Status == STATUS_PENDING) + { + /* Wait for the driver */ + Status = WaitForSingleObject(EventHandle, INFINITE); + + /* Update status */ + Status = IoStatusBlock.Status; + } + + /* Close handles and return */ + CloseHandle(EventHandle); + CloseHandle(DriverHandle); + return NT_SUCCESS(Status); +} + +/* + * @implemented + */ +BOOLEAN +WINAPI +AcsHlpAttemptConnection(IN PAUTODIAL_ADDR ConnectionAddress) +{ + AUTODIAL_COMMAND Command; + + /* Clear the command packet */ + RtlZeroMemory(&Command, sizeof(AUTODIAL_COMMAND)); + + /* Copy the address into the command packet */ + RtlCopyMemory(&Command.Address, ConnectionAddress, sizeof(AUTODIAL_ADDR)); + + /* Send it to the driver */ + return AcsHlpSendCommand(&Command); +} + +/* + * @implemented + */ +BOOLEAN +WINAPI +AcsHlpNoteNewConnection(IN PAUTODIAL_ADDR ConnectionAddress, + IN PAUTODIAL_CONN Connection) +{ + AUTODIAL_COMMAND Command; + + /* Copy the address into the command packet */ + RtlCopyMemory(&Command.Address, ConnectionAddress, sizeof(AUTODIAL_ADDR)); + + /* Set the New Connection flag and copy the connection data */ + Command.NewConnection = TRUE; + RtlCopyMemory(&Command.Connection, Connection, sizeof(AUTODIAL_CONN)); + + /* Send it to the driver */ + return AcsHlpSendCommand(&Command); +} + Propchange: trunk/reactos/dll/win32/rasadhlp/autodial.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasadhlp/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasadhlp/init.c?… ============================================================================== --- trunk/reactos/dll/win32/rasadhlp/init.c (added) +++ trunk/reactos/dll/win32/rasadhlp/init.c [iso-8859-1] Fri Oct 16 06:33:22 2009 @@ -1,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Winsock 2 SPI + * FILE: lib/mswsock/lib/init.c + * PURPOSE: DLL Initialization + */ + +/* INCLUDES ******************************************************************/ +#include "precomp.h" + +/* DATA **********************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +WINAPI +DllMain(HINSTANCE Instance, + DWORD Reason, + LPVOID Reserved) +{ + /* Check if we're being attached */ + if (Reason == DLL_PROCESS_ATTACH) + { + /* Let's disable TLC calls as an optimization */ + DisableThreadLibraryCalls(Instance); + } + + /* We're done */ + return TRUE; +} Propchange: trunk/reactos/dll/win32/rasadhlp/init.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasadhlp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasadhlp/precomp… ============================================================================== --- trunk/reactos/dll/win32/rasadhlp/precomp.h (added) +++ trunk/reactos/dll/win32/rasadhlp/precomp.h [iso-8859-1] Fri Oct 16 06:33:22 2009 @@ -1,0 +1,102 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Ancillary Function Driver DLL + * FILE: include/msafd.h + * PURPOSE: Ancillary Function Driver DLL header + */ + +#define _WIN32_WINNT 0x502 +#define _CRT_SECURE_NO_DEPRECATE +#define WIN32_NO_STATUS + +/* PSDK Headers */ +#include <winsock2.h> +#include <wsipx.h> +#include <wsnetbs.h> +#include <wininet.h> + +/* NDK */ +#include <iofuncs.h> +#include <rtltypes.h> + +/* Shared GUIDs */ +#include <nsp_dns.h> + +/* These should go in rasadhlp.h */ +#define FILE_DEVICE_ACD 0x000000F1 +#define _ACD_CTL_CODE(function, method, access) \ + CTL_CODE(FILE_DEVICE_ACD, function, method, access) + +#define IOCTL_ACD_RESET \ + _ACD_CTL_CODE(0, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_ACD_ENABLE \ + _ACD_CTL_CODE(1, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_ACD_NOTIFICATION \ + _ACD_CTL_CODE(2, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_ACD_KEEPALIVE \ + _ACD_CTL_CODE(3, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_ACD_COMPLETION \ + _ACD_CTL_CODE(4, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_ACD_CONNECT_ADDRESS \ + _ACD_CTL_CODE(5, METHOD_BUFFERED, FILE_READ_ACCESS) + +typedef enum +{ + AutoDialIp, + AutoDialIpx, + AutoDialNetBios, + AutoDialIpHost +} AUTODIAL_FAMILY; + +typedef enum +{ + ConnectionIpxLana, + ConnectionIp, + ConnectionIpHost, + ConnectionNetBiosMac, +} CONNECTION_FAMILY; + +typedef struct _AUTODIAL_ADDR +{ + AUTODIAL_FAMILY Family; + union + { + IN_ADDR Ip4Address; + CHAR IpxNode[6]; + CHAR NetBiosAddress[NETBIOS_NAME_LENGTH]; + CHAR HostName[INTERNET_MAX_PATH_LENGTH]; + }; +} AUTODIAL_ADDR, *PAUTODIAL_ADDR; + +typedef struct _AUTODIAL_CONN +{ + CONNECTION_FAMILY Family; + union + { + UCHAR IpxLana; + ULONG Ip4Address; + WCHAR ConnectionName[32]; + CHAR NetBiosMac[6]; + }; +} AUTODIAL_CONN, *PAUTODIAL_CONN; + +typedef struct _AUTODIAL_COMMAND +{ + AUTODIAL_ADDR Address; + BOOL NewConnection; + AUTODIAL_CONN Connection; +} AUTODIAL_COMMAND, *PAUTODIAL_COMMAND; + +BOOLEAN +WINAPI +AcsHlpNoteNewConnection( + IN PAUTODIAL_ADDR ConnectionAddress, + IN PAUTODIAL_CONN Connection +); + +BOOLEAN +WINAPI +AcsHlpAttemptConnection( + IN PAUTODIAL_ADDR ConnectionAddress +); + Propchange: trunk/reactos/dll/win32/rasadhlp/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasadhlp/rasadhlp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasadhlp/rasadhl… ============================================================================== --- trunk/reactos/dll/win32/rasadhlp/rasadhlp.rbuild (added) +++ trunk/reactos/dll/win32/rasadhlp/rasadhlp.rbuild [iso-8859-1] Fri Oct 16 06:33:22 2009 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="rasadhlp" type="win32dll" installbase="system32" installname="rasadhlp.dll"> + <importlibrary definition="rasadhlp.spec" /> + <include base="ReactOS">include/reactos/winsock</include> + <include base="rasadhlp">.</include> + <library>kernel32</library> + <library>ntdll</library> + <library>ws2_32</library> + <file>autodial.c</file> + <file>init.c</file> + <file>winsock.c</file> +</module> Propchange: trunk/reactos/dll/win32/rasadhlp/rasadhlp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasadhlp/rasadhlp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasadhlp/rasadhl… ============================================================================== --- trunk/reactos/dll/win32/rasadhlp/rasadhlp.spec (added) +++ trunk/reactos/dll/win32/rasadhlp/rasadhlp.spec [iso-8859-1] Fri Oct 16 06:33:22 2009 @@ -1,0 +1,6 @@ +@ stdcall AcsHlpAttemptConnection(ptr) +@ stub AcsHlpNbConnection +@ stdcall AcsHlpNoteNewConnection(ptr ptr) +@ stdcall WSAttemptAutodialAddr(ptr long) +@ stdcall WSAttemptAutodialName(ptr) +@ stdcall WSNoteSuccessfulHostentLookup(ptr long) Propchange: trunk/reactos/dll/win32/rasadhlp/rasadhlp.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasadhlp/winsock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasadhlp/winsock… ============================================================================== --- trunk/reactos/dll/win32/rasadhlp/winsock.c (added) +++ trunk/reactos/dll/win32/rasadhlp/winsock.c [iso-8859-1] Fri Oct 16 06:33:22 2009 @@ -1,0 +1,137 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Winsock 2 SPI + * FILE: lib/mswsock/lib/init.c + * PURPOSE: DLL Initialization + */ + +/* INCLUDES ******************************************************************/ +#include "precomp.h" + +/* DATA **********************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +BOOL +WINAPI +WSAttemptAutodialAddr(IN CONST SOCKADDR FAR *Name, + IN INT NameLength) +{ + PSOCKADDR_IN Ip = (PSOCKADDR_IN)Name; + PSOCKADDR_NB NetBios = (PSOCKADDR_NB)Name; + AUTODIAL_ADDR AutodialAdddress; + + /* Check the family type */ + switch (Name->sa_family) + { + case AF_INET: + /* Normal IPv4, set the Autodial Address Data */ + AutodialAdddress.Family = AutoDialIp; + AutodialAdddress.Ip4Address = Ip->sin_addr; + break; + + case AF_NETBIOS: + /* NetBIOS, set the Autodial Address Data*/ + AutodialAdddress.Family = AutoDialNetBios; + RtlCopyMemory(&AutodialAdddress.NetBiosAddress, + NetBios->snb_name, + NETBIOS_NAME_LENGTH); + break; + + default: + /* Unsupported family type */ + return FALSE; + } + + /* Call the public routine */ + return AcsHlpAttemptConnection(&AutodialAdddress); +} + +/* + * @implemented + */ +BOOL +WINAPI +WSAttemptAutodialName(IN CONST LPWSAQUERYSETW Restrictions) +{ + AUTODIAL_ADDR AutodialAdddress; + CHAR AnsiIp[17]; + LPGUID Guid = Restrictions->lpServiceClassId; + + /* Make sure we actually have a name */ + if (!Restrictions->lpszServiceInstanceName) return FALSE; + + /* Check if this is the Hostname GUID */ + if (!memcmp(Guid, &HostnameGuid, sizeof(GUID))) + { + /* It is. Set up the Autodial Address Data */ + AutodialAdddress.Family = AutoDialIpHost; + WideCharToMultiByte(CP_ACP, + 0, + Restrictions->lpszServiceInstanceName, + -1, + AutodialAdddress.HostName, + INTERNET_MAX_PATH_LENGTH - 1, + 0, + 0); + + /* Call the public routine */ + return AcsHlpAttemptConnection(&AutodialAdddress); + } + else if (!memcmp(Guid, &AddressGuid, sizeof(GUID))) + { + /* It's actually the IP String GUID */ + AutodialAdddress.Family = AutoDialIp; + + /* Convert the IP String to ANSI and then convert it to IP */ + WideCharToMultiByte(CP_ACP, + 0, + Restrictions->lpszServiceInstanceName, + -1, + AnsiIp, + sizeof(AnsiIp) - 1, + 0, + 0); + _strlwr(AnsiIp); + AutodialAdddress.Ip4Address.S_un.S_addr = inet_addr(AnsiIp); + + /* Make sure the IP is valid */ + if (AutodialAdddress.Ip4Address.S_un.S_addr == -1) return FALSE; + + /* Call the public routine */ + return AcsHlpAttemptConnection(&AutodialAdddress); + } + else + { + /* Unknown GUID type */ + return FALSE; + } +} + +/* + * @implemented + */ +VOID +WINAPI +WSNoteSuccessfulHostentLookup(IN CONST CHAR FAR *Name, + IN CONST ULONG Address) +{ + AUTODIAL_ADDR AutodialAdddress; + AUTODIAL_CONN AutodialConnection; + + /* Make sure there actually is a name */ + if (!(Name) || !strlen(Name)) return; + + /* Setup the Address */ + AutodialAdddress.Family = AutoDialIpHost; + strcpy(AutodialAdddress.HostName, Name); + + /* Setup the new connection */ + AutodialConnection.Family = ConnectionIp; + AutodialConnection.Ip4Address = Address; + AcsHlpNoteNewConnection(&AutodialAdddress, &AutodialConnection); +} + Propchange: trunk/reactos/dll/win32/rasadhlp/winsock.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 11 months

← Newer
1
...
35
36
37
38
39
40
41
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009