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

Andrew Talbot : cryptnet: Constify some variables.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 6ddc981c2bf1c763694b896f1e1ff22bb3ac55e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ddc981c2bf1c763694b896f1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jun 22 22:04:07 2009 +0100 cryptnet: Constify some variables. --- dlls/cryptnet/cryptnet_main.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 83346a0..9301a56 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -608,7 +608,7 @@ static BOOL CRYPT_DownloadObject(DWORD dwRetrievalFlags, HINTERNET hHttp, * creates a new cache entry for the object and writes the object to it. * Sets the expiration time of the cache entry to expires. */ -static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, +static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; @@ -692,7 +692,7 @@ static void CALLBACK CRYPT_InetStatusCallback(HINTERNET hInt, } } -static BOOL CRYPT_Connect(URL_COMPONENTSW *components, +static BOOL CRYPT_Connect(const URL_COMPONENTSW *components, struct InetContext *context, PCRYPT_CREDENTIALS pCredentials, HINTERNET *phInt, HINTERNET *phHost) { @@ -1049,7 +1049,7 @@ static BOOL CRYPT_GetRetrieveFunction(LPCWSTR pszURL, } static BOOL WINAPI CRYPT_CreateBlob(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { DWORD size, i; CRYPT_BLOB_ARRAY *context; @@ -1086,7 +1086,7 @@ static BOOL WINAPI CRYPT_CreateBlob(LPCSTR pszObjectOid, typedef BOOL (WINAPI *AddContextToStore)(HCERTSTORE hCertStore, const void *pContext, DWORD dwAddDisposition, const void **ppStoreContext); -static BOOL CRYPT_CreateContext(PCRYPT_BLOB_ARRAY pObject, +static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, DWORD dwExpectedContentTypeFlags, AddContextToStore addFunc, void **ppvContext) { BOOL ret = TRUE; @@ -1142,28 +1142,28 @@ static BOOL CRYPT_CreateContext(PCRYPT_BLOB_ARRAY pObject, } static BOOL WINAPI CRYPT_CreateCert(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CERT, (AddContextToStore)CertAddCertificateContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreateCRL(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CRL, (AddContextToStore)CertAddCRLContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreateCTL(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CTL, (AddContextToStore)CertAddCTLContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreatePKCS7(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { BOOL ret; @@ -1187,7 +1187,7 @@ static BOOL WINAPI CRYPT_CreatePKCS7(LPCSTR pszObjectOid, } static BOOL WINAPI CRYPT_CreateAny(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { BOOL ret; @@ -1273,7 +1273,7 @@ static BOOL WINAPI CRYPT_CreateAny(LPCSTR pszObjectOid, } typedef BOOL (WINAPI *ContextDllCreateObjectContext)(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext); + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext); static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid, ContextDllCreateObjectContext *pFunc, HCRYPTOIDFUNCADDR *phFunc) @@ -1322,10 +1322,10 @@ static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid, return ret; } -typedef BOOL (*get_object_expiration_func)(void *pvContext, +typedef BOOL (*get_object_expiration_func)(const void *pvContext, FILETIME *expiration); -static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCert(const void *pvObject, FILETIME *expiration) { PCCERT_CONTEXT cert = pvObject; @@ -1333,7 +1333,7 @@ static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) return TRUE; } -static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCRL(const void *pvObject, FILETIME *expiration) { PCCRL_CONTEXT cert = pvObject; @@ -1341,7 +1341,7 @@ static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) return TRUE; } -static BOOL CRYPT_GetExpirationFromCTL(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCTL(const void *pvObject, FILETIME *expiration) { PCCTL_CONTEXT cert = pvObject;

1 0

Nikolay Sivov : comctl32/listview: Test for parent sequence when creating with LVS_OWNERDRAWFIXED.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: d03e63ccd7bc52a0aedb249feeea6739d930413a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03e63ccd7bc52a0aedb249fe… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 22 21:39:46 2009 +0400 comctl32/listview: Test for parent sequence when creating with LVS_OWNERDRAWFIXED. --- dlls/comctl32/tests/listview.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2d697bb..820acc6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -114,6 +114,14 @@ static const struct message create_parent_wnd_seq[] = { { 0 } }; +static const struct message create_ownerdrawfixed_parent_seq[] = { + { WM_NOTIFYFORMAT, sent }, + { WM_QUERYUISTATE, sent|optional }, /* Win2K and higher */ + { WM_MEASUREITEM, sent }, + { WM_PARENTNOTIFY, sent }, + { 0 } +}; + static const struct message redraw_listview_seq[] = { { WM_PAINT, sent|id, 0, 0, LISTVIEW_ID }, { WM_PAINT, sent|id, 0, 0, HEADER_ID }, @@ -1392,6 +1400,13 @@ static void test_create(void) ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); DestroyWindow(hList); + + /* WM_MEASUREITEM should be sent when created with LVS_OWNERDRAWFIXED */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hList = create_listview_control(LVS_OWNERDRAWFIXED); + ok_sequence(sequences, PARENT_SEQ_INDEX, create_ownerdrawfixed_parent_seq, + "created with LVS_OWNERDRAWFIXED - parent seq", TRUE); + DestroyWindow(hList); } static void test_redraw(void)

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.24
by Jeremy Newman June 22, 2009

June 22, 2009

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 June 22, 2009

June 22, 2009

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 June 22, 2009

June 22, 2009

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 June 22, 2009

June 22, 2009

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

Huw Davies : ole32: Since OleCreateLinkFromData is a stub we should return S_FALSE from OleQueryLinkFromData .
by Alexandre Julliard June 22, 2009

June 22, 2009

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

Alexandre Julliard : configure: Improve extraction of the target name from the CROSSCC definition.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 72a95ffa22606fb1027385dd7eba647e294ae5ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a95ffa22606fb1027385dd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 14:50:51 2009 +0200 configure: Improve extraction of the target name from the CROSSCC definition. --- configure | 15 ++++++++++++++- configure.ac | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1142c59..2ebe28a 100755 --- a/configure +++ b/configure @@ -8366,8 +8366,21 @@ test -n "$MINGWAR" || MINGWAR="false" then CROSSTEST="\$(CROSSTEST)" - CROSSTARGETFLAGS="-b `expr $CROSSCC : '$.*$-gcc'`" + set x $CROSSCC + shift + target="" + while test $# -ge 1 + do + case "$1" in + *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; + esac + shift + done + if test -n "$target" + then + CROSSTARGETFLAGS="-b $target" + fi fi fi diff --git a/configure.ac b/configure.ac index 356f6b7..3ef18dc 100644 --- a/configure.ac +++ b/configure.ac @@ -699,7 +699,20 @@ then if test "$CROSSCC" != "false" then AC_SUBST(CROSSTEST,"\$(CROSSTEST)") - AC_SUBST(CROSSTARGETFLAGS,"-b `expr $CROSSCC : '$.*$-gcc'`") + set x $CROSSCC + shift + target="" + while test $# -ge 1 + do + case "$1" in + *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; + esac + shift + done + if test -n "$target" + then + AC_SUBST(CROSSTARGETFLAGS,"-b $target") + fi fi fi

1 0

Francois Gouget : ole32: Make stub_manager_int_addref() static.
by Alexandre Julliard June 22, 2009

June 22, 2009

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

Alexandre Julliard : crypt32: Fix a couple of assumptions about structure layout.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: d5d3efd592e55f1f3c4de9f24488128a35d59cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d3efd592e55f1f3c4de9f24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 14:53:24 2009 +0200 crypt32: Fix a couple of assumptions about structure layout. --- dlls/crypt32/decode.c | 2 +- dlls/crypt32/encode.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 2c2b543..7a33e6a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -523,7 +523,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], for (i = 0; i < cItem; i++) { bytesNeeded += items[i].size; - structSize += items[i].minSize; + structSize = max( structSize, items[i].offset + items[i].minSize ); } if (pcbDecoded) *pcbDecoded = 1 + lenBytes + cbDecoded; diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 67a0155..258384c 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -564,13 +564,12 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLEntries(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - DWORD cCRLEntry = *(const DWORD *)pvStructInfo; DWORD bytesNeeded, dataLen, lenBytes, i; - const CRL_ENTRY *rgCRLEntry = *(const CRL_ENTRY *const *) - ((const BYTE *)pvStructInfo + sizeof(DWORD)); + const CRL_INFO *info = pvStructInfo; + const CRL_ENTRY *rgCRLEntry = info->rgCRLEntry; BOOL ret = TRUE; - for (i = 0, dataLen = 0; ret && i < cCRLEntry; i++) + for (i = 0, dataLen = 0; ret && i < info->cCRLEntry; i++) { DWORD size; @@ -594,7 +593,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLEntries(DWORD dwCertEncodingType, *pbEncoded++ = ASN_SEQUENCEOF; CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); pbEncoded += lenBytes; - for (i = 0; i < cCRLEntry; i++) + for (i = 0; i < info->cCRLEntry; i++) { DWORD size = dataLen; @@ -659,7 +658,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLInfo(DWORD dwCertEncodingType, } if (info->cCRLEntry) { - items[cItem].pvStructInfo = &info->cCRLEntry; + items[cItem].pvStructInfo = info; items[cItem].encodeFunc = CRYPT_AsnEncodeCRLEntries; cItem++; }

1 0