March 2005 - Wine-Devel - list.winehq.org

Re: KERNEL: PeekNamedPipe must check for zero-length buffer as well as for NULL buffer
by Jakob Eriksson March 22, 2005

March 22, 2005

Alex Villacis Lasso wrote: > > Changelog: > * PeekNamedPipe now checks both for a NULL buffer and a zero-length > buffer before trying to recv() from the pipe Could you write a regression test? regards, Jakob

1 0

Re: NTDLL: teach wine about Mingw32 (RESUBMIT)
by Steven Edwards March 22, 2005

March 22, 2005

Hi, --- "C. Scott Ananian" <cscott(a)cscott.net> wrote: > This patch seems to have gotten lost: it was sent last Thursday but hasn't > yet been applied or rejected (as far as I can tell). It's even got a > testimonial from a wine developer: Andreas Mohr says, "Nice patch." =) I don't understand why Mingw does not report the same value as the Windows compiler here. Do you know lcc or and other free compiler based application need this? If not maybe it should be fixed in mingw. Thanks Steven __________________________________ Do you Yahoo!? Make Yahoo! your home page http://www.yahoo.com/r/hs

2 1

Re: registry TODO
by Filip Navara March 22, 2005

March 22, 2005

Boaz Harrosh wrote: > Thomas Weidenmueller wrote: > >>> How is ReactOS's current (future) system? >> >> See above > > I was Just asking what ReactOS is doing, not that they need change. > ReactOS is different in this respect, I agree. > Is ReactOS's format the same as Windows. or do you have your own > Binary format? We use the a Windows registry format, but since some field haven't been reversed yet it is not 100% compatible... ;-) The registry files are mapped as sections in memory along with some other control data stored in non-paged pool. - Filip

1 0

Re: registry TODO
by Jonathan Wilson March 22, 2005

March 22, 2005

> Is ReactOS's format the same as Windows. or do you have your own Binary The answer to "is the reactos registry format the same as windows" depends on which version of windows you are comparing it to. Windows 95/98/ME used system.dat and user.dat to store the registry. NT kernels (NT4, 2000, XP etc) use "registry hives" (IIRC ReactOS uses hives too, no idea if they are the same format as NT/2K/XP or not)

1 0

Re: [WINEALSA] direct sound fallback patch
by Robert Reif March 22, 2005

March 22, 2005

Robert Reif wrote: > Don't fail when opening a device in direct sound mode. > Rather, try alternate formats first before failing. > > With the wave api, requesting a format that the > hardware can't do should fail so the wave mapper can > fix it up. However, the direct sound api does not > expect a failure (within reason) if the format isn't > supported in hardware but expects the closest > format that the hardware does support. > > This gets the direct sound regression tests working > better with the ALSA "hw" device and my lame Intel > builtin sound card. Use this patch instead. Fixes a format bug. Index: dlls/winmm/winealsa/audio.c =================================================================== RCS file: /home/wine/wine/dlls/winmm/winealsa/audio.c,v retrieving revision 1.71 diff -u -p -r1.71 audio.c --- dlls/winmm/winealsa/audio.c 21 Mar 2005 12:32:48 -0000 1.71 +++ dlls/winmm/winealsa/audio.c 21 Mar 2005 18:02:05 -0000 @@ -315,6 +315,22 @@ static const char * getMessage(UINT msg) return unknown; } +static const char * getFormat(WORD wFormatTag) +{ + static char unknown[32]; +#define FMT_TO_STR(x) case x: return #x + switch(wFormatTag) { + FMT_TO_STR(WAVE_FORMAT_PCM); + FMT_TO_STR(WAVE_FORMAT_EXTENSIBLE); + FMT_TO_STR(WAVE_FORMAT_MULAW); + FMT_TO_STR(WAVE_FORMAT_ALAW); + FMT_TO_STR(WAVE_FORMAT_ADPCM); + } +#undef FMT_TO_STR + sprintf(unknown, "UNKNOWN(0x%04x)", wFormatTag); + return unknown; +} + static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format) { @@ -1758,6 +1774,12 @@ static DWORD wodOpen(WORD wDevID, LPWAVE memcpy(&wwo->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); copy_format(lpDesc->lpFormat, &wwo->format); + TRACE("Requested this format: %ldx%dx%d %s\n", + wwo->format.Format.nSamplesPerSec, + wwo->format.Format.wBitsPerSample, + wwo->format.Format.nChannels, + getFormat(wwo->format.Format.wFormatTag)); + if (wwo->format.Format.wBitsPerSample == 0) { WARN("Resetting zeroed wBitsPerSample\n"); wwo->format.Format.wBitsPerSample = 8 * @@ -1789,7 +1811,19 @@ static DWORD wodOpen(WORD wDevID, LPWAVE else wwo->write = snd_pcm_mmap_writei; - EXIT_ON_ERROR( snd_pcm_hw_params_set_channels(pcm, hw_params, wwo->format.Format.nChannels), MMSYSERR_INVALPARAM, "unable to set required channels"); + if ((err = snd_pcm_hw_params_set_channels(pcm, hw_params, wwo->format.Format.nChannels)) < 0) { + WARN("unable to set required channels: %d\n", wwo->format.Format.nChannels); + if (dwFlags & WAVE_DIRECTSOUND) { + if (wwo->format.Format.nChannels > 2) + wwo->format.Format.nChannels = 2; + else if (wwo->format.Format.nChannels == 2) + wwo->format.Format.nChannels = 1; + else if (wwo->format.Format.nChannels == 1) + wwo->format.Format.nChannels = 2; + WARN("changed number of channels from %d to %d\n", lpDesc->lpFormat->nChannels, wwo->format.Format.nChannels); + } + EXIT_ON_ERROR( snd_pcm_hw_params_set_channels(pcm, hw_params, wwo->format.Format.nChannels ), MMSYSERR_INVALPARAM, "unable to set required channels" ); + } if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_PCM) || ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) && @@ -1819,7 +1853,24 @@ static DWORD wodOpen(WORD wDevID, LPWAVE return WAVERR_BADFORMAT; } - EXIT_ON_ERROR( snd_pcm_hw_params_set_format(pcm, hw_params, format), MMSYSERR_INVALPARAM, "unable to set required format"); + if ((err = snd_pcm_hw_params_set_format(pcm, hw_params, format)) < 0) { + WARN("unable to set required format: %s\n", snd_pcm_format_name(format)); + if (dwFlags & WAVE_DIRECTSOUND) { + if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_PCM) || + ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) && + IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) { + if (wwo->format.Format.wBitsPerSample != 16) { + wwo->format.Format.wBitsPerSample = 16; + format = SND_PCM_FORMAT_S16_LE; + } else { + wwo->format.Format.wBitsPerSample = 8; + format = SND_PCM_FORMAT_U8; + } + WARN("changed bits per sample from %d to %d\n", lpDesc->lpFormat->wBitsPerSample, wwo->format.Format.wBitsPerSample); + } + } + EXIT_ON_ERROR( snd_pcm_hw_params_set_format(pcm, hw_params, format), MMSYSERR_INVALPARAM, "unable to set required format" ); + } rate = wwo->format.Format.nSamplesPerSec; dir=0; @@ -1830,9 +1881,14 @@ static DWORD wodOpen(WORD wDevID, LPWAVE return WAVERR_BADFORMAT; } if (rate != wwo->format.Format.nSamplesPerSec) { - ERR("Rate doesn't match (requested %ld Hz, got %d Hz)\n", wwo->format.Format.nSamplesPerSec, rate); - snd_pcm_close(pcm); - return WAVERR_BADFORMAT; + if (dwFlags & WAVE_DIRECTSOUND) { + WARN("changed sample rate from %ld Hz to %d Hz\n", wwo->format.Format.nSamplesPerSec, rate); + wwo->format.Format.nSamplesPerSec = rate; + } else { + ERR("Rate doesn't match (requested %ld Hz, got %d Hz)\n", wwo->format.Format.nSamplesPerSec, rate); + snd_pcm_close(pcm); + return WAVERR_BADFORMAT; + } } dir=0; EXIT_ON_ERROR( snd_pcm_hw_params_set_buffer_time_near(pcm, hw_params, &buffer_time, &dir), MMSYSERR_INVALPARAM, "unable to set buffer time");

1 2

Re: msde on wine
by Dan Kegel March 22, 2005

March 22, 2005

Damiano Venturin wrote: > I'm interested in running msde on wine. I'm just looking around to see > if someone reached the goal. I saw you mail at > http://www.winehq.com/hypermail/wine-devel/2003/02/0583.html > > I just want to know if u was able to run it. I haven't tried since then. In the two years since then, MSI support on Wine has come a long ways, perhaps it will install now. Give it a try and report your experiences to the wine-devel mailing list, perhaps someone there can help you past the inevitable problems. - Dan -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

1 0

registry TODO
by James Hawkins March 22, 2005

March 22, 2005

Alexandre, Recently you removed the loading of the Windows registry on startup and stated that > Nobody's working on it, so it won't be supported until someone cares > enough to do it. I encouraged a few people to start working on it but > nobody did, so taking out the existing support is a way to provide > more encouragement. If that's not enough then the feature simply won't > be supported anymore. What needs to be done concerning this TODO? Looking through Bugzilla I found bug #422: "Currently Wine loads the complete registry into memory at startup. This is relatively ok when the registry is small such as in fake_windows configurations, but when importing the registry fro a Windows partition this can result in the wineserver allocating more than 30MB. This slows down startup times very significantly and wastes memory even if most of it is going to be swapped out. One of the reasons why Wine puts all the registry into memory on startup is that the current registry file format does not lend itself well to random accesses (especially writes). But there is no fundamental reason why Wine needs to read all the registry on startup. Hence this proposal to: * change the registry file format so that Wine can easily make random accesses. A 'database' format may be appropriate here, maybe based on the Berkeley database Library (libdb2/libdb3) or the GNU dbm library (libgbm1, but check license issues). * put in place a mechanism to update these files from the Windows registry files when appropriate (it seems impractical to access the Windows files directly) * modify the registry routines to retrieve only the data required by the application and cache it in memory" Is this a valid description of what needs to be done? -- James Hawkins

3 2

Regression in file tests
by Jakob Eriksson March 22, 2005

March 22, 2005

Between http://cvs.winehq.org/cvsweb/wine/dlls/kernel/tests/file.c#rev1.46 http://test.winehq.org/data/200502231000/ and http://test.winehq.org/data/200503041000/ http://cvs.winehq.org/cvsweb/wine/dlls/kernel/tests/file.c#rev1.48 we have more about 50 more failed test results. What happened? regards, Jakob

1 1

Re: Eliminate casts of the return value of HeapAlloc
by Francois Gouget March 22, 2005

March 22, 2005

On Mon, 21 Mar 2005, Alexandre Julliard wrote: [...] > Log message: > Mike McCormack <mike(a)codeweavers.com> > Eliminate casts of the return value of HeapAlloc. This could be turned into a pretty easy janitorial the starting point of which would be the output of this command: find . -name "*.[ch]" | xargs egrep "\) *Heap(Re)?Alloc" (344 lines) There are a couple of places where the output of HeapAlloc is being cast to a DWORD but except for those it seems pretty straightforward. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ La terre est une b\xEAta...

3 2

Status and (nearby) future of wined3d
by Paul Vriens March 21, 2005

March 21, 2005

Hi, what will happen to the wined3d stuff, now Oliver has some 'problems' staying on-line? There were at least 4 patches or so he send which were not applied (yet). If the sole reason for that is that it couldn't be merged/applied to CVS I could give it a try. But that's about the only thing I can do regarding wined3d stuff. Cheers, Paul.

1 0

Preview-window works in Virtualdub,Paltalk etc.
by luis lenders March 21, 2005

March 21, 2005

Hi, don't know if it's of much use for anyone, but i can now view the images from my webcam in the preview window in programs like Virtualdub, Paltalk and WebCamnow. Basically the attached "patch" reads a RGB-image from my video4linux device and "turns" this into a bitmap, which is then displayed. The device must be able to "read RGB's". In case you would like to try, replace dlls/avicap32 with the attached one, and replace include/vfw.h with the attached vfw.h. I'm skilled enough to turn this into a real patch, maybe someone with more programming capabilities could give it try. Regards Luis Send instant messages to your online friends http://uk.messenger.yahoo.com

2 1

[shlwapi/tests/shreg.c] Question about ExpandEnvironmentStringsA
by Paul Vriens March 21, 2005

March 21, 2005

Hi, while going through some results on test.winehq.org I've noticed something regarding ExpandEnvironmentStringsA. One of the NT4 tests (I think it's one from Ivan Leo Puoti?) comes back with: shreg.c:97:sExplen1 = (24) shreg.c:99:sExplen2 = (86) while all others (i.e. win98/nt4/w2k/winxp) I've seen so far return: shreg.c:97:sExplen1 = (12) shreg.c:99:sExplen2 = (43) Why is/could the length be doubled in his case? Cheers, Paul.

2 2

Re: RICHEDIT: RTF reader i18n (now with font charset support)
by Phil Krylov March 21, 2005

March 21, 2005

On Mon, 21 Mar 2005 14:40:38 +0300 Vitaly Lipatov <lav(a)etersoft.ru> wrote: > > > Will we do this code in locale independent manner? Why we have > > > ansiCodePage=1252 by default? > > > > It is locale independent. 1252 is the default value used if RTF does not > > specify another codepage (which almost never happens). If I used > > GetACP() here, the same RTF document would be differently imported > > depending on user locale. RTF is not supposed to act like this. If RTF > If I try open RTF where codepage is not specified, guessed codepage must be > the same as ACP. For instance if I get such file here in Russia, I suppose it > in cp1251 codepage. > > > does not specify any codepage it means that it uses CP1252. > I recommend use GetACP, otherwise in will some disadvantage for non cp1252 > users. > > > How do you find this code is locale dependent? IMHO it's _in_dependent of > > locale. > I worry only about default codepage. OK, I've made some tests using the original M$ richedit, and they show the following: \ansicpg keyword in the RTF header does not affect the used encoding when importing RTF. The encoding used for import is determined by \fcharset setting for the "current" font. If it specifies \fcharset1 (DEFAULT_CHARSET) or is omitted, GetACP() is used. If it specifies \fcharset0 (ANSI_CHARSET), CP1252 is used regardless of current locale. For other charsets, their respective codepages are used. I'll commit the required changes to the RTF reader soon. -- Ph.

1 0

Re: [ntdll] NtCreateFile update
by Jonathan Wilson March 21, 2005

March 21, 2005

Does anyone have any links to these "documented only because Microsoft have to" type functions (like NtCreateFile etc)?

3 3

Re: Four questions to dll/iphlpapi/* wrt lstrcpyA.
by Juan Lang March 20, 2005

March 20, 2005

Hi Peter, there's nothing magical in here, your understanding is correct. I'll answer each question individually though. > 1) I am wondering, why sizeof(ptr->Adaptername) is used instead of > MAX_ADAPTER_NAME_LENGTH+1? That's just a style thing. I prefer sizeof(thing being copied) to MAGIC_CONSTANT in case the structure being used changes. That's unlikely in this case since the structure is defined in a public header. Since it's a style thing there's no code-behavior reason to keep it this way. > 2) Is 2a supposed to be saying 15 Yes, that's just a stupid bug apparently. Why I didn't use sizeof is beyond me. > 3) Why suddenly the change to use memcpy? and not some strcpy > function as the code above it? I wrote this on a different day :) --Juan __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

2 1

Re: DDRAW: Surface locking patch, take 2
by Christian Costa March 20, 2005

March 20, 2005

Hi Matthew, This seems fine. There are some comments though, see below. >Index: dlls/ddraw/dsurface/dib.c >=================================================================== >RCS file: /home/wine/wine/dlls/ddraw/dsurface/dib.c,v >retrieving revision 1.46 >diff -u -r1.46 dib.c >--- dlls/ddraw/dsurface/dib.c 10 Mar 2005 11:13:11 -0000 1.46 >+++ dlls/ddraw/dsurface/dib.c 20 Mar 2005 16:49:40 -0000 >@@ -528,9 +528,15 @@ > DD_STRUCT_INIT(&sdesc); > > sdesc.dwSize = sizeof(sdesc); >- if (src) IDirectDrawSurface7_Lock(src, NULL, &sdesc, DDLOCK_READONLY, 0); > ddesc.dwSize = sizeof(ddesc); >- IDirectDrawSurface7_Lock(iface,NULL,&ddesc,DDLOCK_WRITEONLY,0); >+ >+ if (src == iface) { >+ IDirectDrawSurface7_Lock(iface, NULL, &ddesc, 0, 0); >+ DD_STRUCT_COPY_BYSIZE(&sdesc, &ddesc); >+ } else { >+ if (src) IDirectDrawSurface7_Lock(src, NULL, &sdesc, DDLOCK_READONLY, 0); >+ IDirectDrawSurface7_Lock(iface,NULL,&ddesc,DDLOCK_WRITEONLY,0); >+ } > > if ((sdesc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC) && > (ddesc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC)) { >@@ -581,7 +587,8 @@ > (xsrc.right > sdesc.dwWidth) || (xsrc.right < 0) || > (xsrc.right < xsrc.left) || (xsrc.bottom < xsrc.top))) { > WARN("Application gave us bad source rectangle for Blt.\n"); >- return DDERR_INVALIDRECT; >+ ret = DDERR_INVALIDRECT; >+ goto release; > } > /* For the Destination rect, it can be out of bounds on the condition that a clipper > is set for the given surface. >@@ -593,7 +600,8 @@ > (xdst.right > ddesc.dwWidth) || (xdst.right < 0) || > (xdst.right < xdst.left) || (xdst.bottom < xdst.top))) { > WARN("Application gave us bad destination rectangle for Blt without a clipper set.\n"); >- return DDERR_INVALIDRECT; >+ ret = DDERR_INVALIDRECT; >+ goto release; > } > > /* Now handle negative values in the rectangles. Warning: only supported for now >@@ -958,7 +966,7 @@ > > release: > IDirectDrawSurface7_Unlock(iface,NULL); >- if (src) IDirectDrawSurface7_Unlock(src,NULL); >+ if (src && src != iface) IDirectDrawSurface7_Unlock(src,NULL); > return DD_OK; > } > >@@ -975,7 +983,7 @@ > HRESULT ret = DD_OK; > LPBYTE sbuf, dbuf; > RECT rsrc2; >- RECT lock_src, lock_dst; >+ RECT lock_src, lock_dst, lock_union; > > if (TRACE_ON(ddraw)) { > TRACE("(%p)->(%ld,%ld,%p,%p,%08lx)\n", >@@ -1043,11 +1051,28 @@ > lock_dst.right = dstx + w; > lock_dst.bottom = dsty + h; > >+ bpp = GET_BPP(This->surface_desc); >+ > /* We need to lock the surfaces, or we won't get refreshes when done. */ >- sdesc.dwSize = sizeof(sdesc); >- IDirectDrawSurface7_Lock(src, &lock_src, &sdesc, DDLOCK_READONLY, 0); >- ddesc.dwSize = sizeof(ddesc); >- IDirectDrawSurface7_Lock(iface, &lock_dst, &ddesc, DDLOCK_WRITEONLY, 0); >+ if (src == iface) { >+ int pitch; >+ >+ UnionRect(&lock_union, &lock_src, &lock_dst); >+ >+ /* Lock the union of the two rectangles */ >+ IDirectDrawSurface7_Lock(iface, &lock_union, &ddesc, 0, 0); >+ >+ pitch = This->surface_desc.u1.lPitch; >+ > ddesc has not been properly initialized. you should also copy sdesc from ddesc. >+ /* Since sdesc was originally copied from this surface's description, we can just reuse it */ >+ sdesc.lpSurface = (BYTE *)This->surface_desc.lpSurface + lock_src.top * pitch + lock_src.left * bpp; >+ ddesc.lpSurface = (BYTE *)This->surface_desc.lpSurface + lock_dst.top * pitch + lock_dst.left * bpp; >+ } else { >+ sdesc.dwSize = sizeof(sdesc); >+ IDirectDrawSurface7_Lock(src, &lock_src, &sdesc, DDLOCK_READONLY, 0); >+ ddesc.dwSize = sizeof(ddesc); >+ IDirectDrawSurface7_Lock(iface, &lock_dst, &ddesc, DDLOCK_WRITEONLY, 0); >+ } > > /* Handle first the FOURCC surfaces... */ > if ((sdesc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC) && (ddesc.u4.ddpfPixelFormat.dwFlags & DDPF_FOURCC)) { >@@ -1069,7 +1094,6 @@ > goto error; > } > >- bpp = GET_BPP(This->surface_desc); > sbuf = (BYTE *) sdesc.lpSurface; > dbuf = (BYTE *) ddesc.lpSurface; > >@@ -1141,8 +1165,13 @@ > } > > error: >- IDirectDrawSurface7_Unlock(iface, &lock_dst); >- IDirectDrawSurface7_Unlock(src, &lock_src); >+ if (src == iface) { >+ IDirectDrawSurface7_Unlock(iface, &lock_union); >+ } else { >+ IDirectDrawSurface7_Unlock(iface, &lock_dst); >+ IDirectDrawSurface7_Unlock(src, &lock_src); > You should check if src != NULL before trying to unlocking it. >+ } >+ > return ret; > } > > >

2 2

Re: [WINEALSA] fix direct sound capabilities to match HW
by Robert Reif March 20, 2005

March 20, 2005

Robert Reif wrote: > Fix direct sound capabilities to match hardware. > > Should fix problems related to trying to do 8 bit and mono on > 16 bit stereo only hardware when using ALSA hw device and > direct sound hardware acceleration. > > > This one should work. Index: dlls/winmm/winealsa/audio.c =================================================================== RCS file: /home/wine/wine/dlls/winmm/winealsa/audio.c,v retrieving revision 1.67 diff -u -p -r1.67 audio.c --- dlls/winmm/winealsa/audio.c 19 Mar 2005 17:11:02 -0000 1.67 +++ dlls/winmm/winealsa/audio.c 20 Mar 2005 20:51:41 -0000 @@ -189,6 +189,7 @@ typedef struct { /* DirectSound stuff */ DSDRIVERDESC ds_desc; + DSDRIVERCAPS ds_caps; } WINE_WAVEOUT; typedef struct { @@ -231,6 +232,7 @@ typedef struct { /* DirectSound stuff */ DSDRIVERDESC ds_desc; + DSCDRIVERCAPS ds_caps; } WINE_WAVEIN; static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; @@ -817,6 +819,38 @@ LONG ALSA_WaveInit(void) wwo->caps.dwSupport |= WAVECAPS_LRVOLUME; } + if (wwo->caps.dwFormats & (WAVE_FORMAT_1M08 | WAVE_FORMAT_2M08 | + WAVE_FORMAT_4M08 | WAVE_FORMAT_48M08 | + WAVE_FORMAT_96M08 | WAVE_FORMAT_1M16 | + WAVE_FORMAT_2M16 | WAVE_FORMAT_4M16 | + WAVE_FORMAT_48M16 | WAVE_FORMAT_96M16) ) + wwo->ds_caps.dwFlags |= DSCAPS_PRIMARYMONO; + + if (wwo->caps.dwFormats & (WAVE_FORMAT_1S08 | WAVE_FORMAT_2S08 | + WAVE_FORMAT_4S08 | WAVE_FORMAT_48S08 | + WAVE_FORMAT_96S08 | WAVE_FORMAT_1S16 | + WAVE_FORMAT_2S16 | WAVE_FORMAT_4S16 | + WAVE_FORMAT_48S16 | WAVE_FORMAT_96S16) ) + wwo->ds_caps.dwFlags |= DSCAPS_PRIMARYSTEREO; + + if (wwo->caps.dwFormats & (WAVE_FORMAT_1M08 | WAVE_FORMAT_2M08 | + WAVE_FORMAT_4M08 | WAVE_FORMAT_48M08 | + WAVE_FORMAT_96M08 | WAVE_FORMAT_1S08 | + WAVE_FORMAT_2S08 | WAVE_FORMAT_4S08 | + WAVE_FORMAT_48S08 | WAVE_FORMAT_96S08) ) + wwo->ds_caps.dwFlags |= DSCAPS_PRIMARY8BIT; + + if (wwo->caps.dwFormats & (WAVE_FORMAT_1M16 | WAVE_FORMAT_2M16 | + WAVE_FORMAT_4M16 | WAVE_FORMAT_48M16 | + WAVE_FORMAT_96M16 | WAVE_FORMAT_1S16 | + WAVE_FORMAT_2S16 | WAVE_FORMAT_4S16 | + WAVE_FORMAT_48S16 | WAVE_FORMAT_96S16) ) + wwo->ds_caps.dwFlags |= DSCAPS_PRIMARY16BIT; + + wwo->ds_caps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; + wwo->ds_caps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; + wwo->ds_caps.dwPrimaryBuffers = 1; + ALSA_WodNumDevs++; } @@ -933,7 +967,7 @@ LONG ALSA_WaveInit(void) ALSA_WidNumDevs++; } - + return 0; } @@ -2013,7 +2047,7 @@ static DWORD wodGetVolume(WORD wDevID, L if (!wwo->ctl) return MMSYSERR_NOTSUPPORTED; - + count = snd_ctl_elem_info_get_count(wwo->playback_einfo); min = snd_ctl_elem_info_get_min(wwo->playback_einfo); max = snd_ctl_elem_info_get_max(wwo->playback_einfo); @@ -2612,25 +2646,7 @@ static HRESULT WINAPI IDsDriverImpl_GetC { IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pCaps); - memset(pCaps, 0, sizeof(*pCaps)); - - pCaps->dwFlags = DSCAPS_PRIMARYMONO; - if ( WOutDev[This->wDevID].caps.wChannels == 2 ) - pCaps->dwFlags |= DSCAPS_PRIMARYSTEREO; - - if ( WOutDev[This->wDevID].caps.dwFormats & (WAVE_FORMAT_1S08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_4S08 ) ) - pCaps->dwFlags |= DSCAPS_PRIMARY8BIT; - - if ( WOutDev[This->wDevID].caps.dwFormats & (WAVE_FORMAT_1S16 | WAVE_FORMAT_2S16 | WAVE_FORMAT_4S16)) - pCaps->dwFlags |= DSCAPS_PRIMARY16BIT; - - pCaps->dwPrimaryBuffers = 1; - TRACE("caps=0x%X\n",(unsigned int)pCaps->dwFlags); - pCaps->dwMinSecondarySampleRate = DSBFREQUENCY_MIN; - pCaps->dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; - - /* the other fields only apply to secondary buffers, which we don't support - * (unless we want to mess with wavetable synthesizers and MIDI) */ + memcpy(pCaps, &(WOutDev[This->wDevID].ds_caps), sizeof(DSDRIVERCAPS)); return DS_OK; }

1 0

Re: ddraw correctness fixes patch
by Christian Costa March 20, 2005

March 20, 2005

> Message du 18/03/05 13:49 > De : "Christian Costa" > A : "Tom Wickline" , "wine-devel" > Copie à : > Objet : Re: ddraw correctness fixes patch > > > > Message du 18/03/05 06:44 > > De : "Tom Wickline" > > A : "wine-devel" > > Copie à : > > Objet : ddraw correctness fixes patch > > > > anyone know why this patch hasn't been accepted? > > > > http://www.winehq.org/hypermail/wine-patches/2005/03/0328.html > > > > Tom > > > > Hi Tom, > > Sorry I missed the patch on wine-patches but I do remember an old version sent to wine-devel. > > So let's review it. :-) > > The new locking mechanism is wrong. > DDLOCK_xxx are just used for optimization. > > The thing to do during the blit should be something like that : > > sdesc.dwSize = sizeof(sdesc); > ddesc.dwSize = sizeof(ddesc); > if (src == NULL) > IDirectDrawSurface7_Lock(iface, &lock_dst, &ddesc, DDLOCK_WRITEONLY, 0); > else if (src == iface) { > RECT lock_union = < rect that just contains lock_dst and lock_src >; > IDirectDrawSurface7_Lock(iface, &lock_union, &ddesc, 0, 0); > sdesc = ddesc; I think here that sdesc and ddesc surface pointers should be remapped according to lock_src and lock_dest. > } else { > IDirectDrawSurface7_Lock(src, &lock_src, &sdesc, DDLOCK_READONLY, 0); > IDirectDrawSurface7_Lock(iface, &lock_dst, &ddesc, DDLOCK_WRITEONLY, 0); > } > > and the previous locking code should be used. > > The added DD_STRUCT_INIT are useless. > > Hope that helps. > > Bye, > Christian > > > > > >

3 4

ntdll / kernel32: #53
by Eric Pouech March 20, 2005

March 20, 2005

This patch starts looking at providing full overlapped I/O support to named pipes. We're not here yet. It basically starts making the wineserver side of the named pipe code: - use NT values instead of kernel32 - make use of asynchronous I/O The rest of the patch is mainly cleanup. It should be a no op change. A+ -- Eric Pouech

1 0

Re: winmm patch
by Dimitrie O. Paun March 20, 2005

March 20, 2005

On Sat, Mar 19, 2005 at 07:46:01PM -0600, Royce Mitchell III wrote: > Royce Mitchell III <royce3(a)ev1.net> > - fix warning that is really a bug - from looking at the code, wDevID > should be a UINT, not a UINT_16 ( perhaps these should be renamed? ) Please: 1. Send a diff -u (http://winehq.org/site/sending_patches) 2. Don't compress your submissions. -- Dimi.

1 0

Re: Correct calling conventions
by Marcus Meissner March 20, 2005

March 20, 2005

On Sat, Mar 19, 2005 at 08:30:44PM -0500, Vincent Béron wrote: > Changelog: > Use the correct calling convention in various places. The problem here is too, that these functions do not have prototypes in the correct headers, otherwise gcc would have already warned about them. Ciao, Marcus

2 1

winmm problems
by Robert Lunnon March 20, 2005

March 20, 2005

I am having some problems with the latest wine under Solaris and a small test game I use, (Little Fighter 2) , if I enable audio support the application seems to deadlock but without audio it runs OK. It doesn't matter what audio driver I select (libaudioio or arts). Since February, what changes have been made to the audio framework that might cause this behaviour? Bob

1 0

Four questions to dll/iphlpapi/* wrt lstrcpyA.
by Peter Berg Larsen March 20, 2005

March 20, 2005

Hi, I was looking at the Janitorial project of replacing strncpy with lstrcpyn{A,W}. I found the following code in iphlpapi a little strange. (Well, only question number 2, but then could as well ask about the 2 others.) I have marked where in the code the question belongs to with the question numbers. 1) I am wondering, why sizeof(ptr->Adaptername) is used instead of MAX_ADAPTER_NAME_LENGTH+1? Is there something special coded in the 3 last bytes, since they are hidden by the = '\0' the line below? if not then this be replaced with lstrcpyn(... , MAX_ADAPTER_NAME_LENGTH+1)? 2) Is 2a supposed to be saying 15 or is there someting about IpMask and Context that must be zero, when setting IpAddress, and IpMask? 3) Why suddenly the change to use memcpy? and not some strcpy function as the code above it? Peter typedef struct { char String[4 * 4]; } IP_ADDRESS_STRING, IP_MASK_STRING, ...; typedef struct _IP_ADDR_STRING { struct _IP_ADDR_STRING* Next; IP_ADDRESS_STRING IpAddress; IP_MASK_STRING IpMask; DWORD Context; } IP_ADDR_STRING, *PIP_ADDR_STRING; typedef struct _IP_ADAPTER_INFO { ... char AdapterName[MAX_ADAPTER_NAME_LENGTH + 4]; char Description[MAX_ADAPTER_DESCRIPTION_LENGTH + 4]; BYTE Address[MAX_ADAPTER_ADDRESS_LENGTH]; IP_ADDR_STRING IpAddressList; ... IP_ADDR_STRING PrimaryWinsServer; IP_ADDR_STRING SecondaryWinsServer; } IP_ADAPTER_INFO, *PIP_ADAPTER_INFO; ipenum.c: 936 char *toIPAddressString(unsigned int addr, char string[16]) { if (string) { struct in_addr iAddr; iAddr.s_addr = addr; /* extra-anal, just to make auditors happy */ strncpy(string, inet_ntoa(iAddr), 16); string[16] = '\0'; **** 2a **** } return string; } iphlpapi_main.c: 584 DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) { ... PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx]; ... 1) /* on Win98 this is left empty, but whatever */ strncpy(ptr->AdapterName, getInterfaceNameByIndex(table->indexes[ndx]), sizeof(ptr->AdapterName)); ptr->AdapterName[MAX_ADAPTER_NAME_LENGTH] = '\0'; ... 2) toIPAddressString(getInterfaceIPAddrByIndex(table->indexes[ndx]), ptr->IpAddressList.IpAddress.String); toIPAddressString(getInterfaceMaskByIndex(table->indexes[ndx]), ptr->IpAddressList.IpMask.String); ... 3) memcpy(ptr->PrimaryWinsServer.IpAddress.String, primaryWINS.String, sizeof(primaryWINS.String)); memcpy(ptr->SecondaryWinsServer.IpAddress.String, secondaryWINS.String, sizeof(secondaryWINS.String)); ... }

1 0

kde plugin
by Oliver Stieber March 20, 2005

March 20, 2005

Hi, I've got a plugin for KDE that displays icons and thumbnails for windows applications and dlls in Konqueror. I was intending to extend it to meta info and maybe a full kioslave for browsing windows PE files, but never got that far. At the moment it's a bit of a licensing nightmare, but I can package it up in a format that's ok for QT and Wine if anyone's interested. Oliver. Send instant messages to your online friends http://uk.messenger.yahoo.com

2 3

Re: Theming for Wine via the registry
by Oliver Stieber March 19, 2005

March 19, 2005

--- Mike Hearn <mike(a)navi.cx> wrote: > On Sat, 2005-03-12 at 21:00 +0000, Oliver Stieber > wrote: > > > > > > Ah, that's different. That'd actually require > using > > > Gtk/Qt which we cannot > > > do, the best we can get is to look like them. > > > > > What's the problem, licensing, integration or > > thread-safety (I know QT isn't thread safe) > > Well all those *could* be problems, but the real > problem is that the > Windows widget toolkit and GTK/Qt are too different, > you can't map > between them. The only problem I can see would be drawing the widgets, I haven't looked deeply enough into QT or GTK to know if it's more on the 'impossible' side of difficult or not. Wrapping the event loop and passing events should be relatively easy. > > I may have a look at that too, it would be useful > if > > QT/GTK could use some of the existing Windows > > accessibility software. > > No, that's not what I meant. Implementing OLE > accessibility would mean > that Win32 apps on Wine appear to in native tools > like at-poke. It > wouldn't mean you could use win32 accessibility > software to access > native apps. > That doesn't sound too hard, I don't know how well defined Gnome and QT's accessibility interfaces are but I think QT's coming along quite well it would be nice is everything got Dbused though. Send instant messages to your online friends http://uk.messenger.yahoo.com

4 3