Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[navaraf] 33449: Fix incorrect parameters to IoSetDeviceToVerify/IoVerifyVolume. Spotted by R.T.Sivakumar <rtshiva@gmail.com>.

by navaraf＠svn.reactos.org

Author: navaraf Date: Sun May 11 15:04:47 2008 New Revision: 33449 URL: http://svn.reactos.org/svn/reactos?rev=33449&view=rev Log: Fix incorrect parameters to IoSetDeviceToVerify/IoVerifyVolume. Spotted by R.T.Sivakumar <rtshiva(a)gmail.com>. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun May 11 15:04:47 2008 @@ -382,11 +382,10 @@ DPRINT ("Media change detected!\n"); DPRINT ("Device %p\n", DeviceExt->StorageDevice); + /* Find the device to verify and reset the thread field to empty value again. */ DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); - - IoSetDeviceToVerify (PsGetCurrentThread (), - NULL); - Status = IoVerifyVolume (DeviceExt->StorageDevice, + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, FALSE); } if (!NT_SUCCESS(Status))

16 years, 8 months

[navaraf] 33448: Fix checking of return values from IoCreateDevice. Spotted by R.T.Sivakumar <rtshiva@gmail.com>.

by navaraf＠svn.reactos.org

Author: navaraf Date: Sun May 11 14:47:50 2008 New Revision: 33448 URL: http://svn.reactos.org/svn/reactos?rev=33448&view=rev Log: Fix checking of return values from IoCreateDevice. Spotted by R.T.Sivakumar <rtshiva(a)gmail.com>. Modified: trunk/reactos/drivers/filesystems/fastfat/iface.c Modified: trunk/reactos/drivers/filesystems/fastfat/iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/iface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/iface.c [iso-8859-1] Sun May 11 14:47:50 2008 @@ -56,26 +56,28 @@ 0, FALSE, &DeviceObject); + + if (Status == STATUS_OBJECT_NAME_EXISTS || + Status == STATUS_OBJECT_NAME_COLLISION) + { + /* Try an other name, if 'Fat' is already in use. 'Fat' is also used by fastfat.sys on W2K */ + RtlInitUnicodeString(&DeviceName, L"\\RosFat"); + Status = IoCreateDevice(DriverObject, + sizeof(VFAT_GLOBAL_DATA), + &DeviceName, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &DeviceObject); + } + + + if (!NT_SUCCESS(Status)) { - if (Status == STATUS_OBJECT_NAME_EXISTS || - Status == STATUS_OBJECT_NAME_COLLISION) - { - /* Try an other name, if 'Fat' is already in use. 'Fat' is also used by fastfat.sys on W2K */ - RtlInitUnicodeString(&DeviceName, L"\\RosFat"); - Status = IoCreateDevice(DriverObject, - sizeof(VFAT_GLOBAL_DATA), - &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - return (Status); - } - } + return (Status); } + VfatGlobalData = DeviceObject->DeviceExtension; RtlZeroMemory (VfatGlobalData, sizeof(VFAT_GLOBAL_DATA)); VfatGlobalData->DriverObject = DriverObject;

16 years, 8 months

[navaraf] 33447: Fix wrong variable usage - "Filename" (8 characters long) of a directory entry was referenced instead of a "ShortName" (11 characters long). The actual bug was harmless since both arrays are defined in an union and lie at the same place in memory.

by navaraf＠svn.reactos.org

Author: navaraf Date: Sun May 11 13:57:07 2008 New Revision: 33447 URL: http://svn.reactos.org/svn/reactos?rev=33447&view=rev Log: Fix wrong variable usage - "Filename" (8 characters long) of a directory entry was referenced instead of a "ShortName" (11 characters long). The actual bug was harmless since both arrays are defined in an union and lie at the same place in memory. Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Sun May 11 13:57:07 2008 @@ -386,7 +386,7 @@ { pSlots[0].alias_checksum = (((pSlots[0].alias_checksum & 1) << 7 | ((pSlots[0].alias_checksum & 0xfe) >> 1)) - + DirContext.DirEntry.Fat.Filename[i]); + + DirContext.DirEntry.Fat.ShortName[i]); } /* construct slots and entry */ for (i = nbSlots - 2; i >= 0; i--)

16 years, 8 months

[cfinck] 33446: Robin Geuze (r DOT geuze AT chello DOT nl): - Add the correct Visual Studio version to the .sln file header, so that the Visual Studio Version Selector does not get confused. I slightly modified the patch to replace some following if's by else if's.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun May 11 13:30:36 2008 New Revision: 33446 URL: http://svn.reactos.org/svn/reactos?rev=33446&view=rev Log: Robin Geuze (r DOT geuze AT chello DOT nl): - Add the correct Visual Studio version to the .sln file header, so that the Visual Studio Version Selector does not get confused. I slightly modified the patch to replace some following if's by else if's. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h [iso-8859-1] Sun May 11 13:30:36 2008 @@ -114,6 +114,7 @@ std::string _strip_gcc_deffile(std::string Filename, std::string sourcedir, std::string objdir); std::string _get_solution_version ( void ); + std::string _get_studio_version ( void ); std::string _gen_guid(); std::string _replace_str( std::string string1, @@ -147,4 +148,3 @@ }; #endif // __MSVC_H__ - Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Sun May 11 13:30:36 2008 @@ -966,26 +966,49 @@ if (configuration.VSProjectVersion.empty()) configuration.VSProjectVersion = MS_VS_DEF_VERSION; - if (configuration.VSProjectVersion == "7.00") + else if (configuration.VSProjectVersion == "7.00") version = "7.00"; - if (configuration.VSProjectVersion == "7.10") + else if (configuration.VSProjectVersion == "7.10") version = "8.00"; - if (configuration.VSProjectVersion == "8.00") + else if (configuration.VSProjectVersion == "8.00") version = "9.00"; - if (configuration.VSProjectVersion == "9.00") + else if (configuration.VSProjectVersion == "9.00") version = "10.00"; return version; } +std::string +MSVCBackend::_get_studio_version ( void ) +{ + string version; + + if (configuration.VSProjectVersion.empty()) + configuration.VSProjectVersion = MS_VS_DEF_VERSION; + + else if (configuration.VSProjectVersion == "7.00") + version = "2002"; + + else if (configuration.VSProjectVersion == "7.10") + version = "2003"; + + else if (configuration.VSProjectVersion == "8.00") + version = "2005"; + + else if (configuration.VSProjectVersion == "9.00") + version = "2008"; + + return version; +} + void MSVCBackend::_generate_sln_header ( FILE* OUT ) { fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_version().c_str() ); - fprintf ( OUT, "# Visual Studio 2005\r\n" ); + fprintf ( OUT, "# Visual Studio %s\r\n", _get_studio_version().c_str() ); fprintf ( OUT, "\r\n" ); }

16 years, 8 months

[cfinck] 33445: - [FORMATTING] Fix indentation in usetup's genlist. - Remove the obsolete "media/vgafonts/readme.txt" file. No code changes

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun May 11 10:07:16 2008 New Revision: 33445 URL: http://svn.reactos.org/svn/reactos?rev=33445&view=rev Log: - [FORMATTING] Fix indentation in usetup's genlist. - Remove the obsolete "media/vgafonts/readme.txt" file. No code changes Removed: trunk/reactos/media/vgafonts/readme.txt Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Sun May 11 10:07:16 2008 @@ -36,263 +36,263 @@ PGENERIC_LIST CreateGenericList(VOID) { - PGENERIC_LIST List; - - List = (PGENERIC_LIST)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST)); - if (List == NULL) - return NULL; - - InitializeListHead(&List->ListHead); - - List->Left = 0; - List->Top = 0; - List->Right = 0; - List->Bottom = 0; - - List->CurrentEntry = NULL; - - return List; + PGENERIC_LIST List; + + List = (PGENERIC_LIST)RtlAllocateHeap(ProcessHeap, + 0, + sizeof(GENERIC_LIST)); + if (List == NULL) + return NULL; + + InitializeListHead(&List->ListHead); + + List->Left = 0; + List->Top = 0; + List->Right = 0; + List->Bottom = 0; + + List->CurrentEntry = NULL; + + return List; } VOID DestroyGenericList(PGENERIC_LIST List, - BOOLEAN FreeUserData) -{ - PGENERIC_LIST_ENTRY ListEntry; - PLIST_ENTRY Entry; - - /* Release list entries */ - while (!IsListEmpty (&List->ListHead)) - { - Entry = RemoveHeadList (&List->ListHead); - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - - /* Release user data */ - if (FreeUserData && ListEntry->UserData != NULL) - RtlFreeHeap (ProcessHeap, 0, ListEntry->UserData); - - /* Release list entry */ - RtlFreeHeap (ProcessHeap, 0, ListEntry); - } - - /* Release list head */ - RtlFreeHeap (ProcessHeap, 0, List); + BOOLEAN FreeUserData) +{ + PGENERIC_LIST_ENTRY ListEntry; + PLIST_ENTRY Entry; + + /* Release list entries */ + while (!IsListEmpty (&List->ListHead)) + { + Entry = RemoveHeadList (&List->ListHead); + ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + + /* Release user data */ + if (FreeUserData && ListEntry->UserData != NULL) + RtlFreeHeap (ProcessHeap, 0, ListEntry->UserData); + + /* Release list entry */ + RtlFreeHeap (ProcessHeap, 0, ListEntry); + } + + /* Release list head */ + RtlFreeHeap (ProcessHeap, 0, List); } BOOLEAN AppendGenericListEntry(PGENERIC_LIST List, - PCHAR Text, - PVOID UserData, - BOOLEAN Current) -{ - PGENERIC_LIST_ENTRY Entry; - - Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST_ENTRY) + strlen(Text)); - if (Entry == NULL) - return FALSE; - - strcpy (Entry->Text, Text); - Entry->UserData = UserData; - - InsertTailList(&List->ListHead, - &Entry->Entry); - - if (Current || List->CurrentEntry == NULL) - { - List->CurrentEntry = Entry; - } - - return TRUE; + PCHAR Text, + PVOID UserData, + BOOLEAN Current) +{ + PGENERIC_LIST_ENTRY Entry; + + Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, + 0, + sizeof(GENERIC_LIST_ENTRY) + strlen(Text)); + if (Entry == NULL) + return FALSE; + + strcpy (Entry->Text, Text); + Entry->UserData = UserData; + + InsertTailList(&List->ListHead, + &Entry->Entry); + + if (Current || List->CurrentEntry == NULL) + { + List->CurrentEntry = Entry; + } + + return TRUE; } static VOID DrawListFrame(PGENERIC_LIST GenericList) { - COORD coPos; - DWORD Written; - SHORT i; - - /* Draw upper left corner */ - coPos.X = GenericList->Left; - coPos.Y = GenericList->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xDA, // '+', - 1, - coPos, - &Written); - - /* Draw upper edge */ - coPos.X = GenericList->Left + 1; - coPos.Y = GenericList->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - GenericList->Right - GenericList->Left - 1, - coPos, - &Written); - - /* Draw upper right corner */ - coPos.X = GenericList->Right; - coPos.Y = GenericList->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xBF, // '+', - 1, - coPos, - &Written); - - /* Draw left and right edge */ - for (i = GenericList->Top + 1; i < GenericList->Bottom; i++) - { - coPos.X = GenericList->Left; - coPos.Y = i; - FillConsoleOutputCharacterA (StdOutput, - 0xB3, // '|', - 1, - coPos, - &Written); - - coPos.X = GenericList->Right; - FillConsoleOutputCharacterA (StdOutput, - 0xB3, //'|', - 1, - coPos, - &Written); - } - - /* Draw lower left corner */ - coPos.X = GenericList->Left; - coPos.Y = GenericList->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC0, // '+', - 1, - coPos, - &Written); - - /* Draw lower edge */ - coPos.X = GenericList->Left + 1; - coPos.Y = GenericList->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - GenericList->Right - GenericList->Left - 1, - coPos, - &Written); - - /* Draw lower right corner */ - coPos.X = GenericList->Right; - coPos.Y = GenericList->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xD9, // '+', - 1, - coPos, - &Written); + COORD coPos; + DWORD Written; + SHORT i; + + /* Draw upper left corner */ + coPos.X = GenericList->Left; + coPos.Y = GenericList->Top; + FillConsoleOutputCharacterA (StdOutput, + 0xDA, // '+', + 1, + coPos, + &Written); + + /* Draw upper edge */ + coPos.X = GenericList->Left + 1; + coPos.Y = GenericList->Top; + FillConsoleOutputCharacterA (StdOutput, + 0xC4, // '-', + GenericList->Right - GenericList->Left - 1, + coPos, + &Written); + + /* Draw upper right corner */ + coPos.X = GenericList->Right; + coPos.Y = GenericList->Top; + FillConsoleOutputCharacterA (StdOutput, + 0xBF, // '+', + 1, + coPos, + &Written); + + /* Draw left and right edge */ + for (i = GenericList->Top + 1; i < GenericList->Bottom; i++) + { + coPos.X = GenericList->Left; + coPos.Y = i; + FillConsoleOutputCharacterA (StdOutput, + 0xB3, // '|', + 1, + coPos, + &Written); + + coPos.X = GenericList->Right; + FillConsoleOutputCharacterA (StdOutput, + 0xB3, //'|', + 1, + coPos, + &Written); + } + + /* Draw lower left corner */ + coPos.X = GenericList->Left; + coPos.Y = GenericList->Bottom; + FillConsoleOutputCharacterA (StdOutput, + 0xC0, // '+', + 1, + coPos, + &Written); + + /* Draw lower edge */ + coPos.X = GenericList->Left + 1; + coPos.Y = GenericList->Bottom; + FillConsoleOutputCharacterA (StdOutput, + 0xC4, // '-', + GenericList->Right - GenericList->Left - 1, + coPos, + &Written); + + /* Draw lower right corner */ + coPos.X = GenericList->Right; + coPos.Y = GenericList->Bottom; + FillConsoleOutputCharacterA (StdOutput, + 0xD9, // '+', + 1, + coPos, + &Written); } static VOID DrawListEntries(PGENERIC_LIST GenericList) { - PGENERIC_LIST_ENTRY ListEntry; - PLIST_ENTRY Entry; - COORD coPos; - DWORD Written; - USHORT Width; - - coPos.X = GenericList->Left + 1; - coPos.Y = GenericList->Top + 1; - Width = GenericList->Right - GenericList->Left - 1; - - Entry = GenericList->ListHead.Flink; - while (Entry != &GenericList->ListHead) - { - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - - if (coPos.Y == GenericList->Bottom) - break; - - FillConsoleOutputAttribute (StdOutput, - (GenericList->CurrentEntry == ListEntry) ? - FOREGROUND_BLUE | BACKGROUND_WHITE : - FOREGROUND_WHITE | BACKGROUND_BLUE, - Width, - coPos, - &Written); - - FillConsoleOutputCharacterA (StdOutput, - ' ', - Width, - coPos, - &Written); - - coPos.X++; - WriteConsoleOutputCharacterA (StdOutput, - ListEntry->Text, - min (strlen(ListEntry->Text), (SIZE_T)Width - 2), - coPos, - &Written); - coPos.X--; - - coPos.Y++; - Entry = Entry->Flink; - } - - while (coPos.Y < GenericList->Bottom) - { - FillConsoleOutputAttribute (StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, - Width, - coPos, - &Written); - - FillConsoleOutputCharacterA (StdOutput, - ' ', - Width, - coPos, - &Written); - coPos.Y++; + PGENERIC_LIST_ENTRY ListEntry; + PLIST_ENTRY Entry; + COORD coPos; + DWORD Written; + USHORT Width; + + coPos.X = GenericList->Left + 1; + coPos.Y = GenericList->Top + 1; + Width = GenericList->Right - GenericList->Left - 1; + + Entry = GenericList->ListHead.Flink; + while (Entry != &GenericList->ListHead) + { + ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + + if (coPos.Y == GenericList->Bottom) + break; + + FillConsoleOutputAttribute (StdOutput, + (GenericList->CurrentEntry == ListEntry) ? + FOREGROUND_BLUE | BACKGROUND_WHITE : + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); + + FillConsoleOutputCharacterA (StdOutput, + ' ', + Width, + coPos, + &Written); + + coPos.X++; + WriteConsoleOutputCharacterA (StdOutput, + ListEntry->Text, + min (strlen(ListEntry->Text), (SIZE_T)Width - 2), + coPos, + &Written); + coPos.X--; + + coPos.Y++; + Entry = Entry->Flink; + } + + while (coPos.Y < GenericList->Bottom) + { + FillConsoleOutputAttribute (StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); + + FillConsoleOutputCharacterA (StdOutput, + ' ', + Width, + coPos, + &Written); + coPos.Y++; } } VOID DrawGenericList(PGENERIC_LIST List, - SHORT Left, - SHORT Top, - SHORT Right, - SHORT Bottom) -{ - List->Left = Left; - List->Top = Top; - List->Right = Right; - List->Bottom = Bottom; - - DrawListFrame(List); - - if (IsListEmpty(&List->ListHead)) - return; - - DrawListEntries(List); + SHORT Left, + SHORT Top, + SHORT Right, + SHORT Bottom) +{ + List->Left = Left; + List->Top = Top; + List->Right = Right; + List->Bottom = Bottom; + + DrawListFrame(List); + + if (IsListEmpty(&List->ListHead)) + return; + + DrawListEntries(List); } VOID ScrollDownGenericList (PGENERIC_LIST List) { - PLIST_ENTRY Entry; - - if (List->CurrentEntry == NULL) - return; - - if (List->CurrentEntry->Entry.Flink != &List->ListHead) - { - Entry = List->CurrentEntry->Entry.Flink; - List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - DrawListEntries(List); + PLIST_ENTRY Entry; + + if (List->CurrentEntry == NULL) + return; + + if (List->CurrentEntry->Entry.Flink != &List->ListHead) + { + Entry = List->CurrentEntry->Entry.Flink; + List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + DrawListEntries(List); } } @@ -300,74 +300,79 @@ VOID ScrollUpGenericList (PGENERIC_LIST List) { - PLIST_ENTRY Entry; - - if (List->CurrentEntry == NULL) - return; - - if (List->CurrentEntry->Entry.Blink != &List->ListHead) - { - Entry = List->CurrentEntry->Entry.Blink; - List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - DrawListEntries(List); + PLIST_ENTRY Entry; + + if (List->CurrentEntry == NULL) + return; + + if (List->CurrentEntry->Entry.Blink != &List->ListHead) + { + Entry = List->CurrentEntry->Entry.Blink; + List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + DrawListEntries(List); } } VOID GenericListKeyPress (PGENERIC_LIST GenericList, CHAR AsciChar) { - PGENERIC_LIST_ENTRY ListEntry; - PLIST_ENTRY Entry; - - Entry = &GenericList->CurrentEntry->Entry; - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + PGENERIC_LIST_ENTRY ListEntry; + PLIST_ENTRY Entry; + + Entry = &GenericList->CurrentEntry->Entry; + ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); Reset: - if (tolower(ListEntry->Text[0]) != AsciChar) - Entry = GenericList->ListHead.Flink; - - while (Entry != &GenericList->ListHead) - { - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciChar)) + if (tolower(ListEntry->Text[0]) != AsciChar) + Entry = GenericList->ListHead.Flink; + + while (Entry != &GenericList->ListHead) + { + ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + + if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciChar)) { - if (CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry) == GenericList->CurrentEntry) + if (CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry) == GenericList->CurrentEntry) { - Entry = Entry->Flink; - if (Entry == &GenericList->ListHead) - goto Reset; - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - if ((strlen(ListEntry->Text) < 1) || (tolower(ListEntry->Text[0]) != AsciChar)) - goto Reset; + Entry = Entry->Flink; + if (Entry == &GenericList->ListHead) + goto Reset; + + ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + if ((strlen(ListEntry->Text) < 1) || (tolower(ListEntry->Text[0]) != AsciChar)) + goto Reset; } - GenericList->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - break; + + GenericList->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + break; } - Entry = Entry->Flink; - } - if (Entry) - DrawListEntries(GenericList); + + Entry = Entry->Flink; + } + + if (Entry) + DrawListEntries(GenericList); } PGENERIC_LIST_ENTRY GetGenericListEntry(PGENERIC_LIST List) { - return List->CurrentEntry; + return List->CurrentEntry; } VOID SaveGenericListState(PGENERIC_LIST List) { - List->BackupEntry = List->CurrentEntry; + List->BackupEntry = List->CurrentEntry; } VOID RestoreGenericListState(PGENERIC_LIST List) { - List->CurrentEntry = List->BackupEntry; + List->CurrentEntry = List->BackupEntry; } /* EOF */ Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Sun May 11 10:07:16 2008 @@ -29,23 +29,23 @@ typedef struct _GENERIC_LIST_ENTRY { - LIST_ENTRY Entry; - PVOID UserData; - CHAR Text[1]; + LIST_ENTRY Entry; + PVOID UserData; + CHAR Text[1]; } GENERIC_LIST_ENTRY, *PGENERIC_LIST_ENTRY; typedef struct _GENERIC_LIST { - LIST_ENTRY ListHead; + LIST_ENTRY ListHead; - SHORT Left; - SHORT Top; - SHORT Right; - SHORT Bottom; + SHORT Left; + SHORT Top; + SHORT Right; + SHORT Bottom; - PGENERIC_LIST_ENTRY CurrentEntry; - PGENERIC_LIST_ENTRY BackupEntry; + PGENERIC_LIST_ENTRY CurrentEntry; + PGENERIC_LIST_ENTRY BackupEntry; } GENERIC_LIST, *PGENERIC_LIST; @@ -55,20 +55,20 @@ VOID DestroyGenericList(PGENERIC_LIST List, - BOOLEAN FreeUserData); + BOOLEAN FreeUserData); BOOLEAN AppendGenericListEntry(PGENERIC_LIST List, - PCHAR Text, - PVOID UserData, - BOOLEAN Current); + PCHAR Text, + PVOID UserData, + BOOLEAN Current); VOID DrawGenericList(PGENERIC_LIST List, - SHORT Left, - SHORT Top, - SHORT Right, - SHORT Bottom); + SHORT Left, + SHORT Top, + SHORT Right, + SHORT Bottom); VOID ScrollDownGenericList(PGENERIC_LIST List); Removed: trunk/reactos/media/vgafonts/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/readme.txt?… ============================================================================== --- trunk/reactos/media/vgafonts/readme.txt [iso-8859-1] (original) +++ trunk/reactos/media/vgafonts/readme.txt (removed) @@ -1,15 +1,0 @@ -Until a better solution is found (like extending cabman) please recreate vgafont.bin -with 7-Zip or a similar compression tool. The file has to be in standard zip format without -compression. (CompressionMethod = 0) - -sources: - -http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp437-8x8.fnt -http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp850-8x8.fnt -http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp865-8x8.fnt -http://opengrok.creo.hu/dragonfly/xref/src/share/syscons/fonts/cp866-8x8.fnt -http://packages.debian.org/en/etch/all/console-data/ file: gr737-8x8.psf -http://packages.debian.org/en/etch/all/console-data/ file: lat2-08.psf (as a base), remade several - glyphs (by GreatLord), corrected the aligning and cleaned up some of the fonts, finally changed from - ISO to DOS ASCII standard CP852 (by Caemyr) -http://cman.us/files/cp775-8x8.zip

16 years, 8 months

[mpiulachs] 33444: - fix typo

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Sun May 11 10:05:19 2008 New Revision: 33444 URL: http://svn.reactos.org/svn/reactos?rev=33444&view=rev Log: - fix typo Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=334… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sun May 11 10:05:19 2008 @@ -147,7 +147,7 @@ <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> <property name="BASEADDRESS_OLEAUT32" value="0x76e00000" /> <property name="BASEADDRESS_TAPI32" value="0x76e60000" /> - <property name="BASEADDRESS_RASMAN" value="0x76e90000h" /> + <property name="BASEADDRESS_RASMAN" value="0x76e90000" /> <property name="BASEADDRESS_RASAPI32" value="0x76ee0000" /> <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> <property name="BASEADDRESS_MSVFW32" value="0x76f60000" />

16 years, 8 months

[pschweitzer] 33443: Synced urlmon.dll with Wine HEAD. This *does not* fix Downloader

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 11 08:57:45 2008 New Revision: 33443 URL: http://svn.reactos.org/svn/reactos?rev=33443&view=rev Log: Synced urlmon.dll with Wine HEAD. This *does not* fix Downloader Modified: trunk/reactos/dll/win32/urlmon/file.c trunk/reactos/dll/win32/urlmon/internet.c trunk/reactos/dll/win32/urlmon/urlmon.spec trunk/reactos/include/psdk/urlmon.idl Modified: trunk/reactos/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] Sun May 11 08:57:45 2008 @@ -99,8 +99,7 @@ DWORD grfBINDF = 0; LARGE_INTEGER size; DWORD len; - LPWSTR url, mime = NULL; - LPCWSTR file_name; + LPWSTR url, mime = NULL, file_name; WCHAR null_char = 0; BOOL first_call = FALSE; HRESULT hres; @@ -136,6 +135,8 @@ IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); if(!This->file) { + WCHAR *ptr; + first_call = TRUE; IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); @@ -145,6 +146,13 @@ file_name += 2; if(*file_name == '/') file_name++; + + for(ptr = file_name; *ptr; ptr++) { + if(*ptr == '?' || *ptr == '#') { + *ptr = 0; + break; + } + } This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); Modified: trunk/reactos/dll/win32/urlmon/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/internet.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/internet.c [iso-8859-1] Sun May 11 08:57:45 2008 @@ -298,3 +298,12 @@ return S_OK; } + +/*********************************************************************** + * CoInternetSetFeatureEnabled (URLMON.@) + */ +HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST feature, DWORD flags, BOOL enable) +{ + FIXME("%d, 0x%08x, %x, stub\n", feature, flags, enable); + return E_NOTIMPL; +} Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Sun May 11 08:57:45 2008 @@ -19,6 +19,7 @@ @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) +@ stdcall CoInternetSetFeatureEnabled(long long long) @ stub CompareSecurityIds @ stub CopyBindInfo @ stdcall CopyStgMedium(ptr ptr) Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… ============================================================================== --- trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] Sun May 11 08:57:45 2008 @@ -1325,6 +1325,43 @@ [in] LPCODEBASEHOLD lpcbh); } +typedef enum _tagINTERNETFEATURELIST +{ + FEATURE_OBJECT_CACHING, + FEATURE_ZONE_ELEVATION, + FEATURE_MIME_HANDLING, + FEATURE_MIME_SNIFFING, + FEATURE_WINDOW_RESTRICTIONS, + FEATURE_WEBOC_POPUPMANAGEMENT, + FEATURE_BEHAVIORS, + FEATURE_DISABLE_MK_PROTOCOL, + FEATURE_LOCALMACHINE_LOCKDOWN, + FEATURE_SECURITYBAND, + FEATURE_RESTRICT_ACTIVEXINSTALL, + FEATURE_VALIDATE_NAVIGATE_URL, + FEATURE_RESTRICT_FILEDOWNLOAD, + FEATURE_ADDON_MANAGEMENT, + FEATURE_PROTOCOL_LOCKDOWN, + FEATURE_HTTP_USERNAME_PASSWORD_DISABLE, + FEATURE_SAFE_BINDTOOBJECT, + FEATURE_UNC_SAVEDFILECHECK, + FEATURE_GET_URL_DOM_FILEPATH_UNENCODED, + FEATURE_TABBED_BROWSING, + FEATURE_SSLUX, + FEATURE_DISABLE_NAVIGATION_SOUNDS, + FEATURE_DISABLE_LEGACY_COMPRESSION, + FEATURE_FORCE_ADDR_AND_STATUS, + FEATURE_XMLHTTP, + FEATURE_DISABLE_TELNET_PROTOCOL, + FEATURE_FEEDS, + FEATURE_BLOCK_INPUT_PROMPTS, + FEATURE_DOMSTORAGE, + FEATURE_XDOMAINREQUEST, + FEATURE_DATAURI, + FEATURE_AJAX_CONNECTIONSERVICES, + FEATURE_ENTRY_COUNT +} INTERNETFEATURELIST; + cpp_quote("DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4);") cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4);") cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") @@ -1391,6 +1428,7 @@ cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);") cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

16 years, 8 months

[gbrunmar] 33442: Made 17 listbox winetests pass in user32.dll (some of the changes were taken from wine)

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun May 11 08:46:47 2008 New Revision: 33442 URL: http://svn.reactos.org/svn/reactos?rev=33442&view=rev Log: Made 17 listbox winetests pass in user32.dll (some of the changes were taken from wine) Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sun May 11 08:46:47 2008 @@ -1879,13 +1879,14 @@ LRESULT ret = LB_OKAY; WIN32_FIND_DATAW entry; int pos; + LRESULT maxinsert = LB_ERR; /* don't scan directory if we just want drives exclusively */ if (attrib != (DDL_DRIVES | DDL_EXCLUSIVE)) { /* scan directory */ if ((handle = FindFirstFileW(filespec, &entry)) == INVALID_HANDLE_VALUE) { - int le = GetLastError(); + int le = GetLastError(); if ((le != ERROR_NO_MORE_FILES) && (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; } else @@ -1909,7 +1910,8 @@ else /* not a directory */ { #define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \ - FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE) + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE | \ + FILE_ATTRIBUTE_DIRECTORY) if ((attrib & DDL_EXCLUSIVE) && ((attrib & ATTRIBS) != (entry.dwFileAttributes & ATTRIBS))) @@ -1924,22 +1926,33 @@ pos = LISTBOX_FindFileStrPos( descr, buffer ); if ((ret = LISTBOX_InsertString( descr, pos, buffer )) < 0) break; + + if (ret <= maxinsert) + maxinsert++; + else + maxinsert = ret; + } while (FindNextFileW( handle, &entry )); FindClose( handle ); } } - /* scan drives */ - if ((ret >= 0) && (attrib & DDL_DRIVES)) - { - WCHAR buffer[] = {'[','-','a','-',']',0}; - WCHAR root[] = {'A',':','\\',0}; - int drive; - for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++) - { - if (GetDriveTypeW(root) <= DRIVE_NO_ROOT_DIR) continue; - if ((ret = LISTBOX_InsertString( descr, -1, buffer )) < 0) - break; + if (ret >= 0) + { + ret = maxinsert; + + /* scan drives */ + if (attrib & DDL_DRIVES) + { + WCHAR buffer[] = {'[','-','a','-',']',0}; + WCHAR root[] = {'A',':','\\',0}; + int drive; + for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++) + { + if (GetDriveTypeW(root) <= DRIVE_NO_ROOT_DIR) continue; + if ((ret = LISTBOX_InsertString( descr, -1, buffer )) < 0) + break; + } } } return ret;

16 years, 8 months

[pschweitzer] 33441: No need for a shortcut to kbswitch.exe on the desktop

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 11 08:11:30 2008 New Revision: 33441 URL: http://svn.reactos.org/svn/reactos?rev=33441&view=rev Log: No need for a shortcut to kbswitch.exe on the desktop Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun May 11 08:11:30 2008 @@ -741,7 +741,6 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); - CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, FALSE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE);

16 years, 8 months

[cfinck] 33440: Recreate the branch from /reactos

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun May 11 07:40:10 2008 New Revision: 33440 URL: http://svn.reactos.org/svn/reactos?rev=33440&view=rev Log: Recreate the branch from /reactos Added: branches/win32k-gdi-dx/ - copied from r33439, trunk/reactos/

16 years, 8 months

← Newer
1
...
32
33
34
35
36
37
38
...
59
Older →

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 May 2008