wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

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

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

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 : 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

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 : 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@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

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@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

Alexandre Julliard : d3dx9: Fix some incorrect const typecasts.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 277040d92454b7cc32d668b49a9bbf95df2796d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277040d92454b7cc32d668b49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 17:53:14 2010 +0200 d3dx9: Fix some incorrect const typecasts. --- dlls/d3dx9_36/surface.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index b0427d2..82881bc 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -529,13 +529,11 @@ static void make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD * 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) + 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)); @@ -545,11 +543,11 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; for(y = 0;y < minheight;y++) { - srcptr = (BYTE*)( src + y * srcpitch); - destptr = (BYTE*)(dest + y * destpitch); + const BYTE *srcptr = src + y * srcpitch; + BYTE *destptr = dest + y * destpitch; for(x = 0;x < minwidth;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(DWORD*)srcptr, channels); + if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(const DWORD*)srcptr, channels); /* recombine the components */ if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); @@ -570,13 +568,12 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C * Works only for ARGB formats with 1 - 4 bytes per pixel. */ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, - CONST BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) + BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) { struct argb_conversion_info conv_info; DWORD channels[4]; UINT minwidth, minheight; - BYTE *srcptr, *destptr, *bufptr; UINT x, y; ZeroMemory(channels, sizeof(channels)); @@ -586,13 +583,13 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT sr minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; for(y = 0;y < destsize.y;y++) { - destptr = (BYTE*)dest + y * destpitch; - bufptr = (BYTE*)src + srcpitch * (y * srcsize.y / destsize.y); - srcptr = bufptr; + BYTE *destptr = dest + y * destpitch; + const BYTE *bufptr = src + srcpitch * (y * srcsize.y / destsize.y); + const BYTE *srcptr = bufptr; for(x = 0;x < destsize.x;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(DWORD*)srcptr, channels); + if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(const DWORD*)srcptr, channels); /* recombine the components */ if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); @@ -685,12 +682,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if(FAILED(hr)) return D3DXERR_INVALIDDATA; if((dwFilter & 0xF) == D3DX_FILTER_NONE) { - copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, - (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + copy_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, + lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); } else /*if((dwFilter & 0xF) == D3DX_FILTER_POINT) */ { /* always apply a point filter until D3DX_FILTER_LINEAR, D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented */ - point_filter_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, - (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + point_filter_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, + lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); } IDirect3DSurface9_UnlockRect(pDestSurface);

1 0

Tony Wasserka : d3dx9: Implement ARGB point filtering in D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 1905e93b542ad2c3357b6bcbb335d39a2bf022b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1905e93b542ad2c3357b6bcbb… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Jul 28 21:56:00 2010 +0200 d3dx9: Implement ARGB point filtering in D3DXLoadSurfaceFromMemory. --- dlls/d3dx9_36/surface.c | 53 ++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/surface.c | 6 +--- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4bd7450..b0427d2 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -562,6 +562,48 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C } /************************************************************ + * point_filter_simple_data + * + * Copies the source buffer to the destination buffer, performing + * any necessary format conversion, color keying and stretching + * using a point filter. + * Works only for ARGB formats with 1 - 4 bytes per pixel. + */ +static void point_filter_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, *bufptr; + 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; + + for(y = 0;y < destsize.y;y++) { + destptr = (BYTE*)dest + y * destpitch; + bufptr = (BYTE*)src + srcpitch * (y * srcsize.y / destsize.y); + srcptr = bufptr; + + for(x = 0;x < destsize.x;x++) { + /* extract source color components */ + if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(DWORD*)srcptr, channels); + + /* recombine the components */ + if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); + + srcptr = bufptr + (x * srcsize.x / destsize.x) * srcformat->bytes_per_pixel; + destptr += destformat->bytes_per_pixel; + } + } +} + +/************************************************************ * D3DXLoadSurfaceFromMemory * * Loads data from a given memory chunk into a surface, @@ -616,7 +658,6 @@ 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 & 0xF) != D3DX_FILTER_NONE) return E_NOTIMPL; if(dwFilter == D3DX_DEFAULT) dwFilter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc); @@ -643,8 +684,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0); if(FAILED(hr)) return D3DXERR_INVALIDDATA; - copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, - (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + if((dwFilter & 0xF) == D3DX_FILTER_NONE) { + copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, + (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + } else /*if((dwFilter & 0xF) == D3DX_FILTER_POINT) */ { + /* always apply a point filter until D3DX_FILTER_LINEAR, D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented */ + point_filter_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, + (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + } IDirect3DSurface9_UnlockRect(pDestSurface); return D3D_OK; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 83895c0..a996e6d 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -354,10 +354,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromSurface */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &newsurf, NULL); if(SUCCEEDED(hr)) { - todo_wine { - hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(NULL, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);

1 0

Tony Wasserka : d3dx9: Return D3DERR_INVALIDCALL in D3DXLoadSurfaceFromMemory if pDestRect is invalid .
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 5bdfd877a751fe5c99ede04eb25d41a481269bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdfd877a751fe5c99ede04eb… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Jul 28 21:51:42 2010 +0200 d3dx9: Return D3DERR_INVALIDCALL in D3DXLoadSurfaceFromMemory if pDestRect is invalid. --- dlls/d3dx9_36/surface.c | 7 ++++++- dlls/d3dx9_36/tests/surface.c | 22 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c39ec57..4bd7450 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -583,7 +583,8 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C * Success: D3D_OK, if we successfully load the pixel data into our surface or * if pSrcMemory is NULL but the other parameters are valid * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect are NULL or - * if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) + * if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) or + * if DestRect is invalid * D3DXERR_INVALIDDATA, if we fail to lock pDestSurface * E_FAIL, if SrcFormat is D3DFMT_UNKNOWN or the dimensions of pSrcRect are invalid * @@ -631,8 +632,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, destsize.x = surfdesc.Width; destsize.y = surfdesc.Height; } else { + if(pDestRect->left > pDestRect->right || pDestRect->right > surfdesc.Width) return D3DERR_INVALIDCALL; + if(pDestRect->top > pDestRect->bottom || pDestRect->bottom > surfdesc.Height) return D3DERR_INVALIDCALL; + if(pDestRect->left < 0 || pDestRect->top < 0) return D3DERR_INVALIDCALL; destsize.x = pDestRect->right - pDestRect->left; destsize.y = pDestRect->bottom - pDestRect->top; + if(destsize.x == 0 || destsize.y == 0) return D3D_OK; } hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 43ec02b..83895c0 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -217,7 +217,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) HRESULT hr; BOOL testdummy_ok, testbitmap_ok; IDirect3DSurface9 *surf, *newsurf; - RECT rect; + RECT rect, destrect; D3DLOCKED_RECT lockrect; const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 }; const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 }; @@ -330,6 +330,26 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_UNKNOWN, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0); ok(hr == E_FAIL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, E_FAIL); + SetRect(&destrect, -1, -1, 1, 1); /* destination rect is partially outside texture boundaries */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + SetRect(&destrect, 255, 255, 257, 257); /* destination rect is partially outside texture boundaries */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + SetRect(&destrect, 1, 1, 0, 0); /* left > right, top > bottom */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + SetRect(&destrect, 0, 0, 0, 0); /* left = right, top = bottom */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + + SetRect(&destrect, 257, 257, 257, 257); /* left = right, top = bottom, but invalid values */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + /* D3DXLoadSurfaceFromSurface */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &newsurf, NULL);

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010