Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 31123: Spanish translation for "find" by Grant A. Brady (bragr AT bradphi DOT com) with some fixes by encoded. See issue #2880 for more details.
by cfinck＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: cfinck Date: Mon Dec 10 17:24:42 2007 New Revision: 31123 URL: http://svn.reactos.org/svn/reactos?rev=31123&view=rev Log: Spanish translation for "find" by Grant A. Brady (bragr AT bradphi DOT com) with some fixes by encoded. See issue #2880 for more details. Added: trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc Added: trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc Mon Dec 10 17:24:42 2007 @@ -1,0 +1,17 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "FIND: Imprime todas las líneas de un fichero que contiene una cadena.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"cadena\" [ fichero... ]\n\ + /C Cuenta el número de líneas que contienen cadenas.\n\ + /I Ignora mayúsculas y minúsculas\n\ + /N Numere las líneas que aparece en la pantalla, a partir de 1.\n\ + /V Impreme las líneas que no contienen una cadena." + +IDS_NO_SUCH_FILE, "FIND: %s: Ningún tal fichero\n" + +IDS_CANNOT_OPEN, "FIND: %s: No se puede abrir este fichero\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Mon Dec 10 17:24:42 2007 @@ -5,6 +5,7 @@ #include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/lt-LT.rc"

1 0

[cwittich] 31122: fix a typo
by cwittich＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: cwittich Date: Mon Dec 10 15:21:51 2007 New Revision: 31122 URL: http://svn.reactos.org/svn/reactos?rev=31122&view=rev Log: fix a typo Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Mon Dec 10 15:21:51 2007 @@ -451,7 +451,7 @@ pExtensionPlatform = ExtensionPlatformNT; break; default: - ERR("Unkown platform 0x%lx\n", PlatformInfo->Platform); + ERR("Unknown platform 0x%lx\n", PlatformInfo->Platform); pExtensionPlatform = ExtensionPlatformNone; break; }

1 0

[cwittich] 31121: fix redzone overwrite when launching solitaire ntoskrnl\mm\/rpoolmgr.h(707): High-side redzone overwrite detected for paged pool address 0x8d882000 Tag th(68742020), Size 4148, UserSize 4096, LoZone 87878787, HiZone 00000000
by cwittich＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: cwittich Date: Mon Dec 10 12:57:30 2007 New Revision: 31121 URL: http://svn.reactos.org/svn/reactos?rev=31121&view=rev Log: fix redzone overwrite when launching solitaire ntoskrnl\mm\/rpoolmgr.h(707): High-side redzone overwrite detected for paged pool address 0x8d882000 Tag th(68742020), Size 4148, UserSize 4096, LoZone 87878787, HiZone 00000000 Modified: trunk/reactos/drivers/video/displays/framebuf/palette.c Modified: trunk/reactos/drivers/video/displays/framebuf/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/palette.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/palette.c Mon Dec 10 12:57:30 2007 @@ -121,6 +121,7 @@ pClut->FirstEntry = iStart; pClut->NumEntries = cColors; memcpy(&pClut->LookupTable[0].RgbLong, ppalent, sizeof(ULONG) * cColors); + EngFreeMem(ppalent); if (((PPDEV)dhpdev)->PaletteShift) { @@ -176,6 +177,9 @@ { PPALETTEENTRY PaletteEntries; + if (cColors == 0) + return FALSE; + PaletteEntries = EngAllocMem(0, cColors * sizeof(ULONG), ALLOC_TAG); if (PaletteEntries == NULL) { @@ -185,6 +189,7 @@ if (PALOBJ_cGetColors(ppalo, iStart, cColors, (PULONG)PaletteEntries) != cColors) { + EngFreeMem(PaletteEntries); return FALSE; }

1 0

[greatlrd] 31120: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) Fixed Main_DirectDraw_GetDisplayMode for dx1, dx2 Fixed some compile warnings
by greatlrd＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: greatlrd Date: Mon Dec 10 10:34:54 2007 New Revision: 31120 URL: http://svn.reactos.org/svn/reactos?rev=31120&view=rev Log: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) Fixed Main_DirectDraw_GetDisplayMode for dx1, dx2 Fixed some compile warnings Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Mon Dec 10 10:34:54 2007 @@ -78,6 +78,11 @@ HRESULT WINAPI Main_DirectDraw_GetDisplayMode ( + LPDDRAWI_DIRECTDRAW_INT This, + LPDDSURFACEDESC pDDSD); + +HRESULT WINAPI +Main_DirectDraw_GetDisplayMode4 ( LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD); @@ -203,3 +208,4 @@ DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData); DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData); + Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Mon Dec 10 10:34:54 2007 @@ -37,7 +37,7 @@ } } - if (IsBadCodePtr(pCallback)) + if (IsBadCodePtr((LPVOID)pCallback)) { ret = DDERR_INVALIDPARAMS; } @@ -135,7 +135,7 @@ } } - if (IsBadCodePtr(pCallback)) + if (IsBadCodePtr((LPVOID)pCallback)) { ret = DDERR_INVALIDPARAMS; } @@ -265,7 +265,7 @@ DevMode.dmBitsPerPel = dwBPP; DevMode.dmDisplayFrequency = dwRefreshRate; - DX_WINDBG_trace_res(dwHeight, dwWidth, dwBPP, dwRefreshRate); + DX_WINDBG_trace_res(dwWidth, dwHeight,dwBPP, dwRefreshRate); retval = ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN); /* FIXME: Are we supposed to set CDS_SET_PRIMARY as well ? */ @@ -367,18 +367,18 @@ } HRESULT WINAPI -Main_DirectDraw_GetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD) +Main_DirectDraw_GetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC pDDSD) { HRESULT retVal = DD_OK; DX_WINDBG_trace(); _SEH_TRY { - if(IsBadWritePtr(pDDSD,sizeof(LPDWORD))) + if(IsBadWritePtr(pDDSD,sizeof(LPDDSURFACEDESC))) { retVal = DDERR_INVALIDPARAMS; } - else if (pDDSD->dwSize != sizeof(DDSURFACEDESC2)) + else if (pDDSD->dwSize != sizeof(DDSURFACEDESC)) { retVal = DDERR_INVALIDPARAMS; } @@ -401,3 +401,39 @@ return retVal; } + +HRESULT WINAPI +Main_DirectDraw_GetDisplayMode4 (LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD) +{ + HRESULT retVal = DD_OK; + DX_WINDBG_trace(); + + _SEH_TRY + { + if(IsBadWritePtr(pDDSD,sizeof(LPDDSURFACEDESC2))) + { + retVal = DDERR_INVALIDPARAMS; + } + else if (pDDSD->dwSize != sizeof(DDSURFACEDESC2)) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + // FIXME: More stucture members might need to be filled + + pDDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; + pDDSD->dwHeight = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; + pDDSD->dwWidth = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; + pDDSD->ddpfPixelFormat = This->lpLcl->lpGbl->vmiData.ddpfDisplay; + pDDSD->dwRefreshRate = This->lpLcl->lpGbl->dwMonitorFrequency; + pDDSD->lPitch = This->lpLcl->lpGbl->vmiData.lDisplayPitch; + } + } + _SEH_HANDLE + { + } + _SEH_END; + + return retVal; +} Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Dec 10 10:34:54 2007 @@ -165,7 +165,7 @@ /* FIXME ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop */ ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop = 1; pDDraw->lpLcl->lpPrimary = ThisSurfInt; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)pDDraw); + Main_DirectDraw_AddRef(pDDraw); } else { @@ -246,3 +246,4 @@ } + Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Mon Dec 10 10:34:54 2007 @@ -84,7 +84,7 @@ LPDDCAPS pHELCaps); HRESULT WINAPI -Main_DirectDraw_GetDisplayMode ( +Main_DirectDraw_GetDisplayMode4 ( LPDIRECTDRAW4 iface, LPDDSURFACEDESC2 pDDSD); @@ -186,7 +186,7 @@ Main_DirectDraw_EnumSurfaces, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, - Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetDisplayMode4, Main_DirectDraw_GetFourCCCodes, Main_DirectDraw_GetGDISurface, Main_DirectDraw_GetMonitorFrequency, Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Mon Dec 10 10:34:54 2007 @@ -88,7 +88,7 @@ LPDDCAPS pHELCaps); HRESULT WINAPI -Main_DirectDraw_GetDisplayMode ( +Main_DirectDraw_GetDisplayMode4 ( LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD); @@ -201,7 +201,7 @@ Main_DirectDraw_EnumSurfaces, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, /* (GetCaps done) */ - Main_DirectDraw_GetDisplayMode, /* (GetDisplayMode testing / devloping) */ + Main_DirectDraw_GetDisplayMode4, /* (GetDisplayMode testing / devloping) */ Main_DirectDraw_GetFourCCCodes, /* (GetFourCCCodes done) */ Main_DirectDraw_GetGDISurface, Main_DirectDraw_GetMonitorFrequency, /* (GetMonitorFrequency done) */ @@ -221,3 +221,4 @@ Main_DirectDraw_EvaluateMode }; +

1 0

[dchapyshev] 31119: - Update Russian translation
by dchapyshev＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: dchapyshev Date: Mon Dec 10 10:19:34 2007 New Revision: 31119 URL: http://svn.reactos.org/svn/reactos?rev=31119&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Mon Dec 10 10:19:34 2007 @@ -435,7 +435,7 @@ IDS_COMMON_VIDEO "Îáùèå äîêóìåíòû\\Ìîè ôèëüìû" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Íîâàÿ ïàïêà" IDS_DRIVE_FIXED "Ëîêàëüíûé äèñê" IDS_DRIVE_CDROM "CDROM"

1 0

[weiden] 31117: _findnext is already implemented. Fixes a crash during Abiword startup
by weiden＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: weiden Date: Mon Dec 10 08:07:47 2007 New Revision: 31117 URL: http://svn.reactos.org/svn/reactos?rev=31117&view=rev Log: _findnext is already implemented. Fixes a crash during Abiword startup Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec Mon Dec 10 08:07:47 2007 @@ -236,7 +236,7 @@ @ cdecl _findclose(long) @ cdecl _findfirst(str ptr) @ cdecl _findfirsti64(str ptr) -@ stub _findnext #(long ptr) MSVCRT__findnext +@ cdecl _findnext(long ptr) @ cdecl _findnexti64(long ptr) @ cdecl _finite( double ) @ cdecl _flsbuf(long ptr)

1 0

[fireball] 31116: - Because we'll need to pass the ARC hardware information to the kernel, we need to use the usual FreeLDR trick of using a static buffer where to store the data instead of allocating memory. But, unlike our other data, this kind of information is variably-sized, and it's not possible to make arrays of arrays and start assuming upper bounds. Therefore, give us a large 16KB stash buffer, and implement a very simple array-based heap allocator so that all the ARC hardware memory wi
by fireball＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: fireball Date: Mon Dec 10 01:57:40 2007 New Revision: 31116 URL: http://svn.reactos.org/svn/reactos?rev=31116&view=rev Log: - Because we'll need to pass the ARC hardware information to the kernel, we need to use the usual FreeLDR trick of using a static buffer where to store the data instead of allocating memory. But, unlike our other data, this kind of information is variably-sized, and it's not possible to make arrays of arrays and start assuming upper bounds. Therefore, give us a large 16KB stash buffer, and implement a very simple array-based heap allocator so that all the ARC hardware memory will be contiguous and static as the kernel will expect it. - Copy all configuration data, identifiers and other data passed to the arc hardware routines into a new location. This is because the caller will free this information, and we want to keep it in memory. We also want it to be contiguous and part of our stash buffer, so allocate the copies from the stash buffer described above. - Store the root of the hardware tree in the ArchExtra ReactOS Loader Parameter Block, the kernel's freeldr->ntldr conversion routines will later deal with this data. Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Mon Dec 10 01:57:40 2007 @@ -27,6 +27,13 @@ #define CONFIG_CMD(bus, dev_fn, where) \ (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) + + +// +// Static heap for ARC Hardware Component Tree +// 16KB oughta be enough for anyone. +// +#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 // // ARC Component Configuration Routines Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Mon Dec 10 01:57:40 2007 @@ -14,9 +14,28 @@ /* GLOBALS ********************************************************************/ +extern CHAR reactos_arc_hardware_data[]; +ULONG FldrpHwHeapLocation; PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot; /* FUNCTIONS ******************************************************************/ + +PVOID +NTAPI +FldrpHwHeapAlloc(IN ULONG Size) +{ + PVOID Buffer; + + /* Return a block of memory from the ARC Hardware Heap */ + Buffer = &reactos_arc_hardware_data[FldrpHwHeapLocation]; + + /* Increment the heap location */ + FldrpHwHeapLocation += Size; + if (FldrpHwHeapLocation > HW_MAX_ARC_HEAP_SIZE) Buffer = NULL; + + /* Return the buffer */ + return Buffer; +} VOID NTAPI @@ -51,21 +70,31 @@ VOID NTAPI FldrSetIdentifier(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PWCHAR Identifier) -{ - LONG Error; - ULONG IdentifierLength = (wcslen(Identifier) + 1) * sizeof(WCHAR); + IN PWCHAR IdentifierString) +{ + LONG Error; + ULONG IdentifierLength; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; + PCHAR Identifier; + + /* Allocate memory for the identifier */ + /* WARNING: This should be ASCII data */ + IdentifierLength = (wcslen(IdentifierString) + 1) * sizeof(WCHAR); + Identifier = FldrpHwHeapAlloc(IdentifierLength); + if (!Identifier) return; + + /* Copy the identifier */ + RtlCopyMemory(Identifier, IdentifierString, IdentifierLength); /* Set component information */ Component->IdentifierLength = IdentifierLength; - Component->Identifier = (PCHAR)Identifier; // We need to use ASCII instead + Component->Identifier = Identifier; /* Set the key */ Error = RegSetValue((FRLDRHKEY)Component->Key, L"Identifier", REG_SZ, - (PCHAR)Identifier, + (PCHAR)IdentifierString, IdentifierLength); if (Error != ERROR_SUCCESS) { @@ -82,7 +111,7 @@ PCONFIGURATION_COMPONENT Component; /* Allocate the root */ - FldrArcHwTreeRoot = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); + FldrArcHwTreeRoot = FldrpHwHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); if (!FldrArcHwTreeRoot) return; /* Set it up */ @@ -125,7 +154,7 @@ PCONFIGURATION_COMPONENT Component; /* Allocate the node for this component */ - ComponentData = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); + ComponentData = FldrpHwHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); if (!ComponentData) return; /* Now save our parent */ @@ -168,21 +197,29 @@ VOID NTAPI FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PVOID ConfigurationData, + IN PVOID Data, IN ULONG Size) { LONG Error; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; - + PVOID ConfigurationData; + + /* Allocate a buffer from the hardware heap */ + ConfigurationData = FldrpHwHeapAlloc(Size); + if (!ConfigurationData) return; + + /* Copy component information */ + RtlCopyMemory(ConfigurationData, Data, Size); + /* Set component information */ ComponentData->ConfigurationData = ConfigurationData; Component->ConfigurationDataLength = Size; - + /* Set 'Configuration Data' value */ Error = RegSetValue((FRLDRHKEY)Component->Key, L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - ConfigurationData, + Data, Size); if (Error != ERROR_SUCCESS) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Mon Dec 10 01:57:40 2007 @@ -35,6 +35,8 @@ ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; // ARC Disk Information char reactos_arc_strings[32][256]; unsigned long reactos_disk_count = 0; +char reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE] = {0}; + CHAR szHalName[255]; CHAR szBootPath[255]; CHAR SystemRoot[255]; @@ -601,6 +603,7 @@ LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.DrivesAddr = reactos_arc_disk_info; + LoaderBlock.ArchExtra = (ULONG)reactos_arc_hardware_data; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) {

1 0

[fireball] 31115: - Further refactor the code by completing getting rid of the registry key parameters and work only with ARC configuration component nodes; the registry key is now hidden in an opaque structure from the rest of the code. - Fix some bugs in the ARC component node creation.
by fireball＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: fireball Date: Mon Dec 10 01:09:37 2007 New Revision: 31115 URL: http://svn.reactos.org/svn/reactos?rev=31115&view=rev Log: - Further refactor the code by completing getting rid of the registry key parameters and work only with ARC configuration component nodes; the registry key is now hidden in an opaque structure from the rest of the code. - Fix some bugs in the ARC component node creation. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Mon Dec 10 01:09:37 2007 @@ -234,12 +234,12 @@ } static VOID -DetectPnpBios(FRLDRHKEY SystemKey, ULONG *BusNumber) +DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PNP_BIOS_DEVICE_NODE DeviceNode; PCM_PNP_BIOS_INSTALLATION_CHECK InstData; - FRLDRHKEY BusKey; + PCONFIGURATION_COMPONENT_DATA BusKey; ULONG x; ULONG NodeSize = 0; ULONG NodeCount = 0; @@ -367,7 +367,7 @@ static VOID -SetHarddiskConfigurationData(FRLDRHKEY DiskKey, +SetHarddiskConfigurationData(PCONFIGURATION_COMPONENT_DATA DiskKey, ULONG DriveNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; @@ -439,7 +439,7 @@ static VOID -SetHarddiskIdentifier(FRLDRHKEY DiskKey, +SetHarddiskIdentifier(PCONFIGURATION_COMPONENT_DATA DiskKey, ULONG DriveNumber) { PMASTER_BOOT_RECORD Mbr; @@ -510,13 +510,13 @@ static VOID -DetectBiosDisks(FRLDRHKEY SystemKey, - FRLDRHKEY BusKey) +DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, + PCONFIGURATION_COMPONENT_DATA BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_INT13_DRIVE_PARAMETER Int13Drives; GEOMETRY Geometry; - FRLDRHKEY DiskKey; + PCONFIGURATION_COMPONENT_DATA DiskKey; ULONG DiskCount; ULONG Size; ULONG i; @@ -661,13 +661,13 @@ static VOID -DetectBiosFloppyPeripheral(FRLDRHKEY ControllerKey) +DetectBiosFloppyPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_FLOPPY_DEVICE_DATA FloppyData; WCHAR Identifier[20]; - FRLDRHKEY PeripheralKey; + PCONFIGURATION_COMPONENT_DATA PeripheralKey; ULONG Size; ULONG FloppyNumber; UCHAR FloppyType; @@ -743,12 +743,12 @@ static VOID -DetectBiosFloppyController(FRLDRHKEY SystemKey, - FRLDRHKEY BusKey) +DetectBiosFloppyController(PCONFIGURATION_COMPONENT_DATA SystemKey, + PCONFIGURATION_COMPONENT_DATA BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - FRLDRHKEY ControllerKey; + PCONFIGURATION_COMPONENT_DATA ControllerKey; ULONG Size; ULONG FloppyCount; @@ -999,13 +999,13 @@ static VOID -DetectSerialPointerPeripheral(FRLDRHKEY ControllerKey, +DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, ULONG Base) { CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; char Buffer[256]; WCHAR Identifier[256]; - FRLDRHKEY PeripheralKey; + PCONFIGURATION_COMPONENT_DATA PeripheralKey; ULONG MouseType; ULONG Length; ULONG i; @@ -1173,7 +1173,7 @@ static VOID -DetectSerialPorts(FRLDRHKEY BusKey) +DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; @@ -1183,7 +1183,7 @@ WCHAR Buffer[80]; PUSHORT BasePtr; ULONG ControllerNumber = 0; - FRLDRHKEY ControllerKey; + PCONFIGURATION_COMPONENT_DATA ControllerKey; ULONG i; ULONG Size; @@ -1288,13 +1288,13 @@ static VOID -DetectParallelPorts(FRLDRHKEY BusKey) +DetectParallelPorts(PCONFIGURATION_COMPONENT_DATA BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ULONG Irq[3] = {7, 5, (ULONG)-1}; WCHAR Buffer[80]; - FRLDRHKEY ControllerKey; + PCONFIGURATION_COMPONENT_DATA ControllerKey; PUSHORT BasePtr; ULONG Base; ULONG ControllerNumber; @@ -1462,12 +1462,12 @@ static VOID -DetectKeyboardPeripheral(FRLDRHKEY ControllerKey) +DetectKeyboardPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_KEYBOARD_DEVICE_DATA KeyboardData; - FRLDRHKEY PeripheralKey; + PCONFIGURATION_COMPONENT_DATA PeripheralKey; ULONG Size; /* HACK: don't call DetectKeyboardDevice() as it fails in Qemu 0.8.2 */ @@ -1530,11 +1530,11 @@ static VOID -DetectKeyboardController(FRLDRHKEY BusKey) +DetectKeyboardController(PCONFIGURATION_COMPONENT_DATA BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - FRLDRHKEY ControllerKey; + PCONFIGURATION_COMPONENT_DATA ControllerKey; ULONG Size; /* Create controller key */ @@ -1716,11 +1716,11 @@ static VOID -DetectPS2Mouse(FRLDRHKEY BusKey) +DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) { CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - FRLDRHKEY ControllerKey; - FRLDRHKEY PeripheralKey; + PCONFIGURATION_COMPONENT_DATA ControllerKey; + PCONFIGURATION_COMPONENT_DATA PeripheralKey; if (DetectPS2AuxPort()) { @@ -1804,10 +1804,10 @@ static VOID -DetectDisplayController(FRLDRHKEY BusKey) +DetectDisplayController(PCONFIGURATION_COMPONENT_DATA BusKey) { WCHAR Buffer[80]; - FRLDRHKEY ControllerKey; + PCONFIGURATION_COMPONENT_DATA ControllerKey; USHORT VesaVersion; FldrCreateComponentKey(BusKey, @@ -1859,10 +1859,10 @@ static VOID -DetectIsaBios(FRLDRHKEY SystemKey, ULONG *BusNumber) +DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - FRLDRHKEY BusKey; + PCONFIGURATION_COMPONENT_DATA BusKey; ULONG Size; /* Create new bus key */ @@ -1930,7 +1930,7 @@ VOID PcHwDetect(VOID) { - FRLDRHKEY SystemKey; + PCONFIGURATION_COMPONENT_DATA SystemKey; ULONG BusNumber = 0; DbgPrint((DPRINT_HWDETECT, "DetectHardware()\n")); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Mon Dec 10 01:09:37 2007 @@ -49,9 +49,9 @@ VOID -DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber) +DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { - FRLDRHKEY BiosKey; + PCONFIGURATION_COMPONENT_DATA BiosKey; if (FindAcpiBios()) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Mon Dec 10 01:09:37 2007 @@ -54,9 +54,9 @@ VOID -DetectApmBios(FRLDRHKEY SystemKey, ULONG *BusNumber) +DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { - FRLDRHKEY BiosKey; + PCONFIGURATION_COMPONENT_DATA BiosKey; if (FindApmBios()) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Mon Dec 10 01:09:37 2007 @@ -140,12 +140,12 @@ static VOID -DetectPciIrqRoutingTable(FRLDRHKEY BusKey) +DetectPciIrqRoutingTable(PCONFIGURATION_COMPONENT_DATA BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PPCI_IRQ_ROUTING_TABLE Table; - FRLDRHKEY TableKey; + PCONFIGURATION_COMPONENT_DATA TableKey; ULONG Size; Table = GetPciIrqRoutingTable(); @@ -211,14 +211,14 @@ VOID -DetectPciBios(FRLDRHKEY SystemKey, ULONG *BusNumber) +DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; CM_PCI_BUS_DATA BusData; - FRLDRHKEY BiosKey; + PCONFIGURATION_COMPONENT_DATA BiosKey; ULONG Size; #if 0 - FRLDRHKEY BusKey; + PCONFIGURATION_COMPONENT_DATA BusKey; ULONG i; WCHAR szPci[] = L"PCI"; #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Mon Dec 10 01:09:37 2007 @@ -34,7 +34,7 @@ VOID NTAPI FldrSetComponentInformation( - IN FRLDRHKEY ComponentKey, + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, IN IDENTIFIER_FLAG Flags, IN ULONG Key, IN ULONG Affinity @@ -43,31 +43,31 @@ VOID NTAPI FldrSetIdentifier( - IN FRLDRHKEY ComponentKey, + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, IN PWCHAR Identifier ); VOID NTAPI FldrCreateSystemKey( - OUT FRLDRHKEY *SystemKey + OUT PCONFIGURATION_COMPONENT_DATA *SystemKey ); VOID NTAPI FldrCreateComponentKey( - IN FRLDRHKEY SystemKey, + IN PCONFIGURATION_COMPONENT_DATA SystemKey, IN PWCHAR BusName, IN ULONG BusNumber, IN CONFIGURATION_CLASS Class, IN CONFIGURATION_TYPE Type, - OUT FRLDRHKEY *ComponentKey + OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey ); VOID NTAPI FldrSetConfigurationData( - IN FRLDRHKEY ComponentKey, + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, IN PVOID ConfigurationData, IN ULONG Size ); @@ -82,16 +82,13 @@ VOID HalpCalibrateStallExecution(VOID); /* hwacpi.c */ -VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber); +VOID DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); /* hwapm.c */ -VOID DetectApmBios(FRLDRHKEY SystemKey, ULONG *BusNumber); - -/* hwcpu.c */ -VOID DetectCPUs(FRLDRHKEY SystemKey); +VOID DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); /* hwpci.c */ -VOID DetectPciBios(FRLDRHKEY SystemKey, ULONG *BusNumber); +VOID DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); /* i386cpu.S */ ULONG CpuidSupported(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Mon Dec 10 01:09:37 2007 @@ -15,87 +15,28 @@ /* GLOBALS ********************************************************************/ PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot; -ULONG FldrBusTypeCount[MaximumType + 1] = {0}; -const PWCHAR FldrBusTypeString[MaximumType + 1] = -{ - L"System", - L"CentralProcessor", - L"FloatingPointProcessor", - L"PrimaryICache", - L"PrimaryDCache", - L"SecondaryICache", - L"SecondaryDCache", - L"SecondaryCache", - L"EisaAdapter", - L"TcAdapter", - L"ScsiAdapter", - L"DtiAdapter", - L"MultifunctionAdapter", - L"DiskController", - L"TapeController", - L"CdRomController", - L"WormController", - L"SerialController", - L"NetworkController", - L"DisplayController", - L"ParallelController", - L"PointerController", - L"KeyboardController", - L"AudioController", - L"OtherController", - L"DiskPeripheral", - L"FloppyDiskPeripheral", - L"TapePeripheral", - L"ModemPeripheral", - L"MonitorPeripheral", - L"PrinterPeripheral", - L"PointerPeripheral", - L"KeyboardPeripheral", - L"TerminalPeripheral", - L"OtherPeripheral", - L"LinePeripheral", - L"NetworkPeripheral", - L"SystemMemory", - L"DockingInformation", - L"RealModeIrqRoutingTable", - L"RealModePCIEnumeration", - L"Undefined" -}; -const PWCHAR FldrClassString[MaximumClass + 1] = -{ - L"System", - L"Processor", - L"Cache", - L"Adapter", - L"Controller", - L"Peripheral", - L"MemoryClass", - L"Undefined" -}; /* FUNCTIONS ******************************************************************/ VOID NTAPI -FldrSetComponentInformation(IN FRLDRHKEY ComponentKey, +FldrSetComponentInformation(IN PCONFIGURATION_COMPONENT_DATA ComponentData, IN IDENTIFIER_FLAG Flags, IN ULONG Key, IN ULONG Affinity) { LONG Error; - CONFIGURATION_COMPONENT_DATA Data = {0}; // This would be "ComponentKey" - PCONFIGURATION_COMPONENT_DATA ComponentData = &Data; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; - + /* Set component information */ Component->Flags = Flags; Component->Version = 0; Component->Revision = 0; - Component->Key = Key; + //Component->Key = Key; // HACK: We store the registry key here Component->AffinityMask = Affinity; /* Set the value */ - Error = RegSetValue(ComponentKey, + Error = RegSetValue((FRLDRHKEY)Component->Key, L"Component Information", REG_BINARY, (PVOID)&Component->Flags, @@ -109,13 +50,11 @@ VOID NTAPI -FldrSetIdentifier(IN FRLDRHKEY ComponentKey, +FldrSetIdentifier(IN PCONFIGURATION_COMPONENT_DATA ComponentData, IN PWCHAR Identifier) { LONG Error; ULONG IdentifierLength = (wcslen(Identifier) + 1) * sizeof(WCHAR); - CONFIGURATION_COMPONENT_DATA Data = {0}; // This would be "ComponentKey" - PCONFIGURATION_COMPONENT_DATA ComponentData = &Data; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; /* Set component information */ @@ -123,7 +62,7 @@ Component->Identifier = (PCHAR)Identifier; // We need to use ASCII instead /* Set the key */ - Error = RegSetValue(ComponentKey, + Error = RegSetValue((FRLDRHKEY)Component->Key, L"Identifier", REG_SZ, (PCHAR)Identifier, @@ -137,7 +76,7 @@ VOID NTAPI -FldrCreateSystemKey(OUT FRLDRHKEY *SystemKey) +FldrCreateSystemKey(OUT PCONFIGURATION_COMPONENT_DATA *SystemNode) { LONG Error; PCONFIGURATION_COMPONENT Component; @@ -157,10 +96,13 @@ Component->Identifier = 0; Component->IdentifierLength = 0; + /* Return the node */ + *SystemNode = FldrArcHwTreeRoot; + /* Create the key */ Error = RegCreateKey(NULL, L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", - SystemKey); + (FRLDRHKEY*)&Component->Key); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", Error)); @@ -170,20 +112,18 @@ VOID NTAPI -FldrCreateComponentKey(IN FRLDRHKEY SystemKey, +FldrCreateComponentKey(IN PCONFIGURATION_COMPONENT_DATA SystemNode, IN PWCHAR BusName, IN ULONG BusNumber, IN CONFIGURATION_CLASS Class, IN CONFIGURATION_TYPE Type, - OUT FRLDRHKEY *ComponentKey) + OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey) { LONG Error; WCHAR Buffer[80]; - CONFIGURATION_COMPONENT_DATA Root = {0}; // This would be "SystemKey" - PCONFIGURATION_COMPONENT_DATA SystemNode = &Root; PCONFIGURATION_COMPONENT_DATA ComponentData; PCONFIGURATION_COMPONENT Component; - + /* Allocate the node for this component */ ComponentData = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); if (!ComponentData) return; @@ -203,18 +143,21 @@ SystemNode->Child = ComponentData; } - /* Set us up (need to use class/type instead of name/number) */ - Component = &FldrArcHwTreeRoot->ComponentEntry; + /* Set us up */ + Component = &ComponentData->ComponentEntry; Component->Class = Class; Component->Type = Type; - /* FIXME: Use Class/Type to build key name */ - + /* Return the child */ + *ComponentKey = ComponentData; + /* Build the key name */ swprintf(Buffer, L"%s\\%u", BusName, BusNumber); /* Create the key */ - Error = RegCreateKey(SystemKey, Buffer, ComponentKey); + Error = RegCreateKey((FRLDRHKEY)SystemNode->ComponentEntry.Key, + Buffer, + (FRLDRHKEY*)&Component->Key); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", Error)); @@ -224,13 +167,11 @@ VOID NTAPI -FldrSetConfigurationData(IN FRLDRHKEY ComponentKey, +FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, IN PVOID ConfigurationData, IN ULONG Size) { LONG Error; - CONFIGURATION_COMPONENT_DATA Data = {0}; // This would be "ComponentKey" - PCONFIGURATION_COMPONENT_DATA ComponentData = &Data; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; /* Set component information */ @@ -238,7 +179,7 @@ Component->ConfigurationDataLength = Size; /* Set 'Configuration Data' value */ - Error = RegSetValue(ComponentKey, + Error = RegSetValue((FRLDRHKEY)Component->Key, L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, ConfigurationData,

1 0

[fireball] 31114: - Start filling out ARC component data nodes for all the new refactored hardware node APIs (these are just dummies for now).
by fireball＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: fireball Date: Mon Dec 10 00:49:17 2007 New Revision: 31114 URL: http://svn.reactos.org/svn/reactos?rev=31114&view=rev Log: - Start filling out ARC component data nodes for all the new refactored hardware node APIs (these are just dummies for now). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Mon Dec 10 00:49:17 2007 @@ -275,7 +275,12 @@ DbgPrint((DPRINT_HWDETECT, "Estimated buffer size %u\n", NodeSize * NodeCount)); /* Create component key */ - FldrCreateComponentKey(SystemKey, L"MultifunctionAdapter", *BusNumber, &BusKey); + FldrCreateComponentKey(SystemKey, + L"MultifunctionAdapter", + *BusNumber, + AdapterClass, + MultiFunctionAdapter, + &BusKey); (*BusNumber)++; /* Set the component information */ @@ -605,6 +610,8 @@ FldrCreateComponentKey(BusKey, L"DiskController\\0\\DiskPeripheral", i, + PeripheralClass, + DiskPeripheral, &DiskKey); /* Set disk values */ @@ -681,6 +688,8 @@ FldrCreateComponentKey(ControllerKey, L"FloppyDiskPeripheral", FloppyNumber, + PeripheralClass, + FloppyDiskPeripheral, &PeripheralKey); /* Set 'ComponentInformation' value */ @@ -754,6 +763,8 @@ FldrCreateComponentKey(SystemKey, L"DiskController", 0, + ControllerClass, + DiskController, &ControllerKey); DbgPrint((DPRINT_HWDETECT, "Created key: DiskController\\0\n")); @@ -1130,6 +1141,8 @@ FldrCreateComponentKey(ControllerKey, L"PointerPeripheral", 0, + PeripheralClass, + PointerPeripheral, &PeripheralKey); DbgPrint((DPRINT_HWDETECT, "Created key: PointerPeripheral\\0\n")); @@ -1193,6 +1206,8 @@ FldrCreateComponentKey(BusKey, L"SerialController", ControllerNumber, + ControllerClass, + SerialController, &ControllerKey); /* Set 'ComponentInformation' value */ @@ -1305,6 +1320,8 @@ FldrCreateComponentKey(BusKey, L"ParallelController", ControllerNumber, + ControllerClass, + ParallelController, &ControllerKey); /* Set 'ComponentInformation' value */ @@ -1460,6 +1477,8 @@ FldrCreateComponentKey(ControllerKey, L"KeyboardPeripheral", 0, + PeripheralClass, + KeyboardPeripheral, &PeripheralKey); DbgPrint((DPRINT_HWDETECT, "Created key: KeyboardPeripheral\\0\n")); @@ -1522,6 +1541,8 @@ FldrCreateComponentKey(BusKey, L"KeyboardController", 0, + ControllerClass, + KeyboardController, &ControllerKey); DbgPrint((DPRINT_HWDETECT, "Created key: KeyboardController\\0\n")); @@ -1709,6 +1730,8 @@ FldrCreateComponentKey(BusKey, L"PointerController", 0, + ControllerClass, + PointerController, &ControllerKey); DbgPrint((DPRINT_HWDETECT, "Created key: PointerController\\0\n")); @@ -1746,8 +1769,10 @@ /* Create peripheral key */ FldrCreateComponentKey(ControllerKey, - L"PointerController", + L"PointerPeripheral", 0, + ControllerClass, + PointerPeripheral, &PeripheralKey); DbgPrint((DPRINT_HWDETECT, "Created key: PointerPeripheral\\0\n")); @@ -1788,6 +1813,8 @@ FldrCreateComponentKey(BusKey, L"DisplayController", 0, + ControllerClass, + DisplayController, &ControllerKey); DbgPrint((DPRINT_HWDETECT, "Created key: DisplayController\\0\n")); @@ -1842,6 +1869,8 @@ FldrCreateComponentKey(SystemKey, L"MultifunctionAdapter", *BusNumber, + AdapterClass, + MultiFunctionAdapter, &BusKey); /* Set 'Component Information' value similar to my NT4 box */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Mon Dec 10 00:49:17 2007 @@ -61,6 +61,8 @@ FldrCreateComponentKey(SystemKey, L"MultifunctionAdapter", *BusNumber, + AdapterClass, + MultiFunctionAdapter, &BiosKey); #if 0 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Mon Dec 10 00:49:17 2007 @@ -64,6 +64,8 @@ FldrCreateComponentKey(SystemKey, L"MultifunctionAdapter", *BusNumber, + AdapterClass, + MultiFunctionAdapter, &BiosKey); #if 0 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Mon Dec 10 00:49:17 2007 @@ -156,6 +156,8 @@ FldrCreateComponentKey(BusKey, L"RealModeIrqRoutingTable", 0, + SystemClass, + RealModeIrqRoutingTable, &TableKey); /* Set 'Component Information' */ @@ -228,6 +230,8 @@ FldrCreateComponentKey(SystemKey, L"MultifunctionAdapter", *BusNumber, + AdapterClass, + MultiFunctionAdapter, &BiosKey); /* Set 'Component Information' */ @@ -283,6 +287,8 @@ FldrCreateComponentKey(SystemKey, L"MultifunctionAdapter", *BusNumber, + AdapterClass, + MultiFunctionAdapter, &BiosKey); /* Set 'Component Information' */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Mon Dec 10 00:49:17 2007 @@ -59,6 +59,8 @@ IN FRLDRHKEY SystemKey, IN PWCHAR BusName, IN ULONG BusNumber, + IN CONFIGURATION_CLASS Class, + IN CONFIGURATION_TYPE Type, OUT FRLDRHKEY *ComponentKey ); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Mon Dec 10 00:49:17 2007 @@ -12,6 +12,67 @@ #define NDEBUG #include <debug.h> +/* GLOBALS ********************************************************************/ + +PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot; +ULONG FldrBusTypeCount[MaximumType + 1] = {0}; +const PWCHAR FldrBusTypeString[MaximumType + 1] = +{ + L"System", + L"CentralProcessor", + L"FloatingPointProcessor", + L"PrimaryICache", + L"PrimaryDCache", + L"SecondaryICache", + L"SecondaryDCache", + L"SecondaryCache", + L"EisaAdapter", + L"TcAdapter", + L"ScsiAdapter", + L"DtiAdapter", + L"MultifunctionAdapter", + L"DiskController", + L"TapeController", + L"CdRomController", + L"WormController", + L"SerialController", + L"NetworkController", + L"DisplayController", + L"ParallelController", + L"PointerController", + L"KeyboardController", + L"AudioController", + L"OtherController", + L"DiskPeripheral", + L"FloppyDiskPeripheral", + L"TapePeripheral", + L"ModemPeripheral", + L"MonitorPeripheral", + L"PrinterPeripheral", + L"PointerPeripheral", + L"KeyboardPeripheral", + L"TerminalPeripheral", + L"OtherPeripheral", + L"LinePeripheral", + L"NetworkPeripheral", + L"SystemMemory", + L"DockingInformation", + L"RealModeIrqRoutingTable", + L"RealModePCIEnumeration", + L"Undefined" +}; +const PWCHAR FldrClassString[MaximumClass + 1] = +{ + L"System", + L"Processor", + L"Cache", + L"Adapter", + L"Controller", + L"Peripheral", + L"MemoryClass", + L"Undefined" +}; + /* FUNCTIONS ******************************************************************/ VOID @@ -21,21 +82,23 @@ IN ULONG Key, IN ULONG Affinity) { - CONFIGURATION_COMPONENT ConfigurationComponent; - LONG Error; - - /* Build the component information */ - ConfigurationComponent.Flags = Flags; - ConfigurationComponent.Version = 0; - ConfigurationComponent.Revision = 0; - ConfigurationComponent.Key = Key; - ConfigurationComponent.AffinityMask = Affinity; + LONG Error; + CONFIGURATION_COMPONENT_DATA Data = {0}; // This would be "ComponentKey" + PCONFIGURATION_COMPONENT_DATA ComponentData = &Data; + PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; + + /* Set component information */ + Component->Flags = Flags; + Component->Version = 0; + Component->Revision = 0; + Component->Key = Key; + Component->AffinityMask = Affinity; /* Set the value */ Error = RegSetValue(ComponentKey, L"Component Information", REG_BINARY, - (PVOID)&ConfigurationComponent.Flags, + (PVOID)&Component->Flags, FIELD_OFFSET(CONFIGURATION_COMPONENT, ConfigurationDataLength) - FIELD_OFFSET(CONFIGURATION_COMPONENT, Flags)); if (Error != ERROR_SUCCESS) @@ -51,7 +114,14 @@ { LONG Error; ULONG IdentifierLength = (wcslen(Identifier) + 1) * sizeof(WCHAR); - + CONFIGURATION_COMPONENT_DATA Data = {0}; // This would be "ComponentKey" + PCONFIGURATION_COMPONENT_DATA ComponentData = &Data; + PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; + + /* Set component information */ + Component->IdentifierLength = IdentifierLength; + Component->Identifier = (PCHAR)Identifier; // We need to use ASCII instead + /* Set the key */ Error = RegSetValue(ComponentKey, L"Identifier", @@ -70,6 +140,22 @@ FldrCreateSystemKey(OUT FRLDRHKEY *SystemKey) { LONG Error; + PCONFIGURATION_COMPONENT Component; + + /* Allocate the root */ + FldrArcHwTreeRoot = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); + if (!FldrArcHwTreeRoot) return; + + /* Set it up */ + Component = &FldrArcHwTreeRoot->ComponentEntry; + Component->Class = SystemClass; + Component->Type = MaximumType; + Component->Version = 0; + Component->Key = 0; + Component->AffinityMask = 0; + Component->ConfigurationDataLength = 0; + Component->Identifier = 0; + Component->IdentifierLength = 0; /* Create the key */ Error = RegCreateKey(NULL, @@ -79,7 +165,7 @@ { DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", Error)); return; - } + } } VOID @@ -87,10 +173,42 @@ FldrCreateComponentKey(IN FRLDRHKEY SystemKey, IN PWCHAR BusName, IN ULONG BusNumber, + IN CONFIGURATION_CLASS Class, + IN CONFIGURATION_TYPE Type, OUT FRLDRHKEY *ComponentKey) { LONG Error; WCHAR Buffer[80]; + CONFIGURATION_COMPONENT_DATA Root = {0}; // This would be "SystemKey" + PCONFIGURATION_COMPONENT_DATA SystemNode = &Root; + PCONFIGURATION_COMPONENT_DATA ComponentData; + PCONFIGURATION_COMPONENT Component; + + /* Allocate the node for this component */ + ComponentData = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); + if (!ComponentData) return; + + /* Now save our parent */ + ComponentData->Parent = SystemNode; + + /* Now we need to figure out if the parent already has a child entry */ + if (SystemNode->Child) + { + /* It does, so we'll be a sibling of the child instead */ + SystemNode->Child->Sibling = ComponentData; + } + else + { + /* It doesn't, so we will be the first child */ + SystemNode->Child = ComponentData; + } + + /* Set us up (need to use class/type instead of name/number) */ + Component = &FldrArcHwTreeRoot->ComponentEntry; + Component->Class = Class; + Component->Type = Type; + + /* FIXME: Use Class/Type to build key name */ /* Build the key name */ swprintf(Buffer, L"%s\\%u", BusName, BusNumber); @@ -111,6 +229,13 @@ IN ULONG Size) { LONG Error; + CONFIGURATION_COMPONENT_DATA Data = {0}; // This would be "ComponentKey" + PCONFIGURATION_COMPONENT_DATA ComponentData = &Data; + PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; + + /* Set component information */ + ComponentData->ConfigurationData = ConfigurationData; + Component->ConfigurationDataLength = Size; /* Set 'Configuration Data' value */ Error = RegSetValue(ComponentKey,

1 0

[fireball] 31113: - Refactor creation of component data under the HARDWARE\DESCRIPTION node to use separate routines in a new ARC file, so that registry routines are factored out of the process. This allows 1) Better portability with PPC branch (which will need to do the same kind of hardware work) 2) Ability to eventually get rid of the registry calls and build a true ARC hardware device tree instead (which the kernel will have to parse during boot). The idea is to remove registry writing suppo
by fireball＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: fireball Date: Sun Dec 9 23:17:56 2007 New Revision: 31113 URL: http://svn.reactos.org/svn/reactos?rev=31113&view=rev Log: - Refactor creation of component data under the HARDWARE\DESCRIPTION node to use separate routines in a new ARC file, so that registry routines are factored out of the process. This allows 1) Better portability with PPC branch (which will need to do the same kind of hardware work) 2) Ability to eventually get rid of the registry calls and build a true ARC hardware device tree instead (which the kernel will have to parse during boot). The idea is to remove registry writing support from freeldr (because the code is old and freeldr shouldn't be touching the registry anyway). Patch by Alex. Added: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Sun Dec 9 23:17:56 2007 @@ -233,41 +233,12 @@ delay_count /= (MILLISEC / 2); /* Calculate delay_count for 1ms */ } - -VOID -SetComponentInformation(FRLDRHKEY ComponentKey, - ULONG Flags, - ULONG Key, - ULONG Affinity) -{ - CM_COMPONENT_INFORMATION CompInfo; - LONG Error; - - CompInfo.Flags = Flags; - CompInfo.Version = 0; - CompInfo.Key = Key; - CompInfo.Affinity = Affinity; - - /* Set 'Component Information' value */ - Error = RegSetValue(ComponentKey, - L"Component Information", - REG_BINARY, - (PCHAR)&CompInfo, - sizeof(CM_COMPONENT_INFORMATION)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } -} - - static VOID DetectPnpBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PNP_BIOS_DEVICE_NODE DeviceNode; PCM_PNP_BIOS_INSTALLATION_CHECK InstData; - WCHAR Buffer[80]; FRLDRHKEY BusKey; ULONG x; ULONG NodeSize = 0; @@ -278,7 +249,6 @@ ULONG PnpBufferSize; ULONG Size; char *Ptr; - LONG Error; InstData = (PCM_PNP_BIOS_INSTALLATION_CHECK)PnpBiosSupported(); if (InstData == NULL || strncmp((CHAR*)InstData->Signature, "$PnP", 4)) @@ -304,40 +274,20 @@ DbgPrint((DPRINT_HWDETECT, "MaxNodeSize %u NodeCount %u\n", NodeSize, NodeCount)); DbgPrint((DPRINT_HWDETECT, "Estimated buffer size %u\n", NodeSize * NodeCount)); - /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BusKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Increment bus number */ - (*BusNumber)++; - - /* Set 'Component Information' value similar to my NT4 box */ - SetComponentInformation(BusKey, - 0x0, - 0x0, - 0xFFFFFFFF); - - /* Set 'Identifier' value */ - Error = RegSetValue(BusKey, - L"Identifier", - REG_SZ, - (PCHAR)L"PNP BIOS", - 9 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } - - /* Set 'Configuration Data' value */ + /* Create component key */ + FldrCreateComponentKey(SystemKey, L"MultifunctionAdapter", *BusNumber, &BusKey); + (*BusNumber)++; + + /* Set the component information */ + FldrSetComponentInformation(BusKey, + 0x0, + 0x0, + 0xFFFFFFFF); + + /* Set the identifier */ + FldrSetIdentifier(BusKey, L"PNP BIOS"); + + /* Set 'Configuration Data' value */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + (NodeSize * NodeCount); FullResourceDescriptor = MmAllocateMemory(Size); if (FullResourceDescriptor == NULL) @@ -404,20 +354,9 @@ DbgPrint((DPRINT_HWDETECT, "Real buffer size: %u\n", PnpBufferSize)); DbgPrint((DPRINT_HWDETECT, "Resource size: %u\n", Size)); - - /* Set 'Configuration Data' value */ - Error = RegSetValue(BusKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); - MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - } + + FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); + MmFreeMemory(FullResourceDescriptor); } @@ -431,7 +370,6 @@ EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; ULONG Size; - LONG Error; /* Set 'Configuration Data' value */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + @@ -490,18 +428,8 @@ DiskGeometry->SectorsPerTrack, DiskGeometry->BytesPerSector)); - Error = RegSetValue(DiskKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(DiskKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - } } @@ -516,7 +444,6 @@ ULONG Signature; WCHAR Identifier[20]; CHAR ArcName[256]; - LONG Error; /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) @@ -573,17 +500,7 @@ DbgPrint((DPRINT_HWDETECT, "Identifier: %S\n", Identifier)); /* Set identifier */ - Error = RegSetValue(DiskKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - sizeof(Identifier)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Identifier) failed (Error %u)\n", - (int)Error)); - } + FldrSetIdentifier(DiskKey, Identifier); } @@ -594,12 +511,10 @@ PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_INT13_DRIVE_PARAMETER Int13Drives; GEOMETRY Geometry; - WCHAR Buffer[80]; FRLDRHKEY DiskKey; ULONG DiskCount; ULONG Size; ULONG i; - LONG Error; BOOLEAN Changed; /* Count the number of visible drives */ @@ -680,37 +595,17 @@ } /* Set 'Configuration Data' value */ - Error = RegSetValue(SystemKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(SystemKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } /* Create and fill subkey for each harddisk */ for (i = 0; i < DiskCount; i++) { /* Create disk key */ - swprintf (Buffer, - L"DiskController\\0\\DiskPeripheral\\%u", - i); - - Error = RegCreateKey(BusKey, - Buffer, - &DiskKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create drive key\n")); - continue; - } - DbgPrint((DPRINT_HWDETECT, "Created key: %S\n", Buffer)); + FldrCreateComponentKey(BusKey, + L"DiskController\\0\\DiskPeripheral", + i, + &DiskKey); /* Set disk values */ SetHarddiskConfigurationData(DiskKey, 0x80 + i); @@ -764,11 +659,9 @@ PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_FLOPPY_DEVICE_DATA FloppyData; - WCHAR KeyName[32]; WCHAR Identifier[20]; FRLDRHKEY PeripheralKey; ULONG Size; - LONG Error; ULONG FloppyNumber; UCHAR FloppyType; ULONG MaxDensity[6] = {0, 360, 1200, 720, 1440, 2880}; @@ -784,25 +677,17 @@ DiskResetController(FloppyNumber); Ptr = GetInt1eTable(); - - swprintf(KeyName, L"FloppyDiskPeripheral\\%u", FloppyNumber); - - Error = RegCreateKey(ControllerKey, - KeyName, - &PeripheralKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create peripheral key\n")); - return; - } - - DbgPrint((DPRINT_HWDETECT, "Created key: %S\n", KeyName)); + + FldrCreateComponentKey(ControllerKey, + L"FloppyDiskPeripheral", + FloppyNumber, + &PeripheralKey); /* Set 'ComponentInformation' value */ - SetComponentInformation(PeripheralKey, - 0x0, - FloppyNumber, - 0xFFFFFFFF); + FldrSetComponentInformation(PeripheralKey, + 0x0, + FloppyNumber, + 0xFFFFFFFF); Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + sizeof(CM_FLOPPY_DEVICE_DATA); @@ -838,33 +723,12 @@ FloppyData->DataTransferRate = 0; /* Set 'Configuration Data' value */ - Error = RegSetValue(PeripheralKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(PeripheralKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } /* Set 'Identifier' value */ swprintf(Identifier, L"FLOPPY%u", FloppyNumber + 1); - Error = RegSetValue(PeripheralKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue() failed (Error %u)\n", - (int)Error)); - } + FldrSetIdentifier(PeripheralKey, Identifier); } } @@ -877,7 +741,6 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; FRLDRHKEY ControllerKey; ULONG Size; - LONG Error; ULONG FloppyCount; FloppyCount = GetFloppyCount(); @@ -887,23 +750,18 @@ if (FloppyCount == 0) return; - - Error = RegCreateKey(BusKey, - L"DiskController\\0", - &ControllerKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); - return; - } - + + FldrCreateComponentKey(SystemKey, + L"DiskController", + 0, + &ControllerKey); DbgPrint((DPRINT_HWDETECT, "Created key: DiskController\\0\n")); /* Set 'ComponentInformation' value */ - SetComponentInformation(ControllerKey, - 0x64, - 0, - 0xFFFFFFFF); + FldrSetComponentInformation(ControllerKey, + Output | Input | Removable, + 0, + 0xFFFFFFFF); Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); @@ -950,19 +808,8 @@ PartialDescriptor->u.Dma.Port = 0; /* Set 'Configuration Data' value */ - Error = RegSetValue(ControllerKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } DetectBiosFloppyPeripheral(ControllerKey); } @@ -1153,7 +1000,6 @@ ULONG i; ULONG j; ULONG k; - LONG Error; DbgPrint((DPRINT_HWDETECT, "DetectSerialPointerPeripheral()\n")); @@ -1281,23 +1127,18 @@ } /* Create 'PointerPeripheral' key */ - Error = RegCreateKey(ControllerKey, - L"PointerPeripheral\\0", - &PeripheralKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "Failed to create peripheral key\n")); - return; - } + FldrCreateComponentKey(ControllerKey, + L"PointerPeripheral", + 0, + &PeripheralKey); DbgPrint((DPRINT_HWDETECT, "Created key: PointerPeripheral\\0\n")); /* Set 'ComponentInformation' value */ - SetComponentInformation(PeripheralKey, - 0x20, - 0, - 0xFFFFFFFF); + FldrSetComponentInformation(PeripheralKey, + Input, + 0, + 0xFFFFFFFF); /* Set 'Configuration Data' value */ memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); @@ -1307,31 +1148,13 @@ FullResourceDescriptor.PartialResourceList.Revision = 1; FullResourceDescriptor.PartialResourceList.Count = 0; - Error = RegSetValue(PeripheralKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR)&FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - } + FldrSetConfigurationData(PeripheralKey, + &FullResourceDescriptor, + sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Set 'Identifier' value */ - Error = RegSetValue(PeripheralKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue() failed (Error %u)\n", - (int)Error)); - } + FldrSetIdentifier(PeripheralKey, Identifier); } } @@ -1349,7 +1172,6 @@ ULONG ControllerNumber = 0; FRLDRHKEY ControllerKey; ULONG i; - LONG Error; ULONG Size; DbgPrint((DPRINT_HWDETECT, "DetectSerialPorts()\n")); @@ -1368,25 +1190,16 @@ Base)); /* Create controller key */ - swprintf(Buffer, - L"SerialController\\%u", - ControllerNumber); - - Error = RegCreateKey(BusKey, - Buffer, - &ControllerKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); - continue; - } - DbgPrint((DPRINT_HWDETECT, "Created key: %S\n", Buffer)); + FldrCreateComponentKey(BusKey, + L"SerialController", + ControllerNumber, + &ControllerKey); /* Set 'ComponentInformation' value */ - SetComponentInformation(ControllerKey, - 0x78, - ControllerNumber, - 0xFFFFFFFF); + FldrSetComponentInformation(ControllerKey, + Output | Input | ConsoleIn | ConsoleOut, + ControllerNumber, + 0xFFFFFFFF); /* Build full device descriptor */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + @@ -1438,35 +1251,12 @@ SerialDeviceData->BaudClock = 1843200; /* UART Clock frequency (Hertz) */ /* Set 'Configuration Data' value */ - Error = RegSetValue(ControllerKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - } - + /* Set 'Identifier' value */ - swprintf(Buffer, - L"COM%u", - i + 1); - Error = RegSetValue(ControllerKey, - L"Identifier", - REG_SZ, - (PCHAR)Buffer, - (wcslen(Buffer) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue() failed (Error %u)\n", - (int)Error)); - continue; - } + swprintf(Buffer, L"COM%u", i + 1); + FldrSetIdentifier(ControllerKey, Buffer); DbgPrint((DPRINT_HWDETECT, "Created value: Identifier %s\n", Buffer)); @@ -1494,7 +1284,6 @@ ULONG Base; ULONG ControllerNumber; ULONG i; - LONG Error; ULONG Size; DbgPrint((DPRINT_HWDETECT, "DetectParallelPorts() called\n")); @@ -1513,25 +1302,16 @@ Base)); /* Create controller key */ - swprintf(Buffer, - L"ParallelController\\%u", - ControllerNumber); - - Error = RegCreateKey(BusKey, - Buffer, - &ControllerKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); - continue; - } - DbgPrint((DPRINT_HWDETECT, "Created key: %S\n", Buffer)); + FldrCreateComponentKey(BusKey, + L"ParallelController", + ControllerNumber, + &ControllerKey); /* Set 'ComponentInformation' value */ - SetComponentInformation(ControllerKey, - 0x40, - ControllerNumber, - 0xFFFFFFFF); + FldrSetComponentInformation(ControllerKey, + Output, + ControllerNumber, + 0xFFFFFFFF); /* Build full device descriptor */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR); @@ -1576,35 +1356,12 @@ } /* Set 'Configuration Data' value */ - Error = RegSetValue(ControllerKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - } /* Set 'Identifier' value */ - swprintf(Buffer, - L"PARALLEL%u", - i + 1); - Error = RegSetValue(ControllerKey, - L"Identifier", - REG_SZ, - (PCHAR)Buffer, - (wcslen(Buffer) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue() failed (Error %u)\n", - (int)Error)); - continue; - } + swprintf(Buffer, L"PARALLEL%u", i + 1); + FldrSetIdentifier(ControllerKey, Buffer); DbgPrint((DPRINT_HWDETECT, "Created value: Identifier %s\n", Buffer)); @@ -1695,27 +1452,22 @@ PCM_KEYBOARD_DEVICE_DATA KeyboardData; FRLDRHKEY PeripheralKey; ULONG Size; - LONG Error; /* HACK: don't call DetectKeyboardDevice() as it fails in Qemu 0.8.2 */ if (TRUE || DetectKeyboardDevice()) { - /* Create controller key */ - Error = RegCreateKey(ControllerKey, - L"KeyboardPeripheral\\0", - &PeripheralKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create peripheral key\n")); - return; - } + /* Create controller key */ + FldrCreateComponentKey(ControllerKey, + L"KeyboardPeripheral", + 0, + &PeripheralKey); DbgPrint((DPRINT_HWDETECT, "Created key: KeyboardPeripheral\\0\n")); /* Set 'ComponentInformation' value */ - SetComponentInformation(ControllerKey, - 0x28, - 0, - 0xFFFFFFFF); + FldrSetComponentInformation(ControllerKey, + Input | ConsoleIn, + 0, + 0xFFFFFFFF); /* Set 'Configuration Data' value */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + @@ -1749,31 +1501,11 @@ KeyboardData->KeyboardFlags = 0x20; /* Set 'Configuration Data' value */ - Error = RegSetValue(PeripheralKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR)FullResourceDescriptor, - Size); + FldrSetConfigurationData(PeripheralKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - } /* Set 'Identifier' value */ - Error = RegSetValue(PeripheralKey, - L"Identifier", - REG_SZ, - (PCHAR)L"PCAT_ENHANCED", - 14 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue() failed (Error %u)\n", - (int)Error)); - } + FldrSetIdentifier(PeripheralKey, L"PCAT_ENHANCED"); } } @@ -1785,24 +1517,19 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; FRLDRHKEY ControllerKey; ULONG Size; - LONG Error; /* Create controller key */ - Error = RegCreateKey(BusKey, - L"KeyboardController\\0", - &ControllerKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); - return; - } + FldrCreateComponentKey(BusKey, + L"KeyboardController", + 0, + &ControllerKey); DbgPrint((DPRINT_HWDETECT, "Created key: KeyboardController\\0\n")); /* Set 'ComponentInformation' value */ - SetComponentInformation(ControllerKey, - 0x28, - 0, - 0xFFFFFFFF); + FldrSetComponentInformation(ControllerKey, + Input | ConsoleIn, + 0, + 0xFFFFFFFF); /* Set 'Configuration Data' value */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + @@ -1851,20 +1578,9 @@ PartialDescriptor->u.Port.Length = 1; /* Set 'Configuration Data' value */ - Error = RegSetValue(ControllerKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR)FullResourceDescriptor, - Size); + FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } - + DetectKeyboardPeripheral(ControllerKey); } @@ -1984,28 +1700,23 @@ CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; FRLDRHKEY ControllerKey; FRLDRHKEY PeripheralKey; - LONG Error; if (DetectPS2AuxPort()) { DbgPrint((DPRINT_HWDETECT, "Detected PS2 port\n")); /* Create controller key */ - Error = RegCreateKey(BusKey, - L"PointerController\\0", - &ControllerKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); - return; - } + FldrCreateComponentKey(BusKey, + L"PointerController", + 0, + &ControllerKey); DbgPrint((DPRINT_HWDETECT, "Created key: PointerController\\0\n")); /* Set 'ComponentInformation' value */ - SetComponentInformation(ControllerKey, - 0x20, - 0, - 0xFFFFFFFF); + FldrSetComponentInformation(ControllerKey, + Input, + 0, + 0xFFFFFFFF); memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); @@ -2025,40 +1736,26 @@ FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; /* Set 'Configuration Data' value */ - Error = RegSetValue(ControllerKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR)&FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } - + FldrSetConfigurationData(ControllerKey, + &FullResourceDescriptor, + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); if (DetectPS2AuxDevice()) { DbgPrint((DPRINT_HWDETECT, "Detected PS2 mouse\n")); - /* Create peripheral key */ - Error = RegCreateKey(ControllerKey, - L"PointerPeripheral\\0", - &PeripheralKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create peripheral key\n")); - return; - } + /* Create peripheral key */ + FldrCreateComponentKey(ControllerKey, + L"PointerController", + 0, + &PeripheralKey); DbgPrint((DPRINT_HWDETECT, "Created key: PointerPeripheral\\0\n")); /* Set 'ComponentInformation' value */ - SetComponentInformation(PeripheralKey, - 0x20, - 0, - 0xFFFFFFFF); + FldrSetComponentInformation(PeripheralKey, + Input, + 0, + 0xFFFFFFFF); /* Initialize resource descriptor */ memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); @@ -2069,35 +1766,15 @@ FullResourceDescriptor.PartialResourceList.Count = 0; /* Set 'Configuration Data' value */ - Error = RegSetValue(PeripheralKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR)&FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } + FldrSetConfigurationData(PeripheralKey, + &FullResourceDescriptor, + sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Set 'Identifier' value */ - Error = RegSetValue(PeripheralKey, - L"Identifier", - REG_SZ, - (PCHAR)L"MICROSOFT PS2 MOUSE", - 20 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue() failed (Error %u)\n", - (int)Error)); - return; - } - } - } + FldrSetIdentifier(PeripheralKey, L"MICROSOFT PS2 MOUSE"); + } + } } @@ -2107,23 +1784,18 @@ WCHAR Buffer[80]; FRLDRHKEY ControllerKey; USHORT VesaVersion; - LONG Error; - - Error = RegCreateKey(BusKey, - L"DisplayController\\0", - &ControllerKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); - return; - } + + FldrCreateComponentKey(BusKey, + L"DisplayController", + 0, + &ControllerKey); DbgPrint((DPRINT_HWDETECT, "Created key: DisplayController\\0\n")); /* Set 'ComponentInformation' value */ - SetComponentInformation(ControllerKey, - 0x00, - 0, - 0xFFFFFFFF); + FldrSetComponentInformation(ControllerKey, + 0x00, + 0, + 0xFFFFFFFF); /* FIXME: Set 'ComponentInformation' value */ @@ -2153,18 +1825,7 @@ } /* Set 'Identifier' value */ - Error = RegSetValue(ControllerKey, - L"Identifier", - REG_SZ, - (PCHAR)Buffer, - (wcslen(Buffer) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue() failed (Error %u)\n", - (int)Error)); - return; - } + FldrSetIdentifier(ControllerKey, Buffer); /* FIXME: Add display peripheral (monitor) data */ } @@ -2174,43 +1835,26 @@ DetectIsaBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - WCHAR Buffer[80]; FRLDRHKEY BusKey; ULONG Size; - LONG Error; /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BusKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } + FldrCreateComponentKey(SystemKey, + L"MultifunctionAdapter", + *BusNumber, + &BusKey); /* Set 'Component Information' value similar to my NT4 box */ - SetComponentInformation(BusKey, - 0x0, - 0x0, - 0xFFFFFFFF); + FldrSetComponentInformation(BusKey, + 0x0, + 0x0, + 0xFFFFFFFF); /* Increment bus number */ (*BusNumber)++; /* Set 'Identifier' value */ - Error = RegSetValue(BusKey, - L"Identifier", - REG_SZ, - (PCHAR)L"ISA", - 4 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } + FldrSetIdentifier(BusKey, L"ISA"); /* Set 'Configuration Data' value */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - @@ -2232,19 +1876,8 @@ FullResourceDescriptor->PartialResourceList.Count = 0; /* Set 'Configuration Data' value */ - Error = RegSetValue(BusKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); @@ -2270,27 +1903,19 @@ { FRLDRHKEY SystemKey; ULONG BusNumber = 0; - LONG Error; DbgPrint((DPRINT_HWDETECT, "DetectHardware()\n")); /* Create the 'System' key */ - Error = RegCreateKey(NULL, - L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", - &SystemKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - + FldrCreateSystemKey(&SystemKey); + /* Detect buses */ DetectPciBios(SystemKey, &BusNumber); DetectApmBios(SystemKey, &BusNumber); DetectPnpBios(SystemKey, &BusNumber); DetectIsaBios(SystemKey, &BusNumber); DetectAcpiBios(SystemKey, &BusNumber); - + DbgPrint((DPRINT_HWDETECT, "DetectHardware() Done\n")); } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Sun Dec 9 23:17:56 2007 @@ -51,49 +51,34 @@ VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { - WCHAR Buffer[80]; FRLDRHKEY BiosKey; - LONG Error; - + if (FindAcpiBios()) { AcpiPresent = TRUE; + /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BiosKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - + FldrCreateComponentKey(SystemKey, + L"MultifunctionAdapter", + *BusNumber, + &BiosKey); + #if 0 - /* Set 'Component Information' */ - SetComponentInformation(BiosKey, - 0x0, - 0x0, - 0xFFFFFFFF); + /* Set 'Component Information' */ + FldrSetComponentInformation(BiosKey, + 0x0, + 0x0, + 0xFFFFFFFF); #endif - + /* Increment bus number */ (*BusNumber)++; - + /* Set 'Identifier' value */ - Error = RegSetValue(BiosKey, - L"Identifier", - REG_SZ, - (PCHAR)L"ACPI BIOS", - 10 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } - + FldrSetIdentifier(BiosKey, L"ACPI BIOS"); } + + /* FIXME: Add congiguration data */ } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Sun Dec 9 23:17:56 2007 @@ -56,50 +56,32 @@ VOID DetectApmBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { - WCHAR Buffer[80]; - FRLDRHKEY BiosKey; - LONG Error; - - if (FindApmBios()) + FRLDRHKEY BiosKey; + + if (FindApmBios()) { - /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BiosKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - + /* Create new bus key */ + FldrCreateComponentKey(SystemKey, + L"MultifunctionAdapter", + *BusNumber, + &BiosKey); + #if 0 - /* Set 'Component Information' */ - SetComponentInformation(BiosKey, - 0x0, - 0x0, - 0xFFFFFFFF); + /* Set 'Component Information' */ + FldrSetComponentInformation(BiosKey, + 0x0, + 0x0, + 0xFFFFFFFF); #endif - - /* Increment bus number */ - (*BusNumber)++; - - /* Set 'Identifier' value */ - Error = RegSetValue(BiosKey, - L"Identifier", - REG_SZ, - (PCHAR)L"APM", - 4 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } - + + /* Increment bus number */ + (*BusNumber)++; + + /* Set 'Identifier' value */ + FldrSetIdentifier(BiosKey, L"APM"); } - - /* FIXME: Add congiguration data */ + + /* FIXME: Add congiguration data */ } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Sun Dec 9 23:17:56 2007 @@ -147,39 +147,25 @@ PPCI_IRQ_ROUTING_TABLE Table; FRLDRHKEY TableKey; ULONG Size; - LONG Error; Table = GetPciIrqRoutingTable(); if (Table != NULL) { DbgPrint((DPRINT_HWDETECT, "Table size: %u\n", Table->Size)); - Error = RegCreateKey(BusKey, - L"RealModeIrqRoutingTable\\0", - &TableKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } + FldrCreateComponentKey(BusKey, + L"RealModeIrqRoutingTable", + 0, + &TableKey); /* Set 'Component Information' */ - SetComponentInformation(TableKey, - 0x0, - 0x0, - 0xFFFFFFFF); + FldrSetComponentInformation(TableKey, + 0x0, + 0x0, + 0xFFFFFFFF); /* Set 'Identifier' value */ - Error = RegSetValue(TableKey, - L"Identifier", - REG_SZ, - (PCHAR)L"PCI Real-mode IRQ Routing Table", - 32 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } + FldrSetIdentifier(TableKey, L"PCI Real-mode IRQ Routing Table"); /* Set 'Configuration Data' value */ Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + @@ -216,19 +202,8 @@ Table->Size); /* Set 'Configuration Data' value */ - Error = RegSetValue(TableKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(TableKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } } } @@ -238,10 +213,8 @@ { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; CM_PCI_BUS_DATA BusData; - WCHAR Buffer[80]; FRLDRHKEY BiosKey; ULONG Size; - LONG Error; #if 0 FRLDRHKEY BusKey; ULONG i; @@ -252,37 +225,22 @@ if (FindPciBios(&BusData)) { /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BiosKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } + FldrCreateComponentKey(SystemKey, + L"MultifunctionAdapter", + *BusNumber, + &BiosKey); /* Set 'Component Information' */ - SetComponentInformation(BiosKey, - 0x0, - 0x0, - 0xFFFFFFFF); + FldrSetComponentInformation(BiosKey, + 0x0, + 0x0, + 0xFFFFFFFF); /* Increment bus number */ (*BusNumber)++; /* Set 'Identifier' value */ - Error = RegSetValue(BiosKey, - L"Identifier", - REG_SZ, - (PCHAR)L"PCI BIOS", - 9 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } + FldrSetIdentifier(BiosKey, L"PCI BIOS"); /* Set 'Configuration Data' value */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR); @@ -307,19 +265,8 @@ FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.BusNumber.Length = 1; /* Set 'Configuration Data' value */ - Error = RegSetValue(BiosKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); + FldrSetConfigurationData(BiosKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } DetectPciIrqRoutingTable(BiosKey); @@ -332,43 +279,25 @@ /* Report PCI buses */ for (i = 0; i < (ULONG)BusData.BusCount; i++) - { - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BusKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - printf("RegCreateKey() failed (Error %u)\n", (int)Error); - return; - } - - /* Set 'Component Information' */ - SetComponentInformation(BusKey, - 0x0, - 0x0, - 0xFFFFFFFF); - - /* Increment bus number */ - (*BusNumber)++; - - - /* Set 'Identifier' value */ - Error = RegSetValue(BusKey, - L"Identifier", - REG_SZ, - (PCSTR)szPci, - sizeof(szPci)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } - } + { + FldrCreateComponentKey(SystemKey, + L"MultifunctionAdapter", + *BusNumber, + &BiosKey); + + /* Set 'Component Information' */ + FldrSetComponentInformation(BusKey, + 0x0, + 0x0, + 0xFFFFFFFF); + + /* Increment bus number */ + (*BusNumber)++; + + /* Set 'Identifier' value */ + FldrSetIdentifier(BiosKey, szPci); + } #endif - } } 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 (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Sun Dec 9 23:17:56 2007 @@ -46,6 +46,7 @@ <directory name="reactos"> <file>registry.c</file> <file>arcname.c</file> + <file>archwsup.c</file> <file>binhive.c</file> <file>reactos.c</file> </directory> Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Sun Dec 9 23:17:56 2007 @@ -25,33 +25,51 @@ #include "../../reactos/registry.h" #endif -/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags */ -#define CM_RESOURCE_PORT_MEMORY 0x0000 -#define CM_RESOURCE_PORT_IO 0x0001 - -#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0x0000 -#define CM_RESOURCE_INTERRUPT_LATCHED 0x0001 - -typedef struct _CM_COMPONENT_INFORMATION -{ - ULONG Flags; - ULONG Version; - ULONG Key; - ULONG Affinity; -} __attribute__((packed)) CM_COMPONENT_INFORMATION, *PCM_COMPONENT_INFORMATION; - - -/* CM_COMPONENT_INFORMATION.Flags */ -#define Failed 0x00000001 -//#define ReadOnly 0x00000002 -#define Removable 0x00000004 -#define ConsoleIn 0x00000008 -#define ConsoleOut 0x00000010 -#define Input 0x00000020 -#define Output 0x00000040 - #define CONFIG_CMD(bus, dev_fn, where) \ (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) + +// +// ARC Component Configuration Routines +// +VOID +NTAPI +FldrSetComponentInformation( + IN FRLDRHKEY ComponentKey, + IN IDENTIFIER_FLAG Flags, + IN ULONG Key, + IN ULONG Affinity +); + +VOID +NTAPI +FldrSetIdentifier( + IN FRLDRHKEY ComponentKey, + IN PWCHAR Identifier +); + +VOID +NTAPI +FldrCreateSystemKey( + OUT FRLDRHKEY *SystemKey +); + +VOID +NTAPI +FldrCreateComponentKey( + IN FRLDRHKEY SystemKey, + IN PWCHAR BusName, + IN ULONG BusNumber, + OUT FRLDRHKEY *ComponentKey +); + +VOID +NTAPI +FldrSetConfigurationData( + IN FRLDRHKEY ComponentKey, + IN PVOID ConfigurationData, + IN ULONG Size +); + /* PROTOTYPES ***************************************************************/ @@ -60,11 +78,6 @@ VOID StallExecutionProcessor(ULONG Microseconds); VOID HalpCalibrateStallExecution(VOID); - -VOID SetComponentInformation(FRLDRHKEY ComponentKey, - ULONG Flags, - ULONG Key, - ULONG Affinity); /* hwacpi.c */ VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber); Added: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (added) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Sun Dec 9 23:17:56 2007 @@ -1,0 +1,127 @@ +/* + * PROJECT: ReactOS Boot Loader (FreeLDR) + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/freeldr/reactos/archwsup.c + * PURPOSE: Routines for ARC Hardware Tree and Configuration Data + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +FldrSetComponentInformation(IN FRLDRHKEY ComponentKey, + IN IDENTIFIER_FLAG Flags, + IN ULONG Key, + IN ULONG Affinity) +{ + CONFIGURATION_COMPONENT ConfigurationComponent; + LONG Error; + + /* Build the component information */ + ConfigurationComponent.Flags = Flags; + ConfigurationComponent.Version = 0; + ConfigurationComponent.Revision = 0; + ConfigurationComponent.Key = Key; + ConfigurationComponent.AffinityMask = Affinity; + + /* Set the value */ + Error = RegSetValue(ComponentKey, + L"Component Information", + REG_BINARY, + (PVOID)&ConfigurationComponent.Flags, + FIELD_OFFSET(CONFIGURATION_COMPONENT, ConfigurationDataLength) - + FIELD_OFFSET(CONFIGURATION_COMPONENT, Flags)); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", Error)); + } +} + +VOID +NTAPI +FldrSetIdentifier(IN FRLDRHKEY ComponentKey, + IN PWCHAR Identifier) +{ + LONG Error; + ULONG IdentifierLength = (wcslen(Identifier) + 1) * sizeof(WCHAR); + + /* Set the key */ + Error = RegSetValue(ComponentKey, + L"Identifier", + REG_SZ, + (PCHAR)Identifier, + IdentifierLength); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", Error)); + return; + } +} + +VOID +NTAPI +FldrCreateSystemKey(OUT FRLDRHKEY *SystemKey) +{ + LONG Error; + + /* Create the key */ + Error = RegCreateKey(NULL, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", + SystemKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", Error)); + return; + } +} + +VOID +NTAPI +FldrCreateComponentKey(IN FRLDRHKEY SystemKey, + IN PWCHAR BusName, + IN ULONG BusNumber, + OUT FRLDRHKEY *ComponentKey) +{ + LONG Error; + WCHAR Buffer[80]; + + /* Build the key name */ + swprintf(Buffer, L"%s\\%u", BusName, BusNumber); + + /* Create the key */ + Error = RegCreateKey(SystemKey, Buffer, ComponentKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", Error)); + return; + } +} + +VOID +NTAPI +FldrSetConfigurationData(IN FRLDRHKEY ComponentKey, + IN PVOID ConfigurationData, + IN ULONG Size) +{ + LONG Error; + + /* Set 'Configuration Data' value */ + Error = RegSetValue(ComponentKey, + L"Configuration Data", + REG_FULL_RESOURCE_DESCRIPTOR, + ConfigurationData, + Size); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, + "RegSetValue(Configuration Data) failed (Error %u)\n", + Error)); + } +} Propchange: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs