Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 15419: Remove some debug messages at boot
by hpoussin＠svn.reactos.com 20 May '05

20 May '05

Remove some debug messages at boot Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-20 00:47:16 UTC (rev 15418) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-20 01:08:37 UTC (rev 15419) @@ -113,7 +113,7 @@ { /* Get the PRCB for this CPU */ Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; - DPRINT1("Setting up lookaside for CPU: %x, PRCB: %p\n", i, Prcb); + DPRINT("Setting up lookaside for CPU: %x, PRCB: %p\n", i, Prcb); /* Set the Large IRP List */ Prcb->PPLookasideList[LookasideLargeIrpList].L = &IoLargeIrpLookaside.L; @@ -182,7 +182,7 @@ Prcb->PPLookasideList[LookasideCompletionList].P = &CurrentList->L; } - DPRINT1("Done allocation\n"); + DPRINT("Done allocation\n"); } VOID @@ -411,10 +411,10 @@ IoCreateArcNames(); /* Create the SystemRoot symbolic link */ - CPRINT("CommandLine: %s\n", (PCHAR)KeLoaderBlock.CommandLine); + DPRINT("CommandLine: %s\n", (PCHAR)KeLoaderBlock.CommandLine); Status = IoCreateSystemRootLink((PCHAR)KeLoaderBlock.CommandLine); if (!NT_SUCCESS(Status)) { - DbgPrint("IoCreateSystemRootLink FAILED: (0x%x) - ", Status); + CPRINT("IoCreateSystemRootLink FAILED: (0x%x) - ", Status); KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE); } _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-05-20 00:47:16 UTC (rev 15418) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-05-20 01:08:37 UTC (rev 15419) @@ -2278,7 +2278,7 @@ CHAR c; /* Execute the commands in the init file */ - DbgPrint("KDB: Executing KDBinit file...\n"); + DPRINT("KDB: Executing KDBinit file...\n"); p1 = KdbInitFileBuffer; while (p1[0] != '\0') { @@ -2309,7 +2309,7 @@ while (p1[0] == '\r' || p1[0] == '\n') p1++; } - DbgPrint("KDB: KDBinit executed\n"); + DPRINT("KDB: KDBinit executed\n"); } /*!\brief Called when KDB is initialized

1 0

[hpoussin] 15418: Set svn:keywords and svn:eol-style properties
by hpoussin＠svn.reactos.com 20 May '05

20 May '05

Set svn:keywords and svn:eol-style properties Change some DPRINT1 to DPRINT in bug.c, clock.c, gate.c Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/clock.c Modified: trunk/reactos/ntoskrnl/ke/gate.c Modified: trunk/reactos/ntoskrnl/ke/i386/main.S _____ Modified: trunk/reactos/ntoskrnl/ke/bug.c --- trunk/reactos/ntoskrnl/ke/bug.c 2005-05-20 00:17:35 UTC (rev 15417) +++ trunk/reactos/ntoskrnl/ke/bug.c 2005-05-20 00:47:16 UTC (rev 15418) @@ -53,7 +53,7 @@ /* Make sure it worked */ if (NT_SUCCESS(Status)) { - DPRINT1("Found Bugcheck Resource Data!\n"); + DPRINT("Found Bugcheck Resource Data!\n"); /* Now actually get a pointer to it */ Status = LdrAccessResource((PVOID)KERNEL_BASE, @@ -64,7 +64,7 @@ /* Make sure it worked */ if (NT_SUCCESS(Status)) { - DPRINT1("Got Pointer to Bugcheck Resource Data!\n"); + DPRINT("Got Pointer to Bugcheck Resource Data!\n"); KiBugCodeMessages = BugCheckData; } } _____ Modified: trunk/reactos/ntoskrnl/ke/clock.c --- trunk/reactos/ntoskrnl/ke/clock.c 2005-05-20 00:17:35 UTC (rev 15417) +++ trunk/reactos/ntoskrnl/ke/clock.c 2005-05-20 00:47:16 UTC (rev 15418) @@ -77,7 +77,7 @@ { TIME_FIELDS TimeFields; - DPRINT1("KiInitializeSystemClock()\n"); + DPRINT("KiInitializeSystemClock()\n"); InitializeListHead(&KiTimerListHead); KeInitializeDpc(&KiExpireTimerDpc, (PKDEFERRED_ROUTINE)KiExpireTimers, 0); @@ -96,7 +96,7 @@ SharedUserData->SystemTime.High1Time = SystemBootTime.u.HighPart; KiClockSetupComplete = TRUE; - DPRINT1("Finished KiInitializeSystemClock()\n"); + DPRINT("Finished KiInitializeSystemClock()\n"); } VOID Property changes on: trunk/reactos/ntoskrnl/ke/clock.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ke/gate.c --- trunk/reactos/ntoskrnl/ke/gate.c 2005-05-20 00:17:35 UTC (rev 15417) +++ trunk/reactos/ntoskrnl/ke/gate.c 2005-05-20 00:47:16 UTC (rev 15418) @@ -19,7 +19,7 @@ FASTCALL KeInitializeGate(PKGATE Gate) { - DPRINT1("KeInitializeGate(Gate %x)\n", Gate); + DPRINT("KeInitializeGate(Gate %x)\n", Gate); /* Initialize the Dispatcher Header */ KeInitializeDispatcherHeader(&Gate->Header, @@ -39,7 +39,7 @@ PKWAIT_BLOCK GateWaitBlock; NTSTATUS Status; - DPRINT1("KeWaitForGate(Gate %x)\n", Gate); + DPRINT("KeWaitForGate(Gate %x)\n", Gate); do { @@ -74,7 +74,7 @@ /* Handle Kernel Queues */ if (CurrentThread->Queue) { - DPRINT1("Waking Queue\n"); + DPRINT("Waking Queue\n"); KiWakeQueue(CurrentThread->Queue); } @@ -82,7 +82,7 @@ KeReleaseSpinLock(&CurrentThread->ApcQueueLock, OldIrql); /* Block the Thread */ - DPRINT1("Blocking the Thread: %x\n", CurrentThread); + DPRINT("Blocking the Thread: %x\n", CurrentThread); KiBlockThread(&Status, CurrentThread->Alertable, WaitMode, @@ -91,7 +91,7 @@ /* Check if we were executing an APC */ if (Status != STATUS_KERNEL_APC) return; - DPRINT1("Looping Again\n"); + DPRINT("Looping Again\n"); } while (TRUE); } @@ -104,7 +104,7 @@ KIRQL OldIrql; NTSTATUS WaitStatus = STATUS_SUCCESS; - DPRINT1("KeSignalGateBoostPriority(EveGate %x)\n", Gate); + DPRINT("KeSignalGateBoostPriority(EveGate %x)\n", Gate); /* Acquire Dispatcher Database Lock */ OldIrql = KeAcquireDispatcherDatabaseLock(); @@ -132,12 +132,12 @@ /* Increment the Queue's active threads */ if (WaitThread->Queue) { - DPRINT1("Incrementing Queue's active threads\n"); + DPRINT("Incrementing Queue's active threads\n"); WaitThread->Queue->CurrentCount++; } /* Reschedule the Thread */ - DPRINT1("Unblocking the Thread\n"); + DPRINT("Unblocking the Thread\n"); KiUnblockThread(WaitThread, &WaitStatus, EVENT_INCREMENT); return; Property changes on: trunk/reactos/ntoskrnl/ke/gate.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ke/i386/main.S --- trunk/reactos/ntoskrnl/ke/i386/main.S 2005-05-20 00:17:35 UTC (rev 15417) +++ trunk/reactos/ntoskrnl/ke/i386/main.S 2005-05-20 00:47:16 UTC (rev 15418) @@ -6,7 +6,7 @@ #include <internal/i386/mm.h> #include <internal/i386/fpu.h> -#define AP_MAGIC (0x12481020) +#define AP_MAGIC (0x12481020) .globl _NtProcessStartup @@ -23,20 +23,20 @@ cmpl $AP_MAGIC, %ecx jne .m1 - pushl $0 - popfl - - /* - * Reserve space for the floating point save area. - */ - subl $SIZEOF_FX_SAVE_AREA, %esp - - /* - * Call the application processor initialization code - */ - pushl $0 - call _KiSystemStartup - + pushl $0 + popfl + + /* + * Reserve space for the floating point save area. + */ + subl $SIZEOF_FX_SAVE_AREA, %esp + + /* + * Call the application processor initialization code + */ + pushl $0 + call _KiSystemStartup + .m1: /* Load the initial kernel stack */ lea _kernel_stack, %eax Property changes on: trunk/reactos/ntoskrnl/ke/i386/main.S ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/ke/i386/usercall.S ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/ke/i386/vdm.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/ke/usercall.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

1 0

[ion] 15417: Ensure success
by ion＠svn.reactos.com 20 May '05

20 May '05

Ensure success Modified: trunk/reactos/subsys/win32k/ntuser/csr.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/csr.c --- trunk/reactos/subsys/win32k/ntuser/csr.c 2005-05-19 23:26:56 UTC (rev 15416) +++ trunk/reactos/subsys/win32k/ntuser/csr.c 2005-05-20 00:17:35 UTC (rev 15417) @@ -104,17 +104,20 @@ &ObjectAttributes, &Cid); - /* Duplicate the Handle */ - Status = ZwDuplicateObject(NtCurrentProcess(), - ObjectHandle, - CsrProcessHandle, - Handle, - DesiredAccess, - TRUE, - 0); + if ((NT_SUCCESS(Status))) + { + /* Duplicate the Handle */ + Status = ZwDuplicateObject(NtCurrentProcess(), + ObjectHandle, + CsrProcessHandle, + Handle, + DesiredAccess, + TRUE, + 0); - /* Close our handle to CSRSS */ - NtClose(CsrProcessHandle); + /* Close our handle to CSRSS */ + ZwClose(CsrProcessHandle); + } return Status; }

1 0

[ion] 15416: Fix one of the added hacks. ObpCreateHAndle not exported anymore, and win32k now duplicates the handle nicely (Also faster since we don't have to attach/detach to csr anymore
by ion＠svn.reactos.com 19 May '05

19 May '05

Fix one of the added hacks. ObpCreateHAndle not exported anymore, and win32k now duplicates the handle nicely (Also faster since we don't have to attach/detach to csr anymore Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/subsys/win32k/include/csr.h Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-05-19 22:04:45 UTC (rev 15415) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-05-19 23:26:56 UTC (rev 15416) @@ -823,7 +823,6 @@ ;ObCheckCreateObjectAccess@28 ;ObCheckObjectAccess@20 ObCreateObject@36 -ObpCreateHandle ; FIXME! See win32k/ntuser/csr.c! ObFindHandleForObject@20 ObGetObjectPointerCount@4 ObGetObjectSecurity@12 _____ Modified: trunk/reactos/subsys/win32k/include/csr.h --- trunk/reactos/subsys/win32k/include/csr.h 2005-05-19 22:04:45 UTC (rev 15415) +++ trunk/reactos/subsys/win32k/include/csr.h 2005-05-19 23:26:56 UTC (rev 15416) @@ -15,7 +15,11 @@ extern NTSTATUS FASTCALL CsrInit(void); extern NTSTATUS FASTCALL CsrNotify(PCSRSS_API_REQUEST Request, PCSRSS_API_REPLY Reply); extern NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); -extern NTSTATUS STDCALL CsrInsertObject(PVOID, PACCESS_STATE, ACCESS_MASK, ULONG, PVOID*, PHANDLE); +NTSTATUS +STDCALL +CsrInsertObject(HANDLE ObjectHandle, + ACCESS_MASK DesiredAccess, + PHANDLE Handle); #endif /* CSR_H_INCLUDED */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/csr.c --- trunk/reactos/subsys/win32k/ntuser/csr.c 2005-05-19 22:04:45 UTC (rev 15415) +++ trunk/reactos/subsys/win32k/ntuser/csr.c 2005-05-19 23:26:56 UTC (rev 15416) @@ -11,13 +11,6 @@ static HANDLE WindowsApiPort = NULL; PEPROCESS CsrProcess = NULL; - -NTSTATUS -ObpCreateHandle(PEPROCESS Process, - PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - BOOLEAN Inherit, - PHANDLE HandleReturn); NTSTATUS FASTCALL CsrInit(void) @@ -83,37 +76,46 @@ return Status; } -NTSTATUS STDCALL -CsrInsertObject(PVOID Object, - PACCESS_STATE PassedAccessState, +NTSTATUS +STDCALL +CsrInsertObject(HANDLE ObjectHandle, ACCESS_MASK DesiredAccess, - ULONG AdditionalReferences, - PVOID* ReferencedObject, PHANDLE Handle) { NTSTATUS Status; - PEPROCESS OldProcess; + HANDLE CsrProcessHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + CLIENT_ID Cid; + + /* Put CSR'S CID */ + Cid.UniqueProcess = CsrProcess->UniqueProcessId; + Cid.UniqueThread = 0; + + /* Empty Attributes */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + + /* Get a Handle to Csrss */ + Status = ZwOpenProcess(&CsrProcessHandle, + PROCESS_DUP_HANDLE, + &ObjectAttributes, + &Cid); + + /* Duplicate the Handle */ + Status = ZwDuplicateObject(NtCurrentProcess(), + ObjectHandle, + CsrProcessHandle, + Handle, + DesiredAccess, + TRUE, + 0); + + /* Close our handle to CSRSS */ + NtClose(CsrProcessHandle); - /* Switch to the process in which the handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(CsrProcess); - } - - /* FIXME!!!!!!!!! SOMETHING HAS GOT TO BE DONE ABOUT THIS !!!!! */ - Status = ObpCreateHandle(PsGetCurrentProcess(), - Object, - DesiredAccess, - BODY_TO_HEADER(Object)->Inherit, - Handle); - /* FIXME!!!!!!!!! SOMETHING HAS GOT TO BE DONE ABOUT ^^^^ THAT !!!!! */ - - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } - return Status; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-05-19 22:04:45 UTC (rev 15415) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-05-19 23:26:56 UTC (rev 15416) @@ -843,11 +843,8 @@ * Create a handle for CSRSS and notify CSRSS */ Request.Type = CSRSS_CREATE_DESKTOP; - Status = CsrInsertObject((PVOID)DesktopObject, - NULL, + Status = CsrInsertObject(Desktop, GENERIC_ALL, - 0, - NULL, (HANDLE*)&Request.Data.CreateDesktopRequest.DesktopHandle); if (! NT_SUCCESS(Status)) {

1 0

[hpoussin] 15415: IoGetDeviceProperty():
by hpoussin＠svn.reactos.com 19 May '05

19 May '05

IoGetDeviceProperty(): Fix DevicePropertyEnumeratorName Implement DevicePropertyPhysicalDeviceObjectName Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-19 22:02:34 UTC (rev 15414) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-19 22:04:45 UTC (rev 15415) @@ -236,6 +236,7 @@ if (Ptr != NULL) { Length = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)DeviceNode->InstancePath.Buffer) + sizeof(WCHAR); + Data = DeviceNode->InstancePath.Buffer; } else { @@ -245,7 +246,9 @@ break; case DevicePropertyPhysicalDeviceObjectName: - return STATUS_NOT_IMPLEMENTED; + Length = DeviceNode->InstancePath.Length + sizeof(WCHAR); + Data = DeviceNode->InstancePath.Buffer; + break; default: return STATUS_INVALID_PARAMETER_2; @@ -257,7 +260,8 @@ RtlCopyMemory(PropertyBuffer, Data, Length); /* Terminate the string */ - if (DeviceProperty == DevicePropertyEnumeratorName) + if (DeviceProperty == DevicePropertyEnumeratorName + || DeviceProperty == DevicePropertyPhysicalDeviceObjectName) { Ptr = (PWSTR)PropertyBuffer; Ptr[(Length / sizeof(WCHAR)) - 1] = 0;

1 0

[hpoussin] 15414: Don't create a new DriverObject if one is already existing
by hpoussin＠svn.reactos.com 19 May '05

19 May '05

Don't create a new DriverObject if one is already existing Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-05-19 19:53:01 UTC (rev 15413) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-05-19 22:02:34 UTC (rev 15414) @@ -518,6 +518,12 @@ ULONG DriverImageSize); NTSTATUS FASTCALL +IopGetDriverObject( + PDRIVER_OBJECT *DriverObject, + PUNICODE_STRING ServiceName, + BOOLEAN FileSystem); + +NTSTATUS FASTCALL IopLoadServiceModule( IN PUNICODE_STRING ServiceName, OUT PMODULE_OBJECT *ModuleObject); _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-19 19:53:01 UTC (rev 15413) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-19 22:02:34 UTC (rev 15414) @@ -152,6 +152,64 @@ } NTSTATUS FASTCALL +IopGetDriverObject( + PDRIVER_OBJECT *DriverObject, + PUNICODE_STRING ServiceName, + BOOLEAN FileSystem) +{ + PDRIVER_OBJECT Object; + WCHAR NameBuffer[MAX_PATH]; + UNICODE_STRING DriverName; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + DPRINT("IopOpenDriverObject(%p '%wZ' %x)\n", + DriverObject, ServiceName, FileSystem); + + *DriverObject = NULL; + + /* Create ModuleName string */ + if (ServiceName == NULL || ServiceName->Buffer == NULL) + /* We don't know which DriverObject we have to open */ + return STATUS_INVALID_PARAMETER_2; + + if (FileSystem == TRUE) + wcscpy(NameBuffer, FILESYSTEM_ROOT_NAME); + else + wcscpy(NameBuffer, DRIVER_ROOT_NAME); + wcscat(NameBuffer, ServiceName->Buffer); + + RtlInitUnicodeString(&DriverName, NameBuffer); + DPRINT("Driver name: '%wZ'\n", &DriverName); + + /* Initialize ObjectAttributes for driver object */ + InitializeObjectAttributes( + &ObjectAttributes, + &DriverName, + OBJ_OPENIF | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Open driver object */ + Status = ObReferenceObjectByName( + &DriverName, + 0, /* Attributes */ + NULL, /* PassedAccessState */ + 0, /* DesiredAccess */ + IoDriverObjectType, + KernelMode, + NULL, /* ParseContext */ + (PVOID*)&Object); + + if (!NT_SUCCESS(Status)) + return Status; + + *DriverObject = Object; + + return STATUS_SUCCESS; +} + +NTSTATUS FASTCALL IopCreateDriverObject( PDRIVER_OBJECT *DriverObject, PUNICODE_STRING ServiceName, @@ -229,18 +287,8 @@ { return Status; } - - /* This function shouldn't be called twice for the same driver anyways..why is it? */ -#if 0 - if (Status == STATUS_OBJECT_EXISTS) - { - /* The driver object already exists, so it is already - * initialized. Don't initialize it once more. */ - *DriverObject = Object; - return STATUS_SUCCESS; - } -#endif - /* Create driver extension */ + + /* Create driver extension */ Object->DriverExtension = (PDRIVER_EXTENSION) ExAllocatePoolWithTag( NonPagedPool, @@ -652,13 +700,10 @@ else { /* get existing DriverObject pointer */ - Status = IopCreateDriverObject( + Status = IopGetDriverObject( &DriverObject, &ServiceName, - OBJ_OPENIF, - FALSE, - ModuleObject->Base, - ModuleObject->Length); + FALSE); if (!NT_SUCCESS(Status)) continue; } _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-19 19:53:01 UTC (rev 15413) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-19 22:02:34 UTC (rev 15414) @@ -1668,13 +1668,10 @@ else { /* get existing DriverObject pointer */ - Status = IopCreateDriverObject( - &DriverObject, - &DeviceNode->ServiceName, - OBJ_OPENIF, - FALSE, - ModuleObject->Base, - ModuleObject->Length); + Status = IopGetDriverObject( + &DriverObject, + &DeviceNode->ServiceName, + FALSE); } if (NT_SUCCESS(Status)) {

1 0

[chorns] 15413: Option to disable automatic dependencies
by chorns＠svn.reactos.com 19 May '05

19 May '05

Option to disable automatic dependencies Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/configuration.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-05-19 19:53:01 UTC (rev 15413) @@ -34,8 +34,7 @@ /*static*/ Backend* Backend::Factory::Create ( const string& name, Project& project, - bool verbose, - bool cleanAsYouGo ) + Configuration& configuration ) { string sname ( name ); strlwr ( &sname[0] ); @@ -49,14 +48,12 @@ throw UnknownBackendException ( sname ); return NULL; } - return (*f) ( project, verbose, cleanAsYouGo ); + return (*f) ( project, configuration ); } Backend::Backend ( Project& project, - bool verbose, - bool cleanAsYouGo ) + Configuration& configuration ) : ProjectNode ( project ), - verbose ( verbose ), - cleanAsYouGo ( cleanAsYouGo ) + configuration ( configuration ) { } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h 2005-05-19 19:53:01 UTC (rev 15413) @@ -6,7 +6,7 @@ class Backend; typedef Backend* BackendFactory ( Project& project, - bool verbose ); + Configuration& configuration ); class Backend { @@ -22,26 +22,22 @@ virtual ~Factory(); virtual Backend* operator() ( Project&, - bool verbose, - bool cleanAsYouGo ) = 0; + Configuration& configuration ) = 0; public: static Backend* Create ( const std::string& name, Project& project, - bool verbose, - bool cleanAsYouGo ); + Configuration& configuration ); }; protected: Backend ( Project& project, - bool verbose, - bool cleanAsYouGo ); + Configuration& configuration ); public: virtual void Process () = 0; Project& ProjectNode; - bool verbose; - bool cleanAsYouGo; + Configuration& configuration; }; #endif /* __BACKEND_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-05-19 19:53:01 UTC (rev 15413) @@ -35,18 +35,16 @@ DevCppFactory() : Factory("devcpp") {} Backend *operator() (Project &project, - bool verbose, - bool cleanAsYouGo) + Configuration& configuration) { - return new DevCppBackend(project, verbose, cleanAsYouGo); + return new DevCppBackend(project, configuration); } } factory; DevCppBackend::DevCppBackend(Project &project, - bool verbose, - bool cleanAsYouGo) : Backend(project, verbose, cleanAsYouGo) + Configuration& configuration) : Backend(project, configuration) { m_unitCount = 0; } @@ -113,8 +111,7 @@ Backend *backend = Backend::Factory::Create("mingw", ProjectNode, - verbose, - cleanAsYouGo ); + configuration ); backend->Process(); delete backend; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h 2005-05-19 19:53:01 UTC (rev 15413) @@ -20,8 +20,7 @@ public: DevCppBackend(Project &project, - bool verbose, - bool cleanAsYouGo); + Configuration& configuration); virtual ~DevCppBackend() {} virtual void Process(); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-19 19:53:01 UTC (rev 15413) @@ -212,20 +212,17 @@ public: MingwFactory() : Factory ( "mingw" ) {} Backend* operator() ( Project& project, - bool verbose, - bool cleanAsYouGo ) + Configuration& configuration ) { return new MingwBackend ( project, - verbose, - cleanAsYouGo ); + configuration ); } } factory; MingwBackend::MingwBackend ( Project& project, - bool verbose, - bool cleanAsYouGo ) - : Backend ( project, verbose, cleanAsYouGo ), + Configuration& configuration ) + : Backend ( project, configuration ), intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ), outputDirectory ( new Directory ( "$(OUTPUT)" ) ), installDirectory ( new Directory ( "$(INSTALL)" ) ) @@ -622,7 +619,7 @@ printf ( "Unpacking WINE resources..." ); WineResource wineResource ( ProjectNode, GetBin2ResExecutable () ); - wineResource.UnpackResources ( verbose ); + wineResource.UnpackResources ( configuration.Verbose ); printf ( "done\n" ); } @@ -631,7 +628,7 @@ { printf ( "Generating test support code..." ); TestSupportCode testSupportCode ( ProjectNode ); - testSupportCode.GenerateTestSupportCode ( verbose ); + testSupportCode.GenerateTestSupportCode ( configuration.Verbose ); printf ( "done\n" ); } @@ -640,18 +637,21 @@ { printf ( "Generating proxy makefiles..." ); ProxyMakefile proxyMakefile ( ProjectNode ); - proxyMakefile.GenerateProxyMakefiles ( verbose ); + proxyMakefile.GenerateProxyMakefiles ( configuration.Verbose ); printf ( "done\n" ); } void MingwBackend::CheckAutomaticDependencies () { - printf ( "Checking automatic dependencies..." ); - AutomaticDependency automaticDependency ( ProjectNode ); - automaticDependency.Process (); - automaticDependency.CheckAutomaticDependencies ( verbose ); - printf ( "done\n" ); + if ( configuration.AutomaticDependencies ) + { + printf ( "Checking automatic dependencies..." ); + AutomaticDependency automaticDependency ( ProjectNode ); + automaticDependency.Process (); + automaticDependency.CheckAutomaticDependencies ( configuration.Verbose ); + printf ( "done\n" ); + } } bool @@ -667,9 +667,9 @@ MingwBackend::GenerateDirectories () { printf ( "Creating directories..." ); - intermediateDirectory->GenerateTree ( "", verbose ); - outputDirectory->GenerateTree ( "", verbose ); - installDirectory->GenerateTree ( "", verbose ); + intermediateDirectory->GenerateTree ( "", configuration.Verbose ); + outputDirectory->GenerateTree ( "", configuration.Verbose ); + installDirectory->GenerateTree ( "", configuration.Verbose ); printf ( "done\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-19 19:53:01 UTC (rev 15413) @@ -46,8 +46,7 @@ { public: MingwBackend ( Project& project, - bool verbose, - bool cleanAsYouGo ); + Configuration& configuration ); virtual ~MingwBackend (); virtual void Process (); std::string AddDirectoryTarget ( const std::string& directory, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-19 19:53:01 UTC (rev 15413) @@ -1280,7 +1280,7 @@ void MingwModuleHandler::GenerateCleanObjectsAsYouGoCode () const { - if ( backend->cleanAsYouGo ) + if ( backend->configuration.CleanAsYouGo ) { vector<string> objectFiles; GetObjectsVector ( module.non_if_data, _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/configuration.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/configuration.cpp 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/configuration.cpp 2005-05-19 19:53:01 UTC (rev 15413) @@ -0,0 +1,15 @@ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +Configuration::Configuration () +{ + Verbose = false; + CleanAsYouGo = false; + AutomaticDependencies = true; +} + +Configuration::~Configuration () +{ +} Property changes on: branches/xmlbuildsystem/reactos/tools/rbuild/configuration.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-05-19 19:53:01 UTC (rev 15413) @@ -18,8 +18,7 @@ static string BuildSystem; static string RootXmlFile = "ReactOS.xml"; -static bool Verbose = false; -static bool CleanAsYouGo = false; +static Configuration configuration; bool ParseSwitch ( int argc, char** argv, int index ) @@ -28,11 +27,14 @@ switch ( switchChar ) { case 'v': - Verbose = true; + configuration.Verbose = true; break; case 'c': - CleanAsYouGo = true; + configuration.CleanAsYouGo = true; break; + case 'd': + configuration.AutomaticDependencies = false; + break; case 'r': RootXmlFile = string(&argv[index][2]); break; @@ -74,6 +76,7 @@ printf ( "Switches:\n" ); printf ( " -v Be verbose\n" ); printf ( " -c Clean as you go. Delete generated files as soon as they are not needed anymore\n" ); + printf ( " -d Disable automatic dependencies.\n" ); printf ( " -rfile.xml Name of the root xml file. Default is ReactOS.xml\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); @@ -91,8 +94,7 @@ project.ExecuteInvocations (); Backend* backend = Backend::Factory::Create ( BuildSystem, project, - Verbose, - CleanAsYouGo ); + configuration ); backend->Process (); delete backend; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-19 19:53:01 UTC (rev 15413) @@ -68,6 +68,16 @@ class SourceFileTest; +class Configuration +{ +public: + Configuration (); + ~Configuration (); + bool Verbose; + bool CleanAsYouGo; + bool AutomaticDependencies; +}; + class Environment { public: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-05-19 19:00:37 UTC (rev 15412) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-05-19 19:53:01 UTC (rev 15413) @@ -115,6 +115,7 @@ bootstrap.cpp \ cdfile.cpp \ compilerflag.cpp \ + configuration.cpp \ define.cpp \ exception.cpp \ filesupportcode.cpp \ @@ -225,6 +226,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)configuration.o: $(RBUILD_BASE_)configuration.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

1 0

[sedwards] 15412: Watch the case damnit. Sorry Windows users
by sedwards＠svn.reactos.com 19 May '05

19 May '05

Watch the case damnit. Sorry Windows users Deleted: branches/xmlbuildsystem/reactos/subsys/system/winefile/Sv.rc Added: branches/xmlbuildsystem/reactos/subsys/system/winefile/sv.rc _____ Deleted: branches/xmlbuildsystem/reactos/subsys/system/winefile/Sv.rc --- branches/xmlbuildsystem/reactos/subsys/system/winefile/Sv.rc 2005-05-19 18:38:04 UTC (rev 15411) +++ branches/xmlbuildsystem/reactos/subsys/system/winefile/Sv.rc 2005-05-19 19:00:37 UTC (rev 15412) @@ -1,213 +0,0 @@ -/* - * WineFile - * Swedish Language Support - * - * Copyright 2005 David Nordenberg - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT -#pragma code_page(1252) - - -/* Menu */ - - -IDM_WINEFILE MENU FIXED IMPURE -{ - POPUP "&Arkiv" { - MENUITEM "&Íppna\tEnter", ID_ACTIVATE - MENUITEM "&Flytta...\tF7", ID_FILE_MOVE - MENUITEM "&Kopiera...\tF8", 107 - MENUITEM "&I urklipp...\tF9", 118 - MENUITEM "&Ta bort\tDel", 108 - MENUITEM "&Byt namn...", 109 - MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "&Komprimera...", 119 - MENUITEM "Packa &upp...", 120 - MENUITEM SEPARATOR - MENUITEM "&K÷r...", ID_EXECUTE - MENUITEM "&Skriv ut...", 102 - MENUITEM "Associera...", 103 - MENUITEM SEPARATOR - MENUITEM "Skapa mapp...", 111 - MENUITEM "&S÷k...", 104 - MENUITEM "&Võlj filer...", 116 - MENUITEM SEPARATOR -#ifndef _NO_EXTENSIONS - MENUITEM "&Avsluta\tAlt+X" , ID_FILE_EXIT -#else - MENUITEM "&Avsluta", ID_FILE_EXIT -#endif - } - - POPUP "&Disk" { - MENUITEM "&Kopiera disk...", 201 - MENUITEM "&Namnge disk...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formatera disk...", ID_FORMAT_DISK -#ifdef _WIN95 - MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Anslut &Nõtverksenhet", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Koppla ifrÕn Nõtverksenhet", ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "Dela ut...", 254 - MENUITEM "&Ta bort utdelning...", 255 - MENUITEM SEPARATOR - MENUITEM "&Võlj enhet...", 251 - } - - POPUP "&Trõd" { - MENUITEM "&Nõsta nivÕ\t+", 301 - MENUITEM "Ut÷ka &trõd\t*", 302 - MENUITEM "Ut÷ka &alla\tCtrl+*", 303 - MENUITEM "Kollapsa &trõd\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Markera undermappar", 505 - } - - POPUP "&Visa" { - MENUITEM "&Trõd och mapp", 413 - MENUITEM "Bara tr&õd", 411 - MENUITEM "Bara &mapp", 412 - MENUITEM SEPARATOR - MENUITEM "De&la", 414 - MENUITEM SEPARATOR - MENUITEM "&Namn", ID_VIEW_NAME - MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "&Vissa detaljer..." , ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Sortera efter namn", ID_VIEW_SORT_NAME - MENUITEM "Sortera efter t&yp", ID_VIEW_SORT_TYPE - MENUITEM "Sortera efter st&orlek", ID_VIEW_SORT_SIZE - MENUITEM "Sortera efter &datum", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Sortera efter &...", 409 - } - - POPUP "&Instõllningar" { - MENUITEM "&Bekrõftelse...", 501 - MENUITEM "&Teckensnitt...", ID_SELECT_FONT - MENUITEM "&Konfigurera verktygsfõlt...", 512 - MENUITEM SEPARATOR - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minimera vid k÷rning" , 504 - MENUITEM "&Spara õndringar vid stõngning", 511 - } - - - POPUP "&Sõkerhet" { - MENUITEM "&?tkomst..." , 605 - MENUITEM "&Loggning..." , 606 - MENUITEM "&?gare..." , 607 - } - - POPUP "&F÷nster" { - MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW - MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ - MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT -#ifndef _NO_EXTENSIONS - MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT -#endif - MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE - MENUITEM "&Uppdatera\tF5", ID_REFRESH - } - - - POPUP "&?" { - MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP - MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP - MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Information om &Winefile...", ID_ABOUT -/* POPUP "Info..." { - MENUITEM "Info about &Wine..." , ID_ABOUT_WINE - MENUITEM "&License..." ID_LICENSE - MENUITEM "&NO WARRANTY" ID_NO_WARRANTY - } */ - } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "K÷r" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Som &symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjõlp" , 254, 158, 43, 47, 14 -} - -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Võlj mÕl" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&S÷kvõg:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Blõddra" , 254, 158, 43, 47, 14 -} - -STRINGTABLE -{ - IDS_FONT_SEL_DLG_NAME "Verkstõll teckensnittsinstõllningar" - IDS_FONT_SEL_ERROR "Ett fel uppstog nõr ett nytt teckensnitt valdes." -} - -STRINGTABLE -{ - IDS_WINEFILE "Winefile" - IDS_ERROR "Fel" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Skrivbord" - IDS_SHELL "Skal" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ej implementerat õnnu" - IDS_WINE "WINE" - IDS_WINE_FILE "Wine File" -} - -STRINGTABLE -{ - IDS_COL_NAME "Namn" - IDS_COL_SIZE "Storlek" - IDS_COL_CDATE "CDatum" - IDS_COL_ADATE "ADatum" - IDS_COL_MDATE "MDatum" - IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Lõnkar" - IDS_COL_ATTR "Attribut" - IDS_COL_SEC "Sõkerhet" -} _____ Copied: branches/xmlbuildsystem/reactos/subsys/system/winefile/sv.rc (from rev 15411, branches/xmlbuildsystem/reactos/subsys/system/winefile/Sv.rc)

1 0

[chorns] 15411: Don't put modules in project root to avoid overwriting the top-level makefile with a proxy makefile
by chorns＠svn.reactos.com 19 May '05

19 May '05

Don't put modules in project root to avoid overwriting the top-level makefile with a proxy makefile Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/bootdata/bootcd/ Added: branches/xmlbuildsystem/reactos/bootdata/bootcd/bootcd.xml Modified: branches/xmlbuildsystem/reactos/bootdata/bootdata.xml Added: branches/xmlbuildsystem/reactos/bootdata/livecd/ Added: branches/xmlbuildsystem/reactos/bootdata/livecd/livecd.xml _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-05-19 15:32:22 UTC (rev 15410) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-05-19 18:38:04 UTC (rev 15411) @@ -65,11 +65,4 @@ <directory name="subsys"> <xi:include href="subsys/directory.xml" /> </directory> - - <module name="bootcd" type="iso"> - </module> - - <module name="livecd" type="liveiso"> - </module> - </project> _____ Added: branches/xmlbuildsystem/reactos/bootdata/bootcd/bootcd.xml --- branches/xmlbuildsystem/reactos/bootdata/bootcd/bootcd.xml 2005-05-19 15:32:22 UTC (rev 15410) +++ branches/xmlbuildsystem/reactos/bootdata/bootcd/bootcd.xml 2005-05-19 18:38:04 UTC (rev 15411) @@ -0,0 +1,2 @@ +<module name="bootcd" type="iso"> +</module> Property changes on: branches/xmlbuildsystem/reactos/bootdata/bootcd/bootcd.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/bootdata/bootdata.xml --- branches/xmlbuildsystem/reactos/bootdata/bootdata.xml 2005-05-19 15:32:22 UTC (rev 15410) +++ branches/xmlbuildsystem/reactos/bootdata/bootdata.xml 2005-05-19 18:38:04 UTC (rev 15411) @@ -6,3 +6,9 @@ <cdfile base="reactos">hivesft.inf</cdfile> <cdfile base="reactos">hivesys.inf</cdfile> <cdfile base="reactos">txtsetup.sif</cdfile> +<directory name="bootcd"> + <xi:include href="bootcd/bootcd.xml" /> +</directory> +<directory name="livecd"> + <xi:include href="livecd/livecd.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/bootdata/livecd/livecd.xml --- branches/xmlbuildsystem/reactos/bootdata/livecd/livecd.xml 2005-05-19 15:32:22 UTC (rev 15410) +++ branches/xmlbuildsystem/reactos/bootdata/livecd/livecd.xml 2005-05-19 18:38:04 UTC (rev 15411) @@ -0,0 +1,2 @@ +<module name="livecd" type="liveiso"> +</module> Property changes on: branches/xmlbuildsystem/reactos/bootdata/livecd/livecd.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[greatlrd] 15410: Fix CD bug for
by greatlrd＠svn.reactos.com 19 May '05

19 May '05

Fix CD bug for CD "program files" cd did only working with CD program files now it support "" Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-05-19 05:26:35 UTC (rev 15409) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-05-19 15:32:22 UTC (rev 15410) @@ -156,8 +156,7 @@ { LPTSTR dir; /* pointer to the directory to change to */ LPTSTR lpOldPath; - LPTSTR endofstring; /* pointer to the null character in the directory to change to */ - LPTSTR lastquote; /* pointer to the last quotation mark in the directory to change to */ + size_t size, str_len; /*Should we better declare a variable containing _tsclen(dir) ? It's used a few times, but on the other hand paths are generally not very long*/ @@ -171,17 +170,29 @@ /* The whole param string is our parameter these days. The only thing we do is eliminating every quotation mark */ /* Is it safe to change the characters param is pointing to? I presume it is, as there doesn't seem to be any post-processing of it after the function call (what would that accomplish?) */ + + size = _tcscspn(param, _T("\"") ); + str_len = _tcslen(param)-1; - dir=param; - endofstring=dir+_tcslen(dir); + if ((param[size] == _T('"')) && (str_len >1)) + { + + if (size==0) + { + _tcsncpy(param,&param[size+1],str_len); + param[str_len] = _T('\0'); + } - while ((lastquote = _tcsrchr(dir, _T('\"')))) - { - endofstring--; - memmove(lastquote,lastquote+1,endofstring-lastquote); - *endofstring=_T('\0'); + size = _tcscspn(param, _T("\"") ); + if (param[size] == _T('"')) + { + param[size] = _T('\0'); + } + } - + + dir=param; + /* if doing a CD and no parameters given, print out current directory */ if (!dir || !dir[0]) {

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