November 2018 - Wine-commits

Gabriel Ivăncescu : comctl32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: ebe99b92d48c86a358ac2143ac45a2b3f7197872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe99b92d48c86a358ac2143… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:17 2018 +0200 comctl32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 3 ++- dlls/comctl32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 76b09aa..aa42c3a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -762,7 +762,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } else { if (buffer) - *((ULONG_PTR *)buffer) = descr->items[index].data; + *((ULONG_PTR *)buffer) = (descr->style & LBS_NODATA) + ? 0 : descr->items[index].data; len = sizeof(ULONG_PTR); } return len; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 802dd98..8620ca3 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2302,7 +2302,6 @@ static void test_LBS_NODATA(void) memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); - todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0);

1 0

Gabriel Ivăncescu : comctl32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 1b17d8c09a2c6e3827951a4c8d88e8f52e9f8975 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b17d8c09a2c6e3827951a4c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:18 2018 +0200 comctl32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index aa42c3a..03afc5e 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2630,7 +2630,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[wParam].data; + return (descr->style & LBS_NODATA) ? 0 : descr->items[wParam].data; case LB_SETITEMDATA: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 8620ca3..e507688 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2305,7 +2305,6 @@ static void test_LBS_NODATA(void) ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0); - todo_wine ok(ret == 0, "Unexpected return value %d.\n", ret); }

1 0

Gabriel Ivăncescu : comctl32/listbox: Don' t set any data for LBS_NODATA listboxes.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 19f26c35d5cabae15fc9b5311da776c02db6488e URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f26c35d5cabae15fc9b531… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:19 2018 +0200 comctl32/listbox: Don't set any data for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 03afc5e..479f6a6 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2638,7 +2638,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - descr->items[wParam].data = lParam; + if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index e507688..271cbca 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2310,13 +2310,10 @@ static void test_LBS_NODATA(void) /* More messages that don't work with LBS_NODATA. */ ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); DestroyWindow(listbox);

1 0

Gabriel Ivăncescu : comctl32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 0b7dbc9e19cf8def22e3817e51afc46f87168331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7dbc9e19cf8def22e3817e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 14 12:00:20 2018 +0200 comctl32/listbox: Make LBS_NODATA listboxes error on any attempt to find a value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 ++ dlls/comctl32/tests/listbox.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 479f6a6..dbc7b4a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -880,6 +880,8 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa INT i; LB_ITEMDATA *item; + if (descr->style & LBS_NODATA) return LB_ERR; + if (start >= descr->nb_items) start = -1; item = descr->items + start + 1; if (HAS_STRINGS(descr)) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 271cbca..43da3ca 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2309,10 +2309,16 @@ static void test_LBS_NODATA(void) } /* More messages that don't work with LBS_NODATA. */ + ret = SendMessageA(listbox, LB_FINDSTRING, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); + ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 0); + ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); ok(ret == LB_ERR, "Unexpected return value %d.\n", ret);

1 0

Francois Gouget : testbot: Allow more than one test environment per Wine build.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: tools Branch: master Commit: 8143d8386a986bd2f07a555d4f0507819f5e92a3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8143d8386a986bd2f07a555… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 14 02:51:45 2018 +0100 testbot: Allow more than one test environment per Wine build. This implies not assuming that the mission's build uniquely identifies the testing environment. Let GetMissionBaseName() deal with coming up with a suitable identifier for the wineprefix and test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 12 ++++++------ testbot/bin/build/WineReconfig.pl | 9 +++++---- testbot/bin/build/WineTest.pl | 38 ++++++++++++++++++------------------- testbot/lib/Build/Utils.pm | 24 +++++++++++++---------- testbot/lib/WineTestBot/Missions.pm | 8 +++++++- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 3784ef0..592162a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -290,10 +290,10 @@ sub WrapUpAndExit($;$$$) if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - foreach my $Build (keys %{$TaskMissions->{Builds}}) + foreach my $Mission (@{$TaskMissions->{Missions}}) { # Keep the old report if the new one is missing - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { # Update the VM's reference WineTest results for WineSendLog.pl @@ -549,9 +549,9 @@ elsif (!defined $TAError) # Grab the test reports if any # -foreach my $Build (keys %{$TaskMissions->{Builds}}) +foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { @@ -606,9 +606,9 @@ if ($NewStatus eq 'completed') { my $LatestDir = "$DataDir/latest"; my $StepDir = $Step->GetDir(); - foreach my $Build (keys %{$TaskMissions->{Builds}}) + foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; my $RefReport = $Task->VM->Name ."_$RptFileName"; for my $Suffix ("", ".err") { diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 898f72c..cc25da0 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -103,17 +103,18 @@ sub UpdateWinePrefixes($) # Set up brand new WinePrefixes ready for use for testing. # This way we do it once instead of doing it for every test, thus saving - # time. Note that this requires using a different wineprefix for each build. + # time. Note that this requires using a different wineprefix for each + # mission. foreach my $Mission (@{$TaskMissions->{Missions}}) { next if ($Mission->{test} eq "build"); - SetupWineEnvironment($Mission->{Build}); - InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; + my $BaseName = SetupWineEnvironment($Mission); + InfoMsg "\nRecreating the $BaseName wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Mission->{Build}, "wait"); + my $ErrMessage = CreateWinePrefix($Mission, "wait"); if (defined $ErrMessage) { LogMsg "$ErrMessage\n"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 6891faa..1f083c2 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -84,34 +84,34 @@ sub SetupTest($$) LogMsg "tests\n" if (!$InTests); $InTests = 1; - InfoMsg "\nRunning $Test in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + my $BaseName = SetupWineEnvironment($Mission); + InfoMsg "\nRunning $Test in the $BaseName Wine\n"; + return $BaseName; } sub DailyWineTest($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - SetupTest("WineTest", $Mission); + my $BaseName = SetupTest("WineTest", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - my $Tag = SanitizeTag("$BaseTag-$Mission->{Build}"); - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -o '../$Mission->{Build}.report' -t $Tag ". - ShArgv2Cmd(@$Args)); - if (!-f "$Mission->{Build}.report") + my $Tag = SanitizeTag("$BaseTag-$BaseName"); + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$BaseName.report") { - LogMsg "WineTest did not produce a report file\n"; + LogMsg "WineTest did not produce the $BaseName report\n"; return 0; } # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -s '../$Mission->{Build}.report'")) + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -s '../$BaseName.report'")) { - LogMsg "WineTest failed to send the $Mission->{Build} report\n"; + LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue } @@ -153,26 +153,26 @@ sub TestPatch($$) return 1 if (!@TestList); } - SetupTest("the tests", $Mission); + my $BaseName = SetupTest("the tests", $Mission); if (!-d $ENV{WINEPREFIX}) { # FIXME Wait for the wineserver as a workaround for bug 41713. my $ErrMessage = CreateWinePrefix($Mission, "wait"); if (defined $ErrMessage) { - LogMsg "Could not create the $Mission->{Build} wineprefix: $ErrMessage\n"; + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; return 0; } } # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -o '../$Mission->{Build}.report' -t test-$Mission->{Build} ". + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -o '../$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$Mission->{Build}.report") + if (!-f "$BaseName.report") { - LogMsg "WineTest did not produce a report file\n"; + LogMsg "WineTest did not produce the $BaseName report\n"; return 0; } @@ -365,7 +365,7 @@ if ($DataDir =~ /'/) # # Clean up old reports -map { unlink("$_.report") } keys %{$TaskMissions->{Builds}}; +unlink map { GetMissionBaseName($_) .".report" } @{$TaskMissions->{Missions}}; my $Impacts; if ($Action eq "testpatch") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index aa5c205..06fb3d8 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -36,6 +36,7 @@ use Digest::SHA; use File::Path; use WineTestBot::Config; +use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Utils; @@ -327,19 +328,22 @@ sub UpdateAddOns() sub SetupWineEnvironment($) { - my ($Build) = @_; + my ($Mission) = @_; - $ENV{WINEPREFIX} = "$DataDir/wineprefix-$Build"; + my $BaseName = GetMissionBaseName($Mission); + $ENV{WINEPREFIX} = "$DataDir/wineprefix-$BaseName"; $ENV{DISPLAY} ||= ":0.0"; + + return $BaseName; } sub RunWine($$$) { - my ($Build, $Cmd, $CmdArgs) = @_; + my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Build' && file $Cmd`; + my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Build' && set -x && ". + return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". "time $Wine $Cmd $CmdArgs"); } @@ -348,24 +352,24 @@ sub RunWine($$$) # WinePrefix helpers # -sub CreateWinePrefix($$) +sub CreateWinePrefix($;$) { - my ($Build, $Wait) = @_; + my ($Mission, $Wait) = @_; return "\$WINEPREFIX is not set!" if (!$ENV{WINEPREFIX}); rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Build, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { - return "Failed to disable the $Build build crash dialogs: $!"; + return "Failed to disable the crash dialogs: $!"; } if ($Wait) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Build' && ./server/wineserver -w"); + system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); } return undef; diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 80c1d97..0dc812d 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -26,7 +26,7 @@ WineTestBot::Missions - Missions parser and helper functions =cut use Exporter 'import'; -our @EXPORT = qw(DumpMissions ParseMissionStatement +our @EXPORT = qw(DumpMissions GetMissionBaseName ParseMissionStatement MergeMissionStatementTasks SplitMissionStatementTasks); @@ -86,6 +86,12 @@ sub ParseMissionStatement($) return (undef, \@Missions); } +sub GetMissionBaseName($) +{ + my ($Mission) = @_; + return $Mission->{Build}; +} + sub MergeMissionStatementTasks($) { my ($MissionStatement) = @_;

1 0

Gabriel Ivăncescu : comctl32/listbox: Disable LBS_NODATA if styles are incompatible with it.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 8e13120c80697d14d3363c2acc6742ebaaa1259d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e13120c80697d14d3363c2a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 13 12:35:57 2018 +0200 comctl32/listbox: Disable LBS_NODATA if styles are incompatible with it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index d0e8e60..3d8804a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2516,6 +2516,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL; if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE; if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; + if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED) + descr->style &= ~LBS_NODATA; descr->item_height = LISTBOX_SetFont( descr, 0 ); if (descr->style & LBS_OWNERDRAWFIXED)

1 0

Gabriel Ivăncescu : comctl32/listbox: Make SetCount fail if LBS_NODATA is not set.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 2aedcf3f8c900bb55b1b0bf893029f2635f9a758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aedcf3f8c900bb55b1b0bf8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 13 12:35:58 2018 +0200 comctl32/listbox: Make SetCount fail if LBS_NODATA is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 6 +----- dlls/comctl32/tests/listbox.c | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 3d8804a..4a2df52 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1752,11 +1752,7 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) { LRESULT ret; - if (HAS_STRINGS(descr)) - { - SetLastError(ERROR_SETCOUNT_ON_BAD_LB); - return LB_ERR; - } + if (!(descr->style & LBS_NODATA)) return LB_ERR; /* FIXME: this is far from optimal... */ if (count > descr->nb_items) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index c560ce1..6ac3c73 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1806,9 +1806,7 @@ static void test_set_count( void ) SetLastError( 0xdeadbeef ); ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); - todo_wine_if(i == 0) ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); - todo_wine_if(i == 1) ok( GetLastError() == 0xdeadbeef, "Unexpected error %d.\n", GetLastError() ); DestroyWindow( listbox ); @@ -2341,7 +2339,6 @@ todo_wine style = GetWindowLongA(listbox, GWL_STYLE); ok((style & invalid_styles[i]) == invalid_styles[i], "%u: unexpected window styles %#x.\n", i, style); ret = SendMessageA(listbox, LB_SETCOUNT, 100, 0); - todo_wine_if(i == 1 || i == 4) ok(ret == LB_ERR, "%u: unexpected return value %d.\n", i, ret); DestroyWindow(listbox); }

1 0

Henri Verbeet : d3d8: Do not add map access indiscriminately in cubetexture_init().
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 66952c922c0480371e7ef652bd39fc16757970ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=66952c922c0480371e7ef652… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 16:58:14 2018 +0330 d3d8: Do not add map access indiscriminately in cubetexture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 0b86ed9..ec5ae03 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1155,8 +1155,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; desc.height = edge_length; desc.depth = 1;

1 0

Henri Verbeet : d3d8: Do not add map access indiscriminately in d3d8_device_create_surface().
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 366d2bb75e2f805285591cd28f45f5dc09c06450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=366d2bb75e2f805285591cd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 16:58:15 2018 +0330 d3d8: Do not add map access indiscriminately in d3d8_device_create_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 885849f..476e3e1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1166,8 +1166,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1;

1 0

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL rendertarget view information.
by Alexandre Julliard 13 Nov '18

13 Nov '18

Module: wine Branch: master Commit: 0799c3babd25150aa27645361ced67d8e99e5be0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0799c3babd25150aa2764536… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 16:58:16 2018 +0330 wined3d: Introduce a separate structure for OpenGL rendertarget view information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 39 ++++++++++++++++++++---------------- dlls/wined3d/view.c | 45 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 13 +++++++++++- 3 files changed, 57 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0799c3babd25150aa276…

1 0