February 2009 - Wine-commits

Francois Gouget : snmpapi/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 392b8cc6897e12d618f984c7321564228cfe2b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392b8cc6897e12d618f984c73… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:29:38 2009 +0100 snmpapi/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/snmpapi/tests/util.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 7ef36fb..7973917 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -550,24 +550,24 @@ START_TEST(util) test_SnmpUtilOidToA(); if (!pSnmpUtilAsnAnyCpy || !pSnmpUtilAsnAnyFree) - skip("SnmpUtilAsnAnyCpy and/or SnmpUtilAsnAnyFree not available\n"); + win_skip("SnmpUtilAsnAnyCpy and/or SnmpUtilAsnAnyFree not available\n"); else test_SnmpUtilAsnAnyCpyFree(); if (!pSnmpUtilOctetsCpy || !pSnmpUtilOctetsFree) - skip("SnmpUtilOctetsCpy and/or SnmpUtilOctetsFree not available\n"); + win_skip("SnmpUtilOctetsCpy and/or SnmpUtilOctetsFree not available\n"); else test_SnmpUtilOctetsCpyFree(); test_SnmpUtilOidCpyFree(); if (!pSnmpUtilOctetsNCmp) - skip("SnmpUtilOctetsNCmp not available\n"); + win_skip("SnmpUtilOctetsNCmp not available\n"); else test_SnmpUtilOctetsNCmp(); if (!pSnmpUtilOctetsCmp) - skip("SnmpUtilOctetsCmp not available\n"); + win_skip("SnmpUtilOctetsCmp not available\n"); else test_SnmpUtilOctetsCmp();

1 0

Francois Gouget : dplayx/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: d5b324e362c556409f4a951de0832c17e31429b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b324e362c556409f4a951de… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:28:16 2009 +0100 dplayx/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/dplayx/tests/dplayx.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 00224bd..2d14584 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1274,7 +1274,7 @@ static void test_EnumSessions(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "EnumSessions not implemented\n" ); + todo_wine win_skip( "EnumSessions not implemented\n" ); return; } @@ -1623,7 +1623,7 @@ static void test_SessionDesc(void) if ( hr == DPERR_UNINITIALIZED ) { - skip("Get/SetSessionDesc not implemented\n"); + todo_wine win_skip("Get/SetSessionDesc not implemented\n"); return; } @@ -1793,7 +1793,7 @@ static void test_CreatePlayer(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "CreatePlayer not implemented\n" ); + todo_wine win_skip( "CreatePlayer not implemented\n" ); return; } @@ -1975,7 +1975,7 @@ static void test_GetPlayerCaps(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "GetPlayerCaps not implemented\n" ); + todo_wine win_skip( "GetPlayerCaps not implemented\n" ); return; } @@ -2140,7 +2140,7 @@ static void test_PlayerData(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "Get/SetPlayerData not implemented\n" ); + todo_wine win_skip( "Get/SetPlayerData not implemented\n" ); return; } @@ -2395,7 +2395,7 @@ static void test_PlayerName(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "Get/SetPlayerName not implemented\n" ); + todo_wine win_skip( "Get/SetPlayerName not implemented\n" ); return; } @@ -2651,7 +2651,7 @@ static void test_GetPlayerAccount(void) if ( hr == DP_OK ) { - skip( "GetPlayerAccount not implemented\n" ); + todo_wine win_skip( "GetPlayerAccount not implemented\n" ); return; } @@ -2835,7 +2835,7 @@ static void test_GetPlayerAddress(void) if ( hr == DP_OK ) { - skip( "GetPlayerAddress not implemented\n" ); + todo_wine win_skip( "GetPlayerAddress not implemented\n" ); return; } @@ -2967,7 +2967,7 @@ static void test_GetPlayerFlags(void) if ( hr == DP_OK ) { - skip( "GetPlayerFlags not implemented\n" ); + todo_wine win_skip( "GetPlayerFlags not implemented\n" ); return; } @@ -3092,7 +3092,7 @@ static void test_CreateGroup(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "CreateGroup not implemented\n" ); + todo_wine win_skip( "CreateGroup not implemented\n" ); return; } @@ -3381,7 +3381,7 @@ static void test_GroupOwner(void) if ( hr == DP_OK ) { - skip( "GetGroupOwner not implemented\n" ); + todo_wine win_skip( "GetGroupOwner not implemented\n" ); return; } @@ -3568,7 +3568,7 @@ static void test_EnumPlayers(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "EnumPlayers not implemented\n" ); + todo_wine win_skip( "EnumPlayers not implemented\n" ); return; } @@ -3889,7 +3889,7 @@ static void test_EnumGroups(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "EnumGroups not implemented\n" ); + todo_wine win_skip( "EnumGroups not implemented\n" ); return; } @@ -4107,7 +4107,7 @@ static void test_EnumGroupsInGroup(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "EnumGroupsInGroup not implemented\n" ); + todo_wine win_skip( "EnumGroupsInGroup not implemented\n" ); return; } @@ -4333,7 +4333,7 @@ static void test_groups_p2p(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "dplay not implemented enough for this test yet\n" ); + todo_wine win_skip( "dplay not implemented enough for this test yet\n" ); return; } @@ -4568,7 +4568,7 @@ static void test_groups_cs(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "dplay not implemented enough for this test yet\n" ); + todo_wine win_skip( "dplay not implemented enough for this test yet\n" ); return; } @@ -4814,7 +4814,7 @@ static void test_Send(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "Send not implemented\n" ); + todo_wine win_skip( "Send not implemented\n" ); return; } @@ -5136,7 +5136,7 @@ static void test_Receive(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "Receive not implemented\n" ); + todo_wine win_skip( "Receive not implemented\n" ); return; } @@ -5409,7 +5409,7 @@ static void test_GetMessageCount(void) if ( hr == DP_OK ) { - skip( "GetMessageCount not implemented\n" ); + todo_wine win_skip( "GetMessageCount not implemented\n" ); return; } @@ -5633,7 +5633,7 @@ static void test_GetMessageQueue(void) if ( hr == DP_OK ) { - skip( "GetMessageQueue not implemented\n" ); + todo_wine win_skip( "GetMessageQueue not implemented\n" ); return; } @@ -5950,7 +5950,7 @@ static void test_remote_data_replication(void) if ( hr == DPERR_UNINITIALIZED ) { - skip( "dplay not implemented enough for this test yet\n" ); + todo_wine win_skip( "dplay not implemented enough for this test yet\n" ); return; }

1 0

Francois Gouget : d3d9/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 3be66542595d2b999a5f10c1e40d6fc53c933a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be66542595d2b999a5f10c1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:27:26 2009 +0100 d3d9/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/d3d9/tests/d3d9ex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index c5d83b0..ad19b5e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -199,7 +199,7 @@ START_TEST(d3d9ex) pDirect3DCreate9Ex = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9Ex"); if (!pDirect3DCreate9Ex) { - skip("Failed to get address of Direct3DCreate9Ex\n"); + win_skip("Failed to get address of Direct3DCreate9Ex\n"); return; }

1 0

Francois Gouget : winemaker: Fix handling of the global settings specified on the command line.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 786a2cda6415564e2d93164f83725aa5fcda800f URL: http://source.winehq.org/git/wine.git/?a=commit;h=786a2cda6415564e2d93164f8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:33:48 2009 +0100 winemaker: Fix handling of the global settings specified on the command line. Now that we no longer have a global Make.rules file, include them in each Makefile. --- tools/winemaker | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 078ef44..56597c3 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -307,13 +307,18 @@ my $P_TARGETS=2; # - set the project's path # - initialize the target list # - create a default target (will be removed later if unnecessary) -sub project_init($$) +sub project_init($$$) { - my $project=$_[0]; - my $path=$_[1]; + my ($project, $path, $global_settings)=@_; my $project_settings=[]; target_init($project_settings); + @$project_settings[$T_DEFINES]=[@{@$global_settings[$T_DEFINES]}]; + @$project_settings[$T_INCLUDE_PATH]=[@{@$global_settings[$T_INCLUDE_PATH]}]; + @$project_settings[$T_DLL_PATH]=[@{@$global_settings[$T_DLL_PATH]}]; + @$project_settings[$T_DLLS]=[@{@$global_settings[$T_DLLS]}]; + @$project_settings[$T_LIBRARY_PATH]=[@{@$global_settings[$T_LIBRARY_PATH]}]; + @$project_settings[$T_LIBRARIES]=[@{@$global_settings[$T_LIBRARIES]}]; @$project[$P_PATH]=$path; @$project[$P_SETTINGS]=$project_settings; @@ -551,7 +556,7 @@ sub source_scan_directory($$$$) $project=$parent_project; } else { $project=[]; - project_init($project,$path); + project_init($project, $path, \@global_settings); } my $project_settings=@$project[$P_SETTINGS]; @@ -1622,8 +1627,10 @@ sub generate_project_files($) generate_list("CEXTRA",1,@$project_settings[$T_CEXTRA]); generate_list("CXXEXTRA",1,@$project_settings[$T_CXXEXTRA]); generate_list("RCEXTRA",1,@$project_settings[$T_RCEXTRA]); + generate_list("DEFINES",1,@$project_settings[$T_DEFINES]); generate_list("INCLUDE_PATH",1,@$project_settings[$T_INCLUDE_PATH]); generate_list("DLL_PATH",1,@$project_settings[$T_DLL_PATH]); + generate_list("DLL_IMPORTS",1,@$project_settings[$T_DLLS]); generate_list("LIBRARY_PATH",1,@$project_settings[$T_LIBRARY_PATH]); generate_list("LIBRARIES",1,@$project_settings[$T_LIBRARIES]); print FILEO "\n\n"; @@ -1748,7 +1755,7 @@ sub generate_project_files($) if (@{@$project[$P_TARGETS]} > 0) { print FILEO "### Target specific build rules\n"; - print FILEO "DEFLIB = \$(LIBRARY_PATH) \$(LIBRARIES) \$(DLL_PATH)\n\n"; + print FILEO "DEFLIB = \$(LIBRARY_PATH) \$(LIBRARIES) \$(DLL_PATH) \$(DLL_IMPORTS:%=-l%)\n\n"; foreach my $target (@{@$project[$P_TARGETS]}) { my $canon=canonize("@$target[$T_NAME]"); $canon =~ s/_so$//; @@ -1933,7 +1940,7 @@ if ($opt_no_banner == 0) { print_banner(); } -project_init(\@main_project,""); +project_init(\@main_project, "", \@global_settings); # Fix the file and directory names fix_file_and_directory_names(".");

1 0

Francois Gouget : d3d8/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: bd14f24b6986bff44d3a932ceb429fc00fdac2da URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd14f24b6986bff44d3a932ce… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:27:18 2009 +0100 d3d8/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/d3d8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 826061b..f622e1f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -623,7 +623,7 @@ static void test_cursor(void) pGetCursorInfo = (void *)GetProcAddress(user32_handle, "GetCursorInfo"); if (!pGetCursorInfo) { - skip("GetCursorInfo is not available\n"); + win_skip("GetCursorInfo is not available\n"); return; }

1 0

Francois Gouget : winemaker: Fix invalid usage of {open,close}dir() in fix_file_and_directory_names(). .
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: d4fddfb4bc1b2537639cb82c8802793ea251414f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fddfb4bc1b2537639cb82c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 25 10:32:36 2009 +0100 winemaker: Fix invalid usage of {open,close}dir() in fix_file_and_directory_names(). . Reuse our caching mechanism (get_directory_contents()), but clear the cache if we have modified a directory's content. --- tools/winemaker | 75 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 32 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 8c78987..078ef44 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -447,6 +447,14 @@ sub get_directory_contents($) return $directory; } +## +# Removes a directory from the cache. +# This is needed if one of its files or subdirectory has been renamed. +sub clear_directory_cache($) +{ + my ($dirname)=@_; + delete $directories{$dirname}; +} ##### @@ -604,7 +612,6 @@ sub source_scan_directory($$$$) } } } - closedir(DIRECTORY); if ($has_headers) { push @{@$project_settings[$T_INCLUDE_PATH]},"-I."; @@ -997,10 +1004,11 @@ sub fix_file_and_directory_names($) { my $dirname=$_[0]; - if (opendir(DIRECTORY, "$dirname")) { - foreach my $dentry (readdir DIRECTORY) { + my $directory=get_directory_contents($dirname); + foreach my $dentry (@$directory) + { if ($dentry =~ /^\./ or $dentry eq "CVS") { - next; + next; } # Set $warn to 1 if the user should be warned of the renaming my $warn; @@ -1008,49 +1016,52 @@ sub fix_file_and_directory_names($) if (-f "$dirname/$dentry") { - # Don't rename Winemaker's makefiles - next if ($dentry eq "Makefile" and - `head -n 1 "$dirname/$dentry"` =~ /Generated by Winemaker/); - - # Leave non-source files alone - next if ($new_name !~ /(^makefile|\.(c|cpp|h|rc))$/i); - - # Only all lowercase extensions are supported (because of - # rules like '.c.o:'. - $new_name =~ s/\.C$/.c/; - $new_name =~ s/\.cpp$/.cpp/i; - $warn=1 if ($new_name =~ s/\.cxx$/.cpp/i); - $new_name =~ s/\.rc$/.rc/i; - # And this last one is to avoid confusion then running make - $warn=1 if ($new_name =~ s/^makefile$/makefile.win/i); + # Don't rename Winemaker's makefiles + next if ($dentry eq "Makefile" and + `head -n 1 "$dirname/$dentry"` =~ /Generated by Winemaker/); + + # Leave non-source files alone + next if ($new_name !~ /(^makefile|\.(c|cpp|h|rc))$/i); + + # Only all lowercase extensions are supported (because of + # rules like '.c.o:'. + $new_name =~ s/\.C$/.c/; + $new_name =~ s/\.cpp$/.cpp/i; + $warn=1 if ($new_name =~ s/\.cxx$/.cpp/i); + $new_name =~ s/\.rc$/.rc/i; + # And this last one is to avoid confusion then running make + $warn=1 if ($new_name =~ s/^makefile$/makefile.win/i); } # Adjust the case to the user's preferences if (($opt_lower == $OPT_LOWER_ALL and $dentry =~ /[A-Z]/) or ($opt_lower == $OPT_LOWER_UPPERCASE and $dentry !~ /[a-z]/) ) { - $new_name=lc $new_name; + $new_name=lc $new_name; } # autoconf and make don't support these characters well $new_name =~ s/[ \$]/_/g; # And finally, perform the renaming - if ($new_name ne $dentry) { - if ($warn) { - print STDERR "warning: in \"$dirname\", renaming \"$dentry\" to \"$new_name\"\n"; - } - if (!rename("$dirname/$dentry","$dirname/$new_name")) { - print STDERR "error: in \"$dirname\", unable to rename \"$dentry\" to \"$new_name\"\n"; - print STDERR " $!\n"; - $new_name=$dentry; - } + if ($new_name ne $dentry) + { + if ($warn) { + print STDERR "warning: in \"$dirname\", renaming \"$dentry\" to \"$new_name\"\n"; + } + if (!rename("$dirname/$dentry","$dirname/$new_name")) { + print STDERR "error: in \"$dirname\", unable to rename \"$dentry\" to \"$new_name\"\n"; + print STDERR " $!\n"; + $new_name=$dentry; + } + else + { + clear_directory_cache($dirname); + } } if (-d "$dirname/$new_name") { - fix_file_and_directory_names("$dirname/$new_name"); + fix_file_and_directory_names("$dirname/$new_name"); } - } - closedir(DIRECTORY); } }

1 0

Michael Stefaniuc : winemp3.acm: Remove the commented out III_dequantize_sample_ms function.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 2dc90652fbece2967494aaeb720bc32a1e4dfbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc90652fbece2967494aaeb7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 25 10:29:38 2009 +0100 winemp3.acm: Remove the commented out III_dequantize_sample_ms function. It was already commented out when it was imported into Wine back in 2002. --- dlls/winemp3.acm/layer3.c | 415 --------------------------------------------- 1 files changed, 0 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2dc90652fbece2967494a…

1 0

Alexandre Julliard : user32/tests: Fix a few more input test failures on Windows.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 0db3d3cd2ea05561daced42eddd297a1efd1c233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db3d3cd2ea05561daced42ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 25 12:24:53 2009 +0100 user32/tests: Fix a few more input test failures on Windows. --- dlls/user32/input.c | 2 +- dlls/user32/tests/input.c | 31 ++++++++++++++----------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 2b11c7d..dc0ce56 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1168,7 +1168,7 @@ int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOI return -1; } - if(!ptin || !ptout) { + if(!ptin || (!ptout && count)) { SetLastError(ERROR_NOACCESS); return -1; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 889244f..e534e1c 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -885,7 +885,7 @@ static void test_Input_blackbox(void) pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); empty_message_queue(); GetKeyboardState(ks2); - if (!ii && !sent_messages_cnt && !memcmp( ks1, ks2, sizeof(ks1) )) + if (!ii && sent_messages_cnt <= 1 && !memcmp( ks1, ks2, sizeof(ks1) )) { win_skip( "window doesn't receive the queued input\n" ); break; @@ -913,7 +913,7 @@ static void test_keynames(void) static POINT pt_old, pt_new; static BOOL clipped; -#define STEP 20 +#define STEP 3 static LRESULT CALLBACK hook_proc1( int code, WPARAM wparam, LPARAM lparam ) { @@ -1097,11 +1097,10 @@ static void test_GetMouseMovePointsEx(void) SetLastError(MYERROR); count = 0; retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, NULL, count, GMMP_USE_DISPLAY_POINTS); - todo_wine { - ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); - ok(MYERROR == GetLastError(), - "expected error %d, got %u\n", MYERROR, GetLastError()); - } + if (retval == -1) + ok(GetLastError() == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", GetLastError()); + else + ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); /* test fourth parameter * a value higher than 64 is expected to fail with ERROR_INVALID_PARAMETER @@ -1116,20 +1115,18 @@ static void test_GetMouseMovePointsEx(void) SetLastError(MYERROR); count = 0; retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); - todo_wine { - ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); - ok(MYERROR == GetLastError(), - "expected error %d, got %u\n", MYERROR, GetLastError()); - } + if (retval == -1) + ok(GetLastError() == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", GetLastError()); + else + ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); SetLastError(MYERROR); count = BUFLIM; retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); - todo_wine { - ok((0 <= retval) && (retval <= count), "expected GetMouseMovePointsEx to succeed, got %d\n", retval); - ok(MYERROR == GetLastError(), - "expected error %d, got %u\n", MYERROR, GetLastError()); - } + if (retval == -1) + ok(GetLastError() == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", GetLastError()); + else + ok((0 <= retval) && (retval <= count), "expected GetMouseMovePointsEx to succeed, got %d\n", retval); SetLastError(MYERROR); retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM+1, GMMP_USE_DISPLAY_POINTS);

1 0

Alexandre Julliard : user32/tests: Add some more optional messages.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 33d4c7c514c140079f5c125bbbf3c6c737eea05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d4c7c514c140079f5c125bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 25 12:25:03 2009 +0100 user32/tests: Add some more optional messages. --- dlls/user32/tests/msg.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4a6778f..e68910c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -257,12 +257,13 @@ static const struct message WmSWP_MoveSeq[] = { static const struct message WmSWP_ResizeNoZOrder[] = { { WM_WINDOWPOSCHANGING, sent|wparam, /*SWP_NOZORDER|*/SWP_NOACTIVATE }, { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_NCCALCSIZE, sent|wparam, 1 }, - { WM_NCPAINT, sent }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, - { WM_ERASEBKGND, sent|optional }, /* FIXME: remove optional once Wine is fixed */ + { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, /*SWP_NOZORDER|*/SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_MOVE, sent|defwinproc|optional }, + { WM_SIZE, sent|defwinproc|wparam|optional, SIZE_RESTORED }, { WM_NCCALCSIZE, sent|wparam|optional, 1 }, /* Win9x doesn't send it */ { WM_NCPAINT, sent|optional }, /* Win9x doesn't send it */ { WM_GETTEXT, sent|defwinproc|optional }, /* Win9x doesn't send it */ @@ -1234,7 +1235,7 @@ static const struct message WmCreateCustomDialogSeq[] = { { WM_GETTEXT, sent|optional|defwinproc }, { WM_GETTEXT, sent|optional|defwinproc }, { WM_ERASEBKGND, sent }, - { WM_CTLCOLORDLG, sent|defwinproc }, + { WM_CTLCOLORDLG, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_GETTEXT, sent|optional }, { WM_GETTEXT, sent|optional }, @@ -1326,10 +1327,10 @@ static const struct message WmModalDialogSeq[] = { { WM_ACTIVATE, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, - { WM_NCPAINT, sent }, + { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|optional }, - { WM_ERASEBKGND, sent }, - { WM_CTLCOLORDLG, sent }, + { WM_ERASEBKGND, sent|optional }, + { WM_CTLCOLORDLG, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_GETTEXT, sent|optional }, { WM_NCCALCSIZE, sent|optional }, @@ -1637,7 +1638,7 @@ static const struct message WmSHOWNATopInvisible[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, - { WM_NCPAINT, sent|wparam, 1 }, + { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, @@ -2428,7 +2429,7 @@ static const struct message WmCreateMDIchildVisibleMaxSeq1[] = { { WM_MDIREFRESHMENU, sent/*|wparam|lparam, 0, 0*/ }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE, 0, SWP_FRAMECHANGED }, /* Win9x: message sequence terminates here. */ @@ -4086,7 +4087,7 @@ static void test_showwindow(void) /* ShowWindow( SW_SHOWNA) for invisible top level window */ trace("calling ShowWindow( SW_SHOWNA) for invisible top level window\n"); ok( ShowWindow(hwnd, SW_SHOWNA) == FALSE, "ShowWindow: window was visible\n" ); - ok_sequence(WmSHOWNATopInvisible, "ShowWindow(SW_SHOWNA) on invisible top level window", TRUE); + ok_sequence(WmSHOWNATopInvisible, "ShowWindow(SW_SHOWNA) on invisible top level window", FALSE); /* ShowWindow( SW_SHOWNA) for now visible top level window */ trace("calling ShowWindow( SW_SHOWNA) for now visible top level window\n"); @@ -9937,13 +9938,13 @@ static const struct message WmRestore_4[] = { { 0 } }; static const struct message WmRestore_5[] = { - { HCBT_MINMAX, hook|lparam, 0, SW_SHOWNORMAL }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_MINMAX, hook|lparam|optional, 0, SW_SHOWNORMAL }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, { HCBT_ACTIVATE, hook|optional }, { HCBT_SETFOCUS, hook|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, + { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_RESTORED }, { 0 } }; static const struct message WmHide_1[] = { @@ -10008,8 +10009,10 @@ static const struct message WmMinimize_3[] = { }; static const struct message WmShowMinNoActivate[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINNOACTIVE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc|optional }, + { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_MINIMIZED }, { 0 } }; static const struct message WmMinMax_1[] = { @@ -10035,7 +10038,7 @@ static const struct message WmMinMax_3[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_RESTORED }, + { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_MINIMIZED }, { 0 } }; static const struct message WmMinMax_4[] = { @@ -10146,7 +10149,7 @@ static void test_ShowWindow(void) /* 48 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_3, FALSE }, /* 49 */ { SW_SHOW, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmEmptySeq, FALSE }, /* 50 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmRestore_5, FALSE }, -/* 51 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, +/* 51 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmRestore_5, FALSE }, /* 52 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 53 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, FALSE },

1 0

Henri Verbeet : d3d10core: Adjust a couple of FIXMEs.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 1622f89ce9ef7ddf654d0655e66ce35c62af36be URL: http://source.winehq.org/git/wine.git/?a=commit;h=1622f89ce9ef7ddf654d0655e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 08:39:01 2009 +0100 d3d10core: Adjust a couple of FIXMEs. --- dlls/d3d10core/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 87f8a21..4f0fb31 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1256,7 +1256,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice HRESULT hr; FIXME("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p stub!\n", + "\tmultisample_quality %u, lockable %u, surface %p partial stub!\n", iface, superior, width, height, format, multisample_type, multisample_quality, lockable, surface); FIXME("Implement DXGI<->wined3d usage conversion\n"); @@ -1295,7 +1295,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3 HRESULT hr; FIXME("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p stub!\n", + "\tmultisample_quality %u, discard %u, surface %p partial stub!\n", iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); FIXME("Implement DXGI<->wined3d usage conversion\n");

1 0