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

appdb/include downloadurl.php version_queue.php
by WineHQ April 24, 2007

April 24, 2007

ChangeSet ID: 31103 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/24 18:38:41 Modified files: include : downloadurl.php version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Always read input first in downloadurl::outputEditorSingle(). Makes sure changes aren't lost when reloading the form due to input errors Patch: http://cvs.winehq.org/patch.py?id=31103 Old revision New revision Changes Path 1.13 1.14 +7 -5 appdb/include/downloadurl.php 1.7 1.8 +2 -0 appdb/include/version_queue.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.13 appdb/include/downloadurl.php:1.14 --- appdb/include/downloadurl.php:1.13 24 Apr 2007 23:38:41 -0000 +++ appdb/include/downloadurl.php 24 Apr 2007 23:38:41 -0000 @@ -224,7 +224,12 @@ class downloadurl /* Output an editor for a single new URL */ function outputEditorSingle($iVersionId = NULL, $aValues = NULL) { - if($iVersionId) + if($aValues["sDownloadUrlUrl"] && + $aValues["sDownloadUrlDescription"]) + { + $sDownloadUrlUrl = $aValues["sDownloadUrlUrl"]; + $sDownloadUrlDescription = $aValues["sDownloadUrlDescription"]; + } else if($iVersionId) { if($hResult = appData::getData($iVersionId, "downloadurl", TRUE, TRUE)) @@ -233,12 +238,9 @@ class downloadurl $sDownloadUrlUrl = $oRow->url; $sDownloadUrlDescription = $oRow->description; } - } else - { - $sDownloadUrlUrl = $aValues["sDownloadUrlUrl"]; - $sDownloadUrlDescription = $aValues["sDownloadUrlDescription"]; } + $sReturn .= html_frame_start("Download URL","90%"); $sReturn .= html_table_begin(""); Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.7 appdb/include/version_queue.php:1.8 --- appdb/include/version_queue.php:1.7 24 Apr 2007 23:38:41 -0000 +++ appdb/include/version_queue.php 24 Apr 2007 23:38:41 -0000 @@ -71,6 +71,8 @@ class version_queue function outputEditor() { + global $aClean; + /* Display duplicate list if this is a an existing version */ if($this->oVersion->iVersionId) $this->displayMoveTestTable();

1 0

appdb/include tableve.php
by WineHQ April 24, 2007

April 24, 2007

ChangeSet ID: 31102 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/24 18:36:10 Modified files: include : tableve.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix TableVE::make_option_list's where handling to prevent sql injection Patch: http://cvs.winehq.org/patch.py?id=31102 Old revision New revision Changes Path 1.13 1.14 +15 -9 appdb/include/tableve.php Index: appdb/include/tableve.php diff -u -p appdb/include/tableve.php:1.13 appdb/include/tableve.php:1.14 --- appdb/include/tableve.php:1.13 24 Apr 2007 23:36:10 -0000 +++ appdb/include/tableve.php 24 Apr 2007 23:36:10 -0000 @@ -171,23 +171,29 @@ class TableVE { echo html_frame_end(); } - function make_option_list($varname, $cvalue, $table, $idField, $nameField, $where = "") + function make_option_list($sVarname, $sCvalue, $sTable, $sIdField, $sNameField, $aWhere = null) { - $hResult = query_parameters("SELECT ?, ? FROM ? ? ORDER BY '?'", - $idField, $nameField, $table, $where, $nameField); + /* We do not allow direct insertion into of SQL code, so the WHERE clause is + is accepted in an array form, where the first element is the variable + and the second is the value it must be equal to */ + if($aWhere) + $sWhere = "WHERE ".$aWhere[0]." ='".$aWhere[1]."'"; + + $hResult = query_parameters("SELECT ?, ? FROM ? $sWhere ORDER BY '?'", + $sIdField, $sNameField, $sTable, $sNameField); if(!$hResult) return; // Oops - echo "<select name='$varname'>\n"; + echo "<select name='$sVarname'>\n"; echo "<option value=0>Choose ...</option>\n"; - while(list($id, $name) = mysql_fetch_row($hResult)) + while(list($iId, $sName) = mysql_fetch_row($hResult)) { - if ($name == "NONAME") + if ($sName == "NONAME") continue; - if($id == $cvalue) - echo "<option value=$id selected>$name\n"; + if($iId == $sCvalue) + echo "<option value=$iId selected>$sName\n"; else - echo "<option value=$id>$name\n"; + echo "<option value=$iId>$sName\n"; } echo "</select>\n"; }

1 0

Maarten Lankhorst : winealsa: Implement Get/SetControlDetails in mixer.
by Alexandre Julliard April 24, 2007

April 24, 2007

Module: wine Branch: master Commit: 02c416a187898c0f028f86a9f987c92f5353c4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c416a187898c0f028f86a9f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 24 00:23:52 2007 +0200 winealsa: Implement Get/SetControlDetails in mixer. --- dlls/winealsa.drv/mixer.c | 439 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 438 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02c416a187898c0f028f8…

1 0

Maarten Lankhorst : winealsa: Implement GetLineControls in mixer.
by Alexandre Julliard April 24, 2007

April 24, 2007

Module: wine Branch: master Commit: 143f10a4d07198a46647d44f9cee07b01d3a80b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=143f10a4d07198a46647d44f9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 24 00:23:50 2007 +0200 winealsa: Implement GetLineControls in mixer. --- dlls/winealsa.drv/mixer.c | 134 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 465b18b..a35d981 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -100,6 +100,46 @@ static const char * getMessage(UINT uMsg) return str; } +static const char * getControlType(DWORD dwControlType) +{ +#define TYPE_TO_STR(x) case x: return #x; + switch (dwControlType) { + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_BOOLEANMETER); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_SIGNEDMETER); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_PEAKMETER); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_UNSIGNEDMETER); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_BOOLEAN); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_ONOFF); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MUTE); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MONO); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_LOUDNESS); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_STEREOENH); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_BASS_BOOST); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_BUTTON); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_DECIBELS); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_SIGNED); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_UNSIGNED); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_PERCENT); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_SLIDER); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_PAN); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_QSOUNDPAN); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_FADER); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_VOLUME); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_BASS); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_TREBLE); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_EQUALIZER); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_SINGLESELECT); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MUX); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MULTIPLESELECT); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MIXER); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MICROTIME); + TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME); + } +#undef TYPE_TO_STR + return wine_dbg_sprintf("UNKNOWN(%08x)", dwControlType); +} + /* A simple declaration of a line control * These are each of the channels that show up */ @@ -891,6 +931,97 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags) return MMSYSERR_NOERROR; } +/* Get the controls that belong to a certain line, either all or 1 */ +static DWORD MIX_GetLineControls(UINT wDevID, LPMIXERLINECONTROLSW mlc, DWORD_PTR flags) +{ + mixer *mmixer = MIX_GetMix(wDevID); + int i,j = 0; + DWORD ct; + + if (!mlc || mlc->cbStruct != sizeof(*mlc)) + { + WARN("Invalid mlc %p, cbStruct: %d\n", mlc, (!mlc ? -1 : mlc->cbStruct)); + return MMSYSERR_INVALPARAM; + } + + if (mlc->cbmxctrl != sizeof(MIXERCONTROLW)) + { + WARN("cbmxctrl %d\n", mlc->cbmxctrl); + return MMSYSERR_INVALPARAM; + } + + if (!mmixer) + return MMSYSERR_BADDEVICEID; + + flags &= MIXER_GETLINECONTROLSF_QUERYMASK; + + if (flags == MIXER_GETLINECONTROLSF_ONEBYID) + mlc->dwLineID = mlc->u.dwControlID / CONTROLSPERLINE; + + if (mlc->dwLineID < 0 || mlc->dwLineID >= mmixer->chans) + { + TRACE("Invalid dwLineID %d\n", mlc->dwLineID); + return MIXERR_INVALLINE; + } + + switch (flags) + { + case MIXER_GETLINECONTROLSF_ALL: + TRACE("line=%08x MIXER_GETLINECONTROLSF_ALL (%d)\n", mlc->dwLineID, mlc->cControls); + for (i = 0; i < CONTROLSPERLINE; ++i) + if (mmixer->controls[i+mlc->dwLineID * CONTROLSPERLINE].enabled) + { + memcpy(&mlc->pamxctrl[j], &mmixer->controls[i+mlc->dwLineID * CONTROLSPERLINE].c, sizeof(MIXERCONTROLW)); + TRACE("Added %s (%s)\n", debugstr_w(mlc->pamxctrl[j].szShortName), debugstr_w(mlc->pamxctrl[j].szName)); + ++j; + if (j > mlc->cControls) + { + WARN("invalid parameter\n"); + return MMSYSERR_INVALPARAM; + } + } + + if (!j || mlc->cControls > j) + { + WARN("invalid parameter\n"); + return MMSYSERR_INVALPARAM; + } + break; + case MIXER_GETLINECONTROLSF_ONEBYID: + TRACE("line=%08x MIXER_GETLINECONTROLSF_ONEBYID (%x)\n", mlc->dwLineID, mlc->u.dwControlID); + + if (!mmixer->controls[mlc->u.dwControlID].enabled) + return MIXERR_INVALCONTROL; + + mlc->pamxctrl[0] = mmixer->controls[mlc->u.dwControlID].c; + break; + case MIXER_GETLINECONTROLSF_ONEBYTYPE: + TRACE("line=%08x MIXER_GETLINECONTROLSF_ONEBYTYPE (%s)\n", mlc->dwLineID, getControlType(mlc->u.dwControlType)); + + ct = mlc->u.dwControlType & MIXERCONTROL_CT_CLASS_MASK; + for (i = 0; i <= CONTROLSPERLINE; ++i) + { + const int ofs = i+mlc->dwLineID*CONTROLSPERLINE; + if (i == CONTROLSPERLINE) + { + WARN("invalid parameter: control %s not found\n", getControlType(mlc->u.dwControlType)); + return MIXERR_INVALCONTROL; + } + if (mmixer->controls[ofs].enabled && (mmixer->controls[ofs].c.dwControlType & MIXERCONTROL_CT_CLASS_MASK) == ct) + { + mlc->pamxctrl[0] = mmixer->controls[ofs].c; + break; + } + } + break; + default: + FIXME("Unknown flag %08lx\n", flags & MIXER_GETLINECONTROLSF_QUERYMASK); + return MMSYSERR_INVALPARAM; + } + + return MMSYSERR_NOERROR; +} + #endif /*HAVE_ALSA*/ /************************************************************************** @@ -926,6 +1057,9 @@ DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MXDM_GETLINEINFO: ret = MIX_GetLineInfo(wDevID, (LPMIXERLINEW)dwParam1, dwParam2); break; + case MXDM_GETLINECONTROLS: + ret = MIX_GetLineControls(wDevID, (LPMIXERLINECONTROLSW)dwParam1, dwParam2); break; + case MXDM_GETNUMDEVS: ret = cards; break;

1 0

Maarten Lankhorst : winealsa: Implement mixer controls, and add GetLineInfo .
by Alexandre Julliard April 24, 2007

April 24, 2007

Module: wine Branch: master Commit: 1843e71ef1cc938fbb83f57a0c3320ccc287c170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1843e71ef1cc938fbb83f57a0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 24 00:23:46 2007 +0200 winealsa: Implement mixer controls, and add GetLineInfo. --- dlls/winealsa.drv/mixer.c | 286 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 282 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1843e71ef1cc938fbb83f…

1 0

Maarten Lankhorst : winealsa: Implement opening/closing and caps of device.
by Alexandre Julliard April 24, 2007

April 24, 2007

Module: wine Branch: master Commit: f7082bbbc06ccc9294d7df76f22234251267a5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7082bbbc06ccc9294d7df76f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 24 00:23:42 2007 +0200 winealsa: Implement opening/closing and caps of device. --- dlls/winealsa.drv/mixer.c | 381 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 378 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7082bbbc06ccc9294d7d…

1 0

Maarten Lankhorst : winealsa: Introduce mixer code.
by Alexandre Julliard April 24, 2007

April 24, 2007

Module: wine Branch: master Commit: f60dcd2dee381798bb18b3bfebe48234ad78bf9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60dcd2dee381798bb18b3bfe… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 24 00:23:34 2007 +0200 winealsa: Introduce mixer code. --- dlls/winealsa.drv/Makefile.in | 1 + dlls/winealsa.drv/mixer.c | 291 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/winealsa.drv.spec | 1 + 3 files changed, 293 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index ff6e60c..58c733f 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ alsa.c \ dsoutput.c \ midi.c \ + mixer.c \ waveinit.c \ wavein.c \ waveout.c diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c new file mode 100644 index 0000000..6d0c161 --- /dev/null +++ b/dlls/winealsa.drv/mixer.c @@ -0,0 +1,291 @@ +/* + * Alsa MIXER Wine Driver for Linux + * Very loosely based on wineoss mixer driver + * + * Copyright 2007 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <fcntl.h> +#include <errno.h> +#include <assert.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winerror.h" +#include "winuser.h" +#include "winnls.h" +#include "mmddk.h" +#include "mmsystem.h" +#include "alsa.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mixer); + +#ifdef HAVE_ALSA + +/* Generic notes: + * In windows it seems to be required for all controls to have a volume switch + * In alsa that's optional + * + * I assume for playback controls, that there is always a playback volume switch available + * Mute is optional + * + * For capture controls, it is needed that there is a capture switch and a volume switch, + * It doesn't matter wether it is a playback volume switch or a capture volume switch. + * The code will first try to get/adjust capture volume, if that fails it tries playback volume + * It is not pretty, but under my 3 test cards it seems that there is no other choice: + * Most capture controls don't have a capture volume setting + * + * MUX means that only capture source can be exclusively selected, + * MIXER means that multiple sources can be selected simultaneously. + */ + +static const char * getMessage(UINT uMsg) +{ + static char str[64]; +#define MSG_TO_STR(x) case x: return #x; + switch (uMsg){ + MSG_TO_STR(DRVM_INIT); + MSG_TO_STR(DRVM_EXIT); + MSG_TO_STR(DRVM_ENABLE); + MSG_TO_STR(DRVM_DISABLE); + MSG_TO_STR(MXDM_GETDEVCAPS); + MSG_TO_STR(MXDM_GETLINEINFO); + MSG_TO_STR(MXDM_GETNUMDEVS); + MSG_TO_STR(MXDM_OPEN); + MSG_TO_STR(MXDM_CLOSE); + MSG_TO_STR(MXDM_GETLINECONTROLS); + MSG_TO_STR(MXDM_GETCONTROLDETAILS); + MSG_TO_STR(MXDM_SETCONTROLDETAILS); + default: break; + } +#undef MSG_TO_STR + sprintf(str, "UNKNOWN(%08x)", uMsg); + return str; +} + +/* Mixer device */ +typedef struct mixer +{ + snd_mixer_t *mix; + WCHAR mixername[MAXPNAMELEN]; + + int chans, dests; +} mixer; + +#define MAX_MIXERS 32 + +static int cards = 0; +static mixer mixdev[MAX_MIXERS]; + +/* Is this control suited for showing up? */ +static int blacklisted(snd_mixer_elem_t *elem) +{ + const char *name = snd_mixer_selem_get_name(elem); + BOOL blisted = 0; + + if (!snd_mixer_selem_has_playback_volume(elem) && + (!snd_mixer_selem_has_capture_volume(elem) || + !snd_mixer_selem_has_capture_switch(elem))) + blisted = 1; + + TRACE("%s: %x\n", name, blisted); + return blisted; +} + +static void ALSA_MixerInit(void) +{ + int x, mixnum = 0; + + for (x = 0; x < MAX_MIXERS; ++x) + { + int card, err; + char cardind[6], cardname[10]; + BOOL hascapt=0, hasmast=0; + + snd_ctl_t *ctl; + snd_mixer_elem_t *elem, *mastelem = NULL, *captelem = NULL; + snd_ctl_card_info_t *info = NULL; + snd_ctl_card_info_alloca(&info); + + snprintf(cardind, sizeof(cardind), "%d", x); + card = snd_card_get_index(cardind); + if (card < 0 || card > MAX_MIXERS - 1) + continue; + snprintf(cardname, sizeof(cardname), "hw:%d", card); + + err = snd_ctl_open(&ctl, cardname, 0); + if (err < 0) + { + WARN("Cannot open card: %s\n", snd_strerror(err)); + continue; + } + + err = snd_ctl_card_info(ctl, info); + if (err < 0) + { + WARN("Cannot get card info: %s\n", snd_strerror(err)); + snd_ctl_close(ctl); + continue; + } + + MultiByteToWideChar(CP_UNIXCP, 0, snd_ctl_card_info_get_name(info), -1, mixdev[mixnum].mixername, sizeof(mixdev[mixnum].mixername)/sizeof(WCHAR)); + snd_ctl_close(ctl); + + err = snd_mixer_open(&mixdev[mixnum].mix,0); + if (err < 0) + { + WARN("Error occured opening mixer: %s\n", snd_strerror(err)); + continue; + } + + err = snd_mixer_attach(mixdev[mixnum].mix, cardname); + if (err < 0) + goto eclose; + + err = snd_mixer_selem_register(mixdev[mixnum].mix, NULL, NULL); + if (err < 0) + goto eclose; + + err = snd_mixer_load(mixdev[mixnum].mix); + if (err < 0) + goto eclose; + + mixdev[mixnum].chans = 0; + mixdev[mixnum].dests = 1; /* Master, Capture will be enabled if needed */ + + for (elem = snd_mixer_first_elem(mixdev[mixnum].mix); elem; elem = snd_mixer_elem_next(elem)) + if (!strcasecmp(snd_mixer_selem_get_name(elem), "Master")) + { + mastelem = elem; + ++hasmast; + } + else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Capture")) + { + captelem = elem; + ++hascapt; + } + else if (!blacklisted(elem)) + { + if (snd_mixer_selem_has_capture_switch(elem)) + { + ++mixdev[mixnum].chans; + mixdev[mixnum].dests = 2; + } + if (snd_mixer_selem_has_playback_volume(elem)) + ++mixdev[mixnum].chans; + } + + /* If there is only 'Capture' and 'Master', this device is not worth it */ + if (!mixdev[mixnum].chans) + { + WARN("No channels found, skipping device!\n"); + snd_mixer_close(mixdev[mixnum].mix); + continue; + } + + /* If there are no 'Capture' and 'Master', something is wrong */ + if (hasmast != 1 || hascapt != 1) + { + if (hasmast != 1) + FIXME("Should have found 1 channel for 'Master', but instead found %d\n", hasmast); + if (hascapt != 1) + FIXME("Should have found 1 channel for 'Capture', but instead found %d\n", hascapt); + goto eclose; + } + + mixdev[mixnum].chans += 2; /* Capture/Master */ + + TRACE("%s: Amount of controls: %i/%i, name: %s\n", cardname, mixdev[mixnum].dests, mixdev[mixnum].chans, debugstr_w(mixdev[mixnum].mixername)); + mixnum++; + continue; + + eclose: + WARN("Error occured initialising mixer: %s\n", snd_strerror(err)); + snd_mixer_close(mixdev[mixnum].mix); + } + cards = mixnum; + TRACE("\n"); +} + +static void ALSA_MixerExit(void) +{ + int x; + TRACE("\n"); + + for (x = 0; x < cards; ++x) + snd_mixer_close(mixdev[x].mix); + cards = 0; +} + +#endif /*HAVE_ALSA*/ + +/************************************************************************** + * mxdMessage (WINEALSA.3) + */ +DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ +#ifdef HAVE_ALSA + DWORD ret; + TRACE("(%04X, %s, %08lX, %08lX, %08lX);\n", wDevID, getMessage(wMsg), + dwUser, dwParam1, dwParam2); + + switch (wMsg) + { + case DRVM_INIT: ALSA_MixerInit(); ret = MMSYSERR_NOERROR; break; + case DRVM_EXIT: ALSA_MixerExit(); ret = MMSYSERR_NOERROR; break; + /* All taken care of by driver initialisation */ + /* Unimplemented, and not needed */ + case DRVM_ENABLE: + case DRVM_DISABLE: + ret = MMSYSERR_NOERROR; break; + + case MXDM_GETNUMDEVS: + ret = cards; break; + + default: + WARN("unknown message %s!\n", getMessage(wMsg)); + return MMSYSERR_NOTSUPPORTED; + } + + TRACE("Returning %08X\n", ret); + return ret; +#else /*HAVE_ALSA*/ + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + + return MMSYSERR_NOTENABLED; +#endif /*HAVE_ALSA*/ +} diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index 766c2fc..bf883b4 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -1,5 +1,6 @@ @ stdcall -private DriverProc(long long long long long) ALSA_DriverProc @ stdcall -private midMessage(long long long long long) ALSA_midMessage @ stdcall -private modMessage(long long long long long) ALSA_modMessage +@ stdcall -private mxdMessage(long long long long long) ALSA_mxdMessage @ stdcall -private widMessage(long long long long long) ALSA_widMessage @ stdcall -private wodMessage(long long long long long) ALSA_wodMessage

1 0

Rob Shearman : msi: Add a non-persistent string instead of a persistent one if the table or row is non-persistent .
by Alexandre Julliard April 24, 2007

April 24, 2007

Module: wine Branch: master Commit: e474304160f7ab7224de183ca10a2fbd4c3a3e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e474304160f7ab7224de183ca… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:27:37 2007 +0100 msi: Add a non-persistent string instead of a persistent one if the table or row is non-persistent. --- dlls/msi/table.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index b6ede40..ea1314e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1250,10 +1250,14 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI for ( i = 0; i < tv->num_cols; i++ ) { + BOOL persistent; + /* only update the fields specified in the mask */ if ( !(mask&(1<<i)) ) continue; + /* if row >= tv->table->row_count then it is a non-persistent row */ + persistent = tv->table->persistent && (row < tv->table->row_count); /* FIXME: should we allow updating keys? */ val = 0; @@ -1266,7 +1270,8 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI else if ( tv->columns[i].type & MSITYPE_STRING ) { LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, StringPersistent ); + val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, + persistent ? StringPersistent : StringNonPersistent ); } else if ( 2 == bytes_per_column( &tv->columns[ i ] ) ) {

1 0

Rob Shearman : msi: All columns being temporary means the table is non-persistent.
by Alexandre Julliard April 24, 2007

April 24, 2007

Module: wine Branch: master Commit: 697d820eeedae307db5cc0ddbec60c6c68391812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697d820eeedae307db5cc0ddb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 23 08:26:44 2007 +0100 msi: All columns being temporary means the table is non-persistent. The HOLD keyword just means that the non-persistent data in the table should be kept around, not that the table is temporary. --- dlls/msi/create.c | 11 ++++++++++- dlls/msi/query.h | 3 ++- dlls/msi/sql.y | 7 +++++-- dlls/msi/tests/db.c | 2 -- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index ef71684..965a4a6 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -146,10 +146,12 @@ static UINT check_columns( column_info *col_info ) } UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, - column_info *col_info, BOOL temp ) + column_info *col_info, BOOL hold ) { MSICREATEVIEW *cv = NULL; UINT r; + const column_info *col; + BOOL temp = TRUE; TRACE("%p\n", cv ); @@ -161,6 +163,13 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, if( !cv ) return ERROR_FUNCTION_FAILED; + for( col = col_info; col; col = col->next ) + if( !col->temporary ) + { + temp = FALSE; + break; + } + /* fill the structure */ cv->view.ops = &create_ops; msiobj_addref( &db->hdr ); diff --git a/dlls/msi/query.h b/dlls/msi/query.h index a8a633f..69d511c 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -66,6 +66,7 @@ typedef struct _column_info LPCWSTR table; LPCWSTR column; UINT type; + BOOL temporary; struct expr *val; struct _column_info *next; } column_info; @@ -108,7 +109,7 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, struct expr *cond ); UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, - column_info *col_info, BOOL temp ); + column_info *col_info, BOOL hold ); UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, column_info *columns, column_info *values, BOOL temp ); diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 17cb957..9cbeb6f 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -40,6 +40,8 @@ static int sql_error(const char *str); WINE_DEFAULT_DEBUG_CHANNEL(msi); +#define MSITYPE_TEMPORARY 0x8000 + typedef struct tag_SQL_input { MSIDATABASE *db; @@ -278,7 +280,8 @@ column_and_type: column column_type { $$ = $1; - $$->type = $2 | MSITYPE_VALID; + $$->type = ($2 | MSITYPE_VALID) & ~MSITYPE_TEMPORARY; + $$->temporary = $2 & MSITYPE_TEMPORARY ? TRUE : FALSE; } ; @@ -293,7 +296,7 @@ column_type: } | data_type_l TK_TEMPORARY { - FIXME("temporary column\n"); + $$ = $1 | MSITYPE_TEMPORARY; } ; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9ebcd02..073cf01 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2664,10 +2664,8 @@ static void test_temporary_table(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); - todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, "P2"); ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); - } query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`) HOLD"; r = run_query(hdb, 0, query);

1 0

Rob Shearman : msi: Add a persistent flag to tables.
by Alexandre Julliard April 24, 2007

April 24, 2007

Module: wine Branch: master Commit: 44f7cb8858f9cb316b939edb0ded65d7fcb0433b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f7cb8858f9cb316b939edb0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 24 11:00:44 2007 +0100 msi: Add a persistent flag to tables. Implement MSI_DatabaseIsTablePersistent. --- dlls/msi/table.c | 20 ++++++++++++++++++-- dlls/msi/tests/db.c | 6 +++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 09abe1a..b6ede40 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -69,6 +69,7 @@ struct tagMSITABLE struct list entry; MSICOLUMNINFO *colinfo; UINT col_count; + BOOL persistent; WCHAR name[1]; }; @@ -626,6 +627,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->nonpersistent_data = NULL; table->colinfo = NULL; table->col_count = 0; + table->persistent = persistent; lstrcpyW( table->name, name ); for( col = col_info; col; col = col->next ) @@ -771,6 +773,7 @@ static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ) table->nonpersistent_data = NULL; table->colinfo = NULL; table->col_count = 0; + table->persistent = TRUE; lstrcpyW( table->name, name ); /* these two tables are special - we know the column types already */ @@ -811,6 +814,10 @@ static UINT save_table( MSIDATABASE *db, MSITABLE *t ) USHORT *rawdata = NULL, *p; UINT rawsize, r, i, j, row_size; + /* Nothing to do for non-persistent tables */ + if( !t->persistent ) + return ERROR_SUCCESS; + TRACE("Saving %s\n", debugstr_w( t->name ) ); row_size = msi_table_get_row_size( t->colinfo, t->col_count ); @@ -1694,13 +1701,22 @@ UINT MSI_CommitTables( MSIDATABASE *db ) MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ) { + MSITABLE *t; + UINT r; + + TRACE("%p %s\n", db, debugstr_w(table)); + if (!table) return MSICONDITION_ERROR; - if (!TABLE_Exists( db, table )) + r = get_table( db, table, &t ); + if (r != ERROR_SUCCESS) return MSICONDITION_NONE; - return MSICONDITION_FALSE; + if (t->persistent) + return MSICONDITION_TRUE; + else + return MSICONDITION_FALSE; } static MSIRECORD *msi_get_transform_record( MSITABLEVIEW *tv, string_table *st, USHORT *rawdata ) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 422bba3..9ebcd02 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2658,14 +2658,14 @@ static void test_temporary_table(void) ok(r == ERROR_SUCCESS, "failed to add table\n"); cond = MsiDatabaseIsTablePersistent(hdb, "P"); - todo_wine ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); + ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); query = "CREATE TABLE `P2` ( `B` SHORT NOT NULL, `C` CHAR(255) PRIMARY KEY `C`) HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); todo_wine { - cond = MsiDatabaseIsTablePersistent(hdb, "P"); + cond = MsiDatabaseIsTablePersistent(hdb, "P2"); ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); } @@ -2689,10 +2689,10 @@ static void test_temporary_table(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); - todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, "T3"); ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); + todo_wine { query = "CREATE TABLE `T4` ( `B` SHORT NOT NULL, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`)"; r = run_query(hdb, 0, query); ok(r == ERROR_FUNCTION_FAILED, "failed to add table\n");

1 0