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

Michael Stefaniuc : user32: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 3090323c89399c39c01058d83aeeccace8be31cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3090323c89399c39c01058d83… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:57 2009 +0200 user32: Build language resource files separately. Do not include them from an other rc file. --- dlls/user32/Makefile.in | 32 ++++++++++++++- dlls/user32/resources.h | 28 +++++++++++++ dlls/user32/resources/user32.rc | 76 ----------------------------------- dlls/user32/resources/user32_Bg.rc | 2 + dlls/user32/resources/user32_Ca.rc | 2 + dlls/user32/resources/user32_Cs.rc | 2 + dlls/user32/resources/user32_Da.rc | 2 + dlls/user32/resources/user32_De.rc | 2 + dlls/user32/resources/user32_En.rc | 2 + dlls/user32/resources/user32_Eo.rc | 2 + dlls/user32/resources/user32_Es.rc | 2 + dlls/user32/resources/user32_Fi.rc | 2 + dlls/user32/resources/user32_Fr.rc | 2 + dlls/user32/resources/user32_Hu.rc | 2 + dlls/user32/resources/user32_It.rc | 2 + dlls/user32/resources/user32_Ja.rc | 4 +- dlls/user32/resources/user32_Ko.rc | 2 + dlls/user32/resources/user32_Lt.rc | 4 +- dlls/user32/resources/user32_Nl.rc | 2 + dlls/user32/resources/user32_No.rc | 2 + dlls/user32/resources/user32_Pl.rc | 2 + dlls/user32/resources/user32_Pt.rc | 2 + dlls/user32/resources/user32_Ro.rc | 4 +- dlls/user32/resources/user32_Ru.rc | 2 + dlls/user32/resources/user32_Si.rc | 4 +- dlls/user32/resources/user32_Sk.rc | 2 + dlls/user32/resources/user32_Sv.rc | 2 + dlls/user32/resources/user32_Tr.rc | 2 + dlls/user32/resources/user32_Uk.rc | 2 + dlls/user32/resources/user32_Wa.rc | 2 + dlls/user32/resources/user32_Zh.rc | 4 +- dlls/user32/resources/user32_bin.rc | 1 + dlls/user32/resources/version.rc | 2 + 33 files changed, 118 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3090323c89399c39c0105…

1 0

Alexandre Julliard : make_makefiles: Automatically update the source lists in the individual makefiles.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 88b74519ae86081af38a1e2dd5e0b8417e1f5039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b74519ae86081af38a1e2dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 13:26:01 2009 +0200 make_makefiles: Automatically update the source lists in the individual makefiles. --- tools/make_makefiles | 119 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 106 insertions(+), 13 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 91f7d39..99a120c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -118,7 +118,21 @@ my %private_idl_headers = ( "wine/winedxgi.idl" => 1, ); -my (@makefiles, %makefiles); +my %ignored_source_files = ( + "dlls/wineps.drv/afm2c.c" => 1, + "dlls/wineps.drv/mkagl.c" => 1, + "programs/winetest/dist.rc" => 1, +); + +my (@all_files, @makefiles, %makefiles); + +sub dirname($) +{ + my $ret = shift; + return "" unless $ret =~ /\//; + $ret =~ s!/[^/]*$!!; + return $ret; +} # update a file if changed sub update_file($) @@ -178,6 +192,49 @@ sub replace_in_file($$$@) return update_file($file); } +# replace a variable in a makefile +sub replace_makefile_variable($$) +{ + my ($file, $var) = @_; + my $make = $makefiles{$file}; + + return unless defined ${$make}{"=$var"}; + + my @values = @{${$make}{"=$var"}}; + ${$make}{$var} = \@values; + + open NEW_FILE, ">$file.in.new" or die "cannot create $file.in.new"; + + open OLD_FILE, "$file.in" or die "cannot open $file.in"; + while (<OLD_FILE>) + { + if (/^\s*($var\s+)=/) + { + # try to preserve formatting + my $prefix = $1; + my $multiline = /\\$/ || (@values > 1); + while (/\\$/) + { + $_ = <OLD_FILE>; + last unless $_; + } + if ($multiline) + { + print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + } + else + { + print NEW_FILE "$prefix= @values\n"; + } + next; + } + print NEW_FILE $_; + } + close OLD_FILE; + close NEW_FILE; + return update_file("$file.in"); +} + # parse the specified makefile to identify the rules file sub parse_makefile($) { @@ -191,7 +248,9 @@ sub parse_makefile($) while (<MAKE>) { chomp; + next if (/^\s*#/); while (/\\$/) { chop; $_ .= <MAKE>; chomp; } # merge continued lines + next if (/^\s*$/); if (/^\@(MAKE.*RULES)\@/) { @@ -199,12 +258,12 @@ sub parse_makefile($) $make{"=rules"} = $makerules{$var}; next; } - if (/^(MODULE|IMPORTLIB|TESTDLL)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL)\s*=\s*(.*)/) { $make{$1} = $2; next; } - if (/^(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|MC_SRCS|RC_SRCS|RC_SRCS16|RC_BINARIES|SPEC_SRCS16|EXTRA_OBJS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|C_SRCS16|RC_SRCS16|SPEC_SRCS16|EXTRA_OBJS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/) { my @list = split(/\s+/, $2); $make{$1} = \@list; @@ -214,6 +273,30 @@ sub parse_makefile($) return %make; } +# assign source files to their respective makefile +sub assign_sources_to_makefiles() +{ + foreach my $file (@all_files) + { + next if defined $ignored_source_files{$file}; + my $dir = dirname( $file ); + + while ($dir && !defined $makefiles{"$dir/Makefile"}) { $dir = dirname( $dir ); } + next unless $dir; + + die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile"}; + + my $make = $makefiles{"$dir/Makefile"}; + my $basename = substr( $file, length($dir) + 1 ); + + if ($basename =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $basename; } + elsif ($basename =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $basename; } + elsif ($basename =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $basename; } + elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; } + elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; } + elsif ($basename =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $basename; } + } +} ################################################################ # update the makefile list in configure.ac @@ -256,6 +339,20 @@ sub update_makefiles(@) push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n"; } + # update the source variables in all the makefiles + + foreach my $file (sort @_) + { + my %make = %{$makefiles{$file}}; + + replace_makefile_variable( $file, "LEX_SRCS" ); + replace_makefile_variable( $file, "BISON_SRCS" ); + replace_makefile_variable( $file, "MC_SRCS" ); + replace_makefile_variable( $file, "SVG_SRCS" ); + replace_makefile_variable( $file, "C_SRCS" ) unless defined $make{"C_SRCS16"}; + replace_makefile_variable( $file, "RC_SRCS" ) unless defined $make{"RC_SRCS16"}; + } + push @lines, "\ndnl Build dependencies for test files compiled into winetest\n"; replace_in_file( "configure.ac", '^WINE_CONFIG_MAKERULES', '^dnl Build dependencies for test files compiled into winetest$', @lines); } @@ -491,9 +588,8 @@ sub update_dlls(@) sub update_includes() { - return unless -d ".git"; my (@h_srcs, @private_idl_srcs, @public_idl_srcs, @tlb_srcs, %subdirs); - my @includes = map { s/^include\///; $_; } split /\0/, `git ls-files -c -z include`; + my @includes = map { (my $ret = $_) =~ s/^include\///; $ret; } grep /^include\//, @all_files; foreach my $incl (@includes) { if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; } @@ -561,14 +657,10 @@ sub update_gitignore(@) } -if (-d ".git") -{ - @makefiles = map { s/\.in$//; $_; } split /\0/, `git ls-files -c -z Makefile.in \\*/Makefile.in`; -} -else -{ - @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`); -} +die "needs to be run from a git checkout" unless -d ".git"; + +(a)all_files = split /\0/, `git ls-files -c -z`; +(a)makefiles = map { my $ret = $_; $ret =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; foreach my $file (sort values %makerules, @makefiles) { @@ -576,6 +668,7 @@ foreach my $file (sort values %makerules, @makefiles) $makefiles{$file} = \%make; } +assign_sources_to_makefiles(); update_makefiles( @makefiles ); push @ignores, update_includes(); push @ignores, update_ignores( @makefiles );

1 0

Frédéric Delanoy : hhctrl.ocx: Update French translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 90df7b139490a6692b0e16dc2f0e5b1169697618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90df7b139490a6692b0e16dc2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 02:08:06 2009 +0200 hhctrl.ocx: Update French translation. --- dlls/hhctrl.ocx/Fr.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/Fr.rc b/dlls/hhctrl.ocx/Fr.rc index 206479e..2146a3c 100644 --- a/dlls/hhctrl.ocx/Fr.rc +++ b/dlls/hhctrl.ocx/Fr.rc @@ -21,6 +21,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE @@ -35,9 +38,9 @@ STRINGTABLE BEGIN IDTB_EXPAND "Afficher" IDTB_CONTRACT "Cacher" - IDTB_STOP "Arr�ter" + IDTB_STOP "Arrêter" IDTB_REFRESH "A&ctualiser" - IDTB_BACK "Pr�c�dent" + IDTB_BACK "Précédent" IDTB_HOME "Sommaire" IDTB_SYNC "Synchroniser" IDTB_PRINT "Imprimer" @@ -51,8 +54,8 @@ BEGIN IDTB_SEARCH "IDTB_SEARCH" IDTB_HISTORY "IDTB_HISTORY" IDTB_FAVORITES "IDTB_FAVORITES" - IDTB_JUMP1 "Jump1" - IDTB_JUMP2 "Jump2" + IDTB_JUMP1 "Saut1" + IDTB_JUMP2 "Saut2" IDTB_CUSTOMIZE "Personnaliser" IDTB_ZOOM "Zoom" IDTB_TOC_NEXT "IDTB_TOC_NEXT"

1 0

Frédéric Delanoy : gphoto2.ds: Update French translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: e400b153782a845eba02541b6c42fa7d354ca5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e400b153782a845eba02541b6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 01:57:07 2009 +0200 gphoto2.ds: Update French translation. --- dlls/gphoto2.ds/gphoto2_Fr.rc | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Fr.rc b/dlls/gphoto2.ds/gphoto2_Fr.rc index 3d5d6d5..39267e3 100644 --- a/dlls/gphoto2.ds/gphoto2_Fr.rc +++ b/dlls/gphoto2.ds/gphoto2_Fr.rc @@ -2,6 +2,7 @@ * French resources for Twain * * Copyright 2006 Jonathan Ernst + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,21 +21,24 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Files on Camera" +CAPTION "Fichiers sur l'appareil photo" MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 - DEFPUSHBUTTON "Importer la s�lection",IDC_IMPORT,152,252,72,14 - PUSHBUTTON "Preview",IDC_FETCH,7,252,64,14 - PUSHBUTTON "Importer tous",IDC_IMPORTALL,80,252,64,14 - CONTROL "Skip This Dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + DEFPUSHBUTTON "Importer la sélection",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Prévisualiser",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Tout importer",IDC_IMPORTALL,80,252,64,14 + CONTROL "Sauter ce dialogue",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 PUSHBUTTON "Fermer",IDC_EXIT,315,252,50,14 END @@ -48,10 +52,10 @@ END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER -CAPTION "Connexion � l'appareil photo" +CAPTION "Connexion à l'appareil photo" FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "Connexion � l'appareil photo... Veuillez patienter",IDC_STATIC,128,58, + LTEXT "Connexion à l'appareil photo... Veuillez patienter",IDC_STATIC,128,58, 116,8 END

1 0

Michael Stefaniuc : ole32: Import the content of version. rc into the main rc file.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: a1b286086e11e68e9b11836e1df2a4e5eb2c45b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b286086e11e68e9b11836e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 11:49:34 2009 +0200 ole32: Import the content of version.rc into the main rc file. There is no need for a separate file. --- dlls/ole32/ole32res.rc | 14 ++++---------- dlls/ole32/version.rc | 24 ------------------------ 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc index 0a649a6..60887a5 100644 --- a/dlls/ole32/ole32res.rc +++ b/dlls/ole32/ole32res.rc @@ -23,7 +23,10 @@ #include "winuser.h" #include "winnls.h" -#include "version.rc" +#define WINE_OLESELFREGISTER +#define WINE_FILENAME_STR "ole32.dll" + +#include <wine/wine_common_ver.rc> /* * Everything that does not depend on language, @@ -44,12 +47,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: drag_link.cur */ 3 CURSOR drag_link.cur - - -/* - * Everything specific to any language goes - * in one of the specific files. - * Note that you can and may override resources - * which also have a neutral version. This is to - * get localized bitmaps for example. - */ diff --git a/dlls/ole32/version.rc b/dlls/ole32/version.rc deleted file mode 100644 index fb85ade..0000000 --- a/dlls/ole32/version.rc +++ /dev/null @@ -1,24 +0,0 @@ -/* - * version information for ole32.dll - * - * Copyright (C) 2003 John K. Hohm - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WINE_OLESELFREGISTER -#define WINE_FILENAME_STR "ole32.dll" - -#include <wine/wine_common_ver.rc>

1 0

Frédéric Delanoy : msi: Update French translation .
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: e801cae5209fa082071d3bb5448752f1dc6383c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e801cae5209fa082071d3bb54… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 3 02:22:29 2009 +0200 msi: Update French translation. --- dlls/msi/msi_Fr.rc | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi_Fr.rc b/dlls/msi/msi_Fr.rc index a4cd0bc..f7f7338 100644 --- a/dlls/msi/msi_Fr.rc +++ b/dlls/msi/msi_Fr.rc @@ -20,17 +20,20 @@ #include "windef.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Le paquet d'installation spécifié n'a pu être ouvert. Veuillez vérifier le chemin du fichier et réessayer." 5 "Le chemin %s est introuvable" - 9 "ins�rez le disque %s" - 10 "mauvais param�tres" + 9 "insérez le disque %s" + 10 "mauvais paramètres" 11 "saisissez le nom du dossier contenant %s" - 12 "source d'installation pour la fonctionnalit� manquante" - 13 "lecteur r�seau pour la fonctionnalit� manquant" - 14 "fonctionnalit� depuis:" - 15 "s�lectionnez le dossier contenant %s" + 12 "source d'installation pour la fonctionnalité manquante" + 13 "lecteur réseau pour la fonctionnalité manquante" + 14 "fonctionnalité depuis :" + 15 "sélectionnez le dossier contenant %s" }

1 0

Rein Klazes : comdlg32/tests: fix a few test failures on Vista and higher.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: b46f8b1b32ec7036af3fc32c2f596f62be1f1c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46f8b1b32ec7036af3fc32c2… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Jul 3 11:46:23 2009 +0200 comdlg32/tests: fix a few test failures on Vista and higher. --- dlls/comdlg32/tests/filedlg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 6272f72..da51246 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -457,7 +457,7 @@ static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM msgFILEOKSTRING = RegisterWindowMessageA( FILEOKSTRING); } if( msg == WM_NOTIFY) { - if(((LPNMHDR)lParam)->code == CDN_INITDONE) { + if(((LPNMHDR)lParam)->code == CDN_FOLDERCHANGE) { SetTimer( dlg, 0, 100, 0); PostMessage( parent, WM_COMMAND, IDOK, 0); return FALSE; @@ -520,9 +520,9 @@ static void test_ok(void) : (LPOFNHOOKPROC) test_ok_wndproc; ret = GetOpenFileNameA(&ofn); ok( ok_testcases[i].expclose == ok_testcases[i].actclose, - "Open File dialog should %shave closed.\n", + "testid %d: Open File dialog should %shave closed.\n", i, ok_testcases[i].expclose ? "" : "NOT "); - ok(ret == ok_testcases[i].expclose, "GetOpenFileName returned %#x\n", ret); + ok(ret == ok_testcases[i].expclose, "testid %d: GetOpenFileName returned %#x\n", i, ret); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); }

1 0

Hans Leidekker : iphlpapi/tests: Initialize a variable.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 91b6ebefa89cb8e71330348b39835dca78e63ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b6ebefa89cb8e71330348b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:31:10 2009 +0200 iphlpapi/tests: Initialize a variable. --- dlls/iphlpapi/tests/iphlpapi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index f879c93..eaada07 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -829,6 +829,7 @@ static void test_GetAdaptersAddresses(void) ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", ret); + size = 0; ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return;

1 0

Hans Leidekker : ole32: Use existing MTA in CoGetContextToken and CoGetObjectContext.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 6986d97f18730710aad132989104df5dee45c99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6986d97f18730710aad132989… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:32:08 2009 +0200 ole32: Use existing MTA in CoGetContextToken and CoGetObjectContext. --- dlls/ole32/compobj.c | 18 +++++++++-- dlls/ole32/tests/compobj.c | 70 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 739c86d..7403b95 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4050,8 +4050,12 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) *ppv = NULL; if (!apt) { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + apartment_release(apt); } context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); @@ -4089,7 +4093,15 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) return E_OUTOFMEMORY; if (!info->apt) - return CO_E_NOTINITIALIZED; + { + APARTMENT *apt; + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + apartment_release(apt); + } if (!token) return E_POINTER; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index ff2462f..1435984 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1082,6 +1082,9 @@ static void test_CoGetObjectContext(void) IObjContext *pObjContext; APTTYPE apttype; THDTYPE thdtype; + struct info info; + HANDLE thread; + DWORD tid, exitcode; if (!pCoGetObjectContext) { @@ -1093,6 +1096,36 @@ static void test_CoGetObjectContext(void) ok(hr == CO_E_NOTINITIALIZED, "CoGetObjectContext should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pComThreadingInfo == NULL, "pComThreadingInfo should have been set to NULL\n"); + /* show that COM doesn't have to be initialized for multi-threaded apartments if another + thread has already done so */ + + info.wait = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + info.stop = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + + WaitForSingleObject(info.wait, INFINITE); + + pComThreadingInfo = NULL; + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + IComThreadingInfo_Release(pComThreadingInfo); + + SetEvent(info.stop); + WaitForSingleObject(thread, INFINITE); + + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); + + CloseHandle(thread); + CloseHandle(info.wait); + CloseHandle(info.stop); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); @@ -1260,6 +1293,9 @@ static void test_CoGetContextToken(void) ULONG refs; ULONG_PTR token; IObjContext *ctx; + struct info info; + HANDLE thread; + DWORD tid, exitcode; if (!pCoGetContextToken) { @@ -1272,6 +1308,36 @@ static void test_CoGetContextToken(void) ok(hr == CO_E_NOTINITIALIZED, "Expected CO_E_NOTINITIALIZED, got 0x%08x\n", hr); ok(token == 0xdeadbeef, "Expected 0, got 0x%lx\n", token); + /* show that COM doesn't have to be initialized for multi-threaded apartments if another + thread has already done so */ + + info.wait = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + info.stop = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + + WaitForSingleObject(info.wait, INFINITE); + + token = 0; + hr = pCoGetContextToken(&token); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + IUnknown_Release((IUnknown *)token); + + SetEvent(info.stop); + WaitForSingleObject(thread, INFINITE); + + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); + + CloseHandle(thread); + CloseHandle(info.wait); + CloseHandle(info.stop); + CoInitialize(NULL); hr = pCoGetContextToken(NULL); @@ -1283,10 +1349,10 @@ static void test_CoGetContextToken(void) ok(token, "Expected token != 0\n"); refs = IUnknown_AddRef((IUnknown *)token); - todo_wine ok(refs == 1, "Expected 1, got %u\n", refs); + ok(refs == 1, "Expected 1, got %u\n", refs); refs = IUnknown_Release((IUnknown *)token); - todo_wine ok(refs == 0, "Expected 0, got %u\n", refs); + ok(refs == 0, "Expected 0, got %u\n", refs); hr = pCoGetObjectContext(&IID_IObjContext, (void **)&ctx); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr);

1 0

Hans Leidekker : wintrust/tests: Initialize a variable.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 44db8883f86bd96f5cf8e565f45445efaf7b75d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44db8883f86bd96f5cf8e565f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:31:36 2009 +0200 wintrust/tests: Initialize a variable. --- dlls/wintrust/tests/asn.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 308fb8b..a4f4fbb 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -725,6 +725,7 @@ static void test_decodeCatNameValue(void) DWORD size; CAT_NAMEVALUE *value; + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, emptyCatNameValue, sizeof(emptyCatNameValue), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -739,6 +740,7 @@ static void test_decodeCatNameValue(void) value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithTag, sizeof(catNameValueWithTag), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -754,6 +756,7 @@ static void test_decodeCatNameValue(void) value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithFlags, sizeof(catNameValueWithFlags), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -768,6 +771,7 @@ static void test_decodeCatNameValue(void) value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithValue, sizeof(catNameValueWithValue), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size);

1 0