Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[janderwald] 49967: [AUDIO-BRINGUP] - Fix error message when mmixer library has failed to initialize - Remove device handle from MIXER_INFO as a mixer can span over more than one device (i.e. mixer...
by janderwald＠svn.reactos.org 07 Dec '10

07 Dec '10

Author: janderwald Date: Tue Dec 7 10:29:57 2010 New Revision: 49967 URL: http://svn.reactos.org/svn/reactos?rev=49967&view=rev Log: [AUDIO-BRINGUP] - Fix error message when mmixer library has failed to initialize - Remove device handle from MIXER_INFO as a mixer can span over more than one device (i.e. mixer, wave) - Add device handle to mixer control struct - Store mixer controls in list than in array. Will later be used to add hacks (i.e wave line must have volume controls etc) - Add reserved member to topology pin struct and mark used pins as reserved. It is then used to add alternative mixers destination lines Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c branches/audio-bringup/lib/drivers/sound/mmixer/priv.h branches/audio-bringup/lib/drivers/sound/mmixer/sup.c branches/audio-bringup/lib/drivers/sound/mmixer/topology.c Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Tue Dec 7 10:29:57 2010 @@ -111,7 +111,6 @@ { case DRV_LOAD : { - HANDLE Handle; MMRESULT Result; SND_TRACE(L"DRV_LOAD\n"); @@ -120,11 +119,11 @@ if ( ! MMSUCCESS(Result) ) return 0L; - Result = WdmAudOpenSoundDeviceByMMixer(NULL, &Handle); + Result = WdmAudOpenSoundDeviceByMMixer(); if ( Result != MMSYSERR_NOERROR ) { - SND_ERR(L"Failed to open \\\\.\\wdmaud\n"); + SND_ERR(L"Failed to initialize MMixer Library"); //UnlistAllSoundDevices(); return 0L; Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Tue Dec 7 10:29:57 2010 @@ -57,9 +57,7 @@ IN DWORD CapabilitiesSize); MMRESULT -WdmAudOpenSoundDeviceByMMixer( - IN struct _SOUND_DEVICE* SoundDevice, - OUT PVOID* Handle); +WdmAudOpenSoundDeviceByMMixer(); MMRESULT WdmAudCloseSoundDeviceByMMixer( 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] Tue Dec 7 10:29:57 2010 @@ -32,28 +32,42 @@ MMixerAddMixerControl( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG NodeIndex, - IN LPMIXERLINE_EXT MixerLine, - OUT LPMIXERCONTROLW MixerControl) + IN LPMIXERLINE_EXT MixerLine) { LPGUID NodeType; KSP_NODE Node; ULONG BytesReturned; MIXER_STATUS Status; LPWSTR Name; + LPMIXERCONTROL_EXT MixerControl; + + /* allocate mixer control */ + MixerControl = MixerContext->Alloc(sizeof(MIXERCONTROL_EXT)); + if (!MixerControl) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + /* initialize mixer control */ - MixerControl->cbStruct = sizeof(MIXERCONTROLW); - MixerControl->dwControlID = MixerInfo->ControlId; + MixerControl->hDevice = hMixer; + MixerControl->NodeID = NodeIndex; + MixerControl->ExtraData = NULL; + + MixerControl->Control.cbStruct = sizeof(MIXERCONTROLW); + MixerControl->Control.dwControlID = MixerInfo->ControlId; /* get node type */ NodeType = MMixerGetNodeTypeFromTopology(Topology, NodeIndex); /* store control type */ - MixerControl->dwControlType = MMixerGetControlTypeFromTopologyNode(NodeType); - - MixerControl->fdwControl = MIXERCONTROL_CONTROLF_UNIFORM; /* FIXME */ - MixerControl->cMultipleItems = 0; + MixerControl->Control.dwControlType = MMixerGetControlTypeFromTopologyNode(NodeType); + + MixerControl->Control.fdwControl = MIXERCONTROL_CONTROLF_UNIFORM; /* FIXME */ + MixerControl->Control.cMultipleItems = 0; /* setup request to retrieve name */ Node.NodeId = NodeIndex; @@ -63,7 +77,7 @@ Node.Reserved = 0; /* get node name size */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), NULL, 0, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), NULL, 0, &BytesReturned); if (Status == MM_STATUS_MORE_ENTRIES) { @@ -76,24 +90,28 @@ } /* get node name */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), (LPVOID)Name, BytesReturned, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), (LPVOID)Name, BytesReturned, &BytesReturned); if (Status == MM_STATUS_SUCCESS) { - MixerContext->Copy(MixerControl->szShortName, Name, (min(MIXER_SHORT_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); - MixerControl->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; - - MixerContext->Copy(MixerControl->szName, Name, (min(MIXER_LONG_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); - MixerControl->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; + MixerContext->Copy(MixerControl->Control.szShortName, Name, (min(MIXER_SHORT_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); + MixerControl->Control.szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; + + MixerContext->Copy(MixerControl->Control.szName, Name, (min(MIXER_LONG_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); + MixerControl->Control.szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; } /* free name buffer */ MixerContext->Free(Name); } + /* increment control count */ MixerInfo->ControlId++; - if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUX) + /* insert control */ + InsertTailList(&MixerLine->ControlsList, &MixerControl->Entry); + + if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_MUX) { ULONG NodesCount; PULONG Nodes; @@ -114,24 +132,24 @@ MixerContext->Free(Nodes); /* setup mux bounds */ - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = NodesCount - 1; - MixerControl->Metrics.dwReserved[0] = NodesCount; - MixerControl->cMultipleItems = NodesCount; - MixerControl->fdwControl |= MIXERCONTROL_CONTROLF_MULTIPLE; - } - else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) - { - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 1; - } - else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_ONOFF) + MixerControl->Control.Bounds.dwMinimum = 0; + MixerControl->Control.Bounds.dwMaximum = NodesCount - 1; + MixerControl->Control.Metrics.dwReserved[0] = NodesCount; + MixerControl->Control.cMultipleItems = NodesCount; + MixerControl->Control.fdwControl |= MIXERCONTROL_CONTROLF_MULTIPLE; + } + else if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + MixerControl->Control.Bounds.dwMinimum = 0; + MixerControl->Control.Bounds.dwMaximum = 1; + } + else if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_ONOFF) { /* only needs to set bounds */ - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 1; - } - else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + MixerControl->Control.Bounds.dwMinimum = 0; + MixerControl->Control.Bounds.dwMaximum = 1; + } + else if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { KSNODEPROPERTY_AUDIO_CHANNEL Property; ULONG Length; @@ -139,9 +157,9 @@ PKSPROPERTY_MEMBERSHEADER Members; PKSPROPERTY_STEPPING_LONG Range; - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 0xFFFF; - MixerControl->Metrics.cSteps = 0xC0; /* FIXME */ + MixerControl->Control.Bounds.dwMinimum = 0; + MixerControl->Control.Bounds.dwMaximum = 0xFFFF; + MixerControl->Control.Metrics.cSteps = 0xC0; /* FIXME */ Length = sizeof(KSPROPERTY_DESCRIPTION) + sizeof(KSPROPERTY_MEMBERSHEADER) + sizeof(KSPROPERTY_STEPPING_LONG); Desc = (PKSPROPERTY_DESCRIPTION)MixerContext->Alloc(Length); @@ -156,7 +174,7 @@ Property.NodeProperty.Property.Set = KSPROPSETID_Audio; /* get node volume level info */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), Desc, Length, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), Desc, Length, &BytesReturned); if (Status == MM_STATUS_SUCCESS) { @@ -181,7 +199,7 @@ Steps = MaxRange / Range->SteppingDelta + 1; /* store mixer control info there */ - VolumeData->Header.dwControlID = MixerControl->dwControlID; + VolumeData->Header.dwControlID = MixerControl->Control.dwControlID; VolumeData->SignedMaximum = Range->Bounds.SignedMaximum; VolumeData->SignedMinimum = Range->Bounds.SignedMinimum; VolumeData->SteppingDelta = Range->SteppingDelta; @@ -202,13 +220,13 @@ VolumeData->Values[Index] = Value; Value += Range->SteppingDelta; } - InsertTailList(&MixerLine->LineControlsExtraData, &VolumeData->Header.Entry); + MixerControl->ExtraData = VolumeData; } } MixerContext->Free(Desc); } - DPRINT("Status %x Name %S\n", Status, MixerControl->szName); + DPRINT("Status %x Name %S\n", Status, MixerControl->Control.szName); return MM_STATUS_SUCCESS; } @@ -259,7 +277,7 @@ wcscpy(DestinationLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); /* initialize extra line */ - InitializeListHead(&DestinationLine->LineControlsExtraData); + InitializeListHead(&DestinationLine->ControlsList); /* insert into mixer info */ InsertTailList(&MixerInfo->LineList, &DestinationLine->Entry); @@ -275,6 +293,7 @@ MMixerGetPinName( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG PinId, IN OUT LPWSTR * OutBuffer) { @@ -291,7 +310,7 @@ Pin.Property.Id = KSPROPERTY_PIN_NAME; /* try get pin name size */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), NULL, 0, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), NULL, 0, &BytesReturned); /* check if buffer overflowed */ if (Status == MM_STATUS_MORE_ENTRIES) @@ -305,7 +324,7 @@ } /* try get pin name */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Buffer, BytesReturned, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Buffer, BytesReturned, &BytesReturned); if (Status != MM_STATUS_SUCCESS) { /* failed to get pin name */ @@ -326,6 +345,7 @@ MMixerBuildMixerDestinationLine( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG PinId, IN ULONG bInput) { @@ -333,7 +353,7 @@ MIXER_STATUS Status; /* try get pin name */ - Status = MMixerGetPinName(MixerContext, MixerInfo, PinId, &PinName); + Status = MMixerGetPinName(MixerContext, MixerInfo, hMixer, PinId, &PinName); if (Status == MM_STATUS_SUCCESS) { /* create mixer destination line */ @@ -503,6 +523,7 @@ MMixerGetChannelCountEnhanced( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG NodeId, OUT PULONG MaxChannels) { @@ -522,7 +543,7 @@ /* get description */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)&Description, sizeof(KSPROPERTY_DESCRIPTION), &BytesReturned); + Status = MixerContext->Control(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)) @@ -537,7 +558,7 @@ } /* get description */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)NewDescription, Description.DescriptionSize, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)NewDescription, Description.DescriptionSize, &BytesReturned); if (Status == MM_STATUS_SUCCESS) { /* get header */ @@ -572,6 +593,7 @@ MMixerGetChannelCountLegacy( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG NodeId, OUT PULONG MaxChannels) { @@ -592,7 +614,7 @@ do { /* get channel volume */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Channel, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Volume, sizeof(LONG), &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Channel, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Volume, sizeof(LONG), &BytesReturned); if (Status != MM_STATUS_SUCCESS) break; @@ -610,18 +632,19 @@ MMixerGetMaxChannelsForNode( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG NodeId, OUT PULONG MaxChannels) { MIXER_STATUS Status; /* try to get it enhanced */ - Status = MMixerGetChannelCountEnhanced(MixerContext, MixerInfo, NodeId, MaxChannels); + Status = MMixerGetChannelCountEnhanced(MixerContext, MixerInfo, hMixer, NodeId, MaxChannels); if (Status != MM_STATUS_SUCCESS) { /* get it old-fashioned way */ - MMixerGetChannelCountLegacy(MixerContext, MixerInfo, NodeId, MaxChannels); + MMixerGetChannelCountLegacy(MixerContext, MixerInfo, hMixer, NodeId, MaxChannels); } } @@ -629,6 +652,7 @@ MMixerAddMixerControlsToMixerLineByNodeIndexArray( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN OUT LPMIXERLINE_EXT DstLine, IN ULONG NodesCount, @@ -639,18 +663,6 @@ LPGUID NodeType; ULONG MaxChannels; - /* store nodes array */ - DstLine->NodeIds = Nodes; - - /* allocate MIXERCONTROLSW array */ - DstLine->LineControls = MixerContext->Alloc(NodesCount * sizeof(MIXERCONTROLW)); - - if (!DstLine->LineControls) - { - /* out of memory */ - return MM_STATUS_NO_MEMORY; - } - /* initialize control count */ Count = 0; @@ -674,16 +686,15 @@ if (IsEqualGUIDAligned(NodeType, &KSNODETYPE_VOLUME)) { /* calculate maximum channel count for node */ - MMixerGetMaxChannelsForNode(MixerContext, MixerInfo, Nodes[Index], &MaxChannels); + MMixerGetMaxChannelsForNode(MixerContext, MixerInfo, hMixer, 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]); + Status = MMixerAddMixerControl(MixerContext, MixerInfo, hMixer, Topology, Nodes[Index], DstLine); if (Status == MM_STATUS_SUCCESS) { @@ -703,6 +714,7 @@ MMixerGetComponentAndTargetType( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG PinId, OUT PULONG ComponentType, OUT PULONG TargetType) @@ -717,7 +729,7 @@ PKSPIN_PHYSICALCONNECTION Connection; /* first dataflow type */ - Status = MMixerGetPinDataFlowAndCommunication(MixerContext, MixerInfo->hMixer, PinId, &DataFlow, &Communication); + Status = MMixerGetPinDataFlowAndCommunication(MixerContext, hMixer, PinId, &DataFlow, &Communication); if (Status != MM_STATUS_SUCCESS) { @@ -734,7 +746,7 @@ /* get pin category */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned); if (Status != MM_STATUS_SUCCESS) { /* failed to get dataflow */ @@ -742,7 +754,7 @@ } /* check if it has a physical connection */ - Status = MMixerGetPhysicalConnection(MixerContext, MixerInfo->hMixer, PinId, &Connection); + Status = MMixerGetPhysicalConnection(MixerContext, hMixer, PinId, &Connection); if (Status == MM_STATUS_SUCCESS) { /* pin is a brige pin */ @@ -901,6 +913,7 @@ MMixerBuildMixerSourceLine( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG PinId, IN ULONG NodesCount, @@ -914,7 +927,7 @@ ULONG ComponentType, TargetType; /* get component and target type */ - Status = MMixerGetComponentAndTargetType(MixerContext, MixerInfo, PinId, &ComponentType, &TargetType); + Status = MMixerGetComponentAndTargetType(MixerContext, MixerInfo, hMixer, PinId, &ComponentType, &TargetType); if (Status != MM_STATUS_SUCCESS) { /* failed to get component status */ @@ -936,9 +949,7 @@ ASSERT(DstLine); /* initialize mixer src line */ - SrcLine->hDevice = MixerInfo->hMixer; SrcLine->PinId = PinId; - SrcLine->NodeIds = Nodes; /* initialize mixer line */ SrcLine->Line.cbStruct = sizeof(MIXERLINEW); @@ -955,14 +966,14 @@ SrcLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; SrcLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; - InitializeListHead(&SrcLine->LineControlsExtraData); + InitializeListHead(&SrcLine->ControlsList); /* copy name */ ASSERT(MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] == L'\0'); wcscpy(SrcLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); /* get pin name */ - Status = MMixerGetPinName(MixerContext, MixerInfo, PinId, &PinName); + Status = MMixerGetPinName(MixerContext, MixerInfo, hMixer, PinId, &PinName); if (Status == MM_STATUS_SUCCESS) { @@ -978,7 +989,7 @@ } /* add the controls to mixer line */ - Status = MMixerAddMixerControlsToMixerLineByNodeIndexArray(MixerContext, MixerInfo, Topology, SrcLine, NodesCount, Nodes); + Status = MMixerAddMixerControlsToMixerLineByNodeIndexArray(MixerContext, MixerInfo, hMixer, Topology, SrcLine, NodesCount, Nodes); if (Status != MM_STATUS_SUCCESS) { /* failed */ @@ -995,6 +1006,7 @@ MMixerAddMixerSourceLines( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG DestinationLineID, IN ULONG LineTerminator) @@ -1091,7 +1103,7 @@ ULONG TempIndex; #endif /* now build the mixer source line */ - Status = MMixerBuildMixerSourceLine(MixerContext, MixerInfo, Topology, PinId, AllPinNodesCount, AllPinNodes, DestinationLineID, &SrcLine); + Status = MMixerBuildMixerSourceLine(MixerContext, MixerInfo, hMixer, Topology, PinId, AllPinNodesCount, AllPinNodes, DestinationLineID, &SrcLine); if (Status == MM_STATUS_SUCCESS) { @@ -1100,6 +1112,10 @@ /* increment destination line count */ DstLine->Line.cConnections++; + + /* mark pin as reserved */ + MMixerSetTopologyPinReserved(Topology, PinId); + #ifdef MMIXER_DEBUG DPRINT1("Adding PinId %lu AllPinNodesCount %lu to DestinationLine %lu\n", PinId, AllPinNodesCount, DestinationLineID); for(TempIndex = 0; TempIndex < AllPinNodesCount; TempIndex++) @@ -1124,6 +1140,7 @@ MMixerAddMixerControlsToDestinationLine( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG PinId, IN ULONG bInput, @@ -1165,7 +1182,7 @@ if (NodesCount > 0) { /* add all nodes as mixer controls to the destination line */ - Status = MMixerAddMixerControlsToMixerLineByNodeIndexArray(MixerContext, MixerInfo, Topology, DstLine, NodesCount, Nodes); + Status = MMixerAddMixerControlsToMixerLineByNodeIndexArray(MixerContext, MixerInfo, hMixer, Topology, DstLine, NodesCount, Nodes); if (Status != MM_STATUS_SUCCESS) { /* failed to add controls */ @@ -1185,6 +1202,7 @@ MMixerApplyOutputFilterHack( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_DATA MixerData, + IN HANDLE hMixer, IN OUT PULONG PinsCount, IN OUT PULONG Pins) { @@ -1195,7 +1213,7 @@ for(Index = 0; Index < *PinsCount; Index++) { /* check if it has a physical connection */ - Status = MMixerGetPhysicalConnection(MixerContext, MixerData->hDevice, Pins[Index], &Connection); + Status = MMixerGetPhysicalConnection(MixerContext, hMixer, Pins[Index], &Connection); if (Status == MM_STATUS_SUCCESS) { @@ -1249,16 +1267,6 @@ DPRINT1("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); - if (MixerInfo->hMixer != NULL) - { - /* dont replace mixer destination handles */ - DPRINT1("MixerInfo hDevice %p MixerData hDevice %p\n", MixerInfo->hMixer, MixerData->hDevice); - ASSERT(MixerInfo->hMixer == MixerData->hDevice); - } - - /* store connected mixer handle */ - MixerInfo->hMixer = MixerData->hDevice; - if (MixerData->Topology == NULL) { /* construct new topology */ @@ -1278,12 +1286,19 @@ Topology = MixerData->Topology; } - /* allocate pin index array which will hold all referenced pins */ - Status = MMixerAllocateTopologyPinArray(MixerContext, Topology, &Pins); - ASSERT(Status == MM_STATUS_SUCCESS); + /* mark pin as consumed */ + MMixerSetTopologyPinReserved(Topology, OutConnection->Pin); if (!bInput) { + /* allocate pin index array which will hold all referenced pins */ + Status = MMixerAllocateTopologyPinArray(MixerContext, Topology, &Pins); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to create topology */ + return Status; + } + /* the mixer is an output mixer * find end pin of the node path */ @@ -1305,14 +1320,14 @@ * WorkArround: remove all pin ids which have a physical connection * because bridge pins may belong to different render paths */ - MMixerApplyOutputFilterHack(MixerContext, MixerData, &PinsCount, Pins); + MMixerApplyOutputFilterHack(MixerContext, MixerData, MixerData->hDevice, &PinsCount, Pins); /* sanity checks */ ASSERT(PinsCount != 0); ASSERT(PinsCount == 1); /* create destination line */ - Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, Pins[0], bInput); + Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Pins[0], bInput); /* calculate destination line id */ DestinationLineID = (DESTINATION_LINE + MixerInfo->MixCaps.cDestinations-1); @@ -1327,13 +1342,19 @@ } /* add mixer controls to destination line */ - Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, Topology, Pins[0], bInput, DestinationLineID, &LineTerminator); + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Topology, Pins[0], bInput, DestinationLineID, &LineTerminator); if (Status == MM_STATUS_SUCCESS) { /* now add the rest of the source lines */ - Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, Topology, DestinationLineID, LineTerminator); - } + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, MixerData->hDevice, Topology, DestinationLineID, LineTerminator); + } + + /* mark pin as consumed */ + MMixerSetTopologyPinReserved(Topology, Pins[0]); + + /* free topology pin array */ + MixerContext->Free(Pins); } else { @@ -1341,12 +1362,12 @@ DestinationLineID = (DESTINATION_LINE + MixerInfo->MixCaps.cDestinations-1); /* add mixer controls */ - Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, Topology, OutConnection->Pin, bInput, DestinationLineID, &LineTerminator); + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Topology, OutConnection->Pin, bInput, DestinationLineID, &LineTerminator); if (Status == MM_STATUS_SUCCESS) { /* now add the rest of the source lines */ - Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, Topology, DestinationLineID, LineTerminator); + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, MixerData->hDevice, Topology, DestinationLineID, LineTerminator); } } @@ -1364,7 +1385,7 @@ IN ULONG bInputMixer, IN OUT LPMIXER_INFO * OutMixerInfo) { - + ULONG Index; MIXER_STATUS Status; PKSPIN_PHYSICALCONNECTION OutConnection; ULONG * Pins; @@ -1431,10 +1452,16 @@ return Status; } + /* mark all found pins as reserved */ + for(Index = 0; Index < PinsFound; Index++) + { + MMixerSetTopologyPinReserved(Topology, Pins[Index]); + } + if (bInputMixer) { /* pre create the mixer destination line for input mixers */ - Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, Pins[0], bInputMixer); + Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Pins[0], bInputMixer); if (Status != MM_STATUS_SUCCESS) { @@ -1468,6 +1495,9 @@ if (Status == MM_STATUS_SUCCESS) { + /* mark pin as reserved */ + MMixerSetTopologyPinReserved(Topology, Pins[0]); + /* topology on the topoloy filter */ Status = MMixerHandlePhysicalConnection(MixerContext, MixerList, MixerData, MixerInfo, bInputMixer, OutConnection); @@ -1480,7 +1510,6 @@ * handle drivers which expose their topology on the same filter */ ASSERT(0); - MixerInfo->hMixer = MixerData->hDevice; } /* free pins */ @@ -1498,6 +1527,32 @@ return Status; } +VOID +MMixerHandleAlternativeMixers( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN LPMIXER_DATA MixerData, + IN PTOPOLOGY Topology) +{ + ULONG Index, PinCount, Reserved; + + DPRINT1("DeviceName %S\n", MixerData->DeviceName); + + /* get topology pin count */ + MMixerGetTopologyPinCount(Topology, &PinCount); + + for(Index = 0; Index < PinCount; Index++) + { + MMixerIsTopologyPinReserved(Topology, Index, &Reserved); + + /* check if it has already been reserved */ + if (Reserved == FALSE) + { + DPRINT1("MixerName %S Available PinID %lu\n", MixerData->DeviceName, Index); + } + } +} + MIXER_STATUS MMixerSetupFilter( IN PMIXER_CONTEXT MixerContext, @@ -1567,7 +1622,7 @@ } - /* TODO: handle alternative mixer types + apply hacks for Wave source line */ + /* TODO: apply hacks for Wave source line */ /* activate midi devices */ MMixerInitializeMidiForFilter(MixerContext, MixerList, MixerData, Topology); 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] Tue Dec 7 10:29:57 2010 @@ -306,8 +306,9 @@ { LPMIXER_INFO MixerInfo; LPMIXERLINE_EXT MixerLineSrc; - LPMIXERCONTROLW MixerControl; + LPMIXERCONTROL_EXT MixerControl; MIXER_STATUS Status; + PLIST_ENTRY Entry; ULONG Index; /* verify mixer context */ @@ -319,6 +320,20 @@ return Status; } + if (MixerLineControls->cbStruct != sizeof(MIXERLINECONTROLSW)) + { + DPRINT1("Invalid MixerLineControls cbStruct passed %lu expected %lu\n", MixerLineControls->cbStruct, sizeof(MIXERLINECONTROLSW)); + /* invalid parameter */ + return MM_STATUS_INVALID_PARAMETER; + } + + if (MixerLineControls->cbmxctrl != sizeof(MIXERCONTROLW)) + { + DPRINT1("Invalid MixerLineControls cbmxctrl passed %lu expected %lu\n", MixerLineControls->cbStruct, sizeof(MIXERLINECONTROLSW)); + /* invalid parameter */ + return MM_STATUS_INVALID_PARAMETER; + } + if ((Flags & (MIXER_OBJECTF_MIXER | MIXER_OBJECTF_HMIXER)) == MIXER_OBJECTF_MIXER) { /* caller passed mixer id */ @@ -335,12 +350,12 @@ DPRINT("MMixerGetLineControls MixerId %lu Flags %lu\n", MixerId, Flags); - if (Flags == MIXER_GETLINECONTROLSF_ALL) { /* cast to mixer info */ MixerInfo = (LPMIXER_INFO)MixerHandle; + /* get mixer line */ MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLineControls->dwLineID); if (!MixerLineSrc) @@ -349,9 +364,31 @@ DPRINT("MMixerGetLineControls Line not found %lx\n", MixerLineControls->dwLineID); return MM_STATUS_INVALID_PARAMETER; } + + if (MixerLineSrc->Line.cControls != MixerLineControls->cControls) + { + /* invalid parameter */ + DPRINT1("Invalid control count %lu expected %lu\n", MixerLineControls->cControls, MixerLineSrc->Line.cControls); + return MM_STATUS_INVALID_PARAMETER; + } + /* copy line control(s) */ - MixerContext->Copy(MixerLineControls->pamxctrl, MixerLineSrc->LineControls, min(MixerLineSrc->Line.cControls, MixerLineControls->cControls) * sizeof(MIXERCONTROLW)); - + Entry = MixerLineSrc->ControlsList.Flink; + Index = 0; + while(Entry != &MixerLineSrc->ControlsList) + { + /* get mixer control */ + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(Entry, MIXERCONTROL_EXT, Entry); + + /* copy mixer control */ + MixerContext->Copy(&MixerLineControls->pamxctrl[Index], &MixerControl->Control, sizeof(MIXERCONTROLW)); + + /* move to next */ + Entry = Entry->Flink; + + /* increment mixer control offset */ + Index++; + } return MM_STATUS_SUCCESS; } else if (Flags == MIXER_GETLINECONTROLSF_ONEBYTYPE) @@ -374,19 +411,23 @@ ASSERT(MixerLineControls->cbmxctrl == sizeof(MIXERCONTROLW)); ASSERT(MixerLineControls->pamxctrl != NULL); - Index = 0; - for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) - { - DPRINT1("dwControlType %x\n", MixerLineSrc->LineControls[Index].dwControlType); - if (MixerLineControls->dwControlType == MixerLineSrc->LineControls[Index].dwControlType) + Entry = MixerLineSrc->ControlsList.Flink; + while(Entry != &MixerLineSrc->ControlsList) + { + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(Entry, MIXERCONTROL_EXT, Entry); + if (MixerLineControls->dwControlType == MixerControl->Control.dwControlType) { /* found a control with that type */ - MixerContext->Copy(MixerLineControls->pamxctrl, &MixerLineSrc->LineControls[Index], sizeof(MIXERCONTROLW)); + MixerContext->Copy(MixerLineControls->pamxctrl, &MixerControl->Control, sizeof(MIXERCONTROLW)); return MM_STATUS_SUCCESS; } - } - DPRINT("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", MixerLineControls->dwControlType, MixerLineControls->dwLineID, MixerLineSrc->Line.cControls); - return MM_STATUS_UNSUCCESSFUL; + + /* move to next entry */ + Entry = Entry->Flink; + } + + DPRINT("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", MixerLineControls->dwControlType, MixerLineControls->dwLineID, MixerLineSrc->Line.cControls); + return MM_STATUS_UNSUCCESSFUL; } else if (Flags == MIXER_GETLINECONTROLSF_ONEBYID) { @@ -406,10 +447,10 @@ ASSERT(MixerLineControls->cbmxctrl == sizeof(MIXERCONTROLW)); ASSERT(MixerLineControls->pamxctrl != NULL); - DPRINT("MMixerGetLineControls ControlID %lx ControlType %lx Name %S\n", MixerControl->dwControlID, MixerControl->dwControlType, MixerControl->szName); + DPRINT("MMixerGetLineControls ControlID %lx ControlType %lx Name %S\n", MixerControl->Control.dwControlID, MixerControl->Control.dwControlType, MixerControl->Control.szName); /* copy the controls */ - MixerContext->Copy(MixerLineControls->pamxctrl, MixerControl, sizeof(MIXERCONTROLW)); + MixerContext->Copy(MixerLineControls->pamxctrl, &MixerControl->Control, sizeof(MIXERCONTROLW)); MixerLineControls->pamxctrl->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; MixerLineControls->pamxctrl->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; @@ -431,7 +472,7 @@ ULONG NodeId; LPMIXER_INFO MixerInfo; LPMIXERLINE_EXT MixerLine; - LPMIXERCONTROLW MixerControl; + LPMIXERCONTROL_EXT MixerControl; /* verify mixer context */ Status = MMixerVerifyContext(MixerContext); @@ -439,6 +480,7 @@ if (Status != MM_STATUS_SUCCESS) { /* invalid context passed */ + DPRINT1("invalid context\n"); return Status; } @@ -450,6 +492,7 @@ if (!MixerHandle) { /* invalid parameter */ + DPRINT1("invalid handle\n"); return MM_STATUS_INVALID_PARAMETER; } } @@ -464,18 +507,21 @@ if (Status != MM_STATUS_SUCCESS) { /* failed to find control id */ + DPRINT1("invalid control id %lu\n", MixerControlDetails->dwControlID); return MM_STATUS_INVALID_PARAMETER; } - switch(MixerControl->dwControlType) + DPRINT1("MMixerSetControlDetails ControlType %lx MixerControlName %S MixerLineName %S NodeID %lu\n", MixerControl->Control.dwControlType, MixerControl->Control.szName, MixerLine->Line.szName, NodeId); + switch(MixerControl->Control.dwControlType) { case MIXERCONTROL_CONTROLTYPE_MUTE: - Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo->hMixer, NodeId, MixerLine->Line.dwLineID, MixerControlDetails, TRUE); + Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo, MixerControl, MixerLine->Line.dwLineID, MixerControlDetails, TRUE); break; case MIXERCONTROL_CONTROLTYPE_VOLUME: - Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo->hMixer, NodeId, TRUE, MixerControl, MixerControlDetails, MixerLine); + Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo, NodeId, TRUE, MixerControl, MixerControlDetails, MixerLine); break; default: + ASSERT(0); Status = MM_STATUS_NOT_IMPLEMENTED; } @@ -494,7 +540,7 @@ ULONG NodeId; LPMIXER_INFO MixerInfo; LPMIXERLINE_EXT MixerLine; - LPMIXERCONTROLW MixerControl; + LPMIXERCONTROL_EXT MixerControl; /* verify mixer context */ Status = MMixerVerifyContext(MixerContext); @@ -530,19 +576,58 @@ return MM_STATUS_INVALID_PARAMETER; } - switch(MixerControl->dwControlType) + switch(MixerControl->Control.dwControlType) { case MIXERCONTROL_CONTROLTYPE_MUTE: - Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo, NodeId, MixerLine->Line.dwLineID, MixerControlDetails, FALSE); + Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo, MixerControl, MixerLine->Line.dwLineID, MixerControlDetails, FALSE); break; case MIXERCONTROL_CONTROLTYPE_VOLUME: Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo, NodeId, FALSE, MixerControl, MixerControlDetails, MixerLine); break; default: Status = MM_STATUS_NOT_IMPLEMENTED; + DPRINT1("ControlType %lu not implemented\n", MixerControl->Control.dwControlType); } return Status; +} + +VOID +MMixerPrintMixerLineControls( + IN LPMIXERLINE_EXT MixerLine) +{ + PLIST_ENTRY Entry; + LPMIXERCONTROL_EXT MixerControl; + ULONG Index = 0; + + Entry = MixerLine->ControlsList.Flink; + while(Entry != &MixerLine->ControlsList) + { + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(Entry, MIXERCONTROL_EXT, Entry); + + DPRINT1("\n"); + DPRINT1("Control Index: %lu\n", Index); + DPRINT("\n"); + DPRINT1("cbStruct %u\n", MixerControl->Control.cbStruct); + DPRINT1("dwControlID %lu\n", MixerControl->Control.dwControlID); + DPRINT1("dwControlType %lx\n", MixerControl->Control.dwControlType); + DPRINT1("fdwControl %lu\n", MixerControl->Control.fdwControl); + DPRINT1("cMultipleItems %lu\n", MixerControl->Control.cMultipleItems); + DPRINT1("szShortName %S\n", MixerControl->Control.szShortName); + DPRINT1("szName %S\n", MixerControl->Control.szName); + DPRINT1("Bounds.dwMinimum %lu\n", MixerControl->Control.Bounds.dwMinimum); + DPRINT1("Bounds.dwMaximum %lu\n", MixerControl->Control.Bounds.dwMaximum); + + DPRINT1("Metrics.Reserved[0] %lu\n", MixerControl->Control.Metrics.dwReserved[0]); + DPRINT1("Metrics.Reserved[1] %lu\n", MixerControl->Control.Metrics.dwReserved[1]); + DPRINT1("Metrics.Reserved[2] %lu\n", MixerControl->Control.Metrics.dwReserved[2]); + DPRINT1("Metrics.Reserved[3] %lu\n", MixerControl->Control.Metrics.dwReserved[3]); + DPRINT1("Metrics.Reserved[4] %lu\n", MixerControl->Control.Metrics.dwReserved[4]); + DPRINT1("Metrics.Reserved[5] %lu\n", MixerControl->Control.Metrics.dwReserved[5]); + + Entry = Entry->Flink; + Index++; + } } VOID @@ -583,6 +668,9 @@ /* get destination line */ DstMixerLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + DPRINT1("//----------------------------------------------------------------------------------------------\n"); + DPRINT1("\n"); + DPRINT1("Destination Index %lu\n", SubIndex); DPRINT1("\n"); DPRINT1("cChannels %lu\n", DstMixerLine->Line.cChannels); DPRINT1("cConnections %lu\n", DstMixerLine->Line.cConnections); @@ -601,7 +689,7 @@ 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); - + MMixerPrintMixerLineControls(DstMixerLine); for(SrcIndex = 0; SrcIndex < DstMixerLine->Line.cConnections; SrcIndex++) { @@ -610,8 +698,9 @@ /* get source line */ SrcMixerLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + DPRINT1("//==============================================================================================\n"); DPRINT1("\n"); - DPRINT1("SourceIndex: %lu\n", SrcIndex); + DPRINT1("SrcLineIndex : %lu\n", SrcIndex); DPRINT1("\n"); DPRINT1("cChannels %lu\n", SrcMixerLine->Line.cChannels); DPRINT1("cConnections %lu\n", SrcMixerLine->Line.cConnections); @@ -630,6 +719,7 @@ 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); + MMixerPrintMixerLineControls(SrcMixerLine); } } } @@ -736,7 +826,17 @@ Entry = Entry->Flink; } - MMixerPrintMixers(MixerContext, MixerList); + Entry = MixerList->MixerData.Flink; + while(Entry != &MixerList->MixerData) + { + MixerData = (LPMIXER_DATA)CONTAINING_RECORD(Entry, MIXER_DATA, Entry); + + /* now handle alternative mixer types */ + MMixerHandleAlternativeMixers(MixerContext, MixerList, MixerData, MixerData->Topology); + Entry = Entry->Flink; + } + + //MMixerPrintMixers(MixerContext, MixerList); /* done */ return MM_STATUS_SUCCESS; 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] Tue Dec 7 10:29:57 2010 @@ -55,8 +55,8 @@ ULONG PinConnectedToCount; PULONG PinConnectedTo; - ULONG Visited; + ULONG Reserved; }PIN, *PPIN; @@ -74,7 +74,6 @@ { LIST_ENTRY Entry; MIXERCAPSW MixCaps; - HANDLE hMixer; LIST_ENTRY LineList; ULONG ControlId; LIST_ENTRY EventList; @@ -83,12 +82,19 @@ typedef struct { LIST_ENTRY Entry; + MIXERCONTROLW Control; + ULONG NodeID; + HANDLE hDevice; + PVOID ExtraData; +}MIXERCONTROL_EXT, *LPMIXERCONTROL_EXT; + +typedef struct +{ + LIST_ENTRY Entry; ULONG PinId; - HANDLE hDevice; MIXERLINEW Line; - LPMIXERCONTROLW LineControls; - PULONG NodeIds; - LIST_ENTRY LineControlsExtraData; + LIST_ENTRY ControlsList; + }MIXERLINE_EXT, *LPMIXERLINE_EXT; typedef struct @@ -272,14 +278,14 @@ LPMIXER_INFO MixerInfo, DWORD dwControlID, LPMIXERLINE_EXT *MixerLine, - LPMIXERCONTROLW *MixerControl, + LPMIXERCONTROL_EXT *MixerControl, PULONG NodeId); MIXER_STATUS MMixerSetGetMuteControlDetails( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, - IN ULONG NodeId, + IN LPMIXERCONTROL_EXT MixerControl, IN ULONG dwLineID, IN LPMIXERCONTROLDETAILS MixerControlDetails, IN ULONG bSet); @@ -290,7 +296,7 @@ IN LPMIXER_INFO MixerInfo, IN ULONG NodeId, IN ULONG bSet, - LPMIXERCONTROLW MixerControl, + LPMIXERCONTROL_EXT MixerControl, IN LPMIXERCONTROLDETAILS MixerControlDetails, LPMIXERLINE_EXT MixerLine); @@ -359,6 +365,13 @@ OUT PKSPIN_DATAFLOW DataFlow, OUT PKSPIN_COMMUNICATION Communication); +VOID +MMixerHandleAlternativeMixers( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN LPMIXER_DATA MixerData, + IN PTOPOLOGY Topology); + /* topology.c */ @@ -473,6 +486,17 @@ OUT PULONG bReserved); VOID +MMixerSetTopologyPinReserved( + IN PTOPOLOGY Topology, + IN ULONG PinId); + +VOID +MMixerIsTopologyPinReserved( + IN PTOPOLOGY Topology, + IN ULONG PinId, + OUT PULONG bReserved); + +VOID MMixerGetTopologyPinCount( IN PTOPOLOGY Topology, OUT PULONG PinCount); Modified: branches/audio-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Tue Dec 7 10:29:57 2010 @@ -100,29 +100,6 @@ return NULL; } -LPMIXERCONTROL_DATA -MMixerGetMixerControlDataById( - PLIST_ENTRY ListHead, - DWORD dwControlId) -{ - PLIST_ENTRY Entry; - LPMIXERCONTROL_DATA Control; - - /* get first entry */ - Entry = ListHead->Flink; - - while(Entry != ListHead) - { - Control = (LPMIXERCONTROL_DATA)CONTAINING_RECORD(Entry, MIXERCONTROL_DATA, Entry); - DPRINT("dwSource %x dwSource %x\n", Control->dwControlID, dwControlId); - if (Control->dwControlID == dwControlId) - return Control; - - Entry = Entry->Flink; - } - return NULL; -} - LPMIXERLINE_EXT MMixerGetSourceMixerLineByLineId( LPMIXER_INFO MixerInfo, @@ -187,13 +164,13 @@ MMixerGetMixerControlById( LPMIXER_INFO MixerInfo, DWORD dwControlID, - LPMIXERLINE_EXT *MixerLine, - LPMIXERCONTROLW *MixerControl, + LPMIXERLINE_EXT *OutMixerLine, + LPMIXERCONTROL_EXT *OutMixerControl, PULONG NodeId) { - PLIST_ENTRY Entry; + PLIST_ENTRY Entry, ControlEntry; LPMIXERLINE_EXT MixerLineSrc; - ULONG Index; + LPMIXERCONTROL_EXT MixerControl; /* get first entry */ Entry = MixerInfo->LineList.Flink; @@ -202,18 +179,21 @@ { MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); - for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) - { - if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) + ControlEntry = MixerLineSrc->ControlsList.Flink; + while(ControlEntry != &MixerLineSrc->ControlsList) + { + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(ControlEntry, MIXERCONTROL_EXT, Entry); + if (MixerControl->Control.dwControlID == dwControlID) { - if (MixerLine) - *MixerLine = MixerLineSrc; - if (MixerControl) - *MixerControl = &MixerLineSrc->LineControls[Index]; + if (OutMixerLine) + *OutMixerLine = MixerLineSrc; + if (OutMixerControl) + *OutMixerControl = MixerControl; if (NodeId) - *NodeId = MixerLineSrc->NodeIds[Index]; + *NodeId = MixerControl->NodeID; return MM_STATUS_SUCCESS; } + ControlEntry = ControlEntry->Flink; } Entry = Entry->Flink; } @@ -270,7 +250,7 @@ MMixerSetGetMuteControlDetails( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, - IN ULONG NodeId, + IN LPMIXERCONTROL_EXT MixerControl, IN ULONG dwLineID, IN LPMIXERCONTROLDETAILS MixerControlDetails, IN ULONG bSet) @@ -290,7 +270,7 @@ Value = Input->fValue; /* set control details */ - Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_MUTE, 0, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerControl->hDevice, MixerControl->NodeID, bSet, KSPROPERTY_AUDIO_MUTE, 0, &Value); if (Status != MM_STATUS_SUCCESS) return Status; @@ -316,7 +296,7 @@ IN LPMIXER_INFO MixerInfo, IN ULONG NodeId, IN ULONG bSet, - LPMIXERCONTROLW MixerControl, + LPMIXERCONTROL_EXT MixerControl, IN LPMIXERCONTROLDETAILS MixerControlDetails, LPMIXERLINE_EXT MixerLine) { @@ -329,7 +309,7 @@ if (MixerControlDetails->cbDetails != sizeof(MIXERCONTROLDETAILS_SIGNED)) return MM_STATUS_INVALID_PARAMETER; - VolumeData = (LPMIXERVOLUME_DATA)MMixerGetMixerControlDataById(&MixerLine->LineControlsExtraData, MixerControl->dwControlID); + VolumeData = (LPMIXERVOLUME_DATA)MixerControl->ExtraData; if (!VolumeData) return MM_STATUS_UNSUCCESSFUL; @@ -355,12 +335,12 @@ if (bSet) { /* TODO */ - Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); - Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerControl->hDevice, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerControl->hDevice, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); } else { - Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, Channel, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerControl->hDevice, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, Channel, &Value); } if (!bSet) @@ -372,7 +352,7 @@ else { /* notify clients of a line change MM_MIXM_CONTROL_CHANGE with MixerControl->dwControlID */ - MMixerNotifyControlChange(MixerContext, MixerInfo, MM_MIXM_CONTROL_CHANGE, MixerControl->dwControlID); + MMixerNotifyControlChange(MixerContext, MixerInfo, MM_MIXM_CONTROL_CHANGE, MixerControl->Control.dwControlID); } return Status; } Modified: branches/audio-bringup/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Tue Dec 7 10:29:57 2010 @@ -1174,6 +1174,31 @@ } VOID +MMixerSetTopologyPinReserved( + IN PTOPOLOGY Topology, + IN ULONG PinId) +{ + /* sanity check */ + ASSERT(PinId < Topology->TopologyPinsCount); + + /* set reserved */ + Topology->TopologyPins[PinId].Reserved = TRUE; +} + +VOID +MMixerIsTopologyPinReserved( + IN PTOPOLOGY Topology, + IN ULONG PinId, + OUT PULONG bReserved) +{ + /* sanity check */ + ASSERT(PinId < Topology->TopologyPinsCount); + + /* get reserved status */ + *bReserved = Topology->TopologyPins[PinId].Reserved; +} + +VOID MMixerSetTopologyNodeReserved( IN PTOPOLOGY Topology, IN ULONG NodeIndex)

1 0

[akhaldi] 49966: [CMAKE] - Start working on rostests cmake integration.
by akhaldi＠svn.reactos.org 07 Dec '10

07 Dec '10

Author: akhaldi Date: Tue Dec 7 09:27:10 2010 New Revision: 49966 URL: http://svn.reactos.org/svn/reactos?rev=49966&view=rev Log: [CMAKE] - Start working on rostests cmake integration. Added: trunk/rostests/CMakeLists.txt (with props) trunk/rostests/winetests/CMakeLists.txt (with props) trunk/rostests/winetests/advapi32/CMakeLists.txt (with props) trunk/rostests/winetests/advpack/CMakeLists.txt (with props) trunk/rostests/winetests/amstream/CMakeLists.txt (with props) trunk/rostests/winetests/atl/CMakeLists.txt (with props) trunk/rostests/winetests/avifil32/CMakeLists.txt (with props) trunk/rostests/winetests/browseui/CMakeLists.txt (with props) trunk/rostests/winetests/cabinet/CMakeLists.txt (with props) trunk/rostests/winetests/comcat/CMakeLists.txt (with props) trunk/rostests/winetests/comctl32/CMakeLists.txt (with props) trunk/rostests/winetests/comdlg32/CMakeLists.txt (with props) trunk/rostests/winetests/credui/CMakeLists.txt (with props) trunk/rostests/winetests/crypt32/CMakeLists.txt (with props) trunk/rostests/winetests/cryptnet/CMakeLists.txt (with props) trunk/rostests/winetests/cryptui/CMakeLists.txt (with props) trunk/rostests/winetests/dnsapi/CMakeLists.txt (with props) trunk/rostests/winetests/dsound/CMakeLists.txt (with props) trunk/rostests/winetests/fusion/CMakeLists.txt (with props) trunk/rostests/winetests/gdi32/CMakeLists.txt (with props) trunk/rostests/winetests/gdiplus/CMakeLists.txt (with props) trunk/rostests/winetests/hlink/CMakeLists.txt (with props) trunk/rostests/winetests/icmp/CMakeLists.txt (with props) trunk/rostests/winetests/imm32/CMakeLists.txt (with props) trunk/rostests/winetests/inetcomm/CMakeLists.txt (with props) trunk/rostests/winetests/inetmib1/CMakeLists.txt (with props) trunk/rostests/winetests/iphlpapi/CMakeLists.txt (with props) trunk/rostests/winetests/itss/CMakeLists.txt (with props) trunk/rostests/winetests/jscript/CMakeLists.txt (with props) trunk/rostests/winetests/kernel32/CMakeLists.txt (with props) trunk/rostests/winetests/localspl/CMakeLists.txt (with props) trunk/rostests/winetests/localui/CMakeLists.txt (with props) trunk/rostests/winetests/lz32/CMakeLists.txt (with props) trunk/rostests/winetests/mapi32/CMakeLists.txt (with props) trunk/rostests/winetests/mlang/CMakeLists.txt (with props) trunk/rostests/winetests/msacm32/CMakeLists.txt (with props) trunk/rostests/winetests/mscms/CMakeLists.txt (with props) trunk/rostests/winetests/msctf/CMakeLists.txt (with props) Added: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=49966&… ============================================================================== --- trunk/rostests/CMakeLists.txt (added) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +#add_subdirectory(apitests) +#add_subdirectory(dibtests) +#add_subdirectory(dxtest) +#add_subdirectory(regtests) +#add_subdirectory(rosautotest) +#add_subdirectory(tests) +#add_subdirectory(win32) +add_subdirectory(winetests) Propchange: trunk/rostests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt (added) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,88 @@ + +add_subdirectory(advapi32) +add_subdirectory(advpack) +add_subdirectory(amstream) +add_subdirectory(atl) +add_subdirectory(avifil32) +add_subdirectory(browseui) +add_subdirectory(cabinet) +add_subdirectory(comcat) +add_subdirectory(comctl32) +add_subdirectory(comdlg32) +add_subdirectory(credui) +add_subdirectory(crypt32) +add_subdirectory(cryptnet) +add_subdirectory(cryptui) +add_subdirectory(dnsapi) +add_subdirectory(dsound) +add_subdirectory(fusion) +add_subdirectory(gdi32) +add_subdirectory(gdiplus) +add_subdirectory(hlink) +add_subdirectory(icmp) +add_subdirectory(imm32) +add_subdirectory(inetcomm) +add_subdirectory(inetmib1) +add_subdirectory(iphlpapi) +add_subdirectory(itss) +add_subdirectory(jscript) +add_subdirectory(kernel32) +add_subdirectory(localspl) +add_subdirectory(localui) +add_subdirectory(lz32) +add_subdirectory(mapi32) +add_subdirectory(mlang) +add_subdirectory(msacm32) +add_subdirectory(mscms) +add_subdirectory(msctf) +#add_subdirectory(mshtml) +#add_subdirectory(msi) +#add_subdirectory(mstask) +#add_subdirectory(msvcrt) +#add_subdirectory(msvcrtd) +#add_subdirectory(msvfw32) +#add_subdirectory(msxml3) +#add_subdirectory(netapi32) +#add_subdirectory(ntdll) +#add_subdirectory(ntdsapi) +#add_subdirectory(ntprint) +#add_subdirectory(odbccp32) +#add_subdirectory(ole32) +#add_subdirectory(oleacc) +#add_subdirectory(oleaut32) +#add_subdirectory(opengl32) +#add_subdirectory(pdh) +#add_subdirectory(powrprof) +#add_subdirectory(psapi) +#add_subdirectory(qmgr) +#add_subdirectory(quartz) +#add_subdirectory(rasapi32) +#add_subdirectory(riched20) +#add_subdirectory(riched32) +#add_subdirectory(rpcrt4) +#add_subdirectory(rsabase) +#add_subdirectory(rsaenh) +#add_subdirectory(schannel) +#add_subdirectory(secur32) +#add_subdirectory(serialui) +#add_subdirectory(setupapi) +#add_subdirectory(shdocvw) +#add_subdirectory(shell32) +#add_subdirectory(shlwapi) +#add_subdirectory(snmpapi) +#add_subdirectory(spoolss) +#add_subdirectory(twain_32) +#add_subdirectory(urlmon) +#add_subdirectory(user32) +#add_subdirectory(userenv) +#add_subdirectory(usp10) +#add_subdirectory(uxtheme) +#add_subdirectory(version) +#add_subdirectory(winhttp) +#add_subdirectory(wininet) +#add_subdirectory(winmm) +#add_subdirectory(wintrust) +#add_subdirectory(wlanapi) +#add_subdirectory(wldap32) +#add_subdirectory(ws2_32) +#add_subdirectory(xmllite) Propchange: trunk/rostests/winetests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/advapi32/CMakeLists.txt (added) +++ trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,25 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + cred.c + crypt.c + crypt_lmhash.c + crypt_md4.c + crypt_md5.c + crypt_sha.c + eventlog.c + lsa.c + registry.c + security.c + service.c + testlist.c) + +add_executable(advapi32_winetest ${SOURCE}) + +target_link_libraries(advapi32_winetest uuid) + +set_module_type(advapi32_winetest win32cui) +add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/advapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/CMakeLi… ============================================================================== --- trunk/rostests/winetests/advpack/CMakeLists.txt (added) +++ trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,17 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + advpack.c + files.c + install.c + testlist.c) + +add_executable(advpack_winetest ${SOURCE}) + +target_link_libraries(advpack_winetest wine) + +set_module_type(advpack_winetest win32cui) +add_importlibs(advpack_winetest cabinet advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/advpack/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/CMakeL… ============================================================================== --- trunk/rostests/winetests/amstream/CMakeLists.txt (added) +++ trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,6 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_executable(amstream_winetest amstream.c testlist.c) +target_link_libraries(amstream_winetest wine uuid) +set_module_type(amstream_winetest win32cui) +add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/amstream/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt (added) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,14 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + atl_ax.c + module.c + testlist.c) + +add_executable(atl_winetest ${SOURCE}) + +target_link_libraries(atl_winetest wine uuid) + +set_module_type(atl_winetest win32cui) +add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/atl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/CMakeL… ============================================================================== --- trunk/rostests/winetests/avifil32/CMakeLists.txt (added) +++ trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,6 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_executable(avifil32_winetest api.c testlist.c) +target_link_libraries(avifil32_winetest wine) +set_module_type(avifil32_winetest win32cui) +add_importlibs(avifil32_winetest avifil32 msvcrt kernel32) Propchange: trunk/rostests/winetests/avifil32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/CMakeL… ============================================================================== --- trunk/rostests/winetests/browseui/CMakeLists.txt (added) +++ trunk/rostests/winetests/browseui/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(browseui_winetest autocomplete.c testlist.c) +target_link_libraries(browseui_winetest wine uuid) +set_module_type(browseui_winetest win32cui) +add_importlibs(browseui_winetest user32 ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/browseui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cabinet/CMakeLists.txt (added) +++ trunk/rostests/winetests/cabinet/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(cabinet_winetest extract.c fdi.c testlist.c) +target_link_libraries(cabinet_winetest wine) +set_module_type(cabinet_winetest win32cui) +add_importlibs(cabinet_winetest cabinet msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/cabinet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/CMakeLis… ============================================================================== --- trunk/rostests/winetests/comcat/CMakeLists.txt (added) +++ trunk/rostests/winetests/comcat/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(comcat_winetest comcat.c testlist.c) +target_link_libraries(comcat_winetest wine uuid) +set_module_type(comcat_winetest win32cui) +add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/comcat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt (added) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,40 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +remove_definitions(-D_WIN32_IE=0x600) +add_definitions(-D_WIN32_IE=0x500) + +list(APPEND SOURCE + comboex.c + datetime.c + dpa.c + header.c + imagelist.c + ipaddress.c + listview.c + misc.c + monthcal.c + mru.c + progress.c + propsheet.c + rebar.c + status.c + subclass.c + tab.c + toolbar.c + tooltips.c + trackbar.c + treeview.c + updown.c + testlist.c + rsrc.rc) + +add_executable(comctl32_winetest ${SOURCE}) +target_link_libraries(comctl32_winetest wine) +set_module_type(comctl32_winetest win32cui) +add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/comctl32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comdlg32/CMakeLists.txt (added) +++ trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + filedlg.c + fontdlg.c + printdlg.c + testlist.c + rsrc.rc) + +add_executable(comdlg32_winetest ${SOURCE}) +target_link_libraries(comdlg32_winetest wine) +set_module_type(comdlg32_winetest win32cui) +add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/comdlg32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/CMakeLis… ============================================================================== --- trunk/rostests/winetests/credui/CMakeLists.txt (added) +++ trunk/rostests/winetests/credui/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(credui_winetest credui.c testlist.c) +target_link_libraries(credui_winetest wine) +set_module_type(credui_winetest win32cui) +add_importlibs(credui_winetest credui msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/credui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/crypt32/CMakeLists.txt (added) +++ trunk/rostests/winetests/crypt32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,27 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + base64.c + cert.c + chain.c + crl.c + ctl.c + encode.c + main.c + message.c + msg.c + object.c + oid.c + protectdata.c + sip.c + store.c + str.c + testlist.c) + +add_executable(crypt32_winetest ${SOURCE}) +target_link_libraries(crypt32_winetest wine) +set_module_type(crypt32_winetest win32cui) +add_importlibs(crypt32_winetest crypt32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/crypt32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/CMakeL… ============================================================================== --- trunk/rostests/winetests/cryptnet/CMakeLists.txt (added) +++ trunk/rostests/winetests/cryptnet/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(cryptnet_winetest cryptnet.c testlist.c) +target_link_libraries(cryptnet_winetest wine) +set_module_type(cryptnet_winetest win32cui) +add_importlibs(cryptnet_winetest cryptnet crypt32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/cryptnet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cryptui/CMakeLists.txt (added) +++ trunk/rostests/winetests/cryptui/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(cryptui_winetest cryptui.c testlist.c) +target_link_libraries(cryptui_winetest wine) +set_module_type(cryptui_winetest win32cui) +add_importlibs(cryptui_winetest cryptui crypt32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/cryptui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dnsapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/dnsapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(dnsapi_winetest name.c record.c testlist.c) +target_link_libraries(dnsapi_winetest wine) +set_module_type(dnsapi_winetest win32cui) +add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/dnsapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dsound/CMakeLists.txt (added) +++ trunk/rostests/winetests/dsound/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,19 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + capture.c + ds3d8.c + ds3d.c + dsound8.c + dsound.c + duplex.c + propset.c + testlist.c) + +add_executable(dsound_winetest ${SOURCE}) +target_link_libraries(dsound_winetest wine uuid dxguid) +set_module_type(dsound_winetest win32cui) +add_importlibs(dsound_winetest dsound ole32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/dsound/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/CMakeLis… ============================================================================== --- trunk/rostests/winetests/fusion/CMakeLists.txt (added) +++ trunk/rostests/winetests/fusion/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + asmcache.c + asmenum.c + asmname.c + fusion.c + testlist.c) + +add_executable(fusion_winetest ${SOURCE}) +target_link_libraries(fusion_winetest wine) +set_module_type(fusion_winetest win32cui) +add_importlibs(fusion_winetest user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/fusion/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt (added) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,24 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + bitmap.c + brush.c + clipping.c + dc.c + gdiobj.c + generated.c + icm.c + font.c + mapping.c + metafile.c + palette.c + path.c + pen.c + testlist.c) + +add_executable(gdi32_winetest ${SOURCE}) +set_module_type(gdi32_winetest win32cui) +add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/gdi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/CMakeLi… ============================================================================== --- trunk/rostests/winetests/gdiplus/CMakeLists.txt (added) +++ trunk/rostests/winetests/gdiplus/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,23 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + brush.c + customlinecap.c + font.c + graphics.c + graphicspath.c + image.c + matrix.c + pathiterator.c + pen.c + region.c + stringformat.c + testlist.c) + +add_executable(gdiplus_winetest ${SOURCE}) +target_link_libraries(gdiplus_winetest wine) +set_module_type(gdiplus_winetest win32cui) +add_importlibs(gdiplus_winetest gdiplus user32 gdi32 ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/gdiplus/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/CMakeList… ============================================================================== --- trunk/rostests/winetests/hlink/CMakeLists.txt (added) +++ trunk/rostests/winetests/hlink/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,14 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + browse_ctx.c + hlink.c + testlist.c) + +add_executable(hlink_winetest ${SOURCE}) +target_link_libraries(hlink_winetest wine uuid) +set_module_type(hlink_winetest win32cui) +add_importlibs(hlink_winetest hlink ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/hlink/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/icmp/CMakeLists… ============================================================================== --- trunk/rostests/winetests/icmp/CMakeLists.txt (added) +++ trunk/rostests/winetests/icmp/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(icmp_winetest icmp.c testlist.c) +target_link_libraries(icmp_winetest wine uuid) +set_module_type(icmp_winetest win32cui) +add_importlibs(icmp_winetest icmp msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/icmp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/CMakeList… ============================================================================== --- trunk/rostests/winetests/imm32/CMakeLists.txt (added) +++ trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(imm32_winetest imm32.c testlist.c) +target_link_libraries(imm32_winetest wine) +set_module_type(imm32_winetest win32cui) +add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/imm32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetcomm/CMakeLists.txt (added) +++ trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,14 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + mimeintl.c + mimeole.c + testlist.c) + +add_executable(inetcomm_winetest ${SOURCE}) +target_link_libraries(inetcomm_winetest wine) +set_module_type(inetcomm_winetest win32cui) +add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/inetcomm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/inetmib1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetmib1/CMakeLists.txt (added) +++ trunk/rostests/winetests/inetmib1/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(inetmib1_winetest main.c testlist.c) +target_link_libraries(inetmib1_winetest wine) +set_module_type(inetmib1_winetest win32cui) +add_importlibs(inetmib1_winetest snmpapi msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/inetmib1/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/iphlpapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/iphlpapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(iphlpapi_winetest iphlpapi.c testlist.c) +target_link_libraries(iphlpapi_winetest wine) +set_module_type(iphlpapi_winetest win32cui) +add_importlibs(iphlpapi_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/iphlpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/CMakeLists… ============================================================================== --- trunk/rostests/winetests/itss/CMakeLists.txt (added) +++ trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(itss_winetest protocol.c testlist.c rsrc.rc) +target_link_libraries(itss_winetest wine) +set_module_type(itss_winetest win32cui) +add_importlibs(itss_winetest ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/itss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/CMakeLi… ============================================================================== --- trunk/rostests/winetests/jscript/CMakeLists.txt (added) +++ trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + activex.c + jscript.c + run.c + testlist.c + rsrc.rc) + +add_executable(jscript_winetest ${SOURCE}) +target_link_libraries(jscript_winetest wine) +set_module_type(jscript_winetest win32cui) +add_importlibs(jscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/jscript/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt (added) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,47 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + actctx.c + alloc.c + atom.c + change.c + codepage.c + comm.c + console.c + debugger.c + directory.c + drive.c + environ.c + fiber.c + file.c + format_msg.c + #generated.c + heap.c + interlck.c + loader.c + locale.c + mailslot.c + module.c + path.c + pipe.c + process.c + profile.c + resource.c + sync.c + thread.c + time.c + timer.c + toolhelp.c + version.c + virtual.c + volume.c + testlist.c + resource.rc) + +add_executable(kernel32_winetest ${SOURCE}) +target_link_libraries(kernel32_winetest wine) +set_module_type(kernel32_winetest win32cui) +add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/kernel32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/CMakeL… ============================================================================== --- trunk/rostests/winetests/localspl/CMakeLists.txt (added) +++ trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,10 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_executable(localspl_winetest localmon.c testlist.c) +target_link_libraries(localspl_winetest wine) +set_module_type(localspl_winetest win32cui) +add_importlibs(localspl_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/localspl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/CMakeLi… ============================================================================== --- trunk/rostests/winetests/localui/CMakeLists.txt (added) +++ trunk/rostests/winetests/localui/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,10 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_executable(localui_winetest localui.c testlist.c) +target_link_libraries(localui_winetest wine) +set_module_type(localui_winetest win32cui) +add_importlibs(localui_winetest winspool msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/localui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/CMakeLists… ============================================================================== --- trunk/rostests/winetests/lz32/CMakeLists.txt (added) +++ trunk/rostests/winetests/lz32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(lz32_winetest lzexpand_main.c testlist.c) +target_link_libraries(lz32_winetest wine) +set_module_type(lz32_winetest win32cui) +add_importlibs(lz32_winetest lz32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/lz32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mapi32/CMakeLists.txt (added) +++ trunk/rostests/winetests/mapi32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,15 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + imalloc.c + prop.c + util.c + testlist.c) + +add_executable(mapi32_winetest ${SOURCE}) +target_link_libraries(mapi32_winetest wine uuid) +set_module_type(mapi32_winetest win32cui) +add_importlibs(mapi32_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/mapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/CMakeList… ============================================================================== --- trunk/rostests/winetests/mlang/CMakeLists.txt (added) +++ trunk/rostests/winetests/mlang/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(mlang_winetest mlang.c testlist.c) +target_link_libraries(mlang_winetest wine uuid) +set_module_type(mlang_winetest win32cui) +add_importlibs(mlang_winetest oleaut32 ole32 gdi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/mlang/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msacm32/CMakeLists.txt (added) +++ trunk/rostests/winetests/msacm32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(msacm32_winetest msacm.c testlist.c) +target_link_libraries(msacm32_winetest wine) +set_module_type(msacm32_winetest win32cui) +add_importlibs(msacm32_winetest msacm32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/msacm32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/CMakeList… ============================================================================== --- trunk/rostests/winetests/mscms/CMakeLists.txt (added) +++ trunk/rostests/winetests/mscms/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(mscms_winetest profile.c testlist.c) +target_link_libraries(mscms_winetest wine) +set_module_type(mscms_winetest win32cui) +add_importlibs(mscms_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/mscms/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/CMakeList… ============================================================================== --- trunk/rostests/winetests/msctf/CMakeLists.txt (added) +++ trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(msctf_winetest inputprocessor.c testlist.c) +target_link_libraries(msctf_winetest wine) +set_module_type(msctf_winetest win32cui) +add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/msctf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 49965: [AUDIO-BRINGUP] - Implement support for retrieving mux mixer controls - Implement support for on/off controls - Store logical pins for nodes connecting to another nodes. Current...
by janderwald＠svn.reactos.org 06 Dec '10

06 Dec '10

Author: janderwald Date: Mon Dec 6 16:00:06 2010 New Revision: 49965 URL: http://svn.reactos.org/svn/reactos?rev=49965&view=rev Log: [AUDIO-BRINGUP] - Implement support for retrieving mux mixer controls - Implement support for on/off controls - Store logical pins for nodes connecting to another nodes. Currently not yet used Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/priv.h branches/audio-bringup/lib/drivers/sound/mmixer/topology.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 16:00:06 2010 @@ -53,19 +53,7 @@ MixerControl->dwControlType = MMixerGetControlTypeFromTopologyNode(NodeType); MixerControl->fdwControl = MIXERCONTROL_CONTROLF_UNIFORM; /* FIXME */ - MixerControl->cMultipleItems = 0; /* FIXME */ - - if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) - { - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 1; - } - else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) - { - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 0xFFFF; - MixerControl->Metrics.cSteps = 0xC0; /* FIXME */ - } + MixerControl->cMultipleItems = 0; /* setup request to retrieve name */ Node.NodeId = NodeIndex; @@ -104,28 +92,46 @@ } MixerInfo->ControlId++; -#if 0 + if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUX) { - KSNODEPROPERTY Property; - ULONG PinId = 2; - - /* setup the request */ - RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY)); - - Property.NodeId = NodeIndex; - Property.Property.Id = KSPROPERTY_AUDIO_MUX_SOURCE; - Property.Property.Flags = KSPROPERTY_TYPE_SET; - Property.Property.Set = KSPROPSETID_Audio; - - /* get node volume level info */ - Status = MixerContext->Control(hDevice, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY), (PVOID)&PinId, sizeof(ULONG), &BytesReturned); - - DPRINT1("Status %x NodeIndex %u PinId %u\n", Status, NodeIndex, PinId); - //DbgBreakPoint(); - }else -#endif - if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + ULONG NodesCount; + PULONG Nodes; + + /* allocate topology nodes array */ + Status = MMixerAllocateTopologyNodeArray(MixerContext, Topology, &Nodes); + + if (Status != MM_STATUS_SUCCESS) + { + /* out of memory */ + return STATUS_NO_MEMORY; + } + + /* get connected node count */ + MMixerGetNextNodesFromNodeIndex(MixerContext, Topology, NodeIndex, TRUE, &NodesCount, Nodes); + + /* TODO */ + MixerContext->Free(Nodes); + + /* setup mux bounds */ + MixerControl->Bounds.dwMinimum = 0; + MixerControl->Bounds.dwMaximum = NodesCount - 1; + MixerControl->Metrics.dwReserved[0] = NodesCount; + MixerControl->cMultipleItems = NodesCount; + MixerControl->fdwControl |= MIXERCONTROL_CONTROLF_MULTIPLE; + } + else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + MixerControl->Bounds.dwMinimum = 0; + MixerControl->Bounds.dwMaximum = 1; + } + else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_ONOFF) + { + /* only needs to set bounds */ + MixerControl->Bounds.dwMinimum = 0; + MixerControl->Bounds.dwMaximum = 1; + } + else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { KSNODEPROPERTY_AUDIO_CHANNEL Property; ULONG Length; @@ -133,6 +139,10 @@ PKSPROPERTY_MEMBERSHEADER Members; PKSPROPERTY_STEPPING_LONG Range; + MixerControl->Bounds.dwMinimum = 0; + MixerControl->Bounds.dwMaximum = 0xFFFF; + MixerControl->Metrics.cSteps = 0xC0; /* FIXME */ + Length = sizeof(KSPROPERTY_DESCRIPTION) + sizeof(KSPROPERTY_MEMBERSHEADER) + sizeof(KSPROPERTY_STEPPING_LONG); Desc = (PKSPROPERTY_DESCRIPTION)MixerContext->Alloc(Length); ASSERT(Desc); @@ -142,7 +152,7 @@ Property.NodeProperty.NodeId = NodeIndex; Property.NodeProperty.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL; - Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT; + Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY; Property.NodeProperty.Property.Set = KSPROPSETID_Audio; /* get node volume level info */ 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] Mon Dec 6 16:00:06 2010 @@ -27,6 +27,7 @@ ULONG NodeConnectedFromCount; struct __TOPOLOGY_NODE__ ** NodeConnectedFrom; + PULONG LogicalPinNodeConnectedFrom; ULONG PinConnectedFromCount; PULONG PinConnectedFrom; @@ -53,6 +54,7 @@ ULONG PinConnectedToCount; PULONG PinConnectedTo; + ULONG Visited; }PIN, *PPIN; Modified: branches/audio-bringup/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Mon Dec 6 16:00:06 2010 @@ -264,7 +264,9 @@ { PTOPOLOGY_NODE InNode, OutNode; PTOPOLOGY_NODE * NewNodes; + PULONG NewLogicalPinNodeConnectedFrom; ULONG Count; + ULONG LogicalPinId; /* sanity checks */ ASSERT(Topology->TopologyNodesCount > Connection->ToNode); @@ -274,6 +276,9 @@ InNode = &Topology->TopologyNodes[Connection->FromNode]; OutNode = &Topology->TopologyNodes[Connection->ToNode]; + /* get logical pin node id */ + LogicalPinId = Connection->ToNodePin; + /* get existing count */ Count = OutNode->NodeConnectedFromCount; @@ -286,20 +291,41 @@ return MM_STATUS_NO_MEMORY; } + /* allocate logical pin nodes array */ + NewLogicalPinNodeConnectedFrom = MixerContext->Alloc((Count + 1) * sizeof(ULONG)); + if (!NewLogicalPinNodeConnectedFrom) + { + /* out of memory */ + MixerContext->Free(NewNodes); + return MM_STATUS_NO_MEMORY; + } + if (Count) { /* copy existing nodes */ MixerContext->Copy(NewNodes, OutNode->NodeConnectedFrom, sizeof(PTOPOLOGY) * Count); + /* copy existing logical pin node array */ + MixerContext->Copy(NewLogicalPinNodeConnectedFrom, OutNode->LogicalPinNodeConnectedFrom, sizeof(ULONG) * Count); + /* release old nodes array */ MixerContext->Free(OutNode->NodeConnectedFrom); + + /* release old logical pin node array */ + MixerContext->Free(OutNode->LogicalPinNodeConnectedFrom); } /* add new topology node */ NewNodes[OutNode->NodeConnectedFromCount] = InNode; + /* add logical node id */ + NewLogicalPinNodeConnectedFrom[OutNode->NodeConnectedFromCount] = LogicalPinId; + /* replace old nodes array */ OutNode->NodeConnectedFrom = NewNodes; + + /* replace old logical pin node array */ + OutNode->LogicalPinNodeConnectedFrom = NewLogicalPinNodeConnectedFrom; /* increment nodes count */ OutNode->NodeConnectedFromCount++;

1 0

[fireball] 49964: - Adjust SWM to actually behave like a window manager which user32/server expects. [2/2] Changes briefly: * A window is created as a hidden window by default . * When a window is ...
by fireball＠svn.reactos.org 06 Dec '10

06 Dec '10

Author: fireball Date: Mon Dec 6 14:16:20 2010 New Revision: 49964 URL: http://svn.reactos.org/svn/reactos?rev=49964&view=rev Log: - Adjust SWM to actually behave like a window manager which user32/server expects. [2/2] Changes briefly: * A window is created as a hidden window by default . * When a window is being made visible zorder doesn't change (it's not moved to foreground automatically anymore). Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Mon Dec 6 14:16:20 2010 @@ -356,7 +356,8 @@ Win->Window.bottom = WindowRect->bottom; Win->Visible = create_empty_region(); - set_region_rect(Win->Visible, &Win->Window); + Win->Hidden = TRUE; + //set_region_rect(Win->Visible, &Win->Window); /* Set window's flags */ if (ex_style & WS_EX_TOPMOST) Win->Topmost = TRUE; @@ -375,9 +376,9 @@ } /* Now ensure it is visible on screen */ - SwmInvalidateRegion(Win, Win->Visible, &Win->Window); - - SwmClipAllWindows(); + //SwmInvalidateRegion(Win, Win->Visible, &Win->Window); + + //SwmClipAllWindows(); //SwmDumpWindows(); @@ -855,6 +856,7 @@ DPRINT("Unhiding %x, rect (%d,%d)-(%d,%d)\n", Win->hwnd, Win->Window.left, Win->Window.top, Win->Window.right, Win->Window.bottom); Win->Hidden = FALSE; +#if 0 /* Make it topmost window if needed */ if (!(SwpFlags & SWP_NOZORDER)) { @@ -864,6 +866,7 @@ /* Add it to the head of the list */ InsertHeadList(&SwmWindows, &Win->Entry); } +#endif /* Calculate visible regions for all windows */ SwmClipAllWindows();

1 0

[fireball] 49963: - Move to a more formalized window manager interaction in winent. Based on code from winex11.drv. [1/2] - As a result, windows should appear and hide correctly, as expected by the...
by fireball＠svn.reactos.org 06 Dec '10

06 Dec '10

Author: fireball Date: Mon Dec 6 14:13:08 2010 New Revision: 49963 URL: http://svn.reactos.org/svn/reactos?rev=49963&view=rev Log: - Move to a more formalized window manager interaction in winent. Based on code from winex11.drv. [1/2] - As a result, windows should appear and hide correctly, as expected by the core user32/server code. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/dll/win32/winent.drv/wnd.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Mon Dec 6 14:13:08 2010 @@ -583,11 +583,11 @@ if (hwnd) { /* Capturing */ - FIXME("Capture set for hwnd %x\n", hwnd); + TRACE("Capture set for hwnd %x\n", hwnd); } else { - FIXME("Capture released\n"); + TRACE("Capture released\n"); } } @@ -628,7 +628,27 @@ void CDECL RosDrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { - UNIMPLEMENTED; + struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); + + if (!data) return; + if (parent == old_parent) return; + + if (parent != GetDesktopWindow()) /* a child window */ + { + if (old_parent == GetDesktopWindow()) + { + /* destroy the old windows */ + //destroy_whole_window( data, FALSE ); + //destroy_icon_window( data ); + FIXME("Should destroy hwnd %x\n", data->hwnd); + } + } + else /* new top level window */ + { + /* FIXME: we ignore errors since we can't really recover anyway */ + //create_whole_window( data ); + FIXME("Should create a new whole window for hwnd %x\n", data->hwnd); + } } int CDECL RosDrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) @@ -658,6 +678,11 @@ /* Do some magic... */ TRACE("Window %x is being made visible1\n", hwnd); + + if (data->whole_window && is_window_rect_mapped( &data->window_rect )) + { + if (!data->mapped) map_window( data, style->styleNew ); + } } if (offset == GWL_STYLE && (changed & WS_DISABLED)) @@ -737,14 +762,16 @@ const RECT *window_rect, const RECT *rectClient, const RECT *visible_rect, const RECT *valid_rects ) { - RECT old_whole_rect, old_client_rect; + RECT old_whole_rect, old_client_rect, old_window_rect; struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); + DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); if (!data) return; TRACE( "win %x pos changed. new vis rect %s, old whole rect %s, swp_flags %x insert_after %x\n", hwnd, wine_dbgstr_rect(visible_rect), wine_dbgstr_rect(&data->whole_rect), swp_flags, insert_after ); + old_window_rect = data->window_rect; old_whole_rect = data->whole_rect; old_client_rect = data->client_rect; data->window_rect = *window_rect; @@ -778,18 +805,38 @@ if (!data->whole_window) return; - /* Sync position change */ - if (!(swp_flags & SWP_NOREDRAW)) // HACK: When removing this, explorer's start menu starts to appear partially. Investigate! - { - /* SWM: Change windows position */ - SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect, insert_after, swp_flags); + /* Sync window position with the SWM */ + sync_window_position( data, swp_flags, + &old_window_rect, &old_whole_rect, &old_client_rect ); + + if (data->mapped) + { + if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || + (!is_window_rect_mapped( window_rect ) && is_window_rect_mapped( &old_window_rect ))) + unmap_window( data ); } /* Pass show/hide information to the window manager */ - if (swp_flags & SWP_SHOWWINDOW) - SwmShowWindow(hwnd, TRUE, swp_flags); - else if (swp_flags & SWP_HIDEWINDOW) - SwmShowWindow(hwnd, FALSE, swp_flags); + if ((new_style & WS_VISIBLE) && + ((new_style & WS_MINIMIZE) || is_window_rect_mapped( window_rect ))) + { + //if (!data->mapped || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) + //set_wm_hints( display, data ); + + if (!data->mapped) + { + map_window( data, new_style ); + } + else if ((swp_flags & SWP_STATECHANGED) && (!data->iconic != !(new_style & WS_MINIMIZE))) + { + data->iconic = (new_style & WS_MINIMIZE) != 0; + FIXME( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); + //if (data->iconic) + // XIconifyWindow( display, data->whole_window, DefaultScreen(display) ); + //else if (is_window_rect_mapped( rectWindow )) + // XMapWindow( display, data->whole_window ); + } + } } /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Mon Dec 6 14:13:08 2010 @@ -37,6 +37,9 @@ RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ HCURSOR cursor; /* current cursor */ + BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ + BOOL iconic : 1; /* is window in iconic state? */ + BOOL shaped : 1; /* is window using a custom region shape? */ }; /* clipboard.c */ @@ -84,3 +87,9 @@ struct ntdrv_win_data *NTDRV_create_desktop_win_data( HWND hwnd ); void NTDRV_destroy_win_data( HWND hwnd ); VOID CDECL RosDrv_UpdateZOrder(HWND hwnd, RECT *rect); +void map_window( struct ntdrv_win_data *data, DWORD new_style ); +void unmap_window( struct ntdrv_win_data *data ); +BOOL is_window_rect_mapped( const RECT *rect ); +void sync_window_position( struct ntdrv_win_data *data, + UINT swp_flags, const RECT *old_window_rect, + const RECT *old_whole_rect, const RECT *old_client_rect ); Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Mon Dec 6 14:13:08 2010 @@ -194,5 +194,95 @@ SwmRemoveWindow( hwnd ); } +/*********************************************************************** + * map_window + */ +void map_window( struct ntdrv_win_data *data, DWORD new_style ) +{ + TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); + + SwmShowWindow( data->hwnd, TRUE, 0); + + data->mapped = TRUE; + data->iconic = (new_style & WS_MINIMIZE) != 0; +} + + +/*********************************************************************** + * unmap_window + */ +void unmap_window( struct ntdrv_win_data *data ) +{ + TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); + + SwmShowWindow( data->hwnd, FALSE, 0); + + data->mapped = FALSE; + //data->net_wm_state = 0; +} + +/*********************************************************************** + * is_window_rect_mapped + * + * Check if the SWM whole window should be mapped based on its rectangle + */ +BOOL is_window_rect_mapped( const RECT *rect ) +{ + /* don't map if rect is off-screen */ + /*if (rect->left >= virtual_screen_rect.right || + rect->top >= virtual_screen_rect.bottom || + rect->right <= virtual_screen_rect.left || + rect->bottom <= virtual_screen_rect.top) + return FALSE;*/ + + return TRUE; +} + +/*********************************************************************** + * sync_window_position + * + * Synchronize the SWM window position with the Windows one + */ +void sync_window_position( struct ntdrv_win_data *data, + UINT swp_flags, const RECT *old_window_rect, + const RECT *old_whole_rect, const RECT *old_client_rect ) +{ + SwmPosChanged(data->hwnd, &data->whole_rect, old_whole_rect, NULL, swp_flags); + + if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) + { + /* find window that this one must be after */ + HWND prev = GetWindow( data->hwnd, GW_HWNDPREV ); + while (prev && !(GetWindowLongW( prev, GWL_STYLE ) & WS_VISIBLE)) + prev = GetWindow( prev, GW_HWNDPREV ); + if (!prev) /* top child */ + { + /* Bring this window to foreground */ + SwmSetForeground(data->hwnd); + } + /* should use stack_mode Below but most window managers don't get it right */ + /* and Above with a sibling doesn't work so well either, so we ignore it */ + } + +#ifdef HAVE_LIBXSHAPE + if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) + sync_window_region( display, data, (HRGN)1 ); + if (data->shaped) + { + int old_x_offset = old_window_rect->left - old_whole_rect->left; + int old_y_offset = old_window_rect->top - old_whole_rect->top; + int new_x_offset = data->window_rect.left - data->whole_rect.left; + int new_y_offset = data->window_rect.top - data->whole_rect.top; + if (old_x_offset != new_x_offset || old_y_offset != new_y_offset) + XShapeOffsetShape( display, data->whole_window, ShapeBounding, + new_x_offset - old_x_offset, new_y_offset - old_y_offset ); + } +#endif + + TRACE( "win %p/%lx pos %d,%d,%dx%d\n", + data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top, + data->whole_rect.right - data->whole_rect.left, + data->whole_rect.bottom - data->whole_rect.top ); +} /* EOF */

1 0

[gadamopoulos] 49962: [win32k] - In FNID_SENDMESSAGECALLBACK use SEH before accesing the user-mode buffer
by gadamopoulos＠svn.reactos.org 06 Dec '10

06 Dec '10

Author: gadamopoulos Date: Mon Dec 6 12:07:05 2010 New Revision: 49962 URL: http://svn.reactos.org/svn/reactos?rev=49962&view=rev Log: [win32k] - In FNID_SENDMESSAGECALLBACK use SEH before accesing the user-mode buffer 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] Mon Dec 6 12:07:05 2010 @@ -2175,14 +2175,23 @@ break; case FNID_SENDMESSAGECALLBACK: { - PCALL_BACK_INFO CallBackInfo = (PCALL_BACK_INFO)ResultInfo; + CALL_BACK_INFO CallBackInfo; ULONG_PTR uResult; - - if (!CallBackInfo) - break; + + _SEH2_TRY + { + ProbeForRead((PVOID)ResultInfo, sizeof(CALL_BACK_INFO), 1); + RtlCopyMemory(&CallBackInfo, (PVOID)ResultInfo, sizeof(CALL_BACK_INFO)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + _SEH2_YIELD(break); + } + _SEH2_END; if (!co_IntSendMessageWithCallBack(hWnd, Msg, wParam, lParam, - CallBackInfo->CallBack, CallBackInfo->Context, &uResult)) + CallBackInfo.CallBack, CallBackInfo.Context, &uResult)) { DPRINT1("Callback failure!\n"); }

1 0

[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

← Newer
1
...
26
27
28
29
30
31
32
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010