November 2009 - Wine-devel - list.winehq.org

re: Remove NoAppDBEntry keyword?
by Dan Kegel 25 Apr '10

25 Apr '10

Jerome Leclanche wrote: > Austin English <austinenglish at gmail.com> wrote: >> Anyone opposed to removing that keyword? > > +1 on removing it. > It would be nice to have a bugzilla filter to replace it, too. > > Are we keeping "tasklist" and "tasklet" keywords as well? theres > barely a dozen very old bugs for both of them. I think it'd be fine to remove noappdbentry, tasklist, and tasklet. If there are no objections by next weekend, let's go ahead and do it. - Dan

4 4

Re: tools/widl: Split expr_int_const off from expr
by Rob Shearman 21 Dec '09

21 Dec '09

2009/6/28 Gerald Pfeifer <gerald(a)pfeifer.com>: > diff --git a/tools/widl/parser.y b/tools/widl/parser.y > index c2f1abc..01aa060 100644 > --- a/tools/widl/parser.y > +++ b/tools/widl/parser.y > @@ -622,56 +633,54 @@ m_expr: { $$ = make_expr(EXPR_VOID); } > | expr > ; > > -expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } > - | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } > +expr: expr_int_const > | aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, $1); } > + | '-' aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, -($2)); } This is covered by the production for the binary minus operator that already exists, so I'm not sure what you're trying to achieve here. > | tFALSE { $$ = make_exprl(EXPR_TRUEFALSE, 0); } > - | tNULL { $$ = make_exprl(EXPR_NUM, 0); } > | tTRUE { $$ = make_exprl(EXPR_TRUEFALSE, 1); } > | aSTRING { $$ = make_exprs(EXPR_STRLIT, $1); } > | aWSTRING { $$ = make_exprs(EXPR_WSTRLIT, $1); } > - | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } > | expr '?' expr ':' expr { $$ = make_expr3(EXPR_COND, $1, $3, $5); } > | expr LOGICALOR expr { $$ = make_expr2(EXPR_LOGOR, $1, $3); } > | expr LOGICALAND expr { $$ = make_expr2(EXPR_LOGAND, $1, $3); } > - | expr '|' expr { $$ = make_expr2(EXPR_OR , $1, $3); } > - | expr '^' expr { $$ = make_expr2(EXPR_XOR, $1, $3); } > - | expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); } > | expr EQUALITY expr { $$ = make_expr2(EXPR_EQUALITY, $1, $3); } > | expr INEQUALITY expr { $$ = make_expr2(EXPR_INEQUALITY, $1, $3); } > | expr '>' expr { $$ = make_expr2(EXPR_GTR, $1, $3); } > | expr '<' expr { $$ = make_expr2(EXPR_LESS, $1, $3); } > | expr GREATEREQUAL expr { $$ = make_expr2(EXPR_GTREQL, $1, $3); } > | expr LESSEQUAL expr { $$ = make_expr2(EXPR_LESSEQL, $1, $3); } > - | expr SHL expr { $$ = make_expr2(EXPR_SHL, $1, $3); } > - | expr SHR expr { $$ = make_expr2(EXPR_SHR, $1, $3); } > - | expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); } > - | expr '-' expr { $$ = make_expr2(EXPR_SUB, $1, $3); } > - | expr '%' expr { $$ = make_expr2(EXPR_MOD, $1, $3); } > - | expr '*' expr { $$ = make_expr2(EXPR_MUL, $1, $3); } > - | expr '/' expr { $$ = make_expr2(EXPR_DIV, $1, $3); } > | '!' expr { $$ = make_expr1(EXPR_LOGNOT, $2); } > - | '~' expr { $$ = make_expr1(EXPR_NOT, $2); } > - | '+' expr %prec POS { $$ = make_expr1(EXPR_POS, $2); } > - | '-' expr %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } > | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } > | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } > | expr MEMBERPTR aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, $1), make_exprs(EXPR_IDENTIFIER, $3)); } > | expr '.' aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, $1, make_exprs(EXPR_IDENTIFIER, $3)); } > | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } > - | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } > | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } > - | '(' expr ')' { $$ = $2; } > ; > > expr_list_int_const: expr_int_const { $$ = append_expr( NULL, $1 ); } > | expr_list_int_const ',' expr_int_const { $$ = append_expr( $1, $3 ); } > ; > > -expr_int_const: expr { $$ = $1; > - if (!$$->is_const) > - error_loc("expression is not an integer constant\n"); > - } > +expr_int_const: aNUM { $$ = make_exprl(EXPR_NUM, $1); } > + | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } > + | tNULL { $$ = make_exprl(EXPR_NUM, 0); } > + | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } aIDENTIFIER isn't necessarily a constant expression. > + | '~' expr_int_const { $$ = make_expr1(EXPR_NOT, $2); } > + | '+' expr_int_const %prec POS { $$ = make_expr1(EXPR_POS, $2); } > + | '-' expr_int_const %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } > + | expr_int_const SHL expr_int_const { $$ = make_expr2(EXPR_SHL, $1, $3); } > + | expr_int_const SHR expr_int_const { $$ = make_expr2(EXPR_SHR, $1, $3); } > + | expr_int_const '+' expr_int_const { $$ = make_expr2(EXPR_ADD, $1, $3); } > + | expr_int_const '-' expr_int_const { $$ = make_expr2(EXPR_SUB, $1, $3); } > + | expr_int_const '%' expr_int_const { $$ = make_expr2(EXPR_MOD, $1, $3); } > + | expr_int_const '*' expr_int_const { $$ = make_expr2(EXPR_MUL, $1, $3); } > + | expr_int_const '/' expr_int_const { $$ = make_expr2(EXPR_DIV, $1, $3); } > + | expr_int_const '|' expr_int_const { $$ = make_expr2(EXPR_OR , $1, $3); } > + | expr_int_const '^' expr_int_const { $$ = make_expr2(EXPR_XOR, $1, $3); } > + | expr_int_const '&' expr_int_const { $$ = make_expr2(EXPR_AND, $1, $3); } Using "expr_int_const" instead of "expr" here prevents a many forms of expressions from being parsed. > + | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } > + | '(' expr ')' { $$ = $2; } > ; > > expr_const: expr { $$ = $1; It looks like you'll have to find another way of fixing the issue you are trying to fix. -- Rob Shearman

3 2

meaning of "Hardware" field in bugzilla?
by Dan Kegel 13 Dec '09

13 Dec '09

Does "mac" mean "powerpc mac only"? I rather thought it meant "apple macintosh", regardless of cpu. I ask because Austin has just gone through and changed lots of "mac" bugs to "pc" even though the bugs were on Intel macs, which just seems wrong.

8 8

Re: [PATCH] kernel32: Respect the LANG environment variable on Mac OS.
by Ken Thomases 10 Dec '09

10 Dec '09

The call to setenv() has 0 (false) as its third parameter, so that LANG is not overwritten. -Ken On Nov 23, 2009, at 9:12 AM, Charles Davis wrote: > --- > dlls/kernel32/locale.c | 53 > +++++++++++++++++++++++++---------------------- > 1 files changed, 28 insertions(+), 25 deletions(-) > > > > diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c > index fb9b517..d9ea8eb 100644 > --- a/dlls/kernel32/locale.c > +++ b/dlls/kernel32/locale.c > @@ -2925,32 +2925,35 @@ void LOCALE_Init(void) > UINT ansi_cp = 1252, oem_cp = 437, mac_cp = 10000, unix_cp; > > #ifdef __APPLE__ > - /* MacOS doesn't set the locale environment variables so we have to do it ourselves */ > - CFArrayRef preferred_locales, all_locales; > CFStringRef user_language_string_ref = NULL; > - char user_locale[50]; > - char* p; > - > - CFLocaleRef user_locale_ref = CFLocaleCopyCurrent(); > - CFStringRef user_locale_string_ref = CFLocaleGetIdentifier( user_locale_ref ); > - > - CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); > - CFRelease( user_locale_ref ); > - /* Strip modifiers because setlocale() can't parse them. */ > - if ((p = strchr( user_locale, '@' ))) *p = 0; > - if (!strchr( user_locale, '.' )) strcat( user_locale, ".UTF-8" ); > - unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ > - setenv( "LANG", user_locale, 0 ); > - TRACE( "setting locale to '%s'\n", user_locale ); > - > - /* We still want to set the retrieve the preferred language as chosen in > - System Preferences.app, because it can differ from CFLocaleCopyCurrent(). > - */ > - all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); > - preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); > - if (preferred_locales && CFArrayGetCount( preferred_locales )) > - user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ); > - CFRelease( all_locales ); > + if (!getenv( "LANG" )) > + { > + /* MacOS doesn't set the locale environment variables so we have to do it ourselves */ > + CFArrayRef preferred_locales, all_locales; > + char user_locale[50]; > + char* p; > + > + CFLocaleRef user_locale_ref = CFLocaleCopyCurrent(); > + CFStringRef user_locale_string_ref = CFLocaleGetIdentifier( user_locale_ref ); > + > + CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); > + CFRelease( user_locale_ref ); > + /* Strip modifiers because setlocale() can't parse them. */ > + if ((p = strchr( user_locale, '@' ))) *p = 0; > + if (!strchr( user_locale, '.' )) strcat( user_locale, ".UTF-8" ); > + unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ > + setenv( "LANG", user_locale, 0 ); > + TRACE( "setting locale to '%s'\n", user_locale ); > + > + /* We still want to set the retrieve the preferred language as chosen in > + System Preferences.app, because it can differ from CFLocaleCopyCurrent(). > + */ > + all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); > + preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); > + if (preferred_locales && CFArrayGetCount( preferred_locales )) > + user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ); > + CFRelease( all_locales ); > + } > #endif /* __APPLE__ */ > > setlocale( LC_ALL, "" ); > > >

7 19

[PATCH] kernel32: Respect the LANG environment variable on Mac OS.
by Joerg-Cyril.Hoehle＠t-systems.com 09 Dec '09

09 Dec '09

Hi, perhaps I should contribute to this thread given that I indirectly triggered it via bug #20377. IMHO Wine, due to its sandbox nature, needs a way to switch language/locale independently on the desktop settings. Much like gcompris allows to choose a language other than the desktop's. No discussion, the default should be the desktop setting. So here, and in bug #20377, the issue is not the default setting. The issue is how to depart from the default. Now use LANG or LC_xyz to switch? The MacOS Terminal.app (as of 10.5.8) sets/shows very few environment variables. LANG is among them, none of LC_xyz is. Therefore I argue that LANG= is the canonical and reasonable choice for a local override on MacOS. It has the additional benefit of being + what Linux users are typically told to use (quick Google survey); + what the Wine Wiki recommends in http://wiki.winehq.org/TestingLanguages What's the relationship between LC_xyz and LANG? The official answer for programs using glibc is: "the library will test the environment variables LC_ALL, LC_CTYPE, and LANG in that order" But is glibc actually used on MacOS?? The Unicode FAQ says http://www.cl.cam.ac.uk/~mgk25/unicode.html "The LANG environment variable is used to set the default locale for all categories, but the LC_* variables can be used to override individual categories." So I don't understand the isolated recommendation of using LC_MESSAGES in this thread. My use-case is how to mimick a French, or Dutch, or Turkish, or any Asian MS-Windows environment, without switching my desktop to any of these (the "sandbox" idea again). LC_MESSAGES is not enough AFAIK. Ken Thomases writes: >I see no upside at all to changing LANG into an override where that's >not how it functions in any other context. I see no override involved here. On my Mac OSX 10.5.8 which is pretty much a base install, no LC_xyz is set. Therefore LANG does not override any LC_xyz setting. All I ask about LANG is that it overrides the desktop settings. If any LC_xyz were set, I expect them to take priority over LANG, like is documented and quoted above for glib and has been done for years in Linux. >Terminal (at least, recent versions) has a setting in its preferences >to set the locale environment variables in shells it creates. However, >it really only sets LANG according to the Region selected on the Formats >tab. It does not set individual LC_* variables. It completely ignores >the user's preferred language. I fail to see the problem. Only LANG is set, no LC_xyz therefore all UNIX apps launched within Terminal.app (or at least the glibc-based ones) should give a consistent answer, dictated by the LC_xyz/LANG defaulting rules. Should the next Apple update have Terminal.app set LC_xyz instead of LANG, I'd expect wine to obey them, because they take precedence over LANG. So actually, my wish is that Wine follows the LC_ALL/LC_xyz/LANG defaulting rules. Currently it does not. (I still need to check back on the Mac whether Wine follows LC_xyz). >(e.g. Japanese language, U.S. formats) Ken, is the use-case that you have in mind a Japanese user traveling to the U.S. (Jap. language, U.S. region/format)? Terminal.app sets LANG to US which you believe is wrong? My issue is not whether Terminal.app is broken or not. My issue is that if LANG is set, it should be obeyed, so the user gets consistent results (from a UNIX environment point of view). Regards, Jörg Höhle

4 5

winetest + pbuffer + nvidia 190.18 drivers = X crash
by Austin English 08 Dec '09

08 Dec '09

Been happening for a few days...not sure what triggered it, but when coming back from work I see my login screen, which explains the lack of 64-bit tests/appinstall results. I don't know if any of the D3D guys could take a look, but I'd appreciate it... -- -Austin

2 4

Fixing the kernel32:actctx tests on Vista+
by Paul Vriens 03 Dec '09

03 Dec '09

Hi Jacek, You are the original author of these tests. Is there any reason the "test3.manifest" name is reused? The tests currently crash (intermittently on some) on Vista+ and with the attached patch things seem to get better. I'm just renaming one of the manifest files so there are no duplicates in these tests. -- Cheers, Paul.

4 7

New winetricks 20091125: new verbs ie7, alsa, fbo, pbuffer, ...
by Dan Kegel 02 Dec '09

02 Dec '09

Pie's in the oven, time for another winetricks release. Changes in this version: Add experimental dotnet35 verb Add IE7 verb. Based on a patch by Hans Leidekker. Add verbs alsa, audioio, coreaudio, esound, jack, nas, oss to override sound driver Add verbs backbuffer, fbo, pbuffer for setting offscreen rendering buffer Don't crash winecfg if native comctl32 is used Fix gecko to work with wine-1.1.33. Make vc2003toolkit and psdk2003 verbs run on windows On cleanup, remove $WINETRICKS_TMP, not just the files in it Sorted command menu Update Firefox to 3.5.5 Update mpc to latest version, move the exe to Program Files and add it to %PATH% Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com (Bug reports to the issue tracker at the above URL, please.) Thanks to Austin English, Erik Inge Bolsoe, and Hans Leidekker. This message posted in gmail (basic mode) in ie7 in wine.

3 3

Introducing WineTestBot
by Greg Geldorp 02 Dec '09

02 Dec '09

Or, for those who like to be buzzword compliant, the Wine Testing Cloud Service. Inspired by all the talk about testing during WineConf 2009, I set out to fill a gap in Wine testing. Most of the Wine developers don't have access to a battery of Windows machines to run the tests they write/modify on. As a result, there are quite a few regressions in the tests themselves. The WineTestBot provides a whole bunch of Windows machines, ready to accept and run your modified tests. In its current state you can submit Windows executables (most likely cross-compiled on a Linux box) to the bot, which will run it in VMs of your choice. So, how does this work in practice? First, go to https://winetestbot.geldorp.nl and click on "Register" to register an account. Once your account is approved (you'll receive a notification via email) you can log in. After log in, the menu in the sidebar changes to include an item "Submit job". This allows you to upload an .exe from your local system to the bot. You can pick the VMs (Windows versions) you want to run the test on. From the "Home" page you can see the status of your job, by clicking on the job id you get a bit more info about the progress. Once the test is completed, the stdout generated by the test is retrieved from each VM and made available via that web page. The tests are run on VMware ESX VMs, so it's probably not all that useful to run sound and DirectDraw tests on them. Also, no Win9x VMs are available. I haven't set up 64-bit VMs yet, but those should be easy to add. Before each test run, the VMs are reset to a clean snapshot, so no cruft from old tests will be left around. Your test shouldn't take more than 5 minutes, which is more than the WineTest framework allows anyway. For each Windows version, there is a "base" VM and there can be additional VMs too. The idea is that the base VM is running the most up-to-date and most often used variation of that Windows version, so running your test on the base VMs should give you a good indication on how the test behaves. Additionally, you can run your tests on the other variations too. So, for example for XP the base VM is XP Professional SP3, but there are additional VMs like SP2, Media Center Edition, and a non-English version available too. Obviously, even when you use all available VMs you'll cover a very small subset of all possible configurations (most notably you won't test on a single physical system) so please do check http://test.winehq.org after your patch has been accepted to see if you introduced failures on other machines. The plan for the future is to extend this a bit. Speaking from my own experience, I know that programmers like to be as lazy as possible. Which means that having to cross-compile your test before you can send it off to the bot will be seen as a bit of a hurdle. So the next step will be to allow you to upload the git diff instead of a Windows executable. The bot will apply your diff to a git tree and take care of creating the cross-compiled Windows executable, which it will then run on the Windows VMs. Step 3 will be to have the bot watch wine-patches for anything that might impact the tests and do the apply diff/cross-compile/run thing automatically. Obviously I'll be looking at Dan's patch watcher for this 3rd step. Security is a concern, but perhaps more for me than for you :-). I have to trust you not to abuse this system. If you want to do something naughty please do it on your own machine. There are some safeguards in the system, like the timeout. In general, you should not expect any privacy, I do have access to the consoles of the VMs and firewall logs. If you want to use this system for something else than Wine tests, please talk to me first. I'd like to thank Paul Vriens who acted as beta tester and made some valuable suggestions. I welcome feedback so if you have any ideas on how to improve this thing further please let me know. Ge.

5 6

re: RFC: EM_FORMATRANGE Patch for Wine-1.1.33
by Dan Kegel 01 Dec '09

01 Dec '09

I can't do a deep review, but I did see that you have some commented out code, and IIRC AJ doesn't like that. Better to remove it than comment it out. BTW, besides the three apps mentioned in http://bugs.winehq.org/show_bug.cgi?id=6254, what apps depend on this? - Dan

2 1