Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[dgorbachev] 53800: [Desk|User32|UXTheme] Silence GCC 4.6 "variable 'foo' set but not used [-Werror=unused-but-set-variable]" warnings/errors.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Sep 22 06:09:11 2011 New Revision: 53800 URL: http://svn.reactos.org/svn/reactos?rev=53800&view=rev Log: [Desk|User32|UXTheme] Silence GCC 4.6 "variable 'foo' set but not used [-Werror=unused-but-set-variable]" warnings/errors. Modified: trunk/reactos/dll/cpl/desk/advmon.c trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/draw.c trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advmon.c [iso-8859-1] Thu Sep 22 06:09:11 2011 @@ -88,11 +88,8 @@ IDataObject *pdo; #ifdef _MSC_VER HMODULE hShell32 = NULL; + CPSEAE msvc_SHCreatePropSheetExtArrayEx; #endif - CPSEAE msvc_SHCreatePropSheetExtArrayEx; - - /* silence gcc warning */ - msvc_SHCreatePropSheetExtArrayEx = NULL; /* FIXME: Build the "%s and %s" caption string for the monitor and adapter name */ szCaption[0] = _T('\0'); Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Thu Sep 22 06:09:11 2011 @@ -53,7 +53,7 @@ static INT_PTR AppearancePage_OnInit(HWND hwndDlg) { - INT i, TemplateCount, iListIndex; + INT i, /*TemplateCount,*/ iListIndex; HWND hwndColor, hwndTheme; GLOBALS *g; @@ -74,7 +74,7 @@ LoadThemes(g); - TemplateCount = LoadSchemePresetEntries(g->strSelectedStyle); + /*TemplateCount = */ LoadSchemePresetEntries(g->strSelectedStyle); hwndColor = GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME); g->SchemeId = -1; Modified: trunk/reactos/dll/cpl/desk/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.c?rev=53… ============================================================================== --- trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] Thu Sep 22 06:09:11 2011 @@ -437,18 +437,18 @@ BOOL MyDrawCaptionTemp(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCWSTR str, UINT uFlags, COLOR_SCHEME *scheme) { - ULONG Height; - UINT VCenter, Padding; - LONG ButtonWidth; + //ULONG Height; + //UINT VCenter, Padding; + //LONG ButtonWidth; HBRUSH hbr; HGDIOBJ hFontOld; - RECT rc; - - Height = scheme->Size[SIZE_CAPTION_Y] - 1; - VCenter = (rect->bottom - rect->top) / 2; - Padding = VCenter - (Height / 2); - - ButtonWidth = scheme->Size[SIZE_SIZE_X] - 2; + RECT rc; + + //Height = scheme->Size[SIZE_CAPTION_Y] - 1; + //VCenter = (rect->bottom - rect->top) / 2; + //Padding = VCenter - (Height / 2); + + //ButtonWidth = scheme->Size[SIZE_SIZE_X] - 2; if (uFlags & DC_GRADIENT) { Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] Thu Sep 22 06:09:11 2011 @@ -684,7 +684,7 @@ SIZE rcsize; LOGFONT lf; HFONT hPrevFont, hFont; - INT len; + //INT len; hFont = infoPtr->Monitors[Index].hFont; if (hFont == NULL && @@ -698,7 +698,7 @@ (2 * infoPtr->SelectionFrame.cy) - 2; rcsize.cy = (rcsize.cy * 60) / 100; - len = _tcslen(infoPtr->Monitors[Index].szCaption); + //len = _tcslen(infoPtr->Monitors[Index].szCaption); hPrevFont = SelectObject(hDC, infoPtr->hFont); Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Thu Sep 22 06:09:11 2011 @@ -434,7 +434,7 @@ { HINSTANCE hLibrary; PVOID pInitFunction; - NTSTATUS Status; + //NTSTATUS Status; ANSI_STRING InitFuncName; BOOL Result = FALSE; @@ -467,7 +467,7 @@ /* Initialize the user api hook */ ASSERT(pstrInitFunc->Buffer); - Status = RtlUnicodeStringToAnsiString(&InitFuncName, + /*Status = */ RtlUnicodeStringToAnsiString(&InitFuncName, pstrInitFunc, TRUE); Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Thu Sep 22 06:09:11 2011 @@ -1756,8 +1756,8 @@ static HRGN UXTHEME_RegionFromDibBits(RGBQUAD* pBuffer, RGBQUAD* pclrTransparent, LPCRECT pRect) { int x, y, xstart; +#ifdef EXTCREATEREGION_WORKS int cMaxRgnRects, cRgnDataSize, cRgnRects; -#ifdef EXTCREATEREGION_WORKS RECT* prcCurrent; PRGNDATA prgnData; #else @@ -1769,12 +1769,12 @@ pclrCurrent = (PULONG)pBuffer; clrTransparent = *(PULONG)pclrTransparent; +#ifdef EXTCREATEREGION_WORKS /* Create a region and pre-allocate memory enough for 3 spaces in one row*/ cRgnRects = 0; cMaxRgnRects = 4* (pRect->bottom-pRect->top); cRgnDataSize = sizeof(RGNDATA) + cMaxRgnRects * sizeof(RECT); -#ifdef EXTCREATEREGION_WORKS /* Allocate the region data */ prgnData = (PRGNDATA)HeapAlloc(GetProcessHeap(), 0, cRgnDataSize); Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Thu Sep 22 06:09:11 2011 @@ -736,7 +736,7 @@ ThemeHandleButton(HWND hWnd, WPARAM wParam) { MSG Msg; - BOOL Pressed = TRUE, OldState; + BOOL Pressed = TRUE; // , OldState; WPARAM SCMsg, ht; ULONG Style; DRAW_CONTEXT context; @@ -779,7 +779,7 @@ if (Msg.message != WM_MOUSEMOVE) continue; - OldState = Pressed; + //OldState = Pressed; ht = SendMessage(hWnd, WM_NCHITTEST, 0, MAKELPARAM(Msg.pt.x, Msg.pt.y)); Pressed = (ht == wParam);

12 years, 12 months

[dgorbachev] 53799: [NTOSKRNL] Do not fail with unknown CPUs. Bug #6493.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Sep 22 06:08:35 2011 New Revision: 53799 URL: http://svn.reactos.org/svn/reactos?rev=53799&view=rev Log: [NTOSKRNL] Do not fail with unknown CPUs. Bug #6493. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Thu Sep 22 06:08:35 2011 @@ -247,8 +247,9 @@ return CPU_RISE; } - /* Invalid CPU */ - return 0; + /* Unknown CPU */ + DPRINT1("%s CPU support not fully tested!\n", Prcb->VendorString); + return CPU_UNKNOWN; } ULONG @@ -311,9 +312,6 @@ Reg[3] &= ~0x800; } - /* Set the current features */ - CpuFeatures = Reg[3]; - break; /* AMD CPUs */ @@ -363,9 +361,6 @@ ExtendedCPUID = FALSE; } - /* Set the current features */ - CpuFeatures = Reg[3]; - break; /* Cyrix CPUs */ @@ -385,9 +380,6 @@ setCx86(CX86_CCR1, Ccr1); } - /* Set the current features */ - CpuFeatures = Reg[3]; - break; /* Transmeta CPUs */ @@ -412,6 +404,9 @@ break; } + + /* Set the current features */ + CpuFeatures = Reg[3]; /* Convert all CPUID Feature bits into our format */ if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4;

12 years, 12 months

[dgorbachev] 53798: [FREELDR] Put uninitialized/zero-initialized data into .bss. Fill it with 0s at startup.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Sep 22 06:06:51 2011 New Revision: 53798 URL: http://svn.reactos.org/svn/reactos?rev=53798&view=rev Log: [FREELDR] Put uninitialized/zero-initialized data into .bss. Fill it with 0s at startup. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Sep 22 06:06:51 2011 @@ -203,10 +203,6 @@ list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() -if(NOT MSVC) - set_source_files_properties(${SETUPLDR_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") -endif() - add_executable(setupldr_pe ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) if(NOT MSVC) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Thu Sep 22 06:06:51 2011 @@ -70,11 +70,19 @@ /* Initialize the idt */ call _InitIdt +#ifndef _USE_ML + /* Clean out bss */ + xor eax, eax + mov edi, offset __bss_start__ + mov ecx, offset __bss_end__ + 3 + sub ecx, edi + shr ecx, 2 + rep stosd + /* Pass the command line to BootMain */ -#ifdef _USE_ML + mov eax, offset cmdline +#else xor eax, eax -#else - mov eax, offset cmdline #endif /* GO! */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S [iso-8859-1] Thu Sep 22 06:06:51 2011 @@ -58,7 +58,7 @@ /* load_addr */ .long INITIAL_BASE /* load_end_addr */ - .long INITIAL_BASE + __bss_start__ - FREELDR_BASE + .long 0 /* bss_end_addr */ .long 0 /* entry_addr */ @@ -98,16 +98,9 @@ /* Relocate itself to lower address */ mov esi, INITIAL_BASE mov edi, FREELDR_BASE - mov ecx, (offset __bss_start__ - FREELDR_BASE + 3) + mov ecx, offset __bss_start__ - FREELDR_BASE shr ecx, 2 rep movsd - - /* Clean out bss */ - xor eax, eax - mov ecx, offset __bss_end__ + 3 - sub ecx, offset __bss_start__ - shr ecx, 2 - rep stosd /* Load segment registers for real-address mode */ lgdt gdtptr Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk [iso-8859-1] Thu Sep 22 06:06:51 2011 @@ -1,58 +1,103 @@ -OUTPUT_FORMAT(pei-i386) -ENTRY(_mainCRTStartup) SECTIONS { - .text __image_base__ + __section_alignment__ : + .text __image_base__ + __section_alignment__ : { - __text_start__ = .; - *(.init) *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) + *(SORT(.text*)) + *(.data) + *(SORT(.data*)) + *(.rdata) + *(SORT(.rdata*)) } - init BLOCK(__section_alignment__) : + + .bss : { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - __data_end__ = . ; __bss_start__ = . ; *(.bss) *(COMMON) __bss_end__ = . ; } + + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section. Unlike other targets that fake this by putting the + section VMA at 0, the PE format will not allow it. */ + /* DWARF 1.1 and DWARF 2. */ + .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_aranges) + } + .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_pubnames) + } + .debug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_pubtypes) + } + /* DWARF 2. */ + .debug_info BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_info) *(.gnu.linkonce.wi.*) + } + .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_abbrev) + } + .debug_line BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_line) + } + .debug_frame BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_frame*) + } + .debug_str BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_str) + } + .debug_loc BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_loc) + } + .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_macinfo) + } + /* SGI/MIPS DWARF 2 extensions. */ + .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_weaknames) + } + .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_funcnames) + } + .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_typenames) + } + .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_varnames) + } + .debug_macro BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_macro) + } + /* DWARF 3. */ + .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_ranges) + } + /* DWARF 4. */ + .debug_types BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_types) *(.gnu.linkonce.wt.*) + } + /DISCARD/ : { - *(.drectve) + *(*) } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } - } -

12 years, 12 months

[tkreuzer] 53797: [FREELDR] Patch by Brian Palmer: Fix problems that could occur, when the BIOS returns memory regions that are not page aligned, by fixing up the bios memory map before using it.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Sep 21 23:02:24 2011 New Revision: 53797 URL: http://svn.reactos.org/svn/reactos?rev=53797&view=rev Log: [FREELDR] Patch by Brian Palmer: Fix problems that could occur, when the BIOS returns memory regions that are not page aligned, by fixing up the bios memory map before using it. Modified: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arcem… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] Wed Sep 21 23:02:24 2011 @@ -35,6 +35,49 @@ #endif }; + +static +VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount) +{ + int Index; + int Index2; + ULONGLONG BaseAddressOffset; + + // Loop through each entry in the array + for (Index=0; Index<*MapCount; Index++) + { + // Correct all the addresses to be aligned on page boundaries + BaseAddressOffset = ROUND_UP(BiosMemoryMap[Index].BaseAddress, MM_PAGE_SIZE) - BiosMemoryMap[Index].BaseAddress; + BiosMemoryMap[Index].BaseAddress += BaseAddressOffset; + if (BiosMemoryMap[Index].Length < BaseAddressOffset) + { + BiosMemoryMap[Index].Length = 0; + } + else + { + BiosMemoryMap[Index].Length -= BaseAddressOffset; + } + BiosMemoryMap[Index].Length = ROUND_DOWN(BiosMemoryMap[Index].Length, MM_PAGE_SIZE); + + // If the entry type isn't usable then remove + // it from the memory map (this will help reduce + // the size of our lookup table) + // If the length is less than a full page then + // get rid of it also. + if (BiosMemoryMap[Index].Type != BiosMemoryUsable || + BiosMemoryMap[Index].Length < MM_PAGE_SIZE) + { + // Slide every entry after this down one + for (Index2=Index; Index2<(*MapCount - 1); Index2++) + { + BiosMemoryMap[Index2] = BiosMemoryMap[Index2 + 1]; + } + (*MapCount)--; + Index--; + } + } +} + const MEMORY_DESCRIPTOR* ArcGetMemoryDescriptor(const MEMORY_DESCRIPTOR* Current) { @@ -57,6 +100,11 @@ BiosMemoryMapEntryCount = MachVtbl.GetMemoryMap(BiosMemoryMap, sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); + + // + // Fix entries that are not page aligned + // + MmFixupSystemMemoryMap(BiosMemoryMap, &BiosMemoryMapEntryCount); // // Copy the entries to our structure

12 years, 12 months

[tkreuzer] 53796: [FREELDR] Patch by Brian Palmer: Properly handle a memory hole below 16MB, which some machines have.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Sep 21 21:48:44 2011 New Revision: 53796 URL: http://svn.reactos.org/svn/reactos?rev=53796&view=rev Log: [FREELDR] Patch by Brian Palmer: Properly handle a memory hole below 16MB, which some machines have. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Wed Sep 21 21:48:44 2011 @@ -27,95 +27,100 @@ DBG_DEFAULT_CHANNEL(MEMORY); -static ULONG -PcMemGetExtendedMemorySize(VOID) -{ - REGS RegsIn; - REGS RegsOut; - ULONG MemorySize; - - TRACE("GetExtendedMemorySize()\n"); - - /* Int 15h AX=E801h - * Phoenix BIOS v4.0 - GET MEMORY SIZE FOR >64M CONFIGURATIONS - * - * AX = E801h - * Return: - * CF clear if successful - * AX = extended memory between 1M and 16M, in K (max 3C00h = 15MB) - * BX = extended memory above 16M, in 64K blocks - * CX = configured memory 1M to 16M, in K - * DX = configured memory above 16M, in 64K blocks - * CF set on error - */ - RegsIn.w.ax = 0xE801; - Int386(0x15, &RegsIn, &RegsOut); - - TRACE("Int15h AX=E801h\n"); - TRACE("AX = 0x%x\n", RegsOut.w.ax); - TRACE("BX = 0x%x\n", RegsOut.w.bx); - TRACE("CX = 0x%x\n", RegsOut.w.cx); - TRACE("DX = 0x%x\n", RegsOut.w.dx); - TRACE("CF set = %s\n\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); - - if (INT386_SUCCESS(RegsOut)) - { - /* If AX=BX=0000h the use CX and DX */ - if (RegsOut.w.ax == 0) - { - /* Return extended memory size in K */ - MemorySize = RegsOut.w.dx * 64; - MemorySize += RegsOut.w.cx; - return MemorySize; - } - else - { - /* Return extended memory size in K */ - MemorySize = RegsOut.w.bx * 64; - MemorySize += RegsOut.w.ax; - return MemorySize; - } - } - - /* If we get here then Int15 Func E801h didn't work */ - /* So try Int15 Func 88h */ - - /* Int 15h AH=88h - * SYSTEM - GET EXTENDED MEMORY SIZE (286+) - * - * AH = 88h - * Return: - * CF clear if successful - * AX = number of contiguous KB starting at absolute address 100000h - * CF set on error - * AH = status - * 80h invalid command (PC,PCjr) - * 86h unsupported function (XT,PS30) - */ - RegsIn.b.ah = 0x88; - Int386(0x15, &RegsIn, &RegsOut); - - TRACE("Int15h AH=88h\n"); - TRACE("AX = 0x%x\n", RegsOut.w.ax); - TRACE("CF set = %s\n\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); - - if (INT386_SUCCESS(RegsOut) && RegsOut.w.ax != 0) - { - MemorySize = RegsOut.w.ax; - return MemorySize; - } - - /* If we get here then Int15 Func 88h didn't work */ - /* So try reading the CMOS */ - WRITE_PORT_UCHAR((PUCHAR)0x70, 0x31); - MemorySize = READ_PORT_UCHAR((PUCHAR)0x71); - MemorySize = (MemorySize & 0xFFFF); - MemorySize = (MemorySize << 8); - - TRACE("Int15h Failed\n"); - TRACE("CMOS reports: 0x%x\n", MemorySize); - - return MemorySize; +static +BOOLEAN +GetExtendedMemoryConfiguration(ULONG* pMemoryAtOneMB /* in KB */, ULONG* pMemoryAtSixteenMB /* in 64KB */) +{ + REGS RegsIn; + REGS RegsOut; + + TRACE("GetExtendedMemoryConfiguration()\n"); + + *pMemoryAtOneMB = 0; + *pMemoryAtSixteenMB = 0; + + // Int 15h AX=E801h + // Phoenix BIOS v4.0 - GET MEMORY SIZE FOR >64M CONFIGURATIONS + // + // AX = E801h + // Return: + // CF clear if successful + // AX = extended memory between 1M and 16M, in K (max 3C00h = 15MB) + // BX = extended memory above 16M, in 64K blocks + // CX = configured memory 1M to 16M, in K + // DX = configured memory above 16M, in 64K blocks + // CF set on error + RegsIn.w.ax = 0xE801; + Int386(0x15, &RegsIn, &RegsOut); + + TRACE("Int15h AX=E801h\n"); + TRACE("AX = 0x%x\n", RegsOut.w.ax); + TRACE("BX = 0x%x\n", RegsOut.w.bx); + TRACE("CX = 0x%x\n", RegsOut.w.cx); + TRACE("DX = 0x%x\n", RegsOut.w.dx); + TRACE("CF set = %s\n\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); + + if (INT386_SUCCESS(RegsOut)) + { + // If AX=BX=0000h the use CX and DX + if (RegsOut.w.ax == 0) + { + // Return extended memory size in K + *pMemoryAtSixteenMB = RegsOut.w.dx; + *pMemoryAtOneMB = RegsOut.w.cx; + return TRUE; + } + else + { + // Return extended memory size in K + *pMemoryAtSixteenMB = RegsOut.w.bx; + *pMemoryAtOneMB = RegsOut.w.ax; + return TRUE; + } + } + + // If we get here then Int15 Func E801h didn't work + // So try Int15 Func 88h + // Int 15h AH=88h + // SYSTEM - GET EXTENDED MEMORY SIZE (286+) + // + // AH = 88h + // Return: + // CF clear if successful + // AX = number of contiguous KB starting at absolute address 100000h + // CF set on error + // AH = status + // 80h invalid command (PC,PCjr) + // 86h unsupported function (XT,PS30) + RegsIn.b.ah = 0x88; + Int386(0x15, &RegsIn, &RegsOut); + + TRACE("Int15h AH=88h\n"); + TRACE("AX = 0x%x\n", RegsOut.w.ax); + TRACE("CF set = %s\n\n", (RegsOut.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); + + if (INT386_SUCCESS(RegsOut) && RegsOut.w.ax != 0) + { + *pMemoryAtOneMB = RegsOut.w.ax; + return TRUE; + } + + // If we get here then Int15 Func 88h didn't work + // So try reading the CMOS + WRITE_PORT_UCHAR((PUCHAR)0x70, 0x31); + *pMemoryAtOneMB = READ_PORT_UCHAR((PUCHAR)0x71); + *pMemoryAtOneMB = (*pMemoryAtOneMB & 0xFFFF); + *pMemoryAtOneMB = (*pMemoryAtOneMB << 8); + + TRACE("Int15h Failed\n"); + TRACE("CMOS reports: 0x%x\n", *pMemoryAtOneMB); + + if (*pMemoryAtOneMB != 0) + { + return TRUE; + } + + return FALSE; } static ULONG @@ -228,21 +233,36 @@ PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize) { ULONG EntryCount; + ULONG ExtendedMemorySizeAtOneMB; + ULONG ExtendedMemorySizeAtSixteenMB; EntryCount = PcMemGetBiosMemoryMap(BiosMemoryMap, MaxMemoryMapSize); /* If the BIOS didn't provide a memory map, synthesize one */ - if (0 == EntryCount && 2 <= MaxMemoryMapSize) - { - /* Conventional memory */ - BiosMemoryMap[0].BaseAddress = 0; - BiosMemoryMap[0].Length = PcMemGetConventionalMemorySize() * 1024; - BiosMemoryMap[0].Type = BiosMemoryUsable; - /* Extended memory */ - BiosMemoryMap[1].BaseAddress = 1024 * 1024; - BiosMemoryMap[1].Length = PcMemGetExtendedMemorySize() * 1024; - BiosMemoryMap[1].Type = BiosMemoryUsable; - EntryCount = 2; + if (0 == EntryCount && 3 <= MaxMemoryMapSize) + { + GetExtendedMemoryConfiguration(&ExtendedMemorySizeAtOneMB, &ExtendedMemorySizeAtSixteenMB); + + /* Conventional memory */ + BiosMemoryMap[EntryCount].BaseAddress = 0; + BiosMemoryMap[EntryCount].Length = PcMemGetConventionalMemorySize() * 1024; + BiosMemoryMap[EntryCount].Type = BiosMemoryUsable; + EntryCount++; + + /* Extended memory at 1MB */ + BiosMemoryMap[EntryCount].BaseAddress = 1024 * 1024; + BiosMemoryMap[EntryCount].Length = ExtendedMemorySizeAtOneMB * 1024; + BiosMemoryMap[EntryCount].Type = BiosMemoryUsable; + EntryCount++; + + if (ExtendedMemorySizeAtSixteenMB != 0) + { + /* Extended memory at 16MB */ + BiosMemoryMap[EntryCount].BaseAddress = 0x1000000; + BiosMemoryMap[EntryCount].Length = ExtendedMemorySizeAtSixteenMB * 64 * 1024; + BiosMemoryMap[EntryCount].Type = BiosMemoryUsable; + EntryCount++; + } } return EntryCount;

12 years, 12 months

[pschweitzer] 53795: [SYSSETUP] Fix build

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 21 21:17:15 2011 New Revision: 53795 URL: http://svn.reactos.org/svn/reactos?rev=53795&view=rev Log: [SYSSETUP] Fix build Modified: trunk/reactos/dll/win32/syssetup/precomp.h Modified: trunk/reactos/dll/win32/syssetup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/precomp… ============================================================================== --- trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] Wed Sep 21 21:17:15 2011 @@ -22,6 +22,7 @@ #include <string.h> #include <pseh/pseh2.h> #include <time.h> +#include <ntsecapi.h> #include "globals.h" #include "resource.h"

12 years, 12 months

[ekohl] 53794: [SYSSETUP] Set the account domain name.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Sep 21 20:53:46 2011 New Revision: 53794 URL: http://svn.reactos.org/svn/reactos?rev=53794&view=rev Log: [SYSSETUP] Set the account domain name. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Wed Sep 21 20:53:46 2011 @@ -520,6 +520,47 @@ return FALSE; } + +static +NTSTATUS +SetAccountDomain(LPWSTR DomainName) +{ + POLICY_ACCOUNT_DOMAIN_INFO Info; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle; + NTSTATUS Status; + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_TRUST_ADMIN, + &PolicyHandle); + if (Status != STATUS_SUCCESS) + { + DPRINT("LsaOpenPolicy failed (Status: 0x%08lx)\n", Status); + return Status; + } + + Info.DomainName.Buffer = DomainName; + Info.DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + Info.DomainName.MaximumLength = Info.DomainName.Length + sizeof(WCHAR); + Info.DomainSid = NULL; + + Status = LsaSetInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID)&Info); + if (Status != STATUS_SUCCESS) + { + DPRINT("LsaSetInformationPolicy failed (Status: 0x%08lx)\n", Status); + } + + LsaClose(PolicyHandle); + + return Status; +} + static BOOL WriteComputerSettings(WCHAR * ComputerName, HWND hwndDlg) @@ -544,6 +585,9 @@ /* Try to also set DNS hostname */ SetComputerNameExW(ComputerNamePhysicalDnsHostname, ComputerName); + + /* Set the account domain name */ + SetAccountDomain(ComputerName); return TRUE; }

12 years, 12 months

[pschweitzer] 53793: [NTDLL] Fix broken if condition

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 21 19:37:15 2011 New Revision: 53793 URL: http://svn.reactos.org/svn/reactos?rev=53793&view=rev Log: [NTDLL] Fix broken if condition Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Wed Sep 21 19:37:15 2011 @@ -206,7 +206,7 @@ KeyValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, KeyInfoSize); - if (KeyInfo == NULL) + if (KeyValueInformation == NULL) { /* Give up this time */ Status = STATUS_NO_MEMORY;

12 years, 12 months

[pschweitzer] 53792: [EVENTLOG] Fix broken if condition

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 21 19:26:57 2011 New Revision: 53792 URL: http://svn.reactos.org/svn/reactos?rev=53792&view=rev Log: [EVENTLOG] Fix broken if condition Modified: trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Sep 21 19:26:57 2011 @@ -261,7 +261,7 @@ But for now limit EventLog size to just under 5K. */ LogFile->Header.MaxSize = 5000; - if (!SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == + if (SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { DPRINT1("SetFilePointer() failed! %d\n", GetLastError());

12 years, 12 months

[pschweitzer] 53791: [KERNEL32] Fix buffer overrun

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 21 17:13:28 2011 New Revision: 53791 URL: http://svn.reactos.org/svn/reactos?rev=53791&view=rev Log: [KERNEL32] Fix buffer overrun Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] Wed Sep 21 17:13:28 2011 @@ -1370,7 +1370,7 @@ } while (*Let != 0); /* Append extension & UNICODE_NULL */ - memmove(TempFileName, Ext, sizeof(Ext) + sizeof(WCHAR)); + memmove(TempFileName, Ext, sizeof(Ext)); /* If user provided its ID, just return */ if (uUnique)

12 years, 12 months

← Newer
1
...
9
10
11
12
13
14
15
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011