Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31133: - Improve the FreeLDR->NTLDR conversion layer by now converting the ARC Hardware Tree. - Apply relocation-style fixups to convert from FreeLDR to Kernel Addresses, since a contiguous buffer was used in FreeLDR, which means we only need to add a delta to each FreeLDR pointer to get the Kernel pointer. - Don't assert if we receive an ARC tree, since we now do! Instead, pretty-print it to the debug log. - Remove some registry debug spew.
by fireball＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: fireball Date: Tue Dec 11 00:01:45 2007 New Revision: 31133 URL: http://svn.reactos.org/svn/reactos?rev=31133&view=rev Log: - Improve the FreeLDR->NTLDR conversion layer by now converting the ARC Hardware Tree. - Apply relocation-style fixups to convert from FreeLDR to Kernel Addresses, since a contiguous buffer was used in FreeLDR, which means we only need to add a delta to each FreeLDR pointer to get the Kernel pointer. - Don't assert if we receive an ARC tree, since we now do! Instead, pretty-print it to the debug log. - Remove some registry debug spew. Modified: trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Tue Dec 11 00:01:45 2007 @@ -456,6 +456,16 @@ } CM_PARSE_CONTEXT, *PCM_PARSE_CONTEXT; // +// MultiFunction Adapter Recognizer Structure +// +typedef struct _CMP_MF_TYPE +{ + PWCHAR Identifier; + USHORT InterfaceType; + USHORT Count; +} CMP_MF_TYPE, *PCMP_MF_TYPE; + +// // System Control Vector // typedef struct _CM_SYSTEM_CONTROL_VECTOR @@ -1387,6 +1397,10 @@ extern ULONG CmpConfigurationAreaSize; extern PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; extern UNICODE_STRING CmTypeName[]; +extern UNICODE_STRING CmClassName[]; +extern CMP_MF_TYPE CmpMultifunctionTypes[]; +extern USHORT CmpUnknownBusCount; +extern ULONG CmpTypeCount[MaximumType + 1]; extern HIVE_LIST_ENTRY CmpMachineHiveList[]; extern UNICODE_STRING CmSymbolicLinkValueName; extern UNICODE_STRING CmpSystemStartOptions; Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Tue Dec 11 00:01:45 2007 @@ -87,10 +87,10 @@ /* Fail if the key couldn't be created, and make sure it's a new key */ if (!NT_SUCCESS(Status)) return Status; - ASSERT(Disposition == REG_CREATED_NEW_KEY); - } - - /* Sstup the compnent information key */ + //ASSERT(Disposition == REG_CREATED_NEW_KEY); + } + + /* Setup the component information key */ RtlInitUnicodeString(&ValueName, L"Component Information"); Status = NtSetValueKey(KeyHandle, &ValueName, @@ -116,6 +116,7 @@ Status = RtlAnsiStringToUnicodeString(&ValueData, &TempString, TRUE); + RtlCreateUnicodeString(&ValueData, (PWCHAR)Component->Identifier); if (NT_SUCCESS(Status)) { /* Save the identifier in the registry */ @@ -192,6 +193,157 @@ /* Return status */ return Status; +} + +int t, tabLevel; + +VOID +NTAPI +CmpDumpHardwareTree(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber) +{ + PCONFIGURATION_COMPONENT Component; + USHORT DeviceIndexTable[MaximumType + 1] = {0}; + ULONG Interface = InterfaceType, Bus = BusNumber, i; + PCHAR InterfaceStrings[MaximumInterfaceType + 1] = + { + "Internal", + "Isa", + "Eisa", + "MicroChannel", + "TurboChannel", + "PCIBus", + "VMEBus", + "NuBus", + "PCMCIABus", + "CBus", + "MPIBus", + "MPSABus", + "ProcessorInternal", + "InternalPowerBus", + "PNPISABus", + "PNPBus", + "Unknown" + }; + + while (CurrentEntry) + { + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Dumping node @ 0x%p\n", CurrentEntry); + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Parent @ 0x%p Sibling @ 0x%p Child @ 0x%p\n", + CurrentEntry->Parent, CurrentEntry->Sibling, CurrentEntry->Child); + + /* Check if this is an adapter */ + Component = &CurrentEntry->ComponentEntry; + if ((Component->Class == AdapterClass) && + (CurrentEntry->Parent->ComponentEntry.Class == SystemClass)) + { + /* Check what kind of adapter it is */ + switch (Component->Type) + { + /* EISA */ + case EisaAdapter: + + /* Fixup information */ + Interface = Eisa; + Bus = CmpTypeCount[EisaAdapter]++; + break; + + /* Turbo-channel */ + case TcAdapter: + + /* Fixup information */ + Interface = TurboChannel; + Bus = CmpTypeCount[TurboChannel]++; + break; + + /* ISA, PCI, etc busses */ + case MultiFunctionAdapter: + + /* Check if we have an identifier */ + if (Component->Identifier) + { + /* Loop each multi-function adapter type */ + for (i = 0; CmpMultifunctionTypes[i].Identifier; i++) + { + /* Check for a name match */ + if (!_wcsicmp(CmpMultifunctionTypes[i].Identifier, + (PWCHAR)Component->Identifier)) + { + /* Match found */ + break; + } + } + + /* Fix up information */ + Interface = CmpMultifunctionTypes[i].InterfaceType; + Bus = CmpMultifunctionTypes[i].Count++; + } + break; + + /* SCSI Bus */ + case ScsiAdapter: + + /* Fix up */ + Interface = Internal; + Bus = CmpTypeCount[ScsiAdapter]++; + break; + + /* Unknown */ + default: + Interface = -1; + Bus = CmpUnknownBusCount++; + break; + } + } + + /* Convert from NT to ARC class */ + if (Component->Class == SystemClass) Component->Type = ArcSystem; + + /* Dump information on the component */ + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Component Type: %wZ\n", &CmTypeName[Component->Type]); + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Class: %wZ\n", &CmClassName[Component->Class]); + if (Component->Class != SystemClass) + { + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Device Index: %lx\n", DeviceIndexTable[Component->Type]++); + } + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Component Information:\n"); + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("\tFlags: %lx\n", Component->Flags); + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("\tVersion: %lx\n", Component->Version); + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("\tAffinity: %lx\n", Component->AffinityMask); + if (Component->IdentifierLength) + { + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Identifier: %S\n", Component->Identifier); + } + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Configuration Data: %p\n", CurrentEntry->ConfigurationData); + for (t = 0; t < tabLevel; t++) DbgPrint("\t"); + DbgPrint("Interface Type: %s Bus Number: %d\n\n", + InterfaceStrings[Interface], + Bus); + + /* Check for children */ + if (CurrentEntry->Child) + { + /* Recurse child */ + tabLevel++; + CmpDumpHardwareTree(CurrentEntry->Child, Interface, Bus); + tabLevel--; + } + + /* Get to the next entry */ + CurrentEntry = CurrentEntry->Sibling; + } } NTSTATUS @@ -258,7 +410,10 @@ /* Check if we got anything from NTLDR */ if (LoaderBlock->ConfigurationRoot) { - ASSERTMSG("NTLDR ARC Hardware Tree Not Supported!\n", FALSE); + /* Dump the hardware tree */ + DPRINT1("ARC Hardware Tree Received @ 0x%p. Dumping HW Info:\n\n", + LoaderBlock->ConfigurationRoot); + CmpDumpHardwareTree(LoaderBlock->ConfigurationRoot, -1, -1); } else { @@ -272,3 +427,4 @@ return Status; } + Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c Tue Dec 11 00:01:45 2007 @@ -60,7 +60,22 @@ BOOLEAN CmpMiniNTBoot; ULONG CmpBootType; +USHORT CmpUnknownBusCount; +ULONG CmpTypeCount[MaximumType + 1]; + HANDLE CmpRegistryRootHandle; + +UNICODE_STRING CmClassName[MaximumClass + 1] = +{ + RTL_CONSTANT_STRING(L"System"), + RTL_CONSTANT_STRING(L"Processor"), + RTL_CONSTANT_STRING(L"Cache"), + RTL_CONSTANT_STRING(L"Adapter"), + RTL_CONSTANT_STRING(L"Controller"), + RTL_CONSTANT_STRING(L"Peripheral"), + RTL_CONSTANT_STRING(L"MemoryClass"), + RTL_CONSTANT_STRING(L"Undefined") +}; UNICODE_STRING CmTypeName[MaximumType + 1] = { @@ -108,6 +123,19 @@ RTL_CONSTANT_STRING(L"Undefined") }; +CMP_MF_TYPE CmpMultifunctionTypes[] = +{ + {L"ISA", Isa, 0}, + {L"MCA", MicroChannel, 0}, + {L"PCI", PCIBus, 0}, + {L"VME", VMEBus, 0}, + {L"PCMCIA", PCMCIABus, 0}, + {L"CBUS", CBus, 0}, + {L"MPIPI", MPIBus, 0}, + {L"MPSA", MPSABus, 0}, + {NULL, Internal, 0} +}; + CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = { { Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Tue Dec 11 00:01:45 2007 @@ -1054,8 +1054,7 @@ /* Get the hive index, make sure it makes sense */ i = (ULONG)StartContext; ASSERT(CmpMachineHiveList[i].Name != NULL); - DPRINT1("[HiveLoad] Parallel Thread: %d\n", i); - + /* We were started */ CmpMachineHiveList[i].ThreadStarted = TRUE; @@ -1097,7 +1096,6 @@ CmpMachineHiveList[i].Allocate = TRUE; /* Load the hive file */ - DPRINT1("[HiveLoad]: Load from file %wZ\n", &FileName); Status = CmpInitHiveFromFile(&FileName, CmpMachineHiveList[i].HHiveFlags, &CmHive, @@ -1122,12 +1120,10 @@ } else { + /* We already have a hive, is it volatile? */ CmHive = CmpMachineHiveList[i].CmHive; - /* We already have a hive, is it volatile? */ if (!(CmHive->Hive.HiveFlags & HIVE_VOLATILE)) { - DPRINT1("[HiveLoad]: Open from file %wZ\n", &FileName); - /* It's now, open the hive file and log */ Status = CmpOpenHiveFiles(&FileName, L".LOG", @@ -1305,7 +1301,6 @@ } /* Now link the hive to its master */ - DPRINT1("[HiveLoad]: Link %wZ\n", &RegName); Status = CmpLinkHiveToMaster(&RegName, NULL, CmpMachineHiveList[i].CmHive2, Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Tue Dec 11 00:01:45 2007 @@ -36,7 +36,7 @@ ULONG BldrCurrentMd; ULONG BldrCurrentMod; -/* NT Loader Data. Eats up about 80KB! */ +/* NT Loader Data. Eats up about 100KB! */ LOADER_PARAMETER_BLOCK BldrLoaderBlock; // 0x0000 LOADER_PARAMETER_EXTENSION BldrExtensionBlock; // 0x0060 CHAR BldrCommandLine[256]; // 0x00DC @@ -53,7 +53,7 @@ ARC_DISK_INFORMATION BldrArcDiskInfo; // 0x12134 CHAR BldrArcNames[32][256]; // 0x1213C ARC_DISK_SIGNATURE BldrDiskInfo[32]; // 0x1413C - // 0x1443C +CHAR BldrArcHwBuffer[16 * 1024]; // 0x1843C /* BIOS Memory Map */ BIOS_MEMORY_DESCRIPTOR BiosMemoryDescriptors[16] = {{0}}; @@ -862,6 +862,34 @@ VOID NTAPI +KiRosFixupComponentTree(IN PCONFIGURATION_COMPONENT_DATA p, + IN ULONG i) +{ + PCONFIGURATION_COMPONENT pp; + + /* Loop each entry */ + while (p) + { + /* Grab the component entry */ + pp = &p->ComponentEntry; + + /* Fixup the pointers */ + if (pp->Identifier) pp->Identifier = (PVOID)((ULONG_PTR)pp->Identifier + i); + if (p->ConfigurationData) p->ConfigurationData = (PVOID)((ULONG_PTR)p->ConfigurationData + i); + if (p->Parent) p->Parent = (PVOID)((ULONG_PTR)p->Parent + i); + if (p->Sibling) p->Sibling = (PVOID)((ULONG_PTR)p->Sibling + i); + if (p->Child) p->Child = (PVOID)((ULONG_PTR)p->Child + i); + + /* Check if we have a child */ + if (p->Child) KiRosFixupComponentTree(p->Child, i); + + /* Get to the next entry */ + p = p->Sibling; + } +} + +VOID +NTAPI KiRosFrldrLpbToNtLpb(IN PROS_LOADER_PARAMETER_BLOCK RosLoaderBlock, IN PLOADER_PARAMETER_BLOCK *NtLoaderBlock) { @@ -1185,6 +1213,15 @@ InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, &ArcDiskInfo->ListEntry); } + + /* Copy the ARC Hardware Tree */ + RtlCopyMemory(BldrArcHwBuffer, (PVOID)RosLoaderBlock->ArchExtra, 16 * 1024); + LoaderBlock->ConfigurationRoot = (PVOID)BldrArcHwBuffer; + + /* Apply fixups */ + KiRosFixupComponentTree(LoaderBlock->ConfigurationRoot, + (ULONG_PTR)BldrArcHwBuffer - + RosLoaderBlock->ArchExtra); } VOID

1 0

[greatlrd] 31132: Fix some typo in Main_DirectDraw_QueryInterface
by greatlrd＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: greatlrd Date: Mon Dec 10 23:29:51 2007 New Revision: 31132 URL: http://svn.reactos.org/svn/reactos?rev=31132&view=rev Log: Fix some typo in Main_DirectDraw_QueryInterface Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Mon Dec 10 23:29:51 2007 @@ -82,14 +82,14 @@ } } - This->lpVtbl = &DirectDraw2_Vtable; + This->lpVtbl = &DirectDraw4_Vtable; *obj = This; Main_DirectDraw_AddRef(This); } - else if (IsEqualGUID(&IID_IDirectDraw4, id)) - { - if (This->lpVtbl != &DirectDraw4_Vtable) + else if (IsEqualGUID(&IID_IDirectDraw2, id)) + { + if (This->lpVtbl != &DirectDraw2_Vtable) { This = internal_directdraw_int_alloc(This); if (!This)

1 0

[fireball] 31131: - Pass ARC Hardware Tree in SetupLDR too. - Zero-initialize memory from the Hardware Heap, just to be sure. - Don't set the Version/Key/Affinity when creating the system node, let the caller do this. - Fix the way components were added in the tree, it was busted. - Enable setting of component information for the APM and ACPI component nodes. This was #if'ed out because it crashed the kernel while PnP was getting bus information for ATAPI/SCSIPORT, since the nodes had no compone
by fireball＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: fireball Date: Mon Dec 10 23:28:31 2007 New Revision: 31131 URL: http://svn.reactos.org/svn/reactos?rev=31131&view=rev Log: - Pass ARC Hardware Tree in SetupLDR too. - Zero-initialize memory from the Hardware Heap, just to be sure. - Don't set the Version/Key/Affinity when creating the system node, let the caller do this. - Fix the way components were added in the tree, it was busted. - Enable setting of component information for the APM and ACPI component nodes. This was #if'ed out because it crashed the kernel while PnP was getting bus information for ATAPI/SCSIPORT, since the nodes had no component data. Add some component data to remove the crash, and then enable component information. - The Real Mode IRQ Routing Table is a Peripheral Class, not a System Class. - Enable the code to create component nodes for each PCI Bus, it was #if'ed out ages ago. - Don't create any component data for the PCI BIOS, it doesn't have any. - Create component data for the first PCI Bus component node based on the PCI_REGISTRY_INFO strucutre. - Fix the way the BIOS Hard disk Peripheral nodes are created. - Always create the DiskController node with floppy disk information, but don't do actual floppy detection if no floppies are there. - Fix flags for Floppy Peripheral nodes. - Fix vector for Floppy Peripheral node. - Set component information for each BIOS hard disk peripheral node. - Fix component information for Serial Peripherals, they were being created on the Serial Controller node instead. - Set empty component information for the system node. - TODO: Setup ACPI and APM Bios descriptor information. - TODO: Setup ROM BIOS Block descriptor information. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Mon Dec 10 23:28:31 2007 @@ -508,119 +508,6 @@ FldrSetIdentifier(DiskKey, Identifier); } - -static VOID -DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, - PCONFIGURATION_COMPONENT_DATA BusKey) -{ - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - PCM_INT13_DRIVE_PARAMETER Int13Drives; - GEOMETRY Geometry; - PCONFIGURATION_COMPONENT_DATA DiskKey; - ULONG DiskCount; - ULONG Size; - ULONG i; - BOOLEAN Changed; - - /* Count the number of visible drives */ - DiskReportError(FALSE); - DiskCount = 0; - - /* There are some really broken BIOSes out there. There are even BIOSes - * that happily report success when you ask them to read from non-existent - * harddisks. So, we set the buffer to known contents first, then try to - * read. If the BIOS reports success but the buffer contents haven't - * changed then we fail anyway */ - memset((PVOID) DISKREADBUFFER, 0xcd, 512); - while (MachDiskReadLogicalSectors(0x80 + DiskCount, 0ULL, 1, (PVOID)DISKREADBUFFER)) - { - Changed = FALSE; - for (i = 0; ! Changed && i < 512; i++) - { - Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; - } - if (! Changed) - { - DbgPrint((DPRINT_HWDETECT, "BIOS reports success for disk %d but data didn't change\n", - (int)DiskCount)); - break; - } - DiskCount++; - memset((PVOID) DISKREADBUFFER, 0xcd, 512); - } - DiskReportError(TRUE); - DbgPrint((DPRINT_HWDETECT, "BIOS reports %d harddisk%s\n", - (int)DiskCount, (DiskCount == 1) ? "": "s")); - - /* Allocate resource descriptor */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + - sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) - { - DbgPrint((DPRINT_HWDETECT, - "Failed to allocate resource descriptor\n")); - return; - } - - /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = InterfaceTypeUndefined; - FullResourceDescriptor->BusNumber = -1; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = - CmResourceTypeDeviceSpecific; -// FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = -// FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Flags = - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.DeviceSpecificData.DataSize = - sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; - - /* Get harddisk Int13 geometry data */ - Int13Drives = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - for (i = 0; i < DiskCount; i++) - { - if (MachDiskGetDriveGeometry(0x80 + i, &Geometry)) - { - Int13Drives[i].DriveSelect = 0x80 + i; - Int13Drives[i].MaxCylinders = Geometry.Cylinders - 1; - Int13Drives[i].SectorsPerTrack = Geometry.Sectors; - Int13Drives[i].MaxHeads = Geometry.Heads - 1; - Int13Drives[i].NumberDrives = DiskCount; - - DbgPrint((DPRINT_HWDETECT, - "Disk %x: %u Cylinders %u Heads %u Sectors %u Bytes\n", - 0x80 + i, - Geometry.Cylinders - 1, - Geometry.Heads -1, - Geometry.Sectors, - Geometry.BytesPerSector)); - } - } - - /* Set 'Configuration Data' value */ - FldrSetConfigurationData(SystemKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); - - /* Create and fill subkey for each harddisk */ - for (i = 0; i < DiskCount; i++) - { - /* Create disk key */ - FldrCreateComponentKey(BusKey, - L"DiskController\\0\\DiskPeripheral", - i, - PeripheralClass, - DiskPeripheral, - &DiskKey); - - /* Set disk values */ - SetHarddiskConfigurationData(DiskKey, 0x80 + i); - SetHarddiskIdentifier(DiskKey, 0x80 + i); - } -} - - static ULONG GetFloppyCount(VOID) { @@ -694,7 +581,7 @@ /* Set 'ComponentInformation' value */ FldrSetComponentInformation(PeripheralKey, - 0x0, + Input | Output, FloppyNumber, 0xFFFFFFFF); @@ -743,12 +630,11 @@ static VOID -DetectBiosFloppyController(PCONFIGURATION_COMPONENT_DATA SystemKey, - PCONFIGURATION_COMPONENT_DATA BusKey) +DetectBiosFloppyController(PCONFIGURATION_COMPONENT_DATA BusKey, + PCONFIGURATION_COMPONENT_DATA ControllerKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - PCONFIGURATION_COMPONENT_DATA ControllerKey; ULONG Size; ULONG FloppyCount; @@ -756,24 +642,7 @@ DbgPrint((DPRINT_HWDETECT, "Floppy count: %u\n", FloppyCount)); - - if (FloppyCount == 0) - return; - FldrCreateComponentKey(SystemKey, - L"DiskController", - 0, - ControllerClass, - DiskController, - &ControllerKey); - DbgPrint((DPRINT_HWDETECT, "Created key: DiskController\\0\n")); - - /* Set 'ComponentInformation' value */ - FldrSetComponentInformation(ControllerKey, - Output | Input | Removable, - 0, - 0xFFFFFFFF); - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); FullResourceDescriptor = MmAllocateMemory(Size); @@ -807,7 +676,7 @@ PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; PartialDescriptor->u.Interrupt.Level = 6; - PartialDescriptor->u.Interrupt.Vector = 0; + PartialDescriptor->u.Interrupt.Vector = 6; PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF; /* Set DMA channel */ @@ -822,9 +691,140 @@ FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); - DetectBiosFloppyPeripheral(ControllerKey); -} - + if (FloppyCount) DetectBiosFloppyPeripheral(ControllerKey); +} + +static VOID +DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, + PCONFIGURATION_COMPONENT_DATA BusKey) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_INT13_DRIVE_PARAMETER Int13Drives; + GEOMETRY Geometry; + PCONFIGURATION_COMPONENT_DATA DiskKey, ControllerKey; + ULONG DiskCount; + ULONG Size; + ULONG i; + BOOLEAN Changed; + + /* Count the number of visible drives */ + DiskReportError(FALSE); + DiskCount = 0; + + /* There are some really broken BIOSes out there. There are even BIOSes + * that happily report success when you ask them to read from non-existent + * harddisks. So, we set the buffer to known contents first, then try to + * read. If the BIOS reports success but the buffer contents haven't + * changed then we fail anyway */ + memset((PVOID) DISKREADBUFFER, 0xcd, 512); + while (MachDiskReadLogicalSectors(0x80 + DiskCount, 0ULL, 1, (PVOID)DISKREADBUFFER)) + { + Changed = FALSE; + for (i = 0; ! Changed && i < 512; i++) + { + Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; + } + if (! Changed) + { + DbgPrint((DPRINT_HWDETECT, "BIOS reports success for disk %d but data didn't change\n", + (int)DiskCount)); + break; + } + DiskCount++; + memset((PVOID) DISKREADBUFFER, 0xcd, 512); + } + DiskReportError(TRUE); + DbgPrint((DPRINT_HWDETECT, "BIOS reports %d harddisk%s\n", + (int)DiskCount, (DiskCount == 1) ? "": "s")); + + FldrCreateComponentKey(BusKey, + L"DiskController", + 0, + ControllerClass, + DiskController, + &ControllerKey); + DbgPrint((DPRINT_HWDETECT, "Created key: DiskController\\0\n")); + + /* Set 'ComponentInformation' value */ + FldrSetComponentInformation(ControllerKey, + Output | Input | Removable, + 0, + 0xFFFFFFFF); + + DetectBiosFloppyController(BusKey, ControllerKey); + + /* Allocate resource descriptor */ + Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; + FullResourceDescriptor = MmAllocateMemory(Size); + if (FullResourceDescriptor == NULL) + { + DbgPrint((DPRINT_HWDETECT, + "Failed to allocate resource descriptor\n")); + return; + } + + /* Initialize resource descriptor */ + memset(FullResourceDescriptor, 0, Size); + FullResourceDescriptor->InterfaceType = InterfaceTypeUndefined; + FullResourceDescriptor->BusNumber = -1; + FullResourceDescriptor->PartialResourceList.Version = 1; + FullResourceDescriptor->PartialResourceList.Revision = 1; + FullResourceDescriptor->PartialResourceList.Count = 1; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = 0; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Flags = 0; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.DeviceSpecificData.DataSize = + sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; + + /* Get harddisk Int13 geometry data */ + Int13Drives = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + for (i = 0; i < DiskCount; i++) + { + if (MachDiskGetDriveGeometry(0x80 + i, &Geometry)) + { + Int13Drives[i].DriveSelect = 0x80 + i; + Int13Drives[i].MaxCylinders = Geometry.Cylinders - 1; + Int13Drives[i].SectorsPerTrack = Geometry.Sectors; + Int13Drives[i].MaxHeads = Geometry.Heads - 1; + Int13Drives[i].NumberDrives = DiskCount; + + DbgPrint((DPRINT_HWDETECT, + "Disk %x: %u Cylinders %u Heads %u Sectors %u Bytes\n", + 0x80 + i, + Geometry.Cylinders - 1, + Geometry.Heads -1, + Geometry.Sectors, + Geometry.BytesPerSector)); + } + } + + /* Set 'Configuration Data' value */ + FldrSetConfigurationData(SystemKey, FullResourceDescriptor, Size); + MmFreeMemory(FullResourceDescriptor); + + /* Create and fill subkey for each harddisk */ + for (i = 0; i < DiskCount; i++) + { + /* Create disk key */ + FldrCreateComponentKey(ControllerKey, + L"DiskPeripheral", + i, + PeripheralClass, + DiskPeripheral, + &DiskKey); + + /* Set 'ComponentInformation' value */ + FldrSetComponentInformation(DiskKey, + Output | Input, + 0, + 0xFFFFFFFF); + + /* Set disk values */ + SetHarddiskConfigurationData(DiskKey, 0x80 + i); + SetHarddiskIdentifier(DiskKey, 0x80 + i); + } +} static VOID InitializeSerialPort(ULONG Port, @@ -1483,7 +1483,7 @@ DbgPrint((DPRINT_HWDETECT, "Created key: KeyboardPeripheral\\0\n")); /* Set 'ComponentInformation' value */ - FldrSetComponentInformation(ControllerKey, + FldrSetComponentInformation(PeripheralKey, Input | ConsoleIn, 0, 0xFFFFFFFF); @@ -1911,8 +1911,6 @@ /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); - DetectBiosFloppyController(SystemKey, BusKey); - DetectSerialPorts(BusKey); DetectParallelPorts(BusKey); @@ -1937,6 +1935,12 @@ /* Create the 'System' key */ FldrCreateSystemKey(&SystemKey); + + /* Set empty component information */ + FldrSetComponentInformation(SystemKey, + 0x0, + 0x0, + 0xFFFFFFFF); /* Detect buses */ DetectPciBios(SystemKey, &BusNumber); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Mon Dec 10 23:28:31 2007 @@ -52,7 +52,8 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - + CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + if (FindAcpiBios()) { AcpiPresent = TRUE; @@ -65,14 +66,24 @@ MultiFunctionAdapter, &BiosKey); -#if 0 /* Set 'Component Information' */ FldrSetComponentInformation(BiosKey, 0x0, 0x0, 0xFFFFFFFF); -#endif + /* Set 'Configuration Data' value */ + memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + FullResourceDescriptor.InterfaceType = Internal; + FullResourceDescriptor.BusNumber = *BusNumber; + FullResourceDescriptor.PartialResourceList.Version = 0; + FullResourceDescriptor.PartialResourceList.Revision = 0; + FullResourceDescriptor.PartialResourceList.Count = 0; + FldrSetConfigurationData(BiosKey, + &FullResourceDescriptor, + sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + /* Increment bus number */ (*BusNumber)++; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Mon Dec 10 23:28:31 2007 @@ -57,7 +57,8 @@ DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - + CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + if (FindApmBios()) { /* Create new bus key */ @@ -67,14 +68,24 @@ AdapterClass, MultiFunctionAdapter, &BiosKey); - -#if 0 + /* Set 'Component Information' */ FldrSetComponentInformation(BiosKey, 0x0, 0x0, 0xFFFFFFFF); -#endif + + /* Set 'Configuration Data' value */ + memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + FullResourceDescriptor.InterfaceType = Internal; + FullResourceDescriptor.BusNumber = *BusNumber; + FullResourceDescriptor.PartialResourceList.Version = 0; + FullResourceDescriptor.PartialResourceList.Revision = 0; + FullResourceDescriptor.PartialResourceList.Count = 0; + FldrSetConfigurationData(BiosKey, + &FullResourceDescriptor, + sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Increment bus number */ (*BusNumber)++; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Mon Dec 10 23:28:31 2007 @@ -54,13 +54,13 @@ ROUTING_SLOT Slot[1]; } __attribute__((packed)) PCI_IRQ_ROUTING_TABLE, *PPCI_IRQ_ROUTING_TABLE; -typedef struct _CM_PCI_BUS_DATA -{ - UCHAR BusCount; - USHORT PciVersion; - UCHAR HardwareMechanism; -} __attribute__((packed)) CM_PCI_BUS_DATA, *PCM_PCI_BUS_DATA; - +typedef struct _PCI_REGISTRY_INFO +{ + UCHAR MajorRevision; + UCHAR MinorRevision; + UCHAR NoBuses; + UCHAR HardwareMechanism; +} PCI_REGISTRY_INFO, *PPCI_REGISTRY_INFO; static PPCI_IRQ_ROUTING_TABLE GetPciIrqRoutingTable(VOID) @@ -106,7 +106,7 @@ static BOOLEAN -FindPciBios(PCM_PCI_BUS_DATA BusData) +FindPciBios(PPCI_REGISTRY_INFO BusData) { REGS RegsIn; REGS RegsOut; @@ -125,8 +125,9 @@ DbgPrint((DPRINT_HWDETECT, "BL: %x\n", RegsOut.b.bl)); DbgPrint((DPRINT_HWDETECT, "CL: %x\n", RegsOut.b.cl)); - BusData->BusCount = RegsOut.b.cl + 1; - BusData->PciVersion = RegsOut.w.bx; + BusData->NoBuses = RegsOut.b.cl + 1; + BusData->MajorRevision = RegsOut.b.bh; + BusData->MinorRevision = RegsOut.b.bl; BusData->HardwareMechanism = RegsOut.b.cl; return TRUE; @@ -156,7 +157,7 @@ FldrCreateComponentKey(BusKey, L"RealModeIrqRoutingTable", 0, - SystemClass, + PeripheralClass, RealModeIrqRoutingTable, &TableKey); @@ -214,14 +215,13 @@ DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - CM_PCI_BUS_DATA BusData; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PCI_REGISTRY_INFO BusData; PCONFIGURATION_COMPONENT_DATA BiosKey; ULONG Size; -#if 0 PCONFIGURATION_COMPONENT_DATA BusKey; ULONG i; WCHAR szPci[] = L"PCI"; -#endif /* Report the PCI BIOS */ if (FindPciBios(&BusData)) @@ -247,26 +247,23 @@ FldrSetIdentifier(BiosKey, L"PCI BIOS"); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR); + Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, + PartialResourceList.PartialDescriptors); FullResourceDescriptor = MmAllocateMemory(Size); if (FullResourceDescriptor == NULL) - { - DbgPrint((DPRINT_HWDETECT, - "Failed to allocate resource descriptor\n")); - return; - } + { + DbgPrint((DPRINT_HWDETECT, + "Failed to allocate resource descriptor\n")); + return; + } /* Initialize resource descriptor */ memset(FullResourceDescriptor, 0, Size); FullResourceDescriptor->InterfaceType = PCIBus; FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeBusNumber; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareDeviceExclusive; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.BusNumber.Start = 0; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.BusNumber.Length = 1; + FullResourceDescriptor->PartialResourceList.Version = 0; + FullResourceDescriptor->PartialResourceList.Revision = 0; + FullResourceDescriptor->PartialResourceList.Count = 0; /* Set 'Configuration Data' value */ FldrSetConfigurationData(BiosKey, FullResourceDescriptor, Size); @@ -274,36 +271,90 @@ DetectPciIrqRoutingTable(BiosKey); -#if 0 - /* - * FIXME: - * Enabling this piece of code will corrupt the boot sequence! - * This is probably caused by a bug in the registry code! - */ - /* Report PCI buses */ - for (i = 0; i < (ULONG)BusData.BusCount; i++) + for (i = 0; i < (ULONG)BusData.NoBuses; i++) { + /* Create the bus key */ FldrCreateComponentKey(SystemKey, L"MultifunctionAdapter", *BusNumber, AdapterClass, MultiFunctionAdapter, - &BiosKey); - + &BusKey); + /* Set 'Component Information' */ FldrSetComponentInformation(BusKey, 0x0, 0x0, 0xFFFFFFFF); - + + /* Check if this is the first bus */ + if (i == 0) + { + /* Set 'Configuration Data' value */ + Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, + PartialResourceList.PartialDescriptors) + + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + + sizeof(PCI_REGISTRY_INFO); + FullResourceDescriptor = MmAllocateMemory(Size); + if (!FullResourceDescriptor) + { + DbgPrint((DPRINT_HWDETECT, + "Failed to allocate resource descriptor\n")); + return; + } + + /* Initialize resource descriptor */ + memset(FullResourceDescriptor, 0, Size); + FullResourceDescriptor->InterfaceType = PCIBus; + FullResourceDescriptor->BusNumber = i; + FullResourceDescriptor->PartialResourceList.Version = 1; + FullResourceDescriptor->PartialResourceList.Revision = 1; + FullResourceDescriptor->PartialResourceList.Count = 1; + PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor->Type = CmResourceTypeDeviceSpecific; + PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; + PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(PCI_REGISTRY_INFO); + memcpy(&FullResourceDescriptor->PartialResourceList.PartialDescriptors[1], + &BusData, + sizeof(PCI_REGISTRY_INFO)); + + /* Set 'Configuration Data' value */ + FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); + MmFreeMemory(FullResourceDescriptor); + } + else + { + /* Set 'Configuration Data' value */ + Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, + PartialResourceList.PartialDescriptors); + FullResourceDescriptor = MmAllocateMemory(Size); + if (!FullResourceDescriptor) + { + DbgPrint((DPRINT_HWDETECT, + "Failed to allocate resource descriptor\n")); + return; + } + + /* Initialize resource descriptor */ + memset(FullResourceDescriptor, 0, Size); + FullResourceDescriptor->InterfaceType = PCIBus; + FullResourceDescriptor->BusNumber = i; + FullResourceDescriptor->PartialResourceList.Version = 0; + FullResourceDescriptor->PartialResourceList.Revision = 0; + FullResourceDescriptor->PartialResourceList.Count = 0; + + /* Set 'Configuration Data' value */ + FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); + MmFreeMemory(FullResourceDescriptor); + } + /* Increment bus number */ (*BusNumber)++; - + /* Set 'Identifier' value */ - FldrSetIdentifier(BiosKey, szPci); + FldrSetIdentifier(BusKey, szPci); } -#endif } } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Mon Dec 10 23:28:31 2007 @@ -29,6 +29,9 @@ /* Return a block of memory from the ARC Hardware Heap */ Buffer = &reactos_arc_hardware_data[FldrpHwHeapLocation]; + /* Clear it */ + RtlZeroMemory(Buffer, Size); + /* Increment the heap location */ FldrpHwHeapLocation += Size; if (FldrpHwHeapLocation > HW_MAX_ARC_HEAP_SIZE) Buffer = NULL; @@ -118,9 +121,6 @@ Component = &FldrArcHwTreeRoot->ComponentEntry; Component->Class = SystemClass; Component->Type = MaximumType; - Component->Version = 0; - Component->Key = 0; - Component->AffinityMask = 0; Component->ConfigurationDataLength = 0; Component->Identifier = 0; Component->IdentifierLength = 0; @@ -136,6 +136,36 @@ { DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", Error)); return; + } +} + +VOID +NTAPI +FldrLinkToParent(IN PCONFIGURATION_COMPONENT_DATA Parent, + IN PCONFIGURATION_COMPONENT_DATA Child) +{ + PCONFIGURATION_COMPONENT_DATA Sibling; + + /* Get the first sibling */ + Sibling = Parent->Child; + + /* If no sibling exists, then we are the first child */ + if (!Sibling) + { + /* Link us in */ + Parent->Child = Child; + } + else + { + /* Loop each sibling */ + do + { + /* This is now the parent */ + Parent = Sibling; + } while ((Sibling = Sibling->Sibling)); + + /* Found the lowest sibling; mark us as its sibling too */ + Parent->Sibling = Child; } } @@ -160,17 +190,8 @@ /* Now save our parent */ ComponentData->Parent = SystemNode; - /* Now we need to figure out if the parent already has a child entry */ - if (SystemNode->Child) - { - /* It does, so we'll be a sibling of the child instead */ - SystemNode->Child->Sibling = ComponentData; - } - else - { - /* It doesn't, so we will be the first child */ - SystemNode->Child = ComponentData; - } + /* Link us to the parent */ + FldrLinkToParent(SystemNode, ComponentData); /* Set us up */ Component = &ComponentData->ComponentEntry; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Mon Dec 10 23:28:31 2007 @@ -30,6 +30,7 @@ LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel char reactos_module_strings[64][256]; // Array to hold module names reactos_mem_data_t reactos_mem_data; +extern char reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE]; char szBootPath[256]; char szHalName[256]; CHAR SystemRoot[255]; @@ -186,6 +187,7 @@ LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; + LoaderBlock.ArchExtra = (ULONG)reactos_arc_hardware_data; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) {

1 0

[mpiulachs] 31130: * refactor the code to make it more OOP and extensible * remove old outdated SD project files * make it use some .NET 2.0 features as generic collections and settings
by mpiulachs＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: mpiulachs Date: Mon Dec 10 22:08:13 2007 New Revision: 31130 URL: http://svn.reactos.org/svn/reactos?rev=31130&view=rev Log: * refactor the code to make it more OOP and extensible * remove old outdated SD project files * make it use some .NET 2.0 features as generic collections and settings Added: trunk/irc/TechBot/TechBot.Library/Command.cs (contents, props changed) - copied, changed from r31065, trunk/irc/TechBot/TechBot.Library/ICommand.cs trunk/irc/TechBot/TechBot.Library/Commands/ trunk/irc/TechBot/TechBot.Library/Commands/Base/ trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs (with props) trunk/irc/TechBot/TechBot.Library/Properties/AssemblyInfo.cs (contents, props changed) - copied, changed from r31065, trunk/irc/TechBot/TechBot.Library/AssemblyInfo.cs trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot.Library/Settings.cs (with props) trunk/irc/TechBot/TechBot.Library/Settings.settings (with props) trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Library/app.config (with props) Removed: trunk/irc/TechBot/TechBot.Library/AssemblyInfo.cs trunk/irc/TechBot/TechBot.Library/Default.build trunk/irc/TechBot/TechBot.Library/ICommand.cs trunk/irc/TechBot/TechBot.Library/TechBot.Library.cmbx trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx Modified: trunk/irc/TechBot/TechBot.Console/App.config trunk/irc/TechBot/TechBot.Console/Main.cs trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj trunk/irc/TechBot/TechBot.Library/ApiCommand.cs trunk/irc/TechBot/TechBot.Library/BugCommand.cs trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs trunk/irc/TechBot/TechBot.Library/HelpCommand.cs trunk/irc/TechBot/TechBot.Library/HresultCommand.cs trunk/irc/TechBot/TechBot.Library/IrcService.cs trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs trunk/irc/TechBot/TechBot.Library/SvnCommand.cs trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj trunk/irc/TechBot/TechBot.Library/TechBotService.cs trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs trunk/irc/TechBot/TechBot.Library/WmCommand.cs trunk/irc/TechBot/TechBot/ServiceThread.cs trunk/irc/TechBot/TechBot/TechBot.csproj Modified: trunk/irc/TechBot/TechBot.Console/App.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/App.co… ============================================================================== --- trunk/irc/TechBot/TechBot.Console/App.config (original) +++ trunk/irc/TechBot/TechBot.Console/App.config Mon Dec 10 22:08:13 2007 @@ -8,11 +8,6 @@ <add key="IRCBotPassword" value="MyPassword" /> <add key="ChmPath" value="C:\IRC\TechBot\CHM" /> <add key="MainChm" value="kmarch.chm" /> - <add key="NtstatusXml" value="ntstatus.xml" /> - <add key="WinerrorXml" value="winerror.xml" /> - <add key="HresultXml" value="hresult.xml" /> - <add key="WmXml" value="wm.xml" /> - <add key="SvnCommand" value="svn co svn://svn.reactos.org/trunk/reactos" /> <add key="BugUrl" value="http://www.reactos.org/bugzilla/show_bug.cgi?id={0}" /> <add key="WineBugUrl" value="http://bugs.winehq.org/show_bug.cgi?id={0}" /> <add key="SambaBugUrl" value="https://bugzilla.samba.org/show_bug.cgi?id={0}" /> Modified: trunk/irc/TechBot/TechBot.Console/Main.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Main.c… ============================================================================== --- trunk/irc/TechBot/TechBot.Console/Main.cs (original) +++ trunk/irc/TechBot/TechBot.Console/Main.cs Mon Dec 10 22:08:13 2007 @@ -217,11 +217,11 @@ IRCBotPassword, ChmPath, MainChm, - NtstatusXml, - WinerrorXml, - HresultXml, - WmXml, - SvnCommand, + //NtstatusXml, + //WinerrorXml, + //HresultXml, + //WmXml, + //SvnCommand, BugUrl, WineBugUrl, SambaBugUrl); @@ -239,15 +239,15 @@ System.Console.WriteLine("TechBot running console service..."); TechBotService service = new TechBotService(new ConsoleServiceOutput(), ChmPath, - MainChm, - NtstatusXml, - WinerrorXml, - HresultXml, - WmXml, - SvnCommand, - BugUrl, - WineBugUrl, - SambaBugUrl); + MainChm); + //NtstatusXml, + //WinerrorXml, + //HresultXml, + //WmXml, + //SvnCommand, + //BugUrl, + //WineBugUrl, + //SambaBugUrl); service.Run(); while (true) { Modified: trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj (original) +++ trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj Mon Dec 10 22:08:13 2007 @@ -54,6 +54,9 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <None Include="App.config" /> + </ItemGroup> + <ItemGroup> <Folder Include="Properties\" /> </ItemGroup> </Project> Modified: trunk/irc/TechBot/TechBot.Library/ApiCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ApiCom… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/ApiCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/ApiCommand.cs Mon Dec 10 22:08:13 2007 @@ -7,22 +7,17 @@ namespace TechBot.Library { - public class ApiCommand : BaseCommand, ICommand + public class ApiCommand : Command { private const bool IsVerbose = false; private HtmlHelpSystem chm; - private IServiceOutput serviceOutput; private string chmPath; private string mainChm; - - public ApiCommand(IServiceOutput serviceOutput, - string chmPath, - string mainChm) - { - this.serviceOutput = serviceOutput; - this.chmPath = chmPath; - this.mainChm = mainChm; + + public ApiCommand(TechBotService techBot) + : base(techBot) + { Run(); } @@ -30,7 +25,7 @@ string message) { if (IsVerbose) - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, message); } @@ -65,14 +60,21 @@ Console.WriteLine(String.Format("Loaded {0} CHMs", chm.FileList.Length)); } - + + public override string[] AvailableCommands + { + get { return new string[] { "api" }; } + } + + /* public bool CanHandle(string commandName) { return CanHandle(commandName, new string[] { "api" }); } - - public void Handle(MessageContext context, +*/ + + public override void Handle(MessageContext context, string commandName, string parameters) { @@ -82,8 +84,8 @@ Search(context, parameters); } - - public string Help() + + public override string Help() { return "!api <apiname>"; } @@ -177,7 +179,7 @@ if (prototype == null || prototype.Trim().Equals(String.Empty)) return false; string formattedPrototype = FormatPrototype(prototype); - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, formattedPrototype); return true; } @@ -203,7 +205,7 @@ if (prototype == null || prototype.Trim().Equals(String.Empty)) continue; string formattedPrototype = FormatPrototype(prototype); - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, formattedPrototype); return true; } @@ -214,14 +216,14 @@ private void DisplayNoResult(MessageContext context, string keyword) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("I don't know about keyword {0}", keyword)); } private void DisplayNoKeyword(MessageContext context) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, "Please give me a keyword."); } Removed: trunk/irc/TechBot/TechBot.Library/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Assemb… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/AssemblyInfo.cs (original) +++ trunk/irc/TechBot/TechBot.Library/AssemblyInfo.cs (removed) @@ -1,32 +1,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following -// attributes. -// -// change them to the information which is associated with the assembly -// you compile. - -[assembly: AssemblyTitle("")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all values by your own or you can build default build and revision -// numbers with the '*' character (the default): - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes specify the key for the sign of your assembly. See the -// .NET Framework documentation for more information about signing. -// This is not required, if you don't want signing let these attributes like they're. -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] Modified: trunk/irc/TechBot/TechBot.Library/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/BugCom… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/BugCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/BugCommand.cs Mon Dec 10 22:08:13 2007 @@ -2,70 +2,49 @@ namespace TechBot.Library { - public class BugCommand : BaseCommand, ICommand + public abstract class BugCommand : Command//, ICommand { - private IServiceOutput serviceOutput; - private string RosBugUrl; - private string WineBugUrl; - private string SambaBugUrl; - - public BugCommand(IServiceOutput serviceOutput, - string RosBugUrl, - string WineBugUrl, - string SambaBugUrl) + public BugCommand(TechBotService techBot) : base (techBot) { - this.serviceOutput = serviceOutput; - this.RosBugUrl = RosBugUrl; - this.WineBugUrl = WineBugUrl; - this.SambaBugUrl = SambaBugUrl; - } - - public bool CanHandle(string commandName) - { - return CanHandle(commandName, - new string[] { "bug" }); } - public void Handle(MessageContext context, - string commandName, - string parameters) - { - string bugText = parameters; - if (bugText.Equals(String.Empty)) - { - serviceOutput.WriteLine(context, - "Please provide a valid bug number."); - return; - } + public override void Handle(MessageContext context, + string commandName, + string parameters) + { + string bugText = parameters; + if (bugText.Equals(String.Empty)) + { + TechBot.ServiceOutput.WriteLine(context, + "Please provide a valid bug number."); + return; + } - NumberParser np = new NumberParser(); - long bug = np.Parse(bugText); - if (np.Error) - { - serviceOutput.WriteLine(context, - String.Format("{0} is not a valid bug number.", - bugText)); - return; - } - - string bugUrl = this.RosBugUrl; + NumberParser np = new NumberParser(); + long bug = np.Parse(bugText); + if (np.Error) + { + TechBot.ServiceOutput.WriteLine(context, + String.Format("{0} is not a valid bug number.", + bugText)); + return; + } - if (context is ChannelMessageContext) - { - ChannelMessageContext channelContext = context as ChannelMessageContext; - if (channelContext.Channel.Name == "winehackers") - bugUrl = this.WineBugUrl; - else if (channelContext.Channel.Name == "samba-technical") - bugUrl = this.SambaBugUrl; - } - - serviceOutput.WriteLine(context, - String.Format(bugUrl, bug)); - } - - public string Help() - { - return "!bug <number>"; - } + /* + string bugUrl = this.RosBugUrl; + + if (context is ChannelMessageContext) + { + ChannelMessageContext channelContext = context as ChannelMessageContext; + if (channelContext.Channel.Name == "winehackers") + bugUrl = this.WineBugUrl; + else if (channelContext.Channel.Name == "samba-technical") + bugUrl = this.SambaBugUrl; + }*/ + + TechBot.ServiceOutput.WriteLine(context, String.Format(BugUrl, bug)); + } + + protected abstract string BugUrl { get; } } } Copied: trunk/irc/TechBot/TechBot.Library/Command.cs (from r31065, trunk/irc/TechBot/TechBot.Library/ICommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/ICommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/Command.cs Mon Dec 10 22:08:13 2007 @@ -1,29 +1,53 @@ -using System; - -namespace TechBot.Library -{ - public interface ICommand - { - bool CanHandle(string commandName); - void Handle(MessageContext context, - string commandName, - string parameters); - string Help(); - } - - - - public class BaseCommand - { - protected bool CanHandle(string commandName, - string[] availableCommands) - { - foreach (string availableCommand in availableCommands) - { - if (String.Compare(availableCommand, commandName, true) == 0) - return true; - } - return false; - } - } -} +using System; + +namespace TechBot.Library +{ + /* + public interface ICommand + { + bool CanHandle(string commandName); + void Handle(MessageContext context, + string commandName, + string parameters); + //string Help(); + }*/ + + public abstract class Command + { + protected TechBotService m_TechBotService = null; + + public Command(TechBotService techbot) + { + m_TechBotService = techbot; + } + + public TechBotService TechBot + { + get { return m_TechBotService; } + } + + public abstract string[] AvailableCommands { get; } + + public abstract void Handle(MessageContext context, + string commandName, + string parameters); + + /* + protected bool CanHandle(string commandName, + string[] availableCommands) + { + foreach (string availableCommand in availableCommands) + { + if (String.Compare(availableCommand, commandName, true) == 0) + return true; + } + return false; + } + */ + + public virtual string Help() + { + return "No help is available for this command"; + } + } +} Propchange: trunk/irc/TechBot/TechBot.Library/Command.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs (added) +++ trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs Mon Dec 10 22:08:13 2007 @@ -1,0 +1,26 @@ +using System; +using System.Xml; +using System.Collections.Generic; +using System.Text; + +namespace TechBot.Library +{ + public abstract class XmlCommand : Command + { + protected XmlDocument m_XmlDocument; + + public XmlCommand(TechBotService techBot) + : base(techBot) + { + m_XmlDocument = new XmlDocument(); + m_XmlDocument.Load(XmlFile); + } + + public abstract string XmlFile { get; } + + public XmlDocument XmlDocument + { + get { return m_XmlDocument; } + } + } +} Propchange: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/irc/TechBot/TechBot.Library/Default.build URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Defaul… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Default.build (original) +++ trunk/irc/TechBot/TechBot.Library/Default.build (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0"?> -<project name="TechBot.Library" default="build"> - - <property name="output.dir" value="..\bin" /> - - <target name="build" description="Build component"> - <mkdir dir="${output.dir}" /> - <csc target="library" - output="${output.dir}\TechBot.Library.dll" - optimize="true" - debug="true" - doc="${output.dir}\TechBot.Library.xml" - warninglevel="0"> - <sources> - <include name="*.cs" /> - </sources> - <references> - <include name="${output.dir}\CHMLibrary.dll" /> - <include name="${output.dir}\TechBot.IRCLibrary.dll" /> - </references> - </csc> - </target> - -</project> Modified: trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ErrorC… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs Mon Dec 10 22:08:13 2007 @@ -4,30 +4,32 @@ namespace TechBot.Library { - public class ErrorCommand : BaseCommand, ICommand + public class ErrorCommand : Command { - private IServiceOutput serviceOutput; private NtStatusCommand ntStatus; private WinerrorCommand winerror; - private HresultCommand hresult; - - public ErrorCommand(IServiceOutput serviceOutput, string ntstatusXml, - string winerrorXml, string hresultXml) - { - this.serviceOutput = serviceOutput; - this.ntStatus = new NtStatusCommand(serviceOutput, - ntstatusXml); - this.winerror = new WinerrorCommand(serviceOutput, - winerrorXml); - this.hresult = new HresultCommand(serviceOutput, - hresultXml); + private HResultCommand hresult; + + public ErrorCommand(TechBotService techBot) + : base(techBot) + { + this.ntStatus = new NtStatusCommand(techBot); + this.winerror = new WinerrorCommand(techBot); + this.hresult = new HResultCommand(techBot); } + /* public bool CanHandle(string commandName) { return CanHandle(commandName, new string[] { "error" }); } + */ + + public override string[] AvailableCommands + { + get { return new string[] { "error" }; } + } private static int GetSeverity(long error) { @@ -79,14 +81,14 @@ return code.ToString(); } - public void Handle(MessageContext context, + public override void Handle(MessageContext context, string commandName, string parameters) { string originalErrorText = parameters.Trim(); if (originalErrorText.Equals(String.Empty)) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, "Please provide an Error Code."); return; } @@ -98,7 +100,7 @@ long error = np.Parse(errorText); if (np.Error) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is not a valid Error Code.", originalErrorText)); return; @@ -173,30 +175,30 @@ goto retry; } - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("I don't know about Error Code {0}.", originalErrorText)); } else if (descriptions.Count == 1) { string description = (string)descriptions[0]; - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is {1}.", originalErrorText, description)); } else { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} could be:", originalErrorText)); foreach(string description in descriptions) - serviceOutput.WriteLine(context, String.Format("\t{0}", description)); - } - } - - public string Help() + TechBot.ServiceOutput.WriteLine(context, String.Format("\t{0}", description)); + } + } + + public override string Help() { return "!error <value>"; } Modified: trunk/irc/TechBot/TechBot.Library/HelpCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/HelpCo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/HelpCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/HelpCommand.cs Mon Dec 10 22:08:13 2007 @@ -3,38 +3,33 @@ namespace TechBot.Library { - public class HelpCommand : BaseCommand, ICommand + public class HelpCommand : Command { - private IServiceOutput serviceOutput; - private ArrayList commands; - - public HelpCommand(IServiceOutput serviceOutput, - ArrayList commands) + public HelpCommand(TechBotService techBot) + : base(techBot) { - this.serviceOutput = serviceOutput; - this.commands = commands; } - public bool CanHandle(string commandName) - { - return CanHandle(commandName, - new string[] { "help" }); - } - - public void Handle(MessageContext context, - string commandName, - string parameters) - { - serviceOutput.WriteLine(context, - "I support the following commands:"); - foreach (ICommand command in commands) - { - serviceOutput.WriteLine(context, - command.Help()); - } - } - - public string Help() + public override string[] AvailableCommands + { + get { return new string[] { "help" }; } + } + + public override void Handle( + MessageContext context, + string commandName, + string parameters) + { + TechBot.ServiceOutput.WriteLine(context, "I support the following commands:"); + + foreach (Command command in TechBot.Commands) + { + TechBot.ServiceOutput.WriteLine(context, + command.Help()); + } + } + + public override string Help() { return "!help"; } Modified: trunk/irc/TechBot/TechBot.Library/HresultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Hresul… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/HresultCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/HresultCommand.cs Mon Dec 10 22:08:13 2007 @@ -3,33 +3,39 @@ namespace TechBot.Library { - public class HresultCommand : BaseCommand, ICommand + public class HResultCommand : XmlCommand { - private IServiceOutput serviceOutput; - private XmlDocument hresultXmlDocument; + public HResultCommand(TechBotService techBot) + : base(techBot) + { + } - public HresultCommand(IServiceOutput serviceOutput, - string hresultXml) - { - this.serviceOutput = serviceOutput; - hresultXmlDocument = new XmlDocument(); - hresultXmlDocument.Load(hresultXml); - } - + public override string XmlFile + { + get { return Settings.Default.HResultXml; } + } + + public override string[] AvailableCommands + { + get { return new string[] { "hresult" }; } + } + + /* public bool CanHandle(string commandName) { return CanHandle(commandName, new string[] { "hresult" }); } + */ - public void Handle(MessageContext context, + public override void Handle(MessageContext context, string commandName, string parameters) { string hresultText = parameters; if (hresultText.Equals(String.Empty)) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, "Please provide a valid HRESULT value."); return; } @@ -38,7 +44,7 @@ long hresult = np.Parse(hresultText); if (np.Error) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is not a valid HRESULT value.", hresultText)); return; @@ -47,27 +53,27 @@ string description = GetHresultDescription(hresult); if (description != null) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is {1}.", hresultText, description)); } else { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("I don't know about HRESULT {0}.", hresultText)); } } - public string Help() + public override string Help() { return "!hresult <value>"; } public string GetHresultDescription(long hresult) { - XmlElement root = hresultXmlDocument.DocumentElement; + XmlElement root = base.m_XmlDocument.DocumentElement; XmlNode node = root.SelectSingleNode(String.Format("Hresult[@value='{0}']", hresult.ToString("X8"))); if (node != null) Removed: trunk/irc/TechBot/TechBot.Library/ICommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/IComma… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/ICommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/ICommand.cs (removed) @@ -1,29 +1,0 @@ -using System; - -namespace TechBot.Library -{ - public interface ICommand - { - bool CanHandle(string commandName); - void Handle(MessageContext context, - string commandName, - string parameters); - string Help(); - } - - - - public class BaseCommand - { - protected bool CanHandle(string commandName, - string[] availableCommands) - { - foreach (string availableCommand in availableCommands) - { - if (String.Compare(availableCommand, commandName, true) == 0) - return true; - } - return false; - } - } -} Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/IrcSer… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/IrcService.cs (original) +++ trunk/irc/TechBot/TechBot.Library/IrcService.cs Mon Dec 10 22:08:13 2007 @@ -1,6 +1,8 @@ using System; +using System.Text; using System.Collections; using System.Threading; + using TechBot.IRCLibrary; namespace TechBot.Library @@ -20,7 +22,7 @@ private string wmXml; private string svnCommand; private string bugUrl, WineBugUrl, SambaBugUrl; - private IrcClient client; + private IrcClient m_IrcClient; private ArrayList channels = new ArrayList(); /* IrcChannel */ private TechBotService service; private bool isStopped = false; @@ -32,11 +34,11 @@ string password, string chmPath, string mainChm, - string ntstatusXml, - string winerrorXml, - string hresultXml, - string wmXml, - string svnCommand, + //string ntstatusXml, + //string winerrorXml, + //string hresultXml, + //string wmXml, + //string svnCommand, string BugUrl, string WineBugUrl, string SambaBugUrl) @@ -61,42 +63,43 @@ this.SambaBugUrl = SambaBugUrl; } - public void Run() - { - service = new TechBotService(this, - chmPath, - mainChm, - ntstatusXml, - winerrorXml, - hresultXml, - wmXml, - svnCommand, - bugUrl, - WineBugUrl, - SambaBugUrl); - service.Run(); - - client = new IrcClient(); - client.Encoding = System.Text.Encoding.GetEncoding("iso-8859-1"); - client.MessageReceived += new MessageReceivedHandler(client_MessageReceived); - client.ChannelUserDatabaseChanged += new ChannelUserDatabaseChangedHandler(client_ChannelUserDatabaseChanged); - System.Console.WriteLine(String.Format("Connecting to {0} port {1}", - hostname, port)); - client.Connect(hostname, port); - System.Console.WriteLine("Connected..."); - client.Register(botname, password, null); - System.Console.WriteLine(String.Format("Registered as {0}...", botname)); - JoinChannels(); - - while (!isStopped) - { - Thread.Sleep(1000); - } - - PartChannels(); - client.Diconnect(); - System.Console.WriteLine("Disconnected..."); - } + public void Run() + { + service = new TechBotService(this, + chmPath, + mainChm); + //ntstatusXml, + //winerrorXml, + //hresultXml, + //wmXml, + //svnCommand, + //bugUrl, + //WineBugUrl, + //SambaBugUrl); + service.Run(); + + m_IrcClient = new IrcClient(); + m_IrcClient.Encoding = Encoding.GetEncoding("iso-8859-1"); + m_IrcClient.MessageReceived += new MessageReceivedHandler(client_MessageReceived); + m_IrcClient.ChannelUserDatabaseChanged += new ChannelUserDatabaseChangedHandler(client_ChannelUserDatabaseChanged); + Console.WriteLine("Connecting to {0} port {1}", + hostname, + port); + m_IrcClient.Connect(hostname, port); + Console.WriteLine("Connected..."); + m_IrcClient.Register(botname, password, null); + Console.WriteLine("Registered as {0}...", botname); + JoinChannels(); + + while (!isStopped) + { + Thread.Sleep(1000); + } + + PartChannels(); + m_IrcClient.Diconnect(); + Console.WriteLine("Disconnected..."); + } public void Stop() { @@ -107,7 +110,7 @@ { foreach (string channelname in channelnames.Split(new char[] { ';' })) { - IrcChannel channel = client.JoinChannel(channelname); + IrcChannel channel = m_IrcClient.JoinChannel(channelname); channels.Add(channel); System.Console.WriteLine(String.Format("Joined channel #{0}...", channel.Name)); @@ -118,7 +121,7 @@ { foreach (IrcChannel channel in channels) { - client.PartChannel(channel, "Caught in the bitstream..."); + m_IrcClient.PartChannel(channel, "Caught in the bitstream..."); System.Console.WriteLine(String.Format("Parted channel #{0}...", channel.Name)); } @@ -235,11 +238,11 @@ else if (GetTargetNickname(message, out nickname)) { - IrcUser targetUser = new IrcUser(client, + IrcUser targetUser = new IrcUser(m_IrcClient, nickname); if (String.Compare(targetUser.Nickname, botname, true) == 0) { - IrcUser sourceUser = new IrcUser(client, + IrcUser sourceUser = new IrcUser(m_IrcClient, message.PrefixNickname); context = new UserMessageContext(sourceUser); return true; Modified: trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/NtStat… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs Mon Dec 10 22:08:13 2007 @@ -3,35 +3,37 @@ namespace TechBot.Library { - public class NtStatusCommand : BaseCommand, ICommand + public class NtStatusCommand : XmlCommand { - private IServiceOutput serviceOutput; - private string ntstatusXml; - private XmlDocument ntstatusXmlDocument; + public NtStatusCommand(TechBotService techBot) + : base(techBot) + { + } - public NtStatusCommand(IServiceOutput serviceOutput, - string ntstatusXml) - { - this.serviceOutput = serviceOutput; - this.ntstatusXml = ntstatusXml; - ntstatusXmlDocument = new XmlDocument(); - ntstatusXmlDocument.Load(ntstatusXml); - } - + public override string XmlFile + { + get { return Settings.Default.NtStatusXml; } + } + + public override string[] AvailableCommands + { + get { return new string[] { "ntstatus" }; } + } +/* public bool CanHandle(string commandName) { return CanHandle(commandName, new string[] { "ntstatus" }); } - - public void Handle(MessageContext context, +*/ + public override void Handle(MessageContext context, string commandName, string parameters) { string ntstatusText = parameters; if (ntstatusText.Equals(String.Empty)) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, "Please provide a valid NTSTATUS value."); return; } @@ -40,7 +42,7 @@ long ntstatus = np.Parse(ntstatusText); if (np.Error) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is not a valid NTSTATUS value.", ntstatusText)); return; @@ -49,27 +51,27 @@ string description = GetNtstatusDescription(ntstatus); if (description != null) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is {1}.", ntstatusText, description)); } else { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("I don't know about NTSTATUS {0}.", ntstatusText)); } } - - public string Help() + + public override string Help() { return "!ntstatus <value>"; } public string GetNtstatusDescription(long ntstatus) { - XmlElement root = ntstatusXmlDocument.DocumentElement; + XmlElement root = base.m_XmlDocument.DocumentElement; XmlNode node = root.SelectSingleNode(String.Format("Ntstatus[@value='{0}']", ntstatus.ToString("X8"))); if (node != null) Copied: trunk/irc/TechBot/TechBot.Library/Properties/AssemblyInfo.cs (from r31065, trunk/irc/TechBot/TechBot.Library/AssemblyInfo.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Proper… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/AssemblyInfo.cs (original) +++ trunk/irc/TechBot/TechBot.Library/Properties/AssemblyInfo.cs Mon Dec 10 22:08:13 2007 @@ -1,32 +1,32 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following -// attributes. -// -// change them to the information which is associated with the assembly -// you compile. - -[assembly: AssemblyTitle("")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all values by your own or you can build default build and revision -// numbers with the '*' character (the default): - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes specify the key for the sign of your assembly. See the -// .NET Framework documentation for more information about signing. -// This is not required, if you don't want signing let these attributes like they're. -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] +using System.Reflection; +using System.Runtime.CompilerServices; + +// Information about this assembly is defined by the following +// attributes. +// +// change them to the information which is associated with the assembly +// you compile. + +[assembly: AssemblyTitle("")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// The assembly version has following format : +// +// Major.Minor.Build.Revision +// +// You can specify all values by your own or you can build default build and revision +// numbers with the '*' character (the default): + +[assembly: AssemblyVersion("1.0.*")] + +// The following attributes specify the key for the sign of your assembly. See the +// .NET Framework documentation for more information about signing. +// This is not required, if you don't want signing let these attributes like they're. +[assembly: AssemblyDelaySign(false)] +[assembly: AssemblyKeyFile("")] Propchange: trunk/irc/TechBot/TechBot.Library/Properties/AssemblyInfo.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ReactO… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs (added) +++ trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs Mon Dec 10 22:08:13 2007 @@ -1,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace TechBot.Library +{ + class ReactOSBugUrl : BugCommand + { + public ReactOSBugUrl(TechBotService techBot) + : base(techBot) + { + } + + public override string[] AvailableCommands + { + get { return new string[] { "rosbug" }; } + } + + protected override string BugUrl + { + get { return "http://www.reactos.org/bugzilla/show_bug.cgi?id={0}"; } + } + + public override string Help() + { + return "!rosbug <number>"; + } + } +} Propchange: trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/SambaB… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs (added) +++ trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs Mon Dec 10 22:08:13 2007 @@ -1,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace TechBot.Library +{ + class SambaBugUrl : BugCommand + { + public SambaBugUrl(TechBotService techBot) + : base(techBot) + { + } + + public override string[] AvailableCommands + { + get { return new string[] { "sambabug" }; } + } + + protected override string BugUrl + { + get { return "https://bugzilla.samba.org/show_bug.cgi?id={0}"; } + } + + public override string Help() + { + return "!sambabug <number>"; + } + } +} Propchange: trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs (added) +++ trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs Mon Dec 10 22:08:13 2007 @@ -1,0 +1,71 @@ +ï»¿//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:2.0.50727.832 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace TechBot.Library { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("C:\\Ros\\current\\irc\\TechBot\\Resources\\ntstatus.xml")] + public string NtStatusXml { + get { + return ((string)(this["NtStatusXml"])); + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("C:\\Ros\\current\\irc\\TechBot\\Resources\\winerror.xml")] + public string WinErrorXml { + get { + return ((string)(this["WinErrorXml"])); + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("C:\\Ros\\current\\irc\\TechBot\\Resources\\hresult.xml")] + public string HResultXml { + get { + return ((string)(this["HResultXml"])); + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("C:\\Ros\\current\\irc\\TechBot\\Resources\\wm.xml")] + public string WMXml { + get { + return ((string)(this["WMXml"])); + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("svn://svn.reactos.org/trunk/reactos")] + public string SVNRoot { + get { + return ((string)(this["SVNRoot"])); + } + } + } +} Propchange: trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.Library/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Settings.cs (added) +++ trunk/irc/TechBot/TechBot.Library/Settings.cs Mon Dec 10 22:08:13 2007 @@ -1,0 +1,28 @@ +namespace TechBot.Library { + + + // This class allows you to handle specific events on the settings class: + // The SettingChanging event is raised before a setting's value is changed. + // The PropertyChanged event is raised after a setting's value is changed. + // The SettingsLoaded event is raised after the setting values are loaded. + // The SettingsSaving event is raised before the setting values are saved. + internal sealed partial class Settings { + + public Settings() { + // // To add event handlers for saving and changing settings, uncomment the lines below: + // + // this.SettingChanging += this.SettingChangingEventHandler; + // + // this.SettingsSaving += this.SettingsSavingEventHandler; + // + } + + private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) { + // Add code to handle the SettingChangingEvent event here. + } + + private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) { + // Add code to handle the SettingsSaving event here. + } + } +} Propchange: trunk/irc/TechBot/TechBot.Library/Settings.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.Library/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Settings.settings (added) +++ trunk/irc/TechBot/TechBot.Library/Settings.settings Mon Dec 10 22:08:13 2007 @@ -1,0 +1,21 @@ +ï»¿<?xml version='1.0' encoding='utf-8'?> +<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="TechBot.Library" GeneratedClassName="Settings"> + <Profiles /> + <Settings> + <Setting Name="NtStatusXml" Type="System.String" Scope="Application"> + <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\ntstatus.xml</Value> + </Setting> + <Setting Name="WinErrorXml" Type="System.String" Scope="Application"> + <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\winerror.xml</Value> + </Setting> + <Setting Name="HResultXml" Type="System.String" Scope="Application"> + <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\hresult.xml</Value> + </Setting> + <Setting Name="WMXml" Type="System.String" Scope="Application"> + <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\wm.xml</Value> + </Setting> + <Setting Name="SVNRoot" Type="System.String" Scope="Application"> + <Value Profile="(Default)">svn://svn.reactos.org/trunk/reactos</Value> + </Setting> + </Settings> +</SettingsFile> Propchange: trunk/irc/TechBot/TechBot.Library/Settings.settings ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/irc/TechBot/TechBot.Library/SvnCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/SvnCom… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/SvnCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/SvnCommand.cs Mon Dec 10 22:08:13 2007 @@ -2,33 +2,29 @@ namespace TechBot.Library { - public class SvnCommand : BaseCommand, ICommand + public class SvnCommand : Command { - private IServiceOutput serviceOutput; - private string svnCommand; + private string m_SvnRoot; - public SvnCommand(IServiceOutput serviceOutput, - string svnCommand) + public SvnCommand(TechBotService techBot) + : base(techBot) { - this.serviceOutput = serviceOutput; - this.svnCommand = svnCommand; - } - - public bool CanHandle(string commandName) - { - return CanHandle(commandName, - new string[] { "svn" }); + m_SvnRoot = Settings.Default.SVNRoot; } - public void Handle(MessageContext context, + public override string[] AvailableCommands + { + get { return new string[] { "svn" }; } + } + + public override void Handle(MessageContext context, string commandName, string parameters) { - serviceOutput.WriteLine(context, - svnCommand); + TechBot.ServiceOutput.WriteLine(context, string.Format("svn co {0}" , m_SvnRoot)); } - - public string Help() + + public override string Help() { return "!svn"; } Removed: trunk/irc/TechBot/TechBot.Library/TechBot.Library.cmbx URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/TechBot.Library.cmbx (original) +++ trunk/irc/TechBot/TechBot.Library/TechBot.Library.cmbx (removed) @@ -1,16 +1,0 @@ -<Combine fileversion="1.0" name="TechBot.Library" description=""> - <StartMode startupentry="TechBot.Library" single="True"> - <Execute entry="TechBot.Library" type="None" /> - </StartMode> - <Entries> - <Entry filename=".\.\TechBot.Library.prjx" /> - </Entries> - <Configurations active="Debug"> - <Configuration name="Release"> - <Entry name="TechBot.Library" configurationname="Debug" build="False" /> - </Configuration> - <Configuration name="Debug"> - <Entry name="TechBot.Library" configurationname="Debug" build="False" /> - </Configuration> - </Configurations> -</Combine> Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj (original) +++ trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj Mon Dec 10 22:08:13 2007 @@ -40,8 +40,10 @@ --> <ItemGroup> <Compile Include="ApiCommand.cs" /> - <Compile Include="AssemblyInfo.cs" /> <Compile Include="BugCommand.cs" /> + <Compile Include="Commands\Base\XmlCommand.cs" /> + <Compile Include="SambaBugUrl.cs" /> + <Compile Include="WineBugUrl.cs" /> <Compile Include="ErrorCommand.cs" /> <Compile Include="HelpCommand.cs" /> <Compile Include="HresultCommand.cs" /> @@ -50,7 +52,15 @@ <Compile Include="MessageContext.cs" /> <Compile Include="NtStatusCommand.cs" /> <Compile Include="NumberParser.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="ReactOSBugUrl.cs" /> <Compile Include="ServiceOutput.cs" /> + <Compile Include="Settings.cs" /> + <Compile Include="Settings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTimeSharedInput>True</DesignTimeSharedInput> + <DependentUpon>Settings.settings</DependentUpon> + </Compile> <Compile Include="SvnCommand.cs" /> <Compile Include="TechBotService.cs" /> <Compile Include="WinerrorCommand.cs" /> @@ -72,6 +82,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <Folder Include="Properties\" /> + <None Include="app.config" /> + <None Include="Settings.settings"> + <Generator>SettingsSingleFileGenerator</Generator> + <LastGenOutput>Settings.Designer.cs</LastGenOutput> + </None> </ItemGroup> </Project> Removed: trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx (original) +++ trunk/irc/TechBot/TechBot.Library/TechBot.Library.prjx (removed) @@ -1,43 +1,0 @@ -<Project name="TechBot.Library" standardNamespace="TechBot.Library" description="" newfilesearch="None" enableviewstate="True" version="1.1" projecttype="C#"> - <Contents> - <File name=".\AssemblyInfo.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\Default.build" subtype="Code" buildaction="Nothing" dependson="" data="" /> - <File name=".\TechBotService.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\ServiceOutput.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\IrcService.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\ApiCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\ICommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\HelpCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\NtStatusCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\NumberParser.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\HresultCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\WinerrorCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\ErrorCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\SvnCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\BugCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\WmCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - <File name=".\MessageContext.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> - </Contents> - <References> - <Reference type="Project" refto="CHMLibrary" localcopy="True" /> - <Reference type="Project" refto="TechBot.IRCLibrary" localcopy="True" /> - </References> - <DeploymentInformation target="" script="" strategy="File" /> - <Configuration runwithwarnings="True" name="Debug"> - <CodeGeneration runtime="MsNet" compiler="Csc" compilerversion="" warninglevel="4" nowarn="" includedebuginformation="True" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" target="Library" definesymbols="" generatexmldocumentation="False" win32Icon="" noconfig="False" nostdlib="False" /> - <Execution commandlineparameters="" consolepause="False" /> - <Output directory="..\bin\Debug" assembly="TechBot.Library" executeScript="" executeBeforeBuild="" executeAfterBuild="" executeBeforeBuildArguments="" executeAfterBuildArguments="" /> - </Configuration> - <Configurations active="Debug"> - <Configuration runwithwarnings="True" name="Debug"> - <CodeGeneration runtime="MsNet" compiler="Csc" compilerversion="" warninglevel="4" nowarn="" includedebuginformation="True" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" target="Library" definesymbols="" generatexmldocumentation="False" win32Icon="" noconfig="False" nostdlib="False" /> - <Execution commandlineparameters="" consolepause="False" /> - <Output directory="..\bin\Debug" assembly="TechBot.Library" executeScript="" executeBeforeBuild="" executeAfterBuild="" executeBeforeBuildArguments="" executeAfterBuildArguments="" /> - </Configuration> - <Configuration runwithwarnings="True" name="Release"> - <CodeGeneration runtime="MsNet" compiler="Csc" compilerversion="" warninglevel="4" nowarn="" includedebuginformation="False" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" mainclass="" target="Library" definesymbols="" generatexmldocumentation="False" win32Icon="" noconfig="False" nostdlib="False" /> - <Execution commandlineparameters="" consolepause="False" /> - <Output directory="..\bin\Release" assembly="TechBot.Library" executeScript="" executeBeforeBuild="" executeAfterBuild="" executeBeforeBuildArguments="" executeAfterBuildArguments="" /> - </Configuration> - </Configurations> -</Project> Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/TechBotService.cs (original) +++ trunk/irc/TechBot/TechBot.Library/TechBotService.cs Mon Dec 10 22:08:13 2007 @@ -1,5 +1,6 @@ using System; using System.Collections; +using System.Collections.Generic; using System.IO; using System.Data; using System.Threading; @@ -18,19 +19,19 @@ private string wmXml; private string svnCommand; private string bugUrl, WineBugUrl, SambaBugUrl; - private ArrayList commands = new ArrayList(); + private List<Command> commands = new List<Command>(); public TechBotService(IServiceOutput serviceOutput, string chmPath, - string mainChm, - string ntstatusXml, - string winerrorXml, - string hresultXml, - string wmXml, - string svnCommand, - string bugUrl, - string WineBugUrl, - string SambaBugUrl) + string mainChm) + //string ntstatusXml, + //string winerrorXml, + //string hresultXml, + //string wmXml, + //string svnCommand, + //string bugUrl, + //string WineBugUrl, + //string SambaBugUrl) { this.serviceOutput = serviceOutput; this.chmPath = chmPath; @@ -44,33 +45,33 @@ this.WineBugUrl = WineBugUrl; this.SambaBugUrl = SambaBugUrl; } - - public void Run() - { - commands.Add(new HelpCommand(serviceOutput, - commands)); - /*commands.Add(new ApiCommand(serviceOutput, - chmPath, - mainChm));*/ - commands.Add(new NtStatusCommand(serviceOutput, - ntstatusXml)); - commands.Add(new WinerrorCommand(serviceOutput, - winerrorXml)); - commands.Add(new HresultCommand(serviceOutput, - hresultXml)); - commands.Add(new ErrorCommand(serviceOutput, - ntstatusXml, - winerrorXml, - hresultXml)); - commands.Add(new WmCommand(serviceOutput, - wmXml)); - commands.Add(new SvnCommand(serviceOutput, - svnCommand)); - commands.Add(new BugCommand(serviceOutput, - bugUrl, - WineBugUrl, - SambaBugUrl)); - } + + public void Run() + { + commands.Add(new HelpCommand(this)); + /*commands.Add(new ApiCommand(serviceOutput, + chmPath, + mainChm));*/ + commands.Add(new NtStatusCommand(this)); + commands.Add(new WinerrorCommand(this)); + commands.Add(new HResultCommand(this)); + commands.Add(new ErrorCommand(this)); + commands.Add(new WMCommand(this)); + commands.Add(new SvnCommand(this)); + commands.Add(new ReactOSBugUrl(this)); + commands.Add(new SambaBugUrl(this)); + commands.Add(new WineBugUrl(this)); + } + + public IServiceOutput ServiceOutput + { + get { return serviceOutput; } + } + + public IList<Command> Commands + { + get { return commands; } + } public void InjectMessage(MessageContext context, string message) @@ -94,23 +95,27 @@ message = message.Substring(1).Trim(); int index = message.IndexOf(' '); string commandName; - string parameters = ""; + string commandParams = ""; if (index != -1) { commandName = message.Substring(0, index).Trim(); - parameters = message.Substring(index).Trim(); + commandParams = message.Substring(index).Trim(); } else commandName = message.Trim(); - foreach (ICommand command in commands) + foreach (Command command in commands) { - if (command.CanHandle(commandName)) - { - command.Handle(context, - commandName, parameters); - return; - } + foreach (string cmd in command.AvailableCommands) + { + if (cmd == commandName) + { + command.Handle(context, + commandName, + commandParams); + return; + } + } } } } Added: trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/WineBu… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs (added) +++ trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs Mon Dec 10 22:08:13 2007 @@ -1,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace TechBot.Library +{ + class WineBugUrl : BugCommand + { + public WineBugUrl(TechBotService techBot) + : base(techBot) + { + } + + public override string[] AvailableCommands + { + get { return new string[] { "winebug" }; } + } + + protected override string BugUrl + { + get { return "http://bugs.winehq.org/show_bug.cgi?id={0}"; } + } + + public override string Help() + { + return "!winebug <number>"; + } + } +} Propchange: trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Winerr… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs Mon Dec 10 22:08:13 2007 @@ -3,35 +3,31 @@ namespace TechBot.Library { - public class WinerrorCommand : BaseCommand, ICommand + public class WinerrorCommand : XmlCommand { - private IServiceOutput serviceOutput; - private string winerrorXml; - private XmlDocument winerrorXmlDocument; - - public WinerrorCommand(IServiceOutput serviceOutput, - string winerrorXml) + public WinerrorCommand(TechBotService techBot) + : base(techBot) { - this.serviceOutput = serviceOutput; - this.winerrorXml = winerrorXml; - winerrorXmlDocument = new XmlDocument(); - winerrorXmlDocument.Load(winerrorXml); - } - - public bool CanHandle(string commandName) - { - return CanHandle(commandName, - new string[] { "winerror" }); } - public void Handle(MessageContext context, + public override string XmlFile + { + get { return Settings.Default.WinErrorXml; } + } + + public override string[] AvailableCommands + { + get { return new string[] { "winerror" }; } + } + + public override void Handle(MessageContext context, string commandName, string parameters) { string winerrorText = parameters; if (winerrorText.Equals(String.Empty)) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, "Please provide a valid System Error Code value."); return; } @@ -40,7 +36,7 @@ long winerror = np.Parse(winerrorText); if (np.Error) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is not a valid System Error Code value.", winerrorText)); return; @@ -49,27 +45,27 @@ string description = GetWinerrorDescription(winerror); if (description != null) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is {1}.", winerrorText, description)); } else { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("I don't know about System Error Code {0}.", winerrorText)); } } - - public string Help() + + public override string Help() { return "!winerror <value>"; } public string GetWinerrorDescription(long winerror) { - XmlElement root = winerrorXmlDocument.DocumentElement; + XmlElement root = base.m_XmlDocument.DocumentElement; XmlNode node = root.SelectSingleNode(String.Format("Winerror[@value='{0}']", winerror)); if (node != null) Modified: trunk/irc/TechBot/TechBot.Library/WmCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/WmComm… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/WmCommand.cs (original) +++ trunk/irc/TechBot/TechBot.Library/WmCommand.cs Mon Dec 10 22:08:13 2007 @@ -3,35 +3,31 @@ namespace TechBot.Library { - public class WmCommand : BaseCommand, ICommand + public class WMCommand : XmlCommand { - private IServiceOutput serviceOutput; - private string wmXml; - private XmlDocument wmXmlDocument; - - public WmCommand(IServiceOutput serviceOutput, - string wmXml) + public WMCommand(TechBotService techBot) + : base(techBot) { - this.serviceOutput = serviceOutput; - this.wmXml = wmXml; - wmXmlDocument = new XmlDocument(); - wmXmlDocument.Load(wmXml); - } - - public bool CanHandle(string commandName) - { - return CanHandle(commandName, - new string[] { "wm" }); } - public void Handle(MessageContext context, + public override string XmlFile + { + get { return Settings.Default.WMXml; } + } + + public override string[] AvailableCommands + { + get { return new string[] { "wm" }; } + } + + public override void Handle(MessageContext context, string commandName, string parameters) { string wmText = parameters; if (wmText.Equals(String.Empty)) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, "Please provide a valid window message value or name."); return; } @@ -51,27 +47,27 @@ if (output != null) { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("{0} is {1}.", wmText, output)); } else { - serviceOutput.WriteLine(context, + TechBot.ServiceOutput.WriteLine(context, String.Format("I don't know about window message {0}.", wmText)); } } - - public string Help() + + public override string Help() { return "!wm <value> or !wm <name>"; } private string GetWmDescription(long wm) { - XmlElement root = wmXmlDocument.DocumentElement; + XmlElement root = base.m_XmlDocument.DocumentElement; XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@value='{0}']", wm)); if (node != null) @@ -87,7 +83,7 @@ private string GetWmNumber(string wmName) { - XmlElement root = wmXmlDocument.DocumentElement; + XmlElement root = base.m_XmlDocument.DocumentElement; XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@text='{0}']", wmName)); if (node != null) Added: trunk/irc/TechBot/TechBot.Library/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/app.co… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/app.config (added) +++ trunk/irc/TechBot/TechBot.Library/app.config Mon Dec 10 22:08:13 2007 @@ -1,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <configSections> + <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > + <section name="TechBot.Library.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + </sectionGroup> + </configSections> + <applicationSettings> + <TechBot.Library.Settings> + <setting name="NtStatusXml" serializeAs="String"> + <value>C:\Ros\current\irc\TechBot\Resources\ntstatus.xml</value> + </setting> + <setting name="WinErrorXml" serializeAs="String"> + <value>C:\Ros\current\irc\TechBot\Resources\winerror.xml</value> + </setting> + <setting name="HResultXml" serializeAs="String"> + <value>C:\Ros\current\irc\TechBot\Resources\hresult.xml</value> + </setting> + <setting name="WMXml" serializeAs="String"> + <value>C:\Ros\current\irc\TechBot\Resources\wm.xml</value> + </setting> + <setting name="SVNRoot" serializeAs="String"> + <value>svn://svn.reactos.org/trunk/reactos</value> + </setting> + </TechBot.Library.Settings> + </applicationSettings> +</configuration> Propchange: trunk/irc/TechBot/TechBot.Library/app.config ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/ServiceThread.… ============================================================================== --- trunk/irc/TechBot/TechBot/ServiceThread.cs (original) +++ trunk/irc/TechBot/TechBot/ServiceThread.cs Mon Dec 10 22:08:13 2007 @@ -58,11 +58,11 @@ IRCBotPassword, ChmPath, MainChm, - NtstatusXml, - WinerrorXml, - HresultXml, - WmXml, - SvnCommand, + //NtstatusXml, + //WinerrorXml, + //HresultXml, + //WmXml, + //SvnCommand, BugUrl, WineBugUrl, SambaBugUrl); Modified: trunk/irc/TechBot/TechBot/TechBot.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBot.csproj… ============================================================================== --- trunk/irc/TechBot/TechBot/TechBot.csproj (original) +++ trunk/irc/TechBot/TechBot/TechBot.csproj Mon Dec 10 22:08:13 2007 @@ -10,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TechBot</RootNamespace> <AssemblyName>TechBot</AssemblyName> + <StartupObject>TechBot.TechBotService</StartupObject> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols>

1 0

[cwittich] 31129: Alexandre Julliard : Fix a compiler warning. <julliard at winehq.org>
by cwittich＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: cwittich Date: Mon Dec 10 21:49:56 2007 New Revision: 31129 URL: http://svn.reactos.org/svn/reactos?rev=31129&view=rev Log: Alexandre Julliard : Fix a compiler warning. <julliard at winehq.org> Modified: trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c Mon Dec 10 21:49:56 2007 @@ -771,7 +771,7 @@ SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } -static void add_font(LPWSTR fontName, DWORD fontType, HWND hListWnd, NEWTEXTMETRICEXW *ntmc) +static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, NEWTEXTMETRICEXW *ntmc) { COMBOBOXEXITEMW cbItem; WCHAR buffer[MAX_PATH]; @@ -789,7 +789,8 @@ else break; } - cbItem.pszText = fontName; + cbItem.pszText = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(fontName) + 1)*sizeof(WCHAR) ); + lstrcpyW( cbItem.pszText, fontName ); cbItem.mask |= CBEIF_LPARAM; if(fontType & RASTER_FONTTYPE) @@ -797,6 +798,7 @@ cbItem.lParam = MAKELONG(fontType,fontHeight); SendMessageW(hListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbItem); + HeapFree( GetProcessHeap(), 0, cbItem.pszText ); } static void dialog_choose_font(void)

1 0

[dchapyshev] 31128: - Add icons for buttons on "Hardware Profiles" dialog
by dchapyshev＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: dchapyshev Date: Mon Dec 10 21:20:02 2007 New Revision: 31128 URL: http://svn.reactos.org/svn/reactos?rev=31128&view=rev Log: - Add icons for buttons on "Hardware Profiles" dialog Added: trunk/reactos/dll/cpl/sysdm/resources/down.ico (with props) trunk/reactos/dll/cpl/sysdm/resources/up.ico (with props) Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/sysdm.rc Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c Mon Dec 10 21:20:02 2007 @@ -53,8 +53,16 @@ switch (uMsg) { case WM_INITDIALOG: + { + SendMessage(GetDlgItem(hwndDlg, IDC_HRDPROFUP), + BM_SETIMAGE,(WPARAM)IMAGE_ICON, + (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_UP))); + SendMessage(GetDlgItem(hwndDlg, IDC_HRDPROFDWN), + BM_SETIMAGE,(WPARAM)IMAGE_ICON, + (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_DOWN))); MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); - break; + } + break; case WM_COMMAND: switch (LOWORD(wParam)) Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc Mon Dec 10 21:20:02 2007 @@ -84,8 +84,8 @@ LTEXT "Sie können Hardware-Profile für verschiedene Hardware-Konfigurationen einrichten. Beim Starten können Sie dann das Profil auswählen, welches benutzt werden soll.", IDC_STATIC, 46, 11, 200, 25 LTEXT "Verfügbare Hardware-Profile:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "&Eigenschaften", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "&Kopieren", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "&Umbenennen", IDC_HRDPROFRENAME, 118, 106, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc Mon Dec 10 21:20:02 2007 @@ -76,8 +76,8 @@ LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Available hardware profiles:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "&Properties", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "&Copy", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "&Rename", IDC_HRDPROFRENAME, 118, 106, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc Mon Dec 10 21:20:02 2007 @@ -79,8 +79,8 @@ LTEXT "Vous pouvez paramétrer des profils matériels pour différentes configurations matérielles. Au démarrage, vous pouvez choisir le profil désiré.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Profils Matériels disponibles:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "&Propriétés", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "&Copier", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "&Renommer", IDC_HRDPROFRENAME, 118, 106, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc Mon Dec 10 21:20:02 2007 @@ -76,8 +76,8 @@ LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Available hardware profiles:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "&Properties", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "&Copy", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "&Rename", IDC_HRDPROFRENAME, 118, 106, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc Mon Dec 10 21:20:02 2007 @@ -76,8 +76,8 @@ LTEXT "Profili Hardware mette a disposizione un modo per definire e memorizzare diverse configurazioni hardware. All'avvio del computer è possibile scegliere quale usare.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Profili Hardware disponibili:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "&Proprietà", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "&Copia", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "&Rinomina", IDC_HRDPROFRENAME, 118, 106, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc Mon Dec 10 21:20:02 2007 @@ -80,8 +80,8 @@ LTEXT "Mo¿esz okreliæ profile sprzêtu dla ró¿nych konfiguracji sprzêtu. Podczas uruchamiania mo¿esz wybraæ profil, którego chcesz u¿yæ.", IDC_STATIC, 46, 11, 188, 25 LTEXT "&Dostêpne profile sprzêtu:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "&W³aciwoci", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "&Kopiuj", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "Z&mieñ nazwê", IDC_HRDPROFRENAME, 118, 106, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc Mon Dec 10 21:20:02 2007 @@ -76,8 +76,8 @@ LTEXT "Ìîæíî ñîçäàòü íåñêîëüêî ïðîôèëåé äëÿ ðàçëè÷íûõ êîíôèãóðàöèé îáîðóäîâàíèÿ è âûáðàòü íóæíûé ïðè çàãðóçêå ñèñòåìû.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Äîñòóïíûå ïðîôèëè îáîðóäîâàíèÿ:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "Ñâîéñòâà", IDC_HRDPROFPROP, 8, 106, 47, 14 PUSHBUTTON "Êîïèðîâàòü", IDC_HRDPROFCOPY, 60, 106, 47, 14 PUSHBUTTON "Ïåðåèìåíîâàòü", IDC_HRDPROFRENAME, 112, 106, 59, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc Mon Dec 10 21:20:02 2007 @@ -85,8 +85,8 @@ LTEXT "Pre rôzne hardvérové konfigurácie môete nastavi hardvérové profily. Pri spustení je moné vybra profil, ktorý chcete pouíva.", IDC_STATIC, 46, 11, 188, 25 LTEXT "&Dostupné hardvérové profily:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "Vl&astnosti", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "&Kopírova", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "Pr&emenova", IDC_HRDPROFRENAME, 118, 106, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc Mon Dec 10 21:20:02 2007 @@ -84,8 +84,8 @@ LTEXT "Ìîæíà ñòâîðèòè äåê³ëüêà ïðîô³ë³â äëÿ ð³çíèõ êîíô³ãóðàö³é óñòàòêóâàííÿ é âèáèðàòè ïîòð³áíèé ïðîô³ëü ï³ä ÷àñ çàâàíòàæåííÿ ñèñòåìè.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Íàÿâí³ ïðîô³ë³ óñòàòêóâàííÿ:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON PUSHBUTTON "Â&ëàñòèâîñò³", IDC_HRDPROFPROP, 8, 106, 50, 14 PUSHBUTTON "&Êîï³þâàòè", IDC_HRDPROFCOPY, 63, 106, 50, 14 PUSHBUTTON "Ïåðåé&ìåíóâàòè", IDC_HRDPROFRENAME, 118, 106, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h Mon Dec 10 21:20:02 2007 @@ -7,6 +7,8 @@ #define IDI_DEVMGR 51 #define IDI_HARDPROF 52 #define IDI_USERPROF 53 +#define IDI_UP 2500 +#define IDI_DOWN 2501 #define IDB_ROSBMP 55 Added: trunk/reactos/dll/cpl/sysdm/resources/down.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/do… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/sysdm/resources/down.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/sysdm/resources/up.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/up… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/sysdm/resources/up.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Mon Dec 10 21:20:02 2007 @@ -16,6 +16,8 @@ IDI_USERPROF ICON "resources/devmgr.ico" IDI_HARDPROF ICON "resources/devmgr.ico" IDI_DEVMGR ICON "resources/devmgr.ico" +IDI_UP ICON "resources/up.ico" +IDI_DOWN ICON "resources/down.ico" IDB_ROSBMP BITMAP "resources/rosbitmap.bmp" RC_LICENSE RTDATA "resources/gpl.txt"

1 0

[dchapyshev] 31127: - Add some headers from wine
by dchapyshev＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: dchapyshev Date: Mon Dec 10 20:46:08 2007 New Revision: 31127 URL: http://svn.reactos.org/svn/reactos?rev=31127&view=rev Log: - Add some headers from wine Added: trunk/reactos/include/psdk/adshlp.h (with props) trunk/reactos/include/psdk/icm.h (with props) trunk/reactos/include/psdk/mprapi.h (with props) trunk/reactos/include/psdk/ntdsapi.h (with props) trunk/reactos/include/psdk/sfc.h (with props) trunk/reactos/include/psdk/svrapi.h (with props) trunk/reactos/include/psdk/tapi.h (with props) trunk/reactos/include/psdk/wincred.h (with props) Added: trunk/reactos/include/psdk/adshlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/adshlp.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/adshlp.h (added) +++ trunk/reactos/include/psdk/adshlp.h Mon Dec 10 20:46:08 2007 @@ -1,0 +1,36 @@ +/* + * Copyright (C) 2005 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ADSHLP_H +#define __WINE_ADSHLP_H + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI ADsBuildEnumerator(IADsContainer*,IEnumVARIANT**); +HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*); +HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**); +HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**); +BOOL WINAPI FreeADsMem(LPVOID); + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/psdk/adshlp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/icm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/icm.h?rev=311… ============================================================================== --- trunk/reactos/include/psdk/icm.h (added) +++ trunk/reactos/include/psdk/icm.h Mon Dec 10 20:46:08 2007 @@ -1,0 +1,433 @@ +/* + * Copyright 2004 (C) Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ICM_H +#define __WINE_ICM_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef HANDLE HPROFILE; +typedef HPROFILE *PHPROFILE; +typedef HANDLE HTRANSFORM; + +typedef DWORD TAGTYPE, *PTAGTYPE, *LPTAGTYPE; + +typedef char COLOR_NAME[32]; +typedef COLOR_NAME *PCOLOR_NAME, *LPCOLOR_NAME; + +typedef struct tagNAMED_PROFILE_INFO +{ + DWORD dwFlags; + DWORD dwCount; + DWORD dwCountDevCoordinates; + COLOR_NAME szPrefix; + COLOR_NAME szSuffix; +} NAMED_PROFILE_INFO, *PNAMED_PROFILE_INFO, *LPNAMED_PROFILE_INFO; + +#define MAX_COLOR_CHANNELS 8 + +struct GRAYCOLOR +{ + WORD gray; +}; + +struct RGBCOLOR +{ + WORD red; + WORD green; + WORD blue; +}; + +struct CMYKCOLOR +{ + WORD cyan; + WORD magenta; + WORD yellow; + WORD black; +}; + +struct XYZCOLOR +{ + WORD X; + WORD Y; + WORD Z; +}; + +struct YxyCOLOR +{ + WORD Y; + WORD x; + WORD y; +}; + +struct LabCOLOR +{ + WORD L; + WORD a; + WORD b; +}; + +struct GENERIC3CHANNEL +{ + WORD ch1; + WORD ch2; + WORD ch3; +}; + +struct NAMEDCOLOR +{ + DWORD dwIndex; +}; + +struct HiFiCOLOR +{ + BYTE channel[MAX_COLOR_CHANNELS]; +}; + +typedef union tagCOLOR +{ + struct GRAYCOLOR gray; + struct RGBCOLOR rgb; + struct CMYKCOLOR cmyk; + struct XYZCOLOR XYZ; + struct YxyCOLOR Yxy; + struct LabCOLOR Lab; + struct GENERIC3CHANNEL gen3ch; + struct NAMEDCOLOR named; + struct HiFiCOLOR hifi; + struct + { + DWORD reserved1; + VOID *reserved2; + } DUMMYSTRUCTNAME; +} COLOR, *PCOLOR, *LPCOLOR; + +typedef enum +{ + COLOR_GRAY = 1, + COLOR_RGB, + COLOR_XYZ, + COLOR_Yxy, + COLOR_Lab, + COLOR_3_CHANNEL, + COLOR_CMYK, + COLOR_5_CHANNEL, + COLOR_6_CHANNEL, + COLOR_7_CHANNEL, + COLOR_8_CHANNEL, + COLOR_NAMED, +} COLORTYPE, *PCOLORTYPE, *LPCOLORTYPE; + +typedef enum +{ + BM_x555RGB = 0x00, + BM_565RGB = 0x01, + BM_RGBTRIPLETS = 0x02, + BM_BGRTRIPLETS = 0x04, + BM_xRGBQUADS = 0x08, + BM_10b_RGB = 0x09, + BM_16b_RGB = 0x0a, + BM_xBGRQUADS = 0x10, + BM_CMYKQUADS = 0x20, + BM_x555XYZ = 0x101, + BM_x555Yxz, + BM_x555Lab, + BM_x555G3CH, + BM_XYZTRIPLETS = 0x201, + BM_YxyTRIPLETS, + BM_LabTRIPLETS, + BM_G3CHTRIPLETS, + BM_5CHANNEL, + BM_6CHANNEL, + BM_7CHANNEL, + BM_8CHANNEL, + BM_GRAY, + BM_xXYZQUADS = 0x301, + BM_xYxyQUADS, + BM_xLabQUADS, + BM_xG3CHQUADS, + BM_KYMCQUADS, + BM_10b_XYZ = 0x401, + BM_10b_Yxy, + BM_10b_Lab, + BM_10b_G3CH, + BM_NAMED_INDEX, + BM_16b_XYZ = 0x501, + BM_16b_Yxy, + BM_16b_Lab, + BM_16b_G3CH, + BM_16b_GRAY, +} BMFORMAT, *PBMFORMAT, *LPBMFORMAT; + +typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); +typedef PBMCALLBACKFN LPPBMCALLBACKFN; + +typedef struct tagPROFILEHEADER +{ + DWORD phSize; + DWORD phCMMType; + DWORD phVersion; + DWORD phClass; + DWORD phDataColorSpace; + DWORD phConnectionSpace; + DWORD phDateTime[3]; + DWORD phSignature; + DWORD phPlatform; + DWORD phProfileFlags; + DWORD phManufacturer; + DWORD phModel; + DWORD phAttributes[2]; + DWORD phRenderingIntent; + CIEXYZ phIlluminant; + DWORD phCreator; + BYTE phReserved[44]; +} PROFILEHEADER, *PPROFILEHEADER, *LPPROFILEHEADER; + +typedef struct tagPROFILE +{ + DWORD dwType; + PVOID pProfileData; + DWORD cbDataSize; +} PROFILE, *PPROFILE, *LPPROFILE; + +#define ENUM_TYPE_VERSION 0x0300 + +typedef struct tagENUMTYPEA +{ + DWORD dwSize; + DWORD dwVersion; + DWORD dwFields; + PCSTR pDeviceName; + DWORD dwMediaType; + DWORD dwDitheringMode; + DWORD dwResolution[2]; + DWORD dwCMMType; + DWORD dwClass; + DWORD dwDataColorSpace; + DWORD dwConnectionSpace; + DWORD dwSignature; + DWORD dwPlatform; + DWORD dwProfileFlags; + DWORD dwManufacturer; + DWORD dwModel; + DWORD dwAttributes[2]; + DWORD dwRenderingIntent; + DWORD dwCreator; + DWORD dwDeviceClass; +} ENUMTYPEA, *PENUMTYPEA, *LPENUMTYPEA; + +typedef struct tagENUMTYPEW +{ + DWORD dwSize; + DWORD dwVersion; + DWORD dwFields; + PCWSTR pDeviceName; + DWORD dwMediaType; + DWORD dwDitheringMode; + DWORD dwResolution[2]; + DWORD dwCMMType; + DWORD dwClass; + DWORD dwDataColorSpace; + DWORD dwConnectionSpace; + DWORD dwSignature; + DWORD dwPlatform; + DWORD dwProfileFlags; + DWORD dwManufacturer; + DWORD dwModel; + DWORD dwAttributes[2]; + DWORD dwRenderingIntent; + DWORD dwCreator; + DWORD dwDeviceClass; +} ENUMTYPEW, *PENUMTYPEW, *LPENUMTYPEW; + +#define ET_DEVICENAME 0x00000001 +#define ET_MEDIATYPE 0x00000002 +#define ET_DITHERMODE 0x00000004 +#define ET_RESOLUTION 0x00000008 +#define ET_CMMTYPE 0x00000010 +#define ET_CLASS 0x00000020 +#define ET_DATACOLORSPACE 0x00000040 +#define ET_CONNECTIONSPACE 0x00000080 +#define ET_SIGNATURE 0x00000100 +#define ET_PLATFORM 0x00000200 +#define ET_PROFILEFLAGS 0x00000400 +#define ET_MANUFACTURER 0x00000800 +#define ET_MODEL 0x00001000 +#define ET_ATTRIBUTES 0x00002000 +#define ET_RENDERINGINTENT 0x00004000 +#define ET_CREATOR 0x00008000 +#define ET_DEVICECLASS 0x00010000 + +struct _tagCOLORMATCHSETUPA; +struct _tagCOLORMATCHSETUPW; + +typedef BOOL (WINAPI *PCMSCALLBACKA)(struct _tagCOLORMATCHSETUPA*,LPARAM); +typedef BOOL (WINAPI *PCMSCALLBACKW)(struct _tagCOLORMATCHSETUPW*,LPARAM); + +typedef struct _tagCOLORMATCHSETUPA +{ + DWORD dwSize; + DWORD dwVersion; + DWORD dwFlags; + HWND hwndOwner; + PCSTR pSourceName; + PCSTR pDisplayName; + PCSTR pPrinterName; + DWORD dwRenderIntent; + DWORD dwProofingIntent; + PSTR pMonitorProfile; + DWORD ccMonitorProfile; + PSTR pPrinterProfile; + DWORD ccPrinterProfile; + PSTR pTargetProfile; + DWORD ccTargetProfile; + DLGPROC lpfnHook; + LPARAM lParam; + PCMSCALLBACKA lpfnApplyCallback; + LPARAM lParamApplyCallback; +} COLORMATCHSETUPA, *PCOLORMATCHSETUPA, *LPCOLORMATCHSETUPA; + +typedef struct _tagCOLORMATCHSETUPW +{ + DWORD dwSize; + DWORD dwVersion; + DWORD dwFlags; + HWND hwndOwner; + PCWSTR pSourceName; + PCWSTR pDisplayName; + PCWSTR pPrinterName; + DWORD dwRenderIntent; + DWORD dwProofingIntent; + PWSTR pMonitorProfile; + DWORD ccMonitorProfile; + PWSTR pPrinterProfile; + DWORD ccPrinterProfile; + PWSTR pTargetProfile; + DWORD ccTargetProfile; + DLGPROC lpfnHook; + LPARAM lParam; + PCMSCALLBACKW lpfnApplyCallback; + LPARAM lParamApplyCallback; +} COLORMATCHSETUPW, *PCOLORMATCHSETUPW, *LPCOLORMATCHSETUPW; + +BOOL WINAPI AssociateColorProfileWithDeviceA(PCSTR,PCSTR,PCSTR); +BOOL WINAPI AssociateColorProfileWithDeviceW(PCWSTR,PCWSTR,PCWSTR); +#define AssociateColorProfileWithDevice WINELIB_NAME_AW(AssociateColorProfileWithDevice) +BOOL WINAPI CheckBitmapBits(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PBYTE,PBMCALLBACKFN,LPARAM); +BOOL WINAPI CheckColors(HTRANSFORM,PCOLOR,DWORD,COLORTYPE,PBYTE); +BOOL WINAPI ConvertColorNameToIndex(HPROFILE,PCOLOR_NAME,PDWORD,DWORD); +BOOL WINAPI ConvertIndexToColorName(HPROFILE,PDWORD,PCOLOR_NAME,DWORD); +BOOL WINAPI CloseColorProfile(HPROFILE); +HTRANSFORM WINAPI CreateColorTransformA(LPLOGCOLORSPACEA,HPROFILE,HPROFILE,DWORD); +HTRANSFORM WINAPI CreateColorTransformW(LPLOGCOLORSPACEW,HPROFILE,HPROFILE,DWORD); +#define CreateColorTransform WINELIB_NAME_AW(CreateColorTransform) +BOOL WINAPI CreateDeviceLinkProfile(PHPROFILE,DWORD,PDWORD,DWORD,DWORD,PBYTE*,DWORD); +HTRANSFORM WINAPI CreateMultiProfileTransform(PHPROFILE,DWORD,PDWORD,DWORD,DWORD,DWORD); +BOOL WINAPI CreateProfileFromLogColorSpaceA(LPLOGCOLORSPACEA,PBYTE*); +BOOL WINAPI CreateProfileFromLogColorSpaceW(LPLOGCOLORSPACEW,PBYTE*); +#define CreateProfileFromLogColorSpace WINELIB_NAME_AW(CreateProfileFromLogColorSpace) +BOOL WINAPI DeleteColorTransform(HTRANSFORM); +BOOL WINAPI DisassociateColorProfileFromDeviceA(PCSTR,PCSTR,PCSTR); +BOOL WINAPI DisassociateColorProfileFromDeviceW(PCWSTR,PCWSTR,PCWSTR); +#define DisassociateColorProfileFromDevice WINELIB_NAME_AW(DisassociateColorProfileFromDevice) +BOOL WINAPI EnumColorProfilesA(PCSTR,PENUMTYPEA,PBYTE,PDWORD,PDWORD); +BOOL WINAPI EnumColorProfilesW(PCWSTR,PENUMTYPEW,PBYTE,PDWORD,PDWORD); +#define EnumColorProfiles WINELIB_NAME_AW(EnumColorProfiles) +DWORD WINAPI GenerateCopyFilePaths(LPCWSTR,LPCWSTR,LPBYTE,DWORD,LPWSTR,LPDWORD,LPWSTR,LPDWORD,DWORD); +DWORD WINAPI GetCMMInfo(HTRANSFORM,DWORD); +BOOL WINAPI GetColorDirectoryA(PCSTR,PSTR,PDWORD); +BOOL WINAPI GetColorDirectoryW(PCWSTR,PWSTR,PDWORD); +#define GetColorDirectory WINELIB_NAME_AW(GetColorDirectory) +BOOL WINAPI GetColorProfileElement(HPROFILE,TAGTYPE,DWORD,PDWORD,PVOID,PBOOL); +BOOL WINAPI GetColorProfileElementTag(HPROFILE,DWORD,PTAGTYPE); +BOOL WINAPI GetColorProfileFromHandle(HPROFILE,PBYTE,PDWORD); +BOOL WINAPI GetColorProfileHeader(HPROFILE,PPROFILEHEADER); +HCOLORSPACE WINAPI GetColorSpace(HDC); +BOOL WINAPI GetCountColorProfileElements(HPROFILE,PDWORD); +BOOL WINAPI GetNamedProfileInfo(HPROFILE,PNAMED_PROFILE_INFO); +BOOL WINAPI GetPS2ColorRenderingDictionary(HPROFILE,DWORD,PBYTE,PDWORD,PBOOL); +BOOL WINAPI GetPS2ColorRenderingIntent(HPROFILE,DWORD,PBYTE,PDWORD); +BOOL WINAPI GetPS2ColorSpaceArray(HPROFILE,DWORD,DWORD,PBYTE,PDWORD,PBOOL); +BOOL WINAPI GetStandardColorSpaceProfileA(PCSTR,DWORD,PSTR,PDWORD); +BOOL WINAPI GetStandardColorSpaceProfileW(PCWSTR,DWORD,PWSTR,PDWORD); +#define GetStandardColorSpaceProfile WINELIB_NAME_AW(GetStandardColorSpaceProfile) +BOOL WINAPI InstallColorProfileA(PCSTR,PCSTR); +BOOL WINAPI InstallColorProfileW(PCWSTR,PCWSTR); +#define InstallColorProfile WINELIB_NAME_AW(InstallColorProfile) +BOOL WINAPI IsColorProfileTagPresent(HPROFILE,TAGTYPE,PBOOL); +BOOL WINAPI IsColorProfileValid(HPROFILE,PBOOL); +HPROFILE WINAPI OpenColorProfileA(PPROFILE,DWORD,DWORD,DWORD); +HPROFILE WINAPI OpenColorProfileW(PPROFILE,DWORD,DWORD,DWORD); +#define OpenColorProfile WINELIB_NAME_AW(OpenColorProfile) +BOOL WINAPI RegisterCMMA(PCSTR,DWORD,PCSTR); +BOOL WINAPI RegisterCMMW(PCWSTR,DWORD,PCWSTR); +#define RegisterCMM WINELIB_NAME_AW(RegisterCMM) +BOOL WINAPI SelectCMM(DWORD id); +BOOL WINAPI SetColorProfileElement(HPROFILE,TAGTYPE,DWORD,PDWORD,PVOID); +BOOL WINAPI SetColorProfileElementReference(HPROFILE,TAGTYPE,TAGTYPE); +BOOL WINAPI SetColorProfileElementSize(HPROFILE,TAGTYPE,DWORD); +BOOL WINAPI SetColorProfileHeader(HPROFILE,PPROFILEHEADER); +HCOLORSPACE WINAPI SetColorSpace(HDC,HCOLORSPACE); +BOOL WINAPI SetStandardColorSpaceProfileA(PCSTR,DWORD,PSTR); +BOOL WINAPI SetStandardColorSpaceProfileW(PCWSTR,DWORD,PWSTR); +#define SetStandardColorSpaceProfile WINELIB_NAME_AW(SetStandardColorSpaceProfile) +BOOL WINAPI SetupColorMatchingA(PCOLORMATCHSETUPA); +BOOL WINAPI SetupColorMatchingW(PCOLORMATCHSETUPW); +#define SetupColorMatching WINELIB_NAME_AW(SetupColorMatching) +BOOL WINAPI SpoolerCopyFileEvent(LPWSTR,LPWSTR,DWORD); +BOOL WINAPI TranslateBitmapBits(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); +BOOL WINAPI TranslateColors(HTRANSFORM,PCOLOR,DWORD,COLORTYPE,PCOLOR,COLORTYPE); +BOOL WINAPI UninstallColorProfileA(PCSTR,PCSTR,BOOL); +BOOL WINAPI UninstallColorProfileW(PCWSTR,PCWSTR,BOOL); +#define UninstallColorProfile WINELIB_NAME_AW(UninstallColorProfile) +BOOL WINAPI UnregisterCMMA(PCSTR,DWORD); +BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); +#define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) + +#define PROFILE_FILENAME 1 +#define PROFILE_MEMBUFFER 2 + +#define PROFILE_READ 1 +#define PROFILE_READWRITE 2 + +#define SPACE_XYZ 0x58595A20 /* 'XYZ ' */ +#define SPACE_Lab 0x4C616220 /* 'Lab ' */ +#define SPACE_Luv 0x4C757620 /* 'Luv ' */ +#define SPACE_YCbCr 0x59436272 /* 'YCbr' */ +#define SPACE_Yxy 0x59787920 /* 'Yxy ' */ +#define SPACE_RGB 0x52474220 /* 'RGB ' */ +#define SPACE_GRAY 0x47524159 /* 'GRAY' */ +#define SPACE_HSV 0x48535620 /* 'HSV ' */ +#define SPACE_HLS 0x484C5320 /* 'HLS ' */ +#define SPACE_CMYK 0x434D594B /* 'CMYK' */ +#define SPACE_CMY 0x434D5920 /* 'CMY ' */ +#define SPACE_2_CHANNEL 0x32434c52 /* '2CLR' */ +#define SPACE_3_CHANNEL 0x33434c52 /* '3CLR' */ +#define SPACE_4_CHANNEL 0x34434c52 /* '4CLR' */ +#define SPACE_5_CHANNEL 0x35434c52 /* '5CLR' */ +#define SPACE_6_CHANNEL 0x36434c52 /* '6CLR' */ +#define SPACE_7_CHANNEL 0x37434c52 /* '7CLR' */ +#define SPACE_8_CHANNEL 0x38434c52 /* '8CLR' */ + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_ICM_H */ Propchange: trunk/reactos/include/psdk/icm.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/mprapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mprapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/mprapi.h (added) +++ trunk/reactos/include/psdk/mprapi.h Mon Dec 10 20:46:08 2007 @@ -1,0 +1,45 @@ +/* + * Copyright (C) 2006 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MPRAPI_H +#define __WINE_MPRAPI_H + +#include <lmcons.h> +#include <ras.h> +/* FIXME: #include <in6addr.h> */ + +#define MAX_DEVICE_NAME 128 +#define MAX_DEVICETYPE_NAME 16 +#define MAX_INTERFACE_NAME_LEN 256 +#define MAX_MEDIA_NAME 16 +#define MAX_PHONE_NUMBER_LEN 128 +#define MAX_PORT_NAME 16 +#define MAX_TRANSPORT_NAME_LEN 40 + + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_MPRAPI_H */ Propchange: trunk/reactos/include/psdk/mprapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/ntdsapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdsapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntdsapi.h (added) +++ trunk/reactos/include/psdk/ntdsapi.h Mon Dec 10 20:46:08 2007 @@ -1,0 +1,36 @@ +/* + * Copyright (C) 2006 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NTDSAPI_H +#define __WINE_NTDSAPI_H + +/* FIXME: #include <schedule.h> */ + +#ifdef __cplusplus +extern "C" { +#endif + +DWORD WINAPI DsMakeSpnA(LPCSTR, LPCSTR, LPCSTR, USHORT, LPCSTR, DWORD*, LPSTR); +DWORD WINAPI DsMakeSpnW(LPCWSTR, LPCWSTR, LPCWSTR, USHORT, LPCWSTR, DWORD*, LPWSTR); +#define DsMakeSpn WINELIB_NAME_AW(DsMakeSpn) + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_NTDSAPI_H */ Propchange: trunk/reactos/include/psdk/ntdsapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/sfc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sfc.h?rev=311… ============================================================================== --- trunk/reactos/include/psdk/sfc.h (added) +++ trunk/reactos/include/psdk/sfc.h Mon Dec 10 20:46:08 2007 @@ -1,0 +1,46 @@ +/* + * Definitions for the System File Checker (Windows File Protection) + * + * Copyright 2006 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SFC_H +#define __WINE_SFC_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Types */ + +typedef struct _PROTECTED_FILE_DATA { + WCHAR FileName[MAX_PATH]; + DWORD FileNumber; +} PROTECTED_FILE_DATA, *PPROTECTED_FILE_DATA; + +/* Functions */ + +BOOL WINAPI SfcGetNextProtectedFile(HANDLE, PPROTECTED_FILE_DATA); +BOOL WINAPI SfcIsFileProtected(HANDLE, LPCWSTR); +BOOL WINAPI SfcIsKeyProtected(HKEY, LPCWSTR, REGSAM); +BOOL WINAPI SfpVerifyFile(LPCSTR, LPSTR, DWORD); + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/psdk/sfc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/svrapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/svrapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/svrapi.h (added) +++ trunk/reactos/include/psdk/svrapi.h Mon Dec 10 20:46:08 2007 @@ -1,0 +1,46 @@ +/* +* Copyright 2006 Konstantin Petrov +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#ifndef SVRAPI_INCLUDED +#define SVRAPI_INCLUDED + +#include <lmcons.h> +#include <lmerr.h> + +#include <pshpack1.h> + +typedef struct _share_info_1 { + char shi1_netname[LM20_NNLEN+1]; + char shi1_pad1; + unsigned short shi1_type; + char* shi1_remark; +} share_info_1; + +typedef struct _share_info_50 { + char shi50_netname[LM20_NNLEN+1]; + unsigned char shi50_type; + unsigned short shi50_flags; + char* shi50_remark; + char* shi50_path; + char shi50_rw_password[SHPWLEN+1]; + char shi50_ro_password[SHPWLEN+1]; +} share_info_50; + +#include <poppack.h> + +#endif /* SVRAPI_INCLUDED */ Propchange: trunk/reactos/include/psdk/svrapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/tapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tapi.h?rev=31… ============================================================================== --- trunk/reactos/include/psdk/tapi.h (added) +++ trunk/reactos/include/psdk/tapi.h Mon Dec 10 20:46:08 2007 @@ -1,0 +1,1020 @@ +/* + * TAPI definitions + * + * Copyright (c) 1999 Andreas Mohr + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_TAPI_H +#define __WINE_TAPI_H + +#ifndef __WINESRC__ +# include <windows.h> +#endif +#include <basetsd.h> +#include <oaidl.h> + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +typedef HANDLE HCALL, *LPHCALL; +typedef HANDLE HLINE, *LPHLINE; +typedef HANDLE HLINEAPP, *LPHLINEAPP; +typedef HANDLE HPHONE, *LPHPHONE; +typedef HANDLE HPHONEAPP, *LPHPHONEAPP; + +#define TAPIERR_REQUESTFAILED -16L +#define LINEERR_ALLOCATED 0x80000001 +#define LINEERR_BADDEVICEID 0x80000002 +#define LINEERR_BEARERMODEUNAVAIL 0x80000003 +#define LINEERR_CALLUNAVAIL 0x80000005 +#define LINEERR_COMPLETIONOVERRUN 0x80000006 +#define LINEERR_CONFERENCEFULL 0x80000007 +#define LINEERR_DIALBILLING 0x80000008 +#define LINEERR_DIALDIALTONE 0x80000009 +#define LINEERR_DIALPROMPT 0x8000000A +#define LINEERR_DIALQUIET 0x8000000B +#define LINEERR_INCOMPATIBLEAPIVERSION 0x8000000C +#define LINEERR_INCOMPATIBLEEXTVERSION 0x8000000D +#define LINEERR_INIFILECORRUPT 0x8000000E +#define LINEERR_INUSE 0x8000000F +#define LINEERR_INVALADDRESS 0x80000010 +#define LINEERR_INVALADDRESSID 0x80000011 +#define LINEERR_INVALADDRESSMODE 0x80000012 +#define LINEERR_INVALADDRESSSTATE 0x80000013 +#define LINEERR_INVALAPPHANDLE 0x80000014 +#define LINEERR_INVALAPPNAME 0x80000015 +#define LINEERR_INVALBEARERMODE 0x80000016 +#define LINEERR_INVALCALLCOMPLMODE 0x80000017 +#define LINEERR_INVALCALLHANDLE 0x80000018 +#define LINEERR_INVALCALLPARAMS 0x80000019 +#define LINEERR_INVALCALLPRIVILEGE 0x8000001A +#define LINEERR_INVALCALLSELECT 0x8000001B +#define LINEERR_INVALCALLSTATE 0x8000001C +#define LINEERR_INVALCALLSTATELIST 0x8000001D +#define LINEERR_INVALCARD 0x8000001E +#define LINEERR_INVALCOMPLETIONID 0x8000001F +#define LINEERR_INVALCONFCALLHANDLE 0x80000020 +#define LINEERR_INVALCONSULTCALLHANDLE 0x80000021 +#define LINEERR_INVALCOUNTRYCODE 0x80000022 +#define LINEERR_INVALDEVICECLASS 0x80000023 +#define LINEERR_INVALDEVICEHANDLE 0x80000024 +#define LINEERR_INVALDIALPARAMS 0x80000025 +#define LINEERR_INVALDIGITLIST 0x80000026 +#define LINEERR_INVALDIGITMODE 0x80000027 +#define LINEERR_INVALDIGITS 0x80000028 +#define LINEERR_INVALEXTVERSION 0x80000029 +#define LINEERR_INVALGROUPID 0x8000002A +#define LINEERR_INVALLINEHANDLE 0x8000002B +#define LINEERR_INVALLINESTATE 0x8000002C +#define LINEERR_INVALLOCATION 0x8000002D +#define LINEERR_INVALMEDIALIST 0x8000002E +#define LINEERR_INVALMEDIAMODE 0x8000002F +#define LINEERR_INVALMESSAGEID 0x80000030 +#define LINEERR_INVALPARAM 0x80000032 +#define LINEERR_INVALPARKID 0x80000033 +#define LINEERR_INVALPARKMODE 0x80000034 +#define LINEERR_INVALPOINTER 0x80000035 +#define LINEERR_INVALPRIVSELECT 0x80000036 +#define LINEERR_INVALRATE 0x80000037 +#define LINEERR_INVALREQUESTMODE 0x80000038 +#define LINEERR_INVALTERMINALID 0x80000039 +#define LINEERR_INVALTERMINALMODE 0x8000003A +#define LINEERR_INVALTIMEOUT 0x8000003B +#define LINEERR_INVALTONE 0x8000003C +#define LINEERR_INVALTONELIST 0x8000003D +#define LINEERR_INVALTONEMODE 0x8000003E +#define LINEERR_INVALTRANSFERMODE 0x8000003F +#define LINEERR_LINEMAPPERFAILED 0x80000040 +#define LINEERR_NOCONFERENCE 0x80000041 +#define LINEERR_NODEVICE 0x80000042 +#define LINEERR_NODRIVER 0x80000043 +#define LINEERR_NOMEM 0x80000044 +#define LINEERR_NOREQUEST 0x80000045 +#define LINEERR_NOTOWNER 0x80000046 +#define LINEERR_NOTREGISTERED 0x80000047 +#define LINEERR_OPERATIONFAILED 0x80000048 +#define LINEERR_OPERATIONUNAVAIL 0x80000049 +#define LINEERR_RATEUNAVAIL 0x8000004A +#define LINEERR_RESOURCEUNAVAIL 0x8000004B +#define LINEERR_REQUESTOVERRUN 0x8000004C +#define LINEERR_STRUCTURETOOSMALL 0x8000004D +#define LINEERR_TARGETNOTFOUND 0x8000004E +#define LINEERR_TARGETSELF 0x8000004F +#define LINEERR_UNINITIALIZED 0x80000050 +#define LINEERR_USERUSERINFOTOOBIG 0x80000051 +#define LINEERR_REINIT 0x80000052 +#define LINEERR_ADDRESSBLOCKED 0x80000053 +#define LINEERR_BILLINGREJECTED 0x80000054 +#define LINEERR_INVALFEATURE 0x80000055 +#define LINEERR_NOMULTIPLEINSTANCE 0x80000056 + +#define STRINGFORMAT_ASCII 0x00000001 +#define STRINGFORMAT_DBCS 0x00000002 +#define STRINGFORMAT_UNICODE 0x00000003 +#define STRINGFORMAT_BINARY 0x00000004 + +#define LINEADDRESSMODE_ADDRESSID 0x00000001 +#define LINEADDRESSMODE_DIALABLEADDR 0x00000002 + +#define LINEBEARERMODE_VOICE 0x00000001 +#define LINEBEARERMODE_SPEECH 0x00000002 +#define LINEBEARERMODE_MULTIUSE 0x00000004 +#define LINEBEARERMODE_DATA 0x00000008 +#define LINEBEARERMODE_ALTSPEECHDATA 0x00000010 +#define LINEBEARERMODE_NONCALLSIGNALING 0x00000020 +#define LINEBEARERMODE_PASSTHROUGH 0x00000040 + +#define LINEMEDIAMODE_UNKNOWN 0x00000002 +#define LINEMEDIAMODE_INTERACTIVEVOICE 0x00000004 +#define LINEMEDIAMODE_AUTOMATEDVOICE 0x00000008 +#define LINEMEDIAMODE_DATAMODEM 0x00000010 + +#define LINEDEVCAPFLAGS_CROSSADDRCONF 0x00000001 +#define LINEDEVCAPFLAGS_HIGHLEVCOMP 0x00000002 +#define LINEDEVCAPFLAGS_LOWLEVCOMP 0x00000004 +#define LINEDEVCAPFLAGS_MEDIACONTROL 0x00000008 +#define LINEDEVCAPFLAGS_MULTIPLEADDR 0x00000010 +#define LINEDEVCAPFLAGS_CLOSEDROP 0x00000020 +#define LINEDEVCAPFLAGS_DIALBILLING 0x00000040 +#define LINEDEVCAPFLAGS_DIALQUIET 0x00000080 +#define LINEDEVCAPFLAGS_DIALDIALTONE 0x00000100 + +#define LINEDEVSTATE_OTHER 0x00000001 +#define LINEDEVSTATE_RINGING 0x00000002 +#define LINEDEVSTATE_CONNECTED 0x00000004 +#define LINEDEVSTATE_DISCONNECTED 0x00000008 +#define LINEDEVSTATE_MSGWAITON 0x00000010 +#define LINEDEVSTATE_MSGWAITOFF 0x00000020 +#define LINEDEVSTATE_INSERVICE 0x00000040 +#define LINEDEVSTATE_OUTOFSERVICE 0x00000080 +#define LINEDEVSTATE_MAINTENANCE 0x00000100 +#define LINEDEVSTATE_OPEN 0x00000200 +#define LINEDEVSTATE_CLOSE 0x00000400 +#define LINEDEVSTATE_NUMCALLS 0x00000800 +#define LINEDEVSTATE_NUMCOMPLETIONS 0x00001000 +#define LINEDEVSTATE_TERMINALS 0x00002000 +#define LINEDEVSTATE_ROAMMODE 0x00004000 +#define LINEDEVSTATE_BATTERY 0x00008000 +#define LINEDEVSTATE_SIGNAL 0x00010000 +#define LINEDEVSTATE_DEVSPECIFIC 0x00020000 +#define LINEDEVSTATE_REINIT 0x00040000 +#define LINEDEVSTATE_LOCK 0x00080000 + +#define LINEDEVSTATE_CAPSCHANGE 0x00100000 +#define LINEDEVSTATE_CONFIGCHANGE 0x00200000 +#define LINEDEVSTATE_TRANSLATECHANGE 0x00400000 +#define LINEDEVSTATE_COMPLCANCEL 0x00800000 +#define LINEDEVSTATE_REMOVED 0x01000000 + +#define LINELOCATIONOPTION_PULSEDIAL 0x00000001 + + +#define LINEFEATURE_DEVSPECIFIC 0x00000001 +#define LINEFEATURE_DEVSPECIFICFEAT 0x00000002 +#define LINEFEATURE_FORWARD 0x00000004 +#define LINEFEATURE_MAKECALL 0x00000008 +#define LINEFEATURE_SETMEDIACONTROL 0x00000010 +#define LINEFEATURE_SETTERMINAL 0x00000020 +#define LINEFEATURE_SETDEVSTATUS 0x00000040 +#define LINEFEATURE_FORWARDFWD 0x00000080 +#define LINEFEATURE_FORWARDDND 0x00000100 + +/* tapi callback messages */ + +#define LINE_ADDRESSSTATE 0L +#define LINE_CALLINFO 1L +#define LINE_CALLSTATE 2L +#define LINE_CLOSE 3L +#define LINE_DEVSPECIFIC 4L +#define LINE_DEVSPECIFICFEATURE 5L +#define LINE_GATHERDIGITS 6L +#define LINE_GENERATE 7L +#define LINE_LINEDEVSTATE 8L +#define LINE_MONITORDIGITS 9L +#define LINE_MONITORMEDIA 10L +#define LINE_MONITORTONE 11L +#define LINE_REPLY 12L +#define LINE_REQUEST 13L +#define PHONE_BUTTON 14L +#define PHONE_CLOSE 15L +#define PHONE_DEVSPECIFIC 16L +#define PHONE_REPLY 17L +#define PHONE_STATE 18L +#define LINE_CREATE 19L +#define PHONE_CREATE 20L + +#define LINE_AGENTSPECIFIC 21L +#define LINE_AGENTSTATUS 22L +#define LINE_APPNEWCALL 23L +#define LINE_PROXYREQUEST 24L +#define LINE_REMOVE 25L +#define PHONE_REMOVE 26L +/* these are used as Param1 of line_callstate messages */ +#define LINECALLSTATE_IDLE 0x00000001 +#define LINECALLSTATE_OFFERING 0x00000002 +#define LINECALLSTATE_ACCEPTED 0x00000004 +#define LINECALLSTATE_DIALTONE 0x00000008 +#define LINECALLSTATE_DIALING 0x00000010 +#define LINECALLSTATE_RINGBACK 0x00000020 +#define LINECALLSTATE_BUSY 0x00000040 +#define LINECALLSTATE_SPECIALINFO 0x00000080 +#define LINECALLSTATE_CONNECTED 0x00000100 +#define LINECALLSTATE_PROCEEDING 0x00000200 +#define LINECALLSTATE_ONHOLD 0x00000400 +#define LINECALLSTATE_CONFERENCED 0x00000800 +#define LINECALLSTATE_ONHOLDPENDCONF 0x00001000 +#define LINECALLSTATE_ONHOLDPENDTRANSFER 0x00002000 +#define LINECALLSTATE_DISCONNECTED 0x00004000 +#define LINECALLSTATE_UNKNOWN 0x00008000 +#define LINECONNECTEDMODE_ACTIVE 0x00000001 +#define LINECONNECTEDMODE_INACTIVE 0x00000002 +#define LINECONNECTEDMODE_ACTIVEHELD 0x00000004 +#define LINECONNECTEDMODE_INACTIVEHELD 0x00000008 +#define LINECONNECTEDMODE_CONFIRMED 0x00000010 + +/* these are Param2 values for state_disconnected line_callstate messages */ +#define LINEDISCONNECTMODE_NORMAL 0x00000001 +#define LINEDISCONNECTMODE_UNKNOWN 0x00000002 +#define LINEDISCONNECTMODE_REJECT 0x00000004 +#define LINEDISCONNECTMODE_PICKUP 0x00000008 +#define LINEDISCONNECTMODE_FORWARDED 0x00000010 +#define LINEDISCONNECTMODE_BUSY 0x00000020 +#define LINEDISCONNECTMODE_NOANSWER 0x00000040 +#define LINEDISCONNECTMODE_BADADDRESS 0x00000080 +#define LINEDISCONNECTMODE_UNREACHABLE 0x00000100 +#define LINEDISCONNECTMODE_CONGESTION 0x00000200 +#define LINEDISCONNECTMODE_INCOMPATIBLE 0x00000400 +#define LINEDISCONNECTMODE_UNAVAIL 0x00000800 +#define LINEDISCONNECTMODE_NODIALTONE 0x00001000 +#define LINEDISCONNECTMODE_NUMBERCHANGED 0x00002000 +#define LINEDISCONNECTMODE_OUTOFORDER 0x00004000 +#define LINEDISCONNECTMODE_TEMPFAILURE 0x00008000 +#define LINEDISCONNECTMODE_QOSUNAVAIL 0x00010000 +#define LINEDISCONNECTMODE_BLOCKED 0x00020000 +#define LINEDISCONNECTMODE_DONOTDISTURB 0x00040000 +#define LINEDISCONNECTMODE_CANCELLED 0x00080000 + +#define LINECALLSELECT_LINE 0x00000001 +#define LINECALLSELECT_ADDRESS 0x00000002 +#define LINECALLSELECT_CALL 0x00000004 +#define LINECALLSELECT_DEVICEID 0x00000008 + +#define LINECALLPRIVILEGE_NONE 0x00000001 +#define LINECALLPRIVILEGE_MONITOR 0x00000002 +#define LINECALLPRIVILEGE_OWNER 0x00000004 +#define LINECALLFEATURE_ACCEPT 0x00000001 +#define LINECALLFEATURE_ADDTOCONF 0x00000002 +#define LINECALLFEATURE_ANSWER 0x00000004 +#define LINECALLFEATURE_BLINDTRANSFER 0x00000008 +#define LINECALLFEATURE_COMPLETECALL 0x00000010 +#define LINECALLFEATURE_COMPLETETRANSF 0x00000020 +#define LINECALLFEATURE_DIAL 0x00000040 +#define LINECALLFEATURE_DROP 0x00000080 +#define LINECALLFEATURE_GATHERDIGITS 0x00000100 +#define LINECALLFEATURE_GENERATEDIGITS 0x00000200 +#define LINECALLFEATURE_GENERATETONE 0x00000400 +#define LINECALLFEATURE_HOLD 0x00000800 +#define LINECALLFEATURE_MONITORDIGITS 0x00001000 +#define LINECALLFEATURE_MONITORMEDIA 0x00002000 +#define LINECALLFEATURE_MONITORTONES 0x00004000 +#define LINECALLFEATURE_PARK 0x00008000 +#define LINECALLFEATURE_PREPAREADDCONF 0x00010000 +#define LINECALLFEATURE_REDIRECT 0x00020000 +#define LINECALLFEATURE_REMOVEFROMCONF 0x00040000 +#define LINECALLFEATURE_SECURECALL 0x00080000 +#define LINECALLFEATURE_SENDUSERUSER 0x00100000 +#define LINECALLFEATURE_SETCALLPARAMS 0x00200000 +#define LINECALLFEATURE_SETMEDIACONTROL 0x00400000 +#define LINECALLFEATURE_SETTERMINAL 0x00800000 +#define LINECALLFEATURE_SETUPCONF 0x01000000 +#define LINECALLFEATURE_SETUPTRANSFER 0x02000000 +#define LINECALLFEATURE_SWAPHOLD 0x04000000 +#define LINECALLFEATURE_UNHOLD 0x08000000 +#define LINECALLFEATURE_RELEASEUSERUSERINFO 0x10000000 + +typedef struct lineaddresscaps_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwLineDeviceID; + DWORD dwAddressSize; + DWORD dwAddressOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; + DWORD dwAddressSharing; + DWORD dwAddressStates; + DWORD dwCallInfoStates; + DWORD dwCallerIDFlags; + DWORD dwCalledIDFlags; + DWORD dwConnectedIDFlags; + DWORD dwRedirectionIDFlags; + DWORD dwRedirectingIDFlags; + DWORD dwCallStates; + DWORD dwDialToneModes; + DWORD dwBusyModes; + DWORD dwSpecialInfo; + DWORD dwDisconnectModes; + DWORD dwMaxNumActiveCalls; + DWORD dwMaxNumOnHoldCalls; + DWORD dwMaxNumOnHoldPendingCalls; + DWORD dwMaxNumConference; + DWORD dwMaxNumTransConf; + DWORD dwAddrCapFlags; + DWORD dwCallFeatures; + DWORD dwRemoveFromConfCaps; + DWORD dwRemoveFromConfState; + DWORD dwTransferModes; + DWORD dwParkModes; + DWORD dwForwardModes; + DWORD dwMaxForwardEntries; + DWORD dwMaxSpecificEntries; + DWORD dwMinFwdNumRings; + DWORD dwMaxFwdNumRings; + DWORD dwMaxCallCompletions; + DWORD dwCallCompletionConds; + DWORD dwCallCompletionModes; + DWORD dwNumCompletionMessages; + DWORD dwCompletionMsgTextEntrySize; + DWORD dwCompletionMsgTextSize; + DWORD dwCompletionMsgTextOffset; + DWORD dwAddressFeatures; +} LINEADDRESSCAPS, *LPLINEADDRESSCAPS; + +typedef struct lineaddressstatus_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwNumInUse; + DWORD dwNumActiveCalls; + DWORD dwNumOnHoldCalls; + DWORD dwNumOnHoldPendCalls; + DWORD dwAddressFeatures; + DWORD dwNumRingsNoAnswer; + DWORD dwForwardNumEntries; + DWORD dwForwardSize; + DWORD dwForwardOffset; + DWORD dwTerminalModesSize; + DWORD dwTerminalModesOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; +} LINEADDRESSSTATUS, *LPLINEADDRESSSTATUS; + +typedef struct linedialparams_tag { + DWORD dwDialPause; + DWORD dwDialSpeed; + DWORD dwDigitDuration; + DWORD dwWaitForDialtone; +} LINEDIALPARAMS, *LPLINEDIALPARAMS; + +typedef struct linecallinfo_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + HLINE hLine; + DWORD dwLineDeviceID; + DWORD dwAddressID; + DWORD dwBearerMode; + DWORD dwRate; + DWORD dwMediaMode; + DWORD dwAppSpecific; + DWORD dwCallID; + DWORD dwRelatedCallID; + DWORD dwCallParamFlags; + DWORD dwCallStates; + DWORD dwMonitorDigitModes; + DWORD dwMonitorMediaModes; + LINEDIALPARAMS DialParams; + DWORD dwOrigin; + DWORD dwReason; + DWORD dwCompletionID; + DWORD dwNumOwners; + DWORD dwNumMonitors; + DWORD dwCountryCode; + DWORD dwTrunk; + DWORD dwCallerIDFlags; + DWORD dwCallerIDSize; + DWORD dwCallerIDOffset; + DWORD dwCallerIDNameSize; + DWORD dwCallerIDNameOffset; + DWORD dwCalledIDFlags; + DWORD dwCalledIDSize; + DWORD dwCalledIDOffset; + DWORD dwCalledIDNameSize; + DWORD dwCalledIDNameOffset; + DWORD dwConnectedIDFlags; + DWORD dwConnectedIDSize; + DWORD dwConnectedIDOffset; + DWORD dwConnectedIDNameSize; + DWORD dwConnectedIDNameOffset; + DWORD dwRedirectionIDFlags; + DWORD dwRedirectionIDSize; + DWORD dwRedirectionIDOffset; + DWORD dwRedirectionIDNameSize; + DWORD dwRedirectionIDNameOffset; + DWORD dwRedirectingIDFlags; + DWORD dwRedirectingIDSize; + DWORD dwRedirectingIDOffset; + DWORD dwRedirectingIDNameSize; + DWORD dwRedirectingIDNameOffset; + DWORD dwAppNameSize; + DWORD dwAppNameOffset; + DWORD dwDisplayableAddressSize; + DWORD dwDisplayableAddressOffset; + DWORD dwCalledPartySize; + DWORD dwCalledPartyOffset; + DWORD dwCommentSize; + DWORD dwCommentOffset; + DWORD dwDisplaySize; + DWORD dwDisplayOffset; + DWORD dwUserUserInfoSize; + DWORD dwUserUserInfoOffset; + DWORD dwHighLevelCompSize; + DWORD dwHighLevelCompOffset; + DWORD dwLowLevelCompSize; + DWORD dwLowLevelCompOffset; + DWORD dwChargingInfoSize; + DWORD dwChargingInfoOffset; + DWORD dwTerminalModesSize; + DWORD dwTerminalModesOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; +} LINECALLINFO, *LPLINECALLINFO; + +typedef struct linecalllist_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwCallsNumEntries; + DWORD dwCallsSize; + DWORD dwCallsOffset; +} LINECALLLIST, *LPLINECALLLIST; + +typedef struct linecallparams_tag { + DWORD dwTotalSize; + DWORD dwBearerMode; + DWORD dwMinRate; + DWORD dwMaxRate; + DWORD dwMediaMode; + DWORD dwCallParamFlags; + DWORD dwAddressMode; + DWORD dwAddressID; + LINEDIALPARAMS DialParams; + DWORD dwOrigAddressSize; + DWORD dwOrigAddressOffset; + DWORD dwDisplayableAddressSize; + DWORD dwDisplayableAddressOffset; + DWORD dwCalledPartySize; + DWORD dwCalledPartyOffset; + DWORD dwCommentSize; + DWORD dwCommentOffset; + DWORD dwUserUserInfoSize; + DWORD dwUserUserInfoOffset; + DWORD dwHighLevelCompSize; + DWORD dwHighLevelCompOffset; + DWORD dwLowLevelCompSize; + DWORD dwLowLevelCompOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; +} LINECALLPARAMS, *LPLINECALLPARAMS; + +typedef struct linecallstatus_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwCallState; + DWORD dwCallStateMode; + DWORD dwCallPrivilege; + DWORD dwCallFeatures; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; +} LINECALLSTATUS, *LPLINECALLSTATUS; + +typedef struct linecountrylist_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwNumCountries; + DWORD dwCountryListSize; + DWORD dwCountryListOffset; +} LINECOUNTRYLIST, *LPLINECOUNTRYLIST; + +typedef struct linecountryentry_tag { + DWORD dwCountryID; + DWORD dwCountryCode; + DWORD dwNextCountryID; + DWORD dwCountryNameSize; + DWORD dwCountryNameOffset; + DWORD dwSameAreaRuleSize; + DWORD dwSameAreaRuleOffset; + DWORD dwLongDistanceRuleSize; + DWORD dwLongDistanceRuleOffset; + DWORD dwInternationalRuleSize; + DWORD dwInternationalRuleOffset; +} LINECOUNTRYENTRY, *LPLINECOUNTRYENTRY; + +typedef struct linedevcaps_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwProviderInfoSize; + DWORD dwProviderInfoOffset; + DWORD dwSwitchInfoSize; + DWORD dwSwitchInfoOffset; + DWORD dwPermanentLineID; + DWORD dwLineNameSize; + DWORD dwLineNameOffset; + DWORD dwStringFormat; + DWORD dwAddressModes; + DWORD dwNumAddresses; + DWORD dwBearerModes; + DWORD dwMaxRate; + DWORD dwMediaModes; + DWORD dwGenerateToneModes; + DWORD dwGenerateToneMaxNumFreq; + DWORD dwGenerateDigitModes; + DWORD dwMonitorToneMaxNumFreq; + DWORD dwMonitorToneMaxNumEntries; + DWORD dwMonitorDigitModes; + DWORD dwGatherDigitsMinTimeout; + DWORD dwGatherDigitsMaxTimeout; + DWORD dwMedCtlDigitMaxListSize; + DWORD dwMedCtlMediaMaxListSize; + DWORD dwMedCtlToneMaxListSize; + DWORD dwMedCtlCallStateMaxListSize; + DWORD dwDevCapFlags; + DWORD dwMaxNumActiveCalls; + DWORD dwAnswerMode; + DWORD dwRingModes; + DWORD dwLineStates; + DWORD dwUUIAcceptSize; + DWORD dwUUIAnswerSize; + DWORD dwUUIMakeCallSize; + DWORD dwUUIDropSize; + DWORD dwUUISendUserUserInfoSize; + DWORD dwUUICallInfoSize; + LINEDIALPARAMS MinDialParams; + LINEDIALPARAMS MaxDialParams; + LINEDIALPARAMS DefaultDialParams; + DWORD dwNumTerminals; + DWORD dwTerminalCapsSize; + DWORD dwTerminalCapsOffset; + DWORD dwTerminalTextEntrySize; + DWORD dwTerminalTextSize; + DWORD dwTerminalTextOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; + DWORD dwLineFeatures; +} LINEDEVCAPS, *LPLINEDEVCAPS; + +typedef struct linedevstatus_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwNumOpens; + DWORD dwOpenMediaModes; + DWORD dwNumActiveCalls; + DWORD dwNumOnHoldCalls; + DWORD dwNumOnHoldPendingCalls; + DWORD dwLineFeatures; + DWORD dwNumCallCompletion; + DWORD dwRingMode; + DWORD dwSignalLevel; + DWORD dwBatteryLevel; + DWORD dwRoamMode; + DWORD dwDevStatusFlags; + DWORD dwTerminalModesSize; + DWORD dwTerminalModesOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; +} LINEDEVSTATUS, *LPLINEDEVSTATUS; + +typedef struct lineextensionid_tag { + DWORD dwExtensionID0; + DWORD dwExtensionID1; + DWORD dwExtensionID2; + DWORD dwExtensionID3; +} LINEEXTENSIONID, *LPLINEEXTENSIONID; + +typedef struct lineforward_tag { + DWORD dwForwardMode; + DWORD dwCallerAddressSize; + DWORD dwCallerAddressOffset; + DWORD dwDestCountryCode; + DWORD dwDestAddressSize; + DWORD dwDestAddressOffset; +} LINEFORWARD, *LPLINEFORWARD; + +typedef struct lineforwardlist_tag { + DWORD dwTotalSize; + DWORD dwNumEntries; + LINEFORWARD ForwardList[1]; +} LINEFORWARDLIST, *LPLINEFORWARDLIST; + +typedef struct linegeneratetone_tag { + DWORD dwFrequency; + DWORD dwCadenceOn; + DWORD dwCadenceOff; + DWORD dwVolume; +} LINEGENERATETONE, *LPLINEGENERATETONE; + +typedef struct linemediacontrolcallstate_tag { + DWORD dwCallStates; + DWORD dwMediaControl; +} LINEMEDIACONTROLCALLSTATE, *LPLINEMEDIACONTROLCALLSTATE; + +typedef struct linemediacontroldigit_tag { + DWORD dwDigit; + DWORD dwDigitModes; + DWORD dwMediaControl; +} LINEMEDIACONTROLDIGIT, *LPLINEMEDIACONTROLDIGIT; + +typedef struct linemediacontrolmedia_tag { + DWORD dwMediaModes; + DWORD dwDuration; + DWORD dwMediaControl; +} LINEMEDIACONTROLMEDIA, *LPLINEMEDIACONTROLMEDIA; + +typedef struct linemediacontroltone_tag { + DWORD dwAppSpecific; + DWORD dwDuration; + DWORD dwFrequency1; + DWORD dwFrequency2; + DWORD dwFrequency3; + DWORD dwMediaControl; +} LINEMEDIACONTROLTONE, *LPLINEMEDIACONTROLTONE; + +typedef struct linemonitortone_tag { + DWORD dwAppSpecific; + DWORD dwDuration; + DWORD dwFrequency1; + DWORD dwFrequency2; + DWORD dwFrequency3; +} LINEMONITORTONE, *LPLINEMONITORTONE; + +typedef struct lineproviderlist_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwNumProviders; + DWORD dwProviderListSize; + DWORD dwProviderListOffset; +} LINEPROVIDERLIST, *LPLINEPROVIDERLIST; + +typedef struct linetranslatecaps_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwNumLocations; + DWORD dwLocationListSize; + DWORD dwLocationListOffset; + DWORD dwCurrentLocationID; + DWORD dwNumCards; + DWORD dwCardListSize; + DWORD dwCardListOffset; + DWORD dwCurrentPreferredCardID; +} LINETRANSLATECAPS, *LPLINETRANSLATECAPS; + +typedef struct linelocationentry_tag { + DWORD dwPermanentLocationID; + DWORD dwLocationNameSize; + DWORD dwLocationNameOffset; + DWORD dwCountryCode; + DWORD dwCityCodeSize; + DWORD dwCityCodeOffset; + DWORD dwPreferredCardID; + DWORD dwLocalAccessCodeSize; + DWORD dwLocalAccessCodeOffset; + DWORD dwLongDistanceAccessCodeSize; + DWORD dwLongDistanceAccessCodeOffset; + DWORD dwTollPrefixListSize; + DWORD dwTollPrefixListOffset; + DWORD dwCountryID; + DWORD dwOptions; + DWORD dwCancelCallWaitingSize; + DWORD dwCancelCallWaitingOffset; +} LINELOCATIONENTRY, *LPLINELOCATIONENTRY; + +typedef struct linecardentry_tag { + DWORD dwPermanentCardID; + DWORD dwCardNameSize; + DWORD dwCardNameOffset; + DWORD dwCardNumberDigits; + DWORD dwSameAreaRuleSize; + DWORD dwSameAreaRuleOffset; + DWORD dwLongDistanceRuleSize; + DWORD dwLongDistanceRuleOffset; + DWORD dwInternationalRuleSize; + DWORD dwInternationalRuleOffset; + DWORD dwOptions; +} LINECARDENTRY, *LPLINECARDENTRY; + + +typedef struct linetranslateoutput_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwDialableStringSize; + DWORD dwDialableStringOffset; + DWORD dwDisplayableStringSize; + DWORD dwDisplayableStringOffset; + DWORD dwCurrentCountry; + DWORD dwDestCountry; + DWORD dwTranslateResults; +} LINETRANSLATEOUTPUT, *LPLINETRANSLATEOUTPUT; + +typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); + +typedef struct _PHONEAPP { + int dummy; +} PHONEAPP, *LPPHONEAPP; + +typedef struct _PHONE { + DWORD dwRingMode; + DWORD dwVolume; +} PHONE, *LPPHONE; + +typedef struct phonebuttoninfo_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwButtonMode; + DWORD dwButtonFunction; + DWORD dwButtonTextSize; + DWORD dwButtonTextOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; + DWORD dwButtonState; +} PHONEBUTTONINFO, *LPPHONEBUTTONINFO; + +typedef struct phonecaps_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwProviderInfoSize; + DWORD dwProviderInfoOffset; + DWORD dwPhoneInfoSize; + DWORD dwPhoneInfoOffset; + DWORD dwPermanentPhoneID; + DWORD dwPhoneNameSize; + DWORD dwPhoneNameOffset; + DWORD dwStringFormat; + DWORD dwPhoneStates; + DWORD dwHookSwitchDevs; + DWORD dwHandsetHookSwitchModes; + DWORD dwSpeakerHookSwitchModes; + DWORD dwHeadsetHookSwitchModes; + DWORD dwVolumeFlags; + DWORD dwGainFlags; + DWORD dwDisplayNumRows; + DWORD dwDisplayNumColumns; + DWORD dwNumRingModes; + DWORD dwNumButtonLamps; + DWORD dwButtonModesSize; + DWORD dwButtonModesOffset; + DWORD dwButtonFunctionsSize; + DWORD dwButtonFunctionsOffset; + DWORD dwLampModesSize; + DWORD dwLampModesOffset; + DWORD dwNumSetData; + DWORD dwSetDataSize; + DWORD dwSetDataOffset; + DWORD dwNumGetData; + DWORD dwGetDataSize; + DWORD dwGetDataOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; +} PHONECAPS, *LPPHONECAPS; + +typedef struct phoneextensionid_tag { + DWORD dwExtensionID0; + DWORD dwExtensionID1; + DWORD dwExtensionID2; + DWORD dwExtensionID3; +} PHONEEXTENSIONID, *LPPHONEEXTENSIONID; + +typedef struct phonestatus_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwStatusFlags; + DWORD dwNumOwners; + DWORD dwRingMOde; + DWORD dwRingVolume; + DWORD dwHandsetHookSwitchMode; + DWORD dwHandsetVolume; + DWORD dwHandsetGain; + DWORD dwSpeakerHookSwitchMode; + DWORD dwSpeakerVolume; + DWORD dwSpeakerGain; + DWORD dwHeadsetHookSwitchMode; + DWORD dwHeadsetVolume; + DWORD dwHeadsetGain; + DWORD dwDisplaySize; + DWORD dwDisplayOffset; + DWORD dwLampModesSize; + DWORD dwLampModesOffset; + DWORD dwOwnerNameSize; + DWORD dwOwnerNameOffset; + DWORD dwDevSpecificSize; + DWORD dwDevSpecificOffset; +} PHONESTATUS, *LPPHONESTATUS; + +typedef void (CALLBACK *PHONECALLBACK)(HANDLE, DWORD, DWORD, DWORD, DWORD, DWORD); + +typedef struct varstring_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwStringFormat; + DWORD dwStringSize; + DWORD dwStringOffset; +} VARSTRING, *LPVARSTRING; + +/* line functions */ +DWORD WINAPI lineAccept(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineAddProvider(LPCSTR,HWND,LPDWORD); +DWORD WINAPI lineAddToConference(HCALL,HCALL); +DWORD WINAPI lineAnswer(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineBlindTransfer(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineClose(HLINE); +DWORD WINAPI lineCompleteCall(HCALL,LPDWORD,DWORD,DWORD); +DWORD WINAPI lineCompleteTransfer(HCALL,HCALL,LPHCALL,DWORD); +DWORD WINAPI lineConfigDialog(DWORD,HWND,LPCSTR); +DWORD WINAPI lineConfigDialogEdit(DWORD,HWND,LPCSTR,LPVOID const,DWORD,LPVARSTRING); +DWORD WINAPI lineConfigProvider(HWND,DWORD); +DWORD WINAPI lineDeallocateCall(HCALL); +DWORD WINAPI lineDevSpecific(HLINE,DWORD,HCALL,LPVOID,DWORD); +DWORD WINAPI lineDevSpecificFeature(HLINE,DWORD,LPVOID,DWORD); +DWORD WINAPI lineDial(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineDrop(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineForward(HLINE,DWORD,DWORD,LPLINEFORWARDLIST,DWORD,LPHCALL,LPLINECALLPARAMS); +DWORD WINAPI lineGatherDigits(HCALL,DWORD,LPSTR,DWORD,LPCSTR,DWORD,DWORD); +DWORD WINAPI lineGenerateDigits(HCALL,DWORD,LPCSTR,DWORD); +DWORD WINAPI lineGenerateTone(HCALL,DWORD,DWORD,DWORD,LPLINEGENERATETONE); +DWORD WINAPI lineGetAddressCaps(HLINEAPP,DWORD,DWORD,DWORD,DWORD,LPLINEADDRESSCAPS); +DWORD WINAPI lineGetAddressID(HLINE,LPDWORD,DWORD,LPCSTR,DWORD); +DWORD WINAPI lineGetAddressStatus(HLINE,DWORD,LPLINEADDRESSSTATUS); +DWORD WINAPI lineGetAppPriority(LPCSTR,DWORD,LPLINEEXTENSIONID const,DWORD,LPVARSTRING,LPDWORD); +DWORD WINAPI lineGetCallInfo(HCALL,LPLINECALLINFO); +DWORD WINAPI lineGetCallStatus(HCALL,LPLINECALLSTATUS); +DWORD WINAPI lineGetConfRelatedCalls(HCALL,LPLINECALLLIST); +DWORD WINAPI lineGetCountry(DWORD,DWORD,LPLINECOUNTRYLIST); +DWORD WINAPI lineGetDevCaps(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); +DWORD WINAPI lineGetDevConfig(DWORD,LPVARSTRING,LPCSTR); +DWORD WINAPI lineGetID(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); +DWORD WINAPI lineGetIcon(DWORD,LPCSTR,HICON *); +DWORD WINAPI lineGetLineDevStatus(HLINE,LPLINEDEVSTATUS); +DWORD WINAPI lineGetNewCalls(HLINE,DWORD,DWORD,LPLINECALLLIST); +DWORD WINAPI lineGetNumRings(HLINE,DWORD,LPDWORD); +DWORD WINAPI lineGetProviderList(DWORD dwAPIVersion,LPLINEPROVIDERLIST); +DWORD WINAPI lineGetRequest(HLINEAPP,DWORD,LPVOID); +DWORD WINAPI lineGetStatusMessages(HLINE,LPDWORD,LPDWORD); +DWORD WINAPI lineGetTranslateCaps(HLINEAPP,DWORD,LPLINETRANSLATECAPS); +DWORD WINAPI lineHandoff(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineHold(HCALL); +DWORD WINAPI lineInitialize(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCSTR,LPDWORD); +DWORD WINAPI lineMakeCall(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); +DWORD WINAPI lineMonitorDigits(HCALL,DWORD); +DWORD WINAPI lineMonitorMedia(HCALL,DWORD); +DWORD WINAPI lineMonitorTones(HCALL,LPLINEMONITORTONE,DWORD); +DWORD WINAPI lineNegotiateAPIVersion(HLINEAPP,DWORD,DWORD,DWORD,LPDWORD,LPLINEEXTENSIONID); +DWORD WINAPI lineNegotiateExtVersion(HLINEAPP,DWORD,DWORD,DWORD,DWORD,LPDWORD); +DWORD WINAPI lineOpen(HLINEAPP,DWORD,LPHLINE,DWORD,DWORD,DWORD,DWORD,DWORD,LPLINECALLPARAMS); +DWORD WINAPI linePark(HCALL,DWORD,LPCSTR,LPVARSTRING); +DWORD WINAPI linePickup(HLINE,DWORD,LPHCALL,LPCSTR,LPCSTR); +DWORD WINAPI linePrepareAddToConference(HCALL,LPHCALL,LPLINECALLPARAMS); +DWORD WINAPI lineRedirect(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineRegisterRequestRecipient(HLINEAPP,DWORD,DWORD,DWORD); +DWORD WINAPI lineReleaseUserUserInfo(HCALL); +DWORD WINAPI lineRemoveFromConference(HCALL); +DWORD WINAPI lineRemoveProvider(DWORD,HWND); +DWORD WINAPI lineSecureCall(HCALL); +DWORD WINAPI lineSendUserUserInfo(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineSetAppPriority(LPCSTR,DWORD,LPLINEEXTENSIONID const,DWORD,LPCSTR,DWORD); +DWORD WINAPI lineSetAppSpecific(HCALL,DWORD); +DWORD WINAPI lineSetCallParams(HCALL,DWORD,DWORD,DWORD,LPLINEDIALPARAMS); +DWORD WINAPI lineSetCallPrivilege(HCALL,DWORD); +DWORD WINAPI lineSetCurrentLocation(HLINEAPP,DWORD); +DWORD WINAPI lineSetDevConfig(DWORD,LPVOID,DWORD,LPCSTR); +DWORD WINAPI lineSetMediaControl(HLINE,DWORD,HCALL,DWORD,LPLINEMEDIACONTROLDIGIT,DWORD,LPLINEMEDIACONTROLMEDIA,DWORD,LPLINEMEDIACONTROLTONE,DWORD,LPLINEMEDIACONTROLCALLSTATE,DWORD); +DWORD WINAPI lineSetMediaMode(HCALL,DWORD); +DWORD WINAPI lineSetNumRings(HLINE,DWORD,DWORD); +DWORD WINAPI lineSetStatusMessages(HLINE,DWORD,DWORD); +DWORD WINAPI lineSetTerminal(HLINE,DWORD,HCALL,DWORD,DWORD,DWORD,DWORD); +DWORD WINAPI lineSetTollList(HLINEAPP,DWORD,LPCSTR,DWORD); +DWORD WINAPI lineSetupConference(HCALL,HLINE,LPHCALL,LPHCALL,DWORD,LPLINECALLPARAMS); +DWORD WINAPI lineSetupTransfer(HCALL,LPHCALL,LPLINECALLPARAMS); +DWORD WINAPI lineShutdown(HLINEAPP); +DWORD WINAPI lineSwapHold(HCALL,HCALL); +DWORD WINAPI lineTranslateAddress(HLINEAPP,DWORD,DWORD,LPCSTR,DWORD,DWORD,LPLINETRANSLATEOUTPUT); +DWORD WINAPI lineTranslateDialog(HLINEAPP,DWORD,DWORD,HWND,LPCSTR); +DWORD WINAPI lineUncompleteCall(HLINE,DWORD); +DWORD WINAPI lineUnHold(HCALL); +DWORD WINAPI lineUnpark(HLINE,DWORD,LPHCALL,LPCSTR); + +DWORD WINAPI lineAddProviderA(LPCSTR,HWND,LPDWORD); +DWORD WINAPI lineBlindTransferA(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineConfigDialogA(DWORD,HWND,LPCSTR); +DWORD WINAPI lineConfigDialogEditA(DWORD,HWND,LPCSTR,LPVOID const,DWORD,LPVARSTRING); +DWORD WINAPI lineDialA(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineForwardA(HLINE,DWORD,DWORD,LPLINEFORWARDLIST,DWORD,LPHCALL,LPLINECALLPARAMS); +DWORD WINAPI lineGatherDigitsA(HCALL,DWORD,LPSTR,DWORD,LPCSTR,DWORD,DWORD); +DWORD WINAPI lineGenerateDigitsA(HCALL,DWORD,LPCSTR,DWORD); +DWORD WINAPI lineGetAddressCapsA(HLINEAPP,DWORD,DWORD,DWORD,DWORD,LPLINEADDRESSCAPS); +DWORD WINAPI lineGetAddressIDA(HLINE,LPDWORD,DWORD,LPCSTR,DWORD); +DWORD WINAPI lineGetAddressStatusA(HLINE,DWORD,LPLINEADDRESSSTATUS); +DWORD WINAPI lineGetAppPriorityA(LPCSTR,DWORD,LPLINEEXTENSIONID const,DWORD,LPVARSTRING,LPDWORD); +DWORD WINAPI lineGetCallInfoA(HCALL,LPLINECALLINFO); +DWORD WINAPI lineGetCountryA(DWORD,DWORD,LPLINECOUNTRYLIST); +DWORD WINAPI lineGetDevCapsA(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); +DWORD WINAPI lineGetDevConfigA(DWORD,LPVARSTRING,LPCSTR); +DWORD WINAPI lineGetIDA(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); +DWORD WINAPI lineGetIconA(DWORD,LPCSTR,HICON *); +DWORD WINAPI lineGetLineDevStatusA(HLINE,LPLINEDEVSTATUS); +DWORD WINAPI lineGetProviderListA(DWORD dwAPIVersion,LPLINEPROVIDERLIST); +DWORD WINAPI lineGetRequestA(HLINEAPP,DWORD,LPVOID); +DWORD WINAPI lineGetTranslateCapsA(HLINEAPP,DWORD,LPLINETRANSLATECAPS); +DWORD WINAPI lineHandoffA(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineMakeCallA(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); +DWORD WINAPI lineOpenA(HLINEAPP,DWORD,LPHLINE,DWORD,DWORD,DWORD,DWORD,DWORD,LPLINECALLPARAMS); +DWORD WINAPI lineParkA(HCALL,DWORD,LPCSTR,LPVARSTRING); +DWORD WINAPI linePickupA(HLINE,DWORD,LPHCALL,LPCSTR,LPCSTR); +DWORD WINAPI linePrepareAddToConferenceA(HCALL,LPHCALL,LPLINECALLPARAMS); +DWORD WINAPI lineRedirectA(HCALL,LPCSTR,DWORD); +DWORD WINAPI lineSetAppPriorityA(LPCSTR,DWORD,LPLINEEXTENSIONID const,DWORD,LPCSTR,DWORD); +DWORD WINAPI lineSetDevConfigA(DWORD,LPVOID,DWORD,LPCSTR); +DWORD WINAPI lineSetTollListA(HLINEAPP,DWORD,LPCSTR,DWORD); +DWORD WINAPI lineSetupConferenceA(HCALL,HLINE,LPHCALL,LPHCALL,DWORD,LPLINECALLPARAMS); +DWORD WINAPI lineSetupTransferA(HCALL,LPHCALL,LPLINECALLPARAMS); +DWORD WINAPI lineTranslateAddressA(HLINEAPP,DWORD,DWORD,LPCSTR,DWORD,DWORD,LPLINETRANSLATEOUTPUT); +DWORD WINAPI lineTranslateDialogA(HLINEAPP,DWORD,DWORD,HWND,LPCSTR); +DWORD WINAPI lineUnhold(HCALL); +DWORD WINAPI lineUnparkA(HLINE,DWORD,LPHCALL,LPCSTR); + +/* phone functions */ +DWORD WINAPI phoneClose(HPHONE); +DWORD WINAPI phoneConfigDialog(DWORD,HWND,LPCSTR); +DWORD WINAPI phoneDevSpecific(HPHONE,LPVOID,DWORD); +DWORD WINAPI phoneGetButtonInfo(HPHONE,DWORD,LPPHONEBUTTONINFO); +DWORD WINAPI phoneGetData(HPHONE,DWORD,LPVOID,DWORD); +DWORD WINAPI phoneGetDevCaps(HPHONEAPP,DWORD,DWORD,DWORD,LPPHONECAPS); +DWORD WINAPI phoneGetDisplay(HPHONE,LPVARSTRING); +DWORD WINAPI phoneGetGain(HPHONE,DWORD,LPDWORD); +DWORD WINAPI phoneGetHookSwitch(HPHONE,LPDWORD); +DWORD WINAPI phoneGetID(HPHONE,LPVARSTRING,LPCSTR); +DWORD WINAPI phoneGetIcon(DWORD,LPCSTR,HICON *); +DWORD WINAPI phoneGetLamp(HPHONE,DWORD,LPDWORD); +DWORD WINAPI phoneGetRing(HPHONE,LPDWORD,LPDWORD); +DWORD WINAPI phoneGetStatus(HPHONE,LPPHONESTATUS); +DWORD WINAPI phoneGetStatusMessages(HPHONE,LPDWORD,LPDWORD,LPDWORD); +DWORD WINAPI phoneGetVolume(HPHONE,DWORD,LPDWORD); +DWORD WINAPI phoneInitialize(LPHPHONEAPP,HINSTANCE,PHONECALLBACK,LPCSTR,LPDWORD); +DWORD WINAPI phoneNegotiateAPIVersion(HPHONEAPP,DWORD,DWORD,DWORD,LPDWORD,LPPHONEEXTENSIONID); +DWORD WINAPI phoneNegotiateExtVersion(HPHONEAPP,DWORD,DWORD,DWORD,DWORD,LPDWORD); +DWORD WINAPI phoneOpen(HPHONEAPP,DWORD,LPHPHONE,DWORD,DWORD,DWORD,DWORD); +DWORD WINAPI phoneSetButtonInfo(HPHONE,DWORD,LPPHONEBUTTONINFO); +DWORD WINAPI phoneSetData(HPHONE,DWORD,LPVOID,DWORD); +DWORD WINAPI phoneSetDisplay(HPHONE,DWORD,DWORD,LPCSTR,DWORD); +DWORD WINAPI phoneSetGain(HPHONE,DWORD,DWORD); +DWORD WINAPI phoneSetHookSwitch(HPHONE,DWORD,DWORD); +DWORD WINAPI phoneSetLamp(HPHONE,DWORD,DWORD); +DWORD WINAPI phoneSetRing(HPHONE,DWORD,DWORD); +DWORD WINAPI phoneSetStatusMessages(HPHONE,DWORD,DWORD,DWORD); +DWORD WINAPI phoneSetVolume(HPHONE,DWORD,DWORD); +DWORD WINAPI phoneShutdown(HPHONEAPP); + +DWORD WINAPI phoneConfigDialogA(DWORD,HWND,LPCSTR); +DWORD WINAPI phoneGetButtonInfoA(HPHONE,DWORD,LPPHONEBUTTONINFO); +DWORD WINAPI phoneGetDevCapsA(HPHONEAPP,DWORD,DWORD,DWORD,LPPHONECAPS); +DWORD WINAPI phoneGetIDA(HPHONE,LPVARSTRING,LPCSTR); +DWORD WINAPI phoneGetIconA(DWORD,LPCSTR,HICON *); +DWORD WINAPI phoneGetStatusA(HPHONE,LPPHONESTATUS); +DWORD WINAPI phoneSetButtonInfoA(HPHONE,DWORD,LPPHONEBUTTONINFO); + +/* "assisted" functions */ +DWORD WINAPI tapiGetLocationInfo(LPSTR,LPSTR); +DWORD WINAPI tapiRequestMakeCall(LPCSTR,LPCSTR,LPCSTR,LPCSTR); + +DWORD WINAPI tapiGetLocationInfoA(LPSTR,LPSTR); +DWORD WINAPI tapiRequestMakeCallA(LPCSTR,LPCSTR,LPCSTR,LPCSTR); + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + +#endif /* __WINE_TAPI_H */ Propchange: trunk/reactos/include/psdk/tapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincred.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wincred.h (added) +++ trunk/reactos/include/psdk/wincred.h Mon Dec 10 20:46:08 2007 @@ -1,0 +1,208 @@ +/* + * Copyright (C) 2006 Robert Shearman (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINCRED_H_ +#define _WINCRED_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __SECHANDLE_DEFINED__ +#define __SECHANDLE_DEFINED__ +typedef struct _SecHandle +{ + ULONG_PTR dwLower; + ULONG_PTR dwUpper; +} SecHandle, *PSecHandle; +#endif + +typedef SecHandle CtxtHandle; +typedef PSecHandle PCtxtHandle; + +typedef struct _CREDENTIAL_ATTRIBUTEA +{ + LPSTR Keyword; + DWORD Flags; + DWORD ValueSize; + LPBYTE Value; +} CREDENTIAL_ATTRIBUTEA, *PCREDENTIAL_ATTRIBUTEA; + +typedef struct _CREDENTIAL_ATTRIBUTEW +{ + LPWSTR Keyword; + DWORD Flags; + DWORD ValueSize; + LPBYTE Value; +} CREDENTIAL_ATTRIBUTEW, *PCREDENTIAL_ATTRIBUTEW; + +DECL_WINELIB_TYPE_AW(CREDENTIAL_ATTRIBUTE) +DECL_WINELIB_TYPE_AW(PCREDENTIAL_ATTRIBUTE) + +typedef struct _CREDENTIALA +{ + DWORD Flags; + DWORD Type; + LPSTR TargetName; + LPSTR Comment; + FILETIME LastWritten; + DWORD CredentialBlobSize; + LPBYTE CredentialBlob; + DWORD Persist; + DWORD AttributeCount; + PCREDENTIAL_ATTRIBUTEA Attributes; + LPSTR TargetAlias; + LPSTR UserName; +} CREDENTIALA, *PCREDENTIALA; + +typedef struct _CREDENTIALW +{ + DWORD Flags; + DWORD Type; + LPWSTR TargetName; + LPWSTR Comment; + FILETIME LastWritten; + DWORD CredentialBlobSize; + LPBYTE CredentialBlob; + DWORD Persist; + DWORD AttributeCount; + PCREDENTIAL_ATTRIBUTEW Attributes; + LPWSTR TargetAlias; + LPWSTR UserName; +} CREDENTIALW, *PCREDENTIALW; + +DECL_WINELIB_TYPE_AW(CREDENTIAL) +DECL_WINELIB_TYPE_AW(PCREDENTIAL) + +typedef struct _CREDUI_INFOA +{ + DWORD cbSize; + HWND hwndParent; + PCSTR pszMessageText; + PCSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOA, *PCREDUI_INFOA; + +typedef struct _CREDUI_INFOW +{ + DWORD cbSize; + HWND hwndParent; + PCWSTR pszMessageText; + PCWSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOW, *PCREDUI_INFOW; + +DECL_WINELIB_TYPE_AW(CREDUI_INFO) +DECL_WINELIB_TYPE_AW(PCREDUI_INFO) + +#define CRED_MAX_STRING_LENGTH 256 +#define CRED_MAX_USERNAME_LENGTH 513 +#define CRED_MAX_GENERIC_TARGET_NAME_LENGTH 32767 +#define CRED_MAX_DOMAIN_TARGET_NAME_LENGTH 337 +#define CRED_MAX_VALUE_SIZE 256 +#define CRED_MAX_ATTRIBUTES 64 + +#define CRED_MAX_BLOB_SIZE 512 + +#define CREDUI_MAX_MESSAGE_LENGTH 32767 +#define CREDUI_MAX_CAPTION_LENGTH 128 +#define CREDUI_MAX_GENERIC_TARGET_LENGTH CRED_MAX_GENERIC_TARGET_NAME_LENGTH +#define CREDUI_MAX_DOMAIN_TARGET_LENGTH CRED_MAX_DOMAIN_TARGET_LENGTH +#define CREDUI_MAX_USERNAME_LENGTH CRED_MAX_USERNAME_LENGTH +#define CREDUI_MAX_PASSWORD_LENGTH (CRED_MAX_CREDENTIAL_BLOB_SIZE / 2) + +/* flags for CREDENTIAL::Flags */ +#define CRED_FLAGS_PASSWORD_FOR_CERT 0x0001 +#define CRED_FLAGS_PROMPT_NOW 0x0002 +#define CRED_FLAGS_USERNAME_TARGET 0x0004 +#define CRED_FLAGS_OWF_CRED_BLOB 0x0008 +#define CRED_FLAGS_VALID_FLAGS 0x000f + +/* values for CREDENTIAL::Type */ +#define CRED_TYPE_GENERIC 1 +#define CRED_TYPE_DOMAIN_PASSWORD 2 +#define CRED_TYPE_DOMAIN_CERTIFICATE 3 +#define CRED_TYPE_DOMAIN_VISIBLE_PASSWORD 4 +#define CRED_TYPE_MAXIMUM 5 + +/* values for CREDENTIAL::Persist */ +#define CRED_PERSIST_NONE 0 +#define CRED_PERSIST_SESSION 1 +#define CRED_PERSIST_LOCAL_MACHINE 2 +#define CRED_PERSIST_ENTERPRISE 3 + +#define CREDUI_FLAGS_INCORRECT_PASSWORD 0x00000001 +#define CREDUI_FLAGS_DO_NOT_PERSIST 0x00000002 +#define CREDUI_FLAGS_REQUEST_ADMINISTRATOR 0x00000004 +#define CREDUI_FLAGS_EXCLUDE_CERTIFICATES 0x00000008 +#define CREDUI_FLAGS_REQUIRE_CERTIFICATE 0x00000010 +#define CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX 0x00000040 +#define CREDUI_FLAGS_ALWAYS_SHOW_UI 0x00000080 +#define CREDUI_FLAGS_REQUIRE_SMARTCARD 0x00000100 +#define CREDUI_FLAGS_PASSWORD_ONLY_OK 0x00000200 +#define CREDUI_FLAGS_VALIDATE_USERNAME 0x00000400 +#define CREDUI_FLAGS_COMPLETE_USERNAME 0x00000800 +#define CREDUI_FLAGS_PERSIST 0x00001000 +#define CREDUI_FLAGS_SERVER_CREDENTIAL 0x00004000 +#define CREDUI_FLAGS_EXPECT_CONFIRMATION 0x00020000 +#define CREDUI_FLAGS_GENERIC_CREDENTIALS 0x00040000 +#define CREDUI_FLAGS_USERNAME_TARGET_CREDENTIALS 0x00080000 +#define CREDUI_FLAGS_KEEP_USERNAME 0x00100000 + +/* flags for CredWrite and CredWriteDomainCredentials */ +#define CRED_PRESERVE_CREDENTIAL_BLOB 0x00000001 + +BOOL WINAPI CredDeleteA(LPCSTR,DWORD,DWORD); +BOOL WINAPI CredDeleteW(LPCWSTR,DWORD,DWORD); +#define CredDelete WINELIB_NAME_AW(CredDelete) +BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); +BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); +#define CredEnumerate WINELIB_NAME_AW(CredEnumerate) +VOID WINAPI CredFree(PVOID); +BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); +BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); +#define CredRead WINELIB_NAME_AW(CredRead) +BOOL WINAPI CredRenameA(LPCSTR,LPCSTR,DWORD,DWORD); +BOOL WINAPI CredRenameW(LPCWSTR,LPCWSTR,DWORD,DWORD); +#define CredRename WINELIB_NAME_AW(CredRename) +BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); +BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); +#define CredWrite WINELIB_NAME_AW(CredWrite) + +DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); +DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); +#define CredUICmdLinePromptForCredentials WINELIB_NAME_AW(CredUICmdLinePromptForCredentials) +DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR,BOOL); +DWORD WINAPI CredUIConfirmCredentialsA(PCSTR,BOOL); +#define CredUIConfirmCredentials WINELIB_NAME_AW(CredUIConfirmCredentials) +DWORD WINAPI CredUIParseUserNameW(PCWSTR,PWSTR,ULONG,PWSTR,ULONG); +DWORD WINAPI CredUIParseUserNameA(PCSTR,PSTR,ULONG,PSTR,ULONG); +#define CredUIParseUserName WINELIB_NAME_AW(CredUIParseUserName) +DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); +DWORD WINAPI CredUIPromptForCredentialsA(PCREDUI_INFOA,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); +#define CredUIPromptForCredentials WINELIB_NAME_AW(CredUIPromptForCredentials) +DWORD WINAPI CredUIStoreSSOCredW(PCWSTR,PCWSTR,PCWSTR,BOOL); +/* Note: no CredUIStoreSSOCredA in PSDK header */ +DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); +/* Note: no CredUIReadSSOCredA in PSDK header */ + +#ifdef __cplusplus +} +#endif + +#endif /* _WINCRED_H_ */ Propchange: trunk/reactos/include/psdk/wincred.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 31126: Add MSVC8 solution and project files
by mpiulachs＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: mpiulachs Date: Mon Dec 10 18:48:02 2007 New Revision: 31126 URL: http://svn.reactos.org/svn/reactos?rev=31126&view=rev Log: Add MSVC8 solution and project files Added: trunk/irc/TechBot/CHMLibrary/CHMLibrary.csproj (with props) trunk/irc/TechBot/Compression/Compression.csproj (with props) trunk/irc/TechBot/TechBot.Console/Properties/ trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj (with props) trunk/irc/TechBot/TechBot.IRCLibrary/Properties/ trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj (with props) trunk/irc/TechBot/TechBot.Library/Properties/ trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj (with props) trunk/irc/TechBot/TechBot.sln (with props) trunk/irc/TechBot/TechBot/Properties/ trunk/irc/TechBot/TechBot/TechBot.csproj (with props) Added: trunk/irc/TechBot/CHMLibrary/CHMLibrary.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/CHMLibrary/CHMLibrary.… ============================================================================== --- trunk/irc/TechBot/CHMLibrary/CHMLibrary.csproj (added) +++ trunk/irc/TechBot/CHMLibrary/CHMLibrary.csproj Mon Dec 10 18:48:02 2007 @@ -1,0 +1,85 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{72E5CCA1-6318-4D62-964D-CB23A5C743B5}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>CHMLibrary</RootNamespace> + <AssemblyName>CHMLibrary</AssemblyName> + <StartupObject> + </StartupObject> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +  + <ItemGroup> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="Category.cs" /> + <Compile Include="CHMDecoding\BinaryReaderHelp.cs" /> + <Compile Include="CHMDecoding\CHMBtree.cs" /> + <Compile Include="CHMDecoding\CHMFile.cs" /> + <Compile Include="CHMDecoding\CHMIdxhdr.cs" /> + <Compile Include="CHMDecoding\CHMStrings.cs" /> + <Compile Include="CHMDecoding\CHMSystem.cs" /> + <Compile Include="CHMDecoding\CHMTocidx.cs" /> + <Compile Include="CHMDecoding\CHMTopics.cs" /> + <Compile Include="CHMDecoding\CHMUrlstr.cs" /> + <Compile Include="CHMDecoding\CHMUrltable.cs" /> + <Compile Include="CHMDecoding\DumpingInfo.cs" /> + <Compile Include="CHMDecoding\enumerations.cs" /> + <Compile Include="CHMDecoding\FullTextEngine.cs" /> + <Compile Include="CHMDecoding\HHCParser.cs" /> + <Compile Include="CHMDecoding\HHCParser2.cs" /> + <Compile Include="CHMDecoding\HHKParser.cs" /> + <Compile Include="CHMDecoding\TopicEntry.cs" /> + <Compile Include="CHMDecoding\UrlTableEntry.cs" /> + <Compile Include="ChmFileInfo.cs" /> + <Compile Include="HtmlHelpSystem.cs" /> + <Compile Include="HttpUtility.cs" /> + <Compile Include="Index.cs" /> + <Compile Include="IndexItem.cs" /> + <Compile Include="IndexTopic.cs" /> + <Compile Include="InformationType.cs" /> + <Compile Include="Storage\CHMStream.cs" /> + <Compile Include="TableOfContents.cs" /> + <Compile Include="TOCItem.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.XML" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Compression\Compression.csproj"> + <Project>{E32307F1-623A-4E62-826F-56CDD4B23A54}</Project> + <Name>Compression</Name> + </ProjectReference> + </ItemGroup> +</Project> Propchange: trunk/irc/TechBot/CHMLibrary/CHMLibrary.csproj ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/Compression/Compression.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/Compression/Compressio… ============================================================================== --- trunk/irc/TechBot/Compression/Compression.csproj (added) +++ trunk/irc/TechBot/Compression/Compression.csproj Mon Dec 10 18:48:02 2007 @@ -1,0 +1,65 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{E32307F1-623A-4E62-826F-56CDD4B23A54}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>Compression</RootNamespace> + <AssemblyName>Compression</AssemblyName> + <StartupObject> + </StartupObject> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +  + <ItemGroup> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="Checksums\Adler32.cs" /> + <Compile Include="Checksums\CRC32.cs" /> + <Compile Include="Checksums\IChecksum.cs" /> + <Compile Include="Checksums\StrangeCRC.cs" /> + <Compile Include="Deflater.cs" /> + <Compile Include="DeflaterConstants.cs" /> + <Compile Include="DeflaterEngine.cs" /> + <Compile Include="DeflaterHuffman.cs" /> + <Compile Include="DeflaterPending.cs" /> + <Compile Include="Inflater.cs" /> + <Compile Include="InflaterDynHeader.cs" /> + <Compile Include="InflaterHuffmanTree.cs" /> + <Compile Include="PendingBuffer.cs" /> + <Compile Include="Streams\DeflaterOutputStream.cs" /> + <Compile Include="Streams\InflaterInputStream.cs" /> + <Compile Include="Streams\OutputWindow.cs" /> + <Compile Include="Streams\StreamManipulator.cs" /> + <Compile Include="ZipException.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> +</Project> Propchange: trunk/irc/TechBot/Compression/Compression.csproj ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj (added) +++ trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj Mon Dec 10 18:48:02 2007 @@ -1,0 +1,59 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>TechBot.Console</RootNamespace> + <AssemblyName>TechBot.Console</AssemblyName> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +  + <ItemGroup> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="Main.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\TechBot.IRCLibrary\TechBot.IRCLibrary.csproj"> + <Project>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</Project> + <Name>TechBot.IRCLibrary</Name> + </ProjectReference> + <ProjectReference Include="..\TechBot.Library\TechBot.Library.csproj"> + <Project>{1114F34D-F388-4F38-AE27-C0EE1B10B777}</Project> + <Name>TechBot.Library</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> +</Project> Propchange: trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/Tec… ============================================================================== --- trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj (added) +++ trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj Mon Dec 10 18:48:02 2007 @@ -1,0 +1,56 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>TechBot.IRCLibrary</RootNamespace> + <AssemblyName>TechBot.IRCLibrary</AssemblyName> + <StartupObject> + </StartupObject> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +  + <ItemGroup> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="IRC.cs" /> + <Compile Include="IrcChannel.cs" /> + <Compile Include="IrcClient.cs" /> + <Compile Include="IrcException.cs" /> + <Compile Include="IrcMessage.cs" /> + <Compile Include="IrcUser.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> +</Project> Propchange: trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj (added) +++ trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj Mon Dec 10 18:48:02 2007 @@ -1,0 +1,77 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{1114F34D-F388-4F38-AE27-C0EE1B10B777}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>TechBot.Library</RootNamespace> + <AssemblyName>TechBot.Library</AssemblyName> + <StartupObject> + </StartupObject> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +  + <ItemGroup> + <Compile Include="ApiCommand.cs" /> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="BugCommand.cs" /> + <Compile Include="ErrorCommand.cs" /> + <Compile Include="HelpCommand.cs" /> + <Compile Include="HresultCommand.cs" /> + <Compile Include="ICommand.cs" /> + <Compile Include="IrcService.cs" /> + <Compile Include="MessageContext.cs" /> + <Compile Include="NtStatusCommand.cs" /> + <Compile Include="NumberParser.cs" /> + <Compile Include="ServiceOutput.cs" /> + <Compile Include="SvnCommand.cs" /> + <Compile Include="TechBotService.cs" /> + <Compile Include="WinerrorCommand.cs" /> + <Compile Include="WmCommand.cs" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.XML" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\CHMLibrary\CHMLibrary.csproj"> + <Project>{72E5CCA1-6318-4D62-964D-CB23A5C743B5}</Project> + <Name>CHMLibrary</Name> + </ProjectReference> + <ProjectReference Include="..\TechBot.IRCLibrary\TechBot.IRCLibrary.csproj"> + <Project>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</Project> + <Name>TechBot.IRCLibrary</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> +</Project> Propchange: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot.sln URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.sln?rev=31126&… ============================================================================== --- trunk/irc/TechBot/TechBot.sln (added) +++ trunk/irc/TechBot/TechBot.sln Mon Dec 10 18:48:02 2007 @@ -1,0 +1,50 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot", "TechBot\TechBot.csproj", "{106F437D-424B-4758-A69C-862D08D26F3D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compression", "Compression\Compression.csproj", "{E32307F1-623A-4E62-826F-56CDD4B23A54}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CHMLibrary", "CHMLibrary\CHMLibrary.csproj", "{72E5CCA1-6318-4D62-964D-CB23A5C743B5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Console", "TechBot.Console\TechBot.Console.csproj", "{44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.IRCLibrary", "TechBot.IRCLibrary\TechBot.IRCLibrary.csproj", "{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Library", "TechBot.Library\TechBot.Library.csproj", "{1114F34D-F388-4F38-AE27-C0EE1B10B777}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {106F437D-424B-4758-A69C-862D08D26F3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {106F437D-424B-4758-A69C-862D08D26F3D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {106F437D-424B-4758-A69C-862D08D26F3D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {106F437D-424B-4758-A69C-862D08D26F3D}.Release|Any CPU.Build.0 = Release|Any CPU + {E32307F1-623A-4E62-826F-56CDD4B23A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E32307F1-623A-4E62-826F-56CDD4B23A54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E32307F1-623A-4E62-826F-56CDD4B23A54}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E32307F1-623A-4E62-826F-56CDD4B23A54}.Release|Any CPU.Build.0 = Release|Any CPU + {72E5CCA1-6318-4D62-964D-CB23A5C743B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72E5CCA1-6318-4D62-964D-CB23A5C743B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72E5CCA1-6318-4D62-964D-CB23A5C743B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72E5CCA1-6318-4D62-964D-CB23A5C743B5}.Release|Any CPU.Build.0 = Release|Any CPU + {44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}.Release|Any CPU.Build.0 = Release|Any CPU + {D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}.Release|Any CPU.Build.0 = Release|Any CPU + {1114F34D-F388-4F38-AE27-C0EE1B10B777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1114F34D-F388-4F38-AE27-C0EE1B10B777}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1114F34D-F388-4F38-AE27-C0EE1B10B777}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1114F34D-F388-4F38-AE27-C0EE1B10B777}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Propchange: trunk/irc/TechBot/TechBot.sln ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/irc/TechBot/TechBot/TechBot.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBot.csproj… ============================================================================== --- trunk/irc/TechBot/TechBot/TechBot.csproj (added) +++ trunk/irc/TechBot/TechBot/TechBot.csproj Mon Dec 10 18:48:02 2007 @@ -1,0 +1,68 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{106F437D-424B-4758-A69C-862D08D26F3D}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>TechBot</RootNamespace> + <AssemblyName>TechBot</AssemblyName> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +  + <ItemGroup> + <None Include="App.config" /> + </ItemGroup> + <ItemGroup> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="ServiceThread.cs" /> + <Compile Include="TechBotService.cs"> + <SubType>Component</SubType> + </Compile> + </ItemGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Configuration.Install" /> + <Reference Include="System.Data" /> + <Reference Include="System.ServiceProcess" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\TechBot.IRCLibrary\TechBot.IRCLibrary.csproj"> + <Project>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</Project> + <Name>TechBot.IRCLibrary</Name> + </ProjectReference> + <ProjectReference Include="..\TechBot.Library\TechBot.Library.csproj"> + <Project>{1114F34D-F388-4F38-AE27-C0EE1B10B777}</Project> + <Name>TechBot.Library</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> +</Project> Propchange: trunk/irc/TechBot/TechBot/TechBot.csproj ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 31125: add svn ignore for obj , bin , *.ncb and *.suo
by mpiulachs＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: mpiulachs Date: Mon Dec 10 18:45:51 2007 New Revision: 31125 URL: http://svn.reactos.org/svn/reactos?rev=31125&view=rev Log: add svn ignore for obj ,bin ,*.ncb and *.suo Modified: trunk/irc/TechBot/ (props changed) trunk/irc/TechBot/CHMLibrary/ (props changed) trunk/irc/TechBot/CHMLibrary/CHMDecoding/ (props changed) trunk/irc/TechBot/CHMLibrary/Storage/ (props changed) trunk/irc/TechBot/Compression/ (props changed) trunk/irc/TechBot/Compression/Checksums/ (props changed) trunk/irc/TechBot/Compression/Streams/ (props changed) trunk/irc/TechBot/Resources/ (props changed) trunk/irc/TechBot/TechBot/ (props changed) trunk/irc/TechBot/TechBot.Console/ (props changed) trunk/irc/TechBot/TechBot.IRCLibrary/ (props changed) trunk/irc/TechBot/TechBot.Library/ (props changed) Propchange: trunk/irc/TechBot/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/CHMLibrary/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/CHMLibrary/CHMDecoding/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/CHMLibrary/Storage/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/Compression/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/Compression/Checksums/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/Compression/Streams/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/Resources/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/TechBot/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/TechBot.Console/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/TechBot.IRCLibrary/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo Propchange: trunk/irc/TechBot/TechBot.Library/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Dec 10 18:45:51 2007 @@ -1,0 +1,4 @@ +obj +bin +*.ncb +*.suo

1 0

[mpiulachs] 31124: * not quite ok , fix inconsistencies in spanish translation * update catalan translation
by mpiulachs＠svn.reactos.org 10 Dec '07

10 Dec '07

Author: mpiulachs Date: Mon Dec 10 17:34:52 2007 New Revision: 31124 URL: http://svn.reactos.org/svn/reactos?rev=31124&view=rev Log: * not quite ok , fix inconsistencies in spanish translation * update catalan translation Modified: trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc Modified: trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc Mon Dec 10 17:34:52 2007 @@ -6,7 +6,7 @@ IDS_USAGE, "FIND: Mostra totes les linies que continguin una determinada cadena de caràcters.\n\n\ FIND [ /C ] [ /I ] [ /N ] [ /V ] \"Cadena de caràcters\" [ file... ]\n\ /C Conta el numero de linies que contenen la cadena de caràcters\n\ - /I Ignore case\n\ + /I Ignora majúscules i minúscules\n\ /N Numero de linies mostrades, començant per la primera\n\ /V Mostra les linies que no contenen la cadena de caràcters" Modified: trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc Mon Dec 10 17:34:52 2007 @@ -5,13 +5,13 @@ IDS_USAGE, "FIND: Imprime todas las líneas de un fichero que contiene una cadena.\n\n\ FIND [ /C ] [ /I ] [ /N ] [ /V ] \"cadena\" [ fichero... ]\n\ - /C Cuenta el número de líneas que contienen cadenas.\n\ + /C Cuenta el número de líneas que contienen la cadena de caracteres\n\ /I Ignora mayúsculas y minúsculas\n\ - /N Numere las líneas que aparece en la pantalla, a partir de 1.\n\ - /V Impreme las líneas que no contienen una cadena." + /N Numero de líneas a mostrar en pantalla, a partir de la primera\n\ + /V Muestra las líneas que no contienen la cadena de caracteres." -IDS_NO_SUCH_FILE, "FIND: %s: Ningún tal fichero\n" +IDS_NO_SUCH_FILE, "FIND: %s: No se encontró el fichero\n" -IDS_CANNOT_OPEN, "FIND: %s: No se puede abrir este fichero\n" +IDS_CANNOT_OPEN, "FIND: %s: No se pudo abrir el fichero\n" }

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