wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Francois Gouget : testbot/WineRunBuild: Trust the build task's missions.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: tools Branch: master Commit: aa9453eafa1b6db778f7e18c7afa411e89479286 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aa9453eafa1b6db778f7e18… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 11:53:39 2018 +0100 testbot/WineRunBuild: Trust the build task's missions. We now set the build task's missions field with the list of builds to perform so there is no need to recompute it in WineRunBuild. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 5a3a683..68e6be4 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -336,22 +336,6 @@ if ($Step->FileType ne "patch") # -# Figure out what to build -# - -my (%Missions, %TestExes); -foreach my $TestStep (@{$Job->Steps->GetItems()}) -{ - if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe/) - { - $Missions{$TestStep->FileType} = 1; - $TestExes{$TestStep->FileName} = $TestStep->FileType; - } -} - - -# # Run the build # @@ -364,7 +348,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Missions) ."\n". + " ../bin/build/Build.pl patch.diff ". $Task->Missions ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -446,6 +430,16 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # +my %TestExes; +foreach my $TestStep (@{$Job->Steps->GetItems()}) +{ + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe/) + { + $TestExes{$TestStep->FileName} = $TestStep->FileType; + } +} + my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}})

1 0

Francois Gouget : testbot/web: Clean up Submit's page handling.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: tools Branch: master Commit: 5b74d743f56c780af214ba3e589ab32b9b3ca8ed URL: https://source.winehq.org/git/tools.git/?a=commit;h=5b74d743f56c780af214ba3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 11:50:44 2018 +0100 testbot/web: Clean up Submit's page handling. Also validate the page like every parameter coming from the web browser. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 5c40ef5..a81a954 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -48,6 +48,9 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->{Page} = $self->GetParam("Page") || 1; + # Page is a hidden parameter so fix it instead of issuing an error + $self->{Page} = 1 if ($self->{Page} !~ /^[1-4]$/); + $self->{LastPage} = $self->{Page}; my @PropertyDescriptors1 = ( CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), @@ -132,8 +135,7 @@ sub GenerateFields($) { my ($self) = @_; - print "<div><input type='hidden' name='Page' value='", $self->{Page}, - "'></div>\n"; + print "<div><input type='hidden' name='Page' value='$self->{Page}'></div>\n"; if ($self->{Page} == 1) { print "<div class='ItemProperty'><label>File</label>", @@ -215,7 +217,7 @@ sub GenerateFields($) } if ($self->{Page} == 2) { - if ($self->GetParam("Page") == 3) + if ($self->{LastPage} == 3) { my $VMs = CreateVMs(); # VMs that are only visible with ShowAll @@ -274,7 +276,7 @@ sub GenerateFields($) $Checked = undef; } if ($Checked and - ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) + ($self->{LastPage} == 1 || $self->GetParam($FieldName))) { print " checked='checked'"; } @@ -454,7 +456,7 @@ sub Validate($) { my ($self) = @_; - if ($self->{Page} == 2 && $self->GetParam("Page") == 2) + if ($self->{Page} == 2 && $self->{LastPage} == 2) { my $VMSelected = !1; my $VMs = CreateVMs(); @@ -474,7 +476,7 @@ sub Validate($) return !1; } } - elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) + elsif ($self->{Page} == 3 && $self->{LastPage} == 3) { if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) ||

1 0

Francois Gouget : testbot: Better identify when multiple locales are tested.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: tools Branch: master Commit: 3c518bbb1ce891083e970f4ea75e9b137cf66b55 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c518bbb1ce891083e970f4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 11:50:28 2018 +0100 testbot: Better identify when multiple locales are tested. Previously testing the default English locale and one other locale would only show the latter in the mission description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Missions.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 18d4f5e..2662340 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -125,14 +125,16 @@ sub GetTaskMissionDescription($$) my $Lang; foreach my $Mission (@{$TaskMission->{Missions}}) { - next if (!$Mission->{lang}); - if (defined $Lang) + if (!defined $Lang) + { + $Lang = $Mission->{lang} || ""; + } + elsif ($Lang ne ($Mission->{lang} || "")) { $Description .= " + Locales"; $Lang = undef; last; } - $Lang = $Mission->{lang}; } $Description .= " ". LocaleName($Lang) if ($Lang); $Description .= " tests";

1 0

Alexandre Julliard : configure: Allow building a WoW64 tree inside the source directory.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 1582ae6b045bb1658f6d5bc83efc5f6ce042c06e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1582ae6b045bb1658f6d5bc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 20:55:13 2018 +0100 configure: Allow building a WoW64 tree inside the source directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 11 ++--------- configure.ac | 13 +++---------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/configure b/configure index f7c1158..d00057b 100755 --- a/configure +++ b/configure @@ -5648,17 +5648,10 @@ enable_win64=${enable_win64:-no} enable_winetest=${enable_winetest:-$enable_tests} -if test -n "$with_wine64" +if test "x$enable_win64" = "xyes" then - if test "x$enable_win64" = "xyes" - then - as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. + test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 - fi - test "$srcdir" != . || as_fn_error $? "--with-wine64 cannot be used when building inside the source tree. -You should create a separate build directory and run configure from there." "$LINENO" 5 -elif test "x$enable_win64" = "xyes" -then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi diff --git a/configure.ac b/configure.ac index c909ce4..50cf9a0 100644 --- a/configure.ac +++ b/configure.ac @@ -225,18 +225,11 @@ enable_win64=${enable_win64:-no} dnl Disable winetest too if tests are disabled enable_winetest=${enable_winetest:-$enable_tests} -dnl Some special cases for the wow64 build -if test -n "$with_wine64" +dnl Some special cases for the 64-bit build +if test "x$enable_win64" = "xyes" then - if test "x$enable_win64" = "xyes" - then - AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. + test -z "$with_wine64" || AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) - fi - test "$srcdir" != . || AC_MSG_ERROR([--with-wine64 cannot be used when building inside the source tree. -You should create a separate build directory and run configure from there.]) -elif test "x$enable_win64" = "xyes" -then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi

1 0

Alexandre Julliard : configure: Don' t create fonts and server symlinks in the WoW64 build tree.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 123b92373d4c64b52b9f3d9cfb53a1145f9d425e URL: https://source.winehq.org/git/wine.git/?a=commit;h=123b92373d4c64b52b9f3d9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 15:42:07 2018 +0100 configure: Don't create fonts and server symlinks in the WoW64 build tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 13 +++++-------- configure.ac | 14 ++++++-------- tools/make_makefiles | 5 ----- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/configure b/configure index f2be330..f7c1158 100755 --- a/configure +++ b/configure @@ -5657,8 +5657,6 @@ then fi test "$srcdir" != . || as_fn_error $? "--with-wine64 cannot be used when building inside the source tree. You should create a separate build directory and run configure from there." "$LINENO" 5 - enable_fonts=${enable_fonts:-no} - enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" @@ -20014,7 +20012,7 @@ wine_fn_config_makefile dlls/xmllite/tests enable_tests wine_fn_config_makefile dlls/xolehlp enable_xolehlp wine_fn_config_makefile dlls/xpsprint enable_xpsprint wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs -test -n "$with_wine64" || wine_fn_config_makefile fonts enable_fonts +wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile include enable_include wine_fn_config_makefile libs/port enable_port wine_fn_config_makefile libs/wine enable_wine @@ -20124,7 +20122,7 @@ wine_fn_config_makefile programs/wscript/tests enable_tests wine_fn_config_makefile programs/wusa enable_wusa wine_fn_config_makefile programs/xcopy enable_xcopy wine_fn_config_makefile programs/xcopy/tests enable_tests -test -n "$with_wine64" || wine_fn_config_makefile server enable_server +wine_fn_config_makefile server enable_server test "x$enable_tools" = xno || wine_fn_config_makefile tools enable_tools test "x$enable_tools" = xno || wine_fn_config_makefile tools/sfnt2fon enable_sfnt2fon test "x$enable_tools" = xno || wine_fn_config_makefile tools/widl enable_widl @@ -20187,9 +20185,8 @@ then /*) reldir="" ;; *) reldir="../" ;; esac - wine_fn_append_rule "all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader -fonts server: - \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ + rm -f fonts server 2>/dev/null + wine_fn_append_rule "all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader loader/wine64 loader/wine64-preloader: \$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ $with_wine64/loader/wine: @@ -20197,7 +20194,7 @@ $with_wine64/loader/wine: $with_wine64/loader/wine-preloader: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" + \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ diff --git a/configure.ac b/configure.ac index 328b572..c909ce4 100644 --- a/configure.ac +++ b/configure.ac @@ -235,8 +235,6 @@ then fi test "$srcdir" != . || AC_MSG_ERROR([--with-wine64 cannot be used when building inside the source tree. You should create a separate build directory and run configure from there.]) - enable_fonts=${enable_fonts:-no} - enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" @@ -3877,7 +3875,7 @@ WINE_CONFIG_MAKEFILE(dlls/xmllite/tests) WINE_CONFIG_MAKEFILE(dlls/xolehlp) WINE_CONFIG_MAKEFILE(dlls/xpsprint) WINE_CONFIG_MAKEFILE(dlls/xpssvcs) -WINE_CONFIG_MAKEFILE(fonts,,[test -n "$with_wine64"]) +WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/port) WINE_CONFIG_MAKEFILE(libs/wine) @@ -3987,7 +3985,7 @@ WINE_CONFIG_MAKEFILE(programs/wscript/tests) WINE_CONFIG_MAKEFILE(programs/wusa) WINE_CONFIG_MAKEFILE(programs/xcopy) WINE_CONFIG_MAKEFILE(programs/xcopy/tests) -WINE_CONFIG_MAKEFILE(server,,[test -n "$with_wine64"]) +WINE_CONFIG_MAKEFILE(server) WINE_CONFIG_MAKEFILE(tools,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/sfnt2fon,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/widl,,[test "x$enable_tools" = xno]) @@ -4065,10 +4063,10 @@ then /*) reldir="" ;; *) reldir="../" ;; esac + dnl Get rid of old symlinks + rm -f fonts server 2>/dev/null WINE_APPEND_RULE( -[all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader -fonts server: - \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] +[all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader loader/wine64 loader/wine64-preloader: \$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] $with_wine64/loader/wine: @@ -4076,7 +4074,7 @@ $with_wine64/loader/wine: $with_wine64/loader/wine-preloader: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) + \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ diff --git a/tools/make_makefiles b/tools/make_makefiles index b26406b..d1fe7f5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -464,11 +464,6 @@ sub update_makefiles(@) die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; $args = ",,[test \"x\$enable_tools\" = xno]"; } - elsif (($dir eq "fonts") || ($dir eq "server")) - { - # these are created as symlinks for wow64 builds - $args = ",,[test -n \"\$with_wine64\"]"; - } push @lines, "WINE_CONFIG_MAKEFILE($dir$args)\n"; }

1 0

Alexandre Julliard : libwine: Look for the 64-bit wineserver using the 64-bit loader symlink.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 493129d638b5ee05522d4b1e0dd026f3f416ffcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=493129d638b5ee05522d4b1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 13:24:19 2018 +0100 libwine: Look for the 64-bit wineserver using the 64-bit loader symlink. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 8ebe970..f638412 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -47,6 +47,7 @@ static char *server_dir; static char *build_dir; static char *user_name; static char *argv0_name; +static char *wineserver64; #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); @@ -156,7 +157,7 @@ static char *get_runtime_libdir(void) /* read a symlink and return its directory */ static char *symlink_dirname( const char *name ) { - char *p, *buffer; + char *p, *buffer, *absdir = NULL; int ret, size; for (size = 256; ; size *= 2) @@ -169,11 +170,19 @@ static char *symlink_dirname( const char *name ) if (!(p = strrchr( buffer, '/' ))) break; if (p == buffer) p++; *p = 0; - return buffer; + if (buffer[0] == '/') return buffer; + /* make it absolute */ + absdir = xmalloc( strlen(name) + strlen(buffer) + 1 ); + strcpy( absdir, name ); + if (!(p = strrchr( absdir, '/' ))) break; + strcpy( p + 1, buffer ); + free( buffer ); + return absdir; } free( buffer ); } free( buffer ); + free( absdir ); return NULL; } @@ -446,6 +455,16 @@ done: if (build_dir) { argv0_name = build_path( "loader/", basename ); + if (sizeof(int) == sizeof(void *)) + { + char *loader, *linkname = build_path( build_dir, "loader/wine64" ); + if ((loader = symlink_dirname( linkname ))) + { + wineserver64 = build_path( loader, "../server/wineserver" ); + free( loader ); + } + free( linkname ); + } } else { @@ -565,7 +584,10 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) /* if we are in build dir and name contains a path, try that */ if (build_dir) { - argv[0] = build_path( build_dir, name ); + if (wineserver64 && !strcmp( name, "server/wineserver" )) + argv[0] = xstrdup( wineserver64 ); + else + argv[0] = build_path( build_dir, name ); preloader_exec( argv, use_preloader ); free( argv[0] ); }

1 0

Alexandre Julliard : libwine: Add a helper function to read a symlink.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 27254d849b60f5103c06e530e10b40bbc8a5494d URL: https://source.winehq.org/git/wine.git/?a=commit;h=27254d849b60f5103c06e530… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 13:10:15 2018 +0100 libwine: Add a helper function to read a symlink. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 13f016a..8ebe970 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -54,9 +54,11 @@ static void fatal_perror( const char *err, ... ) __attribute__((noreturn,format #endif #if defined(__linux__) || defined(__FreeBSD_kernel__ ) -#define EXE_LINK "/proc/self/exe" +static const char exe_link[] = "/proc/self/exe"; #elif defined (__FreeBSD__) || defined(__DragonFly__) -#define EXE_LINK "/proc/curproc/file" +static const char exe_link[] = "/proc/curproc/file"; +#else +static const char exe_link[] = ""; #endif /* die on a fatal error */ @@ -151,30 +153,34 @@ static char *get_runtime_libdir(void) return NULL; } -/* return the directory that contains the main exe at run-time */ -static char *get_runtime_exedir(void) +/* read a symlink and return its directory */ +static char *symlink_dirname( const char *name ) { -#ifdef EXE_LINK - char *p, *bindir; - int size; + char *p, *buffer; + int ret, size; for (size = 256; ; size *= 2) { - int ret; - if (!(bindir = malloc( size ))) return NULL; - if ((ret = readlink( EXE_LINK, bindir, size )) == -1) break; + if (!(buffer = malloc( size ))) return NULL; + if ((ret = readlink( name, buffer, size )) == -1) break; if (ret != size) { - bindir[ret] = 0; - if (!(p = strrchr( bindir, '/' ))) break; - if (p == bindir) p++; + buffer[ret] = 0; + if (!(p = strrchr( buffer, '/' ))) break; + if (p == buffer) p++; *p = 0; - return bindir; + return buffer; } - free( bindir ); + free( buffer ); } - free( bindir ); -#endif + free( buffer ); + return NULL; +} + +/* return the directory that contains the main exe at run-time */ +static char *get_runtime_exedir(void) +{ + if (exe_link[0]) return symlink_dirname( exe_link ); return NULL; }

1 0

Gabriel Ivăncescu : comctl32/listbox: Store the items array size instead of using HeapSize().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: ece6dfe52c4997942011f45199fcdbf79102ad85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ece6dfe52c4997942011f451… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 28 14:09:15 2018 +0300 comctl32/listbox: Store the items array size instead of using HeapSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 7525e7f..cb645b4 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -72,6 +72,7 @@ typedef struct INT height; /* Window height */ LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ + UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ INT focus_item; /* Item that has the focus */ @@ -688,7 +689,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + nb_items += descr->items_size; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, nb_items * sizeof(LB_ITEMDATA)); } @@ -702,6 +703,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = nb_items; descr->items = item; return LB_OKAY; } @@ -1528,12 +1530,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) + if (descr->nb_items == descr->items_size) { /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; + max_items = descr->items_size + LB_ARRAY_GRANULARITY; if (descr->items) item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); @@ -1545,6 +1545,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = max_items; descr->items = item; } @@ -1704,13 +1705,17 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* Shrink the item array if possible */ - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + max_items = descr->items_size; if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) { max_items -= LB_ARRAY_GRANULARITY; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); - if (item) descr->items = item; + if (item) + { + descr->items_size = max_items; + descr->items = item; + } } /* Repaint the items */ @@ -1756,6 +1761,7 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; + descr->items_size = 0; descr->items = NULL; } @@ -2493,6 +2499,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; + descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1;

1 0

Gabriel Ivăncescu : user32/tests: Also include LBS_NODATA cases when testing ownerdraw.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 40e16ac150385536c1ed579adaaa422c7de4253d URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e16ac150385536c1ed579a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 20 12:57:41 2018 +0200 user32/tests: Also include LBS_NODATA cases when testing ownerdraw. 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/user32/tests/listbox.c | 84 +++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index d13a4e3..b87acd7 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -338,65 +338,73 @@ static HWND create_parent( void ) static void test_ownerdraw(void) { + static const DWORD styles[] = + { + 0, + LBS_NODATA + }; HWND parent, hLB; INT ret; RECT rc; + UINT i; parent = create_parent(); assert(parent); - hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); - assert(hLB); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE | styles[i], parent); + assert(hLB); - SetForegroundWindow(hLB); - UpdateWindow(hLB); + SetForegroundWindow(hLB); + UpdateWindow(hLB); - /* make height short enough */ - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, - SWP_NOZORDER | SWP_NOMOVE); + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, + SWP_NOZORDER | SWP_NOMOVE); - /* make 0 item invisible */ - SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); - ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); - ok(ret == 1, "wrong top index %d\n", ret); + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - trace("item 0 rect %s\n", wine_dbgstr_rect(&rc)); - ok(!IsRectEmpty(&rc), "empty item rect\n"); - ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + trace("item 0 rect %s\n", wine_dbgstr_rect(&rc)); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); - DestroyWindow(hLB); + DestroyWindow(hLB); - /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ - hLB = CreateWindowA("listbox", "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, - NULL, NULL, NULL, 0); - ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA("listbox", "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE | styles[i], + 0, 0, 100, 100, NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); - ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 0, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 1, "Unexpected return value %d.\n", ret); - - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 13, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - DestroyWindow (hLB); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); + DestroyWindow (hLB); + } DestroyWindow(parent); }

1 0

Gabriel Ivăncescu : comctl32/tests: Also include LBS_NODATA cases when testing ownerdraw.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 423ea9790b8cbe17de325327dd4c7457cc1929c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=423ea9790b8cbe17de325327… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 20 12:57:40 2018 +0200 comctl32/tests: Also include LBS_NODATA cases when testing ownerdraw. 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/tests/listbox.c | 79 ++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 362447e..e789483 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -462,62 +462,71 @@ static HWND create_parent( void ) static void test_ownerdraw(void) { + static const DWORD styles[] = + { + 0, + LBS_NODATA + }; HWND parent, hLB; INT ret; RECT rc; + UINT i; parent = create_parent(); ok(parent != NULL, "Failed to create parent window.\n"); - hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); - ok(hLB != NULL, "Failed to create listbox window.\n"); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE | styles[i], parent); + ok(hLB != NULL, "Failed to create listbox window.\n"); - SetForegroundWindow(hLB); - UpdateWindow(hLB); + SetForegroundWindow(hLB); + UpdateWindow(hLB); - /* make height short enough */ - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); - /* make 0 item invisible */ - SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); - ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); - ok(ret == 1, "wrong top index %d\n", ret); + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - ok(!IsRectEmpty(&rc), "empty item rect\n"); - ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); - DestroyWindow(hLB); + DestroyWindow(hLB); - /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ - hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, - NULL, NULL, NULL, 0); - ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE | styles[i], + 0, 0, 100, 100, NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); - ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 0, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 1, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 13, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - DestroyWindow (hLB); + DestroyWindow (hLB); + } DestroyWindow(parent); }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018