Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 44136: - Silence (on request of Christoph)
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 16:04:19 2009 New Revision: 44136 URL: http://svn.reactos.org/svn/reactos?rev=44136&view=rev Log: - Silence (on request of Christoph) Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Fri Nov 13 16:04:19 2009 @@ -470,7 +470,7 @@ ((OpenPacket->RelatedFileObject) || (RemainingName->Length)) && (!VolumeOpen)) { - DPRINT1("Fix Secure FSD support!!!\n"); + DPRINT("Fix Secure FSD support!!!\n"); } /* Allocate the IRP */

1 0

[janderwald] 44135: - Silence
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 16:00:33 2009 New Revision: 44135 URL: http://svn.reactos.org/svn/reactos?rev=44135&view=rev Log: - Silence Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Fri Nov 13 16:00:33 2009 @@ -30,7 +30,7 @@ PSOUND_DEVICE SoundDevice; PMMFUNCTION_TABLE FunctionTable; - SND_TRACE(L"Getting mixer info %u\n", Message); + //SND_TRACE(L"Getting mixer info %u\n", Message); VALIDATE_MMSYS_PARAMETER( PrivateHandle ); SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE) PrivateHandle;

1 0

[tkreuzer] 44134: Convert KdpDprintf to conditional KDDBGPRINT macros to stop spamming WinDbg on invalid addresses.
by tkreuzer＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: tkreuzer Date: Fri Nov 13 15:29:39 2009 New Revision: 44134 URL: http://svn.reactos.org/svn/reactos?rev=44134&view=rev Log: Convert KdpDprintf to conditional KDDBGPRINT macros to stop spamming WinDbg on invalid addresses. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmdbg.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] Fri Nov 13 15:29:39 2009 @@ -12,6 +12,12 @@ #include "ARM3/miarm.h" #define NDEBUG #include <debug.h> + +#ifndef NDEBUG +#define KDDBGPRINT KdpDprintf +#else +#define KDDBGPRINT if (0) KdpDprintf +#endif /* GLOBALS ********************************************************************/ @@ -47,7 +53,7 @@ // // The structures we require aren't initialized yet, fail // - KdpDprintf("MiDbgTranslatePhysicalAddress called too early! " + KDDBGPRINT("MiDbgTranslatePhysicalAddress called too early! " "Address: 0x%I64x\n", PhysicalAddress); return NULL; } @@ -62,7 +68,7 @@ // // Fail // - KdpDprintf("MiDbgTranslatePhysicalAddress: Cache Flags not yet supported. " + KDDBGPRINT("MiDbgTranslatePhysicalAddress: Cache Flags not yet supported. " "Flags: 0x%lx\n", Flags & (MMDBG_COPY_CACHED | MMDBG_COPY_UNCACHED | MMDBG_COPY_WRITE_COMBINED)); @@ -92,7 +98,7 @@ // // FIXME: We don't support this yet // - KdpDprintf("MiDbgTranslatePhysicalAddress: I/O Space not yet supported. " + KDDBGPRINT("MiDbgTranslatePhysicalAddress: I/O Space not yet supported. " "PFN: 0x%I64x\n", (ULONG64)Pfn); return NULL; } @@ -161,7 +167,7 @@ // // Invalid size, fail // - KdpDprintf("MmDbgCopyMemory: Received Illegal Size 0x%lx\n", Size); + KDDBGPRINT("MmDbgCopyMemory: Received Illegal Size 0x%lx\n", Size); return STATUS_INVALID_PARAMETER_3; } @@ -173,7 +179,7 @@ // // Fail // - KdpDprintf("MmDbgCopyMemory: Received Unaligned Address 0x%I64x Size %lx\n", + KDDBGPRINT("MmDbgCopyMemory: Received Unaligned Address 0x%I64x Size %lx\n", Address, Size); return STATUS_INVALID_PARAMETER_3; } @@ -196,7 +202,7 @@ // // Fail // - KdpDprintf("MmDbgCopyMemory: Failed to Translate Physical Address " + KDDBGPRINT("MmDbgCopyMemory: Failed to Translate Physical Address " "%I64x\n", Address); return STATUS_UNSUCCESSFUL; } @@ -221,7 +227,7 @@ // // Fail // - KdpDprintf("MmDbgCopyMemory: Failing %s for invalid " + KDDBGPRINT("MmDbgCopyMemory: Failing %s for invalid " "Virtual Address 0x%p\n", Flags & MMDBG_COPY_WRITE ? "write" : "read", TargetAddress); @@ -257,7 +263,7 @@ // FIXME: We should attempt to override the write protection instead of // failing here // - KdpDprintf("MmDbgCopyMemory: Failing Write for Protected Address 0x%p\n", + KDDBGPRINT("MmDbgCopyMemory: Failing Write for Protected Address 0x%p\n", TargetAddress); return STATUS_UNSUCCESSFUL; }

1 0

[janderwald] 44133: [PSDK] - Fix MIXEROPENDESC struct(x64 compability issue) [MMEBUDDY] - Fix usage of MIXEROPENDESC [WDMAUD.DRV] - Implement a listening thread which waits for volume level / mute control changes
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 15:22:11 2009 New Revision: 44133 URL: http://svn.reactos.org/svn/reactos?rev=44133&view=rev Log: [PSDK] - Fix MIXEROPENDESC struct(x64 compability issue) [MMEBUDDY] - Fix usage of MIXEROPENDESC [WDMAUD.DRV] - Implement a listening thread which waits for volume level / mute control changes Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/include/psdk/mmddk.h trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Fri Nov 13 15:22:11 2009 @@ -260,6 +260,13 @@ NULL); } + if (DeviceType == MIXER_DEVICE_TYPE) + { + SetEvent(SoundDeviceInstance->hStopEvent); + CloseHandle(SoundDeviceInstance->hStopEvent); + CloseHandle(SoundDeviceInstance->hNotifyEvent); + } + --OpenCount; if ( OpenCount < 1 ) @@ -280,6 +287,62 @@ { /* Whatever... */ return MMSYSERR_NOERROR; +} + + +DWORD +WINAPI +MixerEventThreadRoutine( + LPVOID Parameter) +{ + HANDLE WaitObjects[2]; + DWORD dwResult; + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)Parameter; + + /* setup wait objects */ + WaitObjects[0] = Instance->hNotifyEvent; + WaitObjects[1] = Instance->hStopEvent; + + /* zero device info */ + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + + DeviceInfo.hDevice = Instance->Handle; + DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; + + do + { + dwResult = WaitForMultipleObjects(2, WaitObjects, FALSE, INFINITE); + + if (dwResult == WAIT_OBJECT_0 + 1) + { + /* stop event was signalled */ + break; + } + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_GET_MIXER_EVENT, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if (Result == MMSYSERR_NOERROR) + { + DriverCallback(Instance->WinMM.ClientCallback, + HIWORD(Instance->WinMM.Flags), + Instance->WinMM.Handle, + DeviceInfo.u.MixerEvent.NotificationType, + Instance->WinMM.ClientCallbackInstanceData, + (DWORD_PTR)DeviceInfo.u.MixerEvent.Value, + 0); + } + }while(TRUE); + + /* done */ + return 0; } @@ -292,6 +355,7 @@ { MMRESULT Result; WDMAUD_DEVICE_INFO DeviceInfo; + HANDLE hThread; if (Instance->Handle != KernelHandle) { @@ -299,10 +363,18 @@ return MMSYSERR_NOERROR; } + Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if ( ! Instance->hNotifyEvent ) + return MMSYSERR_NOMEM; + + Instance->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if ( ! Instance->hStopEvent ) + return MMSYSERR_NOMEM; ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; DeviceInfo.DeviceIndex = DeviceId; + DeviceInfo.u.hNotifyEvent = Instance->hNotifyEvent; Result = SyncOverlappedDeviceIoControl(KernelHandle, IOCTL_OPEN_WDMAUD, @@ -314,7 +386,15 @@ if ( ! MMSUCCESS(Result) ) { - return TranslateInternalMmResult(Result); + CloseHandle(Instance->hNotifyEvent); + CloseHandle(Instance->hStopEvent); + return TranslateInternalMmResult(Result); + } + + hThread = CreateThread(NULL, 0, MixerEventThreadRoutine, (LPVOID)Instance, 0, NULL); + if ( hThread ) + { + CloseHandle(hThread); } /* Store sound device handle instance handle */ Modified: trunk/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmddk.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/mmddk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmddk.h [iso-8859-1] Fri Nov 13 15:22:11 2009 @@ -416,9 +416,10 @@ typedef struct tMIXEROPENDESC { HMIXEROBJ hmx; - LPVOID pReserved0; - DWORD dwCallback; - DWORD dwInstance; + LPVOID pReserved0; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; + DWORD_PTR dnDevNode; } MIXEROPENDESC, *LPMIXEROPENDESC; typedef struct { Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Fri Nov 13 15:22:11 2009 @@ -334,8 +334,8 @@ { HDRVR Handle; DWORD Flags; - DWORD ClientCallback; - DWORD ClientCallbackInstanceData; + DWORD_PTR ClientCallback; + DWORD_PTR ClientCallbackInstanceData; } WinMM; /* DO NOT TOUCH THESE OUTSIDE OF THE SOUND THREAD */ @@ -357,6 +357,8 @@ DWORD FrameSize; DWORD BufferCount; WAVEFORMATEX WaveFormatEx; + HANDLE hNotifyEvent; + HANDLE hStopEvent; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; /* This lives in WAVEHDR.reserved */ @@ -561,8 +563,8 @@ SetSoundDeviceInstanceMmeData( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN HDRVR MmeHandle, - IN DWORD ClientCallback, - IN DWORD ClientCallbackData, + IN DWORD_PTR ClientCallback, + IN DWORD_PTR ClientCallbackData, IN DWORD Flags); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Fri Nov 13 15:22:11 2009 @@ -353,8 +353,8 @@ SetSoundDeviceInstanceMmeData( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN HDRVR MmeHandle, - IN DWORD ClientCallback, - IN DWORD ClientCallbackData, + IN DWORD_PTR ClientCallback, + IN DWORD_PTR ClientCallbackData, IN DWORD Flags) { VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) );

1 0

[janderwald] 44132: [KS] - Silent debug traces on request of Christoph [CMIDRIVER] - Remove link hacks [WDMAUD_KERNEL] - Silent debug traces on request of Christoph - Reference notification event when the mixer is openend - Fix a bug in the notification handler (double free due entry not removed from list)
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 15:13:22 2009 New Revision: 44132 URL: http://svn.reactos.org/svn/reactos?rev=44132&view=rev Log: [KS] - Silent debug traces on request of Christoph [CMIDRIVER] - Remove link hacks [WDMAUD_KERNEL] - Silent debug traces on request of Christoph - Reference notification event when the mixer is openend - Fix a bug in the notification handler (double free due entry not removed from list) Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -1790,7 +1790,8 @@ PKSIOBJECT_HEADER ObjectHeader; NTSTATUS Status; - DPRINT1("KS / CREATE\n"); + DPRINT("KS / CREATE\n"); + /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); /* get device extension */ Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -32,6 +32,8 @@ #include "NtStrsafe.h" #pragma code_seg("PAGE") + +const GUID KSPROPSETID_CMI = {0x2B81CDBB, 0xEE6C, 0x4ECC, {0x8A, 0xA5, 0x9A, 0x18, 0x8B, 0x02, 0x3D, 0xFF}}; HRESULT NTAPI CreateMiniportTopologyCMI(PUNKNOWN* Unknown, REFCLSID, PUNKNOWN UnknownOuter, POOL_TYPE PoolType) { Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -354,13 +354,13 @@ (PCPFNPROPERTY_HANDLER)PropertyHandler_ComponentId }, { - &GUID_NULL,//&KSPROPSETID_CMI, //HACK + &KSPROPSETID_CMI, KSPROPERTY_CMI_GET, KSPROPERTY_TYPE_GET, (PCPFNPROPERTY_HANDLER)PropertyHandler_Private }, { - &GUID_NULL,//&KSPROPSETID_CMI, //HACK + &KSPROPSETID_CMI, KSPROPERTY_CMI_SET, KSPROPERTY_TYPE_SET, (PCPFNPROPERTY_HANDLER)PropertyHandler_Private Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -469,6 +469,9 @@ STDMETHODIMP CMiniportWaveCMI::DataRangeIntersection(ULONG PinId, PKSDATARANGE ClientDataRange, PKSDATARANGE MyDataRange, ULONG OutputBufferLength, PVOID ResultantFormat, PULONG ResultantFormatLength) { //PAGED_CODE(); + static const GUID KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF = {0x00000092L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + + DBGPRINT(("CMiniportWaveCMI[%p]::DataRangeIntersection(%d, %p, %p, %d, %p, %p)", this, PinId, ClientDataRange, MyDataRange, OutputBufferLength, ResultantFormat, ResultantFormatLength)); if (PinId == PIN_WAVE_AC3_RENDER_SINK) { @@ -482,7 +485,7 @@ } - if (!IsEqualGUIDAligned(ClientDataRange->SubFormat, GUID_NULL)//KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) //HACK + if (!IsEqualGUIDAligned(ClientDataRange->SubFormat, KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) && !IsEqualGUIDAligned(ClientDataRange->SubFormat, KSDATAFORMAT_SUBTYPE_WILDCARD)) { // check for Vista isAC3Pin = false; Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -65,7 +65,7 @@ 0, 0, STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO), - STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),//STATICGUIDOF(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF), //HACK + STATICGUIDOF(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF), STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) }, MAX_CHANNELS_AC3, Modified: trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -4,6 +4,10 @@ <directory name="mpu401"> <xi:include href="mpu401/mpu401.rbuild" /> </directory> + <directory name="CMIDriver"> + <xi:include href="CMIDriver/cmidriver.rbuild" /> + </directory> +  Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -86,7 +86,7 @@ ULONG BytesReturned; PFILE_OBJECT FileObject; - //DPRINT1("WdmAudControlDeviceState\n"); + DPRINT("WdmAudControlDeviceState\n"); Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) @@ -105,7 +105,7 @@ ObDereferenceObject(FileObject); - //DPRINT1("WdmAudControlDeviceState Status %x\n", Status); + DPRINT("WdmAudControlDeviceState Status %x\n", Status); return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } @@ -154,6 +154,14 @@ ClientInfo->hPins[Index].Handle = NULL; SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); return STATUS_SUCCESS; + } + else if (ClientInfo->hPins[Index].Handle == DeviceInfo->hDevice && ClientInfo->hPins[Index].Type == MIXER_DEVICE_TYPE) + { + if (ClientInfo->hPins[Index].NotifyEvent) + { + ObDereferenceObject(ClientInfo->hPins[Index].NotifyEvent); + ClientInfo->hPins[Index].NotifyEvent = NULL; + } } } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -22,7 +22,7 @@ NTSTATUS Status; PWDMAUD_DEVICE_EXTENSION DeviceExtension; - DPRINT1("WdmAudInstallDevice called\n"); + DPRINT("WdmAudInstallDevice called\n"); Status = IoCreateDevice(DriverObject, sizeof(WDMAUD_DEVICE_EXTENSION), @@ -95,7 +95,7 @@ WdmAudUnload( IN PDRIVER_OBJECT driver) { - DPRINT1("WdmAudUnload called\n"); + DPRINT("WdmAudUnload called\n"); } NTSTATUS @@ -266,7 +266,7 @@ IN PUNICODE_STRING Registry_path ) { - DPRINT1("Wdmaud.sys loaded\n"); + DPRINT("Wdmaud.sys loaded\n"); Driver->DriverUnload = WdmAudUnload; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -1752,11 +1752,12 @@ ULONG Index; PWDMAUD_HANDLE Handels; PWDMAUD_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + PKEVENT EventObject = NULL; DPRINT("WdmAudControlOpenMixer\n"); DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - if (DeviceInfo->DeviceIndex >= DeviceExtension->MixerInfoCount) { @@ -1764,13 +1765,26 @@ return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } + if (DeviceInfo->u.hNotifyEvent) + { + Status = ObReferenceObjectByHandle(DeviceInfo->u.hNotifyEvent, EVENT_MODIFY_STATE, ExEventObjectType, UserMode, (LPVOID*)&EventObject, NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid notify event passed %p from client %p\n", DeviceInfo->u.hNotifyEvent, ClientInfo); + DbgBreakPoint(); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + } + + for(Index = 0; Index < ClientInfo->NumPins; Index++) { if (ClientInfo->hPins[Index].Handle == (HANDLE)DeviceInfo->DeviceIndex && ClientInfo->hPins[Index].Type == MIXER_DEVICE_TYPE) { /* re-use pseudo handle */ DeviceInfo->hDevice = (HANDLE)DeviceInfo->DeviceIndex; - ClientInfo->hPins[Index].hNotifyEvent = DeviceInfo->u.hNotifyEvent; + ClientInfo->hPins[Index].NotifyEvent = EventObject; return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } } @@ -1788,7 +1802,7 @@ ClientInfo->hPins = Handels; ClientInfo->hPins[ClientInfo->NumPins].Handle = (HANDLE)DeviceInfo->DeviceIndex; ClientInfo->hPins[ClientInfo->NumPins].Type = MIXER_DEVICE_TYPE; - ClientInfo->hPins[ClientInfo->NumPins].hNotifyEvent = DeviceInfo->u.hNotifyEvent; + ClientInfo->hPins[ClientInfo->NumPins].NotifyEvent = EventObject; ClientInfo->NumPins++; } else @@ -1849,7 +1863,7 @@ if (DeviceInfo->u.MixLine.dwSource >= MixerLineSrc->Line.cConnections) { - DPRINT1("dwSource %u Destinations %u\n", DeviceInfo->u.MixLine.dwSource, MixerLineSrc->Line.cConnections); + DPRINT1("dwSource %u > Destinations %u\n", DeviceInfo->u.MixLine.dwSource, MixerLineSrc->Line.cConnections); /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } @@ -1903,7 +1917,7 @@ return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } - DPRINT1("Flags %x\n", DeviceInfo->Flags); + DPRINT("Flags %x\n", DeviceInfo->Flags); UNIMPLEMENTED; //DbgBreakPoint(); @@ -1960,14 +1974,14 @@ Index = 0; for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) { - DPRINT1("dwControlType %x\n", MixerLineSrc->LineControls[Index].dwControlType); + DPRINT("dwControlType %x\n", MixerLineSrc->LineControls[Index].dwControlType); if (DeviceInfo->u.MixControls.dwControlType == MixerLineSrc->LineControls[Index].dwControlType) { RtlMoveMemory(DeviceInfo->u.MixControls.pamxctrl, &MixerLineSrc->LineControls[Index], sizeof(MIXERCONTROLW)); return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } } - DPRINT1("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", DeviceInfo->u.MixControls.dwControlType, DeviceInfo->u.MixControls.dwLineID, MixerLineSrc->Line.cControls); + DPRINT("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", DeviceInfo->u.MixControls.dwControlType, DeviceInfo->u.MixControls.dwLineID, MixerLineSrc->Line.cControls); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, sizeof(WDMAUD_DEVICE_INFO)); } else if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ONEBYID) @@ -1977,7 +1991,7 @@ /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - DPRINT1("MixerId %u ControlId %u\n",(ULONG_PTR)DeviceInfo->hDevice, DeviceInfo->u.MixControls.dwControlID); + DPRINT("MixerId %u ControlId %u\n",(ULONG_PTR)DeviceInfo->hDevice, DeviceInfo->u.MixControls.dwControlID); Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG_PTR)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); if (NT_SUCCESS(Status)) { @@ -2047,7 +2061,7 @@ *InputValue = Value; } - DPRINT1("Status %x bSet %u NodeId %u Value %d PropertyId %u\n", Status, bSet, NodeId, Value, PropertyId); + DPRINT("Status %x bSet %u NodeId %u Value %d PropertyId %u\n", Status, bSet, NodeId, Value, PropertyId); return Status; } @@ -2061,11 +2075,9 @@ PWDMAUD_DEVICE_EXTENSION DeviceExtension; PLIST_ENTRY Entry; PWDMAUD_CLIENT CurClient; - PKEVENT EventObject; PMIXER_EVENT Event; KIRQL OldIrql; ULONG Index; - NTSTATUS Status; /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -2085,22 +2097,13 @@ /* now iterate through all pins and try to find an matching handle */ for(Index = 0; Index < CurClient->NumPins; Index++) { - if (CurClient->hPins[Index].Handle == hMixer && CurClient->hPins[Index].Type == MIXER_DEVICE_TYPE && CurClient->hPins[Index].hNotifyEvent) + if (CurClient->hPins[Index].Handle == hMixer && CurClient->hPins[Index].Type == MIXER_DEVICE_TYPE && CurClient->hPins[Index].NotifyEvent) { - /* found a matching mixer handle and a valid notify event */ - Status = ObReferenceObjectByHandle(CurClient->hPins[Index].hNotifyEvent, EVENT_MODIFY_STATE, ExEventObjectType, UserMode, (LPVOID*)&EventObject, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Invalid notify event passed %p from client %p\n", CurClient->hPins[Index].hNotifyEvent, CurClient); - break; - } - /* allocate event entry */ Event = (PMIXER_EVENT)ExAllocatePool(NonPagedPool, sizeof(MIXER_EVENT)); if (!Event) { /* no memory */ - ObDereferenceObject(EventObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -2112,11 +2115,12 @@ /* insert event entry */ InsertTailList(&CurClient->MixerEventList, &Event->Entry); + DPRINT("Notifying %p hMixer %p Value %x NotificationType %u\n", CurClient->hPins[Index].NotifyEvent, hMixer, Value, NotificationType); + /* now signal the event */ - KeSetEvent(EventObject, 0, FALSE); - - /* dereference event */ - ObDereferenceObject(EventObject); + KeSetEvent(CurClient->hPins[Index].NotifyEvent, 0, FALSE); + + /* search next client */ break; @@ -2178,6 +2182,24 @@ return Status; } + +ULONG +GetVolumeControlIndex( + LPMIXERVOLUME_DATA VolumeData, + LONG Value) +{ + ULONG Index; + + for(Index = 0; Index < VolumeData->ValuesCount; Index++) + { + if (VolumeData->Values[Index] > Value) + { + return VolumeData->InputSteppingDelta * Index; + } + } + return VolumeData->InputSteppingDelta * (VolumeData->ValuesCount-1); +} + NTSTATUS SetGetVolumeControlDetails( @@ -2191,6 +2213,7 @@ { LPMIXERCONTROLDETAILS_UNSIGNED Input; LONG Value, Index, Channel = 0; + ULONG dwValue; NTSTATUS Status; LPMIXERVOLUME_DATA VolumeData; @@ -2234,16 +2257,9 @@ if (!bSet) { - for(Index = 0; Index < VolumeData->ValuesCount; Index++) - { - if (VolumeData->Values[Index] > Value) - { - /* FIXME SEH */ - Input->dwValue = VolumeData->InputSteppingDelta * Index; - return Status; - } - } - Input->dwValue = VolumeData->InputSteppingDelta * (VolumeData->ValuesCount-1); + dwValue = GetVolumeControlIndex(VolumeData, (LONG)Value); + /* FIXME SEH */ + Input->dwValue = dwValue; } else { @@ -2283,6 +2299,7 @@ if (Event->hMixer == DeviceInfo->hDevice) { /* found an event for that particular device */ + RemoveEntryList(&Event->Entry); break; } @@ -2292,7 +2309,6 @@ /* move to next entry */ Entry = Entry->Flink; } - /* release client context lock */ KeReleaseSpinLock(&DeviceExtension->Lock, OldIrql); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Fri Nov 13 15:13:22 2009 @@ -31,7 +31,7 @@ SOUND_DEVICE_TYPE Type; ULONG FilterId; ULONG PinId; - HANDLE hNotifyEvent; + PRKEVENT NotifyEvent; }WDMAUD_HANDLE, *PWDMAUD_HANDLE; typedef struct

1 0

[khornicek] 44131: - initialize the pointer exclude rectangle
by khornicek＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: khornicek Date: Fri Nov 13 14:52:17 2009 New Revision: 44131 URL: http://svn.reactos.org/svn/reactos?rev=44131&view=rev Log: - initialize the pointer exclude rectangle Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Fri Nov 13 14:52:17 2009 @@ -406,6 +406,8 @@ DPRINT("Adjusting GDIInfo.ulLogPixelsY\n"); PrimarySurface.GDIInfo.ulLogPixelsY = 96; } + + PrimarySurface.Pointer.Exclude.right = -1; /* Complete initialization of the physical device */ PrimarySurface.DriverFunctions.CompletePDEV(

1 0

[fireball] 44130: - Sync rpcrt4 with Wine-1.1.32. ReactOS-specific changes are: * Use overlapped named pipes access mode, and use GetOverlappedResult for reading/writing too. * Add patch for waiting for server calls in RpcMgmtWaitServerListen (not fully correct one, but enough for now). * Hacks around ntsecapi.h inclusion (it can't be used properly with winternl.h). * Total removal of HTTP transport. Could be enabled when dynamic linking to wininet.dll will be possible. - Change config.h to incl
by fireball＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: fireball Date: Fri Nov 13 14:26:54 2009 New Revision: 44130 URL: http://svn.reactos.org/svn/reactos?rev=44130&view=rev Log: - Sync rpcrt4 with Wine-1.1.32. ReactOS-specific changes are: * Use overlapped named pipes access mode, and use GetOverlappedResult for reading/writing too. * Add patch for waiting for server calls in RpcMgmtWaitServerListen (not fully correct one, but enough for now). * Hacks around ntsecapi.h inclusion (it can't be used properly with winternl.h). * Total removal of HTTP transport. Could be enabled when dynamic linking to wininet.dll will be possible. - Change config.h to include new ASM macros. This is not platform independent. Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c trunk/reactos/dll/win32/rpcrt4/cpsf.h trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/epm_towers.h trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c trunk/reactos/dll/win32/rpcrt4/ndr_misc.h trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h trunk/reactos/dll/win32/rpcrt4/rpc_async.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_defs.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/include/reactos/wine/config.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?re… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.h?re… Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… Modified: trunk/reactos/dll/win32/rpcrt4/epm_towers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/epm_tower… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_misc.… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_async… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_defs.… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi…

1 0

[cwittich] 44129: sync dde with wine 1.1.32
by cwittich＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: cwittich Date: Fri Nov 13 13:40:20 2009 New Revision: 44129 URL: http://svn.reactos.org/svn/reactos?rev=44129&view=rev Log: sync dde with wine 1.1.32 Modified: trunk/reactos/dll/win32/user32/misc/dde.c Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Fri Nov 13 13:40:20 2009 @@ -1638,7 +1638,7 @@ WDML_IncHSZ(pInstance, hszService); DdeQueryStringW(pInstance->instanceID, hszService, buf1, 256, CP_WINUNICODE); - snprintfW(buf2, 256, fmtW, buf1, GetCurrentProcessId()); + snprintfW(buf2, 256, fmtW, buf1, 2*sizeof(ULONG_PTR), GetCurrentProcessId()); pServer->hszServiceSpec = DdeCreateStringHandleW(pInstance->instanceID, buf2, CP_WINUNICODE); pServer->atomService = WDML_MakeAtomFromHsz(pServer->hszService);

1 0

[cwittich] 44128: sync dwmapi with wine 1.1.32
by cwittich＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: cwittich Date: Fri Nov 13 12:47:11 2009 New Revision: 44128 URL: http://svn.reactos.org/svn/reactos?rev=44128&view=rev Log: sync dwmapi with wine 1.1.32 Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec trunk/reactos/dll/win32/dwmapi/dwmapi_main.c trunk/reactos/include/psdk/dwmapi.h Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Fri Nov 13 12:47:11 2009 @@ -29,9 +29,9 @@ @ stdcall DwmFlush() @ stdcall DwmGetColorizationColor(ptr long) @ stub DwmGetCompositionTimingInfo -@ stub DwmGetGraphicsStreamClient -@ stub DwmGetGraphicsStreamTransformHint -@ stub DwmGetTransportAttributes +@ stdcall DwmGetGraphicsStreamClient(long ptr) +@ stdcall DwmGetGraphicsStreamTransformHint(long ptr) +@ stdcall DwmGetTransportAttributes(ptr ptr ptr) @ stub DwmGetWindowAttribute @ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration Modified: trunk/reactos/dll/win32/dwmapi/dwmapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi_ma… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] Fri Nov 13 12:47:11 2009 @@ -111,6 +111,26 @@ } /********************************************************************** + * DwmGetGraphicsStreamClient (DWMAPI.@) + */ +HRESULT WINAPI DwmGetGraphicsStreamClient(UINT uIndex, UUID *pClientUuid) +{ + FIXME("(%d, %p) stub\n", uIndex, pClientUuid); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmGetTransportAttributes (DWMAPI.@) + */ +HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected, DWORD *pDwGeneration) +{ + FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); + + return E_NOTIMPL; +} + +/********************************************************************** * DwmUnregisterThumbnail (DWMAPI.@) */ HRESULT WINAPI DwmUnregisterThumbnail(HTHUMBNAIL thumbnail) @@ -129,3 +149,13 @@ return S_OK; } + +/********************************************************************** + * DwmGetGraphicsStreamTransformHint (DWMAPI.@) + */ +HRESULT WINAPI DwmGetGraphicsStreamTransformHint(UINT uIndex, MilMatrix3x2D *pTransform) +{ + FIXME("(%d, %p) stub\n", uIndex, pTransform); + + return E_NOTIMPL; +} Modified: trunk/reactos/include/psdk/dwmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dwmapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] Fri Nov 13 12:47:11 2009 @@ -31,7 +31,18 @@ DECLARE_HANDLE(HTHUMBNAIL); +typedef struct _MilMatrix3x2D +{ + DOUBLE S_11; + DOUBLE S_12; + DOUBLE S_21; + DOUBLE S_22; + DOUBLE DX; + DOUBLE DY; +} MilMatrix3x2D; + DWMAPI DwmEnableComposition(UINT); +DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmIsCompositionEnabled(BOOL*);

1 0

[janderwald] 44127: - Implement updating volume position / mute state after receiving a notification
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 12:42:23 2009 New Revision: 44127 URL: http://svn.reactos.org/svn/reactos?rev=44127&view=rev Log: - Implement updating volume position / mute state after receiving a notification Modified: trunk/reactos/dll/cpl/mmsys/volume.c Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Fri Nov 13 12:42:23 2009 @@ -299,8 +299,32 @@ pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch(uMsg) { + case MM_MIXM_LINE_CHANGE: + { + GetMuteState(pGlobalData); + if (pGlobalData->muteVal) + { + SendDlgItemMessage(hwndDlg, IDC_MUTE_CHECKBOX, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconMuted); + } + else + { + SendDlgItemMessage(hwndDlg, IDC_MUTE_CHECKBOX, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconUnMuted); + } + break; + } + case MM_MIXM_CONTROL_CHANGE: + { + GetVolumeValue(pGlobalData); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)FALSE, (LPARAM)MAKELONG(pGlobalData->volumeMinimum, pGlobalData->volumeValue/VOLUME_DIVIDER)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pGlobalData->volumeValue/VOLUME_DIVIDER); + break; + } case WM_INITDIALOG: { pGlobalData = (GLOBAL_DATA*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA));

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs