Ros-diffs December 2006

ros-diffs@reactos.org

16 participants
168 discussions

[fireball] 25098: - Remove unnecessary functions - Get, parse and use system path and options from the ini file - Comment-changes / cleanup
by fireball＠svn.reactos.org 09 Dec '06

09 Dec '06

Author: fireball Date: Sat Dec 9 13:24:29 2006 New Revision: 25098 URL: http://svn.reactos.org/svn/reactos?rev=25098&view=rev Log: - Remove unnecessary functions - Get, parse and use system path and options from the ini file - Comment-changes / cleanup Modified: branches/winldr/windows/winldr.c Modified: branches/winldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/winldr.c?rev=250… ============================================================================== --- branches/winldr/windows/winldr.c (original) +++ branches/winldr/windows/winldr.c Sat Dec 9 13:24:29 2006 @@ -45,62 +45,6 @@ VOID WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock); VOID WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); -//TODO: Move to arch-independent hardware.c file -PVOID -HwCreateComponentResources(PCONFIGURATION_COMPONENT Component, - ULONG DeviceDataLength, - PVOID DeviceData) -{ - return NULL; -} - -//TODO: Move to arch-independent hardware.c file -VOID -InitializeHWConfig(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - //PCONFIGURATION_COMPONENT_DATA ConfigurationRoot; - //PCONFIGURATION_COMPONENT Component; - //PCONFIGURATION_COMPONENT_DATA /*CurrentEntry,*/ PreviousEntry, AdapterEntry; - //BOOLEAN IsNextEntryChild; - - DbgPrint((DPRINT_WINDOWS, "InitializeHWConfig()\n")); - - //LoaderBlock->ConfigurationRoot = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); - //RtlZeroMemory(LoaderBlock->ConfigurationRoot, sizeof(CONFIGURATION_COMPONENT_DATA)); - - /* Fill root == SystemClass */ - //ConfigurationRoot = LoaderBlock->ConfigurationRoot; - //Component = &LoaderBlock->ConfigurationRoot->ComponentEntry; - - //Component->Class = SystemClass; - //Component->Type = MaximumType; - //Component->Version = 0; // FIXME: ? - //Component->ConfigurationDataLength = 0; - //Component->Key = 0; - //Component->AffinityMask = 0; - - //Component->Identifier = 0; - //Component->IdentifierLength = 0; - - - //IsNextEntryChild = TRUE; - //PreviousEntry = ConfigurationRoot; - - /* Enumerate all PCI buses */ - //AdapterEntry = ConfigurationRoot; - - /* TODO: Disk Geometry */ - /* TODO: Keyboard */ - - /* TODO: Serial port */ - - //Config->ConfigurationData = alloc(sizeof(CONFIGURATION_COMPONENT_DATA), EfiLoaderData); - - /* Convert everything to VA */ - ConvertConfigToVA(LoaderBlock->ConfigurationRoot); - LoaderBlock->ConfigurationRoot = PaToVa(LoaderBlock->ConfigurationRoot); -} - // Init "phase 0" VOID @@ -131,28 +75,42 @@ // Init "phase 1" VOID -WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - CHAR Options[] = "/DEBUGPORT=COM1 /BAUDRATE=115200"; +WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, + PCHAR Options, + PCHAR SystemPath) +{ + /* Examples of correct options and paths */ + //CHAR Options[] = "/DEBUGPORT=COM1 /BAUDRATE=115200"; //CHAR Options[] = "/NODEBUG"; - CHAR SystemRoot[] = "\\WINNT\\"; + //CHAR SystemRoot[] = "\\WINNT\\"; + //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; + CHAR HalPath[] = "\\"; - CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; - CHAR ArcHal[] = "multi(0)disk(0)rdisk(0)partition(1)"; - - ULONG i; + CHAR SystemRoot[256]; + CHAR ArcBoot[256]; + ULONG i, PathSeparator; PLOADER_PARAMETER_EXTENSION Extension; LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support - + + /* Construct SystemRoot and ArcBoot from SystemPath */ + PathSeparator = strstr(SystemPath, "\\") - SystemPath; + strncpy(ArcBoot, SystemPath, PathSeparator); + strcpy(SystemRoot, &SystemPath[PathSeparator]); + strcat(SystemRoot, "\\"); + + DbgPrint((DPRINT_WINDOWS, "ArcBoot: %s\n", ArcBoot)); + DbgPrint((DPRINT_WINDOWS, "SystemRoot: %s\n", SystemRoot)); + DbgPrint((DPRINT_WINDOWS, "Options: %s\n", Options)); + /* Fill Arc BootDevice */ LoaderBlock->ArcBootDeviceName = MmAllocateMemory(strlen(ArcBoot)+1); strcpy(LoaderBlock->ArcBootDeviceName, ArcBoot); LoaderBlock->ArcBootDeviceName = PaToVa(LoaderBlock->ArcBootDeviceName); - /* Fill Arc HalDevice */ - LoaderBlock->ArcHalDeviceName = MmAllocateMemory(strlen(ArcHal)+1); - strcpy(LoaderBlock->ArcHalDeviceName, ArcHal); + /* Fill Arc HalDevice, it matches ArcBoot path */ + LoaderBlock->ArcHalDeviceName = MmAllocateMemory(strlen(ArcBoot)+1); + strcpy(LoaderBlock->ArcHalDeviceName, ArcBoot); LoaderBlock->ArcHalDeviceName = PaToVa(LoaderBlock->ArcHalDeviceName); /* Fill SystemRoot */ @@ -200,15 +158,15 @@ &ArcDiskInfo->ListEntry); } - /* Convert the list to virtual address */ + /* Convert all list's to Virtual address */ + + /* Convert the ArcDisks list to virtual address */ List_PaToVa(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); LoaderBlock->ArcDiskInformation = PaToVa(LoaderBlock->ArcDiskInformation); - /* Create configuration entries */ - InitializeHWConfig(LoaderBlock); - - - /* Convert all list's to Virtual address */ + /* Convert configuration entries to VA */ + ConvertConfigToVA(LoaderBlock->ConfigurationRoot); + LoaderBlock->ConfigurationRoot = PaToVa(LoaderBlock->ConfigurationRoot); /* Convert all DTE into virtual addresses */ List_PaToVa(&LoaderBlock->LoadOrderListHead); @@ -398,9 +356,10 @@ LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion) { CHAR MsgBuffer[256]; - CHAR SystemPath[1024], SearchPath[1024]; - CHAR FileName[1024]; - CHAR BootPath[256]; + CHAR SystemPath[512], SearchPath[512]; + CHAR FileName[512]; + CHAR BootPath[512]; + CHAR BootOptions[256]; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; ULONG SectionId; @@ -439,13 +398,21 @@ return; } - if (!MachDiskNormalizeSystemPath(SystemPath, - sizeof(SystemPath))) + /* Read booting options */ + if (!IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) + { + /* Nothing read, make the string empty */ + strcpy(BootOptions, ""); + } + + /* Normalize system path */ + if (!MachDiskNormalizeSystemPath(SystemPath, sizeof(SystemPath))) { UiMessageBox("Invalid system path"); return; } + /* Let user know we started loading */ UiDrawStatusText("Loading..."); /* Try to open system drive */ @@ -463,25 +430,25 @@ DbgPrint((DPRINT_WINDOWS,"SystemRoot: '%s'\n", BootPath)); - // Allocate and minimalistic-initialize LPB + /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); - // Detect hardware + /* Detect hardware */ MachHwDetect(&LoaderBlock->ConfigurationRoot); - // Load kernel + /* Load kernel */ strcpy(FileName, BootPath); strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE"); Status = WinLdrLoadImage(FileName, LoaderSystemCode, &NtosBase); DbgPrint((DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase)); - // Load HAL + /* Load HAL */ strcpy(FileName, BootPath); strcat(FileName, "SYSTEM32\\HAL.DLL"); Status = WinLdrLoadImage(FileName, LoaderHalCode, &HalBase); DbgPrint((DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase)); - // Load kernel-debugger support dll + /* Load kernel-debugger support dll */ if (OperatingSystemVersion > _WIN32_WINNT_NT4) { strcpy(FileName, BootPath); @@ -490,7 +457,7 @@ DbgPrint((DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase)); } - // Allocate data table entries for above-loaded modules + /* Allocate data table entries for above-loaded modules */ WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", "WINNT\\SYSTEM32\\NTOSKRNL.EXE", NtosBase, &KernelDTE); WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", @@ -518,14 +485,13 @@ DbgPrint((DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status)); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock); + WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath); /* Alloc PCR, TSS, do magic things with the GDT/IDT */ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); - /* Save entry-point pointer (VA) */ + /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; - LoaderBlockVA = PaToVa(LoaderBlock); /* "Stop all motors", change videomode */ @@ -541,9 +507,9 @@ DbgPrint((DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", KiSystemStartup, LoaderBlockVA)); - WinLdrpDumpMemoryDescriptors(LoaderBlockVA); - WinLdrpDumpBootDriver(LoaderBlockVA); - WinLdrpDumpArcDisks(LoaderBlockVA); + //WinLdrpDumpMemoryDescriptors(LoaderBlockVA); + //WinLdrpDumpBootDriver(LoaderBlockVA); + //WinLdrpDumpArcDisks(LoaderBlockVA); //FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below //while (1) {};

1 0

[janderwald] 25097: - various msvc fixes * inline -> __inline * use msvc generated interface name * fix duplicate definition of ElfrRegisterEventSourceA -> ElfrRegisterEventSourceW * fix memory leak in ElfrOpenELA
by janderwald＠svn.reactos.org 09 Dec '06

09 Dec '06

Author: janderwald Date: Sat Dec 9 12:07:15 2006 New Revision: 25097 URL: http://svn.reactos.org/svn/reactos?rev=25097&view=rev Log: - various msvc fixes * inline -> __inline * use msvc generated interface name * fix duplicate definition of ElfrRegisterEventSourceA -> ElfrRegisterEventSourceW * fix memory leak in ElfrOpenELA Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h (original) +++ trunk/reactos/base/services/eventlog/eventlog.h Sat Dec 9 12:07:15 2006 @@ -154,7 +154,7 @@ DWORD dwDataSize, LPVOID lpRawData); -inline void LogfFreeRecord(LPVOID Rec); +void __inline LogfFreeRecord(LPVOID Rec); /* eventlog.c */ VOID PRINT_HEADER(PFILE_HEADER header); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c (original) +++ trunk/reactos/base/services/eventlog/file.c Sat Dec 9 12:07:15 2006 @@ -859,7 +859,7 @@ return Buffer; } -inline void LogfFreeRecord(LPVOID Rec) +void __inline LogfFreeRecord(LPVOID Rec) { HeapFree(MyHeap, 0, Rec); } Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c (original) +++ trunk/reactos/base/services/eventlog/rpc.c Sat Dec 9 12:07:15 2006 @@ -22,8 +22,11 @@ DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); return 0; } - +#ifdef _MSC_VER + Status = RpcServerRegisterIf(eventlog_v0_0_s_ifspec, NULL, NULL); +#else Status = RpcServerRegisterIf(eventlog_ServerIfHandle, NULL, NULL); +#endif if(Status != RPC_S_OK) { @@ -121,10 +124,10 @@ /* Function 8 */ -NTSTATUS ElfrRegisterEventSourceA( - /* [unique][in] */ LPSTR ServerName, - /* [in] */ PANSI_STRING LogName, - /* [in] */ PANSI_STRING NullStr, +NTSTATUS ElfrRegisterEventSourceW( + /* [unique][in] */ LPWSTR ServerName, + /* [in] */ PUNICODE_STRING LogName, + /* [in] */ PUNICODE_STRING NullStr, /* [in] */ long MajorVer, /* [in] */ long MinorVer, /* [out] */ PLOGHANDLE Handle) @@ -224,7 +227,7 @@ if(ServerName && !RtlCreateUnicodeStringFromAsciiz(&servername, ServerName)) { - RtlFreeUnicodeString(&servername); + RtlFreeUnicodeString(&logname); return STATUS_NO_MEMORY; }

1 0

[frik85] 25096: add more Vista UI related hyper links
by frik85＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: frik85 Date: Sat Dec 9 01:31:56 2006 New Revision: 25096 URL: http://svn.reactos.org/svn/reactos?rev=25096&view=rev Log: add more Vista UI related hyper links Modified: trunk/documentation/user.interface/user_interface_guidelines.html Modified: trunk/documentation/user.interface/user_interface_guidelines.html URL: http://svn.reactos.org/svn/reactos/trunk/documentation/user.interface/user_… ============================================================================== --- trunk/documentation/user.interface/user_interface_guidelines.html (original) +++ trunk/documentation/user.interface/user_interface_guidelines.html Sat Dec 9 01:31:56 2006 @@ -47,7 +47,15 @@ <ul> <li>Windows Vista - UI Guidelines Windows Vista User Experience Guidelines (preliminary documentation) - <a href="http://msdn.microsoft.com/library/en-us/UxGuide/UXGuide/Home.asp">http://msdn.microsoft.com/library/en-us/UxGuide/UXGuide/Home.asp</a></li> + <a href="http://msdn.microsoft.com/library/en-us/UxGuide/UXGuide/Home.asp">http://msdn.microsoft.com/library/en-us/UxGuide/UXGuide/Home.asp</a> + <a href="http://msdn.microsoft.com/windowsvista/uxguide">http://msdn.microsoft.com/windowsvista/uxguide</a> + <a href="http://download.microsoft.com/download/0/6/d/06d178f1-b36f-4030-b325-19ddfc…">http://download.microsoft.com/download/0/6/d/06d178f1-b36f-4030-b325-19ddfc…</a> (PDF, 24MB download) + </li> +</ul> +<ul> + <li>Windows UI Team Blogs + "shell: revealed" Windows UI team blog website features inside-out information around the UI topic + <a href="http://shellrevealed.com/blogs/">http://shellrevealed.com/blogs/</a></li> </ul> <ul> <li>Windows UI Programming Newsgroup

1 0

[fireball] 25095: More ConfigurationDataLength fixes
by fireball＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: fireball Date: Sat Dec 9 01:29:12 2006 New Revision: 25095 URL: http://svn.reactos.org/svn/reactos?rev=25095&view=rev Log: More ConfigurationDataLength fixes Modified: branches/winldr/arch/i386/hardware.c Modified: branches/winldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hardware.c?rev… ============================================================================== --- branches/winldr/arch/i386/hardware.c (original) +++ branches/winldr/arch/i386/hardware.c Sat Dec 9 01:29:12 2006 @@ -596,10 +596,10 @@ /* Fill DiskController resources descriptor, which consists of: Partial Resource List + 3 Partial Resource Descriptors (Dma, Irq and Port) */ - DiskComponentData->ConfigurationData = MmAllocateMemory(sizeof(CM_PARTIAL_RESOURCE_LIST) + - 2*sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - RtlZeroMemory(DiskComponentData->ConfigurationData, sizeof(CM_PARTIAL_RESOURCE_LIST) + - 2*sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2*sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + DiskComponentData->ConfigurationData = MmAllocateMemory(Size); + RtlZeroMemory(DiskComponentData->ConfigurationData, Size); + DiskComponent->ConfigurationDataLength = Size; ResourceList = (PCM_PARTIAL_RESOURCE_LIST)DiskComponentData->ConfigurationData; ResourceList->Count = 3; // DMA + Interrupt + Port @@ -693,6 +693,7 @@ Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_DISK_GEOMETRY_DEVICE_DATA); DiskPeripheralData->ConfigurationData = MmAllocateMemory(Size); RtlZeroMemory(DiskPeripheralData->ConfigurationData, Size); + DiskPeripheralEntry->ConfigurationDataLength = Size; ResourceList = (PCM_PARTIAL_RESOURCE_LIST)DiskPeripheralData->ConfigurationData; ResourceList->Count = 1; @@ -722,7 +723,7 @@ DiskPrevious = DiskPeripheralData; } - /* Create configuration data for disks */ + /* Create configuration data for disks (in the root System node ) */ /* Size is 1 resource list containing 2 resource descriptors, each one containing its own device data */ ConfigurationData = MmAllocateMemory(sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + DiskCount*sizeof(CM_INT13_DRIVE_PARAMETER) + 0);

1 0

[fireball] 25094: - Fix a bunch of lame bugs in keyboard/pointer controllers creation (missing configuration data length, wrong count of resources, etc). Now NT boots up with working keyboard and mouse.
by fireball＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: fireball Date: Sat Dec 9 00:40:45 2006 New Revision: 25094 URL: http://svn.reactos.org/svn/reactos?rev=25094&view=rev Log: - Fix a bunch of lame bugs in keyboard/pointer controllers creation (missing configuration data length, wrong count of resources, etc). Now NT boots up with working keyboard and mouse. Modified: branches/winldr/arch/i386/hardware.c Modified: branches/winldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hardware.c?rev… ============================================================================== --- branches/winldr/arch/i386/hardware.c (original) +++ branches/winldr/arch/i386/hardware.c Sat Dec 9 00:40:45 2006 @@ -1822,6 +1822,7 @@ PCONFIGURATION_COMPONENT_DATA ControllerComponent; PCONFIGURATION_COMPONENT ControllerEntry; PCM_PARTIAL_RESOURCE_LIST ResourceList; + ULONG Size; /* Create controller key */ ControllerComponent = (PCONFIGURATION_COMPONENT_DATA)MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); @@ -1837,12 +1838,12 @@ /* Fill keyboard controller resources descriptor, which consists of: Partial Resource List + 2 Partial Resource Descriptors (Irq and 2 Ports) */ - ControllerComponent->ConfigurationData = MmAllocateMemory(sizeof(CM_PARTIAL_RESOURCE_LIST) + - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - RtlZeroMemory(ControllerComponent->ConfigurationData, sizeof(CM_PARTIAL_RESOURCE_LIST) + - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2*sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ControllerComponent->ConfigurationData = MmAllocateMemory(Size); + ControllerEntry->ConfigurationDataLength = Size; + RtlZeroMemory(ControllerComponent->ConfigurationData, Size); ResourceList = (PCM_PARTIAL_RESOURCE_LIST)ControllerComponent->ConfigurationData; - ResourceList->Count = 2; // Interrupt + Port + Port + ResourceList->Count = 3; // Interrupt + Port + Port /* Interrupt */ ResourceList->PartialDescriptors[0].Type = CmResourceTypeInterrupt; @@ -2045,6 +2046,7 @@ PCONFIGURATION_COMPONENT_DATA ControllerComponent; PCONFIGURATION_COMPONENT ControllerEntry; PCM_PARTIAL_RESOURCE_LIST ResourceList; + ULONG Size; /* If there is no PS2 aux port - return */ if (!DetectPS2AuxPort()) @@ -2066,10 +2068,10 @@ /* Fill mouse controller resources descriptor, which consists of: Partial Resource List */ - ControllerComponent->ConfigurationData = MmAllocateMemory(sizeof(CM_PARTIAL_RESOURCE_LIST) + - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - RtlZeroMemory(ControllerComponent->ConfigurationData, sizeof(CM_PARTIAL_RESOURCE_LIST) + - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ControllerComponent->ConfigurationData = MmAllocateMemory(Size); + ControllerEntry->ConfigurationDataLength = Size; + RtlZeroMemory(ControllerComponent->ConfigurationData, Size); ResourceList = (PCM_PARTIAL_RESOURCE_LIST)ControllerComponent->ConfigurationData; ResourceList->Count = 1; // Interrupt

1 0

[fireball] 25093: - Remove unnecessary _NTSYSTEM_ definition - Work on hardware detection - now keyboard and pointer controllers + peripherals are detected and stored in configuration lists, however this change breaks booting (NT hangs during i8042prt initialization in QEMU).
by fireball＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: fireball Date: Fri Dec 8 23:20:24 2006 New Revision: 25093 URL: http://svn.reactos.org/svn/reactos?rev=25093&view=rev Log: - Remove unnecessary _NTSYSTEM_ definition - Work on hardware detection - now keyboard and pointer controllers + peripherals are detected and stored in configuration lists, however this change breaks booting (NT hangs during i8042prt initialization in QEMU). Modified: branches/winldr/arch/i386/hardware.c branches/winldr/arch/i386/loader.c Modified: branches/winldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hardware.c?rev… ============================================================================== --- branches/winldr/arch/i386/hardware.c (original) +++ branches/winldr/arch/i386/hardware.c Fri Dec 8 23:20:24 2006 @@ -23,10 +23,6 @@ #define NDEBUG #include <debug.h> - -/* Parts of hardware detection specific to ReactOS */ -/* They should go away once kernel is able to use configuration lists */ -#define ROS_SPECIFIC 1 #define MILLISEC (10) #define PRECISION (8) @@ -1793,14 +1789,16 @@ Partial resource list + 1 resource descriptor having device data in CM_KEYBOARD_DEVICE_DATA format */ Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_KEYBOARD_DEVICE_DATA); + KeyboardEntry->ConfigurationDataLength = Size; KeyboardComponentData->ConfigurationData = MmAllocateMemory(Size); RtlZeroMemory(KeyboardComponentData->ConfigurationData, Size); ResourceList = (PCM_PARTIAL_RESOURCE_LIST)KeyboardComponentData->ConfigurationData; + //ResourceList->Version = 1; ResourceList->Count = 1; /* Device specific data */ ResourceList->PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; - ResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = sizeof(PCM_KEYBOARD_DEVICE_DATA); + ResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = sizeof(CM_KEYBOARD_DEVICE_DATA); KeyboardData = (PCM_KEYBOARD_DEVICE_DATA)((ULONG_PTR)KeyboardComponentData->ConfigurationData + sizeof(CM_PARTIAL_RESOURCE_LIST)); @@ -1824,8 +1822,6 @@ PCONFIGURATION_COMPONENT_DATA ControllerComponent; PCONFIGURATION_COMPONENT ControllerEntry; PCM_PARTIAL_RESOURCE_LIST ResourceList; - - return ParentComponent; /* Create controller key */ ControllerComponent = (PCONFIGURATION_COMPONENT_DATA)MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); @@ -1852,7 +1848,7 @@ ResourceList->PartialDescriptors[0].Type = CmResourceTypeInterrupt; ResourceList->PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; ResourceList->PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; - ResourceList->PartialDescriptors[0].u.Interrupt.Level = 0; + ResourceList->PartialDescriptors[0].u.Interrupt.Level = 1; ResourceList->PartialDescriptors[0].u.Interrupt.Vector = 1; ResourceList->PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; @@ -1996,10 +1992,114 @@ return TRUE; } - static VOID -DetectPS2Mouse(FRLDRHKEY BusKey) -{ +DetectPointerPeripheral(PCONFIGURATION_COMPONENT_DATA PointerController) +{ + PCM_PARTIAL_RESOURCE_LIST ResourceList; + + /* Check if we really have a PS2 Aux device connected */ + if (DetectPS2AuxDevice()) + { + PCONFIGURATION_COMPONENT_DATA PointerComponentData; + PCONFIGURATION_COMPONENT PointerEntry; + + DbgPrint((DPRINT_HWDETECT, "Detected PS2 mouse\n")); + + /* Create Pointer Peripheral */ + PointerComponentData = (PCONFIGURATION_COMPONENT_DATA) + MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); + RtlZeroMemory(PointerComponentData, sizeof(CONFIGURATION_COMPONENT_DATA)); + + PointerEntry = &PointerComponentData->ComponentEntry; + RtlZeroMemory(PointerEntry, sizeof(CONFIGURATION_COMPONENT)); + + PointerEntry->Class = PeripheralClass; + PointerEntry->Type = PointerPeripheral; + PointerEntry->AffinityMask = 0xFFFFFFFF; + PointerEntry->Flags = 0x20; + PointerEntry->Identifier = MmAllocateMemory(20); + strcpy(PointerEntry->Identifier, "MICROSOFT PS2 MOUSE"); + PointerEntry->IdentifierLength = strlen(PointerEntry->Identifier); + PointerEntry->Identifier = PaToVa(PointerEntry->Identifier); + + /* Fill pointer peripheral resources descriptor, which consists of: + Partial Resource List only */ + PointerComponentData->ConfigurationData = MmAllocateMemory(sizeof(CM_PARTIAL_RESOURCE_LIST)); + RtlZeroMemory(PointerComponentData->ConfigurationData, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PointerEntry->ConfigurationDataLength = sizeof(CM_PARTIAL_RESOURCE_LIST); + ResourceList = (PCM_PARTIAL_RESOURCE_LIST)PointerComponentData->ConfigurationData; + ResourceList->Count = 0; // No resource descriptors + //ResourceList->Version = 1; + + /* Add pointer peripheral to the parent */ + PointerController->Child = PointerComponentData; + PointerComponentData->Parent = PointerController; + } +} + +static +PCONFIGURATION_COMPONENT_DATA +DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA ParentComponent, + BOOLEAN NextChild) +{ + PCONFIGURATION_COMPONENT_DATA ControllerComponent; + PCONFIGURATION_COMPONENT ControllerEntry; + PCM_PARTIAL_RESOURCE_LIST ResourceList; + + /* If there is no PS2 aux port - return */ + if (!DetectPS2AuxPort()) + return ParentComponent; + + DbgPrint((DPRINT_HWDETECT, "Detected PS2 port\n")); + + /* Create controller key */ + ControllerComponent = (PCONFIGURATION_COMPONENT_DATA)MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); + RtlZeroMemory(ControllerComponent, sizeof(CONFIGURATION_COMPONENT_DATA)); + + ControllerEntry = &ControllerComponent->ComponentEntry; + RtlZeroMemory(ControllerEntry, sizeof(CONFIGURATION_COMPONENT)); + + ControllerEntry->Class = ControllerClass; + ControllerEntry->Type = PointerController; + ControllerEntry->AffinityMask = 0xFFFFFFFF; + ControllerEntry->Flags = 0x20; + + /* Fill mouse controller resources descriptor, which consists of: + Partial Resource List */ + ControllerComponent->ConfigurationData = MmAllocateMemory(sizeof(CM_PARTIAL_RESOURCE_LIST) + + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlZeroMemory(ControllerComponent->ConfigurationData, sizeof(CM_PARTIAL_RESOURCE_LIST) + + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + ResourceList = (PCM_PARTIAL_RESOURCE_LIST)ControllerComponent->ConfigurationData; + ResourceList->Count = 1; // Interrupt + + /* Interrupt */ + ResourceList->PartialDescriptors[0].Type = CmResourceTypeInterrupt; + ResourceList->PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; + ResourceList->PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; + ResourceList->PartialDescriptors[0].u.Interrupt.Level = 12; + ResourceList->PartialDescriptors[0].u.Interrupt.Vector = 12; + ResourceList->PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; + + /* Add this mouse controller to the parent/sibling */ + if (NextChild) + { + ParentComponent->Child = ControllerComponent; + ControllerComponent->Parent = ParentComponent; + } + else + { + ParentComponent->Sibling = ControllerComponent; + ControllerComponent->Parent = ParentComponent->Parent; + } + + /* Detect any mouse attached to this controller */ + DetectPointerPeripheral(ControllerComponent); + + /* Return pointer to the mouse controller */ + return ControllerComponent; + +#if 0 CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; FRLDRHKEY ControllerKey; FRLDRHKEY PeripheralKey; @@ -2117,6 +2217,7 @@ } } } +#endif } @@ -2196,132 +2297,133 @@ PCONFIGURATION_COMPONENT_DATA PreviousComponent, BOOLEAN NextChild) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - PCONFIGURATION_COMPONENT_DATA IsaAdapter, LastComponent; - PCONFIGURATION_COMPONENT IsaComponent; - PVOID Identifier; - WCHAR Buffer[80]; - FRLDRHKEY BusKey; - ULONG Size; - LONG Error; - - /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BusKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Set 'Component Information' value similar to my NT4 box */ - SetComponentInformation(BusKey, - 0x0, - 0x0, - 0xFFFFFFFF); - - /* Increment bus number */ - (*BusNumber)++; - - /* Set 'Identifier' value */ - Error = RegSetValue(BusKey, - L"Identifier", - REG_SZ, - (PCHAR)L"ISA", - 4 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } - - /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - 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 = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 0; - - /* Set 'Configuration Data' value */ - Error = RegSetValue(BusKey, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PCHAR) FullResourceDescriptor, - Size); - MmFreeMemory(FullResourceDescriptor); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - (int)Error)); - return; - } - - - /* Create adapter component */ - IsaAdapter = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); - RtlZeroMemory(IsaAdapter, sizeof(CONFIGURATION_COMPONENT_DATA)); - - IsaComponent = &IsaAdapter->ComponentEntry; - RtlZeroMemory(IsaComponent, sizeof(CONFIGURATION_COMPONENT)); - - IsaComponent->Class = AdapterClass; - IsaComponent->Type = MultiFunctionAdapter; - IsaComponent->AffinityMask = 0xFFFFFFFF; - Identifier = MmAllocateMemory(sizeof("ISA")+1); - sprintf(Identifier, "ISA"); - IsaComponent->Identifier = PaToVa(Identifier); - IsaComponent->IdentifierLength = strlen(Identifier)+1; - - if (NextChild) - { - PreviousComponent->Child = IsaAdapter; - IsaAdapter->Parent = PreviousComponent; - } - else - { - PreviousComponent->Sibling = IsaAdapter; - IsaAdapter->Parent = PreviousComponent->Parent; - } - - - /* Detect ISA/BIOS devices */ - - /* DetectBiosDisks writes information both to the root entry and to - its own entries */ - LastComponent = DetectBiosDisks(SystemKey, BusKey, ComponentRoot, IsaAdapter, TRUE); - - DetectBiosFloppyController(SystemKey, BusKey); - - DetectSerialPorts(BusKey); - - DetectParallelPorts(BusKey); - - /* Detect keyboard and mouse */ - LastComponent = - DetectKeyboardController(LastComponent, - (IsaAdapter == LastComponent) ? TRUE : FALSE); - - DetectPS2Mouse(BusKey); - - DetectDisplayController(BusKey); - - /* FIXME: Detect more ISA devices */ + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCONFIGURATION_COMPONENT_DATA IsaAdapter, LastComponent; + PCONFIGURATION_COMPONENT IsaComponent; + PVOID Identifier; + WCHAR Buffer[80]; + FRLDRHKEY BusKey; + ULONG Size; + LONG Error; + + /* Create new bus key */ + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); + Error = RegCreateKey(SystemKey, + Buffer, + &BusKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); + return; + } + + /* Set 'Component Information' value similar to my NT4 box */ + SetComponentInformation(BusKey, + 0x0, + 0x0, + 0xFFFFFFFF); + + /* Increment bus number */ + (*BusNumber)++; + + /* Set 'Identifier' value */ + Error = RegSetValue(BusKey, + L"Identifier", + REG_SZ, + (PCHAR)L"ISA", + 4 * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); + return; + } + + /* Set 'Configuration Data' value */ + Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + 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 = Isa; + FullResourceDescriptor->BusNumber = 0; + FullResourceDescriptor->PartialResourceList.Version = 1; + FullResourceDescriptor->PartialResourceList.Revision = 1; + FullResourceDescriptor->PartialResourceList.Count = 0; + + /* Set 'Configuration Data' value */ + Error = RegSetValue(BusKey, + L"Configuration Data", + REG_FULL_RESOURCE_DESCRIPTOR, + (PCHAR) FullResourceDescriptor, + Size); + MmFreeMemory(FullResourceDescriptor); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, + "RegSetValue(Configuration Data) failed (Error %u)\n", + (int)Error)); + return; + } + + + /* Create adapter component */ + IsaAdapter = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); + RtlZeroMemory(IsaAdapter, sizeof(CONFIGURATION_COMPONENT_DATA)); + + IsaComponent = &IsaAdapter->ComponentEntry; + RtlZeroMemory(IsaComponent, sizeof(CONFIGURATION_COMPONENT)); + + IsaComponent->Class = AdapterClass; + IsaComponent->Type = MultiFunctionAdapter; + IsaComponent->AffinityMask = 0xFFFFFFFF; + Identifier = MmAllocateMemory(sizeof("ISA")+1); + sprintf(Identifier, "ISA"); + IsaComponent->Identifier = PaToVa(Identifier); + IsaComponent->IdentifierLength = strlen(Identifier)+1; + + if (NextChild) + { + PreviousComponent->Child = IsaAdapter; + IsaAdapter->Parent = PreviousComponent; + } + else + { + PreviousComponent->Sibling = IsaAdapter; + IsaAdapter->Parent = PreviousComponent->Parent; + } + + + /* Detect ISA/BIOS devices */ + + /* DetectBiosDisks writes information both to the root entry and to + its own entries */ + LastComponent = DetectBiosDisks(SystemKey, BusKey, ComponentRoot, IsaAdapter, TRUE); + + DetectBiosFloppyController(SystemKey, BusKey); + + DetectSerialPorts(BusKey); + + DetectParallelPorts(BusKey); + + /* Detect keyboard and mouse */ + LastComponent = + DetectKeyboardController(LastComponent, + (IsaAdapter == LastComponent) ? TRUE : FALSE); + + LastComponent = DetectPS2Mouse(LastComponent, + (IsaAdapter == LastComponent) ? TRUE : FALSE); + + DetectDisplayController(BusKey); + + /* FIXME: Detect more ISA devices */ } @@ -2337,7 +2439,6 @@ DbgPrint((DPRINT_HWDETECT, "DetectHardware()\n")); -#if ROS_SPECIFIC /* Create the 'System' key */ Error = RegCreateKey(NULL, L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", @@ -2347,7 +2448,6 @@ DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); return; } -#endif /* Allocate root configuration component */ *ComponentRoot = MmAllocateMemory(sizeof(CONFIGURATION_COMPONENT_DATA)); Modified: branches/winldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/loader.c?rev=2… ============================================================================== --- branches/winldr/arch/i386/loader.c (original) +++ branches/winldr/arch/i386/loader.c Fri Dec 8 23:20:24 2006 @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define _NTSYSTEM_ #include <freeldr.h> #define NDEBUG

1 0

[cwittich] 25092: -display version information for compiler, binutils and nasm
by cwittich＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: cwittich Date: Fri Dec 8 21:41:20 2006 New Revision: 25092 URL: http://svn.reactos.org/svn/reactos?rev=25092&view=rev Log: -display version information for compiler, binutils and nasm Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Fri Dec 8 21:41:20 2006 @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Casper S. Hornstrup + * 2006 Christoph von Wittich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -717,16 +718,12 @@ } string -MingwBackend::GetCompilerVersion ( const string& compilerCommand ) +MingwBackend::GetVersionString ( const string& versionCommand ) { FILE *fp; int ch, i; char buffer[81]; - string versionCommand = ssprintf ( "%s --version gcc", - compilerCommand.c_str (), - NUL, - NUL ); fp = popen ( versionCommand.c_str () , "r" ); for( i = 0; ( i < 80 ) && @@ -755,6 +752,36 @@ token = strtok ( NULL, separators ); } return version; +} + +string +MingwBackend::GetNetwideAssemblerVersion ( const string& nasmCommand ) +{ + string versionCommand = ssprintf ( "%s -v", + nasmCommand.c_str (), + NUL, + NUL ); + return GetVersionString( versionCommand ); +} + +string +MingwBackend::GetCompilerVersion ( const string& compilerCommand ) +{ + string versionCommand = ssprintf ( "%s --version gcc", + compilerCommand.c_str (), + NUL, + NUL ); + return GetVersionString( versionCommand ); +} + +string +MingwBackend::GetBinutilsVersion ( const string& binutilsCommand ) +{ + string versionCommand = ssprintf ( "%s -v", + binutilsCommand.c_str (), + NUL, + NUL ); + return GetVersionString( versionCommand ); } bool @@ -779,7 +806,7 @@ } string -MingwBackend::GetBinutilsVersion ( const string& binutilsCommand ) +MingwBackend::GetBinutilsVersionDate ( const string& binutilsCommand ) { FILE *fp; int ch, i; @@ -870,9 +897,9 @@ } if ( detectedBinutils ) { - string binutilsVersion = GetBinutilsVersion ( binutilsCommand ); + string binutilsVersion = GetBinutilsVersionDate ( binutilsCommand ); if ( IsSupportedBinutilsVersion ( binutilsVersion ) ) - printf ( "detected (%s)\n", binutilsCommand.c_str () ); + printf ( "detected (%s %s)\n", binutilsCommand.c_str (), GetBinutilsVersion( binutilsCommand ).c_str() ); else { printf ( "detected (%s), but with unsupported version (%s)\n", @@ -906,7 +933,7 @@ detectedNasm = TryToDetectThisNetwideAssembler ( nasmCommand ); } if ( detectedNasm ) - printf ( "detected (%s)\n", nasmCommand.c_str () ); + printf ( "detected (%s %s)\n", nasmCommand.c_str (), GetNetwideAssemblerVersion( nasmCommand ).c_str() ); else printf ( "not detected\n" ); } Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Fri Dec 8 21:41:20 2006 @@ -90,7 +90,10 @@ bool TryToDetectThisNetwideAssembler ( const std::string& assembler ); bool TryToDetectThisBinutils ( const std::string& binutils ); std::string GetBinutilsVersion ( const std::string& binutilsCommand ); + std::string GetBinutilsVersionDate ( const std::string& binutilsCommand ); bool IsSupportedBinutilsVersion ( const std::string& binutilsVersion ); + std::string GetVersionString ( const std::string& versionCommand ); + std::string GetNetwideAssemblerVersion ( const std::string& nasmCommand ); void DetectBinutils (); void DetectNetwideAssembler (); void DetectPipeSupport ();

1 0

[janderwald] 25091: - generated client header/source files get _c postfix - generated server header/source files get _s postfix - only generate code for the required module Note: due to an bug in VS2005 build tool lib tool does only get part of generated object filename i.e. pnp_c.obj becomes pnp.obj. As a result the lib tool cannot link. However we need to generate unique obj files so that client / server project always compiles the requires source files
by janderwald＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: janderwald Date: Fri Dec 8 15:47:58 2006 New Revision: 25091 URL: http://svn.reactos.org/svn/reactos?rev=25091&view=rev Log: - generated client header/source files get _c postfix - generated server header/source files get _s postfix - only generate code for the required module Note: due to an bug in VS2005 build tool lib tool does only get part of generated object filename i.e. pnp_c.obj becomes pnp.obj. As a result the lib tool cannot link. However we need to generate unique obj files so that client / server project always compiles the requires source files Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Dec 8 15:47:58 2006 @@ -595,12 +595,18 @@ fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); if ( module.type == RpcClient ) - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"midl.exe /cstub %s.c /header %s.h "$(InputPath)" /out "$(IntDir)"", src.c_str (), src.c_str () ); + { + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"midl.exe /cstub %s_c.c /header %s_c.h /server none "$(InputPath)" /out "$(IntDir)"", src.c_str (), src.c_str () ); + fprintf ( OUT, "
"); + fprintf ( OUT, "cl.exe /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WIN32_WINNT=0x502" /D "_UNICODE" /D "UNICODE" /Gm /EHsc /RTC1 /MDd /Fo"$(IntDir)\\%s.obj" /W3 /c /Wp64 /ZI /TC "$(IntDir)\\%s_c.c" /nologo /errorReport:prompt", src.c_str (), src.c_str () ); + } else - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"midl.exe /sstub %s.c /header %s.h "$(InputPath)" /out "$(IntDir)"", src.c_str (), src.c_str () ); - - fprintf ( OUT, "
"); - fprintf ( OUT, "cl.exe /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WIN32_WINNT=0x502" /D "_UNICODE" /D "UNICODE" /Gm /EHsc /RTC1 /MDd /Fo"$(IntDir)\\%s.obj" /W3 /c /Wp64 /ZI /TC "$(IntDir)\\%s.c" /nologo /errorReport:prompt", src.c_str (), src.c_str () ); + { + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"midl.exe /sstub %s_s.c /header %s_s.h /client none "$(InputPath)" /out "$(IntDir)"", src.c_str (), src.c_str () ); + fprintf ( OUT, "
"); + fprintf ( OUT, "cl.exe /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WIN32_WINNT=0x502" /D "_UNICODE" /D "UNICODE" /Gm /EHsc /RTC1 /MDd /Fo"$(IntDir)\\%s.obj" /W3 /c /Wp64 /ZI /TC "$(IntDir)\\%s_s.c" /nologo /errorReport:prompt", src.c_str (), src.c_str () ); + + } fprintf ( OUT, "
"); fprintf ( OUT, "lib.exe /OUT:"$(OutDir)\\%s.lib" "$(IntDir)\\%s.obj"
\"\r\n", module.name.c_str (), src.c_str () ); fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(IntDir)\\$(InputName).obj\"/>\r\n" );

1 0

[janderwald] 25090: - silence output
by janderwald＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: janderwald Date: Fri Dec 8 15:24:40 2006 New Revision: 25090 URL: http://svn.reactos.org/svn/reactos?rev=25090&view=rev Log: - silence output Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Dec 8 15:24:40 2006 @@ -158,7 +158,6 @@ module.GetBasePath() ); if ( module.type != RpcServer && module.type != RpcClient ) { - printf("path %s\n", path.c_str ()); if ( path.find ("/include/reactos/idl") != string::npos) { include_idl = true;

1 0

[janderwald] 25089: - include path to generated idl files for dependant projects
by janderwald＠svn.reactos.org 08 Dec '06

08 Dec '06

Author: janderwald Date: Fri Dec 8 14:50:56 2006 New Revision: 25089 URL: http://svn.reactos.org/svn/reactos?rev=25089&view=rev Log: - include path to generated idl files for dependant projects Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Dec 8 14:50:56 2006 @@ -114,6 +114,7 @@ // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? bool console = exe && (module.type == Win32CUI); + bool include_idl = false; string vcproj_path = module.GetBasePath(); vector<string> source_files, resource_files, includes, includes_wine, libraries; @@ -155,7 +156,15 @@ string path = Path::RelativeFromDirectory ( incs[i]->directory, module.GetBasePath() ); - + if ( module.type != RpcServer && module.type != RpcClient ) + { + printf("path %s\n", path.c_str ()); + if ( path.find ("/include/reactos/idl") != string::npos) + { + include_idl = true; + continue; + } + } // add to another list win32api and include/wine directories if ( !strncmp(incs[i]->directory.c_str(), "include\\ddk", 11 ) || !strncmp(incs[i]->directory.c_str(), "include\\crt", 11 ) || @@ -270,6 +279,20 @@ fprintf ( OUT, "%s", include.c_str() ); include_string += " /I " + include; multiple_includes = true; + } + } + if ( include_idl ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + + if ( configuration.UseConfigurationInPath ) + { + fprintf ( OUT, "%s\\include\\reactos\\idl%s\\%s\r\n", intdir.c_str (), vcdir.c_str (), cfg.name.c_str() ); + } + else + { + fprintf ( OUT, "%s\\include\\reactos\\idl\r\n", intdir.c_str () ); } } if ( cfg.headers == WineHeaders )

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2006