April 2007 - Wine-devel - list.winehq.org

Re: devenum: Constify a variable
by Robert Shearman 23 Apr '07

23 Apr '07

Andrew Talbot wrote: > */ > static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance( > LPCLASSFACTORY iface, > - LPUNKNOWN pUnkOuter, > + const IUnknown *pUnkOuter, > REFIID riid, > LPVOID *ppvObj) > I'm not sure what the point of this is. -- Rob Shearman

2 2

comments for a fix for wine/dlls/wineoss.drv/mixer.c for Solaris
by sol11x86＠comcast.net 23 Apr '07

23 Apr '07

On a current git tree, I noticed some variables falling out as undefined for Solaris Express/Build 61 and OpenSound System 4.0 v1002. I patched it the following way, but because I haven't played with sound before, wanted to get some comments on whether or not there is a better fix (or a better #ifdef to use). With this patch, I was able to hear audio from Grand Theft Auto 2. Thanks, Ben --- wine.ORIG/dlls/wineoss.drv/mixer.c 2007-04-21 16:43:39.000000000 -0400 +++ wine-git/dlls/wineoss.drv/mixer.c 2007-04-21 17:45:33.655890000 -0400 @@ -159,11 +159,15 @@ IOCTL_TO_STR(SOUND_MIXER_DIGITAL1); IOCTL_TO_STR(SOUND_MIXER_DIGITAL2); IOCTL_TO_STR(SOUND_MIXER_DIGITAL3); +#ifndef __sun__ IOCTL_TO_STR(SOUND_MIXER_PHONEIN); IOCTL_TO_STR(SOUND_MIXER_PHONEOUT); +#endif IOCTL_TO_STR(SOUND_MIXER_VIDEO); IOCTL_TO_STR(SOUND_MIXER_RADIO); +#ifndef __sun__ IOCTL_TO_STR(SOUND_MIXER_MONITOR); +#endif } #undef IOCTL_TO_STR sprintf(str, "UNKNOWN(%08x)", command);

2 1

Re: [1/2] Extend the testing framework to include IDL files and RPC clients (take 2)
by Alexandre Julliard 23 Apr '07

23 Apr '07

Dan Hipschman <dsh(a)linux.ucla.edu> writes: > This extends the testing framework to allow for tests that need IDL > files and RPC clients. It's the same as the last attempt, but I've > removed two little development artifacts that slipped in last time, > I fixed an indentation glitch, fixed one more thing in the Makefile > so "make depend" works for ClientMakefile as well, and I separated > the first test case from the infrastructure change (see next patch). That's very ugly; you shouldn't need any of that stuff, especially not a separate makefile. You should put everything in the same exe, and differentiate server and client through command line arguments, the way the process test does it. -- Alexandre Julliard julliard(a)winehq.org

3 3

Ubuntu packages for wine-0.9.35 are broken
by Vitaliy Margolen 22 Apr '07

22 Apr '07

I'm getting number of reports on #winehq as well as in bugzilla about new Ubuntu packages for 0.9.35 having problems with displaying text and mouse cursor. It appears there were some problems with xrandr during compiling them. Scott could you take a look at this and fix them as soon as you can? Or at least remove broken packages from the repository? Vitaliy.

8 19

Re: schannel: Move schannel tests from secur32 to the recent schannel
by Robert Shearman 22 Apr '07

22 Apr '07

Yuval Fledel wrote: > Move schannel tests from secur32 to the recent schannel. Adding a > tests directory on the way. I don't see the point in this. The actual functionality is implemented in secur32, so it makes sense for the tests to also be there. -- Rob Shearman

2 1

Re: msi [3/3]: Enumerate the structured storage streams from the package into the _Streams table
by Robert Shearman 22 Apr '07

22 Apr '07

James Hawkins wrote: > + static const WCHAR Create[] = { > + 'C','R','E','A','T','E',' ','T','A','B','L','E',' ', > + '`','_','S','t','r','e','a','m','s','`',' ','(',' ', > + '`','N','a','m','e','`',' ','C','H','A','R','(','5','6',')',' ', > + 'N','O','T',' ','N','U','L','L',',',' ','`','D','a','t','a','`',' ', > + 'O','B','J','E','C','T',' ','P','R','I','M','A','R','Y',' ', > + 'K','E','Y',' ','`','N','a','m','e','`',')',0}; > This is wrong as the _Streams table shouldn't appear in the _Tables table. Also, changes added to this table won't be reflected in the actual streams in the .msi file. I think that the best way to implement this is to return a custom view from TABLE_CreateView that is implemented on top of OLE structured storage functions. -- Rob Shearman

2 1

Re: RegDeleteTree [3rd]
by Alexandre Julliard 22 Apr '07

22 Apr '07

Stefan Leichter <Stefan.Leichter(a)camline.com> writes: > + /* Recursively delete all the subkeys */ > + for (i = 0; i < dwKeyCount && !ret; i++) { > + dwSize = dwMaxSubkeyLen; > + ret = RegEnumKeyExW(hSubKey, i, lpszName, &dwSize, NULL, > + NULL, NULL, NULL); This won't work, the index will change as you delete keys. > + } else { > + if (!ret) > + ret = RegSetValueW(hSubKey, NULL, REG_SZ, emptyW, 0); The function is supposed to delete the key values, that's not what this does. You probably need to write some test cases... -- Alexandre Julliard julliard(a)winehq.org

4 7

Re: [PATCH] Make wine build with the Intel CC
by Maarten Lankhorst 22 Apr '07

22 Apr '07

Jonathan Schleifer schreef: > Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > >> Wine could build fine without c++, not sure why everything has to >> link against the c++ library as it will probably only be needed in >> winegcc. Also these compiling flags seem kind of agressive. >> > > As I said, just quoted from my .profile, nothing special for wine. I > just have -lstdc++ added there as some apps need it to compile with icc. > Ok, Please when responding add wine-devel to CC so others can follow discussion. >> They are defined in include/winbase.h >> > > That's the point. They are defined INCLUDING the asm code. That's why > the asm code is already defined and not needed in the file itself. > It's working well for gcc, so I would try to find out how gcc works around it and then work around the same way.. not adding ifdefs everywhere. >> just make sure icc is recognised there. >> > > You mean: Make sure that icc doesn't get recognized as gcc. Well, > I tried that. It doesn't work. This will still end in stuff like: > /tmp/iccCwib4Das_.s:1499: Error: symbol `wine_get_fs' is already defined > /tmp/iccCwib4Das_.s:1523: Error: symbol `wine_set_fs' is already defined > Some part of headers do checks specifically on GCC, you might want to do the same for icc. >> you can't just comment out those Interlocked functions, some >> applications might need them. >> > > I only commented them out because they are defined TWICE. They are still > there and thus the programs run. I tested running a few apps with this > patch. > It's still not how it's done for gcc, see above. >> Plus the way you do it makes the code unreadable. I cannot test this >> as I don't have icc. > I'm sure someone on the list has icc > Probably, but if you want to get code past julliard it is recommended to follow certain guidelines, one of them is not making an unnecesary #ifdef hell. Maarten

3 7

Re: [PATCH] Make wine build with the Intel CC [Resent]
by Jonathan Schleifer 22 Apr '07

22 Apr '07

It seems my replies never got though because I wasn't subscribed to the list, but instead using gmane. I subscribed now and resent all my replies. Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > Wine could build fine without c++, not sure why everything has to > link against the c++ library as it will probably only be needed in > winegcc. Also these compiling flags seem kind of agressive. As I said, just quoted from my .profile, nothing special for wine. I just have -lstdc++ added there as some apps need it to compile with icc. > They are defined in include/winbase.h That's the point. They are defined INCLUDING the asm code. That's why the asm code is already defined and not needed in the file itself. > just make sure icc is recognised there. You mean: Make sure that icc doesn't get recognized as gcc. Well, I tried that. It doesn't work. This will still end in stuff like: /tmp/iccCwib4Das_.s:1499: Error: symbol `wine_get_fs' is already defined /tmp/iccCwib4Das_.s:1523: Error: symbol `wine_set_fs' is already defined > you can't just comment out those Interlocked functions, some > applications might need them. I only commented them out because they are defined TWICE. They are still there and thus the programs run. I tested running a few apps with this patch. > Plus the way you do it makes the code unreadable. I cannot test this > as I don't have icc. I'm sure someone on the list has icc. -- Jonathan

1 0

Re: [PATCH] Make wine build with the Intel CC [Resent]
by Jonathan Schleifer 22 Apr '07

22 Apr '07

For some strange reason, this mail didn't appear on the list. Therefore I resent it. (Maybe it's missing because it included an attached GPG signature?) Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > Wine could build fine without c++, not sure why everything has to > link against the c++ library as it will probably only be needed in > winegcc. Also these compiling flags seem kind of agressive. As I said, just quoted from my .profile, nothing special for wine. I just have -lstdc++ added there as some apps need it to compile with icc. > They are defined in include/winbase.h That's the point. They are defined INCLUDING the asm code. That's why the asm code is already defined and not needed in the file itself. > just make sure icc is recognised there. You mean: Make sure that icc doesn't get recognized as gcc. Well, I tried that. It doesn't work. This will still end in stuff like: /tmp/iccCwib4Das_.s:1499: Error: symbol `wine_get_fs' is already defined /tmp/iccCwib4Das_.s:1523: Error: symbol `wine_set_fs' is already defined > you can't just comment out those Interlocked functions, some > applications might need them. I only commented them out because they are defined TWICE. They are still there and thus the programs run. I tested running a few apps with this patch. > Plus the way you do it makes the code unreadable. I cannot test this > as I don't have icc. I'm sure someone on the list has icc. -- Jonathan

1 0