Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 49961: [NDIS] - Add a missing spin lock release in a failure case - Fix incomplete copying of NDIS 5.1 miniport characteristics
by cgutman＠svn.reactos.org 06 Dec '10

06 Dec '10

Author: cgutman Date: Mon Dec 6 04:39:57 2010 New Revision: 49961 URL: http://svn.reactos.org/svn/reactos?rev=49961&view=rev Log: [NDIS] - Add a missing spin lock release in a failure case - Fix incomplete copying of NDIS 5.1 miniport characteristics Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Dec 6 04:39:57 2010 @@ -316,6 +316,7 @@ if (!LookAheadBuffer) { NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return; } @@ -2454,7 +2455,20 @@ break; case 0x05: - MinSize = sizeof(NDIS50_MINIPORT_CHARACTERISTICS); + switch (MiniportCharacteristics->MinorNdisVersion) + { + case 0x00: + MinSize = sizeof(NDIS50_MINIPORT_CHARACTERISTICS); + break; + + case 0x01: + MinSize = sizeof(NDIS51_MINIPORT_CHARACTERISTICS); + break; + + default: + NDIS_DbgPrint(MIN_TRACE, ("Bad 5.x minor characteristics version.\n")); + return NDIS_STATUS_BAD_VERSION; + } break; default: @@ -2531,8 +2545,6 @@ return NDIS_STATUS_BAD_CHARACTERISTICS; } } - - /* TODO: verify NDIS5 and NDIS5.1 */ RtlCopyMemory(&Miniport->MiniportCharacteristics, MiniportCharacteristics, MinSize);

1 0

[janderwald] 49960: [AUDIO-BRINGUP] - Implement determination of the channel count for source mixer lines
by janderwald＠svn.reactos.org 06 Dec '10

06 Dec '10

Author: janderwald Date: Mon Dec 6 02:15:33 2010 New Revision: 49960 URL: http://svn.reactos.org/svn/reactos?rev=49960&view=rev Log: [AUDIO-BRINGUP] - Implement determination of the channel count for source mixer lines Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Mon Dec 6 02:15:33 2010 @@ -490,6 +490,132 @@ } MIXER_STATUS +MMixerGetChannelCountEnhanced( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_INFO MixerInfo, + IN ULONG NodeId, + OUT PULONG MaxChannels) +{ + KSPROPERTY_DESCRIPTION Description; + PKSPROPERTY_DESCRIPTION NewDescription; + PKSPROPERTY_MEMBERSHEADER Header; + ULONG BytesReturned; + KSP_NODE Request; + MIXER_STATUS Status; + + /* try #1 obtain it via description */ + Request.NodeId = NodeId; + Request.Reserved = 0; + Request.Property.Set = KSPROPSETID_Audio; + Request.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY; + Request.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL; + + + /* get description */ + Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)&Description, sizeof(KSPROPERTY_DESCRIPTION), &BytesReturned); + if (Status == MM_STATUS_SUCCESS) + { + if (Description.DescriptionSize >= sizeof(KSPROPERTY_DESCRIPTION) + sizeof(KSPROPERTY_MEMBERSHEADER) && (Description.MembersListCount > 0)) + { + /* allocate new description */ + NewDescription = MixerContext->Alloc(Description.DescriptionSize); + + if (!NewDescription) + { + /* not enough memory */ + return MM_STATUS_NO_MEMORY; + } + + /* get description */ + Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)NewDescription, Description.DescriptionSize, &BytesReturned); + if (Status == MM_STATUS_SUCCESS) + { + /* get header */ + Header = (PKSPROPERTY_MEMBERSHEADER)(NewDescription + 1); + + if (Header->Flags & KSPROPERTY_MEMBER_FLAG_BASICSUPPORT_MULTICHANNEL) + { + /* found enhanced flag */ + ASSERT(Header->MembersCount > 1); + + /* store channel count */ + *MaxChannels = Header->MembersCount; + + /* free description */ + MixerContext->Free(NewDescription); + + /* done */ + return MM_STATUS_SUCCESS; + } + } + + /* free description */ + MixerContext->Free(NewDescription); + } + } + + /* failed to get channel count enhanced */ + return MM_STATUS_UNSUCCESSFUL; +} + +VOID +MMixerGetChannelCountLegacy( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_INFO MixerInfo, + IN ULONG NodeId, + OUT PULONG MaxChannels) +{ + ULONG BytesReturned; + MIXER_STATUS Status; + KSNODEPROPERTY_AUDIO_CHANNEL Channel; + LONG Volume; + + /* setup request */ + Channel.Reserved = 0; + Channel.NodeProperty.NodeId = NodeId; + Channel.NodeProperty.Reserved = 0; + Channel.NodeProperty.Property.Flags = KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY; + Channel.NodeProperty.Property.Set = KSPROPSETID_Audio; + Channel.Channel = 0; + Channel.NodeProperty.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL; + + do + { + /* get channel volume */ + Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Channel, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Volume, sizeof(LONG), &BytesReturned); + if (Status != MM_STATUS_SUCCESS) + break; + + /* increment channel count */ + Channel.Channel++; + + }while(TRUE); + + /* store channel count */ + *MaxChannels = Channel.Channel; + +} + +VOID +MMixerGetMaxChannelsForNode( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_INFO MixerInfo, + IN ULONG NodeId, + OUT PULONG MaxChannels) +{ + MIXER_STATUS Status; + + /* try to get it enhanced */ + Status = MMixerGetChannelCountEnhanced(MixerContext, MixerInfo, NodeId, MaxChannels); + + if (Status != MM_STATUS_SUCCESS) + { + /* get it old-fashioned way */ + MMixerGetChannelCountLegacy(MixerContext, MixerInfo, NodeId, MaxChannels); + } +} + +MIXER_STATUS MMixerAddMixerControlsToMixerLineByNodeIndexArray( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, @@ -500,6 +626,8 @@ { ULONG Index, Count, bReserved; MIXER_STATUS Status; + LPGUID NodeType; + ULONG MaxChannels; /* store nodes array */ DstLine->NodeIds = Nodes; @@ -529,6 +657,20 @@ #endif /* set node status as used */ MMixerSetTopologyNodeReserved(Topology, Nodes[Index]); + + /* query node type */ + NodeType = MMixerGetNodeTypeFromTopology(Topology, Nodes[Index]); + + if (IsEqualGUIDAligned(NodeType, &KSNODETYPE_VOLUME)) + { + /* calculate maximum channel count for node */ + MMixerGetMaxChannelsForNode(MixerContext, MixerInfo, Nodes[Index], &MaxChannels); + + DPRINT("NodeId %lu MaxChannels %lu Line %S Id %lu\n", Nodes[Index], MaxChannels, DstLine->Line.szName, DstLine->Line.dwLineID); + /* calculate maximum channels */ + DstLine->Line.cChannels = min(DstLine->Line.cChannels, MaxChannels); + } + /* now add the mixer control */ Status = MMixerAddMixerControl(MixerContext, MixerInfo, Topology, Nodes[Index], DstLine, &DstLine->LineControls[Count]);

1 0

[janderwald] 49959: [AUDIO-BRINGUP] - Add advanced flags of KSPROPERTY_MEMBERSHEADER
by janderwald＠svn.reactos.org 06 Dec '10

06 Dec '10

Author: janderwald Date: Mon Dec 6 01:43:55 2010 New Revision: 49959 URL: http://svn.reactos.org/svn/reactos?rev=49959&view=rev Log: [AUDIO-BRINGUP] - Add advanced flags of KSPROPERTY_MEMBERSHEADER Modified: branches/audio-bringup/include/psdk/ks.h Modified: branches/audio-bringup/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/psdk/ks.h… ============================================================================== --- branches/audio-bringup/include/psdk/ks.h [iso-8859-1] (original) +++ branches/audio-bringup/include/psdk/ks.h [iso-8859-1] Mon Dec 6 01:43:55 2010 @@ -1573,11 +1573,6 @@ Properties */ -#define KSPROPERTY_MEMBER_RANGES 0x00000001 -#define KSPROPERTY_MEMBER_STEPPEDRANGES 0x00000002 -#define KSPROPERTY_MEMBER_VALUES 0x00000003 -#define KSPROPERTY_MEMBER_FLAG_DEFAULT KSPROPERTY_MEMBER_RANGES - typedef struct { GUID PropertySet; @@ -1662,6 +1657,17 @@ KSPROPERTY_MEMBERSHEADER MembersHeader; const VOID* Members; } KSPROPERTY_MEMBERSLIST, *PKSPROPERTY_MEMBERSLIST; + +#define KSPROPERTY_MEMBER_RANGES 0x00000001 +#define KSPROPERTY_MEMBER_STEPPEDRANGES 0x00000002 +#define KSPROPERTY_MEMBER_VALUES 0x00000003 + +#define KSPROPERTY_MEMBER_FLAG_DEFAULT 0x00000001 +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define KSPROPERTY_MEMBER_FLAG_BASICSUPPORT_MULTICHANNEL 0x00000002 +#define KSPROPERTY_MEMBER_FLAG_BASICSUPPORT_UNIFORM 0x00000004 +#endif + typedef struct { KSIDENTIFIER PropTypeSet;

1 0

[janderwald] 49958: [AUDIO-BRINGUP] - Fix the famous node property handler bug, leading to lots of audio related crashes
by janderwald＠svn.reactos.org 06 Dec '10

06 Dec '10

Author: janderwald Date: Mon Dec 6 01:06:37 2010 New Revision: 49958 URL: http://svn.reactos.org/svn/reactos?rev=49958&view=rev Log: [AUDIO-BRINGUP] - Fix the famous node property handler bug, leading to lots of audio related crashes Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Mon Dec 6 01:06:37 2010 @@ -165,7 +165,7 @@ // get instance / value size InstanceSize = IoStack->Parameters.DeviceIoControl.InputBufferLength; - Instance = Data; + Instance = Request; ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength; // initialize property request @@ -273,18 +273,15 @@ if (PropertyRequest->PropertyItem && PropertyRequest->PropertyItem->Handler) { // now call the handler - UNICODE_STRING GuidBuffer; - RtlStringFromGUID(Property->Set, &GuidBuffer); - DPRINT1("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p PropertyItemFlags %lx PropertyItemId %lu\n", - PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize, - PropertyRequest->PropertyItem->Handler, PropertyRequest, PropertyRequest->PropertyItem->Flags, PropertyRequest->PropertyItem->Id); -#if 1 + //UNICODE_STRING GuidBuffer; + //RtlStringFromGUID(Property->Set, &GuidBuffer); + //DPRINT("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p PropertyItemFlags %lx PropertyItemId %lu\n", + // PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize, + // PropertyRequest->PropertyItem->Handler, PropertyRequest, PropertyRequest->PropertyItem->Flags, PropertyRequest->PropertyItem->Id); + Status = PropertyRequest->PropertyItem->Handler(PropertyRequest); - DPRINT1("Status %lx ValueSize %lu Information %lu\n", Status, PropertyRequest->ValueSize, Irp->IoStatus.Information); -#else - Status = STATUS_NOT_FOUND; -#endif - Irp->IoStatus.Information = PropertyRequest->ValueSize; + //DPRINT("Status %lx ValueSize %lu Information %lu\n", Status, PropertyRequest->ValueSize, Irp->IoStatus.Information); + Irp->IoStatus.Information = PropertyRequest->ValueSize; if (Status != STATUS_PENDING) {

1 0

[gadamopoulos] 49957: [win32k] -Amend to r41772. Allow PostMessage to handle DDE messages
by gadamopoulos＠svn.reactos.org 05 Dec '10

05 Dec '10

Author: gadamopoulos Date: Sun Dec 5 23:10:03 2010 New Revision: 49957 URL: http://svn.reactos.org/svn/reactos?rev=49957&view=rev Log: [win32k] -Amend to r41772. Allow PostMessage to handle DDE messages Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Dec 5 23:10:03 2010 @@ -977,10 +977,42 @@ LPARAM lParam ) { PTHREADINFO pti; - MSG Message; + MSG Message, KernelModeMsg; LARGE_INTEGER LargeTickCount; - - if (FindMsgMemory(Msg) != 0) + PMSGMEMORY MsgMemoryEntry; + + Message.hwnd = Wnd; + Message.message = Msg; + Message.wParam = wParam; + Message.lParam = lParam; + Message.pt = gpsi->ptCursor; + KeQueryTickCount(&LargeTickCount); + Message.time = MsqCalculateMessageTime(&LargeTickCount); + + MsgMemoryEntry = FindMsgMemory(Message.message); + + if( Msg >= WM_DDE_FIRST && Msg <= WM_DDE_LAST ) + { + NTSTATUS Status; + + Status = CopyMsgToKernelMem(&KernelModeMsg, &Message, MsgMemoryEntry); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + co_IntSendMessageNoWait(KernelModeMsg.hwnd, + KernelModeMsg.message, + KernelModeMsg.wParam, + KernelModeMsg.lParam); + + if(MsgMemoryEntry) + ExFreePool((PVOID) KernelModeMsg.lParam); + + return TRUE; + } + + if (MsgMemoryEntry) { SetLastWin32Error(ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -1035,20 +1067,13 @@ /* FIXME - last error code? */ return FALSE; } - + if (WM_QUIT == Msg) { MsqPostQuitMessage(Window->head.pti->MessageQueue, wParam); } else { - Message.hwnd = Wnd; - Message.message = Msg; - Message.wParam = wParam; - Message.lParam = lParam; - Message.pt = gpsi->ptCursor; - KeQueryTickCount(&LargeTickCount); - Message.time = MsqCalculateMessageTime(&LargeTickCount); MsqPostMessage(Window->head.pti->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); } }

1 0

[janderwald] 49956: [AUDIO-BRINGUP] - Remove installation of non-existant wdmaud / sysaudio / kmixer
by janderwald＠svn.reactos.org 05 Dec '10

05 Dec '10

Author: janderwald Date: Sun Dec 5 21:31:33 2010 New Revision: 49956 URL: http://svn.reactos.org/svn/reactos?rev=49956&view=rev Log: [AUDIO-BRINGUP] - Remove installation of non-existant wdmaud / sysaudio / kmixer Modified: branches/audio-bringup/dll/cpl/mmsys/mmsys.c branches/audio-bringup/media/inf/audio.inf Modified: branches/audio-bringup/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/cpl/mmsys/mms… ============================================================================== --- branches/audio-bringup/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sun Dec 5 21:31:33 2010 @@ -394,13 +394,6 @@ Context, NULL, NULL); - - if (Result) - { - Result = SetupInstallServicesFromInfSectionW(hInf, - L"Audio_Inst.NT.Services", - 0); - } SetupTermDefaultQueueCallback(Context); SetupCloseInfFile(hInf); Modified: branches/audio-bringup/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/media/inf/audio.i… ============================================================================== --- branches/audio-bringup/media/inf/audio.inf [iso-8859-1] (original) +++ branches/audio-bringup/media/inf/audio.inf [iso-8859-1] Sun Dec 5 21:31:33 2010 @@ -30,38 +30,13 @@ CopyFiles = Audio.CopyFiles.KernelMode, Audio.CopyFiles.UserMode [Audio.CopyFiles.KernelMode] -sysaudio.sys -wdmaud.sys portcls.sys drmk.sys -kmixer.sys [Audio.CopyFiles.UserMode] wdmaud.drv ksuser.dll -[Audio_Inst.NT.Services] -AddService = wdmaud,,wdmaud_Service_Inst -AddService = sysaudio,,sysaudio_Service_Inst -AddService = kmixer,,kmixer_Service_Inst - -[wdmaud_Service_Inst] -ServiceType = 1 -StartType = 3 -ErrorControl = 0 -ServiceBinary = %12%\wdmaud.sys - -[kmixer_Service_Inst] -ServiceType = 1 -StartType = 3 -ErrorControl = 0 -ServiceBinary = %12%\kmixer.sys - -[sysaudio_Service_Inst] -ServiceType = 1 -StartType = 3 -ErrorControl = 0 -ServiceBinary = %12%\sysaudio.sys ;-------------------------------- STRINGS -------------------------------

1 0

[janderwald] 49955: [AUDIO-BRINGUP] - Properly determine the component type and target type of source lines - Correctly set dwDestination / target type / component member for source lines
by janderwald＠svn.reactos.org 05 Dec '10

05 Dec '10

Author: janderwald Date: Sun Dec 5 18:01:24 2010 New Revision: 49955 URL: http://svn.reactos.org/svn/reactos?rev=49955&view=rev Log: [AUDIO-BRINGUP] - Properly determine the component type and target type of source lines - Correctly set dwDestination / target type / component member for source lines Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/midi.c branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c branches/audio-bringup/lib/drivers/sound/mmixer/priv.h Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sun Dec 5 18:01:24 2010 @@ -7,6 +7,26 @@ */ #include "priv.h" + +const GUID KSNODETYPE_DESKTOP_MICROPHONE = {0xDFF21BE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_LEGACY_AUDIO_CONNECTOR = {0xDFF21FE4, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_TELEPHONE = {0xDFF21EE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_PHONE_LINE = {0xDFF21EE1, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_DOWN_LINE_PHONE = {0xDFF21EE3, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_DESKTOP_SPEAKER = {0xDFF21CE4, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_ROOM_SPEAKER = {0xDFF21CE5, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_COMMUNICATION_SPEAKER = {0xDFF21CE6, 0xF70F, 0x11D0, {0xB9,0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_HEADPHONES = {0xDFF21CE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO = {0xDFF21CE3, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_MICROPHONE = {0xDFF21BE1, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9,0x22, 0x31, 0x96}}; +const GUID KSCATEGORY_AUDIO = {0x6994AD04L, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_SPDIF_INTERFACE = {0xDFF21FE5, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_ANALOG_CONNECTOR = {0xDFF21FE1, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_SPEAKER = {0xDFF21CE1, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_CD_PLAYER = {0xDFF220E3, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_SYNTHESIZER = {0xDFF220F3, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSNODETYPE_LINE_CONNECTOR = {0xDFF21FE3, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0,0xC9, 0x22, 0x31, 0x96}}; +const GUID PINNAME_VIDEO_CAPTURE = {0xfb6c4281, 0x353, 0x11d1, {0x90, 0x5f, 0x0, 0x0, 0xc0, 0xcc, 0x16, 0xba}}; MIXER_STATUS MMixerAddMixerControl( @@ -528,6 +548,204 @@ } MIXER_STATUS +MMixerGetComponentAndTargetType( + IN PMIXER_CONTEXT MixerContext, + IN OUT LPMIXER_INFO MixerInfo, + IN ULONG PinId, + OUT PULONG ComponentType, + OUT PULONG TargetType) +{ + KSPIN_DATAFLOW DataFlow; + KSPIN_COMMUNICATION Communication; + MIXER_STATUS Status; + KSP_PIN Request; + ULONG BytesReturned; + GUID Guid; + BOOLEAN BridgePin = FALSE; + PKSPIN_PHYSICALCONNECTION Connection; + + /* first dataflow type */ + Status = MMixerGetPinDataFlowAndCommunication(MixerContext, MixerInfo->hMixer, PinId, &DataFlow, &Communication); + + if (Status != MM_STATUS_SUCCESS) + { + /* failed to get dataflow */ + return Status; + } + + /* now get pin category guid */ + Request.PinId = PinId; + Request.Reserved = 0; + Request.Property.Flags = KSPROPERTY_TYPE_GET; + Request.Property.Set = KSPROPSETID_Pin; + Request.Property.Id = KSPROPERTY_PIN_CATEGORY; + + + /* get pin category */ + Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to get dataflow */ + return Status; + } + + /* check if it has a physical connection */ + Status = MMixerGetPhysicalConnection(MixerContext, MixerInfo->hMixer, PinId, &Connection); + if (Status == MM_STATUS_SUCCESS) + { + /* pin is a brige pin */ + BridgePin = TRUE; + + /* free physical connection */ + MixerContext->Free(Connection); + } + + if (DataFlow == KSPIN_DATAFLOW_IN) + { + if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_MICROPHONE) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_DESKTOP_MICROPHONE)) + { + /* type microphone */ + *TargetType = MIXERLINE_TARGETTYPE_WAVEIN; + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_LEGACY_AUDIO_CONNECTOR) || + IsEqualGUIDAligned(&Guid, &KSCATEGORY_AUDIO) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_SPEAKER)) + { + /* type waveout */ + *TargetType = MIXERLINE_TARGETTYPE_WAVEOUT; + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_WAVEOUT; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_CD_PLAYER)) + { + /* type cd player */ + *TargetType = MIXERLINE_TARGETTYPE_UNDEFINED; + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_COMPACTDISC; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_SYNTHESIZER)) + { + /* type synthesizer */ + *TargetType = MIXERLINE_TARGETTYPE_MIDIOUT; + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_SYNTHESIZER; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_LINE_CONNECTOR)) + { + /* type line */ + *TargetType = MIXERLINE_TARGETTYPE_UNDEFINED; + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_LINE; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_TELEPHONE) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_PHONE_LINE) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_DOWN_LINE_PHONE)) + { + /* type telephone */ + *TargetType = MIXERLINE_TARGETTYPE_UNDEFINED; + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_TELEPHONE; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_ANALOG_CONNECTOR)) + { + /* type analog */ + if (BridgePin) + *TargetType = MIXERLINE_TARGETTYPE_WAVEIN; + else + *TargetType = MIXERLINE_TARGETTYPE_WAVEOUT; + + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_ANALOG; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_SPDIF_INTERFACE)) + { + /* type analog */ + if (BridgePin) + *TargetType = MIXERLINE_TARGETTYPE_WAVEIN; + else + *TargetType = MIXERLINE_TARGETTYPE_WAVEOUT; + + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_DIGITAL; + } + else + { + /* unknown type */ + *TargetType = MIXERLINE_TARGETTYPE_UNDEFINED; + *ComponentType = MIXERLINE_COMPONENTTYPE_SRC_UNDEFINED; + DPRINT1("Unknown Category for PinId %lu BridgePin %lu\n", PinId, BridgePin); + } + } + else + { + if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_SPEAKER) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_DESKTOP_SPEAKER) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_ROOM_SPEAKER) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_COMMUNICATION_SPEAKER)) + { + /* type waveout */ + *TargetType = MIXERLINE_TARGETTYPE_WAVEOUT; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS; + } + else if (IsEqualGUIDAligned(&Guid, &KSCATEGORY_AUDIO) || + IsEqualGUIDAligned(&Guid, &PINNAME_CAPTURE)) + { + /* type wavein */ + *TargetType = MIXERLINE_TARGETTYPE_WAVEIN; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_HEADPHONES) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO)) + { + /* type head phones */ + *TargetType = MIXERLINE_TARGETTYPE_WAVEOUT; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_HEADPHONES; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_TELEPHONE) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_PHONE_LINE) || + IsEqualGUIDAligned(&Guid, &KSNODETYPE_DOWN_LINE_PHONE)) + { + /* type waveout */ + *TargetType = MIXERLINE_TARGETTYPE_UNDEFINED; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_TELEPHONE; + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_ANALOG_CONNECTOR)) + { + /* type analog */ + if (BridgePin) + { + *TargetType = MIXERLINE_TARGETTYPE_WAVEOUT; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS; + } + else + { + *TargetType = MIXERLINE_TARGETTYPE_WAVEIN; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN; + } + } + else if (IsEqualGUIDAligned(&Guid, &KSNODETYPE_SPDIF_INTERFACE)) + { + /* type spdif */ + if (BridgePin) + { + *TargetType = MIXERLINE_TARGETTYPE_WAVEOUT; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS; + } + else + { + *TargetType = MIXERLINE_TARGETTYPE_WAVEIN; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN; + } + } + else + { + /* unknown type */ + *TargetType = MIXERLINE_TARGETTYPE_UNDEFINED; + *ComponentType = MIXERLINE_COMPONENTTYPE_DST_UNDEFINED; + DPRINT1("Unknown Category for PinId %lu BridgePin %lu\n", PinId, BridgePin); + } + } + + /* done */ + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS MMixerBuildMixerSourceLine( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, @@ -541,6 +759,16 @@ LPMIXERLINE_EXT SrcLine, DstLine; LPWSTR PinName; MIXER_STATUS Status; + ULONG ComponentType, TargetType; + + /* get component and target type */ + Status = MMixerGetComponentAndTargetType(MixerContext, MixerInfo, PinId, &ComponentType, &TargetType); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to get component status */ + TargetType = MIXERLINE_TARGETTYPE_UNDEFINED; + ComponentType = MIXERLINE_COMPONENTTYPE_DST_UNDEFINED; + } /* construct source line */ SrcLine = (LPMIXERLINE_EXT)MixerContext->Alloc(sizeof(MIXERLINE_EXT)); @@ -562,14 +790,15 @@ /* initialize mixer line */ SrcLine->Line.cbStruct = sizeof(MIXERLINEW); - SrcLine->Line.dwDestination = 0; + SrcLine->Line.dwDestination = MixerInfo->MixCaps.cDestinations-1; SrcLine->Line.dwSource = DstLine->Line.cConnections; SrcLine->Line.dwLineID = (DstLine->Line.cConnections * SOURCE_LINE)+ (MixerInfo->MixCaps.cDestinations-1); SrcLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE | MIXERLINE_LINEF_SOURCE; + SrcLine->Line.dwComponentType = ComponentType; SrcLine->Line.dwUser = 0; SrcLine->Line.cChannels = DstLine->Line.cChannels; SrcLine->Line.cConnections = 0; - SrcLine->Line.Target.dwType = 1; + SrcLine->Line.Target.dwType = TargetType; SrcLine->Line.Target.dwDeviceID = DstLine->Line.Target.dwDeviceID; SrcLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; Modified: branches/audio-bringup/lib/drivers/sound/mmixer/midi.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/midi.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/midi.c [iso-8859-1] Sun Dec 5 18:01:24 2010 @@ -11,7 +11,7 @@ MIXER_STATUS MMixerGetPinDataFlowAndCommunication( IN PMIXER_CONTEXT MixerContext, - IN LPMIXER_DATA MixerData, + IN HANDLE hDevice, IN ULONG PinId, OUT PKSPIN_DATAFLOW DataFlow, OUT PKSPIN_COMMUNICATION Communication) @@ -28,7 +28,7 @@ Pin.Property.Set = KSPROPSETID_Pin; /* get pin dataflow */ - Status = MixerContext->Control(MixerData->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)DataFlow, sizeof(KSPIN_DATAFLOW), &BytesReturned); + Status = MixerContext->Control(hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)DataFlow, sizeof(KSPIN_DATAFLOW), &BytesReturned); if (Status != MM_STATUS_SUCCESS) { /* failed to retrieve dataflow */ @@ -39,7 +39,7 @@ Pin.Property.Id = KSPROPERTY_PIN_COMMUNICATION; /* get pin communication */ - Status = MixerContext->Control(MixerData->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Communication, sizeof(KSPIN_COMMUNICATION), &BytesReturned); + Status = MixerContext->Control(hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Communication, sizeof(KSPIN_COMMUNICATION), &BytesReturned); return Status; } @@ -142,7 +142,7 @@ IsEqualGUIDAligned(&DataRange->Specifier, &KSDATAFORMAT_SPECIFIER_NONE)) { /* pin supports midi datarange */ - if (MMixerGetPinDataFlowAndCommunication(MixerContext, MixerData, PinId, &DataFlow, &Communication) == MM_STATUS_SUCCESS) + if (MMixerGetPinDataFlowAndCommunication(MixerContext, MixerData->hDevice, PinId, &DataFlow, &Communication) == MM_STATUS_SUCCESS) { if (DataFlow == KSPIN_DATAFLOW_IN && Communication == KSPIN_COMMUNICATION_SINK) { Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Sun Dec 5 18:01:24 2010 @@ -550,9 +550,9 @@ IN PMIXER_CONTEXT MixerContext, IN PMIXER_LIST MixerList) { - ULONG Index, SubIndex, DestinationLineID; + ULONG Index, SubIndex, DestinationLineID, SrcIndex; LPMIXER_INFO MixerInfo; - LPMIXERLINE_EXT DstMixerLine; + LPMIXERLINE_EXT DstMixerLine, SrcMixerLine; DPRINT1("MixerList %p\n", MixerList); DPRINT1("MidiInCount %lu\n", MixerList->MidiInListCount); @@ -601,6 +601,36 @@ DPRINT1("Target.vDriverVersion %lx\n", DstMixerLine->Line.Target.vDriverVersion); DPRINT1("Target.wMid %lx\n", DstMixerLine->Line.Target.wMid ); DPRINT1("Target.wPid %lx\n", DstMixerLine->Line.Target.wPid); + + + for(SrcIndex = 0; SrcIndex < DstMixerLine->Line.cConnections; SrcIndex++) + { + /* calculate destination line id */ + DestinationLineID = (SOURCE_LINE * SrcIndex) + SubIndex; + + /* get source line */ + SrcMixerLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + DPRINT1("\n"); + DPRINT1("SourceIndex: %lu\n", SrcIndex); + DPRINT1("\n"); + DPRINT1("cChannels %lu\n", SrcMixerLine->Line.cChannels); + DPRINT1("cConnections %lu\n", SrcMixerLine->Line.cConnections); + DPRINT1("cControls %lu\n", SrcMixerLine->Line.cControls); + DPRINT1("dwComponentType %lx\n", SrcMixerLine->Line.dwComponentType); + DPRINT1("dwDestination %lu\n", SrcMixerLine->Line.dwDestination); + DPRINT1("dwLineID %lx\n", SrcMixerLine->Line.dwLineID); + DPRINT1("dwSource %lx\n", SrcMixerLine->Line.dwSource); + DPRINT1("dwUser %lu\n", SrcMixerLine->Line.dwUser); + DPRINT1("fdwLine %lu\n", SrcMixerLine->Line.fdwLine); + DPRINT1("szName %S\n", SrcMixerLine->Line.szName); + DPRINT1("szShortName %S\n", SrcMixerLine->Line.szShortName); + DPRINT1("Target.dwDeviceId %lu\n", SrcMixerLine->Line.Target.dwDeviceID); + DPRINT1("Target.dwType %lu\n", SrcMixerLine->Line.Target.dwType); + DPRINT1("Target.szName %S\n", SrcMixerLine->Line.Target.szPname); + DPRINT1("Target.vDriverVersion %lx\n", SrcMixerLine->Line.Target.vDriverVersion); + DPRINT1("Target.wMid %lx\n", SrcMixerLine->Line.Target.wMid ); + DPRINT1("Target.wPid %lx\n", SrcMixerLine->Line.Target.wPid); + } } } } Modified: branches/audio-bringup/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Sun Dec 5 18:01:24 2010 @@ -349,6 +349,14 @@ IN OUT PKSPIN_CONNECT PinConnect, IN ULONG PinId); +MIXER_STATUS +MMixerGetPinDataFlowAndCommunication( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hDevice, + IN ULONG PinId, + OUT PKSPIN_DATAFLOW DataFlow, + OUT PKSPIN_COMMUNICATION Communication); + /* topology.c */

1 0

[fireball] 49954: [TASKMGR] - Rafal Harabien: Add support for DELETE key to processes and applications list in taskmgr. See issue #5646 for more details.
by fireball＠svn.reactos.org 05 Dec '10

05 Dec '10

Author: fireball Date: Sun Dec 5 10:27:45 2010 New Revision: 49954 URL: http://svn.reactos.org/svn/reactos?rev=49954&view=rev Log: [TASKMGR] - Rafal Harabien: Add support for DELETE key to processes and applications list in taskmgr. See issue #5646 for more details. Modified: trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Sun Dec 5 10:27:45 2010 @@ -210,6 +210,11 @@ ApplicationPageOnNotify(wParam, lParam); break; + case WM_KEYDOWN: + if (wParam == VK_DELETE) + ProcessPage_OnEndProcess(); + break; + } return 0; @@ -584,6 +589,14 @@ ApplicationPage_OnSwitchTo(); break; + + case LVN_KEYDOWN: + + if (((LPNMLVKEYDOWN)lParam)->wVKey == VK_DELETE) + ApplicationPage_OnEndTask(); + + break; + } } else if (pnmh->hwndFrom == ListView_GetHeader(hApplicationPageListCtrl)) Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Dec 5 10:27:45 2010 @@ -201,6 +201,11 @@ case WM_NOTIFY: ProcessPageOnNotify(wParam, lParam); break; + + case WM_KEYDOWN: + if (wParam == VK_DELETE) + ProcessPage_OnEndProcess(); + break; } return 0; @@ -249,6 +254,12 @@ case NM_RCLICK: ProcessPageShowContextMenu(GetSelectedProcessId()); + break; + + case LVN_KEYDOWN: + + if (((LPNMLVKEYDOWN)lParam)->wVKey == VK_DELETE) + ProcessPage_OnEndProcess(); break; }

1 0

[tkreuzer] 49953: [ROSSYM] Silence debug prints
by tkreuzer＠svn.reactos.org 04 Dec '10

04 Dec '10

Author: tkreuzer Date: Sat Dec 4 21:16:35 2010 New Revision: 49953 URL: http://svn.reactos.org/svn/reactos?rev=49953&view=rev Log: [ROSSYM] Silence debug prints Modified: branches/cmake-bringup/lib/rossym/delete.c branches/cmake-bringup/lib/rossym/find.c branches/cmake-bringup/lib/rossym/fromfile.c branches/cmake-bringup/lib/rossym/frommem.c branches/cmake-bringup/lib/rossym/fromraw.c branches/cmake-bringup/lib/rossym/getraw.c branches/cmake-bringup/lib/rossym/initkm.c branches/cmake-bringup/lib/rossym/initum.c branches/cmake-bringup/lib/rossym/zwfile.c Modified: branches/cmake-bringup/lib/rossym/delete.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/delete… ============================================================================== --- branches/cmake-bringup/lib/rossym/delete.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/delete.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -12,7 +12,7 @@ #include <reactos/rossym.h> #include <ntimage.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #include "rossympriv.h" Modified: branches/cmake-bringup/lib/rossym/find.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/find.c… ============================================================================== --- branches/cmake-bringup/lib/rossym/find.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/find.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -39,7 +39,7 @@ #include <reactos/rossym.h> #include "rossympriv.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> #include "rossym.h" Modified: branches/cmake-bringup/lib/rossym/fromfile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/fromfi… ============================================================================== --- branches/cmake-bringup/lib/rossym/fromfile.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/fromfile.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -17,7 +17,7 @@ #include "dwarf.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> BOOLEAN Modified: branches/cmake-bringup/lib/rossym/frommem.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/fromme… ============================================================================== --- branches/cmake-bringup/lib/rossym/frommem.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/frommem.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -14,7 +14,7 @@ #include "rossympriv.h" #include <ntimage.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #include "dwarf.h" Modified: branches/cmake-bringup/lib/rossym/fromraw.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/fromra… ============================================================================== --- branches/cmake-bringup/lib/rossym/fromraw.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/fromraw.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -12,7 +12,7 @@ #include <reactos/rossym.h> #include "rossympriv.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> BOOLEAN Modified: branches/cmake-bringup/lib/rossym/getraw.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/getraw… ============================================================================== --- branches/cmake-bringup/lib/rossym/getraw.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/getraw.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -12,7 +12,7 @@ #include <reactos/rossym.h> #include "rossympriv.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> ULONG Modified: branches/cmake-bringup/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/initkm… ============================================================================== --- branches/cmake-bringup/lib/rossym/initkm.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/initkm.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -14,7 +14,7 @@ #include <reactos/rossym.h> #include "rossympriv.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> #define TAG_ROSSYM 'MYSR' Modified: branches/cmake-bringup/lib/rossym/initum.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/initum… ============================================================================== --- branches/cmake-bringup/lib/rossym/initum.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/initum.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -11,7 +11,7 @@ #include <reactos/rossym.h> #include "rossympriv.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> static PVOID Modified: branches/cmake-bringup/lib/rossym/zwfile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/zwfile… ============================================================================== --- branches/cmake-bringup/lib/rossym/zwfile.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/zwfile.c [iso-8859-1] Sat Dec 4 21:16:35 2010 @@ -12,7 +12,7 @@ #include <reactos/rossym.h> #include "rossympriv.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> BOOLEAN

1 0

[tkreuzer] 49952: [CMAKE] Give ntdll a baseaddress
by tkreuzer＠svn.reactos.org 04 Dec '10

04 Dec '10

Author: tkreuzer Date: Sat Dec 4 20:18:24 2010 New Revision: 49952 URL: http://svn.reactos.org/svn/reactos?rev=49952&view=rev Log: [CMAKE] Give ntdll a baseaddress Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Sat Dec 4 20:18:24 2010 @@ -49,7 +49,8 @@ ntdllsys libcntpr ${PSEH_LIB}) - + +set_image_base(ntdll ${baseaddress_ntdll}) add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE}) add_dependencies(ntdll ntstatus asm)

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