Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 23846: Pass additional arguments to a service when it is started by a call to StartService.
by ekohl＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: ekohl Date: Thu Aug 31 21:16:19 2006 New Revision: 23846 URL: http://svn.reactos.org/svn/reactos?rev=23846&view=rev Log: Pass additional arguments to a service when it is started by a call to StartService. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/driver.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/include/reactos/wine/winnt.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Thu Aug 31 21:16:19 2006 @@ -528,14 +528,14 @@ } -static NTSTATUS -ScmSendStartCommand(PSERVICE Service, LPWSTR Arguments) +static DWORD +ScmSendStartCommand(PSERVICE Service, + LPWSTR Arguments) { PSCM_START_PACKET StartPacket; DWORD TotalLength; -#if 0 + DWORD ArgsLength = 0; DWORD Length; -#endif PWSTR Ptr; DWORD Count; @@ -543,7 +543,6 @@ /* Calculate the total length of the start command line */ TotalLength = wcslen(Service->lpServiceName) + 1; -#if 0 if (Arguments != NULL) { Ptr = Arguments; @@ -551,18 +550,20 @@ { Length = wcslen(Ptr) + 1; TotalLength += Length; + ArgsLength += Length; Ptr += Length; - } - } -#endif + DPRINT("Arg: %S\n", Ptr); + } + } TotalLength++; + DPRINT("ArgsLength: %ld\nTotalLength: %ld\n\n", ArgsLength, TotalLength); /* Allocate start command packet */ StartPacket = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SCM_START_PACKET) + (TotalLength - 1) * sizeof(WCHAR)); if (StartPacket == NULL) - return STATUS_INSUFFICIENT_RESOURCES; + return ERROR_NOT_ENOUGH_MEMORY; StartPacket->Command = SCM_START_COMMAND; StartPacket->Size = TotalLength; @@ -570,8 +571,14 @@ wcscpy(Ptr, Service->lpServiceName); Ptr += (wcslen(Service->lpServiceName) + 1); - /* FIXME: Copy argument list */ - + /* Copy argument list */ + if (Arguments != NULL) + { + memcpy(Ptr, Arguments, ArgsLength); + Ptr += ArgsLength; + } + + /* Terminate the argument list */ *Ptr = 0; /* Send the start command */ @@ -583,18 +590,20 @@ /* FIXME: Read the reply */ + /* Release the start command packet */ HeapFree(GetProcessHeap(), 0, StartPacket); DPRINT("ScmSendStartCommand() done\n"); - return STATUS_SUCCESS; -} - - -static NTSTATUS -ScmStartUserModeService(PSERVICE Service) + return ERROR_SUCCESS; +} + + +static DWORD +ScmStartUserModeService(PSERVICE Service, + LPWSTR lpArgs) { RTL_QUERY_REGISTRY_TABLE QueryTable[3]; PROCESS_INFORMATION ProcessInformation; @@ -603,6 +612,7 @@ ULONG Type; BOOL Result; NTSTATUS Status; + DWORD dwError = ERROR_SUCCESS; RtlInitUnicodeString(&ImagePath, NULL); @@ -626,7 +636,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - return Status; + return RtlNtStatusToDosError(Status); } DPRINT("ImagePath: '%S'\n", ImagePath.Buffer); DPRINT("Type: %lx\n", Type); @@ -644,7 +654,7 @@ if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE) { DPRINT1("Failed to create control pipe!\n"); - return STATUS_UNSUCCESSFUL; + return GetLastError(); } StartupInfo.cb = sizeof(StartupInfo); @@ -669,12 +679,13 @@ if (!Result) { + dwError = GetLastError(); /* Close control pipe */ CloseHandle(Service->ControlPipeHandle); Service->ControlPipeHandle = INVALID_HANDLE_VALUE; DPRINT1("Starting '%S' failed!\n", Service->lpServiceName); - return STATUS_UNSUCCESSFUL; + return dwError; } DPRINT("Process Id: %lu Handle %lx\n", @@ -706,20 +717,21 @@ &dwRead, NULL)) { + dwError = GetLastError(); DPRINT1("Reading the service control pipe failed (Error %lu)\n", - GetLastError()); - Status = STATUS_UNSUCCESSFUL; + dwError); } else { DPRINT("Received process id %lu\n", dwProcessId); /* Send start command */ - Status = ScmSendStartCommand(Service, NULL); + dwError = ScmSendStartCommand(Service, lpArgs); } } else { + dwError = GetLastError(); DPRINT("Connecting control pipe failed!\n"); /* Close control pipe */ @@ -727,22 +739,21 @@ Service->ControlPipeHandle = INVALID_HANDLE_VALUE; Service->ProcessId = 0; Service->ThreadId = 0; - Status = STATUS_UNSUCCESSFUL; } /* Close process and thread handle */ CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hProcess); - return Status; -} - - -NTSTATUS -ScmStartService(PSERVICE Service) + return dwError; +} + + +DWORD +ScmStartService(PSERVICE Service, LPWSTR lpArgs) { PSERVICE_GROUP Group = Service->lpGroup; - NTSTATUS Status; + DWORD dwError = ERROR_SUCCESS; DPRINT("ScmStartService() called\n"); @@ -752,19 +763,19 @@ if (Service->Status.dwServiceType & SERVICE_DRIVER) { /* Load driver */ - Status = ScmLoadDriver(Service); - if (Status == STATUS_SUCCESS) + dwError = ScmLoadDriver(Service); + if (dwError == ERROR_SUCCESS) Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; } else { /* Start user-mode service */ - Status = ScmStartUserModeService(Service); - } - - DPRINT("ScmStartService() done (Status %lx)\n", Status); - - if (NT_SUCCESS(Status)) + dwError = ScmStartUserModeService(Service, lpArgs); + } + + DPRINT("ScmStartService() done (Error %lu)\n", dwError); + + if (dwError == ERROR_SUCCESS) { if (Group != NULL) { @@ -802,7 +813,7 @@ } #endif - return Status; + return dwError; } @@ -846,7 +857,7 @@ (CurrentService->dwTag == CurrentGroup->TagArray[i])) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService); + ScmStartService(CurrentService, NULL); } ServiceEntry = ServiceEntry->Flink; @@ -864,7 +875,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService); + ScmStartService(CurrentService, NULL); } ServiceEntry = ServiceEntry->Flink; @@ -884,7 +895,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService); + ScmStartService(CurrentService, NULL); } ServiceEntry = ServiceEntry->Flink; @@ -901,7 +912,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService); + ScmStartService(CurrentService, NULL); } ServiceEntry = ServiceEntry->Flink; Modified: trunk/reactos/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/drive… ============================================================================== --- trunk/reactos/base/system/services/driver.c (original) +++ trunk/reactos/base/system/services/driver.c Thu Aug 31 21:16:19 2006 @@ -11,12 +11,13 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS +DWORD ScmLoadDriver(PSERVICE lpService) { WCHAR szDriverPath[MAX_PATH]; UNICODE_STRING DriverPath; NTSTATUS Status; + DWORD dwError = ERROR_SUCCESS; /* Build the driver path */ wcscpy(szDriverPath, @@ -34,7 +35,12 @@ /* FIXME: Release privilege */ - return Status; + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + } + + return dwError; } Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Thu Aug 31 21:16:19 2006 @@ -1755,7 +1755,6 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - NTSTATUS Status; DPRINT1("ScmrStartServiceW() called\n"); @@ -1790,12 +1789,7 @@ return ERROR_SERVICE_MARKED_FOR_DELETE; /* Start the service */ - Status = ScmStartService(lpService); - if (!NT_SUCCESS(Status)) - { - DPRINT("ScmStartService failed!\n"); - return RtlNtStatusToDosError(Status); - } + dwError = ScmStartService(lpService, (LPWSTR)lpServiceArgBuffer); return dwError; } @@ -2099,7 +2093,6 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - NTSTATUS Status; DPRINT1("ScmrStartServiceA() called\n"); @@ -2136,9 +2129,9 @@ /* FIXME: Convert argument vector to Unicode */ /* Start the service */ - Status = ScmStartService(lpService); - if (!NT_SUCCESS(Status)) - return RtlNtStatusToDosError(Status); + dwError = ScmStartService(lpService, NULL); + + /* FIXME: Free argument vector */ return dwError; } Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Thu Aug 31 21:16:19 2006 @@ -88,6 +88,8 @@ DWORD ScmCreateServiceDatabase(VOID); VOID ScmGetBootAndSystemDriverState(VOID); VOID ScmAutoStartServices(VOID); +DWORD ScmStartService(PSERVICE Service, + LPWSTR lpArgs); PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); @@ -99,7 +101,7 @@ /* driver.c */ -NTSTATUS ScmLoadDriver(PSERVICE lpService); +DWORD ScmLoadDriver(PSERVICE lpService); DWORD ScmUnloadDriver(PSERVICE lpService); DWORD ScmControlDriver(PSERVICE lpService, DWORD dwControl, @@ -121,8 +123,6 @@ /* services.c */ VOID PrintString(LPCSTR fmt, ...); -NTSTATUS ScmStartService(PSERVICE Service); - /* EOF */ Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Thu Aug 31 21:16:19 2006 @@ -90,17 +90,24 @@ PACTIVE_SERVICE lpService; DWORD dwArgCount = 0; DWORD dwLength = 0; + DWORD dwLen; + LPWSTR lpPtr; lpService = (PACTIVE_SERVICE)Context; DPRINT("ScServiceMainStub() called\n"); /* Count arguments */ - while (lpService->Arguments[dwLength]) - { - dwLength += wcslen(&lpService->Arguments[dwLength]) + 1; + lpPtr = lpService->Arguments; + while (*lpPtr) + { + DPRINT("arg: %S\n", *lpPtr); + dwLen = wcslen(lpPtr) + 1; dwArgCount++; - } + dwLength += dwLen; + lpPtr += dwLen; + } + DPRINT("dwArgCount: %ld\ndwLength: %ld\n", dwArgCount, dwLength); /* Build the argument vector and call the main service routine */ if (lpService->bUnicode) @@ -241,6 +248,7 @@ PACTIVE_SERVICE lpService; HANDLE ThreadHandle; + DPRINT("ScStartService() called\n"); DPRINT("Size: %lu\n", StartPacket->Size); DPRINT("Service: %S\n", &StartPacket->Arguments[0]); Modified: trunk/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnt… ============================================================================== --- trunk/reactos/include/reactos/wine/winnt.h (original) +++ trunk/reactos/include/reactos/wine/winnt.h Thu Aug 31 21:16:19 2006 @@ -38,6 +38,8 @@ #define LANG_RHAETO_ROMANCE 0x17 #define LANG_SAAMI 0x3b #define LANG_SORBIAN 0x2e +#define LANG_LOWER_SORBIAN 0x2e +#define LANG_UPPER_SORBIAN 0x2e #define LANG_SUTU 0x30 #define LANG_TSONGA 0x31 #define LANG_TSWANA 0x32

1 0

[ion] 23845: - Remove some deprecated code and custom ROS exports/code.
by ion＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: ion Date: Thu Aug 31 21:10:58 2006 New Revision: 23845 URL: http://svn.reactos.org/svn/reactos?rev=23845&view=rev Log: - Remove some deprecated code and custom ROS exports/code. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/i386/gdt.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/i386/main_asm.S trunk/reactos/ntoskrnl/ke/i386/tss.c trunk/reactos/ntoskrnl/ke/main.c trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Aug 31 21:10:58 2006 @@ -565,21 +565,7 @@ if (KdPollBreakIn()) DbgBreakPointWithStatus (DBG_STATUS_CONTROL_C); /* Initialize all processors */ - while (!HalAllProcessorsStarted()) { - - PVOID ProcessorStack; - - /* Set up the Kernel and Process Manager for this CPU */ - KePrepareForApplicationProcessorInit(KeNumberProcessors); - KeCreateApplicationProcessorIdleThread(KeNumberProcessors); - - /* Allocate a stack for use when booting the processor */ - ProcessorStack = RVA(Ki386InitialStackArray[((int)KeNumberProcessors)], KERNEL_STACK_SIZE); - - /* Tell HAL a new CPU is being started */ - HalStartNextProcessor(0, (ULONG)ProcessorStack - 2*sizeof(FX_SAVE_AREA)); - KeNumberProcessors++; - } + HalAllProcessorsStarted(); /* Do Phase 1 HAL Initalization */ HalInitSystem(1, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/gdt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/gdt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c Thu Aug 31 21:10:58 2006 @@ -48,12 +48,6 @@ static KSPIN_LOCK GdtLock; /* FUNCTIONS *****************************************************************/ - -VOID -KiGdtPrepareForApplicationProcessorInit(ULONG Id) -{ - KiGdtArray[Id] = ExAllocatePool(NonPagedPool, sizeof(USHORT) * 4 * 11); -} VOID KiInitializeGdt(PKPCR Pcr) @@ -247,36 +241,4 @@ KeReleaseSpinLock(&GdtLock, oldIrql); } -VOID -KeDumpGdtSelector(ULONG Entry) -{ - USHORT a, b, c, d; - ULONG RawLimit; - - a = KiBootGdt[Entry*4]; - b = KiBootGdt[Entry*4 + 1]; - c = KiBootGdt[Entry*4 + 2]; - d = KiBootGdt[Entry*4 + 3]; - - DbgPrint("Base: %x\n", b + ((c & 0xff) * (1 << 16)) + - ((d & 0xff00) * (1 << 16))); - RawLimit = a + ((d & 0xf) * (1 << 16)); - if (d & 0x80) - { - DbgPrint("Limit: %x\n", RawLimit * 4096); - } - else - { - DbgPrint("Limit: %x\n", RawLimit); - } - DbgPrint("Accessed: %d\n", (c & 0x100) >> 8); - DbgPrint("Type: %x\n", (c & 0xe00) >> 9); - DbgPrint("System: %d\n", (c & 0x1000) >> 12); - DbgPrint("DPL: %d\n", (c & 0x6000) >> 13); - DbgPrint("Present: %d\n", (c & 0x8000) >> 15); - DbgPrint("AVL: %x\n", (d & 0x10) >> 4); - DbgPrint("D: %d\n", (d & 0x40) >> 6); - DbgPrint("G: %d\n", (d & 0x80) >> 7); -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Thu Aug 31 21:10:58 2006 @@ -41,8 +41,6 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, Ki386GetCpuId) -#pragma alloc_text(INIT, KeCreateApplicationProcessorIdleThread) -#pragma alloc_text(INIT, KePrepareForApplicationProcessorInit) #pragma alloc_text(INIT, KeInit1) #pragma alloc_text(INIT, KeInit2) #pragma alloc_text(INIT, Ki386SetProcessorFeatures) @@ -185,148 +183,6 @@ Ki386Cpuid(0x80000006, &Dummy, &Dummy, &Ecx, &Dummy); Pcr->SecondLevelCacheSize = Ecx >> 16; } -} - -VOID -KeApplicationProcessorInitDispatcher(VOID) -{ - KIRQL oldIrql; - oldIrql = KeAcquireDispatcherDatabaseLock(); - IdleProcessorMask |= (1 << KeGetCurrentProcessorNumber()); - KeReleaseDispatcherDatabaseLock(oldIrql); -} - -VOID -INIT_FUNCTION -KeCreateApplicationProcessorIdleThread(ULONG Id) -{ - PETHREAD IdleThread; - PKPRCB Prcb = ((PKPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE))->Prcb; - - PsInitializeIdleOrFirstThread(PsIdleProcess, - &IdleThread, - NULL, - KernelMode, - FALSE); - IdleThread->Tcb.State = Running; - IdleThread->Tcb.FreezeCount = 0; - IdleThread->Tcb.Affinity = 1 << Id; - IdleThread->Tcb.UserAffinity = 1 << Id; - IdleThread->Tcb.Priority = LOW_PRIORITY; - IdleThread->Tcb.BasePriority = LOW_PRIORITY; - Prcb->IdleThread = &IdleThread->Tcb; - Prcb->CurrentThread = &IdleThread->Tcb; - - Ki386InitialStackArray[Id] = (PVOID)IdleThread->Tcb.StackLimit; - - DPRINT("IdleThread for Processor %d has PID %d\n", - Id, IdleThread->Cid.UniqueThread); -} - -VOID -INIT_FUNCTION -NTAPI -KePrepareForApplicationProcessorInit(ULONG Id) -{ - PFN_TYPE PrcPfn; - PKIPCR Pcr; - PKIPCR BootPcr; - - DPRINT("KePrepareForApplicationProcessorInit(Id %d)\n", Id); - - BootPcr = (PKIPCR)KPCR_BASE; - Pcr = (PKIPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE); - - MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &PrcPfn); - MmCreateVirtualMappingForKernel((PVOID)Pcr, - PAGE_READWRITE, - &PrcPfn, - 1); - /* - * Create a PCR for this processor - */ - memset(Pcr, 0, PAGE_SIZE); - Pcr->Number = Id; - Pcr->SetMember = 1 << Id; - Pcr->NtTib.Self = &Pcr->NtTib; - Pcr->Self = (PKPCR)Pcr; - Pcr->Prcb = &Pcr->PrcbData; - Pcr->Irql = SYNCH_LEVEL; - - Pcr->PrcbData.SetMember = 1 << Id; - Pcr->PrcbData.MHz = BootPcr->PrcbData.MHz; - Pcr->StallScaleFactor = BootPcr->StallScaleFactor; - - /* Mark the end of the exception handler list */ - Pcr->NtTib.ExceptionList = (PVOID)-1; - - KiGdtPrepareForApplicationProcessorInit(Id); - - KeActiveProcessors |= 1 << Id; -} - -VOID -NTAPI -KeApplicationProcessorInit(VOID) -{ - ULONG Offset; - PKIPCR Pcr; - - DPRINT("KeApplicationProcessorInit()\n"); - - if (Ke386GlobalPagesEnabled) - { - /* Enable global pages */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_PGE); - } - - - Offset = InterlockedIncrementUL(&PcrsAllocated) - 1; - Pcr = (PKIPCR)((ULONG_PTR)KPCR_BASE + Offset * PAGE_SIZE); - - /* - * Initialize the GDT - */ - KiInitializeGdt((PKPCR)Pcr); - - /* Get processor information. */ - Ki386GetCpuId(); - - /* Check FPU/MMX/SSE support. */ - KiCheckFPU(); - - KeInitDpc(Pcr->Prcb); - InitializeListHead(&Pcr->PrcbData.WaitListHead); - - if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) - { - extern void KiFastCallEntry(void); - - /* CS Selector of the target segment. */ - Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); - /* Target ESP. */ - Ke386Wrmsr(0x175, 0, 0); - /* Target EIP. */ - Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); - } - - /* - * It is now safe to process interrupts - */ - KeLowerIrql(DISPATCH_LEVEL); - - /* - * Initialize the TSS - */ - Ki386ApplicationProcessorInitializeTSS(); - - /* - * Initialize a default LDT - */ - Ki386InitializeLdt(); - - /* Now we can enable interrupts. */ - Ke386EnableInterrupts(); } VOID @@ -423,42 +279,8 @@ } p1 = p2; } -#if 0 - /* - * FIXME: - * Make the detection of the noexecute feature more portable. - */ - if(KPCR->PrcbData.CpuType == 0xf && - RtlCompareMemory("AuthenticAMD", KPCR->PrcbData.VendorString, 12) == 12) - { - if (NoExecute) - { - ULONG Flags, l, h; - Ke386SaveFlags(Flags); - Ke386DisableInterrupts(); - - Ke386Rdmsr(0xc0000080, l, h); - l |= (1 << 11); - Ke386Wrmsr(0xc0000080, l, h); - Ke386NoExecute = TRUE; - Ke386RestoreFlags(Flags); - } - } - else - { - NoExecute=FALSE; - } -#endif Ke386Pae = Ke386GetCr4() & X86_CR4_PAE ? TRUE : FALSE; -#if 0 - /* Enable PAE mode */ - if ((Pae && (KPCR->PrcbData.FeatureBits & X86_FEATURE_PAE)) || NoExecute) - { - MiEnablePAE((PVOID*)LastKernelAddress); - Ke386PaeEnabled = TRUE; - } -#endif if (KPCR->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) { extern void KiFastCallEntry(void); Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/main_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S Thu Aug 31 21:10:58 2006 @@ -64,7 +64,7 @@ * Call the application processor initialization code */ pushl $0 - call _KiSystemStartup + call _KiSystemStartup@4 .m1: /* Load the initial kernel stack */ Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/tss.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/tss.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/tss.c Thu Aug 31 21:10:58 2006 @@ -39,149 +39,6 @@ extern VOID KiTrap8(VOID); /* FUNCTIONS *****************************************************************/ - -BOOL STDCALL -Ke386IoSetAccessProcess(PEPROCESS Process, BOOL EnableDisable) -{ - KIRQL oldIrql; - USHORT Offset; - - if(EnableDisable > 1) return FALSE; - Offset = (EnableDisable) ? (USHORT) FIELD_OFFSET(KTSS, IoMaps) : 0xffff; - - oldIrql = KeRaiseIrqlToSynchLevel(); - Process->Pcb.IopmOffset = Offset; - - if(PsGetCurrentProcess() == Process) - { - KeGetCurrentKPCR()->TSS->IoMapBase = Offset; - } - - KeLowerIrql(oldIrql); - return TRUE; -} - - -BOOL STDCALL -Ke386SetIoAccessMap(DWORD MapNumber, PULONG IOMapStart) -{ - KIRQL oldIrql; - - if(MapNumber != 1) return FALSE; - - oldIrql = KeRaiseIrqlToSynchLevel(); - - memcpy(&KeGetCurrentKPCR()->TSS->IoMaps[0], - IOMapStart, - 0x2000); - - KeGetCurrentKPCR()->TSS->IoMapBase = KeGetCurrentProcess()->IopmOffset; - KeLowerIrql(oldIrql); - return TRUE; -} - -BOOL STDCALL -Ke386QueryIoAccessMap(DWORD MapNumber, PULONG IOMapStart) -{ - KIRQL oldIrql; - - if(MapNumber == 0x0) - { - memset(IOMapStart, 0xff, 0x2000); - return TRUE; - } else if(MapNumber != 1) return FALSE; - - oldIrql = KeRaiseIrqlToSynchLevel(); - - memcpy(IOMapStart, - &KeGetCurrentKPCR()->TSS->IoMaps[0], - 0x2000); - - KeLowerIrql(oldIrql); - return TRUE; -} - -VOID -Ki386ApplicationProcessorInitializeTSS(VOID) -{ - ULONG cr3_; - PKTSS Tss; - PKTSS TrapTss; - PVOID TrapStack; - ULONG Id; - PUSHORT Gdt; - ULONG base, length; - - Id = KeGetCurrentProcessorNumber(); - Gdt = KeGetCurrentKPCR()->GDT; - - Ke386GetPageTableDirectory(cr3_); - - Tss = ExAllocatePool(NonPagedPool, sizeof(KTSS)); - TrapTss = ExAllocatePool(NonPagedPool, sizeof(KTSSNOIOPM)); - TrapStack = ExAllocatePool(NonPagedPool, KERNEL_STACK_SIZE); - - Ki386TssArray[Id] = Tss; - Ki386TrapTssArray[Id] = (KTSSNOIOPM*)TrapTss; - Ki386TrapStackArray[Id] = TrapStack; - KeGetCurrentKPCR()->TSS = Tss; - - /* Initialize the boot TSS. */ - Tss->Esp0 = (ULONG)Ki386InitialStackArray[Id] + KERNEL_STACK_SIZE; /* FIXME: - sizeof(FX_SAVE_AREA)? */ - Tss->Ss0 = KGDT_R0_DATA; - Tss->IoMapBase = 0xFFFF; /* No i/o bitmap */ - Tss->LDT = 0; - - /* - * Initialize a descriptor for the TSS - */ - base = (ULONG)Tss; - length = sizeof(KTSS) - 1; - - Gdt[(KGDT_TSS / 2) + 0] = (USHORT)(length & 0xFFFF); - Gdt[(KGDT_TSS / 2) + 1] = (USHORT)(base & 0xFFFF); - Gdt[(KGDT_TSS / 2) + 2] = (USHORT)(((base & 0xFF0000) >> 16) | 0x8900); - Gdt[(KGDT_TSS / 2) + 3] = (USHORT)(((length & 0xF0000) >> 16) | - ((base & 0xFF000000) >> 16)); - - /* Initialize the TSS used for handling double faults. */ - TrapTss->Flags = 0; - TrapTss->Esp0 = ((ULONG)TrapStack + KERNEL_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ - TrapTss->Ss0 = KGDT_R0_DATA; - TrapTss->Cs = KGDT_R0_CODE; - TrapTss->Eip = (ULONG)KiTrap8; - TrapTss->Ds = KGDT_R0_DATA; - TrapTss->Es = KGDT_R0_DATA; - TrapTss->Fs = KGDT_R0_PCR; - TrapTss->IoMapBase = 0xFFFF; /* No i/o bitmap */ - TrapTss->LDT = 0; - - /* - * Initialize a descriptor for the trap TSS. - */ - base = (ULONG)TrapTss; - length = sizeof(KTSSNOIOPM) - 1; - - Gdt[(KGDT_DF_TSS / 2) + 0] = (USHORT)(length & 0xFFFF); - Gdt[(KGDT_DF_TSS / 2) + 1] = (USHORT)(base & 0xFFFF); - Gdt[(KGDT_DF_TSS / 2) + 2] = (USHORT)(((base & 0xFF0000) >> 16) | 0x8900); - Gdt[(KGDT_DF_TSS / 2) + 3] = (USHORT)(((length & 0xF0000) >> 16) | - ((base & 0xFF000000) >> 16)); - - /* - * Load the task register - */ -#if defined(__GNUC__) - __asm__("ltr %%ax" - : /* no output */ - : "a" (KGDT_TSS)); -#elif defined(_MSC_VER) - __asm mov ax, KGDT_TSS - __asm ltr ax -#else -#error Unknown compiler for inline assembler -#endif -} VOID INIT_FUNCTION Ki386BootInitializeTSS(VOID) Modified: trunk/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/main.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/ke/main.c (original) +++ trunk/reactos/ntoskrnl/ke/main.c Thu Aug 31 21:10:58 2006 @@ -66,8 +66,6 @@ extern unsigned int _image_base__; ULONG_PTR KERNEL_BASE = (ULONG_PTR)&_image_base__; -VOID INIT_FUNCTION _main(ULONG MultiBootMagic, PROS_LOADER_PARAMETER_BLOCK _LoaderBlock); - #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, _main) #endif @@ -87,55 +85,39 @@ } VOID -#ifdef __GNUC__ -__attribute((noinline)) -#endif +NTAPI KiSystemStartup(BOOLEAN BootProcessor) { DPRINT("KiSystemStartup(%d)\n", BootProcessor); - /* Initialize the Application Processor */ - if (!BootProcessor) KeApplicationProcessorInit(); - /* Initialize the Processor with HAL */ HalInitializeProcessor(KeNumberProcessors, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); - /* Load the Kernel if this is the Boot CPU, else inialize the App CPU only */ - if (BootProcessor) { - - /* Initialize the Kernel Executive */ - ExpInitializeExecutive(); - - /* Create the IOPM Save Area */ - Ki386IopmSaveArea = ExAllocatePoolWithTag(NonPagedPool, - PAGE_SIZE * 2, - TAG('K', 'e', ' ', ' ')); - - /* Free Initial Memory */ - MiFreeInitMemory(); + /* Initialize the Kernel Executive */ + ExpInitializeExecutive(); + + /* Create the IOPM Save Area */ + Ki386IopmSaveArea = ExAllocatePoolWithTag(NonPagedPool, + PAGE_SIZE * 2, + TAG('K', 'e', ' ', ' ')); + + /* Free Initial Memory */ + MiFreeInitMemory(); /* Never returns */ #if 0 - /* FIXME: - * The initial thread isn't a real ETHREAD object, we cannot call PspExitThread. - */ - PspExitThread(STATUS_SUCCESS); + /* FIXME: + * The initial thread isn't a real ETHREAD object, we cannot call PspExitThread. + */ + PspExitThread(STATUS_SUCCESS); #else - while (1) { - LARGE_INTEGER Timeout; - Timeout.QuadPart = 0x7fffffffffffffffLL; - KeDelayExecutionThread(KernelMode, FALSE, &Timeout); - } + while (1) + { + LARGE_INTEGER Timeout; + Timeout.QuadPart = 0x7fffffffffffffffLL; + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + } #endif - } else { - - /* Do application processor initialization */ - KeApplicationProcessorInitDispatcher(); - - /* Lower IRQL and go to Idle Thread */ - KeLowerIrql(PASSIVE_LEVEL); - PsIdleThreadMain(NULL); - } /* Bug Check and loop forever if anything failed */ KEBUGCHECK(0); Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Thu Aug 31 21:10:58 2006 @@ -513,9 +513,6 @@ KdPowerTransition@4 KdpServiceDispatcher@12 Ke386CallBios@8 -Ke386IoSetAccessProcess@8 -Ke386QueryIoAccessMap@8 -Ke386SetIoAccessMap@8 @KeAcquireGuardedMutex@4 @KeAcquireGuardedMutexUnsafe@4 KeAcquireSpinLockAtDpcLevel@4

1 0

[weiden] 23844: Add stubs for the condition variable functions
by weiden＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: weiden Date: Thu Aug 31 20:56:49 2006 New Revision: 23844 URL: http://svn.reactos.org/svn/reactos?rev=23844&view=rev Log: Add stubs for the condition variable functions Added: trunk/reactos/dll/win32/kernel32/synch/condvar.c (with props) trunk/reactos/lib/rtl/condvar.c (with props) Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/include/psdk/winbase.h trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Thu Aug 31 20:56:49 2006 @@ -505,6 +505,7 @@ RtlInitUnicodeStringEx@8 ;RtlInitializeAtomPackage RtlInitializeBitMap@12 +RtlInitializeConditionVariable@4 RtlInitializeContext@20 RtlInitializeCriticalSection@4 RtlInitializeCriticalSectionAndSpinCount@8 @@ -650,6 +651,8 @@ ;RtlSetUserFlagsHeap RtlSetUserValueHeap@16 RtlSizeHeap@12 +RtlSleepConditionVariableCS@12 +RtlSleepConditionVariableSRW@16 RtlSplay@4 ;RtlStartRXact RtlStringFromGUID@8 @@ -703,6 +706,8 @@ RtlValidateUnicodeString@8 RtlVerifyVersionInfo@16 ;RtlWalkHeap +RtlWakeAllConditionVariable@4 +RtlWakeConditionVariable@4 RtlWriteRegistryValue@24 ;RtlZeroHeap RtlZeroMemory@8 Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Thu Aug 31 20:56:49 2006 @@ -586,6 +586,7 @@ HeapValidate@12 HeapWalk@8 InitAtomTable@4 +InitializeConditionVariable(a)4=NTDLL.RtlInitializeConditionVariable InitializeCriticalSection@4 InitializeCriticalSectionAndSpinCount@8 InitializeSListHead(a)4=NTDLL.RtlInitializeSListHead @@ -900,6 +901,8 @@ SignalObjectAndWait@16 SizeofResource@8 Sleep@4 +SleepConditionVariableCS@12 +SleepConditionVariableSRW@16 SleepEx@8 SuspendThread@4 SwitchToFiber@4 @@ -954,6 +957,8 @@ VirtualQuery@12 VirtualQueryEx@16 VirtualUnlock@8 +WakeAllConditionVariable(a)4=NTDLL.RtlWakeAllConditionVariable +WakeConditionVariable(a)4=NTDLL.RtlWakeConditionVariable WaitCommEvent@12 WaitForDebugEvent@8 WaitForMultipleObjects@16 Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Thu Aug 31 20:56:49 2006 @@ -94,6 +94,7 @@ <file>lstring.c</file> </directory> <directory name="synch"> + <file>condvar.c</file> <file>critical.c</file> <file>event.c</file> <file>mutex.c</file> Added: trunk/reactos/dll/win32/kernel32/synch/condvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/condvar.c (added) +++ trunk/reactos/dll/win32/kernel32/synch/condvar.c Thu Aug 31 20:56:49 2006 @@ -1,0 +1,97 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Condition Variable functions + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + */ + +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + +#include <k32.h> + +#define NDEBUG +#include "../include/debug.h" + +/* FIXME: Move these RTL declarations to the NDK */ +NTSTATUS +NTAPI +RtlSleepConditionVariableCS(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, + IN OUT PRTL_CRITICAL_SECTION CriticalSection, + IN PLARGE_INTEGER TimeOut OPTIONAL); + +NTSTATUS +NTAPI +RtlSleepConditionVariableSRW(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, + IN OUT PRTL_SRWLOCK SRWLock, + IN PLARGE_INTEGER TimeOut OPTIONAL, + IN ULONG Flags); + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +BOOL +WINAPI +SleepConditionVariableCS(IN OUT PCONDITION_VARIABLE ConditionVariable, + IN OUT PCRITICAL_SECTION CriticalSection, + IN DWORD dwMilliseconds) +{ + NTSTATUS Status; + LARGE_INTEGER TimeOut; + PLARGE_INTEGER TimeOutPtr = NULL; + + if (dwMilliseconds != INFINITE) + { + TimeOut.QuadPart = UInt32x32To64(-10000, dwMilliseconds); + TimeOutPtr = &TimeOut; + } + + Status = RtlSleepConditionVariableCS((PRTL_CONDITION_VARIABLE)ConditionVariable, + (PRTL_CRITICAL_SECTION)CriticalSection, + TimeOutPtr); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +SleepConditionVariableSRW(IN OUT PCONDITION_VARIABLE ConditionVariable, + IN OUT PSRWLOCK SRWLock, + IN DWORD dwMilliseconds, + IN ULONG Flags) +{ + NTSTATUS Status; + LARGE_INTEGER TimeOut; + PLARGE_INTEGER TimeOutPtr = NULL; + + if (dwMilliseconds != INFINITE) + { + TimeOut.QuadPart = UInt32x32To64(-10000, dwMilliseconds); + TimeOutPtr = &TimeOut; + } + + Status = RtlSleepConditionVariableSRW((PRTL_CONDITION_VARIABLE)ConditionVariable, + (PRTL_SRWLOCK)SRWLock, + TimeOutPtr, + Flags); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/kernel32/synch/condvar.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Thu Aug 31 20:56:49 2006 @@ -1058,6 +1058,7 @@ } JOB_SET_ARRAY, *PJOB_SET_ARRAY; #if (_WIN32_WINNT >= 0x0600) typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK; +typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE; #endif typedef DWORD(WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,DWORD,DWORD,HANDLE,HANDLE,LPVOID); typedef void(WINAPI *LPFIBER_START_ROUTINE)(PVOID); @@ -1662,6 +1663,9 @@ BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL); BOOL WINAPI InitAtomTable(DWORD); BOOL WINAPI InitializeAcl(PACL,DWORD,DWORD); +#if (_WIN32_WINNT >= 0x0600) +VOID WINAPI InitializeConditionVariable(PCONDITION_VARIABLE); +#endif VOID WINAPI InitializeCriticalSection(LPCRITICAL_SECTION); BOOL WINAPI InitializeCriticalSectionAndSpinCount(LPCRITICAL_SECTION,DWORD); DWORD WINAPI SetCriticalSectionSpinCount(LPCRITICAL_SECTION,DWORD); @@ -1978,6 +1982,10 @@ DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); DWORD WINAPI SizeofResource(HINSTANCE,HRSRC); void WINAPI Sleep(DWORD); +#if (_WIN32_WINNT >= 0x0600) +BOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); +BOOL WINAPI SleepConditionVariableSRW(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); +#endif DWORD WINAPI SleepEx(DWORD,BOOL); DWORD WINAPI SuspendThread(HANDLE); void WINAPI SwitchToFiber(PVOID); @@ -2024,6 +2032,10 @@ DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); +#if (_WIN32_WINNT >= 0x0600) +VOID WINAPI WakeConditionVariable(PCONDITION_VARIABLE); +VOID WINAPI WakeAllConditionVariable(PCONDITION_VARIABLE); +#endif BOOL WINAPI WinLoadTrustProvider(GUID*); BOOL WINAPI WriteFile(HANDLE,PCVOID,DWORD,PDWORD,LPOVERLAPPED); BOOL WINAPI WriteFileEx(HANDLE,PCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); Added: trunk/reactos/lib/rtl/condvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/condvar.c?rev=2384… ============================================================================== --- trunk/reactos/lib/rtl/condvar.c (added) +++ trunk/reactos/lib/rtl/condvar.c Thu Aug 31 20:56:49 2006 @@ -1,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Condition Variable Routines + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +RtlInitializeConditionVariable(OUT PRTL_CONDITION_VARIABLE ConditionVariable) +{ + ConditionVariable->Ptr = NULL; +} + + +VOID +NTAPI +RtlWakeConditionVariable(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable) +{ + UNIMPLEMENTED; +} + + +VOID +NTAPI +RtlWakeAllConditionVariable(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable) +{ + UNIMPLEMENTED; +} + + +NTSTATUS +NTAPI +RtlSleepConditionVariableCS(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, + IN OUT PRTL_CRITICAL_SECTION CriticalSection, + IN PLARGE_INTEGER TimeOut OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +RtlSleepConditionVariableSRW(IN OUT PRTL_CONDITION_VARIABLE ConditionVariable, + IN OUT PRTL_SRWLOCK SRWLock, + IN PLARGE_INTEGER TimeOut OPTIONAL, + IN ULONG Flags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} Propchange: trunk/reactos/lib/rtl/condvar.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=238… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Thu Aug 31 20:56:49 2006 @@ -47,6 +47,7 @@ <file>bitmap.c</file> <file>bootdata.c</file> <file>compress.c</file> + <file>condvar.c</file> <file>crc32.c</file> <file>critical.c</file> <file>dbgbuffer.c</file>

1 0

[fireball] 23843: Change a very ugly done DbgPrint() function to a good implementation. Now Freeldr shows all DPRINTs from e.g. cmlib correctly.
by fireball＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: fireball Date: Thu Aug 31 20:08:17 2006 New Revision: 23843 URL: http://svn.reactos.org/svn/reactos?rev=23843&view=rev Log: Change a very ugly done DbgPrint() function to a good implementation. Now Freeldr shows all DPRINTs from e.g. cmlib correctly. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Thu Aug 31 20:08:17 2006 @@ -870,10 +870,33 @@ #undef DbgPrint ULONG -DbgPrint(const char *Fmt, ...) -{ - UiMessageBox(Fmt); - return 0; +DbgPrint(const char *Format, ...) +{ + va_list ap; + CHAR Buffer[512]; + ULONG Length; + + va_start(ap, Format); + + /* Construct a string */ + Length = _vsnprintf(Buffer, 512, Format, ap); + + /* Check if we went past the buffer */ + if (Length == -1) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + /* Show it as a message box */ + UiMessageBox(Buffer); + + /* Cleanup and exit */ + va_end(ap); + return 0; } /* EOF */

1 0

[fireball] 23842: Sylvain Petreolle: Partly fix unicode build of cmd (a typo)
by fireball＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: fireball Date: Thu Aug 31 18:14:42 2006 New Revision: 23842 URL: http://svn.reactos.org/svn/reactos?rev=23842&view=rev Log: Sylvain Petreolle: Partly fix unicode build of cmd (a typo) Modified: trunk/reactos/base/shell/cmd/cmdinput.c Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c Thu Aug 31 18:14:42 2006 @@ -521,7 +521,7 @@ } #ifdef _UNICODE ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if ((ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #else ch = ir.Event.KeyEvent.uChar.AsciiChar; if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && bCharInput)

1 0

[hpoussin] 23841: Add ATTACH_PARENT_PROCESS constant
by hpoussin＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: hpoussin Date: Thu Aug 31 18:11:33 2006 New Revision: 23841 URL: http://svn.reactos.org/svn/reactos?rev=23841&view=rev Log: Add ATTACH_PARENT_PROCESS constant Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h (original) +++ trunk/reactos/include/psdk/wincon.h Thu Aug 31 18:11:33 2006 @@ -160,6 +160,7 @@ BOOL WINAPI AllocConsole(void); #if (_WIN32_WINNT >= 0x0501) +#define ATTACH_PARENT_PROCESS (DWORD)-1 BOOL WINAPI AttachConsole(DWORD); #endif HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,CONST SECURITY_ATTRIBUTES*,DWORD,LPVOID);

1 0

[hpoussin] 23840: Remove some code duplication when calling PopupError Add ConAttachConsole stub
by hpoussin＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: hpoussin Date: Thu Aug 31 16:35:39 2006 New Revision: 23840 URL: http://svn.reactos.org/svn/reactos?rev=23840&view=rev Log: Remove some code duplication when calling PopupError Add ConAttachConsole stub Modified: trunk/reactos/base/setup/usetup/console.c trunk/reactos/base/setup/usetup/console.h trunk/reactos/base/setup/usetup/usetup.c Modified: trunk/reactos/base/setup/usetup/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.… ============================================================================== --- trunk/reactos/base/setup/usetup/console.c (original) +++ trunk/reactos/base/setup/usetup/console.c Thu Aug 31 16:35:39 2006 @@ -36,21 +36,21 @@ HANDLE StdInput = INVALID_HANDLE_VALUE; HANDLE StdOutput = INVALID_HANDLE_VALUE; -static SHORT xScreen = 0; -static SHORT yScreen = 0; +SHORT xScreen = 0; +SHORT yScreen = 0; /* FUNCTIONS *****************************************************************/ -BOOL WINAPI -ConAllocConsole( - IN DWORD dwProcessId) +#ifndef WIN32_USETUP + +BOOL WINAPI +ConAllocConsole(VOID) { UNICODE_STRING ScreenName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen"); UNICODE_STRING KeyboardName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; - CONSOLE_SCREEN_BUFFER_INFO csbi; /* Open the screen */ InitializeObjectAttributes( @@ -86,13 +86,14 @@ if (!NT_SUCCESS(Status)) return FALSE; - if (!GetConsoleScreenBufferInfo(StdOutput, &csbi)) - return FALSE; - - xScreen = csbi.dwSize.X; - yScreen = csbi.dwSize.Y; - return TRUE; +} + +BOOL WINAPI +ConAttachConsole( + IN DWORD dwProcessId) +{ + return FALSE; } BOOL WINAPI @@ -136,6 +137,21 @@ *lpNumberOfCharsWritten = IoStatusBlock.Information; return TRUE; +} + +HANDLE WINAPI +ConGetStdHandle( + IN DWORD nStdHandle) +{ + switch (nStdHandle) + { + case STD_INPUT_HANDLE: + return StdInput; + case STD_OUTPUT_HANDLE: + return StdOutput; + default: + return INVALID_HANDLE_VALUE; + } } BOOL WINAPI @@ -435,6 +451,8 @@ 0); return NT_SUCCESS(Status); } + +#endif /* !WIN32_USETUP */ VOID CONSOLE_ConInKey( Modified: trunk/reactos/base/setup/usetup/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/console.… ============================================================================== --- trunk/reactos/base/setup/usetup/console.h (original) +++ trunk/reactos/base/setup/usetup/console.h Thu Aug 31 16:35:39 2006 @@ -27,15 +27,31 @@ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ +#define FOREGROUND_WHITE (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE) +#define FOREGROUND_YELLOW (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN) +#define BACKGROUND_WHITE (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) + +extern HANDLE StdInput, StdOutput; +extern SHORT xScreen, yScreen; + +#ifdef WIN32_USETUP + +#define NtDisplayString(str) printf("%S", (str)->Buffer) +#define NtRaiseHardError(status, a, b, c, d, e) exit(1) + +#else /* WIN32_USETUP */ + #undef WriteConsole #undef ReadConsoleInput #undef FillConsoleOutputCharacter #define AllocConsole ConAllocConsole +#define AttachConsole ConAttachConsole #define FillConsoleOutputAttribute ConFillConsoleOutputAttribute #define FillConsoleOutputCharacterA ConFillConsoleOutputCharacterA #define FreeConsole ConFreeConsole #define GetConsoleScreenBufferInfo ConGetConsoleScreenBufferInfo +#define GetStdHandle ConGetStdHandle #define ReadConsoleInput ConReadConsoleInput #define SetConsoleCursorInfo ConSetConsoleCursorInfo #define SetConsoleCursorPosition ConSetConsoleCursorPosition @@ -44,15 +60,8 @@ #define WriteConsoleOutputCharacterA ConWriteConsoleOutputCharacterA #define WriteConsoleOutputCharacterW ConWriteConsoleOutputCharacterW -#define FOREGROUND_WHITE (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE) -#define FOREGROUND_YELLOW (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN) -#define BACKGROUND_WHITE (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) - -extern HANDLE StdInput, StdOutput; - -BOOL WINAPI -ConAllocConsole( - IN DWORD dwProcessId); +BOOL WINAPI +ConAllocConsole(VOID); BOOL WINAPI ConFillConsoleOutputAttribute( @@ -77,6 +86,10 @@ ConGetConsoleScreenBufferInfo( IN HANDLE hConsoleOutput, OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo); + +HANDLE WINAPI +ConGetStdHandle( + IN DWORD nStdHandle); BOOL WINAPI ConReadConsoleInput( @@ -124,6 +137,7 @@ IN COORD dwWriteCoord, OUT LPDWORD lpNumberOfCharsWritten); +#endif /* !WIN32_USETUP */ VOID CONSOLE_ClearScreen(VOID); Modified: trunk/reactos/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.c (original) +++ trunk/reactos/base/setup/usetup/usetup.c Thu Aug 31 16:35:39 2006 @@ -141,9 +141,15 @@ } +#define POPUP_WAIT_NONE 0 +#define POPUP_WAIT_ANY_KEY 1 +#define POPUP_WAIT_ENTER 2 + static VOID PopupError(PCHAR Text, - PCHAR Status) + PCHAR Status, + PINPUT_RECORD Ir, + ULONG WaitEvent) { SHORT xScreen; SHORT yScreen; @@ -364,6 +370,20 @@ coPos, &Written); } + + if (WaitEvent == POPUP_WAIT_NONE) + return; + + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if (WaitEvent == POPUP_WAIT_ANY_KEY + || Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) + { + return; + } + } } @@ -384,7 +404,8 @@ "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue"); + "F3= Quit ENTER = Continue", + NULL, POPUP_WAIT_NONE); while(TRUE) { @@ -560,31 +581,17 @@ { CONSOLE_PrintTextXY(6, 15, "NtQuerySystemInformation() failed (Status 0x%08lx)", Status); PopupError("Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer"); - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } if (Sdi.NumberOfDisks == 0) { PopupError("Setup could not find a harddisk.\n", - "ENTER = Reboot computer"); - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Get the source path and source root path */ @@ -592,24 +599,17 @@ &SourceRootPath); if (!NT_SUCCESS(Status)) { - CONSOLE_PrintTextXY(6, 15, "GetSourcePath() failed (Status 0x%08lx)", Status); + CONSOLE_PrintTextXY(6, 15, "GetSourcePaths() failed (Status 0x%08lx)", Status); PopupError("Setup could not find its source drive.\n", - "ENTER = Reboot computer"); - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } #if 0 else { - PrintTextXY(6, 15, "SourcePath: '%wZ'", &SourcePath); - PrintTextXY(6, 16, "SourceRootPath: '%wZ'", &SourceRootPath); + CONSOLE_PrintTextXY(6, 15, "SourcePath: '%wZ'", &SourcePath); + CONSOLE_PrintTextXY(6, 16, "SourceRootPath: '%wZ'", &SourceRootPath); } #endif @@ -624,34 +624,18 @@ if (SetupInf == INVALID_HANDLE_VALUE) { PopupError("Setup failed to load the file TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Open 'Version' section */ if (!SetupFindFirstLineW (SetupInf, L"Version", L"Signature", &Context)) { PopupError("Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } @@ -659,34 +643,18 @@ if (!INF_GetData (&Context, NULL, &Value)) { PopupError("Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Check 'Signature' string */ if (_wcsicmp(Value, L"$ReactOS$") != 0) { PopupError("Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } CheckUnattendedSetup(); @@ -977,17 +945,9 @@ { /* FIXME: report error */ PopupError("Setup failed to load the keyboard layout list.\n", - "ENTER = Reboot computer"); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } } @@ -1372,7 +1332,8 @@ "\n" " \x07 Press F3 to quit Setup." " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue"); + "F3= Quit ENTER = Continue", + NULL, POPUP_WAIT_NONE); while (TRUE) { CONSOLE_ConInKey (Ir); @@ -1454,8 +1415,8 @@ "of an already existing Partition!\n" "\n" " * Press any key to continue.", - NULL); - CONSOLE_ConInKey (Ir); + NULL, + Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } @@ -1469,8 +1430,8 @@ PopupError ("You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", - NULL); - CONSOLE_ConInKey (Ir); + NULL, + Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } @@ -2363,17 +2324,9 @@ DPRINT ("WritePartitionsToDisk() failed\n"); PopupError ("Setup failed to write partition tables.\n", - "ENTER = Reboot computer"); - - while (TRUE) - { - CONSOLE_ConInKey (Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Set DestinationRootPath */ @@ -2600,17 +2553,9 @@ { PopupError("Setup failed to find the 'SetupData' section\n" "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer"); - - while (TRUE) - { - CONSOLE_ConInKey (Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Read the 'DefaultPath' data */ @@ -2698,17 +2643,8 @@ { char Buffer[128]; sprintf(Buffer, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n", SectionName); - PopupError(Buffer, "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(FALSE); - } - } + PopupError(Buffer, "ENTER = Reboot computer", Ir, POPUP_WAIT_ENTER); + return(FALSE); } /* @@ -2814,17 +2750,9 @@ { DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); PopupError("Setup could not create the install directory.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(FALSE); - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return(FALSE); } @@ -2834,23 +2762,16 @@ if (SourceCabinet) { PopupError("Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", "ENTER = Reboot computer"); + "in the cabinet.\n", "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); } else { PopupError("Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", "ENTER = Reboot computer"); + "in TXTSETUP.SIF.\n", "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); } - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(FALSE); - } - } + return(FALSE); } /* Enumerate the directory values and create the subdirectories */ @@ -2885,17 +2806,9 @@ { DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); PopupError("Setup could not create install directories.", - "ENTER = Reboot computer"); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(FALSE); - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return(FALSE); } } } @@ -2925,17 +2838,9 @@ if (SetupFileQueue == NULL) { PopupError("Setup failed to open the copy file queue.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return(QUIT_PAGE); - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return(QUIT_PAGE); } if (!PrepareCopyPageInfFile(SetupInf, NULL, Ir)) @@ -2974,17 +2879,9 @@ if (InfFileData == NULL) { PopupError("Cabinet has no setup script.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } } else @@ -2992,17 +2889,9 @@ DPRINT("Cannot open cabinet: %S.\n", CabinetGetCabinetName()); PopupError("Cabinet not found.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } InfHandle = INF_OpenBufferedFileA(InfFileData, @@ -3013,17 +2902,9 @@ if (InfHandle == INVALID_HANDLE_VALUE) { PopupError("Cabinet has no valid inf file.\n", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } CabinetCleanup(); @@ -3126,17 +3007,9 @@ { DPRINT("SetInstallPathValue() failed\n"); PopupError("Setup failed to set the initialize the registry.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Create the default hives */ @@ -3145,17 +3018,9 @@ { DPRINT("NtInitializeRegistry() failed (Status %lx)\n", Status); PopupError("Setup failed to create the registry hives.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Update registry */ @@ -3165,17 +3030,9 @@ { DPRINT1("SetupFindFirstLine() failed\n"); PopupError("Setup failed to find the registry data files.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } do @@ -3206,17 +3063,9 @@ DPRINT("Importing %S failed\n", File); PopupError("Setup failed to import a hive file.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } } while (SetupFindNextLine (&InfContext, &InfContext)); @@ -3226,17 +3075,9 @@ if (!ProcessDisplayRegistry(SetupInf, DisplayList)) { PopupError("Setup failed to update display registry settings.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Update keyboard layout settings */ @@ -3244,17 +3085,9 @@ if (!ProcessKeyboardLayoutRegistry(LayoutList)) { PopupError("Setup failed to update keyboard layout settings.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } /* Update the mounted devices list */ @@ -3438,15 +3271,8 @@ if (DoesFileExist(L"\\Device\\Floppy0", L"\\") == FALSE) { PopupError("No disk in drive A:.", - "ENTER = Continue"); - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - break; - } - + "ENTER = Continue", + Ir, POPUP_WAIT_ENTER); return BOOT_LOADER_FLOPPY_PAGE; } @@ -3487,17 +3313,9 @@ if (!NT_SUCCESS(Status)) { PopupError("Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } return SUCCESS_PAGE; @@ -3505,17 +3323,9 @@ else { PopupError("failed to install FAT bootcode on the system partition.", - "ENTER = Reboot computer"); - - while(TRUE) - { - CONSOLE_ConInKey(Ir); - - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return QUIT_PAGE; - } - } + "ENTER = Reboot computer", + Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; } return BOOT_LOADER_HARDDISK_PAGE; @@ -3669,22 +3479,24 @@ } -VOID NTAPI -NtProcessStartup(PPEB Peb) +static VOID +RunUSetup(VOID) { INPUT_RECORD Ir; PAGE_NUMBER Page; BOOL ret; - RtlNormalizeProcessParams(Peb->ProcessParameters); - - ProcessHeap = Peb->ProcessHeap; - INF_SetHeap(ProcessHeap); - SignalInitEvent(); - ret = AllocConsole(0); - if (!ret) + ret = AllocConsole(); + if (ret) + ret = AttachConsole(ATTACH_PARENT_PROCESS); + + if (!ret +#ifdef WIN32_USETUP + && GetLastError() != ERROR_ACCESS_DENIED +#endif + ) { PrintString("Unable to open the console\n\n"); PrintString("The most common cause of this is using an USB keyboard\n"); @@ -3693,6 +3505,16 @@ /* Raise a hard error (crash the system/BSOD) */ NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0,0,0,0,0); + } + else + { + CONSOLE_SCREEN_BUFFER_INFO csbi; + + StdInput = GetStdHandle(STD_INPUT_HANDLE); + StdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + GetConsoleScreenBufferInfo(StdOutput, &csbi); + xScreen = csbi.dwSize.X; + yScreen = csbi.dwSize.Y; } @@ -3850,4 +3672,27 @@ NtTerminateProcess(NtCurrentProcess(), 0); } + +#ifdef WIN32_USETUP +int +main(void) +{ + ProcessHeap = GetProcessHeap(); + RunUSetup(); + return 0; +} + +#else + +VOID NTAPI +NtProcessStartup(PPEB Peb) +{ + RtlNormalizeProcessParams(Peb->ProcessParameters); + + ProcessHeap = Peb->ProcessHeap; + INF_SetHeap(ProcessHeap); + RunUSetup(); +} +#endif /* !WIN32_USETUP */ + /* EOF */

1 0

[hpoussin] 23839: Fix build for Linux people, where gcc claims that it doesn't support I64 for printf. Thanks Usurp on IRC
by hpoussin＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: hpoussin Date: Thu Aug 31 16:31:34 2006 New Revision: 23839 URL: http://svn.reactos.org/svn/reactos?rev=23839&view=rev Log: Fix build for Linux people, where gcc claims that it doesn't support I64 for printf. Thanks Usurp on IRC Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Thu Aug 31 16:31:34 2006 @@ -1083,7 +1083,7 @@ USHORT Width; USHORT Height; - ULONGLONG PartSize; + LARGE_INTEGER PartSize; PCHAR Unit; UCHAR Attribute; PCHAR PartType; @@ -1100,25 +1100,25 @@ #if 0 if (PartEntry->UnpartitionledLength >= 0x280000000ULL) /* 10 GB */ { - PartSize = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30; + PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30; Unit = "GB"; } else #endif if (PartEntry->UnpartitionedLength >= 0xA00000ULL) /* 10 MB */ { - PartSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; + PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; Unit = "MB"; } else { - PartSize = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10; + PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10; Unit = "KB"; } sprintf (LineBuffer, - " Unpartitioned space %6I64u %s", - PartSize, + " Unpartitioned space %6lu %s", + PartSize.u.LowPart, Unit); } else @@ -1152,40 +1152,40 @@ #if 0 if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { - PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; + PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; Unit = "GB"; } else #endif if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ { - PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; + PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; Unit = "MB"; } else { - PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; + PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; Unit = "KB"; } if (PartType == NULL) { sprintf (LineBuffer, - "%c%c Type %-3u %6I64u %s", + "%c%c Type %-3u %6lu %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, - PartSize, + PartSize.u.LowPart, Unit); } else { sprintf (LineBuffer, - "%c%c %-24s %6I64u %s", + "%c%c %-24s %6lu %s", (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartType, - PartSize, + PartSize.u.LowPart, Unit); } }

1 0

[pborobia] 23838: Another test commit
by pborobia＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: pborobia Date: Thu Aug 31 15:57:54 2006 New Revision: 23838 URL: http://svn.reactos.org/svn/reactos?rev=23838&view=rev Log: Another test commit Modified: branches/clipboard/dll/win32/user32/windows/clipboard.c Modified: branches/clipboard/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/dll/win32/user32/wind… ============================================================================== --- branches/clipboard/dll/win32/user32/windows/clipboard.c (original) +++ branches/clipboard/dll/win32/user32/windows/clipboard.c Thu Aug 31 15:57:54 2006 @@ -1,21 +1,4 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ + /* $Id$ * * PROJECT: ReactOS user32.dll

1 0

[hpoussin] 23837: Fix Linux build (filename case problem...) Thanks gregj on IRC
by hpoussin＠svn.reactos.org 31 Aug '06

31 Aug '06

Author: hpoussin Date: Thu Aug 31 15:09:05 2006 New Revision: 23837 URL: http://svn.reactos.org/svn/reactos?rev=23837&view=rev Log: Fix Linux build (filename case problem...) Thanks gregj on IRC Modified: trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=238… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Thu Aug 31 15:09:05 2006 @@ -32,13 +32,13 @@ <file>log_asm.s</file> <file>random_asm.S</file> <file>rtlswap.S</file> - <file>rtlmem.S</file> + <file>rtlmem.s</file> <file>pow_asm.s</file> <file>res_asm.s</file> <file>sin_asm.s</file> <file>sqrt_asm.s</file> - <file>tan_asm.s</file> - </directory> + <file>tan_asm.s</file> + </directory> </if> <file>access.c</file> <file>acl.c</file>

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