Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 46616: [tchar.h] enable _tcsnlen definition
by tkreuzer＠svn.reactos.org 31 Mar '10

31 Mar '10

Author: tkreuzer Date: Wed Mar 31 14:16:42 2010 New Revision: 46616 URL: http://svn.reactos.org/svn/reactos?rev=46616&view=rev Log: [tchar.h] enable _tcsnlen definition Modified: trunk/reactos/include/crt/tchar.h Modified: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=46… ============================================================================== --- trunk/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/tchar.h [iso-8859-1] Wed Mar 31 14:16:42 2010 @@ -624,9 +624,7 @@ #define _tcscpy_s strcpy_s #define _tcsdup _strdup #define _tcslen strlen -#if 0 #define _tcsnlen strnlen -#endif #define _tcsxfrm strxfrm #define _tcsxfrm_l _strxfrm_l #define _tcserror strerror

1 0

[tkreuzer] 46615: [RBUILD] - Don't link to RosBE's ofmt_stub.a, as we have our own version now. - Don't link to libcoldname.a on amd64, instead link to libgcc_eh.a
by tkreuzer＠svn.reactos.org 31 Mar '10

31 Mar '10

Author: tkreuzer Date: Wed Mar 31 13:57:21 2010 New Revision: 46615 URL: http://svn.reactos.org/svn/reactos?rev=46615&view=rev Log: [RBUILD] - Don't link to RosBE's ofmt_stub.a, as we have our own version now. - Don't link to libcoldname.a on amd64, instead link to libgcc_eh.a Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Mar 31 13:57:21 2010 @@ -480,18 +480,17 @@ fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" ); - - // We use our proprietary "ofmt_stub.a" to implement a stub for "_get_output_format" required by "libmingwex.a". - // This archive just contains the compiled "ofmt_stub.s" supplied with the MinGW Runtime sources. - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\"\n" ); + + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\"" ); /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64") - { - fprintf ( fMakefile, "PROJECT_LPPFLAGS += $(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\n" ); - } - } - + fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"" ); + /* hack to get _get_output_format, needed by libmingwex */ + else if (Environment::GetArch() == "i386") + fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\" "); + fprintf ( fMakefile,"\n"); + } MingwModuleHandler::GenerateParameters ( "PROJECT", "+=", ProjectNode.non_if_data ); MingwModuleHandler::GenerateParameters ( "PROJECT_HOST", "+=", ProjectNode.host_non_if_data ); @@ -975,7 +974,7 @@ { int digit = binutilsVersion.find_last_of("."); if(digit == -1) - { + { printf("Unable to detect binutils version!\n"); return false; }

1 0

[tkreuzer] 46614: [KERNEL32] Add RtlAddFunctionTable export for amd64
by tkreuzer＠svn.reactos.org 31 Mar '10

31 Mar '10

Author: tkreuzer Date: Wed Mar 31 12:21:14 2010 New Revision: 46614 URL: http://svn.reactos.org/svn/reactos?rev=46614&view=rev Log: [KERNEL32] Add RtlAddFunctionTable export for amd64 Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Wed Mar 31 12:21:14 2010 @@ -759,6 +759,7 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) +@ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long double) @ stdcall RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr ptr)

1 0

[sir_richard] 46613: [HALACPI]: Implement beginning of HAL ACPI support (HalpSetupAcpiPhase0). Tested on VMWare, where it found the FACP, SRAT, RSDT and MCFG and the ACPI Timer at 1008H. BOOT and DBGP are not found (optional features). [HALACPI]: Support depends on boot loader creating the ACPI BIOS Multi Node structure in MultiFunctionAdapter in the hardware tree. It seems that FreeLdr does this (wow!) correctly! [HALACPI]: Implement HAL ACPI Table Cache. [HALACPI]: HAL ACPI Table Overrides fro
by sir_richard＠svn.reactos.org 31 Mar '10

31 Mar '10

Author: sir_richard Date: Wed Mar 31 06:43:39 2010 New Revision: 46613 URL: http://svn.reactos.org/svn/reactos?rev=46613&view=rev Log: [HALACPI]: Implement beginning of HAL ACPI support (HalpSetupAcpiPhase0). Tested on VMWare, where it found the FACP, SRAT, RSDT and MCFG and the ACPI Timer at 1008H. BOOT and DBGP are not found (optional features). [HALACPI]: Support depends on boot loader creating the ACPI BIOS Multi Node structure in MultiFunctionAdapter in the hardware tree. It seems that FreeLdr does this (wow!) correctly! [HALACPI]: Implement HAL ACPI Table Cache. [HALACPI]: HAL ACPI Table Overrides from the boot loader are not supported (doubt FreeLdr does this). [HALACPI]: The next steps are to write the HAL ACPI PnP Driver and HAL ACPI Power Driver. Added: trunk/reactos/hal/halx86/generic/acpi/halacpi.c (with props) trunk/reactos/hal/halx86/generic/legacy/halpcat.c (with props) Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/hal_generic.rbuild Added: trunk/reactos/hal/halx86/generic/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halacpi.c (added) +++ trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] Wed Mar 31 06:43:39 2010 @@ -1,0 +1,864 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: hal/halx86/generic/acpi/halacpi.c + * PURPOSE: HAL ACPI Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +LIST_ENTRY HalpAcpiTableCacheList; +FAST_MUTEX HalpAcpiTableCacheLock; + +BOOLEAN HalpProcessedACPIPhase0; +BOOLEAN HalpPhysicalMemoryMayAppearAbove4GB; + +FADT HalpFixedAcpiDescTable; +PDEBUG_PORT_TABLE HalpDebugPortTable; +PACPI_SRAT HalpAcpiSrat; +PBOOT_TABLE HalpSimpleBootFlagTable; + +PHYSICAL_ADDRESS HalpMaxHotPlugMemoryAddress; +PHYSICAL_ADDRESS HalpLowStubPhysicalAddress; +PHARDWARE_PTE HalpPteForFlush; +PVOID HalpVirtAddrForFlush; +PVOID HalpLowStub; + +PACPI_BIOS_MULTI_NODE HalpAcpiMultiNode; + +LIST_ENTRY HalpAcpiTableMatchList; + +ULONG HalpInvalidAcpiTable; + +/* PRIVATE FUNCTIONS **********************************************************/ + +PDESCRIPTION_HEADER +NTAPI +HalpAcpiGetCachedTable(IN ULONG Signature) +{ + PLIST_ENTRY ListHead, NextEntry; + PACPI_CACHED_TABLE CachedTable; + + /* Loop cached tables */ + ListHead = &HalpAcpiTableCacheList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the table */ + CachedTable = CONTAINING_RECORD(NextEntry, ACPI_CACHED_TABLE, Links); + + /* Compare signatures */ + if (CachedTable->Header.Signature == Signature) return &CachedTable->Header; + + /* Keep going */ + NextEntry = NextEntry->Flink; + } + + /* Nothing found */ + return NULL; +} + +VOID +NTAPI +HalpAcpiCacheTable(IN PDESCRIPTION_HEADER TableHeader) +{ + PACPI_CACHED_TABLE CachedTable; + + /* Get the cached table and link it */ + CachedTable = CONTAINING_RECORD(TableHeader, ACPI_CACHED_TABLE, Header); + InsertTailList(&HalpAcpiTableCacheList, &CachedTable->Links); +} + +PVOID +NTAPI +HalpAcpiCopyBiosTable(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PDESCRIPTION_HEADER TableHeader) +{ + ULONG Size; + PFN_NUMBER PageCount; + PHYSICAL_ADDRESS PhysAddress; + PACPI_CACHED_TABLE CachedTable; + PDESCRIPTION_HEADER CopiedTable; + + /* Size we'll need for the cached table */ + Size = TableHeader->Length + FIELD_OFFSET(ACPI_CACHED_TABLE, Header); + if (LoaderBlock) + { + /* Phase 0: Convert to pages and use the HAL heap */ + PageCount = BYTES_TO_PAGES(Size); + PhysAddress.LowPart = HalpAllocPhysicalMemory(LoaderBlock, + 0x1000000, + PageCount, + FALSE); + if (PhysAddress.LowPart) + { + /* Map it */ + CachedTable = HalpMapPhysicalMemory64(PhysAddress, PageCount); + } + else + { + /* No memory, so nothing to map */ + CachedTable = NULL; + } + } + else + { + /* Use Mm pool */ + CachedTable = ExAllocatePoolWithTag(NonPagedPool, Size, ' laH'); + } + + /* Do we have the cached table? */ + if (CachedTable) + { + /* Copy the data */ + CopiedTable = &CachedTable->Header; + RtlCopyMemory(CopiedTable, TableHeader, TableHeader->Length); + } + else + { + /* Nothing to return */ + CopiedTable = NULL; + } + + /* Return the table */ + return CopiedTable; +} + +PVOID +NTAPI +HalpAcpiGetTableFromBios(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG Signature) +{ + PHYSICAL_ADDRESS PhysicalAddress; + PXSDT Xsdt; + PRSDT Rsdt; + PFADT Fadt; + PDESCRIPTION_HEADER Header = NULL; + ULONG TableLength; + CHAR CheckSum = 0; + ULONG Offset; + ULONG EntryCount, CurrentEntry; + PCHAR CurrentByte; + PFN_NUMBER PageCount; + + /* Should not query the RSDT/XSDT by itself */ + if ((Signature == RSDT_SIGNATURE) || (Signature == XSDT_SIGNATURE)) return NULL; + + /* Special case request for DSDT, because the FADT points to it */ + if (Signature == DSDT_SIGNATURE) + { + /* Grab the FADT */ + Fadt = HalpAcpiGetTable(LoaderBlock, FADT_SIGNATURE); + if (Fadt) + { + /* Grab the DSDT address and assume 2 pages */ + PhysicalAddress.LowPart = Fadt->dsdt; + TableLength = 2 * PAGE_SIZE; + + /* Map it */ + if (LoaderBlock) + { + /* Phase 0, use HAL heap */ + Header = HalpMapPhysicalMemory64(PhysicalAddress, 2u); + } + else + { + /* Phase 1, use Mm */ + Header = MmMapIoSpace(PhysicalAddress, 2 * PAGE_SIZE, 0); + } + + /* Fail if we couldn't map it */ + if (!Header) + { + DbgPrint("HAL: Failed to map ACPI table.\n"); + return NULL; + } + + /* Validate the signature */ + DPRINT1("ACPI DSDT at 0x%p\n", Header); + if (Header->Signature != DSDT_SIGNATURE) + { + /* Fail and unmap */ + if (LoaderBlock) + { + /* Using HAL heap */ + HalpUnmapVirtualAddress(Header, 2); + } + else + { + /* Using Mm */ + MmUnmapIoSpace(Header, 2 * PAGE_SIZE); + } + + /* Didn't find anything */ + return NULL; + } + } + else + { + /* Couldn't find it */ + return NULL; + } + } + else + { + /* To find tables, we need the RSDT */ + Rsdt = HalpAcpiGetTable(LoaderBlock, RSDT_SIGNATURE); + if (Rsdt) + { + /* Won't be using the XSDT */ + Xsdt = NULL; + } + else + { + /* Only other choice is to use the XSDT */ + Xsdt = HalpAcpiGetTable(LoaderBlock, XSDT_SIGNATURE); + if (!Xsdt) return NULL; + + /* Won't be using the RSDT */ + DPRINT1("ACPI XSDT at 0x%p\n", Xsdt); + Rsdt = NULL; + } + + /* Smallest RSDT/XSDT is one without table entries */ + Offset = FIELD_OFFSET(RSDT, Tables); + if (Xsdt) + { + /* Figure out total size of table and the offset */ + TableLength = Xsdt->Header.Length; + if (TableLength < Offset) Offset = Xsdt->Header.Length; + + /* The entries are each 64-bits, so count them */ + EntryCount = (TableLength - Offset) / sizeof(PHYSICAL_ADDRESS); + } + else + { + /* Figure out total size of table and the offset */ + TableLength = Rsdt->Header.Length; + if (TableLength < Offset) Offset = Rsdt->Header.Length; + + /* The entries are each 32-bits, so count them */ + EntryCount = (TableLength - Offset) / sizeof(ULONG); + } + + /* Start at the beginning of the array and loop it */ + for (CurrentEntry = 0; CurrentEntry < EntryCount; CurrentEntry++) + { + /* Are we using the XSDT? */ + if (!Xsdt) + { + /* Read the 32-bit physical address */ + PhysicalAddress.LowPart = Rsdt->Tables[CurrentEntry]; + } + else + { + /* Read the 64-bit physical address */ + PhysicalAddress = Xsdt->Tables[CurrentEntry]; + } + + /* Had we already mapped a table? */ + if (Header) + { + /* Yes, unmap it */ + if (LoaderBlock) + { + /* Using HAL heap */ + HalpUnmapVirtualAddress(Header, 2); + } + else + { + /* Using Mm */ + MmUnmapIoSpace(Header, 2 * PAGE_SIZE); + } + } + + /* Now map this table */ + if (!LoaderBlock) + { + /* Phase 1: Use HAL heap */ + Header = MmMapIoSpace(PhysicalAddress, 2 * PAGE_SIZE, MmNonCached); + } + else + { + /* Phase 0: Use Mm */ + Header = HalpMapPhysicalMemory64(PhysicalAddress, 2); + } + + /* Check if we mapped it */ + if (!Header) + { + /* Game over */ + DbgPrint("HAL: Failed to map ACPI table.\n"); + return NULL; + } + + /* We found it, break out */ + DPRINT("Found ACPI table %c%c%c%c at 0x%p\n", + Header->Signature & 0xFF, + (Header->Signature & 0xFF00) >> 8, + (Header->Signature & 0xFF0000) >> 16, + (Header->Signature & 0xFF000000) >> 24, + Header); + if (Header->Signature == Signature) break; + } + + /* Did we end up here back at the last entry? */ + if (CurrentEntry == EntryCount) + { + /* Yes, unmap the last table we processed */ + if (LoaderBlock) + { + /* Using HAL heap */ + HalpUnmapVirtualAddress(Header, 2); + } + else + { + /* Using Mm */ + MmUnmapIoSpace(Header, 2 * PAGE_SIZE); + } + + /* Didn't find anything */ + return NULL; + } + } + + /* Past this point, we assume something was found */ + ASSERT(Header); + + /* How many pages do we need? */ + PageCount = BYTES_TO_PAGES(Header->Length); + if (PageCount != 2) + { + /* We assumed two, but this is not the case, free the current mapping */ + if (LoaderBlock) + { + /* Using HAL heap */ + HalpUnmapVirtualAddress(Header, 2); + } + else + { + /* Using Mm */ + MmUnmapIoSpace(Header, 2 * PAGE_SIZE); + } + + /* Now map this table using its correct size */ + if (!LoaderBlock) + { + /* Phase 1: Use HAL heap */ + Header = MmMapIoSpace(PhysicalAddress, PageCount << PAGE_SHIFT, MmNonCached); + } + else + { + /* Phase 0: Use Mm */ + Header = HalpMapPhysicalMemory64(PhysicalAddress, PageCount); + } + } + + /* Fail if the remapped failed */ + if (!Header) return NULL; + + /* All tables in ACPI 3.0 other than the FACP should have correct checksum */ + if ((Header->Signature != FADT_SIGNATURE) || (Header->Revision > 2)) + { + /* Go to the end of the table */ + CheckSum = 0; + CurrentByte = (PCHAR)Header + Header->Length; + while (CurrentByte-- != (PCHAR)Header) + { + /* Add this byte */ + CheckSum += *CurrentByte; + } + + /* The correct checksum is always 0, anything else is illegal */ + if (CheckSum) HalpInvalidAcpiTable = Header->Signature; + } + + /* Return the table */ + return Header; +} + +PVOID +NTAPI +HalpAcpiGetTable(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG Signature) +{ + PFN_NUMBER PageCount; + PDESCRIPTION_HEADER TableAddress, BiosCopy; + + /* See if we have a cached table? */ + TableAddress = HalpAcpiGetCachedTable(Signature); + if (!TableAddress) + { + /* No cache, search the BIOS */ + TableAddress = HalpAcpiGetTableFromBios(LoaderBlock, Signature); + if (TableAddress) + { + /* Found it, copy it into our own memory */ + BiosCopy = HalpAcpiCopyBiosTable(LoaderBlock, TableAddress); + + /* Get the pages, and unmap the BIOS copy */ + PageCount = BYTES_TO_PAGES(TableAddress->Length); + if (LoaderBlock) + { + /* Phase 0, use the HAL heap */ + HalpUnmapVirtualAddress(TableAddress, PageCount); + } + else + { + /* Phase 1, use Mm */ + MmUnmapIoSpace(TableAddress, PageCount << 12); + } + + /* Cache the bios copy */ + TableAddress = BiosCopy; + if (BiosCopy) HalpAcpiCacheTable(BiosCopy); + } + } + + /* Return the table */ + return TableAddress; +} + +PVOID +NTAPI +HalAcpiGetTable(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG Signature) +{ + PDESCRIPTION_HEADER TableHeader; + + /* Is this phase0 */ + if (LoaderBlock) + { + /* Initialize the cache first */ + if (!NT_SUCCESS(HalpAcpiTableCacheInit(LoaderBlock))) return NULL; + } + else + { + /* Lock the cache */ + ExAcquireFastMutex(&HalpAcpiTableCacheLock); + } + + /* Get the table */ + TableHeader = HalpAcpiGetTable(LoaderBlock, Signature); + + /* Release the lock in phase 1 */ + if (!LoaderBlock) ExReleaseFastMutex(&HalpAcpiTableCacheLock); + + /* Return the table */ + return TableHeader; +} + +VOID +NTAPI +HalpNumaInitializeStaticConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PACPI_SRAT SratTable; + + /* Get the SRAT, bail out if it doesn't exist */ + SratTable = HalAcpiGetTable(LoaderBlock, SRAT_SIGNATURE); + HalpAcpiSrat = SratTable; + if (!SratTable) return; +} + +VOID +NTAPI +HalpGetHotPlugMemoryInfo(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PACPI_SRAT SratTable; + + /* Get the SRAT, bail out if it doesn't exist */ + SratTable = HalAcpiGetTable(LoaderBlock, SRAT_SIGNATURE); + HalpAcpiSrat = SratTable; + if (!SratTable) return; +} + +VOID +NTAPI +HalpDynamicSystemResourceConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + /* For this HAL, it means to get hot plug memory information */ + HalpGetHotPlugMemoryInfo(LoaderBlock); +} + +VOID +NTAPI +HalpAcpiDetectMachineSpecificActions(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PFADT DescriptionTable) +{ + /* Does this HAL specify something? */ + if (HalpAcpiTableMatchList.Flink) + { + /* Great, but we don't support it */ + DPRINT1("WARNING: Your HAL has specific ACPI hacks to apply!\n"); + } +} + +VOID +NTAPI +HalpInitBootTable(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PBOOT_TABLE BootTable; + + /* Get the boot table */ + BootTable = HalAcpiGetTable(LoaderBlock, BOOT_SIGNATURE); + HalpSimpleBootFlagTable = BootTable; + DPRINT1("ACPI BOOT at 0x%p\n", HalpSimpleBootFlagTable); + + /* Validate it */ + if ((BootTable) && + (BootTable->Header.Length >= sizeof(BOOT_TABLE)) && + (BootTable->CMOSIndex >= 9)) + { + DPRINT1("ACPI Boot table found, but not supported!\n"); + } + else + { + /* Invalid or doesn't exist, ignore it */ + HalpSimpleBootFlagTable = 0; + } + + /* Install the end of boot handler */ +// HalEndOfBoot = HalpEndOfBoot; +} + +NTSTATUS +NTAPI +HalpAcpiFindRsdtPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + OUT PACPI_BIOS_MULTI_NODE* AcpiMultiNode) +{ + PCONFIGURATION_COMPONENT_DATA ComponentEntry; + PCONFIGURATION_COMPONENT_DATA Next = NULL; + PCM_PARTIAL_RESOURCE_LIST ResourceList; + PACPI_BIOS_MULTI_NODE NodeData; + ULONG NodeLength; + PFN_NUMBER PageCount; + PVOID MappedAddress; + PHYSICAL_ADDRESS PhysicalAddress; + + /* Did we already do this once? */ + if (HalpAcpiMultiNode) + { + /* Return what we know */ + *AcpiMultiNode = HalpAcpiMultiNode; + return STATUS_SUCCESS; + } + + /* Assume failure */ + *AcpiMultiNode = NULL; + + /* Find the multi function adapter key */ + ComponentEntry = KeFindConfigurationNextEntry(LoaderBlock->ConfigurationRoot, + AdapterClass, + MultiFunctionAdapter, + 0, + &Next); + while (ComponentEntry) + { + /* Find the ACPI BIOS key */ + if (!_stricmp(ComponentEntry->ComponentEntry.Identifier, "ACPI BIOS")) + { + /* Found it */ + break; + } + + /* Keep searching */ + Next = ComponentEntry; + ComponentEntry = KeFindConfigurationNextEntry(LoaderBlock->ConfigurationRoot, + AdapterClass, + MultiFunctionAdapter, + NULL, + &Next); + } + + /* Make sure we found it */ + if (!ComponentEntry) + { + DbgPrint("**** HalpAcpiFindRsdtPhase0: did NOT find RSDT\n"); + return STATUS_NOT_FOUND; + } + + /* The configuration data is a resource list, and the BIOS node follows */ + ResourceList = ComponentEntry->ConfigurationData; + NodeData = (PACPI_BIOS_MULTI_NODE)(ResourceList + 1); + + /* How many E820 memory entries are there? */ + NodeLength = sizeof(ACPI_BIOS_MULTI_NODE) + + (NodeData->Count - 1) * sizeof(ACPI_E820_ENTRY); + + /* Convert to pages */ + PageCount = BYTES_TO_PAGES(NodeLength); + + /* Allocate the memory */ + PhysicalAddress.LowPart = HalpAllocPhysicalMemory(LoaderBlock, + 0x1000000, + PageCount, + FALSE); + if (PhysicalAddress.LowPart) + { + /* Map it if the allocation worked */ + MappedAddress = HalpMapPhysicalMemory64(PhysicalAddress, PageCount); + } + else + { + /* Otherwise we'll have to fail */ + MappedAddress = NULL; + } + + /* Save the multi node, bail out if we didn't find it */ + HalpAcpiMultiNode = MappedAddress; + if (!MappedAddress) return STATUS_INSUFFICIENT_RESOURCES; + + /* Copy the multi-node data */ + RtlCopyMemory(MappedAddress, NodeData, NodeLength); + + /* Return the data */ + *AcpiMultiNode = HalpAcpiMultiNode; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +HalpAcpiTableCacheInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PACPI_BIOS_MULTI_NODE AcpiMultiNode; + NTSTATUS Status = STATUS_SUCCESS; + PHYSICAL_ADDRESS PhysicalAddress; + PVOID MappedAddress; + ULONG TableLength; + PRSDT Rsdt; + PLOADER_PARAMETER_EXTENSION LoaderExtension; + + /* Only initialize once */ + if (HalpAcpiTableCacheList.Flink) return Status; + + /* Setup the lock and table */ + ExInitializeFastMutex(&HalpAcpiTableCacheLock); + InitializeListHead(&HalpAcpiTableCacheList); + + /* Find the RSDT */ + Status = HalpAcpiFindRsdtPhase0(LoaderBlock, &AcpiMultiNode); + if (!NT_SUCCESS(Status)) return Status; + + /* Map the RSDT */ + if (LoaderBlock) + { + /* Phase0: Use HAL Heap to map the RSDT, we assume it's about 2 pages */ + PhysicalAddress.QuadPart = AcpiMultiNode->RsdtAddress.QuadPart; + MappedAddress = HalpMapPhysicalMemory64(PhysicalAddress, 2); + } + else + { + /* Use an I/O map */ + MappedAddress = MmMapIoSpace(PhysicalAddress, PAGE_SIZE * 2, MmNonCached); + } + + /* Get the RSDT */ + Rsdt = MappedAddress; + if (!MappedAddress) + { + /* Fail, no memory */ + DbgPrint("HAL: Failed to map RSDT\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Validate it */ + DPRINT1("ACPI RSDT at 0x%p\n", Rsdt); + if ((Rsdt->Header.Signature != RSDT_SIGNATURE) && + (Rsdt->Header.Signature != XSDT_SIGNATURE)) + { + /* Very bad: crash */ + HalDisplayString("Bad RSDT pointer\n"); + KeBugCheckEx(MISMATCHED_HAL, 4, __LINE__, 0, 0); + } + + /* We assumed two pages -- do we need less or more? */ + TableLength = ADDRESS_AND_SIZE_TO_SPAN_PAGES(PhysicalAddress.LowPart, + Rsdt->Header.Length); + if (TableLength != 2) + { + /* Are we in phase 0 or 1? */ + if (!LoaderBlock) + { + /* Unmap the old table, remap the new one, using Mm I/O space */ + MmUnmapIoSpace(MappedAddress, 2 * PAGE_SIZE); + MappedAddress = MmMapIoSpace(PhysicalAddress, + TableLength << PAGE_SHIFT, + MmNonCached); + } + else + { + /* Unmap the old table, remap the new one, using HAL heap */ + HalpUnmapVirtualAddress(MappedAddress, 2); + MappedAddress = HalpMapPhysicalMemory64(PhysicalAddress, TableLength); + } + + /* Get the remapped table */ + Rsdt = MappedAddress; + if (!MappedAddress) + { + /* Fail, no memory */ + DbgPrint("HAL: Couldn't remap RSDT\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* Now take the BIOS copy and make our own local copy */ + Rsdt = HalpAcpiCopyBiosTable(LoaderBlock, &Rsdt->Header); + if (!Rsdt) + { + /* Fail, no memory */ + DbgPrint("HAL: Couldn't remap RSDT\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Get rid of the BIOS mapping */ + if (LoaderBlock) + { + /* Use HAL heap */ + HalpUnmapVirtualAddress(MappedAddress, TableLength); + } + else + { + /* Use Mm */ + MmUnmapIoSpace(MappedAddress, TableLength << PAGE_SHIFT); + } + + /* Cache the RSDT */ + HalpAcpiCacheTable(&Rsdt->Header); + + /* Check for compatible loader block extension */ + LoaderExtension = LoaderBlock->Extension; + if (LoaderExtension->Size >= 0x58) + { + /* Compatible loader: did it provide an ACPI table override? */ + if ((LoaderExtension->AcpiTable) && (LoaderExtension->AcpiTableSize)) + { + /* Great, because we don't support it! */ + DPRINT1("ACPI Table Overrides Not Supported!\n"); + } + } + + /* Done */ + return Status; +} + +VOID +NTAPI +HaliAcpiTimerInit(IN ULONG TimerPort, + IN ULONG TimerValExt) +{ + PAGED_CODE(); + + /* Is this in the init phase? */ + if (!TimerPort ) + { + /* Get the data from the FADT */ + TimerPort = HalpFixedAcpiDescTable.pm_tmr_blk_io_port; + TimerValExt = HalpFixedAcpiDescTable.flags & ACPI_TMR_VAL_EXT; + } + + /* FIXME: Now proceed to the timer initialization */ + DPRINT1("ACPI Timer at: %Xh (EXT: %d)\n", TimerPort, TimerValExt); + //HalaAcpiTimerInit(TimerPort, TimerValExt); +} + +NTSTATUS +NTAPI +HalpSetupAcpiPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + NTSTATUS Status; + PFADT Fadt; + ULONG TableLength; + PHYSICAL_ADDRESS PhysicalAddress; + + /* Only do this once */ + DPRINT1("You are booting the ACPI HAL!\n"); + if (HalpProcessedACPIPhase0) return STATUS_SUCCESS; + + /* Setup the ACPI table cache */ + Status = HalpAcpiTableCacheInit(LoaderBlock); + if (!NT_SUCCESS(Status)) return Status; + + /* Grab the FADT */ + Fadt = HalAcpiGetTable(LoaderBlock, FADT_SIGNATURE); + if (!Fadt) + { + /* Fail */ + DbgPrint("HAL: Didn't find the FACP\n"); + return STATUS_NOT_FOUND; + } + + /* Assume typical size, otherwise whatever the descriptor table says */ + DPRINT1("ACPI FACP at 0x%p\n", Fadt); + TableLength = sizeof(FADT); + if (Fadt->Header.Length < sizeof(FADT)) TableLength = Fadt->Header.Length; + + /* Copy it in the HAL static buffer */ + RtlCopyMemory(&HalpFixedAcpiDescTable, Fadt, TableLength); + + /* Anything special this HAL needs to do? */ + HalpAcpiDetectMachineSpecificActions(LoaderBlock, &HalpFixedAcpiDescTable); + + /* Get the debug table for KD */ + HalpDebugPortTable = HalAcpiGetTable(LoaderBlock, DBGP_SIGNATURE); + DPRINT1("ACPI DBGP at 0x%p\n", HalpDebugPortTable); + + /* Initialize NUMA through the SRAT */ + HalpNumaInitializeStaticConfiguration(LoaderBlock); + + /* Initialize hotplug through the SRAT */ + HalpDynamicSystemResourceConfiguration(LoaderBlock); + DPRINT1("ACPI SRAT at 0x%p\n", HalpAcpiSrat); + if (HalpAcpiSrat) + { + DPRINT1("Your machine has a SRAT, but NUMA/HotPlug are not supported!\n"); + } + + /* Can there be memory higher than 4GB? */ + if (HalpMaxHotPlugMemoryAddress.HighPart >= 1) + { + /* We'll need this for DMA later */ + HalpPhysicalMemoryMayAppearAbove4GB = TRUE; + } + + /* Setup the ACPI timer */ + HaliAcpiTimerInit(0, 0); + + /* Do we have a low stub address yet? */ + if (!HalpLowStubPhysicalAddress.LowPart) + { + /* Allocate it */ + HalpLowStubPhysicalAddress.LowPart = HalpAllocPhysicalMemory(LoaderBlock, + 0x100000, + 1, + FALSE); + if (HalpLowStubPhysicalAddress.LowPart) + { + /* Map it */ + HalpLowStub = HalpMapPhysicalMemory64(HalpLowStubPhysicalAddress, 1); + } + } + + /* Grab a page for flushes */ + PhysicalAddress.QuadPart = 0x100000; + HalpVirtAddrForFlush = HalpMapPhysicalMemory64(PhysicalAddress, 1); + HalpPteForFlush = HalAddressToPte(HalpVirtAddrForFlush); + + /* Don't do this again */ + HalpProcessedACPIPhase0 = TRUE; + + /* Setup the boot table */ + HalpInitBootTable(LoaderBlock); + + /* Return success */ + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/hal/halx86/generic/acpi/halacpi.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Wed Mar 31 06:43:39 2010 @@ -307,6 +307,9 @@ } #ifndef _MINIHAL_ + /* Initialize ACPI */ + HalpSetupAcpiPhase0(LoaderBlock); + /* Initialize the PICs */ HalpInitializePICs(TRUE); #endif Added: trunk/reactos/hal/halx86/generic/legacy/halpcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/halpcat.c (added) +++ trunk/reactos/hal/halx86/generic/legacy/halpcat.c [iso-8859-1] Wed Mar 31 06:43:39 2010 @@ -1,0 +1,27 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: hal/halx86/generic/acpi/halpcat.c + * PURPOSE: HAL Legacy Support Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* PRIVATE FUNCTIONS **********************************************************/ + +NTSTATUS +NTAPI +HalpSetupAcpiPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + /* There is no ACPI on these HALs */ + return STATUS_NO_SUCH_DEVICE; +} + +/* EOF */ Propchange: trunk/reactos/hal/halx86/generic/legacy/halpcat.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed Mar 31 06:43:39 2010 @@ -7,6 +7,9 @@ <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <directory name="generic"> + <directory name="legacy"> + <file>halpcat.c</file> + </directory> <directory name="bus"> <file>bushndlr.c</file> <file>isabus.c</file> @@ -53,6 +56,9 @@ <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <directory name="generic"> + <directory name="acpi"> + <file>halacpi.c</file> + </directory> <directory name="bus"> <file>bushndlr.c</file> <file>isabus.c</file>

1 0

[sir_richard] 46612: [HAL]: Add Phase 0 HAL Heap Allocation/Mapping/Unmapping APIs, remove current broken APIs that depend on Mm having been initialized. These APIs use the HAL Heap that's typically at 0xFFC00000. FreeLDR seems to map this region correctly. [HAL]: Although currently implemented for ACPI support (to come), these APIs can now also be used to enable DMA in Phase 0 like NT, instead of only in Phase 1 like ReactOS.
by sir_richard＠svn.reactos.org 31 Mar '10

31 Mar '10

Author: sir_richard Date: Wed Mar 31 06:38:20 2010 New Revision: 46612 URL: http://svn.reactos.org/svn/reactos?rev=46612&view=rev Log: [HAL]: Add Phase 0 HAL Heap Allocation/Mapping/Unmapping APIs, remove current broken APIs that depend on Mm having been initialized. These APIs use the HAL Heap that's typically at 0xFFC00000. FreeLDR seems to map this region correctly. [HAL]: Although currently implemented for ACPI support (to come), these APIs can now also be used to enable DMA in Phase 0 like NT, instead of only in Phase 1 like ReactOS. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Wed Mar 31 06:38:20 2010 @@ -14,9 +14,224 @@ /* GLOBALS *******************************************************************/ +/* Share with Mm headers? */ +#define MM_HAL_VA_START (PVOID)0xFFC00000 +#define MM_HAL_HEAP_START (PVOID)((ULONG_PTR)MM_HAL_VA_START + (1024 * 1024)) + BOOLEAN HalpPciLockSettings; +ULONG HalpUsedAllocDescriptors; +MEMORY_ALLOCATION_DESCRIPTOR HalpAllocationDescriptorArray[64]; +PVOID HalpHeapStart = MM_HAL_HEAP_START; /* PRIVATE FUNCTIONS *********************************************************/ + +ULONG +NTAPI +HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG MaxAddress, + IN ULONG PageCount, + IN BOOLEAN Aligned) +{ + ULONG UsedDescriptors, Alignment, PhysicalAddress; + PFN_NUMBER MaxPage, BasePage; + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock, NewBlock, FreeBlock; + + /* Highest page we'll go */ + MaxPage = MaxAddress >> PAGE_SHIFT; + + /* We need at least two blocks */ + if ((HalpUsedAllocDescriptors + 2) > 64) return 0; + + /* Remember how many we have now */ + UsedDescriptors = HalpUsedAllocDescriptors; + + /* Loop the loader block memory descriptors */ + NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + { + /* Get the block */ + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* No alignment by default */ + Alignment = 0; + + /* Unless requested, in which case we use a 64KB block alignment */ + if (Aligned) Alignment = ((MdBlock->BasePage + 0x0F) & ~0x0F) - MdBlock->BasePage; + + /* Search for free memory */ + if ((MdBlock->MemoryType == LoaderFree) || + (MdBlock->MemoryType == MemoryFirmwareTemporary)) + { + /* Make sure the page is within bounds, including alignment */ + BasePage = MdBlock->BasePage; + if ((BasePage) && + (MdBlock->PageCount >= PageCount + Alignment) && + (BasePage + PageCount + Alignment < MaxPage)) + { + + /* We found an address */ + PhysicalAddress = (BasePage + Alignment) << PAGE_SHIFT; + break; + } + } + + /* Keep trying */ + NextEntry = NextEntry->Flink; + } + + /* If we didn't find anything, get out of here */ + if (NextEntry == &LoaderBlock->MemoryDescriptorListHead) return 0; + + /* Okay, now get a descriptor */ + NewBlock = &HalpAllocationDescriptorArray[HalpUsedAllocDescriptors]; + NewBlock->PageCount = PageCount; + NewBlock->BasePage = MdBlock->BasePage + Alignment; + NewBlock->MemoryType = LoaderHALCachedMemory; + + /* Update count */ + UsedDescriptors++; + HalpUsedAllocDescriptors = UsedDescriptors; + + /* Check if we had any alignment */ + if (Alignment) + { + /* Check if we had leftovers */ + if ((MdBlock->PageCount - Alignment) != PageCount) + { + /* Get the next descriptor */ + FreeBlock = &HalpAllocationDescriptorArray[UsedDescriptors]; + FreeBlock->PageCount = MdBlock->PageCount - Alignment - PageCount; + FreeBlock->BasePage = MdBlock->BasePage + Alignment + PageCount; + + /* One more */ + HalpUsedAllocDescriptors++; + + /* Insert it into the list */ + InsertHeadList(&MdBlock->ListEntry, &FreeBlock->ListEntry); + } + + /* Use this descriptor */ + NewBlock->PageCount = Alignment; + InsertHeadList(&MdBlock->ListEntry, &NewBlock->ListEntry); + } + else + { + /* Consume memory from this block */ + MdBlock->BasePage += PageCount; + MdBlock->PageCount -= PageCount; + + /* Insert the descriptor */ + InsertTailList(&MdBlock->ListEntry, &NewBlock->ListEntry); + + /* Remove the entry if the whole block was allocated */ + if (!MdBlock->PageCount == 0) RemoveEntryList(&MdBlock->ListEntry); + } + + /* Return the address */ + return PhysicalAddress; +} + +PVOID +NTAPI +HalpMapPhysicalMemory64(IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG PageCount) +{ + PHARDWARE_PTE PointerPte; + ULONG UsedPages = 0; + PVOID VirtualAddress, BaseAddress; + + /* Start at the current HAL heap base */ + BaseAddress = HalpHeapStart; + + /* Loop until we have all the pages required */ + while (UsedPages < PageCount) + { + /* Begin a new loop cycle */ + UsedPages = 0; + VirtualAddress = BaseAddress; + + /* If this overflows past the HAL heap, it means there's no space */ + if (BaseAddress == NULL) return NULL; + + /* Loop until we have all the pages required in a single run */ + while (UsedPages < PageCount) + { + /* Get the PTE for this address and check if it's available */ + PointerPte = HalAddressToPte(VirtualAddress); + if (*(PULONG)PointerPte) + { + /* PTE has data, skip it and start with a new base address */ + BaseAddress = (PVOID)((ULONG_PTR)VirtualAddress + PAGE_SIZE); + break; + } + + /* PTE is available, keep going on this run */ + VirtualAddress = (PVOID)((ULONG_PTR)VirtualAddress + PAGE_SIZE); + UsedPages++; + } + } + + /* Take the base address of the page plus the actual offset in the address */ + VirtualAddress = (PVOID)((ULONG_PTR)BaseAddress + + BYTE_OFFSET(PhysicalAddress.LowPart)); + + /* If we are starting at the heap, move the heap */ + if (BaseAddress == HalpHeapStart) + { + /* Past this allocation */ + HalpHeapStart = (PVOID)((ULONG_PTR)BaseAddress + (PageCount * PAGE_SIZE)); + } + + /* Loop pages that can be mapped */ + while (UsedPages--) + { + /* Fill out the PTE */ + PointerPte = HalAddressToPte(BaseAddress); + PointerPte->PageFrameNumber = PhysicalAddress.QuadPart >> PAGE_SHIFT; + PointerPte->Valid = 1; + PointerPte->Write = 1; + + /* Move to the next address */ + PhysicalAddress.QuadPart += PAGE_SIZE; + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress + PAGE_SIZE); + } + + /* Flush the TLB and return the address */ + HalpFlushTLB(); + return VirtualAddress; +} + +VOID +NTAPI +HalpUnmapVirtualAddress(IN PVOID VirtualAddress, + IN ULONG PageCount) +{ + PHARDWARE_PTE PointerPte; + ULONG i; + + /* Only accept valid addresses */ + if (VirtualAddress < MM_HAL_VA_START) return; + + /* Align it down to page size */ + VirtualAddress = (PVOID)((ULONG_PTR)VirtualAddress & ~(PAGE_SIZE - 1)); + + /* Loop PTEs */ + PointerPte = HalAddressToPte(VirtualAddress); + for (i = 0; i < PageCount; i++) + { + *(PULONG)PointerPte = 0; + PointerPte++; + } + + /* Flush the TLB */ + HalpFlushTLB(); + + /* Put the heap back */ + if (HalpHeapStart > VirtualAddress) HalpHeapStart = VirtualAddress; +} VOID NTAPI Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Wed Mar 31 06:38:20 2010 @@ -28,32 +28,6 @@ return; } -#ifndef _MINIHAL_ -PVOID -NTAPI -HalpMapPhysicalMemory64(IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberPage) -{ - // - // Use kernel memory manager I/O map facilities - // - return MmMapIoSpace(PhysicalAddress, - NumberPage << PAGE_SHIFT, - MmNonCached); -} - -VOID -NTAPI -HalpUnmapVirtualAddress(IN PVOID VirtualAddress, - IN ULONG NumberPages) -{ - // - // Use kernel memory manager I/O map facilities - // - MmUnmapIoSpace(VirtualAddress, NumberPages << PAGE_SHIFT); -} -#endif - VOID NTAPI HalpFlushTLB(VOID) Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Wed Mar 31 06:38:20 2010 @@ -681,7 +681,21 @@ VOID ); - +ULONG +NTAPI +HalpAllocPhysicalMemory( + IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG MaxAddress, + IN ULONG PageCount, + IN BOOLEAN Aligned +); + +PVOID +NTAPI +HalpMapPhysicalMemory64( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG PageCount +); VOID FASTCALL

1 0

[sir_richard] 46611: [HALACPI]: Add some missing signatures.
by sir_richard＠svn.reactos.org 31 Mar '10

31 Mar '10

Author: sir_richard Date: Wed Mar 31 06:34:26 2010 New Revision: 46611 URL: http://svn.reactos.org/svn/reactos?rev=46611&view=rev Log: [HALACPI]: Add some missing signatures. Modified: trunk/reactos/hal/halx86/include/halacpi.h Modified: trunk/reactos/hal/halx86/include/halacpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halacpi… ============================================================================== --- trunk/reactos/hal/halx86/include/halacpi.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halacpi.h [iso-8859-1] Wed Mar 31 06:34:26 2010 @@ -30,6 +30,9 @@ #define PSDT_SIGNATURE 0x54445350 // "PSDT" #define SBST_SIGNATURE 0x54534253 // "SBST" #define DBGP_SIGNATURE 0x50474244 // "DBGP" +#define XSDT_SIGNATURE 'TDSX' +#define BOOT_SIGNATURE 'TOOB' +#define SRAT_SIGNATURE 'TARS' // // FADT Flags

1 0

[sir_richard] 46610: [HALACPI]: Add HAL ACPI header.
by sir_richard＠svn.reactos.org 31 Mar '10

31 Mar '10

Author: sir_richard Date: Wed Mar 31 06:26:04 2010 New Revision: 46610 URL: http://svn.reactos.org/svn/reactos?rev=46610&view=rev Log: [HALACPI]: Add HAL ACPI header. Added: trunk/reactos/hal/halx86/include/halacpi.h (with props) Modified: trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Wed Mar 31 06:26:04 2010 @@ -48,5 +48,6 @@ #include "halp.h" #include "mps.h" #include "ioapic.h" +#include "halacpi.h" /* EOF */ Added: trunk/reactos/hal/halx86/include/halacpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halacpi… ============================================================================== --- trunk/reactos/hal/halx86/include/halacpi.h (added) +++ trunk/reactos/hal/halx86/include/halacpi.h [iso-8859-1] Wed Mar 31 06:26:04 2010 @@ -1,0 +1,227 @@ +#pragma once + +// +// Should be shared with FreeLDR +// +typedef struct _ACPI_E820_ENTRY +{ + PHYSICAL_ADDRESS Base; + LARGE_INTEGER Length; + ULONGLONG Type; +} ACPI_E820_ENTRY, *PACPI_E820_ENTRY; + +typedef struct _ACPI_BIOS_MULTI_NODE +{ + PHYSICAL_ADDRESS RsdtAddress; + ULONGLONG Count; + ACPI_E820_ENTRY E820Entry[1]; +} ACPI_BIOS_MULTI_NODE, *PACPI_BIOS_MULTI_NODE; + +// +// ACPI Signatures +// +#define RSDP_SIGNATURE 0x2052545020445352 // "RSD PTR " +#define FACS_SIGNATURE 0x53434146 // "FACS" +#define FADT_SIGNATURE 0x50434146 // "FACP" +#define RSDT_SIGNATURE 0x54445352 // "RSDT" +#define APIC_SIGNATURE 0x43495041 // "APIC" +#define DSDT_SIGNATURE 0x54445344 // "DSDT" +#define SSDT_SIGNATURE 0x54445353 // "SSDT" +#define PSDT_SIGNATURE 0x54445350 // "PSDT" +#define SBST_SIGNATURE 0x54534253 // "SBST" +#define DBGP_SIGNATURE 0x50474244 // "DBGP" + +// +// FADT Flags +// +#define ACPI_TMR_VAL_EXT 0x100 + +// +// ACPI Generic Register Address +// +typedef struct _GEN_ADDR +{ + UCHAR AddressSpaceID; + UCHAR BitWidth; + UCHAR BitOffset; + UCHAR Reserved; + PHYSICAL_ADDRESS Address; +} GEN_ADDR, *PGEN_ADDR; + +// +// ACPI BIOS Structures (packed) +// +#include <pshpack1.h> +typedef struct _RSDP +{ + ULONGLONG Signature; + UCHAR Checksum; + UCHAR OEMID[6]; + UCHAR Reserved[1]; + ULONG RsdtAddress; +} RSDP; +typedef RSDP *PRSDP; + +typedef struct _DESCRIPTION_HEADER +{ + ULONG Signature; + ULONG Length; + UCHAR Revision; + UCHAR Checksum; + UCHAR OEMID[6]; + UCHAR OEMTableID[8]; + ULONG OEMRevision; + UCHAR CreatorID[4]; + ULONG CreatorRev; +} DESCRIPTION_HEADER; +typedef DESCRIPTION_HEADER *PDESCRIPTION_HEADER; + +typedef struct _FACS +{ + ULONG Signature; + ULONG Length; + ULONG HardwareSignature; + ULONG pFirmwareWakingVector; + ULONG GlobalLock; + ULONG Flags; + PHYSICAL_ADDRESS x_FirmwareWakingVector; + UCHAR version; + UCHAR Reserved[32]; +} FACS; +typedef FACS *PFACS; + +typedef struct _FADT +{ + DESCRIPTION_HEADER Header; + ULONG facs; + ULONG dsdt; + UCHAR int_model; + UCHAR pm_profile; + USHORT sci_int_vector; + ULONG smi_cmd_io_port; + UCHAR acpi_on_value; + UCHAR acpi_off_value; + UCHAR s4bios_req; + UCHAR pstate_control; + ULONG pm1a_evt_blk_io_port; + ULONG pm1b_evt_blk_io_port; + ULONG pm1a_ctrl_blk_io_port; + ULONG pm1b_ctrl_blk_io_port; + ULONG pm2_ctrl_blk_io_port; + ULONG pm_tmr_blk_io_port; + ULONG gp0_blk_io_port; + ULONG gp1_blk_io_port; + UCHAR pm1_evt_len; + UCHAR pm1_ctrl_len; + UCHAR pm2_ctrl_len; + UCHAR pm_tmr_len; + UCHAR gp0_blk_len; + UCHAR gp1_blk_len; + UCHAR gp1_base; + UCHAR cstate_control; + USHORT lvl2_latency; + USHORT lvl3_latency; + USHORT flush_size; + USHORT flush_stride; + UCHAR duty_offset; + UCHAR duty_width; + UCHAR day_alarm_index; + UCHAR month_alarm_index; + UCHAR century_alarm_index; + USHORT boot_arch; + UCHAR reserved3[1]; + ULONG flags; + GEN_ADDR reset_reg; + UCHAR reset_val; + UCHAR reserved4[3]; + PHYSICAL_ADDRESS x_firmware_ctrl; + PHYSICAL_ADDRESS x_dsdt; + GEN_ADDR x_pm1a_evt_blk; + GEN_ADDR x_pm1b_evt_blk; + GEN_ADDR x_pm1a_ctrl_blk; + GEN_ADDR x_pm1b_ctrl_blk; + GEN_ADDR x_pm2_ctrl_blk; + GEN_ADDR x_pm_tmr_blk; + GEN_ADDR x_gp0_blk; + GEN_ADDR x_gp1_blk; +} FADT; +typedef FADT *PFADT; + +typedef struct _DSDT +{ + DESCRIPTION_HEADER Header; + UCHAR DiffDefBlock[ANYSIZE_ARRAY]; +} DSDT; +typedef DSDT *PDSDT; + +typedef struct _RSDT +{ + DESCRIPTION_HEADER Header; + ULONG Tables[ANYSIZE_ARRAY]; +} RSDT; +typedef RSDT *PRSDT; + +typedef struct _XSDT +{ + DESCRIPTION_HEADER Header; + PHYSICAL_ADDRESS Tables[ANYSIZE_ARRAY]; +} XSDT; +typedef XSDT *PXSDT; +#include <poppack.h> + +// +// Microsoft-specific (pretty much) ACPI Tables, normal MS ABI packing +// +typedef struct _DEBUG_PORT_TABLE +{ + DESCRIPTION_HEADER Header; + UCHAR InterfaceType; + UCHAR Reserved[3]; + GEN_ADDR BaseAddress; +} DEBUG_PORT_TABLE, *PDEBUG_PORT_TABLE; + +typedef struct _BOOT_TABLE +{ + DESCRIPTION_HEADER Header; + UCHAR CMOSIndex; + UCHAR Reserved[3]; +} BOOT_TABLE, *PBOOT_TABLE; + +typedef struct _ACPI_SRAT +{ + DESCRIPTION_HEADER Header; + UCHAR TableRevision; + ULONG Reserved[2]; +} ACPI_SRAT, *PACPI_SRAT; + +// +// Internal HAL structure +// +typedef struct _ACPI_CACHED_TABLE +{ + LIST_ENTRY Links; + DESCRIPTION_HEADER Header; + // table follows + // ... +} ACPI_CACHED_TABLE, *PACPI_CACHED_TABLE; + +NTSTATUS +NTAPI +HalpAcpiTableCacheInit( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +PVOID +NTAPI +HalpAcpiGetTable( + IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG Signature +); + +NTSTATUS +NTAPI +HalpSetupAcpiPhase0( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +/* EOF */ Propchange: trunk/reactos/hal/halx86/include/halacpi.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 46609: [SETUPAPI] - Implement SetupDiOpenDeviceInterfaceW
by janderwald＠svn.reactos.org 31 Mar '10

31 Mar '10

Author: janderwald Date: Wed Mar 31 04:43:57 2010 New Revision: 46609 URL: http://svn.reactos.org/svn/reactos?rev=46609&view=rev Log: [SETUPAPI] - Implement SetupDiOpenDeviceInterfaceW 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Wed Mar 31 04:43:57 2010 @@ -3699,8 +3699,209 @@ DWORD OpenFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { - FIXME("%p %s %08x %p\n", + struct DeviceInfoSet * list; + PCWSTR pEnd; + DWORD dwLength, dwError, dwIndex, dwKeyName, dwSubIndex; + CLSID ClassId; + WCHAR Buffer[MAX_PATH + 1]; + WCHAR SymBuffer[MAX_PATH + 1]; + WCHAR InstancePath[MAX_PATH + 1]; + HKEY hKey, hDevKey, hSymKey; + struct DeviceInfo * deviceInfo; + struct DeviceInterface *deviceInterface; + BOOL Ret; + PLIST_ENTRY ItemList; + PLIST_ENTRY InterfaceListEntry; + + TRACE("%p %s %08x %p\n", DeviceInfoSet, debugstr_w(DevicePath), OpenFlags, DeviceInterfaceData); + + + if (DeviceInterfaceData && DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + list = (struct DeviceInfoSet * )DeviceInfoSet; + + dwLength = wcslen(DevicePath); + if (dwLength < 39) + { + /* path must be at least a guid length + L'\0' */ + SetLastError(ERROR_BAD_PATHNAME); + return FALSE; + } + + if (DevicePath[0] != L'\\' || + DevicePath[1] != L'\\' || + (DevicePath[2] != L'?' && DevicePath[2] != L'.') || + DevicePath[3] != L'\\') + { + /* invalid formatted path */ + SetLastError(ERROR_BAD_PATHNAME); + return FALSE; + } + + /* check for reference strings */ + pEnd = wcschr(&DevicePath[4], L'\\'); + if (!pEnd) + { + /* no reference string */ + pEnd = DevicePath + dwLength; + } + + /* copy guid */ + wcscpy(Buffer, pEnd - 37); + Buffer[36] = L'\0'; + + dwError = UuidFromStringW(Buffer, &ClassId); + if (dwError != NOERROR) + { + /* invalid formatted path */ + SetLastError(ERROR_BAD_PATHNAME); + return FALSE; + } + + hKey = SetupDiOpenClassRegKeyExW(&ClassId, KEY_READ, DIOCR_INTERFACE, list->MachineName, NULL); + + if (hKey == INVALID_HANDLE_VALUE) + { + /* invalid device class */ + return FALSE; + } + + ItemList = list->ListHead.Flink; + while (ItemList != &list->ListHead) + { + deviceInfo = CONTAINING_RECORD(ItemList, struct DeviceInfo, ListEntry); + InterfaceListEntry = deviceInfo->InterfaceListHead.Flink; + while (InterfaceListEntry != &deviceInfo->InterfaceListHead) + { + deviceInterface = CONTAINING_RECORD(InterfaceListEntry, struct DeviceInterface, ListEntry); + if (!IsEqualIID(&deviceInterface->InterfaceClassGuid, &ClassId)) + { + InterfaceListEntry = InterfaceListEntry->Flink; + continue; + } + + if (!wcsicmp(deviceInterface->SymbolicLink, DevicePath)) + { + if (DeviceInterfaceData) + { + DeviceInterfaceData->Reserved = (ULONG_PTR)deviceInterface; + DeviceInterfaceData->Flags = deviceInterface->Flags; + CopyMemory(&DeviceInterfaceData->InterfaceClassGuid, &ClassId, sizeof(GUID)); + } + + return TRUE; + } + + } + } + + + dwIndex = 0; + do + { + Buffer[0] = 0; + dwKeyName = sizeof(Buffer) / sizeof(WCHAR); + dwError = RegEnumKeyExW(hKey, dwIndex, Buffer, &dwKeyName, NULL, NULL, NULL, NULL); + + if (dwError != ERROR_SUCCESS) + break; + + if (RegOpenKeyExW(hKey, Buffer, 0, KEY_READ, &hDevKey) != ERROR_SUCCESS) + break; + + dwSubIndex = 0; + InstancePath[0] = 0; + dwKeyName = sizeof(InstancePath); + + dwError = RegQueryValueExW(hDevKey, L"DeviceInstance", NULL, NULL, (LPBYTE)InstancePath, &dwKeyName); + + while(TRUE) + { + Buffer[0] = 0; + dwKeyName = sizeof(Buffer) / sizeof(WCHAR); + dwError = RegEnumKeyExW(hDevKey, dwSubIndex, Buffer, &dwKeyName, NULL, NULL, NULL, NULL); + + if (dwError != ERROR_SUCCESS) + break; + + dwError = RegOpenKeyExW(hDevKey, Buffer, 0, KEY_READ, &hSymKey); + if (dwError != ERROR_SUCCESS) + break; + + /* query for symbolic link */ + dwKeyName = sizeof(SymBuffer); + SymBuffer[0] = L'\0'; + dwError = RegQueryValueExW(hSymKey, L"SymbolicLink", NULL, NULL, (LPBYTE)SymBuffer, &dwKeyName); + + if (dwError != ERROR_SUCCESS) + { + RegCloseKey(hSymKey); + break; + } + + if (!wcsicmp(SymBuffer, DevicePath)) + { + Ret = CreateDeviceInfo(list, InstancePath, &ClassId, &deviceInfo); + RegCloseKey(hSymKey); + RegCloseKey(hDevKey); + RegCloseKey(hKey); + + if (Ret) + { + deviceInterface = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInterface) + (wcslen(SymBuffer) + 1) * sizeof(WCHAR)); + if (deviceInterface) + { + + CopyMemory(&deviceInterface->InterfaceClassGuid, &ClassId, sizeof(GUID)); + deviceInterface->DeviceInfo = deviceInfo; + deviceInterface->Flags = SPINT_ACTIVE; //FIXME + + wcscpy(deviceInterface->SymbolicLink, SymBuffer); + + InsertTailList(&deviceInfo->InterfaceListHead, &deviceInterface->ListEntry); + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); + + + if (DeviceInterfaceData) + { + DeviceInterfaceData->Reserved = (ULONG_PTR)deviceInterface; + DeviceInterfaceData->Flags = deviceInterface->Flags; + CopyMemory(&DeviceInterfaceData->InterfaceClassGuid, &ClassId, sizeof(GUID)); + } + else + { + Ret = FALSE; + SetLastError(ERROR_INVALID_USER_BUFFER); + } + } + } + else + { + HeapFree(GetProcessHeap(), 0, deviceInfo); + Ret = FALSE; + } + return Ret; + } + RegCloseKey(hSymKey); + dwSubIndex++; + } + + RegCloseKey(hDevKey); + dwIndex++; + }while(TRUE); + + RegCloseKey(hKey); return FALSE; }

1 0

[akhaldi] 46608: [BATTC] - Correct the inclusion of wmilib [PSDK] - ws2tcpip.h improvements, some formatting fixes, remove some duplicate definitions between winsock2.h and ws2def.h [XDK] - Move some definitions from ntifs.template.h to more appropriate places. [NTIFS] - Reflect XDK changes.
by akhaldi＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: akhaldi Date: Tue Mar 30 23:50:05 2010 New Revision: 46608 URL: http://svn.reactos.org/svn/reactos?rev=46608&view=rev Log: [BATTC] - Correct the inclusion of wmilib [PSDK] - ws2tcpip.h improvements, some formatting fixes, remove some duplicate definitions between winsock2.h and ws2def.h [XDK] - Move some definitions from ntifs.template.h to more appropriate places. [NTIFS] - Reflect XDK changes. Modified: branches/header-work/drivers/battery/battc/battc.h branches/header-work/include/ddk/ntifs.h branches/header-work/include/psdk/in6addr.h branches/header-work/include/psdk/winsock.h branches/header-work/include/psdk/winsock2.h branches/header-work/include/psdk/ws2tcpip.h branches/header-work/include/xdk/extypes.h branches/header-work/include/xdk/fsrtltypes.h branches/header-work/include/xdk/ntifs.template.h Modified: branches/header-work/drivers/battery/battc/battc.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/battery/bat… ============================================================================== --- branches/header-work/drivers/battery/battc/battc.h [iso-8859-1] (original) +++ branches/header-work/drivers/battery/battc/battc.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -9,7 +9,7 @@ #pragma once #include <ntddk.h> -#include <wmlib.h> +#include <wmilib.h> #include <initguid.h> #include <batclass.h> Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -4957,6 +4957,10 @@ +#define INVALID_PROCESSOR_INDEX 0xffffffff + +#define EX_PUSH_LOCK ULONG_PTR +#define PEX_PUSH_LOCK PULONG_PTR /****************************************************************************** * Executive Functions * ******************************************************************************/ @@ -6178,6 +6182,12 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ /* FSRTL Types */ + +typedef ULONG LBN; +typedef LBN *PLBN; + +typedef ULONG VBN; +typedef VBN *PVBN; typedef struct _FSRTL_COMMON_FCB_HEADER { CSHORT NodeTypeCode; @@ -6347,6 +6357,121 @@ #define FSRTL_CC_FLUSH_ERROR_FLAG_NO_HARD_ERROR 0x1 #define FSRTL_CC_FLUSH_ERROR_FLAG_NO_LOG_ENTRY 0x2 + +typedef NTSTATUS +(NTAPI *PCOMPLETE_LOCK_IRP_ROUTINE) ( + IN PVOID Context, + IN PIRP Irp); + +typedef struct _FILE_LOCK_INFO { + LARGE_INTEGER StartingByte; + LARGE_INTEGER Length; + BOOLEAN ExclusiveLock; + ULONG Key; + PFILE_OBJECT FileObject; + PVOID ProcessId; + LARGE_INTEGER EndingByte; +} FILE_LOCK_INFO, *PFILE_LOCK_INFO; + +typedef VOID +(NTAPI *PUNLOCK_ROUTINE) ( + IN PVOID Context, + IN PFILE_LOCK_INFO FileLockInfo); + +typedef struct _FILE_LOCK { + PCOMPLETE_LOCK_IRP_ROUTINE CompleteLockIrpRoutine; + PUNLOCK_ROUTINE UnlockRoutine; + BOOLEAN FastIoIsQuestionable; + BOOLEAN SpareC[3]; + PVOID LockInformation; + FILE_LOCK_INFO LastReturnedLockInfo; + PVOID LastReturnedLock; + LONG volatile LockRequestsInProgress; +} FILE_LOCK, *PFILE_LOCK; + +typedef struct _TUNNEL { + FAST_MUTEX Mutex; + PRTL_SPLAY_LINKS Cache; + LIST_ENTRY TimerQueue; + USHORT NumEntries; +} TUNNEL, *PTUNNEL; + +typedef struct _BASE_MCB { + ULONG MaximumPairCount; + ULONG PairCount; + USHORT PoolType; + USHORT Flags; + PVOID Mapping; +} BASE_MCB, *PBASE_MCB; + +typedef struct _LARGE_MCB { + PKGUARDED_MUTEX GuardedMutex; + BASE_MCB BaseMcb; +} LARGE_MCB, *PLARGE_MCB; + +#define MCB_FLAG_RAISE_ON_ALLOCATION_FAILURE 1 + +typedef struct _MCB { + LARGE_MCB DummyFieldThatSizesThisStructureCorrectly; +} MCB, *PMCB; + +typedef enum _FAST_IO_POSSIBLE { + FastIoIsNotPossible = 0, + FastIoIsPossible, + FastIoIsQuestionable +} FAST_IO_POSSIBLE; + +typedef struct _EOF_WAIT_BLOCK { + LIST_ENTRY EofWaitLinks; + KEVENT Event; +} EOF_WAIT_BLOCK, *PEOF_WAIT_BLOCK; + +typedef PVOID OPLOCK, *POPLOCK; + +typedef VOID +(NTAPI *POPLOCK_WAIT_COMPLETE_ROUTINE) ( + IN PVOID Context, + IN PIRP Irp); + +typedef VOID +(NTAPI *POPLOCK_FS_PREPOST_IRP) ( + IN PVOID Context, + IN PIRP Irp); + +#if (NTDDI_VERSION >= NTDDI_VISTASP1) +#define OPLOCK_FLAG_COMPLETE_IF_OPLOCKED 0x00000001 +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define OPLOCK_FLAG_OPLOCK_KEY_CHECK_ONLY 0x00000002 +#define OPLOCK_FLAG_BACK_OUT_ATOMIC_OPLOCK 0x00000004 +#define OPLOCK_FLAG_IGNORE_OPLOCK_KEYS 0x00000008 +#define OPLOCK_FSCTRL_FLAG_ALL_KEYS_MATCH 0x00000001 +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN7) + +typedef struct _OPLOCK_KEY_ECP_CONTEXT { + GUID OplockKey; + ULONG Reserved; +} OPLOCK_KEY_ECP_CONTEXT, *POPLOCK_KEY_ECP_CONTEXT; + +DEFINE_GUID( GUID_ECP_OPLOCK_KEY, 0x48850596, 0x3050, 0x4be7, 0x98, 0x63, 0xfe, 0xc3, 0x50, 0xce, 0x8d, 0x7f ); + +#endif + +typedef PVOID PNOTIFY_SYNC; + +typedef BOOLEAN +(NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( + IN PVOID NotifyContext, + IN PVOID TargetContext OPTIONAL, + IN PSECURITY_SUBJECT_CONTEXT SubjectContext); + +typedef BOOLEAN +(NTAPI *PFILTER_REPORT_CHANGE) ( + IN PVOID NotifyContext, + IN PVOID FilterContext); /* FSRTL Functions */ #define FsRtlEnterFileSystem KeEnterCriticalRegion @@ -8655,11 +8780,6 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ -#define INVALID_PROCESSOR_INDEX 0xffffffff - -#define EX_PUSH_LOCK ULONG_PTR -#define PEX_PUSH_LOCK PULONG_PTR - /* #if !defined(_X86AMD64_) FIXME : WHAT ?! */ #if defined(_WIN64) @@ -8690,127 +8810,6 @@ #if defined(_M_IX86) || defined(_M_AMD64) #define HalGetDmaAlignmentRequirement() 1L #endif - -typedef ULONG LBN; -typedef LBN *PLBN; - -typedef ULONG VBN; -typedef VBN *PVBN; - -typedef enum _FAST_IO_POSSIBLE { - FastIoIsNotPossible = 0, - FastIoIsPossible, - FastIoIsQuestionable -} FAST_IO_POSSIBLE; - -typedef struct _EOF_WAIT_BLOCK { - LIST_ENTRY EofWaitLinks; - KEVENT Event; -} EOF_WAIT_BLOCK, *PEOF_WAIT_BLOCK; - -typedef struct _FILE_LOCK_INFO { - LARGE_INTEGER StartingByte; - LARGE_INTEGER Length; - BOOLEAN ExclusiveLock; - ULONG Key; - PFILE_OBJECT FileObject; - PVOID ProcessId; - LARGE_INTEGER EndingByte; -} FILE_LOCK_INFO, *PFILE_LOCK_INFO; - -typedef NTSTATUS -(NTAPI *PCOMPLETE_LOCK_IRP_ROUTINE) ( - IN PVOID Context, - IN PIRP Irp); - -typedef VOID -(NTAPI *PUNLOCK_ROUTINE) ( - IN PVOID Context, - IN PFILE_LOCK_INFO FileLockInfo); - -typedef struct _FILE_LOCK { - PCOMPLETE_LOCK_IRP_ROUTINE CompleteLockIrpRoutine; - PUNLOCK_ROUTINE UnlockRoutine; - BOOLEAN FastIoIsQuestionable; - BOOLEAN SpareC[3]; - PVOID LockInformation; - FILE_LOCK_INFO LastReturnedLockInfo; - PVOID LastReturnedLock; - LONG volatile LockRequestsInProgress; -} FILE_LOCK, *PFILE_LOCK; - -typedef struct _TUNNEL { - FAST_MUTEX Mutex; - PRTL_SPLAY_LINKS Cache; - LIST_ENTRY TimerQueue; - USHORT NumEntries; -} TUNNEL, *PTUNNEL; - -typedef struct _BASE_MCB { - ULONG MaximumPairCount; - ULONG PairCount; - USHORT PoolType; - USHORT Flags; - PVOID Mapping; -} BASE_MCB, *PBASE_MCB; - -typedef struct _LARGE_MCB { - PKGUARDED_MUTEX GuardedMutex; - BASE_MCB BaseMcb; -} LARGE_MCB, *PLARGE_MCB; - -#define MCB_FLAG_RAISE_ON_ALLOCATION_FAILURE 1 - -typedef struct _MCB { - LARGE_MCB DummyFieldThatSizesThisStructureCorrectly; -} MCB, *PMCB; - -typedef PVOID OPLOCK, *POPLOCK; - -typedef VOID -(NTAPI *POPLOCK_WAIT_COMPLETE_ROUTINE) ( - IN PVOID Context, - IN PIRP Irp); - -typedef VOID -(NTAPI *POPLOCK_FS_PREPOST_IRP) ( - IN PVOID Context, - IN PIRP Irp); - -#if (NTDDI_VERSION >= NTDDI_VISTASP1) -#define OPLOCK_FLAG_COMPLETE_IF_OPLOCKED 0x00000001 -#endif - -#if (NTDDI_VERSION >= NTDDI_WIN7) -#define OPLOCK_FLAG_OPLOCK_KEY_CHECK_ONLY 0x00000002 -#define OPLOCK_FLAG_BACK_OUT_ATOMIC_OPLOCK 0x00000004 -#define OPLOCK_FLAG_IGNORE_OPLOCK_KEYS 0x00000008 -#define OPLOCK_FSCTRL_FLAG_ALL_KEYS_MATCH 0x00000001 -#endif - -#if (NTDDI_VERSION >= NTDDI_WIN7) - -typedef struct _OPLOCK_KEY_ECP_CONTEXT { - GUID OplockKey; - ULONG Reserved; -} OPLOCK_KEY_ECP_CONTEXT, *POPLOCK_KEY_ECP_CONTEXT; - -DEFINE_GUID( GUID_ECP_OPLOCK_KEY, 0x48850596, 0x3050, 0x4be7, 0x98, 0x63, 0xfe, 0xc3, 0x50, 0xce, 0x8d, 0x7f ); - -#endif - -typedef PVOID PNOTIFY_SYNC; - -typedef BOOLEAN -(NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( - IN PVOID NotifyContext, - IN PVOID TargetContext OPTIONAL, - IN PSECURITY_SUBJECT_CONTEXT SubjectContext); - -typedef BOOLEAN -(NTAPI *PFILTER_REPORT_CHANGE) ( - IN PVOID NotifyContext, - IN PVOID FilterContext); extern NTKERNELAPI PUSHORT NlsOemLeadByteInfo; #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo Modified: branches/header-work/include/psdk/in6addr.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/in6add… ============================================================================== --- branches/header-work/include/psdk/in6addr.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/in6addr.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -1,12 +1,10 @@ #ifndef s6_addr -typedef struct in6_addr -{ - union - { - UCHAR Byte[16]; - USHORT Word[8]; - } u; +typedef struct in6_addr { + union { + UCHAR Byte[16]; + USHORT Word[8]; + } u; } IN6_ADDR, *PIN6_ADDR, FAR *LPIN6_ADDR; #define in_addr6 in6_addr Modified: branches/header-work/include/psdk/winsock.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winsoc… ============================================================================== --- branches/header-work/include/psdk/winsock.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/winsock.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -652,7 +652,7 @@ IN int len, IN int flags, OUT struct sockaddr FAR *from OPTIONAL, - IN OUY int FAR * fromlen OPTIONAL); + IN OUT int FAR * fromlen OPTIONAL); int PASCAL FAR Modified: branches/header-work/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winsoc… ============================================================================== --- branches/header-work/include/psdk/winsock2.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/winsock2.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -1,6 +1,6 @@ #pragma once -#if !(defined _WINSOCK2API_ || defined _WINSOCK_H) +#if !(defined _WINSOCK2API_ || defined _WINSOCKAPI_) #define _WINSOCK2API_ #define _WINSOCKAPI_ /* to prevent later inclusion of winsock.h */ @@ -179,9 +179,6 @@ u_short l_linger; }; -#define _IO(x,y) (IOC_VOID|((x)<<8)|(y)) -#define _IOR(x,y,t) (IOC_OUT|(((LONG)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) -#define _IOW(x,y,t) (IOC_IN|(((LONG)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) #define FIONBIO _IOW('f', 126, u_long) struct netent { @@ -192,14 +189,15 @@ }; struct servent { - char *s_name; - char **s_aliases; + char FAR *s_name; + char FAR **s_aliases; #ifdef _WIN64 - char *s_proto; + char FAR *s_proto; short s_port; #else short s_port; - char *s_proto; + char FAR *s_proto; +#endif }; struct protoent { @@ -208,9 +206,8 @@ short p_proto; }; -#define SO_CONDITIONAL_ACCEPT 0x3002 - #define SOMAXCONN 0x7fffffff + #define MSG_OOB 1 #define MSG_PEEK 2 #define MSG_DONTROUTE 4 @@ -225,13 +222,7 @@ #define NO_DATA WSANO_DATA #define NO_ADDRESS WSANO_ADDRESS -#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ - -#define IOCPARM_MASK 0x7f -#define IOC_VOID 0x20000000 -#define IOC_OUT 0x40000000 -#define IOC_IN 0x80000000 -#define IOC_INOUT (IOC_IN|IOC_OUT) +#endif /* !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) */ #define FIONREAD _IOR('f', 127, u_long) #define FIOASYNC _IOW('f', 125, u_long) @@ -241,31 +232,6 @@ #define SIOCGLOWAT _IOR('s', 3, u_long) #define SIOCATMARK _IOR('s', 7, u_long) -#define IPPORT_ECHO 7 -#define IPPORT_DISCARD 9 -#define IPPORT_SYSTAT 11 -#define IPPORT_DAYTIME 13 -#define IPPORT_NETSTAT 15 -#define IPPORT_FTP 21 -#define IPPORT_TELNET 23 -#define IPPORT_SMTP 25 -#define IPPORT_TIMESERVER 37 -#define IPPORT_NAMESERVER 42 -#define IPPORT_WHOIS 43 -#define IPPORT_MTP 57 -#define IPPORT_TFTP 69 -#define IPPORT_RJE 77 -#define IPPORT_FINGER 79 -#define IPPORT_TTYLINK 87 -#define IPPORT_SUPDUP 95 -#define IPPORT_EXECSERVER 512 -#define IPPORT_LOGINSERVER 513 -#define IPPORT_CMDSERVER 514 -#define IPPORT_EFSSERVER 520 -#define IPPORT_BIFFUDP 512 -#define IPPORT_WHOSERVER 513 -#define IPPORT_ROUTESERVER 520 -#define IPPORT_RESERVED 1024 #define IMPLINK_IP 155 #define IMPLINK_LOWEXPER 156 #define IMPLINK_HIGHEXPER 158 @@ -281,36 +247,6 @@ #define FROM_PROTOCOL_INFO (-1) -#define SOCK_STREAM 1 -#define SOCK_DGRAM 2 -#define SOCK_RAW 3 -#define SOCK_RDM 4 -#define SOCK_SEQPACKET 5 - -#define SO_DEBUG 1 -#define SO_ACCEPTCONN 2 -#define SO_REUSEADDR 4 -#define SO_KEEPALIVE 8 -#define SO_DONTROUTE 16 -#define SO_BROADCAST 32 -#define SO_USELOOPBACK 64 -#define SO_LINGER 128 -#define SO_OOBINLINE 256 -#define SO_DONTLINGER (int)(~SO_LINGER) -#define SO_EXCLUSIVEADDRUSE ((int)(~SO_REUSEADDR)) - -#define SO_SNDBUF 0x1001 -#define SO_RCVBUF 0x1002 -#define SO_SNDLOWAT 0x1003 -#define SO_RCVLOWAT 0x1004 -#define SO_SNDTIMEO 0x1005 -#define SO_RCVTIMEO 0x1006 -#define SO_ERROR 0x1007 -#define SO_TYPE 0x1008 - -#define SO_GROUP_ID 0x2001 -#define SO_GROUP_PRIORITY 0x2002 -#define SO_MAX_MSG_SIZE 0x2003 #define SO_PROTOCOL_INFOA 0x2004 #define SO_PROTOCOL_INFOW 0x2005 #ifdef UNICODE @@ -349,8 +285,6 @@ #define PF_BTH AF_BTH #endif #define PF_MAX AF_MAX - -#define SOL_SOCKET 0xffff #define MSG_PARTIAL 0x8000 #define MSG_INTERRUPT 0x10 @@ -541,38 +475,6 @@ #define SERVICE_MULTIPLE 0x00000001 -#define NS_ALL 0 -#define NS_SAP 1 -#define NS_NDS 2 -#define NS_PEER_BROWSE 3 -#define NS_SLP 5 -#define NS_DHCP 6 -#define NS_TCPIP_LOCAL 10 -#define NS_TCPIP_HOSTS 11 -#define NS_DNS 12 -#define NS_NETBT 13 -#define NS_WINS 14 -#if(_WIN32_WINNT >= 0x0501) -#define NS_NLA 15 -#endif -#if(_WIN32_WINNT >= 0x0600) -#define NS_BTH 16 -#endif -#define NS_NBP 20 -#define NS_MS 30 -#define NS_STDA 31 -#define NS_NTDS 32 -#if(_WIN32_WINNT >= 0x0600) -#define NS_EMAIL 37 -#define NS_PNRPNAME 38 -#define NS_PNRPCLOUD 39 -#endif -#define NS_X500 40 -#define NS_NIS 41 -#define NS_NISPLUS 42 -#define NS_WRQ 50 -#define NS_NETDES 60 - #define RES_UNUSED_1 0x00000001 #define RES_FLUSH_CACHE 0x00000002 #ifndef RES_SERVICE @@ -635,11 +537,6 @@ #define RESULT_IS_DELETED 0x0040 #endif - - - - - #ifndef s_addr #define s_addr S_un.S_addr @@ -665,7 +562,7 @@ #ifdef _WIN64 unsigned short iMaxSockets; unsigned short iMaxUdpDg; - char *lpVendorInfo; + char FAR *lpVendorInfo; char szDescription[WSADESCRIPTION_LEN+1]; char szSystemStatus[WSASYS_STATUS_LEN+1]; #else @@ -673,7 +570,8 @@ char szSystemStatus[WSASYS_STATUS_LEN+1]; unsigned short iMaxSockets; unsigned short iMaxUdpDg; - char *lpVendorInfo; + char FAR *lpVendorInfo; +#endif } WSADATA, FAR *LPWSADATA; struct sockproto { @@ -1204,7 +1102,7 @@ IN int len, IN int flags, OUT struct sockaddr FAR *from OPTIONAL, - IN OUY int FAR * fromlen OPTIONAL); + IN OUT int FAR * fromlen OPTIONAL); typedef int (WSAAPI *LPFN_SELECT)( @@ -1820,7 +1718,6 @@ #if INCL_WINSOCK_API_PROTOTYPES - WINSOCK_API_LINKAGE SOCKET WSAAPI @@ -1946,7 +1843,7 @@ IN int len, IN int flags, OUT struct sockaddr FAR *from OPTIONAL, - IN OUY int FAR *fromlen OPTIONAL); + IN OUT int FAR *fromlen OPTIONAL); WINSOCK_API_LINKAGE int @@ -2828,3 +2725,5 @@ #include <wsipv6ok.h> #endif #endif */ + +#endif /* !(defined _WINSOCK2API_ || defined _WINSOCK_H) */ Modified: branches/header-work/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ws2tcp… ============================================================================== --- branches/header-work/include/psdk/ws2tcpip.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ws2tcpip.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -6,412 +6,846 @@ * */ -#ifndef _WS2TCPIP_H +#pragma once + #define _WS2TCPIP_H - -#if (defined _WINSOCK_H && !defined _WINSOCK2_H) -#error "ws2tcpip.h is not compatable with winsock.h. Include winsock2.h instead." -#endif #include <winsock2.h> #include <ws2ipdef.h> -#ifdef __cplusplus +#include <limits.h> + +#ifdef __cplusplus extern "C" { #endif -/* - * The IP_* macros are also defined in winsock.h, but some values are different there. - * The values defined in winsock.h for 1.1 and used in wsock32.dll are consistent - * with the original values Steve Deering defined in his document "IP Multicast Extensions - * for 4.3BSD UNIX related systems (MULTICAST 1.2 Release)." However, these conflicted with - * the definitions for some IPPROTO_IP level socket options already assigned by BSD, - * so Berkeley changed all the values by adding 7. WinSock2 (ws2_32.dll) uses - * the BSD 4.4 compatible values defined here. - * - * See also: msdn kb article Q257460 - * http://support.microsoft.com/support/kb/articles/Q257/4/60.asp - */ - -/* This is also defined in winsock.h; value hasn't changed */ -#define IP_OPTIONS 1 - -#define IP_HDRINCL 2 -/* - * These are also be defined in winsock.h, - * but values have changed for WinSock2 interface - */ -#define IP_TOS 3 /* old (winsock 1.1) value 8 */ -#define IP_TTL 4 /* old value 7 */ -#define IP_MULTICAST_IF 9 /* old value 2 */ -#define IP_MULTICAST_TTL 10 /* old value 3 */ -#define IP_MULTICAST_LOOP 11 /* old value 4 */ -#define IP_ADD_MEMBERSHIP 12 /* old value 5 */ -#define IP_DROP_MEMBERSHIP 13 /* old value 6 */ -#define IP_DONTFRAGMENT 14 /* old value 9 */ -#define IP_ADD_SOURCE_MEMBERSHIP 15 -#define IP_DROP_SOURCE_MEMBERSHIP 16 -#define IP_BLOCK_SOURCE 17 -#define IP_UNBLOCK_SOURCE 18 -#define IP_PKTINFO 19 - -/* - * As with BSD implementation, IPPROTO_IPV6 level socket options have - * same values as IPv4 counterparts. - */ -#define IPV6_UNICAST_HOPS 4 -#define IPV6_MULTICAST_IF 9 -#define IPV6_MULTICAST_HOPS 10 -#define IPV6_MULTICAST_LOOP 11 -#define IPV6_ADD_MEMBERSHIP 12 -#define IPV6_DROP_MEMBERSHIP 13 -#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP -#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP -#define IPV6_PKTINFO 19 - -#define IP_DEFAULT_MULTICAST_TTL 1 -#define IP_DEFAULT_MULTICAST_LOOP 1 -#define IP_MAX_MEMBERSHIPS 20 - -#define TCP_EXPEDITED_1122 2 - #define UDP_NOCHECKSUM 1 - -/* INTERFACE_INFO iiFlags */ -#define IFF_UP 1 -#define IFF_BROADCAST 2 -#define IFF_LOOPBACK 4 -#define IFF_POINTTOPOINT 8 -#define IFF_MULTICAST 16 - -#define SIO_GET_INTERFACE_LIST _IOR('t', 127, u_long) - -#define INET_ADDRSTRLEN 16 -#define INET6_ADDRSTRLEN 46 - -/* getnameinfo constants */ -#define NI_MAXHOST 1025 -#define NI_MAXSERV 32 - -#define NI_NOFQDN 0x01 -#define NI_NUMERICHOST 0x02 -#define NI_NAMEREQD 0x04 -#define NI_NUMERICSERV 0x08 -#define NI_DGRAM 0x10 - -/* getaddrinfo constants */ -#define AI_PASSIVE 1 -#define AI_CANONNAME 2 -#define AI_NUMERICHOST 4 +#define UDP_CHECKSUM_COVERAGE 20 + +#ifdef _MSC_VER +#define WS2TCPIP_INLINE __inline +#else +#define WS2TCPIP_INLINE extern inline +#endif /* getaddrinfo error codes */ -#define EAI_AGAIN WSATRY_AGAIN -#define EAI_BADFLAGS WSAEINVAL -#define EAI_FAIL WSANO_RECOVERY -#define EAI_FAMILY WSAEAFNOSUPPORT -#define EAI_MEMORY WSA_NOT_ENOUGH_MEMORY -#define EAI_NODATA WSANO_DATA -#define EAI_NONAME WSAHOST_NOT_FOUND -#define EAI_SERVICE WSATYPE_NOT_FOUND -#define EAI_SOCKTYPE WSAESOCKTNOSUPPORT - -/* - * ip_mreq also in winsock.h for WinSock1.1, - * but online msdn docs say it is defined here for WinSock2. - */ - -struct ip_mreq { - struct in_addr imr_multiaddr; - struct in_addr imr_interface; -}; - -struct ip_mreq_source { - struct in_addr imr_multiaddr; - struct in_addr imr_sourceaddr; - struct in_addr imr_interface; -}; - -struct ip_msfilter { - struct in_addr imsf_multiaddr; - struct in_addr imsf_interface; - u_long imsf_fmode; - u_long imsf_numsrc; - struct in_addr imsf_slist[1]; -}; - -#define IP_MSFILTER_SIZE(numsrc) \ - (sizeof(struct ip_msfilter) - sizeof(struct in_addr) \ - + (numsrc) * sizeof(struct in_addr)) - - -/* ipv6 */ -/* These require XP or .NET Server or use of add-on IPv6 stacks on NT 4 - or higher */ - -/* This is based on the example given in RFC 2553 with stdint types - changed to BSD types. For now, use these field names until there - is some consistency in MS docs. In this file, we only use the - in6_addr structure start address, with casts to get the right offsets - when testing addresses */ - -struct in6_addr { - union { - u_char Byte[16]; - u_short Word[8]; - u_long _S6_u32[4]; - } u; -}; - -/* s6_addr is the standard name */ -#define s6_addr u.Byte - -/* These are GLIBC names */ -#define s6_addr16 u.Word -#define s6_addr32 u.Word - -/* These are used in some MS code */ -#define in_addr6 in6_addr -#define _s6_bytes u.Byte -#define _s6_words u.Word - -typedef struct in6_addr IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR; - -struct sockaddr_in6 { - short sin6_family; /* AF_INET6 */ - u_short sin6_port; /* transport layer port # */ - u_long sin6_flowinfo; /* IPv6 traffic class & flow info */ - struct in6_addr sin6_addr; /* IPv6 address */ - u_long sin6_scope_id; /* set of interfaces for a scope */ -}; -typedef struct sockaddr_in6 SOCKADDR_IN6, *PSOCKADDR_IN6, *LPSOCKADDR_IN6; - -extern const struct in6_addr in6addr_any; -extern const struct in6_addr in6addr_loopback; -/* the above can get initialised using: */ -#define IN6ADDR_ANY_INIT { 0 } -#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } - -/* Described in RFC 2292, but not in 2553 */ -/* int IN6_ARE_ADDR_EQUAL(const struct in6_addr * a, const struct in6_addr * b) */ -#define IN6_ARE_ADDR_EQUAL(a, b) \ - (memcmp ((void*)(a), (void*)(b), sizeof (struct in6_addr)) == 0) - - -/* Address Testing Macros - - These macro functions all take const struct in6_addr* as arg. - Static inlines would allow type checking, but RFC 2553 says they - macros. - NB: These are written specifically for little endian host */ - -#define IN6_IS_ADDR_UNSPECIFIED(_addr) \ - ( (((const u_long *)(_addr))[0] == 0) \ - && (((const u_long *)(_addr))[1] == 0) \ - && (((const u_long *)(_addr))[2] == 0) \ - && (((const u_long *)(_addr))[3] == 0)) - -#define IN6_IS_ADDR_LOOPBACK(_addr) \ - ( (((const u_long *)(_addr))[0] == 0) \ - && (((const u_long *)(_addr))[1] == 0) \ - && (((const u_long *)(_addr))[2] == 0) \ - && (((const u_long *)(_addr))[3] == 0x01000000)) /* Note byte order reversed */ -/* (((const u_long *)(_addr))[3] == ntohl(1)) */ - -#define IN6_IS_ADDR_MULTICAST(_addr) (((const u_char *) (_addr))[0] == 0xff) - -#define IN6_IS_ADDR_LINKLOCAL(_addr) \ - ( (((const u_char *)(_addr))[0] == 0xfe) \ - && ((((const u_char *)(_addr))[1] & 0xc0) == 0x80)) - -#define IN6_IS_ADDR_SITELOCAL(_addr) \ - ( (((const u_char *)(_addr))[0] == 0xfe) \ - && ((((const u_char *)(_addr))[1] & 0xc0) == 0xc0)) - -#define IN6_IS_ADDR_V4MAPPED(_addr) \ - ( (((const u_long *)(_addr))[0] == 0) \ - && (((const u_long *)(_addr))[1] == 0) \ - && (((const u_long *)(_addr))[2] == 0xffff0000)) /* Note byte order reversed */ -/* (((const u_long *)(_addr))[2] == ntohl(0x0000ffff))) */ - -#define IN6_IS_ADDR_V4COMPAT(_addr) \ - ( (((const u_long *)(_addr))[0] == 0) \ - && (((const u_long *)(_addr))[1] == 0) \ - && (((const u_long *)(_addr))[2] == 0) \ - && (((const u_long *)(_addr))[3] != 0) \ - && (((const u_long *)(_addr))[3] != 0x01000000)) /* Note byte order reversed */ -/* (ntohl (((const u_long *)(_addr))[3]) > 1 ) */ - - -#define IN6_IS_ADDR_MC_NODELOCAL(_addr) \ - ( IN6_IS_ADDR_MULTICAST(_addr) \ - && ((((const u_char *)(_addr))[1] & 0xf) == 0x1)) - -#define IN6_IS_ADDR_MC_LINKLOCAL(_addr) \ - ( IN6_IS_ADDR_MULTICAST (_addr) \ - && ((((const u_char *)(_addr))[1] & 0xf) == 0x2)) - -#define IN6_IS_ADDR_MC_SITELOCAL(_addr) \ - ( IN6_IS_ADDR_MULTICAST(_addr) \ - && ((((const u_char *)(_addr))[1] & 0xf) == 0x5)) - -#define IN6_IS_ADDR_MC_ORGLOCAL(_addr) \ - ( IN6_IS_ADDR_MULTICAST(_addr) \ - && ((((const u_char *)(_addr))[1] & 0xf) == 0x8)) - -#define IN6_IS_ADDR_MC_GLOBAL(_addr) \ - ( IN6_IS_ADDR_MULTICAST(_addr) \ - && ((((const u_char *)(_addr))[1] & 0xf) == 0xe)) - +#define EAI_AGAIN WSATRY_AGAIN +#define EAI_BADFLAGS WSAEINVAL +#define EAI_FAIL WSANO_RECOVERY +#define EAI_FAMILY WSAEAFNOSUPPORT +#define EAI_MEMORY WSA_NOT_ENOUGH_MEMORY +#define EAI_NODATA EAI_NONAME +#define EAI_NOSECURENAME WSA_SECURE_HOST_NOT_FOUND +#define EAI_NONAME WSAHOST_NOT_FOUND +#define EAI_SERVICE WSATYPE_NOT_FOUND +#define EAI_SOCKTYPE WSAESOCKTNOSUPPORT +#define EAI_IPSECPOLICY WSA_IPSEC_NAME_POLICY_ERROR + +#ifdef UNICODE +typedef ADDRINFOW ADDRINFOT,*PADDRINFOT; +#else +typedef ADDRINFOA ADDRINFOT,*PADDRINFOT; +#endif + +typedef ADDRINFOA ADDRINFO, FAR *LPADDRINFO; + +#if (_WIN32_WINNT >= 0x0600) + +#ifdef UNICODE +typedef ADDRINFOEXW ADDRINFOEX, *PADDRINFOEX; +#else +typedef ADDRINFOEXA ADDRINFOEX, *PADDRINFOEX; +#endif + +#endif /* (_WIN32_WINNT >= 0x0600) */ + +WINSOCK_API_LINKAGE +INT +WSAAPI +getaddrinfo( + IN PCSTR pNodeName OPTIONAL, + IN PCSTR pServiceName OPTIONAL, + IN const ADDRINFOA *pHints OPTIONAL, + OUT PADDRINFOA *ppResult); + +#if (NTDDI_VERSION >= NTDDI_WINXPSP2) || (_WIN32_WINNT >= 0x0502) + +WINSOCK_API_LINKAGE +INT +WSAAPI +GetAddrInfoW( + IN PCWSTR pNodeName OPTIONAL, + IN PCWSTR pServiceName OPTIONAL, + IN const ADDRINFOW *pHints OPTIONAL, + OUT PADDRINFOW *ppResult); + +#define GetAddrInfoA getaddrinfo + +#ifdef UNICODE +#define GetAddrInfo GetAddrInfoW +#else +#define GetAddrInfo GetAddrInfoA +#endif + +#endif /* (NTDDI_VERSION >= NTDDI_WINXPSP2) || (_WIN32_WINNT >= 0x0502) */ + +#if INCL_WINSOCK_API_TYPEDEFS + +typedef INT +(WSAAPI *LPFN_GETADDRINFO)( + IN PCSTR pNodeName OPTIONAL, + IN PCSTR pServiceName OPTIONAL, + IN const ADDRINFOA *pHints OPTIONAL, + OUT PADDRINFOA *ppResult); + +typedef INT +(WSAAPI *LPFN_GETADDRINFOW)( + IN PCWSTR pNodeName OPTIONAL, + IN PCWSTR pServiceName OPTIONAL, + IN const ADDRINFOW *pHints OPTIONAL, + OUT PADDRINFOW *ppResult); + +#define LPFN_GETADDRINFOA LPFN_GETADDRINFO + +#ifdef UNICODE +#define LPFN_GETADDRINFOT LPFN_GETADDRINFOW +#else +#define LPFN_GETADDRINFOT LPFN_GETADDRINFOA +#endif + +#endif /* INCL_WINSOCK_API_TYPEDEFS */ + +#if (_WIN32_WINNT >= 0x0600) + +typedef void +(CALLBACK *LPLOOKUPSERVICE_COMPLETION_ROUTINE)( + IN DWORD dwError, + IN DWORD dwBytes, + IN LPWSAOVERLAPPED lpOverlapped); + +WINSOCK_API_LINKAGE +INT +WSAAPI +GetAddrInfoExA( + IN PCSTR pName OPTIONAL, + IN PCSTR pServiceName OPTIONAL, + IN DWORD dwNameSpace, + IN LPGUID lpNspId OPTIONAL, + IN const ADDRINFOEXA *hints, + OUT PADDRINFOEXA *ppResult, + IN struct timeval *timeout OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + OUT LPHANDLE lpNameHandle OPTIONAL); + +WINSOCK_API_LINKAGE +INT +WSAAPI +GetAddrInfoExW( + IN PCWSTR pName OPTIONAL, + IN PCWSTR pServiceName OPTIONAL, + IN DWORD dwNameSpace, + IN LPGUID lpNspId OPTIONAL, + IN const ADDRINFOEXW *hints OPTIONAL, + OUT PADDRINFOEXW *ppResult, + IN struct timeval *timeout OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + OUT LPHANDLE lpHandle OPTIONAL); + +#ifdef UNICODE +#define GetAddrInfoEx GetAddrInfoExW +#else +#define GetAddrInfoEx GetAddrInfoExA +#endif + +#if INCL_WINSOCK_API_TYPEDEFS + +typedef INT +(WSAAPI *LPFN_GETADDRINFOEXA)( + IN PCSTR pName, + IN PCSTR pServiceName OPTIONAL, + IN DWORD dwNameSpace, + IN LPGUID lpNspId OPTIONAL, + IN const ADDRINFOEXA *hints OPTIONAL, + OUT PADDRINFOEXA *ppResult, + IN struct timeval *timeout OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + OUT LPHANDLE lpNameHandle OPTIONAL); + +typedef INT +(WSAAPI *LPFN_GETADDRINFOEXW)( + IN PCWSTR pName, + IN PCWSTR pServiceName OPTIONAL, + IN DWORD dwNameSpace, + IN LPGUID lpNspId OPTIONAL, + IN const ADDRINFOEXW *hints OPTIONAL, + OUT PADDRINFOEXW *ppResult, + IN struct timeval *timeout OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + OUT LPHANDLE lpHandle OPTIONAL); + +#ifdef UNICODE +#define LPFN_GETADDRINFOEX LPFN_GETADDRINFOEXW +#else +#define LPFN_GETADDRINFOEX LPFN_GETADDRINFOEXA +#endif +#endif + +#endif + +#if (_WIN32_WINNT >= 0x0600) + +WINSOCK_API_LINKAGE +INT +WSAAPI +SetAddrInfoExA( + IN PCSTR pName, + IN PCSTR pServiceName OPTIONAL, + IN SOCKET_ADDRESS *pAddresses OPTIONAL, + IN DWORD dwAddressCount, + IN LPBLOB lpBlob OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwNameSpace, + IN LPGUID lpNspId OPTIONAL, + IN struct timeval *timeout OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + OUT LPHANDLE lpNameHandle OPTIONAL); + +WINSOCK_API_LINKAGE +INT +WSAAPI +SetAddrInfoExW( + IN PCWSTR pName, + IN PCWSTR pServiceName OPTIONAL, + IN SOCKET_ADDRESS *pAddresses OPTIONAL, + IN DWORD dwAddressCount, + IN LPBLOB lpBlob OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwNameSpace, + IN LPGUID lpNspId OPTIONAL, + IN struct timeval *timeout OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + OUT LPHANDLE lpNameHandle OPTIONAL); + +#ifdef UNICODE +#define SetAddrInfoEx SetAddrInfoExW +#else +#define SetAddrInfoEx SetAddrInfoExA +#endif + +#if INCL_WINSOCK_API_TYPEDEFS + +typedef INT +(WSAAPI *LPFN_SETADDRINFOEXA)( + IN PCSTR pName, + IN PCSTR pServiceName OPTIONAL, + IN SOCKET_ADDRESS *pAddresses OPTIONAL, + IN DWORD dwAddressCount, + IN LPBLOB lpBlob OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwNameSpace, + IN LPGUID lpNspId OPTIONAL, + IN struct timeval *timeout OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + OUT LPHANDLE lpNameHandle OPTIONAL); + +typedef INT +(WSAAPI *LPFN_SETADDRINFOEXW)( + IN PCWSTR pName, + IN PCWSTR pServiceName OPTIONAL, + IN SOCKET_ADDRESS *pAddresses OPTIONAL, + IN DWORD dwAddressCount, + IN LPBLOB lpBlob OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwNameSpace, + IN LPGUID lpNspId OPTIONAL, + IN struct timeval *timeout OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL, + IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, + OUT LPHANDLE lpNameHandle OPTIONAL); + +#ifdef UNICODE +#define LPFN_SETADDRINFOEX LPFN_SETADDRINFOEXW +#else +#define LPFN_SETADDRINFOEX LPFN_SETADDRINFOEXA +#endif +#endif + +#endif + +WINSOCK_API_LINKAGE +VOID +WSAAPI +freeaddrinfo( + IN PADDRINFOA pAddrInfo OPTIONAL); + +#if (NTDDI_VERSION >= NTDDI_WINXPSP2) || (_WIN32_WINNT >= 0x0502) + +WINSOCK_API_LINKAGE +VOID +WSAAPI +FreeAddrInfoW( + IN PADDRINFOW pAddrInfo OPTIONAL); + +#define FreeAddrInfoA freeaddrinfo + +#ifdef UNICODE +#define FreeAddrInfo FreeAddrInfoW +#else +#define FreeAddrInfo FreeAddrInfoA +#endif +#endif + +#if INCL_WINSOCK_API_TYPEDEFS + +typedef VOID +(WSAAPI *LPFN_FREEADDRINFO)( + IN PADDRINFOA pAddrInfo OPTIONAL); + +typedef VOID +(WSAAPI *LPFN_FREEADDRINFOW)( + IN PADDRINFOW pAddrInfo OPTIONAL); + +#define LPFN_FREEADDRINFOA LPFN_FREEADDRINFO + +#ifdef UNICODE +#define LPFN_FREEADDRINFOT LPFN_FREEADDRINFOW +#else +#define LPFN_FREEADDRINFOT LPFN_FREEADDRINFOA +#endif + +#endif + +#if (_WIN32_WINNT >= 0x0600) + +WINSOCK_API_LINKAGE +void +WSAAPI +FreeAddrInfoEx( + IN PADDRINFOEXA pAddrInfoEx OPTIONAL); + +WINSOCK_API_LINKAGE +void +WSAAPI +FreeAddrInfoExW( + IN PADDRINFOEXW pAddrInfoEx OPTIONAL); + +#define FreeAddrInfoExA FreeAddrInfoEx + +#ifdef UNICODE +#define FreeAddrInfoEx FreeAddrInfoExW +#endif + +#ifdef INCL_WINSOCK_API_TYPEDEFS + +typedef void +(WSAAPI *LPFN_FREEADDRINFOEXA)( + IN PADDRINFOEXA pAddrInfoEx); + +typedef void +(WSAAPI *LPFN_FREEADDRINFOEXW)( + IN PADDRINFOEXW pAddrInfoEx); + + +#ifdef UNICODE +#define LPFN_FREEADDRINFOEX LPFN_FREEADDRINFOEXW +#else +#define LPFN_FREEADDRINFOEX LPFN_FREEADDRINFOEXA +#endif + +#endif +#endif typedef int socklen_t; -struct ipv6_mreq { - struct in6_addr ipv6mr_multiaddr; - unsigned int ipv6mr_interface; -}; -typedef struct ipv6_mreq IPV6_MREG; - -struct in6_pktinfo { - IN6_ADDR ipi6_addr; - UINT ipi6_ifindex; -}; -typedef struct in6_pktinfo IN6_PKTINFO; - -typedef struct addrinfo +WINSOCK_API_LINKAGE +INT +WSAAPI +getnameinfo( + IN const SOCKADDR *pSockaddr, + IN socklen_t SockaddrLength, + OUT PCHAR pNodeBuffer OPTIONAL, + IN DWORD NodeBufferSize, + OUT PCHAR pServiceBuffer, + IN DWORD ServiceBufferSize, + IN INT Flags); + +#if (NTDDI_VERSION >= NTDDI_WINXPSP2) || (_WIN32_WINNT >= 0x0502) + +WINSOCK_API_LINKAGE +INT +WSAAPI +GetNameInfoW( + IN const SOCKADDR *pSockaddr, + IN socklen_t SockaddrLength, + OUT PWCHAR pNodeBuffer, + IN DWORD NodeBufferSize, + OUT PWCHAR pServiceBuffer OPTIONAL, + IN DWORD ServiceBufferSize, + IN INT Flags); + +#define GetNameInfoA getnameinfo + +#ifdef UNICODE +#define GetNameInfo GetNameInfoW +#else +#define GetNameInfo GetNameInfoA +#endif + +#endif + +#if INCL_WINSOCK_API_TYPEDEFS + +typedef int +(WSAAPI *LPFN_GETNAMEINFO)( + IN const SOCKADDR *pSockaddr, + IN socklen_t SockaddrLength, + OUT PCHAR pNodeBuffer, + IN DWORD NodeBufferSize, + OUT PCHAR pServiceBuffer OPTIONAL, + IN DWORD ServiceBufferSize, + IN INT Flags); + +typedef INT +(WSAAPI *LPFN_GETNAMEINFOW)( + IN const SOCKADDR *pSockaddr, + IN socklen_t SockaddrLength, + OUT PWCHAR pNodeBuffer, + IN DWORD NodeBufferSize, + OUT PWCHAR pServiceBuffer OPTIONAL, + IN DWORD ServiceBufferSize, + IN INT Flags); + +#define LPFN_GETNAMEINFOA LPFN_GETNAMEINFO + +#ifdef UNICODE +#define LPFN_GETNAMEINFOT LPFN_GETNAMEINFOW +#else +#define LPFN_GETNAMEINFOT LPFN_GETNAMEINFOA +#endif +#endif + +#if (NTDDI_VERSION >= NTDDI_VISTA) + +WINSOCK_API_LINKAGE +INT +WSAAPI +inet_pton( + IN INT Family, + IN PCSTR pszAddrString, + OUT PVOID pAddrBuf); + +INT +WSAAPI +InetPtonW( + IN INT Family, + IN PCWSTR pszAddrString, + OUT PVOID pAddrBuf); + +PCSTR +WSAAPI +inet_ntop( + IN INT Family, + IN PVOID pAddr, + OUT PSTR pStringBuf, + IN size_t StringBufSize); + +PCWSTR +WSAAPI +InetNtopW( + IN INT Family, + IN PVOID pAddr, + OUT PWSTR pStringBuf, + IN size_t StringBufSize); + +#define InetPtonA inet_pton +#define InetNtopA inet_ntop + +#ifdef UNICODE +#define InetPton InetPtonW +#define InetNtop InetNtopW +#else +#define InetPton InetPtonA +#define InetNtop InetNtopA +#endif + +#if INCL_WINSOCK_API_TYPEDEFS + +typedef INT +(WSAAPI *LPFN_INET_PTONA)( + IN INT Family, + IN PCSTR pszAddrString, + OUT PVOID pAddrBuf); + +typedef INT +(WSAAPI *LPFN_INET_PTONW)( + IN INT Family, + IN PCWSTR pszAddrString, + OUT PVOID pAddrBuf); + +typedef PCSTR +(WSAAPI *LPFN_INET_NTOPA)( + IN INT Family, + IN PVOID pAddr, + OUT PSTR pStringBuf, + IN size_t StringBufSize); + +typedef PCWSTR +(WSAAPI *LPFN_INET_NTOPW)( + IN INT Family, + IN PVOID pAddr, + OUT PWSTR pStringBuf, + IN size_t StringBufSize); + +#ifdef UNICODE +#define LPFN_INET_PTON LPFN_INET_PTONW +#define LPFN_INET_NTOP LPFN_INET_NTOPW +#else +#define LPFN_INET_PTON LPFN_INET_PTONA +#define LPFN_INET_NTOP LPFN_INET_NTOPA +#endif + +#endif /* TYPEDEFS */ +#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ + +#if INCL_WINSOCK_API_PROTOTYPES + +#ifdef UNICODE +#define gai_strerror gai_strerrorW +#else +#define gai_strerror gai_strerrorA +#endif + +#define GAI_STRERROR_BUFFER_SIZE 1024 + +static __inline +char * +gai_strerrorA( + IN int ecode) { - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; - char *ai_canonname; - struct sockaddr *ai_addr; - struct addrinfo *ai_next; -} ADDRINFOA, *PADDRINFOA; - -typedef struct addrinfoW + DWORD dwMsgLen; + static char buff[GAI_STRERROR_BUFFER_SIZE + 1]; + + dwMsgLen = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM + |FORMAT_MESSAGE_IGNORE_INSERTS + |FORMAT_MESSAGE_MAX_WIDTH_MASK, + NULL, + ecode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPSTR)buff, + GAI_STRERROR_BUFFER_SIZE, + NULL); + + return buff; +} + +static __inline +WCHAR * +gai_strerrorW( + IN int ecode) { - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; - PWSTR ai_canonname; - struct sockaddr *ai_addr; - struct addrinfoW *ai_next; -} ADDRINFOW, *PADDRINFOW; - -#ifdef UNICODE -typedef ADDRINFOW ADDRINFOT,*PADDRINFOT; -#else -typedef ADDRINFOA ADDRINFOT,*PADDRINFOT; -#endif - -typedef ADDRINFOA ADDRINFO, FAR *LPADDRINFO; - -void WSAAPI freeaddrinfo (struct addrinfo*); -int WSAAPI getaddrinfo (const char*,const char*,const struct addrinfo*, - struct addrinfo**); - -#define GAI_STRERROR_BUFFER_SIZE 1024 - -static __inline char* -gai_strerrorA(int ecode) + DWORD dwMsgLen; + static WCHAR buff[GAI_STRERROR_BUFFER_SIZE + 1]; + + dwMsgLen = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM + |FORMAT_MESSAGE_IGNORE_INSERTS + |FORMAT_MESSAGE_MAX_WIDTH_MASK, + NULL, + ecode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)buff, + GAI_STRERROR_BUFFER_SIZE, + NULL); + + return buff; +} + +#endif /* INCL_WINSOCK_API_PROTOTYPES */ + +WS2TCPIP_INLINE +int +setipv4sourcefilter( + IN SOCKET Socket, + IN IN_ADDR Interface, + IN IN_ADDR Group, + IN MULTICAST_MODE_TYPE FilterMode, + IN ULONG SourceCount, + IN CONST IN_ADDR *SourceList) { - static char buff[GAI_STRERROR_BUFFER_SIZE + 1]; - - FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, - NULL, - ecode, - MAKELANGID(LANG_NEUTRAL, - SUBLANG_DEFAULT), - (LPSTR)buff, - GAI_STRERROR_BUFFER_SIZE, - NULL); - - return buff; + int Error; + DWORD Size, Returned; + PIP_MSFILTER Filter; + + if (SourceCount > + (((ULONG) (ULONG_MAX - sizeof(*Filter))) / sizeof(*SourceList))) { + WSASetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + Size = IP_MSFILTER_SIZE(SourceCount); + Filter = (PIP_MSFILTER) HeapAlloc(GetProcessHeap(), 0, Size); + if (Filter == NULL) { + WSASetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + Filter->imsf_multiaddr = Group; + Filter->imsf_interface = Interface; + Filter->imsf_fmode = FilterMode; + Filter->imsf_numsrc = SourceCount; + if (SourceCount > 0) { + CopyMemory(Filter->imsf_slist, SourceList, + SourceCount * sizeof(*SourceList)); + } + + Error = WSAIoctl(Socket, SIOCSIPMSFILTER, Filter, Size, NULL, 0, + &Returned, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, Filter); + + return Error; } -static __inline WCHAR* -gai_strerrorW(int ecode) +WS2TCPIP_INLINE +int +getipv4sourcefilter( + IN SOCKET Socket, + IN IN_ADDR Interface, + IN IN_ADDR Group, + OUT MULTICAST_MODE_TYPE *FilterMode, + IN OUT ULONG *SourceCount, + OUT IN_ADDR *SourceList) { - static WCHAR buff[GAI_STRERROR_BUFFER_SIZE + 1]; - - FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, - NULL, - ecode, - MAKELANGID(LANG_NEUTRAL, - SUBLANG_DEFAULT), - (LPWSTR)buff, - GAI_STRERROR_BUFFER_SIZE, - NULL); - - return buff; + int Error; + DWORD Size, Returned; + PIP_MSFILTER Filter; + + if (*SourceCount > + (((ULONG) (ULONG_MAX - sizeof(*Filter))) / sizeof(*SourceList))) { + WSASetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + Size = IP_MSFILTER_SIZE(*SourceCount); + Filter = (PIP_MSFILTER) HeapAlloc(GetProcessHeap(), 0, Size); + if (Filter == NULL) { + WSASetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + Filter->imsf_multiaddr = Group; + Filter->imsf_interface = Interface; + Filter->imsf_numsrc = *SourceCount; + + Error = WSAIoctl(Socket, SIOCGIPMSFILTER, Filter, Size, Filter, Size, + &Returned, NULL, NULL); + + if (Error == 0) { + if (*SourceCount > 0) { + CopyMemory(SourceList, Filter->imsf_slist, + *SourceCount * sizeof(*SourceList)); + *SourceCount = Filter->imsf_numsrc; + } + *FilterMode = Filter->imsf_fmode; + } + + HeapFree(GetProcessHeap(), 0, Filter); + + return Error; } -#ifdef UNICODE -#define gai_strerror gai_strerrorW -#else -#define gai_strerror gai_strerrorA -#endif /* UNICODE */ - -int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD, - char*,DWORD,int); - -#if (_WIN32_WINNT >= 0x0502) -INT WSAAPI GetNameInfoW(const SOCKADDR*,socklen_t,PWCHAR,DWORD,PWCHAR,DWORD,INT); -#define GetNameInfoA getnameinfo - -#ifdef UNICODE -#define GetNameInfo GetNameInfoW -#else -#define GetNameInfo GetNameInfoA -#endif /* UNICODE */ - -#endif /* (_WIN32_WINNT >= 0x0502) */ - -/* Some older IPv4/IPv6 compatability stuff */ - -/* This struct lacks sin6_scope_id; retained for use in sockaddr_gen */ -struct sockaddr_in6_old { - short sin6_family; - u_short sin6_port; - u_long sin6_flowinfo; - struct in6_addr sin6_addr; -}; - -typedef union sockaddr_gen{ - struct sockaddr Address; - struct sockaddr_in AddressIn; - struct sockaddr_in6_old AddressIn6; -} sockaddr_gen; - - -typedef struct _INTERFACE_INFO { - u_long iiFlags; - sockaddr_gen iiAddress; - sockaddr_gen iiBroadcastAddress; - sockaddr_gen iiNetmask; -} INTERFACE_INFO, *LPINTERFACE_INFO; - -/* - The definition above can cause problems on NT4,prior to sp4. - To workaround, include the following struct and typedef and - #define INTERFACE_INFO OLD_INTERFACE_INFO - See: FIX: WSAIoctl SIO_GET_INTERFACE_LIST Option Problem - (Q181520) in MSDN KB. - - The old definition causes problems on newer NT and on XP. - -typedef struct _OLD_INTERFACE_INFO { - u_long iiFlags; - struct sockaddr iiAddress; - struct sockaddr iiBroadcastAddress; - struct sockaddr iiNetmask; -} OLD_INTERFACE_INFO; -*/ - -#ifdef __cplusplus +#if (NTDDI_VERSION >= NTDDI_WINXP) + +WS2TCPIP_INLINE +int +setsourcefilter( + IN SOCKET Socket, + IN ULONG Interface, + IN CONST SOCKADDR *Group, + IN int GroupLength, + IN MULTICAST_MODE_TYPE FilterMode, + IN ULONG SourceCount, + IN CONST SOCKADDR_STORAGE *SourceList) +{ + int Error; + DWORD Size, Returned; + PGROUP_FILTER Filter; + + if (SourceCount >= (((ULONG) (ULONG_MAX - sizeof(*Filter))) / sizeof(*SourceList))) { + WSASetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + Size = GROUP_FILTER_SIZE(SourceCount); + Filter = (PGROUP_FILTER) HeapAlloc(GetProcessHeap(), 0, Size); + if (Filter == NULL) { + WSASetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + Filter->gf_interface = Interface; + ZeroMemory(&Filter->gf_group, sizeof(Filter->gf_group)); + CopyMemory(&Filter->gf_group, Group, GroupLength); + Filter->gf_fmode = FilterMode; + Filter->gf_numsrc = SourceCount; + if (SourceCount > 0) { + CopyMemory(Filter->gf_slist, SourceList, SourceCount * sizeof(*SourceList)); + } + + Error = WSAIoctl(Socket, SIOCSMSFILTER, Filter, Size, NULL, 0, &Returned, NULL, NULL); + HeapFree(GetProcessHeap(), 0, Filter); + + return Error; } -#endif - -#endif /* _WS2TCPIP_H */ + +WS2TCPIP_INLINE +int +getsourcefilter( + IN SOCKET Socket, + IN ULONG Interface, + IN CONST SOCKADDR *Group, + IN int GroupLength, + OUT MULTICAST_MODE_TYPE *FilterMode, + IN OUT ULONG *SourceCount, + OUT SOCKADDR_STORAGE *SourceList) +{ + int Error; + DWORD Size, Returned; + PGROUP_FILTER Filter; + + if (*SourceCount > (((ULONG) (ULONG_MAX - sizeof(*Filter))) / sizeof(*SourceList))) { + WSASetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + Size = GROUP_FILTER_SIZE(*SourceCount); + Filter = (PGROUP_FILTER) HeapAlloc(GetProcessHeap(), 0, Size); + if (Filter == NULL) { + WSASetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + Filter->gf_interface = Interface; + ZeroMemory(&Filter->gf_group, sizeof(Filter->gf_group)); + CopyMemory(&Filter->gf_group, Group, GroupLength); + Filter->gf_numsrc = *SourceCount; + + Error = WSAIoctl(Socket, SIOCGMSFILTER, Filter, Size, Filter, Size, &Returned, NULL, NULL); + if (Error == 0) { + if (*SourceCount > 0) { + CopyMemory(SourceList, Filter->gf_slist, *SourceCount * sizeof(*SourceList)); + *SourceCount = Filter->gf_numsrc; + } + *FilterMode = Filter->gf_fmode; + } + + HeapFree(GetProcessHeap(), 0, Filter); + + return Error; +} +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + +#ifdef IDEAL_SEND_BACKLOG_IOCTLS + +WS2TCPIP_INLINE +int +idealsendbacklogquery( + IN SOCKET s, + OUT ULONG *pISB) +{ + DWORD bytes; + + return WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, + NULL, 0, pISB, sizeof(*pISB), &bytes, NULL, NULL); +} + +WS2TCPIP_INLINE +int +idealsendbacklognotify( + IN SOCKET s, + IN LPWSAOVERLAPPED lpOverlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL) +{ + DWORD bytes; + + return WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_CHANGE, + NULL, 0, NULL, 0, &bytes, + lpOverlapped, lpCompletionRoutine); +} + +#endif /* IDEAL_SEND_BACKLOG_IOCTLS */ + +#if (_WIN32_WINNT >= 0x0600) + +#ifdef _SECURE_SOCKET_TYPES_DEFINED_ + +WINSOCK_API_LINKAGE +INT +WSAAPI +WSASetSocketSecurity( + IN SOCKET Socket, + IN const SOCKET_SECURITY_SETTINGS *SecuritySettings OPTIONAL, + IN ULONG SecuritySettingsLen, + IN LPWSAOVERLAPPED Overlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL); + +WINSOCK_API_LINKAGE +INT +WSAAPI +WSAQuerySocketSecurity( + IN SOCKET Socket, + IN const SOCKET_SECURITY_QUERY_TEMPLATE *SecurityQueryTemplate OPTIONAL, + IN ULONG SecurityQueryTemplateLen, + OUT SOCKET_SECURITY_QUERY_INFO* SecurityQueryInfo OPTIONAL, + IN OUT ULONG *SecurityQueryInfoLen, + IN LPWSAOVERLAPPED Overlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL); + +WINSOCK_API_LINKAGE +INT +WSAAPI +WSASetSocketPeerTargetName( + IN SOCKET Socket, + IN const SOCKET_PEER_TARGET_NAME *PeerTargetName, + IN ULONG PeerTargetNameLen, + IN LPWSAOVERLAPPED Overlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL); + +WINSOCK_API_LINKAGE +INT +WSAAPI +WSADeleteSocketPeerTargetName( + IN SOCKET Socket, + IN const struct sockaddr *PeerAddr, + IN ULONG PeerAddrLen, + IN LPWSAOVERLAPPED Overlapped OPTIONAL, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL); + +WINSOCK_API_LINKAGE +INT +WSAAPI +WSAImpersonateSocketPeer( + IN SOCKET Socket, + IN const struct sockaddr *PeerAddr OPTIONAL, + IN ULONG PeerAddrLen); + +WINSOCK_API_LINKAGE +INT +WSAAPI +WSARevertImpersonation(); + +#endif /* _SECURE_SOCKET_TYPES_DEFINED_ */ +#endif /* (_WIN32_WINNT >= 0x0600) */ + +#if !defined(_WIN32_WINNT) || (_WIN32_WINNT <= 0x0500) +#include <wspiapi.h> +#endif + +#ifdef __cplusplus +} +#endif Modified: branches/header-work/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/extypes… ============================================================================== --- branches/header-work/include/xdk/extypes.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/extypes.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -1,7 +1,8 @@ +$if (_WDMDDK_ || _NTDDK_) /****************************************************************************** * Executive Types * ******************************************************************************/ - +$endif $if (_WDMDDK_) #define EX_RUNDOWN_ACTIVE 0x1 #define EX_RUNDOWN_COUNT_SHIFT 0x1 @@ -285,3 +286,9 @@ #define PROTECTED_POOL 0x80000000 $endif (_NTDDK_) +$if (_NTIFS_) +#define INVALID_PROCESSOR_INDEX 0xffffffff + +#define EX_PUSH_LOCK ULONG_PTR +#define PEX_PUSH_LOCK PULONG_PTR +$endif (_NTIFS_) Modified: branches/header-work/include/xdk/fsrtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/fsrtlty… ============================================================================== --- branches/header-work/include/xdk/fsrtltypes.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/fsrtltypes.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -1,5 +1,11 @@ $if (_NTIFS_) /* FSRTL Types */ + +typedef ULONG LBN; +typedef LBN *PLBN; + +typedef ULONG VBN; +typedef VBN *PVBN; typedef struct _FSRTL_COMMON_FCB_HEADER { CSHORT NodeTypeCode; @@ -169,4 +175,119 @@ #define FSRTL_CC_FLUSH_ERROR_FLAG_NO_HARD_ERROR 0x1 #define FSRTL_CC_FLUSH_ERROR_FLAG_NO_LOG_ENTRY 0x2 + +typedef NTSTATUS +(NTAPI *PCOMPLETE_LOCK_IRP_ROUTINE) ( + IN PVOID Context, + IN PIRP Irp); + +typedef struct _FILE_LOCK_INFO { + LARGE_INTEGER StartingByte; + LARGE_INTEGER Length; + BOOLEAN ExclusiveLock; + ULONG Key; + PFILE_OBJECT FileObject; + PVOID ProcessId; + LARGE_INTEGER EndingByte; +} FILE_LOCK_INFO, *PFILE_LOCK_INFO; + +typedef VOID +(NTAPI *PUNLOCK_ROUTINE) ( + IN PVOID Context, + IN PFILE_LOCK_INFO FileLockInfo); + +typedef struct _FILE_LOCK { + PCOMPLETE_LOCK_IRP_ROUTINE CompleteLockIrpRoutine; + PUNLOCK_ROUTINE UnlockRoutine; + BOOLEAN FastIoIsQuestionable; + BOOLEAN SpareC[3]; + PVOID LockInformation; + FILE_LOCK_INFO LastReturnedLockInfo; + PVOID LastReturnedLock; + LONG volatile LockRequestsInProgress; +} FILE_LOCK, *PFILE_LOCK; + +typedef struct _TUNNEL { + FAST_MUTEX Mutex; + PRTL_SPLAY_LINKS Cache; + LIST_ENTRY TimerQueue; + USHORT NumEntries; +} TUNNEL, *PTUNNEL; + +typedef struct _BASE_MCB { + ULONG MaximumPairCount; + ULONG PairCount; + USHORT PoolType; + USHORT Flags; + PVOID Mapping; +} BASE_MCB, *PBASE_MCB; + +typedef struct _LARGE_MCB { + PKGUARDED_MUTEX GuardedMutex; + BASE_MCB BaseMcb; +} LARGE_MCB, *PLARGE_MCB; + +#define MCB_FLAG_RAISE_ON_ALLOCATION_FAILURE 1 + +typedef struct _MCB { + LARGE_MCB DummyFieldThatSizesThisStructureCorrectly; +} MCB, *PMCB; + +typedef enum _FAST_IO_POSSIBLE { + FastIoIsNotPossible = 0, + FastIoIsPossible, + FastIoIsQuestionable +} FAST_IO_POSSIBLE; + +typedef struct _EOF_WAIT_BLOCK { + LIST_ENTRY EofWaitLinks; + KEVENT Event; +} EOF_WAIT_BLOCK, *PEOF_WAIT_BLOCK; + +typedef PVOID OPLOCK, *POPLOCK; + +typedef VOID +(NTAPI *POPLOCK_WAIT_COMPLETE_ROUTINE) ( + IN PVOID Context, + IN PIRP Irp); + +typedef VOID +(NTAPI *POPLOCK_FS_PREPOST_IRP) ( + IN PVOID Context, + IN PIRP Irp); + +#if (NTDDI_VERSION >= NTDDI_VISTASP1) +#define OPLOCK_FLAG_COMPLETE_IF_OPLOCKED 0x00000001 +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN7) +#define OPLOCK_FLAG_OPLOCK_KEY_CHECK_ONLY 0x00000002 +#define OPLOCK_FLAG_BACK_OUT_ATOMIC_OPLOCK 0x00000004 +#define OPLOCK_FLAG_IGNORE_OPLOCK_KEYS 0x00000008 +#define OPLOCK_FSCTRL_FLAG_ALL_KEYS_MATCH 0x00000001 +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN7) + +typedef struct _OPLOCK_KEY_ECP_CONTEXT { + GUID OplockKey; + ULONG Reserved; +} OPLOCK_KEY_ECP_CONTEXT, *POPLOCK_KEY_ECP_CONTEXT; + +DEFINE_GUID( GUID_ECP_OPLOCK_KEY, 0x48850596, 0x3050, 0x4be7, 0x98, 0x63, 0xfe, 0xc3, 0x50, 0xce, 0x8d, 0x7f ); + +#endif + +typedef PVOID PNOTIFY_SYNC; + +typedef BOOLEAN +(NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( + IN PVOID NotifyContext, + IN PVOID TargetContext OPTIONAL, + IN PSECURITY_SUBJECT_CONTEXT SubjectContext); + +typedef BOOLEAN +(NTAPI *PFILTER_REPORT_CHANGE) ( + IN PVOID NotifyContext, + IN PVOID FilterContext); $endif (_NTIFS_) Modified: branches/header-work/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ntifs.t… ============================================================================== --- branches/header-work/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/ntifs.template.h [iso-8859-1] Tue Mar 30 23:50:05 2010 @@ -1064,6 +1064,7 @@ } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; $include (kefuncs.h) +$include (extypes.h) $include (exfuncs.h) $include (sefuncs.h) $include (psfuncs.h) @@ -1079,11 +1080,6 @@ $include (ccfuncs.h) $include (zwfuncs.h) -#define INVALID_PROCESSOR_INDEX 0xffffffff - -#define EX_PUSH_LOCK ULONG_PTR -#define PEX_PUSH_LOCK PULONG_PTR - /* #if !defined(_X86AMD64_) FIXME : WHAT ?! */ #if defined(_WIN64) @@ -1114,127 +1110,6 @@ #if defined(_M_IX86) || defined(_M_AMD64) #define HalGetDmaAlignmentRequirement() 1L #endif - -typedef ULONG LBN; -typedef LBN *PLBN; - -typedef ULONG VBN; -typedef VBN *PVBN; - -typedef enum _FAST_IO_POSSIBLE { - FastIoIsNotPossible = 0, - FastIoIsPossible, - FastIoIsQuestionable -} FAST_IO_POSSIBLE; - -typedef struct _EOF_WAIT_BLOCK { - LIST_ENTRY EofWaitLinks; - KEVENT Event; -} EOF_WAIT_BLOCK, *PEOF_WAIT_BLOCK; - -typedef struct _FILE_LOCK_INFO { - LARGE_INTEGER StartingByte; - LARGE_INTEGER Length; - BOOLEAN ExclusiveLock; - ULONG Key; - PFILE_OBJECT FileObject; - PVOID ProcessId; - LARGE_INTEGER EndingByte; -} FILE_LOCK_INFO, *PFILE_LOCK_INFO; - -typedef NTSTATUS -(NTAPI *PCOMPLETE_LOCK_IRP_ROUTINE) ( - IN PVOID Context, - IN PIRP Irp); - -typedef VOID -(NTAPI *PUNLOCK_ROUTINE) ( - IN PVOID Context, - IN PFILE_LOCK_INFO FileLockInfo); - -typedef struct _FILE_LOCK { - PCOMPLETE_LOCK_IRP_ROUTINE CompleteLockIrpRoutine; - PUNLOCK_ROUTINE UnlockRoutine; - BOOLEAN FastIoIsQuestionable; - BOOLEAN SpareC[3]; - PVOID LockInformation; - FILE_LOCK_INFO LastReturnedLockInfo; - PVOID LastReturnedLock; - LONG volatile LockRequestsInProgress; -} FILE_LOCK, *PFILE_LOCK; - -typedef struct _TUNNEL { - FAST_MUTEX Mutex; - PRTL_SPLAY_LINKS Cache; - LIST_ENTRY TimerQueue; - USHORT NumEntries; -} TUNNEL, *PTUNNEL; - -typedef struct _BASE_MCB { - ULONG MaximumPairCount; - ULONG PairCount; - USHORT PoolType; - USHORT Flags; - PVOID Mapping; -} BASE_MCB, *PBASE_MCB; - -typedef struct _LARGE_MCB { - PKGUARDED_MUTEX GuardedMutex; - BASE_MCB BaseMcb; -} LARGE_MCB, *PLARGE_MCB; - -#define MCB_FLAG_RAISE_ON_ALLOCATION_FAILURE 1 - -typedef struct _MCB { - LARGE_MCB DummyFieldThatSizesThisStructureCorrectly; -} MCB, *PMCB; - -typedef PVOID OPLOCK, *POPLOCK; - -typedef VOID -(NTAPI *POPLOCK_WAIT_COMPLETE_ROUTINE) ( - IN PVOID Context, - IN PIRP Irp); - -typedef VOID -(NTAPI *POPLOCK_FS_PREPOST_IRP) ( - IN PVOID Context, - IN PIRP Irp); - -#if (NTDDI_VERSION >= NTDDI_VISTASP1) -#define OPLOCK_FLAG_COMPLETE_IF_OPLOCKED 0x00000001 -#endif - -#if (NTDDI_VERSION >= NTDDI_WIN7) -#define OPLOCK_FLAG_OPLOCK_KEY_CHECK_ONLY 0x00000002 -#define OPLOCK_FLAG_BACK_OUT_ATOMIC_OPLOCK 0x00000004 -#define OPLOCK_FLAG_IGNORE_OPLOCK_KEYS 0x00000008 -#define OPLOCK_FSCTRL_FLAG_ALL_KEYS_MATCH 0x00000001 -#endif - -#if (NTDDI_VERSION >= NTDDI_WIN7) - -typedef struct _OPLOCK_KEY_ECP_CONTEXT { - GUID OplockKey; - ULONG Reserved; -} OPLOCK_KEY_ECP_CONTEXT, *POPLOCK_KEY_ECP_CONTEXT; - -DEFINE_GUID( GUID_ECP_OPLOCK_KEY, 0x48850596, 0x3050, 0x4be7, 0x98, 0x63, 0xfe, 0xc3, 0x50, 0xce, 0x8d, 0x7f ); - -#endif - -typedef PVOID PNOTIFY_SYNC; - -typedef BOOLEAN -(NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( - IN PVOID NotifyContext, - IN PVOID TargetContext OPTIONAL, - IN PSECURITY_SUBJECT_CONTEXT SubjectContext); - -typedef BOOLEAN -(NTAPI *PFILTER_REPORT_CHANGE) ( - IN PVOID NotifyContext, - IN PVOID FilterContext); extern NTKERNELAPI PUSHORT NlsOemLeadByteInfo; #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo

1 0

[tkreuzer] 46607: fix a typo
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 23:35:52 2010 New Revision: 46607 URL: http://svn.reactos.org/svn/reactos?rev=46607&view=rev Log: fix a typo Modified: trunk/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c Modified: trunk/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cxa_pur… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c [iso-8859-1] Tue Mar 30 23:35:52 2010 @@ -1,5 +1,5 @@ -void assert(int); +void _assert(int); void __cxa_pure_virtual() {

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