Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 33453: a "real" InterlockedExchangePointer wants PVOID* and nothing else.
by tkreuzer＠svn.reactos.org 11 May '08

11 May '08

Author: tkreuzer Date: Sun May 11 17:09:53 2008 New Revision: 33453 URL: http://svn.reactos.org/svn/reactos?rev=33453&view=rev Log: a "real" InterlockedExchangePointer wants PVOID* and nothing else. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun May 11 17:09:53 2008 @@ -467,7 +467,7 @@ Class->Next = BaseClass->Next; /* replace the base class */ - (void)InterlockedExchangePointer(ClassLink, + (void)InterlockedExchangePointer((PVOID*)ClassLink, Class); /* destroy the obsolete copy on the shared heap */ @@ -552,7 +552,7 @@ } /* link in the new base class */ - (void)InterlockedExchangePointer(BaseClassLink, + (void)InterlockedExchangePointer((PVOID*)BaseClassLink, Class); } @@ -620,7 +620,7 @@ ASSERT(CurrentClass == Class); - (void)InterlockedExchangePointer(PrevLink, + (void)InterlockedExchangePointer((PVOID*)PrevLink, Class->Next); ASSERT(Class->Base == BaseClass); @@ -658,7 +658,7 @@ NewClass->Base = NewClass; /* replace the class in the list */ - (void)InterlockedExchangePointer(*ClassLinkPtr, + (void)InterlockedExchangePointer((PVOID*)*ClassLinkPtr, NewClass); *ClassLinkPtr = &NewClass->Next; @@ -719,7 +719,7 @@ if (FreeOnFailure) { /* unlink the base class */ - (void)InterlockedExchangePointer(Link, + (void)InterlockedExchangePointer((PVOID*)Link, Class->Next); /* we can free the old base class now */ @@ -1191,7 +1191,7 @@ List = &pi->LocalClassList; Class->Next = *List; - (void)InterlockedExchangePointer(List, + (void)InterlockedExchangePointer((PVOID*)List, Class); Ret = Class->Atom; @@ -1850,7 +1850,7 @@ ASSERT(Class->System); Class->Next = pi->SystemClassList; - (void)InterlockedExchangePointer(&pi->SystemClassList, + (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, Class); } else

1 0

[tkreuzer] 33452: - a bunch of tests for NtUserEnumDisplaySettings - one test for NtGdiGetFontResourceInfoInternalW
by tkreuzer＠svn.reactos.org 11 May '08

11 May '08

Author: tkreuzer Date: Sun May 11 16:49:56 2008 New Revision: 33452 URL: http://svn.reactos.org/svn/reactos?rev=33452&view=rev Log: - a bunch of tests for NtUserEnumDisplaySettings - one test for NtGdiGetFontResourceInfoInternalW Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c (with props) trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c (with props) Modified: trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.rbuild Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c [iso-8859-1] Sun May 11 16:49:56 2008 @@ -1,0 +1,43 @@ + +INT +Test_NtGdiGetFontResourceInfoInternalW(PTESTINFO pti) +{ + WCHAR szFullFileName[MAX_PATH+1]; + BOOL bRet; + DWORD dwBufSize; + LOGFONTW logfont; + UNICODE_STRING NtFileName; + + GetCurrentDirectoryW(MAX_PATH, szFullFileName); + wcscat(szFullFileName, L"\\test.otf"); + + ASSERT(AddFontResourceW(szFullFileName) != 0); + + ASSERT(RtlDosPathNameToNtPathName_U(szFullFileName, + &NtFileName, + NULL, + NULL)); + + dwBufSize = sizeof(logfont); + memset(&logfont, 0x0, dwBufSize); + + bRet = NtGdiGetFontResourceInfoInternalW( + NtFileName.Buffer, + (NtFileName.Length / sizeof(WCHAR)) +1, + 1, + dwBufSize, + &dwBufSize, + &logfont, + 2); + + TEST(bRet != FALSE); + + printf("lfHeight = %ld\n", logfont.lfHeight); + printf("lfWidth = %ld\n", logfont.lfWidth); + printf("lfFaceName = %ls\n", logfont.lfFaceName); + + RemoveFontResourceW(szFullFileName); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetFontResourceInfoInternalW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c [iso-8859-1] Sun May 11 16:49:56 2008 @@ -1,0 +1,99 @@ + +static struct +{ + DEVMODEW devmode; + CHAR buffer[0xffff]; +} data; + +INT +TEST_NtUserEnumDisplaySettings(PTESTINFO pti) +{ + UNICODE_STRING usDeviceName; + WCHAR szName[] = L"DISPLAY"; + NTSTATUS Status; + INT i; + + SetLastError(ERROR_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 0, 0, 0); + TEST(Status == STATUS_ACCESS_VIOLATION); + TEST(GetLastError() == ERROR_SUCCESS); + + data.devmode.dmDriverExtra = 0; + for (i = 0; i < 2 * sizeof(DEVMODEW); i++) + { + data.devmode.dmSize = i; + Status = NtUserEnumDisplaySettings(NULL, 1000, (DEVMODEW*)&data, 0); + if (i != sizeof(DEVMODEW)) + { + TEST(Status == STATUS_BUFFER_TOO_SMALL); + } + } + TEST(GetLastError() == ERROR_SUCCESS); + + usDeviceName.Buffer = NULL; + usDeviceName.Length = 0; + usDeviceName.MaximumLength = 0; + Status = NtUserEnumDisplaySettings(&usDeviceName, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_BUFFER_TOO_SMALL); + Status = NtUserEnumDisplaySettings(&usDeviceName, -4, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_BUFFER_TOO_SMALL); + + data.devmode.dmSize = sizeof(DEVMODEW); + data.devmode.dmDriverExtra = 0xffff; + Status = NtUserEnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + + data.devmode.dmSize = sizeof(DEVMODEW); + data.devmode.dmDriverExtra = 0; + Status = NtUserEnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + + usDeviceName.Buffer = NULL; + usDeviceName.Length = 0; + usDeviceName.MaximumLength = 0; + Status = NtUserEnumDisplaySettings(&usDeviceName, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_1); + Status = NtUserEnumDisplaySettings(&usDeviceName, -4, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_1); + + Status = NtUserEnumDisplaySettings(NULL, 0, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 1, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 2, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 4, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 8, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + + Status = NtUserEnumDisplaySettings(NULL, 247, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, 248, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_2); + + Status = NtUserEnumDisplaySettings(NULL, -1, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, -2, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, -3, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_SUCCESS); + Status = NtUserEnumDisplaySettings(NULL, -4, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_2); + + Status = NtUserEnumDisplaySettings(&usDeviceName, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_1); + + usDeviceName.Buffer = szName; + usDeviceName.Length = wcslen(szName); + usDeviceName.MaximumLength = usDeviceName.Length; + Status = NtUserEnumDisplaySettings(&usDeviceName, ENUM_CURRENT_SETTINGS, (DEVMODEW*)&data, 0); + TEST(Status == STATUS_INVALID_PARAMETER_1); + + Status = NtUserEnumDisplaySettings(&usDeviceName, 1000, (DEVMODEW*)&data, 123456); + TEST(Status == STATUS_INVALID_PARAMETER_1); + + TEST(GetLastError() == ERROR_SUCCESS); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplaySettings.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Sun May 11 16:49:56 2008 @@ -15,6 +15,7 @@ //#include "ntgdi/NtGdiEnumFontChunk.c" #include "ntgdi/NtGdiEnumFontOpen.c" #include "ntgdi/NtGdiGetBitmapBits.c" +#include "ntgdi/NtGdiGetFontResourceInfoInternalW.c" #include "ntgdi/NtGdiGetRandomRgn.c" #include "ntgdi/NtGdiSelectBitmap.c" #include "ntgdi/NtGdiSelectBrush.c" @@ -34,6 +35,7 @@ #include "ntuser/NtUserCallOneParam.c" #include "ntuser/NtUserCountClipboardFormats.c" //#include "ntuser/NtUserCreateWindowEx.c" +#include "ntuser/NtUserEnumDisplaySettings.c" #include "ntuser/NtUserFindExistingCursorIcon.c" #include "ntuser/NtUserRedrawWindow.c" #include "ntuser/NtUserScrollDC.c" @@ -51,13 +53,14 @@ /* ntgdi */ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, { L"NtGdiBitBlt", Test_NtGdiBitBlt }, -{ L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, + { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiEngCreatePalette", Test_NtGdiEngCreatePalette }, // { L"NtGdiEnumFontChunk", Test_NtGdiEnumFontChunk }, { L"NtGdiEnumFontOpen", Test_NtGdiEnumFontOpen }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, + { L"NtGdiGetFontResourceInfoInternalW", Test_NtGdiGetFontResourceInfoInternalW }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, { L"NtGdiSelectBitmap", Test_NtGdiSelectBitmap }, @@ -78,6 +81,7 @@ { L"NtUserCallOneParam", Test_NtUserCallOneParam }, { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }, // { L"NtUserCreateWindowEx", Test_NtUserCreateWindowEx }, + { L"NtUserEnumDisplaySettings", TEST_NtUserEnumDisplaySettings }, { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, { L"NtUserRedrawWindow", Test_NtUserRedrawWindow }, { L"NtUserScrollDC", Test_NtUserScrollDC }, Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.rbuild [iso-8859-1] Sun May 11 16:49:56 2008 @@ -4,6 +4,7 @@ <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x501</define> <library>apitest</library> + <library>ntdll</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library>

1 0

[hpoussin] 33451: Add generic list scrolling See issue #3234 for more details.
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 16:32:00 2008 New Revision: 33451 URL: http://svn.reactos.org/svn/reactos?rev=33451&view=rev Log: Add generic list scrolling See issue #3234 for more details. Modified: trunk/reactos/base/setup/usetup/genlist.c 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 16:32:00 2008 @@ -46,6 +46,8 @@ { LIST_ENTRY ListHead; + PLIST_ENTRY FirstShown; + PLIST_ENTRY LastShown; SHORT Left; SHORT Top; SHORT Right; @@ -230,13 +232,14 @@ coPos.Y = GenericList->Top + 1; Width = GenericList->Right - GenericList->Left - 1; - Entry = GenericList->ListHead.Flink; + Entry = GenericList->FirstShown; while (Entry != &GenericList->ListHead) { ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); if (coPos.Y == GenericList->Bottom) break; + GenericList->LastShown = Entry; FillConsoleOutputAttribute (StdOutput, (GenericList->CurrentEntry == ListEntry) ? @@ -289,6 +292,7 @@ SHORT Right, SHORT Bottom) { + List->FirstShown = List->ListHead.Flink; List->Left = Left; List->Top = Top; List->Right = Right; @@ -314,6 +318,11 @@ if (List->CurrentEntry->Entry.Flink != &List->ListHead) { Entry = List->CurrentEntry->Entry.Flink; + if (List->LastShown == &List->CurrentEntry->Entry) + { + List->FirstShown = List->FirstShown->Flink; + List->LastShown = List->LastShown->Flink; + } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); } @@ -331,6 +340,11 @@ if (List->CurrentEntry->Entry.Blink != &List->ListHead) { Entry = List->CurrentEntry->Entry.Blink; + if (List->FirstShown == &List->CurrentEntry->Entry) + { + List->FirstShown = List->FirstShown->Blink; + List->LastShown = List->LastShown->Blink; + } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); }

1 0

[hpoussin] 33450: Better encapsulation of generic list
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 16:17:57 2008 New Revision: 33450 URL: http://svn.reactos.org/svn/reactos?rev=33450&view=rev Log: Better encapsulation of generic list Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/settings.c 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 16:17:57 2008 @@ -33,6 +33,28 @@ /* FUNCTIONS ****************************************************************/ +typedef struct _GENERIC_LIST_ENTRY +{ + LIST_ENTRY Entry; + PGENERIC_LIST List; + PVOID UserData; + CHAR Text[1]; +} GENERIC_LIST_ENTRY; + + +typedef struct _GENERIC_LIST +{ + LIST_ENTRY ListHead; + + SHORT Left; + SHORT Top; + SHORT Right; + SHORT Bottom; + + PGENERIC_LIST_ENTRY CurrentEntry; + PGENERIC_LIST_ENTRY BackupEntry; +} GENERIC_LIST; + PGENERIC_LIST CreateGenericList(VOID) { @@ -98,6 +120,7 @@ return FALSE; strcpy (Entry->Text, Text); + Entry->List = List; Entry->UserData = UserData; InsertTailList(&List->ListHead, @@ -313,6 +336,59 @@ } } + +VOID +SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry) +{ + if (Entry->List != List) + return; + List->CurrentEntry = Entry; +} + + +PGENERIC_LIST_ENTRY +GetCurrentListEntry(PGENERIC_LIST List) +{ + return List->CurrentEntry; +} + + +PGENERIC_LIST_ENTRY +GetFirstListEntry(PGENERIC_LIST List) +{ + PLIST_ENTRY Entry = List->ListHead.Flink; + + if (Entry == &List->ListHead) + return NULL; + return CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); +} + + +PGENERIC_LIST_ENTRY +GetNextListEntry(PGENERIC_LIST_ENTRY Entry) +{ + PLIST_ENTRY Next = Entry->Entry.Flink; + + if (Next == &Entry->List->ListHead) + return NULL; + return CONTAINING_RECORD(Next, GENERIC_LIST_ENTRY, Entry); +} + + +PVOID +GetListEntryUserData(PGENERIC_LIST_ENTRY List) +{ + return List->UserData; +} + + +LPCSTR +GetListEntryText(PGENERIC_LIST_ENTRY List) +{ + return List->Text; +} + + VOID GenericListKeyPress (PGENERIC_LIST GenericList, CHAR AsciChar) { @@ -355,12 +431,6 @@ DrawListEntries(GenericList); } -PGENERIC_LIST_ENTRY -GetGenericListEntry(PGENERIC_LIST List) -{ - return List->CurrentEntry; -} - VOID SaveGenericListState(PGENERIC_LIST List) 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 16:17:57 2008 @@ -27,28 +27,10 @@ #ifndef __GENLIST_H__ #define __GENLIST_H__ -typedef struct _GENERIC_LIST_ENTRY -{ - LIST_ENTRY Entry; - PVOID UserData; - CHAR Text[1]; -} GENERIC_LIST_ENTRY, *PGENERIC_LIST_ENTRY; - - -typedef struct _GENERIC_LIST -{ - LIST_ENTRY ListHead; - - SHORT Left; - SHORT Top; - SHORT Right; - SHORT Bottom; - - PGENERIC_LIST_ENTRY CurrentEntry; - PGENERIC_LIST_ENTRY BackupEntry; -} GENERIC_LIST, *PGENERIC_LIST; - - +struct _GENERIC_LIST_ENTRY; +typedef struct _GENERIC_LIST_ENTRY *PGENERIC_LIST_ENTRY; +struct _GENERIC_LIST; +typedef struct _GENERIC_LIST *PGENERIC_LIST; PGENERIC_LIST CreateGenericList(VOID); @@ -76,8 +58,23 @@ VOID ScrollUpGenericList(PGENERIC_LIST List); +VOID +SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry); + PGENERIC_LIST_ENTRY -GetGenericListEntry(PGENERIC_LIST List); +GetCurrentListEntry(PGENERIC_LIST List); + +PGENERIC_LIST_ENTRY +GetFirstListEntry(PGENERIC_LIST List); + +PGENERIC_LIST_ENTRY +GetNextListEntry(PGENERIC_LIST_ENTRY Entry); + +PVOID +GetListEntryUserData(PGENERIC_LIST_ENTRY List); + +LPCSTR +GetListEntryText(PGENERIC_LIST_ENTRY List); VOID SaveGenericListState(PGENERIC_LIST List); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun May 11 16:17:57 2008 @@ -563,7 +563,6 @@ VOID UpdateKBLayout(VOID) { - PLIST_ENTRY Entry; PGENERIC_LIST_ENTRY ListEntry; LPCWSTR pszNewLayout; @@ -574,22 +573,20 @@ LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); } - Entry = LayoutList->ListHead.Flink; + ListEntry = GetFirstListEntry(LayoutList); /* Search for default layout (if provided) */ if (pszNewLayout != NULL) { - while (Entry != &LayoutList->ListHead) - { - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - - if (!wcscmp(pszNewLayout, ListEntry->UserData)) - { - LayoutList->CurrentEntry = ListEntry; + while (ListEntry != NULL) + { + if (!wcscmp(pszNewLayout, GetListEntryUserData(ListEntry))) + { + SetCurrentListEntry(LayoutList, ListEntry); break; } - Entry = Entry->Flink; + ListEntry = GetNextListEntry(ListEntry); } } } @@ -647,7 +644,7 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; + SelectedLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); if (wcscmp(SelectedLanguageId, DefaultLanguage)) { @@ -1019,10 +1016,10 @@ MUIDisplayPage(DEVICE_SETTINGS_PAGE); - CONSOLE_SetTextXY(25, 11, GetGenericListEntry(ComputerList)->Text); - CONSOLE_SetTextXY(25, 12, GetGenericListEntry(DisplayList)->Text); - CONSOLE_SetTextXY(25, 13, GetGenericListEntry(KeyboardList)->Text); - CONSOLE_SetTextXY(25, 14, GetGenericListEntry(LayoutList)->Text); + CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry((ComputerList)))); + CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry((DisplayList)))); + CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry((KeyboardList)))); + CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry((LayoutList)))); CONSOLE_InvertTextXY(24, Line, 48, 1); Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sun May 11 16:17:57 2008 @@ -485,15 +485,15 @@ DPRINT("ProcessComputerFiles() called\n"); - Entry = GetGenericListEntry(List); + Entry = GetCurrentListEntry(List); if (Entry == NULL) { - DPRINT("GetGenericListEntry() failed\n"); + DPRINT("GetCurrentListEntry() failed\n"); return FALSE; } wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*) Entry->UserData); + wcscat(SectionName, (const wchar_t*)GetListEntryUserData(Entry)); *AdditionalSectionName = SectionName; return TRUE; @@ -514,14 +514,14 @@ DPRINT("ProcessDisplayRegistry() called\n"); - Entry = GetGenericListEntry(List); + Entry = GetCurrentListEntry(List); if (Entry == NULL) { - DPRINT("GetGenericListEntry() failed\n"); - return FALSE; - } - - if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*) Entry->UserData, &Context)) + DPRINT("GetCurrentListEntry() failed\n"); + return FALSE; + } + + if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*)GetListEntryUserData(Entry), &Context)) { DPRINT("SetupFindFirstLineW() failed\n"); return FALSE; @@ -629,11 +629,11 @@ HANDLE KeyHandle; NTSTATUS Status; - Entry = GetGenericListEntry(List); + Entry = GetCurrentListEntry(List); if (Entry == NULL) return FALSE; - LanguageId = (PWCHAR)Entry->UserData; + LanguageId = (PWCHAR)GetListEntryUserData(Entry); if (LanguageId == NULL) return FALSE; @@ -877,11 +877,11 @@ NTSTATUS Status; PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - Entry = GetGenericListEntry(List); + Entry = GetCurrentListEntry(List); if (Entry == NULL) return FALSE; - LanguageId = (PWCHAR)Entry->UserData; + LanguageId = (PWCHAR)GetListEntryUserData(Entry); if (LanguageId == NULL) return FALSE;

1 0

[navaraf] 33449: Fix incorrect parameters to IoSetDeviceToVerify/IoVerifyVolume. Spotted by R.T.Sivakumar <rtshiva@gmail.com>.
by navaraf＠svn.reactos.org 11 May '08

11 May '08

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))

1 0

[navaraf] 33448: Fix checking of return values from IoCreateDevice. Spotted by R.T.Sivakumar <rtshiva@gmail.com>.
by navaraf＠svn.reactos.org 11 May '08

11 May '08

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;

1 0

[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 11 May '08

11 May '08

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--)

1 0

[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 11 May '08

11 May '08

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" ); }

1 0

[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 11 May '08

11 May '08

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

1 0

[mpiulachs] 33444: - fix typo
by mpiulachs＠svn.reactos.org 11 May '08

11 May '08

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

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