May 2002 - Wine-Devel - list.winehq.org

Re: wine/dlls/winmm mmsystem.c winemm.h
by Michael Stefaniuc May 16, 2002

May 16, 2002

Hello, tested the patch and FreeSolitaire works again. You can close the bug entry. thanks bye michael On Thu, May 16, 2002 at 10:03:17PM +0200, Eric Pouech wrote: > Eric Pouech a écrit : > oops the last hunk of the patch isn't part of the patch > so Alexandre, please use this file instead > > A+ > Name: ps_a2w > ChangeLog: fixed hangs when playing an ASCII resource > License: X11 > GenDate: 2002/05/16 19:48:36 UTC > ModifiedFiles: dlls/winmm/mmsystem.c > AddedFiles: > =================================================================== > RCS file: /home/cvs/cvsroot/wine/wine/dlls/winmm/mmsystem.c,v > retrieving revision 1.52 > diff -u -u -r1.52 mmsystem.c > --- dlls/winmm/mmsystem.c 12 May 2002 03:10:26 -0000 1.52 > +++ dlls/winmm/mmsystem.c 16 May 2002 19:39:46 -0000 > @@ -447,6 +447,7 @@ > waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR)); > > errCleanUp: > + TRACE("Done playing='%s' !\n", debugstr_w(wps->pszSound)); > CloseHandle(s.hEvent); > HeapFree(GetProcessHeap(), 0, waveHdr); > HeapFree(GetProcessHeap(), 0, lpWaveFormat); > @@ -463,6 +464,21 @@ > return bRet; > } > > +static BOOL MULTIMEDIA_IsString(DWORD fdwSound, const void* psz) > +{ > + /* SND_RESOURCE is 0x40004 while > + * SND_MEMORY is 0x00004 > + */ > + switch (fdwSound & SND_RESOURCE) > + { > + case SND_RESOURCE: return HIWORD(psz) != 0; /* by name or by ID ? */ > + case SND_MEMORY: return FALSE; > + /* any other case (SND_ALIAS, SND_FILENAME... shall drop into this one) */ > + case 0: return TRUE; > + default: FIXME("WTF\n"); return FALSE; > + } > +} > + > static BOOL MULTIMEDIA_PlaySound(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound, DWORD search) > { > WINE_PLAYSOUND* wps = NULL; > @@ -515,10 +531,9 @@ > } while (InterlockedCompareExchangePointer((void**)&iData->lpPlaySound, wps, NULL) != NULL); > > if (fdwSound & SND_ASYNC) { > - if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) && > - !((DWORD)pszSound >> 16)) || > - !pszSound)) { > - wps->pszSound = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszSound)+1) * sizeof(WCHAR) ); > + if (MULTIMEDIA_IsString(fdwSound, pszSound)) > + { > + wps->pszSound = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszSound)+1) * sizeof(WCHAR)); > lstrcpyW((LPWSTR)wps->pszSound, pszSound); > } > wps->bLoop = fdwSound & SND_LOOP; > @@ -541,16 +556,13 @@ > { > LPWSTR pszSoundW; > BOOL bSound; > + > + pszSoundW = (MULTIMEDIA_IsString(fdwSound, pszSoundA)) ? > + HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA) : (LPWSTR)pszSoundA; > > - if (!((fdwSound & SND_MEMORY) || > - ((fdwSound & SND_RESOURCE) && !((DWORD)pszSoundA >> 16)) || > - !pszSoundA)) { > - pszSoundW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA); > - bSound = PlaySoundW(pszSoundW, hmod, fdwSound); > - HeapFree(GetProcessHeap(), 0, pszSoundW); > - } else > - bSound = PlaySoundW((LPWSTR)pszSoundA, hmod, fdwSound); > - > + bSound = PlaySoundW(pszSoundW, hmod, fdwSound); > + if ((void*)pszSoundW != (void*)pszSoundA) HeapFree(GetProcessHeap(), 0, pszSoundW); > + > return bSound; > } > > @@ -585,14 +597,12 @@ > LPWSTR pszSoundW; > BOOL bSound; > > - if (!((uFlags & SND_MEMORY) || > - ((uFlags & SND_RESOURCE) && !((DWORD)pszSoundA >> 16)) || > - !pszSoundA)) { > - pszSoundW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA); > - bSound = sndPlaySoundW(pszSoundW, uFlags); > + pszSoundW = (MULTIMEDIA_IsString(uFlags, pszSoundA)) ? > + HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA) : (LPWSTR)pszSoundA; > + > + bSound = sndPlaySoundW(pszSoundW, uFlags); > + if ((void*)pszSoundW != (void*)pszSoundA) > HeapFree(GetProcessHeap(), 0, pszSoundW); > - } else > - bSound = sndPlaySoundW((LPWSTR)pszSoundA, uFlags); > > return bSound; > } -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

1 0

winedefault.reg and .Default user entries
by Sylvain Petreolle May 16, 2002

May 16, 2002

Hi, Looking at recent patches, I saw entries for the user .Default in winedefault.reg. Are these entries useful ? I think not because wine uses the real username to load registry entries from the $HOME/.wine/user.reg. ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

Re: wine-20020509/dlls/winsock/socket.c
by Francois Gouget May 16, 2002

May 16, 2002

Please, see Warren Baird's (Warren_Baird(a)cimmetry.com) patch on this and my reply to wine-devel. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ If it stinks, it's chemistry. If it moves, it's biology. If it does not work, It's computer science.

1 0

Re: Patch - check for msghdr.msg_control on Sparc-Solaris
by Francois Gouget May 16, 2002

May 16, 2002

On Thu, 16 May 2002 Warren_Baird(a)cimmetry.com wrote: > > > > ChangeLog: > > - added a test for the msg_control field in struct msghdr > (does't appear in sparc-solaris) I think it would be better to do it using a technique similar to how it is done in scheduler/client.c on line 255: #ifdef HAVE_MSGHDR_ACCRIGHTS msghdr.msg_accrights = (void *)&fd; msghdr.msg_accrightslen = sizeof(fd); #else /* HAVE_MSGHDR_ACCRIGHTS */ cmsg.len = sizeof(cmsg); cmsg.level = SOL_SOCKET; cmsg.type = SCM_RIGHTS; cmsg.fd = fd; msghdr.msg_control = &cmsg; msghdr.msg_controllen = sizeof(cmsg); msghdr.msg_flags = 0; #endif /* HAVE_MSGHDR_ACCRIGHTS */ -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Dieu dit: "M-x Lumière". Et la lumière fut.

1 0

Re: wine/programs/winetest wtmain.c
by Dimitrie O. Paun May 16, 2002

May 16, 2002

On May 16, 2002 04:32 pm, Alexandre Julliard wrote: > Log message: > Better usage message. Flush stderr before exiting. And I thought stderr was unbuffered... -- Dimi.

2 1

Ignore my query
by Medland, Bill May 16, 2002

May 16, 2002

Again, two minutes after posting the message it becomes clear. (bug in wineps; for some reason the name has a leading space on all after the first name extracted from printcap) Bill

1 0

Re: wine/dlls/winmm mmsystem.c winemm.h
by Michael Stefaniuc May 16, 2002

May 16, 2002

Hello, this patch has introduced a regression, see http://bugs.winehq.com/show_bug.cgi?id=684 for details. bye michael On Sat, May 11, 2002 at 10:10:27PM -0500, Alexandre Julliard wrote: > ChangeSet ID: 1021173026714339351122366 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 02/05/11 22:10:27 > > Modified files: > dlls/winmm : mmsystem.c winemm.h > > Log message: > Eric Pouech <eric.pouech(a)wanadoo.fr> > Better behavior of PlaySound (error handling, synchronization). > Removed some unnecessary tests about windows handles. > > Patch: http://cvs.winehq.com/patch.py?id=1021173026714339351122366 > > Revision Changes Path > 1.52 +178 -204 wine/dlls/winmm/mmsystem.c > 1.11 +14 -0 wine/dlls/winmm/winemm.h -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

2 1

Before I go mad, what am I doing wrong?
by Medland, Bill May 16, 2002

May 16, 2002

I've been bashing my head against this all morning; can anyone tell me WHY I am an idiot. (Context - basically I have the task of putting together a Wine rpm tailored particularly to our application, for use by those who have been so spolied by M$ that they can't be bothered with the work involved in setting up wine from elsewhere. As part of that I am trying to figure out and improve the documentation on printing. As a result I am getting to understand that my copy is probably only working by chance). For as long as I can remember I have been using the "Wine Postscript Driver" solution on my machine, and also had "lp" configured as the same thing. I did not have a [ppd] section in my config. /etc/printcap mentions three JetDirect printers (well, four now; see below) I just added a [ppd] section into the config and added entries for each of the three (or 4) printers as follows: [ppd] "lp" = "/home/medbi01/bin/lopt612.ppd" "colour" = "/home/medbi01/bin/lopt612.ppd" "duplex" = "/home/medbi01/bin/lopt612.ppd" "mp" = "/home/medbi01/bin/lopt612.ppd" (the colour and duplex are lies but forget that for now) Now when I start notepad I get err:psdrv:PSDRV_FindPrinterInfo Error 2 getting PPD file name for printer 'colour' and similarly for duplex and mp, but not for lp. I (eventually) went into the code (dlls/psdrv/init.c) and modified the code to see the error code coming back from when it asked the registry for the lp, mp, colour, duplex. It returns 2 for mp, colour, duplex but SUCCESS for lp. OH!! I've just changed the default printer to "mp"and now it's the lp, colour and duplex it doesn't find. i.e. it finds the first one it asks about but not the next. So it sounds like something to do with the registry code. But now I've added the "generic" entry and removed my debug print code and it doesn't "complain". But without the "generic" it does. So maybe it's the fact that they all have the same value? No. Does this make any sense to anyone? Bill p.s. I'm going to see if it is "the first access to a registry key tends to fail".

1 0

Component owner for mouse input
by Andriy Palamarchuk May 16, 2002

May 16, 2002

Are there volunteers to handle issues with mouse input? Andriy __________________________________________________ Do You Yahoo!? LAUNCH - Your Yahoo! Music Experience http://launch.yahoo.com

1 0

Re: [Bug 448] Changed - winsock 16 bit
by Uwe Bonnes May 16, 2002

May 16, 2002

>>>>> "David" == David Barrena <david(a)molina.subs.map.es> writes: David> I can´t find socket.c in ...dlls/winsock/. Where is it?. Is a David> bynary Winsows app. Thanks. hertz:/spare/bon/wine> find -name \*sock\*.c ./dlls/wsock32/wsock32.spec.c ./dlls/wsock32/wsock32.dll.dbg.c ./dlls/wsock32/socket.c ./dlls/winsock/winsock.spec.c ./dlls/winsock/tests/sock.c ./dlls/winsock/socket.c ./server/sock.c -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0