Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[janderwald] 49997: [AUDIO-BRINGUP] - Implement WdmAudResetStreamByMMixer, StopStreamingInSoundThread - WIDM_RESET / WODM_RESET are now implemented - Skipping now audio bytes (i.e. jumping to diffe...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Dec 10 06:14:10 2010 New Revision: 49997 URL: http://svn.reactos.org/svn/reactos?rev=49997&view=rev Log: [AUDIO-BRINGUP] - Implement WdmAudResetStreamByMMixer, StopStreamingInSoundThread - WIDM_RESET / WODM_RESET are now implemented - Skipping now audio bytes (i.e. jumping to different audio position) now properly works and no longer causes a hang under certain conditions Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h branches/audio-bringup/lib/drivers/sound/mmixer/wave.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] Fri Dec 10 06:14:10 2010 @@ -751,7 +751,19 @@ IN MMDEVICE_TYPE DeviceType, IN BOOLEAN bStartReset) { - /* FIXME */ + MIXER_STATUS Status; + + if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + Status = MMixerSetWaveResetState(&MixerContext, SoundDeviceInstance->Handle, bStartReset); + if (Status == MM_STATUS_SUCCESS) + { + /* completed successfully */ + return MMSYSERR_NOERROR; + } + } + + return MMSYSERR_NOTSUPPORTED; } Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Fri Dec 10 06:14:10 2010 @@ -277,8 +277,62 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { - /* TODO */ - return MMSYSERR_NOTSUPPORTED; + MMDEVICE_TYPE DeviceType; + PMMFUNCTION_TABLE FunctionTable; + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + + /* set state reset in progress */ + SoundDeviceInstance->ResetInProgress = TRUE; + + /* Get sound device */ + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Obtain the function table */ + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Obtain device instance type */ + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Check if reset function is supported */ + if (FunctionTable->ResetStream) + { + /* cancel all current audio buffers */ + FunctionTable->ResetStream(SoundDeviceInstance, DeviceType, TRUE); + } + + /* complete all current headers */ + while( SoundDeviceInstance->HeadWaveHeader ) + { + SND_TRACE(L"StopStreamingInSoundThread: Completing Header %p\n", SoundDeviceInstance->HeadWaveHeader); + CompleteWaveHeader( SoundDeviceInstance, SoundDeviceInstance->HeadWaveHeader ); + } + + /* there should be no oustanding buffers now */ + SND_ASSERT(SoundDeviceInstance->OutstandingBuffers == 0); + + while(SoundDeviceInstance->OutstandingBuffers) + { + SND_ERR("StopStreamingInSoundThread OutStandingBufferCount %lu\n", SoundDeviceInstance->OutstandingBuffers); + /* my hack of doom */ + Sleep(10); + } + + /* Check if reset function is supported */ + if (FunctionTable->ResetStream) + { + /* finish the reset */ + FunctionTable->ResetStream(SoundDeviceInstance, DeviceType, FALSE); + } + + /* clear state reset in progress */ + SoundDeviceInstance->ResetInProgress = FALSE; + + + return MMSYSERR_NOERROR; } MMRESULT Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Fri Dec 10 06:14:10 2010 @@ -111,6 +111,11 @@ /* Continue playback when paused */ break; } + case WODM_PAUSE : + { + /* pause playback */ + break; + } case WODM_GETPOS : { 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] Fri Dec 10 06:14:10 2010 @@ -207,6 +207,12 @@ IN KSSTATE State); MIXER_STATUS +MMixerSetWaveResetState( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE PinHandle, + IN ULONG bBegin); + +MIXER_STATUS MMixerGetWaveDevicePath( IN PMIXER_CONTEXT MixerContext, IN ULONG bWaveIn, Modified: branches/audio-bringup/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/wave.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/wave.c [iso-8859-1] Fri Dec 10 06:14:10 2010 @@ -608,6 +608,16 @@ { KSPROPERTY Property; ULONG Length; + MIXER_STATUS Status; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } /* setup property request */ Property.Set = KSPROPSETID_Connection; @@ -618,6 +628,31 @@ } MIXER_STATUS +MMixerSetWaveResetState( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE PinHandle, + IN ULONG bBegin) +{ + ULONG Length; + MIXER_STATUS Status; + KSRESET Reset; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } + + /* begin / stop reset */ + Reset = (bBegin ? KSRESET_BEGIN : KSRESET_END); + + return MixerContext->Control(PinHandle, IOCTL_KS_RESET_STATE, &Reset, sizeof(KSRESET), NULL, 0, &Length); +} + +MIXER_STATUS MMixerGetWaveDevicePath( IN PMIXER_CONTEXT MixerContext, IN ULONG bWaveIn,

13 years, 9 months

[tkreuzer] 49996: [WIN32K] Merge r49994 and r49995 from reactx branch

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 9 15:53:55 2010 New Revision: 49996 URL: http://svn.reactos.org/svn/reactos?rev=49996&view=rev Log: [WIN32K] Merge r49994 and r49995 from reactx branch Modified: trunk/reactos/ (props changed) trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 9 15:53:55 2010 @@ -1,4 +1,5 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 Modified: trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Thu Dec 9 15:53:55 2010 @@ -355,8 +355,12 @@ RtlAppendUnicodeToString(&strDriverName, pwsz); /* MSDN says "The driver must include this suffix in the pwszDriver string." - But in fact it's optional. */ - if (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) + But in fact it's optional. + + ms win32k EngLoadImageEx loading .sys file without append .dll + */ + if ( (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) && + (_wcsnicmp(pwszDriverName + cwcLength - 4, L".sys", 4) != 0) ) { /* Append the .dll suffix */ RtlAppendUnicodeToString(&strDriverName, L".dll"); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu Dec 9 15:53:55 2010 @@ -138,16 +138,8 @@ /* Loading the kernel interface of directx for win32k */ - DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); - if ( ghDxGraphics == NULL) - { - DPRINT1("Warning: dxkrnl.sys not found\n"); - /* try loading vista dx kernel */ - DPRINT1("Warning: trying loading xp/2003/reactos dxg.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); - } - + DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); if ( ghDxGraphics == NULL) { Status = STATUS_DLL_NOT_FOUND;

13 years, 9 months

[greatlrd] 49995: DxDdStartupDxGraphics fix loading dxg.sys remove vista stupied behvoir. now it behvoir like windows 7, xp and 2003

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 9 14:30:17 2010 New Revision: 49995 URL: http://svn.reactos.org/svn/reactos?rev=49995&view=rev Log: DxDdStartupDxGraphics fix loading dxg.sys remove vista stupied behvoir. now it behvoir like windows 7, xp and 2003 Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu Dec 9 14:30:17 2010 @@ -138,16 +138,8 @@ /* Loading the kernel interface of directx for win32k */ - DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); - if ( ghDxGraphics == NULL) - { - DPRINT1("Warning: dxkrnl.sys not found\n"); - /* try loading vista dx kernel */ - DPRINT1("Warning: trying loading xp/2003/reactos dxg.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); - } - + DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); if ( ghDxGraphics == NULL) { Status = STATUS_DLL_NOT_FOUND;

13 years, 9 months

[greatlrd] 49994: EngLoadImageEx BugFix so it can load .sys file as well. Now we can load dxg.sys again

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 9 14:27:56 2010 New Revision: 49994 URL: http://svn.reactos.org/svn/reactos?rev=49994&view=rev Log: EngLoadImageEx BugFix so it can load .sys file as well. Now we can load dxg.sys again Modified: branches/reactx/reactos/subsystems/win32/win32k/eng/ldevobj.c Modified: branches/reactx/reactos/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Thu Dec 9 14:27:56 2010 @@ -355,8 +355,12 @@ RtlAppendUnicodeToString(&strDriverName, pwsz); /* MSDN says "The driver must include this suffix in the pwszDriver string." - But in fact it's optional. */ - if (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) + But in fact it's optional. + + ms win32k EngLoadImageEx loading .sys file without append .dll + */ + if ( (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) && + (_wcsnicmp(pwszDriverName + cwcLength - 4, L".sys", 4) != 0) ) { /* Append the .dll suffix */ RtlAppendUnicodeToString(&strDriverName, L".dll");

13 years, 9 months

[janderwald] 49993: [AUDIO-BRINGUP] - Respect channel count which defines if the control acts uniform or per channel - Fix bug in MMixerSetGetMuxControlDetails

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Dec 9 11:33:58 2010 New Revision: 49993 URL: http://svn.reactos.org/svn/reactos?rev=49993&view=rev Log: [AUDIO-BRINGUP] - Respect channel count which defines if the control acts uniform or per channel - Fix bug in MMixerSetGetMuxControlDetails Added: branches/audio-bringup/lib/drivers/sound/mmixer/TODO Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/sup.c Added: branches/audio-bringup/lib/drivers/sound/mmixer/TODO URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/TODO (added) +++ branches/audio-bringup/lib/drivers/sound/mmixer/TODO [iso-8859-1] Thu Dec 9 11:33:58 2010 @@ -1,0 +1,6 @@ +=== MMIXER TASKS === + +- Add hacks for source lines, such that Wave Mixer line always has a volume control +- Support custom mixer controls +- Assign mixer controls after all controls have been assigned (starting on the destination lines) +- TESTING & BUGFIXING 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] Thu Dec 9 11:33:58 2010 @@ -35,7 +35,8 @@ IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG NodeIndex, - IN LPMIXERLINE_EXT MixerLine) + IN LPMIXERLINE_EXT MixerLine, + IN ULONG MaxChannels) { LPGUID NodeType; KSP_NODE Node; @@ -66,7 +67,7 @@ /* store control type */ MixerControl->Control.dwControlType = MMixerGetControlTypeFromTopologyNode(NodeType); - MixerControl->Control.fdwControl = MIXERCONTROL_CONTROLF_UNIFORM; /* FIXME */ + MixerControl->Control.fdwControl = (MaxChannels > 1 ? 0 : MIXERCONTROL_CONTROLF_UNIFORM); MixerControl->Control.cMultipleItems = 0; /* setup request to retrieve name */ @@ -136,7 +137,7 @@ MixerControl->Control.Bounds.dwMaximum = NodesCount - 1; MixerControl->Control.Metrics.dwReserved[0] = NodesCount; MixerControl->Control.cMultipleItems = NodesCount; - MixerControl->Control.fdwControl |= MIXERCONTROL_CONTROLF_MULTIPLE; + MixerControl->Control.fdwControl |= MIXERCONTROL_CONTROLF_UNIFORM | MIXERCONTROL_CONTROLF_MULTIPLE; } else if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) { @@ -695,9 +696,14 @@ /* calculate maximum channels */ DstLine->Line.cChannels = min(DstLine->Line.cChannels, MaxChannels); } + else + { + /* use default of one channel */ + MaxChannels = 1; + } /* now add the mixer control */ - Status = MMixerAddMixerControl(MixerContext, MixerInfo, hMixer, Topology, Nodes[Index], DstLine); + Status = MMixerAddMixerControl(MixerContext, MixerInfo, hMixer, Topology, Nodes[Index], DstLine, MaxChannels); if (Status == MM_STATUS_SUCCESS) { 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] Thu Dec 9 11:33:58 2010 @@ -536,6 +536,14 @@ return Status; } + /* gets the corresponding mixer data */ + MixerData = MMixerGetMixerDataByDeviceHandle(MixerContext, MixerControl->hDevice); + + /* sanity check */ + ASSERT(MixerData); + ASSERT(MixerData->Topology); + ASSERT(MixerData->MixerInfo == MixerInfo); + /* get logical pin nodes */ MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes);

13 years, 9 months

[greatlrd] 49992: implement VBEVideoUnShareVideoMemmory for DdUnlock and DdMapmemmory

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 9 08:58:46 2010 New Revision: 49992 URL: http://svn.reactos.org/svn/reactos?rev=49992&view=rev Log: implement VBEVideoUnShareVideoMemmory for DdUnlock and DdMapmemmory 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] Thu Dec 9 08:58:46 2010 @@ -538,6 +538,17 @@ (PVIDEO_SHARE_MEMORY_INFORMATION)RequestPacket->OutputBuffer, RequestPacket->StatusBlock); break; + case IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY: + if (RequestPacket->InputBufferLength < sizeof(VIDEO_SHARE_MEMORY)) + { + RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; + return TRUE; + } + Result = VBEVideoUnShareVideoMemmory( + (PVBE_DEVICE_EXTENSION)HwDeviceExtension, + (PVIDEO_SHARE_MEMORY)RequestPacket->InputBufferLength, + RequestPacket->StatusBlock); + break; default: RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; @@ -853,7 +864,7 @@ } /* - * VBEQueryNumAvailModes + * VBEVideoShareVideoMemmory * */ BOOLEAN FASTCALL @@ -877,8 +888,8 @@ */ if ( ((DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].ModeAttributes & VBE_MODEATTR_LINEAR) != VBE_MODEATTR_LINEAR) || - (pShareMemory->ViewOffset > VBEDeviceExtension->VbeInfo.TotalMemory) || - ((pShareMemory->ViewOffset + pShareMemory->ViewSize) > VBEDeviceExtension->VbeInfo.TotalMemory) ) + (pShareMemory->ViewOffset > DeviceExtension->VbeInfo.TotalMemory) || + ((pShareMemory->ViewOffset + pShareMemory->ViewSize) > DeviceExtension->VbeInfo.TotalMemory) ) { retvalue = FALSE; } @@ -912,9 +923,35 @@ } } - return retvalue; } + +/* + * VBEVideoUnShareVideoMemmory + * + */ +BOOLEAN FASTCALL +VBEVideoUnShareVideoMemmory( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_SHARE_MEMORY pShareMemory, + PSTATUS_BLOCK StatusBlock) +{ + BOOLEAN retvalue; + + StatusBlock->Status = VideoPortUnmapMemory( DeviceExtension, + pShareMemory->RequestedVirtualAddress, + pShareMemory->ProcessHandle); + if (StatusBlock->Status == NO_ERROR) + { + retvalue = TRUE; + } + else + { + retvalue = FALSE; + } + return retvalue; +} + /* * VBEQueryNumAvailModes * @@ -1091,7 +1128,7 @@ * For VGA compatible adapters program the color registers directly. */ - if (!(DeviceExtension->VbeInfo.Capabilities & 2)) + if (!(DeviceExtension->VbeInfo.Capabilities & VBE_CHECK_VGA_COMPATIBLE)) { for (Entry = ColorLookUpTable->FirstEntry; Entry < ColorLookUpTable->NumEntries + ColorLookUpTable->FirstEntry; 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] Thu Dec 9 08:58:46 2010 @@ -101,6 +101,12 @@ #define VBE_GETRETURNCODE(x) (x & 0xFFFF) /* + * VBE checkflags Codes + */ +#define VBE_CHECK_VGA_COMPATIBLE 0x02 +#define VBE_CHECK_STEROSCOPIC_HW_SUPPORT 0x08 + +/* * VBE specification defined structure for general adapter info * returned by function VBE_GET_CONTROLLER_INFORMATION command. */ @@ -312,3 +318,9 @@ PVIDEO_SHARE_MEMORY pShareMemory, PVIDEO_SHARE_MEMORY_INFORMATION pShareMemoryInformation, PSTATUS_BLOCK StatusBlock); + +BOOLEAN FASTCALL +VBEVideoUnShareVideoMemmory( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_SHARE_MEMORY pShareMemory, + PSTATUS_BLOCK StatusBlock);

13 years, 9 months

[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

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; }

13 years, 9 months

[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

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,

13 years, 9 months

[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

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);

13 years, 9 months

[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

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; } /*

13 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
37
Older →

Jump to page:

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