- Wine-Devel - list.winehq.org

Re: alsa: device name
by Mike Hearn June 13, 2005

June 13, 2005

On Mon, 13 Jun 2005 00:20:20 -0400, Kevin Koltzau wrote: > To be honest I didn't think it was correct either, but the current > solution does not work correctly either so I figured I'd give it a shot. > > I have default overridden to pass through dmix/dsnoop, wine cannot access > my card directly through plug:hw the majority of the time. Using the > PlaybackDevice config option is a good enough hack for me for now There should - at minimum - be a comment here. I "fixed" this to use default months ago, it was fixed back to plughw:0,0 and now you submitted a patch to fix it back to default again! This thing just ping-pongs back and forth like there's no tomorrow :) thanks -mike

2 1

wineserver CreateFile flags
by Andreas Mohr June 13, 2005

June 13, 2005

Hi, the create_file request checks for GENERIC_READ or GENERIC_WRITE, but not for GENERIC_ALL. http://groups.google.de/group/microsoft.public.vc.language/browse_thread/th… Documented on MSDN via http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/fs/… --> http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/fs/… --> http://msdn.microsoft.com/library/default.asp?url=/library/en-us/secauthz/s… This might be an issue since some programs might want to do a CreateFile call with GENERIC_ALL. Only few programs do, however, and there is a reason for it: http://groups.google.de/group/microsoft.public.vc.language/browse_thread/th… indicates that GENERIC_ALL is problematic, so maybe it's not too bad that wineserver doesn't support it properly. JFYI, Andreas

2 1

Re: [QUARTZ] Add FFMpeg video wrapper filter (take 3)
by Christian Costa June 13, 2005

June 13, 2005

IFAIK, no... Christian > Message du 13/06/05 16:47 > De : "Mike Hearn" > A : wine-devel(a)winehq.com > Copie à : > Objet : Re: [QUARTZ] Add FFMpeg video wrapper filter (take 3) > > On Mon, 13 Jun 2005 14:59:37 +0200, Alexandre Julliard wrote: > > > Changelog: > > > Added FFMpeg video wrapper filter. > > > > You should dlopen the library to avoid creating a run-time dependency. > > I was under the impression that libavcodec did not have a stable API > anyway. I thought it was simply a place to copy/paste code from. Has that > changed? > > thanks -mike > > > >

1 0

wine and gdi+
by Michael Büttner June 13, 2005

June 13, 2005

Hi, I was checking wine for GDI+ support and noticed that there are no headers or anything at all. I did not find any further information, so i guess there's no work being done there? So, winelib is not an option. What about using wine and native gdiplus.dll, any experiences? What about the license? The one shipped with the gdiplus package I got says says you may use/redistribute gdiplus.dll solely for windows, has anybody ever seen a less restrictive version of that? thx, michael

4 4

Re: [QUARTZ] Add FFMpeg video wrapper filter (take 3)
by Alexandre Julliard June 13, 2005

June 13, 2005

Christian Costa <titan.costa(a)wanadoo.fr> writes: > Moved avcodec.h include into the #ifdef section. > > Changelog: > Added FFMpeg video wrapper filter. You should dlopen the library to avoid creating a run-time dependency. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: crypt32: add CertAlgIdToOID/CertOIDToAlgID
by Alexandre Julliard June 13, 2005

June 13, 2005

Juan Lang <juan_lang(a)yahoo.com> writes: > ChangeLog: add CertAlgIdToOID/CertOIDToAlgID, with tests Unless you have a lot more OID functions to implement, I'd suggest to merge that code in one of the existing files. We don't want to create a new file for just a couple of small functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

OLEAUT32/tests/vartype.c: VarDateFromStr() failure
by Saulius Krasuckas June 13, 2005

June 13, 2005

The conversion fails with some strings on WinME. MSVC debugger throws a message box saying: | Unhandled exception in oleaut32_test.exe (OLEAUT32.DLL): | 0xC0000005: Access violation How should I fix this? The only thing now I can think of is to remove "noisy" tests. Other suggestions? ChangeLog: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Remove VarDateFromStr() calls that generate exceptions on WinME. Index: dlls/oleaut32/tests/vartype.c =================================================================== RCS file: /home/wine/wine/dlls/oleaut32/tests/vartype.c,v retrieving revision 1.23 diff -w -p -u -r1.23 vartype.c --- dlls/oleaut32/tests/vartype.c 6 Jun 2005 19:50:37 -0000 1.23 +++ dlls/oleaut32/tests/vartype.c 13 Jun 2005 12:28:27 -0000 @@ -3275,9 +3275,7 @@ static const char *BadDateStrings[] = "1.2.3 4.5 6", "1.2.3 4 5.6", "1.2 3.4.5.6", "1.2 3.4.5 6", "1.2 3.4 5.6", "1.2 3.4 5 6", "1.2 3 4.5.6", "1.2 3 4.5 6", "1.2 3 4 5.6", "1.2 3 4 5 6", "1 2.3.4.5.6", "1 2.3.4.5 6", "1 2.3.4 5.6", "1 2.3.4 5 6", "1 2.3 4.5.6", - "1 2.3 4.5 6", "1 2.3 4 5.6", "1 2.3 4 5 6", "1 2 3.4.5.6", "1 2 3.4.5 6", "1 2 3.4 5.6", "1 2 3.4 5 6", "1 2 3 4.5 6", "1 2 3 4 5.6", "1 2 3 4 5 6", - "1.2.3 4 am 5 6", "1.2.3 4 5 am 6", "1.2.3 4 5 6 am", "1 am 2 3 4.5.6", "1 2 am 3 4.5.6", "1 2 3 am 4.5.6" }; @@ -3382,7 +3380,6 @@ static void test_VarDateFromStr(void) /* 5 elements - interpreted as 2 & 3 digit date/times */ DFS("1.2.3 4 5"); MKRELDATE(5,4); relative += 0.04309027778; EXPECT_DBL(relative); DFS("1.2 3 4 5"); EXPECT_DBL(38415.04305555556); - DFS("1 2 3.4.5"); MKRELDATE(2,1); relative += 0.12783564815; EXPECT_DBL(relative); DFS("1 2 3 4.5"); EXPECT_DBL(37623.17013888889); /* 6 elements - interpreted as 3 digit date/times */ DFS("1.2.3 4 5 6"); EXPECT_DBL(38812.04309027778);

1 0

Re: [WINED3D] stateblocks samplers swapchains
by Marcus Meissner June 12, 2005

June 12, 2005

On Mon, Jun 13, 2005 at 01:45:02AM +0100, Oliver Stieber wrote: I do not think this even compiled for you, there are CVS merge conflicts in the patch, see below... Can you _please_ work in getting patches into WINE? If possible small and self contained. This would help all of us. :/ Ciao, Marcus .... @@ -412,17 +571,24 @@ while (pow2Width < Width) pow2Width <<= 1; while (pow2Height < Height) pow2Height <<= 1; +<<<<<<< device.c + /* TODO: support for non-power 2 textures */ + if((pow2Width > Width || pow2Height > Height) && !Usage & D3DUSAGE_RENDERTARGET){ + /** TODO: add support for non power two compressed textures (OpenGL provices support for * non-power-two textures gratis) **/ + FIXME("Non-power 2 textures are not supported\n"); +======= if(pow2Width > Width || pow2Height > Height){ FIXME("non-power-two textures unsupported\n"); /* OpenGL provides support for these gratis */ +>>>>>>> 1.31 return D3DERR_NOTAVAILABLE; } ...... - HDC hDc; + IWineD3DDevice** ppReturnedDeviceInterface, IUnknown *parent, + D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *object = NULL; IWineD3DImpl *This = (IWineD3DImpl *)iface; +<<<<<<< directx.c + IWineD3DSwapChainImpl *swapchain; +======= int num; XVisualInfo template; HRESULT res; +>>>>>>> 1.31 ...... +<<<<<<< directx.c + /* Initialize the current view state */ + object->modelview_valid = 1; + object->proj_valid = 0; + object->view_ident = 1; + object->last_was_rhw = 0; + glGetIntegerv(GL_MAX_LIGHTS, &object->maxConcurrentLights); + TRACE("(%p,%d) All defaults now set up, leaving CreateDevice with %p\n", This, Adapter, object); +======= /* Change the display settings */ memset(&devmode, 0, sizeof(DEVMODEW)); devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; @@ -1709,67 +1743,14 @@ IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) object->stencilBufferTarget); } */ +>>>>>>> 1.31 - /* Set up some starting GL setup */ - ENTER_GL(); + /* Clear the screen */ + IWineD3DDevice_Clear((IWineD3DDevice *) object, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER|D3DCLEAR_TARGET, 0x00, 1.0, 0);

1 0

Re: alsa: device name
by Jeremy White June 12, 2005

June 12, 2005

Kevin, I don't think this is correct. Our job is to enumerate devices available to Wine; the 'default' device is generally card #0, device #0 on that card. A system may well have multiple card and multiple devices within a card; by setting this to 'default', you have prevented a meaningful scan. I've actually got a fairly large patch coming which reorganizes Alsa device discovery to be more correct, imho. (I iterate through the cards, and iterate through device on cards; I detect and mark as the wine default the default card identified by Alsa config; I respect ALSA card/device environment variables, and, finally, I allow for explict device name override within Wine). I'm stymied currently by the fact that my patch correctly identifies a greater range of devices reported by Alsa, but then, at least with my laptop's sound card, one of the devices reported doesn't work for beans. I'm trying to figure a way to detect that card 0, device 4 doesn't work for beans so I can strip it from the results; once I finish that (if I can), I'll submit the larger patch. Cheers, Jeremy Kevin Koltzau wrote: > With ALSA 1.0, the device name "default" should be used. > "default" is mapped to plug:hw by default, but allows remapping from your alsa config > > > ------------------------------------------------------------------------ > > Index: dlls/winmm/winealsa/audio.c > =================================================================== > RCS file: /home/wine/wine/dlls/winmm/winealsa/audio.c,v > retrieving revision 1.85 > diff -u -d -r1.85 audio.c > --- dlls/winmm/winealsa/audio.c 9 Jun 2005 09:49:31 -0000 1.85 > +++ dlls/winmm/winealsa/audio.c 13 Jun 2005 00:47:09 -0000 > @@ -714,7 +714,7 @@ > /****************************************************************** > * ALSA_GetDeviceFromReg > * > - * Returns either "plug:hw" or reads the registry so the user can > + * Returns either "default" or reads the registry so the user can > * override the playback/record device used. > */ > static char *ALSA_GetDeviceFromReg(const char *value) > @@ -741,7 +741,7 @@ > > end: > if (!result) > - result = ALSA_strdup("plug:hw"); > + result = ALSA_strdup("default"); > > if (key) > RegCloseKey(key);

2 1

Re: [PATCH] FCI work for cabinet.dll [cabinet-fci-patch-02b.diff]
by Dimi Paun June 12, 2005

June 12, 2005

From: "Gerold J. Wucherpfennig" <gjwucherpfennig(a)gmx.net> Cool stuff Gerold. A few nits: > + if(PFCI_INT(hfci)->fNextCab==TRUE) { It's better to avoid explicit comparison with TRUE. What if fNextCab is 10, not 1? It's still true, but it will fail the above test. Just do: + if(PFCI_INT(hfci)->fNextCab) { Also, I know you're modifying existing code, but if it's not too much to ask, 2-space indent is hard to read, and the vast majority of developers do prefer 4-space indent. So if you don't mind, and we can find a solution, would be great if we can stick to 4-spaces instead. -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

7 11