September 2011 - Wine-devel

Remove the legalese from start.exe?
by Francois Gouget 22 Sep '11

22 Sep '11

Start has the following lines at the end of its usage message: "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option.\n" "This is free software, and you are welcome to redistribute it\n" "under certain conditions; run 'start /L' for details.\n" And also this resource: "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU Lesser Public License\n" "as published by the Free Software Foundation; either version 2.1\n" [...] "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n" "\n" "See the COPYING.LIB file for license information.\n" We also have another copy of this copyright notice in shell32 for the 'About Wine' dialog but without the 'start.exe' and 'COPYING.LIB' lines, and with 'This program' replaced with 'Wine'. One more copyright notice we have is this in msrle32.rc: "Wine MS-RLE video codec\n" "Copyright 2002 by Michael Guennewig" Now this is all legalese which is a pain to translate (weird vocabulary) and pretty scary too. And because of the small differences the copyright notice needs to be translated twice (though tools like Virtaal/Launchpad may notice the similarity and prefill a fuzzy translation). Also start.exe and msrle32.dll are the only ones to have these notices which seems pretty inconsistent. So what can we do to make this simpler? The simplest would be to remove all copyright notices from start.rc and msrle32.rc. (we would keep the ones in the source of course). I guess that would require Dan's and Michael's approval. The other options involve separating the strings that change from one tool to the next, from those that stay the same. This way the latter will only appear once in the PO file and thus need to be translated only once. The various parts can then trivially be concatenated when they are displayed. (unfortunately this does not help for the msrle32.rc case) For instance we could decide to only keep the 'COPYING.LIB' string and tack it to the end of the usage message. We could also make things more consistent by doing this in every tool. So in pseudo-code we would have something like this: /* Load the tool-specific usage message */ usage_message = load_string(IDS_USAGE); /* Load the generic copying.lib reference. This one is duplicated in * every tool but always the same. */ copying_reference = load_string(IDS_COPYING); /* Print both */ printf(usage_message); printf(copying_reference); Another option would be to reuse the exact same main copyright notice as in the About Wine dialog since we need to translate that anyway (I think it would work wrapping-wise). So the start.exe pseudo-code for showing the license would be something like this: /* Load the copyright notice header, that is: * start.exe version 0.2 Copyright (C) 2003, Dan Kegel * start.exe is part of Wine. */ notice_header = load_string(IDS_NOTICE_HEADER); /* Load the generic Wine copyright notice. Note that it * says 'Wine' like in the 'About Wine' dialog, not 'This program' * and would be the same in any other Wine tool: * Wine is free software; you can redistribute it and/or modify * ... */ notice_generic = load_string(IDS_NOTICE_GENERIC); /* Load the copyright notice trailer: * * See the COPYING.LIB file for license information. */ notice_trailer = load_string(IDS_NOTICE_TRAILER); /* Print all the parts together */ printf(notice_header); printf(notice_generic); printf(notice_trailer); -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ tcA thgirypoC muinelliM latigiD eht detaloiv tsuj evah uoY

3 4

[PATCH 3/5] winealsa.drv: Use the plughw instead of the hw interface for openening devices.
by Joerg-Cyril.Hoehle＠t-systems.com 22 Sep '11

22 Sep '11

Henri Verbeet [becoming an audio expert now?] wrote: >The default device may for example be a set of USB speakers or an USB >microphone, in which case you'd have just an output or just an input >respectively. My testcase has been to hack mmdevdrv.c and replace "default" with "plug:dmix" or "dmix" which is an output only device. Expected test result is to behave like most testbot.winehq.org and skip capture tests. Actual output (prior to your patch) last time I tried was some failures. I.e. the mmdevapi render and capture tests suggest that there's no default device for testbots that cannot capture. How does your alsa_try_open interact with devices that clang onto the underlying HW resource for several seconds? (PA does this) Regards, Jörg Höhle

2 1

winetest: Missing test.avi and msrle.avi files
by Francois Gouget 22 Sep '11

22 Sep '11

Two Wine tests are skipping tests because they are missing avi test files: * quartz:avisplitter needs a test.avi file: http://source.winehq.org/git/wine.git/?a=history;f=dlls/quartz/tests/avispl… avisplitter.c:210: Tests skipped: Could not read test file "test.avi", skipping test * winmm:mmio needs an msrle.avi file: http://test.winehq.org/data/b6153354dd28c57fb1f92f85df1f1ba751794fc1/mac_fg… mmio.c:77: Tests skipped: msrle.avi file is missing, skipping the test Interestingly there is a test.avi file in the Wine source tree: dlls/qedit/tests/test.avi So where can one procure these test files? Should quartz:avisplitter automatically find qedit:test's test.avi file? Can the missing files be added to Wine? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Avoid the Gates of Hell - use Linux.

2 2

Re: po: Update Russian translation
by Francois Gouget 21 Sep '11

21 Sep '11

This email is likely to get mangled but the gist of it will hopefully survive. > -"Синтаксис:\tIF [NOT] EXIST файл команда\n" > +"Синтаксис: IF [NOT] EXIST файл команда\n" > "IF [NOT] \"строка1\"==\"строка2\" команда\n" > "IF [NOT] ERRORLEVEL число команда\n" I believe the last two lines should be indented. > +"[/I] Если конечный каталог отсутствует и копируется более одного файла,\n" > +"местом назначения считается каталог.\n" [...] > +"[/A] Копирует только файлы с атрибутом \"архивный\".\n" > +"[/M] Копирует только файлы с атрибутом \"архивный\",\n" > +"при этом очищает атрибут.\n" > +"[/D | /D:m-d-y] Копирует только новые файлы или файлы, измененные\n" > +"после указанной даты. Если дата не указана, заменяет все старые файлы\n" > +"существующими новыми.\n" This one too could use some extra indentation where the description wraps to the next line. Also it is missing an extra trailing '\n'. > #: wordpad.rc:174 > msgid "inch" > msgstr "inch" Based on your exchange with Nikolay Sivov it sounds like this could be translated. > #: cmd.rc:291 xcopy.rc:40 > msgctxt "Yes key" > msgid "Y" > msgstr "" [...same for 'No key'...] > #: xcopy.rc:35 > msgid "%s? (Yes|No)\n" > -msgstr "" > +msgstr "%s? (Yes (да)|No (нет))\n" I believe this one is a bit ambiguous because it does not make it clear whether to type 'Yes' or 'да' (only the first character counts as the 'Yes key' anyway). My understanding is that the two standard ways to deal with this are: * "(Yes|No)" -> "(да|нет)" and "Y" -> "д" This is used for languages where typing the translated strings presents no special challenge. * "(Yes|No)" -> "(да (Y)|нет (N))" and "Y" -> "Y" If typing the translated strings is cumbersome for some reason (but I guess it's not the case here). In truth this approach is mostly used for accelerators. I guess that's because Alt cannot be combined with characters composed through dead keys or special input methods, and also because it avoids trouble with accelerator collisions in case two translations start with the same letter (like if 'Yes' and 'No' both both translated to words starting with 'C' for instance). -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Vote Electronique: Les gens qui votent ne décident rien. Ceux qui comptent les votes décident de tout.

3 4

Re: [PATCH 5/5] vbscript: Added const statement tests
by Marvin 21 Sep '11

21 Sep '11

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=14433 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/9] cmd/tests: add tests for command line parsing
by Frédéric Delanoy 21 Sep '11

21 Sep '11

On Tue, Sep 20, 2011 at 01:51, Martin Wilck <mwilck(a)arcor.de> wrote: > This patch adds some tests for command line parsing and treatment > of quotes and special characters in the command line and in program > names and parameters. The .exp file was created using Win XP. > --- > programs/cmd/tests/rsrc.rc | 6 + > programs/cmd/tests/test_cmdline.cmd | 159 ++++++++++++++++++++++ > programs/cmd/tests/test_cmdline.cmd.exp | 219 +++++++++++++++++++++++++++++++ > 3 files changed, 384 insertions(+), 0 deletions(-) > create mode 100755 programs/cmd/tests/test_cmdline.cmd > create mode 100755 programs/cmd/tests/test_cmdline.cmd.exp You might want to do a single "@echo off" at the start of the .cmd file. Echoing every command in the .exp isn't very helpful: you don't want to replicate the .cmd contents in the .exp file. Add comments or "subsections" as is done in test_builtins.cmd if necessary, or even better use descriptive results, like e.g. 'text in single quotes' if possible (Also the @ before every rem or echo just add visual clutter IMHO but that's due to the enabled echo mode)

2 3

re: [PATCH 2/9] cmd: use GetCommandline() rather than argv
by Dan Kegel 21 Sep '11

21 Sep '11

Hi Martin, on my i7 machine, your patch series fails every time for me when run normally. Here's the log: ]] ../../../tools/runtest -q -P wine -M cmd.exe -T ../../.. -p cmd.exe_test.exe.so batch.c && touch batch.ok ]] ... ]] wine: cannot find L"C:\\windows\\system32\\tell;1;;2.exe" ]] batch.c:301: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 50 (got '0 ', wanted '0(a)space@') ]] batch.c:301: Test failed: unexpected char 0x65 position 0 in line 53 (got 'error 9009', wanted '1(a)space@') ]] batch.c:301: Test failed: unexpected char 0x65 position 0 in line 59 (got 'error 9009', wanted '1(a)space@') ]] batch.c:301: Test failed: unexpected char 0x65 position 0 in line 62 (got 'error 9009', wanted '2(a)space@') ]] batch.c:301: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 75 (got '"hi"', wanted '"hi"') ]] batch.c:301: Test failed: unexpected char 0x65 position 0 in line 78 (got 'error 9009', wanted '1(a)space@') ]] batch.c:301: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 81 (got '"\"\\"\\\"\\\\" "\"\\"\\\"\\\\"', wanted '"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\"') ]] batch.c:301: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 90 (got '1 ', wanted '1(a)space@') ]] batch.c:301: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 93 (got '0 ', wanted '0(a)space@') ]] batch.c:301: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 102 (got '3 ', wanted '3(a)space@') ]] Command exited with non-zero status 10 ]] make: *** [batch.ok] Error 10 ]] make: Target `test' not remade because of errors. When run with WINEDEBUG=warn+heap, it passes. Not sure what to make of that, but something's fishy, and the patch should not go in as is. You might try valgrind to see if it turns anything up. - Dan

3 4

Re: po: Update Russian translation
by Nikolay Sivov 21 Sep '11

21 Sep '11

On 9/20/2011 22:33, Alexander Lakhin wrote: > English strings removed, partial translation fixed too. > #: crypt32.rc:53 cryptdlg.rc:31 > -#, fuzzy > msgctxt "Certification Practice Statement" > msgid "CPS" > -msgstr "CPS" > +msgstr "РУЦ" What does that mean exactly? I didn't find such abbreviation anywhere. > #: jscript.rc:48 > -#, fuzzy > msgid "URI to be decoded is incorrect" > msgstr "URI содержит неверные символы" That's not a translation. > #: oleview.rc:114 > msgid "Ask for an in-process handler when calling CoGetClassObject" > msgstr "" > +"Запросить использование обработчика \"в процессе\" при вызове " > +"CoGetClassObject" "Использовать" is better here IMO, you just don't say the way you translated it. > "\n" > "Например:\n" > " wineconsole cmd\n" > -"Запустить командный процессор Wine в консоли Wine\n" > +"Открывает командное приглашение Wine в консоли Wine.\n" > "\n" This was better before change. > #: wordpad.rc:173 > -#, fuzzy > msgctxt "unit: inch" > msgid "in" > -msgstr "in" > +msgstr "дм" There's no common short name for inch AFAIK, "дм" is used for decimetre. > #: wordpad.rc:175 > -#, fuzzy > msgctxt "unit: point" > msgid "pt" > -msgstr "pt" > +msgstr "пт" I'm not sure about this.

2 1

Re: [PATCH 1/2] include: add a generic class factory template
by Octavian Voicu 20 Sep '11

20 Sep '11

On Tue, Sep 20, 2011 at 4:05 PM, Bernhard Loos <bernhardloos(a)googlemail.com> wrote: > +# define __WINE_GENERIC_CF_DLL_MAIN_CONTENT \ > + return __WINE_PS_ENTRY(DllMain(hInstDll, fdwReason, lpv)); I think __WINE_PS_ENTRY needs only be applied to DllMain, not its argument, so second line should read: + return __WINE_PS_ENTRY(DllMain)(hInstDll, fdwReason, lpv); Octavian

1 0

Daily builds of latest Git now available as Ubuntu packages
by Scott Ritchie 20 Sep '11

20 Sep '11

For an easier user testing experience, you can now install the latest git as a convenient Ubuntu package. The instructions are very similar to using the standard Ubuntu packages, however the PPA name is different. Instead of ppa:ubuntu-wine/ppa, you add ppa:ubuntu-wine/daily. >From a terminal: sudo add-apt-repository ppa:ubuntu-wine/daily sudo apt-get update sudo apt-get install wine1.3 The packages are versioned like wine1.3-1.3.27+daily-20110901. Limitations: The major version number is based on the latest released version of the Ubuntu packages, so on release days you might see something like 1.3.27+daily-20110909 which would actually be equivalent 1.3.28. If I get especially behind and don't update the official packages after Monday, you might even see a "1.3.27+daily" that's actually ahead of 1.3.28. In all cases wine --version should return what it normally does, however - this is just the package revision that is being wonky. Possible future: These packages are a convenient way to run some tests that may be much too slow for testbot to run against every patch, such as autohotkey-based application automation. Thanks, Scott Ritchie

6 9