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

Re: D3D7 -> WineD3D, 2nd attempt

by Stefan Dösinger

An update to the drawStridedSlow thing: With my a little bit less senseless ProcessVertices implementation, the framerate increased from 1.5 fps to 4.5 fps(CPU0(a)600 Mhz) and from 2 fps to 6 fps (CPU0(a)1400 mhz). So I guess it's the garbage I am sending to drawPrimitives that makes it so slow.

Oct. 30, 2005

Re: DirectSound problems - dlls/dsound/mixer.c

by Stefan Dösinger

Hello, > Here is the patch. And here are my test results: * Half-Life: It works with alsa+standard hardware acceleration(yeah!). Navigating the menus is much faster(great!), it's the same speed as on windows. I didn't expect the sound output as the reason for the slowlyness. * Counterstrike: Alsa still doesn't work(as before), I have to fall back to OSS(which doesn't have acceleration because it's only emulated by alsa). No change here. This is strange, because CS is only a HL mod. * Jedi Knight Jedi Academy: Works nicely with alsa(don't know if it did before), still has a 0.5 secound sound lag with acceleration(as it did before) * Battlefield 1942: Difficult to explain: The old situation was that the sound started playing when the game starts, but if short sounds(shooting, clicking buttons) are played, fragments of the sounds remain in the sound queue and form a louder and louder background noise. This makes the sound unuseable. Additionally, activating the sound output in winecfg has a very negative impact on the speed. New: No sound without acceleration, but also no speed impact(so an improvement). The old sound situation with standard acceleration, speed is still good. I haven't found any regression, as long as the "no sound without acceleration" in BF1942 isn't considered an regression. Continue the good work ;-) Stefan PS: I haven't done any sound specific tests lately, so some changes I report might be caused by other patches(If there were any) Stefan

Oct. 30, 2005

Re: DirectSound problems - dlls/dsound/mixer.c

by Stefan Dösinger

Am Sonntag, 30. Oktober 2005 14:23 schrieb Davin McCall: > Good news - I have got it working. It required work in both the mixer and > the Wine ALSA sound driver. It works on my system if the ALSA driver is > used and hw emulation is NOT used (in winecfg). > > If anyone would like to test patches, give me a hoy. In particular I'd like > to make sure it doesn't break anything else - StarCraft is one of the few > Windows apps I actually have :-) Can you send me the patch / upload it somewhere? I can test it with a few games and tell you if everything works as it should. stefan

Oct. 30, 2005

Re: DirectSound problems - dlls/dsound/mixer.c

by Randall Walls

COMMENTS!!!!!! Wonderful, beautiful, glorious, HELPFUL comments. Good show, mate. I'll test it on a few games later today and report back. I think this may also fix the 'length is not a factor of blocksize' error that I was trying to tackle a while back. Randall Walls Davin McCall wrote: >Trying again as an inline attachment. > >Davin > > >On Sun, 30 Oct 2005 15:31:15 +0100 >Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > > > >>Am Sonntag, 30. Oktober 2005 14:23 schrieb Davin McCall: >> >> >>>Good news - I have got it working. It required work in both the mixer and >>>the Wine ALSA sound driver. It works on my system if the ALSA driver is >>>used and hw emulation is NOT used (in winecfg). >>> >>>If anyone would like to test patches, give me a hoy. In particular I'd like >>>to make sure it doesn't break anything else - StarCraft is one of the few >>>Windows apps I actually have :-) >>> >>> >>Can you send me the patch / upload it somewhere? I can test it with a few >>games and tell you if everything works as it should. >> >>stefan >> >> >>------------------------------------------------------------------------ >> >> >> >>

Oct. 30, 2005

Re: The Holy Grail - Wine 0.9 - thanks to all

by Christian Costa

H. Verbeet wrote: >On 10/30/05, Christian Costa <titan.costa(a)wanadoo.fr> wrote: > > >>IIRC, a patch fixing this problem was commited about 2 or 3 months ago. >> >> >This one? http://cvs.winehq.org/patch.py?id=18002 > >It doesn't touch CreateLight. The crash happens because of this check >in GL_IDirect3DImpl_3_2T_1T_CreateLight: > > if (fl == MAX_LIGHTS) { > return DDERR_INVALIDPARAMS; /* No way to say 'max lights reached' ... */ > } > >The application is sloppy for not checking the result of course, but >on Windows the call never fails, at least not for creating more lights >than the hardware supports. > Could you try this patch ? ? dlls/ddraw/.d3d_private.h.swp ? dlls/ddraw/.device_opengl.c.swp ? dlls/ddraw/.direct3d_opengl.c.swo ? dlls/ddraw/.direct3d_opengl.c.swp ? dlls/ddraw/.light.c.swp ? dlls/ddraw/.opengl_private.h.swp ? dlls/ddraw/device_opengl.c.fog ? dlls/ddraw/device_opengl.c.work ? dlls/ddraw/lights.diff ? dlls/ddraw/t.txt Index: dlls/ddraw/direct3d_opengl.c =================================================================== RCS file: /home/wine/wine/dlls/ddraw/direct3d_opengl.c,v retrieving revision 1.2 diff -u -r1.2 direct3d_opengl.c --- dlls/ddraw/direct3d_opengl.c 26 Jul 2005 20:10:51 -0000 1.2 +++ dlls/ddraw/direct3d_opengl.c 30 Oct 2005 12:10:01 -0000 @@ -98,23 +98,31 @@ { ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface); IDirect3DGLImpl *glThis = (IDirect3DGLImpl *) This->d3d_private; - int fl; + DWORD light_index; IDirect3DLightImpl *d3dlimpl; HRESULT ret_value; TRACE("(%p/%p)->(%p,%p)\n", This, iface, lplpDirect3DLight, pUnkOuter); - for (fl = 0; fl < MAX_LIGHTS; fl++) { - if ((glThis->free_lights & (0x01 << fl)) != 0) { - glThis->free_lights &= ~(0x01 << fl); + for (light_index = 0; light_index < glThis->max_lights; light_index++) { + if (!glThis->used_lights[light_index]) break; - } } - if (fl == MAX_LIGHTS) { - return DDERR_INVALIDPARAMS; /* No way to say 'max lights reached' ... */ + if (light_index == glThis->max_lights) { + int new_max_lights = glThis->max_lights ? 2 * glThis->max_lights : 1; + BOOL *new_used_lights = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_max_lights * sizeof(BOOL)); + if (!new_used_lights) + return E_OUTOFMEMORY; + CopyMemory(new_used_lights, glThis->used_lights, glThis->max_lights); + HeapFree(GetProcessHeap(), 0, glThis->used_lights); + glThis->max_lights = new_max_lights; + glThis->used_lights = new_used_lights; } - ret_value = d3dlight_create(&d3dlimpl, This, GL_LIGHT0 + fl); + ret_value = d3dlight_create(&d3dlimpl, This, light_index); *lplpDirect3DLight = ICOM_INTERFACE(d3dlimpl, IDirect3DLight); + if (ret_value == D3D_OK) + glThis->used_lights[light_index] = TRUE; + return ret_value; } @@ -306,10 +314,10 @@ return res; } -static void light_released(IDirectDrawImpl *This, GLenum light_num) +static void light_released(IDirectDrawImpl *This, DWORD light_index) { IDirect3DGLImpl *glThis = (IDirect3DGLImpl *) This->d3d_private; - glThis->free_lights |= (light_num - GL_LIGHT0); + glThis->used_lights[light_index] = FALSE; } #if !defined(__STRICT_ANSI__) && defined(__GNUC__) @@ -453,7 +461,6 @@ ICOM_INIT_INTERFACE(This, IDirect3D3, VTABLE_IDirect3D3); ICOM_INIT_INTERFACE(This, IDirect3D7, VTABLE_IDirect3D7); - globject->free_lights = (0x01 << MAX_LIGHTS) - 1; /* There are, in total, 8 lights in OpenGL */ globject->light_released = light_released; This->d3d_private = globject; Index: dlls/ddraw/light.c =================================================================== RCS file: /home/wine/wine/dlls/ddraw/light.c,v retrieving revision 1.2 diff -u -r1.2 light.c --- dlls/ddraw/light.c 26 Jul 2005 20:10:51 -0000 1.2 +++ dlls/ddraw/light.c 30 Oct 2005 12:10:01 -0000 @@ -158,39 +158,43 @@ static void update(IDirect3DLightImpl* This) { IDirect3DDeviceImpl* device; - if (!This->active_viewport||!This->active_viewport->active_device) + if (!This->active_viewport || !This->active_viewport->active_device) return; device = This->active_viewport->active_device; - IDirect3DDevice7_SetLight(ICOM_INTERFACE(device,IDirect3DDevice7),This->dwLightIndex,&(This->light7)); + IDirect3DDevice7_SetLight(ICOM_INTERFACE(device,IDirect3DDevice7), This->dwLightIndex, &(This->light7)); } static void activate(IDirect3DLightImpl* This) { IDirect3DLightGLImpl *glThis = (IDirect3DLightGLImpl *) This; + IDirect3DDeviceImpl* device; + if (!This->active_viewport || !This->active_viewport->active_device) + return; + device = This->active_viewport->active_device; TRACE("(%p)\n", This); - ENTER_GL(); update(This); /* If was not active, activate it */ if ((glThis->parent.light.dwFlags & D3DLIGHT_ACTIVE) == 0) { - glEnable(glThis->light_num); + IDirect3DDevice7_LightEnable(ICOM_INTERFACE(device,IDirect3DDevice7), glThis->light_index, TRUE); glThis->parent.light.dwFlags |= D3DLIGHT_ACTIVE; } - LEAVE_GL(); } static void desactivate(IDirect3DLightImpl* This) { IDirect3DLightGLImpl *glThis = (IDirect3DLightGLImpl *) This; - + IDirect3DDeviceImpl* device; + if (!This->active_viewport || !This->active_viewport->active_device) + return; + device = This->active_viewport->active_device; + TRACE("(%p)\n", This); - ENTER_GL(); /* If was not active, activate it */ if ((glThis->parent.light.dwFlags & D3DLIGHT_ACTIVE) != 0) { - glDisable(glThis->light_num); + IDirect3DDevice7_LightEnable(ICOM_INTERFACE(device,IDirect3DDevice7), glThis->light_index, FALSE); glThis->parent.light.dwFlags &= ~D3DLIGHT_ACTIVE; } - LEAVE_GL(); } ULONG WINAPI @@ -203,7 +207,7 @@ TRACE("(%p/%p)->() decrementing from %lu.\n", This, iface, ref + 1); if (!ref) { - ((IDirect3DGLImpl *) This->d3d->d3d_private)->light_released(This->d3d, glThis->light_num); + ((IDirect3DGLImpl *) This->d3d->d3d_private)->light_released(This->d3d, glThis->light_index); HeapFree(GetProcessHeap(), 0, This); return 0; } @@ -233,7 +237,7 @@ -HRESULT d3dlight_create(IDirect3DLightImpl **obj, IDirectDrawImpl *d3d, GLenum light_num) +HRESULT d3dlight_create(IDirect3DLightImpl **obj, IDirectDrawImpl *d3d, DWORD light_index) { IDirect3DLightImpl *object; IDirect3DLightGLImpl *gl_object; @@ -249,7 +253,7 @@ object->desactivate = desactivate; object->update = update; object->active_viewport = NULL; - gl_object->light_num = light_num; + gl_object->light_index = light_index; ICOM_INIT_INTERFACE(object, IDirect3DLight, VTABLE_IDirect3DLight); Index: dlls/ddraw/opengl_private.h =================================================================== RCS file: /home/wine/wine/dlls/ddraw/opengl_private.h,v retrieving revision 1.2 diff -u -r1.2 opengl_private.h --- dlls/ddraw/opengl_private.h 12 Jun 2005 10:43:11 -0000 1.2 +++ dlls/ddraw/opengl_private.h 30 Oct 2005 12:10:02 -0000 @@ -48,14 +48,15 @@ /* This structure is used for the 'd3d_private' field of the IDirectDraw structure */ typedef struct IDirect3DGLImpl { - DWORD free_lights; - void (*light_released)(IDirectDrawImpl *, GLenum light_num); + BOOL *used_lights; + int max_lights; + void (*light_released)(IDirectDrawImpl *, DWORD light_index); } IDirect3DGLImpl; typedef struct IDirect3DLightGLImpl { struct IDirect3DLightImpl parent; - GLenum light_num; + DWORD light_index; } IDirect3DLightGLImpl; /* This structure is used for the 'private' field of the IDirectDrawSurfaceImpl structure */ @@ -185,7 +186,7 @@ /* All non-static functions 'exported' by various sub-objects */ extern HRESULT direct3d_create(IDirectDrawImpl *This); extern HRESULT d3dtexture_create(IDirectDrawImpl *d3d, IDirectDrawSurfaceImpl *surf, BOOLEAN at_creation, IDirectDrawSurfaceImpl *main_surf); -extern HRESULT d3dlight_create(IDirect3DLightImpl **obj, IDirectDrawImpl *d3d, GLenum light_num); +extern HRESULT d3dlight_create(IDirect3DLightImpl **obj, IDirectDrawImpl *d3d, DWORD light_index); extern HRESULT d3dexecutebuffer_create(IDirect3DExecuteBufferImpl **obj, IDirectDrawImpl *d3d, IDirect3DDeviceImpl *d3ddev, LPD3DEXECUTEBUFFERDESC lpDesc); extern HRESULT d3dmaterial_create(IDirect3DMaterialImpl **obj, IDirectDrawImpl *d3d); extern HRESULT d3dviewport_create(IDirect3DViewportImpl **obj, IDirectDrawImpl *d3d);

Oct. 30, 2005

Re: wine/programs/winecfg appdefaults.c

by Mike Hearn

On Fri, 28 Oct 2005 04:38:11 -0500, Alexandre Julliard wrote: > Log message: > Vitaliy Margolen <wine-patch(a)kievinfo.com> Define OS environment variable > on WinNT versions Shouldn't this be done by the startup code? I don't see any reason why we need to duplicate this information into the registry where it can get out of sync etc, rather than just having it as part of the initial environmental setup. thanks -mike

Oct. 30, 2005

Re: DirectSound problems - dlls/dsound/mixer.c

by Davin McCall

Trying again as an inline attachment. Davin On Sun, 30 Oct 2005 15:31:15 +0100 Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Am Sonntag, 30. Oktober 2005 14:23 schrieb Davin McCall: > > Good news - I have got it working. It required work in both the mixer and > > the Wine ALSA sound driver. It works on my system if the ALSA driver is > > used and hw emulation is NOT used (in winecfg). > > > > If anyone would like to test patches, give me a hoy. In particular I'd like > > to make sure it doesn't break anything else - StarCraft is one of the few > > Windows apps I actually have :-) > Can you send me the patch / upload it somewhere? I can test it with a few > games and tell you if everything works as it should. > > stefan

Oct. 30, 2005

Re: DirectSound problems - dlls/dsound/mixer.c

by Davin McCall

Here is the patch. Davin On Sun, 30 Oct 2005 15:31:15 +0100 Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Am Sonntag, 30. Oktober 2005 14:23 schrieb Davin McCall: > > Good news - I have got it working. It required work in both the mixer and > > the Wine ALSA sound driver. It works on my system if the ALSA driver is > > used and hw emulation is NOT used (in winecfg). > > > > If anyone would like to test patches, give me a hoy. In particular I'd like > > to make sure it doesn't break anything else - StarCraft is one of the few > > Windows apps I actually have :-) > Can you send me the patch / upload it somewhere? I can test it with a few > games and tell you if everything works as it should. > > stefan

Oct. 30, 2005

Re: DirectSound problems - dlls/dsound/mixer.c

by Davin McCall

Good news - I have got it working. It required work in both the mixer and the Wine ALSA sound driver. It works on my system if the ALSA driver is used and hw emulation is NOT used (in winecfg). If anyone would like to test patches, give me a hoy. In particular I'd like to make sure it doesn't break anything else - StarCraft is one of the few Windows apps I actually have :-) Davin On Fri, 28 Oct 2005 18:24:36 +1000 Davin McCall <davmac(a)davmac.org> wrote: > Hi, > > I'm trying to sort out sound problems with StarCraft and have made some progress by hacking around with the "dlls/dsound/mixer.c" file. I'm new to Wine hacking however, and there's some things in the code which I don't understand (and others which seem blatantly wrong). > > Hopefully someone can help me with these questions: > > 1) In DSOUND_PerformMix(), two values inq and maxq are calculated which seem to represent the amount of already-mixed (prebuffered) data in the primary buffer and the maximum amount that should be prebuffered. See lines 1001 - 1012. > > Then the comparison "inq > maxq" is made to detect whether all buffered data has been played, and if so the sound is stopped by calling DSOUND_PrimaryStop. However, inq is based on the *writepos* value which is the play position plus a safety margin (latency) - see line 972. > > So, sound is stopped before the play position actually reaches the end of the buffered audio. This seems wrong. Can anyone tell me if this is correct (and if so why) or if it really is wrong. > > > 2) (same function) on line 1048, after using DSOUND_PrimaryStop(), the playpos is retrieved by making a driver call. The comment says that DSOUND_PrimaryStop() is supposed to reset playpos to 0, but OSS cannot do this and that is why IDsDriverBuffer_GetPosition() is called. However, with ALSA, the driver returns the last played position, even though when the sound is restarted (ie. when DSOUND_PrimaryPlay is called) the position does go back to 0. The result is that playpos is wrong in the meantime. If a sound buffer is added to the queue it gets mixed at the wrong position. > > So, should the ALSA driver return 0 for IDsDriverBuffer_GetPosition() or is it simply wrong to use that function to retrieve play position after stopping the device? (and if so, is there a better solution)? > > > 3) Was whoever wrote this code allergic to comments? :-) > > > I'd appreciate any help I can get. > > Davin > >

Oct. 30, 2005

Re: The Holy Grail - Wine 0.9 - thanks to all

by H. Verbeet

On 10/30/05, Christian Costa <titan.costa(a)wanadoo.fr> wrote: > Could you try this patch ? Seems to work, at the very least the application doesn't crash right after loading anymore, and at first sight the lighting doesn't seem off.

Oct. 30, 2005