Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 49991: fix video memory lenght issue in VBEVideoShareVideoMemmory but few case itcan still map wrong range (outside the video ram)
by greatlrd＠svn.reactos.org 09 Dec '10

09 Dec '10

Author: greatlrd Date: Thu Dec 9 07:38:52 2010 New Revision: 49991 URL: http://svn.reactos.org/svn/reactos?rev=49991&view=rev Log: fix video memory lenght issue in VBEVideoShareVideoMemmory but few case itcan still map wrong range (outside the video ram) Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/mi… ============================================================================== --- branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Thu Dec 9 07:38:52 2010 @@ -868,28 +868,31 @@ ULONG sharedViewSize; BOOLEAN retvalue; ULONG inIoSpace; - + /* in ms ddk xp it have two flag that are use full for us here VIDEO_MEMORY_SPACE_USER_MODE or VIDEO_MEMORY_SPACE_P6CACHE the ddk say VIDEO_MEMORY_SPACE_P6CACHE does not care if it user mode or kmode memory. But we want be 100% sure it is vitual user mode memory adddress we mappin from kmode video memmory. */ - inIoSpace = VIDEO_MEMORY_SPACE_USER_MODE; - - if (DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].ModeAttributes & VBE_MODEATTR_LINEAR) + + if ( ((DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].ModeAttributes & VBE_MODEATTR_LINEAR) != VBE_MODEATTR_LINEAR) || + (pShareMemory->ViewOffset > VBEDeviceExtension->VbeInfo.TotalMemory) || + ((pShareMemory->ViewOffset + pShareMemory->ViewSize) > VBEDeviceExtension->VbeInfo.TotalMemory) ) + { + retvalue = FALSE; + } + else { StatusBlock->Information = sizeof(VIDEO_SHARE_MEMORY_INFORMATION); - - /* FIXME calc see we do not go over the video memory size */ - virtualAddress = pShareMemory->ProcessHandle; sharedViewSize = pShareMemory->ViewSize; shareAddress.QuadPart = DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].PhysBasePtr; - /* we iggnore the ViewOffset */ - + /* FIXME we iggnore the ViewOffset */ + + inIoSpace = VIDEO_MEMORY_SPACE_USER_MODE; StatusBlock->Status = VideoPortMapMemory( DeviceExtension, shareAddress, &sharedViewSize, @@ -907,12 +910,8 @@ { retvalue = FALSE; } - } - else - { - retvalue = FALSE; - } + return retvalue; }

1 0

[janderwald] 49990: [AUDIO-BRINGUP] - Implement MixerEvent callback in wdmaud.drv - Comment out assert which is hit in VmWare - Implement full support mux controls
by janderwald＠svn.reactos.org 08 Dec '10

08 Dec '10

Author: janderwald Date: Wed Dec 8 19:49:28 2010 New Revision: 49990 URL: http://svn.reactos.org/svn/reactos?rev=49990&view=rev Log: [AUDIO-BRINGUP] - Implement MixerEvent callback in wdmaud.drv - Comment out assert which is hit in VmWare - Implement full support mux controls Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c 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/mmixer.h 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/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Wed Dec 8 19:49:28 2010 @@ -663,6 +663,25 @@ return MMSYSERR_NOTSUPPORTED; } +VOID +CALLBACK +MixerEventCallback( + IN PVOID MixerEventContext, + IN HANDLE hMixer, + IN ULONG NotificationType, + IN ULONG Value) +{ + PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)MixerEventContext; + + DriverCallback(Instance->WinMM.ClientCallback, + HIWORD(Instance->WinMM.Flags), + Instance->WinMM.Handle, + NotificationType, + Instance->WinMM.ClientCallbackInstanceData, + (DWORD_PTR)Value, + 0); +} + MMRESULT WdmAudSetMixerDeviceFormatByMMixer( IN PSOUND_DEVICE_INSTANCE Instance, @@ -670,11 +689,7 @@ IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize) { - Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if ( ! Instance->hNotifyEvent ) - return MMSYSERR_NOMEM; - - if (MMixerOpen(&MixerContext, DeviceId, Instance->hNotifyEvent, NULL /* FIXME */, &Instance->Handle) == MM_STATUS_SUCCESS) + if (MMixerOpen(&MixerContext, DeviceId, (PVOID)Instance, MixerEventCallback, &Instance->Handle) == MM_STATUS_SUCCESS) return MMSYSERR_NOERROR; return MMSYSERR_BADDEVICEID; 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] Wed Dec 8 19:49:28 2010 @@ -1570,7 +1570,7 @@ DPRINT("MixerName %S Available PinID %lu\n", MixerData->DeviceName, Index); /* sanity check */ - ASSERT(MixerData->MixerInfo); + //ASSERT(MixerData->MixerInfo); if (!MixerData->MixerInfo) { @@ -1730,7 +1730,7 @@ /* initialize notification entry */ EventData->MixerEventContext = MixerEventContext; - EventData->MixerEventRoutine; + EventData->MixerEventRoutine = MixerEventRoutine; /* store event */ InsertTailList(&MixerInfo->EventList, &EventData->Entry); 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] Wed Dec 8 19:49:28 2010 @@ -108,7 +108,6 @@ /* store result */ *MixerHandle = (HANDLE)MixerInfo; - return MM_STATUS_SUCCESS; } @@ -243,7 +242,7 @@ if (!MixerLineSrc) { /* invalid parameter */ - DPRINT1("MMixerGetLineInfo: MixerName %S Line not found %lu\n", MixerInfo->MixCaps.szPname, MixerLine->dwLineID); + DPRINT1("MMixerGetLineInfo: MixerName %S Line not found 0x%lx\n", MixerInfo->MixCaps.szPname, MixerLine->dwLineID); return MM_STATUS_INVALID_PARAMETER; } @@ -519,8 +518,10 @@ case MIXERCONTROL_CONTROLTYPE_VOLUME: Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo, NodeId, TRUE, MixerControl, MixerControlDetails, MixerLine); break; + case MIXERCONTROL_CONTROLTYPE_MUX: + Status = MMixerSetGetMuxControlDetails(MixerContext, MixerInfo, NodeId, TRUE, Flags, MixerControl, MixerControlDetails, MixerLine); + break; default: - ASSERT(0); Status = MM_STATUS_NOT_IMPLEMENTED; } @@ -583,9 +584,16 @@ case MIXERCONTROL_CONTROLTYPE_VOLUME: Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo, NodeId, FALSE, MixerControl, MixerControlDetails, MixerLine); break; + case MIXERCONTROL_CONTROLTYPE_ONOFF: + DPRINT1("Not Implemented MIXERCONTROL_CONTROLTYPE_ONOFF\n"); + break; + case MIXERCONTROL_CONTROLTYPE_MUX: + Status = MMixerSetGetMuxControlDetails(MixerContext, MixerInfo, NodeId, FALSE, Flags, MixerControl, MixerControlDetails, MixerLine); + break; + default: Status = MM_STATUS_NOT_IMPLEMENTED; - DPRINT1("ControlType %lu not implemented\n", MixerControl->Control.dwControlType); + DPRINT1("ControlType %lx not implemented\n", MixerControl->Control.dwControlType); } return Status; Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Wed Dec 8 19:49:28 2010 @@ -47,7 +47,7 @@ typedef MIXER_STATUS(*PMIXER_CLOSEKEY)( IN HANDLE hKey); -typedef VOID (*PMIXER_EVENT)( +typedef VOID (CALLBACK *PMIXER_EVENT)( IN PVOID MixerEventContext, IN HANDLE hMixer, IN ULONG NotificationType, 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] Wed Dec 8 19:49:28 2010 @@ -302,6 +302,18 @@ LPMIXERLINE_EXT MixerLine); MIXER_STATUS +MMixerSetGetMuxControlDetails( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_INFO MixerInfo, + IN ULONG NodeId, + IN ULONG bSet, + IN ULONG Flags, + LPMIXERCONTROL_EXT MixerControl, + IN LPMIXERCONTROLDETAILS MixerControlDetails, + LPMIXERLINE_EXT MixerLine); + + +MIXER_STATUS MMixerSetGetControlDetails( IN PMIXER_CONTEXT MixerContext, IN HANDLE hMixer, @@ -507,3 +519,9 @@ IN PTOPOLOGY Topology, OUT PULONG PinCount); +VOID +MMixerGetConnectedFromLogicalTopologyPins( + IN PTOPOLOGY Topology, + IN ULONG NodeIndex, + OUT PULONG OutPinCount, + OUT PULONG OutPins); 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] Wed Dec 8 19:49:28 2010 @@ -54,6 +54,63 @@ return MM_STATUS_SUCCESS; } +LPMIXERLINE_EXT +MMixerGetMixerLineContainingNodeId( + IN LPMIXER_INFO MixerInfo, + IN ULONG NodeID) +{ + PLIST_ENTRY Entry, ControlEntry; + LPMIXERLINE_EXT MixerLineSrc; + LPMIXERCONTROL_EXT MixerControl; + + /* get first entry */ + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); + + ControlEntry = MixerLineSrc->ControlsList.Flink; + while(ControlEntry != &MixerLineSrc->ControlsList) + { + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(ControlEntry, MIXERCONTROL_EXT, Entry); + if (MixerControl->NodeID == NodeID) + { + return MixerLineSrc; + } + ControlEntry = ControlEntry->Flink; + } + Entry = Entry->Flink; + } + + return NULL; +} + +VOID +MMixerGetLowestLogicalTopologyPinOffsetFromArray( + IN ULONG LogicalPinArrayCount, + IN PULONG LogicalPinArray, + OUT PULONG PinOffset) +{ + ULONG Index; + ULONG LowestId = 0; + + for(Index = 1; Index < LogicalPinArrayCount; Index++) + { + if (LogicalPinArray[Index] != MAXULONG) + { + /* sanity check: logical pin id must be unique */ + ASSERT(LogicalPinArray[Index] != LogicalPinArray[LowestId]); + } + + if (LogicalPinArray[Index] < LogicalPinArray[LowestId]) + LowestId = Index; + } + + /* store result */ + *PinOffset = LowestId; +} + VOID MMixerFreeMixerInfo( IN PMIXER_CONTEXT MixerContext, @@ -66,6 +123,38 @@ MixerContext->Free((PVOID)MixerInfo); } + + +LPMIXER_DATA +MMixerGetMixerDataByDeviceHandle( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hDevice) +{ + LPMIXER_DATA MixerData; + PLIST_ENTRY Entry; + PMIXER_LIST MixerList; + + /* get mixer list */ + MixerList = (PMIXER_LIST)MixerContext->MixerContext; + + if (!MixerList->MixerDataCount) + return NULL; + + Entry = MixerList->MixerData.Flink; + + while(Entry != &MixerList->MixerData) + { + MixerData = (LPMIXER_DATA)CONTAINING_RECORD(Entry, MIXER_DATA, Entry); + + if (MixerData->hDevice == hDevice) + return MixerData; + + /* move to next mixer entry */ + Entry = Entry->Flink; + } + return NULL; +} + LPMIXER_INFO MMixerGetMixerInfoByIndex( @@ -255,7 +344,7 @@ PLIST_ENTRY Entry; PEVENT_NOTIFICATION_ENTRY NotificationEntry; - /* enumerate list and add a notification entry */ + /* enumerate list and perform notification */ Entry = MixerInfo->EventList.Flink; while(Entry != &MixerInfo->EventList) { @@ -315,6 +404,247 @@ } return Status; +} + +MIXER_STATUS +MMixerSetGetMuxControlDetails( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_INFO MixerInfo, + IN ULONG NodeId, + IN ULONG bSet, + IN ULONG Flags, + IN LPMIXERCONTROL_EXT MixerControl, + IN LPMIXERCONTROLDETAILS MixerControlDetails, + IN LPMIXERLINE_EXT MixerLine) +{ + MIXER_STATUS Status; + PULONG LogicalNodes, ConnectedNodes; + ULONG LogicalNodesCount, ConnectedNodesCount, Index, CurLogicalPinOffset, BytesReturned, OldLogicalPinOffset; + LPMIXER_DATA MixerData; + LPMIXERCONTROLDETAILS_LISTTEXTW ListText; + LPMIXERCONTROLDETAILS_BOOLEAN Values; + LPMIXERLINE_EXT SourceLine; + KSNODEPROPERTY Request; + + DPRINT("MixerControlDetails %p\n", MixerControlDetails); + DPRINT("bSet %lx\n", bSet); + DPRINT("Flags %lx\n", Flags); + DPRINT("NodeId %lu\n", MixerControl->NodeID); + DPRINT("MixerControlDetails dwControlID %lu\n", MixerControlDetails->dwControlID); + DPRINT("MixerControlDetails cChannels %lu\n", MixerControlDetails->cChannels); + DPRINT("MixerControlDetails cMultipleItems %lu\n", MixerControlDetails->cMultipleItems); + DPRINT("MixerControlDetails cbDetails %lu\n", MixerControlDetails->cbDetails); + DPRINT("MixerControlDetails paDetails %p\n", MixerControlDetails->paDetails); + + if (MixerControl->Control.fdwControl & MIXERCONTROL_CONTROLF_UNIFORM) + { + /* control acts uniform */ + if (MixerControlDetails->cChannels != 1) + { + /* expected 1 channel */ + DPRINT1("Expected 1 channel but got %lu\n", MixerControlDetails->cChannels); + return MM_STATUS_UNSUCCESSFUL; + } + } + + /* check if multiple items match */ + if (MixerControlDetails->cMultipleItems != MixerControl->Control.cMultipleItems) + { + DPRINT1("MultipleItems mismatch %lu expected %lu\n", MixerControlDetails->cMultipleItems, MixerControl->Control.cMultipleItems); + return MM_STATUS_UNSUCCESSFUL; + } + + if (bSet) + { + if ((Flags & MIXER_SETCONTROLDETAILSF_QUERYMASK) == MIXER_SETCONTROLDETAILSF_CUSTOM) + { + /* tell me when this is hit */ + ASSERT(FALSE); + } + else if ((Flags & (MIXER_SETCONTROLDETAILSF_VALUE | MIXER_SETCONTROLDETAILSF_CUSTOM)) == MIXER_SETCONTROLDETAILSF_VALUE) + { + /* sanity check */ + ASSERT(bSet == TRUE); + ASSERT(MixerControlDetails->cbDetails == sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + + Values = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails; + CurLogicalPinOffset = MAXULONG; + for(Index = 0; Index < MixerControlDetails->cMultipleItems; Index++) + { + if (Values[Index].fValue) + { + /* mux can only activate one line at a time */ + ASSERT(CurLogicalPinOffset == MAXULONG); + CurLogicalPinOffset = Index; + } + } + + /* setup request */ + Request.NodeId = NodeId; + Request.Reserved = 0; + Request.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_GET; + Request.Property.Id = KSPROPERTY_AUDIO_MUX_SOURCE; + Request.Property.Set = KSPROPSETID_Audio; + + /* perform getting source */ + Status = MixerContext->Control(MixerControl->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSNODEPROPERTY), &OldLogicalPinOffset, sizeof(ULONG), &BytesReturned); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to get source */ + return Status; + } + + DPRINT("OldLogicalPinOffset %lu CurLogicalPinOffset %lu\n", OldLogicalPinOffset, CurLogicalPinOffset); + + if (OldLogicalPinOffset == CurLogicalPinOffset) + { + /* cannot be unselected */ + return MM_STATUS_UNSUCCESSFUL; + } + + /* perform setting source */ + Request.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_SET; + Status = MixerContext->Control(MixerControl->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSNODEPROPERTY), &CurLogicalPinOffset, sizeof(ULONG), &BytesReturned); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to set source */ + return Status; + } + + /* notify control change */ + MMixerNotifyControlChange(MixerContext, MixerInfo, MM_MIXM_CONTROL_CHANGE, MixerControl->Control.dwControlID ); + + return Status; + } + } + else + { + if ((Flags & MIXER_GETCONTROLDETAILSF_QUERYMASK) == MIXER_GETCONTROLDETAILSF_VALUE) + { + /* setup request */ + Request.NodeId = NodeId; + Request.Reserved = 0; + Request.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_GET; + Request.Property.Id = KSPROPERTY_AUDIO_MUX_SOURCE; + Request.Property.Set = KSPROPSETID_Audio; + + /* perform getting source */ + Status = MixerContext->Control(MixerControl->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSNODEPROPERTY), &OldLogicalPinOffset, sizeof(ULONG), &BytesReturned); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to get source */ + return Status; + } + + /* get logical pin nodes */ + MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes); + + /* sanity check */ + ASSERT(LogicalNodesCount == MixerControlDetails->cMultipleItems); + ASSERT(LogicalNodesCount == MixerControl->Control.Metrics.dwReserved[0]); + + Values = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails; + for(Index = 0; Index < ConnectedNodesCount; Index++) + { + /* getting logical pin offset */ + MMixerGetLowestLogicalTopologyPinOffsetFromArray(LogicalNodesCount, LogicalNodes, &CurLogicalPinOffset); + + if (CurLogicalPinOffset == OldLogicalPinOffset) + { + /* mark index as active */ + Values[Index].fValue = TRUE; + } + else + { + /* index not active */ + Values[Index].fValue = FALSE; + } + + /* mark offset as consumed */ + LogicalNodes[CurLogicalPinOffset] = MAXULONG; + } + + /* cleanup */ + MixerContext->Free(LogicalNodes); + + /* done */ + return MM_STATUS_SUCCESS; + } + else if ((Flags & MIXER_GETCONTROLDETAILSF_QUERYMASK) == MIXER_GETCONTROLDETAILSF_LISTTEXT) + { + /* sanity check */ + ASSERT(bSet == FALSE); + + /* gets the corresponding mixer data */ + MixerData = MMixerGetMixerDataByDeviceHandle(MixerContext, MixerControl->hDevice); + + /* sanity check */ + ASSERT(MixerData); + ASSERT(MixerData->Topology); + ASSERT(MixerData->MixerInfo == MixerInfo); + + /* now allocate logical pin array */ + Status = MMixerAllocateTopologyNodeArray(MixerContext, MixerData->Topology, &LogicalNodes); + if (Status != MM_STATUS_SUCCESS) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + + /* allocate connected node array */ + Status = MMixerAllocateTopologyNodeArray(MixerContext, MixerData->Topology, &ConnectedNodes); + if (Status != MM_STATUS_SUCCESS) + { + /* no memory */ + MixerContext->Free(LogicalNodes); + return MM_STATUS_NO_MEMORY; + } + + /* get logical pin nodes */ + MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes); + + /* get connected nodes */ + MMixerGetNextNodesFromNodeIndex(MixerContext, MixerData->Topology, MixerControl->NodeID, TRUE, &ConnectedNodesCount, ConnectedNodes); + + /* sanity check */ + ASSERT(ConnectedNodesCount == LogicalNodesCount); + ASSERT(ConnectedNodesCount == MixerControlDetails->cMultipleItems); + ASSERT(ConnectedNodesCount == MixerControl->Control.Metrics.dwReserved[0]); + + ListText = (LPMIXERCONTROLDETAILS_LISTTEXTW)MixerControlDetails->paDetails; + + for(Index = 0; Index < ConnectedNodesCount; Index++) + { + /* getting logical pin offset */ + MMixerGetLowestLogicalTopologyPinOffsetFromArray(LogicalNodesCount, LogicalNodes, &CurLogicalPinOffset); + + /* get mixer line with that node */ + SourceLine = MMixerGetMixerLineContainingNodeId(MixerInfo, ConnectedNodes[CurLogicalPinOffset]); + + /* sanity check */ + ASSERT(SourceLine); + + DPRINT1("PinOffset %lu LogicalPin %lu NodeId %lu LineName %S\n", CurLogicalPinOffset, LogicalNodes[CurLogicalPinOffset], ConnectedNodes[CurLogicalPinOffset], SourceLine->Line.szName); + + /* copy details */ + ListText[Index].dwParam1 = SourceLine->Line.dwLineID; + ListText[Index].dwParam2 = SourceLine->Line.dwComponentType; + MixerContext->Copy(ListText[Index].szName, SourceLine->Line.szName, (wcslen(SourceLine->Line.szName) + 1) * sizeof(WCHAR)); + + /* mark offset as consumed */ + LogicalNodes[CurLogicalPinOffset] = MAXULONG; + } + + /* cleanup */ + MixerContext->Free(LogicalNodes); + MixerContext->Free(ConnectedNodes); + + /* done */ + return MM_STATUS_SUCCESS; + } + } + + return MM_STATUS_NOT_IMPLEMENTED; } MIXER_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] Wed Dec 8 19:49:28 2010 @@ -1162,6 +1162,32 @@ return MM_STATUS_SUCCESS; } +VOID +MMixerGetConnectedFromLogicalTopologyPins( + IN PTOPOLOGY Topology, + IN ULONG NodeIndex, + OUT PULONG OutPinCount, + OUT PULONG OutPins) +{ + ULONG Index; + PTOPOLOGY_NODE Node; + + /* sanity check */ + ASSERT(NodeIndex < Topology->TopologyNodesCount); + + /* get node */ + Node = &Topology->TopologyNodes[NodeIndex]; + + for(Index = 0; Index < Node->NodeConnectedFromCount; Index++) + { + /* copy logical pin id */ + OutPins[Index] = Node->LogicalPinNodeConnectedFrom[Index]; + } + + /* store pin count */ + *OutPinCount = Node->NodeConnectedFromCount; +} + LPGUID MMixerGetNodeTypeFromTopology( IN PTOPOLOGY Topology,

1 0

[greatlrd] 49989: start implmenet VBEVideoShareVideoMemmory it is need for DdMapMemmory, waring it does not calc the video ram lenght yet.
by greatlrd＠svn.reactos.org 08 Dec '10

08 Dec '10

Author: greatlrd Date: Wed Dec 8 19:07:42 2010 New Revision: 49989 URL: http://svn.reactos.org/svn/reactos?rev=49989&view=rev Log: start implmenet VBEVideoShareVideoMemmory it is need for DdMapMemmory, waring it does not calc the video ram lenght yet. Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.h Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/mi… ============================================================================== --- branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Wed Dec 8 19:07:42 2010 @@ -525,6 +525,19 @@ (PVIDEO_MODE_INFORMATION)RequestPacket->OutputBuffer, RequestPacket->StatusBlock); break; + case IOCTL_VIDEO_SHARE_VIDEO_MEMORY: + if ( (RequestPacket->InputBufferLength < sizeof(VIDEO_MEMORY)) || + (RequestPacket->OutputBufferLength < sizeof(VIDEO_SHARE_MEMORY_INFORMATION)) ) + { + RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; + return TRUE; + } + Result = VBEVideoShareVideoMemmory( + (PVBE_DEVICE_EXTENSION)HwDeviceExtension, + (PVIDEO_SHARE_MEMORY)RequestPacket->InputBufferLength, + (PVIDEO_SHARE_MEMORY_INFORMATION)RequestPacket->OutputBuffer, + RequestPacket->StatusBlock); + break; default: RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; @@ -538,7 +551,7 @@ else { RequestPacket->StatusBlock->Information = 0; - StatusBlock->Status = ERROR_INVALID_FUNCTION; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; } return TRUE; @@ -825,9 +838,8 @@ PSTATUS_BLOCK StatusBlock) { BOOLEAN retvalue; - StatusBlock->Status VideoPortUnmapMemory(DeviceExtension, VideoMemory->RequestedVirtualAddress, - NULL); - + + StatusBlock->Status = VideoPortUnmapMemory(DeviceExtension, VideoMemory->RequestedVirtualAddress, NULL); if (StatusBlock->Status == NO_ERROR) { retvalue = TRUE; @@ -840,6 +852,70 @@ return retvalue; } +/* + * VBEQueryNumAvailModes + * + */ +BOOLEAN FASTCALL +VBEVideoShareVideoMemmory( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_SHARE_MEMORY pShareMemory, + PVIDEO_SHARE_MEMORY_INFORMATION pShareMemoryInformation, + PSTATUS_BLOCK StatusBlock) +{ + PHYSICAL_ADDRESS shareAddress; + PVOID virtualAddress; + ULONG sharedViewSize; + BOOLEAN retvalue; + ULONG inIoSpace; + + /* in ms ddk xp it have two flag that are use full for us here + VIDEO_MEMORY_SPACE_USER_MODE or VIDEO_MEMORY_SPACE_P6CACHE + the ddk say VIDEO_MEMORY_SPACE_P6CACHE does not care if it + user mode or kmode memory. But we want be 100% sure it is + vitual user mode memory adddress we mappin from kmode video memmory. + */ + inIoSpace = VIDEO_MEMORY_SPACE_USER_MODE; + + if (DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].ModeAttributes & VBE_MODEATTR_LINEAR) + { + StatusBlock->Information = sizeof(VIDEO_SHARE_MEMORY_INFORMATION); + + /* FIXME calc see we do not go over the video memory size */ + + virtualAddress = pShareMemory->ProcessHandle; + sharedViewSize = pShareMemory->ViewSize; + + shareAddress.QuadPart = DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].PhysBasePtr; + + /* we iggnore the ViewOffset */ + + StatusBlock->Status = VideoPortMapMemory( DeviceExtension, + shareAddress, + &sharedViewSize, + &inIoSpace, + &virtualAddress ); + + if (StatusBlock->Status == NO_ERROR) + { + pShareMemoryInformation->SharedViewOffset = pShareMemory->ViewOffset; + pShareMemoryInformation->VirtualAddress = virtualAddress; + pShareMemoryInformation->SharedViewSize = sharedViewSize; + retvalue = TRUE; + } + else + { + retvalue = FALSE; + } + + } + else + { + retvalue = FALSE; + } + + return retvalue; +} /* * VBEQueryNumAvailModes * Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/mi… ============================================================================== --- branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] Wed Dec 8 19:07:42 2010 @@ -304,3 +304,11 @@ PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable, PSTATUS_BLOCK StatusBlock); + + +BOOLEAN FASTCALL +VBEVideoShareVideoMemmory( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_SHARE_MEMORY pShareMemory, + PVIDEO_SHARE_MEMORY_INFORMATION pShareMemoryInformation, + PSTATUS_BLOCK StatusBlock);

1 0

[greatlrd] 49988: Do not try map video memory for no linear video mode. Fix error processing for VBEMapVideoMemory and VBEUnmapVideoMemory
by greatlrd＠svn.reactos.org 08 Dec '10

08 Dec '10

Author: greatlrd Date: Wed Dec 8 17:50:17 2010 New Revision: 49988 URL: http://svn.reactos.org/svn/reactos?rev=49988&view=rev Log: Do not try map video memory for no linear video mode. Fix error processing for VBEMapVideoMemory and VBEUnmapVideoMemory Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/mi… ============================================================================== --- branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Wed Dec 8 17:50:17 2010 @@ -532,7 +532,14 @@ } if (Result) + { RequestPacket->StatusBlock->Status = NO_ERROR; + } + else + { + RequestPacket->StatusBlock->Information = 0; + StatusBlock->Status = ERROR_INVALID_FUNCTION; + } return TRUE; } @@ -755,6 +762,7 @@ { PHYSICAL_ADDRESS FrameBuffer; ULONG inIoSpace = VIDEO_MEMORY_SPACE_MEMORY; + BOOLEAN retvalue; StatusBlock->Information = sizeof(VIDEO_MEMORY_INFORMATION); @@ -776,24 +784,31 @@ DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].LinBytesPerScanLine * DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].YResolution; } - } -#ifdef VBE12_SUPPORT + + StatusBlock->Status = VideoPortMapMemory(DeviceExtension, + FrameBuffer, + &MapInformation->VideoRamLength, + &inIoSpace, + &MapInformation->VideoRamBase); + if (StatusBlock->Status == NO_ERROR) + { + /* The frame buffer and virtual memory and equivalent in this case.*/ + MapInformation->FrameBufferBase = MapInformation->VideoRamBase; + MapInformation->FrameBufferLength = MapInformation->VideoRamLength; + retvalue = TRUE; + } + else + { + retvalue = FALSE; + } + } else { - FrameBuffer.QuadPart = 0xA0000; - MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; - MapInformation->VideoRamLength = 0x10000; - } -#endif - - VideoPortMapMemory(DeviceExtension, FrameBuffer, - &MapInformation->VideoRamLength, &inIoSpace, - &MapInformation->VideoRamBase); - - MapInformation->FrameBufferBase = MapInformation->VideoRamBase; - MapInformation->FrameBufferLength = MapInformation->VideoRamLength; - - return TRUE; + /* we can not map no linear video mode for VBE 2.0 and higher */ + retvalue = FALSE; + } + + return retvalue; } /* @@ -809,9 +824,20 @@ PVIDEO_MEMORY VideoMemory, PSTATUS_BLOCK StatusBlock) { - VideoPortUnmapMemory(DeviceExtension, VideoMemory->RequestedVirtualAddress, + BOOLEAN retvalue; + StatusBlock->Status VideoPortUnmapMemory(DeviceExtension, VideoMemory->RequestedVirtualAddress, NULL); - return TRUE; + + if (StatusBlock->Status == NO_ERROR) + { + retvalue = TRUE; + } + else + { + retvalue = FALSE; + } + + return retvalue; } /*

1 0

[greatlrd] 49987: fix a compile issue and scoure code cleanup
by greatlrd＠svn.reactos.org 08 Dec '10

08 Dec '10

Author: greatlrd Date: Wed Dec 8 17:37:17 2010 New Revision: 49987 URL: http://svn.reactos.org/svn/reactos?rev=49987&view=rev Log: fix a compile issue and scoure code cleanup Modified: branches/reactx/reactos/drivers/video/displays/framebuf/dd.c branches/reactx/reactos/drivers/video/displays/framebuf/enable.c branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.spec Modified: branches/reactx/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/dd.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/dd.c [iso-8859-1] Wed Dec 8 17:37:17 2010 @@ -174,13 +174,13 @@ ShareMemory.ViewSize = 0; ShareMemory.RequestedVirtualAddress = (VOID*) lpMapMemory->fpProcess; - if (EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY, - &ShareMemory, - sizeof(VIDEO_SHARE_MEMORY), - NULL, - 0, - &ReturnedDataLength)) + if (EngDeviceIoControl( ppdev->hDriver, + IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY, + &ShareMemory, + sizeof(VIDEO_SHARE_MEMORY), + NULL, + 0, + &ReturnedDataLength)) { lpMapMemory->ddRVal = DDERR_GENERIC; } Modified: branches/reactx/reactos/drivers/video/displays/framebuf/enable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/enable.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/enable.c [iso-8859-1] Wed Dec 8 17:37:17 2010 @@ -78,13 +78,8 @@ if (SupportedVersions[i] == iEngineVersion ) { pded->iDriverVersion = SupportedVersions[i]; + status = TRUE; - // Initialize sync semaphore. - g_cs = EngCreateSemaphore(); - if (g_cs) - { - status = TRUE; - } break; } } Modified: branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.spec URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.spec [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.spec [iso-8859-1] Wed Dec 8 17:37:17 2010 @@ -1,1 +1,1 @@ -@ stdcall DriverEntry(long long ptr) = DrvEnableDriver +@ stdcall DriverEntry(long long ptr) DrvEnableDriver

1 0

[cfinck] 49986: Remove the "irc", "press-media" and "tools" directories. They were moved to the "press-media" and "project-tools" repositories now.
by cfinck＠svn.reactos.org 08 Dec '10

08 Dec '10

Author: cfinck Date: Wed Dec 8 16:42:47 2010 New Revision: 49986 URL: http://svn.reactos.org/svn/reactos?rev=49986&view=rev Log: Remove the "irc", "press-media" and "tools" directories. They were moved to the "press-media" and "project-tools" repositories now. Removed: trunk/irc/ trunk/press-media/ trunk/tools/

1 0

[greatlrd] 49985: fix export rename DrvEnable to DriverEntry as windows ddk does.
by greatlrd＠svn.reactos.org 08 Dec '10

08 Dec '10

Author: greatlrd Date: Wed Dec 8 06:45:39 2010 New Revision: 49985 URL: http://svn.reactos.org/svn/reactos?rev=49985&view=rev Log: fix export rename DrvEnable to DriverEntry as windows ddk does. Modified: branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.spec Modified: branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.spec URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.spec [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.spec [iso-8859-1] Wed Dec 8 06:45:39 2010 @@ -1,1 +1,1 @@ -@ stdcall DrvEnableDriver(long long ptr) +@ stdcall DriverEntry(long long ptr) = DrvEnableDriver

1 0

[janderwald] 49984: - Fix build #2
by janderwald＠svn.reactos.org 07 Dec '10

07 Dec '10

Author: janderwald Date: Tue Dec 7 22:24:33 2010 New Revision: 49984 URL: http://svn.reactos.org/svn/reactos?rev=49984&view=rev Log: - Fix build #2 Modified: branches/audio-bringup/boot/bootdata/packages/reactos.dff Modified: branches/audio-bringup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/pac… ============================================================================== --- branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Dec 7 22:24:33 2010 @@ -161,7 +161,7 @@ dll\directx\dmusic\dmusic.dll 1 dll\directx\dplay\dplay.dll 1 dll\directx\dplayx\dplayx.dll 1 -dll\directx\dsound\dsound.dll 1 +dll\directx\dsound_new\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 dll\directx\ksproxy\ksproxy.ax 1 dll\directx\ksuser\ksuser.dll 1 @@ -709,6 +709,8 @@ modules\optional\vmx_svga.inf 6 optional modules\optional\vmx_svga.sys 2 optional modules\optional\wine_gecko-1.0.0-x86.cab 4 optional +modules\optional\winamp.exe 7 optional +modules\optional\b.mp3 7 optional ; Rosapps modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional

1 0

[janderwald] 49983: - Add temporary hack to prevent MS Sndvol32 from crashing - Found by smiley
by janderwald＠svn.reactos.org 07 Dec '10

07 Dec '10

Author: janderwald Date: Tue Dec 7 22:22:24 2010 New Revision: 49983 URL: http://svn.reactos.org/svn/reactos?rev=49983&view=rev Log: - Add temporary hack to prevent MS Sndvol32 from crashing - Found by smiley Modified: branches/audio-bringup/dll/win32/user32/windows/message.c Modified: branches/audio-bringup/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/user32/… ============================================================================== --- branches/audio-bringup/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/user32/windows/message.c [iso-8859-1] Tue Dec 7 22:22:24 2010 @@ -1260,14 +1260,14 @@ if (PreResult) goto Exit; - _SEH2_TRY - { + //_SEH2_TRY + //{ Result = WndProc(hWnd, Msg, wParam, lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - } - _SEH2_END; + //} + //_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + //{ + //} + //_SEH2_END; if (Hook && MsgOverride) {

1 0

[fireball] 49982: [DDK] - Oleg Baikalow: Fix NDIS macros.
by fireball＠svn.reactos.org 07 Dec '10

07 Dec '10

Author: fireball Date: Tue Dec 7 22:07:00 2010 New Revision: 49982 URL: http://svn.reactos.org/svn/reactos?rev=49982&view=rev Log: [DDK] - Oleg Baikalow: Fix NDIS macros. Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=499… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Tue Dec 7 22:07:00 2010 @@ -3296,7 +3296,7 @@ * NDIS_BUFFER_LINKAGE( * IN PNDIS_BUFFER Buffer); */ -#define NDIS_BUFFER_LINKAGE(Buffer)(Buffer)->Next; +#define NDIS_BUFFER_LINKAGE(Buffer) (Buffer)->Next /* * VOID @@ -3321,7 +3321,7 @@ * NdisGetPacketFlags( * IN PNDIS_PACKET Packet); */ -#define NdisGetPacketFlags(Packet)(Packet)->Private.Flags; +#define NdisGetPacketFlags(Packet) (Packet)->Private.Flags /* * ULONG

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs