Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[sserapion] 43860: Please don't cast NULL to an integer type. Fixes building this module.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Sat Oct 31 00:51:29 2009 New Revision: 43860 URL: http://svn.reactos.org/svn/reactos?rev=43860&view=rev Log: Please don't cast NULL to an integer type. Fixes building this module. Modified: branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sat Oct 31 00:51:29 2009 @@ -688,13 +688,13 @@ if (ReadPwrScheme(uiID,&tmp)) { - if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,(DWORD)NULL,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,0,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS) { return FALSE; } swprintf(Buf,L"%i",uiID); - if (RegSetValueExW(hKey,szCurrentPowerPolicies,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS) + if (RegSetValueExW(hKey,szCurrentPowerPolicies,0,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS) { RegCloseKey(hKey); if ((lpGlobalPowerPolicy != NULL) || (lpPowerPolicy != NULL)) @@ -799,7 +799,7 @@ if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf, &hKey) == ERROR_SUCCESS) { - RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY)); + RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY)); RegCloseKey(hKey); return TRUE; } @@ -821,7 +821,7 @@ &hKey) != ERROR_SUCCESS) return; swprintf(Buf,L"%i",g_LastID); - RegSetValueExW(hKey,szLastID,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)); + RegSetValueExW(hKey,szLastID,0,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)); RegCloseKey(hKey); } @@ -845,8 +845,8 @@ if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) { - RegSetValueExW(hKey,szName,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR)); - RegSetValueExW(hKey,szDescription,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR)); + RegSetValueExW(hKey,szName,0,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR)); + RegSetValueExW(hKey,szDescription,0,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR)); RegCloseKey(hKey); return WritePwrPolicy(puiID,pPowerPolicy); } @@ -1143,13 +1143,13 @@ if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) { - RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY)); + RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY)); RegCloseKey(hKey); swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%i",*puiID); if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf,&hKey) == ERROR_SUCCESS) { - RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY)); + RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY)); RegCloseKey(hKey); return TRUE; }

1 0

[cgutman] 43859: - Remove some junk code which does nothing but crash
by cgutman＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: cgutman Date: Sat Oct 31 00:39:13 2009 New Revision: 43859 URL: http://svn.reactos.org/svn/reactos?rev=43859&view=rev Log: - Remove some junk code which does nothing but crash Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] Sat Oct 31 00:39:13 2009 @@ -824,19 +824,6 @@ register struct socket *so; register int how; { - if (so == NULL) - { - register struct protosw *pr = NULL; - - how++; - if (how & FREAD) - sorflush(so); - if (how & FWRITE) - return ((*pr->pr_usrreq)(so, PRU_SHUTDOWN, - (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0)); - return (0); - } - register struct protosw *pr = so->so_proto; how++;

1 0

[sserapion] 43858: Fix warnings.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Sat Oct 31 00:02:03 2009 New Revision: 43858 URL: http://svn.reactos.org/svn/reactos?rev=43858&view=rev Log: Fix warnings. Modified: branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c Modified: branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c [iso-8859-1] Sat Oct 31 00:02:03 2009 @@ -251,7 +251,7 @@ { int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; SendMessage(hStatusBar, WM_SIZE, wParam, lParam); - SendMessage(hStatusBar, SB_SETPARTS, 3, (int)&test); + SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); MoveWindow(hScrollbox, 56, 49, LOWORD(lParam) - 56, HIWORD(lParam) - 72, TRUE); //InvalidateRect(hwnd, NULL, TRUE); }

1 0

[sserapion] 43857: Remove unneeded casts. Fix build.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 23:47:30 2009 New Revision: 43857 URL: http://svn.reactos.org/svn/reactos?rev=43857&view=rev Log: Remove unneeded casts. Fix build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c [iso-8859-1] Fri Oct 30 23:47:30 2009 @@ -647,7 +647,7 @@ v[2] = 0.0; z_value = 0.0f; - gluTessBeginPolygon(tess, (VOID *)*(INT *)&z_value); + gluTessBeginPolygon(tess, &z_value); for (loop = (DWORD) *p++; loop; --loop) { @@ -718,7 +718,7 @@ glNormal3f(0.0f, 0.0f, -1.0f); gluTessNormal(tess, 0.0F, 0.0F, -1.0F); - gluTessBeginPolygon(tess, (VOID *)*(INT *)&thickness); + gluTessBeginPolygon(tess, &thickness); for (loop = (DWORD) *p++; loop; --loop) {

1 0

[sginsberg] 43856: - Fix leftover
by sginsberg＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sginsberg Date: Fri Oct 30 23:15:50 2009 New Revision: 43856 URL: http://svn.reactos.org/svn/reactos?rev=43856&view=rev Log: - Fix leftover Modified: trunk/reactos/hal/halx86/include/bus.h Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Fri Oct 30 23:15:50 2009 @@ -249,7 +249,7 @@ IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootBusHandler, IN PCI_SLOT_NUMBER SlotNumber, - IN PUCHAR Buffer, + IN PVOID Buffer, IN ULONG Offset, IN ULONG Length ); @@ -260,7 +260,7 @@ IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootBusHandler, IN PCI_SLOT_NUMBER SlotNumber, - IN PUCHAR Buffer, + IN PVOID Buffer, IN ULONG Offset, IN ULONG Length );

1 0

[sginsberg] 43855: - Restructure HAL bus routines a bit. - Fix some incorrect HAL types and add some that were missing.
by sginsberg＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sginsberg Date: Fri Oct 30 23:07:26 2009 New Revision: 43855 URL: http://svn.reactos.org/svn/reactos?rev=43855&view=rev Log: - Restructure HAL bus routines a bit. - Fix some incorrect HAL types and add some that were missing. Added: trunk/reactos/hal/halx86/generic/bus/ (with props) trunk/reactos/hal/halx86/generic/bus/bushndlr.c (with props) trunk/reactos/hal/halx86/generic/bus/halbus.c - copied, changed from r43810, trunk/reactos/hal/halx86/generic/bus.c trunk/reactos/hal/halx86/generic/bus/isabus.c (with props) trunk/reactos/hal/halx86/generic/bus/pcibus.c - copied, changed from r43810, trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/hal/halx86/generic/bus/sysbus.c (with props) Removed: trunk/reactos/hal/halx86/generic/bus.c trunk/reactos/hal/halx86/generic/pci.c Modified: trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/hal_generic_amd64.rbuild trunk/reactos/hal/halx86/hal_generic_pc.rbuild trunk/reactos/hal/halx86/halxbox.rbuild trunk/reactos/include/ndk/haltypes.h Propchange: trunk/reactos/hal/halx86/generic/bus/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Oct 30 23:07:26 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/hal/halx86/generic/bus/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/hal/halx86/generic/bus/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/hal/halx86/generic/bus/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: trunk/reactos/hal/halx86/generic/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus.c (removed) @@ -1,356 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus.c - * PURPOSE: Bus Support Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -ULONG HalpBusType; - -/* PRIVATE FUNCTIONS *********************************************************/ - -VOID -NTAPI -HalpRegisterKdSupportFunctions(VOID) -{ - /* Register PCI Device Functions */ - KdSetupPciDeviceForDebugging = HalpSetupPciDeviceForDebugging; - KdReleasePciDeviceforDebugging = HalpReleasePciDeviceForDebugging; - - /* Register memory functions */ - KdMapPhysicalMemory64 = HalpMapPhysicalMemory64; - KdUnmapVirtualAddress = HalpUnmapVirtualAddress; - - /* Register ACPI stub */ - KdCheckPowerButton = HalpCheckPowerButton; -} - -NTSTATUS -NTAPI -HalpAssignSlotResources(IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject, - IN INTERFACE_TYPE BusType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN OUT PCM_RESOURCE_LIST *AllocatedResources) -{ - BUS_HANDLER BusHandler; - PAGED_CODE(); - - /* Only PCI is supported */ - if (BusType != PCIBus) return STATUS_NOT_IMPLEMENTED; - - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call the PCI function */ - return HalpAssignPCISlotResources(&BusHandler, - &BusHandler, - RegistryPath, - DriverClassName, - DriverObject, - DeviceObject, - SlotNumber, - AllocatedResources); -} - -BOOLEAN -NTAPI -HalpTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber, - IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress) -{ - /* Translation is easy */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - return TRUE; -} - -ULONG -NTAPI -HalpGetSystemInterruptVector(IN ULONG BusNumber, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity) -{ - ULONG Vector = IRQ2VECTOR(BusInterruptLevel); - *Irql = (KIRQL)VECTOR2IRQL(Vector); - *Affinity = 0xFFFFFFFF; - return Vector; -} - -BOOLEAN -NTAPI -HalpFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress, - IN OUT PULONG_PTR Context, - IN BOOLEAN NextBus) -{ - /* Make sure we have a context */ - if (!Context) return FALSE; - - /* If we have data in the context, then this shouldn't be a new lookup */ - if ((*Context) && (NextBus == TRUE)) return FALSE; - - /* Return bus data */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - - /* Set context value and return success */ - *Context = 1; - return TRUE; -} - -VOID -NTAPI -HalpInitNonBusHandler(VOID) -{ - /* These should be written by the PCI driver later, but we give defaults */ - HalPciTranslateBusAddress = HalpTranslateBusAddress; - HalPciAssignSlotResources = HalpAssignSlotResources; - HalFindBusAddressTranslation = HalpFindBusAddressTranslation; -} - -/* PUBLIC FUNCTIONS **********************************************************/ - -/* - * @implemented - */ -NTSTATUS -NTAPI -HalAdjustResourceList(IN PCM_RESOURCE_LIST Resources) -{ - /* Deprecated, return success */ - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -HalAssignSlotResources(IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject, - IN INTERFACE_TYPE BusType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN OUT PCM_RESOURCE_LIST *AllocatedResources) -{ - /* Check the bus type */ - if (BusType != PCIBus) - { - /* Call our internal handler */ - return HalpAssignSlotResources(RegistryPath, - DriverClassName, - DriverObject, - DeviceObject, - BusType, - BusNumber, - SlotNumber, - AllocatedResources); - } - else - { - /* Call the PCI registered function */ - return HalPciAssignSlotResources(RegistryPath, - DriverClassName, - DriverObject, - DeviceObject, - PCIBus, - BusNumber, - SlotNumber, - AllocatedResources); - } -} - -/* - * @implemented - */ -ULONG -NTAPI -HalGetBusData(IN BUS_DATA_TYPE BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length) -{ - /* Call the extended function */ - return HalGetBusDataByOffset(BusDataType, - BusNumber, - SlotNumber, - Buffer, - 0, - Length); -} - -/* - * @implemented - */ -ULONG -NTAPI -HalGetBusDataByOffset(IN BUS_DATA_TYPE BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - BUS_HANDLER BusHandler; - - /* Look as the bus type */ - if (BusDataType == Cmos) - { - /* Call CMOS Function */ - return HalpGetCmosData(0, SlotNumber, Buffer, Length); - } - else if (BusDataType == EisaConfiguration) - { - /* FIXME: TODO */ - ASSERT(FALSE); - } - else if ((BusDataType == PCIConfiguration) && - (HalpPCIConfigInitialized) && - ((BusNumber >= HalpMinPciBus) && (BusNumber <= HalpMaxPciBus))) - { - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call PCI function */ - return HalpGetPCIData(&BusHandler, - &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, - Buffer, - Offset, - Length); - } - - /* Invalid bus */ - return 0; -} - -/* - * @implemented - */ -ULONG -NTAPI -HalGetInterruptVector(IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity) -{ - /* Call the system bus translator */ - return HalpGetSystemInterruptVector(BusNumber, - BusInterruptLevel, - BusInterruptVector, - Irql, - Affinity); -} - -/* - * @implemented - */ -ULONG -NTAPI -HalSetBusData(IN BUS_DATA_TYPE BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length) -{ - /* Call the extended function */ - return HalSetBusDataByOffset(BusDataType, - BusNumber, - SlotNumber, - Buffer, - 0, - Length); -} - -/* - * @implemented - */ -ULONG -NTAPI -HalSetBusDataByOffset(IN BUS_DATA_TYPE BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - BUS_HANDLER BusHandler; - - /* Look as the bus type */ - if (BusDataType == Cmos) - { - /* Call CMOS Function */ - return HalpSetCmosData(0, SlotNumber, Buffer, Length); - } - else if ((BusDataType == PCIConfiguration) && (HalpPCIConfigInitialized)) - { - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call PCI function */ - return HalpSetPCIData(&BusHandler, - &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, - Buffer, - Offset, - Length); - } - - /* Invalid bus */ - return 0; -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber, - IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress) -{ - /* Look as the bus type */ - if (InterfaceType == PCIBus) - { - /* Call the PCI registered function */ - return HalPciTranslateBusAddress(PCIBus, - BusNumber, - BusAddress, - AddressSpace, - TranslatedAddress); - } - else - { - /* Translation is easy */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - return TRUE; - } -} - -/* EOF */ Added: trunk/reactos/hal/halx86/generic/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/bus… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/bushndlr.c (added) +++ trunk/reactos/hal/halx86/generic/bus/bushndlr.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,0 +1,7 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/bus/bushndlr.c + * PURPOSE: + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ Propchange: trunk/reactos/hal/halx86/generic/bus/bushndlr.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/hal/halx86/generic/bus/halbus.c (from r43810, trunk/reactos/hal/halx86/generic/bus.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/hal… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/halbus.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus.c + * FILE: hal/halx86/generic/bus/halbus.c * PURPOSE: Bus Support Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Added: trunk/reactos/hal/halx86/generic/bus/isabus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/isa… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/isabus.c (added) +++ trunk/reactos/hal/halx86/generic/bus/isabus.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,0 +1,7 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/bus/isabus.c + * PURPOSE: + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ Propchange: trunk/reactos/hal/halx86/generic/bus/isabus.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/hal/halx86/generic/bus/pcibus.c (from r43810, trunk/reactos/hal/halx86/generic/pci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/pci… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/pci.c + * FILE: hal/halx86/generic/bus/pcibus.c * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ @@ -98,9 +98,10 @@ NULL, &HalpFakePciBusData, 0, + NULL, {0, 0, 0, 0}, - HalpGetPCIData, - HalpSetPCIData, + (PGETSETBUSDATA)HalpGetPCIData, + (PGETSETBUSDATA)HalpSetPCIData, NULL, HalpAssignPCISlotResources, NULL, @@ -338,7 +339,7 @@ HalpGetPCIData(IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, + IN PVOID Buffer, IN ULONG Offset, IN ULONG Length) { @@ -404,7 +405,7 @@ /* Update buffer and offset, decrement total length */ Offset += Len; - Buffer += Len; + Buffer = (PVOID)((ULONG_PTR)Buffer + Len); Length -= Len; } @@ -429,7 +430,7 @@ HalpSetPCIData(IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, + IN PVOID Buffer, IN ULONG Offset, IN ULONG Length) { @@ -483,7 +484,7 @@ /* Update buffer and offset, decrement total length */ Offset += Len; - Buffer += Len; + Buffer = (PVOID)((ULONG_PTR)Buffer + Len); Length -= Len; } Added: trunk/reactos/hal/halx86/generic/bus/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/sys… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/sysbus.c (added) +++ trunk/reactos/hal/halx86/generic/bus/sysbus.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,0 +1,7 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/bus/sysbus.c + * PURPOSE: + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ Propchange: trunk/reactos/hal/halx86/generic/bus/sysbus.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pci.c (removed) @@ -1,937 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/pci.c - * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation) - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -BOOLEAN HalpPCIConfigInitialized; -ULONG HalpMinPciBus, HalpMaxPciBus; -KSPIN_LOCK HalpPCIConfigLock; -PCI_CONFIG_HANDLER PCIConfigHandler; - -/* PCI Operation Matrix */ -UCHAR PCIDeref[4][4] = -{ - {0, 1, 2, 2}, // ULONG-aligned offset - {1, 1, 1, 1}, // UCHAR-aligned offset - {2, 1, 2, 2}, // USHORT-aligned offset - {1, 1, 1, 1} // UCHAR-aligned offset -}; - -/* Type 1 PCI Bus */ -PCI_CONFIG_HANDLER PCIConfigHandlerType1 = -{ - /* Synchronization */ - (FncSync)HalpPCISynchronizeType1, - (FncReleaseSync)HalpPCIReleaseSynchronzationType1, - - /* Read */ - { - (FncConfigIO)HalpPCIReadUlongType1, - (FncConfigIO)HalpPCIReadUcharType1, - (FncConfigIO)HalpPCIReadUshortType1 - }, - - /* Write */ - { - (FncConfigIO)HalpPCIWriteUlongType1, - (FncConfigIO)HalpPCIWriteUcharType1, - (FncConfigIO)HalpPCIWriteUshortType1 - } -}; - -/* Type 2 PCI Bus */ -PCI_CONFIG_HANDLER PCIConfigHandlerType2 = -{ - /* Synchronization */ - (FncSync)HalpPCISynchronizeType2, - (FncReleaseSync)HalpPCIReleaseSynchronizationType2, - - /* Read */ - { - (FncConfigIO)HalpPCIReadUlongType2, - (FncConfigIO)HalpPCIReadUcharType2, - (FncConfigIO)HalpPCIReadUshortType2 - }, - - /* Write */ - { - (FncConfigIO)HalpPCIWriteUlongType2, - (FncConfigIO)HalpPCIWriteUcharType2, - (FncConfigIO)HalpPCIWriteUshortType2 - } -}; - -PCIPBUSDATA HalpFakePciBusData = -{ - { - PCI_DATA_TAG, - PCI_DATA_VERSION, - HalpReadPCIConfig, - HalpWritePCIConfig, - NULL, - NULL, - {{{0, 0, 0}}}, - {0, 0, 0, 0} - }, - {{0, 0}}, - 32, -}; - -BUS_HANDLER HalpFakePciBusHandler = -{ - 1, - PCIBus, - PCIConfiguration, - 0, - NULL, - NULL, - &HalpFakePciBusData, - 0, - {0, 0, 0, 0}, - HalpGetPCIData, - HalpSetPCIData, - NULL, - HalpAssignPCISlotResources, - NULL, - NULL -}; - -/* TYPE 1 FUNCTIONS **********************************************************/ - -VOID -NTAPI -HalpPCISynchronizeType1(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PKIRQL Irql, - IN PPCI_TYPE1_CFG_BITS PciCfg1) -{ - /* Setup the PCI Configuration Register */ - PciCfg1->u.AsULONG = 0; - PciCfg1->u.bits.BusNumber = BusHandler->BusNumber; - PciCfg1->u.bits.DeviceNumber = Slot.u.bits.DeviceNumber; - PciCfg1->u.bits.FunctionNumber = Slot.u.bits.FunctionNumber; - PciCfg1->u.bits.Enable = TRUE; - - /* Acquire the lock */ - *Irql = KfRaiseIrql(HIGH_LEVEL); - KiAcquireSpinLock(&HalpPCIConfigLock); -} - -VOID -NTAPI -HalpPCIReleaseSynchronzationType1(IN PBUS_HANDLER BusHandler, - IN KIRQL Irql) -{ - PCI_TYPE1_CFG_BITS PciCfg1; - - /* Clear the PCI Configuration Register */ - PciCfg1.u.AsULONG = 0; - WRITE_PORT_ULONG(((PPCIPBUSDATA)BusHandler->BusData)->Config.Type1.Address, - PciCfg1.u.AsULONG); - - /* Release the lock */ - KiReleaseSpinLock(&HalpPCIConfigLock); - KfLowerIrql(Irql); -} - -TYPE1_READ(HalpPCIReadUcharType1, UCHAR) -TYPE1_READ(HalpPCIReadUshortType1, USHORT) -TYPE1_READ(HalpPCIReadUlongType1, ULONG) -TYPE1_WRITE(HalpPCIWriteUcharType1, UCHAR) -TYPE1_WRITE(HalpPCIWriteUshortType1, USHORT) -TYPE1_WRITE(HalpPCIWriteUlongType1, ULONG) - -/* TYPE 2 FUNCTIONS **********************************************************/ - -VOID -NTAPI -HalpPCISynchronizeType2(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PKIRQL Irql, - IN PPCI_TYPE2_ADDRESS_BITS PciCfg) -{ - PCI_TYPE2_CSE_BITS PciCfg2Cse; - PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData; - - /* Setup the configuration register */ - PciCfg->u.AsUSHORT = 0; - PciCfg->u.bits.Agent = (USHORT)Slot.u.bits.DeviceNumber; - PciCfg->u.bits.AddressBase = (USHORT)BusData->Config.Type2.Base; - - /* Acquire the lock */ - *Irql = KfRaiseIrql(HIGH_LEVEL); - KiAcquireSpinLock(&HalpPCIConfigLock); - - /* Setup the CSE Register */ - PciCfg2Cse.u.AsUCHAR = 0; - PciCfg2Cse.u.bits.Enable = TRUE; - PciCfg2Cse.u.bits.FunctionNumber = (UCHAR)Slot.u.bits.FunctionNumber; - PciCfg2Cse.u.bits.Key = -1; - - /* Write the bus number and CSE */ - WRITE_PORT_UCHAR(BusData->Config.Type2.Forward, - (UCHAR)BusHandler->BusNumber); - WRITE_PORT_UCHAR(BusData->Config.Type2.CSE, PciCfg2Cse.u.AsUCHAR); -} - -VOID -NTAPI -HalpPCIReleaseSynchronizationType2(IN PBUS_HANDLER BusHandler, - IN KIRQL Irql) -{ - PCI_TYPE2_CSE_BITS PciCfg2Cse; - PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData; - - /* Clear CSE and bus number */ - PciCfg2Cse.u.AsUCHAR = 0; - WRITE_PORT_UCHAR(BusData->Config.Type2.CSE, PciCfg2Cse.u.AsUCHAR); - WRITE_PORT_UCHAR(BusData->Config.Type2.Forward, 0); - - /* Release the lock */ - KiReleaseSpinLock(&HalpPCIConfigLock); - KfLowerIrql(Irql); -} - -TYPE2_READ(HalpPCIReadUcharType2, UCHAR) -TYPE2_READ(HalpPCIReadUshortType2, USHORT) -TYPE2_READ(HalpPCIReadUlongType2, ULONG) -TYPE2_WRITE(HalpPCIWriteUcharType2, UCHAR) -TYPE2_WRITE(HalpPCIWriteUshortType2, USHORT) -TYPE2_WRITE(HalpPCIWriteUlongType2, ULONG) - -/* PCI CONFIGURATION SPACE ***************************************************/ - -VOID -NTAPI -HalpPCIConfig(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length, - IN FncConfigIO *ConfigIO) -{ - KIRQL OldIrql; - ULONG i; - UCHAR State[20]; - - /* Synchronize the operation */ - PCIConfigHandler.Synchronize(BusHandler, Slot, &OldIrql, State); - - /* Loop every increment */ - while (Length) - { - /* Find out the type of read/write we need to do */ - i = PCIDeref[Offset % sizeof(ULONG)][Length % sizeof(ULONG)]; - - /* Do the read/write and return the number of bytes */ - i = ConfigIO[i]((PPCIPBUSDATA)BusHandler->BusData, - State, - Buffer, - Offset); - - /* Increment the buffer position and offset, and decrease the length */ - Offset += i; - Buffer += i; - Length -= i; - } - - /* Release the lock and PCI bus */ - PCIConfigHandler.ReleaseSynchronzation(BusHandler, OldIrql); -} - -VOID -NTAPI -HalpReadPCIConfig(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - /* Validate the PCI Slot */ - if (!HalpValidPCISlot(BusHandler, Slot)) - { - /* Fill the buffer with invalid data */ - RtlFillMemory(Buffer, Length, -1); - } - else - { - /* Send the request */ - HalpPCIConfig(BusHandler, - Slot, - Buffer, - Offset, - Length, - PCIConfigHandler.ConfigRead); - } -} - -VOID -NTAPI -HalpWritePCIConfig(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - /* Validate the PCI Slot */ - if (HalpValidPCISlot(BusHandler, Slot)) - { - /* Send the request */ - HalpPCIConfig(BusHandler, - Slot, - Buffer, - Offset, - Length, - PCIConfigHandler.ConfigWrite); - } -} - -BOOLEAN -NTAPI -HalpValidPCISlot(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot) -{ - PCI_SLOT_NUMBER MultiSlot; - PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData; - UCHAR HeaderType; - ULONG Device; - - /* Simple validation */ - if (Slot.u.bits.Reserved) return FALSE; - if (Slot.u.bits.DeviceNumber >= BusData->MaxDevice) return FALSE; - - /* Function 0 doesn't need checking */ - if (!Slot.u.bits.FunctionNumber) return TRUE; - - /* Functions 0+ need Multi-Function support, so check the slot */ - Device = Slot.u.bits.DeviceNumber; - MultiSlot = Slot; - MultiSlot.u.bits.FunctionNumber = 0; - - /* Send function 0 request to get the header back */ - HalpReadPCIConfig(BusHandler, - MultiSlot, - &HeaderType, - FIELD_OFFSET(PCI_COMMON_CONFIG, HeaderType), - sizeof(UCHAR)); - - /* Now make sure the header is multi-function */ - if (!(HeaderType & PCI_MULTIFUNCTION) || (HeaderType == 0xFF)) return FALSE; - return TRUE; -} - -/* HAL PCI CALLBACKS *********************************************************/ - -ULONG -NTAPI -HalpGetPCIData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH]; - PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer; - ULONG Len = 0; - -#ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && - (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || - (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) - { - DPRINT("Blacklisted PCI slot\n"); - if (0 == Offset && 2 <= Length) - { - *(PUSHORT)Buffer = PCI_INVALID_VENDORID; - return 2; - } - return 0; - } -#endif - - /* Normalize the length */ - if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG); - - /* Check if this is a vendor-specific read */ - if (Offset >= PCI_COMMON_HDR_LENGTH) - { - /* Read the header */ - HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, sizeof(ULONG)); - - /* Make sure the vendor is valid */ - if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0; - } - else - { - /* Read the entire header */ - Len = PCI_COMMON_HDR_LENGTH; - HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, Len); - - /* Validate the vendor ID */ - if (PciConfig->VendorID == PCI_INVALID_VENDORID) - { - /* It's invalid, but we want to return this much */ - PciConfig->VendorID = PCI_INVALID_VENDORID; - Len = sizeof(USHORT); - } - - /* Now check if there's space left */ - if (Len < Offset) return 0; - - /* There is, so return what's after the offset and normalize */ - Len -= Offset; - if (Len > Length) Len = Length; - - /* Copy the data into the caller's buffer */ - RtlMoveMemory(Buffer, PciBuffer + Offset, Len); - - /* Update buffer and offset, decrement total length */ - Offset += Len; - Buffer += Len; - Length -= Len; - } - - /* Now we still have something to copy */ - if (Length) - { - /* Check if it's vendor-specific data */ - if (Offset >= PCI_COMMON_HDR_LENGTH) - { - /* Read it now */ - HalpReadPCIConfig(BusHandler, Slot, Buffer, Offset, Length); - Len += Length; - } - } - - /* Update the total length read */ - return Len; -} - -ULONG -NTAPI -HalpSetPCIData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH]; - PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer; - ULONG Len = 0; - -#ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && - (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || - (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) - { - DPRINT1("Trying to set data on blacklisted PCI slot\n"); - return 0; - } -#endif - - /* Normalize the length */ - if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG); - - /* Check if this is a vendor-specific read */ - if (Offset >= PCI_COMMON_HDR_LENGTH) - { - /* Read the header */ - HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, sizeof(ULONG)); - - /* Make sure the vendor is valid */ - if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0; - } - else - { - /* Read the entire header and validate the vendor ID */ - Len = PCI_COMMON_HDR_LENGTH; - HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, Len); - if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0; - - /* Return what's after the offset and normalize */ - Len -= Offset; - if (Len > Length) Len = Length; - - /* Copy the specific caller data */ - RtlMoveMemory(PciBuffer + Offset, Buffer, Len); - - /* Write the actual configuration data */ - HalpWritePCIConfig(BusHandler, Slot, PciBuffer + Offset, Offset, Len); - - /* Update buffer and offset, decrement total length */ - Offset += Len; - Buffer += Len; - Length -= Len; - } - - /* Now we still have something to copy */ - if (Length) - { - /* Check if it's vendor-specific data */ - if (Offset >= PCI_COMMON_HDR_LENGTH) - { - /* Read it now */ - HalpWritePCIConfig(BusHandler, Slot, Buffer, Offset, Length); - Len += Length; - } - } - - /* Update the total length read */ - return Len; -} - -NTSTATUS -NTAPI -HalpSetupPciDeviceForDebugging(IN PVOID LoaderBlock, - IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) -{ - DPRINT1("Unimplemented!\n"); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HalpReleasePciDeviceForDebugging(IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) -{ - DPRINT1("Unimplemented!\n"); - return STATUS_NOT_IMPLEMENTED; -} - -static ULONG NTAPI -PciSize(ULONG Base, ULONG Mask) -{ - ULONG Size = Mask & Base; /* Find the significant bits */ - Size = Size & ~(Size - 1); /* Get the lowest of them to find the decode size */ - return Size; -} - -NTSTATUS -NTAPI -HalpAssignPCISlotResources(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName OPTIONAL, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject OPTIONAL, - IN ULONG Slot, - IN OUT PCM_RESOURCE_LIST *AllocatedResources) -{ - PCI_COMMON_CONFIG PciConfig; - SIZE_T Address; - SIZE_T ResourceCount; - ULONG Size[PCI_TYPE0_ADDRESSES]; - NTSTATUS Status = STATUS_SUCCESS; - UCHAR Offset; - PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; - PCI_SLOT_NUMBER SlotNumber; - ULONG WriteBuffer; - - /* FIXME: Should handle 64-bit addresses */ - - /* Read configuration data */ - SlotNumber.u.AsULONG = Slot; - HalpReadPCIConfig(BusHandler, SlotNumber, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); - - /* Check if we read it correctly */ - if (PciConfig.VendorID == PCI_INVALID_VENDORID) - return STATUS_NO_SUCH_DEVICE; - - /* Read the PCI configuration space for the device and store base address and - size information in temporary storage. Count the number of valid base addresses */ - ResourceCount = 0; - for (Address = 0; Address < PCI_TYPE0_ADDRESSES; Address++) - { - if (0xffffffff == PciConfig.u.type0.BaseAddresses[Address]) - PciConfig.u.type0.BaseAddresses[Address] = 0; - - /* Memory resource */ - if (0 != PciConfig.u.type0.BaseAddresses[Address]) - { - ResourceCount++; - - Offset = (UCHAR)FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); - - /* Write 0xFFFFFFFF there */ - WriteBuffer = 0xffffffff; - HalpWritePCIConfig(BusHandler, SlotNumber, &WriteBuffer, Offset, sizeof(ULONG)); - - /* Read that figure back from the config space */ - HalpReadPCIConfig(BusHandler, SlotNumber, &Size[Address], Offset, sizeof(ULONG)); - - /* Write back initial value */ - HalpWritePCIConfig(BusHandler, SlotNumber, &PciConfig.u.type0.BaseAddresses[Address], Offset, sizeof(ULONG)); - } - } - - /* Interrupt resource */ - if (0 != PciConfig.u.type0.InterruptLine) - ResourceCount++; - - /* Allocate output buffer and initialize */ - *AllocatedResources = ExAllocatePoolWithTag( - PagedPool, - sizeof(CM_RESOURCE_LIST) + - (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - ' laH'); - - if (NULL == *AllocatedResources) - return STATUS_NO_MEMORY; - - (*AllocatedResources)->Count = 1; - (*AllocatedResources)->List[0].InterfaceType = PCIBus; - (*AllocatedResources)->List[0].BusNumber = BusHandler->BusNumber; - (*AllocatedResources)->List[0].PartialResourceList.Version = 1; - (*AllocatedResources)->List[0].PartialResourceList.Revision = 1; - (*AllocatedResources)->List[0].PartialResourceList.Count = ResourceCount; - Descriptor = (*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors; - - /* Store configuration information */ - for (Address = 0; Address < PCI_TYPE0_ADDRESSES; Address++) - { - if (0 != PciConfig.u.type0.BaseAddresses[Address]) - { - if (/*PCI_BASE_ADDRESS_SPACE_MEMORY*/ 0 == - (PciConfig.u.type0.BaseAddresses[Address] & 0x1)) - { - Descriptor->Type = CmResourceTypeMemory; - Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; /* FIXME I have no idea... */ - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; /* FIXME Just a guess */ - Descriptor->u.Memory.Start.QuadPart = (PciConfig.u.type0.BaseAddresses[Address] & PCI_ADDRESS_MEMORY_ADDRESS_MASK); - Descriptor->u.Memory.Length = PciSize(Size[Address], PCI_ADDRESS_MEMORY_ADDRESS_MASK); - } - else if (PCI_ADDRESS_IO_SPACE == - (PciConfig.u.type0.BaseAddresses[Address] & 0x1)) - { - Descriptor->Type = CmResourceTypePort; - Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; /* FIXME I have no idea... */ - Descriptor->Flags = CM_RESOURCE_PORT_IO; /* FIXME Just a guess */ - Descriptor->u.Port.Start.QuadPart = PciConfig.u.type0.BaseAddresses[Address] &= PCI_ADDRESS_IO_ADDRESS_MASK; - Descriptor->u.Port.Length = PciSize(Size[Address], PCI_ADDRESS_IO_ADDRESS_MASK & 0xffff); - } - else - { - ASSERT(FALSE); - return STATUS_UNSUCCESSFUL; - } - Descriptor++; - } - } - - if (0 != PciConfig.u.type0.InterruptLine) - { - Descriptor->Type = CmResourceTypeInterrupt; - Descriptor->ShareDisposition = CmResourceShareShared; /* FIXME Just a guess */ - Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; /* FIXME Just a guess */ - Descriptor->u.Interrupt.Level = PciConfig.u.type0.InterruptLine; - Descriptor->u.Interrupt.Vector = PciConfig.u.type0.InterruptLine; - Descriptor->u.Interrupt.Affinity = 0xFFFFFFFF; - - Descriptor++; - } - - ASSERT(Descriptor == (*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors + ResourceCount); - - /* FIXME: Should store the resources in the registry resource map */ - - return Status; -} - -ULONG -NTAPI -HaliPciInterfaceReadConfig(IN PBUS_HANDLER RootBusHandler, - IN ULONG BusNumber, - IN PCI_SLOT_NUMBER SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - BUS_HANDLER BusHandler; - PPCI_COMMON_CONFIG PciData = (PPCI_COMMON_CONFIG)Buffer; - - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Read configuration data */ - HalpReadPCIConfig(&BusHandler, SlotNumber, Buffer, Offset, Length); - - /* Check if caller only wanted at least Vendor ID */ - if (Length >= 2) - { - /* Validate it */ - if (PciData->VendorID != PCI_INVALID_VENDORID) - { - /* Check if this is the new maximum bus number */ - if (HalpMaxPciBus < BusHandler.BusNumber) - { - /* Set it */ - HalpMaxPciBus = BusHandler.BusNumber; - } - } - } - - /* Return length */ - return Length; -} - -PPCI_REGISTRY_INFO_INTERNAL -NTAPI -HalpQueryPciRegistryInfo(VOID) -{ - WCHAR NameBuffer[8]; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName, ConfigName, IdentName; - HANDLE KeyHandle, BusKeyHandle; - NTSTATUS Status; - UCHAR KeyBuffer[sizeof(PPCI_REGISTRY_INFO) + 100]; - PKEY_VALUE_FULL_INFORMATION ValueInfo = (PVOID)KeyBuffer; - ULONG ResultLength; - PWSTR Tag; - ULONG i; - PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - PPCI_REGISTRY_INFO PciRegInfo; - PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo; - - /* Setup the object attributes for the key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\Hardware\\Description\\" - L"System\\MultiFunctionAdapter"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - /* Open the key */ - Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return NULL; - - /* Setup the receiving string */ - KeyName.Buffer = NameBuffer; - KeyName.MaximumLength = sizeof(NameBuffer); - - /* Setup the configuration and identifier key names */ - RtlInitUnicodeString(&ConfigName, L"ConfigurationData"); - RtlInitUnicodeString(&IdentName, L"Identifier"); - - /* Keep looping for each ID */ - for (i = 0; TRUE; i++) - { - /* Setup the key name */ - RtlIntegerToUnicodeString(i, 10, &KeyName); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - KeyHandle, - NULL); - - /* Open it */ - Status = ZwOpenKey(&BusKeyHandle, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - /* None left, fail */ - ZwClose(KeyHandle); - return NULL; - } - - /* Read the registry data */ - Status = ZwQueryValueKey(BusKeyHandle, - &IdentName, - KeyValueFullInformation, - ValueInfo, - sizeof(KeyBuffer), - &ResultLength); - if (!NT_SUCCESS(Status)) - { - /* Failed, try the next one */ - ZwClose(BusKeyHandle); - continue; - } - - /* Get the PCI Tag and validate it */ - Tag = (PWSTR)((ULONG_PTR)ValueInfo + ValueInfo->DataOffset); - if ((Tag[0] != L'P') || - (Tag[1] != L'C') || - (Tag[2] != L'I') || - (Tag[3])) - { - /* Not a valid PCI entry, skip it */ - ZwClose(BusKeyHandle); - continue; - } - - /* Now read our PCI structure */ - Status = ZwQueryValueKey(BusKeyHandle, - &ConfigName, - KeyValueFullInformation, - ValueInfo, - sizeof(KeyBuffer), - &ResultLength); - ZwClose(BusKeyHandle); - if (!NT_SUCCESS(Status)) continue; - - /* We read it OK! Get the actual resource descriptors */ - FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR) - ((ULONG_PTR)ValueInfo + ValueInfo->DataOffset); - PartialDescriptor = (PCM_PARTIAL_RESOURCE_DESCRIPTOR) - ((ULONG_PTR)FullDescriptor-> - PartialResourceList.PartialDescriptors); - - /* Check if this is our PCI Registry Information */ - if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific) - { - /* Close the key */ - ZwClose(KeyHandle); - - /* FIXME: Check PnP\PCI\CardList */ - - /* Get the PCI information */ - PciRegInfo = (PPCI_REGISTRY_INFO)(PartialDescriptor + 1); - - /* Allocate the return structure */ - PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PCI_REGISTRY_INFO_INTERNAL), - ' laH'); - if (!PciRegistryInfo) return NULL; - - /* Fill it out */ - PciRegistryInfo->HardwareMechanism = PciRegInfo->HardwareMechanism; - PciRegistryInfo->NoBuses = PciRegInfo->NoBuses; - PciRegistryInfo->MajorRevision = PciRegInfo->MajorRevision; - PciRegistryInfo->MinorRevision = PciRegInfo->MinorRevision; - PciRegistryInfo->ElementCount = 0; - } - } -} - -VOID -NTAPI -HalpInitializePciStubs(VOID) -{ - PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo; - UCHAR PciType; - PPCIPBUSDATA BusData = (PPCIPBUSDATA)HalpFakePciBusHandler.BusData; - ULONG i; - PCI_SLOT_NUMBER j; - ULONG VendorId = 0; - - /* Query registry information */ - PciRegistryInfo = HalpQueryPciRegistryInfo(); - if (!PciRegistryInfo) - { - /* Assume type 1 */ - PciType = 1; - } - else - { - /* Get the type and free the info structure */ - PciType = PciRegistryInfo->HardwareMechanism & 0xF; - ExFreePool(PciRegistryInfo); - } - - /* Initialize the PCI lock */ - KeInitializeSpinLock(&HalpPCIConfigLock); - - /* Check the type of PCI bus */ - switch (PciType) - { - /* Type 1 PCI Bus */ - case 1: - - /* Copy the Type 1 handler data */ - RtlCopyMemory(&PCIConfigHandler, - &PCIConfigHandlerType1, - sizeof(PCIConfigHandler)); - - /* Set correct I/O Ports */ - BusData->Config.Type1.Address = PCI_TYPE1_ADDRESS_PORT; - BusData->Config.Type1.Data = PCI_TYPE1_DATA_PORT; - break; - - /* Type 2 PCI Bus */ - case 2: - - /* Copy the Type 1 handler data */ - RtlCopyMemory(&PCIConfigHandler, - &PCIConfigHandlerType2, - sizeof (PCIConfigHandler)); - - /* Set correct I/O Ports */ - BusData->Config.Type2.CSE = PCI_TYPE2_CSE_PORT; - BusData->Config.Type2.Forward = PCI_TYPE2_FORWARD_PORT; - BusData->Config.Type2.Base = PCI_TYPE2_ADDRESS_BASE; - - /* Only 16 devices supported, not 32 */ - BusData->MaxDevice = 16; - break; - - default: - - /* Invalid type */ - DbgPrint("HAL: Unnkown PCI type\n"); - } - - /* Loop all possible buses */ - for (i = 0; i < 256; i++) - { - /* Loop all devices */ - for (j.u.AsULONG = 0; j.u.AsULONG < 32; j.u.AsULONG++) - { - /* Query the interface */ - if (HaliPciInterfaceReadConfig(NULL, - i, - j, - &VendorId, - 0, - sizeof(ULONG))) - { - /* Validate the vendor ID */ - if ((USHORT)VendorId != PCI_INVALID_VENDORID) - { - /* Set this as the maximum ID */ - HalpMaxPciBus = i; - break; - } - } - } - } - - /* We're done */ - HalpPCIConfigInitialized = TRUE; -} - -VOID -NTAPI -HalpInitializePciBus(VOID) -{ - /* Initialize the stubs */ - HalpInitializePciStubs(); - - /* FIXME: Initialize NMI Crash Flag */ -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -6,9 +6,14 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <directory name="generic"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>isabus.c</file> + <file>halbus.c</file> + <file>sysbus.c</file> + </directory> <file>beep.c</file> <file>bios.c</file> - <file>bus.c</file> <file>cmos.c</file> <file>dma.c</file> <file>drive.c</file> Modified: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -6,8 +6,13 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <directory name="generic"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>isabus.c</file> + <file>halbus.c</file> + <file>sysbus.c</file> + </directory> <file>beep.c</file> - <file>bus.c</file> <file>cmos.c</file> <file>dma.c</file> <file>drive.c</file> Modified: trunk/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -6,7 +6,9 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <directory name="generic"> - <file>pci.c</file> + <directory name="bus"> + <file>pcibus.c</file> + </directory> </directory> </module> </group> Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -11,7 +11,9 @@ <library>hal_generic_up</library> <library>ntoskrnl</library> <directory name="generic"> - <file>pci.c</file> + <directory name="bus"> + <file>pcibus.c</file> + </directory> </directory> <directory name="xbox"> <file>halinit_xbox.c</file> Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/haltypes.h [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -44,7 +44,7 @@ // typedef PBUS_HANDLER -(NTAPI *pHalHandlerForConfigSpace)( +(FASTCALL *pHalHandlerForConfigSpace)( IN BUS_DATA_TYPE ConfigSpace, IN ULONG BusNumber ); @@ -101,15 +101,15 @@ // typedef NTSTATUS -(NTAPI *pAdjustResourceList)( - IN PBUS_HANDLER BusHandler, - IN ULONG BusNumber, - IN OUT PCM_RESOURCE_LIST Resources -); - -typedef -NTSTATUS -(NTAPI *pAssignSlotResources)( +(NTAPI *PADJUSTRESOURCELIST)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *Resources +); + +typedef +NTSTATUS +(NTAPI *PASSIGNSLOTRESOURCES)( IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, IN PUNICODE_STRING RegistryPath, @@ -122,20 +122,20 @@ typedef ULONG -(NTAPI *pGetSetBusData)( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER SlotNumber, - OUT PUCHAR Buffer, +(NTAPI *PGETSETBUSDATA)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN ULONG SlotNumber, + OUT PVOID Buffer, IN ULONG Offset, IN ULONG Length ); typedef ULONG -(NTAPI *pGetInterruptVector)( - IN PBUS_HANDLER BusHandler, - IN ULONG BusNumber, +(NTAPI *PGETINTERRUPTVECTOR)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, IN ULONG BusInterruptLevel, IN ULONG BusInterruptVector, OUT PKIRQL Irql, @@ -143,10 +143,10 @@ ); typedef -ULONG -(NTAPI *pTranslateBusAddress)( - IN PBUS_HANDLER BusHandler, - IN ULONG BusNumber, +BOOLEAN +(NTAPI *PTRANSLATEBUSADDRESS)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, IN PHYSICAL_ADDRESS BusAddress, IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress @@ -187,8 +187,37 @@ } HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; // +// HAL Supported Range +// +#define HAL_SUPPORTED_RANGE_VERSION 1 +typedef struct _SUPPORTED_RANGE +{ + struct _SUPPORTED_RANGE *Next; + ULONG SystemAddressSpace; + LONGLONG SystemBase; + LONGLONG Base; + LONGLONG Limit; +} SUPPORTED_RANGE, *PSUPPORTED_RANGE; + +typedef struct _SUPPORTED_RANGES +{ + USHORT Version; + BOOLEAN Sorted; + UCHAR Reserved; + ULONG NoIO; + SUPPORTED_RANGE IO; + ULONG NoMemory; + SUPPORTED_RANGE Memory; + ULONG NoPrefetchMemory; + SUPPORTED_RANGE PrefetchMemory; + ULONG NoDma; + SUPPORTED_RANGE Dma; +} SUPPORTED_RANGES, *PSUPPORTED_RANGES; + +// // HAL Bus Handler // +#define HAL_BUS_HANDLER_VERSION 1 typedef struct _BUS_HANDLER { ULONG Version; @@ -199,15 +228,29 @@ struct _BUS_HANDLER *ParentHandler; PVOID BusData; ULONG DeviceControlExtensionSize; - //PSUPPORTED_RANGES BusAddresses; + PSUPPORTED_RANGES BusAddresses; ULONG Reserved[4]; - pGetSetBusData GetBusData; - pGetSetBusData SetBusData; - pAdjustResourceList AdjustResourceList; - pAssignSlotResources AssignSlotResources; - pGetInterruptVector GetInterruptVector; - pTranslateBusAddress TranslateBusAddress; + PGETSETBUSDATA GetBusData; + PGETSETBUSDATA SetBusData; + PADJUSTRESOURCELIST AdjustResourceList; + PASSIGNSLOTRESOURCES AssignSlotResources; + PGETINTERRUPTVECTOR GetInterruptVector; + PTRANSLATEBUSADDRESS TranslateBusAddress; + PVOID Spare1; + PVOID Spare2; + PVOID Spare3; + PVOID Spare4; + PVOID Spare5; + PVOID Spare6; + PVOID Spare7; + PVOID Spare8; } BUS_HANDLER; + +// +// HAL Chip Hacks +// +#define HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE 0x02 +#define HAL_PCI_CHIP_HACK_USB_SMI_DISABLE 0x08 // // Kernel Exports

1 0

[hpoussin] 43854: [freeldr] Move custom.c, drivemap.c/h, miscboot.c/h to i386 directories
by hpoussin＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: hpoussin Date: Fri Oct 30 22:48:21 2009 New Revision: 43854 URL: http://svn.reactos.org/svn/reactos?rev=43854&view=rev Log: [freeldr] Move custom.c, drivemap.c/h, miscboot.c/h to i386 directories Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c - copied, changed from r43657, trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c - copied, changed from r43657, trunk/reactos/boot/freeldr/freeldr/drivemap.c trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c - copied, changed from r43657, trunk/reactos/boot/freeldr/freeldr/miscboot.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h - copied, changed from r43657, trunk/reactos/boot/freeldr/freeldr/include/options.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/drivemap.h - copied, changed from r43657, trunk/reactos/boot/freeldr/freeldr/include/drivemap.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h - copied, changed from r43657, trunk/reactos/boot/freeldr/freeldr/include/miscboot.h Removed: trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/drivemap.c trunk/reactos/boot/freeldr/freeldr/include/drivemap.h trunk/reactos/boot/freeldr/freeldr/include/miscboot.h trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/options.h trunk/reactos/boot/freeldr/freeldr/options.c Copied: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c (from r43657, trunk/reactos/boot/freeldr/freeldr/custom.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -12,9 +12,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <freeldr.h> @@ -34,13 +34,11 @@ VOID OptionMenuCustomBoot(VOID) { PCSTR CustomBootMenuList[] = { -#ifdef __i386__ "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" -#endif /* __i386__ */ }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; @@ -53,7 +51,6 @@ switch (SelectedMenuItem) { -#ifdef __i386__ case 0: // Disk OptionMenuCustomBootDisk(); break; @@ -69,11 +66,9 @@ case 4: // Linux OptionMenuCustomBootLinux(); break; -#endif /* __i386__ */ - } -} - -#ifdef __i386__ + } +} + VOID OptionMenuCustomBootDisk(VOID) { CHAR SectionName[100]; @@ -408,4 +403,11 @@ LoadAndBootLinux(SectionName, "Custom Linux Setup"); } -#endif /* __i386__ */ + +VOID OptionMenuReboot(VOID) +{ + UiMessageBox("The system will now reboot."); + + DiskStopFloppyMotor(); + SoftReboot(); +} Copied: trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c (from r43657, trunk/reactos/boot/freeldr/freeldr/drivemap.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/drivemap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -12,15 +12,14 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <freeldr.h> #include <debug.h> -#ifdef __i386__ BOOLEAN DriveMapInstalled = FALSE; // Tells us if we have already installed our drive map int 13h handler code ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler @@ -221,4 +220,3 @@ DriveMapInstalled = FALSE; } } -#endif /* __i386__ */ Copied: trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c (from r43657, trunk/reactos/boot/freeldr/freeldr/miscboot.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -12,14 +12,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <freeldr.h> -#ifdef __i386__ VOID LoadAndBootBootSector(PCSTR OperatingSystemName) { PFILE FilePointer; @@ -211,4 +210,3 @@ //DisableA20(); ChainLoadBiosBootSectorCode(); } -#endif /* __i386__ */ Removed: trunk/reactos/boot/freeldr/freeldr/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/custo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/custom.c (removed) @@ -1,411 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> - - -const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; -const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; -const CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; -const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; -const CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; -const CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; -const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; -const CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; - -const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; - -VOID OptionMenuCustomBoot(VOID) -{ - PCSTR CustomBootMenuList[] = { -#ifdef __i386__ - "Disk", - "Partition", - "Boot Sector File", - "ReactOS", - "Linux" -#endif /* __i386__ */ - }; - ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); - ULONG SelectedMenuItem; - - if (!UiDisplayMenu(CustomBootMenuList, CustomBootMenuCount, 0, -1, &SelectedMenuItem, TRUE, NULL)) - { - // The user pressed ESC - return; - } - - switch (SelectedMenuItem) - { -#ifdef __i386__ - case 0: // Disk - OptionMenuCustomBootDisk(); - break; - case 1: // Partition - OptionMenuCustomBootPartition(); - break; - case 2: // Boot Sector File - OptionMenuCustomBootBootSectorFile(); - break; - case 3: // ReactOS - OptionMenuCustomBootReactOS(); - break; - case 4: // Linux - OptionMenuCustomBootLinux(); - break; -#endif /* __i386__ */ - } -} - -#ifdef __i386__ -VOID OptionMenuCustomBootDisk(VOID) -{ - CHAR SectionName[100]; - CHAR BootDriveString[20]; - ULONG SectionId; - TIMEINFO* TimeInfo; - - RtlZeroMemory(SectionName, sizeof(SectionName)); - RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); - - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) - { - return; - } - - // Generate a unique section name - TimeInfo = ArcGetTime(); - sprintf(SectionName, "CustomBootDisk%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); - - // Add the section - if (!IniAddSection(SectionName, &SectionId)) - { - return; - } - - // Add the BootType - if (!IniAddSettingValueToSection(SectionId, "BootType", "Drive")) - { - return; - } - - // Add the BootDrive - if (!IniAddSettingValueToSection(SectionId, "BootDrive", BootDriveString)) - { - return; - } - - UiMessageBox(CustomBootPrompt); - - LoadAndBootDrive(SectionName); -} - -VOID OptionMenuCustomBootPartition(VOID) -{ - CHAR SectionName[100]; - CHAR BootDriveString[20]; - CHAR BootPartitionString[20]; - ULONG SectionId; - TIMEINFO* TimeInfo; - - RtlZeroMemory(SectionName, sizeof(SectionName)); - RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); - RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); - - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) - { - return; - } - - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) - { - return; - } - - // Generate a unique section name - TimeInfo = ArcGetTime(); - sprintf(SectionName, "CustomBootPartition%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); - - // Add the section - if (!IniAddSection(SectionName, &SectionId)) - { - return; - } - - // Add the BootType - if (!IniAddSettingValueToSection(SectionId, "BootType", "Partition")) - { - return; - } - - // Add the BootDrive - if (!IniAddSettingValueToSection(SectionId, "BootDrive", BootDriveString)) - { - return; - } - - // Add the BootPartition - if (!IniAddSettingValueToSection(SectionId, "BootPartition", BootPartitionString)) - { - return; - } - - UiMessageBox(CustomBootPrompt); - - LoadAndBootPartition(SectionName); -} - -VOID OptionMenuCustomBootBootSectorFile(VOID) -{ - CHAR SectionName[100]; - CHAR BootDriveString[20]; - CHAR BootPartitionString[20]; - CHAR BootSectorFileString[200]; - ULONG SectionId; - TIMEINFO* TimeInfo; - - RtlZeroMemory(SectionName, sizeof(SectionName)); - RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); - RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); - RtlZeroMemory(BootSectorFileString, sizeof(BootSectorFileString)); - - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) - { - return; - } - - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) - { - return; - } - - if (!UiEditBox(BootSectorFilePrompt, BootSectorFileString, 200)) - { - return; - } - - // Generate a unique section name - TimeInfo = ArcGetTime(); - sprintf(SectionName, "CustomBootSectorFile%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); - - // Add the section - if (!IniAddSection(SectionName, &SectionId)) - { - return; - } - - // Add the BootType - if (!IniAddSettingValueToSection(SectionId, "BootType", "BootSector")) - { - return; - } - - // Add the BootDrive - if (!IniAddSettingValueToSection(SectionId, "BootDrive", BootDriveString)) - { - return; - } - - // Add the BootPartition - if (!IniAddSettingValueToSection(SectionId, "BootPartition", BootPartitionString)) - { - return; - } - - // Add the BootSectorFile - if (!IniAddSettingValueToSection(SectionId, "BootSectorFile", BootSectorFileString)) - { - return; - } - - UiMessageBox(CustomBootPrompt); - - LoadAndBootBootSector(SectionName); -} - -VOID OptionMenuCustomBootReactOS(VOID) -{ - CHAR SectionName[100]; - CHAR BootDriveString[20]; - CHAR BootPartitionString[20]; - CHAR ReactOSSystemPath[200]; - CHAR ReactOSARCPath[200]; - CHAR ReactOSOptions[200]; - ULONG SectionId; - TIMEINFO* TimeInfo; - - RtlZeroMemory(SectionName, sizeof(SectionName)); - RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); - RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); - RtlZeroMemory(ReactOSSystemPath, sizeof(ReactOSSystemPath)); - RtlZeroMemory(ReactOSOptions, sizeof(ReactOSOptions)); - - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) - { - return; - } - - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) - { - return; - } - - if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSSystemPath, 200)) - { - return; - } - - if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, 200)) - { - return; - } - - // Generate a unique section name - TimeInfo = ArcGetTime(); - sprintf(SectionName, "CustomReactOS%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); - - // Add the section - if (!IniAddSection(SectionName, &SectionId)) - { - return; - } - - // Add the BootType - if (!IniAddSettingValueToSection(SectionId, "BootType", "ReactOS")) - { - return; - } - - // Construct the ReactOS ARC system path - ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, DriveMapGetBiosDriveNumber(BootDriveString), atoi(BootPartitionString)); - - // Add the system path - if (!IniAddSettingValueToSection(SectionId, "SystemPath", ReactOSARCPath)) - { - return; - } - - // Add the CommandLine - if (!IniAddSettingValueToSection(SectionId, "Options", ReactOSOptions)) - { - return; - } - - UiMessageBox(CustomBootPrompt); - - LoadAndBootReactOS(SectionName); -} - -VOID OptionMenuCustomBootLinux(VOID) -{ - CHAR SectionName[100]; - CHAR BootDriveString[20]; - CHAR BootPartitionString[20]; - CHAR LinuxKernelString[200]; - CHAR LinuxInitrdString[200]; - CHAR LinuxCommandLineString[200]; - ULONG SectionId; - TIMEINFO* TimeInfo; - - RtlZeroMemory(SectionName, sizeof(SectionName)); - RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); - RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); - RtlZeroMemory(LinuxKernelString, sizeof(LinuxKernelString)); - RtlZeroMemory(LinuxInitrdString, sizeof(LinuxInitrdString)); - RtlZeroMemory(LinuxCommandLineString, sizeof(LinuxCommandLineString)); - - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) - { - return; - } - - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) - { - return; - } - - if (!UiEditBox(LinuxKernelPrompt, LinuxKernelString, 200)) - { - return; - } - - if (!UiEditBox(LinuxInitrdPrompt, LinuxInitrdString, 200)) - { - return; - } - - if (!UiEditBox(LinuxCommandLinePrompt, LinuxCommandLineString, 200)) - { - return; - } - - // Generate a unique section name - TimeInfo = ArcGetTime(); - sprintf(SectionName, "CustomLinux%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); - - // Add the section - if (!IniAddSection(SectionName, &SectionId)) - { - return; - } - - // Add the BootType - if (!IniAddSettingValueToSection(SectionId, "BootType", "Linux")) - { - return; - } - - // Add the BootDrive - if (!IniAddSettingValueToSection(SectionId, "BootDrive", BootDriveString)) - { - return; - } - - // Add the BootPartition - if (!IniAddSettingValueToSection(SectionId, "BootPartition", BootPartitionString)) - { - return; - } - - // Add the Kernel - if (!IniAddSettingValueToSection(SectionId, "Kernel", LinuxKernelString)) - { - return; - } - - // Add the Initrd - if (strlen(LinuxInitrdString) > 0) - { - if (!IniAddSettingValueToSection(SectionId, "Initrd", LinuxInitrdString)) - { - return; - } - } - - // Add the CommandLine - if (!IniAddSettingValueToSection(SectionId, "CommandLine", LinuxCommandLineString)) - { - return; - } - - UiMessageBox(CustomBootPrompt); - - LoadAndBootLinux(SectionName, "Custom Linux Setup"); -} -#endif /* __i386__ */ Removed: trunk/reactos/boot/freeldr/freeldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/drive… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/drivemap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c (removed) @@ -1,224 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> -#include <debug.h> - -#ifdef __i386__ -BOOLEAN DriveMapInstalled = FALSE; // Tells us if we have already installed our drive map int 13h handler code -ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler -ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler -ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler - -VOID DriveMapMapDrivesInSection(PCSTR SectionName) -{ - CHAR SettingName[80]; - CHAR SettingValue[80]; - CHAR ErrorText[260]; - CHAR Drive1[80]; - CHAR Drive2[80]; - ULONG SectionId; - ULONG SectionItemCount; - ULONG Index; - ULONG Index2; - DRIVE_MAP_LIST DriveMapList; - - RtlZeroMemory(&DriveMapList, sizeof(DRIVE_MAP_LIST)); - - if (!IniOpenSection(SectionName, &SectionId)) - { - return; - } - - // Get the number of items in this section - SectionItemCount = IniGetNumSectionItems(SectionId); - - // Loop through each one and check if its a DriveMap= setting - for (Index=0; Index<SectionItemCount; Index++) - { - // Get the next setting from the .ini file section - if (IniReadSettingByNumber(SectionId, Index, SettingName, sizeof(SettingName), SettingValue, sizeof(SettingValue))) - { - if (_stricmp(SettingName, "DriveMap") == 0) - { - // Make sure we haven't exceeded the drive map max count - if (DriveMapList.DriveMapCount >= 4) - { - sprintf(ErrorText, "Max DriveMap count exceeded in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); - UiMessageBox(ErrorText); - continue; - } - - RtlZeroMemory(Drive1, 80); - RtlZeroMemory(Drive2, 80); - - strcpy(Drive1, SettingValue); - - // Parse the setting value and separate a string "hd0,hd1" - // into two strings "hd0" and "hd1" - for (Index2=0; Index2<strlen(Drive1); Index2++) - { - // Check if this character is the separater character (comma - ',') - if (Drive1[Index2] == ',') - { - Drive1[Index2] = '\0'; - strcpy(Drive2, &Drive1[Index2+1]); - break; - } - } - - // Make sure we got good values before we add them to the map - if (!DriveMapIsValidDriveString(Drive1) || !DriveMapIsValidDriveString(Drive2)) - { - sprintf(ErrorText, "Error in DriveMap setting in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); - UiMessageBox(ErrorText); - continue; - } - - // Add them to the map - DriveMapList.DriveMap[(DriveMapList.DriveMapCount * 2)] = DriveMapGetBiosDriveNumber(Drive1); - DriveMapList.DriveMap[(DriveMapList.DriveMapCount * 2)+1] = DriveMapGetBiosDriveNumber(Drive2); - DriveMapList.DriveMapCount++; - - DPRINTM(DPRINT_WARNING, "Mapping BIOS drive 0x%x to drive 0x%x\n", DriveMapGetBiosDriveNumber(Drive1), DriveMapGetBiosDriveNumber(Drive2)); - } - } - } - - if (DriveMapList.DriveMapCount) - { - DPRINTM(DPRINT_WARNING, "Installing Int13 drive map for %d drives.\n", DriveMapList.DriveMapCount); - DriveMapInstallInt13Handler(&DriveMapList); - } - else - { - DPRINTM(DPRINT_WARNING, "Removing any previously installed Int13 drive map.\n"); - DriveMapRemoveInt13Handler(); - } -} - -BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString) -{ - ULONG Index; - - // Now verify that the user has given us appropriate strings - if ((strlen(DriveString) < 3) || - ((DriveString[0] != 'f') && (DriveString[0] != 'F') && (DriveString[0] != 'h') && (DriveString[0] != 'H')) || - ((DriveString[1] != 'd') && (DriveString[1] != 'D'))) - { - return FALSE; - } - - // Now verify that the user has given us appropriate numbers - // Make sure that only numeric characters were given - for (Index=2; Index<strlen(DriveString); Index++) - { - if (DriveString[Index] < '0' || DriveString[Index] > '9') - { - return FALSE; - } - } - // Now make sure that they are not outrageous values (i.e. hd90874) - if ((atoi(&DriveString[2]) < 0) || (atoi(&DriveString[2]) > 0xff)) - { - return FALSE; - } - - return TRUE; -} - -ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName) -{ - ULONG BiosDriveNumber = 0; - - // If they passed in a number string then just - // convert it to decimal and return it - if (DeviceName[0] >= '0' && DeviceName[0] <= '9') - { - return atoi(DeviceName); - } - - // Convert the drive number string into a number - // 'hd1' = 1 - BiosDriveNumber = atoi(&DeviceName[2]); - - // If it's a hard disk then set the high bit - if ((DeviceName[0] == 'h' || DeviceName[0] == 'H') && - (DeviceName[1] == 'd' || DeviceName[1] == 'D')) - { - BiosDriveNumber |= 0x80; - } - - return BiosDriveNumber; -} - -VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) -{ - ULONG* RealModeIVT = (ULONG*)0x00000000; - USHORT* BiosLowMemorySize = (USHORT*)0x00000413; - - if (!DriveMapInstalled) - { - // Get the old INT 13h handler address from the vector table - OldInt13HandlerAddress = RealModeIVT[0x13]; - - // Decrease the size of low memory - (*BiosLowMemorySize)--; - - // Get linear address for drive map handler - DriveMapHandlerAddress = (ULONG)(*BiosLowMemorySize) << 10; - - // Convert to segment:offset style address - DriveMapHandlerSegOff = (DriveMapHandlerAddress << 12) & 0xffff0000; - } - - // Copy the drive map structure to the proper place - RtlCopyMemory(&DriveMapInt13HandlerMapList, DriveMap, sizeof(DRIVE_MAP_LIST)); - - // Set the address of the BIOS INT 13h handler - DriveMapOldInt13HandlerAddress = OldInt13HandlerAddress; - - // Copy the code to our reserved area - RtlCopyMemory((PVOID)DriveMapHandlerAddress, &DriveMapInt13HandlerStart, ((ULONG)&DriveMapInt13HandlerEnd - (ULONG)&DriveMapInt13HandlerStart)); - - // Update the IVT - RealModeIVT[0x13] = DriveMapHandlerSegOff; - - CacheInvalidateCacheData(); - DriveMapInstalled = TRUE; -} - -VOID DriveMapRemoveInt13Handler(VOID) -{ - ULONG* RealModeIVT = (ULONG*)0x00000000; - USHORT* BiosLowMemorySize = (USHORT*)0x00000413; - - if (DriveMapInstalled) - { - // Get the old INT 13h handler address from the vector table - RealModeIVT[0x13] = OldInt13HandlerAddress; - - // Increase the size of low memory - (*BiosLowMemorySize)++; - - CacheInvalidateCacheData(); - DriveMapInstalled = FALSE; - } -} -#endif /* __i386__ */ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -25,6 +25,8 @@ <if property="ARCH" value="i386"> <file>_alloca.S</file> <file>archmach.c</file> + <file>custom.c</file> + <file>drivemap.c</file> <file>hardware.c</file> <file>hwacpi.c</file> <file>hwapm.c</file> @@ -34,6 +36,7 @@ <file>i386vid.c</file> <file>loader.c</file> <file>machpc.c</file> + <file>miscboot.c</file> <file>pccons.c</file> <file>pcdisk.c</file> <file>pcmem.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -85,10 +85,7 @@ <directory name="include"> <pch>freeldr.h</pch> </directory> - <file>drivemap.c</file> - <file>miscboot.c</file> <file>options.c</file> <file>linuxboot.c</file> <file>oslist.c</file> - <file>custom.c</file> </module> Copied: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h (from r43657, trunk/reactos/boot/freeldr/freeldr/include/options.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -17,20 +17,19 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __OPTIONS_H -#define __OPTIONS_H +#ifndef __I386_OPTIONS_H +#define __I386_OPTIONS_H -VOID DoOptionsMenu(VOID); +#define HAS_OPTION_MENU_CUSTOM_BOOT +#define HAS_OPTION_MENU_REBOOT VOID OptionMenuReboot(VOID); VOID OptionMenuCustomBoot(VOID); -#ifdef __i386__ VOID OptionMenuCustomBootDisk(VOID); VOID OptionMenuCustomBootPartition(VOID); VOID OptionMenuCustomBootBootSectorFile(VOID); VOID OptionMenuCustomBootReactOS(VOID); VOID OptionMenuCustomBootLinux(VOID); -#endif /* __i386__ */ -#endif // #defined __OPTIONS_H +#endif // #defined __I386_OPTIONS_H Copied: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/drivemap.h (from r43657, trunk/reactos/boot/freeldr/freeldr/include/drivemap.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/drivemap.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/drivemap.h [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -12,15 +12,14 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __DRIVEMAP_H -#define __DRIVEMAP_H +#ifndef __I386_DRIVEMAP_H +#define __I386_DRIVEMAP_H -#ifdef __i386__ #include <pshpack1.h> typedef struct { @@ -39,6 +38,5 @@ extern PVOID DriveMapInt13HandlerEnd; extern ULONG DriveMapOldInt13HandlerAddress; extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; -#endif /* __i386__ */ -#endif // #defined __DRIVEMAP_H +#endif // #defined __I386_DRIVEMAP_H Copied: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h (from r43657, trunk/reactos/boot/freeldr/freeldr/include/miscboot.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/miscboot.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -12,18 +12,16 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __BOOT_H -#define __BOOT_H +#ifndef __I386_BOOT_H +#define __I386_BOOT_H -#ifdef __i386__ VOID LoadAndBootBootSector(PCSTR OperatingSystemName); VOID LoadAndBootPartition(PCSTR OperatingSystemName); VOID LoadAndBootDrive(PCSTR OperatingSystemName); -#endif /* __i386__ */ -#endif // defined __BOOT_H +#endif // defined __I386_BOOT_H Removed: trunk/reactos/boot/freeldr/freeldr/include/drivemap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/drivemap.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/drivemap.h (removed) @@ -1,44 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __DRIVEMAP_H -#define __DRIVEMAP_H - -#ifdef __i386__ -#include <pshpack1.h> -typedef struct -{ - UCHAR DriveMapCount; // Count of drives currently mapped - CHAR DriveMap[8]; // Map of BIOS drives -} DRIVE_MAP_LIST, *PDRIVE_MAP_LIST; -#include <poppack.h> - -VOID DriveMapMapDrivesInSection(PCSTR SectionName); -BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString); // Checks the drive string ("hd0") for validity -ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') -VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap); // Installs the int 13h handler for the drive mapper -VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler - -extern PVOID DriveMapInt13HandlerStart; -extern PVOID DriveMapInt13HandlerEnd; -extern ULONG DriveMapOldInt13HandlerAddress; -extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; -#endif /* __i386__ */ - -#endif // #defined __DRIVEMAP_H Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -71,10 +71,13 @@ #include <ui/tui.h> /* arch files */ #if defined(_M_IX86) +#include <arch/i386/custom.h> +#include <arch/i386/drivemap.h> #include <arch/i386/hardware.h> #include <arch/i386/i386.h> #include <arch/i386/machpc.h> #include <arch/i386/machxbox.h> +#include <arch/i386/miscboot.h> #include <internal/i386/intrin_i.h> #include <internal/i386/ke.h> #elif defined(_M_PPC) @@ -96,8 +99,6 @@ /* Needed by boot manager */ #include <bootmgr.h> #include <oslist.h> -#include <drivemap.h> -#include <miscboot.h> #include <options.h> #include <linux.h> /* Externals */ Removed: trunk/reactos/boot/freeldr/freeldr/include/miscboot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/miscboot.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/miscboot.h (removed) @@ -1,29 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __BOOT_H -#define __BOOT_H - -#ifdef __i386__ -VOID LoadAndBootBootSector(PCSTR OperatingSystemName); -VOID LoadAndBootPartition(PCSTR OperatingSystemName); -VOID LoadAndBootDrive(PCSTR OperatingSystemName); -#endif /* __i386__ */ - -#endif // defined __BOOT_H Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -22,15 +22,4 @@ VOID DoOptionsMenu(VOID); -VOID OptionMenuReboot(VOID); - -VOID OptionMenuCustomBoot(VOID); -#ifdef __i386__ -VOID OptionMenuCustomBootDisk(VOID); -VOID OptionMenuCustomBootPartition(VOID); -VOID OptionMenuCustomBootBootSectorFile(VOID); -VOID OptionMenuCustomBootReactOS(VOID); -VOID OptionMenuCustomBootLinux(VOID); -#endif /* __i386__ */ - #endif // #defined __OPTIONS_H Removed: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c (removed) @@ -1,214 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> - -#ifdef __i386__ -VOID LoadAndBootBootSector(PCSTR OperatingSystemName) -{ - PFILE FilePointer; - CHAR SettingName[80]; - ULONG SectionId; - CHAR FileName[260]; - ULONG BytesRead; - - // Find all the message box settings and run them - UiShowMessageBoxesInSection(OperatingSystemName); - - // Try to open the operating system section in the .ini file - if (!IniOpenSection(OperatingSystemName, &SectionId)) - { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", OperatingSystemName); - UiMessageBox(SettingName); - return; - } - - if (!IniReadSettingByName(SectionId, "BootSectorFile", FileName, sizeof(FileName))) - { - UiMessageBox("Boot sector file not specified for selected OS!"); - return; - } - - if (!MachDiskNormalizeSystemPath(FileName, sizeof(FileName))) - { - UiMessageBox("Invalid path to boot sector file"); - return; - } - - FilePointer = FsOpenFile(FileName); - if (!FilePointer) - { - strcat(FileName, " not found."); - UiMessageBox(FileName); - return; - } - - // Read boot sector - if (!FsReadFile(FilePointer, 512, &BytesRead, (void*)0x7c00) || (BytesRead != 512)) - { - UiMessageBox("Unable to read boot sector."); - return; - } - - // Check for validity - if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) - { - UiMessageBox("Invalid boot sector magic (0xaa55)"); - return; - } - - UiUnInitialize("Booting..."); - // Don't stop the floppy drive motor when we - // are just booting a bootsector, or drive, or partition. - // If we were to stop the floppy motor then - // the BIOS wouldn't be informed and if the - // next read is to a floppy then the BIOS will - // still think the motor is on and this will - // result in a read error. - //DiskStopFloppyMotor(); - //DisableA20(); - ChainLoadBiosBootSectorCode(); -} - -VOID LoadAndBootPartition(PCSTR OperatingSystemName) -{ - CHAR SettingName[80]; - CHAR SettingValue[80]; - ULONG SectionId; - PARTITION_TABLE_ENTRY PartitionTableEntry; - ULONG DriveNumber; - ULONG PartitionNumber; - - // Find all the message box settings and run them - UiShowMessageBoxesInSection(OperatingSystemName); - - // Try to open the operating system section in the .ini file - if (!IniOpenSection(OperatingSystemName, &SectionId)) - { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", OperatingSystemName); - UiMessageBox(SettingName); - return; - } - - // Read the boot drive - if (!IniReadSettingByName(SectionId, "BootDrive", SettingValue, sizeof(SettingValue))) - { - UiMessageBox("Boot drive not specified for selected OS!"); - return; - } - - DriveNumber = DriveMapGetBiosDriveNumber(SettingValue); - - // Read the boot partition - if (!IniReadSettingByName(SectionId, "BootPartition", SettingValue, sizeof(SettingValue))) - { - UiMessageBox("Boot partition not specified for selected OS!"); - return; - } - - PartitionNumber = atoi(SettingValue); - - // Get the partition table entry - if (!DiskGetPartitionEntry(DriveNumber, PartitionNumber, &PartitionTableEntry)) - { - return; - } - - // Now try to read the partition boot sector - // If this fails then abort - if (!MachDiskReadLogicalSectors(DriveNumber, PartitionTableEntry.SectorCountBeforePartition, 1, (PVOID)0x7C00)) - { - UiMessageBox("Unable to read partition's boot sector."); - return; - } - - // Check for validity - if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) - { - UiMessageBox("Invalid boot sector magic (0xaa55)"); - return; - } - - UiUnInitialize("Booting..."); - // Don't stop the floppy drive motor when we - // are just booting a bootsector, or drive, or partition. - // If we were to stop the floppy motor then - // the BIOS wouldn't be informed and if the - // next read is to a floppy then the BIOS will - // still think the motor is on and this will - // result in a read error. - //DiskStopFloppyMotor(); - //DisableA20(); - ChainLoadBiosBootSectorCode(); -} - -VOID LoadAndBootDrive(PCSTR OperatingSystemName) -{ - CHAR SettingName[80]; - CHAR SettingValue[80]; - ULONG SectionId; - ULONG DriveNumber; - - // Find all the message box settings and run them - UiShowMessageBoxesInSection(OperatingSystemName); - - // Try to open the operating system section in the .ini file - if (!IniOpenSection(OperatingSystemName, &SectionId)) - { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", OperatingSystemName); - UiMessageBox(SettingName); - return; - } - - if (!IniReadSettingByName(SectionId, "BootDrive", SettingValue, sizeof(SettingValue))) - { - UiMessageBox("Boot drive not specified for selected OS!"); - return; - } - - DriveNumber = DriveMapGetBiosDriveNumber(SettingValue); - - // Now try to read the boot sector (or mbr) - // If this fails then abort - if (!MachDiskReadLogicalSectors(DriveNumber, 0, 1, (PVOID)0x7C00)) - { - UiMessageBox("Unable to read boot sector"); - return; - } - - // Check for validity - if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) - { - UiMessageBox("Invalid boot sector magic (0xaa55)"); - return; - } - - UiUnInitialize("Booting..."); - // Don't stop the floppy drive motor when we - // are just booting a bootsector, or drive, or partition. - // If we were to stop the floppy motor then - // the BIOS wouldn't be informed and if the - // next read is to a floppy then the BIOS will - // still think the motor is on and this will - // result in a read error. - //DiskStopFloppyMotor(); - //DisableA20(); - ChainLoadBiosBootSectorCode(); -} -#endif /* __i386__ */ Modified: trunk/reactos/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/optio… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Fri Oct 30 22:48:21 2009 @@ -35,8 +35,12 @@ "SEPARATOR", +#ifdef HAS_OPTION_MENU_CUSTOM_BOOT "Custom Boot", +#endif +#ifdef HAS_OPTION_MENU_REBOOT "Reboot", +#endif }; enum OptionMenuItems @@ -55,8 +59,12 @@ SEPARATOR2 = 9, +#ifdef HAS_OPTION_MENU_CUSTOM_BOOT CUSTOM_BOOT = 10, +#endif +#ifdef HAS_OPTION_MENU_REBOOT REBOOT = 11, +#endif }; ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); @@ -96,22 +104,15 @@ break; //case SEPARATOR2: // break; +#ifdef HAS_OPTION_MENU_CUSTOM_BOOT case CUSTOM_BOOT: OptionMenuCustomBoot(); break; +#endif +#ifdef HAS_OPTION_MENU_REBOOT case REBOOT: OptionMenuReboot(); break; } -} - -VOID OptionMenuReboot(VOID) -{ - UiMessageBox("The system will now reboot."); - -#ifdef __i386__ - DiskStopFloppyMotor(); - SoftReboot(); -#else #endif }

1 0

[janderwald] 43853: - Check Input Parameter (fixes a skype crash)
by janderwald＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: janderwald Date: Fri Oct 30 19:51:40 2009 New Revision: 43853 URL: http://svn.reactos.org/svn/reactos?rev=43853&view=rev Log: - Check Input Parameter (fixes a skype crash) Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] Fri Oct 30 19:51:40 2009 @@ -580,6 +580,11 @@ PACL *NewAcl) { DWORD ErrorCode; + + if (!NewAcl) + { + return ERROR_INVALID_PARAMETER; + } ErrorCode = CheckNtMartaPresent(); if (ErrorCode == ERROR_SUCCESS)

1 0

[sserapion] 43852: Add missing files. Kernel32 now links.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 19:48:45 2009 New Revision: 43852 URL: http://svn.reactos.org/svn/reactos?rev=43852&view=rev Log: Add missing files. Kernel32 now links. Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Fri Oct 30 19:48:45 2009 @@ -134,6 +134,12 @@ <file>thread.S</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>fiber.S</file> + <file>thread.S</file> + </directory> + </if> </directory> <directory name="misc"> <file>icustubs.cpp</file>

1 0

[sserapion] 43851: Work around broken linker by putting mingw support libs before module library dependencies.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 18:19:56 2009 New Revision: 43851 URL: http://svn.reactos.org/svn/reactos?rev=43851&view=rev Log: Work around broken linker by putting mingw support libs before module library dependencies. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Oct 30 18:19:56 2009 @@ -1513,8 +1513,8 @@ linkerScriptArgument.c_str (), objectsMacro.c_str (), link_defaultlibs ? "$(PROJECT_LPPFLAGS) " : "", + GetLinkerMacro ().c_str (), libsMacro.c_str (), - GetLinkerMacro ().c_str (), target_macro.c_str () ); } else @@ -1555,8 +1555,8 @@ backend->GetFullName ( temp_exp ).c_str (), objectsMacro.c_str (), link_defaultlibs ? "$(PROJECT_LPPFLAGS) " : "", - libsMacro.c_str (), GetLinkerMacro ().c_str (), + libsMacro.c_str (), target_macro.c_str () ); fprintf ( fMakefile,

1 0

← Newer
1
2
3
4
5
6
7
...
65
Older →

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 October 2009