October 2010 - Wine-commits

Jeremy Newman : move poitioning of certain elements to the .pos class
by Jeremy Newman 18 Oct '10

18 Oct '10

Module: website Branch: master Commit: 1be9ac265b2abea89457ac2dcb97b32c432914ff URL: http://source.winehq.org/git/website.git/?a=commit;h=1be9ac265b2abea89457ac… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 18 10:34:11 2010 -0500 move poitioning of certain elements to the .pos class --- styles.css | 11 +++++++---- templates/en/global/themes/winehq/content.template | 6 +++--- .../en/global/themes/winehq/content_nobox.template | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/styles.css b/styles.css index d638a03..cc61d3e 100644 --- a/styles.css +++ b/styles.css @@ -14,26 +14,29 @@ BODY { position: absolute; z-index: 2; top: 0px; - left: 0px; width: 200px; height: 313px; } +#logo_glass_big.pos { left: 0px; } + #logo_glass { position: absolute; z-index: 2; top: 20px; - left: 50px; width: 100px; height: 157px; } +#logo_glass.pos { left: 50px; } + #logo_text { position: absolute; z-index: 3; top: 40px; - left: 110px; width: 186px; height: 58px; } +#logo_text.pos { left: 110px; } + #logo_blurb { position: absolute; z-index: 4; @@ -62,10 +65,10 @@ BODY { position: absolute; z-index: 6; top: 0px; - right: 10px; margin: 0px; padding: 0px; } +#tabs.pos { right: 10px; } #tabs UL { list-style: none; padding: 0; diff --git a/templates/en/global/themes/winehq/content.template b/templates/en/global/themes/winehq/content.template index cd405ff..92b44ac 100644 --- a/templates/en/global/themes/winehq/content.template +++ b/templates/en/global/themes/winehq/content.template @@ -24,8 +24,8 @@ <body> -<div id="logo_glass"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass_sm.png" alt=""></a></div> -<div id="logo_text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="logo_glass" class="pos"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass_sm.png" alt=""></a></div> +<div id="logo_text" class="pos"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="logo_blurb">{$page_blurb}</div> @@ -42,7 +42,7 @@ </div> -<div id="tabs"> +<div id="tabs" class="pos"> <ul> <li class="s"><a href="{$base_url}">WineHQ</a></li> <li><a href="http://wiki.winehq.org/">Wiki</a></li> diff --git a/templates/en/global/themes/winehq/content_nobox.template b/templates/en/global/themes/winehq/content_nobox.template index 8eaa440..10c1370 100644 --- a/templates/en/global/themes/winehq/content_nobox.template +++ b/templates/en/global/themes/winehq/content_nobox.template @@ -24,8 +24,8 @@ <body> -<div id="logo_glass_big"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass.png" alt=""></a></div> -<div id="logo_text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> +<div id="logo_glass_big" class="pos"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass.png" alt=""></a></div> +<div id="logo_text" class="pos"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div> <div id="logo_blurb">{$page_blurb}</div> @@ -42,10 +42,10 @@ </div> -<div id="tabs"> +<div id="tabs" class="pos"> <ul> <li class="s"><a href="{$base_url}">WineHQ</a></li> - <li><a href="http://wiki.winehq.org">Wiki</a></li> + <li><a href="http://wiki.winehq.org/">Wiki</a></li> <li><a href="http://appdb.winehq.org/">AppDB</a></li> <li><a href="http://bugs.winehq.org/">Bugzilla</a></li> <li><a href="http://forums.winehq.org/">Forums</a></li>

1 0

Frédéric Delanoy : French translation for release 1.3.5
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 1709b2482c4a6a6babecc07bc21047623801b13f URL: http://source.winehq.org/git/website.git/?a=commit;h=1709b2482c4a6a6babecc0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 15 21:44:38 2010 +0200 French translation for release 1.3.5 --- news/fr/2010101501.xml | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/news/fr/2010101501.xml b/news/fr/2010101501.xml new file mode 100644 index 0000000..4e20345 --- /dev/null +++ b/news/fr/2010101501.xml @@ -0,0 +1,22 @@ +<news> +<date>15 octobre 2010</date> +<title>Sortie de Wine 1.3.5</title> +<body> +<p> La version de développement 1.3.5 de Wine est à présent disponible.</p> +<p> <a href="{$root}/announce/1.3.5">Nouveautés</a> de cette version : +<ul> + <li>Support des curseurs animés.</li> + <li>Impression directe via CUPS au lieu de lpr.</li> + <li>Corrections pour le programme d'installation d'Office 2010.</li> + <li>Un tas d'améliorations pour MSXML3.</li> + <li>Prise en charge améliorée du Shader Model 4.</li> + <li>Icônes adéquates pour l'Internet Explorer intégré.</li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.5.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. +</p></body></news>

1 0

André Hentschel : Wine 1.3.5 freigegeben
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 55a2ad434921f280be0f6769ff246f47d830491d URL: http://source.winehq.org/git/website.git/?a=commit;h=55a2ad434921f280be0f67… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 15 20:48:47 2010 +0200 Wine 1.3.5 freigegeben --- news/de/2010101501.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/de/2010101501.xml b/news/de/2010101501.xml new file mode 100644 index 0000000..85d7664 --- /dev/null +++ b/news/de/2010101501.xml @@ -0,0 +1,19 @@ +<news> +<date>15. Oktober 2010</date> +<title>Wine 1.3.5 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.3.5 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.3.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für animierte Mauszeiger.</li> + <li>Direktes drucken mit CUPS anstatt lpr.</li> + <li>Behebungen für die Installation von Office 2010.</li> + <li>Viele MSXML3 Verbesserungen.</li> + <li>Verbesserte Unterstützung von Shader Model 4.</li> + <li>Anständige Schaltflächen für den eigenen Internet Explorer.</li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul></p> +<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.5.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. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.3.5
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 90c5298c91b3dbd08cc322b4a3009f524cc15473 URL: http://source.winehq.org/git/website.git/?a=commit;h=90c5298c91b3dbd08cc322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 19:45:10 2010 +0200 Wine release 1.3.5 --- news/en/2010101501.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/en/2010101501.xml b/news/en/2010101501.xml new file mode 100644 index 0000000..b005862 --- /dev/null +++ b/news/en/2010101501.xml @@ -0,0 +1,19 @@ +<news> +<date>October 15, 2010</date> +<title>Wine 1.3.5 Released</title> +<body> +<p> The Wine development release 1.3.5 is now available.</p> +<p> <a href="{$root}/announce/1.3.5">What's new</a> in this release: +<ul> + <li>Support for animated cursors.</li> + <li>Printing directly through CUPS instead of lpr.</li> + <li>Installer fixes for Office 2010.</li> + <li>Many MSXML3 improvements.</li> + <li>Improved Shader Model 4 support.</li> + <li>Proper icons in built-in Internet Explorer.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul></p> +<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : Release 1.3.5.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: b29e111260423fa7e044acaf93112ffc211c423e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e111260423fa7e044acaf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 19:37:09 2010 +0200 Release 1.3.5. --- ANNOUNCE | 1233 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 604 insertions(+), 649 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b29e111260423fa7e044a…

1 0

Tag wine-1.3.5 : Alexandre Julliard : Release 1.3.5
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: refs/tags/wine-1.3.5 Tag: fd99e639c48a342ef662e4375442a014c29e5a9b URL: http://source.winehq.org/git/wine.git/?a=tag;h=fd99e639c48a342ef662e4375442… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 19:37:09 2010 +0200 Release 1.3.5

1 0

Trygve Vea : user32: Updated Norwegian translation.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 293fc4cd28afa49e2445b0ffaafb930af83e2205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293fc4cd28afa49e2445b0ffa… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Fri Oct 15 07:27:54 2010 +0200 user32: Updated Norwegian translation. --- dlls/user32/resources/user32_No.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/resources/user32_No.rc b/dlls/user32/resources/user32_No.rc index 8cae794..56dcf81 100644 --- a/dlls/user32/resources/user32_No.rc +++ b/dlls/user32/resources/user32_No.rc @@ -1,5 +1,6 @@ /* * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2010 Trygve Vea <trygve.vea(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -60,9 +61,9 @@ BEGIN PUSHBUTTON "&Ignorer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nei", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "P&r�v igjen", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Fortsett", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Hjelp", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG 20, 20, 232, 122

1 0

Trygve Vea : wineboot: Updated Norwegian translation.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: a211cef818ba8061b7545222d39ac1cbe544288d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a211cef818ba8061b7545222d… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Fri Oct 15 07:32:19 2010 +0200 wineboot: Updated Norwegian translation. --- programs/wineboot/wineboot_No.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot_No.rc b/programs/wineboot/wineboot_No.rc index 936bf18..e6124f6 100644 --- a/programs/wineboot/wineboot_No.rc +++ b/programs/wineboot/wineboot_No.rc @@ -2,6 +2,7 @@ * WineBoot Norwegian Bokmål resources * * Copyright (C) 2007-2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright (C) 2010 Trygve Vea <trygve.vea(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -44,6 +45,6 @@ CAPTION "Wine" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_WAITICON, 3, 3, 10, 10 - LTEXT "Vent mes Wine-oppsettet i «%s» blir oppdatert...", + LTEXT "Vent mens Wine-oppsettet i «%s» blir oppdatert...", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END

1 0

Trygve Vea : wineps.drv: Updated Norwegian translation.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 399e955a7e9cee9063054af8a822b210a2de1013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399e955a7e9cee9063054af8a… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Fri Oct 15 07:29:03 2010 +0200 wineps.drv: Updated Norwegian translation. --- dlls/wineps.drv/wps_No.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/wps_No.rc b/dlls/wineps.drv/wps_No.rc index 3ba30ee..c38a324 100644 --- a/dlls/wineps.drv/wps_No.rc +++ b/dlls/wineps.drv/wps_No.rc @@ -1,5 +1,6 @@ /* * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2010 Trygve Vea <trygve.vea(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,7 +34,7 @@ FONT 8, "MS Shell Dlg" WS_TABSTOP, 20, 90, 60, 10 CONTROL "&Liggende", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 - LTEXT "Retninger:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + LTEXT "Retning:", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

Jacek Caban : exdisp.idl: Added missing declarations.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 70c937f7a7f81326bb2e83455d31fd26466a76be URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c937f7a7f81326bb2e83455… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 14:16:55 2010 +0200 exdisp.idl: Added missing declarations. --- include/exdisp.idl | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- include/exdispid.h | 31 ++++++++++++++++++++++- 2 files changed, 97 insertions(+), 5 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 808663e..54dd1df 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -409,7 +409,9 @@ dispinterface DWebBrowserEvents2 void SetSecureLockIcon([in] long SecureLockIcon); [id(DISPID_FILEDOWNLOAD)] - void FileDownload([in, out] VARIANT_BOOL* Cancel); + void FileDownload( + [in] VARIANT_BOOL ActiveDocument, + [in, out] VARIANT_BOOL *Cancel); [id(DISPID_NAVIGATEERROR)] void NavigateError( @@ -525,7 +527,8 @@ enum ShellWindowTypeConstants { SWC_EXPLORER = 0, SWC_BROWSER = 1, SWC_3RDPARTY = 2, - SWC_CALLBACK = 4 + SWC_CALLBACK = 4, + SWC_DESKTOP = 8 } ShellWindowTypeConstants; typedef @@ -658,10 +661,69 @@ interface IShellUIHelper : IDispatch { } [ + uuid(a7fe6eda-1932-4281-b881-87b31b8bc52c), + oleautomation, + dual +] +interface IShellUIHelper2 : IShellUIHelper { + [id(DISPID_ADDSEARCHPROVIDER)] + HRESULT AddSearchProvider([in] BSTR URL); + + [id(DISPID_RUNONCESHOWN)] + HRESULT RunOnceShown(); + + [id(DISPID_SKIPRUNONCE)] + HRESULT SkipRunOnce(); + + [id(DISPID_CUSTOMIZESETTINGS)] HRESULT CustomizeSettings( + [in] VARIANT_BOOL fSQM, + [in] VARIANT_BOOL fPhishing, + [in] BSTR bstrLocale); + + [id(DISPID_SQMENABLED)] + HRESULT SqmEnabled([out, retval] VARIANT_BOOL *pfEnabled); + + [id(DISPID_PHISHINGENABLED)] + HRESULT PhishingEnabled([out, retval] VARIANT_BOOL *pfEnabled); + + [id(DISPID_BRANDIMAGEURI)] + HRESULT BrandImageUri([out, retval] BSTR *pbstrUri); + + [id(DISPID_SKIPTABSWELCOME)] + HRESULT SkipTabsWelcome(); + + [id(DISPID_DIAGNOSECONNECTION)] + HRESULT DiagnoseConnection(); + + [id(DISPID_CUSTOMIZECLEARTYPE)] + HRESULT CustomizeClearType([in] VARIANT_BOOL fSet); + + [id(DISPID_ISSEARCHPROVIDERINSTALLED)] + HRESULT IsSearchProviderInstalled( + [in] BSTR URL, + [out, retval] DWORD *pdwResult); + + [id(DISPID_ISSEARCHMIGRATED)] + HRESULT IsSearchMigrated([out, retval] VARIANT_BOOL *pfMigrated); + + [id(DISPID_DEFAULTSEARCHPROVIDER)] + HRESULT DefaultSearchProvider([out, retval] BSTR *pbstrName); + + [id(DISPID_RUNONCEREQUIREDSETTINGSCOMPLETE)] + HRESULT RunOnceRequiredSettingsComplete([in] VARIANT_BOOL fComplete); + + [id(DISPID_RUNONCEHASSHOWN)] + HRESULT RunOnceHasShown([out, retval] VARIANT_BOOL *pfShown); + + [id(DISPID_SEARCHGUIDEURL)] + HRESULT SearchGuideUrl([out, retval] BSTR *pbstrUrl); +} + +[ uuid(64ab4bb7-111e-11d1-8f79-00c04fc2fbe1) ] coclass ShellUIHelper { - [default] interface IShellUIHelper; + [default] interface IShellUIHelper2; } [ @@ -789,7 +851,8 @@ interface IScriptErrorList : IDispatch { [ uuid(efd01300-160f-11d2-bb2e-00805ff7efca), - hidden + hidden, + noncreatable ] coclass CScriptErrorList { [default] interface IScriptErrorList; diff --git a/include/exdispid.h b/include/exdispid.h index 232cee6..012f704 100644 --- a/include/exdispid.h +++ b/include/exdispid.h @@ -91,7 +91,36 @@ #define DISPID_AUTOSCAN 11 #define DISPID_AUTOCOMPLETEATTACH 12 #define DISPID_SHOWBROWSERUI 13 -#define DISPID_SHELLUIHELPERLAST 13 +#define DISPID_ADDSEARCHPROVIDER 14 +#define DISPID_RUNONCESHOWN 15 +#define DISPID_SKIPRUNONCE 16 +#define DISPID_CUSTOMIZESETTINGS 17 +#define DISPID_SQMENABLED 18 +#define DISPID_PHISHINGENABLED 19 +#define DISPID_BRANDIMAGEURI 20 +#define DISPID_SKIPTABSWELCOME 21 +#define DISPID_DIAGNOSECONNECTION 22 +#define DISPID_CUSTOMIZECLEARTYPE 23 +#define DISPID_ISSEARCHPROVIDERINSTALLED 24 +#define DISPID_ISSEARCHMIGRATED 25 +#define DISPID_DEFAULTSEARCHPROVIDER 26 +#define DISPID_RUNONCEREQUIREDSETTINGSCOMPLETE 27 +#define DISPID_RUNONCEHASSHOWN 28 +#define DISPID_SEARCHGUIDEURL 29 +#define DISPID_ADDSERVICE 30 +#define DISPID_ISSERVICEINSTALLED 31 +#define DISPID_ADDTOFAVORITESBAR 32 +#define DISPID_BUILDNEWTABPAGE 33 +#define DISPID_SETRECENTLYCLOSEDVISIBLE 34 +#define DISPID_SETACTIVITIESVISIBLE 35 +#define DISPID_CONTENTDISCOVERYRESET 36 +#define DISPID_INPRIVATEFILTERINGENABLED 37 +#define DISPID_SUGGESTEDSITESENABLED 38 +#define DISPID_ENABLESUGGESTEDSITES 39 +#define DISPID_NAVIGATETOSUGGESTEDSITES 40 +#define DISPID_SHOWTABSHELP 41 +#define DISPID_SHOWINPRIVATEHELP 42 +#define DISPID_SHELLUIHELPERLAST 43 #define DISPID_ADVANCEERROR 10 #define DISPID_RETREATERROR 11

1 0