August 2010 - Wine-commits - list.winehq.org

Aurimas Fišeras : mshtml: Update Lithuanian translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 00f23b9c5bdc373f91d50ef3649fb804612b9e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f23b9c5bdc373f91d50ef36… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Aug 4 20:46:06 2010 +0300 mshtml: Update Lithuanian translation. --- dlls/mshtml/Lt.rc | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc index 5bfa31d..3b73cd4 100644 --- a/dlls/mshtml/Lt.rc +++ b/dlls/mshtml/Lt.rc @@ -1,5 +1,5 @@ /* - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2010 Aurimas Fišeras <aurimas(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 @@ -23,6 +23,12 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + STRINGTABLE + { + IDS_STATUS_DONE "Baigta" + IDS_STATUS_DOWNLOADINGFROM "Atsiunčiama iš %s..." +} + STRINGTABLE { IDS_HTMLDISABLED "HTML atvaizdavimas yra išjungtas."

1 0

André Hentschel : mshtml: Update German translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 021a9fcedd58477546393f2ce6f5e2cf28bbd53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=021a9fcedd58477546393f2ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 4 20:05:24 2010 +0200 mshtml: Update German translation. --- dlls/mshtml/De.rc | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 3929b95..63a5f07 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -2,6 +2,7 @@ * German resources for mshtml * * Copyright 2005 Henning Gerhardt + * Copyright 2010 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,12 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { + IDS_STATUS_DONE "Fertig" + IDS_STATUS_DOWNLOADINGFROM "Herunterladen von %s..." +} + +STRINGTABLE +{ IDS_HTMLDISABLED "Die HTML-Darstellung ist zur Zeit ausgeschaltet." IDS_HTMLDOCUMENT "HTML-Dokument" IDS_DOWNLOADING "Lade herunter..."

1 0

André Hentschel : mshtml: Fix indentation in resource file.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 87bf3ed464b01b9c317edb81b8f6339f3482ccc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bf3ed464b01b9c317edb81b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 4 20:05:40 2010 +0200 mshtml: Fix indentation in resource file. --- dlls/mshtml/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index ba55bf7..15ae91a 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -20,8 +20,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - STRINGTABLE - { +STRINGTABLE +{ IDS_STATUS_DONE "Done" IDS_STATUS_DOWNLOADINGFROM "Downloading from %s..." }

1 0

André Hentschel : shdocvw: Update German translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 9d077ad3bb05a021814a17362f779111207b50af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d077ad3bb05a021814a17362… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 4 20:22:52 2010 +0200 shdocvw: Update German translation. --- dlls/shdocvw/De.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/De.rc b/dlls/shdocvw/De.rc index c7978ff..14559a3 100644 --- a/dlls/shdocvw/De.rc +++ b/dlls/shdocvw/De.rc @@ -52,6 +52,14 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "Ei&genschaften...", ID_BROWSE_PROPERTIES } + POPUP "&Ansicht" + { + POPUP "&Symbolleisten" + { + MENUITEM "&Standard" ID_BROWSE_BAR_STD + MENUITEM "&Adressleiste" ID_BROWSE_BAR_ADDR + } + } POPUP "&Favoriten" { MENUITEM "&Zu den Favoriten hinzufügen..." ID_BROWSE_ADDFAV

1 0

Sven Baars : mshtml: Update the Dutch translation.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: d5df95257d87bf5a793dd20a5299a834cac21aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5df95257d87bf5a793dd20a5… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Aug 4 20:36:04 2010 +0200 mshtml: Update the Dutch translation. --- dlls/mshtml/Nl.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index 3401987..67a99f8 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -24,6 +24,12 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { + IDS_STATUS_DONE "Klaar" + IDS_STATUS_DOWNLOADINGFROM "Downloaden van %s..." +} + +STRINGTABLE +{ IDS_HTMLDISABLED "De HTML weergave is op dit moment uitgeschakeld." IDS_HTMLDOCUMENT "HTML document" IDS_DOWNLOADING "Bezig met downloaden..."

1 0

Scott Ritchie : Update download-deb for Wine 1. 3 --TRANSLATIONS NEED UPDATING--
by Jeremy Newman 09 Aug '10

09 Aug '10

Module: website Branch: master Commit: 43c57f3012074b8e32c5525141ed8ba3c94716a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=43c57f3012074b8e32c552… Author: Scott Ritchie <scott(a)open-vote.org> Date: Fri Aug 6 23:40:59 2010 -0700 Update download-deb for Wine 1.3 --TRANSLATIONS NEED UPDATING-- If you're skimming wine-patches and speak es,de,fr,pl, or pt please update download/deb.template as the old instructions will be lies. Thanks, Scott Ritchie >From 8d8b59467af84751197e4e3afbfbaa19dc63fb15 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Fri, 6 Aug 2010 21:38:01 -0700 Subject: Update download-deb for new Ubuntu instructions for Wine 1.3 (NEEDS TRANSLATING) To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- templates/en/download.template | 2 +- templates/en/download/deb.template | 38 ++++++++++++----------------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index faaa1fb..0bba59e 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/deb">Download Ubuntu packages</a></b> - - binary and source .debs for Ubuntu Lucid (10.04) and Karmic (9.10) + - binary and source .debs for Ubuntu Lucid (10.04 LTS) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index b059673..2168081 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -11,12 +11,12 @@ repository includes Wine, however if you want to stay up to date with the latest Wine beta package you can use WineHQ's by following these instructions. </p> -<h2>Warning: These are beta packages for Ubuntu 9.10 or later</h2> +<h2>Warning: These are beta packages for Ubuntu 10.04 or later</h2> <p><i>The packages here are beta packages. This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an -update may break functionality in Wine. If the Wine version provided with Ubuntu +update may break functionality in Wine. If the Wine version provided with Ubuntu works for you, then you may not want to use these beta packages.</i></p> <h2>Adding the WineHQ Repository:</h2> @@ -34,37 +34,25 @@ Party Software</b> tab and click <b>Add</b>.</p> <h2>Installing Wine:</h2> <p>Click close to finish, and then <b>reload the package information</b> when -prompted. If you have Wine installed, the system's update manager will now -inform you of the latest Wine beta release and prompt you to upgrade. If you -haven't installed Wine yet, go to Applications->Add/Remove and search for -Wine or just <a href="apt://wine">click this link</a>.</p> +prompted. If you have Wine installed already, update manager will offer to +upgrade you to the stable Wine 1.2. To get the most recent Wine 1.3 beta, you +must install the <i>wine1.3 package</i> or <a href="apt://wine1.3">click this +link</a>.</p> <h2>Upgrading to a new version of Ubuntu</h2> -<p>If you are upgrading the entire system, such as going from Ubuntu 9.10 to -10.04, you will need to come back to this page and add the repository again. +<p>If you are upgrading the entire system, such as going from Ubuntu 10.04 to +10.10, you will need to come back to this page and add the repository again. The built in update manager will not switch the Wine repository automatically. </p> -<h2>Older .deb packages</h2> +<h2>Alternative Command Line Instructions for Installing Wine:</h2> -<p>Since the APT repository can only hold the latest packages, older versions of -the packages are available at -<a href="http://wine.budgetdedicated.com/archive/index.html">the WineHQ .deb packages archive</a>.</p> - -<p>You can install downloaded packages by double-clicking on them.</p> - -<h2>Alternative command Line Instructions for Installing Wine:</h2> - -<p>It is also possible to add the Wine repositories and install via the command -line, as follows. These may be useful on Kubuntu, Xubuntu, and other Ubuntu -derivatives. You will need to run these in a terminal window.</p> +<p>It is also possible to add the Wine PPA and install via the terminal. This +may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives.</p> <p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p> <p>Then update APT's package information by running '<b>sudo apt-get -update</b>'. You can now install Wine normally or by typing '<b>sudo apt-get -install wine</b>' into the terminal.</p> - -<br> -<p><i>Very fast and reliable webhosting for the APT repository is graciously provided by <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>.</i></p> +update</b>'. You can now install Wine by typing '<b>sudo apt-get +install wine1.3</b>'.</p>

1 0

André Hentschel : Update download-deb for Wine 1.3 ( German translation)
by Jeremy Newman 09 Aug '10

09 Aug '10

Module: website Branch: master Commit: e6af11dd129ee4144d0246730888f70272a3643f URL: http://source.winehq.org/git/website.git/?a=commit;h=e6af11dd129ee4144d0246… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Aug 7 14:08:22 2010 +0200 Update download-deb for Wine 1.3 (German translation) --- templates/de/download.template | 2 +- templates/de/download/deb.template | 34 +++++++++++----------------------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 3816dd6..f50dccc 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,7 +62,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/deb">Ubuntu</a></b> - binär und Quellcode .debs für Ubuntu Lucid (10.04) und Ubuntu Karmic (9.10) + binär und Quellcode .debs für Ubuntu Lucid (10.04 LTS) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index e5cc74e..13ff76c 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -12,12 +12,12 @@ neuesten Wine Beta auf dem Laufenden bleiben willst nutze das von WineHQ mit der folgenden Anleitung. </p> -<h2>Warnung: Diese Pakete sind Betapakete für Ubuntu 9.10 und neuere.</h2> +<h2>Warnung: Diese Pakete sind Betapakete für Ubuntu 10.04 und neuere.</h2> <p><i>Die Pakete hier sind Betapakete. Das bedeutet, dass sie in regelmäßigen Abständen <a href="http://wiki.winehq.org/Regression">Regressions</a> erleiden, wodurch -eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die Version +eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die Version von Ubuntu bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen.</i></p> <h2>Hinzufügen des WineHQ Repository:</h2> @@ -35,37 +35,25 @@ von Drittanbietern</b>-Reiter und klicke auf <b>Hinzufügen</b>.</p> <h2>Installieren von Wine:</h2> <p>Klick auf Schließen zum Beenden, anschließend <b>lade die Paketinformationen neu</b>, wenn -Du dazu aufgefordert wirst. Wenn Du Wine installiert hast, wird die Aktualisierungsverwaltung -des Systems Dich nun über den aktuellen Wine Betarelease informieren und dich zum Aktualisieren -auffordern. Wenn du Wine noch nicht installiert hast, gehe zu Anwendungen->Hinzufügen/Entfernen -und suche nach Wine oder klicke einfach<a href="apt://wine">auf diesen Link</a>.</p> +Du dazu aufgefordert wirst. Wenn Du Wine schon installiert hast, wird die Aktualisierungsverwaltung +Dir nun ein Upgrade auf die stabile Wine 1.2 Version anbieten. Um das neueste Wine 1.3 Betarelease zu +bekommen musst du das <i>wine1.3 Paket</i> installieren, oder <a href="apt://wine1.3">diesen Link klicken</a>.</p> <h2>Aktualisierung auf eine neue Ubuntuversion</h2> -<p>Wenn Du dein gesamtes System aktualisierst, zum Beispiel von Ubuntu 9.10 auf -10.04, musst Du zu dieser Seite zurückkehren und das Repository nochmal. +<p>Wenn Du dein gesamtes System aktualisierst, zum Beispiel von Ubuntu 10.04 auf +10.10, musst Du zu dieser Seite zurückkehren und das Repository nochmal hinzufügen. Die eingebaute Aktualisierungsverwaltung wird das Wine repository nicht automatisch umschalten.</p> -<h2>Ältere .deb Pakete</h2> - -<p>Da das APT-Repository nur das aktuelle Paket beinhalten kann, sind ältere Versionen der -Pakete verfügbar unter -<a href="http://wine.budgetdedicated.com/archive/index.html">dem WineHQ .deb Paketarchiv</a>.</p> - -<p>Du kannst die heruntergeladenen Pakete per Doppelklick installieren.</p> - <h2>Alternative Kommandozeileninstruktionen für die Wine-Installation:</h2> -<p>Es ist auch möglich, das Hinzufügen der Wine Repositories und die Installation -mit der Kommandozeile durchzuführen, wie folgt. +<p>Es ist auch möglich, das Hinzufügen des Wine PPA und die Installation +wie folgt mit der Kommandozeile durchzuführen. Die Instruktionen sind nützlich für Kubuntu, Xubuntu und andere Ubuntu Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal).</p> <p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p> <p>Aktualisiere dann die APT-Paketinformationen durch Ausführen von '<b>sudo apt-get -update</b>'. Du kannst nun Wine normal installieren oder durch Ausführen von '<b>sudo apt-get -install wine</b>' im Terminal.</p> - -<br> -<p><i>Sehr schnelles und verlässliches Webhosting des APT-Repositorys wird gnadenvoll zur Verfügung gestellt von <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>.</i></p> +update</b>'. Du kannst nun Wine durch Ausführen von '<b>sudo apt-get +install wine1.3</b>' im Terminal installieren.</p>

1 0

Jacek Caban : jscript: Get rid of no longer needed ErrorInstance struct.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 884b76657c685485c7fa14ee59a87a5e283dc1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=884b76657c685485c7fa14ee5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 15:33:17 2010 +0200 jscript: Get rid of no longer needed ErrorInstance struct. --- dlls/jscript/error.c | 59 ++++++++++++++++--------------------------------- 1 files changed, 19 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index a440a41..d92a79f 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -26,26 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -typedef struct { - DispatchEx dispex; -} ErrorInstance; - static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; static const WCHAR nameW[] = {'n','a','m','e',0}; static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static inline ErrorInstance *error_from_vdisp(vdisp_t *vdisp) -{ - return (ErrorInstance*)vdisp->u.jsdisp; -} - -static inline ErrorInstance *error_this(vdisp_t *jsthis) -{ - return is_vclass(jsthis, JSCLASS_ERROR) ? error_from_vdisp(jsthis) : NULL; -} - /* ECMA-262 3rd Edition 15.11.4.4 */ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) @@ -157,13 +143,6 @@ static HRESULT Error_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static void Error_destructor(DispatchEx *dispex) -{ - ErrorInstance *This = (ErrorInstance*)dispex; - - heap_free(This); -} - static const builtin_prop_t Error_props[] = { {toStringW, Error_toString, PROPF_METHOD} }; @@ -173,7 +152,7 @@ static const builtin_info_t Error_info = { {NULL, Error_value, 0}, sizeof(Error_props)/sizeof(*Error_props), Error_props, - Error_destructor, + NULL, NULL }; @@ -182,24 +161,24 @@ static const builtin_info_t ErrorInst_info = { {NULL, Error_value, 0}, 0, NULL, - Error_destructor, + NULL, NULL }; static HRESULT alloc_error(script_ctx_t *ctx, DispatchEx *prototype, - DispatchEx *constr, ErrorInstance **ret) + DispatchEx *constr, DispatchEx **ret) { - ErrorInstance *err; + DispatchEx *err; HRESULT hres; - err = heap_alloc_zero(sizeof(ErrorInstance)); + err = heap_alloc_zero(sizeof(*err)); if(!err) return E_OUTOFMEMORY; if(prototype) - hres = init_dispex(&err->dispex, ctx, &Error_info, prototype); + hres = init_dispex(err, ctx, &Error_info, prototype); else - hres = init_dispex_from_constr(&err->dispex, ctx, &ErrorInst_info, + hres = init_dispex_from_constr(err, ctx, &ErrorInst_info, constr ? constr : ctx->error_constr); if(FAILED(hres)) { heap_free(err); @@ -213,7 +192,7 @@ static HRESULT alloc_error(script_ctx_t *ctx, DispatchEx *prototype, static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, UINT number, const WCHAR *msg, DispatchEx **ret) { - ErrorInstance *err; + DispatchEx *err; VARIANT v; HRESULT hres; @@ -223,9 +202,9 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, V_VT(&v) = VT_I4; V_I4(&v) = number; - hres = jsdisp_propput_name(&err->dispex, numberW, &v, NULL/*FIXME*/, NULL/*FIXME*/); + hres = jsdisp_propput_name(err, numberW, &v, NULL/*FIXME*/, NULL/*FIXME*/); if(FAILED(hres)) { - jsdisp_release(&err->dispex); + jsdisp_release(err); return hres; } @@ -233,19 +212,19 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, if(msg) V_BSTR(&v) = SysAllocString(msg); else V_BSTR(&v) = SysAllocStringLen(NULL, 0); if(V_BSTR(&v)) { - hres = jsdisp_propput_name(&err->dispex, messageW, &v, NULL/*FIXME*/, NULL/*FIXME*/); + hres = jsdisp_propput_name(err, messageW, &v, NULL/*FIXME*/, NULL/*FIXME*/); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(&err->dispex, descriptionW, &v, NULL/*FIXME*/, NULL/*FIXME*/); + hres = jsdisp_propput_name(err, descriptionW, &v, NULL/*FIXME*/, NULL/*FIXME*/); SysFreeString(V_BSTR(&v)); }else { hres = E_OUTOFMEMORY; } if(FAILED(hres)) { - jsdisp_release(&err->dispex); + jsdisp_release(err); return hres; } - *ret = &err->dispex; + *ret = err; return S_OK; } @@ -377,7 +356,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, DispatchEx *object_prototype) RangeErrorConstr_value, ReferenceErrorConstr_value, RegExpErrorConstr_value, SyntaxErrorConstr_value, TypeErrorConstr_value, URIErrorConstr_value}; - ErrorInstance *err; + DispatchEx *err; INT i; VARIANT v; HRESULT hres; @@ -390,17 +369,17 @@ HRESULT init_error_constr(script_ctx_t *ctx, DispatchEx *object_prototype) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(names[i]); if(!V_BSTR(&v)) { - jsdisp_release(&err->dispex); + jsdisp_release(err); return E_OUTOFMEMORY; } - hres = jsdisp_propput_name(&err->dispex, nameW, &v, NULL/*FIXME*/, NULL/*FIXME*/); + hres = jsdisp_propput_name(err, nameW, &v, NULL/*FIXME*/, NULL/*FIXME*/); if(SUCCEEDED(hres)) hres = create_builtin_function(ctx, constr_val[i], names[i], NULL, - PROPF_CONSTR|1, &err->dispex, constr_addr[i]); + PROPF_CONSTR|1, err, constr_addr[i]); - jsdisp_release(&err->dispex); + jsdisp_release(err); VariantClear(&v); if(FAILED(hres)) return hres;

1 0

Dmitry Timoshkov : user32: Protect from setting as a window owner one of its successors.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: dfe6ae58afdebd830fa491a4dec1bed9ee6527eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe6ae58afdebd830fa491a4d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 4 23:00:34 2010 +0900 user32: Protect from setting as a window owner one of its successors. --- dlls/user32/tests/win.c | 9 +++++++++ server/window.c | 13 ++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 632e382..3af8d75 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -380,6 +380,15 @@ static void test_parent_owner(void) check_parents( test, desktop, 0, desktop, 0, test, desktop ); /* window is now child of desktop so GWLP_HWNDPARENT changes owner from now on */ + if (!is_win9x) + { + ret = (HWND)SetWindowLongPtrA( test, GWLP_HWNDPARENT, (LONG_PTR)test ); + ok( ret == 0, "GWL_HWNDPARENT return value %p expected 0\n", ret ); + check_parents( test, desktop, 0, desktop, 0, test, desktop ); + } + else + win_skip("Test creates circular window tree under Win9x/WinMe\n" ); + ret = (HWND)SetWindowLongPtrA( test, GWLP_HWNDPARENT, (LONG_PTR)child ); ok( ret == 0, "GWL_HWNDPARENT return value %p expected 0\n", ret ); check_parents( test, desktop, child, desktop, child, test, desktop ); diff --git a/server/window.c b/server/window.c index 3b912b0..5fdfd13 100644 --- a/server/window.c +++ b/server/window.c @@ -1834,7 +1834,7 @@ DECL_HANDLER(get_desktop_window) DECL_HANDLER(set_window_owner) { struct window *win = get_window( req->handle ); - struct window *owner = NULL; + struct window *owner = NULL, *ptr; if (!win) return; if (req->owner && !(owner = get_window( req->owner ))) return; @@ -1843,6 +1843,17 @@ DECL_HANDLER(set_window_owner) set_error( STATUS_ACCESS_DENIED ); return; } + + /* make sure owner is not a successor of window */ + for (ptr = owner; ptr; ptr = ptr->owner ? get_window( ptr->owner ) : NULL) + { + if (ptr == win) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + reply->prev_owner = win->owner; reply->full_owner = win->owner = owner ? owner->handle : 0; }

1 0

Tony Wasserka : d3dx9: Move pixel sampling and recombination in copy_simple_data to separate helper functions .
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 295d2a67772ef537bdb16eba877872a0f1c53f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=295d2a67772ef537bdb16eba8… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Jul 28 21:33:14 2010 +0200 d3dx9: Move pixel sampling and recombination in copy_simple_data to separate helper functions. --- dlls/d3dx9_36/surface.c | 129 ++++++++++++++++++++++++++++++---------------- 1 files changed, 84 insertions(+), 45 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 7504811..c39ec57 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Tony Wasserka + * Copyright (C) 2009-2010 Tony Wasserka * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -446,45 +446,100 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(LPDIRECT3DSURFACE9 pDestSurface, /************************************************************ - * copy_simple_data - * - * Copies the source buffer to the destination buffer, performing - * any necessary format conversion and color keying. - * Works only for ARGB formats with 1 - 4 bytes per pixel. + * helper functions for D3DXLoadSurfaceFromMemory */ -static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, - CONST BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat, - DWORD dwFilter) +struct argb_conversion_info { + CONST PixelFormatDesc *srcformat; + CONST PixelFormatDesc *destformat; DWORD srcshift[4], destshift[4]; DWORD srcmask[4], destmask[4]; BOOL process_channel[4]; - DWORD channels[4]; - DWORD channelmask = 0; + DWORD channelmask; +}; - UINT minwidth, minheight; - BYTE *srcptr, *destptr; - UINT i, x, y; +static void init_argb_conversion_info(CONST PixelFormatDesc *srcformat, CONST PixelFormatDesc *destformat, struct argb_conversion_info *info) +{ + UINT i; + ZeroMemory(info->process_channel, 4 * sizeof(BOOL)); + info->channelmask = 0; - ZeroMemory(channels, sizeof(channels)); - ZeroMemory(process_channel, sizeof(process_channel)); + info->srcformat = srcformat; + info->destformat = destformat; for(i = 0;i < 4;i++) { /* srcshift is used to extract the _relevant_ components */ - srcshift[i] = srcformat->shift[i] + max( srcformat->bits[i] - destformat->bits[i], 0); + info->srcshift[i] = srcformat->shift[i] + max( srcformat->bits[i] - destformat->bits[i], 0); /* destshift is used to move the components to the correct position */ - destshift[i] = destformat->shift[i] + max(destformat->bits[i] - srcformat->bits[i], 0); + info->destshift[i] = destformat->shift[i] + max(destformat->bits[i] - srcformat->bits[i], 0); - srcmask[i] = ((1 << srcformat->bits[i]) - 1) << srcformat->shift[i]; - destmask[i] = ((1 << destformat->bits[i]) - 1) << destformat->shift[i]; + info->srcmask[i] = ((1 << srcformat->bits[i]) - 1) << srcformat->shift[i]; + info->destmask[i] = ((1 << destformat->bits[i]) - 1) << destformat->shift[i]; /* channelmask specifies bits which aren't used in the source format but in the destination one */ if(destformat->bits[i]) { - if(srcformat->bits[i]) process_channel[i] = TRUE; - else channelmask |= destmask[i]; + if(srcformat->bits[i]) info->process_channel[i] = TRUE; + else info->channelmask |= info->destmask[i]; } } +} + +/************************************************************ + * get_relevant_argb_components + * + * Extracts the relevant components from the source color and + * drops the less significant bits if they aren't used by the destination format. + */ +static void get_relevant_argb_components(CONST struct argb_conversion_info *info, CONST DWORD col, DWORD *out) +{ + UINT i = 0; + for(;i < 4;i++) + if(info->process_channel[i]) + out[i] = (col & info->srcmask[i]) >> info->srcshift[i]; +} + +/************************************************************ + * make_argb_color + * + * Recombines the output of get_relevant_argb_components and converts + * it to the destination format. + */ +static void make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD *in, DWORD *out) +{ + UINT i; + *out = 0; + + for(i = 0;i < 4;i++) { + if(info->process_channel[i]) { + /* necessary to make sure that e.g. an X4R4G4B4 white maps to an R8G8B8 white instead of 0xf0f0f0 */ + signed int shift; + for(shift = info->destshift[i]; shift > info->destformat->shift[i]; shift -= info->srcformat->bits[i]) *out |= in[i] << shift; + *out |= (in[i] >> (info->destformat->shift[i] - shift)) << info->destformat->shift[i]; + } + } + *out |= info->channelmask; /* new channels are set to their maximal value */ +} + +/************************************************************ + * copy_simple_data + * + * Copies the source buffer to the destination buffer, performing + * any necessary format conversion and color keying. + * Works only for ARGB formats with 1 - 4 bytes per pixel. + */ +static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, + CONST BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) +{ + struct argb_conversion_info conv_info; + DWORD channels[4]; + + UINT minwidth, minheight; + BYTE *srcptr, *destptr; + UINT x, y; + + ZeroMemory(channels, sizeof(channels)); + init_argb_conversion_info(srcformat, destformat, &conv_info); minwidth = (srcsize.x < destsize.x) ? srcsize.x : destsize.x; minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; @@ -494,32 +549,16 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C destptr = (BYTE*)(dest + y * destpitch); for(x = 0;x < minwidth;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) { - const DWORD col = *(DWORD*)srcptr; - for(i = 0;i < 4;i++) - if(process_channel[i]) - channels[i] = (col & srcmask[i]) >> srcshift[i]; - } + if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(DWORD*)srcptr, channels); /* recombine the components */ - if(destformat->type == FORMAT_ARGB) { - DWORD* const pixel = (DWORD*)destptr; - *pixel = 0; - - for(i = 0;i < 4;i++) { - if(process_channel[i]) { - /* necessary to make sure that e.g. an X4R4G4B4 white maps to an R8G8B8 white instead of 0xf0f0f0 */ - signed int shift; - for(shift = destshift[i]; shift > destformat->shift[i]; shift -= srcformat->bits[i]) *pixel |= channels[i] << shift; - *pixel |= (channels[i] >> (destformat->shift[i] - shift)) << destformat->shift[i]; - } - } - *pixel |= channelmask; /* new channels are set to their maximal value */ - } + if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); + srcptr += srcformat->bytes_per_pixel; destptr += destformat->bytes_per_pixel; } } + /* TODO: Black out unused pixels */ } /************************************************************ @@ -576,7 +615,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if( !pDestSurface || !pSrcMemory || !pSrcRect ) return D3DERR_INVALIDCALL; if(SrcFormat == D3DFMT_UNKNOWN || pSrcRect->left >= pSrcRect->right || pSrcRect->top >= pSrcRect->bottom) return E_FAIL; - if(dwFilter != D3DX_FILTER_NONE) return E_NOTIMPL; + if((dwFilter & 0xF) != D3DX_FILTER_NONE) return E_NOTIMPL; + if(dwFilter == D3DX_DEFAULT) dwFilter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc); @@ -599,8 +639,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if(FAILED(hr)) return D3DXERR_INVALIDDATA; copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, - (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, - dwFilter); + (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); IDirect3DSurface9_UnlockRect(pDestSurface); return D3D_OK;

1 0