Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 13034: Update status
by gvg＠svn.reactos.com 13 Jan '05

13 Jan '05

Update status Modified: trunk/reactos/doc/README.WINE _____ Modified: trunk/reactos/doc/README.WINE --- trunk/reactos/doc/README.WINE 2005-01-13 21:01:24 UTC (rev 13033) +++ trunk/reactos/doc/README.WINE 2005-01-13 21:03:02 UTC (rev 13034) @@ -34,39 +34,39 @@ The following shared libraries are a 100% port from Winehq sources. -reactos/lib/cabinet # Synced to Wine-20041201 -reactos/lib/comctl32 # Synced to Wine-20041201 -reactos/lib/comdlg32 # Synced to Wine-20041201 -reactos/lib/dinput # Synced to Wine-20041201 -reactos/lib/dinput8 # Synced to Wine-20041201 -reactos/lib/icmp # Synced to Wine-20041201 +reactos/lib/cabinet # Synced to Wine-20050111 +reactos/lib/comctl32 # Synced to Wine-20050111 +reactos/lib/comdlg32 # Synced to Wine-20050111 +reactos/lib/dinput # Synced to Wine-20050111 +reactos/lib/dinput8 # Synced to Wine-20050111 +reactos/lib/icmp # Synced to Wine-20050111 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20041201 +reactos/lib/mpr # Synced to Wine-20050111 reactos/lib/msacm # Out of sync -reactos/lib/msi # Synced to Wine-20041201 +reactos/lib/msi # Synced to Wine-20050111 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20041201 -reactos/lib/oleaut32 # Synced to Wine-20041201 -reactos/lib/oledlg # Synced to Wine-20041201 -reactos/lib/olepro32 # Synced to Wine-20041201 -reactos/lib/richedit # Synced to Wine-20041201 -reactos/lib/rpcrt4 # Synced to Wine-20041201 +reactos/lib/ole32 # Synced to Wine-20050111 +reactos/lib/oleaut32 # Synced to Wine-20050111 +reactos/lib/oledlg # Synced to Wine-20050111 +reactos/lib/olepro32 # Synced to Wine-20050111 +reactos/lib/richedit # Synced to Wine-20050111 +reactos/lib/rpcrt4 # Synced to Wine-20050111 reactos/lib/setupapi # Out of sync -reactos/lib/shell32 # Synced to Wine-20041201 -reactos/lib/shdocvw # Synced to Wine-20041201 -reactos/lib/shlwapi # Synced to Wine-20041201 +reactos/lib/shell32 # Synced to Wine-20050111 +reactos/lib/shdocvw # Synced to Wine-20050111 +reactos/lib/shlwapi # Synced to Wine-20050111 reactos/lib/twain # Out of sync -reactos/lib/unicode # Dependancy on this lib needs to be removed. Synced to Wine-20041201 -reactos/lib/urlmon # Synced to Wine-20041201 +reactos/lib/unicode # Dependancy on this lib needs to be removed. Synced to Wine-20050111 +reactos/lib/urlmon # Synced to Wine-20050111 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20041201 -reactos/lib/winmm/midimap # Synced to Wine-20041201 -reactos/lib/winmm/wavemap # Synced to Wine-20041201 +reactos/lib/winmm # Synced to Wine-20050111 +reactos/lib/winmm/midimap # Synced to Wine-20050111 +reactos/lib/winmm/wavemap # Synced to Wine-20050111 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync

1 0

[gvg] 13033: Remove old vendor drop
by gvg＠svn.reactos.com 13 Jan '05

13 Jan '05

Remove old vendor drop Deleted: vendor/wine/dlls/cabinet/Wine-20041201/ Deleted: vendor/wine/dlls/comctl32/Wine-20041201/ Deleted: vendor/wine/dlls/commdlg/Wine-20041201/ Deleted: vendor/wine/dlls/dinput/Wine-20041201/ Deleted: vendor/wine/dlls/dinput8/Wine-20041201/ Deleted: vendor/wine/dlls/dsound/Wine-20041201/ Deleted: vendor/wine/dlls/icmp/Wine-20041201/ Deleted: vendor/wine/dlls/mpr/Wine-20041201/ Deleted: vendor/wine/dlls/msi/Wine-20041201/ Deleted: vendor/wine/dlls/ole32/Wine-20041201/ Deleted: vendor/wine/dlls/oleaut32/Wine-20041201/ Deleted: vendor/wine/dlls/oledlg/Wine-20041201/ Deleted: vendor/wine/dlls/olepro32/Wine-20041201/ Deleted: vendor/wine/dlls/richedit/Wine-20041201/ Deleted: vendor/wine/dlls/rpcrt4/Wine-20041201/ Deleted: vendor/wine/dlls/shdocvw/Wine-20041201/ Deleted: vendor/wine/dlls/shell32/Wine-20041201/ Deleted: vendor/wine/dlls/shlwapi/Wine-20041201/ Deleted: vendor/wine/dlls/urlmon/Wine-20041201/ Deleted: vendor/wine/dlls/winmm/Wine-20041201/ Deleted: vendor/wine/libs/unicode/Wine-20041201/

1 0

[hbirr] 13032: Reverted parts of the last changes. Vfat must always check the partition type if it is available.
by hbirr＠svn.reactos.com 13 Jan '05

13 Jan '05

Reverted parts of the last changes. Vfat must always check the partition type if it is available. Modified: trunk/reactos/drivers/fs/vfat/fsctl.c _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-13 20:54:13 UTC (rev 13031) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-13 20:57:30 UTC (rev 13032) @@ -86,6 +86,35 @@ return Status; } PartitionInfoIsValid = TRUE; + DPRINT("Partition Information:\n"); + DPRINT("StartingOffset %u\n", PartitionInfo.StartingOffset.QuadPart / 512); + DPRINT("PartitionLength %u\n", PartitionInfo.PartitionLength.QuadPart / 512); + DPRINT("HiddenSectors %u\n", PartitionInfo.HiddenSectors); + DPRINT("PartitionNumber %u\n", PartitionInfo.PartitionNumber); + DPRINT("PartitionType %u\n", PartitionInfo.PartitionType); + DPRINT("BootIndicator %u\n", PartitionInfo.BootIndicator); + DPRINT("RecognizedPartition %u\n", PartitionInfo.RecognizedPartition); + DPRINT("RewritePartition %u\n", PartitionInfo.RewritePartition); + if (PartitionInfo.PartitionType) + { + if (PartitionInfo.PartitionType == PARTITION_FAT_12 || + PartitionInfo.PartitionType == PARTITION_FAT_16 || + PartitionInfo.PartitionType == PARTITION_HUGE || + PartitionInfo.PartitionType == PARTITION_FAT32 || + PartitionInfo.PartitionType == PARTITION_FAT32_XINT13 || + PartitionInfo.PartitionType == PARTITION_XINT13) + { + *RecognizedFS = TRUE; + } + } + else if (DiskGeometry.MediaType == RemovableMedia && + PartitionInfo.PartitionNumber > 0 && + PartitionInfo.StartingOffset.QuadPart == 0LL && + PartitionInfo.PartitionLength.QuadPart > 0LL) + { + /* This is possible a removable media formated as super floppy */ + *RecognizedFS = TRUE; + } } else if (DiskGeometry.MediaType == Unknown) { @@ -97,6 +126,14 @@ *RecognizedFS = TRUE; DiskGeometry.BytesPerSector = 512; } + else + { + *RecognizedFS = TRUE; + } + if (*RecognizedFS == FALSE) + { + return STATUS_SUCCESS; + } Boot = ExAllocatePool(NonPagedPool, DiskGeometry.BytesPerSector); if (Boot == NULL) @@ -110,8 +147,6 @@ Status = VfatReadDisk(DeviceToMount, &Offset, DiskGeometry.BytesPerSector, (PUCHAR) Boot, FALSE); if (NT_SUCCESS(Status)) { - *RecognizedFS = TRUE; - if (Boot->Signatur1 != 0xaa55) { *RecognizedFS = FALSE;

1 0

[hbirr] 13031: Fixed some length problems.
by hbirr＠svn.reactos.com 13 Jan '05

13 Jan '05

Fixed some length problems. Modified: trunk/reactos/drivers/fs/vfat/create.c Modified: trunk/reactos/drivers/fs/vfat/dir.c Modified: trunk/reactos/drivers/fs/vfat/dirwr.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-01-13 20:53:35 UTC (rev 13030) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-01-13 20:54:13 UTC (rev 13031) @@ -200,15 +200,8 @@ Parent, FileToFindU, DirContext->DirIndex); DPRINT ("FindFile: Path %wZ)\n",&Parent->PathNameU); - PathNameBufferLength = Parent->PathNameU.Length + LONGNAME_MAX_LENGTH + 2 * sizeof(WCHAR); - if (PathNameBufferLength > (USHRT_MAX - 2) * sizeof(WCHAR)) - { - /* A valid filename can't be so long. Do as if the file doesn't exist. */ - CHECKPOINT; - return STATUS_NO_SUCH_FILE; - } - - PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameBufferLength); + PathNameBufferLength = LONGNAME_MAX_LENGTH * sizeof(WCHAR); + PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameBufferLength + sizeof(WCHAR)); if (!PathNameBuffer) { CHECKPOINT1; _____ Modified: trunk/reactos/drivers/fs/vfat/dir.c --- trunk/reactos/drivers/fs/vfat/dir.c 2005-01-13 20:53:35 UTC (rev 13030) +++ trunk/reactos/drivers/fs/vfat/dir.c 2005-01-13 20:54:13 UTC (rev 13031) @@ -306,7 +306,7 @@ BOOLEAN First = FALSE; BOOLEAN FirstCall; VFAT_DIRENTRY_CONTEXT DirContext; - WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH]; + WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH + 1]; WCHAR ShortNameBuffer[13]; PIO_STACK_LOCATION Stack = IrpContext->Stack; _____ Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-13 20:53:35 UTC (rev 13030) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-13 20:54:13 UTC (rev 13031) @@ -204,7 +204,7 @@ BOOLEAN SpacesFound; VFAT_DIRENTRY_CONTEXT DirContext; - WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH]; + WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH + 1]; WCHAR ShortNameBuffer[13]; DPRINT ("addEntry: Name='%wZ', Dir='%wZ'\n", NameU, &ParentFcb->PathNameU); @@ -363,6 +363,16 @@ } /* set dates and times */ KeQuerySystemTime (&SystemTime); +#if 0 + { + TIME_FIELDS tf; + RtlTimeToTimeFields (&SystemTime, &tf); + DPRINT1("%d.%d.%d %02d:%02d:%02d.%03d '%wZ'\n", + tf.Day, tf.Month, tf.Year, tf.Hour, + tf.Minute, tf.Second, tf.Milliseconds, + NameU); + } +#endif FsdSystemTimeToDosDateTime (DeviceExt, &SystemTime, &DirContext.DirEntry.Fat.CreationDate, &DirContext.DirEntry.Fat.CreationTime); DirContext.DirEntry.Fat.UpdateDate = DirContext.DirEntry.Fat.CreationDate; _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-13 20:53:35 UTC (rev 13030) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-13 20:54:13 UTC (rev 13031) @@ -461,14 +461,17 @@ UNICODE_STRING NameU; - PathNameLength = (directoryFCB->PathNameU.Length + 2 * sizeof(WCHAR) - + DirContext->LongNameU.Length) * sizeof(WCHAR); + PathNameLength = directoryFCB->PathNameU.Length + max(DirContext->LongNameU.Length, DirContext->ShortNameU.Length); + if (!vfatFCBIsRoot (directoryFCB)) + { + PathNameLength += sizeof(WCHAR); + } - if (PathNameLength > (USHRT_MAX - 2) * sizeof(WCHAR)) + if (PathNameLength > LONGNAME_MAX_LENGTH * sizeof(WCHAR)) { return STATUS_OBJECT_NAME_INVALID; } - PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameLength); + PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameLength + sizeof(WCHAR)); if (!PathNameBuffer) { return STATUS_INSUFFICIENT_RESOURCES; @@ -585,7 +588,9 @@ PVOID Page = NULL; BOOLEAN First = TRUE; VFAT_DIRENTRY_CONTEXT DirContext; - WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH]; + /* This buffer must have a size of 260 characters, because + vfatMakeFCBFromDirEntry can copy 20 name entries with 13 characters. */ + WCHAR LongNameBuffer[260]; WCHAR ShortNameBuffer[13]; BOOLEAN FoundLong = FALSE; BOOLEAN FoundShort = FALSE;

1 0

[hbirr] 13030: Don't add a terminating null character in RtlCopyString, if the destination buffer isn't large enough.
by hbirr＠svn.reactos.com 13 Jan '05

13 Jan '05

Don't add a terminating null character in RtlCopyString, if the destination buffer isn't large enough. A ansi/unicode string doesn't need a terminating null character. Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-01-13 20:30:59 UTC (rev 13029) +++ trunk/reactos/lib/rtl/unicode.c 2005-01-13 20:53:35 UTC (rev 13030) @@ -2195,11 +2195,14 @@ return; } - copylen = min (DestinationString->MaximumLength - sizeof(CHAR), + copylen = min (DestinationString->MaximumLength, SourceString->Length); memcpy(DestinationString->Buffer, SourceString->Buffer, copylen); - DestinationString->Buffer[copylen] = 0; + if (DestinationString->MaximumLength >= copylen + sizeof(CHAR)) + { + DestinationString->Buffer[copylen] = 0; + } DestinationString->Length = copylen; } @@ -2222,10 +2225,13 @@ return; } - copylen = min (DestinationString->MaximumLength - sizeof(WCHAR), + copylen = min (DestinationString->MaximumLength, SourceString->Length); memcpy(DestinationString->Buffer, SourceString->Buffer, copylen); - DestinationString->Buffer[copylen / sizeof(WCHAR)] = 0; + if (DestinationString->MaximumLength >= copylen + sizeof(WCHAR)) + { + DestinationString->Buffer[copylen / sizeof(WCHAR)] = 0; + } DestinationString->Length = copylen; }

1 0

[blight] 13029: Fix unused variable warning.
by blight＠svn.reactos.com 13 Jan '05

13 Jan '05

Fix unused variable warning. Modified: trunk/reactos/ntoskrnl/mm/virtual.c _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-13 19:40:21 UTC (rev 13028) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-13 20:30:59 UTC (rev 13029) @@ -393,6 +393,11 @@ NewAccessProtection, OldAccessProtection); } + else + { + /* FIXME: Should we return failure or success in this case? */ + Status = STATUS_SUCCESS; + } MmUnlockAddressSpace(AddressSpace);

1 0

[sedwards] 13028: I am not the copyright holder on this one
by sedwards＠svn.reactos.com 13 Jan '05

13 Jan '05

I am not the copyright holder on this one Modified: trunk/reactos/apps/utils/net/whois/whois.rc _____ Modified: trunk/reactos/apps/utils/net/whois/whois.rc --- trunk/reactos/apps/utils/net/whois/whois.rc 2005-01-13 12:26:09 UTC (rev 13027) +++ trunk/reactos/apps/utils/net/whois/whois.rc 2005-01-13 19:40:21 UTC (rev 13028) @@ -3,5 +3,4 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Whois\0" #define REACTOS_STR_INTERNAL_NAME "whois\0" #define REACTOS_STR_ORIGINAL_FILENAME "whois.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Steven Edwards (Isolation(a)users.sourceforge.net)\0" #include <reactos/version.rc>

1 0

[navaraf] 13027: d_layer <dome@koganet.ne.jp>
by navaraf＠svn.reactos.com 13 Jan '05

13 Jan '05

d_layer <dome(a)koganet.ne.jp> Fix some problems with RtlStoreUlong: - Store SECONDBYTE of the value correctly. - Store ULONG value, not ULONG_PTR value. Modified: trunk/reactos/include/ntos/rtl.h _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2005-01-13 09:41:55 UTC (rev 13026) +++ trunk/reactos/include/ntos/rtl.h 2005-01-13 12:26:09 UTC (rev 13027) @@ -2350,13 +2350,13 @@ if ((ULONG_PTR)(Address) & LONG_MASK) \ { \ ((PUCHAR)(Address))[LONG_LEAST_SIGNIFICANT_BIT]=(UCHAR)(FIRSTBYTE(Value) ); \ - ((PUCHAR)(Address))[LONG_3RD_MOST_SIGNIFICANT_BIT]=(UCHAR)(FIRSTBYTE(Val ue)); \ + ((PUCHAR)(Address))[LONG_3RD_MOST_SIGNIFICANT_BIT]=(UCHAR)(SECONDBYTE(Va lue)); \ ((PUCHAR)(Address))[LONG_2ND_MOST_SIGNIFICANT_BIT]=(UCHAR)(THIRDBYTE(Val ue)); \ ((PUCHAR)(Address))[LONG_MOST_SIGNIFICANT_BIT]=(UCHAR)(FOURTHBYTE(Value) ); \ } \ else \ { \ - *((PULONG_PTR)(Address))=(ULONG_PTR)(Value); \ + *((PULONG)(Address))=(ULONG)(Value); \ } /*

1 0

[gvg] 13026: Small Wine sync
by gvg＠svn.reactos.com 13 Jan '05

13 Jan '05

Small Wine sync Modified: trunk/reactos/lib/icmp/icmp_main.c _____ Modified: trunk/reactos/lib/icmp/icmp_main.c --- trunk/reactos/lib/icmp/icmp_main.c 2005-01-13 09:28:58 UTC (rev 13025) +++ trunk/reactos/lib/icmp/icmp_main.c 2005-01-13 09:41:55 UTC (rev 13026) @@ -95,6 +95,7 @@ #include "ip.h" #include "ip_icmp.h" + WINE_DEFAULT_DEBUG_CHANNEL(icmp); @@ -135,6 +136,8 @@ return(answer); } + + /* * Exported Routines. */

1 0

[gvg] 13025: Small Wine sync
by gvg＠svn.reactos.com 13 Jan '05

13 Jan '05

Small Wine sync Modified: trunk/reactos/lib/comctl32/datetime.c _____ Modified: trunk/reactos/lib/comctl32/datetime.c --- trunk/reactos/lib/comctl32/datetime.c 2005-01-13 08:45:23 UTC (rev 13024) +++ trunk/reactos/lib/comctl32/datetime.c 2005-01-13 09:28:58 UTC (rev 13025) @@ -1085,6 +1085,7 @@ uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } + return 0; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs