Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 43523: Downgrade various debug prints from DPRINT1 to DPRINT, ranging from "useless" to "pretty useless".
by sginsberg＠svn.reactos.org 16 Oct '09

16 Oct '09

Author: sginsberg Date: Sat Oct 17 00:03:38 2009 New Revision: 43523 URL: http://svn.reactos.org/svn/reactos?rev=43523&view=rev Log: Downgrade various debug prints from DPRINT1 to DPRINT, ranging from "useless" to "pretty useless". Modified: trunk/reactos/base/setup/usetup/interface/devinst.c trunk/reactos/drivers/base/kdcom/i386/kdbg.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/mtrr.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/vdm/vdmmain.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -81,7 +81,7 @@ RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); wcscat(FullImagePath, ImagePath); - DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); + DPRINT("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); /* Create service key */ RtlInitUnicodeString(&StringU, Driver); @@ -368,7 +368,7 @@ DPRINT("Received PnP Event\n"); if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ENUMERATED)) { - DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); InstallDevice(hInf, hEnum, hServices, PnpEvent->TargetDevice.DeviceIds); } else Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/i386/kd… ============================================================================== --- trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -474,7 +474,6 @@ KdDebuggerInitialize0( IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { - UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -486,7 +485,6 @@ KdDebuggerInitialize1( IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { - UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -2308,7 +2308,7 @@ PCHAR BootDeviceName, CommandLine; PDEVICE_OBJECT PhysicalDeviceObject = NULL; NTSTATUS Status; - DPRINT1("RAM Disk Driver Initialized\n"); + DPRINT("RAM Disk Driver Initialized\n"); // // Query ramdisk parameters Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -888,7 +888,7 @@ SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; /* Create symbolic link */ - DPRINT1("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); + DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name); Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); if (!NT_SUCCESS(Status) && ReferenceString == NULL) { @@ -977,7 +977,7 @@ if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; - DPRINT1("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); + DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); /* Symbolic link name is \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ /* Get GUID from SymbolicLinkName */ @@ -993,7 +993,7 @@ SymLink.Buffer = SymbolicLinkName->Buffer; SymLink.MaximumLength = SymLink.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)SymLink.Buffer); - DPRINT1("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); + DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); /* Get pointer to the PDO */ Status = IoGetDeviceObjectPointer( &SymLink, @@ -1015,7 +1015,7 @@ (PVOID)SymbolicLinkName); ObDereferenceObject(FileObject); -DPRINT1("Status %x\n", Status); + DPRINT("Status %x\n", Status); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -40,7 +40,7 @@ if (KeFeatureBits & KF_LARGE_PAGE) { /* FIXME: Support this */ - DPRINT1("Large Page support detected but not yet taken advantage of!\n"); + DPRINT("Large Page support detected but not yet taken advantage of!\n"); } /* Check for global page support */ Modified: trunk/reactos/ntoskrnl/ke/i386/mtrr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/mtrr.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/mtrr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/mtrr.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -21,7 +21,7 @@ KiInitializeMTRR(IN BOOLEAN FinalCpu) { /* FIXME: Support this */ - DPRINT1("Your machine supports MTRR but ReactOS doesn't yet.\n"); + DPRINT("Your machine supports MTRR but ReactOS doesn't yet.\n"); } VOID @@ -29,5 +29,5 @@ KiAmdK6InitializeMTRR(VOID) { /* FIXME: Support this */ - DPRINT1("Your machine supports AMD MTRR but ReactOS doesn't yet.\n"); + DPRINT("Your machine supports AMD MTRR but ReactOS doesn't yet.\n"); } Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -59,5 +59,5 @@ KiInitializePAT(VOID) { /* FIXME: Support this */ - DPRINT1("Advanced Memory features detected but not yet taken advantage of.\n"); + DPRINT("Advanced Memory features detected but not yet taken advantage of.\n"); } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -4810,7 +4810,7 @@ /* Something must gone wrong * how can we have a Section but no * reference? */ - DPRINT1("ERROR: DataSectionObject without reference!\n"); + DPRINT("ERROR: DataSectionObject without reference!\n"); } } Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -22,7 +22,7 @@ NTAPI Ki386VdmEnablePentiumExtentions(VOID) { - DPRINT1("VME detected but not yet supported\n"); + DPRINT("VME detected but not yet supported\n"); } VOID Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -881,7 +881,7 @@ } ptiRawInput = PsGetCurrentThreadWin32Thread(); - DPRINT1("\nRaw Input Thread 0x%x \n", ptiRawInput); + DPRINT("\nRaw Input Thread 0x%x \n", ptiRawInput); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Sat Oct 17 00:03:38 2009 @@ -136,8 +136,8 @@ { NTSTATUS Status; - DPRINT1("Enter NtUserInitialize(%lx, %p, %p)\n", - dwWinVersion, hPowerRequestEvent, hMediaRequestEvent); + DPRINT("Enter NtUserInitialize(%lx, %p, %p)\n", + dwWinVersion, hPowerRequestEvent, hMediaRequestEvent); /* Check the Windows version */ if (dwWinVersion != 0)

1 0

[cwittich] 43522: fix all msvcrt file winetests
by cwittich＠svn.reactos.org 16 Oct '09

16 Oct '09

Author: cwittich Date: Fri Oct 16 23:43:28 2009 New Revision: 43522 URL: http://svn.reactos.org/svn/reactos?rev=43522&view=rev Log: fix all msvcrt file winetests Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Fri Oct 16 23:43:28 2009 @@ -902,10 +902,18 @@ { /* Flush output if needed */ if(file->_flag & _IOWRT) - flush_buffer(file); + flush_buffer(file); if(whence == SEEK_CUR && file->_flag & _IOREAD ) { - offset -= file->_cnt; + offset -= file->_cnt; + if (fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + offset--; + } + } } /* Discard buffered input */ file->_cnt = 0; @@ -1557,27 +1565,6 @@ } /********************************************************************* - * (internal) remove_cr - * - * Translate all \r\n to \n inplace. - * return the number of \r removed - * Corner cases required by some apps: - * \r\r\n -> \r\n - * BUG: should save state across calls somehow, so CR LF that - * straddles buffer boundary gets recognized properly? - */ -static unsigned int remove_cr(char *buf, unsigned int count) -{ - unsigned int i, j; - - for (i=0, j=0; j < count; j++) - if ((buf[j] != '\r') || ((j+1) < count && buf[j+1] != '\n')) - buf[i++] = buf[j]; - - return count - i; -} - -/********************************************************************* * (internal) read_i */ static int read_i(int fd, void *buf, unsigned int count) @@ -1604,18 +1591,25 @@ { if (fdesc[fd].wxflag & WX_TEXT) { - int i; - /* in text mode, a ctrl-z signals EOF */ - for (i=0; i<num_read; i++) + DWORD i, j; + for (i=0, j=0; i<num_read; i++) { + /* in text mode, a ctrl-z signals EOF */ if (bufstart[i] == 0x1a) { - num_read = i; fdesc[fd].wxflag |= (WX_ATEOF|WX_READEOF); TRACE(":^Z EOF %s\n",debugstr_an(buf,num_read)); break; } + /* in text mode, strip \r if followed by \n. + * BUG: should save state across calls somehow, so CR LF that + * straddles buffer boundary gets recognized properly? + */ + if ((bufstart[i] != '\r') + || ((i+1) < num_read && bufstart[i+1] != '\n')) + bufstart[j++] = bufstart[i]; } + num_read = j; } if (count != 0 && num_read == 0) { @@ -1650,10 +1644,6 @@ { int num_read; num_read = read_i(fd, buf, count); - if (num_read>0 && fdesc[fd].wxflag & WX_TEXT) - { - num_read -= remove_cr(buf,num_read); - } return num_read; } @@ -1955,17 +1945,13 @@ { unsigned char *i; unsigned int j; - do { - if (file->_cnt>0) { - file->_cnt--; - i = (unsigned char *)file->_ptr++; - j = *i; - } else - j = _filbuf(file); - if (!(fdesc[file->_file].wxflag & WX_TEXT) - || ((j != '\r') || (file->_cnt && file->_ptr[0] != '\n'))) - return j; - } while(1); + if (file->_cnt>0) { + file->_cnt--; + i = (unsigned char *)file->_ptr++; + j = *i; + } else + j = _filbuf(file); + return j; } /********************************************************************* @@ -2300,11 +2286,13 @@ } if(file->_bufsiz) { int res=flush_buffer(file); - return res?res : fputc(c, file); + return res?res : fputc(c, file); } else { - unsigned char cc=c; + unsigned char cc=c; int len; - len = _write(file->_file, &cc, 1); + /* set _cnt to 0 for unbuffered FILEs */ + file->_cnt = 0; + len = _write(file->_file, &cc, 1); if (len == 1) return c & 0xff; file->_flag |= _IOERR; return EOF; @@ -2336,8 +2324,6 @@ memcpy(ptr, file->_ptr, pcnt); file->_cnt -= pcnt; file->_ptr += pcnt; - if (fdesc[file->_file].wxflag & WX_TEXT) - pcnt -= remove_cr(ptr,pcnt); read += pcnt ; rcnt -= pcnt ; ptr = (char*)ptr + pcnt; @@ -2493,17 +2479,26 @@ */ LONG CDECL ftell(FILE* file) { + /* TODO: just call fgetpos and return lower half of result */ int off=0; long pos; + pos = _tell(file->_file); + if(pos == -1) return -1; if(file->_bufsiz) { - if( file->_flag & _IOWRT ) { - off = file->_ptr - file->_base; - } else { - off = -file->_cnt; - } - } - pos = _tell(file->_file); - if(pos == -1) return pos; + if( file->_flag & _IOWRT ) { + off = file->_ptr - file->_base; + } else { + off = -file->_cnt; + if (fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + off--; + } + } + } + } return off + pos; } @@ -2512,22 +2507,25 @@ */ int CDECL fgetpos(FILE* file, fpos_t *pos) { - /* This code has been lifted form the ftell function */ int off=0; - *pos = _lseeki64(file->_file,0,SEEK_CUR); - - if (*pos == -1) return -1; - + if(*pos == -1) return -1; if(file->_bufsiz) { - if( file->_flag & _IOWRT ) { - off = file->_ptr - file->_base; - } else { - off = -file->_cnt; - } + if( file->_flag & _IOWRT ) { + off = file->_ptr - file->_base; + } else { + off = -file->_cnt; + if (fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + off--; + } + } + } } *pos += off; - return 0; }

1 0

[cwittich] 43521: don't set errno for libcnt
by cwittich＠svn.reactos.org 16 Oct '09

16 Oct '09

Author: cwittich Date: Fri Oct 16 23:29:27 2009 New Revision: 43521 URL: http://svn.reactos.org/svn/reactos?rev=43521&view=rev Log: don't set errno for libcnt 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 23:29:27 2009 @@ -79,7 +79,9 @@ if (any < 0) { acc = neg ? LONG_MIN : LONG_MAX; +#ifndef _LIBCNT_ __set_errno(ERANGE); +#endif } 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 23:29:27 2009 @@ -63,7 +63,9 @@ if (any < 0) { acc = ULONG_MAX; +#ifndef _LIBCNT_ __set_errno(ERANGE); +#endif } else if (neg) acc = -acc;

1 0

[cwittich] 43520: -sync msvcrt_init_io to wine 1.1.31 fixes 12 msvcrt file winetests
by cwittich＠svn.reactos.org 16 Oct '09

16 Oct '09

Author: cwittich Date: Fri Oct 16 22:57:00 2009 New Revision: 43520 URL: http://svn.reactos.org/svn/reactos?rev=43520&view=rev Log: -sync msvcrt_init_io to wine 1.1.31 fixes 12 msvcrt file winetests Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Fri Oct 16 22:57:00 2009 @@ -306,18 +306,19 @@ InitializeCriticalSection(&FILE_cs); FILE_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FILE_cs"); GetStartupInfoA(&si); - if (si.cbReserved2 != 0 && si.lpReserved2 != NULL) - { - char* wxflag_ptr; + if (si.cbReserved2 >= sizeof(unsigned int) && si.lpReserved2 != NULL) + { + BYTE* wxflag_ptr; HANDLE* handle_ptr; - - fdend = *(unsigned*)si.lpReserved2; - - wxflag_ptr = (char*)(si.lpReserved2 + sizeof(unsigned)); - handle_ptr = (HANDLE*)(wxflag_ptr + fdend * sizeof(char)); - - fdend = min(fdend, sizeof(fdesc) / sizeof(fdesc[0])); - for (i = 0; i < fdend; i++) + unsigned int count; + + count = *(unsigned*)si.lpReserved2; + wxflag_ptr = si.lpReserved2 + sizeof(unsigned); + handle_ptr = (HANDLE*)(wxflag_ptr + count); + + count = min(count, (si.cbReserved2 - sizeof(unsigned)) / (sizeof(HANDLE) + 1)); + count = min(count, sizeof(fdesc) / sizeof(fdesc[0])); + for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) { @@ -331,6 +332,7 @@ } wxflag_ptr++; handle_ptr++; } + fdend = max( 3, count ); for (fdstart = 3; fdstart < fdend; fdstart++) if (fdesc[fdstart].handle == INVALID_HANDLE_VALUE) break; }

1 0

[cwittich] 43519: -fix some msvcrt string winetests
by cwittich＠svn.reactos.org 16 Oct '09

16 Oct '09

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;

1 0

[cwittich] 43518: sync msvcrt winetest with wine 1.1.31
by cwittich＠svn.reactos.org 16 Oct '09

16 Oct '09

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(); +}

1 0

[fireball] 43517: [fastfat_new] - Improve FatCreateDcb so that it sets the dir name. - Implement relative file object open.
by fireball＠svn.reactos.org 16 Oct '09

16 Oct '09

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 */

1 0

[fireball] 43516: [fastfat_new] - Implement FatiOpenExistingDir.
by fireball＠svn.reactos.org 16 Oct '09

16 Oct '09

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;

1 0

[cgutman] 43515: - Add rasadhlp to build and bootcd
by cgutman＠svn.reactos.org 16 Oct '09

16 Oct '09

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>

1 0

[sginsberg] 43514: - Remove svn:needs-lock that somehow got added in 43389
by sginsberg＠svn.reactos.org 16 Oct '09

16 Oct '09

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)

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