Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[tkreuzer] 34968: feeldr: - add a funtion to display the loader block - initialize pointer to DbgPrint in the loader block
by tkreuzer＠svn.reactos.org 31 Jul '08

31 Jul '08

Author: tkreuzer Date: Wed Jul 30 19:06:49 2008 New Revision: 34968 URL: http://svn.reactos.org/svn/reactos?rev=34968&view=rev Log: feeldr: - add a funtion to display the loader block - initialize pointer to DbgPrint in the loader block Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Wed Jul 30 19:06:49 2008 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -//#undef DbgPrint +#undef DbgPrint /* Page Directory and Tables for non-PAE Systems */ extern ULONG_PTR NextModuleBase; @@ -33,6 +33,33 @@ /* FUNCTIONS *****************************************************************/ +void +DumpLoaderBlock() +{ + DbgPrint("LoaderBlock @ %p.\n", &LoaderBlock); + DbgPrint("Flags = 0x%x.\n", LoaderBlock.Flags); + DbgPrint("MemLower = 0x%p.\n", (PVOID)LoaderBlock.MemLower); + DbgPrint("MemHigher = 0x%p.\n", (PVOID)LoaderBlock.MemHigher); + DbgPrint("BootDevice = 0x%x.\n", LoaderBlock.BootDevice); + DbgPrint("CommandLine = %s.\n", LoaderBlock.CommandLine); + DbgPrint("ModsCount = 0x%x.\n", LoaderBlock.ModsCount); + DbgPrint("ModsAddr = 0x%p.\n", LoaderBlock.ModsAddr); + DbgPrint("Syms = 0x%s.\n", LoaderBlock.Syms); + DbgPrint("MmapLength = 0x%x.\n", LoaderBlock.MmapLength); + DbgPrint("MmapAddr = 0x%p.\n", (PVOID)LoaderBlock.MmapAddr); + DbgPrint("RdLength = 0x%x.\n", LoaderBlock.RdLength); + DbgPrint("RdAddr = 0x%p.\n", (PVOID)LoaderBlock.RdAddr); + DbgPrint("DrivesCount = 0x%x.\n", LoaderBlock.DrivesCount); + DbgPrint("DrivesAddr = 0x%p.\n", (PVOID)LoaderBlock.DrivesAddr); + DbgPrint("ConfigTable = 0x%x.\n", LoaderBlock.ConfigTable); + DbgPrint("BootLoaderName = 0x%x.\n", LoaderBlock.BootLoaderName); + DbgPrint("PageDirectoryStart = 0x%p.\n", (PVOID)LoaderBlock.PageDirectoryStart); + DbgPrint("PageDirectoryEnd = 0x%p.\n", (PVOID)LoaderBlock.PageDirectoryEnd); + DbgPrint("KernelBase = 0x%p.\n", (PVOID)LoaderBlock.KernelBase); + DbgPrint("ArchExtra = 0x%p.\n", (PVOID)LoaderBlock.ArchExtra); + +} + /*++ * FrLdrStartup * INTERNAL @@ -53,22 +80,26 @@ NTAPI FrLdrStartup(ULONG Magic) { - /* Disable Interrupts */ - _disable(); - - /* Re-initalize EFLAGS */ - KeAmd64EraseFlags(); - - /* Initialize the page directory */ - FrLdrSetupPageDirectory(); - - /* Set the new PML4 */ - __writecr3((ULONGLONG)pPML4); - -DbgPrint((DPRINT_WARNING, "Jumping to kernel @ %p.\n", KernelEntryPoint)); - - /* Jump to Kernel */ - (*KernelEntryPoint)(Magic, &LoaderBlock); + /* Disable Interrupts */ + _disable(); + + /* Re-initalize EFLAGS */ + KeAmd64EraseFlags(); + + /* Initialize the page directory */ + FrLdrSetupPageDirectory(); + + /* Set the new PML4 */ + __writecr3((ULONGLONG)pPML4); + + LoaderBlock.FrLdrDbgPrint = DbgPrint; + +// DumpLoaderBlock(); + + DbgPrint("Jumping to kernel @ %p.\n", KernelEntryPoint); + + /* Jump to Kernel */ + (*KernelEntryPoint)(Magic, &LoaderBlock); } @@ -184,16 +215,15 @@ /* Setup low memory pages */ if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024) { - DbgPrint((DPRINT_WARNING, "Could not map low memory pages.\n")); + DbgPrint("Could not map low memory pages.\n"); } /* Setup kernel pages */ KernelPages = (ROUND_TO_PAGES(NextModuleBase - KERNEL_BASE_PHYS) / PAGE_SIZE); - DbgPrint((DPRINT_WARNING, "Trying to map %d pages for kernel.\n", KernelPages)); if (FrLdrMapRangeOfPages(KernelBase, KERNEL_BASE_PHYS, KernelPages) != KernelPages) { - DbgPrint((DPRINT_WARNING, "Could not map %d kernel pages.\n", KernelPages)); - } - -} - + DbgPrint("Could not map %d kernel pages.\n", KernelPages); + } + +} +

1 0

[tkreuzer] 34967: - add some definitions to winddk.h - amd64/ketypes.h: KSEG0_BASE is where the kernel is loaded, on amd64 this is not equal to MM_LOWEST_SYSTEM_ADDRESS (FFFF080000000000, which is not even a valid canocical address), but it's 0xfffff80000000000) - add a field for a DbgPrint function pointer to the ROS_LOADER_PARAMETER_BLOCK for early debug prints in ntoskrnl - hack PCR
by tkreuzer＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: tkreuzer Date: Wed Jul 30 18:59:02 2008 New Revision: 34967 URL: http://svn.reactos.org/svn/reactos?rev=34967&view=rev Log: - add some definitions to winddk.h - amd64/ketypes.h: KSEG0_BASE is where the kernel is loaded, on amd64 this is not equal to MM_LOWEST_SYSTEM_ADDRESS (FFFF080000000000, which is not even a valid canocical address), but it's 0xfffff80000000000) - add a field for a DbgPrint function pointer to the ROS_LOADER_PARAMETER_BLOCK for early debug prints in ntoskrnl - hack PCR Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h branches/ros-amd64-bringup/reactos/include/reactos/rosldr.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Wed Jul 30 18:59:02 2008 @@ -5485,7 +5485,34 @@ #define PROFILE_LEVEL 15 #define HIGH_LEVEL 15 -#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L +#define PTI_SHIFT 12L +#define PDI_SHIFT 21L +#define PPI_SHIFT 30L +#define PXI_SHIFT 39L +#define PTE_PER_PAGE 512 +#define PDE_PER_PAGE 512 +#define PPE_PER_PAGE 512 +#define PXE_PER_PAGE 512 +#define PTI_MASK_AMD64 (PTE_PER_PAGE - 1) +#define PDI_MASK_AMD64 (PDE_PER_PAGE - 1) +#define PPI_MASK (PPE_PER_PAGE - 1) +#define PXI_MASK (PXE_PER_PAGE - 1) + +#define PXE_BASE 0xFFFFF6FB7DBED000ULL +#define PXE_SELFMAP 0xFFFFF6FB7DBEDF68ULL +#define PPE_BASE 0xFFFFF6FB7DA00000ULL +#define PDE_BASE 0xFFFFF6FB40000000ULL +#define PTE_BASE 0xFFFFF68000000000ULL +#define PXE_TOP 0xFFFFF6FB7DBEDFFFULL +#define PPE_TOP 0xFFFFF6FB7DBFFFFFULL +#define PDE_TOP 0xFFFFF6FB7FFFFFFFULL +#define PTE_TOP 0xFFFFF6FFFFFFFFFFULL + +#define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 +#define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xFFFF080000000000ULL +#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL typedef struct _KPCR { Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Wed Jul 30 18:59:02 2008 @@ -1,10 +1,11 @@ /*++ NDK Version: 0098 Copyright (c) Alex Ionescu. All rights reserved. +Copyright (c) Timo Kreuzer. All rights reserved. Header Name: - ketypes.h (X86) + ketypes.h (AMD64) Abstract: @@ -13,6 +14,7 @@ Author: Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + Timo Kreuzer (timo.kreuzer(a)reactos.org) - Updated - 30-Jul-2008 --*/ @@ -28,6 +30,7 @@ // //#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) //#define PCR ((volatile KPCR * const)K0IPCR) +#define PCR 0 // HACK //#if defined(CONFIG_SMP) || defined(NT_BUILD) //#undef KeGetPcr //#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) @@ -131,7 +134,7 @@ // // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) // -#define KSEG0_BASE 0xffff080000000000ULL +#define KSEG0_BASE 0xfffff80000000000ULL // // Synchronization-level IRQL Modified: branches/ros-amd64-bringup/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/rosldr.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/rosldr.h [iso-8859-1] Wed Jul 30 18:59:02 2008 @@ -45,6 +45,7 @@ ULONG_PTR PageDirectoryEnd; ULONG_PTR KernelBase; ULONG_PTR ArchExtra; + ULONG (*FrLdrDbgPrint)(const char *Format, ...); } ROS_LOADER_PARAMETER_BLOCK, *PROS_LOADER_PARAMETER_BLOCK; extern BOOLEAN AcpiTableDetected;

1 0

[mkupfer] 34966: Patch by Gregor Schneider a.k.a DosX - use line breaks in debug output
by mkupfer＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: mkupfer Date: Wed Jul 30 16:16:03 2008 New Revision: 34966 URL: http://svn.reactos.org/svn/reactos?rev=34966&view=rev Log: Patch by Gregor Schneider a.k.a DosX - use line breaks in debug output Modified: trunk/reactos/dll/win32/shell32/recyclebin.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] Wed Jul 30 16:16:03 2008 @@ -972,7 +972,7 @@ hprop = SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBucketDlg, (LPARAM)sDrive, NULL); if (!hprop) { - ERR("Failed to create property sheet"); + ERR("Failed to create property sheet\n"); return FALSE; } hpsp[psh.nPages] = hprop; @@ -1006,7 +1006,7 @@ res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &hKey); if (res != ERROR_SUCCESS) { - FIXME("Failed to open registry path"); + FIXME("Failed to open registry path\n"); return FALSE; } dwLength = sizeof(RegSerial); @@ -1021,7 +1021,7 @@ /* FIXME * the current volume was mounted on a different path */ - FIXME("mismatched serial volume number"); + FIXME("mismatched serial volume number\n"); RegCloseKey(hKey); return FALSE; }

1 0

[sserapion] 34965: getting sloppy.
by sserapion＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: sserapion Date: Wed Jul 30 16:05:32 2008 New Revision: 34965 URL: http://svn.reactos.org/svn/reactos?rev=34965&view=rev Log: getting sloppy. Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Jul 30 16:05:32 2008 @@ -174,14 +174,14 @@ case ONEPARAM_ROUTINE_GETMENU: { PWINDOW_OBJECT Window; - DWORD DWORD_PTR; + DWORD_PTR Result; if(!(Window = UserGetWindowObject((HWND)Param))) { RETURN( FALSE); } - Result = (DWORD_PTR)Window->Wnd->IDMenu; + Result = Window->Wnd->IDMenu; RETURN( Result); }

1 0

[mkupfer] 34964: - center window only once - get path from executable module instead of current directory
by mkupfer＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: mkupfer Date: Wed Jul 30 13:54:05 2008 New Revision: 34964 URL: http://svn.reactos.org/svn/reactos?rev=34964&view=rev Log: - center window only once - get path from executable module instead of current directory Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Wed Jul 30 13:54:05 2008 @@ -29,6 +29,7 @@ #include <commctrl.h> #include <tchar.h> #include <setupapi.h> +#include <wine/unicode.h> #include "resource.h" @@ -210,9 +211,6 @@ DWORD dwStyle; hwndControl = GetParent(hwndDlg); - - /* Center the wizard window */ - CenterWindow (hwndControl); dwStyle = GetWindowLong(hwndControl, GWL_STYLE); SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); @@ -309,9 +307,6 @@ hwndControl = GetParent(hwndDlg); - /* Center the wizard window */ - CenterWindow (hwndControl); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); @@ -364,9 +359,6 @@ hwndControl = GetParent(hwndDlg); - /* Center the wizard window */ - CenterWindow (hwndControl); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); @@ -416,9 +408,6 @@ DWORD dwStyle; hwndControl = GetParent(hwndDlg); - - /* Center the wizard window */ - CenterWindow (hwndControl); dwStyle = GetWindowLong(hwndControl, GWL_STYLE); SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); @@ -471,9 +460,6 @@ hwndControl = GetParent(hwndDlg); - /* Center the wizard window */ - CenterWindow (hwndControl); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); @@ -524,9 +510,6 @@ DWORD dwStyle; hwndControl = GetParent(hwndDlg); - - /* Center the wizard window */ - CenterWindow (hwndControl); dwStyle = GetWindowLong(hwndControl, GWL_STYLE); SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); @@ -586,6 +569,7 @@ BOOL isUnattendSetup() { WCHAR szPath[MAX_PATH]; + WCHAR *ch; HINF hUnattendedInf; INFCONTEXT InfContext; TCHAR szValue[MAX_PATH]; @@ -593,7 +577,10 @@ //HKEY hKey; BOOL result = 0; - GetCurrentDirectoryW(MAX_PATH, szPath); // FIXME + GetModuleFileNameW(NULL,szPath,MAX_PATH); + ch = strrchrW(szPath,L'\\'); + if (ch != NULL) + *ch = L'\0'; wcscat(szPath, L"\\unattend.inf"); hUnattendedInf = SetupOpenInfFileW(szPath, NULL, INF_STYLE_OLDNT, NULL);

1 0

[janderwald] 34963: - don't display network propery dialog since it is not yet implemented
by janderwald＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: janderwald Date: Wed Jul 30 11:55:45 2008 New Revision: 34963 URL: http://svn.reactos.org/svn/reactos?rev=34963&view=rev Log: - don't display network propery dialog since it is not yet implemented Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [iso-8859-1] Wed Jul 30 11:55:45 2008 @@ -862,6 +862,14 @@ WCHAR buffer[111]; ILGetDisplayName(This->apidl[0], buffer); SH_ShowDriveProperties(buffer); + return; + } + else if (_ILIsNetHood(This->apidl[0])) + { + /* FIXME + * implement nethood properties + */ + FIXME("implement nethood property dialog\n"); return; } else if (_ILIsBitBucket(This->apidl[0]))

1 0

[mkupfer] 34962: uniform distribution of memory progress bars
by mkupfer＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: mkupfer Date: Wed Jul 30 10:12:09 2008 New Revision: 34962 URL: http://svn.reactos.org/svn/reactos?rev=34962&view=rev Log: uniform distribution of memory progress bars Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Jul 30 10:12:09 2008 @@ -3081,33 +3081,36 @@ TRUE, MUIGetString(STRING_SETUPCOPYINGFILES)); + // fit memory bars to screen width, distribute them uniform + unsigned int mem_bar_width = (xScreen - 26) / 5; + mem_bar_width -= mem_bar_width % 2; // make even /* ATTENTION: The following progress bars are debug stuff, which should not be translated!! */ /* Create the paged pool progress bar */ CopyContext.MemoryBars[0] = CreateProgressBar(13, 40, - 18, + 13 + mem_bar_width, 43, - 10, + 13, 44, FALSE, "Paged Memory"); /* Create the non paged pool progress bar */ - CopyContext.MemoryBars[1] = CreateProgressBar(28, + CopyContext.MemoryBars[1] = CreateProgressBar((xScreen / 2)- (mem_bar_width / 2), 40, - 33, + (xScreen / 2) + (mem_bar_width / 2), 43, - 24, + (xScreen / 2)- (mem_bar_width / 2), 44, FALSE, "Nonpaged Memory"); /* Create the global memory progress bar */ - CopyContext.MemoryBars[2] = CreateProgressBar(43, + CopyContext.MemoryBars[2] = CreateProgressBar(xScreen - 13 - mem_bar_width, 40, - 48, + xScreen - 13, 43, - 40, + xScreen - 13 - mem_bar_width, 44, FALSE, "Free Memory");

1 0

[jmorlan] 34961: kernel32: Don't enter the ConsoleLock if it has already been deleted by DllMain. Patch by hto (hto at dev dot null) (Bug 2308)
by jmorlan＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: jmorlan Date: Wed Jul 30 10:00:57 2008 New Revision: 34961 URL: http://svn.reactos.org/svn/reactos?rev=34961&view=rev Log: kernel32: Don't enter the ConsoleLock if it has already been deleted by DllMain. Patch by hto (hto at dev dot null) (Bug 2308) Modified: trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/misc/dllmain.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Wed Jul 30 10:00:57 2008 @@ -22,6 +22,7 @@ extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); extern RTL_CRITICAL_SECTION ConsoleLock; +extern BOOL ConsoleInitialized; extern BOOL WINAPI IsDebuggerPresent(VOID); /* GLOBALS *******************************************************************/ @@ -87,6 +88,8 @@ erException.NumberParameters = 0; RtlRaiseException(&erException); } + + if (!ConsoleInitialized) ExitThread(0); RtlEnterCriticalSection(&ConsoleLock); if(!(nCode == CTRL_C_EVENT && @@ -106,6 +109,7 @@ default: ExitThread(0); } + if (!ConsoleInitialized) ExitThread(0); RtlEnterCriticalSection(&ConsoleLock); if(!(nCode == CTRL_C_EVENT && Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Wed Jul 30 10:00:57 2008 @@ -26,9 +26,9 @@ HANDLE hBaseDir = NULL; PPEB Peb; ULONG SessionId; +BOOL ConsoleInitialized = FALSE; static BOOL DllInitialized = FALSE; -static BOOL ConsoleInitialized = FALSE; BOOL STDCALL DllMain(HANDLE hInst, @@ -374,6 +374,7 @@ /* Delete DLL critical section */ if (ConsoleInitialized == TRUE) { + ConsoleInitialized = FALSE; RtlDeleteCriticalSection (&ConsoleLock); } RtlDeleteCriticalSection (&DllLock);

1 0

[cfinck] 34960: Remove all translations for the "Paged Memory", "Nonpaged Memory" and "Free Memory" progress bars. This is debug stuff, which should have never been translated. As the translated strings are also sometimes longer than the english ones, they led to unnecessary problems like text overlapping.
by cfinck＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: cfinck Date: Wed Jul 30 09:15:41 2008 New Revision: 34960 URL: http://svn.reactos.org/svn/reactos?rev=34960&view=rev Log: Remove all translations for the "Paged Memory", "Nonpaged Memory" and "Free Memory" progress bars. This is debug stuff, which should have never been translated. As the translated strings are also sometimes longer than the english ones, they led to unnecessary problems like text overlapping. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -3081,6 +3081,7 @@ TRUE, MUIGetString(STRING_SETUPCOPYINGFILES)); + /* ATTENTION: The following progress bars are debug stuff, which should not be translated!! */ /* Create the paged pool progress bar */ CopyContext.MemoryBars[0] = CreateProgressBar(13, 40, @@ -3089,7 +3090,7 @@ 10, 44, FALSE, - MUIGetString(STRING_PAGEDMEM)); + "Paged Memory"); /* Create the non paged pool progress bar */ CopyContext.MemoryBars[1] = CreateProgressBar(28, @@ -3099,7 +3100,7 @@ 24, 44, FALSE, - MUIGetString(STRING_NONPAGEDMEM)); + "Nonpaged Memory"); /* Create the global memory progress bar */ CopyContext.MemoryBars[2] = CreateProgressBar(43, @@ -3109,7 +3110,7 @@ 40, 44, FALSE, - MUIGetString(STRING_FREEMEM)); + "Free Memory"); /* Do the file copying */ SetupCommitFileQueueW(NULL, Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1623,12 +1623,6 @@ "\xB3 ¯¨á ä ©«: %S"}, {STRING_SETUPCOPYINGFILES, "¥ç¥ § ¯¨á¢ ¥ ä ©«®¢¥â¥..."}, - {STRING_PAGEDMEM, - "âà ¨à "}, - {STRING_NONPAGEDMEM, - "¥áâà ¨à "}, - {STRING_FREEMEM, - "¢®¡®¤ ¯ ¬¥â"}, {STRING_REGHIVEUPDATE, " áê¢à¥¬¥ï¢ ¥ à¥£¨áâêà¨â¥ à®¥¢¥..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1620,12 +1620,6 @@ "\xB3 Kop¡ruji soubor: %S"}, {STRING_SETUPCOPYINGFILES, "Instalace kop¡ruje soubory..."}, - {STRING_PAGEDMEM, - "Str nkov no"}, - {STRING_NONPAGEDMEM, - "Nestr nkov no"}, - {STRING_FREEMEM, - "Voln pamØ"}, {STRING_REGHIVEUPDATE, " Aktualizuji registr..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1614,12 +1614,6 @@ "\xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, - {STRING_PAGEDMEM, - "Ausgel. Sp."}, - {STRING_NONPAGEDMEM, - "Nicht ausgel. Sp."}, - {STRING_FREEMEM, - "Freier Sp."}, {STRING_REGHIVEUPDATE, " Registry hives werden aktualisiert..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1643,12 +1643,6 @@ "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, - {STRING_PAGEDMEM, - "Paged Memory"}, - {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, - {STRING_FREEMEM, - "Free Memory"}, {STRING_REGHIVEUPDATE, " Updating registry hives..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1615,12 +1615,6 @@ "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, - {STRING_PAGEDMEM, - "Paged Memory"}, - {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, - {STRING_FREEMEM, - "Free Memory"}, {STRING_REGHIVEUPDATE, " Updating registry hives..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1613,12 +1613,6 @@ "\xB3 Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, "El instalador est copiando archivos..."}, - {STRING_PAGEDMEM, - "Mem. paginada"}, - {STRING_NONPAGEDMEM, - "Mem. nopaginada"}, - {STRING_FREEMEM, - "Memoria libre"}, {STRING_REGHIVEUPDATE, " Actualizando el rbol del registro..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1626,12 +1626,6 @@ "\xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, - {STRING_PAGEDMEM, - "Mmoire pagine"}, - {STRING_NONPAGEDMEM, - "Mmoire non pagine"}, - {STRING_FREEMEM, - "Mmoire libre"}, {STRING_REGHIVEUPDATE, " Mise jour de la base de registre..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1614,12 +1614,6 @@ "\xB3 Copia di: %S"}, {STRING_SETUPCOPYINGFILES, "Copia dei file in corso..."}, - {STRING_PAGEDMEM, - "Memoria paginata"}, - {STRING_NONPAGEDMEM, - "Memoria non paginata"}, - {STRING_FREEMEM, - "Memoria libera"}, {STRING_REGHIVEUPDATE, " Aggiornamento degli hives del registro..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1623,12 +1623,6 @@ "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, - {STRING_PAGEDMEM, - "Paged Memory"}, - {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, - {STRING_FREEMEM, - "Free Memory"}, {STRING_REGHIVEUPDATE, " Updating registry hives..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1622,12 +1622,6 @@ "\xB3 Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, - {STRING_PAGEDMEM, - "Stronicowanej"}, - {STRING_NONPAGEDMEM, - "Niestronicowanej"}, - {STRING_FREEMEM, - " Dost©pnej"}, {STRING_REGHIVEUPDATE, " Uaktualnianie..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1614,12 +1614,6 @@ "\xB3 ®¯¨à®¢ ¨¥: %S"}, {STRING_SETUPCOPYINGFILES, "à®£à ¬¬ ãáâ ®¢ª¨ ª®¯¨àã¥â ä ©«ë..."}, - {STRING_PAGEDMEM, - " âà ¨ç ï"}, - {STRING_NONPAGEDMEM, - " ¥áâà ¨ç ï"}, - {STRING_FREEMEM, - "¢®¡®¤ ï ¯ ¬ïâì"}, {STRING_REGHIVEUPDATE, " ¡®¢«¥¨¥ ªãáâ®¢ à¥¥áâà ..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1622,12 +1622,6 @@ "\xB3 Kop¡ruje sa s£bor: %S"}, {STRING_SETUPCOPYINGFILES, "Inçtal tor kop¡ruje s£bory..."}, - {STRING_PAGEDMEM, - "Str nkovan "}, //reazec "Str nkovan pam" sa nevmest¡ - {STRING_NONPAGEDMEM, - "Nestr nkovan "}, //reazec "Nestr nkovan pam" sa nevmest¡ - {STRING_FREEMEM, - "Von pam"}, {STRING_REGHIVEUPDATE, " Aktualizujem polo§ky registrov..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1613,12 +1613,6 @@ "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, - {STRING_PAGEDMEM, - "Paged Memory"}, - {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, - {STRING_FREEMEM, - "Free Memory"}, {STRING_REGHIVEUPDATE, " Updating registry hives..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -1614,12 +1614,6 @@ "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, - {STRING_PAGEDMEM, - "Paged Memory"}, - {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, - {STRING_FREEMEM, - "Free Memory"}, {STRING_REGHIVEUPDATE, " Updating registry hives..."}, {STRING_IMPORTFILE, Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Wed Jul 30 09:15:41 2008 @@ -96,9 +96,6 @@ #define STRING_TXTSETUPFAILED 14 #define STRING_COPYING 15 #define STRING_SETUPCOPYINGFILES 16 -#define STRING_PAGEDMEM 17 -#define STRING_NONPAGEDMEM 18 -#define STRING_FREEMEM 19 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 #define STRING_DISPLAYETTINGSUPDATE 22

1 0

[fireball] 34959: - Fix Irp flags assignment in case of an IoAllocateIrp call with ChargeQuota set to TRUE. Reduces number of kmtest failures by 1.
by fireball＠svn.reactos.org 30 Jul '08

30 Jul '08

Author: fireball Date: Wed Jul 30 08:24:05 2008 New Revision: 34959 URL: http://svn.reactos.org/svn/reactos?rev=34959&view=rev Log: - Fix Irp flags assignment in case of an IoAllocateIrp call with ChargeQuota set to TRUE. Reduces number of kmtest failures by 1. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Jul 30 08:24:05 2008 @@ -525,6 +525,9 @@ PNPAGED_LOOKASIDE_LIST List = NULL; PP_NPAGED_LOOKASIDE_NUMBER ListType = LookasideSmallIrpList; + /* Set Charge Quota Flag */ + if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; + /* Figure out which Lookaside List to use */ if ((StackSize <= 8) && (ChargeQuota == FALSE)) { @@ -586,11 +589,11 @@ else { /* We have an IRP from Lookaside */ - Flags |= IRP_LOOKASIDE_ALLOCATION; - } - - /* Set Flag */ - if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; + if (ChargeQuota) Flags |= IRP_LOOKASIDE_ALLOCATION; + + /* In this case there is no charge quota */ + Flags &= ~IRP_QUOTA_CHARGED; + } /* Now Initialize it */ IoInitializeIrp(Irp, Size, StackSize);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008