- Wine-Devel - list.winehq.org

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 21, 2005

March 21, 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