April 2009 - Wine-Commits - list.winehq.org

Piotr Caban : jscript: Added Math_cos implementation.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: fe5785af096b514bb67e59a833e3bef9e622fc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5785af096b514bb67e59a83… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 2 19:55:30 2009 +0200 jscript: Added Math_cos implementation. --- dlls/jscript/math.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index fc1651c..ac487d1 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -212,8 +212,22 @@ static HRESULT Math_ceil(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_cos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, cos(num_val(&v))); + return S_OK; } static HRESULT Math_exp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

André Hentschel : winemaker: Add project-parse function.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: dc21b4f613440706739463f74ca2906063cef5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc21b4f613440706739463f74… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 2 18:53:14 2009 +0200 winemaker: Add project-parse function. --- tools/winemaker | 623 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 606 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc21b4f61344070673946…

1 0

André Hentschel : winemaker: Add workspace-parse function.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: df5c4178a8f84cd4b96362844f00c9f1d4b973ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5c4178a8f84cd4b96362844… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 2 18:53:24 2009 +0200 winemaker: Add workspace-parse function. --- tools/winemaker | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index b35c1ae..1d6800b 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1089,6 +1089,75 @@ sub source_scan_project_file($$$) } ## +# Scans the specified workspace file to find the project files +sub source_scan_workspace_file($); +sub source_scan_workspace_file($) +{ + my $filename=$_[0]; + my $path=dirname($filename); + my @components; + + if (! -e $filename) { + return; + } + + if (!open(FILEIWS,$filename)) { + print STDERR "error: unable to open $filename for reading:\n"; + print STDERR " $!\n"; + return; + } + + my $prj_name; + my $prj_path; + + if ($filename =~ /.dsw$/i) { + while (<FILEIWS>) { + # Remove any trailing CrLf + s/\r\n$/\n/; + + # catch a project definition + if (/^Project:\s\"(.*)\"=(.*)\s-/) { + $prj_name=$1; + $prj_path=$2; + @components=split /[\/\\]+/, $2; + $prj_path=search_from($path, \@components); + print "Name: $prj_name\nPath: $prj_path\n"; + source_scan_project_file(\@main_project,1,$prj_path); + next; + } elsif (/^#/) { + # ignore Comments + } elsif (/\w:/) { + print STDERR "unknown section $_\n"; + } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) { + print "\nFileversion: $3\n"; + } + } + close(FILEIWS); + } elsif ($filename =~ /.sln$/i) { + while (<FILEIWS>) { + # Remove any trailing CrLf + s/\r\n$/\n/; + + # catch a project definition + if (/^Project(.*)=\s*"(.*)",\s*"(.*)",\s*"(.*)"/) { + $prj_name=$2; + $prj_path=$3; + @components=split /[\/\\]+/, $3; + $prj_path=search_from($path, \@components); + print "Name: $prj_name\nPath: $prj_path\n"; + source_scan_project_file(\@main_project,1,$prj_path); + next; + } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) { + print "\nFileversion: $3\n"; + } + } + close(FILEIWS); + } + + @projects=sort { @$a[$P_PATH] cmp @$b[$P_PATH] } @projects; +} + +## # Scans the specified directory to: # - see if we should create a Makefile in this directory. We normally do # so if we find a project file and sources @@ -1572,6 +1641,8 @@ sub source_scan() } elsif (defined $opt_work_file) { if ($opt_work_file =~ /.dsp$/i or $opt_work_file =~ /.vcproj$/i) { source_scan_project_file(\@main_project,0,$opt_work_file); + } elsif ($opt_work_file =~ /.dsw$/i or $opt_work_file =~ /.sln$/i) { + source_scan_workspace_file($opt_work_file); } } } @@ -2425,7 +2496,7 @@ sub usage() print STDERR " [-Dmacro[=defn]] [-Idir] [-Pdir] [-idll] [-Ldir] [-llibrary]\n"; print STDERR " [--nodlls] [--nomsvcrt] [--interactive] [--single-target name]\n"; print STDERR " [--generated-files|--nogenerated-files]\n"; - print STDERR " work_directory|project_file\n"; + print STDERR " work_directory|project_file|workspace_file\n"; print STDERR "\nWinemaker is designed to recursively convert all the Windows sources found in\n"; print STDERR "the specified directory so that they can be compiled with Winelib. During this\n"; print STDERR "process it will modify and rename some of the files in that directory.\n";

1 0

Piotr Caban : jscript: Added Math_LN2 implementation.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: d2aed1b752dabf5bc0b7bfe7432f02c182114c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2aed1b752dabf5bc0b7bfe74… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 2 19:54:39 2009 +0200 jscript: Added Math_LN2 implementation. --- dlls/jscript/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 4f6c049..fc1651c 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -98,8 +98,8 @@ static HRESULT Math_LOG10E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Math_LN2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_LN2, flags, retv); } static HRESULT Math_LN10(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

André Hentschel : winemaker: Update man page.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: 8f74c2b1a77db74c8788eec687c2fb0ebf4bdf8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f74c2b1a77db74c8788eec68… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 2 18:53:28 2009 +0200 winemaker: Update man page. --- tools/winemaker.man.in | 51 +++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 28 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index fc57a3c..e8afb2d 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual" +.TH WINEMAKER 1 "February 2009" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME winemaker \- generate a build infrastructure for compiling Windows programs on Unix .SH SYNOPSIS @@ -21,7 +21,7 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U ] .br [ -.IR "-Dmacro[=defn] " "] [ " "-Idir " "] [ " "-Ldir " "] [ " "-idll" "] [ " "-llibrary " +.IR "-Dmacro[=defn] " "] [ " "-Idir " "] [ " "-Pdir " "] [ " "-idll" "] [ " "-Ldir " "] [ " "-llibrary " ] .br [ @@ -30,7 +30,8 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U .br [ .IR "--generated-files " "] [ " "--nogenerated-files " "] -] +.br +.IR "work_directory" "| " "project_file" "| " "workspace_file" .SH DESCRIPTION .PP @@ -60,11 +61,12 @@ encounters something out of the ordinary, winemaker will warn you about it. the executables and libraries you are trying to build, match them with source files, and generate the corresponding Makefile.in files. .PP -- finally winemaker will generate a global Makefile.in file calling out to all -the others, and a configure script customized for use with Winelib. +- finally winemaker will generate a global Makefile for normal use. .PP - winemaker knows about MFC-based project and will generate customized files. .PP +- winemaker can read existing Projectfiles. It supports dsp, dsw, vcproj and sln files. +.PP .SH OPTIONS .TP .I --nobanner @@ -140,12 +142,15 @@ Adds the specified macro definition to the global list of macro definitions. .I -Idir Appends the specified directory to the global include path. .TP -.I -Ldir -Appends the specified directory to the global library path. +.I -Pdir +Appends the specified directory to the global dll path. .TP .I -idll Adds the Winelib library to the global list of Winelib libraries to import. .TP +.I -Ldir +Appends the specified directory to the global library path. +.TP .I -llibrary Adds the specified library to the global list of libraries to link with. .TP @@ -167,49 +172,39 @@ Tells winemaker not to generate the Makefile. .PP Here is a typical winemaker use: .PP -$ winemaker --lower-uppercase -DSTRICT +$ winemaker --lower-uppercase -DSTRICT . .PP The above tells winemaker to scan the current directory and its subdirectories for source files. Whenever if finds a file or directory which name is all uppercase, it should rename it to lowercase. It should then fix all these source files for compilation with Winelib and generate Makefiles. The '-DSTRICT' specifies that the STRICT macro must be set when compiling -these sources. Finally winemaker will create a global Makefile.in and -configure.in, and run autoconf to generate the configure script. +these sources. Finally winemaker will create a Makefile. .PP The next step would be: .PP -$ ./configure --with-wine=/usr/local/opt/wine -.PP -This generates the makefiles from the Makefile.in files. The generated -makefiles will fetch the Winelib headers and libraries from the Wine -installation located in /usr/local/opt/wine. -.PP -And finally: -.PP $ make .PP If at this point you get compilation errors (which is quite likely for a reasonably sized project) then you should consult the Winelib User Guide to find tips on how to resolve them. .PP -For an MFC-based project one would have run the following commands instead: +For an MFC-based project you would have to run the following commands instead: .PP -$ winemaker --lower-uppercase --mfc -.br -$ ./configure --with-wine=/usr/local/opt/wine \\ +$ winemaker --lower-uppercase --mfc . .br - --with-mfc=/usr/local/opt/mfc +$ make +.PP +For an existing project-file you would have to run the following commands: +.PP +$ winemaker --lower-all myproject.dsp .br $ make .PP .SH TODO / BUGS .PP -Winemaker should support the Visual Studio project files (.dsp for newer -versions and .mak for some older versions). This would allow it to be much -more accurate, especially for the macro, include and library path -settings. +In some cases you will have to edit the Makefile or sourcefiles by yourself. .PP Assuming that the windows executable/library is available, we could use a pedump-like tool to determine what kind of executable it is (graphical @@ -229,7 +224,7 @@ Winemaker does not support message files and the message compiler yet. .PP The Winelib User Guide: .PP -http://wine.codeweavers.com/docs/winelib-user/ +http://www.winehq.org/docs/winelib-guide/index .PP .BR wine (1) .PP

1 0

Piotr Caban : jscript: Added Math_cos tests.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: 49ce878de726a7720740778a9a7a5f71c2d13e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ce878de726a7720740778a9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 2 19:55:44 2009 +0200 jscript: Added Math_cos tests. --- dlls/jscript/tests/api.js | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 310884a..30f2017 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -579,6 +579,36 @@ ok(tmp === Infinity, "Math.abs(-Infinite) = " + tmp); tmp = Math.abs(-3, 2); ok(tmp === 3, "Math.abs(-3, 2) = " + tmp); +tmp = Math.cos(0); +ok(tmp === 1, "Math.cos(0) = " + tmp); + +tmp = Math.cos(Math.PI/2); +ok(Math.floor(tmp*100) === 0, "Math.cos(Math.PI/2) = " + tmp); + +tmp = Math.cos(-Math.PI/2); +ok(Math.floor(tmp*100) === 0, "Math.cos(-Math.PI/2) = " + tmp); + +tmp = Math.cos(Math.PI/3, 2); +ok(Math.floor(tmp*100) === 50, "Math.cos(Math.PI/3, 2) = " + tmp); + +tmp = Math.cos(true); +ok(Math.floor(tmp*100) === 54, "Math.cos(true) = " + tmp); + +tmp = Math.cos(false); +ok(tmp === 1, "Math.cos(false) = " + tmp); + +tmp = Math.cos(); +ok(isNaN(tmp), "Math.cos() is not NaN"); + +tmp = Math.cos(NaN); +ok(isNaN(tmp), "Math.cos(NaN) is not NaN"); + +tmp = Math.cos(Infinity); +ok(isNaN(tmp), "Math.cos(Infinity) is not NaN"); + +tmp = Math.cos(-Infinity); +ok(isNaN(tmp), "Math.cos(-Infinity) is not NaN"); + tmp = Math.pow(2, 2); ok(tmp === 4, "Math.pow(2, 2) = " + tmp);

1 0

Paul Chitescu : ntdll: Print desired version of missing dependent assemblies.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: de66f257d68d73d41d9a7dedf42bb822721730f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de66f257d68d73d41d9a7dedf… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Thu Apr 2 21:00:07 2009 +0300 ntdll: Print desired version of missing dependent assemblies. --- dlls/ntdll/actctx.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 3744904..a1b1e3b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2022,7 +2022,9 @@ static NTSTATUS parse_depend_manifests(struct actctx_loader* acl) { if (!acl->dependencies[i].optional) { - FIXME( "Could not find dependent assembly %s\n", debugstr_w(acl->dependencies[i].name) ); + FIXME( "Could not find dependent assembly %s (%s)\n", + debugstr_w(acl->dependencies[i].name), + debugstr_version(&acl->dependencies[i].version) ); status = STATUS_SXS_CANT_GEN_ACTCTX; break; }

1 0

André Hentschel : winemaker: winresrc. h is the right name.
by Alexandre Julliard April 3, 2009

April 3, 2009

Module: wine Branch: master Commit: 47b1bffd02c1f16ffc98c110fd90842234c8fcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b1bffd02c1f16ffc98c110f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 2 18:53:12 2009 +0200 winemaker: winresrc.h is the right name. --- tools/winemaker | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 56597c3..8221c88 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1301,17 +1301,17 @@ sub fix_file($$$) if ($is_rc and !$is_mfc and /^(\s*)(\#\s*include\s*)\"afxres\.h\"/) { # VC6 automatically includes 'afxres.h', an MFC specific header, in # the RC files it generates (even in non-MFC projects). So we replace - # it with 'winres.h' its very close standard cousin so that non MFC + # it with 'winresrc.h' its very close standard cousin so that non MFC # projects can compile in Wine without the MFC sources. my $warning="mfc:afxres.h"; if (!defined $warnings{$warning}) { $warnings{$warning}="1"; - print STDERR "warning: In non-MFC projects, winemaker replaces the MFC specific header 'afxres.h' with 'winres.h'\n"; + print STDERR "warning: In non-MFC projects, winemaker replaces the MFC specific header 'afxres.h' with 'winresrc.h'\n"; print STDERR "warning: the above warning is issued only once\n"; } print FILEO "$1/* winemaker: $2\"afxres.h\" */\n"; - print FILEO "$1/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */\n"; - print FILEO "$1$2\"winres.h\"$'"; + print FILEO "$1/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winresrc.h' */\n"; + print FILEO "$1$2\"winresrc.h\"$'"; $modified=1; } elsif (/^(\s*\#\s*include\s*)([\"<])([^\"]+)([\">])/) { @@ -1473,7 +1473,7 @@ sub fix_file($$$) print FILEO; } elsif ($rc_textinclude_state == 3 and /^(\s*\"\#\s*include\s*\"\")afxres\.h(\"\"\\r\\n\")/) { - print FILEO "$1winres.h$2$'"; + print FILEO "$1winresrc.h$2$'"; $modified=1; } elsif (/^\s*BEGIN(\W.*)?$/) {

1 0

Nikolay Sivov : comctl32: Additional tests for ListView header creation.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 6b6d18d766893ff10a38a4efbbe5ef4ef8e9828b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6d18d766893ff10a38a4efb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 2 07:56:30 2009 -0400 comctl32: Additional tests for ListView header creation. --- dlls/comctl32/tests/listview.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9157ec0..84db3d2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -820,11 +820,11 @@ static void test_create(void) hList = CreateWindow("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); ret = SetWindowLongPtr(hList, GWL_STYLE, GetWindowLongPtr(hList, GWL_STYLE) | LVS_REPORT); - ok(ret = WS_VISIBLE, "Style wrong, should be WS_VISIBLE|LVS_ICON\n"); + ok(ret & WS_VISIBLE, "Style wrong, should have WS_VISIBLE\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header should be created\n"); ret = SetWindowLongPtr(hList, GWL_STYLE, GetWindowLong(hList, GWL_STYLE) & ~LVS_REPORT); - ok(ret = WS_VISIBLE|LVS_REPORT, "Style wrong, should be WS_VISIBLE|LVS_REPORT\n"); + ok((ret & WS_VISIBLE) && (ret & LVS_REPORT), "Style wrong, should have WS_VISIBLE|LVS_REPORT\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header should be created\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); @@ -835,13 +835,13 @@ static void test_create(void) GetModuleHandle(NULL), 0); ret = SetWindowLongPtr(hList, GWL_STYLE, (GetWindowLongPtr(hList, GWL_STYLE) & ~LVS_LIST) | LVS_REPORT); - ok(ret = WS_VISIBLE|LVS_LIST, "Style wrong, should be WS_VISIBLE|LVS_ICON\n"); + ok(((ret & WS_VISIBLE) && (ret & LVS_LIST)), "Style wrong, should have WS_VISIBLE|LVS_LIST\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header shouldn't be created\n"); ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); ret = SetWindowLongPtr(hList, GWL_STYLE, (GetWindowLongPtr(hList, GWL_STYLE) & ~LVS_REPORT) | LVS_LIST); - ok(ret = WS_VISIBLE|LVS_REPORT, "Style wrong, should be WS_VISIBLE|LVS_REPORT\n"); + ok(((ret & WS_VISIBLE) && (ret & LVS_REPORT)), "Style wrong, should have WS_VISIBLE|LVS_REPORT\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header shouldn't be created\n"); ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); @@ -863,6 +863,18 @@ static void test_create(void) ok(IsWindow(hHeader), "Header should be created\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + + /* LVS_REPORT without WS_VISIBLE, try to show it */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ShowWindow(hList, SW_SHOW); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header shouldn't be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + DestroyWindow(hList); } static void test_redraw(void)

1 0

Rein Klazes : user32/tests: In sysparams fix another case where a test changes a users desktop setting .
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: ebbf99abce391fb08467616cf07d91c2256be780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbf99abce391fb08467616cf… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 2 11:37:13 2009 +0200 user32/tests: In sysparams fix another case where a test changes a users desktop setting. Made several tests pass on NT4 (no SP), Vista and Win2k8. --- dlls/user32/tests/sysparams.c | 53 ++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d7adfa4..165226a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -709,11 +709,15 @@ static void test_SPI_SETBORDER( void ) /* 6 */ BOOL rc; UINT old_border; NONCLIENTMETRICSA ncmsave; - INT CaptionWidth; + INT CaptionWidth, + PaddedBorderWidth; ncmsave.cbSize = sizeof( ncmsave); rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0); - ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); + if( !rc) { + win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); + return; + } /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP). * Fix this so we can safely restore settings with the nonclientmetrics */ @@ -735,8 +739,10 @@ static void test_SPI_SETBORDER( void ) /* 6 */ if (!test_error_msg(rc,"SPI_{GET,SET}BORDER")) return; /* FIXME: include new PaddedBorderWidth parameter */ - if( old_border != ncmsave.iBorderWidth){ - win_skip( "Can not reliable restore border width yet\n"); + PaddedBorderWidth = ncmsave.iBorderWidth - old_border; + if( PaddedBorderWidth){ + win_skip( "Can not reliable restore border width yet (PaddedBorderWidth = %d)\n", + PaddedBorderWidth); return; } /* This will restore sane values if the test hang previous run. */ @@ -1395,6 +1401,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ Ncmstart.cbSize = sizeof(NONCLIENTMETRICSA); trace("testing SPI_{GET,SET}NONCLIENTMETRICS\n"); + change_counter = 0; SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, FALSE ); if (!test_error_msg(rc,"SPI_{GET,SET}NONCLIENTMETRICS")) @@ -1448,7 +1455,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); /* test registry entries */ TEST_NONCLIENTMETRICS_REG( Ncmcur) - /* test the systemm metrics with these settings */ + /* test the system metrics with these settings */ test_GetSystemMetrics(); /* now for something invalid: increase the {menu|caption|smcaption} fonts by a large amount will increase the {menu|caption|smcaption} height*/ @@ -1483,19 +1490,22 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ "SmCaptionHeight: %d expected %d\n", Ncmcur.iSmCaptionHeight, expect); ok( Ncmcur.iCaptionWidth == 8 || + Ncmcur.iCaptionWidth == 12 || /* Vista, W7b */ Ncmcur.iCaptionWidth == Ncmstart.iCaptionWidth, /* with windows XP theme, the value never changes */ - "CaptionWidth: %d expected 8\n", Ncmcur.iCaptionWidth); + "CaptionWidth: %d expected 8, 12 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); ok( Ncmcur.iScrollWidth == 8, "ScrollWidth: %d expected 8\n", Ncmcur.iScrollWidth); ok( Ncmcur.iScrollHeight == 8, "ScrollHeight: %d expected 8\n", Ncmcur.iScrollHeight); - /* test the systemm metrics with these settings */ + /* test the system metrics with these settings */ test_GetSystemMetrics(); /* restore */ rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); test_change_message( SPI_SETNONCLIENTMETRICS, 0 ); ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); + /* test the system metrics with these settings */ + test_GetSystemMetrics(); } static void test_SPI_SETMINIMIZEDMETRICS( void ) /* 44 */ @@ -2414,6 +2424,14 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETMOUSEBUTTONSWAP(); /* 33 */ test_SPI_SETFASTTASKSWITCH(); /* 36 */ test_SPI_SETDRAGFULLWINDOWS(); /* 37 */ + /* test_WM_DISPLAYCHANGE seems to be somewhat buggy on + * some versions of Windows (Vista, Win2k8, Win7B) in that + * not all metrics are properly restored. Problems are + * SM_CXMAXTRACK, SM_CYMAXTRACK + * Fortunately setting the Non-Client metrics like in + * test_SPI_SETNONCLIENTMETRICS will corect this. That is why + * we do the DISPLAY change now... */ + test_WM_DISPLAYCHANGE(); test_SPI_SETNONCLIENTMETRICS(); /* 42 */ test_SPI_SETMINIMIZEDMETRICS(); /* 44 */ test_SPI_SETICONMETRICS(); /* 46 */ @@ -2433,7 +2451,6 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETWHEELSCROLLCHARS(); /* 108 */ test_SPI_SETWALLPAPER(); /* 115 */ - test_WM_DISPLAYCHANGE(); SendMessageA( ghTestWnd, WM_DESTROY, 0, 0 ); return 0; @@ -2514,10 +2531,11 @@ static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; UINT IconSpacing, IconVerticalSpacing; + BOOL rc; HDC hdc = CreateIC( "Display", 0, 0, 0); UINT avcwCaption; - INT CaptionWidth; + INT CaptionWidthfromreg; MINIMIZEDMETRICS minim; NONCLIENTMETRICS ncm; SIZE screen; @@ -2525,11 +2543,14 @@ static void test_GetSystemMetrics( void) minim.cbSize = sizeof( minim); ncm.cbSize = sizeof( ncm); SystemParametersInfo( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); - SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); - + rc = SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + if( !rc) { + win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); + return; + } /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP) */ - CaptionWidth = metricfromreg( + CaptionWidthfromreg = metricfromreg( "Control Panel\\Desktop\\WindowMetrics","CaptionWidth", dpi); get_text_metr_size( hdc, &ncm.lfMenuFont, &tmMenuFont, NULL); get_text_metr_size( hdc, &ncm.lfCaptionFont, NULL, &avcwCaption); @@ -2573,8 +2594,8 @@ static void test_GetSystemMetrics( void) /* SM_RESERVED2 */ /* SM_RESERVED3 */ /* SM_RESERVED4 */ - ok_gsm( SM_CXMIN, 3 * max( CaptionWidth, 8) + GetSystemMetrics( SM_CYSIZE) + - 4 + 4 * avcwCaption + 2 * GetSystemMetrics( SM_CXFRAME)); + ok_gsm( SM_CXMIN, 3 * max( CaptionWidthfromreg >= 0 ? CaptionWidthfromreg : ncm.iCaptionWidth, 8) + + GetSystemMetrics( SM_CYSIZE) + 4 + 4 * avcwCaption + 2 * GetSystemMetrics( SM_CXFRAME)); ok_gsm( SM_CYMIN, GetSystemMetrics( SM_CYCAPTION) + 2 * GetSystemMetrics( SM_CYFRAME)); ok_gsm_2( SM_CXSIZE, @@ -2661,8 +2682,8 @@ static void test_GetSystemMetrics( void) ncm.iBorderWidth, ncm.iCaptionWidth, ncm.iCaptionHeight, IconSpacing, IconVerticalSpacing); trace( "MenuHeight %d MenuWidth %d ScrollHeight %d ScrollWidth %d SmCaptionHeight %d SmCaptionWidth %d\n", ncm.iMenuHeight, ncm.iMenuWidth, ncm.iScrollHeight, ncm.iScrollWidth, ncm.iSmCaptionHeight, ncm.iSmCaptionWidth); - trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d\n", - avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidth); + trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d screen %d,%d\n", + avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidthfromreg, screen.cx, screen.cy); } ReleaseDC( 0, hdc); }

1 0