I believe
commit be332326ba8fc3def406c5f29adf04fbe9a83976
Author: Andrew Eikum <aeikum(a)codeweavers.com>
Date: Wed Apr 27 09:12:36 2011 -0500
is causing the following build failures on my nightly FreeBSD testers:
mmdevdrv.c:463:20: error: 'AFMT_S24_PACKED' undeclared (first use in this function)
mmdevdrv.c:476:16: error: 'AFMT_FLOAT' undeclared (first use in this function)
mmdevdrv.c:854:24: error: 'AFMT_FLOAT' undeclared (first use in this function)
mmdevdrv.c:863:24: error: 'AFMT_S24_PACKED' undeclared (first use in this function)
mmdevdrv.c:1084:24: error: 'SNDCTL_DSP_HALT' undeclared (first use in this function)
Looks like some autoconfigury is not working or incomplete?
Gerald
On 05/07/2011 07:46 PM, Gerald Pfeifer wrote:
> As we have seen from a related thread on wine-devel, FreeBSD's
> implementation of OSS is slightly, though not a lot, different from
> what current Linux distributions feature.
>
> This patch addresses one such case, AFMT_FLOAT which does not exist
> on FreeBSD (yet?), and I'm sure other non-Linux systems.
I guess we can add this workaround. I don't know how far down this road
we should be willing to go, though. I would consider the FreeBSD
implementation broken: it deviates from the spec as stated by the
authors. So this seems to be their bug, not ours. How far should we bend
over backwards to accommodate their bug?
Anyways this is a tiny hassle, so I'm fine with it. Perhaps you should
consider filing a FreeBSD bug?
Thanks Gerald.
Andrew
> I created this diff with more context so that it becomes immediate that
> this patch is harmless in that AFMT_FLOAT is handled as an error case
> for system not providing it.
>
> Gerald
>
> ---
> dlls/wineoss.drv/mmdevdrv.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
> index 789cb1e..254a119 100644
> --- a/dlls/wineoss.drv/mmdevdrv.c
> +++ b/dlls/wineoss.drv/mmdevdrv.c
> @@ -504,25 +504,27 @@ static int get_oss_format(const WAVEFORMATEX *fmt)
> case 32:
> return AFMT_S32_LE;
> }
> return -1;
> }
>
> if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT ||
> (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE&&
> IsEqualGUID(&fmtex->SubFormat,&KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){
> if(fmt->wBitsPerSample != 32)
> return -1;
>
> +#ifdef AFMT_FLOAT
> return AFMT_FLOAT;
> +#endif
> }
>
> return -1;
> }
>
> static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt)
> {
> WAVEFORMATEX *ret;
> size_t size;
>
> if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
> size = sizeof(WAVEFORMATEXTENSIBLE);
> @@ -935,27 +937,29 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface,
>
> if(This->dataflow == eRender)
> formats = This->ai.oformats;
> else if(This->dataflow == eCapture)
> formats = This->ai.iformats;
> else
> return E_UNEXPECTED;
>
> fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
> if(formats& AFMT_S16_LE){
> fmt->Format.wBitsPerSample = 16;
> fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
> +#ifdef AFMT_FLOAT
> }else if(formats& AFMT_FLOAT){
> fmt->Format.wBitsPerSample = 32;
> fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
> +#endif
> }else if(formats& AFMT_U8){
> fmt->Format.wBitsPerSample = 8;
> fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
> }else if(formats& AFMT_S32_LE){
> fmt->Format.wBitsPerSample = 32;
> fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
> }else if(formats& AFMT_S24_LE){
> fmt->Format.wBitsPerSample = 24;
> fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
> }else{
> ERR("Didn't recognize any available OSS formats: %x\n", formats);
> return E_FAIL;
>
>
Hi Jay,
+static void MakeExplorerWindow(IShellFolder* startFolder, HINSTANCE hInstance)
I know the general rule of thumb when modifying an existing file is to
keep its style, but we also tend to stay away from this style of
function naming. It looks too much like the functions could be Win32
API names. Preferred style is the "one true style" of function
naming, e.g. make_explorer_window instead. As it happens, explorer.c
is the odd man out in programs/explorer, and since it only has 4
functions at the moment, it's probably better to change them than to
add more functions with this style.
Thanks,
--Juan
I'm sorry if I'm wrong, but it seems to me in this and following
patches, the AudioSessionManager_Release() function is incomplete - I
think the dealing with ref == 0 is missing.
HTH,
Joris
Hi Folks,
We have made arrangements for this year's WineConf to happen in
Minneapolis, MN on Saturday October 1 and Sunday October 2. Minneapolis
is the little known other city of the Twin Cities across the river from
our home town, St. Paul. I've put some preliminary information up on
the Wiki:
http://wiki.winehq.org/WineConf2011
We thought that this year it would be fun to stay in downtown
Minneapolis, as there is quite a bit to do there.
Further, at that time of year, the weather has a good chance of being
beautiful, so it will hopefully be a great time for all. I checked, and
only very rarely has it been below freezing on October 1 <evil grin>.
(Seriously, it's usually very nice. Really. Trust me).
If you are interested in WineConf, and have contributed to Wine, but are
not sure if you can afford the travel costs, please write to me. The
Wine Party fund is used mostly to defray travel costs these days and we
may be able to help.
Note that most further communication will happen on the
wineconf(a)winehq.org mailing list; if you're interested, you should
subscribe.
If you're coming, please hit the RSVP page:
http://www.winehq.org/wineconf/rsvp/
Hope to see you in Minneapolis!
Cheers,
Jeremy
Any reason it was not commited yet?
A+
David
________________________________
De : paulo lesgaz <jeremielapuree(a)yahoo.fr>
À : Stefan Dösinger <stefandoesinger(a)gmx.at>; wine-devel(a)winehq.org
Envoyé le : Mer 1 juin 2011, 20h 37min 36s
Objet : Re : ddraw: Add tests for Setcooperativelevel
________________________________
De : Stefan Dösinger <stefandoesinger(a)gmx.at>
À : wine-devel(a)winehq.org
Cc : paulo lesgaz <jeremielapuree(a)yahoo.fr>
Envoyé le : Mer 1 juin 2011, 15h 11min 25s
Objet : Re: ddraw: Add tests for Setcooperativelevel
On Wednesday 01 June 2011 08:01:57 paulo lesgaz wrote:
>> Hi,
>>
>> any problem with the patch
>>
>> http://source.winehq.org/patches/data/74702
>I guess Alexandre was waiting for a reply from me or Henri.
>
>The tests themselves look ok, but I wonder what your ultimate goal is - is
>there a game that has issues with DDSCL_CREATEDEVICEWINDOW?
Yes, see bug 25660
My tests prove that DDSCL_CREATEDEVICEWINDOW+DDSCL_EXCLUSIVE+DDSCL_FULLSCREEN is
allowed with a NULL window. That is what expected by Half life I demo.
Currently, Wine returns DDERR_INVALIDPARAMS.
Obviously, there are already tests that prove that
DDSCL_EXCLUSIVE+DDSCL_FULLSCREEN fails with a null window.
> Also the tests we
>have are somewhat unsatisfying, we don't have a single test where
>DDSCL_CREATEDEVICEWINDOW is supposed to succeed.
Maybe it would be the subject of an another patch?
A+
David