Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[gadamopoulos] 49957: [win32k] -Amend to r41772. Allow PostMessage to handle DDE messages

by gadamopoulos＠svn.reactos.org

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

13 years, 11 months

[janderwald] 49956: [AUDIO-BRINGUP] - Remove installation of non-existant wdmaud / sysaudio / kmixer

by janderwald＠svn.reactos.org

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

13 years, 11 months

[janderwald] 49955: [AUDIO-BRINGUP] - Properly determine the component type and target type of source lines - Correctly set dwDestination / target type / component member for source lines

by janderwald＠svn.reactos.org

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

13 years, 11 months

[fireball] 49954: [TASKMGR] - Rafal Harabien: Add support for DELETE key to processes and applications list in taskmgr. See issue #5646 for more details.

by fireball＠svn.reactos.org

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

13 years, 11 months

[tkreuzer] 49953: [ROSSYM] Silence debug prints

by tkreuzer＠svn.reactos.org

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

13 years, 11 months

[tkreuzer] 49952: [CMAKE] Give ntdll a baseaddress

by tkreuzer＠svn.reactos.org

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

13 years, 11 months

[janderwald] 49951: [AUDIO-BRINGUP] - Fix line ids of source lines - Fix calculating line id of source lines - MS sndvol32 is still crashing in user32

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Dec 4 18:53:51 2010 New Revision: 49951 URL: http://svn.reactos.org/svn/reactos?rev=49951&view=rev Log: [AUDIO-BRINGUP] - Fix line ids of source lines - Fix calculating line id of source lines - MS sndvol32 is still crashing in user32 Modified: 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 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] Sat Dec 4 18:53:51 2010 @@ -564,7 +564,7 @@ SrcLine->Line.cbStruct = sizeof(MIXERLINEW); SrcLine->Line.dwDestination = 0; SrcLine->Line.dwSource = DstLine->Line.cConnections; - SrcLine->Line.dwLineID = (DstLine->Line.cConnections * 0x10000)+ (MixerInfo->MixCaps.cDestinations-1); + SrcLine->Line.dwLineID = (DstLine->Line.cConnections * SOURCE_LINE)+ (MixerInfo->MixCaps.cDestinations-1); SrcLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE | MIXERLINE_LINEF_SOURCE; SrcLine->Line.dwUser = 0; SrcLine->Line.cChannels = DstLine->Line.cChannels; 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] Sat Dec 4 18:53:51 2010 @@ -209,8 +209,12 @@ } /* calculate destination line id */ - DestinationLineID = (MixerLine->dwSource * DESTINATION_LINE) + MixerLine->dwDestination; - + DestinationLineID = (MixerLine->dwSource * SOURCE_LINE) + MixerLine->dwDestination; + + DPRINT("MixerName %S cDestinations %lu MixerLineName %S cConnections %lu dwSource %lu dwDestination %lu ID %lx\n", MixerInfo->MixCaps.szPname, MixerInfo->MixCaps.cDestinations, + MixerLineSrc->Line.szName, MixerLineSrc->Line.cConnections, + MixerLine->dwSource, MixerLine->dwDestination, + DestinationLineID); /* get target destination line id */ MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); @@ -240,7 +244,7 @@ if (!MixerLineSrc) { /* invalid parameter */ - DPRINT1("MixerName %S Line not found %lu\n", MixerInfo->MixCaps.szPname, MixerLine->dwLineID); + DPRINT1("MMixerGetLineInfo: MixerName %S Line not found %lu\n", MixerInfo->MixCaps.szPname, MixerLine->dwLineID); return MM_STATUS_INVALID_PARAMETER; } @@ -329,6 +333,9 @@ Flags &= ~MIXER_OBJECTF_HMIXER; + DPRINT("MMixerGetLineControls MixerId %lu Flags %lu\n", MixerId, Flags); + + if (Flags == MIXER_GETLINECONTROLSF_ALL) { /* cast to mixer info */ @@ -339,6 +346,7 @@ if (!MixerLineSrc) { /* invalid line id */ + DPRINT("MMixerGetLineControls Line not found %lx\n", MixerLineControls->dwLineID); return MM_STATUS_INVALID_PARAMETER; } /* copy line control(s) */ @@ -351,20 +359,25 @@ /* cast to mixer info */ MixerInfo = (LPMIXER_INFO)MixerHandle; + /* get mixer line */ MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLineControls->dwLineID); if (!MixerLineSrc) { /* invalid line id */ + DPRINT1("MMixerGetLineControls Line not found %lx\n", MixerLineControls->dwLineID); return MM_STATUS_INVALID_PARAMETER; } - ASSERT(MixerLineSrc); + /* sanity checks */ + ASSERT(MixerLineControls->cControls == 1); + ASSERT(MixerLineControls->cbmxctrl == sizeof(MIXERCONTROLW)); + ASSERT(MixerLineControls->pamxctrl != NULL); Index = 0; for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) { - DPRINT("dwControlType %x\n", MixerLineSrc->LineControls[Index].dwControlType); + DPRINT1("dwControlType %x\n", MixerLineSrc->LineControls[Index].dwControlType); if (MixerLineControls->dwControlType == MixerLineSrc->LineControls[Index].dwControlType) { /* found a control with that type */ @@ -385,15 +398,24 @@ if (Status != MM_STATUS_SUCCESS) { /* invalid parameter */ + DPRINT("MMixerGetLineControls ControlID not found %lx\n", MixerLineControls->dwLineID); return MM_STATUS_INVALID_PARAMETER; } + + ASSERT(MixerLineControls->cControls == 1); + ASSERT(MixerLineControls->cbmxctrl == sizeof(MIXERCONTROLW)); + ASSERT(MixerLineControls->pamxctrl != NULL); + + DPRINT("MMixerGetLineControls ControlID %lx ControlType %lx Name %S\n", MixerControl->dwControlID, MixerControl->dwControlType, MixerControl->szName); /* copy the controls */ MixerContext->Copy(MixerLineControls->pamxctrl, MixerControl, sizeof(MIXERCONTROLW)); + MixerLineControls->pamxctrl->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; + MixerLineControls->pamxctrl->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; + return MM_STATUS_SUCCESS; } - - + UNIMPLEMENTED return MM_STATUS_NOT_IMPLEMENTED; } 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] Sat Dec 4 18:53:51 2010 @@ -170,8 +170,8 @@ }EVENT_NOTIFICATION_ENTRY, *PEVENT_NOTIFICATION_ENTRY; -#define DESTINATION_LINE 0xFFFF0000 - +#define DESTINATION_LINE (0xFFFF0000) +#define SOURCE_LINE (0x10000) ULONG MMixerGetFilterPinCount( IN PMIXER_CONTEXT MixerContext,

13 years, 11 months

[jimtabor] 49950: [Win32k|User32] - Remove the old send message API and use NtUserMessageCall. - Send messages do not pass the Ansi bit. This was evident during the hook changes. User32 knows the c...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 4 17:51:17 2010 New Revision: 49950 URL: http://svn.reactos.org/svn/reactos?rev=49950&view=rev Log: [Win32k|User32] - Remove the old send message API and use NtUserMessageCall. - Send messages do not pass the Ansi bit. This was evident during the hook changes. User32 knows the caller is Ansi and with a Unicode window user32 can make the apropate switch. Win32k on the other hand, assumes, based on the Unicode window the caller is Unicode. Hook tests enabled in send message, forces the call to win32k, and the Ansi product is Unicode data. Using NtUserMessageCall this bit can be passed forward to allow win32k to make the correct switch going to callback. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sat Dec 4 17:51:17 2010 @@ -267,14 +267,6 @@ } static BOOL FASTCALL -MsgiUMToKMReply(PMSG UMMsg, PMSG KMMsg, LRESULT *Result) -{ - MsgiUMToKMCleanup(UMMsg, KMMsg); - - return TRUE; -} - -static BOOL FASTCALL MsgiKMToUMMessage(PMSG KMMsg, PMSG UMMsg) { *UMMsg = *KMMsg; @@ -1074,6 +1066,7 @@ { PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); return(MAKELONG(ThreadData->LastMessage.pt.x, ThreadData->LastMessage.pt.y)); + //return NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS); } @@ -2103,7 +2096,6 @@ LPARAM lParam) { MSG UMMsg, KMMsg; - NTUSERSENDMESSAGEINFO Info; LRESULT Result; PWND Window; PTHREADINFO ti = GetW32ThreadInfo(); @@ -2137,32 +2129,21 @@ UMMsg.message = Msg; UMMsg.wParam = wParam; UMMsg.lParam = lParam; + if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, FALSE)) { return FALSE; } - Info.Ansi = FALSE; - Result = NtUserSendMessage( KMMsg.hwnd, - KMMsg.message, + + Result = NtUserMessageCall( KMMsg.hwnd, + KMMsg.message, KMMsg.wParam, KMMsg.lParam, - &Info); - if (! Info.HandledByKernel) - { - MsgiUMToKMCleanup(&UMMsg, &KMMsg); - /* We need to send the message ourselves */ - Result = IntCallWindowProcW( Info.Ansi, - Info.Proc, - Window, - UMMsg.hwnd, - UMMsg.message, - UMMsg.wParam, - UMMsg.lParam); - } - else if (! MsgiUMToKMReply(&UMMsg, &KMMsg, &Result)) - { - return FALSE; - } + (ULONG_PTR)&Result, + FNID_SENDMESSAGE, + FALSE); + + MsgiUMToKMCleanup(&UMMsg, &KMMsg); return Result; } @@ -2174,10 +2155,8 @@ LRESULT WINAPI SendMessageA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - MSG AnsiMsg, UcMsg; - MSG KMMsg; + MSG AnsiMsg, UcMsg, KMMsg; LRESULT Result; - NTUSERSENDMESSAGEINFO Info; PWND Window; PTHREADINFO ti = GetW32ThreadInfo(); @@ -2210,57 +2189,28 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; - if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) - { - return FALSE; - } - - if (! MsgiUMToKMMessage(&UcMsg, &KMMsg, FALSE)) - { + + if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + { + return FALSE; + } + + if (!MsgiUMToKMMessage(&UcMsg, &KMMsg, FALSE)) + { MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); return FALSE; - } - Info.Ansi = TRUE; - Result = NtUserSendMessage( KMMsg.hwnd, - KMMsg.message, + } + + Result = NtUserMessageCall( KMMsg.hwnd, + KMMsg.message, KMMsg.wParam, KMMsg.lParam, - &Info); - if (! Info.HandledByKernel) - { - /* We need to send the message ourselves */ - if (Info.Ansi) - { - /* Ansi message and Ansi window proc, that's easy. Clean up - the Unicode message though */ - MsgiUMToKMCleanup(&UcMsg, &KMMsg); - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - Result = IntCallWindowProcA(Info.Ansi, Info.Proc, Window, Wnd, Msg, wParam, lParam); - } - else - { - /* Unicode winproc. Although we started out with an Ansi message we - already converted it to Unicode for the kernel call. Reuse that - message to avoid another conversion */ - Result = IntCallWindowProcW( Info.Ansi, - Info.Proc, - Window, - UcMsg.hwnd, - UcMsg.message, - UcMsg.wParam, - UcMsg.lParam); - if (! MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result)) - { - return FALSE; - } - } - } - /* Message sent by kernel. Convert back to Ansi */ - else if (! MsgiUMToKMReply(&UcMsg, &KMMsg, &Result) || - ! MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result)) - { - return FALSE; - } + (ULONG_PTR)&Result, + FNID_SENDMESSAGE, + TRUE); + + MsgiUMToKMCleanup(&UcMsg, &KMMsg); + MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result); return Result; } @@ -2278,18 +2228,34 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData) { + BOOL Result; + MSG AnsiMsg, UcMsg; CALL_BACK_INFO CallBackInfo; CallBackInfo.CallBack = lpCallBack; CallBackInfo.Context = dwData; - return NtUserMessageCall(hWnd, - Msg, - wParam, - lParam, - (ULONG_PTR)&CallBackInfo, - FNID_SENDMESSAGECALLBACK, - TRUE); + AnsiMsg.hwnd = hWnd; + AnsiMsg.message = Msg; + AnsiMsg.wParam = wParam; + AnsiMsg.lParam = lParam; + + if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + { + return FALSE; + } + + Result = NtUserMessageCall( UcMsg.hwnd, + UcMsg.message, + UcMsg.wParam, + UcMsg.lParam, + (ULONG_PTR)&CallBackInfo, + FNID_SENDMESSAGECALLBACK, + TRUE); + + MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); + + return Result; } /* @@ -2305,7 +2271,6 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData) { - CALL_BACK_INFO CallBackInfo; CallBackInfo.CallBack = lpCallBack; @@ -2334,76 +2299,47 @@ UINT uTimeout, PDWORD_PTR lpdwResult) { - MSG AnsiMsg; - MSG UcMsg; + MSG AnsiMsg, UcMsg; LRESULT Result; - NTUSERSENDMESSAGEINFO Info; + DOSENDMESSAGE dsm; + + SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); + + if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + if (lpdwResult) *lpdwResult = 0; + + dsm.uFlags = fuFlags; + dsm.uTimeout = uTimeout; AnsiMsg.hwnd = hWnd; AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) - { - return FALSE; - } - - SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); - - Info.Ansi = TRUE; - Result = NtUserSendMessageTimeout(UcMsg.hwnd, UcMsg.message, - UcMsg.wParam, UcMsg.lParam, - fuFlags, uTimeout, (ULONG_PTR*)lpdwResult, &Info); - if(!Result) { - SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); return FALSE; } - if (! Info.HandledByKernel) - { - PWND pWnd; - pWnd = ValidateHwnd(hWnd); - /* We need to send the message ourselves */ - if (Info.Ansi) - { - /* Ansi message and Ansi window proc, that's easy. Clean up - the Unicode message though */ - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - Result = IntCallWindowProcA(Info.Ansi, Info.Proc, pWnd, hWnd, Msg, wParam, lParam); - } - else - { - /* Unicode winproc. Although we started out with an Ansi message we - already converted it to Unicode for the kernel call. Reuse that - message to avoid another conversion */ - Result = IntCallWindowProcW( Info.Ansi, - Info.Proc, - pWnd, - UcMsg.hwnd, - UcMsg.message, - UcMsg.wParam, - UcMsg.lParam); - if (! MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result)) - { - SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); - return FALSE; - } - } - if(lpdwResult) - *lpdwResult = Result; - Result = TRUE; - } - else - { - /* Message sent by kernel. Convert back to Ansi */ - if (! MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result)) - { - SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); - return FALSE; - } - } + + Result = NtUserMessageCall( UcMsg.hwnd, + UcMsg.message, + UcMsg.wParam, + UcMsg.lParam, + (ULONG_PTR)&dsm, + FNID_SENDMESSAGETIMEOUT, + TRUE); + + MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result); + + if (lpdwResult) *lpdwResult = dsm.Result; SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); + return Result; } @@ -2422,28 +2358,34 @@ UINT uTimeout, PDWORD_PTR lpdwResult) { - NTUSERSENDMESSAGEINFO Info; LRESULT Result; + DOSENDMESSAGE dsm; SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); - Info.Ansi = FALSE; - Result = NtUserSendMessageTimeout(hWnd, Msg, wParam, lParam, fuFlags, uTimeout, - lpdwResult, &Info); - if (! Info.HandledByKernel) - { - PWND pWnd; - pWnd = ValidateHwnd(hWnd); - /* We need to send the message ourselves */ - Result = IntCallWindowProcW(Info.Ansi, Info.Proc, pWnd, hWnd, Msg, wParam, lParam); - if(lpdwResult) - *lpdwResult = Result; - - SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); - return TRUE; - } + if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + if (lpdwResult) *lpdwResult = 0; + + dsm.uFlags = fuFlags; + dsm.uTimeout = uTimeout; + + Result = NtUserMessageCall( hWnd, + Msg, + wParam, + lParam, + (ULONG_PTR)&dsm, + FNID_SENDMESSAGETIMEOUT, + FALSE); + + if (lpdwResult) *lpdwResult = dsm.Result; SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); + return Result; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Dec 4 17:51:17 2010 @@ -2255,6 +2255,15 @@ UINT transType, DWORD keyboardId, HKL dwhkl ); + +typedef struct tagDOSENDMESSAGE +{ + UINT uFlags; + UINT uTimeout; + ULONG_PTR Result; +} +DOSENDMESSAGE, *PDOSENDMESSAGE; + BOOL NTAPI NtUserMessageCall( @@ -3302,33 +3311,6 @@ IN HWND hWnd, IN DWORD dwFlags); - -typedef struct tagNTUSERSENDMESSAGEINFO -{ - BOOL HandledByKernel; - BOOL Ansi; - WNDPROC Proc; -} NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO; - -/* use NtUserMessageCall */ -LRESULT NTAPI -NtUserSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - PNTUSERSENDMESSAGEINFO Info); - -/* use NtUserMessageCall */ -LRESULT NTAPI -NtUserSendMessageTimeout(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult, - PNTUSERSENDMESSAGEINFO Info); - typedef struct _SETSCROLLBARINFO { int nTrackPos; 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] Sat Dec 4 17:51:17 2010 @@ -18,14 +18,6 @@ BOOLEAN NTAPI PsGetProcessExitProcessCalled(PEPROCESS Process); #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) - -typedef struct -{ - UINT uFlags; - UINT uTimeout; - ULONG_PTR Result; -} -DOSENDMESSAGE, *PDOSENDMESSAGE; /* FUNCTIONS *****************************************************************/ @@ -864,6 +856,8 @@ RemoveMsg |= ((GetWakeMask( MsgFilterMin, MsgFilterMax ))<< 16); } + pti = PsGetCurrentThreadWin32Thread(); + do { Present = co_IntPeekMessage( pMsg, @@ -874,6 +868,9 @@ bGMSG ); if (Present) { + pti->timeLast = pMsg->time; + pti->ptLast = pMsg->pt; + // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. @@ -911,7 +908,6 @@ } while( bGMSG && !Present ); - pti = PsGetCurrentThreadWin32Thread(); // Been spinning, time to swap vinyl... if (pti->pClientInfo->cSpins >= 100) { @@ -962,7 +958,7 @@ Message.pt = gpsi->ptCursor; KeQueryTickCount(&LargeTickCount); - pThread->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); + Message.time = MsqCalculateMessageTime(&LargeTickCount); MsqPostMessage(pThread->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); ObDereferenceObject( peThread ); return TRUE; @@ -1052,7 +1048,7 @@ Message.lParam = lParam; Message.pt = gpsi->ptCursor; KeQueryTickCount(&LargeTickCount); - pti->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); + Message.time = MsqCalculateMessageTime(&LargeTickCount); MsqPostMessage(Window->head.pti->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); } } @@ -1451,29 +1447,21 @@ UINT Msg, WPARAM wParam, LPARAM lParam, - PDOSENDMESSAGE dsm, - PNTUSERSENDMESSAGEINFO UnsafeInfo ) + PDOSENDMESSAGE dsm) { PTHREADINFO pti; LRESULT Result = TRUE; NTSTATUS Status; PWND Window = NULL; - NTUSERSENDMESSAGEINFO Info; MSG UserModeMsg; MSG KernelModeMsg; PMSGMEMORY MsgMemoryEntry; - RtlZeroMemory(&Info, sizeof(NTUSERSENDMESSAGEINFO)); - - /* FIXME: Call hooks. */ if (HWND_BROADCAST != hWnd) { Window = UserGetWindowObject(hWnd); if ( !Window ) { - /* Tell usermode to not touch this one */ - Info.HandledByKernel = TRUE; - MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); return 0; } } @@ -1487,84 +1475,46 @@ /* See if the current thread can handle the message */ pti = PsGetCurrentThreadWin32Thread(); - // This is checked in user mode!!!!!!! - if ( HWND_BROADCAST != hWnd && - NULL != pti && - Window->head.pti->MessageQueue == pti->MessageQueue && - !ISITHOOKED(WH_CALLWNDPROC) && - !ISITHOOKED(WH_CALLWNDPROCRET) && - ( Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST ) ) - { - /* Gather the information usermode needs to call the window proc directly */ - Info.HandledByKernel = FALSE; - - Status = MmCopyFromCaller(&(Info.Ansi), &(UnsafeInfo->Ansi), sizeof(BOOL)); - if (! NT_SUCCESS(Status)) - { - Info.Ansi = ! Window->Unicode; - } - - Info.Ansi = !Window->Unicode; - Info.Proc = Window->lpfnWndProc; + UserModeMsg.hwnd = hWnd; + UserModeMsg.message = Msg; + UserModeMsg.wParam = wParam; + UserModeMsg.lParam = lParam; + MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); + + Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return (dsm ? 0 : -1); + } + + if (!dsm) + { + Result = co_IntSendMessage( KernelModeMsg.hwnd, + KernelModeMsg.message, + KernelModeMsg.wParam, + KernelModeMsg.lParam ); } else { - /* Must be handled by other thread */ - // if (HWND_BROADCAST != hWnd) - // { - // UserDereferenceObject(Window); - // } - Info.HandledByKernel = TRUE; - UserModeMsg.hwnd = hWnd; - UserModeMsg.message = Msg; - UserModeMsg.wParam = wParam; - UserModeMsg.lParam = lParam; - MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); - - Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); - if (! NT_SUCCESS(Status)) - { - MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return (dsm ? 0 : -1); - } - - if(!dsm) - { - Result = co_IntSendMessage( KernelModeMsg.hwnd, - KernelModeMsg.message, - KernelModeMsg.wParam, - KernelModeMsg.lParam ); - } - else - { - Result = co_IntSendMessageTimeout( KernelModeMsg.hwnd, - KernelModeMsg.message, - KernelModeMsg.wParam, - KernelModeMsg.lParam, - dsm->uFlags, - dsm->uTimeout, - &dsm->Result ); - } - - Status = CopyMsgToUserMem(&UserModeMsg, &KernelModeMsg); - if (! NT_SUCCESS(Status)) - { - MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return(dsm ? 0 : -1); - } - } - - Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); + Result = co_IntSendMessageTimeout( KernelModeMsg.hwnd, + KernelModeMsg.message, + KernelModeMsg.wParam, + KernelModeMsg.lParam, + dsm->uFlags, + dsm->uTimeout, + &dsm->Result ); + } + + Status = CopyMsgToUserMem(&UserModeMsg, &KernelModeMsg); if (! NT_SUCCESS(Status)) { - SetLastWin32Error(ERROR_INVALID_PARAMETER); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return(dsm ? 0 : -1); } return (LRESULT)Result; } - BOOL FASTCALL UserSendNotifyMessage( HWND hWnd, @@ -1708,68 +1658,6 @@ return ret; } - -////////// API on the way out! -LRESULT APIENTRY -NtUserSendMessageTimeout( HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult, - PNTUSERSENDMESSAGEINFO UnsafeInfo ) -{ - DOSENDMESSAGE dsm; - LRESULT Result; - - DPRINT("Enter NtUserSendMessageTimeout\n"); - - dsm.uFlags = uFlags; - dsm.uTimeout = uTimeout; - - UserEnterExclusive(); - - Result = co_IntDoSendMessage(hWnd, Msg, wParam, lParam, &dsm, UnsafeInfo); - - UserLeave(); - - if(uResult != NULL && Result != 0) - { - _SEH2_TRY - { - ProbeForWrite(uResult, sizeof(ULONG_PTR), 1); - RtlCopyMemory(uResult, &dsm.Result, sizeof(ULONG_PTR)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER);; - Result = FALSE; - } - _SEH2_END; - } - - return Result; -} - -LRESULT APIENTRY -NtUserSendMessage( HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - PNTUSERSENDMESSAGEINFO UnsafeInfo ) -{ - BOOL ret; - - UserEnterExclusive(); - - ret = co_IntDoSendMessage(Wnd, Msg, wParam, lParam, NULL, UnsafeInfo); - - UserLeave(); - - return ret; -} -////////// BOOL APIENTRY NtUserWaitMessage(VOID) @@ -2220,32 +2108,32 @@ if (parm.flags & BSF_FORCEIFHUNG || parm.flags & BSF_NOHANG) { co_IntSendMessageTimeout( HWND_BROADCAST, - Msg, - wParam, - lParam, - SMTO_ABORTIFHUNG, - 2000, - &RetVal); + Msg, + wParam, + lParam, + SMTO_ABORTIFHUNG, + 2000, + &RetVal); } else if (parm.flags & BSF_NOTIMEOUTIFNOTHUNG) { co_IntSendMessageTimeout( HWND_BROADCAST, - Msg, + Msg, wParam, - lParam, - SMTO_NOTIMEOUTIFNOTHUNG, - 2000, - &RetVal); + lParam, + SMTO_NOTIMEOUTIFNOTHUNG, + 2000, + &RetVal); } else { co_IntSendMessageTimeout( HWND_BROADCAST, - Msg, - wParam, - lParam, - SMTO_NORMAL, - 2000, - &RetVal); + Msg, + wParam, + lParam, + SMTO_NORMAL, + 2000, + &RetVal); } Ret = RetVal; } @@ -2275,6 +2163,62 @@ } } break; + case FNID_SENDMESSAGE: + { + Ret = co_IntDoSendMessage(hWnd, Msg, wParam, lParam, 0); + + if (ResultInfo) + { + _SEH2_TRY + { + ProbeForWrite((PVOID)ResultInfo, sizeof(ULONG_PTR), 1); + RtlCopyMemory((PVOID)ResultInfo, &Ret, sizeof(ULONG_PTR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + _SEH2_YIELD(break); + } + _SEH2_END; + } + break; + } + case FNID_SENDMESSAGETIMEOUT: + { + DOSENDMESSAGE dsm, *pdsm = (PDOSENDMESSAGE)ResultInfo; + if (ResultInfo) + { + _SEH2_TRY + { + ProbeForRead(pdsm, sizeof(DOSENDMESSAGE), 1); + RtlCopyMemory(&dsm, pdsm, sizeof(DOSENDMESSAGE)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + _SEH2_YIELD(break); + } + _SEH2_END; + } + + Ret = co_IntDoSendMessage( hWnd, Msg, wParam, lParam, &dsm ); + + if (pdsm) + { + _SEH2_TRY + { + ProbeForWrite(pdsm, sizeof(DOSENDMESSAGE), 1); + RtlCopyMemory(pdsm, &dsm, sizeof(DOSENDMESSAGE)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + _SEH2_YIELD(break); + } + _SEH2_END; + } + break; + } // CallNextHook bypass. case FNID_CALLWNDPROC: case FNID_CALLWNDPROCRET: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Dec 4 17:51:17 2010 @@ -112,6 +112,12 @@ case NOPARAM_ROUTINE_MSQCLEARWAKEMASK: RETURN( (DWORD_PTR)IntMsqClearWakeMask()); + + case NOPARAM_ROUTINE_GETMSESSAGEPOS: + { + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + RETURN( (DWORD_PTR)MAKELONG(pti->ptLast.x, pti->ptLast.y)); + } default: DPRINT1("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine); Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Dec 4 17:51:17 2010 @@ -692,6 +692,4 @@ NtUserMonitorFromPoint 3 NtUserMonitorFromRect 2 NtUserMonitorFromWindow 2 -NtUserSendMessage 5 -NtUserSendMessageTimeout 8 NtUserSetScrollBarInfo 3

13 years, 11 months

[janderwald] 49949: [AUDIO-BRINGUP] - More fixes for mmixer library - Store destination lines sharing the same mixer object in the same object - Fix generating destination lines id / soure lines - ...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Dec 4 17:45:48 2010 New Revision: 49949 URL: http://svn.reactos.org/svn/reactos?rev=49949&view=rev Log: [AUDIO-BRINGUP] - More fixes for mmixer library - Store destination lines sharing the same mixer object in the same object - Fix generating destination lines id / soure lines - Add mux node for input mixers - Disable code which checked if the topology node has already been reserved for an another line. Tests in WinXP concluded that ms does not do this at all, though documentation claims it - Add source line to the correct destination line - Fix a memory leak - Fix tons of bugs in MMixerGetLineInfo 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/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] Sat Dec 4 17:45:48 2010 @@ -121,7 +121,7 @@ VOID Copy(PVOID Src, PVOID Dst, ULONG NumBytes) { - CopyMemory(Src, Dst, NumBytes); + RtlMoveMemory(Src, Dst, NumBytes); } MIXER_STATUS 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] Sat Dec 4 17:45:48 2010 @@ -202,9 +202,10 @@ /* initialize mixer destination line */ DestinationLine->Line.cbStruct = sizeof(MIXERLINEW); DestinationLine->Line.dwSource = MAXULONG; - DestinationLine->Line.dwLineID = DESTINATION_LINE; + DestinationLine->Line.dwLineID = MixerInfo->MixCaps.cDestinations + DESTINATION_LINE; DestinationLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE; DestinationLine->Line.dwUser = 0; + DestinationLine->Line.dwDestination = MixerInfo->MixCaps.cDestinations; DestinationLine->Line.dwComponentType = (bInputMixer == 0 ? MIXERLINE_COMPONENTTYPE_DST_SPEAKERS : MIXERLINE_COMPONENTTYPE_DST_WAVEIN); DestinationLine->Line.cChannels = 2; /* FIXME */ @@ -219,7 +220,7 @@ } DestinationLine->Line.Target.dwType = (bInputMixer == 0 ? MIXERLINE_TARGETTYPE_WAVEOUT : MIXERLINE_TARGETTYPE_WAVEIN); - DestinationLine->Line.Target.dwDeviceID = !bInputMixer; + DestinationLine->Line.Target.dwDeviceID = 0; //FIXME DestinationLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; DestinationLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; DestinationLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; @@ -231,7 +232,10 @@ InitializeListHead(&DestinationLine->LineControlsExtraData); /* insert into mixer info */ - InsertHeadList(&MixerInfo->LineList, &DestinationLine->Entry); + InsertTailList(&MixerInfo->LineList, &DestinationLine->Entry); + + /* increment destination count */ + MixerInfo->MixCaps.cDestinations++; /* done */ return MM_STATUS_SUCCESS; @@ -385,6 +389,7 @@ IN PMIXER_CONTEXT MixerContext, IN PTOPOLOGY Topology, IN ULONG PinId, + IN ULONG bInputMixer, IN ULONG bUpStream, OUT PULONG OutNodesCount, OUT PULONG OutNodes, @@ -424,6 +429,12 @@ if (bTerminator) { /* found terminator */ + if (bInputMixer) + { + /* add mux source for source destination line */ + OutNodes[Count] = NodeIndex; + Count++; + } break; } @@ -489,13 +500,13 @@ { /* check if the node has already been reserved to a line */ MMixerIsTopologyNodeReserved(Topology, Nodes[Index], &bReserved); - +#if 0 /* MS lies */ if (bReserved) { /* node is already used, skip it */ continue; } - +#endif /* set node status as used */ MMixerSetTopologyNodeReserved(Topology, Nodes[Index]); @@ -524,6 +535,7 @@ IN ULONG PinId, IN ULONG NodesCount, IN PULONG Nodes, + IN ULONG DestinationLineID, OUT LPMIXERLINE_EXT * OutSrcLine) { LPMIXERLINE_EXT SrcLine, DstLine; @@ -540,7 +552,7 @@ } /* get destination line */ - DstLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DESTINATION_LINE); + DstLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); ASSERT(DstLine); /* initialize mixer src line */ @@ -552,7 +564,7 @@ SrcLine->Line.cbStruct = sizeof(MIXERLINEW); SrcLine->Line.dwDestination = 0; SrcLine->Line.dwSource = DstLine->Line.cConnections; - SrcLine->Line.dwLineID = (DstLine->Line.cConnections * 0x10000); + SrcLine->Line.dwLineID = (DstLine->Line.cConnections * 0x10000)+ (MixerInfo->MixCaps.cDestinations-1); SrcLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE | MIXERLINE_LINEF_SOURCE; SrcLine->Line.dwUser = 0; SrcLine->Line.cChannels = DstLine->Line.cChannels; @@ -603,6 +615,7 @@ IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, IN PTOPOLOGY Topology, + IN ULONG DestinationLineID, IN ULONG LineTerminator) { PULONG AllNodes, AllPins, AllPinNodes; @@ -612,7 +625,7 @@ LPMIXERLINE_EXT DstLine, SrcLine; /* get destination line */ - DstLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DESTINATION_LINE); + DstLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); ASSERT(DstLine); /* allocate an array to store all nodes which are upstream of the line terminator */ @@ -647,9 +660,9 @@ AllPinsCount = 0; MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, LineTerminator, TRUE, &AllPinsCount, AllPins); - DPRINT("LineTerminator %lu\n", LineTerminator); - DPRINT("PinCount %lu\n", AllPinsCount); - DPRINT("AllNodesCount %lu\n", AllNodesCount); + DPRINT1("LineTerminator %lu\n", LineTerminator); + DPRINT1("PinCount %lu\n", AllPinsCount); + DPRINT1("AllNodesCount %lu\n", AllNodesCount); /* now construct the source lines which are attached to the destination line */ Index = AllPinsCount; @@ -693,8 +706,11 @@ if (AllPinNodesCount) { +#ifdef MMIXER_DEBUG + ULONG TempIndex; +#endif /* now build the mixer source line */ - Status = MMixerBuildMixerSourceLine(MixerContext, MixerInfo, Topology, PinId, AllPinNodesCount, AllPinNodes, &SrcLine); + Status = MMixerBuildMixerSourceLine(MixerContext, MixerInfo, Topology, PinId, AllPinNodesCount, AllPinNodes, DestinationLineID, &SrcLine); if (Status == MM_STATUS_SUCCESS) { @@ -703,7 +719,18 @@ /* increment destination line count */ DstLine->Line.cConnections++; +#ifdef MMIXER_DEBUG + DPRINT1("Adding PinId %lu AllPinNodesCount %lu to DestinationLine %lu\n", PinId, AllPinNodesCount, DestinationLineID); + for(TempIndex = 0; TempIndex < AllPinNodesCount; TempIndex++) + DPRINT1("NodeIndex %lu\n", AllPinNodes[TempIndex]); +#endif } + } + else + { +#ifdef MMIXER_DEBUG + DPRINT1("Discarding DestinationLineID %lu PinId %lu NO NODES!\n", DestinationLineID, PinId); +#endif } }while(Index != 0); @@ -719,6 +746,7 @@ IN PTOPOLOGY Topology, IN ULONG PinId, IN ULONG bInput, + IN ULONG DestinationLineId, OUT PULONG OutLineTerminator) { PULONG Nodes; @@ -737,7 +765,7 @@ } /* get all destination line controls */ - Status = MMixerCountMixerControls(MixerContext, Topology, PinId, TRUE, &NodesCount, Nodes, &LineTerminator); + Status = MMixerCountMixerControls(MixerContext, Topology, PinId, bInput, TRUE, &NodesCount, Nodes, &LineTerminator); /* check for success */ if (Status != MM_STATUS_SUCCESS) @@ -748,7 +776,7 @@ } /* get destination mixer line */ - DstLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DESTINATION_LINE); + DstLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineId); /* sanity check */ ASSERT(DstLine); @@ -823,7 +851,7 @@ IN PKSPIN_PHYSICALCONNECTION OutConnection) { MIXER_STATUS Status; - ULONG PinsCount, LineTerminator; + ULONG PinsCount, LineTerminator, DestinationLineID; PULONG Pins; PTOPOLOGY Topology; @@ -838,17 +866,35 @@ return MM_STATUS_UNSUCCESSFUL; } - DPRINT("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); + 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; - - Status = MMixerBuildTopology(MixerContext, MixerData, &Topology); - if (Status != MM_STATUS_SUCCESS) - { - /* failed to create topology */ - return Status; + if (MixerData->Topology == NULL) + { + /* construct new topology */ + Status = MMixerBuildTopology(MixerContext, MixerData, &Topology); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to create topology */ + return Status; + } + + /* store topology */ + MixerData->Topology = Topology; + } + else + { + /* re-use existing topology */ + Topology = MixerData->Topology; } /* allocate pin index array which will hold all referenced pins */ @@ -887,79 +933,93 @@ /* create destination line */ Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, Pins[0], bInput); + /* calculate destination line id */ + DestinationLineID = (DESTINATION_LINE + MixerInfo->MixCaps.cDestinations-1); + if (Status != MM_STATUS_SUCCESS) { + /* failed to build destination line */ MixerContext->Free(Pins); - //MMixerFreeTopology(Topology); /* return error code */ return Status; } /* add mixer controls to destination line */ - Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, Topology, Pins[0], bInput, &LineTerminator); + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, Topology, Pins[0], bInput, DestinationLineID, &LineTerminator); if (Status == MM_STATUS_SUCCESS) { /* now add the rest of the source lines */ - Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, Topology, LineTerminator); + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, Topology, DestinationLineID, LineTerminator); } } else { - Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, Topology, OutConnection->Pin, bInput, &LineTerminator); + /* calculate destination line id */ + DestinationLineID = (DESTINATION_LINE + MixerInfo->MixCaps.cDestinations-1); + + /* add mixer controls */ + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, Topology, OutConnection->Pin, bInput, DestinationLineID, &LineTerminator); if (Status == MM_STATUS_SUCCESS) { /* now add the rest of the source lines */ - Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, Topology, LineTerminator); - } - } - - /* free topology */ - //MMixerFreeTopology(Topology); + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, Topology, DestinationLineID, LineTerminator); + } + } return Status; } - MIXER_STATUS MMixerInitializeFilter( IN PMIXER_CONTEXT MixerContext, IN PMIXER_LIST MixerList, IN LPMIXER_DATA MixerData, + IN LPMIXER_INFO MixerInfo, IN PTOPOLOGY Topology, IN ULONG NodeIndex, - IN ULONG bInputMixer) -{ - LPMIXER_INFO MixerInfo; + IN ULONG bInputMixer, + IN OUT LPMIXER_INFO * OutMixerInfo) +{ + MIXER_STATUS Status; PKSPIN_PHYSICALCONNECTION OutConnection; ULONG * Pins; ULONG PinsFound; - - /* allocate a mixer info struct */ - MixerInfo = (LPMIXER_INFO) MixerContext->Alloc(sizeof(MIXER_INFO)); - if (!MixerInfo) - { - /* no memory */ - return MM_STATUS_NO_MEMORY; - } - - /* intialize mixer caps */ - MixerInfo->MixCaps.wMid = MM_MICROSOFT; /* FIXME */ - MixerInfo->MixCaps.wPid = MM_PID_UNMAPPED; /* FIXME */ - MixerInfo->MixCaps.vDriverVersion = 1; /* FIXME */ - MixerInfo->MixCaps.fdwSupport = 0; - MixerInfo->MixCaps.cDestinations = 1; - MixerInfo->hMixer = MixerData->hDevice; - - /* get mixer name */ - MMixerGetDeviceName(MixerContext, MixerInfo->MixCaps.szPname, MixerData->hDeviceInterfaceKey); - - /* initialize line list */ - InitializeListHead(&MixerInfo->LineList); - InitializeListHead(&MixerInfo->EventList); + ULONG NewMixerInfo = FALSE; + + if (MixerInfo == NULL) + { + /* allocate a mixer info struct */ + MixerInfo = (LPMIXER_INFO) MixerContext->Alloc(sizeof(MIXER_INFO)); + if (!MixerInfo) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + + /* new mixer info */ + NewMixerInfo = TRUE; + + /* intialize mixer caps */ + MixerInfo->MixCaps.wMid = MM_MICROSOFT; /* FIXME */ + MixerInfo->MixCaps.wPid = MM_PID_UNMAPPED; /* FIXME */ + MixerInfo->MixCaps.vDriverVersion = 1; /* FIXME */ + MixerInfo->MixCaps.fdwSupport = 0; + MixerInfo->MixCaps.cDestinations = 0; + + /* get mixer name */ + MMixerGetDeviceName(MixerContext, MixerInfo->MixCaps.szPname, MixerData->hDeviceInterfaceKey); + + /* initialize line list */ + InitializeListHead(&MixerInfo->LineList); + InitializeListHead(&MixerInfo->EventList); + } + + /* store mixer info */ + *OutMixerInfo = MixerInfo; /* now allocate an array which will receive the indices of the pin * which has a ADC / DAC nodetype in its path @@ -977,7 +1037,7 @@ PinsFound = 0; MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, NodeIndex, !bInputMixer, &PinsFound, Pins); - /* if there is now pin found, we have a broken topology */ + /* if there is no pin found, we have a broken topology */ ASSERT(PinsFound != 0); /* now create a wave info struct */ @@ -1039,26 +1099,19 @@ * handle drivers which expose their topology on the same filter */ ASSERT(0); + MixerInfo->hMixer = MixerData->hDevice; } /* free pins */ MixerContext->Free(Pins); - if (!bInputMixer && MixerList->MixerListCount == 1) - { - /* FIXME preferred device should be inserted at front - * windows always inserts output mixer in front - */ + if (NewMixerInfo) + { + /* insert mixer */ InsertHeadList(&MixerList->MixerList, &MixerInfo->Entry); - } - else - { - /* insert at back */ - InsertTailList(&MixerList->MixerList, &MixerInfo->Entry); - } - - /* increment mixer count */ - MixerList->MixerListCount++; + /* increment mixer count */ + MixerList->MixerListCount++; + } /* done */ return Status; @@ -1074,6 +1127,7 @@ MIXER_STATUS Status; PTOPOLOGY Topology; ULONG NodeIndex; + LPMIXER_INFO MixerInfo = NULL; /* check if topology has already been built */ if (MixerData->Topology == NULL) @@ -1101,7 +1155,7 @@ if (NodeIndex != MAXULONG) { /* it has */ - Status = MMixerInitializeFilter(MixerContext, MixerList, MixerData, Topology, NodeIndex, FALSE); + Status = MMixerInitializeFilter(MixerContext, MixerList, MixerData, NULL, Topology, NodeIndex, FALSE, &MixerInfo); /* check for success */ if (Status == MM_STATUS_SUCCESS) @@ -1109,7 +1163,11 @@ /* increment mixer count */ (*DeviceCount)++; } - + else + { + /* reset mixer info in case of error */ + MixerInfo = NULL; + } } /* check if the filter has an wave in node */ @@ -1117,7 +1175,7 @@ if (NodeIndex != MAXULONG) { /* it has */ - Status = MMixerInitializeFilter(MixerContext, MixerList, MixerData, Topology, NodeIndex, TRUE); + Status = MMixerInitializeFilter(MixerContext, MixerList, MixerData, MixerInfo, Topology, NodeIndex, TRUE, &MixerInfo); /* check for success */ if (Status == MM_STATUS_SUCCESS) @@ -1127,6 +1185,8 @@ } } + + /* TODO: handle alternative mixer types + 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] Sat Dec 4 17:45:48 2010 @@ -123,6 +123,7 @@ MIXER_STATUS Status; LPMIXER_INFO MixerInfo; LPMIXERLINE_EXT MixerLineSrc; + ULONG DestinationLineID; /* verify mixer context */ Status = MMixerVerifyContext(MixerContext); @@ -144,24 +145,43 @@ } } + if (MixerLine->cbStruct != sizeof(MIXERLINEW)) + { + DPRINT1("MixerLine Expected %lu but got %lu\n", sizeof(MIXERLINEW), MixerLine->cbStruct); + return MM_STATUS_INVALID_PARAMETER; + } + + /* clear hmixer from flags */ Flags &=~MIXER_OBJECTF_HMIXER; + DPRINT1("MMixerGetLineInfo MixerId %lu Flags %lu\n", MixerId, Flags); + if (Flags == MIXER_GETLINEINFOF_DESTINATION) { /* cast to mixer info */ MixerInfo = (LPMIXER_INFO)MixerHandle; - if (MixerLine->dwDestination != 0) - { - /* destination line member must be zero */ - return MM_STATUS_INVALID_PARAMETER; - } - - MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, DESTINATION_LINE); - ASSERT(MixerLineSrc); + /* calculate destination line id */ + DestinationLineID = (MixerLine->dwDestination + DESTINATION_LINE); + + /* get destination line */ + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + + if (MixerLineSrc == NULL) + { + DPRINT1("MixerCaps Name %S DestinationLineCount %lu dwDestination %lu not found\n", MixerInfo->MixCaps.szPname, MixerInfo->MixCaps.cDestinations, MixerLine->dwDestination); + return MM_STATUS_UNSUCCESSFUL; + } + /* copy mixer line */ MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + /* make sure it is null terminated */ + MixerLine->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; + MixerLine->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; + MixerLine->Target.szPname[MAXPNAMELEN-1] = L'\0'; + + /* done */ return MM_STATUS_SUCCESS; } else if (Flags == MIXER_GETLINEINFOF_SOURCE) @@ -169,41 +189,71 @@ /* cast to mixer info */ MixerInfo = (LPMIXER_INFO)MixerHandle; - - MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, DESTINATION_LINE); + /* calculate destination line id */ + DestinationLineID = (MixerLine->dwDestination + DESTINATION_LINE); + + /* get destination line */ + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + + if (MixerLineSrc == NULL) + { + DPRINT1("MixerCaps Name %S DestinationLineCount %lu dwDestination %lu not found\n", MixerInfo->MixCaps.szPname, MixerInfo->MixCaps.cDestinations, MixerLine->dwDestination); + return MM_STATUS_UNSUCCESSFUL; + } + + /* check if dwSource is out of bounds */ + if (MixerLine->dwSource >= MixerLineSrc->Line.cConnections) + { + DPRINT1("MixerCaps Name %S MixerLineName %S Connections %lu dwSource %lu not found\n", MixerInfo->MixCaps.szPname, MixerLineSrc->Line.szName, MixerLineSrc->Line.cConnections, MixerLine->dwSource); + return MM_STATUS_UNSUCCESSFUL; + } + + /* calculate destination line id */ + DestinationLineID = (MixerLine->dwSource * DESTINATION_LINE) + MixerLine->dwDestination; + + /* get target destination line id */ + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + + /* sanity check */ ASSERT(MixerLineSrc); - if (MixerLine->dwSource >= MixerLineSrc->Line.cConnections) - { - DPRINT("dwSource %u > Destinations %u\n", MixerLine->dwSource, MixerLineSrc->Line.cConnections); - - /* invalid parameter */ - return MM_STATUS_INVALID_PARAMETER; - } - - MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLine->dwSource * 0x10000); - if (MixerLineSrc) - { - DPRINT("Line %u Name %S\n", MixerLineSrc->Line.dwSource, MixerLineSrc->Line.szName); - MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); - return MM_STATUS_SUCCESS; - } - return MM_STATUS_UNSUCCESSFUL; + DPRINT("Line %u Name %S\n", MixerLineSrc->Line.dwSource, MixerLineSrc->Line.szName); + + /* copy mixer line */ + MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + + /* make sure it is null terminated */ + MixerLine->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; + MixerLine->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; + MixerLine->Target.szPname[MAXPNAMELEN-1] = L'\0'; + + /* done */ + return MM_STATUS_SUCCESS; } else if (Flags == MIXER_GETLINEINFOF_LINEID) { /* cast to mixer info */ MixerInfo = (LPMIXER_INFO)MixerHandle; + /* try to find line */ MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLine->dwLineID); if (!MixerLineSrc) { /* invalid parameter */ - return MM_STATUS_INVALID_PARAMETER; - } - - /* copy cached data */ + DPRINT1("MixerName %S Line not found %lu\n", MixerInfo->MixCaps.szPname, MixerLine->dwLineID); + return MM_STATUS_INVALID_PARAMETER; + } + + DPRINT("Line %u Name %S\n", MixerLineSrc->Line.dwSource, MixerLineSrc->Line.szName); + + /* copy mixer line*/ MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + + /* make sure it is null terminated */ + MixerLine->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; + MixerLine->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; + MixerLine->Target.szPname[MAXPNAMELEN-1] = L'\0'; + return MM_STATUS_SUCCESS; } else if (Flags == MIXER_GETLINEINFOF_COMPONENTTYPE) @@ -211,6 +261,7 @@ /* cast to mixer info */ MixerInfo = (LPMIXER_INFO)MixerHandle; + /* find mixer line by component type */ MixerLineSrc = MMixerGetSourceMixerLineByComponentType(MixerInfo, MixerLine->dwComponentType); if (!MixerLineSrc) { @@ -218,11 +269,24 @@ return MM_STATUS_UNSUCCESSFUL; } - ASSERT(MixerLineSrc); - - /* copy cached data */ + /* copy mixer line */ MixerContext->Copy(MixerLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + + /* make sure it is null terminated */ + MixerLine->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; + MixerLine->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; + MixerLine->Target.szPname[MAXPNAMELEN-1] = L'\0'; + + /* done */ return MM_STATUS_SUCCESS; + } + else if (Flags == MIXER_GETLINEINFOF_TARGETTYPE) + { + DPRINT1("MIXER_GETLINEINFOF_TARGETTYPE handling is unimplemented\n"); + } + else + { + DPRINT1("Unknown Flags %lx handling is unimplemented\n", Flags); } return MM_STATUS_NOT_IMPLEMENTED; @@ -457,6 +521,66 @@ } return Status; +} + +VOID +MMixerPrintMixers( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList) +{ + ULONG Index, SubIndex, DestinationLineID; + LPMIXER_INFO MixerInfo; + LPMIXERLINE_EXT DstMixerLine; + + DPRINT1("MixerList %p\n", MixerList); + DPRINT1("MidiInCount %lu\n", MixerList->MidiInListCount); + DPRINT1("MidiOutCount %lu\n", MixerList->MidiOutListCount); + DPRINT1("WaveInCount %lu\n", MixerList->WaveInListCount); + DPRINT1("WaveOutCount %lu\n", MixerList->WaveOutListCount); + DPRINT1("MixerCount %p\n", MixerList->MixerListCount); + + + for(Index = 0; Index < MixerList->MixerListCount; Index++) + { + /* get mixer info */ + MixerInfo = MMixerGetMixerInfoByIndex(MixerContext, Index); + + ASSERT(MixerInfo); + DPRINT1("\n"); + DPRINT1("Name :%S\n", MixerInfo->MixCaps.szPname); + DPRINT1("cDestinations: %lu\n", MixerInfo->MixCaps.cDestinations); + DPRINT1("fdwSupport %lu\n", MixerInfo->MixCaps.fdwSupport); + DPRINT1("vDriverVersion %lx\n", MixerInfo->MixCaps.vDriverVersion); + DPRINT1("wMid %lx\n", MixerInfo->MixCaps.wMid); + DPRINT1("wPid %lx\n", MixerInfo->MixCaps.wPid); + + for(SubIndex = 0; SubIndex < MixerInfo->MixCaps.cDestinations; SubIndex++) + { + /* calculate destination line id */ + DestinationLineID = (SubIndex + DESTINATION_LINE); + + /* get destination line */ + DstMixerLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + DPRINT1("\n"); + DPRINT1("cChannels %lu\n", DstMixerLine->Line.cChannels); + DPRINT1("cConnections %lu\n", DstMixerLine->Line.cConnections); + DPRINT1("cControls %lu\n", DstMixerLine->Line.cControls); + DPRINT1("dwComponentType %lx\n", DstMixerLine->Line.dwComponentType); + DPRINT1("dwDestination %lu\n", DstMixerLine->Line.dwDestination); + DPRINT1("dwLineID %lx\n", DstMixerLine->Line.dwLineID); + DPRINT1("dwSource %lx\n", DstMixerLine->Line.dwSource); + DPRINT1("dwUser %lu\n", DstMixerLine->Line.dwUser); + DPRINT1("fdwLine %lu\n", DstMixerLine->Line.fdwLine); + DPRINT1("szName %S\n", DstMixerLine->Line.szName); + DPRINT1("szShortName %S\n", DstMixerLine->Line.szShortName); + DPRINT1("Target.dwDeviceId %lu\n", DstMixerLine->Line.Target.dwDeviceID); + DPRINT1("Target.dwType %lu\n", DstMixerLine->Line.Target.dwType); + DPRINT1("Target.szName %S\n", DstMixerLine->Line.Target.szPname); + 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); + } + } } MIXER_STATUS @@ -560,6 +684,8 @@ Entry = Entry->Flink; } + MMixerPrintMixers(MixerContext, MixerList); + /* done */ return MM_STATUS_SUCCESS; } 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] Sat Dec 4 17:45:48 2010 @@ -745,16 +745,15 @@ /* node should not have been visited */ ASSERT(Node->Visited == FALSE); + /* mark node as visited */ + TopologyNode->Visited = TRUE; + /* add them to node array */ MMixerAddPinIndexToArray(MixerContext, Node->NodeIndex, Topology->TopologyNodesCount, OutNodeCount, OutNodes); /* recursively visit them */ MMixerGetUpOrDownstreamNodes(MixerContext, Topology, TopologyNodes[Index], bUpStream, OutNodeCount, OutNodes); } - - /* mark node as visited */ - TopologyNode->Visited = TRUE; - } MIXER_STATUS

13 years, 11 months

[ekohl] 49948: [NPFS] - Fail attempts to connect or disconnect a directory or device. - Fail attempts to connect or disconnect a pipe by the client.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 4 15:25:27 2010 New Revision: 49948 URL: http://svn.reactos.org/svn/reactos?rev=49948&view=rev Log: [NPFS] - Fail attempts to connect or disconnect a directory or device. - Fail attempts to connect or disconnect a pipe by the client. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sat Dec 4 15:25:27 2010 @@ -95,6 +95,20 @@ DPRINT("NpfsConnectPipe()\n"); + /* Fail, if the CCB is not a pipe CCB */ + if (Ccb->Type != CCB_PIPE) + { + DPRINT1("Not a pipe\n"); + return STATUS_ILLEGAL_FUNCTION; + } + + /* Fail, if the CCB is not a server end CCB */ + if (Ccb->PipeEnd != FILE_PIPE_SERVER_END) + { + DPRINT1("Not the server end\n"); + return STATUS_ILLEGAL_FUNCTION; + } + if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) { KeResetEvent(&Ccb->ConnectEvent); @@ -191,6 +205,20 @@ BOOLEAN Server; DPRINT("NpfsDisconnectPipe()\n"); + + /* Fail, if the CCB is not a pipe CCB */ + if (Ccb->Type != CCB_PIPE) + { + DPRINT1("Not a pipe\n"); + return STATUS_ILLEGAL_FUNCTION; + } + + /* Fail, if the CCB is not a server end CCB */ + if (Ccb->PipeEnd != FILE_PIPE_SERVER_END) + { + DPRINT1("Not the server end\n"); + return STATUS_ILLEGAL_FUNCTION; + } Fcb = Ccb->Fcb; KeLockMutex(&Fcb->CcbListLock);

13 years, 11 months

← Newer
1
...
27
28
29
30
31
32
33
...
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