May 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : msvcrt20: Exclude unused header.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 99504c0e47d1788986acd7e3e5c0af7fa4eb2ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99504c0e47d1788986acd7e3e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 12 13:59:58 2007 +0100 msvcrt20: Exclude unused header. --- dlls/msvcrt20/msvcrt20.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.c b/dlls/msvcrt20/msvcrt20.c index 8f8b448..e8d2b3c 100644 --- a/dlls/msvcrt20/msvcrt20.c +++ b/dlls/msvcrt20/msvcrt20.c @@ -21,7 +21,6 @@ #include <stdarg.h> #include "windef.h" -#include "winbase.h" extern void CDECL __getmainargs(int *argc, char** *argv, char** *envp, int expand_wildcards, int *new_mode);

1 0

Andrew Talbot : msvfw32: Exclude unused header.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: bb519ec0b23e8c77f05fb3cdc9aa1d2e3d01cd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb519ec0b23e8c77f05fb3cdc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 12 14:00:10 2007 +0100 msvfw32: Exclude unused header. --- dlls/msvfw32/mciwnd.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index dc23437..c7551f8 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -28,7 +28,6 @@ #include "winnls.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "winternl.h" #include "vfw.h" #include "digitalv.h"

1 0

Andrew Talbot : ntdll: Exclude unused headers.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 9fe3b60f12bcf5c0ac6905a79f3e6244f6d008b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe3b60f12bcf5c0ac6905a79… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 14 20:50:47 2007 +0100 ntdll: Exclude unused headers. --- dlls/ntdll/debugtools.c | 1 - dlls/ntdll/loader.c | 1 - dlls/ntdll/relay.c | 1 - dlls/ntdll/resource.c | 2 -- dlls/ntdll/sec.c | 1 - dlls/ntdll/virtual.c | 1 - 6 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index d66124c..cb08285 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -36,7 +36,6 @@ #include "wine/unicode.h" #include "winnt.h" #include "winternl.h" -#include "excpt.h" #include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(tid); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9e60704..a7d7f0f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -35,7 +35,6 @@ #include "winternl.h" #include "wine/exception.h" -#include "excpt.h" #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 09419b5..cde1181 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -29,7 +29,6 @@ #include "windef.h" #include "winternl.h" -#include "excpt.h" #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/unicode.h" diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 9c85e06..4a8b260 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -38,10 +38,8 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winnt.h" #include "winternl.h" -#include "excpt.h" #include "wine/exception.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index b88e198..ee1d9b2 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -37,7 +37,6 @@ #include "windef.h" #include "wine/exception.h" #include "ntdll_misc.h" -#include "excpt.h" #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f2dd299..5b9ec31 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -48,7 +48,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" -#include "winioctl.h" #include "wine/library.h" #include "wine/server.h" #include "wine/list.h"

1 0

Andrew Talbot : msxml3: Exclude unused headers.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: abea9c409f8186ebf3049c8d9bb6144172b52f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abea9c409f8186ebf3049c8d9… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 14 20:50:42 2007 +0100 msxml3: Exclude unused headers. --- dlls/msxml3/main.c | 1 - dlls/msxml3/schema.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 62d213e..62bf2b5 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" #include "ole2.h" #include "msxml2.h" diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 5d48321..0eec06c 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "msxml2.h"

1 0

Alexandre Julliard : ntoskrnl.exe: Initial stub version with forwards to existing functions.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 12c169d2bf0b68656676012af86c15470462b311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c169d2bf0b68656676012af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 14 19:55:32 2007 +0200 ntoskrnl.exe: Initial stub version with forwards to existing functions. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 5 + dlls/ntoskrnl.exe/Makefile.in | 11 + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1483 +++++++++++++++++++++++++++++++++++ 7 files changed, 1506 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12c169d2bf0b686566760…

1 0

Alexandre Julliard : hal: Added an initial stub.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: d2d6870284ebf8173698bff5ac27624bc9fedef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d6870284ebf8173698bff5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 14 20:05:15 2007 +0200 hal: Added an initial stub. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/hal/Makefile.in | 10 +++++ dlls/hal/hal.spec | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 109 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index d094b15..e7942ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -235,6 +235,7 @@ ALL_MAKEFILES = \ dlls/gdi32/tests/Makefile \ dlls/glu32/Makefile \ dlls/gphoto2.ds/Makefile \ + dlls/hal/Makefile \ dlls/hhctrl.ocx/Makefile \ dlls/hid/Makefile \ dlls/hlink/Makefile \ @@ -582,6 +583,7 @@ dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules +dlls/hal/Makefile: dlls/hal/Makefile.in dlls/Makedll.rules dlls/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules dlls/hlink/Makefile: dlls/hlink/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index acac0db..59885a1 100755 --- a/configure +++ b/configure @@ -20539,6 +20539,8 @@ ac_config_files="$ac_config_files dlls/glu32/Makefile" ac_config_files="$ac_config_files dlls/gphoto2.ds/Makefile" +ac_config_files="$ac_config_files dlls/hal/Makefile" + ac_config_files="$ac_config_files dlls/hhctrl.ocx/Makefile" ac_config_files="$ac_config_files dlls/hid/Makefile" @@ -21692,6 +21694,7 @@ do "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;; "dlls/glu32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/glu32/Makefile" ;; "dlls/gphoto2.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gphoto2.ds/Makefile" ;; + "dlls/hal/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hal/Makefile" ;; "dlls/hhctrl.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hhctrl.ocx/Makefile" ;; "dlls/hid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hid/Makefile" ;; "dlls/hlink/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hlink/Makefile" ;; diff --git a/configure.ac b/configure.ac index 65157b2..4edb7fb 100644 --- a/configure.ac +++ b/configure.ac @@ -1565,6 +1565,7 @@ AC_CONFIG_FILES([dlls/gdi32/Makefile]) AC_CONFIG_FILES([dlls/gdi32/tests/Makefile]) AC_CONFIG_FILES([dlls/glu32/Makefile]) AC_CONFIG_FILES([dlls/gphoto2.ds/Makefile]) +AC_CONFIG_FILES([dlls/hal/Makefile]) AC_CONFIG_FILES([dlls/hhctrl.ocx/Makefile]) AC_CONFIG_FILES([dlls/hid/Makefile]) AC_CONFIG_FILES([dlls/hlink/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 198f7e5..159bb2d 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -73,6 +73,7 @@ BASEDIRS = \ dxdiagn \ gdi32 \ gphoto2.ds \ + hal \ hhctrl.ocx \ hid \ hlink \ diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in new file mode 100644 index 0000000..b382cff --- /dev/null +++ b/dlls/hal/Makefile.in @@ -0,0 +1,10 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = hal.dll +IMPORTS = kernel32 ntdll + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec new file mode 100644 index 0000000..5c5fc5f --- /dev/null +++ b/dlls/hal/hal.spec @@ -0,0 +1,92 @@ +@ stub ExAcquireFastMutex +@ stub ExReleaseFastMutex +@ stub ExTryToAcquireFastMutex +@ stub HalClearSoftwareInterrupt +@ stub HalRequestSoftwareInterrupt +@ stub HalSystemVectorDispatchEntry +@ stub KeAcquireInStackQueuedSpinLock +@ stub KeAcquireInStackQueuedSpinLockRaiseToSynch +@ stub KeAcquireQueuedSpinLock +@ stub KeAcquireQueuedSpinLockRaiseToSynch +@ stub KeAcquireSpinLockRaiseToSynch +@ stub KeReleaseInStackQueuedSpinLock +@ stub KeReleaseQueuedSpinLock +@ stub KeTryToAcquireQueuedSpinLock +@ stub KeTryToAcquireQueuedSpinLockRaiseToSynch +@ stub KfAcquireSpinLock +@ stub KfLowerIrql +@ stub KfRaiseIrql +@ stub KfReleaseSpinLock +@ stub HalAcquireDisplayOwnership +@ stub HalAdjustResourceList +@ stub HalAllProcessorsStarted +@ stub HalAllocateAdapterChannel +@ stub HalAllocateCommonBuffer +@ stub HalAllocateCrashDumpRegisters +@ stub HalAssignSlotResources +@ stub HalBeginSystemInterrupt +@ stub HalCalibratePerformanceCounter +@ stub HalDisableSystemInterrupt +@ stub HalDisplayString +@ stub HalEnableSystemInterrupt +@ stub HalEndSystemInterrupt +@ stub HalFlushCommonBuffer +@ stub HalFreeCommonBuffer +@ stub HalGetAdapter +@ stub HalGetBusData +@ stub HalGetBusDataByOffset +@ stub HalGetEnvironmentVariable +@ stub HalGetInterruptVector +@ stub HalHandleNMI +@ stub HalInitSystem +@ stub HalInitializeProcessor +@ stub HalMakeBeep +@ stub HalProcessorIdle +@ stub HalQueryDisplayParameters +@ stub HalQueryRealTimeClock +@ stub HalReadDmaCounter +@ stub HalReportResourceUsage +@ stub HalRequestIpi +@ stub HalReturnToFirmware +@ stub HalSetBusData +@ stub HalSetBusDataByOffset +@ stub HalSetDisplayParameters +@ stub HalSetEnvironmentVariable +@ stub HalSetProfileInterval +@ stub HalSetRealTimeClock +@ stub HalSetTimeIncrement +@ stub HalStartNextProcessor +@ stub HalStartProfileInterrupt +@ stub HalStopProfileInterrupt +@ stub HalTranslateBusAddress +@ stub IoAssignDriveLetters +@ stub IoFlushAdapterBuffers +@ stub IoFreeAdapterChannel +@ stub IoFreeMapRegisters +@ stub IoMapTransfer +@ stub IoReadPartitionTable +@ stub IoSetPartitionInformation +@ stub IoWritePartitionTable +@ stub KdComPortInUse +@ stub KeAcquireSpinLock +@ stub KeFlushWriteBuffer +@ stub KeGetCurrentIrql +@ stub KeLowerIrql +@ stub KeQueryPerformanceCounter +@ stub KeRaiseIrql +@ stub KeRaiseIrqlToDpcLevel +@ stub KeRaiseIrqlToSynchLevel +@ stub KeReleaseSpinLock +@ stub KeStallExecutionProcessor +@ stub READ_PORT_BUFFER_UCHAR +@ stub READ_PORT_BUFFER_ULONG +@ stub READ_PORT_BUFFER_USHORT +@ stub READ_PORT_UCHAR +@ stub READ_PORT_ULONG +@ stub READ_PORT_USHORT +@ stub WRITE_PORT_BUFFER_UCHAR +@ stub WRITE_PORT_BUFFER_ULONG +@ stub WRITE_PORT_BUFFER_USHORT +@ stub WRITE_PORT_UCHAR +@ stub WRITE_PORT_ULONG +@ stub WRITE_PORT_USHORT

1 0

lostwages/ news/2007051401.xml wwn/wn20070514_ ...
by WineHQ May 15, 2007

May 15, 2007

ChangeSet ID: 31130 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/05/14 21:22:35 Added files: news : 2007051401.xml wwn : wn20070514_331.xml Log message: WWN #331 Patch: http://cvs.winehq.org/patch.py?id=31130 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007051401.xml Added 1.1 +0 -0 lostwages/wwn/wn20070514_331.xml

1 0

Emmanuel Maillard : winecoreaudio: Initial implementation of MIX_GetControlDetails.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: ad635c60d30e56b060ee1289846d21d36deedd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad635c60d30e56b060ee12898… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Sun May 13 22:16:40 2007 +0200 winecoreaudio: Initial implementation of MIX_GetControlDetails. --- dlls/winecoreaudio.drv/mixer.c | 144 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 144 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 01c35a1..236bbe7 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -233,6 +233,44 @@ static BOOL DeviceHasMute(AudioDeviceID deviceID, Boolean isInput) return FALSE; } +/* + * Getters + */ +static BOOL MIX_LineGetVolume(DWORD lineID, DWORD channels, Float32 *left, Float32 *right) +{ + MixerLine *line = &mixer.lines[lineID]; + UInt32 size = sizeof(Float32); + OSStatus err = noErr; + *left = *right = 0.0; + + err = AudioDeviceGetProperty(line->deviceID, 1, IsInput(line->direction), kAudioDevicePropertyVolumeScalar, &size, left); + if (err != noErr) + return FALSE; + + if (channels == 2) + { + size = sizeof(Float32); + err = AudioDeviceGetProperty(line->deviceID, 2, IsInput(line->direction), kAudioDevicePropertyVolumeScalar, &size, right); + if (err != noErr) + return FALSE; + } + + TRACE("lineID %d channels %d return left %f right %f\n", lineID, channels, *left, *right); + return (err == noErr); +} + +static BOOL MIX_LineGetMute(DWORD lineID, BOOL *muted) +{ + MixerLine *line = &mixer.lines[lineID]; + UInt32 size = sizeof(UInt32); + UInt32 val = 0; + OSStatus err = noErr; + err = AudioDeviceGetProperty(line->deviceID, 0, IsInput(line->direction), kAudioDevicePropertyMute, &size, &val); + *muted = val; + + return (err == noErr); +} + static void MIX_FillControls(void) { int i; @@ -701,6 +739,111 @@ static DWORD MIX_GetLineControls(WORD wDevID, LPMIXERLINECONTROLSW lpMlc, DWORD_ } /************************************************************************** + * MIX_GetControlDetails [internal] + */ +static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, DWORD_PTR fdwDetails) +{ + DWORD ret = MMSYSERR_NOTSUPPORTED; + DWORD dwControlType; + + TRACE("%04X, %p, %08lx\n", wDevID, lpmcd, fdwDetails); + + if (lpmcd == NULL) { + TRACE("invalid parameter: lpmcd == NULL\n"); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= numMixers) { + WARN("bad device ID: %04X\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + if ( (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK) != MIXER_GETCONTROLDETAILSF_VALUE ) + { + WARN("Unknown/unimplement GetControlDetails flag (%08lx)\n", fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK); + return MMSYSERR_NOTSUPPORTED; + } + + if ( lpmcd->dwControlID < 0 || lpmcd->dwControlID >= mixer.numCtrl ) + { + WARN("bad control ID: %d\n", lpmcd->dwControlID); + return MIXERR_INVALVALUE; + } + + TRACE("MIXER_GETCONTROLDETAILSF_VALUE %d\n", lpmcd->dwControlID); + + dwControlType = mixer.mixerCtrls[lpmcd->dwControlID].ctrl.dwControlType; + switch (dwControlType) + { + case MIXERCONTROL_CONTROLTYPE_VOLUME: + FIXME("controlType : %s channels %d\n", getControlType(dwControlType), lpmcd->cChannels); + { + LPMIXERCONTROLDETAILS_UNSIGNED mcdu; + Float32 left, right; + + if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_UNSIGNED)) { + WARN("invalid parameter: lpmcd->cbDetails == %d\n", lpmcd->cbDetails); + return MMSYSERR_INVALPARAM; + } + + if ( MIX_LineGetVolume(mixer.mixerCtrls[lpmcd->dwControlID].dwLineID, lpmcd->cChannels, &left, &right) ) + { + mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)lpmcd->paDetails; + + switch (lpmcd->cChannels) + { + case 1: + /* mono... so R = L */ + mcdu->dwValue = left * 65535; + TRACE("Reading RL = %d\n", mcdu->dwValue); + break; + case 2: + /* stereo, left is paDetails[0] */ + mcdu->dwValue = left * 65535; + TRACE("Reading L = %d\n", mcdu->dwValue); + mcdu++; + mcdu->dwValue = right * 65535; + TRACE("Reading R = %d\n", mcdu->dwValue); + break; + default: + WARN("Unsupported cChannels (%d)\n", lpmcd->cChannels); + return MMSYSERR_INVALPARAM; + } + TRACE("=> %08x\n", mcdu->dwValue); + ret = MMSYSERR_NOERROR; + } + } + break; + case MIXERCONTROL_CONTROLTYPE_MUTE: + case MIXERCONTROL_CONTROLTYPE_ONOFF: + FIXME("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(dwControlType), lpmcd->cChannels); + { + LPMIXERCONTROLDETAILS_BOOLEAN mcdb; + BOOL muted; + if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { + WARN("invalid parameter: lpmcd->cbDetails = %d\n", lpmcd->cbDetails); + return MMSYSERR_INVALPARAM; + } + mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)lpmcd->paDetails; + + if ( MIX_LineGetMute(mixer.mixerCtrls[lpmcd->dwControlID].dwLineID, &muted) ) + { + mcdb->fValue = muted; + TRACE("=> %s\n", mcdb->fValue ? "on" : "off"); + ret = MMSYSERR_NOERROR; + } + } + break; + case MIXERCONTROL_CONTROLTYPE_MIXER: + case MIXERCONTROL_CONTROLTYPE_MUX: + default: + FIXME("controlType : %s\n", getControlType(dwControlType)); + break; + } + return ret; +} + +/************************************************************************** * mxdMessage */ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, @@ -730,6 +873,7 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MXDM_GETLINECONTROLS: return MIX_GetLineControls(wDevID, (LPMIXERLINECONTROLSW)dwParam1, dwParam2); case MXDM_GETCONTROLDETAILS: + return MIX_GetControlDetails(wDevID, (LPMIXERCONTROLDETAILS)dwParam1, dwParam2); case MXDM_SETCONTROLDETAILS: default: WARN("unknown message %d!\n", wMsg);

1 0

Emmanuel Maillard : winecoreaudio: Initial implementation of MIX_SetControlDetails.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 260591fef6a945952d4d44292fea459a07c7805d URL: http://source.winehq.org/git/wine.git/?a=commit;h=260591fef6a945952d4d44292… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Sun May 13 22:24:21 2007 +0200 winecoreaudio: Initial implementation of MIX_SetControlDetails. --- dlls/winecoreaudio.drv/mixer.c | 136 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 236bbe7..25f3d55 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -271,6 +271,50 @@ static BOOL MIX_LineGetMute(DWORD lineID, BOOL *muted) return (err == noErr); } +/* + * Setters + */ +static BOOL MIX_LineSetVolume(DWORD lineID, DWORD channels, Float32 left, Float32 right) +{ + MixerLine *line = &mixer.lines[lineID]; + UInt32 size = sizeof(Float32); + OSStatus err = noErr; + TRACE("lineID %d channels %d left %f right %f\n", lineID, channels, left, right); + + if (channels == 2) + { + err = AudioDeviceSetProperty(line->deviceID, NULL, 1, IsInput(line->direction), kAudioDevicePropertyVolumeScalar, size, &left); + if (err != noErr) + return FALSE; + + err = AudioDeviceSetProperty(line->deviceID, NULL, 2, IsInput(line->direction), kAudioDevicePropertyVolumeScalar, size, &right); + } + else + { + /* + FIXME Using master channel failed ?? return kAudioHardwareUnknownPropertyError + err = AudioDeviceSetProperty(line->deviceID, NULL, 0, IsInput(line->direction), kAudioDevicePropertyVolumeScalar, size, &left); + */ + right = left; + err = AudioDeviceSetProperty(line->deviceID, NULL, 1, IsInput(line->direction), kAudioDevicePropertyVolumeScalar, size, &left); + if (err != noErr) + return FALSE; + err = AudioDeviceSetProperty(line->deviceID, NULL, 2, IsInput(line->direction), kAudioDevicePropertyVolumeScalar, size, &right); + } + return (err == noErr); +} + +static BOOL MIX_LineSetMute(DWORD lineID, BOOL mute) +{ + MixerLine *line = &mixer.lines[lineID]; + UInt32 val = mute; + UInt32 size = sizeof(UInt32); + OSStatus err = noErr; + + err = AudioDeviceSetProperty(line->deviceID, 0, 0, IsInput(line->direction), kAudioDevicePropertyMute, size, &val); + return (err == noErr); +} + static void MIX_FillControls(void) { int i; @@ -844,6 +888,97 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, DWO } /************************************************************************** +* MIX_SetControlDetails [internal] +*/ +static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, DWORD_PTR fdwDetails) +{ + DWORD ret = MMSYSERR_NOTSUPPORTED; + DWORD dwControlType; + + TRACE("%04X, %p, %08lx\n", wDevID, lpmcd, fdwDetails); + + if (lpmcd == NULL) { + TRACE("invalid parameter: lpmcd == NULL\n"); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= numMixers) { + WARN("bad device ID: %04X\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + if ( (fdwDetails & MIXER_SETCONTROLDETAILSF_QUERYMASK) != MIXER_GETCONTROLDETAILSF_VALUE ) + { + WARN("Unknown SetControlDetails flag (%08lx)\n", fdwDetails & MIXER_SETCONTROLDETAILSF_QUERYMASK); + return MMSYSERR_NOTSUPPORTED; + } + + TRACE("MIXER_SETCONTROLDETAILSF_VALUE dwControlID=%d\n", lpmcd->dwControlID); + dwControlType = mixer.mixerCtrls[lpmcd->dwControlID].ctrl.dwControlType; + switch (dwControlType) + { + case MIXERCONTROL_CONTROLTYPE_VOLUME: + FIXME("controlType : %s\n", getControlType(dwControlType)); + { + LPMIXERCONTROLDETAILS_UNSIGNED mcdu; + Float32 left, right = 0; + + if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_UNSIGNED)) { + WARN("invalid parameter: lpmcd->cbDetails == %d\n", lpmcd->cbDetails); + return MMSYSERR_INVALPARAM; + } + + mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)lpmcd->paDetails; + + switch (lpmcd->cChannels) + { + case 1: + /* mono... so R = L */ + TRACE("Setting RL to %d\n", mcdu->dwValue); + left = (Float32) mcdu->dwValue / 65535.0; + break; + case 2: + /* stereo, left is paDetails[0] */ + TRACE("Setting L to %d\n", mcdu->dwValue); + left = (Float32) mcdu->dwValue / 65535.0; + mcdu++; + TRACE("Setting R to %d\n", mcdu->dwValue); + right = (Float32) mcdu->dwValue / 65535.0; + break; + default: + WARN("Unsupported cChannels (%d)\n", lpmcd->cChannels); + return MMSYSERR_INVALPARAM; + } + if ( MIX_LineSetVolume(mixer.mixerCtrls[lpmcd->dwControlID].dwLineID, lpmcd->cChannels, left, right) ) + ret = MMSYSERR_NOERROR; + } + break; + case MIXERCONTROL_CONTROLTYPE_MUTE: + case MIXERCONTROL_CONTROLTYPE_ONOFF: + TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(dwControlType), lpmcd->cChannels); + { + LPMIXERCONTROLDETAILS_BOOLEAN mcdb; + + if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { + WARN("invalid parameter: cbDetails\n"); + return MMSYSERR_INVALPARAM; + } + mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)lpmcd->paDetails; + if ( MIX_LineSetMute(mixer.mixerCtrls[lpmcd->dwControlID].dwLineID, mcdb->fValue) ) + ret = MMSYSERR_NOERROR; + } + break; + case MIXERCONTROL_CONTROLTYPE_MIXER: + case MIXERCONTROL_CONTROLTYPE_MUX: + default: + FIXME("controlType : %s\n", getControlType(dwControlType)); + ret = MMSYSERR_NOTSUPPORTED; + break; + } + return ret; +} + +/************************************************************************** * mxdMessage */ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, @@ -875,6 +1010,7 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MXDM_GETCONTROLDETAILS: return MIX_GetControlDetails(wDevID, (LPMIXERCONTROLDETAILS)dwParam1, dwParam2); case MXDM_SETCONTROLDETAILS: + return MIX_SetControlDetails(wDevID, (LPMIXERCONTROLDETAILS)dwParam1, dwParam2); default: WARN("unknown message %d!\n", wMsg); return MMSYSERR_NOTSUPPORTED;

1 0

Emmanuel Maillard : winecoreaudio: Initial implementation of MIX_GetLineControls.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 33e24d7ecca02b1f8d8d01ae9459e32389035041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e24d7ecca02b1f8d8d01ae9… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Sun May 13 22:12:49 2007 +0200 winecoreaudio: Initial implementation of MIX_GetLineControls. --- dlls/winecoreaudio.drv/mixer.c | 86 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 5a9f724..01c35a1 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -616,6 +616,91 @@ static DWORD MIX_GetLineInfo(WORD wDevID, LPMIXERLINEW lpMl, DWORD_PTR fdwInfo) } /************************************************************************** +* MIX_GetLineControls [internal] +*/ +static DWORD MIX_GetLineControls(WORD wDevID, LPMIXERLINECONTROLSW lpMlc, DWORD_PTR flags) +{ + DWORD ret = MMSYSERR_NOTENABLED; + int ctrl = 0; + TRACE("%04X, %p, %08lX\n", wDevID, lpMlc, flags); + + if (lpMlc == NULL) { + WARN("invalid parameter: lpMlc == NULL\n"); + return MMSYSERR_INVALPARAM; + } + + if (lpMlc->cbStruct < sizeof(*lpMlc)) { + WARN("invalid parameter: lpMlc->cbStruct = %d\n", lpMlc->cbStruct); + return MMSYSERR_INVALPARAM; + } + + if (lpMlc->cbmxctrl < sizeof(MIXERCONTROLW)) { + WARN("invalid parameter: lpMlc->cbmxctrl = %d\n", lpMlc->cbmxctrl); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= numMixers) { + WARN("bad device ID: %04X\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + switch (flags & MIXER_GETLINECONTROLSF_QUERYMASK) + { + case MIXER_GETLINECONTROLSF_ALL: + FIXME("dwLineID=%d MIXER_GETLINECONTROLSF_ALL (%d)\n", lpMlc->dwLineID, lpMlc->cControls); + if (lpMlc->cControls != ControlsPerLine) + { + WARN("invalid parameter lpMlc->cControls %d\n", lpMlc->cControls); + ret = MMSYSERR_INVALPARAM; + } + else + { + if ( (lpMlc->dwLineID >= 0) && (lpMlc->dwLineID < mixer.caps.cDestinations) ) + { + int i; + for (i = 0; i < lpMlc->cControls; i++) + { + lpMlc->pamxctrl[i] = mixer.mixerCtrls[lpMlc->dwLineID * i].ctrl; + } + ret = MMSYSERR_NOERROR; + } + else ret = MIXERR_INVALLINE; + } + break; + case MIXER_GETLINECONTROLSF_ONEBYID: + TRACE("dwLineID=%d MIXER_GETLINECONTROLSF_ONEBYID (%d)\n", lpMlc->dwLineID, lpMlc->u.dwControlID); + if ( lpMlc->u.dwControlID >= 0 && lpMlc->u.dwControlID < mixer.numCtrl ) + { + lpMlc->pamxctrl[0] = mixer.mixerCtrls[lpMlc->u.dwControlID].ctrl; + ret = MMSYSERR_NOERROR; + } + else ret = MIXERR_INVALVALUE; + break; + case MIXER_GETLINECONTROLSF_ONEBYTYPE: + TRACE("dwLineID=%d MIXER_GETLINECONTROLSF_ONEBYTYPE (%s)\n", lpMlc->dwLineID, getControlType(lpMlc->u.dwControlType)); + if (lpMlc->u.dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + { + ctrl = (lpMlc->dwLineID * ControlsPerLine) + IDControlVolume; + lpMlc->pamxctrl[0] = mixer.mixerCtrls[ctrl].ctrl; + ret = MMSYSERR_NOERROR; + } + else + if (lpMlc->u.dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + ctrl = (lpMlc->dwLineID * ControlsPerLine) + IDControlMute; + lpMlc->pamxctrl[0] = mixer.mixerCtrls[ctrl].ctrl; + ret = MMSYSERR_NOERROR; + } + break; + default: + ERR("Unknown flag %08lx\n", flags & MIXER_GETLINECONTROLSF_QUERYMASK); + ret = MMSYSERR_INVALPARAM; + } + + return ret; +} + +/************************************************************************** * mxdMessage */ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, @@ -643,6 +728,7 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MXDM_GETLINEINFO: return MIX_GetLineInfo(wDevID, (LPMIXERLINEW)dwParam1, dwParam2); case MXDM_GETLINECONTROLS: + return MIX_GetLineControls(wDevID, (LPMIXERLINECONTROLSW)dwParam1, dwParam2); case MXDM_GETCONTROLDETAILS: case MXDM_SETCONTROLDETAILS: default:

1 0