December 2011 - Wine-Commits

Alexandre Julliard : netapi32: Simplify the smbpasswd invocation to avoid compiler warnings.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: b7ceca13993ec473c2ac7659b88a456bba1f0211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ceca13993ec473c2ac7659b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 12:09:04 2011 +0100 netapi32: Simplify the smbpasswd invocation to avoid compiler warnings. --- dlls/netapi32/access.c | 124 ++++++++++++++++++++++-------------------------- 1 files changed, 56 insertions(+), 68 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index c48c693..6750a11 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -876,39 +876,6 @@ NET_API_STATUS WINAPI NetUserModalsGet( return NERR_Success; } -static int fork_smbpasswd( char * const argv[], pid_t *pid ) -{ -#ifdef HAVE_FORK - int pipe_out[2]; - - if (pipe( pipe_out ) == -1) return -1; - fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); - fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); - - switch ((*pid = fork())) - { - case -1: - close( pipe_out[0] ); - close( pipe_out[1] ); - return -1; - case 0: - dup2( pipe_out[0], 0 ); - close( pipe_out[0] ); - close( pipe_out[1] ); - execvp( "smbpasswd", argv ); - ERR( "can't execute smbpasswd, is it installed?\n" ); - _exit(1); - default: - close( pipe_out[0] ); - break; - } - return pipe_out[1]; -#else - ERR( "no fork support on this platform\n" ); - return -1; -#endif -} - static char *strdup_unixcp( const WCHAR *str ) { char *ret; @@ -921,20 +888,32 @@ static char *strdup_unixcp( const WCHAR *str ) static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, LPCWSTR oldpassword, LPCWSTR newpassword ) { +#ifdef HAVE_FORK NET_API_STATUS ret = NERR_Success; static char option_silent[] = "-s"; static char option_user[] = "-U"; static char option_remote[] = "-r"; static char smbpasswd[] = "smbpasswd"; - int pipe_out; - pid_t pid; - char *server = NULL, *user, *argv[7], *old, *new = NULL; + int pipe_out[2]; + pid_t pid, wret; + int status; + char *server = NULL, *user, *argv[7], *old = NULL, *new = NULL; if (domainname && !(server = strdup_unixcp( domainname ))) return ERROR_OUTOFMEMORY; if (!(user = strdup_unixcp( username ))) { - HeapFree( GetProcessHeap(), 0, server ); - return ERROR_OUTOFMEMORY; + ret = ERROR_OUTOFMEMORY; + goto end; + } + if (!(old = strdup_unixcp( oldpassword ))) + { + ret = ERROR_OUTOFMEMORY; + goto end; + } + if (!(new = strdup_unixcp( newpassword ))) + { + ret = ERROR_OUTOFMEMORY; + goto end; } argv[0] = smbpasswd; argv[1] = option_silent; @@ -948,48 +927,57 @@ static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, } else argv[4] = NULL; - pipe_out = fork_smbpasswd( argv, &pid ); - HeapFree( GetProcessHeap(), 0, server ); - HeapFree( GetProcessHeap(), 0, user ); - if (pipe_out == -1) return NERR_InternalError; - - if (!(old = strdup_unixcp( oldpassword ))) + if (pipe( pipe_out ) == -1) { - ret = ERROR_OUTOFMEMORY; + ret = NERR_InternalError; goto end; } - if (!(new = strdup_unixcp( newpassword ))) + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); + + switch ((pid = fork())) { - ret = ERROR_OUTOFMEMORY; + case -1: + close( pipe_out[0] ); + close( pipe_out[1] ); + ret = NERR_InternalError; goto end; + case 0: + dup2( pipe_out[0], 0 ); + close( pipe_out[0] ); + close( pipe_out[1] ); + execvp( "smbpasswd", argv ); + ERR( "can't execute smbpasswd, is it installed?\n" ); + _exit(1); + default: + close( pipe_out[0] ); + break; } - write( pipe_out, old, strlen( old ) ); - write( pipe_out, "\n", 1 ); - write( pipe_out, new, strlen( new ) ); - write( pipe_out, "\n", 1 ); - write( pipe_out, new, strlen( new ) ); - write( pipe_out, "\n", 1 ); + write( pipe_out[1], old, strlen( old ) ); + write( pipe_out[1], "\n", 1 ); + write( pipe_out[1], new, strlen( new ) ); + write( pipe_out[1], "\n", 1 ); + write( pipe_out[1], new, strlen( new ) ); + write( pipe_out[1], "\n", 1 ); + close( pipe_out[1] ); -end: - close( pipe_out ); + do { + wret = waitpid(pid, &status, 0); + } while (wret < 0 && errno == EINTR); -#ifdef HAVE_FORK - { - pid_t wret; - int status; - - do { - wret = waitpid(pid, &status, 0); - } while (wret < 0 && errno == EINTR); - if (ret == NERR_Success && - (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))) - ret = NERR_InternalError; - } -#endif + if (ret == NERR_Success && (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))) + ret = NERR_InternalError; +end: + HeapFree( GetProcessHeap(), 0, server ); + HeapFree( GetProcessHeap(), 0, user ); HeapFree( GetProcessHeap(), 0, old ); HeapFree( GetProcessHeap(), 0, new ); return ret; +#else + ERR( "no fork support on this platform\n" ); + return NERR_InternalError; +#endif } /******************************************************************************

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 32fe05d3c4e3e782213618850bbf1df615759389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fe05d3c4e3e782213618850… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 6 01:57:15 2011 +0100 po: Update French translation. --- po/fr.po | 43 ++++++++++++++++++------------------------- 1 files changed, 18 insertions(+), 25 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4a9aefa..c295f02 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,11 +1,11 @@ # French translations for Wine -# Frédéric Delanoy <frederic.delanoy(a)gmail.com>, 2011. +# msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-01 00:20+0100\n" +"PO-Revision-Date: 2011-12-06 00:09+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -115,7 +115,6 @@ msgid "Wine Gecko Installer" msgstr "Programme d'installation de Gecko pour Wine" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -129,8 +128,9 @@ msgstr "" "applications incorporant du HTML puissent fonctionner correctement.\n" "Wine peut automatiquement le télécharger et l'installer pour vous.\n" "\n" -"Note : il est recommandé d'utiliser le paquet de votre distribution si " -"disponible. Consultez http://wiki.winehq.org/Gecko pour plus de détails." +"Note : il est recommandé d'utiliser le paquet de votre distribution." +"Consultez <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/" +"Gecko</a> pour plus de détails." #: appwiz.rc:106 msgid "&Install" @@ -2270,38 +2270,32 @@ msgid "Default MidiOut Device" msgstr "Périphérique MidiOut par défaut" #: dinput.rc:40 -#, fuzzy msgid "Configure Devices" -msgstr "Con&figurer..." +msgstr "Configurer les périphériques" #: dinput.rc:45 msgid "Reset" -msgstr "" +msgstr "Réinitialiser" #: dinput.rc:48 -#, fuzzy msgid "Player" -msgstr "Lecture" +msgstr "Lecteur" #: dinput.rc:49 -#, fuzzy msgid "Device" -msgstr "De&vice:" +msgstr "Périphérique" #: dinput.rc:50 -#, fuzzy msgid "Actions" -msgstr "Action" +msgstr "Actions" #: dinput.rc:51 -#, fuzzy msgid "Mapping" -msgstr "Assignation de lecteur" +msgstr "Mapping" #: dinput.rc:53 -#, fuzzy msgid "Show Assigned First" -msgstr "Déjà assigné\n" +msgstr "Afficher en premier les affectations" #: dinput.rc:34 msgid "Action" @@ -6100,9 +6094,8 @@ msgid "&Data Rate" msgstr "&Débit de données" #: msvfw32.rc:52 -#, fuzzy msgid "kB/sec" -msgstr "Kio/sec" +msgstr "ko/sec" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -6585,7 +6578,6 @@ msgid "us" msgstr "µs" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" msgstr "Propriétés de %s" @@ -12785,7 +12777,6 @@ msgstr "" "somme désolés pour le désagrément subi." #: winedbg.rc:53 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -12795,11 +12786,13 @@ msgid "" "you can <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a>." msgstr "" "Cela peut être causé par une erreur dans le programme ou un défaut dans " -"Wine. Vous pouvez consulter http://appdb.winehq.org pour obtenir des " -"instructions sur l'exécution de cette application.\n" +"Wine. Vous pouvez consulter la <a href=\"http://appdb.winehq.org\">base de " +"données d'applications</a> pour obtenir des conseils sur la façon d'exécuter " +"cette application.\n" "\n" "Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, " -"vous pouvez le rapporter sur http://bugs.winehq.org." +"vous pouvez <a href=\"http://wiki.winehq.org/Bugs\">soumettre un rapport " +"d'anomalie</a>." #: winedbg.rc:35 msgid "Wine program crash"

1 0

Alexandre Julliard : gdi32: Add a null driver implementation for Polyline and Polygon.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 25e300dcade3653452bfd6dd445abd1836792ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e300dcade3653452bfd6dd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 22:29:16 2011 +0100 gdi32: Add a null driver implementation for Polyline and Polygon. --- dlls/gdi32/driver.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 0610347..26048b4 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -477,24 +477,27 @@ static BOOL nulldrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL nulldrv_PolyPolygon( PHYSDEV dev, const POINT *points, const INT *counts, UINT polygons ) { - /* FIXME: could be implemented with Polygon */ return TRUE; } static BOOL nulldrv_PolyPolyline( PHYSDEV dev, const POINT *points, const DWORD *counts, DWORD lines ) { - /* FIXME: could be implemented with Polyline */ return TRUE; } static BOOL nulldrv_Polygon( PHYSDEV dev, const POINT *points, INT count ) { - return TRUE; + INT counts[1] = { count }; + + return PolyPolygon( dev->hdc, points, counts, 1 ); } static BOOL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count ) { - return TRUE; + DWORD counts[1] = { count }; + + if (count < 0) return FALSE; + return PolyPolyline( dev->hdc, points, counts, 1 ); } static UINT nulldrv_RealizeDefaultPalette( PHYSDEV dev )

1 0

Frédéric Delanoy : French translation for release 1.3.34
by Jeremy Newman Dec. 6, 2011

Dec. 6, 2011

Module: website Branch: master Commit: 3f8a1b7c2b748a2984e2e85a94b8d0a8a415cf1c URL: http://source.winehq.org/git/website.git/?a=commit;h=3f8a1b7c2b748a2984e2e8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 2 23:29:34 2011 +0100 French translation for release 1.3.34 --- news/fr/2011120201.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011120201.xml b/news/fr/2011120201.xml new file mode 100644 index 0000000..4d75967 --- /dev/null +++ b/news/fr/2011120201.xml @@ -0,0 +1,20 @@ +<news> +<date>2 décembre 2011</date> +<title>Sortie de Wine 1.3.34</title> +<body> + La version de développement 1.3.34 de Wine est disponible. + <a href="{$root}/announce/1.3.34">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du bytecode dans JavaScript.</li> + <li>Prise en charge des dégradés dans le moteur DIB.</li> + <li>Quelques améliorations dans Uniscribe.</li> + <li>Correctifs dans les changements de mode DirectDraw.</li> + <li>Plusieurs nouvelles fonctions dans le système d'exécutions MSVC.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.34.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.3.34 freigegeben
by Jeremy Newman Dec. 6, 2011

Dec. 6, 2011

Module: website Branch: master Commit: e058458f09b09bf52a81e65806702f614787fe28 URL: http://source.winehq.org/git/website.git/?a=commit;h=e058458f09b09bf52a81e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 2 23:23:33 2011 +0100 Wine 1.3.34 freigegeben --- news/de/2011120201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011120201.xml b/news/de/2011120201.xml new file mode 100644 index 0000000..38f0333 --- /dev/null +++ b/news/de/2011120201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. Dezember 2011</date> +<title>Wine 1.3.34 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.34 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.34">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bytecode Unterstützung in JavaScript.</li> + <li>Unterstützung für Farbverläufe in der DIB Engine.</li> + <li>Einige Uniscribe Verbesserungen.</li> + <li>Fehlerbehebungen für die DirectDraw Modusumschaltung.</li> + <li>Ein paar MSVC Runtime Funktionen mehr.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.34.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : user32: Convert dialogs to po files.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 95f81d10c9c852b72c6513eca0a2d0e066457f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f81d10c9c852b72c6513eca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 21:23:22 2011 +0100 user32: Convert dialogs to po files. --- dlls/user32/Makefile.in | 34 +-------------- dlls/user32/resources/user32_Bg.rc | 48 --------------------- dlls/user32/resources/user32_Ca.rc | 38 ---------------- dlls/user32/resources/user32_Cs.rc | 41 ------------------ dlls/user32/resources/user32_Da.rc | 51 ---------------------- dlls/user32/resources/user32_De.rc | 51 ---------------------- dlls/user32/resources/user32_En.rc | 48 --------------------- dlls/user32/resources/user32_Eo.rc | 49 --------------------- dlls/user32/resources/user32_Es.rc | 49 --------------------- dlls/user32/resources/user32_Fi.rc | 49 --------------------- dlls/user32/resources/user32_Fr.rc | 54 ----------------------- dlls/user32/resources/user32_He.rc | 53 ----------------------- dlls/user32/resources/user32_Hu.rc | 49 --------------------- dlls/user32/resources/user32_It.rc | 52 ---------------------- dlls/user32/resources/user32_Ja.rc | 51 ---------------------- dlls/user32/resources/user32_Ko.rc | 49 --------------------- dlls/user32/resources/user32_Lt.rc | 51 ---------------------- dlls/user32/resources/user32_Nl.rc | 50 --------------------- dlls/user32/resources/user32_No.rc | 49 --------------------- dlls/user32/resources/user32_Pl.rc | 49 --------------------- dlls/user32/resources/user32_Pt.rc | 67 ----------------------------- dlls/user32/resources/user32_Ro.rc | 51 ---------------------- dlls/user32/resources/user32_Ru.rc | 51 ---------------------- dlls/user32/resources/user32_Si.rc | 50 --------------------- dlls/user32/resources/user32_Sk.rc | 48 --------------------- dlls/user32/resources/user32_Sr.rc | 81 ----------------------------------- dlls/user32/resources/user32_Sv.rc | 49 --------------------- dlls/user32/resources/user32_Tr.rc | 48 --------------------- dlls/user32/resources/user32_Uk.rc | 49 --------------------- dlls/user32/resources/user32_Wa.rc | 43 ------------------ dlls/user32/resources/user32_Zh.rc | 83 ------------------------------------ dlls/user32/user32.rc | 27 ++++++++++++ po/ar.po | 73 ++++++++++++++++++++++--------- po/bg.po | 75 +++++++++++++++++++++----------- po/ca.po | 71 +++++++++++++++++++++--------- po/cs.po | 76 ++++++++++++++++++++++----------- po/da.po | 70 +++++++++++++++++++++--------- po/de.po | 70 +++++++++++++++++++++--------- po/el.po | 71 +++++++++++++++++++++--------- po/en.po | 70 +++++++++++++++++++++--------- po/en_US.po | 70 +++++++++++++++++++++--------- po/eo.po | 70 +++++++++++++++++++++--------- po/es.po | 70 +++++++++++++++++++++--------- po/fa.po | 73 ++++++++++++++++++++++--------- po/fi.po | 73 +++++++++++++++++++++---------- po/fr.po | 70 +++++++++++++++++++++--------- po/he.po | 70 +++++++++++++++++++++--------- po/hi.po | 71 +++++++++++++++++++++--------- po/hu.po | 70 +++++++++++++++++++++--------- po/it.po | 70 +++++++++++++++++++++--------- po/ja.po | 70 +++++++++++++++++++++--------- po/ko.po | 70 +++++++++++++++++++++--------- po/lt.po | 70 +++++++++++++++++++++--------- po/ml.po | 71 +++++++++++++++++++++--------- po/nb_NO.po | 70 +++++++++++++++++++++--------- po/nl.po | 70 +++++++++++++++++++++--------- po/or.po | 71 +++++++++++++++++++++--------- po/pa.po | 71 +++++++++++++++++++++--------- po/pl.po | 70 +++++++++++++++++++++--------- po/pt_BR.po | 70 +++++++++++++++++++++--------- po/pt_PT.po | 70 +++++++++++++++++++++--------- po/rm.po | 71 +++++++++++++++++++++--------- po/ro.po | 70 +++++++++++++++++++++--------- po/ru.po | 70 +++++++++++++++++++++--------- po/sk.po | 70 +++++++++++++++++++++--------- po/sl.po | 70 +++++++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 70 +++++++++++++++++++++--------- po/sr_RS(a)latin.po | 70 +++++++++++++++++++++--------- po/sv.po | 70 +++++++++++++++++++++--------- po/te.po | 71 +++++++++++++++++++++--------- po/th.po | 73 ++++++++++++++++++++++--------- po/tr.po | 70 +++++++++++++++++++++--------- po/uk.po | 70 +++++++++++++++++++++--------- po/wa.po | 78 ++++++++++++++++++++++----------- po/wine.pot | 70 +++++++++++++++++++++--------- po/zh_CN.po | 70 +++++++++++++++++++++--------- po/zh_TW.po | 70 +++++++++++++++++++++--------- 77 files changed, 2215 insertions(+), 2586 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95f81d10c9c852b72c651…

1 0

Alexandre Julliard : shell32: Convert dialogs to po files.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 28d54b7b1cc8cccc889d43c95624c990406799d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d54b7b1cc8cccc889d43c95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 21:09:27 2011 +0100 shell32: Convert dialogs to po files. --- dlls/shell32/Makefile.in | 34 +-------- dlls/shell32/shell32.rc | 74 ++++++++++++++++++ dlls/shell32/shell32_Bg.rc | 65 ---------------- dlls/shell32/shell32_Ca.rc | 98 ------------------------ dlls/shell32/shell32_Cs.rc | 69 ----------------- dlls/shell32/shell32_Da.rc | 100 ------------------------- dlls/shell32/shell32_De.rc | 100 ------------------------- dlls/shell32/shell32_En.rc | 96 ------------------------ dlls/shell32/shell32_Eo.rc | 68 ----------------- dlls/shell32/shell32_Es.rc | 98 ------------------------ dlls/shell32/shell32_Fi.rc | 97 ------------------------ dlls/shell32/shell32_Fr.rc | 103 ------------------------- dlls/shell32/shell32_He.rc | 104 -------------------------- dlls/shell32/shell32_Hu.rc | 99 ------------------------ dlls/shell32/shell32_It.rc | 102 ------------------------- dlls/shell32/shell32_Ja.rc | 99 ------------------------ dlls/shell32/shell32_Ko.rc | 101 ------------------------- dlls/shell32/shell32_Lt.rc | 99 ------------------------ dlls/shell32/shell32_Nl.rc | 99 ------------------------ dlls/shell32/shell32_No.rc | 99 ------------------------ dlls/shell32/shell32_Pl.rc | 98 ------------------------ dlls/shell32/shell32_Pt.rc | 140 ---------------------------------- dlls/shell32/shell32_Ro.rc | 99 ------------------------ dlls/shell32/shell32_Ru.rc | 100 ------------------------- dlls/shell32/shell32_Si.rc | 98 ------------------------ dlls/shell32/shell32_Sk.rc | 50 ------------ dlls/shell32/shell32_Sr.rc | 177 -------------------------------------------- dlls/shell32/shell32_Sv.rc | 98 ------------------------ dlls/shell32/shell32_Tr.rc | 65 ---------------- dlls/shell32/shell32_Uk.rc | 100 ------------------------- dlls/shell32/shell32_Wa.rc | 55 -------------- dlls/shell32/shell32_Zh.rc | 135 --------------------------------- po/ar.po | 106 +++++++++++++++++++------- po/bg.po | 110 ++++++++++++++++++++------- po/ca.po | 106 +++++++++++++++++++------- po/cs.po | 110 ++++++++++++++++++++------- po/da.po | 106 +++++++++++++++++++------- po/de.po | 106 +++++++++++++++++++------- po/el.po | 107 +++++++++++++++++++------- po/en.po | 104 +++++++++++++++++++------- po/en_US.po | 106 +++++++++++++++++++------- po/eo.po | 108 ++++++++++++++++++++------- po/es.po | 106 +++++++++++++++++++------- po/fa.po | 106 +++++++++++++++++++------- po/fi.po | 104 +++++++++++++++++++------- po/fr.po | 106 +++++++++++++++++++------- po/he.po | 106 +++++++++++++++++++------- po/hi.po | 105 +++++++++++++++++++------- po/hu.po | 106 +++++++++++++++++++------- po/it.po | 106 +++++++++++++++++++------- po/ja.po | 106 +++++++++++++++++++------- po/ko.po | 105 +++++++++++++++++++------- po/lt.po | 106 +++++++++++++++++++------- po/ml.po | 105 +++++++++++++++++++------- po/nb_NO.po | 106 +++++++++++++++++++------- po/nl.po | 106 +++++++++++++++++++------- po/or.po | 105 +++++++++++++++++++------- po/pa.po | 105 +++++++++++++++++++------- po/pl.po | 105 +++++++++++++++++++------- po/pt_BR.po | 106 +++++++++++++++++++------- po/pt_PT.po | 106 +++++++++++++++++++------- po/rm.po | 107 ++++++++++++++++++++------- po/ro.po | 106 +++++++++++++++++++------- po/ru.po | 106 +++++++++++++++++++------- po/sk.po | 107 ++++++++++++++++++++------- po/sl.po | 106 +++++++++++++++++++------- po/sr_RS(a)cyrillic.po | 111 +++++++++++++++++++-------- po/sr_RS(a)latin.po | 106 +++++++++++++++++++------- po/sv.po | 106 +++++++++++++++++++------- po/te.po | 105 +++++++++++++++++++------- po/th.po | 109 ++++++++++++++++++++------- po/tr.po | 109 ++++++++++++++++++++------- po/uk.po | 106 +++++++++++++++++++------- po/wa.po | 106 +++++++++++++++++++------- po/wine.pot | 104 +++++++++++++++++++------- po/zh_CN.po | 104 +++++++++++++++++++------- po/zh_TW.po | 107 ++++++++++++++++++++------- 77 files changed, 3586 insertions(+), 4213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28d54b7b1cc8cccc889d4…

1 0

Alexandre Julliard : comctl32: Convert dialogs to po files.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 64f4c4161c0066bc0c61bab06ce9253cb2c77bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f4c4161c0066bc0c61bab06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 20:38:21 2011 +0100 comctl32: Convert dialogs to po files. --- dlls/comctl32/Makefile.in | 34 +---------- dlls/comctl32/comctl32.rc | 47 ++++++++++++++ dlls/comctl32/comctl_Bg.rc | 70 --------------------- dlls/comctl32/comctl_Ca.rc | 68 --------------------- dlls/comctl32/comctl_Cs.rc | 74 ---------------------- dlls/comctl32/comctl_Da.rc | 71 --------------------- dlls/comctl32/comctl_De.rc | 70 --------------------- dlls/comctl32/comctl_El.rc | 68 --------------------- dlls/comctl32/comctl_En.rc | 68 --------------------- dlls/comctl32/comctl_Eo.rc | 68 --------------------- dlls/comctl32/comctl_Es.rc | 68 --------------------- dlls/comctl32/comctl_Fr.rc | 75 ----------------------- dlls/comctl32/comctl_He.rc | 74 ---------------------- dlls/comctl32/comctl_Hu.rc | 68 --------------------- dlls/comctl32/comctl_It.rc | 72 ---------------------- dlls/comctl32/comctl_Ja.rc | 71 --------------------- dlls/comctl32/comctl_Ko.rc | 71 --------------------- dlls/comctl32/comctl_Lt.rc | 71 --------------------- dlls/comctl32/comctl_Nl.rc | 70 --------------------- dlls/comctl32/comctl_No.rc | 68 --------------------- dlls/comctl32/comctl_Pl.rc | 69 --------------------- dlls/comctl32/comctl_Pt.rc | 70 --------------------- dlls/comctl32/comctl_Ro.rc | 71 --------------------- dlls/comctl32/comctl_Ru.rc | 73 ---------------------- dlls/comctl32/comctl_Si.rc | 70 --------------------- dlls/comctl32/comctl_Sk.rc | 71 --------------------- dlls/comctl32/comctl_Sr.rc | 121 ------------------------------------ dlls/comctl32/comctl_Sv.rc | 68 --------------------- dlls/comctl32/comctl_Th.rc | 68 --------------------- dlls/comctl32/comctl_Tr.rc | 68 --------------------- dlls/comctl32/comctl_Uk.rc | 75 ----------------------- dlls/comctl32/comctl_Zh.rc | 123 ------------------------------------- po/ar.po | 139 ++++++++++++++++++++++++++++++------------ po/bg.po | 136 +++++++++++++++++++++++++++++------------ po/ca.po | 135 +++++++++++++++++++++++++++++------------ po/cs.po | 136 +++++++++++++++++++++++++++++------------ po/da.po | 135 +++++++++++++++++++++++++++++------------ po/de.po | 135 +++++++++++++++++++++++++++++------------ po/el.po | 140 +++++++++++++++++++++++++++++------------- po/en.po | 135 +++++++++++++++++++++++++++++------------ po/en_US.po | 135 +++++++++++++++++++++++++++++------------ po/eo.po | 136 +++++++++++++++++++++++++++++------------ po/es.po | 135 +++++++++++++++++++++++++++++------------ po/fa.po | 139 ++++++++++++++++++++++++++++++------------ po/fi.po | 145 ++++++++++++++++++++++++++++++++------------ po/fr.po | 135 +++++++++++++++++++++++++++++------------ po/he.po | 135 +++++++++++++++++++++++++++++------------ po/hi.po | 137 +++++++++++++++++++++++++++++------------ po/hu.po | 136 +++++++++++++++++++++++++++++------------ po/it.po | 135 +++++++++++++++++++++++++++++------------ po/ja.po | 135 +++++++++++++++++++++++++++++------------ po/ko.po | 135 +++++++++++++++++++++++++++++------------ po/lt.po | 135 +++++++++++++++++++++++++++++------------ po/ml.po | 137 +++++++++++++++++++++++++++++------------ po/nb_NO.po | 135 +++++++++++++++++++++++++++++------------ po/nl.po | 135 +++++++++++++++++++++++++++++------------ po/or.po | 137 +++++++++++++++++++++++++++++------------ po/pa.po | 137 +++++++++++++++++++++++++++++------------ po/pl.po | 135 +++++++++++++++++++++++++++++------------ po/pt_BR.po | 135 +++++++++++++++++++++++++++++------------ po/pt_PT.po | 135 +++++++++++++++++++++++++++++------------ po/rm.po | 138 ++++++++++++++++++++++++++++++------------ po/ro.po | 135 +++++++++++++++++++++++++++++------------ po/ru.po | 135 +++++++++++++++++++++++++++++------------ po/sk.po | 142 +++++++++++++++++++++++++++++-------------- po/sl.po | 135 +++++++++++++++++++++++++++++------------ po/sr_RS(a)cyrillic.po | 136 +++++++++++++++++++++++++++++------------ po/sr_RS(a)latin.po | 136 +++++++++++++++++++++++++++++------------ po/sv.po | 135 +++++++++++++++++++++++++++++------------ po/te.po | 137 +++++++++++++++++++++++++++++------------ po/th.po | 136 +++++++++++++++++++++++++++++------------ po/tr.po | 135 +++++++++++++++++++++++++++++------------ po/uk.po | 135 +++++++++++++++++++++++++++++------------ po/wa.po | 141 ++++++++++++++++++++++++++++++------------ po/wine.pot | 135 +++++++++++++++++++++++++++++------------ po/zh_CN.po | 136 +++++++++++++++++++++++++++++------------ po/zh_TW.po | 136 +++++++++++++++++++++++++++++------------ 77 files changed, 4399 insertions(+), 4027 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64f4c4161c0066bc0c61b…

1 0

Jacek Caban : mshtml: Added tests for returning ActiveX object' s interfaces from object element's QueryInterface.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: d73b1b6d8fb493bece9446bed89357ce156824c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73b1b6d8fb493bece9446bed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 17:31:14 2011 +0100 mshtml: Added tests for returning ActiveX object's interfaces from object element's QueryInterface. --- dlls/mshtml/tests/activex.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index d9e9c1f..0972392 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -86,6 +86,10 @@ DEFINE_EXPECT(QueryService_TestActiveX); DEFINE_EXPECT(GetMiscStatus); DEFINE_EXPECT(SetAdvise); DEFINE_EXPECT(GetViewStatus); +DEFINE_EXPECT(QI_ITestActiveX); +DEFINE_EXPECT(wrapped_AddRef); +DEFINE_EXPECT(wrapped_Release); +DEFINE_EXPECT(wrapped_func); #define DISPID_SCRIPTPROP 1000 @@ -102,6 +106,9 @@ static int plugin_behavior; static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xf6,0x68,0x07,0x46}}; +static const GUID IID_ITestActiveX = + {0x178fc663,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xf6,0x68,0x07,0x46}}; + static const char object_ax_str[] = "<html><head></head><body>" "<object classid=\"clsid:" TESTACTIVEX_CLSID "\" width=\"300\" height=\"200\" id=\"objid\">" @@ -1143,6 +1150,57 @@ static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { static IOleInPlaceObjectWindowless OleInPlaceObjectWindowless = { &OleInPlaceObjectWindowlessVtbl }; +static void *wrapped_iface_vtbl[100]; +static IUnknown wrapped_iface = { (IUnknownVtbl*)wrapped_iface_vtbl }; + +static HRESULT WINAPI wrapped_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected wrapped_QueryInterface call\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI wrapped_AddRef(IUnknown *iface) +{ + CHECK_EXPECT(wrapped_AddRef); + return 2; +} + +static ULONG WINAPI wrapped_Release(IUnknown *iface) +{ + CHECK_EXPECT(wrapped_Release); + return 1; +} + +static HRESULT WINAPI wrapped_func_nocall(IUnknown *iface, int i, double d) +{ + ok(0, "unexpected call\n"); + return E_FAIL; +} + +static HRESULT WINAPI wrapped_func(IUnknown *iface, int i, double d) +{ + CHECK_EXPECT(wrapped_func); + ok(iface == &wrapped_iface, "iface != wrapped_iface\n"); + ok(i == 10, "i = %d\n", i); + ok(d == 32.0, "d = %lf\n", d); + return S_OK; +} + +static void init_wrapped_iface(void) +{ + unsigned i; + + wrapped_iface_vtbl[0] = wrapped_QueryInterface; + wrapped_iface_vtbl[1] = wrapped_AddRef; + wrapped_iface_vtbl[2] = wrapped_Release; + + for(i=3; i<100; i++) + wrapped_iface_vtbl[i] = wrapped_func_nocall; + + wrapped_iface_vtbl[63] = wrapped_func; +} + static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { @@ -1158,6 +1216,9 @@ static HRESULT ax_qi(REFIID riid, void **ppv) *ppv = &ViewObjectEx; }else if(IsEqualGUID(riid, &IID_IOleObject)) { *ppv = &OleObject; + }else if(IsEqualGUID(riid, &IID_ITestActiveX)) { + CHECK_EXPECT(QI_ITestActiveX); + *ppv = &wrapped_iface; }else if(IsEqualGUID(riid, &IID_IOleWindow) || IsEqualGUID(riid, &IID_IOleInPlaceObject) || IsEqualGUID(&IID_IOleInPlaceObjectWindowless, riid)) { *ppv = &OleInPlaceObjectWindowless; @@ -1257,6 +1318,68 @@ static void test_elem_dispex(IDispatchEx *dispex) CHECK_CALLED(Invoke_SCRIPTPROP); } +static void test_iface_wrapping(IHTMLObjectElement *elem) +{ + IHTMLObjectElement *elem2; + IUnknown *unk, *unk2; + ULONG ref; + void **vtbl; + HRESULT hres; + + SET_EXPECT(QI_ITestActiveX); + SET_EXPECT(wrapped_AddRef); + SET_EXPECT(wrapped_Release); + unk = (void*)0xdeadbeef; + hres = IHTMLObjectElement_QueryInterface(elem, &IID_ITestActiveX, (void**)&unk); + ok(hres == S_OK, "QueryInerface(IID_ITestActiveX failed: %08x\n", hres); + CHECK_CALLED(QI_ITestActiveX); + CHECK_CALLED(wrapped_AddRef); + CHECK_CALLED(wrapped_Release); + + /* See dlls/mshtml/ifacewrap.c */ + ok(unk != &wrapped_iface, "Unexpected unk %p, expected %p (%p, %p)\n", unk, &ViewObjectEx, unk->lpVtbl, &ViewObjectExVtbl); + ok(unk->lpVtbl != wrapped_iface.lpVtbl, "unk->lpVtbl == wrapped_iface->lpVtbl\n"); + ok(unk->lpVtbl->QueryInterface != wrapped_QueryInterface, "QueryInterface not wrapped\n"); + ok(unk->lpVtbl->AddRef != wrapped_AddRef, "AddRef not wrapped\n"); + ok(unk->lpVtbl->Release != wrapped_Release, "Release not wrapped\n"); + + vtbl = (void**)unk->lpVtbl; + ok(vtbl[4] != wrapped_func_nocall, "func not wrapped\n"); + ok(vtbl[63] != wrapped_func, "func not wrapped\n"); + + SET_EXPECT(wrapped_func); + hres = ((HRESULT (WINAPI*)(IUnknown*,int,double))vtbl[63])(unk, 10, 32.0); + ok(hres == S_OK, "wrapped_func returned %08x\n", hres); + CHECK_CALLED(wrapped_func); + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLObjectElement, (void**)&elem2); + ok(hres == S_OK, "Could not get IHTMLObjectElement from wrapped iface: %08x\n", hres); + ok(iface_cmp((IUnknown*)elem2, (IUnknown*)elem), "elem2 != elem\n"); + IHTMLObjectElement_Release(elem2); + + SET_EXPECT(wrapped_Release); + ref = IUnknown_Release(unk); + ok(!ref, "ref=%d\n", ref); + CHECK_CALLED(wrapped_Release); + + SET_EXPECT(QI_ITestActiveX); + SET_EXPECT(wrapped_AddRef); + SET_EXPECT(wrapped_Release); + unk = (void*)0xdeadbeef; + hres = IHTMLObjectElement_QueryInterface(elem, &IID_ITestActiveX, (void**)&unk2); + ok(hres == S_OK, "QueryInerface(IID_ITestActiveX failed: %08x\n", hres); + CHECK_CALLED(QI_ITestActiveX); + CHECK_CALLED(wrapped_AddRef); + CHECK_CALLED(wrapped_Release); + + ok(unk != unk2, "unk == unk2\n"); + + SET_EXPECT(wrapped_Release); + ref = IUnknown_Release(unk2); + ok(!ref, "ref=%d\n", ref); + CHECK_CALLED(wrapped_Release); +} + static void test_object_elem(IHTMLDocument2 *doc) { IHTMLObjectElement *objelem; @@ -1293,6 +1416,8 @@ static void test_object_elem(IHTMLDocument2 *doc) test_elem_dispex(dispex); IDispatchEx_Release(dispex); + test_iface_wrapping(objelem); + IHTMLObjectElement_Release(objelem); } @@ -2171,6 +2296,7 @@ START_TEST(activex) return; } + init_wrapped_iface(); container_hwnd = create_container_window(); ShowWindow(container_hwnd, SW_SHOW);

1 0

Jacek Caban : mshtml: Return wrapped ActiveX object' s interface from object element's QueryInterface.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: fc504c9117e09661ac52da0cd81acb5c995a2321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc504c9117e09661ac52da0cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 17:29:43 2011 +0100 mshtml: Return wrapped ActiveX object's interface from object element's QueryInterface. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlobject.c | 21 +++- dlls/mshtml/ifacewrap.c | 340 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 4 files changed, 363 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc504c9117e09661ac52d…

1 0