Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 41532: Remove unused stuff.
by dgorbachev＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: dgorbachev Date: Mon Jun 22 15:31:57 2009 New Revision: 41532 URL: http://svn.reactos.org/svn/reactos?rev=41532&view=rev Log: Remove unused stuff. Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdmemsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] Mon Jun 22 15:31:57 2009 @@ -30,89 +30,6 @@ static BOOLEAN KdpPhysAccess = FALSE; -#if 0 -extern ULONG MmGlobalKernelPageDirectory[1024]; -ULONG_PTR IdentityMapAddrHigh, IdentityMapAddrLow; - -ULONGLONG -FASTCALL -KdpPhysRead(ULONG_PTR Addr, LONG Len) -{ - ULONGLONG Result = 0; - ULONG_PTR OldCR3 = __readcr3(), OldCR4 = __readcr4(); - - if (Addr & HIGH_PHYS_MASK) - { - Addr &= ~HIGH_PHYS_MASK; - __writecr3(IdentityMapAddrHigh); - } - else - __writecr3(IdentityMapAddrLow); - - __writecr4(OldCR4|CR4_PAGE_SIZE_BIT); // Turn on large page translation - __invlpg((PVOID)Addr); - - switch (Len) - { - case 8: - Result = *((PULONGLONG)Addr); - break; - case 4: - Result = *((PULONG)Addr); - break; - case 2: - Result = *((PUSHORT)Addr); - break; - case 1: - Result = *((PUCHAR)Addr); - break; - } - __writecr4(OldCR4); // Turn off large page translation - __writecr3(OldCR3); - __invlpg((PVOID)Addr); - - return Result; -} - -VOID -NTAPI -KdpPhysWrite(ULONG_PTR Addr, LONG Len, ULONGLONG Value) -{ - ULONG_PTR OldCR3 = __readcr3(), OldCR4 = __readcr4(); - - if (Addr & HIGH_PHYS_MASK) - { - Addr &= ~HIGH_PHYS_MASK; - __writecr3(IdentityMapAddrHigh); - } - else - __writecr3(IdentityMapAddrLow); - - __writecr4(OldCR4|CR4_PAGE_SIZE_BIT); // Turn on large page translation - __invlpg((PVOID)Addr); - - switch (Len) - { - case 8: - *((PULONGLONG)Addr) = Value; - break; - case 4: - *((PULONG)Addr) = Value; - break; - case 2: - *((PUSHORT)Addr) = Value; - break; - case 1: - *((PUCHAR)Addr) = Value; - break; - } - __writecr4(OldCR4); // Turn off large page translation - __writecr3(OldCR3); - __invlpg((PVOID)Addr); -} - -#else - static ULONG_PTR KdpPhysMap(ULONG_PTR PhysAddr, LONG Len) @@ -194,7 +111,6 @@ break; } } -#endif BOOLEAN NTAPI @@ -291,60 +207,11 @@ return TRUE; } -#if 0 VOID NTAPI -KdpEnableSafeMem() -{ - int i; - PULONG IdentityMapVirt; - PHYSICAL_ADDRESS IdentityMapPhys, Highest = { }; - - if (KdpPhysAccess) - return; - - Highest.LowPart = (ULONG)-1; - /* Allocate a physical page and map it to copy the phys copy code onto */ - IdentityMapVirt = (PULONG)MmAllocateContiguousMemory(2 * PAGE_SIZE, Highest); - IdentityMapPhys = MmGetPhysicalAddress(IdentityMapVirt); - IdentityMapAddrHigh = IdentityMapPhys.LowPart; - - /* Copy the kernel space */ - memcpy(IdentityMapVirt, - MmGlobalKernelPageDirectory, - PAGE_SIZE); - - /* Set up 512 4Mb pages (high 2Gig identity mapped) */ - for (i = 0; i < 512; i++) - { - IdentityMapVirt[i] = - HIGH_PHYS_MASK | (i << 22) | PDE_PS_BIT | PDE_W_BIT | PDE_PRESENT_BIT; - } - - /* Allocate a physical page and map it to copy the phys copy code onto */ - IdentityMapAddrLow = IdentityMapAddrHigh + PAGE_SIZE; - IdentityMapVirt += PAGE_SIZE / sizeof(ULONG); - - /* Copy the kernel space */ - memcpy(IdentityMapVirt, - MmGlobalKernelPageDirectory, - PAGE_SIZE); - - /* Set up 512 4Mb pages (low 2Gig identity mapped) */ - for (i = 0; i < 512; i++) - { - IdentityMapVirt[i] = (i << 22) | PDE_PS_BIT | PDE_W_BIT | PDE_PRESENT_BIT; - } - +KdpEnableSafeMem(VOID) +{ KdpPhysAccess = TRUE; } -#else - -VOID -NTAPI -KdpEnableSafeMem(VOID) -{ - KdpPhysAccess = TRUE; -} -#endif +/* EOF */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_keyboard… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] Mon Jun 22 15:31:57 2009 @@ -14,7 +14,6 @@ #define NDEBUG #include <debug.h> -#if 1 #define KBD_STATUS_REG 0x64 #define KBD_CNTL_REG 0x64 @@ -137,258 +136,4 @@ return -1; } -#endif - -#if 0 - -/* GLOBALS *******************************************************************/ - -/* - * Keyboard I/O ports. - */ -#define K_RDWR 0x60 /* keyboard data & cmds (read/write) */ -#define K_STATUS 0x64 /* keybd status (read-only) */ -#define K_CMD 0x64 /* keybd ctlr command (write-only) */ - -/* - * Bit definitions for K_STATUS port. - */ -#define K_OBUF_FUL 0x01 /* output (from keybd) buffer full */ -#define K_IBUF_FUL 0x02 /* input (to keybd) buffer full */ -#define K_SYSFLAG 0x04 /* "System Flag" */ -#define K_CMD_DATA 0x08 /* 1 = input buf has cmd, 0 = data */ -#define K_KBD_INHIBIT 0x10 /* 0 if keyboard inhibited */ -#define K_AUX_OBUF_FUL 0x20 /* 1 = obuf holds aux device data */ -#define K_TIMEOUT 0x40 /* timout error flag */ -#define K_PARITY_ERROR 0x80 /* parity error flag */ - -/* - * Keyboard controller commands (sent to K_CMD port). - */ -#define KC_CMD_READ 0x20 /* read controller command byte */ -#define KC_CMD_WRITE 0x60 /* write controller command byte */ -#define KC_CMD_DIS_AUX 0xa7 /* disable auxiliary device */ -#define KC_CMD_ENB_AUX 0xa8 /* enable auxiliary device */ -#define KC_CMD_TEST_AUX 0xa9 /* test auxiliary device interface */ -#define KC_CMD_SELFTEST 0xaa /* keyboard controller self-test */ -#define KC_CMD_TEST 0xab /* test keyboard interface */ -#define KC_CMD_DUMP 0xac /* diagnostic dump */ -#define KC_CMD_DISABLE 0xad /* disable keyboard */ -#define KC_CMD_ENABLE 0xae /* enable keyboard */ -#define KC_CMD_RDKBD 0xc4 /* read keyboard ID */ -#define KC_CMD_WIN 0xd0 /* read output port */ -#define KC_CMD_WOUT 0xd1 /* write output port */ -#define KC_CMD_ECHO 0xee /* used for diagnostic testing */ -#define KC_CMD_PULSE 0xff /* pulse bits 3-0 based on low nybble */ - -/* - * Keyboard commands (send to K_RDWR). - */ -#define K_CMD_LEDS 0xed /* set status LEDs (caps lock, etc.) */ -#define K_CMD_TYPEMATIC 0xf3 /* set key repeat and delay */ - -/* - * Bit definitions for controller command byte (sent following - * KC_CMD_WRITE command). - * - * Bits 0x02 and 0x80 unused, always set to 0. - */ -#define K_CB_ENBLIRQ 0x01 /* enable data-ready intrpt */ -#define K_CB_SETSYSF 0x04 /* Set System Flag */ -#define K_CB_INHBOVR 0x08 /* Inhibit Override */ -#define K_CB_DISBLE 0x10 /* disable keyboard */ -#define K_CB_IGNPARITY 0x20 /* ignore parity from keyboard */ -#define K_CB_SCAN 0x40 /* standard scan conversion */ - -/* - * Bit definitions for "Indicator Status Byte" (sent after a - * K_CMD_LEDS command). If the bit is on, the LED is on. Undefined - * bit positions must be 0. - */ -#define K_LED_SCRLLK 0x1 /* scroll lock */ -#define K_LED_NUMLK 0x2 /* num lock */ -#define K_LED_CAPSLK 0x4 /* caps lock */ - -/* - * Bit definitions for "Miscellaneous port B" (K_PORTB). - */ -/* read/write */ -#define K_ENABLETMR2 0x01 /* enable output from timer 2 */ -#define K_SPKRDATA 0x02 /* direct input to speaker */ -#define K_ENABLEPRTB 0x04 /* "enable" port B */ -#define K_EIOPRTB 0x08 /* enable NMI on parity error */ -/* read-only */ -#define K_REFRESHB 0x10 /* refresh flag from INLTCONT PAL */ -#define K_OUT2B 0x20 /* timer 2 output */ -#define K_ICKB 0x40 /* I/O channel check (parity error) */ - -/* - * Bit definitions for the keyboard controller's output port. - */ -#define KO_SYSRESET 0x01 /* processor reset */ -#define KO_GATE20 0x02 /* A20 address line enable */ -#define KO_AUX_DATA_OUT 0x04 /* output data to auxiliary device */ -#define KO_AUX_CLOCK 0x08 /* auxiliary device clock */ -#define KO_OBUF_FUL 0x10 /* keyboard output buffer full */ -#define KO_AUX_OBUF_FUL 0x20 /* aux device output buffer full */ -#define KO_CLOCK 0x40 /* keyboard clock */ -#define KO_DATA_OUT 0x80 /* output data to keyboard */ - -/* - * Keyboard return codes. - */ -#define K_RET_RESET_DONE 0xaa /* BAT complete */ -#define K_RET_ECHO 0xee /* echo after echo command */ -#define K_RET_ACK 0xfa /* ack */ -#define K_RET_RESET_FAIL 0xfc /* BAT error */ -#define K_RET_RESEND 0xfe /* resend request */ - -#define SHIFT -1 -#define CTRL -2 -#define META -3 - -static char keymap[128][2] = { - {0}, /* 0 */ - {27, 27}, /* 1 - ESC */ - {'1', '!'}, /* 2 */ - {'2', '@'}, - {'3', '#'}, - {'4', '$'}, - {'5', '%'}, - {'6', '^'}, - {'7', '&'}, - {'8', '*'}, - {'9', '('}, - {'0', ')'}, - {'-', '_'}, - {'=', '+'}, - {8, 8}, /* 14 - Backspace */ - {'\t', '\t'}, /* 15 */ - {'q', 'Q'}, - {'w', 'W'}, - {'e', 'E'}, - {'r', 'R'}, - {'t', 'T'}, - {'y', 'Y'}, - {'u', 'U'}, - {'i', 'I'}, - {'o', 'O'}, - {'p', 'P'}, - {'[', '{'}, - {']', '}'}, /* 27 */ - {'\r', '\r'}, /* 28 - Enter */ - {CTRL, CTRL}, /* 29 - Ctrl */ - {'a', 'A'}, /* 30 */ - {'s', 'S'}, - {'d', 'D'}, - {'f', 'F'}, - {'g', 'G'}, - {'h', 'H'}, - {'j', 'J'}, - {'k', 'K'}, - {'l', 'L'}, - {';', ':'}, - {'\'', '"'}, /* 40 */ - {'`', '~'}, /* 41 */ - {SHIFT, SHIFT}, /* 42 - Left Shift */ - {'\\', '|'}, /* 43 */ - {'z', 'Z'}, /* 44 */ - {'x', 'X'}, - {'c', 'C'}, - {'v', 'V'}, - {'b', 'B'}, - {'n', 'N'}, - {'m', 'M'}, - {',', '<'}, - {'.', '>'}, - {'/', '?'}, /* 53 */ - {SHIFT, SHIFT}, /* 54 - Right Shift */ - {0, 0}, /* 55 - Print Screen */ - {META, META}, /* 56 - Alt */ - {' ', ' '}, /* 57 - Space bar */ - {0, 0}, /* 58 - Caps Lock */ - {0, 0}, /* 59 - F1 */ - {0, 0}, /* 60 - F2 */ - {0, 0}, /* 61 - F3 */ - {0, 0}, /* 62 - F4 */ - {0, 0}, /* 63 - F5 */ - {0, 0}, /* 64 - F6 */ - {0, 0}, /* 65 - F7 */ - {0, 0}, /* 66 - F8 */ - {0, 0}, /* 67 - F9 */ - {0, 0}, /* 68 - F10 */ - {0, 0}, /* 69 - Num Lock */ - {0, 0}, /* 70 - Scroll Lock */ - {'7', '7'}, /* 71 - Numeric keypad 7 */ - {'8', '8'}, /* 72 - Numeric keypad 8 */ - {'9', '9'}, /* 73 - Numeric keypad 9 */ - {'-', '-'}, /* 74 - Numeric keypad '-' */ - {'4', '4'}, /* 75 - Numeric keypad 4 */ - {'5', '5'}, /* 76 - Numeric keypad 5 */ - {'6', '6'}, /* 77 - Numeric keypad 6 */ - {'+', '+'}, /* 78 - Numeric keypad '+' */ - {'1', '1'}, /* 79 - Numeric keypad 1 */ - {'2', '2'}, /* 80 - Numeric keypad 2 */ - {'3', '3'}, /* 81 - Numeric keypad 3 */ - {'0', '0'}, /* 82 - Numeric keypad 0 */ - {'.', '.'}, /* 83 - Numeric keypad '.' */ -}; - -/* FUNCTIONS *****************************************************************/ - -/* - * Quick poll for a pending input character. - * Returns a character if available, -1 otherwise. This routine can return - * false negatives in the following cases: - * - * - a valid character is in transit from the keyboard when called - * - a key release is received (from a previous key press) - * - a SHIFT key press is received (shift state is recorded however) - * - a key press for a multi-character sequence is received - * - * Yes, this is horrible. - */ -ULONG -KdbpTryGetCharKeyboard(VOID) -{ - static unsigned shift_state, ctrl_state, meta_state; - unsigned scan_code, ch; - - /* See if a scan code is ready, returning if none. */ - if ((READ_PORT_UCHAR((PUCHAR)K_STATUS) & K_OBUF_FUL) == 0) { - return -1; - } - scan_code = READ_PORT_UCHAR((PUCHAR)K_RDWR); - - /* Handle key releases - only release of SHIFT is important. */ - if (scan_code & 0x80) { - scan_code &= 0x7f; - if (keymap[scan_code][0] == SHIFT) - shift_state = 0; - else if (keymap[scan_code][0] == CTRL) - ctrl_state = 0; - else if (keymap[scan_code][0] == META) - meta_state = 0; - ch = -1; - } else { - /* Translate the character through the keymap. */ - ch = keymap[scan_code][shift_state] | meta_state; - if (ch == SHIFT) { - shift_state = 1; - ch = -1; - } else if (ch == CTRL) { - ctrl_state = 1; - ch = -1; - } else if (ch == META) { - meta_state = 0200; - ch = -1; - } else if (ch == 0) - ch = -1; - else if (ctrl_state) - ch = (keymap[scan_code][1] - '@') | meta_state; - } - - return ch; -} - -#endif +/* EOF */

1 0

[tkreuzer] 41531: fix pointer <-> DWORD casts
by tkreuzer＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: tkreuzer Date: Mon Jun 22 15:15:14 2009 New Revision: 41531 URL: http://svn.reactos.org/svn/reactos?rev=41531&view=rev Log: fix pointer <-> DWORD casts Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/exitros.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] Mon Jun 22 15:15:14 2009 @@ -57,7 +57,7 @@ DPRINT1("Can't get window creator\n"); return STATUS_INVALID_HANDLE; } - if (WindowCreator != (DWORD)LogonProcess) + if (WindowCreator != (DWORD_PTR)LogonProcess) { DPRINT1("Trying to register window not created by winlogon as notify window\n"); return STATUS_ACCESS_DENIED; @@ -481,7 +481,7 @@ } else { - Context.ProcessId = (DWORD) ProcessData->ProcessId; + Context.ProcessId = (DWORD_PTR) ProcessData->ProcessId; Context.wParam = 0; Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? ENDSESSION_LOGOFF : 0); @@ -527,7 +527,7 @@ /* Terminate this process */ Process = OpenProcess(PROCESS_TERMINATE, FALSE, - (DWORD) ProcessData->ProcessId); + (DWORD_PTR) ProcessData->ProcessId); if (NULL == Process) { DPRINT1("Unable to open process %d, error %d\n", ProcessData->ProcessId, @@ -560,7 +560,7 @@ PCSRSS_PROCESS_DATA *NewData; /* Do not kill winlogon or csrss */ - if ((DWORD) ProcessData->ProcessId == Context->CsrssProcess || + if ((DWORD_PTR) ProcessData->ProcessId == Context->CsrssProcess || ProcessData->ProcessId == LogonProcess) { return STATUS_SUCCESS; @@ -568,7 +568,7 @@ /* Get the login session of this process */ Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, - (DWORD) ProcessData->ProcessId); + (DWORD_PTR) ProcessData->ProcessId); if (NULL == Process) { DPRINT1("Unable to open process %d, error %d\n", ProcessData->ProcessId, @@ -600,7 +600,7 @@ &(Origin.OriginatingLogonSession))) { /* Kill the shell process last */ - if ((DWORD) ProcessData->ProcessId == Context->ShellProcess) + if ((DWORD_PTR) ProcessData->ProcessId == Context->ShellProcess) { ProcessData->ShutdownLevel = 0; } @@ -767,7 +767,7 @@ TOKEN_USER *UserInfo; SHUTDOWN_SETTINGS ShutdownSettings; - if (ProcessId != (DWORD) LogonProcess) + if (ProcessId != (DWORD_PTR) LogonProcess) { DPRINT1("Internal ExitWindowsEx call not from winlogon\n"); return STATUS_ACCESS_DENIED; @@ -928,13 +928,13 @@ if (0 == (Request->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) { - return UserExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, + return UserExitReactos((DWORD_PTR) Request->Header.ClientId.UniqueProcess, Request->Data.ExitReactosRequest.Flags); } else { - return InternalExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, - (DWORD) Request->Header.ClientId.UniqueThread, + return InternalExitReactos((DWORD_PTR) Request->Header.ClientId.UniqueProcess, + (DWORD_PTR) Request->Header.ClientId.UniqueThread, Request->Data.ExitReactosRequest.Flags); } }

1 0

[ros-arm-bringup] 41530: - Initialize system PTE space.
by ros-arm-bringup＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: ros-arm-bringup Date: Mon Jun 22 14:22:19 2009 New Revision: 41530 URL: http://svn.reactos.org/svn/reactos?rev=41530&view=rev Log: - Initialize system PTE space. Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Mon Jun 22 14:22:19 2009 @@ -443,6 +443,11 @@ ASSERT((MmNumberOfSystemPtes - OldCount) <= 1000); DPRINT1("Final System PTE count: %d (%d bytes)\n", MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); + + // + // Create the system PTE space + // + MiInitializeSystemPtes(PointerPte, MmNumberOfSystemPtes, SystemPteSpace); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Mon Jun 22 14:22:19 2009 @@ -23,6 +23,7 @@ PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; MMPTE MmFirstFreeSystemPte[MaximumPtePoolTypes]; ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; +ULONG MmTotalSystemPtes; /* PRIVATE FUNCTIONS **********************************************************/ @@ -36,7 +37,6 @@ // Sanity checks // ASSERT(NumberOfPtes >= 1); - ASSERT(PoolType == NonPagedPoolExpansion); // // Set the starting and ending PTE addresses for this space @@ -71,6 +71,17 @@ // We also keep a global for it // MmTotalFreeSystemPtes[PoolType] = NumberOfPtes; + + // + // Check if this is the system PTE space + // + if (PoolType == SystemPteSpace) + { + // + // Remember how many PTEs we have + // + MmTotalSystemPtes = NumberOfPtes; + } } /* EOF */

1 0

[ros-arm-bringup] 41529: - Initialize count of System PTEs: - Use 7000 for systems with 19MB of RAM or less, 11000 for systems between 19 and 32MB of RAM, and 22000 for systems with more than that. - Windows will go up to 50000 on server machines, but this is likely not needed now (22000 system PTEs is roughly 100 MB). - This now affects the calculation of MmNonPagedSystemStart, which is now correct and reflects the nonpaged address space of the system. - System PTEs are not yet initialized (but
by ros-arm-bringup＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: ros-arm-bringup Date: Mon Jun 22 13:34:24 2009 New Revision: 41529 URL: http://svn.reactos.org/svn/reactos?rev=41529&view=rev Log: - Initialize count of System PTEs: - Use 7000 for systems with 19MB of RAM or less, 11000 for systems between 19 and 32MB of RAM, and 22000 for systems with more than that. - Windows will go up to 50000 on server machines, but this is likely not needed now (22000 system PTEs is roughly 100 MB). - This now affects the calculation of MmNonPagedSystemStart, which is now correct and reflects the nonpaged address space of the system. - System PTEs are not yet initialized (but their page tables are mapped by the same code which maps nonpaged pool expansion VA page tables). Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Mon Jun 22 13:34:24 2009 @@ -94,6 +94,13 @@ PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; PVOID MmNonPagedPoolEnd = (PVOID)0xFFBE0000; + +// +// Windows NT seems to choose between 7000, 11000 and 50000 +// On systems with more than 32MB, this number is then doubled, and further +// aligned up to a PDE boundary (4MB). +// +ULONG MmNumberOfSystemPtes; /* PRIVATE FUNCTIONS **********************************************************/ @@ -109,11 +116,40 @@ MMPTE TempPde = HyperTemplatePte, TempPte = HyperTemplatePte; PVOID NonPagedPoolExpansionVa, BaseAddress; NTSTATUS Status; + ULONG OldCount; BoundaryAddressMultiple.QuadPart = Low.QuadPart = 0; High.QuadPart = -1; if (Phase == 0) { + // + // Check if this is a machine with less than 19MB of RAM + // + if (MmNumberOfPhysicalPages < MI_MIN_PAGES_FOR_SYSPTE_TUNING) + { + // + // Use the very minimum of system PTEs + // + MmNumberOfSystemPtes = 7000; + } + else + { + // + // Use the default, but check if we have more than 32MB of RAM + // + MmNumberOfSystemPtes = 11000; + if (MmNumberOfPhysicalPages > MI_MIN_PAGES_FOR_SYSPTE_BOOST) + { + // + // Double the amount of system PTEs + // + MmNumberOfSystemPtes <<= 1; + } + } + + DPRINT1("System PTE count has been tuned to %d (%d bytes)\n", + MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); + // // Check if this is a machine with less than 256MB of RAM, and no overide // @@ -212,28 +248,47 @@ NonPagedPoolExpansionVa = MmNonPagedPoolStart; DPRINT1("NP Pool has been tuned to: %d bytes and %d bytes\n", MmSizeOfNonPagedPoolInBytes, MmMaximumNonPagedPoolInBytes); - DPRINT1("NP Expansion VA begins at: %p and ends at: %p\n", - MmNonPagedPoolStart, MmNonPagedPoolEnd); - - // - // Now calculate the nonpaged system VA region - // This includes nonpaged pool expansion (above) and the system PTEs - // Since there are no system PTEs yet, this is (for now) the same - // - MmNonPagedSystemStart = MmNonPagedPoolStart; - DPRINT1("NP System VA (later will be System PTEs) start at: %p\n", - MmNonPagedSystemStart); - + + // + // Now calculate the nonpaged system VA region, which includes the + // nonpaged pool expansion (above) and the system PTEs. Note that it is + // then aligned to a PDE boundary (4MB). + // + MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedPoolStart - + (MmNumberOfSystemPtes + 1) * PAGE_SIZE); + MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedSystemStart & + ~((4 * 1024 * 1024) - 1)); + + // + // Don't let it go below the minimum + // + if (MmNonPagedSystemStart < (PVOID)0xEB000000) + { + // + // This is a hard-coded limit in the Windows NT address space + // + MmNonPagedSystemStart = (PVOID)0xEB000000; + + // + // Reduce the amount of system PTEs to reach this point + // + MmNumberOfSystemPtes = ((ULONG_PTR)MmNonPagedPoolStart - + (ULONG_PTR)MmNonPagedSystemStart) >> + PAGE_SHIFT; + MmNumberOfSystemPtes--; + ASSERT(MmNumberOfSystemPtes > 1000); + } + // // Non paged pool should come after the PFN database, but since we are // co-existing with the ReactOS NP pool, our "ARM Pool" will instead // start at this arbitrarly chosen base address. // When ARM pool becomes non paged pool, this needs to be changed. // + DPRINT1("System PTE VA starts at: %p\n", MmNonPagedSystemStart); + DPRINT1("NP Expansion VA begins at: %p and ends at: %p\n", + MmNonPagedPoolStart, MmNonPagedPoolEnd); MmNonPagedPoolStart = (PVOID)0xA0000000; - DPRINT1("NP VA begins at: %p and ends at: %p\n", - MmNonPagedPoolStart, - (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes); // // Now we actually need to get these many physical pages. Nonpaged pool @@ -244,11 +299,14 @@ High, BoundaryAddressMultiple); ASSERT(PageFrameIndex != 0); + DPRINT1("NP VA begins at: %p and ends at: %p\n", + MmNonPagedPoolStart, + (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes); DPRINT1("NP PA PFN begins at: %lx\n", PageFrameIndex); // // Now we need some pages to create the page tables for the NP system VA - // which would normally include system PTEs and expansion NP + // which includes system PTEs and expansion NP // StartPde = MiAddressToPde(MmNonPagedSystemStart); EndPde = MiAddressToPde((PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); @@ -311,7 +369,7 @@ } // - // Now rememeber where the expansion starts + // Now remember where the expansion starts // MmNonPagedPoolExpansionStart = NonPagedPoolExpansionVa; @@ -348,7 +406,7 @@ ASSERT(Status == STATUS_SUCCESS); // - // And we need one more for the system NP (expansion NP only for now) + // And we need one more for the system NP // BaseAddress = MmNonPagedSystemStart; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), @@ -364,9 +422,27 @@ ASSERT(Status == STATUS_SUCCESS); // + // Sanity check: make sure we have properly defined the system PTE space + // + ASSERT(MiAddressToPte(MmNonPagedSystemStart) < + MiAddressToPte(MmNonPagedPoolExpansionStart)); + + // // Now go ahead and initialize the ARM pool // MiInitializeArmPool(); + + // + // We PDE-aligned the nonpaged system start VA, so haul some extra PTEs! + // + PointerPte = MiAddressToPte(MmNonPagedSystemStart); + OldCount = MmNumberOfSystemPtes; + MmNumberOfSystemPtes = MiAddressToPte(MmNonPagedPoolExpansionStart) - + PointerPte; + MmNumberOfSystemPtes--; + ASSERT((MmNumberOfSystemPtes - OldCount) <= 1000); + DPRINT1("Final System PTE count: %d (%d bytes)\n", + MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Jun 22 13:34:24 2009 @@ -7,6 +7,8 @@ */ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32*1024*1024) >> PAGE_SHIFT) #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_FREE_PAGE_LISTS 4

1 0

[ros-arm-bringup] 41528: - Initialize nonpaged pool expansion system PTEs (MiInitializeSystemPtes): - Just supports expansion space for now, not system space. - Very basic initialization of the accounting structures required. - Sets up the first two system PTE clusters for the space (the first contains the linkage, the second contains the sizage). - Called from MiInitializeArmPool.
by ros-arm-bringup＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: ros-arm-bringup Date: Mon Jun 22 12:51:28 2009 New Revision: 41528 URL: http://svn.reactos.org/svn/reactos?rev=41528&view=rev Log: - Initialize nonpaged pool expansion system PTEs (MiInitializeSystemPtes): - Just supports expansion space for now, not system space. - Very basic initialization of the accounting structures required. - Sets up the first two system PTE clusters for the space (the first contains the linkage, the second contains the sizage). - Called from MiInitializeArmPool. Added: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c (with props) Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Jun 22 12:51:28 2009 @@ -10,6 +10,13 @@ #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_FREE_PAGE_LISTS 4 + +typedef enum _MMSYSTEM_PTE_POOL_TYPE +{ + SystemPteSpace, + NonPagedPoolExpansion, + MaximumPtePoolTypes +} MMSYSTEM_PTE_POOL_TYPE; extern MMPTE HyperTemplatePte; @@ -24,4 +31,12 @@ VOID ); +VOID +NTAPI +MiInitializeSystemPtes( + IN PMMPTE StartingPte, + IN ULONG NumberOfPtes, + IN MMSYSTEM_PTE_POOL_TYPE PoolType +); + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Mon Jun 22 12:51:28 2009 @@ -120,6 +120,9 @@ // guard page on top so make sure to skip it. The bottom guard page will be // guaranteed by the fact our size is off by one. // + MiInitializeSystemPtes(PointerPte + 1, + MiExpansionPoolPagesInitialCharge, + NonPagedPoolExpansion); } /* EOF */ Added: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Mon Jun 22 12:51:28 2009 @@ -1,0 +1,76 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/syspte.c + * PURPOSE: ARM Memory Manager System PTE Allocator + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::SYSPTE" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +PMMPTE MmSystemPteBase; +PMMPTE MmSystemPtesStart[MaximumPtePoolTypes]; +PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; +MMPTE MmFirstFreeSystemPte[MaximumPtePoolTypes]; +ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +MiInitializeSystemPtes(IN PMMPTE StartingPte, + IN ULONG NumberOfPtes, + IN MMSYSTEM_PTE_POOL_TYPE PoolType) +{ + // + // Sanity checks + // + ASSERT(NumberOfPtes >= 1); + ASSERT(PoolType == NonPagedPoolExpansion); + + // + // Set the starting and ending PTE addresses for this space + // + MmSystemPteBase = (PVOID)PAGETABLE_MAP; + MmSystemPtesStart[PoolType] = StartingPte; + MmSystemPtesEnd[PoolType] = StartingPte + NumberOfPtes - 1; + DPRINT1("System PTE space for %d starting at: %p and ending at: %p\n", + PoolType, MmSystemPtesStart[PoolType], MmSystemPtesEnd[PoolType]); + + // + // Clear all the PTEs to start with + // + RtlZeroMemory(StartingPte, NumberOfPtes * sizeof(MMPTE)); + + // + // Make the first entry free and link it + // + StartingPte->u.List.NextEntry = -1; + MmFirstFreeSystemPte[PoolType].u.Long = 0; + MmFirstFreeSystemPte[PoolType].u.List.NextEntry = StartingPte - + MmSystemPteBase; + + // + // The second entry stores the size of this PTE space + // + StartingPte++; + StartingPte->u.Long = 0; + StartingPte->u.List.NextEntry = NumberOfPtes; + + // + // We also keep a global for it + // + MmTotalFreeSystemPtes[PoolType] = NumberOfPtes; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Jun 22 12:51:28 2009 @@ -362,6 +362,7 @@ <directory name="ARM3"> <file>init.c</file> <file>pool.c</file> + <file>syspte.c</file> </directory> <file>anonmem.c</file> <file>balance.c</file>

1 0

[ros-arm-bringup] 41527: - Initialize the ARM pool (MiInitializeArmPool): - Do some additional accounting to keep track of initial nonpaged pool range and size. - Create and initialize the free page lists, and free page entries. - Validate that the initial nonpaged pool address space was properly mapped. - Validate that the expansion nonpaged pool address space is unmapped, and prepare to map it.
by ros-arm-bringup＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: ros-arm-bringup Date: Mon Jun 22 12:22:41 2009 New Revision: 41527 URL: http://svn.reactos.org/svn/reactos?rev=41527&view=rev Log: - Initialize the ARM pool (MiInitializeArmPool): - Do some additional accounting to keep track of initial nonpaged pool range and size. - Create and initialize the free page lists, and free page entries. - Validate that the initial nonpaged pool address space was properly mapped. - Validate that the expansion nonpaged pool address space is unmapped, and prepare to map it. Added: trunk/reactos/ntoskrnl/mm/ARM3/pool.c (with props) Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Mon Jun 22 12:22:41 2009 @@ -362,6 +362,11 @@ 0, BoundaryAddressMultiple); ASSERT(Status == STATUS_SUCCESS); + + // + // Now go ahead and initialize the ARM pool + // + MiInitializeArmPool(); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Jun 22 12:22:41 2009 @@ -9,7 +9,19 @@ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) +#define MI_MAX_FREE_PAGE_LISTS 4 extern MMPTE HyperTemplatePte; +extern ULONG MmSizeOfNonPagedPoolInBytes; +extern ULONG MmMaximumNonPagedPoolInBytes; +extern PVOID MmNonPagedPoolStart; +extern PVOID MmNonPagedPoolExpansionStart; + +VOID +NTAPI +MiInitializeArmPool( + VOID +); + /* EOF */ Added: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Mon Jun 22 12:22:41 2009 @@ -1,0 +1,125 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/pool.c + * PURPOSE: ARM Memory Manager Pool Allocator + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::POOL" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +LIST_ENTRY MmNonPagedPoolFreeListHead[MI_MAX_FREE_PAGE_LISTS]; +PFN_NUMBER MmNumberOfFreeNonPagedPool, MiExpansionPoolPagesInitialCharge; +PVOID MmNonPagedPoolEnd0; +PFN_NUMBER MiStartOfInitialPoolFrame, MiEndOfInitialPoolFrame; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +MiInitializeArmPool(VOID) +{ + ULONG i; + PFN_NUMBER PoolPages; + PMMFREE_POOL_ENTRY FreeEntry, FirstEntry; + PMMPTE PointerPte; + PAGED_CODE(); + + // + // We keep 4 lists of free pages (4 lists help avoid contention) + // + for (i = 0; i < MI_MAX_FREE_PAGE_LISTS; i++) + { + // + // Initialize each of them + // + InitializeListHead(&MmNonPagedPoolFreeListHead[i]); + } + + // + // Calculate how many pages the initial nonpaged pool has + // + PoolPages = BYTES_TO_PAGES(MmSizeOfNonPagedPoolInBytes); + MmNumberOfFreeNonPagedPool = PoolPages; + + // + // Initialize the first free entry + // + FreeEntry = MmNonPagedPoolStart; + FirstEntry = FreeEntry; + FreeEntry->Size = PoolPages; + FreeEntry->Owner = FirstEntry; + + // + // Insert it into the last list + // + InsertHeadList(&MmNonPagedPoolFreeListHead[MI_MAX_FREE_PAGE_LISTS - 1], + &FreeEntry->List); + + // + // Now create free entries for every single other page + // + while (PoolPages-- > 1) + { + // + // Link them all back to the original entry + // + FreeEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)FreeEntry + PAGE_SIZE); + FreeEntry->Owner = FirstEntry; + } + + // + // Validate and remember first allocated pool page + // + PointerPte = MiAddressToPte(MmNonPagedPoolStart); + ASSERT(PointerPte->u.Hard.Valid == 1); + MiStartOfInitialPoolFrame = PFN_FROM_PTE(PointerPte); + + // + // Keep track of where initial nonpaged pool ends + // + MmNonPagedPoolEnd0 = (PVOID)((ULONG_PTR)MmNonPagedPoolStart + + MmSizeOfNonPagedPoolInBytes); + + // + // Validate and remember last allocated pool page + // + PointerPte = MiAddressToPte((PVOID)((ULONG_PTR)MmNonPagedPoolEnd0 - 1)); + ASSERT(PointerPte->u.Hard.Valid == 1); + MiEndOfInitialPoolFrame = PFN_FROM_PTE(PointerPte); + + // + // Validate the first nonpaged pool expansion page (which is a guard page) + // + PointerPte = MiAddressToPte(MmNonPagedPoolExpansionStart); + ASSERT(PointerPte->u.Hard.Valid == 0); + + // + // Calculate the size of the expansion region alone + // + MiExpansionPoolPagesInitialCharge = + BYTES_TO_PAGES(MmMaximumNonPagedPoolInBytes - MmSizeOfNonPagedPoolInBytes); + + // + // Remove 2 pages, since there's a guard page on top and on the bottom + // + MiExpansionPoolPagesInitialCharge -= 2; + + // + // Now initialize the nonpaged pool expansion PTE space. Remember there's a + // guard page on top so make sure to skip it. The bottom guard page will be + // guaranteed by the fact our size is off by one. + // +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/pool.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/pool.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Jun 22 12:22:41 2009 @@ -361,6 +361,7 @@ </if> <directory name="ARM3"> <file>init.c</file> + <file>pool.c</file> </directory> <file>anonmem.c</file> <file>balance.c</file>

1 0

[cgutman] 41526: - Revert wininet back to pre-41059 - Fixes random corruption of downloads
by cgutman＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cgutman Date: Mon Jun 22 10:45:21 2009 New Revision: 41526 URL: http://svn.reactos.org/svn/reactos?rev=41526&view=rev Log: - Revert wininet back to pre-41059 - Fixes random corruption of downloads Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/wininet/wininet.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.…

1 0

[ros-arm-bringup] 41524: - The SVN pre-commit hook is broken: /srv/svn/reactos/hooks/commit-eol-style-check.pl: `/usr/bin/svnlook proplist /srv/svn/reactos -t 41523-w6z --verbose trunk/reactos/ntoskrnl/mm/ARM?\194?\179/init.c' failed with this output: svnlook: Path 'trunk/reactos/ntoskrnl/mm/ARM?\194?\179/init.c' does not exist.
by ros-arm-bringup＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: ros-arm-bringup Date: Mon Jun 22 10:13:23 2009 New Revision: 41524 URL: http://svn.reactos.org/svn/reactos?rev=41524&view=rev Log: - The SVN pre-commit hook is broken: /srv/svn/reactos/hooks/commit-eol-style-check.pl: `/usr/bin/svnlook proplist /srv/svn/reactos -t 41523-w6z --verbose trunk/reactos/ntoskrnl/mm/ARM?\194?\179/init.c' failed with this output: svnlook: Path 'trunk/reactos/ntoskrnl/mm/ARM?\194?\179/init.c' does not exist. Added: trunk/reactos/ntoskrnl/mm/ARM3/ - copied from r41523, trunk/reactos/ntoskrnl/mm/ARM³/ Removed: trunk/reactos/ntoskrnl/mm/ARM³/

1 0

[cgutman] 41522: - Fix a bug that caused translations of NdisParameterInteger values into unicode strings to produce bad results - Fix a bug that caused NdisParameterMultiString values to be written to the registry incorrectly
by cgutman＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cgutman Date: Mon Jun 22 05:10:58 2009 New Revision: 41522 URL: http://svn.reactos.org/svn/reactos?rev=41522&view=rev Log: - Fix a bug that caused translations of NdisParameterInteger values into unicode strings to produce bad results - Fix a bug that caused NdisParameterMultiString values to be written to the registry incorrectly Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Jun 22 05:10:58 2009 @@ -63,7 +63,7 @@ * I don't know why tho so i free everything before return. comments welcome. */ { - ULONG ParameterType = ParameterValue->ParameterType; + ULONG ParameterType; ULONG DataSize; PVOID Data; WCHAR Buff[25]; @@ -71,7 +71,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); /* reset parameter type to standard reg types */ - switch(ParameterType) + switch(ParameterValue->ParameterType) { case NdisParameterHexInteger: case NdisParameterInteger: @@ -85,7 +85,7 @@ ParameterType = REG_SZ; if (!NT_SUCCESS(RtlIntegerToUnicodeString( ParameterValue->ParameterData.IntegerData, - (ParameterType == NdisParameterInteger) ? 10 : 16, &Str))) + (ParameterValue->ParameterType == NdisParameterInteger) ? 10 : 16, &Str))) { *Status = NDIS_STATUS_FAILURE; return; @@ -96,7 +96,7 @@ break; case NdisParameterString: case NdisParameterMultiString: - ParameterType = REG_SZ; + ParameterType = (ParameterValue->ParameterType == NdisParameterString) ? REG_SZ : REG_MULTI_SZ; Data = ParameterValue->ParameterData.StringData.Buffer; DataSize = ParameterValue->ParameterData.StringData.Length; break;

1 0

[cgutman] 41521: - Partial rewrite of NdisReadConfiguration - It now determines the parameter type based on the key instead of the ParameterType passed by the caller (documented on MSDN) - It also always sets (*ParameterValue)->ParameterType to NdisParameterInteger when reading an integer or hex integer value (documented on MSDN) - This will fix miniport drivers that supply a bogus ParameterType value because it is ignored by NDIS on NT
by cgutman＠svn.reactos.org 22 Jun '09

22 Jun '09

Author: cgutman Date: Mon Jun 22 04:49:06 2009 New Revision: 41521 URL: http://svn.reactos.org/svn/reactos?rev=41521&view=rev Log: - Partial rewrite of NdisReadConfiguration - It now determines the parameter type based on the key instead of the ParameterType passed by the caller (documented on MSDN) - It also always sets (*ParameterValue)->ParameterType to NdisParameterInteger when reading an integer or hex integer value (documented on MSDN) - This will fix miniport drivers that supply a bogus ParameterType value because it is ignored by NDIS on NT Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Jun 22 04:49:06 2009 @@ -323,21 +323,10 @@ ULONG KeyDataLength; PMINIPORT_RESOURCE MiniportResource; PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext = (PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle; + PVOID Buffer; *ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; - - if(ParameterType != NdisParameterInteger && - ParameterType != NdisParameterHexInteger && - ParameterType != NdisParameterString && - ParameterType != NdisParameterMultiString && - ParameterType != NdisParameterBinary - ) - { - NDIS_DbgPrint(MIN_TRACE,("unsupported parameter type\n")); - *Status = NDIS_STATUS_NOT_SUPPORTED; - return; - } NDIS_DbgPrint(MAX_TRACE,("requested read of %wZ\n", Keyword)); @@ -498,152 +487,105 @@ return; } - switch(ParameterType) - { - case NdisParameterInteger: - case NdisParameterHexInteger: + *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); + if (!*ParameterValue) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + RtlZeroMemory(*ParameterValue, sizeof(NDIS_CONFIGURATION_PARAMETER)); + + if (KeyInformation->Type == REG_BINARY) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterBinary\n")); + + (*ParameterValue)->ParameterType = NdisParameterBinary; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) { - UNICODE_STRING str; - - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; - str.Buffer = (PWCHAR)KeyInformation->Data; - - (*ParameterValue)->ParameterType = ParameterType; - - /* - If ParameterType is NdisParameterInteger then the base of str is decimal. - If ParameterType is NdisParameterHexInteger then the base of str is hexadecimal. - */ - if (ParameterType == NdisParameterInteger) - *Status = RtlUnicodeStringToInteger(&str, 10, &(*ParameterValue)->ParameterData.IntegerData); - else if (ParameterType == NdisParameterHexInteger) - *Status = RtlUnicodeStringToInteger(&str, 16, &(*ParameterValue)->ParameterData.IntegerData); - - + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); ExFreePool(KeyInformation); - - if(*Status != STATUS_SUCCESS) { - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_FAILURE; - return; - } - - MiniportResource->ResourceType = 0; - MiniportResource->Resource = *ParameterValue; - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - *Status = NDIS_STATUS_SUCCESS; - + *Status = NDIS_STATUS_RESOURCES; return; } - case NdisParameterString: - case NdisParameterMultiString: + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.BinaryData.Buffer = Buffer; + (*ParameterValue)->ParameterData.BinaryData.Length = KeyInformation->DataLength; + } + else if (KeyInformation->Type == REG_MULTI_SZ) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterMultiString\n")); + + (*ParameterValue)->ParameterType = NdisParameterMultiString; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) { - PWCHAR RegData = 0; - - if(KeyInformation->Type != REG_SZ && KeyInformation->Type != REG_MULTI_SZ) - { - NDIS_DbgPrint(MIN_TRACE,("requested type does not match actual value type\n")); - ExFreePool(KeyInformation); - *ParameterValue = NULL; - *Status = NDIS_STATUS_FAILURE; - return; - } - - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - RegData = ExAllocatePool(PagedPool, KeyInformation->DataLength); - if(!RegData) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_FAILURE; - return; - } - - MiniportResource->ResourceType = 0; - MiniportResource->Resource = *ParameterValue; - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - memcpy(RegData, KeyInformation->Data, KeyInformation->DataLength); - - (*ParameterValue)->ParameterType = ParameterType; - (*ParameterValue)->ParameterData.StringData.Length = (USHORT)KeyInformation->DataLength; - (*ParameterValue)->ParameterData.StringData.Buffer = RegData; - + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); ExFreePool(KeyInformation); - - *Status = NDIS_STATUS_SUCCESS; - + *Status = NDIS_STATUS_RESOURCES; return; } - case NdisParameterBinary: - { - if(KeyInformation->Type != REG_BINARY) - { - NDIS_DbgPrint(MIN_TRACE,("requested type does not match actual value type\n")); - *Status = NDIS_STATUS_FAILURE; - ExFreePool(KeyInformation); - return; - } - - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER) + KeyInformation->DataLength); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - (*ParameterValue)->ParameterData.BinaryData.Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); - if (!(*ParameterValue)->ParameterData.BinaryData.Buffer) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - (*ParameterValue)->ParameterType = ParameterType; - (*ParameterValue)->ParameterData.BinaryData.Length = KeyInformation->DataLength; - memcpy((*ParameterValue)->ParameterData.BinaryData.Buffer, KeyInformation->Data, KeyInformation->DataLength); - - MiniportResource->ResourceType = 0; - MiniportResource->Resource = *ParameterValue; - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - ExFreePool(KeyInformation); - - *Status = NDIS_STATUS_SUCCESS; - - return; - } - } + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; + (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; + } + else + { + UNICODE_STRING str; + + str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; + str.Buffer = (PWCHAR)KeyInformation->Data; + + if ((*Status = RtlUnicodeStringToInteger(&str, 0, + &(*ParameterValue)->ParameterData.IntegerData)) == STATUS_SUCCESS) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterInteger\n")); + + (*ParameterValue)->ParameterType = NdisParameterInteger; + } + else + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterString\n")); + + (*ParameterValue)->ParameterType = NdisParameterString; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; + (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; + } + } + + MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_MEMORY; + MiniportResource->Resource = *ParameterValue; + + ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); + + ExFreePool(KeyInformation); + + *Status = NDIS_STATUS_SUCCESS; }

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