October 2010 - Wine-devel - list.winehq.org

Re: cmd: Add a space at the end of the first echo'ed batch line [try2]
by Alexandre Julliard 04 Oct '10

04 Oct '10

Alexandre Goujon <ale.goujon(a)gmail.com> writes: > -(a)pwd@>echo Tests for cmd's builtin commands(a)todo_space@ > +(a)pwd@>echo Tests for cmd's builtin commands You'll need to define a @space@ symbol, normal trailing spaces will get mangled. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winex11: choose header exclusiv
by Alexandre Julliard 04 Oct '10

04 Oct '10

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -29,8 +29,7 @@ > > #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H > #include <X11/extensions/xf86vmode.h> > -#endif > -#ifdef HAVE_X11_EXTENSIONS_XF86VMPROTO_H > +#elif defined (HAVE_X11_EXTENSIONS_XF86VMPROTO_H) > #include <X11/extensions/xf86vmproto.h> > #endif This doesn't make sense, all it will most likely achieve is to disable the gamma support. -- Alexandre Julliard julliard(a)winehq.org

1 0

mono packaging, for wine packagers or anyone else who wants to follow along
by Vincent Povirk 04 Oct '10

04 Oct '10

Buried in the 1.3.4 announcement is a tiny, insignificant little change that makes it possible for distributors to package Mono for Wine: mscoree: Search for Mono in some predefined paths before using the registry. As happy as I am to have sneaked this in under the radar, as it were, I guess I'm going to have to tell someone if it's ever going to be useful. I have no plans to make an official Wine Mono distribution. It should be easy enough for anyone to build. We currently do not require any changes in Mono for use with Wine. When we do (and it will be soon), I will try very hard to get the things we need merged upstream. Any managed libraries we need instead of or in addition to those shipped with Mono will have to go in Wine. We don't need a fork yet, and I hope we can keep it that way. Mono installs are generally self-contained and do not interfere with each other. Mono does not have to be installed into a bottle before it can be used. Therefore, I have not programmed any sort of install process into Wine. It will simply search for Mono as needed. If you are a distributor, here is how I recommend you distribute Mono for use with Wine: Download and extract the mono 2.6.7 source tarball from http://ftp.novell.com/pub/mono/sources/mono/mono-2.6.7.tar.bz2 Use the instructions at http://wiki.winehq.org/Mono to cross-compile Mono 2.6.7 using mingw32. Tweak the script if you have to (or just want to), but consider contributing any fixes you have to make back to winezeug. This will create a directory named mono-2.6.7. The contents of that directory should be installed to /usr/share/mono/mono-1.0. To make sure this worked, you should try a simple "Hello World" .NET application in Wine. Wikipedia has an example at https://secure.wikimedia.org/wikipedia/en/wiki/C_sharp_programming_language… that you should be able to save as a .cs file and compile to a .exe file using gmcs. If all is well, you should be able to run that exe file in a clean Wine prefix. In the future, we'll need a mono-2.0 directory as well, so we can keep using newer versions of Mono and get .NET 4.0 support. But we're not there yet. In case all these numbers have not confused you yet, the current version of Mono is 2.6.7. This version uses the Mono Embedding API version 1.0, which is why it needs to be placed in a directory named mono-1.0. It normally includes .NET 1.1 and 2.0 runtimes. It can optionally be compiled with a 4.0 runtime as well, but I don't recommend it. I'm expecting to see Mono 2.8 released "soon". That version will use the Embedding API version 2.0, which Wine can't support yet, but when the time comes it will need to be in a directory named mono-2.0. It will include .NET 2.0 and 4.0 runtimes. .NET 3.0 and 3.5 are not runtimes, which is why they were not included in that list. They use the .NET 2.0 runtime. While Mono 2.8 (and eventually 3.0) is the way forward for .NET 2.0 and 4.0 support, we'll need to also have the 2.6 series available so that we can have a .NET 1.1 runtime. Wine will detect which versions are available and what runtimes they have using a system that I'm working on and hope to have ready "soon", and it will select the correct runtime for whatever it's trying to run, or whatever the program selects using the .NET embedding API. (Also coming soon: the .NET embedding API.) I'm treating Mono as an optional dependency, much like the many native libraries Wine already uses. If it's not there, Wine will gracefully report failure to applications that try to use it, which probably won't work, and print some things to the console. I plan to send some changes soon that happen to cause a Wine without Mono to fail some tests, so I do consider an install that's missing Mono to be broken. But for the most part, the user experience will remain the same as it was before if Mono is missing.

2 1

Question on use of TextMetricsW
by James McKenzie 04 Oct '10

04 Oct '10

All: I am running code like the following in a richedit control to set the font to Courier 12 point font: + static const WCHAR courier[] = {'C','o','u','r','i','e','r',0}; + testFont1 = CreateFontW (12,0,0,0,FW_LIGHT, 0, 0, 0, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | + FF_DONTCARE, courier); + + /*Set test font to be Courier font */ + SendMessageW(hwndRichEdit, WM_SETFONT, (WPARAM)testFont1, MAKELPARAM(TRUE, 0)); + /*Verify font is set */ + SendMessageW(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &CharFont1Unicode); + GetObjectW(testFont1, sizeof(LOGFONTW), &sentLogFont); + ok (!lstrcmpW(sentLogFont.lfFaceName, CharFont1Unicode.szFaceName), "WM_SETFONT set wrong font. " \ + "Font was set to %s or %s, was supposed to be \"Courier\".\n", wine_dbgstr_w(CharFont1Unicode.szFaceName), wine_dbgstr_w(sentLogFont.lfFaceName)); + + ret = GetTextMetricsW (hdc, &tmw); + ok (ret, "GetTextMetricsW failed\n"); + + ok (7 == tmw.tmAveCharWidth, "Average Character Width for Courier 12 is %d\n", tmw.tmAveCharWidth); I also set the font to MS Sans Serif, and two different font sizes for Arial. However, the tmAveCharWidth value remains at 7 and I am of the opinion that this should change for each font change and also for the font size change. Am I doing something improper? Should I clear the tmw structure between calls to GetTextMetricsW? When I run this on native WindowsXP (which I have access to) the average character width changes to 9, but remains the same for all four font types. TTIA. James McKenzie

2 3

Re: kernel32/process: Implement GetLogicalProcessorInformation (rewrite - try 3)
by Mike Kaplinskiy 03 Oct '10

03 Oct '10

On Sun, Oct 3, 2010 at 10:25 AM, Rudolf Mayerhofer <rm(a)eightyfive.net> wrote: >>A rewrite of my previously sent patches in order to avoid changing >>SYSTEM_CPU_INFORMATION. > >>This patch supersedes my previously sent patches: >>[PATCH1/3] include/winternl: Add Logical Processor Information to >>SYSTEM_CPU_INFORMATION (try 3) >>[PATCH2/3] kernel32/process: Implement GetLogicalProcessorInformation() (try > 2) >>[PATCH3/3] ntdll: Retrieve Logical Processor Information from SysFS (try 4) > > Try 2 removes a FIXME which is not needed. > Try 3 changes a FIXME to a WARN when an unknown cache type is found > > > --- > dlls/kernel32/process.c | 272 > ++++++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 270 insertions(+), 2 deletions(-) > > > > > I don't know much about kernel32/ntdll, but I'm pretty sure that you could get this to work through ntdll. NtQuerySystemInformation with SystemProcessorInformation/SystemLogicalProcessorInformation (see http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Syste…) should help. http://native-nt-toolkit.googlecode.com/svn/trunk/ndk/extypes.h (read, don't copy) seems to have a pretty exhaustive set of definitions, but even that's not complete. Some tests for the NT version would be useful. Mike.

1 0

Re: [3/5] mscoree: Add test for creating CLRMetaHost.
by Greg Geldorp 03 Oct '10

03 Oct '10

> 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=5753 > > Your paranoid android. > > === WINEBUILD (build) === > Make in include dir failed Caused by a problem in TestBot, should be fixed now. Greg.

1 0

Re: [5/5] mscoree: Add a test that enumerates .NET runtimes.
by testbot＠testbot.winehq.org 03 Oct '10

03 Oct '10

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=5754 Your paranoid android. === WINEBUILD (build) === Make in include dir failed

1 0

Re: [3/5] mscoree: Add test for creating CLRMetaHost.
by testbot＠testbot.winehq.org 03 Oct '10

03 Oct '10

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=5753 Your paranoid android. === WINEBUILD (build) === Make in include dir failed

1 0

Re: (5th try) winhlp32: Added Hebrew translation
by Paul Vriens 03 Oct '10

03 Oct '10

On 10/03/2010 05:04 PM, Yaron Shahrabani wrote: > + > +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT > + Hi Yaron, This piece should go. And I still have an apply warning for your Makefile.in patch. -- Cheers, Paul.

1 0

Re: cmd: Add a space at the end of the first echo'ed batch line
by Jacek Caban 03 Oct '10

03 Oct '10

On 10/3/10 1:18 PM, Alexandre Goujon wrote: > --- > programs/cmd/tests/batch.c | 2 +- > programs/cmd/wcmdmain.c | 3 +++ > 2 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c > index cc8c020..d7a5e84 100644 > --- a/programs/cmd/tests/batch.c > +++ b/programs/cmd/tests/batch.c > @@ -131,7 +131,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const > }else if(exp_ptr+sizeof(todo_space_cmd)<= exp_end > && !memcmp(exp_ptr, todo_space_cmd, sizeof(todo_space_cmd))) { > exp_ptr += sizeof(todo_space_cmd); > - todo_wine ok(*out_ptr == ' ', "expected space\n"); > + ok(*out_ptr == ' ', "expected space\n"); @todo_space@ is meant to do tests in todo_wine block. You should change @todo_space@ to spec in .exp file instead. If we're convinced that the whole keyword is not useful anymore, the whole handling code should be removed (although I think we'd better keep it). > if(out_ptr< out_end&& *out_ptr == ' ') > out_ptr++; > continue; > diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c > index b50512e..247457a 100644 > --- a/programs/cmd/wcmdmain.c > +++ b/programs/cmd/wcmdmain.c > @@ -1779,8 +1779,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF > if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); > /* Show prompt before batch line IF echo is on and in batch program */ > if (context&& echo_mode&& extraSpace[0]&& (extraSpace[0] != '@')) { > + const WCHAR spc[] = {' ','\0'}; > WCMD_show_prompt(); > WCMD_output_asis(extraSpace); > + /* I don't know why Windows puts a space here but it does */ > + WCMD_output_asis(spc); More tests would be nice. Jacek

2 1