Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 54510: - Fix GetNCHitEx rects.
by jimtabor＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: jimtabor Date: Sun Nov 27 13:29:15 2011 New Revision: 54510 URL: http://svn.reactos.org/svn/reactos?rev=54510&view=rev Log: - Fix GetNCHitEx rects. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Sun Nov 27 13:29:15 2011 @@ -295,11 +295,20 @@ if (!pWnd) return HTNOWHERE; - rcClient.left = rcClient.top = rcWindow.left = rcWindow.top = 0; - rcWindow.right = pWnd->rcWindow.right; - rcWindow.bottom = pWnd->rcWindow.bottom; - rcClient.right = pWnd->rcClient.right; - rcClient.bottom = pWnd->rcClient.bottom; + if (pWnd == UserGetDesktopWindow())//pWnd->fnid == FNID_DESKTOP) + { + rcClient.left = rcClient.top = rcWindow.left = rcWindow.top = 0; + rcWindow.right = UserGetSystemMetrics(SM_CXSCREEN); + rcWindow.bottom = UserGetSystemMetrics(SM_CYSCREEN); + rcClient.right = UserGetSystemMetrics(SM_CXSCREEN); + rcClient.bottom = UserGetSystemMetrics(SM_CYSCREEN); + } + else + { + IntGetClientRect(pWnd, &rcClient); // This or + //rcClient = pWnd->rcClient; // this one? + rcWindow = pWnd->rcWindow; + } if (!RECTL_bPointInRect(&rcWindow, pt.x, pt.y)) return HTNOWHERE;

1 0

[jimtabor] 54509: - Add window placement flag for async message mode. Yes we support this too now.
by jimtabor＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: jimtabor Date: Sun Nov 27 12:58:01 2011 New Revision: 54509 URL: http://svn.reactos.org/svn/reactos?rev=54509&view=rev Log: - Add window placement flag for async message mode. Yes we support this too now. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Nov 27 12:58:01 2011 @@ -2451,6 +2451,9 @@ #define IDANI_CAPTION 3 #define WPF_RESTORETOMAXIMIZED 2 #define WPF_SETMINPOSITION 1 +#if(_WIN32_WINNT >= 0x0500) +#define WPF_ASYNCWINDOWPLACEMENT 4 +#endif #define ODT_MENU 1 #define ODT_LISTBOX 2 #define ODT_COMBOBOX 3

1 0

[jimtabor] 54508: [Win32k] - Create Monitor from rect. This will be used for window placement support.
by jimtabor＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: jimtabor Date: Sun Nov 27 12:47:43 2011 New Revision: 54508 URL: http://svn.reactos.org/svn/reactos?rev=54508&view=rev Log: [Win32k] - Create Monitor from rect. This will be used for window placement support. Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Sun Nov 27 12:47:43 2011 @@ -33,5 +33,6 @@ NTSTATUS IntUpdateMonitorSize(IN PDEVOBJ *pGdiDevice); PMONITOR FASTCALL UserGetMonitorObject(IN HMONITOR); PMONITOR FASTCALL IntGetPrimaryMonitor(VOID); +PMONITOR FASTCALL IntMonitorFromRect(PRECTL,DWORD); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Sun Nov 27 12:47:43 2011 @@ -402,6 +402,83 @@ return cMonitors; } + +PMONITOR +FASTCALL +IntMonitorFromRect( + PRECTL pRect, + DWORD dwFlags) +{ + ULONG cMonitors, LargestArea = 0, i; + PRECTL prcMonitorList = NULL; + HMONITOR *phMonitorList = NULL; + HMONITOR hMonitor = NULL; + + /* Check if flags are valid */ + if (dwFlags != MONITOR_DEFAULTTONULL && + dwFlags != MONITOR_DEFAULTTOPRIMARY && + dwFlags != MONITOR_DEFAULTTONEAREST) + { + EngSetLastError(ERROR_INVALID_FLAGS); + return NULL; + } + + /* Find intersecting monitors */ + cMonitors = IntGetMonitorsFromRect(pRect, &hMonitor, NULL, 1, dwFlags); + if (cMonitors <= 1) + { + /* No or one monitor found. Just return handle. */ + goto cleanup; + } + + /* There is more than one monitor. Find monitor with largest intersection. + Temporary reset hMonitor */ + hMonitor = NULL; + + /* Allocate helper buffers */ + phMonitorList = ExAllocatePoolWithTag(PagedPool, + sizeof(HMONITOR) * cMonitors, + USERTAG_MONITORRECTS); + if (phMonitorList == NULL) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + prcMonitorList = ExAllocatePoolWithTag(PagedPool, + sizeof(RECT) * cMonitors, + USERTAG_MONITORRECTS); + if (prcMonitorList == NULL) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + /* Get intersecting monitors again but now with rectangle list */ + cMonitors = IntGetMonitorsFromRect(pRect, phMonitorList, prcMonitorList, + cMonitors, 0); + + /* Find largest intersection */ + for (i = 0; i < cMonitors; i++) + { + ULONG Area = (prcMonitorList[i].right - prcMonitorList[i].left) * + (prcMonitorList[i].bottom - prcMonitorList[i].top); + if (Area >= LargestArea) + { + hMonitor = phMonitorList[i]; + LargestArea = Area; + } + } + +cleanup: + if (phMonitorList) + ExFreePoolWithTag(phMonitorList, USERTAG_MONITORRECTS); + if (prcMonitorList) + ExFreePoolWithTag(prcMonitorList, USERTAG_MONITORRECTS); + + return UserGetMonitorObject(hMonitor); +} + /* PUBLIC FUNCTIONS ***********************************************************/

1 0

[ekohl] 54507: [USETUP] Get rid of the ugly LIST_FOR_EACH macro.
by ekohl＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: ekohl Date: Sun Nov 27 12:00:34 2011 New Revision: 54507 URL: http://svn.reactos.org/svn/reactos?rev=54507&view=rev Log: [USETUP] Get rid of the ugly LIST_FOR_EACH macro. Modified: trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Nov 27 12:00:34 2011 @@ -1281,6 +1281,7 @@ PDISKENTRY DiskEntry) { PPARTENTRY PartEntry; + PLIST_ENTRY Entry; CHAR LineBuffer[128]; COORD coPos; DWORD Written; @@ -1365,8 +1366,11 @@ PrintEmptyLine (List); /* 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 */ for (i=0; i<4; i++) { @@ -1389,6 +1393,7 @@ 0); } + Entry = Entry->Flink; } /* Print separator line */ @@ -1596,11 +1601,16 @@ /* print list entries */ 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 */ PrintDiskData (List, DiskEntry); + + Entry = Entry->Flink; } } Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Nov 27 12:00:34 2011 @@ -167,11 +167,6 @@ #define POPUP_WAIT_ANY_KEY 1 #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)\ {\ PLIST_ENTRY current;\

1 0

[ekohl] 54506: [TCPVCS] - Report service status upon an interrogate request. - Set the wait hint to a non-zero value.
by ekohl＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: ekohl Date: Sun Nov 27 10:55:45 2011 New Revision: 54506 URL: http://svn.reactos.org/svn/reactos?rev=54506&view=rev Log: [TCPVCS] - Report service status upon an interrogate request. - Set the wait hint to a non-zero value. Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] Sun Nov 27 10:55:45 2011 @@ -135,7 +135,7 @@ LogEvent(L"\nSetting the service to SERVICE_STOP_PENDING", 0, 0, LOG_FILE); InterlockedExchange((LONG *)&bShutdown, TRUE); pServInfo->servStatus.dwWin32ExitCode = 0; - pServInfo->servStatus.dwWaitHint = 0; + pServInfo->servStatus.dwWaitHint = 5000; UpdateStatus(pServInfo, SERVICE_STOP_PENDING, 1); break; @@ -152,6 +152,7 @@ break; case SERVICE_CONTROL_INTERROGATE: + SetServiceStatus(pServInfo->hStatus, &pServInfo->servStatus); break; default:

1 0

[ekohl] 54505: [FREELDR] PcDiskGetDriveGeometry: Try to retrieve the extended disk geometry first.
by ekohl＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: ekohl Date: Sun Nov 27 10:00:24 2011 New Revision: 54505 URL: http://svn.reactos.org/svn/reactos?rev=54505&view=rev Log: [FREELDR] PcDiskGetDriveGeometry: Try to retrieve the extended disk geometry first. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sun Nov 27 10:00:24 2011 @@ -302,11 +302,24 @@ BOOLEAN PcDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) { + EXTENDED_GEOMETRY ExtGeometry; REGS RegsIn; REGS RegsOut; ULONG Cylinders; TRACE("DiskGetDriveGeometry()\n"); + + /* Try to get the extended geometry first */ + ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); + if (DiskGetExtendedDriveParameters(DriveNumber, &ExtGeometry, ExtGeometry.Size)) + { + Geometry->Cylinders = ExtGeometry.Cylinders; + Geometry->Heads = ExtGeometry.Heads; + Geometry->Sectors = ExtGeometry.SectorsPerTrack; + Geometry->BytesPerSector = ExtGeometry.BytesPerSector; + + return TRUE; + } /* BIOS Int 13h, function 08h - Get drive parameters * AH = 08h

1 0

[dgorbachev] 54504: [USETUP] Load the font before displaying the Language Page.
by dgorbachev＠svn.reactos.org 26 Nov '11

26 Nov '11

Author: dgorbachev Date: Sat Nov 26 22:23:34 2011 New Revision: 54504 URL: http://svn.reactos.org/svn/reactos?rev=54504&view=rev Log: [USETUP] Load the font before displaying the Language Page. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c 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] Sat Nov 26 22:23:34 2011 @@ -623,6 +623,10 @@ } } + /* Load the font */ + SelectedLanguageId = DefaultLanguage; + SetConsoleCodePage(); + DrawGenericList(LanguageList, 2, 18,

1 0

[dgorbachev] 54503: [NTOSKRNL] KDB: print more useful backtrace after double fault or NMI.
by dgorbachev＠svn.reactos.org 26 Nov '11

26 Nov '11

Author: dgorbachev Date: Sat Nov 26 22:23:00 2011 New Revision: 54503 URL: http://svn.reactos.org/svn/reactos?rev=54503&view=rev Log: [NTOSKRNL] KDB: print more useful backtrace after double fault or NMI. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sat Nov 26 22:23:00 2011 @@ -948,6 +948,86 @@ return TRUE; } +static BOOLEAN +KdbpTrapFrameFromPrevTss( + PKTRAP_FRAME TrapFrame) +{ + ULONG_PTR Eip, Ebp; + KDESCRIPTOR Gdtr; + KGDTENTRY Desc; + USHORT Sel; + PKTSS Tss; + + Ke386GetGlobalDescriptorTable(&Gdtr.Limit); + Sel = Ke386GetTr(); + + if ((Sel & (sizeof(KGDTENTRY) - 1)) || + (Sel < sizeof(KGDTENTRY)) || + (Sel + sizeof(KGDTENTRY) - 1 > Gdtr.Limit)) + return FALSE; + + if (!NT_SUCCESS(KdbpSafeReadMemory(&Desc, + (PVOID)(Gdtr.Base + Sel), + sizeof(KGDTENTRY)))) + return FALSE; + + if (Desc.HighWord.Bits.Type != 0xB) + return FALSE; + + Tss = (PKTSS)(ULONG_PTR)(Desc.BaseLow | + Desc.HighWord.Bytes.BaseMid << 16 | + Desc.HighWord.Bytes.BaseHi << 24); + + if (!NT_SUCCESS(KdbpSafeReadMemory(&Sel, + (PVOID)&Tss->Backlink, + sizeof(USHORT)))) + return FALSE; + + if ((Sel & (sizeof(KGDTENTRY) - 1)) || + (Sel < sizeof(KGDTENTRY)) || + (Sel + sizeof(KGDTENTRY) - 1 > Gdtr.Limit)) + return FALSE; + + if (!NT_SUCCESS(KdbpSafeReadMemory(&Desc, + (PVOID)(Gdtr.Base + Sel), + sizeof(KGDTENTRY)))) + return FALSE; + + if (Desc.HighWord.Bits.Type != 0xB) + return FALSE; + + Tss = (PKTSS)(ULONG_PTR)(Desc.BaseLow | + Desc.HighWord.Bytes.BaseMid << 16 | + Desc.HighWord.Bytes.BaseHi << 24); + + if (!NT_SUCCESS(KdbpSafeReadMemory(&Eip, + (PVOID)&Tss->Eip, + sizeof(ULONG_PTR)))) + return FALSE; + + if (!NT_SUCCESS(KdbpSafeReadMemory(&Ebp, + (PVOID)&Tss->Ebp, + sizeof(ULONG_PTR)))) + return FALSE; + + TrapFrame->Eip = Eip; + TrapFrame->Ebp = Ebp; + return TRUE; +} + +VOID __cdecl KiTrap02(VOID); +VOID FASTCALL KiTrap03Handler(IN PKTRAP_FRAME); +VOID __cdecl KiTrap08(VOID); +VOID __cdecl KiTrap09(VOID); + +static BOOLEAN +KdbpInNmiOrDoubleFaultHandler( + ULONG_PTR Address) +{ + return (Address > (ULONG_PTR)KiTrap02 && Address < (ULONG_PTR)KiTrap03Handler) || + (Address > (ULONG_PTR)KiTrap08 && Address < (ULONG_PTR)KiTrap09); +} + /*!\brief Displays a backtrace. */ static BOOLEAN @@ -1054,6 +1134,20 @@ if (Address == 0) break; + + if (KdbpInNmiOrDoubleFaultHandler(Address)) + { + if ((GotNextFrame = KdbpTrapFrameFromPrevTss(&TrapFrame))) + { + Address = TrapFrame.Eip; + Frame = TrapFrame.Ebp; + + if (!KdbSymPrintAddress((PVOID)Address, &TrapFrame)) + KdbpPrint("<%08x>\n", Address); + else + KdbpPrint("\n"); + } + } if (!GotNextFrame) {

1 0

[ekohl] 54502: [USETUP] - Enable translations of the language page. Patch by Stefan Fulea. - Simplified the clear text code. - Fixed the german language page. See issue #6637 for more details.
by ekohl＠svn.reactos.org 26 Nov '11

26 Nov '11

Author: ekohl Date: Sat Nov 26 18:27:42 2011 New Revision: 54502 URL: http://svn.reactos.org/svn/reactos?rev=54502&view=rev Log: [USETUP] - Enable translations of the language page. Patch by Stefan Fulea. - Simplified the clear text code. - Fixed the german language page. See issue #6637 for more details. Modified: trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/consup.c [iso-8859-1] Sat Nov 26 18:27:42 2011 @@ -269,6 +269,25 @@ &Written); } +static +VOID +CONSOLE_ClearTextXY(IN SHORT x, + IN SHORT y, + IN SHORT Length) +{ + COORD coPos; + DWORD Written; + + coPos.X = x; + coPos.Y = y; + + FillConsoleOutputCharacterA(StdOutput, + ' ', + Length, + coPos, + &Written); +} + VOID CONSOLE_SetInputTextXY( IN SHORT x, @@ -430,6 +449,25 @@ coPos, &Written); } + +static +VOID +CONSOLE_ClearStatusTextX(IN SHORT x, + IN SHORT Length) +{ + COORD coPos; + DWORD Written; + + coPos.X = x; + coPos.Y = yScreen - 1; + + FillConsoleOutputCharacterA(StdOutput, + ' ', + Length, + coPos, + &Written); +} + VOID CONSOLE_SetStatusTextAutoFitX( @@ -670,4 +708,74 @@ } } + +VOID +CONSOLE_ClearStyledText(IN SHORT x, + IN SHORT y, + IN INT Flags, + IN SHORT Length) +{ + COORD coPos; + + coPos.X = x; + coPos.Y = y; + + if (Flags & TEXT_TYPE_STATUS) + { + coPos.X = x; + coPos.Y = yScreen - 1; + } + else /* TEXT_TYPE_REGULAR (Default) */ + { + coPos.X = x; + coPos.Y = y; + } + + if (Flags & TEXT_ALIGN_CENTER) + { + coPos.X = (xScreen - Length) /2; + } + else if(Flags & TEXT_ALIGN_RIGHT) + { + coPos.X = coPos.X - Length; + + if (Flags & TEXT_PADDING_SMALL) + { + coPos.X -= 1; + } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X -= 2; + } + else if (Flags & TEXT_PADDING_BIG) + { + coPos.X -= 3; + } + } + else /* TEXT_ALIGN_LEFT (Default) */ + { + if (Flags & TEXT_PADDING_SMALL) + { + coPos.X += 1; + } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X += 2; + } + else if (Flags & TEXT_PADDING_BIG) + { + coPos.X += 3; + } + } + + if (Flags & TEXT_TYPE_STATUS) + { + CONSOLE_ClearStatusTextX(coPos.X, Length); + } + else /* TEXT_TYPE_REGULAR (Default) */ + { + CONSOLE_ClearTextXY(coPos.X, coPos.Y, Length); + } +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/consup.h [iso-8859-1] Sat Nov 26 18:27:42 2011 @@ -186,4 +186,10 @@ IN INT Flags, IN LPCSTR Text); +VOID +CONSOLE_ClearStyledText(IN SHORT x, + IN SHORT y, + IN INT Flags, + IN SHORT Length); + /* EOF */ 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] Sat Nov 26 18:27:42 2011 @@ -608,6 +608,9 @@ static PAGE_NUMBER LanguagePage(PINPUT_RECORD Ir) { + PWCHAR NewLanguageId; + BOOL RefreshPage = FALSE; + /* Initialize the computer settings list */ if (LanguageList == NULL) { @@ -637,36 +640,26 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { -#if 0 - SelectedLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); - - /* Redraw language selection page in native language */ - MUIDisplayPage(LANGUAGE_PAGE); -#endif - ScrollDownGenericList (LanguageList); + RefreshPage = TRUE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { -#if 0 - SelectedLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); - - /* Redraw language selection page in native language */ - MUIDisplayPage(LANGUAGE_PAGE); -#endif - ScrollUpGenericList(LanguageList); + RefreshPage = TRUE; } if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_NEXT)) /* PAGE DOWN */ { ScrollPageDownGenericList(LanguageList); + RefreshPage = TRUE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_PRIOR)) /* PAGE UP */ { ScrollPageUpGenericList(LanguageList); + RefreshPage = TRUE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -685,7 +678,7 @@ UpdateKBLayout(); } - // Load the font + /* Load the font */ SetConsoleCodePage(); return INTRO_PAGE; @@ -694,6 +687,28 @@ { /* a-z */ GenericListKeyPress (LanguageList, Ir->Event.KeyEvent.uChar.AsciiChar); + RefreshPage = TRUE; + } + + if (RefreshPage) + { + NewLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); + + if (SelectedLanguageId != NewLanguageId) + { + /* Clear the language page */ + MUIClearPage(LANGUAGE_PAGE); + + SelectedLanguageId = NewLanguageId; + + /* Load the font */ + SetConsoleCodePage(); + + /* Redraw language selection page in native language */ + MUIDisplayPage(LANGUAGE_PAGE); + } + + RefreshPage = FALSE; } } Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sat Nov 26 18:27:42 2011 @@ -24,13 +24,13 @@ { 8, 10, - "\x07 Bitte whlen Sie die Sprache, die Sie whrend des Setups verwenden wollen.", + "\x07 Bitte whlen Sie die Sprache, die Sie whrend des Setups verwenden", TEXT_STYLE_NORMAL }, { 8, 11, - " Dann drcken Sie ENTER.", + "wollen. Dann drcken Sie ENTER.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Sat Nov 26 18:27:42 2011 @@ -40,7 +40,7 @@ static ULONG -FindLanguageIndex() +FindLanguageIndex(VOID) { ULONG lngIndex = 0; @@ -124,7 +124,7 @@ } VOID -MUIDisplayPage(IN ULONG page) +MUIClearPage(IN ULONG page) { const MUI_ENTRY * entry; int index; @@ -142,11 +142,38 @@ index = 0; do { - CONSOLE_SetStyledText ( - entry[index].X, - entry[index].Y, - entry[index].Flags, - entry[index].Buffer); + CONSOLE_ClearStyledText(entry[index].X, + entry[index].Y, + entry[index].Flags, + strlen(entry[index].Buffer)); + index++; + } + while (entry[index].Buffer != NULL); +} + +VOID +MUIDisplayPage(IN ULONG page) +{ + const MUI_ENTRY * entry; + int index; + + entry = FindMUIEntriesOfPage(page); + if (!entry) + { + PopupError("Error: Failed to find translated page", + NULL, + NULL, + POPUP_WAIT_NONE); + return; + } + + index = 0; + do + { + CONSOLE_SetStyledText(entry[index].X, + entry[index].Y, + entry[index].Flags, + entry[index].Buffer); index++; } Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sat Nov 26 18:27:42 2011 @@ -29,7 +29,7 @@ typedef struct { PWCHAR FontName; - PWCHAR SubFontName; + PWCHAR SubFontName; } MUI_SUBFONT; typedef struct @@ -55,6 +55,9 @@ VOID MUIDisplayPage (ULONG PageNumber); + +VOID +MUIClearPage (ULONG PageNumber); VOID MUIDisplayError (ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent);

1 0

[fireball] 54501: [NTDLL/LDR] - Fix incorrect DLL notify flag check. Spotted by Amine.
by fireball＠svn.reactos.org 26 Nov '11

26 Nov '11

Author: fireball Date: Sat Nov 26 10:00:33 2011 New Revision: 54501 URL: http://svn.reactos.org/svn/reactos?rev=54501&view=rev Log: [NTDLL/LDR] - Fix incorrect DLL notify flag check. Spotted by Amine. Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Sat Nov 26 10:00:33 2011 @@ -24,7 +24,7 @@ AVrfPageHeapDllNotification(IN PLDR_DATA_TABLE_ENTRY LdrEntry) { /* Check if page heap dll notification is turned on */ - if (!(RtlpDphGlobalFlags && DPH_FLAG_DLL_NOTIFY)) + if (!(RtlpDphGlobalFlags & DPH_FLAG_DLL_NOTIFY)) return; /* We don't support this flag currently */

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