Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43945: [KS] - Fix a bug in KsCancelIo which accessed already freed memory [PORTCLS] - Cancel all audio stream irps when the it is used in looped stream mode. Fixes re-opening of playback / capture devices in DSound. - Remove dead code
by janderwald＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: janderwald Date: Wed Nov 4 02:54:19 2009 New Revision: 43945 URL: http://svn.reactos.org/svn/reactos?rev=43945&view=rev Log: [KS] - Fix a bug in KsCancelIo which accessed already freed memory [PORTCLS] - Cancel all audio stream irps when the it is used in looped stream mode. Fixes re-opening of playback / capture devices in DSound. - Remove dead code Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Wed Nov 4 02:54:19 2009 @@ -1240,6 +1240,7 @@ PDRIVER_CANCEL OldDriverCancel; PIO_STACK_LOCATION IoStack; PLIST_ENTRY Entry; + PLIST_ENTRY NextEntry; PIRP Irp; KIRQL OldLevel; @@ -1253,6 +1254,9 @@ /* get irp offset */ Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + /* get next entry */ + NextEntry = Entry->Flink; + /* set cancelled bit */ Irp->Cancel = TRUE; @@ -1275,8 +1279,9 @@ /* re-acquire spinlock */ KeAcquireSpinLock(SpinLock, &OldLevel); } + /* move on to next entry */ - Entry = Entry->Flink; + Entry = NextEntry; } /* the irp has already been canceled */ @@ -1785,7 +1790,7 @@ PKSIOBJECT_HEADER ObjectHeader; NTSTATUS Status; - DPRINT("KS / CREATE\n"); + DPRINT1("KS / CREATE\n"); /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); /* get device extension */ @@ -1837,7 +1842,6 @@ } return Status; } - Irp->IoStatus.Information = 0; /* set return status */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Wed Nov 4 02:54:19 2009 @@ -441,8 +441,20 @@ NTAPI CIrpQueue::CancelBuffers() { - + // is there an active irp + if (m_Irp) + { + // re-insert it to cancelable queue + KsAddIrpToCancelableQueue(&m_IrpList, &m_IrpListLock, m_Irp, KsListEntryTail, NULL); + //set it to zero + m_Irp = NULL; + } + + // cancel all irps + KsCancelIo(&m_IrpList, &m_IrpListLock); + // reset stream start flag m_StartStream = FALSE; + // done return TRUE; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Wed Nov 4 02:54:19 2009 @@ -268,7 +268,14 @@ { // store new state Pin->m_State = *State; - } + + if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING && Pin->m_State == KSSTATE_STOP) + { + /* FIXME complete pending irps with successfull state */ + Pin->m_IrpQueue->CancelBuffers(); + } + } + // store result Irp->IoStatus.Information = sizeof(KSSTATE); return Status; @@ -905,7 +912,8 @@ } #endif - DPRINT("CPortPinWaveCyclic::Init Status %x\n", Status); + DPRINT("CPortPinWaveCyclic::Init Status %x PinId %u Capture %u\n", Status, ConnectDetails->PinId, Capture); + DPRINT("Bits %u Samples %u Channels %u Tag %u FrameSize %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nSamplesPerSec, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)(DataFormat))->WaveFormatEx.wFormatTag, m_FrameSize); if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Wed Nov 4 02:54:19 2009 @@ -54,13 +54,6 @@ friend PMINIPORTTOPOLOGY GetTopologyMiniport(PPORTTOPOLOGY Port); }; - -typedef struct -{ - PIRP Irp; - IIrpTarget *Filter; - PIO_WORKITEM WorkItem; -}PIN_WORKER_CONTEXT, *PPIN_WORKER_CONTEXT; static GUID InterfaceGuids[2] = { @@ -448,57 +441,16 @@ } -VOID -NTAPI -CreatePinWorkerRoutine( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) -{ - NTSTATUS Status; - IIrpTarget *Pin; - PPIN_WORKER_CONTEXT WorkerContext = (PPIN_WORKER_CONTEXT)Context; - - DPRINT("CreatePinWorkerRoutine called\n"); - // create the pin - Status = WorkerContext->Filter->NewIrpTarget(&Pin, - KSSTRING_Pin, - NULL, - NonPagedPool, - DeviceObject, - WorkerContext->Irp, - NULL); - - DPRINT("CreatePinWorkerRoutine Status %x\n", Status); - - if (NT_SUCCESS(Status)) - { - // create the dispatch object - // FIXME need create item for clock - Status = NewDispatchObject(WorkerContext->Irp, Pin, 0, NULL); - DPRINT("Pin %p\n", Pin); - } - - DPRINT("CreatePinWorkerRoutine completing irp %p\n", WorkerContext->Irp); - // save status in irp - WorkerContext->Irp->IoStatus.Status = Status; - WorkerContext->Irp->IoStatus.Information = 0; - // complete the request - IoCompleteRequest(WorkerContext->Irp, IO_SOUND_INCREMENT); - // free allocated work item - IoFreeWorkItem(WorkerContext->WorkItem); - // free context - FreeItem(WorkerContext, TAG_PORTCLASS); -} - NTSTATUS NTAPI PcCreatePinDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + NTSTATUS Status; IIrpTarget *Filter; + IIrpTarget *Pin; PKSOBJECT_CREATE_ITEM CreateItem; - PPIN_WORKER_CONTEXT Context; // access the create item CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); @@ -511,6 +463,7 @@ // sanity checks PC_ASSERT(Filter != NULL); + PC_ASSERT_IRQL(PASSIVE_LEVEL); #if KS_IMPLEMENTED @@ -524,44 +477,32 @@ } #endif - // new pins are instantiated at passive level, - // so allocate a work item and context for it - - - Context = (PPIN_WORKER_CONTEXT)AllocateItem(NonPagedPool, sizeof(PIN_WORKER_CONTEXT), TAG_PORTCLASS); - if (!Context) - { - DPRINT("Failed to allocate worker context\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // allocate work item - Context->WorkItem = IoAllocateWorkItem(DeviceObject); - if (!Context->WorkItem) - { - DPRINT("Failed to allocate workitem\n"); - FreeItem(Context, TAG_PORTCLASS); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Context->Filter = Filter; - Context->Irp = Irp; - - DPRINT("Queueing IRP %p Irql %u\n", Irp, KeGetCurrentIrql()); + Status = Filter->NewIrpTarget(&Pin, + KSSTRING_Pin, + NULL, + NonPagedPool, + DeviceObject, + Irp, + NULL); + + DPRINT("PcCreatePinDispatch Status %x\n", Status); + + if (NT_SUCCESS(Status)) + { + // create the dispatch object + // FIXME need create item for clock + Status = NewDispatchObject(Irp, Pin, 0, NULL); + DPRINT("Pin %p\n", Pin); + } + + DPRINT("CreatePinWorkerRoutine completing irp %p\n", Irp); + // save status in irp + Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_PENDING; - IoMarkIrpPending(Irp); - IoQueueWorkItem(Context->WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); - return STATUS_PENDING; -} - - + // complete the request + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} NTSTATUS NTAPI @@ -584,6 +525,7 @@ // sanity checks PC_ASSERT(SubDevice != NULL); + #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader);

1 0

[ablackmann] 43944: Start implementing the long task of DoLAYOUT to process the big "meat" of a KLC file: the keyboard layout. Implement the table of recognized virtual keys (and the translation matrix). Add support for hex-entered keys (0x...). The tool does some minimal error checking for now, and attempts to begin parsing the LAYOUT section, but fails miserably and the code won't execute unless you've enabled verbose mode. I'm just using this commit as a checkpoint for now. Also fixed SCVK st
by ablackmann＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: ablackmann Date: Tue Nov 3 23:57:26 2009 New Revision: 43944 URL: http://svn.reactos.org/svn/reactos?rev=43944&view=rev Log: Start implementing the long task of DoLAYOUT to process the big "meat" of a KLC file: the keyboard layout. Implement the table of recognized virtual keys (and the translation matrix). Add support for hex-entered keys (0x...). The tool does some minimal error checking for now, and attempts to begin parsing the LAYOUT section, but fails miserably and the code won't execute unless you've enabled verbose mode. I'm just using this commit as a checkpoint for now. Also fixed SCVK structure to use the last member as a state flag. Finally, added definitions for LAYOUTENTRY which will keep track of each row's column's values in the LAYOUT. Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Tue Nov 3 23:57:26 2009 @@ -26,8 +26,35 @@ USHORT ScanCode; USHORT VirtualKey; PCHAR Name; - PVOID Reserved; + BOOLEAN Processed; } SCVK, *PSCVK; + +typedef struct tagVKNAME +{ + ULONG VirtualKey; + PCHAR Name; +} VKNAME, *PVKNAME; + +typedef struct tagLAYOUTENTRY +{ + USHORT ScanCode; + UCHAR VirtualKey; + UCHAR OriginalVirtualKey; + UCHAR Cap; + ULONG StateCount; + ULONG CharData[8]; + ULONG DeadCharData[8]; + ULONG OtherCharData[8]; + struct LAYOUTENTRY* CapData; + PCHAR Name; + ULONG Processed; + ULONG LineCount; +} LAYOUTENTRY, *PLAYOUTENTRY; + +typedef struct tagLAYOUT +{ + LAYOUTENTRY Entry[110]; +} LAYOUT, *PLAYOUT; /* GLOBALS ********************************************************************/ @@ -44,7 +71,7 @@ CHAR gLocaleName[256]; ULONG gID = 0; ULONG gKbdLayoutVersion; -CHAR g_Layout[4096]; +LAYOUT g_Layout; ULONG gLineCount; PCHAR KeyWordList[KEYWORD_COUNT] = { @@ -70,118 +97,159 @@ /* ISO 110-key Keyboard Scancode to Virtual Key Conversion Table */ SCVK ScVk[] = { - {0x02, '1', NULL, NULL}, - {0x03, '2', NULL, NULL}, - {0x04, '3', NULL, NULL}, - {0x05, '4', NULL, NULL}, - {0x06, '5', NULL, NULL}, - {0x07, '6', NULL, NULL}, - {0x08, '7', NULL, NULL}, - {0x09, '8', NULL, NULL}, - {0x0a, '9', NULL, NULL}, - {0x0b, '0', NULL, NULL}, - {0x0c, 0xbd, NULL, NULL}, - {0x0d, 0xbb, NULL, NULL}, - {0x10, 'Q', NULL, NULL}, - {0x11, 'W', NULL, NULL}, - {0x12, 'E', NULL, NULL}, - {0x13, 'R', NULL, NULL}, - {0x14, 'T', NULL, NULL}, - {0x15, 'Y', NULL, NULL}, - {0x16, 'U', NULL, NULL}, - {0x17, 'I', NULL, NULL}, - {0x18, 'O', NULL, NULL}, - {0x19, 'P', NULL, NULL}, - {0x1a, 0xdb, NULL, NULL}, - {0x1b, 0xdd, NULL, NULL}, - {0x1e, 'A', NULL, NULL}, - {0x1f, 'S', NULL, NULL}, - {0x20, 'D', NULL, NULL}, - {0x21, 'F', NULL, NULL}, - {0x22, 'G', NULL, NULL}, - {0x23, 'H', NULL, NULL}, - {0x24, 'J', NULL, NULL}, - {0x25, 'K', NULL, NULL}, - {0x26, 'L', NULL, NULL}, - {0x27, 0xba, NULL, NULL}, - {0x28, 0xde, NULL, NULL}, - {0x29, 0xc0, NULL, NULL}, - {0x2b, 0xdc, NULL, NULL}, - {0x2c, 'Z', NULL, NULL}, - {0x2d, 'X', NULL, NULL}, - {0x2e, 'C', NULL, NULL}, - {0x2f, 'V', NULL, NULL}, - {0x30, 'B', NULL, NULL}, - {0x31, 'N', NULL, NULL}, - {0x32, 'M', NULL, NULL}, - {0x33, 0xbc, NULL, NULL}, - {0x34, 0xbe, NULL, NULL}, - {0x35, 0xbf, NULL, NULL}, - {0x53, 0x6e, NULL, NULL}, - {0x56, 0xe2, NULL, NULL}, - {0x73, 0xc1, NULL, NULL}, - {0x7e, 0xc2, NULL, NULL}, - {0xe010, 0xb1, "Speedracer: Previous Track", NULL}, - {0xe019, 0xb0, "Speedracer: Next Track", NULL}, - {0xe01d, 0xa3, "RControl", NULL}, - {0xe020, 0xad, "Speedracer: Volume Mute", NULL}, - {0xe021, 0xb7, "Speedracer: Launch App 2", NULL}, - {0xe022, 0xb3, "Speedracer: Media Play/Pause", NULL}, - {0xe024, 0xb2, "Speedracer: Media Stop", NULL}, - {0xe02e, 0xae, "Speedracer: Volume Up", NULL}, - {0xe030, 0xaf, "Speedracer: Volume Down", NULL}, - {0xe032, 0xac, "Speedracer: Browser Home", NULL}, - {0xe035, 0x6f, "Numpad Divide", NULL}, - {0xe037, 0x2c, "Snapshot", NULL}, - {0xe038, 0xa5, "RMenu", NULL}, - {0xe047, 0x24, "Home", NULL}, - {0xe048, 0x26, "Up", NULL}, - {0xe049, 0x21, "Prior", NULL}, - {0xe04b, 0x25, "Left", NULL}, - {0xe04d, 0x27, "Right", NULL}, - {0xe04f, 0x23, "End", NULL}, - {0xe050, 0x28, "Down", NULL}, - {0xe051, 0x22, "Next", NULL}, - {0xe052, 0x2d, "Insert", NULL}, - {0xe053, 0x2e, "Delete", NULL}, - {0xe05b, 0x5b, "Left Win", NULL}, - {0xe05c, 0x5c, "Right Win", NULL}, - {0xe05d, 0x5d, "Application", NULL}, - {0xe05e, 0xff, "Power", NULL}, - {0xe05f, 0x5f, "Speedracer: Sleep", NULL}, - {0xe060, 0xff, "BAD SCANCODE", NULL}, - {0xe061, 0xff, "BAD SCANCODE", NULL}, - {0xe065, 0xaa, "Speedracer: Browser Search", NULL}, - {0xe066, 0xab, "Speedracer: Browser Favorites", NULL}, - {0xe067, 0xa8, "Speedracer: Browser Refresh", NULL}, - {0xe068, 0xa9, "Speedracer: Browser Stop", NULL}, - {0xe069, 0xa7, "Speedracer: Browser Foward", NULL}, - {0xe06a, 0xa6, "Speedracer: Browser Back", NULL}, - {0xe06b, 0xb6, "Speedracer: Launch App 1", NULL}, - {0xe06c, 0xb4, "Speedracer: Launch Mail", NULL}, - {0xe06d, 0xb5, "Speedracer: Launch Media Selector", NULL}, - {0x53, 0x6e, NULL, NULL}, - {0x0e, 0x08, NULL, NULL}, - {0x01, 0x1b, NULL, NULL}, - {0xe01c, 0x0d, "Numpad Enter", NULL}, - {0x1c, 0x0d, NULL, NULL}, - {0x39, 0x20, NULL, NULL}, - {0xe046, 0x03, "Break (Ctrl + Pause)", NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL}, - {0xFFFF, 0x00, NULL, NULL} + {0x02, '1', NULL, FALSE}, + {0x03, '2', NULL, FALSE}, + {0x04, '3', NULL, FALSE}, + {0x05, '4', NULL, FALSE}, + {0x06, '5', NULL, FALSE}, + {0x07, '6', NULL, FALSE}, + {0x08, '7', NULL, FALSE}, + {0x09, '8', NULL, FALSE}, + {0x0a, '9', NULL, FALSE}, + {0x0b, '0', NULL, FALSE}, + {0x0c, 0xbd, NULL, FALSE}, + {0x0d, 0xbb, NULL, FALSE}, + {0x10, 'Q', NULL, FALSE}, + {0x11, 'W', NULL, FALSE}, + {0x12, 'E', NULL, FALSE}, + {0x13, 'R', NULL, FALSE}, + {0x14, 'T', NULL, FALSE}, + {0x15, 'Y', NULL, FALSE}, + {0x16, 'U', NULL, FALSE}, + {0x17, 'I', NULL, FALSE}, + {0x18, 'O', NULL, FALSE}, + {0x19, 'P', NULL, FALSE}, + {0x1a, 0xdb, NULL, FALSE}, + {0x1b, 0xdd, NULL, FALSE}, + {0x1e, 'A', NULL, FALSE}, + {0x1f, 'S', NULL, FALSE}, + {0x20, 'D', NULL, FALSE}, + {0x21, 'F', NULL, FALSE}, + {0x22, 'G', NULL, FALSE}, + {0x23, 'H', NULL, FALSE}, + {0x24, 'J', NULL, FALSE}, + {0x25, 'K', NULL, FALSE}, + {0x26, 'L', NULL, FALSE}, + {0x27, 0xba, NULL, FALSE}, + {0x28, 0xde, NULL, FALSE}, + {0x29, 0xc0, NULL, FALSE}, + {0x2b, 0xdc, NULL, FALSE}, + {0x2c, 'Z', NULL, FALSE}, + {0x2d, 'X', NULL, FALSE}, + {0x2e, 'C', NULL, FALSE}, + {0x2f, 'V', NULL, FALSE}, + {0x30, 'B', NULL, FALSE}, + {0x31, 'N', NULL, FALSE}, + {0x32, 'M', NULL, FALSE}, + {0x33, 0xbc, NULL, FALSE}, + {0x34, 0xbe, NULL, FALSE}, + {0x35, 0xbf, NULL, FALSE}, + {0x53, 0x6e, NULL, FALSE}, + {0x56, 0xe2, NULL, FALSE}, + {0x73, 0xc1, NULL, FALSE}, + {0x7e, 0xc2, NULL, FALSE}, + {0xe010, 0xb1, "Speedracer: Previous Track", FALSE}, + {0xe019, 0xb0, "Speedracer: Next Track", FALSE}, + {0xe01d, 0xa3, "RControl", FALSE}, + {0xe020, 0xad, "Speedracer: Volume Mute", FALSE}, + {0xe021, 0xb7, "Speedracer: Launch App 2", FALSE}, + {0xe022, 0xb3, "Speedracer: Media Play/Pause", FALSE}, + {0xe024, 0xb2, "Speedracer: Media Stop", FALSE}, + {0xe02e, 0xae, "Speedracer: Volume Up", FALSE}, + {0xe030, 0xaf, "Speedracer: Volume Down", FALSE}, + {0xe032, 0xac, "Speedracer: Browser Home", FALSE}, + {0xe035, 0x6f, "Numpad Divide", FALSE}, + {0xe037, 0x2c, "Snapshot", FALSE}, + {0xe038, 0xa5, "RMenu", FALSE}, + {0xe047, 0x24, "Home", FALSE}, + {0xe048, 0x26, "Up", FALSE}, + {0xe049, 0x21, "Prior", FALSE}, + {0xe04b, 0x25, "Left", FALSE}, + {0xe04d, 0x27, "Right", FALSE}, + {0xe04f, 0x23, "End", FALSE}, + {0xe050, 0x28, "Down", FALSE}, + {0xe051, 0x22, "Next", FALSE}, + {0xe052, 0x2d, "Insert", FALSE}, + {0xe053, 0x2e, "Delete", FALSE}, + {0xe05b, 0x5b, "Left Win", FALSE}, + {0xe05c, 0x5c, "Right Win", FALSE}, + {0xe05d, 0x5d, "Application", FALSE}, + {0xe05e, 0xff, "Power", FALSE}, + {0xe05f, 0x5f, "Speedracer: Sleep", FALSE}, + {0xe060, 0xff, "BAD SCANCODE", FALSE}, + {0xe061, 0xff, "BAD SCANCODE", FALSE}, + {0xe065, 0xaa, "Speedracer: Browser Search", FALSE}, + {0xe066, 0xab, "Speedracer: Browser Favorites", FALSE}, + {0xe067, 0xa8, "Speedracer: Browser Refresh", FALSE}, + {0xe068, 0xa9, "Speedracer: Browser Stop", FALSE}, + {0xe069, 0xa7, "Speedracer: Browser Foward", FALSE}, + {0xe06a, 0xa6, "Speedracer: Browser Back", FALSE}, + {0xe06b, 0xb6, "Speedracer: Launch App 1", FALSE}, + {0xe06c, 0xb4, "Speedracer: Launch Mail", FALSE}, + {0xe06d, 0xb5, "Speedracer: Launch Media Selector", FALSE}, + {0x53, 0x6e, NULL, FALSE}, + {0x0e, 0x08, NULL, FALSE}, + {0x01, 0x1b, NULL, FALSE}, + {0xe01c, 0x0d, "Numpad Enter", FALSE}, + {0x1c, 0x0d, NULL, FALSE}, + {0x39, 0x20, NULL, FALSE}, + {0xe046, 0x03, "Break (Ctrl + Pause)", FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE} }; + +VKNAME VKName[] = +{ + {0x08, "BACK"}, + {0x03, "CANCEL"}, + {0x1b, "ESCAPE"}, + {0x0d, "RETURN"}, + {0x20, "SPACE"}, + {0x6e, "DECIMAL"}, + {0xba, "OEM_1"}, + {0xbb, "OEM_PLUS"}, + {0xbc, "OEM_COMMA"}, + {0xbd, "OEM_MINUS"}, + {0xbe, "OEM_PERIOD"}, + {0xbf, "OEM_2"}, + {0xc0, "OEM_3"}, + {0xdb, "OEM_4"}, + {0xdc, "OEM_5"}, + {0xdd, "OEM_6"}, + {0xde, "OEM_7"}, + {0xdf, "OEM_8"}, + {0xe2, "OEM_102"}, + {0xc1, "ABNT_C1"}, + {0xc2, "ABNT_C2"}, + {0x10, "SHIFT"}, + {0xa0, "LSHIFT"}, + {0xa1, "RSHIFT"}, + {0x12, "MENU"}, + {0xa4, "LMENU"}, + {0xa5, "RMENU"}, + {0x11, "CONTROL"}, + {0xa2, "LCONTROL"}, + {0xa3, "RCONTROL"}, + {0x6c, "SEPARATOR"}, + {0xe4, "ICO_00"}, + {0x2e, "DELETE"}, + {0x2d, "INSERT"}, + {0xe5, "GROUPSHIFT"}, + {0xe6, "RGROUPSHIFT"} +}; + /* FUNCTIONS ******************************************************************/ @@ -195,6 +263,52 @@ /* If we didn't find anything, i will be KEYWORD_COUNT, which is invalid */ return i; +} + +ULONG +getVKNum(IN PCHAR p) +{ + ULONG Length; + ULONG i; + ULONG KeyNumber; + + /* Compute the length of the string */ + Length = strlen(p); + if (!Length) return -1; + + /* Check if this is is a simple key */ + if (Length == 1) + { + /* If it's a number, return it now */ + if ((*p >= '0') && (*p <= '9')) return *p; + + /* Otherwise, convert the letter to upper case */ + *p = toupper(*p); + + /* And make sure it's a valid letter */ + if ((*p >= 'A') && (*p <='Z')) return *p; + + /* Otherwise, fail */ + return -1; + } + + /* Otherwise, scan our virtual key names */ + for (i = 0; i < 36; i++) + { + /* Check if we have a match */ + if (!strcmp(VKName[i].Name, p)) return VKName[i].VirtualKey; + } + + /* Check if this is a hex string */ + if ((*p == '0') && ((*(p + 1) == 'x') || (*(p + 1) == 'X'))) + { + /* Get the key number from the hex string */ + *(p + 1) = 'x'; + if (sscanf(p, "0x%x", &KeyNumber) == 1) return KeyNumber; + } + + /* No hope: fail */ + return -1; } BOOLEAN @@ -680,11 +794,131 @@ } ULONG -DoLAYOUT(IN PVOID LayoutData, +DoLAYOUT(IN PLAYOUT LayoutData, IN PVOID LigatureData, IN PULONG ShiftStates, IN ULONG StateCount) { + CHAR Token[32]; + CHAR Cap[8]; + ULONG KeyWord; + ULONG ScanCode, CurrentCode; + ULONG TokenCount; + ULONG VirtualKey; + ULONG i; + BOOLEAN FullEntry; + ULONG ScanCodeCount = -1; + PLAYOUTENTRY Entry; + + /* Only attempt this is Verbose is enabled (FOR DEBUGGING ONLY) */ + if (!Verbose) return SkipLines(); + + /* Zero out the layout */ + memset(LayoutData, 0, sizeof(LAYOUT)); + + /* Read each line */ + Entry = &LayoutData->Entry[0]; + while (NextLine(gBuf, 256, gfpInput)) + { + /* Search for token */ + if (sscanf(gBuf, "%s", Token) != 1) continue; + + /* Make sure it's not just a comment */ + if (*Token == ';') continue; + + /* Make sure it's not a keyword */ + KeyWord = isKeyWord(Token); + if (KeyWord < KEYWORD_COUNT) break; + + /* Now read the entry */ + TokenCount = sscanf(gBuf, " %x %s %s", &ScanCode, Token, Cap); + if (TokenCount == 3) + { + /* Full entry with cap */ + FullEntry = TRUE; + } + else if (TokenCount != 2) + { + /* Fail, invalid LAYOUT entry */ + printf("There are not enough columns in the layout list.\n"); + exit(1); + } + else + { + /* Simplified layout with no cap */ + FullEntry = FALSE; + } + + /* One more */ + Entry++; + if (++ScanCodeCount >= 110) + { + /* Too many! */ + printf("ScanCode %02x - too many scancodes here to parse.\n", ScanCode); + exit(1); + } + + /* Fill out this entry */ + Entry->ScanCode = ScanCode; + Entry->LineCount = gLineCount; + + /* Loop scancode table */ + for (i = 0; i < 110; i++) + { + /* Get the current code */ + CurrentCode = ScVk[i].ScanCode; + if (CurrentCode == 0xFFFF) + { + /* New code */ + if (Verbose) printf("A new scancode is being defined: 0x%2X, %s\n", Entry->ScanCode, Token); + + /* Fill out the entry */ + Entry->VirtualKey = getVKNum(Token); + goto FillEntry; + } + + /* If we found it, process it */ + if (ScanCode == CurrentCode) break; + } + + /* Make sure we didn't already process it */ + if (ScVk[i].Processed) + { + /* Fail */ + printf("Scancode %X was previously defined.\n", ScanCode); + exit(1); + } + + /* Check if there is a valid virtual key */ + if (ScVk[i].VirtualKey == 0xFFFF) + { + /* Fail */ + printf("The Scancode you tried to use (%X) is reserved.\n", ScanCode); + exit(1); + } + + /* Fill out the entry */ + Entry->OriginalVirtualKey = ScVk[i].VirtualKey; + Entry->Name = ScVk[i].Name; + +FillEntry: + Entry->Processed = TRUE; + ScVk[i].Processed = TRUE; + + /* Get the virtual key from the entry */ + VirtualKey = getVKNum(Token); + Entry->VirtualKey = VirtualKey; + + /* Make sure it's valid */ + if (VirtualKey == 0xFFFF) + { + /* Warn the user */ + if (Verbose) printf("An invalid Virtual Key '%s' was defined.\n", Token); + continue; + } + } + + /* Skip what's left */ return SkipLines(); }

1 0

[cfinck] 43943: - Rename the toolchain packages for RosBE-Windows to the more appropriate names "rosbe_1.4" and "rosbe_1.5". Packages for them can be downloaded from http://svn.reactos.org/RosBE-Sources. - Use "setuplibrary.sh" for the current "buildtoolchain.sh" script and share as much code as possible between this file and RosBE-Unix' "RosBE-Builder.sh". - Add a new parameter to this script for specifying the work/output directory. - Add the cpucount tool to speed up the build process.
by cfinck＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: cfinck Date: Tue Nov 3 23:51:09 2009 New Revision: 43943 URL: http://svn.reactos.org/svn/reactos?rev=43943&view=rev Log: - Rename the toolchain packages for RosBE-Windows to the more appropriate names "rosbe_1.4" and "rosbe_1.5". Packages for them can be downloaded from http://svn.reactos.org/RosBE-Sources. - Use "setuplibrary.sh" for the current "buildtoolchain.sh" script and share as much code as possible between this file and RosBE-Unix' "RosBE-Builder.sh". - Add a new parameter to this script for specifying the work/output directory. - Add the cpucount tool to speed up the build process. Added: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.4/ - copied from r43940, trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/ - copied from r43940, trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/ (with props) trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh - copied unchanged from r43940, trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/tools/ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/tools/cpucount.c - copied unchanged from r43895, trunk/tools/RosBE/Tools/cpucount.c Removed: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/ Modified: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.4/buildtoolchain.sh trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh Modified: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.4/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.4/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.4/buildtoolchain.sh [iso-8859-1] Tue Nov 3 23:51:09 2009 @@ -7,6 +7,8 @@ # Released under GNU GPL v2 or any later version. ################################################################################## +# Package "rosbe_1.4" +# # This script was built for the following toolchain versions: # - binutils v2.19.51-20090127 (snapshot) # patched with: @@ -20,7 +22,7 @@ # - w32api 3.10 # # These versions are used in RosBE-Windows 1.4.2-1.4.5 and RosBE-Unix 1.4-1.4.2. -# Get the toolchain packages from one of these RosBE-Unix versions. +# Get the toolchain packages from http://svn.reactos.org/RosBE-Sources/rosbe_1.4 ################################################################################## # @@ -80,7 +82,7 @@ # Entry point # echo "buildtoolchain - Build a binutils/GCC/mingw-runtime/w32api toolchain for Windows" -echo "Script for gcc_4.1.3 (see script header for details)" +echo "Script for rosbe_1.4 (see script header for details)" echo "by Colin Finck <colin(a)reactos.org>" echo Modified: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh [iso-8859-1] Tue Nov 3 23:51:09 2009 @@ -7,6 +7,8 @@ # Released under GNU GPL v2 or any later version. ######################################################################################################################## +# Package "rosbe_1.5" +# # This script was built for the following toolchain versions: # - binutils 2.20.51-20091017 (snapshot) # - gcc 4.4.2 @@ -17,121 +19,39 @@ # - mpfr 2.4.2-rc1 # - w32api 3.13 # -# These tools were compiled under MSYS with "gcc version 3.4.5 (mingw-vista special r3)" +# These tools have to be compiled under MSYS with "gcc version 3.4.5 (mingw-vista special r3)" # # These versions are used in RosBE-Windows 1.5 and RosBE-Unix 1.5. -# Get the toolchain packages from this RosBE-Unix version. +# Get the toolchain packages from http://svn.reactos.org/RosBE-Sources/rosbe_1.5 ######################################################################################################################## -# -# Constants -# -WORKDIR="/c/buildtoolchain" - -HOST_CFLAGS="-pipe -fno-common -O3 -march=pentium3 -mfpmath=sse" +# RosBE Setup Variables +rs_host_cflags="-pipe -fno-common -O3 -march=pentium3 -mfpmath=sse" +rs_needed_tools="bison flex gcc g++ grep makeinfo" # GNU Make has a special check +rs_target="mingw32" +rs_target_cflags="-pipe -gstabs+ -O3 -march=pentium -mtune=i686" + +# Get the absolute path to the script directory +cd `dirname $0` +rs_scriptdir="$PWD" + +# buildtoolchain Constants HOST_GCC_VERSION="gcc version 3.4.5 (mingw-vista special r3)" -INSTALLDIR="$WORKDIR/mingw" -NEEDED_TOOLS="bison flex gcc g++ grep make makeinfo" -SUPPORTDIR="$WORKDIR/support" +MODULES="w32api mingw_runtime gmp mpfr binutils gcc" SYSHEADERDIR="/mingw/include" -TARGET="mingw32" -TARGET_CFLAGS="-pipe -gstabs+ -O3 -march=pentium -mtune=i686" - - -# -# Functions -# -boldmsg() -{ - echo -e $2 "\e[1m$1\e[0m" -} - -greenmsg() -{ - echo -e $2 "\e[32m$1\e[0m" -} - -redmsg() -{ - echo -e $2 "\e[31m$1\e[0m" -} - -check_run() -{ - if [ $? -ne 0 ]; then - redmsg "FAILED" - echo "Please take a look at the log file \"$WORKDIR/build.log\"" - echo "Aborted!" - exit 1 - else - greenmsg "OK" - rm "$WORKDIR/build.log" - fi -} - -mkdir_if_not_exists() -{ - if ! [ -d "$1" ]; then - mkdir -p "$1" - fi -} - -mkdir_empty() -{ - if [ -d "$1" ]; then - rm -rf "$1" - fi - - mkdir -p "$1" -} - -prepare_module() -{ - # Check if the module shall be built and extract it then - process_it=$1 - module=$2 - - if [ "$process_it" = "0" ]; then - return 1 - fi - - cd "$WORKDIR" - rm -rf "$module" - rm -rf "$module-build" - - echo -n "Extracting $module... " - tar -xjf "$source_path/$module.tar.bz2" >& build.log - check_run - - mkdir "$module-build" - cd "$module-build" - - return 0 -} - -do_command() -{ - echo -n "Running \"$*\"... " - $* >& "$WORKDIR/build.log" - check_run -} - -clean_module() -{ - echo "Cleaning up $1..." - cd "$WORKDIR" - rm -rf "$1-build" - rm -rf "$1" -} - - -# -# Entry point -# -echo "buildtoolchain - Build a binutils/GCC/mingw-runtime/w32api toolchain for Windows" -echo "Script for gcc_4.4.2 (see script header for details)" -echo "by Colin Finck <colin(a)reactos.org>" + +source "$rs_scriptdir/scripts/setuplibrary.sh" + + +echo "*******************************************************************************" +echo "* Buildtoolchain script for the ReactOS Build Environment for Windows *" +echo "* Package \"rosbe_1.5\" *" +echo "* by Colin Finck <colin(a)reactos.org> *" +echo "*******************************************************************************" + +echo +echo "This script builds a binutils/GCC/mingw-runtime/w32api toolchain for Windows." echo if [ "`uname -o`" != "Msys" ]; then @@ -140,10 +60,18 @@ fi # We don't want too less parameters -if [ "$1" == "" ]; then - echo "Syntax: ./buildtoolchain.sh <sources> [w32api] [mingw-runtime] [gmp] [mpfr] [binutils] [gcc]" +if [ "$2" == "" ]; then + echo -n "Syntax: ./buildtoolchain.sh <sources> <workdir>" + + for module in $MODULES; do + echo -n " [$module]" + done + + echo echo echo " sources - Path to the directory containing RosBE-Unix toolchain packages (.tar.bz2 files)" + echo " workdir - Path to the directory used for building. Will contain the final executables and" + echo " temporary files." echo echo "The rest of the arguments are optional. You specify them if you want to prevent a component" echo "from being (re)built. Do this by passing 0 as the argument of the appropriate component." @@ -152,48 +80,16 @@ exit 1 fi -# Get the absolute path to the script directory -cd `dirname $0` -SCRIPTDIR="$PWD" - -# Find out whether the script directory contains spaces -case "$SCRIPTDIR" in -*" "*) - redmsg "The script directory \"$SCRIPTDIR\" contains spaces!" - redmsg "Therefore some build tools cannot be compiled properly." - echo - redmsg "Please move \"$SCRIPTDIR\" to a directory, which does not contain spaces." - - exit 1;; -esac - -# Check if all necessary tools exist -boldmsg "Checking for the needed tools..." - -toolmissing=false -for tool in $NEEDED_TOOLS; do - echo -n "Checking for $tool... " - - if which "$tool" >& /dev/null; then - greenmsg "OK" - else - redmsg "MISSING" - toolmissing=true - fi -done +rs_check_requirements # Check for the correct GCC version echo -n "Checking for the correct GCC version... " if gcc -v 2>&1 | grep "$HOST_GCC_VERSION" >& /dev/null; then - greenmsg "OK" + rs_greenmsg "OK" else - redmsg "MISSING" - toolmissing=true -fi - -if $toolmissing; then - echo "At least one needed tool is missing, aborted!" + rs_redmsg "MISSING" + echo "Correct GCC version is missing, aborted!" exit 1 fi @@ -201,93 +97,111 @@ # Get the absolute path to the source directory cd "$1" -source_path="$PWD" - -# Create all necessary directories -mkdir_if_not_exists "$INSTALLDIR/$TARGET" -mkdir_empty "$SYSHEADERDIR" -mkdir_if_not_exists "$SUPPORTDIR" - -# Process each module -boldmsg "Building..." - - -if [ "$2" != "0" ]; then - echo -n "Extracting w32api... " - - cd "$INSTALLDIR/$TARGET" - tar -xjf "$source_path/w32api.tar.bz2" >& "$WORKDIR/build.log" - check_run -fi - -if prepare_module "$3" "mingw-runtime"; then - export CFLAGS="$TARGET_CFLAGS" - export C_INCLUDE_PATH="$INSTALLDIR/$TARGET/include" - - do_command ../mingw-runtime/configure --prefix="$INSTALLDIR/$TARGET" --host="$TARGET" --build="$TARGET" - do_command make - do_command make install +rs_sourcedir="$PWD" +shift + +# As the work directory might not yet exist, we cannot "cd" here +rs_workdir="$1" +shift + +rs_prefixdir="$rs_workdir/mingw" +rs_supportprefixdir="$rs_workdir/support" + +# Set the rs_process_* variables based on the parameters +for module in $MODULES; do + if [ "$1" = "0" ]; then + eval "rs_process_$module=false" + else + eval "rs_process_$module=true" + fi + + shift +done + +rs_mkdir_empty "$SYSHEADERDIR" + + +##### BEGIN almost shared buildtoolchain/RosBE-Unix building part ############# +rs_boldmsg "Building..." + +rs_mkdir_if_not_exists "$rs_prefixdir/$rs_target" +rs_mkdir_if_not_exists "$rs_supportprefixdir" + +rs_extract_module "w32api" "$rs_prefixdir/$rs_target" + +rs_do_command gcc -s -o "$rs_supportprefixdir/cpucount.exe" "$rs_scriptdir/tools/cpucount.c" +rs_cpucount=`$rs_supportprefixdir/cpucount.exe -x1` + +if rs_prepare_module "mingw_runtime"; then + export CFLAGS="$rs_target_cflags" + export C_INCLUDE_PATH="$rs_prefixdir/$rs_target/include" + + rs_do_command ../mingw_runtime/configure --prefix="$rs_prefixdir/$rs_target" --host="$rs_target" --build="$rs_target" + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd install # libmingwex.a of the MinGW Runtime 3.15 and later references to _get_output_format, which is exported by msvcr80.dll and later. # For older Runtime DLLs (such as the msvcrt.dll we primarily use for ReactOS), MinGW adds a _get_output_format function returning 0 to libmsvcrt.a. # As we use MinGW's libmingwex.a, but our own libmsvcrt.a, linking to MinGW's libmingwex.a will fail by default. Therefore we have to create an archive for the compiled # _get_output_format stub, copy it to our "lib" directory and include it when linking to libmingwex.a. ar r ofmt_stub.a ofmt_stub.o >& /dev/null - cp ofmt_stub.a "$INSTALLDIR/$TARGET/lib" - - clean_module mingw-runtime - + cp ofmt_stub.a "$rs_prefixdir/$rs_target/lib" + + rs_clean_module "mingw_runtime" + + # The "mingw_runtime_dev" package needed for RosBE-Unix is manually created from the result of this build. + export CFLAGS="" export C_INCLUDE_PATH="" fi -if prepare_module "$4" "gmp"; then - export CFLAGS="$HOST_CFLAGS" - - do_command ../gmp/configure ABI=32 --prefix="$SUPPORTDIR" --host="$TARGET" --build="$TARGET" --disable-shared - do_command make - do_command make check - do_command make install - clean_module gmp - - export CFLAGS="" -fi - -if prepare_module "$5" "mpfr"; then - export CFLAGS="$HOST_CFLAGS" - - do_command ../mpfr/configure --prefix="$SUPPORTDIR" --host="$TARGET" --build="$TARGET" --with-gmp="$SUPPORTDIR" --disable-shared - do_command make - do_command make check - do_command make install - clean_module mpfr - - export CFLAGS="" -fi - -if prepare_module "$6" "binutils"; then - export CFLAGS="$HOST_CFLAGS" - - do_command ../binutils/configure --prefix="$INSTALLDIR" --host="$TARGET" --build="$TARGET" --target="$TARGET" --disable-nls - do_command make - do_command make install - clean_module binutils - - export CFLAGS="" -fi - -if prepare_module "$7" "gcc"; then - export STAGE1_CFLAGS="$HOST_CFLAGS" - export BOOT_CFLAGS="$HOST_CFLAGS" - export CFLAGS_FOR_TARGET="$TARGET_CFLAGS" - export CXXFLAGS_FOR_TARGET="$TARGET_CFLAGS" - export C_INCLUDE_PATH="$INSTALLDIR/$TARGET/include" - export LIBRARY_PATH="$INSTALLDIR/$TARGET/lib" - - do_command ../gcc/configure --prefix="$INSTALLDIR" --host="$TARGET" --build="$TARGET" --target="$TARGET" --with-gmp="$SUPPORTDIR" --with-mpfr="$SUPPORTDIR" --enable-languages=c,c++ --enable-checking=release --enable-version-specific-runtime-libs --enable-threads=win32 --disable-win32-registry --disable-shared --disable-nls - do_command make profiledbootstrap - do_command make install - clean_module gcc +if rs_prepare_module "gmp"; then + export CFLAGS="$rs_host_cflags" + + rs_do_command ../gmp/configure ABI=32 --prefix="$rs_supportprefixdir" --host="$rs_target" --build="$rs_target" --disable-shared + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd check + rs_do_command $rs_makecmd install + rs_clean_module "gmp" + + export CFLAGS="" +fi + +if rs_prepare_module "mpfr"; then + export CFLAGS="$rs_host_cflags" + + rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --host="$rs_target" --build="$rs_target" --with-gmp="$rs_supportprefixdir" --disable-shared + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd check + rs_do_command $rs_makecmd install + rs_clean_module "mpfr" + + export CFLAGS="" +fi + +if rs_prepare_module "binutils"; then + export CFLAGS="$rs_host_cflags" + + rs_do_command ../binutils/configure --prefix="$rs_prefixdir" --host="$rs_target" --build="$rs_target" --target="$rs_target" --disable-nls + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd install + rs_clean_module "binutils" + + export CFLAGS="" +fi + +if rs_prepare_module "gcc"; then + export STAGE1_CFLAGS="$rs_host_cflags" + export BOOT_CFLAGS="$rs_host_cflags" + export CFLAGS_FOR_TARGET="$rs_target_cflags" + export CXXFLAGS_FOR_TARGET="$rs_target_cflags" + export C_INCLUDE_PATH="$rs_prefixdir/$rs_target/include" + export LIBRARY_PATH="$rs_prefixdir/$rs_target/lib" + + rs_do_command ../gcc/configure --prefix="$rs_prefixdir" --host="$rs_target" --build="$rs_target" --target="$rs_target" --with-gmp="$rs_supportprefixdir" --with-mpfr="$rs_supportprefixdir" --enable-languages=c,c++ --enable-checking=release --enable-version-specific-runtime-libs --enable-threads=win32 --disable-win32-registry --disable-shared --disable-nls + rs_do_command $rs_makecmd profiledbootstrap + rs_do_command $rs_makecmd install + rs_clean_module "gcc" export STAGE1_CFLAGS="" export BOOT_CFLAGS="" @@ -297,20 +211,21 @@ export LIBRARY_PATH="" fi - # Final actions echo -boldmsg "Final actions" -cd "$INSTALLDIR" +rs_boldmsg "Final actions" +cd "$rs_prefixdir" echo "Removing unneeded files..." -rm -rf $TARGET/bin $TARGET/doc $TARGET/share include info man share +rm -rf $rs_target/bin $rs_target/doc $rs_target/share include info man share rm -f lib/* >& /dev/null -rm -f bin/c++.exe bin/gccbug bin/$TARGET-* +rm -f bin/c++.exe bin/gccbug bin/$rs_target-* echo "Removing debugging symbols..." -find -name "*.exe" -type f -exec strip -s {} ";" +find -executable -type f -exec strip -s {} ";" >& /dev/null find -name "*.a" -type f -exec strip -d {} ";" find -name "*.o" -type f -exec strip -d {} ";" +##### END almost shared buildtoolchain/RosBE-Unix building part ############### + echo "Finished!" Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Nov 3 23:51:09 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

1 0

[janderwald] 43942: - Fix checking of flags found by Ged - Remove unsupported DSBLOCK_FROMWRITECURSOR
by janderwald＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: janderwald Date: Tue Nov 3 23:30:36 2009 New Revision: 43942 URL: http://svn.reactos.org/svn/reactos?rev=43942&view=rev Log: - Fix checking of flags found by Ged - Remove unsupported DSBLOCK_FROMWRITECURSOR Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c trunk/reactos/dll/directx/dsound_new/secondary.c Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] Tue Nov 3 23:30:36 2009 @@ -298,11 +298,6 @@ return DS_OK; } - else if (dwFlags & DSBLOCK_FROMWRITECURSOR) - { - UNIMPLEMENTED - return DSERR_UNSUPPORTED; - } else { ASSERT(dwOffset < This->BufferSize); Modified: trunk/reactos/dll/directx/dsound_new/secondary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/sec… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/secondary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/secondary.c [iso-8859-1] Tue Nov 3 23:30:36 2009 @@ -255,7 +255,7 @@ return DS_OK; } - else if (dwFlags & DSBLOCK_FROMWRITECURSOR) + else if (dwFlags == DSBLOCK_FROMWRITECURSOR) { UNIMPLEMENTED return DSERR_UNSUPPORTED;

1 0

[janderwald] 43941: - Implement IDirectSoundCaptureBuffer8::Lock, IDirectSoundCaptureBuffer8::Unlock - Fix pin handle leakage
by janderwald＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: janderwald Date: Tue Nov 3 23:11:43 2009 New Revision: 43941 URL: http://svn.reactos.org/svn/reactos?rev=43941&view=rev Log: - Implement IDirectSoundCaptureBuffer8::Lock, IDirectSoundCaptureBuffer8::Unlock - Fix pin handle leakage Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c trunk/reactos/dll/directx/dsound_new/primary.c Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] Tue Nov 3 23:11:43 2009 @@ -274,16 +274,50 @@ WINAPI IDirectSoundCaptureBufferImpl_Lock( LPDIRECTSOUNDCAPTUREBUFFER8 iface, - DWORD dwReadCusor, - DWORD dwReadBytes, - LPVOID* lplpvAudioPtr1, - LPDWORD lpdwAudioBytes1, - LPVOID* lplpvAudioPtr2, - LPDWORD lpdwAudioBytes2, + DWORD dwOffset, + DWORD dwBytes, + LPVOID* ppvAudioPtr1, + LPDWORD pdwAudioBytes1, + LPVOID* ppvAudioPtr2, + LPDWORD pdwAudioBytes2, DWORD dwFlags ) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundCaptureBufferImpl This = (LPCDirectSoundCaptureBufferImpl)CONTAINING_RECORD(iface, CDirectSoundCaptureBufferImpl, lpVtbl); + + DPRINT("This %p dwOffset %u dwBytes %u ppvAudioPtr1 %p pdwAudioBytes1 %p ppvAudioPtr2 %p pdwAudioBytes2 %p dwFlags %x This->BufferSize %u\n", + This, dwOffset, dwBytes, ppvAudioPtr1, pdwAudioBytes1, ppvAudioPtr2, pdwAudioBytes2, dwFlags, This->BufferSize); + + if (dwFlags == DSBLOCK_ENTIREBUFFER) + { + *ppvAudioPtr1 = (LPVOID)This->Buffer; + *pdwAudioBytes1 = This->BufferSize; + if (ppvAudioPtr2) + *ppvAudioPtr2 = NULL; + if (pdwAudioBytes2) + *pdwAudioBytes2 = 0; + + return DS_OK; + } + else if (dwFlags & DSBLOCK_FROMWRITECURSOR) + { + UNIMPLEMENTED + return DSERR_UNSUPPORTED; + } + else + { + ASSERT(dwOffset < This->BufferSize); + ASSERT(dwBytes < This->BufferSize); + ASSERT(dwBytes + dwOffset <= This->BufferSize); + + *ppvAudioPtr1 = This->Buffer + dwOffset; + *pdwAudioBytes1 = dwBytes; + if (ppvAudioPtr2) + *ppvAudioPtr2 = NULL; + if (pdwAudioBytes2) + *pdwAudioBytes2 = 0; + + return DS_OK; + } } HRESULT @@ -369,8 +403,7 @@ LPVOID lpvAudioPtr2, DWORD dwAudioBytes2 ) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + return DS_OK; } HRESULT Modified: trunk/reactos/dll/directx/dsound_new/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pri… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] Tue Nov 3 23:11:43 2009 @@ -76,6 +76,12 @@ if (!ref) { + if (This->hPin) + { + /* close pin handle */ + CloseHandle(This->hPin); + } + /* free primary buffer */ HeapFree(GetProcessHeap(), 0, This); }

1 0

[cfinck] 43940: - Bump version to 1.5 - Add a new "setuplibrary.sh" containing many functions from "rosbelibrary.sh". This one can be shared between "buildtoolchain.sh" (RosBE-Windows) and "RosBE-Builder.sh" (RosBE-Unix) to simplify building the toolchain and minimize code differences. - Add an optional installation directory parameter to "RosBE-Builder.sh". If this one is given, the script will perform an unattended installation to the specified directory as long as it does not yet exist. Might
by cfinck＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: cfinck Date: Tue Nov 3 22:40:22 2009 New Revision: 43940 URL: http://svn.reactos.org/svn/reactos?rev=43940&view=rev Log: - Bump version to 1.5 - Add a new "setuplibrary.sh" containing many functions from "rosbelibrary.sh". This one can be shared between "buildtoolchain.sh" (RosBE-Windows) and "RosBE-Builder.sh" (RosBE-Unix) to simplify building the toolchain and minimize code differences. - Add an optional installation directory parameter to "RosBE-Builder.sh". If this one is given, the script will perform an unattended installation to the specified directory as long as it does not yet exist. Might be useful if we consider packaging RosBE-Unix into DEB/RPM/... packages in the future. - Remove the update routines for previous versions. 1.5 changed too much stuff, so that a direct update isn't feasible in this version. - Add bash's "local" keyword where appropriate. Besides, the required source packages can now be downloaded from http://svn.reactos.org/RosBE-Sources. You no longer need to retrieve them from released RosBE-Unix versions. Added: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh (with props) Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/createshortcut.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/rosbelibrary.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh trunk/tools/RosBE/RosBE-Unix/makepackage.sh Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Tue Nov 3 22:40:22 2009 @@ -1,463 +1,341 @@ #!/bin/bash # # ReactOS Build Environment for Unix-based Operating Systems - Builder Tool for the Base package -# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <colin(a)reactos.org> # partially based on the BuildMingwCross script (http://www.mingw.org/MinGWiki/index.php/BuildMingwCross) # # Released under GNU GPL v2 or any later version. -# Constants -ROSBE_VERSION="1.4.2" -TARGET_ARCH="i386" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2" -DEFAULT_INSTALL_DIR="/usr/local/RosBE" -NEEDED_TOOLS="bison flex gcc g++ grep makeinfo" # GNU Make has a special check + +# RosBE Setup Variables +rs_host_cflags="-pipe -fno-common -O3 -march=pentium3 -mfpmath=sse" +rs_needed_tools="bison flex gcc g++ grep makeinfo" # GNU Make has a special check +rs_target="mingw32" +rs_target_cflags="-pipe -gstabs+ -O3 -march=pentium -mtune=i686" # Get the absolute path to the script directory cd `dirname $0` -SCRIPTDIR="$PWD" -SOURCEDIR="$SCRIPTDIR/sources" - -source "$SCRIPTDIR/scripts/rosbelibrary.sh" +rs_scriptdir="$PWD" +rs_workdir="$rs_scriptdir/sources" +rs_sourcedir="$rs_scriptdir/sources" + +# RosBE-Unix Constants +DEFAULT_INSTALL_DIR="/usr/local/RosBE" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5" +ROSBE_VERSION="1.5" +TARGET_ARCH="i386" + +source "$rs_scriptdir/scripts/rosbelibrary.sh" +source "$rs_scriptdir/scripts/setuplibrary.sh" echo "*******************************************************************************" echo "* ReactOS Build Environment for Unix-based Operating Systems *" -echo "* Builder Tool for the Base package *" -echo "* by Colin Finck <mail(a)colinfinck.de> *" +echo "* Builder Tool for the Base package *" +echo "* by Colin Finck <colin(a)reactos.org> *" echo "* *" -echo "* Version $ROSBE_VERSION *" +echo "* Version $ROSBE_VERSION *" echo "*******************************************************************************" echo -echo "This script compiles and installs a complete Build Environment for building ReactOS." -echo - -setup_check_requirements - -# Select the installation directory -boldmsg "Installation Directory" - -echo "In which directory do you want to install it?" -echo "Enter the path to the directory here or simply press ENTER to install it into the default directory." - -# RosBE-Unix 1.4 switched from /usr/RosBE to /usr/local/RosBE, show a message for the people who might want to update -if [ -f "/usr/RosBE/RosBE-Version" ]; then +echo "This script compiles and installs a complete Build Environment for building" +echo "ReactOS." +echo + +if [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "--help" ]; then + echo "Syntax: ./RosBE-Builder.sh [installdir]" echo - redmsg "Warning: " "-n" - echo "The default installation path /usr/RosBE was changed to /usr/local/RosBE starting with version 1.4." - echo "If you want to update a previous installation, enter /usr/RosBE here." -fi - -createdir=false -installdir="" + echo " installdir - Optional parameter to specify an installation directory. If you" + echo " do this, the script will check whether this directory does not" + echo " yet exist and in this case, it will perform an unattended" + echo " installation to this directory." + echo + echo "Usually, you just call the script without any parameters and it will guide you" + echo "through all possible installation options." + exit 0 +fi + +check_root +rs_check_requirements + reinstall=false update=false -while [ "$installdir" = "" ]; do - read -p "[$DEFAULT_INSTALL_DIR] " installdir - echo - - if [ "$installdir" = "" ]; then - installdir=$DEFAULT_INSTALL_DIR - fi - - # Make sure we have the absolute path to the installation directory - installdir=`eval echo $installdir` - - # Check if the installation directory already exists - if [ -f "$installdir" ]; then - echo "The directory \"$installdir\" is a file! Please enter another directory!" +# Select the installation directory +rs_boldmsg "Installation Directory" + +if [ "$1" = "" ]; then + installdir="" + + echo "In which directory do you want to install it?" + echo "Enter the path to the directory here or simply press ENTER to install it into the default directory." + + while [ "$installdir" = "" ]; do + read -p "[$DEFAULT_INSTALL_DIR] " installdir echo - installdir="" - - elif [ -d "$installdir" ]; then - # Check if the directory is empty - if [ ! "`ls $installdir`" = "" ]; then - if [ -f "$installdir/RosBE-Version" ]; then - # Allow the user to update an already installed RosBE version - choice="" - installed_version=`cat "$installdir/RosBE-Version"` - - for known_version in $KNOWN_ROSBE_VERSIONS; do - if [ "$known_version" = "$installed_version" ]; then - if [ "$installed_version" = "$ROSBE_VERSION" ]; then - echo "The current version of the Build Environment is already installed in this directory." - echo "Please choose one of the following options:" + + if [ "$installdir" = "" ]; then + installdir=$DEFAULT_INSTALL_DIR + fi + + # Make sure we have the absolute path to the installation directory + installdir=`eval echo $installdir` + + # Check if the installation directory already exists + if [ -f "$installdir" ]; then + echo "The directory \"$installdir\" is a file! Please enter another directory!" + echo + installdir="" + elif [ -d "$installdir" ]; then + # Check if the directory is empty + if [ ! "`ls $installdir`" = "" ]; then + if [ -f "$installdir/RosBE-Version" ]; then + # Allow the user to update an already installed RosBE version + installed_version=`cat "$installdir/RosBE-Version"` + + for known_version in $KNOWN_ROSBE_VERSIONS; do + if [ "$known_version" = "$installed_version" ]; then + if [ "$installed_version" = "$ROSBE_VERSION" ]; then + echo "The current version of the Build Environment is already installed in this directory." + echo "Please choose one of the following options:" + echo + echo " (R)einstall all components of the Build Environment" + echo " (C)hoose a different installation directory" + echo + + rs_showchoice "R" "r R c C" + else + echo "An older version of the Build Environment has been found in this directory." + echo "Please choose one of the following options:" + echo + echo " (U)pdate/(r)einstall the Build Environment" + echo " (C)hoose a different installation directory" + echo + + rs_showchoice "U" "u U r R c C" + fi + echo - echo " (R)einstall all components of the Build Environment" - echo " (C)hoose a different installation directory" - echo - - showchoice "R" "r R c C" - else - echo "An older version of the Build Environment has been found in this directory." - echo "Please choose one of the following options:" - echo - echo " (U)pdate the existing Build Environment" - echo " (R)einstall all components of the Build Environment" - echo " (C)hoose a different installation directory" - echo - - showchoice "U" "u U r R c C" + break fi - - echo - break - fi - done - - case "$choice" in - "U"|"u") - update=true - ;; - "R"|"r") - reinstall=true - ;; - "C"|"c") + done + + case "$choice" in + "U"|"u") + # We don't support update in this version due to lots of changes + # To reenable updating, change this to "update=true" + reinstall=true + ;; + "R"|"r") + reinstall=true + ;; + "C"|"c") + echo "Please enter another directory!" + installdir="" + ;; + esac + else + echo "The directory \"$installdir\" is not empty. Do you really want to continue? (yes/no)" + read -p "[no] " answer + echo + + if [ "$answer" != "yes" ]; then echo "Please enter another directory!" installdir="" - ;; - esac - else - echo "The directory \"$installdir\" is not empty. Do you really want to continue? (yes/no)" - read -p "[no] " answer - echo - - if [ "$answer" != "yes" ]; then - echo "Please enter another directory!" - installdir="" + fi fi fi - fi - - else - createdir=true - echo "The directory \"$installdir\" does not exist. The installation script will create it for you." - echo - fi -done - -# Ready to start -boldmsg "Ready to start" - -echo "Ready to build and install the ReactOS Build Environment." -echo "Press any key to continue or Ctrl+C to exit." -read - -if $update; then - setvalues=false - - process_cpucount=false - process_mingwruntime=false - process_w32api=false - process_binutils=false - process_gcc=false - process_make=false - process_nasm=false - process_buildtime=false - process_scut=false - process_getincludes=false - - # Logic behind this update part: - # - KNOWN_ROSBE_VERSIONS contains all versions from the oldest to the newest one (in this order!) - # - setvalues will be set to true, when the iterator reaches the installed version - # - Then the processing settings of the installed and the later versions will be applied. - # (i.e. if gcc changed from 0.3.7 to 0.3.8, but not from 0.3.6 to 0.3.7, the gcc build will correctly be reprocessed - # if the user has an installed RosBE 0.3.6 and wants to update to 0.3.8) - for known_version in $KNOWN_ROSBE_VERSIONS; do - if [ "$known_version" = "$installed_version" ]; then - setvalues=true - fi - - if $setvalues; then - case "$known_version" in - "0.3.6") - # Updated components from 0.3.6 to 1.1 - process_cpucount=true - process_mingwruntime=true - process_w32api=true - process_binutils=true - process_gcc=true - process_make=true - process_nasm=true - process_scut=true - ;; - - "1.1") - # Updated components from 1.1 to 1.4 - process_binutils=true - process_nasm=true - - # Reorganize the existing files - mkdir -p "$installdir/$TARGET_ARCH/bin" - mv "$installdir/bin/mingw32-"* "$installdir/$TARGET_ARCH/bin" - mv "$installdir/$TARGET_ARCH/bin/mingw32-make" "$installdir/bin/make" - mv "$installdir/bin/nasm" "$installdir/$TARGET_ARCH/bin/nasm" - mv "$installdir/bin/ndisasm" "$installdir/$TARGET_ARCH/bin/ndisasm" - mv "$installdir/include" "$installdir/$TARGET_ARCH/include" - mv "$installdir/lib" "$installdir/$TARGET_ARCH/lib" - mv "$installdir/libexec" "$installdir/$TARGET_ARCH/libexec" - mv "$installdir/mingw32" "$installdir/$TARGET_ARCH/mingw32" - ;; - - "1.4") - # Updated components from 1.4 to 1.4.2 - process_getincludes=true - esac + else + echo "The directory \"$installdir\" does not exist. The installation script will create it for you." + echo fi done + + # Ready to start + rs_boldmsg "Ready to start" + + echo "Ready to build and install the ReactOS Build Environment." + echo "Press any key to continue or Ctrl+C to exit." + read else - process_cpucount=true - process_mingwruntime=true - process_w32api=true - process_binutils=true - process_gcc=true - process_make=true - process_nasm=true - process_buildtime=true - process_scut=true - process_getincludes=true - - # Delete the contents of the current installation directory if we're reinstalling + installdir=`eval echo $1` + + if [ -e "$installdir" ]; then + rs_redmsg "Installation directory \"$installdir\" already exists, aborted!" + exit 1 + fi + + echo "Using \"$installdir\"" + echo +fi + +if $update; then + # No update supported for RosBE-Unix 1.5 due to lots of changes. + # Add this part back from older versions once we need to update again. + exit 1 +else + rs_process_binutils=true + rs_process_buildtime=true + rs_process_cpucount=true + rs_process_gcc=true + rs_process_getincludes=true + rs_process_gmp=true + rs_process_make=true + rs_process_mingw_runtime_dev=true + rs_process_mpfr=true + rs_process_nasm=true + rs_process_scut=true + rs_process_w32api=true + if $reinstall; then - rm -rf "$installdir/"* + # Empty the directory if we're reinstalling + rs_mkdir_empty "$installdir" + else + # Otherwise just create the directory if it does not exist + rs_mkdir_if_not_exists "$installdir" fi - - # Create the directory if necessary - if $createdir; then - if ! mkdir -p "$installdir"; then - redmsg "Could not create \"$installdir\", aborted!" - exit 1 - fi - fi -fi - -# Test if the installation directory is writeable +fi + +# Test if the installation directory is writable if [ ! -w "$installdir" ]; then - redmsg "Installation directory \"$installdir\" is not writeable, aborted!" + rs_redmsg "Installation directory \"$installdir\" is not writable, aborted!" exit 1 fi -# -# Build the tools -# -boldmsg "Building..." -mkdir "$installdir/bin" >& /dev/null -mkdir -p "$installdir/$TARGET_ARCH/mingw32" >& /dev/null - -# For compiling gcc, it needs to access the already compiled mingw32 binutils -PATH="$installdir/$TARGET_ARCH/bin:$PATH" - -# cpucount -if $process_cpucount; then - echo -n "Compiling cpucount... " - gcc -s -o "$installdir/bin/cpucount" "$SCRIPTDIR/tools/cpucount.c" - setup_check_run -fi - -CPUCOUNT=`$installdir/bin/cpucount -x1` -cd "$installdir/$TARGET_ARCH/mingw32" - -# mingw-runtime -if $process_mingwruntime; then - echo -n "Extracting mingw-runtime... " - tar -xjf "$SOURCEDIR/mingw-runtime.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" -fi - -# w32api -if $process_w32api; then - echo -n "Extracting w32api... " - tar -xjf "$SOURCEDIR/w32api.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" -fi - -cd "$SOURCEDIR" - -# binutils -if $process_binutils; then - rm -rf "binutils" - rm -rf "binutils-build" - - echo -n "Extracting binutils... " - tar -xjf "binutils.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" - - echo -n "Configuring binutils... " - mkdir "binutils-build" - cd "binutils-build" - ../binutils/configure --prefix="$installdir/$TARGET_ARCH" --target=mingw32 --disable-nls --with-gcc \ - --with-gnu-as --with-gnu-ld --disable-shared >& "$SCRIPTDIR/configure.log" - setup_check_run "configure" - - echo -n "Building binutils... " - $makecmd -j $CPUCOUNT CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Installing binutils... " - $makecmd install >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Cleaning up binutils... " - cd "$SOURCEDIR" - rm -rf "binutils-build" - rm -rf "binutils" - setup_check_run -fi - -# gcc -if $process_gcc; then - rm -rf "gcc" - rm -rf "gcc-build" - - echo -n "Extracting gcc... " - tar -xjf "gcc.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" - - echo -n "Configuring gcc... " - mkdir "gcc-build" - cd "gcc-build" - ../gcc/configure --prefix="$installdir/$TARGET_ARCH" --target=mingw32 \ - --with-headers="$installdir/$TARGET_ARCH/mingw32/include"--with-gcc --with-gnu-ld \ - --with-gnu-as --enable-languages=c,c++ --enable-checking=release \ - --enable-threads=win32 --disable-win32-registry --disable-nls \ - --disable-shared >& "$SCRIPTDIR/configure.log" - setup_check_run "configure" - - echo -n "Building gcc... " - $makecmd -j $CPUCOUNT CFLAGS="-O2" CXXFLAGS="-O2" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Installing gcc... " - $makecmd install >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Cleaning up gcc... " - cd "$SOURCEDIR" - rm -rf "gcc-build" - rm -rf "gcc" - setup_check_run -fi - -# make -if $process_make; then - rm -rf "make" - rm -rf "make-build" - - echo -n "Extracting make... " - tar -xjf "make.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" - - echo -n "Configuring make... " - mkdir "make-build" - cd "make-build" - ../make/configure --prefix="$installdir" --disable-dependency-tracking \ - --disable-nls --enable-case-insensitive-file-system \ - --disable-job-server --disable-rpath >& "$SCRIPTDIR/configure.log" - setup_check_run "configure" - - echo -n "Building make... " - $makecmd -j $CPUCOUNT CFLAGS="-s -O2 -mms-bitfields" >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Installing make... " - $makecmd install >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Cleaning up make... " - cd "$SOURCEDIR" - rm -rf "make-build" - rm -rf "make" - setup_check_run -fi - -# nasm -if $process_nasm; then - rm -rf "nasm" - - echo -n "Extracting nasm... " - tar -xjf "nasm.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" - - echo -n "Configuring nasm... " +rs_prefixdir="$installdir/$TARGET_ARCH" +rs_supportprefixdir="$installdir/support" +rs_mkdir_if_not_exists "$installdir/bin" + + +##### BEGIN almost shared buildtoolchain/RosBE-Unix building part ############# +rs_boldmsg "Building..." + +rs_mkdir_if_not_exists "$rs_prefixdir/$rs_target" +rs_mkdir_if_not_exists "$rs_supportprefixdir" + +rs_extract_module "mingw_runtime_dev" "$rs_prefixdir/$rs_target" +rs_extract_module "w32api" "$rs_prefixdir/$rs_target" + +if $rs_process_buildtime; then + rs_do_command gcc -s -o "$installdir/bin/buildtime" "$rs_scriptdir/tools/buildtime.c" +fi + +if $rs_process_cpucount; then + rs_do_command gcc -s -o "$installdir/bin/cpucount" "$rs_scriptdir/tools/cpucount.c" +fi + +rs_cpucount=`$installdir/bin/cpucount -x1` + +if $rs_process_getincludes; then + rs_do_command gcc -s -o "$installdir/bin/getincludes" "$rs_scriptdir/tools/getincludes.c" +fi + +if $rs_process_scut; then + rs_do_command gcc -s -o "$installdir/bin/scut" "$rs_scriptdir/tools/scut.c" +fi + +if rs_prepare_module "gmp"; then + export CFLAGS="$rs_host_cflags" + + rs_do_command ../gmp/configure ABI=32 --prefix="$rs_supportprefixdir" --disable-shared + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd check + rs_do_command $rs_makecmd install + rs_clean_module "gmp" + + export CFLAGS="" +fi + +if rs_prepare_module "mpfr"; then + export CFLAGS="$rs_host_cflags" + + rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --with-gmp="$rs_supportprefixdir" --disable-shared + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd check + rs_do_command $rs_makecmd install + rs_clean_module "mpfr" + + export CFLAGS="" +fi + +if rs_prepare_module "binutils"; then + # At least the GCC 4.4.1 in Ubuntu 9.10 incorrectly warns about a potentially uninitialized variable, so don't count this as an error. + export CFLAGS="$rs_host_cflags -Wno-error=uninitialized" + + rs_do_command ../binutils/configure --prefix="$rs_prefixdir" --target="$rs_target" --disable-nls + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd install + rs_clean_module "binutils" + + export CFLAGS="" +fi + +if rs_prepare_module "gcc"; then + export CFLAGS="$rs_host_cflags" + export CFLAGS_FOR_TARGET="$rs_target_cflags" + export CXXFLAGS_FOR_TARGET="$rs_target_cflags" + + rs_do_command ../gcc/configure --prefix="$rs_prefixdir" --target="$rs_target" --with-gmp="$rs_supportprefixdir" --with-mpfr="$rs_supportprefixdir" --enable-languages=c,c++ --enable-checking=release --enable-version-specific-runtime-libs --enable-threads=win32 --disable-win32-registry --disable-shared --disable-nls + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd install + rs_clean_module "gcc" + + export CFLAGS="" + export CFLAGS_FOR_TARGET="" + export CXXFLAGS_FOR_TARGET="" +fi + +if rs_prepare_module "make"; then + export CFLAGS="$rs_host_cflags" + + rs_do_command ../make/configure --prefix="$installdir" --disable-dependency-tracking --disable-nls --enable-case-insensitive-file-system --disable-job-server --disable-rpath + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd install + rs_clean_module "make" + + export CFLAGS="" +fi + +# NASM doesn't compile in a dedicated build directory, so just extract it +if rs_extract_module "nasm" "$rs_workdir"; then + export CFLAGS="$rs_host_cflags" + cd "nasm" - ./configure --prefix="$installdir/$TARGET_ARCH" >& "$SCRIPTDIR/configure.log" - setup_check_run "configure" - - echo -n "Building nasm... " - $makecmd -j $CPUCOUNT >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Installing nasm... " - $makecmd install >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Cleaning up nasm... " - cd "$SOURCEDIR" - rm -rf "nasm" - setup_check_run + rs_do_command ./configure --prefix="$rs_prefixdir" + rs_do_command $rs_makecmd -j $rs_cpucount + rs_do_command $rs_makecmd install + rs_clean_module "nasm" + + export CFLAGS="" fi # Final actions echo -boldmsg "Final actions" - -if [ "$installdir" = "/usr/RosBE" ] && $update; then - # Changed default installation directory starting with RosBE-Unix 1.4 - echo "Do you want to move /usr/RosBE to /usr/local/RosBE? (yes/no)" - read -p "[yes] " answer - - if [ "$answer" = "" ] || [ "$answer" = "yes" ]; then - mv "/usr/RosBE" "/usr/local/RosBE" - installdir="/usr/local/RosBE" - fi -fi - -if $process_buildtime; then - echo -n "Compiling buildtime... " - gcc -s -o "$installdir/bin/buildtime" "$SCRIPTDIR/tools/buildtime.c" - setup_check_run -fi - -if $process_scut; then - echo -n "Compiling scut... " - gcc -s -o "$installdir/bin/scut" "$SCRIPTDIR/tools/scut.c" - setup_check_run -fi - -if $process_getincludes; then - echo -n "Compiling getincludes... " - gcc -s -o "$installdir/bin/getincludes" "$SCRIPTDIR/tools/getincludes.c" - setup_check_run -fi - -echo -n "Removing unneeded files... " -rm -rf "$installdir/share" -rm -rf "$installdir/$TARGET_ARCH/mingw32/sys-include" -rm -rf "$installdir/$TARGET_ARCH/info" -rm -rf "$installdir/$TARGET_ARCH/man" -rm -rf "$installdir/$TARGET_ARCH/share" -setup_check_run - -echo -n "Removing debugging symbols... " -ls "$installdir/$TARGET_ARCH/bin/"* "$installdir/$TARGET_ARCH/mingw32/bin/"* | grep -v "gccbug" | -while read file; do - strip "$file" -done -setup_check_run - -echo -n "Copying scripts... " -cp -R "$SCRIPTDIR/scripts/"* "$installdir" -setup_check_run - -echo -n "Writing version... " +rs_boldmsg "Final actions" +cd "$installdir" + +echo "Removing unneeded files..." +rm -rf share +rm -rf $rs_prefixdir/include $rs_prefixdir/info $rs_prefixdir/man $rs_prefixdir/share +rm -f $rs_prefixdir/lib/* >& /dev/null + +# Keep the "include" and "lib" directories of the support files in case a subsequent RosBE-Unix package needs them +rm -rf $rs_supportprefixdir/info $rs_supportprefixdir/share + +echo "Removing debugging symbols..." +find -executable -type f -exec strip -s {} ";" >& /dev/null +##### END almost shared buildtoolchain/RosBE-Unix building part ############### + + +echo "Copying scripts..." +cp -R "$rs_scriptdir/scripts/"* "$installdir" + +echo "Writing version..." echo "$ROSBE_VERSION" > "$installdir/RosBE-Version" -setup_check_run echo # Finish -boldmsg "Finished successfully!" +rs_boldmsg "Finished successfully!" echo "To create a shortcut to the Build Environment on the Desktop, please switch back to your" echo "normal User Account (I assume you ran this script as \"root\")." echo "Then execute the following command:" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh [iso-8859-1] Tue Nov 3 22:40:22 2009 @@ -2,7 +2,7 @@ # # Script for initializing RosBE # Part of RosBE for Unix-based Operating Systems -# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2009 Colin Finck <colin(a)reactos.org> # # Released under GNU GPL v2 or any later version. @@ -57,9 +57,9 @@ # Display banner echo "*******************************************************************************" echo "* ReactOS Build Environment for Unix-based Operating Systems *" -echo "* by Colin Finck <mail(a)colinfinck.de> *" +echo "* by Colin Finck <colin(a)reactos.org> *" echo "* *" -echo "* Version $_ROSBE_VERSION *" +echo "* Version $_ROSBE_VERSION *" echo "*******************************************************************************" echo echo "For a list of all included commands, type: \"help\"" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/createshortcut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/createshortcut.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/createshortcut.sh [iso-8859-1] Tue Nov 3 22:40:22 2009 @@ -21,7 +21,7 @@ ROSBE_VERSION=`cat "$SCRIPTDIR/RosBE-Version"` # Select the source directory -boldmsg "ReactOS Source Directory" +rs_boldmsg "ReactOS Source Directory" echo "Enter the directory where the ReactOS sources are located." echo "This directory will become the current directory, when you start the Build Environment." @@ -42,7 +42,7 @@ done # Select the shortcut directory -boldmsg "Shortcut Directory" +rs_boldmsg "Shortcut Directory" echo "In which directory do you want to create the shortcut?" echo "Enter the path to the directory here or simply press ENTER to install it into the Desktop directory of the current user." @@ -62,7 +62,7 @@ done # Create the shortcut -boldmsg "Create Shortcut" +rs_boldmsg "Create Shortcut" echo -n "Creating shortcut... " shortcut="$shortcutdir/ReactOS Build Environment.desktop" @@ -76,4 +76,4 @@ echo "Exec=bash \"$SCRIPTDIR/RosBE.sh\" \"$sourcedir\"" >> "$shortcut" echo "Terminal=true" >> "$shortcut" -greenmsg "OK" +rs_greenmsg "OK" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/rosbelibrary.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/rosbelibrary.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/rosbelibrary.sh [iso-8859-1] Tue Nov 3 22:40:22 2009 @@ -4,67 +4,11 @@ # # Released under GNU GPL v2 or any later version. -# Print a message in a bold font -# Parameter 1: The message -# Parameter 2: Optional additional parameters for "echo" -boldmsg() -{ - echo -e $2 "\e[1m$1\e[0m" -} - -# Print a message in green color -# Parameter 1: The message -# Parameter 2: Optional additional parameters for "echo" -greenmsg() -{ - echo -e $2 "\e[32m$1\e[0m" -} - -# Print a message in red color -# Parameter 1: The message -# Parameter 2: Optional additional parameters for "echo" -redmsg() -{ - echo -e $2 "\e[31m$1\e[0m" -} - -# Allow a choice between several options -# If a valid choice was done, the result is stored in $choice -# Parameter 1 - The default value -# Parameter 2 - All possible values -showchoice() -{ - default_value="$1" - valid_choices="$2" - - breakloop=false - choice="" - - while true; do - read -p "Your choice [$default_value]: " choice - - if [ "$choice" = "" ]; then - choice="$default_value" - break - fi - - for valid_choice in $valid_choices; do - if [ "$choice" = "$valid_choice" ]; then - breakloop=true - break - fi - done - - if $breakloop; then - break - fi - done -} - -# Change the _ROSBE_ARCH variable appropriately +# Check whether the given architecture is supported and if so, change the _ROSBE_ARCH variable appropriately +# Parameter 1: The architecture to set change_architecture() { - new_arch="$1" + local new_arch="$1" if [ -f "$_ROSBE_ROSSCRIPTDIR/$new_arch/version.sh" ]; then # Architecture parameter seems valid @@ -78,24 +22,18 @@ export _ROSBE_ARCH } -# Set the PATH variable properly for the specified architecture -set_path_variable() +# Check whether we're running as root and warn the user in case we don't +check_root() { - # Set the PATH - PATH="$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/bin:$_ROSBE_ROSSCRIPTDIR/bin:$_ROSBE_OLDPATH" -} - -# Check for several requirements, which need to be met in order to run the installation script properly -setup_check_requirements() -{ - # Check whether we're running as root if [ ! "`whoami`" = "root" ]; then - boldmsg "User is not \"root\"" + rs_boldmsg "User is not \"root\"" echo "The default installation path for the Build Environment is \"$DEFAULT_INSTALL_DIR\"." echo "Therefore it is recommended to run this script as the \"root\" user. Otherwise you probably cannot create the necessary directories." echo "An alternative is to specify another installation directory at the installation process." echo "Do you really want to continue? (yes/no)" + + local answer read -p "[no] " answer if [ "$answer" = "yes" ]; then @@ -104,84 +42,11 @@ exit 1 fi fi - - # Test if the script directory is writeable - if [ ! -w "$SCRIPTDIR" ]; then - redmsg "The script directory \"$SCRIPTDIR\" is not writeable, aborted!" - exit 1 - fi - - # Test if the script directory contains spaces - case "$SCRIPTDIR" in - *" "*) - redmsg "The script directory \"$SCRIPTDIR\" contains spaces!" - redmsg "Therefore some build tools cannot be compiled properly." - echo - redmsg "Please move \"$SCRIPTDIR\" to a directory, which does not contain spaces." - - exit 1;; - esac - - # Check if all necessary tools exist - boldmsg "Checking for the needed tools..." - - toolmissing=false - for tool in $NEEDED_TOOLS; do - echo -n "Checking for $tool... " - - if which "$tool" >& /dev/null; then - greenmsg "OK" - else - redmsg "MISSING" - toolmissing=true - fi - done - - # Special check for GNU Make - # For example FreeBSD's "make" is not GNU Make, so we have to define a variable - echo -n "Checking for GNU Make... " - - if make -v 2>&1 | grep "GNU Make" >& /dev/null; then - makecmd="make" - greenmsg "OK" - elif gmake -v 2>&1 | grep "GNU Make" >& /dev/null; then - makecmd="gmake" - greenmsg "OK" - else - redmsg "MISSING" - toolmissing=true - fi - - if $toolmissing; then - echo "At least one needed tool is missing, aborted!" - exit 1 - fi - - echo } -# Check whether the previous command finished with errorlevel 0 -# If it did so, print a green "OK" and delete the debug logfile for the command. -# If that wasn't the case, print a red "FAILED" and give information about the debug logfile. -setup_check_run() +# Set the PATH variable properly for the specified architecture +set_path_variable() { - if [ $? -ne 0 ]; then - redmsg "FAILED" - - if [ "$1" = "" ]; then - echo "If you did not do something wrong, please contact the ReactOS Team." - else - echo "Please take a look at the log file \"$SCRIPTDIR/$1.log\"" - echo "If you did not do something wrong, please save the log file and contact the ReactOS Team." - fi - - echo "Aborted!" - exit 1 - else - greenmsg "OK" - - if [ "$1" != "" ]; then - rm "$SCRIPTDIR/$1.log" - fi - fi + # Set the PATH + PATH="$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/bin:$_ROSBE_ROSSCRIPTDIR/bin:$_ROSBE_OLDPATH" } Added: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh [iso-8859-1] Tue Nov 3 22:40:22 2009 @@ -1,0 +1,230 @@ +############################################################################### +# Shared setup functions for RosBE-Windows' buildtoolchain and RosBE-Unix +# Copyright 2009 Colin Finck <colin(a)reactos.org> +# +# Released under GNU GPL v2 or any later version. +############################################################################### +# Conventions: +# - Prepend all functions of this library with "rs_" (RosBE Setup) +# - Also prepend all variables used here and variables which are shared +# between buildtoolchain and RosBE-Unix and are used in conjunction with +# these functions in the calling script with "rs_" +############################################################################### + + +# Print a message in a bold font +# Parameter 1: The message +# Parameter 2: Optional additional parameters for "echo" +rs_boldmsg() +{ + echo -e $2 "\e[1m$1\e[0m" +} + +# Check for several requirements, which need to be met in order to run the installation script properly +rs_check_requirements() +{ + # Test if the script directory is writable + if [ ! -w "$rs_scriptdir" ]; then + rs_redmsg "The script directory \"$rs_scriptdir\" is not writable, aborted!" + exit 1 + fi + + # Test if the script directory contains spaces + case "$rs_scriptdir" in + *" "*) + rs_redmsg "The script directory \"$rs_scriptdir\" contains spaces!" + rs_redmsg "Therefore some build tools cannot be compiled properly." + echo + rs_redmsg "Please move \"$rs_scriptdir\" to a directory, which does not contain spaces." + + exit 1;; + esac + + # Check if all necessary tools exist + rs_boldmsg "Checking for the needed tools..." + + local toolmissing=false + for tool in $rs_needed_tools; do + echo -n "Checking for $tool... " + + if which "$tool" >& /dev/null; then + rs_greenmsg "OK" + else + rs_redmsg "MISSING" + toolmissing=true + fi + done + + # Special check for GNU Make + # For example FreeBSD's "make" is not GNU Make, so we have to define a variable + echo -n "Checking for GNU Make... " + + local app + local checkapps="make gmake" + rs_makecmd="" + + for app in $checkapps; do + if $app -v 2>&1 | grep "GNU Make" >& /dev/null; then + rs_makecmd="$app" + rs_greenmsg "OK" + fi + done + + if [ "$rs_makecmd" = "" ]; then + rs_redmsg "MISSING" + toolmissing=true + fi + + + if $toolmissing; then + echo "At least one needed tool is missing, aborted!" + exit 1 + fi + + echo +} + +# Check whether the previous command finished with errorlevel 0 +# If it did so, print a green "OK" and delete the debug logfile for the command. +# If that wasn't the case, print a red "FAILED" and give information about the debug logfile. +rs_check_run() +{ + if [ $? -ne 0 ]; then + rs_redmsg "FAILED" + echo "Please take a look at the log file \"$rs_workdir/build.log\"" + echo "If you did not do something wrong, please save the log file and contact the ReactOS Team." + + echo "Aborted!" + exit 1 + else + rs_greenmsg "OK" + rm "$rs_workdir/build.log" + fi +} + +# Cleans a module prepared with rs_prepare_module. +# Parameter 1: The module name +rs_clean_module() +{ + echo "Cleaning up $1..." + cd "$rs_workdir" + rm -rf "$1-build" + rm -rf "$1" +} + +# Executes a building command and checks whether it succeeded. +# Terminates the building process in case of failure. +# Parameters: The command to execute including parameters +rs_do_command() +{ + echo -n "Running \"$*\"... " + $* >& "$rs_workdir/build.log" + rs_check_run +} + +# Checks whether the given module needs to be processed and if so, extracts it. +# Returns 0 if it needs to be processed, otherwise 1. +# Parameter 1: The module name +# Parameter 2: The directory to extract the module to +rs_extract_module() +{ + local module=$1 + local target_dir=$2 + + if ! `eval echo \\$rs_process_$module`; then + return 1 + fi + + cd "$target_dir" + + echo -n "Extracting $module... " + tar -xjf "$rs_sourcedir/$module.tar.bz2" >& "$rs_workdir/build.log" + rs_check_run + + return 0 +} + +# Print a message in green color +# Parameter 1: The message +# Parameter 2: Optional additional parameters for "echo" +rs_greenmsg() +{ + echo -e $2 "\e[32m$1\e[0m" +} + +# Creates the given directory if it does not exist and cleans it if it does. +# Parameter 1: The directory +rs_mkdir_empty() +{ + if [ -d "$1" ]; then + rm -rf "$1" + fi + + mkdir -p "$1" +} + +# Creates a directory if it does not exist. +# Parameter 1: The directory +rs_mkdir_if_not_exists() +{ + if ! [ -d "$1" ]; then + mkdir -p "$1" + fi +} + +# Checks whether the given module needs to be processed and if so, extracts it into a dedicated build directory +# Returns 0 if it needs to be built, otherwise 1. +# Parameter 1: The module name +rs_prepare_module() +{ + local module=$1 + + rm -rf "$rs_workdir/$module" + + if ! rs_extract_module "$module" "$rs_workdir"; then + return 1 + fi + + rm -rf "$module-build" + mkdir "$module-build" + cd "$module-build" + + return 0 +} + +# Print a message in red color +# Parameter 1: The message +# Parameter 2: Optional additional parameters for "echo" +rs_redmsg() +{ + echo -e $2 "\e[31m$1\e[0m" +} + +# Allow a choice between several options +# If a valid choice was done, the result is stored in $choice +# Parameter 1 - The default value +# Parameter 2 - All possible values +rs_showchoice() +{ + local default_value="$1" + local valid_choices="$2" + + local breakloop=false + choice="" + + while ! $breakloop; do + read -p "Your choice [$default_value]: " choice + + if [ "$choice" = "" ]; then + choice="$default_value" + break + fi + + for valid_choice in $valid_choices; do + if [ "$choice" = "$valid_choice" ]; then + breakloop=true + break + fi + done + done +} Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/version.sh [iso-8859-1] Tue Nov 3 22:40:22 2009 @@ -6,7 +6,7 @@ # # Released under GNU GPL v2 or any later version. -source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh" +source "$_ROSBE_ROSSCRIPTDIR/setuplibrary.sh" # Display RosBE version echo "This is the ReactOS Build Environment for Unix-based Operating Systems" @@ -14,10 +14,10 @@ echo # Environment Information -boldmsg "Environment Information" +rs_boldmsg "Environment Information" echo "Selected Target Architecture: $_ROSBE_ARCH" echo # Display tool versions -boldmsg "Build Tools" +rs_boldmsg "Build Tools" source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/version.sh" Modified: trunk/tools/RosBE/RosBE-Unix/makepackage.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/makepackage… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/makepackage.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/makepackage.sh [iso-8859-1] Tue Nov 3 22:40:22 2009 @@ -1,7 +1,7 @@ #!/bin/bash # # ReactOS Build Environment for Unix-based Operating Systems - Packaging tool for the Base package -# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# Copyright 2009 Colin Finck <colin(a)reactos.org> # # Released under GNU GPL v2 or any later version. @@ -61,7 +61,7 @@ case "$package_name" in "Base-i386") - sources+="make mingw-runtime nasm w32api" + sources+="gmp make mingw_runtime_dev mpfr nasm w32api" tools+="cpucount scut" esac @@ -82,16 +82,14 @@ # # The Process # -# Copy the directory, delete some stuff and set the permissions +# Copy the directory and delete some stuff echo "Copying the \"$package_name\" directory..." rm -rf "$full_package_name" cp -R "$package_name" "$full_package_name" -find "$full_package_name" -type d -name ".svn" | xargs rm -rf -find "$full_package_name" -type f -name "SVN-Readme.txt" | xargs rm +find "$full_package_name" -type d -name ".svn" -exec rm -rf {} ";" >& /dev/null +find "$full_package_name" -type f -name "SVN-Readme.txt" -exec rm {} ";" rm "$full_package_name/README.odt" - -find "$full_package_name" -type f -name "*.sh" | xargs chmod +x # Copy the shared tools for tool in $tools; do

1 0

[fireball] 43939: - Revert the mouse hwnd change for now, it was not intended for committing. This unregresses arwinss usability.
by fireball＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: fireball Date: Tue Nov 3 22:37:01 2009 New Revision: 43939 URL: http://svn.reactos.org/svn/reactos?rev=43939&view=rev Log: - Revert the mouse hwnd change for now, it was not intended for committing. This unregresses arwinss usability. Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Tue Nov 3 22:37:01 2009 @@ -189,9 +189,9 @@ GetCursorPos(&pt); } - hwnd = SwmGetWindowFromPoint(pt.x, pt.y); - - FIXME("hwnd %x\n", hwnd); + //hwnd = SwmGetWindowFromPoint(pt.x, pt.y); + + //FIXME("hwnd %x\n", hwnd); if (flags & MOUSEEVENTF_MOVE) {

1 0

[fireball] 43938: - Make desktop window clip siblings too.
by fireball＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: fireball Date: Tue Nov 3 22:28:21 2009 New Revision: 43938 URL: http://svn.reactos.org/svn/reactos?rev=43938&view=rev Log: - Make desktop window clip siblings too. Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Tue Nov 3 22:28:21 2009 @@ -179,7 +179,7 @@ } BackgroundWnd = CreateWindowW((LPCWSTR) DESKTOP_WINDOW_ATOM, L"", - WS_POPUP | WS_CLIPCHILDREN, + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0,

1 0

[fireball] 43937: - Merge 43934, 43935.
by fireball＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: fireball Date: Tue Nov 3 22:19:36 2009 New Revision: 43937 URL: http://svn.reactos.org/svn/reactos?rev=43937&view=rev Log: - Merge 43934, 43935. Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (contents, props changed) Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Tue Nov 3 22:19:36 2009 @@ -42,24 +42,19 @@ LRESULT CALLBACK DtbgWindowProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - switch(Msg) + PAINTSTRUCT PS; + HDC hDC; + + switch(Msg) { case WM_ERASEBKGND: + PaintDesktop((HDC)wParam); return 1; case WM_PAINT: { - PAINTSTRUCT PS; - RECT rc; - HDC hDC; - - if(GetUpdateRect(Wnd, &rc, FALSE) && - (hDC = BeginPaint(Wnd, &PS))) - { - // arwinss, commented out due to desktop flickering - //PaintDesktop(hDC); + if((hDC = BeginPaint(Wnd, &PS))) EndPaint(Wnd, &PS); - } return 0; } @@ -70,6 +65,9 @@ return (LRESULT) TRUE; case WM_CREATE: + return 0; + + case WM_CLOSE: return 0; case WM_NOTIFY: @@ -112,6 +110,9 @@ return 0; } } + + default: + return DefWindowProcW(Wnd, Msg, wParam, lParam); } return 0; Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Nov 3 22:19:36 2009 @@ -1,0 +1,2 @@ +/branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 +/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-43670,43934-43935

1 0

[janderwald] 43936: - Fix one more dsound_winetest dsound8 failure - Register IDirectSound8, IDirectSoundCapture8 with COM
by janderwald＠svn.reactos.org 03 Nov '09

03 Nov '09

Author: janderwald Date: Tue Nov 3 20:20:59 2009 New Revision: 43936 URL: http://svn.reactos.org/svn/reactos?rev=43936&view=rev Log: - Fix one more dsound_winetest dsound8 failure - Register IDirectSound8, IDirectSoundCapture8 with COM Modified: trunk/reactos/dll/directx/dsound_new/directsound.c trunk/reactos/dll/directx/dsound_new/dsound.c Modified: trunk/reactos/dll/directx/dsound_new/directsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dir… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/directsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/directsound.c [iso-8859-1] Tue Nov 3 20:20:59 2009 @@ -353,6 +353,14 @@ LPDIRECTSOUND8 iface, LPDWORD pdwCertified) { + LPCDirectSoundImpl This = (LPCDirectSoundImpl)CONTAINING_RECORD(iface, CDirectSoundImpl, lpVtbl); + + if (!This->bInitialized) + { + /* object not yet initialized */ + return DSERR_UNINITIALIZED; + } + UNIMPLEMENTED; return DS_CERTIFIED; } Modified: trunk/reactos/dll/directx/dsound_new/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/dsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/dsound.c [iso-8859-1] Tue Nov 3 20:20:59 2009 @@ -23,7 +23,15 @@ NewDirectSoundCapture }, { + &CLSID_DirectSoundCapture8, + NewDirectSoundCapture + }, + { &CLSID_DirectSound, + NewDirectSound + }, + { + &CLSID_DirectSound8, NewDirectSound }, {

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