Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-03 08:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]

Browse source 
Get rid of the ugly LIST_FOR_EACH macro.

svn path=/trunk/; revision=54507
This commit is contained in:
Eric Kohl 2011-11-27 12:00:34 +00:00
parent 2e001db9ee
commit 83bf20450a
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/base/setup/usetup/partlist.c
View file

@ -1281,6 +1281,7 @@ PrintDiskData (PPARTLIST List,
PDISKENTRY DiskEntry) PDISKENTRY DiskEntry)
{ {
PPARTENTRY PartEntry; PPARTENTRY PartEntry;
PLIST_ENTRY Entry;
CHAR LineBuffer[128]; CHAR LineBuffer[128];
COORD coPos; COORD coPos;
DWORD Written; DWORD Written;
@ -1365,8 +1366,11 @@ PrintDiskData (PPARTLIST List,
PrintEmptyLine (List); PrintEmptyLine (List);
/* Print partition lines*/ /* Print partition lines*/
LIST_FOR_EACH(PartEntry, &DiskEntry->PartListHead, PARTENTRY, ListEntry) Entry = DiskEntry->PartListHead.Flink;
while (Entry != &DiskEntry->PartListHead)
{ {
PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
/* Print disk entry */ /* Print disk entry */
for (i=0; i<4; i++) for (i=0; i<4; i++)
{ {
@ -1389,6 +1393,7 @@ PrintDiskData (PPARTLIST List,
0); 0);
} }
Entry = Entry->Flink;
} }
/* Print separator line */ /* Print separator line */
@ -1596,11 +1601,16 @@ DrawPartitionList (PPARTLIST List)
/* print list entries */ /* print list entries */
List->Line = - List->Offset; List->Line = - List->Offset;
LIST_FOR_EACH(DiskEntry, &List->DiskListHead, DISKENTRY, ListEntry) Entry = List->DiskListHead.Flink;
while (Entry != &List->DiskListHead)
{ {
DiskEntry = CONTAINING_RECORD (Entry, DISKENTRY, ListEntry);
/* Print disk entry */ /* Print disk entry */
PrintDiskData (List, PrintDiskData (List,
DiskEntry); DiskEntry);
Entry = Entry->Flink;
} }
} }

5
reactos/base/setup/usetup/usetup.h
View file

@ -167,11 +167,6 @@ typedef enum _PAGE_NUMBER
#define POPUP_WAIT_ANY_KEY 1 #define POPUP_WAIT_ANY_KEY 1
#define POPUP_WAIT_ENTER 2 #define POPUP_WAIT_ENTER 2
#define LIST_FOR_EACH(elem, list, type, field) \
for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \
&(elem)->field != (list) || (elem == NULL); \
(elem) = CONTAINING_RECORD((elem)->field.Flink, type, field))
#define InsertAscendingList(ListHead, NewEntry, Type, ListEntryField, SortField)\ #define InsertAscendingList(ListHead, NewEntry, Type, ListEntryField, SortField)\
{\ {\
PLIST_ENTRY current;\ PLIST_ENTRY current;\