Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 55846: [INF] - Fix the Live CD regression (RBuild only - The irony is not lost on me) caused by r55555 - There is another regression that still prevents booting though
by cgutman＠svn.reactos.org 25 Feb '12

25 Feb '12

Author: cgutman Date: Sat Feb 25 00:34:48 2012 New Revision: 55846 URL: http://svn.reactos.org/svn/reactos?rev=55846&view=rev Log: [INF] - Fix the Live CD regression (RBuild only - The irony is not lost on me) caused by r55555 - There is another regression that still prevents booting though Modified: trunk/reactos/media/inf/inf.rbuild Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=5… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/inf/inf.rbuild [iso-8859-1] Sat Feb 25 00:34:48 2012 @@ -13,6 +13,7 @@ <installfile installbase="inf">font.inf</installfile> <installfile installbase="inf">hal.inf</installfile> <installfile installbase="inf">hdc.inf</installfile> + <installfile installbase="inf">input.inf</installfile> <installfile installbase="inf">intl.inf</installfile> <installfile installbase="inf">keyboard.inf</installfile> <installfile installbase="inf">ks.inf</installfile>

1 0

[cgutman] 55845: [USBOHCI] - Fix a broken assertion and print out the alignment mask and HCCA pointer
by cgutman＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: cgutman Date: Fri Feb 24 23:14:19 2012 New Revision: 55845 URL: http://svn.reactos.org/svn/reactos?rev=55845&view=rev Log: [USBOHCI] - Fix a broken assertion and print out the alignment mask and HCCA pointer Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Feb 24 23:14:19 2012 @@ -588,7 +588,8 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), 0xFFFFFFFF); KeStallExecutionProcessor(10); Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET)); - ASSERT((m_HCCAPhysicalAddress.LowPart & Control) == Control); + ASSERT((m_HCCAPhysicalAddress.LowPart & Control) == m_HCCAPhysicalAddress.LowPart); + DPRINT1("HCCA: %x Alignment mask: %x\n", m_HCCAPhysicalAddress.LowPart, Control); // // write address of HCCA

1 0

[cgutman] 55844: [USBOHCI] - Fix various initialization bugs
by cgutman＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: cgutman Date: Fri Feb 24 23:05:22 2012 New Revision: 55844 URL: http://svn.reactos.org/svn/reactos?rev=55844&view=rev Log: [USBOHCI] - Fix various initialization bugs Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Feb 24 23:05:22 2012 @@ -517,7 +517,7 @@ NTSTATUS CUSBHardwareDevice::StartController(void) { - ULONG Control, NumberOfPorts, Index, Descriptor, FrameInterval, Periodic; + ULONG Control, Descriptor, FrameInterval, Periodic; // // lets write physical address of dummy control endpoint descriptor @@ -530,70 +530,16 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_BULK_HEAD_ED_OFFSET), m_BulkEndpointDescriptor->PhysicalAddress.LowPart); // - // get frame interval - // - FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); - m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); - - FrameInterval = ((FrameInterval & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE); - - DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue); - FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; - DPRINT1("FrameInterval %x\n", FrameInterval); - - // - // write frame interval - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval); - - // - // write address of HCCA - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), m_HCCAPhysicalAddress.LowPart); - - // - // now enable the interrupts - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_NORMAL_INTERRUPTS | OHCI_MASTER_INTERRUPT_ENABLE); - - // - // enable all queues - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_ENABLE_LIST); - - // - // 90 % periodic - // - Periodic = OHCI_PERIODIC(m_IntervalValue); - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); - DPRINT("Periodic Start %x\n", Periodic); - - // - // start the controller - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_ENABLE_LIST | OHCI_CONTROL_BULK_RATIO_1_4 | OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); - - // - // wait a bit - // - KeStallExecutionProcessor(100); - - // - // is the controller started - // - Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); - - // - // assert that the controller has been started - // - ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); - ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); - DPRINT1("Control %x\n", Control); - - // // read descriptor // Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); + + // + // get port count + // + m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); + DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); + ASSERT(m_NumberOfPorts < OHCI_MAX_PORT_COUNT); // // no over current protection @@ -620,66 +566,83 @@ WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor); // + // get frame interval + // + FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); + m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); + + FrameInterval = ((FrameInterval & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE); + + DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue); + FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; + DPRINT1("FrameInterval %x\n", FrameInterval); + + // + // write frame interval + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval); + + // + // HCCA alignment check + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), 0xFFFFFFFF); + KeStallExecutionProcessor(10); + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET)); + ASSERT((m_HCCAPhysicalAddress.LowPart & Control) == Control); + + // + // write address of HCCA + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), m_HCCAPhysicalAddress.LowPart); + + // + // now enable the interrupts + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_NORMAL_INTERRUPTS | OHCI_MASTER_INTERRUPT_ENABLE); + + // + // enable all queues + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_ENABLE_LIST); + + // + // 90 % periodic + // + Periodic = OHCI_PERIODIC(m_IntervalValue); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); + DPRINT("Periodic Start %x\n", Periodic); + + // + // start the controller + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_ENABLE_LIST | OHCI_CONTROL_BULK_RATIO_1_4 | OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); + + // + // wait a bit + // + KeStallExecutionProcessor(100); + + // + // is the controller started + // + Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); + + // + // assert that the controller has been started + // + ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL); + ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); + DPRINT1("Control %x\n", Control); + + // // enable power on all ports // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_STATUS_OFFSET), OHCI_RH_LOCAL_POWER_STATUS_CHANGE); // - // wait a bit - // - KeStallExecutionProcessor(10); - - // - // write descriptor - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor); - - // - // retrieve number of ports - // - for(Index = 0; Index < 10; Index++) - { - // - // wait a bit - // - KeStallExecutionProcessor(10); - - // - // read descriptor - // - Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); - - // - // get number of ports - // - NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); - - // - // check if we have received the ports - // - if (NumberOfPorts) - break; - } - - // - // sanity check - // - ASSERT(NumberOfPorts < OHCI_MAX_PORT_COUNT); - - // - // store number of ports - // - m_NumberOfPorts = NumberOfPorts; - - // - // print out number ports - // - DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); - - - // // done // + DPRINT1("OHCI controller is operational\n"); return STATUS_SUCCESS; } @@ -912,18 +875,10 @@ NTSTATUS CUSBHardwareDevice::StopController(void) { - ULONG Control, Reset, Status; + ULONG Control, Reset; ULONG Index, FrameInterval; // - // alignment check - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), 0xFFFFFFFF); - Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET)); - //ASSERT((m_HCCAPhysicalAddress.QuadPart & Control) == Control); - - - // // check context // Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)); @@ -931,14 +886,9 @@ if ((Control & OHCI_INTERRUPT_ROUTING)) { // - // read command status - // - Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET)); - - // // change ownership // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), Status | OHCI_OWNERSHIP_CHANGE_REQUEST); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), OHCI_OWNERSHIP_CHANGE_REQUEST); for(Index = 0; Index < 100; Index++) { // @@ -1002,7 +952,7 @@ // check control register // Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK); - if (Control & OHCI_HC_FUNCTIONAL_STATE_RESUME) + if (Control == OHCI_HC_FUNCTIONAL_STATE_RESUME) { // // it has resumed @@ -1086,7 +1036,7 @@ // // reset time is 10ms // - for(Index = 0; Index < 10; Index++) + for(Index = 0; Index < 100; Index++) { // // wait a bit

1 0

[janderwald] 55843: [USBUHCI] - Invert data toggle
by janderwald＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: janderwald Date: Fri Feb 24 17:58:55 2012 New Revision: 55843 URL: http://svn.reactos.org/svn/reactos?rev=55843&view=rev Log: [USBUHCI] - Invert data toggle Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Fri Feb 24 17:58:55 2012 @@ -1247,6 +1247,7 @@ { PUHCI_TRANSFER_DESCRIPTOR Descriptor, NextDescriptor; ULONG ErrorCount; + UCHAR DataToggle = 0; // // grab first transfer descriptor @@ -1254,6 +1255,9 @@ Descriptor = (PUHCI_TRANSFER_DESCRIPTOR)OutDescriptor->NextElementDescriptor; while(Descriptor) { + // get data toggle + DataToggle = (Descriptor->Token >> TD_TOKEN_DATA_TOGGLE_SHIFT) & 0x01; + if (Descriptor->Status & TD_ERROR_MASK) { // @@ -1344,6 +1348,12 @@ // m_DmaManager->Release(OutDescriptor, sizeof(UHCI_QUEUE_HEAD)); + // is there an endpoint descriptor + if (m_EndpointDescriptor) + { + // invert last data toggle + m_EndpointDescriptor->DataToggle = (DataToggle == 0); + } } VOID

1 0

[gadamopoulos] 55842: [win32k] -remove unrelated and unused information from the WINSTATION_OBJECT
by gadamopoulos＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: gadamopoulos Date: Fri Feb 24 15:32:13 2012 New Revision: 55842 URL: http://svn.reactos.org/svn/reactos?rev=55842&view=rev Log: [win32k] -remove unrelated and unused information from the WINSTATION_OBJECT Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Fri Feb 24 15:32:13 2012 @@ -25,23 +25,8 @@ LIST_ENTRY DesktopListHead; PRTL_ATOM_TABLE AtomTable; HANDLE SystemMenuTemplate; - UINT CaretBlinkRate; HANDLE ShellWindow; HANDLE ShellListView; - - /* Effects */ - BOOL FontSmoothing; /* Enable */ - UINT FontSmoothingType; /* 1:Standard,2:ClearType */ - /* FIXME: Big Icons (SPI_GETICONMETRICS?) */ - BOOL DropShadow; - BOOL DragFullWindows; - BOOL FlatMenu; - - /* ScreenSaver */ - BOOL ScreenSaverRunning; - UINT ScreenSaverTimeOut; - /* Should this be on each desktop ? */ - BOOL ScreenSaverActive; /* Wallpaper */ HANDLE hbmWallpaper; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Fri Feb 24 15:32:13 2012 @@ -424,8 +424,6 @@ Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); WindowStationObject->SystemMenuTemplate = (HANDLE)0; WindowStationObject->Name = WindowStationName; - WindowStationObject->ScreenSaverRunning = FALSE; - WindowStationObject->FlatMenu = FALSE; if (InputWindowStation == NULL) {

1 0

[gadamopoulos] 55841: [win32k] - Properly create the WindowStations directory in NtUserInitialize. Now we take into account the fact that if we are not in session 0, it should be created in \Sessio...
by gadamopoulos＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: gadamopoulos Date: Fri Feb 24 15:22:11 2012 New Revision: 55841 URL: http://svn.reactos.org/svn/reactos?rev=55841&view=rev Log: [win32k] - Properly create the WindowStations directory in NtUserInitialize. Now we take into account the fact that if we are not in session 0, it should be created in \Sessions direcory - Clean up IntParseDesktopPath and make it use the correct WindowStations - Add some comments and cleanup - Remove the unused IntGetFullWindowStationName, IntGetWindowStationObject and IntGetWinStaObj Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -1,7 +1,7 @@ #pragma once -#define WINSTA_ROOT_NAME L"\\Windows\\WindowStations" -#define WINSTA_ROOT_NAME_LENGTH 23 +#define WINSTA_OBJ_DIR L"\\Windows\\WindowStations" +#define SESSION_DIR L"\\Sessions" /* Window Station Status Flags */ #define WSS_LOCKED (1) @@ -68,6 +68,7 @@ extern WINSTATION_OBJECT *InputWindowStation; extern PPROCESSINFO LogonProcess; extern HWND hwndSAS; +extern UNICODE_STRING gustrWindowStationsDir; #define WINSTA_READ STANDARD_RIGHTS_READ | \ WINSTA_ENUMDESKTOPS | \ @@ -99,16 +100,11 @@ NTSTATUS NTAPI InitWindowStationImpl(VOID); +NTSTATUS NTAPI UserCreateWinstaDirectoy(); -VOID APIENTRY -IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); - -NTSTATUS -APIENTRY -IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters); - -NTSTATUS NTAPI -IntWinstaOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters); +VOID APIENTRY IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); +NTSTATUS APIENTRY IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters); +NTSTATUS NTAPI IntWinstaOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters); NTSTATUS FASTCALL IntValidateWindowStationHandle( @@ -116,25 +112,8 @@ KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, PWINSTATION_OBJECT *Object); +BOOL FASTCALL UserSetProcessWindowStation(HWINSTA hWindowStation); -BOOL FASTCALL -IntGetWindowStationObject(PWINSTATION_OBJECT Object); - -BOOL FASTCALL -co_IntInitializeDesktopGraphics(VOID); - -VOID FASTCALL -IntEndDesktopGraphics(VOID); - -BOOL FASTCALL -IntGetFullWindowStationName( - OUT PUNICODE_STRING FullName, - IN PUNICODE_STRING WinStaName, - IN OPTIONAL PUNICODE_STRING DesktopName); - -PWINSTATION_OBJECT FASTCALL IntGetWinStaObj(VOID); - -BOOL FASTCALL -UserSetProcessWindowStation(HWINSTA hWindowStation); - +BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID); +VOID FASTCALL IntEndDesktopGraphics(VOID); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -361,6 +361,7 @@ return STATUS_SUCCESS; error: + ERR_CH(UserThread,"UserCreateThreadInfo failed! Freeing pti 0x%x for TID %d\n", ptiCurrent, Thread->Cid.UniqueThread); UserDestroyThreadInfo(Thread); return Status; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -135,7 +135,7 @@ { PDESKTOP Desktop = (PDESKTOP)Parameters->Object; - TRACE("Deleting desktop (0x%X)\n", Desktop); + TRACE("Deleting desktop object 0x%x\n", Desktop); /* Remove the desktop from the window station's list of associcated desktops */ RemoveEntryList(&Desktop->ListEntry); @@ -216,112 +216,80 @@ HDESK *hDesktop) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING WinSta, Desktop, FullName; - BOOL DesktopPresent = FALSE; - BOOL WinStaPresent = FALSE; + UNICODE_STRING ObjectName; NTSTATUS Status; + WCHAR wstrWinstaFullName[MAX_PATH], *pwstrWinsta = NULL, *pwstrDesktop = NULL; ASSERT(hWinSta); + ASSERT(hDesktop); + ASSERT(DesktopPath); *hWinSta = NULL; - - if(hDesktop != NULL) - { - *hDesktop = NULL; - } - - RtlInitUnicodeString(&WinSta, NULL); - RtlInitUnicodeString(&Desktop, NULL); - - if(DesktopPath != NULL && DesktopPath->Buffer != NULL && DesktopPath->Length > sizeof(WCHAR)) - { - PWCHAR c = DesktopPath->Buffer; - USHORT wl = 0; - USHORT l = DesktopPath->Length; - + *hDesktop = NULL; + + if(DesktopPath->Buffer != NULL && DesktopPath->Length > sizeof(WCHAR)) + { /* * Parse the desktop path string which can be in the form "WinSta\Desktop" * or just "Desktop". In latter case WinSta0 will be used. */ - while(l > 0) + pwstrDesktop = wcschr(DesktopPath->Buffer, L'\\'); + if(pwstrDesktop != NULL) { - if(*c == L'\\') - { - wl = (ULONG_PTR)c - (ULONG_PTR)DesktopPath->Buffer; - break; - } - l -= sizeof(WCHAR); - c++; + *pwstrDesktop = 0; + pwstrDesktop++; + pwstrWinsta = DesktopPath->Buffer; } - - if(wl > 0) + else { - WinSta.Length = wl; - WinSta.MaximumLength = wl + sizeof(WCHAR); - WinSta.Buffer = DesktopPath->Buffer; - - WinStaPresent = TRUE; - c++; - } - - Desktop.Length = DesktopPath->Length - wl; - if(wl > 0) - { - Desktop.Length -= sizeof(WCHAR); - } - if(Desktop.Length > 0) - { - Desktop.MaximumLength = Desktop.Length + sizeof(WCHAR); - Desktop.Buffer = ((wl > 0) ? c : DesktopPath->Buffer); - DesktopPresent = TRUE; - } - } - - if(!WinStaPresent) - { + pwstrDesktop = DesktopPath->Buffer; + pwstrWinsta = NULL; + } + + TRACE("IntParseDesktopPath pwstrWinsta:%S pwstrDesktop:%S\n", pwstrWinsta, pwstrDesktop); + } + #if 0 - /* Search the process handle table for (inherited) window station - handles, use a more appropriate one than WinSta0 if possible. */ - if (!ObFindHandleForObject(Process, - NULL, - ExWindowStationObjectType, - NULL, - (PHANDLE)hWinSta)) + /* Search the process handle table for (inherited) window station + handles, use a more appropriate one than WinSta0 if possible. */ + if (!ObFindHandleForObject(Process, + NULL, + ExWindowStationObjectType, + NULL, + (PHANDLE)hWinSta)) #endif - { - /* We had no luck searching for opened handles, use WinSta0 now */ - RtlInitUnicodeString(&WinSta, L"WinSta0"); - } - } - - if(!DesktopPresent && hDesktop != NULL) - { + { + /* We had no luck searching for opened handles, use WinSta0 now */ + if(!pwstrWinsta) + pwstrWinsta = L"WinSta0"; + } + #if 0 - /* Search the process handle table for (inherited) desktop - handles, use a more appropriate one than Default if possible. */ - if (!ObFindHandleForObject(Process, - NULL, - ExDesktopObjectType, - NULL, - (PHANDLE)hDesktop)) + /* Search the process handle table for (inherited) desktop + handles, use a more appropriate one than Default if possible. */ + if (!ObFindHandleForObject(Process, + NULL, + ExDesktopObjectType, + NULL, + (PHANDLE)hDesktop)) #endif - { - /* We had no luck searching for opened handles, use Desktop now */ - RtlInitUnicodeString(&Desktop, L"Default"); - } - } - + { + /* We had no luck searching for opened handles, use Desktop now */ + if(!pwstrDesktop) + pwstrDesktop = L"Default"; + } + if(*hWinSta == NULL) { - if(!IntGetFullWindowStationName(&FullName, &WinSta, NULL)) - { - return STATUS_INSUFFICIENT_RESOURCES; - } + swprintf(wstrWinstaFullName, L"%wZ\\%ws", &gustrWindowStationsDir, pwstrWinsta); + RtlInitUnicodeString( &ObjectName, wstrWinstaFullName); + + TRACE("parsed initial winsta: %wZ\n", &ObjectName); /* Open the window station */ InitializeObjectAttributes(&ObjectAttributes, - &FullName, + &ObjectName, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -334,30 +302,25 @@ NULL, (HANDLE*)hWinSta); - ExFreePoolWithTag(FullName.Buffer, TAG_STRING); - if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - TRACE("Failed to reference window station %wZ PID: %d!\n", &WinSta, PsGetCurrentProcessId()); + ERR("Failed to reference window station %wZ PID: %d!\n", &ObjectName ); return Status; } } - if(hDesktop != NULL && *hDesktop == NULL) - { - if(!IntGetFullWindowStationName(&FullName, &WinSta, &Desktop)) - { - NtClose(*hWinSta); - *hWinSta = NULL; - return STATUS_INSUFFICIENT_RESOURCES; - } + if(*hDesktop == NULL) + { + RtlInitUnicodeString(&ObjectName, pwstrDesktop); + + TRACE("parsed initial desktop: %wZ\n", &ObjectName); /* Open the desktop object */ InitializeObjectAttributes(&ObjectAttributes, - &FullName, + &ObjectName, OBJ_CASE_INSENSITIVE, - NULL, + *hWinSta, NULL); Status = ObOpenObjectByName(&ObjectAttributes, @@ -368,19 +331,16 @@ NULL, (HANDLE*)hDesktop); - ExFreePoolWithTag(FullName.Buffer, TAG_STRING); - if(!NT_SUCCESS(Status)) { *hDesktop = NULL; NtClose(*hWinSta); *hWinSta = NULL; SetLastNtError(Status); - TRACE("Failed to reference desktop %wZ PID: %d!\n", &Desktop, PsGetCurrentProcessId()); + ERR("Failed to reference desktop %wZ PID: %d!\n", &ObjectName); return Status; } } - return STATUS_SUCCESS; } @@ -410,6 +370,9 @@ AccessMode, (PVOID*)Object, NULL); + + TRACE("IntValidateDesktopHandle: handle:0x%x obj:0x%x access:0x%x Status:0x%x\n", + Desktop, *Object, DesiredAccess, Status); if (!NT_SUCCESS(Status)) SetLastNtError(Status); @@ -860,8 +823,6 @@ * Try to open already existing desktop */ - TRACE("Trying to open desktop (%wZ)\n", &DesktopName); - Status = ObOpenObjectByName( ObjectAttributes, ExDesktopObjectType, @@ -875,7 +836,8 @@ /* In case the object was not created (eg if it existed), return now */ if (Context == FALSE) { - RETURN( Desktop); + TRACE("NtUserCreateDesktop opened desktop %wZ\n", ObjectAttributes->ObjectName); + RETURN( Desktop); } /* Capture desktop name */ @@ -905,7 +867,13 @@ KernelMode, (PVOID)&DesktopObject, NULL); - if (!NT_SUCCESS(Status)) RETURN(NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to reference desktop object\n"); + RETURN(NULL); + } + + TRACE("NtUserCreateDesktop created desktop 0x%x with name %wZ\n", DesktopObject, &DesktopName); DesktopObject->hsectionDesktop = NULL; DesktopObject->pheapDesktop = UserCreateHeap(&DesktopObject->hsectionDesktop, @@ -949,24 +917,9 @@ InitializeListHead(&DesktopObject->pDeskInfo->aphkStart[i]); } -//// Why is this here? -#if 0 - if (! NT_SUCCESS(Status)) - { - ERR("Failed to create desktop handle\n"); - SetLastNtError(Status); - RETURN( NULL); - } -#endif -//// /* * Create a handle for CSRSS and notify CSRSS for Creating Desktop Window. - * - * Honestly, I believe this is a cleverly written hack that allowed ReactOS - * to function at the beginning of the project by ramroding the GUI into - * operation and making the desktop window work from user space. - * (jt) */ Request.Type = MAKE_CSR_API(CREATE_DESKTOP, CSR_GUI); Status = CsrInsertObject(Desktop, @@ -1112,9 +1065,12 @@ if (!NT_SUCCESS(Status)) { + ERR("Failed to open desktop\n"); SetLastNtError(Status); return 0; } + + TRACE("Opened desktop %S with handle 0x%x\n", ObjectAttributes->ObjectName->Buffer, Desktop); return Desktop; } @@ -1147,56 +1103,41 @@ BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - PDESKTOP Object; + PDESKTOP pdesk; NTSTATUS Status; - HDESK Desktop; - DECLARE_RETURN(HDESK); + HDESK hdesk; TRACE("Enter NtUserOpenInputDesktop\n"); - UserEnterExclusive(); - - TRACE("About to open input desktop\n"); /* Get a pointer to the desktop object */ - - Status = IntValidateDesktopHandle( - InputDesktopHandle, - UserMode, - 0, - &Object); - + Status = IntValidateDesktopHandle(InputDesktopHandle, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { TRACE("Validation of input desktop handle (0x%X) failed\n", InputDesktop); - RETURN((HDESK)0); + return NULL; } /* Create a new handle to the object */ - Status = ObOpenObjectByPointer( - Object, + pdesk, 0, NULL, dwDesiredAccess, ExDesktopObjectType, UserMode, - (HANDLE*)&Desktop); - - ObDereferenceObject(Object); - - if (NT_SUCCESS(Status)) - { - TRACE("Successfully opened input desktop\n"); - RETURN((HDESK)Desktop); - } - - SetLastNtError(Status); - RETURN((HDESK)0); - -CLEANUP: - TRACE("Leave NtUserOpenInputDesktop, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + &hdesk); + + ObDereferenceObject(pdesk); + + if (!NT_SUCCESS(Status)) + { + ERR("Failed to open input desktop object\n"); + SetLastNtError(Status); + return NULL; + } + + TRACE("NtUserOpenInputDesktop returning 0x%x\n",hdesk); + return hdesk; } /* @@ -1224,14 +1165,14 @@ BOOL APIENTRY NtUserCloseDesktop(HDESK hDesktop) { - PDESKTOP Object; + PDESKTOP pdesk; NTSTATUS Status; PTHREADINFO pti; DECLARE_RETURN(BOOL); pti = PsGetCurrentThreadWin32Thread(); - TRACE("Enter NtUserCloseDesktop\n"); + TRACE("NtUserCloseDesktop called (0x%x)\n", hDesktop); UserEnterExclusive(); if( hDesktop == pti->hdesk || hDesktop == pti->ppi->hdeskStartup) @@ -1241,27 +1182,19 @@ RETURN(FALSE); } - TRACE("About to close desktop handle (0x%X)\n", hDesktop); - - Status = IntValidateDesktopHandle( - hDesktop, - UserMode, - 0, - &Object); - + Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - TRACE("Validation of desktop handle (0x%X) failed\n", hDesktop); + ERR("Validation of desktop handle (0x%X) failed\n", hDesktop); RETURN(FALSE); } - ObDereferenceObject(Object); - - TRACE("Closing desktop handle (0x%X)\n", hDesktop); + ObDereferenceObject(pdesk); Status = ZwClose(hDesktop); if (!NT_SUCCESS(Status)) { + ERR("Failed to close desktop handle 0x%x\n", hDesktop); SetLastNtError(Status); RETURN(FALSE); } @@ -1529,26 +1462,19 @@ */ BOOL APIENTRY -NtUserSwitchDesktop(HDESK hDesktop) -{ - PDESKTOP DesktopObject; +NtUserSwitchDesktop(HDESK hdesk) +{ + PDESKTOP pdesk; NTSTATUS Status; DECLARE_RETURN(BOOL); UserEnterExclusive(); - TRACE("Enter NtUserSwitchDesktop\n"); - - TRACE("About to switch desktop (0x%X)\n", hDesktop); - - Status = IntValidateDesktopHandle( - hDesktop, - UserMode, - 0, - &DesktopObject); - + TRACE("Enter NtUserSwitchDesktop(0x%x)\n", hdesk); + + Status = IntValidateDesktopHandle( hdesk, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - TRACE("Validation of desktop handle (0x%X) failed\n", hDesktop); + ERR("Validation of desktop handle (0x%X) failed\n", hdesk); RETURN(FALSE); } @@ -1556,18 +1482,18 @@ * Don't allow applications switch the desktop if it's locked, unless the caller * is the logon application itself */ - if((DesktopObject->rpwinstaParent->Flags & WSS_LOCKED) && - LogonProcess != NULL && LogonProcess != PsGetCurrentProcessWin32Process()) - { - ObDereferenceObject(DesktopObject); - ERR("Switching desktop 0x%x denied because the work station is locked!\n", hDesktop); + if((pdesk->rpwinstaParent->Flags & WSS_LOCKED) && + LogonProcess != PsGetCurrentProcessWin32Process()) + { + ObDereferenceObject(pdesk); + ERR("Switching desktop 0x%x denied because the window station is locked!\n", hdesk); RETURN(FALSE); } - if(DesktopObject->rpwinstaParent != InputWindowStation) - { - ObDereferenceObject(DesktopObject); - ERR("Switching desktop 0x%x denied because desktop doesn't belong to the interactive winsta!\n", hDesktop); + if(pdesk->rpwinstaParent != InputWindowStation) + { + ObDereferenceObject(pdesk); + ERR("Switching desktop 0x%x denied because desktop doesn't belong to the interactive winsta!\n", hdesk); RETURN(FALSE); } @@ -1576,13 +1502,13 @@ /* FIXME: Connect to input device */ /* Set the active desktop in the desktop's window station. */ - InputWindowStation->ActiveDesktop = DesktopObject; + InputWindowStation->ActiveDesktop = pdesk; /* Set the global state. */ - InputDesktop = DesktopObject; - InputDesktopHandle = hDesktop; - - ObDereferenceObject(DesktopObject); + InputDesktop = pdesk; + InputDesktopHandle = hdesk; + + ObDereferenceObject(pdesk); RETURN(TRUE); @@ -1679,13 +1605,13 @@ } static NTSTATUS -IntUnmapDesktopView(IN PDESKTOP DesktopObject) +IntUnmapDesktopView(IN PDESKTOP pdesk) { PPROCESSINFO ppi; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; NTSTATUS Status = STATUS_SUCCESS; - TRACE("DO %p\n"); + TRACE("IntUnmapDesktopView called for desktop object %p\n", pdesk); ppi = PsGetCurrentProcessWin32Process(); PrevLink = &ppi->HeapMappings.Next; @@ -1694,16 +1620,17 @@ HeapMapping = *PrevLink; while (HeapMapping != NULL) { - if (HeapMapping->KernelMapping == (PVOID)DesktopObject->pheapDesktop) + if (HeapMapping->KernelMapping == (PVOID)pdesk->pheapDesktop) { if (--HeapMapping->Count == 0) { *PrevLink = HeapMapping->Next; + TRACE("ppi 0x%x unmapped heap of desktop 0x%x\n", ppi, pdesk); Status = MmUnmapViewOfSection(PsGetCurrentProcess(), HeapMapping->UserMapping); - ObDereferenceObject(DesktopObject); + ObDereferenceObject(pdesk); UserHeapFree(HeapMapping); break; @@ -1718,23 +1645,25 @@ } static NTSTATUS -IntMapDesktopView(IN PDESKTOP DesktopObject) -{ - PPROCESSINFO CurrentWin32Process; +IntMapDesktopView(IN PDESKTOP pdesk) +{ + PPROCESSINFO ppi; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; PVOID UserBase = NULL; SIZE_T ViewSize = 0; LARGE_INTEGER Offset; NTSTATUS Status; - CurrentWin32Process = PsGetCurrentProcessWin32Process(); - PrevLink = &CurrentWin32Process->HeapMappings.Next; + TRACE("IntMapDesktopView called for desktop object 0x%x\n", pdesk); + + ppi = PsGetCurrentProcessWin32Process(); + PrevLink = &ppi->HeapMappings.Next; /* Find out if another thread already mapped the desktop heap */ HeapMapping = *PrevLink; while (HeapMapping != NULL) { - if (HeapMapping->KernelMapping == (PVOID)DesktopObject->pheapDesktop) + if (HeapMapping->KernelMapping == (PVOID)pdesk->pheapDesktop) { HeapMapping->Count++; return STATUS_SUCCESS; @@ -1745,9 +1674,8 @@ } /* We're the first, map the heap */ - TRACE("Noone mapped the desktop heap %p yet, so - map it!\n", DesktopObject->pheapDesktop); Offset.QuadPart = 0; - Status = MmMapViewOfSection(DesktopObject->hsectionDesktop, + Status = MmMapViewOfSection(pdesk->hsectionDesktop, PsGetCurrentProcess(), &UserBase, 0, @@ -1763,24 +1691,25 @@ return Status; } + TRACE("ppi 0x%x mapped heap of desktop 0x%x\n", ppi, pdesk); + /* Add the mapping */ HeapMapping = UserHeapAlloc(sizeof(W32HEAP_USER_MAPPING)); if (HeapMapping == NULL) { - MmUnmapViewOfSection(PsGetCurrentProcess(), - UserBase); + MmUnmapViewOfSection(PsGetCurrentProcess(), UserBase); ERR("UserHeapAlloc() failed!\n"); return STATUS_NO_MEMORY; } HeapMapping->Next = NULL; - HeapMapping->KernelMapping = (PVOID)DesktopObject->pheapDesktop; + HeapMapping->KernelMapping = (PVOID)pdesk->pheapDesktop; HeapMapping->UserMapping = UserBase; HeapMapping->Limit = ViewSize; HeapMapping->Count = 1; *PrevLink = HeapMapping; - ObReferenceObject(DesktopObject); + ObReferenceObject(pdesk); return STATUS_SUCCESS; } @@ -1798,7 +1727,7 @@ ASSERT(NtCurrentTeb()); - TRACE("IntSetThreadDesktop() , FOF=%d\n", FreeOnFailure); + TRACE("IntSetThreadDesktop hDesktop:0x%x, FOF:%d\n",hDesktop, FreeOnFailure); pti = PsGetCurrentThreadWin32Thread(); pci = pti->pClientInfo; @@ -1807,12 +1736,7 @@ if(hDesktop != NULL) { /* Validate the new desktop. */ - Status = IntValidateDesktopHandle( - hDesktop, - UserMode, - 0, - &pdesk); - + Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { ERR("Validation of desktop handle (0x%X) failed\n", hDesktop); @@ -1875,7 +1799,7 @@ return FALSE; } } - + pdeskOld = pti->rpdesk; hdeskOld = pti->hdesk; pctiOld = pti->pcti; @@ -1928,6 +1852,8 @@ InsertTailList(&pdesk->PtiList, &pti->PtiLink); } + TRACE("IntSetThreadDesktop: pti 0x%x ppi 0x%x switched from object 0x%x to 0x%x\n", pti, pti->ppi, pdeskOld, pdesk); + return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -101,8 +101,10 @@ NTSTATUS Status; // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) -// Create Object Directory,,, Looks like create workstation. "\\Windows\\WindowStations" // Create Event for Diconnect Desktop. + + Status = UserCreateWinstaDirectoy(); + if (!NT_SUCCESS(Status)) return Status; /* Initialize Video. */ Status = InitVideo(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -27,7 +27,7 @@ #define REQ_INTERACTIVE_WINSTA(err) \ if ( GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ { \ - ERR("NtUserSystemParametersInfo requires interactive window station\n"); \ + ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ EngSetLastError(err); \ return 0; \ } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Fri Feb 24 15:22:11 2012 @@ -20,6 +20,9 @@ /* Winlogon SAS window */ HWND hwndSAS = NULL; +/* Full path to WindowStations directory */ +UNICODE_STRING gustrWindowStationsDir; + /* INITALIZATION FUNCTIONS ****************************************************/ INIT_FUNCTION @@ -27,36 +30,61 @@ NTAPI InitWindowStationImpl(VOID) { - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE WindowStationsDirectory; - UNICODE_STRING UnicodeString; - NTSTATUS Status; GENERIC_MAPPING IntWindowStationMapping = { WINSTA_READ, WINSTA_WRITE, WINSTA_EXECUTE, WINSTA_ACCESS_ALL}; - /* - * Create the '\Windows\WindowStations' directory - */ - - RtlInitUnicodeString(&UnicodeString, WINSTA_ROOT_NAME); - InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, 0, NULL, NULL); - Status = ZwCreateDirectoryObject(&WindowStationsDirectory, 0, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - TRACE("Could not create \\Windows\\WindowStations directory " - "(Status 0x%X)\n", Status); - return Status; - } - /* Set Winsta Object Attributes */ ExWindowStationObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT); ExWindowStationObjectType->TypeInfo.GenericMapping = IntWindowStationMapping; ExWindowStationObjectType->TypeInfo.ValidAccessMask = WINSTA_ACCESS_ALL; return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +UserCreateWinstaDirectoy() +{ + PPEB Peb; + NTSTATUS Status; + WCHAR wstrWindowStationsDir[MAX_PATH]; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hWinstaDir; + + /* Create the WindowStations directory and cache its path for later use */ + Peb = NtCurrentPeb(); + if(Peb->SessionId == 0) + { + RtlCreateUnicodeString(&gustrWindowStationsDir, WINSTA_OBJ_DIR); + } + else + { + swprintf(wstrWindowStationsDir, + L"%ws\\%ld%ws", + SESSION_DIR, + Peb->SessionId, + WINSTA_OBJ_DIR); + + RtlCreateUnicodeString( &gustrWindowStationsDir, wstrWindowStationsDir); + } + + InitializeObjectAttributes(&ObjectAttributes, + &gustrWindowStationsDir, + 0, + NULL, + NULL); + Status = ZwCreateDirectoryObject(&hWinstaDir, 0, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR("Could not create %wZ directory (Status 0x%X)\n", &gustrWindowStationsDir, Status); + return Status; + } + + TRACE("Created directory %wZ for session %d\n", &gustrWindowStationsDir, Peb->SessionId); + + return Status; } /* OBJECT CALLBACKS **********************************************************/ @@ -157,58 +185,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ /* - * IntGetFullWindowStationName - * - * Get a full window station object name from a name specified in - * NtUserCreateWindowStation, NtUserOpenWindowStation, NtUserCreateDesktop - * or NtUserOpenDesktop. - * - * Return Value - * TRUE on success, FALSE on failure. - */ - -BOOL FASTCALL -IntGetFullWindowStationName( - OUT PUNICODE_STRING FullName, - IN PUNICODE_STRING WinStaName, - IN OPTIONAL PUNICODE_STRING DesktopName) -{ - PWCHAR Buffer; - - FullName->Length = WINSTA_ROOT_NAME_LENGTH * sizeof(WCHAR); - if (WinStaName != NULL) - FullName->Length += WinStaName->Length + sizeof(WCHAR); - if (DesktopName != NULL) - FullName->Length += DesktopName->Length + sizeof(WCHAR); - FullName->MaximumLength = FullName->Length; - FullName->Buffer = ExAllocatePoolWithTag(PagedPool, FullName->Length, TAG_STRING); - if (FullName->Buffer == NULL) - { - return FALSE; - } - - Buffer = FullName->Buffer; - memcpy(Buffer, WINSTA_ROOT_NAME, WINSTA_ROOT_NAME_LENGTH * sizeof(WCHAR)); - Buffer += WINSTA_ROOT_NAME_LENGTH; - if (WinStaName != NULL) - { - *Buffer = L'\\'; - Buffer ++; - memcpy(Buffer, WinStaName->Buffer, WinStaName->Length); - - if (DesktopName != NULL) - { - Buffer += WinStaName->Length / sizeof(WCHAR); - *Buffer = L'\\'; - Buffer ++; - memcpy(Buffer, DesktopName->Buffer, DesktopName->Length); - } - } - - return TRUE; -} - -/* * IntValidateWindowStationHandle * * Validates the window station handle. @@ -229,7 +205,7 @@ if (WindowStation == NULL) { - WARN("Invalid window station handle\n"); + ERR("Invalid window station handle\n"); EngSetLastError(ERROR_INVALID_HANDLE); return STATUS_INVALID_HANDLE; } @@ -247,21 +223,6 @@ return Status; } - -BOOL FASTCALL -IntGetWindowStationObject(PWINSTATION_OBJECT Object) -{ - NTSTATUS Status; - - Status = ObReferenceObjectByPointer( - Object, - KernelMode, - ExWindowStationObjectType, - 0); - - return NT_SUCCESS(Status); -} - BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID) @@ -378,6 +339,8 @@ HWINSTA WindowStation; NTSTATUS Status; + TRACE("NtUserCreateWindowStation called\n"); + Status = ObOpenObjectByName( ObjectAttributes, ExWindowStationObjectType, @@ -389,9 +352,9 @@ if (NT_SUCCESS(Status)) { - return (HWINSTA)WindowStation; - } - + TRACE("NtUserCreateWindowStation opened window station %wZ\n", ObjectAttributes->ObjectName); + return (HWINSTA)WindowStation; + } /* * No existing window station found, try to create new one @@ -430,6 +393,7 @@ if (!NT_SUCCESS(Status)) { + ERR("ObCreateObject failed for window station %wZ\n", &WindowStationName); ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return 0; @@ -438,13 +402,14 @@ Status = ObInsertObject( (PVOID)WindowStationObject, NULL, - STANDARD_RIGHTS_REQUIRED, + dwDesiredAccess, 0, NULL, (PVOID*)&WindowStation); if (!NT_SUCCESS(Status)) { + ERR("ObInsertObject failed for window station %wZ\n", &WindowStationName); ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); ObDereferenceObject(WindowStationObject); @@ -464,11 +429,14 @@ if (InputWindowStation == NULL) { + TRACE("Initializeing input window station\n"); InputWindowStation = WindowStationObject; InitCursorImpl(); } + TRACE("NtUserCreateWindowStation created object 0x%x with name %wZ handle 0x%x\n", + WindowStation, &WindowStationObject->Name, WindowStation); return WindowStation; } @@ -501,7 +469,7 @@ POBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK dwDesiredAccess) { - HWINSTA WindowStation; + HWINSTA hwinsta; NTSTATUS Status; Status = ObOpenObjectByName( @@ -511,15 +479,18 @@ NULL, dwDesiredAccess, NULL, - (PVOID*)&WindowStation); + (PVOID*)&hwinsta); if (!NT_SUCCESS(Status)) { + ERR("NtUserOpenWindowStation failed\n"); SetLastNtError(Status); return 0; } - return WindowStation; + TRACE("Opened window station %wZ with handle 0x%x\n", ObjectAttributes->ObjectName, hwinsta); + + return hwinsta; } /* @@ -551,10 +522,11 @@ PWINSTATION_OBJECT Object; NTSTATUS Status; - TRACE("About to close window station handle (0x%X)\n", hWinSta); + TRACE("NtUserCloseWindowStation called (0x%x)\n", hWinSta); if (hWinSta == UserGetProcessWindowStation()) { + ERR("Attempted to close process window station"); return FALSE; } @@ -566,13 +538,13 @@ if (!NT_SUCCESS(Status)) { - TRACE("Validation of window station handle (0x%X) failed\n", hWinSta); + ERR("Validation of window station handle (0x%x) failed\n", hWinSta); return FALSE; } ObDereferenceObject(Object); - TRACE("Closing window station handle (0x%X)\n", hWinSta); + TRACE("Closing window station handle (0x%x)\n", hWinSta); Status = ObCloseHandle(hWinSta, UserMode); if (!NT_SUCCESS(Status)) @@ -797,8 +769,6 @@ { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); - //ASSERT(ppi->hwinsta); - return ppi->hwinsta; } @@ -821,26 +791,6 @@ NtUserGetProcessWindowStation(VOID) { return UserGetProcessWindowStation(); -} - -PWINSTATION_OBJECT FASTCALL -IntGetWinStaObj(VOID) -{ - PWINSTATION_OBJECT WinStaObj; - NTSTATUS Status; - - Status = IntValidateWindowStationHandle( - UserGetProcessWindowStation(), - KernelMode, - 0, - &WinStaObj); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - - return WinStaObj; } BOOL FASTCALL @@ -1025,7 +975,6 @@ OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; HANDLE DirectoryHandle; - UNICODE_STRING DirectoryName = RTL_CONSTANT_STRING(WINSTA_ROOT_NAME); char InitialBuffer[256], *Buffer; ULONG Context, ReturnLength, BufferSize; DWORD EntryCount; @@ -1037,7 +986,7 @@ */ InitializeObjectAttributes( &ObjectAttributes, - &DirectoryName, + &gustrWindowStationsDir, OBJ_CASE_INSENSITIVE, NULL, NULL);

1 0

[sginsberg] 55840: [NTOSKRNL] - Remove nasty hack to make Windows PCI driver load. This may not be required after the fixes that were committed after this hack. If it is still necessary then please...
by sginsberg＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: sginsberg Date: Fri Feb 24 13:51:52 2012 New Revision: 55840 URL: http://svn.reactos.org/svn/reactos?rev=55840&view=rev Log: [NTOSKRNL] - Remove nasty hack to make Windows PCI driver load. This may not be required after the fixes that were committed after this hack. If it is still necessary then please fix whatever issue makes the PCI driver crash instead of relying on a return from bugcheck call to work... [DDK] - Mark KeBugCheckEx as noreturn again. Should fix Prefast issues where it thought execution could return from the call and would warn about false issues. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5584… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Fri Feb 24 13:51:52 2012 @@ -10206,7 +10206,7 @@ } #endif -//DECLSPEC_NORETURN +DECLSPEC_NORETURN NTKERNELAPI VOID NTAPI Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=5584… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Fri Feb 24 13:51:52 2012 @@ -1432,18 +1432,13 @@ IN ULONG_PTR BugCheckParameter3, IN ULONG_PTR BugCheckParameter4) { - /* Workaround for Windows Server 2003 Checked PCI Driver issue */ - if (!((BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && - (BugCheckParameter1 == 0xDEAD0010))) - { - /* Call the internal API */ - KeBugCheckWithTf(BugCheckCode, - BugCheckParameter1, - BugCheckParameter2, - BugCheckParameter3, - BugCheckParameter4, - NULL); - } + /* Call the internal API */ + KeBugCheckWithTf(BugCheckCode, + BugCheckParameter1, + BugCheckParameter2, + BugCheckParameter3, + BugCheckParameter4, + NULL); } /*

1 0

[arty] 55839: [NEWCC] Integrate september's speed improvements, which now work. Remove the flush hack when unpinning cache segments.
by arty＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: arty Date: Fri Feb 24 11:33:23 2012 New Revision: 55839 URL: http://svn.reactos.org/svn/reactos?rev=55839&view=rev Log: [NEWCC] Integrate september's speed improvements, which now work. Remove the flush hack when unpinning cache segments. Modified: trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/swapout.c Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] Fri Feb 24 11:33:23 2012 @@ -130,6 +130,14 @@ DPRINT("Firing work item for %x\n", Bcb->BaseAddress); + if (Dirty) { + CcpUnlock(); + Bcb->RefCount++; + MiFlushMappedSection(ToUnmap, &BaseOffset, &MappedSize, Dirty); + Bcb->RefCount--; + CcpLock(); + } + if (Immediate) { PROS_SECTION_OBJECT ToDeref = Bcb->SectionObject; @@ -143,8 +151,6 @@ RemoveEntryList(&Bcb->ThisFileList); CcpUnlock(); - if (Dirty) - MiFlushMappedSection(ToUnmap, &BaseOffset, &MappedSize, Dirty); MmUnmapCacheViewInSystemSpace(ToUnmap); ObDereferenceObject(ToDeref); CcpLock(); @@ -763,7 +769,6 @@ CcpUnlock(); if (!Released) { - MiFlushMappedSection(RealBcb->BaseAddress, &RealBcb->FileOffset, &RealBcb->Map->FileSizes.FileSize, RealBcb->Dirty); CcpLock(); CcpUnpinData(RealBcb, TRUE); CcpUnlock(); Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri Feb 24 11:33:23 2012 @@ -259,6 +259,7 @@ if (NT_SUCCESS(Status)) { MmLockAddressSpace(AddressSpace); MmSetCleanAllRmaps(Page); + MmSetPageProtect(MmGetAddressSpaceOwner(AddressSpace), (PVOID)PageAddress, PAGE_READONLY); MmLockSectionSegment(Segment); Entry = MmGetPageEntrySectionSegment(Segment, &FileOffset); if (Entry && !IS_SWAP_FROM_SSE(Entry) && PFN_FROM_SSE(Entry) == Page) @@ -663,6 +664,11 @@ Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + if (Page != 0 && PFN_FROM_SSE(Entry) == Page && Dirty) + { + DPRINT("Freeing section page %x:%x -> %x\n", Segment, Offset.LowPart, Entry); + MmSetPageEntrySectionSegment(Segment, &Offset, DIRTY_SSE(Entry)); + } if (Page) { DPRINT("Removing page %x:%x -> %x\n", Segment, Offset.LowPart, Entry); @@ -671,12 +677,7 @@ MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); MmReleasePageMemoryConsumer(MC_CACHE, Page); } - if (Page != 0 && PFN_FROM_SSE(Entry) == Page && Dirty) - { - DPRINT("Freeing section page %x:%x -> %x\n", Segment, Offset.LowPart, Entry); - MmSetPageEntrySectionSegment(Segment, &Offset, DIRTY_SSE(Entry)); - } - else if (SwapEntry != 0) + if (SwapEntry != 0) { MmFreeSwapPage(SwapEntry); } Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Fri Feb 24 11:33:23 2012 @@ -296,6 +296,7 @@ MmSetPageEntrySectionSegment(Segment, &Offset, DIRTY_SSE(Entry)); } MmSetPageProtect(Process, PAddress, PAGE_READWRITE); + MmSetDirtyPage(Process, PAddress); MmUnlockSectionSegment(Segment); DPRINT("Done\n"); return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Fri Feb 24 11:33:23 2012 @@ -184,11 +184,12 @@ (PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, + BOOLEAN Dirty, PMM_REQUIRED_RESOURCES Required) { NTSTATUS Status = STATUS_SUCCESS; ULONG Entry; - BOOLEAN Dirty = FALSE; + PFN_NUMBER OurPage; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); LARGE_INTEGER TotalOffset; PMM_SECTION_SEGMENT Segment; @@ -202,24 +203,16 @@ MmLockSectionSegment(Segment); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - Dirty = MmIsDirtyPageRmap(Required->Page[0]); Entry = MmGetPageEntrySectionSegment(Segment, &TotalOffset); - if (Dirty) - { - PFN_NUMBER OurPage; + if (Dirty) { + DPRINT("Dirty page: %p:%p segment %p offset %08x%08x\n", Process, Address, Segment, TotalOffset.HighPart, TotalOffset.LowPart); MmSetPageEntrySectionSegment(Segment, &TotalOffset, DIRTY_SSE(Entry)); - MmDeleteRmap(Required->Page[0], Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, &Dirty, &OurPage); - ASSERT(OurPage == Required->Page[0]); - } else { - /* Just unmap if the page wasn't dirty */ - PFN_NUMBER OurPage; - MmDeleteRmap(Required->Page[0], Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, &Dirty, &OurPage); - DPRINT("OurPage %x ThePage %x\n", OurPage, Required->Page[0]); - ASSERT(OurPage == Required->Page[0]); - } + } + + MmDeleteRmap(Required->Page[0], Process, Address); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, &OurPage); + ASSERT(OurPage == Required->Page[0]); if (NT_SUCCESS(Status)) { @@ -368,7 +361,7 @@ DPRINT("%x:%x, page %x %x\n", Process, Address, Page, Resources.Page[0]); Status = MmPageOutCacheSection - (AddressSpace, MemoryArea, Address, &Resources); + (AddressSpace, MemoryArea, Address, Dirty, &Resources); DPRINT("%x\n", Status); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); @@ -398,7 +391,6 @@ MmLockAddressSpace(AddressSpace); } while (Status == STATUS_MM_RESTART_OPERATION); - Dirty |= Resources.State & 1; // Accumulate dirty MmUnlockAddressSpace(AddressSpace);

1 0

[dreimer] 55838: Update for rapps
by dreimer＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: dreimer Date: Fri Feb 24 10:33:06 2012 New Revision: 55838 URL: http://svn.reactos.org/svn/reactos?rev=55838&view=rev Log: Update for rapps Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,59 +2,59 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.26 +Version = 3.6.27 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 8.22MB Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 8.06MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.05MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 8.28MB URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 8.06MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 8.9MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.46MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 8.53MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 8.44MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,59 +2,59 @@ [Section] Name = Mozilla Firefox 10 -Version = 10.0 +Version = 10.0.2 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 15.06MB Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/en-… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/e… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 14.92MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/de/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/d… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 14.88MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/es-… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/e… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 15.18MB URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/fr/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/f… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 14.91MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/nb-… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/n… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 15.76MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/pl/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/p… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 15.33MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/ru/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/r… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 15.57MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/sk/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/s… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 15.32MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/uk/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/u… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.4.5 +Version = 3.5.0 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 190.74MB +Size = 201.3MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.4.5/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.5.0/win/x86/Lib… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.42 +Version = 0.9.44 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.1MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.42-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.44-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = ReactOS Build Environment -Version = 1.5.1.1 +Version = 2.0 Licence = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. -Size = 13.76MB +Size = 17.8MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://ovh.dl.sourceforge.net/project/reactos/RosBE-Windows/i386/1.5.1/RosB… +URLDownload = http://heanet.dl.sourceforge.net/project/reactos/RosBE-Windows/i386/2.0/Ros… CDPath = none [Section.0405] Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,41 +2,41 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.7 +Version = 2.7.2 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 17.59MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/en-US/SeaMonkey%2… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/en-US/SeaMonkey… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 17.56MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/de/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/de/SeaMonkey%20… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 17.49MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/es-ES/SeaMonkey%2… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/es-ES/SeaMonkey… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. Size = 17.79MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/fr/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/fr/SeaMonkey%20… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 18.38MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/pl/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/pl/SeaMonkey%20… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 18.01MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/ru/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/ru/SeaMonkey%20… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 18.01MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/ru/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/ru/SeaMonkey%20… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1.18 +Version = 3.1.19 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.06MB Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.91MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.88MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 9.13MB URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.73MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.29MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.29MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -1,48 +1,48 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Thunderbird 9 -Version = 9.0.1 +Name = Mozilla Thunderbird 10 +Version = 10.0.2 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 16.22MB Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 15.1MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 15.0MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 15.4MB URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 15.9MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 15.5MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 15.5MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = UltraVNC -Version = 1.0.9.6.1 +Version = 1.0.9.6.2 Licence = GPL Description = Open-source VNC client/server. Size = 2.19MB Category = 5 URLSite = http://www.uvnc.com/ -URLDownload = http://support1.uvnc.com/download/10961/UltraVNC_1.0.9.6.1_Setup.exe +URLDownload = http://www.uvnc.eu/download/10962/UltraVNC_1.0.9.6.2_Setup.exe CDPath = none [Section.040a] Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 1.1.11 +Version = 2.0.0 Licence = GPL Description = A media player. -Size = 20.1MB +Size = 21.1MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://kent.dl.sourceforge.net/project/vlc/1.1.11/win32/vlc-1.1.11-win32.exe +URLDownload = http://kent.dl.sourceforge.net/project/vlc/2.0.0/win32/vlc-2.0.0-win32.exe CDPath = none [Section.0407]

1 0

[arty] 55837: [NEWCC] Update used page table entry counts when mapping pages in cache sections.
by arty＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: arty Date: Fri Feb 24 10:05:06 2012 New Revision: 55837 URL: http://svn.reactos.org/svn/reactos?rev=55837&view=rev Log: [NEWCC] Update used page table entry counts when mapping pages in cache sections. Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri Feb 24 10:05:06 2012 @@ -49,6 +49,7 @@ #include "../newcc.h" #define NDEBUG #include <debug.h> +#include "../mm/ARM3/miarm.h" #define DPRINTC DPRINT @@ -56,6 +57,7 @@ extern KEVENT MpwThreadEvent; extern KSPIN_LOCK MiSectionPageTableLock; +extern PMMWSL MmWorkingSetList; /* GLOBALS *******************************************************************/ @@ -137,9 +139,18 @@ { MmSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_PFN_SSE(Page)); Address = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; + MmReferencePage(Page); MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); MmInsertRmap(Page, NULL, Address); +#if (_MI_PAGING_LEVELS == 2) + /* Reference Page Directory Entry */ + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } +#endif } else MmReleasePageMemoryConsumer(MC_CACHE, Page); Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Fri Feb 24 10:05:06 2012 @@ -49,10 +49,12 @@ #include "newmm.h" #define NDEBUG #include <debug.h> +#include "../mm/ARM3/miarm.h" #define DPRINTC DPRINT extern KEVENT MmWaitPageEvent; +extern PMMWSL MmWorkingSetList; NTSTATUS NTAPI @@ -140,6 +142,14 @@ { DPRINT("Set %x in address space @ %x\n", Required->Page[0], Address); Status = MmCreateVirtualMapping(Process, Address, Attributes, Required->Page, 1); +#if (_MI_PAGING_LEVELS == 2) + /* Reference Page Directory Entry */ + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } +#endif if (NT_SUCCESS(Status)) { MmInsertRmap(Required->Page[0], Process, Address); @@ -164,6 +174,14 @@ MmReferencePage(Page); Status = MmCreateVirtualMapping(Process, Address, Attributes, &Page, 1); +#if (_MI_PAGING_LEVELS == 2) + /* Reference Page Directory Entry */ + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } +#endif if (NT_SUCCESS(Status)) { MmInsertRmap(Page, Process, Address);

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