June 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Invalidate list after WM_MEASUREITEM notification.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: ad7f0b950b75e37f8c1b05037238702dc082e3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7f0b950b75e37f8c1b05037… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 22 22:38:03 2009 +0400 comctl32/listview: Invalidate list after WM_MEASUREITEM notification. --- dlls/comctl32/listview.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0e22848..ab94936 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1027,7 +1027,8 @@ static inline DWORD notify_postpaint (const LISTVIEW_INFO *infoPtr, NMLVCUSTOMDR return notify_customdraw(infoPtr, CDDS_POSTPAINT, lpnmlvcd); } -static void notify_measureitem(LISTVIEW_INFO *infoPtr) +/* returns TRUE when repaint needed, FALSE otherwise */ +static BOOL notify_measureitem(LISTVIEW_INFO *infoPtr) { MEASUREITEMSTRUCT mis; mis.CtlType = ODT_LISTVIEW; @@ -1038,7 +1039,11 @@ static void notify_measureitem(LISTVIEW_INFO *infoPtr) mis.itemHeight= infoPtr->nItemHeight; SendMessageW(infoPtr->hwndNotify, WM_MEASUREITEM, mis.CtlID, (LPARAM)&mis); if (infoPtr->nItemHeight != max(mis.itemHeight, 1)) + { infoPtr->nMeasureItemHeight = infoPtr->nItemHeight = max(mis.itemHeight, 1); + return TRUE; + } + return FALSE; } /******** Item iterator functions **********************************/ @@ -10792,7 +10797,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if ((infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (infoPtr->uView == LV_VIEW_DETAILS)) { - notify_measureitem(infoPtr); + if (notify_measureitem(infoPtr)) LISTVIEW_InvalidateList(infoPtr); } LISTVIEW_UpdateSize(infoPtr);

1 0

Paul Vriens : crypt32/tests: Fix some tests ( logical || with non-zero constant).
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: e2715a615276d62384794c2153fc0a708038fc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2715a615276d62384794c215… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 23 07:49:12 2009 +0200 crypt32/tests: Fix some tests (logical || with non-zero constant). --- dlls/crypt32/tests/cert.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 322fa2f..1b60b80 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1624,12 +1624,14 @@ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, algoID.pszObjId = (LPSTR)sigOID; ret = CryptSignCertificate(0, 0, 0, toBeSigned->pbData, toBeSigned->cbData, &algoID, NULL, NULL, &size); - ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || NTE_BAD_ALGID), + ok(!ret && + (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_ALGID), "Expected ERROR_INVALID_PARAMETER or NTE_BAD_ALGID, got %08x\n", GetLastError()); ret = CryptSignCertificate(0, AT_SIGNATURE, 0, toBeSigned->pbData, toBeSigned->cbData, &algoID, NULL, NULL, &size); - ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || NTE_BAD_ALGID), + ok(!ret && + (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_ALGID), "Expected ERROR_INVALID_PARAMETER or NTE_BAD_ALGID, got %08x\n", GetLastError()); @@ -1851,7 +1853,8 @@ static void testSignAndEncodeCert(void) algID.pszObjId = oid_rsa_md5rsa; ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size); - ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || NTE_BAD_ALGID), + ok(!ret && + (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_ALGID), "Expected ERROR_INVALID_PARAMETER or NTE_BAD_ALGID, got %08x\n", GetLastError()); algID.pszObjId = oid_rsa_md5;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.24
by Jeremy Newman 22 Jun '09

22 Jun '09

Module: website Branch: master Commit: 4034522cc7fcb7a0eb67b558297b39e10d184263 URL: http://source.winehq.org/git/website.git/?a=commit;h=4034522cc7fcb7a0eb67b5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jun 21 14:22:53 2009 +0200 Polish translation for release 1.1.24 --- news/pl/2009061901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2009061901.xml b/news/pl/2009061901.xml new file mode 100644 index 0000000..108206a --- /dev/null +++ b/news/pl/2009061901.xml @@ -0,0 +1,17 @@ +<news> +<date>Czerwiec 19, 2009</date> +<title>Wydano Wine 1.1.24</title> +<body> +<p> Wydanie rozwojowe Wine 1.1.24 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.1.24">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla skojarzeń plików freedesktop.</li> + <li>Wsparcie dla obsługi wyjątków na 64-bit.</li> + <li>Ulepszenoe jednostki cieniowania ARB.</li> + <li>Poprawki dla trybu FBO.</li> + <li>Wile ulepszeń listview.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.24.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Alexandre Julliard : transl: Add support for parsing multiple resource files in a single module.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: tools Branch: master Commit: d717ae2bcc5abb4a84e8285ac9418c27937c4285 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d717ae2bcc5abb4a84e8285a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 16:41:29 2009 +0200 transl: Add support for parsing multiple resource files in a single module. --- transl/scripts/checkmakefile.pl | 107 +++++++++++++++++++++------------------ 1 files changed, 57 insertions(+), 50 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 5c5d71c..2eb8c1a 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -14,62 +14,69 @@ sub log_string close(LOG); } +sub shell($) +{ + my $cmd = shift; + my $ret = system $cmd; + if ($ret) + { + log_string $cmd; + print "!!!!!!! return value: $ret\n"; + exit 1; + } +} + sub mycheck { my($dir) = shift(@_); - my($name) = shift(@_); + my($defs) = shift(@_); + my @files = @_; - if ($name =~ m/version.rc$/) { - print "--- Ignoring ".$name."\n" unless (exists $ENV{"NOVERBOSE"}); - return; + if (not exists $ENV{"NOVERBOSE"}) { + print "*** $dir\n"; } - if (not exists $ENV{"NOVERBOSE"}) { - print "*** $dir$name\n"; + my @rcfiles; + foreach my $f (@files) + { + next if $f =~ m/^\s*$/; + if ($f =~ m/version.rc$/) { + print "--- Ignoring ".$files[$i]."\n" unless (exists $ENV{"NOVERBOSE"}); + next; + } + push @rcfiles, $f; } + return unless @rcfiles; # files in dlls/ are compiled with __WINESRC__ - my($defs) = ""; - $defs = "-D__WINESRC__" if ($dir =~ m,^dlls,); + $defs .= " -D__WINESRC__" if ($dir =~ m,^dlls,); - log_string("*** $dir$name [$defs]"); + log_string("*** $dir [$defs]"); - my $srcincl = "-I$srcdir/$dir -I$srcdir/include"; - (my $objincl = $srcincl) =~ s!I$srcdir!I$objdir!g; - my $norm_fn = $dir.$name; - $norm_fn =~ s/\.rc$//; + my $incl = "-I$srcdir/$dir -I$objdir/$dir -I$srcdir/include -I$objdir/include"; + my $norm_fn = $dir; $norm_fn =~ s/[^a-zA-Z0-9]/-/g; - (my $target = $name) =~ s/.rc$/.res/; - $ret = system("make -C $objdir/$dir -s $target 2>>$workdir/run.log && cp $objdir/$dir/$target $workdir/dumps/res/$norm_fn.res"); - if ($ret) - { - log_string "make -C $objdir/$dir -s $target 2>>$workdir/run.log && cp $objdir/$dir/$target $workdir/dumps/res/$norm_fn.res"; - print "!!!!!!! return value: $ret\n"; - exit 1; - } - $ret = system("$wrc $srcincl $objincl --verify-translation $defs $srcdir/$dir$name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"); - if ($ret == 0) - { - if ("$dir$name" eq "dlls/kernel32/kernel.rc") { - system("$scriptsdir/ver.pl \"$dir$name\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"); - log_string("*** $name [$defs] (locale run)"); - system("$scriptsdir/ver.pl \"$dir$name\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"); - } else { - system("$scriptsdir/ver.pl \"$dir$name\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt"); - } - } - else - { - log_string "$wrc $srcincl $objincl --verify-translation $defs $srcdir/$dir$name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"; - print "!!!!!!! return value: $ret\n"; - exit 1; + my $targets = join( " ", map { (my $ret = $_) =~ s/.rc$/.res/; $ret; } @rcfiles ); + my $srcs = join( " ", map { "$srcdir/$dir/$_"; } @rcfiles ); + my $objs = join( " ", map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles ); + + shell "make -C $objdir/$dir -s $targets 2>>$workdir/run.log"; + shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/dumps/res/$norm_fn.res $objs 2>>$workdir/run.log"; + shell "$wrc $incl --verify-translation $defs $srcs >$workdir/ver.txt 2>>$workdir/run.log"; + + if ("$dir" eq "dlls/kernel32") { + shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"; + log_string("*** $name [$defs] (locale run)"); + shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"; + } else { + shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt"; } } srand(); # Parse config file -if (-f config) +if (-f "config") { open(CONFIG, "<config"); while (<CONFIG>) @@ -127,21 +134,26 @@ if (!@makefiles) # parse the makefiles foreach my $makefile (@makefiles) { - next unless $makefile =~ m,^$srcdir/(.*/)Makefile.in$,; + next unless $makefile =~ m,^$srcdir/(.*)/Makefile.in$,; my $path = $1; - if ($path eq "programs/winetest/" || $path =~ m,/tests/$,) + if ($path eq "programs/winetest" || $path =~ m,/tests$,) { if (not exists $ENV{"NOVERBOSE"}) { - print "--- Ignoring: ".$path."Makefile.in\n"; + print "--- Ignoring: $path/Makefile.in\n"; } next; } + my $defs = ""; open(MAKEFILE, "<$makefile") or die "cannot open $makefile"; while (<MAKEFILE>) { - last if m/EXTRARCFLAGS\s*=.*res16/; # 16-bit resources not supported + if (m/EXTRARCFLAGS\s*=\s*(.*)/) + { + $defs = $1; + last if ($defs =~ /res16/); # 16-bit resources not supported + } if (m/^RC_SRCS *=/) { while (m/\\$/) @@ -150,14 +162,9 @@ foreach my $makefile (@makefiles) chop; $_ .= <MAKEFILE>; } - m/^RC_SRCS *=(.*)$/; - @file = split(/ /, $1); - foreach (@file) - { - next if ($_ eq ""); - s/\s//; - &mycheck($path,$_); - } + m/^RC_SRCS\s*=\s*(.*)$/; + my @files = split(/\s+/, $1); + &mycheck($path,$defs,@files); last; } }

1 0

Alexandre Julliard : transl: Handle the run. log redirection in the higher level scripts.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: tools Branch: master Commit: b388d996f2c8c5c2296afe971eed77cc52fb98a6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b388d996f2c8c5c2296afe97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 16:44:12 2009 +0200 transl: Handle the run.log redirection in the higher level scripts. --- transl/scripts/Master.sh | 2 +- transl/scripts/checkmakefile.pl | 20 ++++++-------------- winetest/make-winetest | 5 ++++- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index 8b3838b..2391a28 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -48,7 +48,7 @@ mkdir $WORKDIR/dumps/res mkdir $WORKDIR/new-langs # Analyze all the Makefiles -$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" || exit +$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit $SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" || exit # Check for a new languages diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 2eb8c1a..0b98088 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -6,21 +6,13 @@ use Cwd; use File::Basename; -sub log_string -{ - my($string) = shift(@_); - open(LOG, ">>$workdir/run.log") || die "Couldn't open run.log\n"; - print LOG $string."\n"; - close(LOG); -} - sub shell($) { my $cmd = shift; my $ret = system $cmd; if ($ret) { - log_string $cmd; + print STDERR "$cmd\n"; print "!!!!!!! return value: $ret\n"; exit 1; } @@ -51,7 +43,7 @@ sub mycheck # files in dlls/ are compiled with __WINESRC__ $defs .= " -D__WINESRC__" if ($dir =~ m,^dlls,); - log_string("*** $dir [$defs]"); + print STDERR "*** $dir [$defs]\n"; my $incl = "-I$srcdir/$dir -I$objdir/$dir -I$srcdir/include -I$objdir/include"; my $norm_fn = $dir; @@ -61,13 +53,13 @@ sub mycheck my $srcs = join( " ", map { "$srcdir/$dir/$_"; } @rcfiles ); my $objs = join( " ", map { (my $ret = "$objdir/$dir/$_") =~ s/.rc$/.res/; $ret; } @rcfiles ); - shell "make -C $objdir/$dir -s $targets 2>>$workdir/run.log"; - shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/dumps/res/$norm_fn.res $objs 2>>$workdir/run.log"; - shell "$wrc $incl --verify-translation $defs $srcs >$workdir/ver.txt 2>>$workdir/run.log"; + shell "make -C $objdir/$dir -s $targets"; + shell "$toolsdir/tools/winebuild/winebuild --resources -o $workdir/dumps/res/$norm_fn.res $objs"; + shell "$wrc $incl --verify-translation $defs $srcs >$workdir/ver.txt"; if ("$dir" eq "dlls/kernel32") { shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"; - log_string("*** $name [$defs] (locale run)"); + print STDERR "*** $name [$defs] (locale run)\n"; shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"; } else { shell "$scriptsdir/ver.pl \"$dir\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt"; diff --git a/winetest/make-winetest b/winetest/make-winetest index 4547c0a..7394638 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -63,6 +63,7 @@ fi umask 022 ( + set -e (cd wine && git pull) || exit head=$(cd wine && git rev-parse --short=12 HEAD) || exit @@ -131,7 +132,7 @@ umask 022 rm -rf work mkdir work work/langs work/dumps work/dumps/res work/new-langs - $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" + $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" 2>>work/run.log $toolsdir/transl/scripts/summary.pl ./work "$toolsdir/transl/scripts" for i in work/new-langs/* do @@ -147,6 +148,8 @@ umask 022 mv -f work/run.log $transldir/dumps/run.log rm -rf $transldir/langs.old $transldir/dumps.old + echo "translations updated" + ) >$logfile 2>&1 && rm -f $logfile # if the log file is still here, something failed

1 0

Alexandre Julliard : transl: Replace "file" by "module" now that results don't reflect individual files.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: tools Branch: master Commit: d532fc9e17e9530c693d8a7352d710b2c1aa7b42 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d532fc9e17e9530c693d8a73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 17:08:39 2009 +0200 transl: Replace "file" by "module" now that results don't reflect individual files. --- transl/php/lang.php | 8 ++++---- transl/php/resfile.php | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/transl/php/lang.php b/transl/php/lang.php index a743deb..9d79d91 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -64,7 +64,7 @@ function dump_table($table) return; } echo "<table border=\"1\">\n"; - echo "<tr><th>File name</th><th>translated</th><th>missing</th><th>errors</th></tr>\n"; + echo "<tr><th>name</th><th>translated</th><th>missing</th><th>errors</th></tr>\n"; foreach ($table as $key => $value) { $extra = ""; @@ -85,16 +85,16 @@ function dump_table($table) <?php warn_if_lang_hidden($lang) ?> -<h2>Partially translated files</h2> +<h2>Partially translated modules</h2> <?php dump_table($partial) ?> -<h2>Files not translated</h2> +<h2>Modules not translated</h2> <?php dump_table($notransl) ?> <h2>Locales data</h2> <?php dump_table($locale) ?> -<h2>Fully translated files</h2> +<h2>Fully translated modules</h2> <?php dump_table($transl) ?> </html> diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 4044d80..af5f118 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -11,12 +11,12 @@ $msgs = array(); <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> - <title>File <?php echo $resfile?> - Wine translations</title> + <title>Module <?php echo $resfile?> - Wine translations</title> </head> <?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile, FALSE) ?> -<h1>File <?php echo $resfile?></h1> +<h1>Module <?php echo $resfile?></h1> <?php warn_if_lang_hidden($lang); @@ -30,12 +30,12 @@ while ($line = fgets($file, 4096)) } if (count($msgs) == 0) { - echo "<p>This file is not translated into ".get_lang_name($lang).".</p>\n"; - echo "<ul><li>If you want to see what resources are in this file, check the " + echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; + echo "<ul><li>If you want to see what resources are in this module, check the " .gen_resfile_a($MASTER_LANGUAGE, $resfile)."English (US) version</a>" - ." of this file</li>\n"; - echo "<li>If you want to translate this file you should check the $resfile\n"; - echo "file in the Wine source tree and make it include a new language file for\n"; + ." of this module</li>\n"; + echo "<li>If you want to translate this module you should check the $resfile\n"; + echo "directory in the Wine source tree and make it include a new language file for\n"; echo get_lang_name($lang)." (see $WINE_WIKI_TRANSLATIONS for a guide to\n"; echo "translating)</li>"; exit();

1 0

Francois Gouget : ole32: Make stub_manager_int_addref() static.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 872035f1ab1f5000818919671b995e712a4988ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=872035f1ab1f5000818919671… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 22 10:47:06 2009 +0200 ole32: Make stub_manager_int_addref() static. --- dlls/ole32/compobj_private.h | 1 - dlls/ole32/stubmanager.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index a7c6dfa..43e6e25 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -203,7 +203,6 @@ HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv); /* Stub Manager */ -ULONG stub_manager_int_addref(struct stub_manager *This); ULONG stub_manager_int_release(struct stub_manager *This); struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object); ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak); diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index c15e9d3..12813c6 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -251,7 +251,7 @@ static void stub_manager_delete(struct stub_manager *m) } /* increments the internal refcount */ -ULONG stub_manager_int_addref(struct stub_manager *This) +static ULONG stub_manager_int_addref(struct stub_manager *This) { ULONG refs;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 03584b4ff6392f259a2f046cdf11b7976062b55e URL: http://source.winehq.org/git/wine.git/?a=commit;h=03584b4ff6392f259a2f046cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 22 10:45:15 2009 +0200 Assorted spelling fixes. --- dlls/comctl32/tests/listview.c | 9 +++++---- dlls/kernel32/tests/volume.c | 4 ++-- dlls/mlang/tests/mlang.c | 2 +- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/opengl32/tests/opengl.c | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6c6a3b8..2d697bb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3204,7 +3204,7 @@ static void test_editbox(void) ok(hwndedit2 == NULL, "Expected Edit window not to be created\n"); ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); ok(GetFocus() == hwnd, "Expected List to be focused\n"); - /* and value greater then max item index */ + /* and value greater than max item index */ hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); ok(GetFocus() == hwndedit, "Expected Edit to be focused\n"); @@ -3312,7 +3312,7 @@ static void test_notifyformat(void) r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); expect(1, r); DestroyWindow(hwnd); - /* recieving error code defaulting to ansi */ + /* receiving error code defaulting to ansi */ notifyFormat = 0; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3323,7 +3323,7 @@ static void test_notifyformat(void) r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); expect(1, r); DestroyWindow(hwnd); - /* recieving ansi code from unicode window, use it */ + /* receiving ansi code from unicode window, use it */ notifyFormat = NFR_ANSI; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3484,9 +3484,10 @@ static BOOL load_v6_module(ULONG_PTR *pcookie) if (!ret) { - win_skip("A problem during context activation occured.\n"); + win_skip("A problem during context activation occurred.\n"); DeleteFileA(manifest_name); } + else { /* this is a XP SP3 failure workaround */ diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 2c25465..4f8c1c0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -160,7 +160,7 @@ static void test_GetVolumeNameForVolumeMountPointA(void) "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", temp_path, GetLastError()); - /* Try on a non-existent dos drive */ + /* Try on a nonexistent dos drive */ path[2] = 0; for (;path[0] <= 'z'; path[0]++) { ret = QueryDosDeviceA( path, volume, len); @@ -174,7 +174,7 @@ static void test_GetVolumeNameForVolumeMountPointA(void) "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", path, GetLastError()); - /* Try without trailing \ and on a non-existent dos drive */ + /* Try without trailing \ and on a nonexistent dos drive */ path[2] = 0; ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME, diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index d4e3941..54ab987 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -60,7 +60,7 @@ typedef struct lcid_tag_table { /* en, ar and zh use SUBLANG_NEUTRAL for the rfc1766 name without the country all others suppress the country with SUBLANG_DEFAULT. - For 3 letter language codes, the rfc1766 is to small for the country */ + For 3 letter language codes, the rfc1766 is too small for the country */ static const lcid_table_entry lcid_table[] = { {"e", -1, E_FAIL}, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 97089bb..61389cf 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1321,7 +1321,7 @@ static void test_ClientId(void) GUID g2; hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfClientId, (LPVOID*)&pcid); - ok(SUCCEEDED(hr),"Unable to aquire ITfClientId interface\n"); + ok(SUCCEEDED(hr),"Unable to acquire ITfClientId interface\n"); CoCreateGuid(&g2); diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3078b79..2ced97d 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -320,7 +320,7 @@ static void test_sharelists(HDC winhdc) } /* Test 3: Share display lists with a context which already shares display lists with another context. - * According to MSDN the second paramater can't share any display lists but some buggy drivers might allow it */ + * According to MSDN the second parameter cannot share any display lists but some buggy drivers might allow it */ hglrc3 = wglCreateContext(winhdc); if(hglrc3) {

1 0

Huw Davies : gdi32: CBM_INIT is a flag.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 3742389d457c3b51c8b0d079a7290048bde53559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3742389d457c3b51c8b0d079a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 18 15:31:18 2009 +0100 gdi32: CBM_INIT is a flag. --- dlls/gdi32/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 086eaae..3b1ba92 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1120,7 +1120,7 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, if (handle) { - if (init == CBM_INIT) + if (init & CBM_INIT) { if (SetDIBits( hdc, handle, 0, height, bits, data, coloruse ) == 0) {

1 0

Huw Davies : ole32: Since OleCreateLinkFromData is a stub we should return S_FALSE from OleQueryLinkFromData .
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: f48e5e2b5f075793455f0ad5fc3fcad7065a7e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48e5e2b5f075793455f0ad5f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 22 13:24:08 2009 +0100 ole32: Since OleCreateLinkFromData is a stub we should return S_FALSE from OleQueryLinkFromData. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index fe00066..3b87aac 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -570,7 +570,7 @@ HRESULT WINAPI OleQueryLinkFromData( IDataObject* pSrcDataObject) { FIXME("(%p),stub!\n", pSrcDataObject); - return S_OK; + return S_FALSE; } /***********************************************************************

1 0