March 2013 - Wine-Devel - list.winehq.org

RE: [1/3] kernel32: Set GetLargestConsoleWindowSize based on screen resolution

by Hugh McMaster

-----Original Message----- From: Ken Thomases [mailto:ken(a)codeweavers.com] Sent: Wednesday, 27 March 2013 11:25 PM To: Hugh McMaster Cc: Wine Developers Subject: Re: [1/3] kernel32: Set GetLargestConsoleWindowSize based on screen resolution On Mar 27, 2013, at 6:41 AM, Hugh McMaster wrote: > This patch modifies the dlls/kernel32 Makefile.in to (1) compile a new source file (screensize.c) (patch 3/3) and (2) add -lX11 to the ExtraDllFlags line. Ken Thomases wrote: >> This approach is untenable. Kernel32 can't be made to depend on X11. It has to still work when X11 isn't available. Also, X11 is just one possible graphics/windowing system that Wine can use, so it's not always the right authority to consult about screen size. A fair point. I hadn't considered that windowing systems such as XFree86 were still in use. I'm too used to using distributions running X11. >>Eric Pouech suggested in the other thread to calculate the console window size in wineconsole, at which point you can use user32 and SystemParametersInfo(). (Discussion continued in other thread). >> Finally, your patch series is broken in the sense that each patch in the series must still be able to compile. You introduce a dependency on screensize.c in the first patch but don't actually provide that source file until the third. So patches are applied one by one and then tested? I thought patches in a series were applied at the same time. Hugh

March 27, 2013

Re: d3dx9 [patch 1/2, try 3]: Implement D3DXSHEvalSphericalLight

by Alexandre Julliard

Nozomi Kodama <nozomi.kodama(a)yahoo.com> writes: > From 3d331ffa908f69ca58686b4601effbb16d89d1da Mon Sep 17 00:00:00 2001 > From: "nozomi.kodama" <nozomi.kodama(a)yahoo.com> > Date: Thu, 14 Mar 2013 18:34:48 -1000 > Subject: d3dx9: Implement D3DXSHEvalSphericalLight It fails on 64-bit: ../../../../wine/tools/runtest -q -P wine -M d3dx9_36.dll -T ../../.. -p d3dx9_36_test.exe.so ../../../../wine/dlls/d3dx9_36/tests/math.c && touch math.ok math.c:2930: Test failed: Red: case 1, order 5: expected[20] = 0.000529, received 0.000529 math.c:2939: Test failed: Green: case 1, order 5: expected[20] = 0.000809, received 0.000809 math.c:2949: Test failed: Blue: case 1, order 5: expected[20] = 0.001089, received 0.001089 math.c:2930: Test failed: Red: case 1, order 6: expected[20] = 0.000529, received 0.000529 math.c:2939: Test failed: Green: case 1, order 6: expected[20] = 0.000809, received 0.000809 math.c:2949: Test failed: Blue: case 1, order 6: expected[20] = 0.001089, received 0.001089 math.c:2930: Test failed: Red: case 2, order 5: expected[20] = -0.000715, received -0.000714 math.c:2939: Test failed: Green: case 2, order 5: expected[20] = -0.001093, received -0.001093 math.c:2949: Test failed: Blue: case 2, order 5: expected[20] = -0.001471, received -0.001471 math.c:2930: Test failed: Red: case 2, order 6: expected[20] = -0.000715, received -0.000714 math.c:2939: Test failed: Green: case 2, order 6: expected[20] = -0.001093, received -0.001093 math.c:2949: Test failed: Blue: case 2, order 6: expected[20] = -0.001471, received -0.001471 make: *** [math.ok] Error 12 -- Alexandre Julliard julliard(a)winehq.org

March 27, 2013

Re: tools/wine.inf: add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key

by Alexandre Julliard

Austin English <austinenglish(a)gmail.com> writes: > Fixes http://bugs.winehq.org/show_bug.cgi?id=22026 It breaks the tests: ../../../tools/runtest -q -P wine -M advapi32.dll -T ../../.. -p advapi32_test.exe.so eventlog.c && touch eventlog.ok eventlog.c:524: Tests skipped: We don't have a backup eventlog to work with eventlog.c:457: Tests skipped: No records in the 'Application' log eventlog.c:835: Test failed: Expected 1 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 2 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 3 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 4 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 5 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 6 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 7 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 8 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 9 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:835: Test failed: Expected 10 records, got 0 eventlog.c:840: Test failed: Expected oldest to be 1 or higher, got 0 eventlog.c:858: Test failed: Expected 10 records, got 0 eventlog.c:863: Tests skipped: No events were written to the eventlog eventlog.c:1086: Test failed: Expected an eventlog file eventlog.c:1113: Test succeeded inside todo block: Could not delete the registry tree : 0 eventlog.c:1120: Test succeeded inside todo block: Expected MoveFileEx to succeed: 1 make: *** [eventlog.ok] Error 24 -- Alexandre Julliard julliard(a)winehq.org

March 27, 2013

Re: Wiki is down

by Dimi Paun

Thanks for the bug report, it should be fixed now. Dimi. On Wed, Mar 27, 2013 at 12:57 PM, Francois Gouget <fgouget(a)free.fr> wrote: > On Mon, 25 Mar 2013, Dimi Paun wrote: > > > Should be up now, the RAID controller on the box died. > > We'll be moving it to a better box soon, stay tuned. > > Do you know what's up with this message? > > Status of sending notification mails: > [en] fracting: Connection to mailserver 'mail.lattica.com' failed: > (101, 'Network is unreachable') > > Note that it was present before the RAID card trouble so it's not > caused by your recent changes. > > See also bug 33231 - Wiki: Trouble sending notification emails > http://bugs.winehq.org/show_bug.cgi?id=33231 > > -- > Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ > tcA thgirypoC muinelliM latigiD eht detaloiv tsuj evah uoY > -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

March 27, 2013

Re: Wiki is down

by Francois Gouget

On Mon, 25 Mar 2013, Dimi Paun wrote: > Should be up now, the RAID controller on the box died. > We'll be moving it to a better box soon, stay tuned. Do you know what's up with this message? Status of sending notification mails: [en] fracting: Connection to mailserver 'mail.lattica.com' failed: (101, 'Network is unreachable') Note that it was present before the RAID card trouble so it's not caused by your recent changes. See also bug 33231 - Wiki: Trouble sending notification emails http://bugs.winehq.org/show_bug.cgi?id=33231 -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ tcA thgirypoC muinelliM latigiD eht detaloiv tsuj evah uoY

March 27, 2013

Re: [1/3] kernel32: Set GetLargestConsoleWindowSize based on screen resolution

by Ken Thomases

On Mar 27, 2013, at 6:41 AM, Hugh McMaster wrote: > This patch modifies the dlls/kernel32 Makefile.in to (1) compile a new source file (screensize.c) (patch 3/3) and (2) add -lX11 to the ExtraDllFlags line. This approach is untenable. Kernel32 can't be made to depend on X11. It has to still work when X11 isn't available. Also, X11 is just one possible graphics/windowing system that Wine can use, so it's not always the right authority to consult about screen size. Eric Pouech suggested in the other thread to calculate the console window size in wineconsole, at which point you can use user32 and SystemParametersInfo(). Finally, your patch series is broken in the sense that each patch in the series must still be able to compile. You introduce a dependency on screensize.c in the first patch but don't actually provide that source file until the third. -Ken

March 27, 2013

Re: [PATCH 1/3] msvcr90: Forward some functions directly to ntdll

by Piotr Caban

On 03/27/13 12:13, Alexandre Julliard wrote: > Piotr Caban <piotr(a)codeweavers.com> writes: > >> These functions are currently forwarded from msvcr90 to msvcrt which >> forwards to ntdll. Naver LINE is crashing while trying to call them. > > Does it work if you remove the forward in msvcrt instead? That would be > a better fix. > Yes, I'll send a fixed version.

March 27, 2013

Re: advapi32: Do not terminate a regular program if it calls StartServiceCtrlDispatcher.

by Alexandre Julliard

Alexander Morozov <amorozov(a)etersoft.ru> writes: > @@ -592,7 +586,26 @@ BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) > services[i] = info; > } > > - service_run_main_thread(); > + disp = HeapAlloc( GetProcessHeap(), 0, sizeof(*disp) ); > + > + if (!(disp->manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ))) > + { > + ERR("failed to open service manager error %u\n", GetLastError()); > + HeapFree( GetProcessHeap(), 0, disp ); > + return FALSE; > + } > + > + disp->pipe = service_open_pipe(); > + if (disp->pipe == INVALID_HANDLE_VALUE) > + { > + WARN("failed to create control pipe error %u\n", GetLastError()); > + CloseServiceHandle( disp->manager ); > + HeapFree( GetProcessHeap(), 0, disp ); > + SetLastError( ERROR_FAILED_SERVICE_CONTROLLER_CONNECT ); > + return FALSE; > + } > + > + service_run_main_thread( disp ); There's no reason to duplicate that code, just do it in service_run_main_thread instead. -- Alexandre Julliard julliard(a)winehq.org

March 27, 2013

Re: [PATCH 1/3] msvcr90: Forward some functions directly to ntdll

by Alexandre Julliard

Piotr Caban <piotr(a)codeweavers.com> writes: > These functions are currently forwarded from msvcr90 to msvcrt which > forwards to ntdll. Naver LINE is crashing while trying to call them. Does it work if you remove the forward in msvcrt instead? That would be a better fix. -- Alexandre Julliard julliard(a)winehq.org

March 27, 2013

Re: urlmon: Fix handling of mailto URIs in CoInternetCombineUrlEx.

by Jacek Caban

Hi Hans, On 03/27/13 10:43, Hans Leidekker wrote: > --- > dlls/urlmon/tests/uri.c | 63 +++++++++++++++++++++++++++++++++++++++++++---- > dlls/urlmon/uri.c | 15 ++++++++--- > 2 files changed, 69 insertions(+), 9 deletions(-) > > diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c > index e5faa81..29bd859 100644 > --- a/dlls/urlmon/tests/uri.c > +++ b/dlls/urlmon/tests/uri.c > @@ -7005,8 +7005,61 @@ static const uri_combine_test uri_combine_tests[] = { > {URL_SCHEME_FILE,S_OK}, > {URLZONE_INVALID,E_NOTIMPL} > } > + }, > + { "http://winehq.org",0, > + "mailto://",0, > + 0,S_OK,FALSE, You are changing parts that are not combining-specific. Since the relative URI is absolute in this case, there is not much happening other than parsing the URI during combining. Those tests are fine, but please add also tests for CreateUri, see uri_tests array. This should be straightforward based on tests you already wrote. > diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c > index 0f6ee31..c6b5166 100644 > --- a/dlls/urlmon/uri.c > +++ b/dlls/urlmon/uri.c > @@ -422,7 +422,7 @@ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data > else if(is_hierarchical_scheme(data->scheme_type) && (*ptr)[0] == '\\' && (*ptr)[1] == '\\') { > *ptr += 2; > return TRUE; > - } else if(check_hierarchical(ptr)) > + } else if(data->scheme_type != URL_SCHEME_MAILTO && check_hierarchical(ptr)) > return TRUE; > > *ptr = start; > @@ -2980,6 +2980,9 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla > const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; > const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; > const BOOL is_mk = data->scheme_type == URL_SCHEME_MK; > + const BOOL is_javascript = data->scheme_type == URL_SCHEME_JAVASCRIPT; > + const BOOL is_mailto = data->scheme_type == URL_SCHEME_MAILTO; > + DWORD offset = 0; > > if(!data->path) { > uri->path_start = -1; > @@ -2996,7 +2999,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla > } > > /* For javascript: URIs, simply copy path part without any canonicalization */ > - if(data->scheme_type == URL_SCHEME_JAVASCRIPT) { > + if(is_javascript) { > if(!computeOnly) > memcpy(uri->canon_uri+uri->canon_len, data->path, data->path_len*sizeof(WCHAR)); > uri->path_len = data->path_len; > @@ -3007,7 +3010,11 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla > /* Windows doesn't allow a "//" to appear after the scheme > * of a URI, if it's an opaque URI. > */ > - if(data->scheme && *(data->path) == '/' && *(data->path+1) == '/') { > + if (is_mailto && *(data->path) == '/' && *(data->path+1) == '/') { > + if (!*(data->path+2)) uri->path_start = -1; > + offset += 2; I think this should be done in parsing phrase, not during canonicalization. Jacek

March 27, 2013