Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31996: - Add a runtime switch between using freeldr-embedded configuration tree heap, or using a real heap allocation (for NT-way). - Use that in winldr.
by fireball＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: fireball Date: Fri Jan 25 18:08:27 2008 New Revision: 31996 URL: http://svn.reactos.org/svn/reactos?rev=31996&view=rev Log: - Add a runtime switch between using freeldr-embedded configuration tree heap, or using a real heap allocation (for NT-way). - Use that in winldr. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Fri Jan 25 18:08:27 2008 @@ -18,6 +18,8 @@ ULONG FldrpHwHeapLocation; PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot; +BOOLEAN UseRealHeap = FALSE; + /* FUNCTIONS ******************************************************************/ PVOID @@ -25,13 +27,21 @@ FldrpHwHeapAlloc(IN ULONG Size) { PVOID Buffer; - - /* Return a block of memory from the ARC Hardware Heap */ - Buffer = &reactos_arc_hardware_data[FldrpHwHeapLocation]; - - /* Increment the heap location */ - FldrpHwHeapLocation += Size; - if (FldrpHwHeapLocation > HW_MAX_ARC_HEAP_SIZE) Buffer = NULL; + + if (UseRealHeap) + { + /* Allocate memory from generic bootloader heap */ + Buffer = MmHeapAlloc(Size); + } + else + { + /* Return a block of memory from the ARC Hardware Heap */ + Buffer = &reactos_arc_hardware_data[FldrpHwHeapLocation]; + + /* Increment the heap location */ + FldrpHwHeapLocation += Size; + if (FldrpHwHeapLocation > HW_MAX_ARC_HEAP_SIZE) Buffer = NULL; + } /* Clear it */ if (Buffer) Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Fri Jan 25 18:08:27 2008 @@ -29,6 +29,8 @@ extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; extern char reactos_arc_strings[32][256]; +extern BOOLEAN UseRealHeap; + BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, IN PCH DllName, @@ -429,6 +431,7 @@ AllocateAndInitLPB(&LoaderBlock); /* Detect hardware */ + UseRealHeap = TRUE; LoaderBlock->ConfigurationRoot = MachHwDetect(); /* Load kernel */

1 0

[cwittich] 31995: reenable it...
by cwittich＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: cwittich Date: Fri Jan 25 18:04:03 2008 New Revision: 31995 URL: http://svn.reactos.org/svn/reactos?rev=31995&view=rev Log: reenable it... 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 (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Fri Jan 25 18:04:03 2008 @@ -1985,13 +1985,22 @@ { case PSN_SETACTIVE: /* Enable the correct buttons on for the active page */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 300)); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETPOS, 0, 0); SetTimer(hwndDlg, 1, 50, NULL); break; + + case PSN_WIZBACK: + /* Handle a Back button click, if necessary */ + KillTimer(hwndDlg, 1); + + /* Skip the progress page */ + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); + SetupData.UnattendSetup = FALSE; + return TRUE; case PSN_WIZFINISH: /* Handle a Finish button click, if necessary */

1 0

[cwittich] 31994: disable the Back button on Finish page
by cwittich＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: cwittich Date: Fri Jan 25 18:00:29 2008 New Revision: 31994 URL: http://svn.reactos.org/svn/reactos?rev=31994&view=rev Log: disable the Back button on Finish page 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 (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Fri Jan 25 18:00:29 2008 @@ -1985,22 +1985,13 @@ { case PSN_SETACTIVE: /* Enable the correct buttons on for the active page */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 300)); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETPOS, 0, 0); SetTimer(hwndDlg, 1, 50, NULL); break; - - case PSN_WIZBACK: - /* Handle a Back button click, if necessary */ - KillTimer(hwndDlg, 1); - - /* Skip the progress page */ - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); - SetupData.UnattendSetup = FALSE; - return TRUE; case PSN_WIZFINISH: /* Handle a Finish button click, if necessary */

1 0

[cwittich] 31993: changed the index to get better readable code spotted by pablo at menichini dot com dot ar
by cwittich＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: cwittich Date: Fri Jan 25 17:18:41 2008 New Revision: 31993 URL: http://svn.reactos.org/svn/reactos?rev=31993&view=rev Log: changed the index to get better readable code spotted by pablo at menichini dot com dot ar Modified: trunk/reactos/drivers/filesystems/vfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/vfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/d… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/dirwr.c (original) +++ trunk/reactos/drivers/filesystems/vfat/dirwr.c Fri Jan 25 17:18:41 2008 @@ -327,9 +327,9 @@ if (aName[i] == '.') { i++; - for (j = 8; j < 11 && aName[i]; j++, i++) - { - DirContext.DirEntry.Fat.Ext[j - 8] = aName[i]; + for (j = 0; j < 3 && aName[i]; j++, i++) + { + DirContext.DirEntry.Fat.Ext[j] = aName[i]; } } if (DirContext.DirEntry.Fat.Filename[0] == 0xe5)

1 0

[cwittich] 31992: revert r31978
by cwittich＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: cwittich Date: Fri Jan 25 17:15:27 2008 New Revision: 31992 URL: http://svn.reactos.org/svn/reactos?rev=31992&view=rev Log: revert r31978 Modified: trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c Fri Jan 25 17:15:27 2008 @@ -254,6 +254,8 @@ NTAPI LocalLock(HLOCAL hMem) { + /* This is the same as a GlobalLock, assuming these never change */ + ASSERT(LMEM_LOCKCOUNT == GMEM_LOCKCOUNT); return GlobalLock(hMem); }

1 0

[fireball] 31991: - Use new way of obtaining the hardware tree in winldr too. - NT4 requires text mode to be set up, and further version of Windows OS require a different preparation. - Fix configuration tree conversion routine to also convert Identifier pointers from physical address to virtual address.
by fireball＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: fireball Date: Fri Jan 25 17:13:54 2008 New Revision: 31991 URL: http://svn.reactos.org/svn/reactos?rev=31991&view=rev Log: - Use new way of obtaining the hardware tree in winldr too. - NT4 requires text mode to be set up, and further version of Windows OS require a different preparation. - Fix configuration tree conversion routine to also convert Identifier pointers from physical address to virtual address. Modified: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/conversion.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/conversion.c Fri Jan 25 17:13:54 2008 @@ -1,124 +1,128 @@ -/* - * PROJECT: EFI Windows Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: freeldr/winldr/conversion.c - * PURPOSE: Physical <-> Virtual addressing mode conversions - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> - -//#include <ndk/ldrtypes.h> -#include <debug.h> - -/* FUNCTIONS **************************************************************/ - -/* Arch-specific addresses translation implementation */ -PVOID -VaToPa(PVOID Va) -{ - return (PVOID)((ULONG_PTR)Va & ~KSEG0_BASE); -} - -PVOID -PaToVa(PVOID Pa) -{ - return (PVOID)((ULONG_PTR)Pa | KSEG0_BASE); -} - -VOID -List_PaToVa(LIST_ENTRY *ListEntry) -{ - LIST_ENTRY *ListHead = ListEntry; - LIST_ENTRY *Next = ListEntry->Flink; - LIST_ENTRY *NextPA; - - //Print(L"\n\nList_Entry: %X, First Next: %X\n", ListEntry, Next); - // - // Walk through the whole list - // - if (Next != NULL) - { - while (Next != PaToVa(ListHead)) - { - NextPA = VaToPa(Next); - //Print(L"Current: %X, Flink: %X, Blink: %X\n", Next, NextPA->Flink, NextPA->Blink); - - NextPA->Flink = PaToVa((PVOID)NextPA->Flink); - NextPA->Blink = PaToVa((PVOID)NextPA->Blink); - - //Print(L"After converting Flink: %X, Blink: %X\n", NextPA->Flink, NextPA->Blink); - - Next = NextPA->Flink; - } - - // - // Finally convert first Flink/Blink - // - ListEntry->Flink = PaToVa((PVOID)ListEntry->Flink); - if (ListEntry->Blink) - ListEntry->Blink = PaToVa((PVOID)ListEntry->Blink); - } -} - -// This function converts only Child->Child, and calls itself for each Sibling -VOID -ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start) -{ - PCONFIGURATION_COMPONENT_DATA Child; - PCONFIGURATION_COMPONENT_DATA Sibling; - - DbgPrint((DPRINT_WINDOWS, "ConvertConfigToVA(Start 0x%X)\n", Start)); - Child = Start; - - while (Child != NULL) - { - if (Child->ConfigurationData) - Child->ConfigurationData = PaToVa(Child->ConfigurationData); - - if (Child->Child) - Child->Child = PaToVa(Child->Child); - - if (Child->Parent) - Child->Parent = PaToVa(Child->Parent); - - if (Child->Sibling) - Child->Sibling = PaToVa(Child->Sibling); - - DbgPrint((DPRINT_WINDOWS, "Device 0x%X class %d type %d, parent %p\n", Child, - Child->ComponentEntry.Class, Child->ComponentEntry.Type, Child->Parent)); - - // If the child has a sibling list, then search the sibling list - // for an entry that matches the specified class, type, and key. - Sibling = VaToPa(Child->Sibling); - while (Sibling != NULL) - { - if (Sibling->ConfigurationData) - Sibling->ConfigurationData = PaToVa(Sibling->ConfigurationData); - - if (Sibling->Child) - Sibling->Child = PaToVa(Sibling->Child); - - if (Sibling->Parent) - Sibling->Parent = PaToVa(Sibling->Parent); - - if (Sibling->Sibling) - Sibling->Sibling = PaToVa(Sibling->Sibling); - - DbgPrint((DPRINT_WINDOWS, "Device 0x%X class %d type %d sib, parent %p\n", Sibling, - Sibling->ComponentEntry.Class, Sibling->ComponentEntry.Type, Sibling->Parent)); - - // If the sibling has a child tree, then search the child tree - // for an entry that matches the specified class, type, and key. - if (VaToPa(Sibling->Child) != NULL) - ConvertConfigToVA(VaToPa(Sibling->Child)); - - Sibling = VaToPa(Sibling->Sibling); - } - - // Go to the next child - Child = VaToPa(Child->Child); - } -} +/* + * PROJECT: EFI Windows Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: freeldr/winldr/conversion.c + * PURPOSE: Physical <-> Virtual addressing mode conversions + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <freeldr.h> + +//#include <ndk/ldrtypes.h> +#include <debug.h> + +/* FUNCTIONS **************************************************************/ + +/* Arch-specific addresses translation implementation */ +PVOID +VaToPa(PVOID Va) +{ + return (PVOID)((ULONG_PTR)Va & ~KSEG0_BASE); +} + +PVOID +PaToVa(PVOID Pa) +{ + return (PVOID)((ULONG_PTR)Pa | KSEG0_BASE); +} + +VOID +List_PaToVa(LIST_ENTRY *ListEntry) +{ + LIST_ENTRY *ListHead = ListEntry; + LIST_ENTRY *Next = ListEntry->Flink; + LIST_ENTRY *NextPA; + + //Print(L"\n\nList_Entry: %X, First Next: %X\n", ListEntry, Next); + // + // Walk through the whole list + // + if (Next != NULL) + { + while (Next != PaToVa(ListHead)) + { + NextPA = VaToPa(Next); + //Print(L"Current: %X, Flink: %X, Blink: %X\n", Next, NextPA->Flink, NextPA->Blink); + + NextPA->Flink = PaToVa((PVOID)NextPA->Flink); + NextPA->Blink = PaToVa((PVOID)NextPA->Blink); + + //Print(L"After converting Flink: %X, Blink: %X\n", NextPA->Flink, NextPA->Blink); + + Next = NextPA->Flink; + } + + // + // Finally convert first Flink/Blink + // + ListEntry->Flink = PaToVa((PVOID)ListEntry->Flink); + if (ListEntry->Blink) + ListEntry->Blink = PaToVa((PVOID)ListEntry->Blink); + } +} + +// This function converts only Child->Child, and calls itself for each Sibling +VOID +ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start) +{ + PCONFIGURATION_COMPONENT_DATA Child; + PCONFIGURATION_COMPONENT_DATA Sibling; + + DbgPrint((DPRINT_WINDOWS, "ConvertConfigToVA(Start 0x%X)\n", Start)); + Child = Start; + + while (Child != NULL) + { + if (Child->ConfigurationData) + Child->ConfigurationData = PaToVa(Child->ConfigurationData); + + if (Child->Child) + Child->Child = PaToVa(Child->Child); + + if (Child->Parent) + Child->Parent = PaToVa(Child->Parent); + + if (Child->Sibling) + Child->Sibling = PaToVa(Child->Sibling); + + if (Child->ComponentEntry.Identifier) + Child->ComponentEntry.Identifier = PaToVa(Child->ComponentEntry.Identifier); + + DbgPrint((DPRINT_WINDOWS, "Device 0x%X class %d type %d id %p, parent %p\n", Child, + Child->ComponentEntry.Class, Child->ComponentEntry.Type, Child->ComponentEntry.Identifier, Child->Parent)); + + // Go through siblings list + Sibling = VaToPa(Child->Sibling); + while (Sibling != NULL) + { + if (Sibling->ConfigurationData) + Sibling->ConfigurationData = PaToVa(Sibling->ConfigurationData); + + if (Sibling->Child) + Sibling->Child = PaToVa(Sibling->Child); + + if (Sibling->Parent) + Sibling->Parent = PaToVa(Sibling->Parent); + + if (Sibling->Sibling) + Sibling->Sibling = PaToVa(Sibling->Sibling); + + if (Sibling->ComponentEntry.Identifier) + Sibling->ComponentEntry.Identifier = PaToVa(Sibling->ComponentEntry.Identifier); + + DbgPrint((DPRINT_WINDOWS, "Device 0x%X class %d type %d id %p, parent %p\n", Sibling, + Sibling->ComponentEntry.Class, Sibling->ComponentEntry.Type, Sibling->ComponentEntry.Identifier, Sibling->Parent)); + + // Recurse into the Child tree + if (VaToPa(Sibling->Child) != NULL) + ConvertConfigToVA(VaToPa(Sibling->Child)); + + Sibling = VaToPa(Sibling->Sibling); + } + + // Go to the next child + Child = VaToPa(Child->Child); + } +} Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Fri Jan 25 17:13:54 2008 @@ -28,7 +28,6 @@ extern ULONG reactos_disk_count; extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; extern char reactos_arc_strings[32][256]; -extern char reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE]; BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, @@ -430,10 +429,7 @@ AllocateAndInitLPB(&LoaderBlock); /* Detect hardware */ - MachHwDetect(); - LoaderBlock->ConfigurationRoot = MmHeapAlloc(16 * 1024); - RtlCopyMemory(LoaderBlock->ConfigurationRoot, - (PVOID)reactos_arc_hardware_data, 16 * 1024); + LoaderBlock->ConfigurationRoot = MachHwDetect(); /* Load kernel */ strcpy(FileName, BootPath); @@ -495,7 +491,10 @@ /* "Stop all motors", change videomode */ DiskStopFloppyMotor(); - MachVideoPrepareForReactOS(FALSE); + if (OperatingSystemVersion < _WIN32_WINNT_WIN2K) + MachVideoPrepareForReactOS(TRUE); + else + MachVideoPrepareForReactOS(FALSE); /* Debugging... */ //DumpMemoryAllocMap();

1 0

[fireball] 31990: - Fix out-of-bounds access, spotted by Christoph & GCC 4.3.0.
by fireball＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: fireball Date: Fri Jan 25 17:08:11 2008 New Revision: 31990 URL: http://svn.reactos.org/svn/reactos?rev=31990&view=rev Log: - Fix out-of-bounds access, spotted by Christoph & GCC 4.3.0. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri Jan 25 17:08:11 2008 @@ -446,7 +446,7 @@ } /* Null-terminate it */ - CpuString[48] = ANSI_NULL; + CpuString[47] = ANSI_NULL; } } Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h Fri Jan 25 17:08:11 2008 @@ -368,7 +368,7 @@ typedef struct _CMHIVE { HHIVE Hive; - HANDLE FileHandles[3]; + HANDLE FileHandles[HFILE_TYPE_MAX]; LIST_ENTRY NotifyList; LIST_ENTRY HiveList; EX_PUSH_LOCK HiveLock;

1 0

[cwittich] 31989: don't write beyond the arraysize
by cwittich＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: cwittich Date: Fri Jan 25 17:03:23 2008 New Revision: 31989 URL: http://svn.reactos.org/svn/reactos?rev=31989&view=rev Log: don't write beyond the arraysize Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.c Fri Jan 25 17:03:23 2008 @@ -55,7 +55,7 @@ }INewMenuImpl; static const IContextMenu2Vtbl cmvt; -static WCHAR szNew[100]; +static WCHAR szNew[MAX_PATH]; static @@ -207,7 +207,7 @@ /* insert do new folder action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szNew, sizeof(szNew) / sizeof(WCHAR))) szNew[0] = 0; - szNew[199] = 0; + szNew[MAX_PATH-1] = 0; dwIndex = 0; do @@ -259,7 +259,7 @@ MENUITEMINFOW mii; PSHELLNEW_ITEM pCurItem; UINT i; - WCHAR szBuffer[100]; + WCHAR szBuffer[MAX_PATH]; if (This->s_SnHead == NULL) { @@ -273,7 +273,7 @@ /* insert do new shortcut action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) szBuffer[0] = 0; - szBuffer[199] = 0; + szBuffer[MAX_PATH-1] = 0; mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.fType = MFT_STRING; mii.dwTypeData = szBuffer; @@ -284,7 +284,7 @@ /* insert do new shortcut action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) szBuffer[0] = 0; - szBuffer[199] = 0; + szBuffer[MAX_PATH-1] = 0; mii.dwTypeData = szBuffer; mii.cch = strlenW(mii.dwTypeData); mii.wID = idFirst++;

1 0

[cwittich] 31988: fix some warnings
by cwittich＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: cwittich Date: Fri Jan 25 16:26:12 2008 New Revision: 31988 URL: http://svn.reactos.org/svn/reactos?rev=31988&view=rev Log: fix some warnings Modified: trunk/reactos/base/shell/explorer/shell/filechild.cpp trunk/reactos/base/shell/explorer/shell/pane.cpp trunk/reactos/base/shell/explorer/shell/shellfs.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp trunk/reactos/base/shell/explorer/utility/xs-native.cpp Modified: trunk/reactos/base/shell/explorer/shell/filechild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/filechild.cpp (original) +++ trunk/reactos/base/shell/explorer/shell/filechild.cpp Fri Jan 25 16:26:12 2008 @@ -299,10 +299,12 @@ SetWindowText(_hwnd, _path); if (_path[0]) + { if (SetCurrentDirectory(_path)) set_url(_path); //set_url(FmtString(TEXT("file://%s"), _path)); else _path[0] = TEXT('\0'); + } } @@ -508,8 +510,9 @@ case WM_CONTEXTMENU: { // first select the current item in the listbox HWND hpanel = (HWND) wparam; - const POINTS& pos = MAKEPOINTS(lparam); - POINT pt; POINTSTOPOINT(pt, pos); + POINT pt; + pt.x = LOWORD(lparam); + pt.y = HIWORD(lparam); POINT pt_screen = pt; ScreenToClient(hpanel, &pt); SendMessage(hpanel, WM_LBUTTONDOWN, 0, MAKELONG(pt.x, pt.y)); Modified: trunk/reactos/base/shell/explorer/shell/pane.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/pane.cpp (original) +++ trunk/reactos/base/shell/explorer/shell/pane.cpp Fri Jan 25 16:26:12 2008 @@ -377,12 +377,13 @@ bool following_child = (up->_next->_data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)!=0; // a directory? if (!following_child) + { for(Entry*n=up->_next; n; n=n->_next) if (n->_down) { // any file with NTFS sub-streams? following_child = true; break; } - + } if (following_child) #endif { @@ -403,12 +404,13 @@ bool following_child = (entry->_next->_data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)!=0; // a directory? if (!following_child) + { for(Entry*n=entry->_next; n; n=n->_next) if (n->_down) { // any file with NTFS sub-streams? following_child = true; break; } - + } if (following_child) #endif LineTo(dis->hDC, x, dis->rcItem.bottom); Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellfs.cpp (original) +++ trunk/reactos/base/shell/explorer/shell/shellfs.cpp Fri Jan 25 16:26:12 2008 @@ -122,6 +122,7 @@ CONTEXT("ShellEntry::create_absolute_pidl()"); if (_up) + { if (_up->_etype == ET_SHELL) { ShellDirectory* dir = static_cast<ShellDirectory*>(_up); @@ -129,7 +130,7 @@ return _pidl.create_absolute_pidl(dir->create_absolute_pidl()); } else return _pidl.create_absolute_pidl(_up->create_absolute_pidl()); - + } return _pidl; } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp Fri Jan 25 16:26:12 2008 @@ -314,9 +314,12 @@ return ProcessCopyData((COPYDATASTRUCT*)lparam); case WM_CONTEXTMENU: { + POINTS p; + p.x = LOWORD(lparam); + p.y = HIWORD(lparam); PopupMenu menu(IDM_DESKTOPBAR); SetMenuDefaultItem(menu, 0, MF_BYPOSITION); - menu.TrackPopupMenu(_hwnd, MAKEPOINTS(lparam)); + menu.TrackPopupMenu(_hwnd, p); break;} case PM_GET_LAST_ACTIVE: Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Fri Jan 25 16:26:12 2008 @@ -311,7 +311,9 @@ break; case WM_MOVE: { - const POINTS& pos = MAKEPOINTS(lparam); + POINTS pos; + pos.x = LOWORD(lparam); + pos.y = HIWORD(lparam); // move open submenus of floating menus if (_submenu) { @@ -699,10 +701,12 @@ int idx = GetSelectionIndex(); if (idx == -1) + { if (step > 0) idx = 0 - step; else idx = _buttons.size() - step; + } for(;;) { idx += step; @@ -1067,10 +1071,12 @@ { // search for an already existing subdirectory entry with the same name if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { for(ShellEntryMap::iterator it=_entries.begin(); it!=_entries.end(); ++it) { StartMenuEntry& sme = it->second; if (!_tcsicmp(sme._title, title)) ///@todo speed up by using a map indexed by name + { for(ShellEntrySet::iterator it2=sme._entries.begin(); it2!=sme._entries.end(); ++it2) { if ((*it2)->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { // merge the new shell entry with the existing of the same name @@ -1079,7 +1085,9 @@ return it; } } - } + } + } + } ShellEntryMap::iterator sme = AddEntry(title, icon_id); Modified: trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp Fri Jan 25 16:26:12 2008 @@ -419,6 +419,9 @@ case WM_CONTEXTMENU: { Point pt(lparam); + POINTS p; + p.x = pt.x; + p.y = pt.y; ScreenToClient(_hwnd, &pt); if (IconHitTest(pt) == _sorted_icons.end()) { // display menu only when no icon clicked @@ -426,7 +429,7 @@ SetMenuDefaultItem(menu, 0, MF_BYPOSITION); CheckMenuItem(menu, ID_SHOW_HIDDEN_ICONS, MF_BYCOMMAND|(_show_hidden?MF_CHECKED:MF_UNCHECKED)); CheckMenuItem(menu, ID_SHOW_ICON_BUTTON, MF_BYCOMMAND|(_show_button?MF_CHECKED:MF_UNCHECKED)); - menu.TrackPopupMenu(_hwnd, MAKEPOINTS(lparam)); + menu.TrackPopupMenu(_hwnd, p); } break;} Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Fri Jan 25 16:26:12 2008 @@ -705,6 +705,7 @@ break; if (p != s) + { if (_pos->_children.empty()) { // no children in last node? if (_last_tag == TAG_START) _pos->_content.append(s, p-s); @@ -714,7 +715,7 @@ p = s; } else _pos->_children.back()->_trailing.append(s, p-s); - + } std::string leading; if (p != e) @@ -752,12 +753,14 @@ } if (p != s) + { if (_pos->_children.empty()) // no children in current node? _pos->_content.append(s, p-s); else if (_last_tag == TAG_START) _pos->_content.append(s, p-s); else _pos->_children.back()->_trailing.append(s, p-s); + } if (p != e) _pos->_end_leading.assign(p, e-p); Modified: trunk/reactos/base/shell/explorer/utility/xs-native.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xs-native.cpp (original) +++ trunk/reactos/base/shell/explorer/utility/xs-native.cpp Fri Jan 25 16:26:12 2008 @@ -361,6 +361,7 @@ for(;;) { // check for the encoding of the first line end if (!_endl_defined) + { if (c == '\n') { _format._endl = "\n"; _endl_defined = true; @@ -368,7 +369,7 @@ _format._endl = "\r\n"; _endl_defined = true; } - + } c = get(); if (c == EOF)

1 0

[fireball] 31987: - Make HwDetect routine return a pointer to the root of a configuration tree (instead of directly referencing a global variable).
by fireball＠svn.reactos.org 25 Jan '08

25 Jan '08

Author: fireball Date: Fri Jan 25 15:22:51 2008 New Revision: 31987 URL: http://svn.reactos.org/svn/reactos?rev=31987&view=rev Log: - Make HwDetect routine return a pointer to the root of a configuration tree (instead of directly referencing a global variable). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Fri Jan 25 15:22:51 2008 @@ -1861,7 +1861,7 @@ } -VOID +PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID) { PCONFIGURATION_COMPONENT_DATA SystemKey; @@ -1886,6 +1886,8 @@ DetectAcpiBios(SystemKey, &BusNumber); DbgPrint((DPRINT_HWDETECT, "DetectHardware() Done\n")); + + return SystemKey; } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c Fri Jan 25 15:22:51 2008 @@ -349,7 +349,7 @@ /* FIXME: Detect more ISA devices */ } -VOID +PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID) { PCONFIGURATION_COMPONENT_DATA SystemKey; @@ -370,6 +370,7 @@ DetectIsaBios(SystemKey, &BusNumber); DbgPrint((DPRINT_HWDETECT, "DetectHardware() Done\n")); + return SystemKey; } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Fri Jan 25 15:22:51 2008 @@ -446,7 +446,7 @@ } } -VOID PpcHwDetect() { +PCONFIGURATION_COMPONENT_DATA PpcHwDetect() { PCONFIGURATION_COMPONENT_DATA RootKey; ULONG BusNumber = 0, DiskController = 0, DiskNumber = 0; int node = ofw_finddevice("/"); @@ -456,6 +456,7 @@ FldrSetComponentInformation(RootKey, 0, 0, (ULONG)-1); OfwCopyDeviceTree(RootKey,"/",node,&BusNumber,&DiskController,&DiskNumber); + return RootKey; } BOOLEAN PpcDiskNormalizeSystemPath(char *SystemPath, unsigned Size) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Fri Jan 25 15:22:51 2008 @@ -108,7 +108,7 @@ /* Most PReP hardware is in standard locations, based on the corresponding * hardware on PCs. */ -VOID PpcPrepHwDetect() { +PCONFIGURATION_COMPONENT_DATA PpcPrepHwDetect() { PCONFIGURATION_COMPONENT_DATA SystemKey; /* Create the 'System' key */ @@ -121,6 +121,7 @@ 0xFFFFFFFF); printf("DetectHardware() Done\n"); + return SystemKey; } void PpcPrepInit() Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h Fri Jan 25 15:22:51 2008 @@ -55,7 +55,7 @@ VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); -VOID PcHwDetect(VOID); +PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); #endif /* __I386_MACHPC_H_ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h Fri Jan 25 15:22:51 2008 @@ -58,7 +58,7 @@ VOID XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); -VOID XboxHwDetect(VOID); +PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID); VOID XboxSetLED(PCSTR Pattern); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h Fri Jan 25 15:22:51 2008 @@ -69,7 +69,7 @@ VOID (*RTCGetCurrentDateTime)(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); - VOID (*HwDetect)(VOID); + PCONFIGURATION_COMPONENT_DATA (*HwDetect)(VOID); } MACHVTBL, *PMACHVTBL; VOID MachInit(const char *CmdLine); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Fri Jan 25 15:22:51 2008 @@ -604,7 +604,6 @@ LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.DrivesAddr = reactos_arc_disk_info; - LoaderBlock.ArchExtra = (ULONG)reactos_arc_hardware_data; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { @@ -700,7 +699,7 @@ /* * Detect hardware */ - MachHwDetect(); + LoaderBlock.ArchExtra = (ULONG)MachHwDetect(); UiDrawProgressBarCenter(5, 100, szLoadingMsg); if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Fri Jan 25 15:22:51 2008 @@ -187,7 +187,6 @@ LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; - LoaderBlock.ArchExtra = (ULONG)reactos_arc_hardware_data; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { @@ -232,7 +231,7 @@ /* Detect hardware */ UiDrawStatusText("Detecting hardware..."); - MachHwDetect(); + LoaderBlock.ArchExtra = (ULONG)MachHwDetect(); UiDrawStatusText(""); /* set boot device */

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