December 2009 - Wine-Devel - list.winehq.org

Re: RFC: winediag script

by Roderick Colenbrander

On Wed, Dec 2, 2009 at 9:11 PM, Dan Kegel <dank(a)kegel.com> wrote: > I love the idea. Could it be packaged with wine, or > do you think it would be better off being a cousin of winetricks? > > > The current script is a proof of concept. It would be nice if we could have something like this in Wine. The main thing I worry about is how some of the code needs to be packaged. For instance the script also compiles some sample code to retrieve information because systems don't ship a 32-bit glxinfo on 64-bit systems. The same way we might want to package other compile tests. Vincent mentioned a test for libjpeg which is broken on some systems. I think that we put something like this in Wine we need some 'winetest' like tool which contains tests which have to be compiled. This tool would be called from a winediag script which contains scripts similar to what I have written. Winediag itself really should be a script instead of a program because a scripting language is better for hacky stuff :) An argument for having something like this in Wine is that it would be useful for bug reporting. It could be used for filtering out bogus bugs. Second it would also be useful to have some more detailed info bundled with a winetest logs. I really wonder if AJ would accept something along these lines. Else it should become a cousin to winetricks. Roderick

Dec. 2, 2009

Re: [PATCH] kernel32: Respect the LANG environment variable on Mac OS.

by Ken Thomases

On Dec 2, 2009, at 1:22 PM, Gert van den Berg wrote: > I'm using Terminal.app using default settings (AFAIK, except for > colors). "Set locale variables at startup" is enabled. > > I don't see settings for en_ZA* in /usr/share/locale (af_ZA does > exist, but if my applications turn Afrikaans I'll go insane ;-) ) (And > OS X does not have a language settign for Afrikaans) Apparently Terminal.app won't set LANG to a locale that's not in /usr/ share/locale. >> Actually, I think that Wine should respect the LC_* variables if >> they are >> set. So, the precedence order would be LC_ALL > LC_* > Mac OS X >> System >> Preferences > LANG. > > As far as I can figure out, no LC_* variable, except LC_ALL specific > the actual locale? They only determine individual settings, which > overwrites the default for the locale, as set by LANG? (Not sure if it > effectively means set everything to LANG's locale, overwrite > individual settings from LC_* if they are defined) I'm not sure what you mean here. Are you referring to the general Unix meaning of these variables or Wine's use of them? As near as I can tell, Wine only probes the locale information by invoking setlocale(<category>, NULL). It doesn't directly examine the environment variables. Furthermore, it only queries using the individual categories, not LC_ALL. It uses setlocale(LC_ALL, "") once to tell the C library to initialize itself from the environment. So, I'm not sure how setting all of the LC_* variables to a given value can be different from setting LC_ALL to that value. >> If one of the LC_* variables are set, that expresses user intent >> (because >> those variables are not set by Terminal.app automatically). Also, >> it is >> useful to allow the user to override the System Preferences on a >> category-by-category basis. > > Mine gets set to C / UTF-8(for LC_CTYPE) of some reason... Maybe Terminal.app is setting LC_CTYPE when it can't set LANG. Check what's actually set in your environment: env | egrep "^(LANG|LC_)" Regards, Ken

Dec. 2, 2009

re: RFC: winediag script

by Dan Kegel

I love the idea. Could it be packaged with wine, or do you think it would be better off being a cousin of winetricks?

Dec. 2, 2009

Re: [3/6] imagehlp: Implement ImageRemoveCertificate

by Jacek Caban

Hi Owen, Owen Rudge wrote: > --- > dlls/imagehlp/integrity.c | 73 > +++++++++++++++++++++++++++++++++++++-- > dlls/imagehlp/tests/integrity.c | 4 +- > 2 files changed, 72 insertions(+), 5 deletions(-) + cert_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data_size); + + if (!cert_data) + return FALSE; + + ret = SetFilePointer(FileHandle, offset + cert_size_padded, NULL, FILE_BEGIN); + + if (ret == INVALID_SET_FILE_POINTER) + return FALSE; + + /* Read any subsequent certificates */ + r = ReadFile(FileHandle, cert_data, data_size, &count, NULL); + + if ((!r) || (count != data_size)) + return FALSE; + + SetFilePointer(FileHandle, offset, NULL, FILE_BEGIN); + + /* Write them one index back */ + r = WriteFile(FileHandle, cert_data, data_size, &count, NULL); + + if ((!r) || (count != data_size)) + return FALSE; + + HeapFree(GetProcessHeap(), 0, cert_data); You leak cert_data on errors here. Jacek

Dec. 2, 2009

Re: [PATCH] kernel32: Respect the LANG environment variable on Mac OS.

by Gert van den Berg

On Wed, Dec 2, 2009 at 18:05, Ken Thomases <ken(a)codeweavers.com> wrote: > Are you using Terminal.app or some other terminal application? If > Terminal.app, have you turned off the "Set LANG environment variable on > startup" setting in preferences? (That's the name on Leopard. If I recall, > that setting is slightly different in Snow Leopard: "Set locale environment > variables on startup" or something like that.) > I'm using Terminal.app using default settings (AFAIK, except for colors). "Set locale variables at startup" is enabled. I don't see settings for en_ZA* in /usr/share/locale (af_ZA does exist, but if my applications turn Afrikaans I'll go insane ;-) ) (And OS X does not have a language settign for Afrikaans) > Actually, I think that Wine should respect the LC_* variables if they are > set. So, the precedence order would be LC_ALL > LC_* > Mac OS X System > Preferences > LANG. As far as I can figure out, no LC_* variable, except LC_ALL specific the actual locale? They only determine individual settings, which overwrites the default for the locale, as set by LANG? (Not sure if it effectively means set everything to LANG's locale, overwrite individual settings from LC_* if they are defined) > If one of the LC_* variables are set, that expresses user intent (because > those variables are not set by Terminal.app automatically). Also, it is > useful to allow the user to override the System Preferences on a > category-by-category basis. Mine gets set to C / UTF-8(for LC_CTYPE) of some reason... Gert

Dec. 2, 2009

Re: Tests question.

by Austin English

On Wed, Dec 2, 2009 at 11:43 AM, David Anderson <davea42(a)earthlink.net> wrote: > I am trying to get the tests to run before I submit a patch to > shdocvw/webbrowser.c. My first attempts to get the tests to run. > > This morning I did > cd /home/davea/winebld/wine > git fetch; git rebase origin # make sure you're up to date > ./configure && make depend && make # rebuild the tree Does configure return any warnings? > rm -rf ~/.wine # be sure to test in a clean WINEPREFIX > > sudo cp /home/downloads/wine_gecko-1.0.0-x86.cab /usr/local/share/wine/gecko > sh ../apps/winetricks winxp > mkdir /home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko > /bin/echo -n "Wine Gecko 1.0.0" > >/home/davea/.wine/drive_c/windows/system32/gec > ko/1.0.0/wine_gecko/VERSION > cat > /home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko/VERSION This is really overkill. You could either use winetricks (make sure it's a recent version) to install gecko, or put it in /home/davea/winebld/gecko > make testclean > make test > > and it failed on an init_d3d8 call. > > ../../../tools/runtest -q -P wine -M d3d8.dll -T ../../.. -p > d3d8_test.exe.so visual.c && touch visual.ok > err:wgl:opengl_error No OpenGL support compiled in. > err:d3d_caps:WineD3D_CreateFakeGLContext Can't find a suitable iPixelFormat. > err:d3d:InitAdapters Failed to get a gl context for default adapter > err:d3d:WineDirect3DCreate Direct3D8 is not available without opengl > visual.c:131: Tests skipped: could not create D3D8 > visual.c:1312: Test failed: Could not initialize direct3d > make[2]: *** [visual.ok] Error 1 > make[2]: Leaving directory `/home/davea/winebld/wine/dlls/d3d8/tests' > make[1]: *** [d3d8/tests/__test__] Error 2 > make[1]: Leaving directory `/home/davea/winebld/wine/dlls' > make: *** [dlls/__test__] Error 2 > > I note that d3d8/tests/visual.c does a win_skip() when the init_d3d3() > fails. Why not a skip() ? > > Changing the win_skip here to: > if (!d3d8_ptr) > { > skip("could not create D3D8\n"); > return NULL; > } > > enables the test to continue. > > Which is right? win_skip or skip? Why? win_skip is only used on windows. In this case, direct3d should be available on most computers running wine, since they're unlikely to be in a vm. > This is on Ubuntu 9.10 (32bit), open-src drivers, ATI 4350 pci card. The open source drivers may not provide all the needed OpenGL support, though I'm sure someone will correct me if I'm wrong. > Thanks in advance for any clues. DavidAnderson If your patch is for shdocvw, I wouldn't worry if d3d test don't pass. They won't be affected by your patch. Just make tests fail that passed before your patch, especially in related areas (shdocvw/mshtml/urlmon/etc.). -- -Austin

Dec. 2, 2009

Re: Tests question.

by James Mckenzie

>I am trying to get the tests to run before I submit a patch to >shdocvw/webbrowser.c. My first attempts to get the tests to run. > >This morning I did >cd /home/davea/winebld/wine >git fetch; git rebase origin # make sure you're up to date >./configure && make depend && make # rebuild the tree >rm -rf ~/.wine # be sure to test in a clean WINEPREFIX > >sudo cp /home/downloads/wine_gecko-1.0.0-x86.cab /usr/local/share/wine/gecko >sh ../apps/winetricks winxp >mkdir /home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko >/bin/echo -n "Wine Gecko 1.0.0" > >/home/davea/.wine/drive_c/windows/system32/gec >ko/1.0.0/wine_gecko/VERSION >cat >/home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko/VERSION >make testclean >make test > >and it failed on an init_d3d8 call. > >../../../tools/runtest -q -P wine -M d3d8.dll -T ../../.. -p >d3d8_test.exe.so visual.c && touch visual.ok >err:wgl:opengl_error No OpenGL support compiled in. This is what is causing the error. I get the same error on a series of Wine builds for MacOSX and I do have openGL support compiled in as far as I know. >err:d3d_caps:WineD3D_CreateFakeGLContext Can't find a suitable iPixelFormat. >err:d3d:InitAdapters Failed to get a gl context for default adapter >err:d3d:WineDirect3DCreate Direct3D8 is not available without opengl this is where Direct3D8 cannot initialize due to the above error. >visual.c:131: Tests skipped: could not create D3D8 >visual.c:1312: Test failed: Could not initialize direct3d And finally you get this error when running the test. >make[2]: *** [visual.ok] Error 1 >make[2]: Leaving directory `/home/davea/winebld/wine/dlls/d3d8/tests' >make[1]: *** [d3d8/tests/__test__] Error 2 >make[1]: Leaving directory `/home/davea/winebld/wine/dlls' >make: *** [dlls/__test__] Error 2 > >I note that d3d8/tests/visual.c does a win_skip() when the init_d3d3() >fails. Why not a skip() ? > Because it will cause your test to pass is not a good reason to put in a skip(). Fix the OpenGL error and this test should give proper results. James McKenzie

Dec. 2, 2009

Re: [PATCH 1/2] msvcrt: Add test to check if signal(SIGBREAK, ...) works (todo_wine).

by Henri Verbeet

2009/12/2 Charles Davis <cdavis(a)mymail.mines.edu>: > You don't get added to AUTHORS until you've hacked on Wine enough. I > learned that the hard way when I tried to put my name at the top of an > already-existing file. > AUTHORS is periodically updated by Alexandre. The amount of patches / work doesn't matter, it's supposed to be a list of everyone that contributed to Wine (there are plenty of people that only sent a single patch in there).

Dec. 2, 2009

Tests question.

by David Anderson

I am trying to get the tests to run before I submit a patch to shdocvw/webbrowser.c. My first attempts to get the tests to run. This morning I did cd /home/davea/winebld/wine git fetch; git rebase origin # make sure you're up to date ./configure && make depend && make # rebuild the tree rm -rf ~/.wine # be sure to test in a clean WINEPREFIX sudo cp /home/downloads/wine_gecko-1.0.0-x86.cab /usr/local/share/wine/gecko sh ../apps/winetricks winxp mkdir /home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko /bin/echo -n "Wine Gecko 1.0.0" >/home/davea/.wine/drive_c/windows/system32/gec ko/1.0.0/wine_gecko/VERSION cat /home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko/VERSION make testclean make test and it failed on an init_d3d8 call. ../../../tools/runtest -q -P wine -M d3d8.dll -T ../../.. -p d3d8_test.exe.so visual.c && touch visual.ok err:wgl:opengl_error No OpenGL support compiled in. err:d3d_caps:WineD3D_CreateFakeGLContext Can't find a suitable iPixelFormat. err:d3d:InitAdapters Failed to get a gl context for default adapter err:d3d:WineDirect3DCreate Direct3D8 is not available without opengl visual.c:131: Tests skipped: could not create D3D8 visual.c:1312: Test failed: Could not initialize direct3d make[2]: *** [visual.ok] Error 1 make[2]: Leaving directory `/home/davea/winebld/wine/dlls/d3d8/tests' make[1]: *** [d3d8/tests/__test__] Error 2 make[1]: Leaving directory `/home/davea/winebld/wine/dlls' make: *** [dlls/__test__] Error 2 I note that d3d8/tests/visual.c does a win_skip() when the init_d3d3() fails. Why not a skip() ? Changing the win_skip here to: if (!d3d8_ptr) { skip("could not create D3D8\n"); return NULL; } enables the test to continue. Which is right? win_skip or skip? Why? This is on Ubuntu 9.10 (32bit), open-src drivers, ATI 4350 pci card. Thanks in advance for any clues. DavidAnderson

Dec. 2, 2009

Re: [PATCH] kernel32: Respect the LANG environment variable on Mac OS.

by Ken Thomases

On Dec 1, 2009, at 1:30 PM, Gert van den Berg wrote: > My OS X settings is: (Language set to "English", "Formats" set to > "South Africa") > MoHaGLaptop:~ mohag$ locale > LANG= > LC_COLLATE="C" > LC_CTYPE="UTF-8" > LC_MESSAGES="C" > LC_MONETARY="C" > LC_NUMERIC="C" > LC_TIME="C" > LC_ALL= Are you using Terminal.app or some other terminal application? If Terminal.app, have you turned off the "Set LANG environment variable on startup" setting in preferences? (That's the name on Leopard. If I recall, that setting is slightly different in Snow Leopard: "Set locale environment variables on startup" or something like that.) > On Tue, Dec 1, 2009 at 06:12, Ken Thomases <ken(a)codeweavers.com> > wrote: > >> [...] Wine should just use the settings from System Preferences >> directly (via CFLocale, CFNumberFormatter, and CFDateFormatter), >> with an optional way to override them for those rare users who want >> Wine's behavior to deviate from the system's. > > That makes sense to me... (If Wine tries to be a good OS X app under > OS X, rather than a good POSIX app under OS X) > > (And what is suggested was current Wine settings of environment > remained the same, LC_ALL (to allow for similar override everywhere), > platform specific settings (e.g. individual settings from OS X's > "Formats" settings), LC_* (which only contains specific settings, not > "country" / "language"), LANG (for unset settings, and locale/country > itself). On OS X this should mean that the variables other than LC_ALL > only gets looked at if reading the OS X settings fail for some reason) > > For consistency with *nix override via LC_ALL makes sense (ignoring > all other LC_*/LANG settings on OS X, in favour of OS X specific > settings) Actually, I think that Wine should respect the LC_* variables if they are set. So, the precedence order would be LC_ALL > LC_* > Mac OS X System Preferences > LANG. If one of the LC_* variables are set, that expresses user intent (because those variables are not set by Terminal.app automatically). Also, it is useful to allow the user to override the System Preferences on a category-by-category basis. Cheers, Ken

Dec. 2, 2009