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

André Hentschel : German translation of Only support Ubuntu 9.10 and 10.04
by Jeremy Newman 21 May '10

21 May '10

Module: website Branch: master Commit: 4ac59804d46f1157f16544c0552e9369691e7c3e URL: http://source.winehq.org/git/website.git/?a=commit;h=4ac59804d46f1157f16544… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 21 20:04:39 2010 +0200 German translation of Only support Ubuntu 9.10 and 10.04 --- templates/de/download.template | 2 +- templates/de/download/deb.template | 77 +++++++---------------------------- 2 files changed, 17 insertions(+), 62 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 6230356..4d8be29 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,7 +62,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Ubuntu</a> - binär und Quellcode .debs für Ubuntu Lucid (10.04), Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10) und Hardy (8.04) + binär und Quellcode .debs für Ubuntu Lucid (10.04) und Ubuntu Karmic (9.10) <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 801044e..e5cc74e 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -1,27 +1,26 @@ - - + + <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> Wine für Ubuntu und Ubuntu Derivate <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> -Ubuntu und andere Debian-basierte Distributionen nutzen ein spezielles Tool, bekannt -als APT, um Pakete zur verwalten. APT ist in der Lage automatisch alle benötigten -Abhängigkeiten für ein Softwarepaket zu installieren, als auch das Paket zu -aktualisieren, indem sogenannte APT-Repositories durchsucht werden. Ubuntu hat sein eigenes -Repository von Software, welches Wine enthält, allerdings betreiben wir hier unser -eigenes Repository für Downloads der aktuell verfügbaren Betapakete. +Ubuntu und Ubuntu derivate (wie Kubuntu) bekommen ihre Software +als Pakete die in Repositories untergebracht sind. Ubuntu's +Standard Repository enthält Wine, wenn du allerdings mit der +neuesten Wine Beta auf dem Laufenden bleiben willst nutze das von +WineHQ mit der folgenden Anleitung. + -<h2>Warnung: Diese Pakete sind Betapakete.</h2> +<h2>Warnung: Diese Pakete sind Betapakete für Ubuntu 9.10 und neuere.</h2> 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 der aktuell -stabile Release von Wine (zur Zeit Wine 1.0.1) bei dir funktioniert, willst du diese Betapakete -wahrscheinlich nicht benutzen. +eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die Version +von Ubuntu bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. -<h2>Hinzufügen des WineHQ APT Repository:</h2> +<h2>Hinzufügen des WineHQ Repository:</h2> Öffne das Software-Paketquellenmenü durch System->Systemverwaltung->Software-Paketquellen. Wähle dann den Software @@ -29,34 +28,9 @@ von Drittanbietern-Reiter und klicke auf Hinzufügen. <img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="686" height="516" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> -Dann, copy-paste eine der unteren Zeilen in Abhängigkeit welche -Version du benutzt. +Dann, copy-paste die untere Zeile. -Für Ubuntu Lucid (10.04): ppa:ubuntu-wine/ppa -Für Ubuntu Karmic (9.10): -ppa:ubuntu-wine/ppa -Für Ubuntu Jaunty (9.04): -deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" -Für Ubuntu Intrepid (8.10): -deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" -Für Ubuntu Hardy (8.04): -deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" - -<h2>Vertrauen des WineHQ APT Repositorys:</h2> - -Nach dem Hinzufügen des Repository musst du auch noch den Schlüssel für das Repository -zu der Liste der vertrauenswürdigen Schlüssel deines Systems hinzufügen. -Ubuntu Karmic User können diesen Schritt überspringen. - -Für Ubuntu 9.04 und ältere: <a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Lade -und speichere Scott Ritchie's Schlüssel</a> (Rechtsklick -> Speichern unter...) -auf deinen Desktop. Öffne dann den Authentifizierung-Reiter, -klickeSchlüsseldatei importieren und wähle die Schlüsseldatei, -die du gerade gespeichert hast (Scott Ritchie.gpg). Es ist sicher, diese Datei nach -diesem Schritt zu löschen. - -<img src="{$root}/images/distro/de_ubuntu-softwaresources2.png" width="686" height="514" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> <h2>Installieren von Wine:</h2> @@ -68,10 +42,9 @@ und suche nach Wine oder klicke einfach<a href="apt://wine">auf diesen Link</a>. <h2>Aktualisierung auf eine neue Ubuntuversion</h2> -Wenn Du dein gesamtes System aktualisierst, zum Beispiel von Ubuntu 8.04 auf -8.10, musst Du zu dieser Seite zurückkehren und das Repository für die neue -Version von oben hinzufügen. Die eingebaute Aktualisierungsverwaltung wird das -Wine repository nicht automatisch umschalten. +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. +Die eingebaute Aktualisierungsverwaltung wird das Wine repository nicht automatisch umschalten. <h2>Ältere .deb Pakete</h2> @@ -88,26 +61,8 @@ mit der Kommandozeile durchzuführen, wie folgt. Die Instruktionen sind nützlich für Kubuntu, Xubuntu und andere Ubuntu Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal). -<h3>Für 10.04 (Lucid) und 9.10 (Karmic):</h3> - sudo add-apt-repository ppa:ubuntu-wine/ppa -<h3>Für 9.04 und vorherige:</h3> -Füge Schlüssel des Repositorys zu der Liste für vertrauenswürdige -APT-Schlüssel Deines Systems hinzu, indem Du folgendes -in das Terminal copy-pastest.: - -wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - - -Danach, füge das Repository zu den APT-Quellen Deines Systems hinzu: - -Für Ubuntu Jaunty (9.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list -Für Ubuntu Intrepid (8.10): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list -Für Ubuntu Hardy (8.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list - Aktualisiere dann die APT-Paketinformationen durch Ausführen von 'sudo apt-get update'. Du kannst nun Wine normal installieren oder durch Ausführen von 'sudo apt-get install wine' im Terminal.

1 0

Alexandre Julliard : Wine release 1.2-rc1
by Alexandre Julliard 21 May '10

21 May '10

Module: website Branch: master Commit: cfaf2d3b16e8f6a2c4a8b98193c4922c11cb69ce URL: http://source.winehq.org/git/website.git/?a=commit;h=cfaf2d3b16e8f6a2c4a8b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 21:38:10 2010 +0200 Wine release 1.2-rc1 --- news/en/2010052101.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/en/2010052101.xml b/news/en/2010052101.xml new file mode 100644 index 0000000..a32ca9e --- /dev/null +++ b/news/en/2010052101.xml @@ -0,0 +1,20 @@ +<news> +<date>May 21, 2010</date> +<title>Wine 1.2-rc1 Released</title> +<body> + The Wine development release 1.2-rc1 is now available. + This is the first release candidate for Wine 1.2. It marks the beginning of the code freeze period. Please give this release a good testing to help us make 1.2 as good as possible. + <a href="{$root}/announce/1.2-rc1">What's new</a> in this release: +<ul> + <li>Many new toolbar icons.</li> + <li>Support for alpha blending in image lists.</li> + <li>Much more complete shader assembler.</li> + <li>Support for Arabic font shaping and joining.</li> + <li>A number of fixes for video rendering.</li> + <li>Font antialiasing configuration through fontconfig.</li> + <li>Improved handling of desktop link files.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc1.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>. +</body></news>

1 0

Alexandre Julliard : Release 1.2-rc1.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 821cd38e1734137e6eab199334ecc182bd605680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821cd38e1734137e6eab19933… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 21:30:30 2010 +0200 Release 1.2-rc1. --- ANNOUNCE | 1461 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 634 insertions(+), 847 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=821cd38e1734137e6eab1…

1 0

Tag wine-1.2-rc1 : Alexandre Julliard : Release 1.2-rc1
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: refs/tags/wine-1.2-rc1 Tag: 97ba7f5a7c14f86117227cbbde46ad7d187ae227 URL: http://source.winehq.org/git/wine.git/?a=tag;h=97ba7f5a7c14f86117227cbbde46… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 21:30:30 2010 +0200 Release 1.2-rc1

1 0

Matej Špindler : oleacc: Add Slovenian translation.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 46c7f2686bce030c784e7554004d32854af62a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c7f2686bce030c784e75540… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 21 18:01:40 2010 +0200 oleacc: Add Slovenian translation. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/oleacc_Si.rc | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 6ac62c0..96689a5 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ oleacc_No.rc \ oleacc_Pl.rc \ oleacc_Pt.rc \ - oleacc_Ro.rc + oleacc_Ro.rc \ + oleacc_Si.rc @MAKE_DLL_RULES@ diff --git a/dlls/oleacc/oleacc_Si.rc b/dlls/oleacc/oleacc_Si.rc new file mode 100644 index 0000000..5b28c46 --- /dev/null +++ b/dlls/oleacc/oleacc_Si.rc @@ -0,0 +1,94 @@ +/* + * Slovenian resources for oleacc + * + * Copyright 2010 Matej Spindler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "oleacc.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 0 "nepoznan objekt" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "naslovna vrstica" + ROLE_SYSTEM_MENUBAR "menijska vrstica" + ROLE_SYSTEM_SCROLLBAR "drsni trak" + ROLE_SYSTEM_GRIP "prijemalo" + ROLE_SYSTEM_SOUND "zvok" + ROLE_SYSTEM_CURSOR "kazalec" + ROLE_SYSTEM_CARET "mesto vnosa" + ROLE_SYSTEM_ALERT "opozorilo" + ROLE_SYSTEM_WINDOW "okno" + ROLE_SYSTEM_CLIENT "klient" + ROLE_SYSTEM_MENUPOPUP "pojavni meni" + ROLE_SYSTEM_MENUITEM "element menija" + ROLE_SYSTEM_TOOLTIP "zaslonski namig" + ROLE_SYSTEM_APPLICATION "aplikacija" + ROLE_SYSTEM_DOCUMENT "dokument" + ROLE_SYSTEM_PANE "podokno" + ROLE_SYSTEM_CHART "graf" + ROLE_SYSTEM_DIALOG "dialog" + ROLE_SYSTEM_BORDER "okvir" + ROLE_SYSTEM_GROUPING "skupina" + ROLE_SYSTEM_SEPARATOR "razdelek" + ROLE_SYSTEM_TOOLBAR "orodna vrstica" + ROLE_SYSTEM_STATUSBAR "vrstica stanja" + ROLE_SYSTEM_TABLE "tabela" + ROLE_SYSTEM_COLUMNHEADER "glava stolpca" + ROLE_SYSTEM_ROWHEADER "glava vrstice" + ROLE_SYSTEM_COLUMN "stolpec" + ROLE_SYSTEM_ROW "vrstica" + ROLE_SYSTEM_CELL "celica" + ROLE_SYSTEM_LINK "povezava" + ROLE_SYSTEM_HELPBALLOON "balon pomoči" + ROLE_SYSTEM_CHARACTER "znak" + ROLE_SYSTEM_LIST "seznam" + ROLE_SYSTEM_LISTITEM "element seznama" + ROLE_SYSTEM_OUTLINE "oris" + ROLE_SYSTEM_OUTLINEITEM "element orisa" + ROLE_SYSTEM_PAGETAB "zavihek strani" + ROLE_SYSTEM_PROPERTYPAGE "stran lasnosti" + ROLE_SYSTEM_INDICATOR "indicator" + ROLE_SYSTEM_GRAPHIC "grafika" + ROLE_SYSTEM_STATICTEXT "statični tekst" + ROLE_SYSTEM_TEXT "tekst" + ROLE_SYSTEM_PUSHBUTTON "potisni gumb" + ROLE_SYSTEM_CHECKBUTTON "izbirni gumb" + ROLE_SYSTEM_RADIOBUTTON "radijski gumb" + ROLE_SYSTEM_COMBOBOX "kombinirano polje" + ROLE_SYSTEM_DROPLIST "spustni" + ROLE_SYSTEM_PROGRESSBAR "vrstica napredka" + ROLE_SYSTEM_DIAL "številčnica" + ROLE_SYSTEM_HOTKEYFIELD "polje bližnic" + ROLE_SYSTEM_SLIDER "drsnik" + ROLE_SYSTEM_SPINBUTTON "vrtilno polje" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animacija" + ROLE_SYSTEM_EQUATION "enačba" + ROLE_SYSTEM_BUTTONDROPDOWN "spustni gumb" + ROLE_SYSTEM_BUTTONMENU "gumb menija" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "mreža spustnih gumbov" + ROLE_SYSTEM_WHITESPACE "prazen prostor" + ROLE_SYSTEM_PAGETABLIST "seznam zavihkov strani" + ROLE_SYSTEM_CLOCK "ura" + ROLE_SYSTEM_SPLITBUTTON "deljeni gumb" + ROLE_SYSTEM_IPADDRESS "IP naslov" + ROLE_SYSTEM_OUTLINEBUTTON "gumb orisa" +}

1 0

Matej Špindler : taskmgr: Update Slovenian translation .
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: a06a191c172fb731f3993af2dfb490107d36e10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06a191c172fb731f3993af2d… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 14 20:45:38 2010 +0200 taskmgr: Update Slovenian translation. --- programs/taskmgr/Si.rc | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 4cfe73f..858e9d2 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -487,4 +487,90 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Dodeli proces v PODPOVPREČNI prioritetni razred" ID_PROCESS_PAGE_SETPRIORITY_LOW "Dodeli proces v NIZEK prioritetni razred" + ID_PROCESS_PAGE_DEBUGCHANNELS + "Nadzira kanale razhroščevalnika" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_VIEW_LARGE "V&elike ikone" + IDS_VIEW_SMALL "M&ale ikone" + IDS_VIEW_DETAILS "Po&drobnosti" + IDS_WINDOWS "&Okna" + IDS_VIEW_SELECTCOLUMNS "&Izbiranje stolcev..." + IDS_OPTIONS_SHOW16BITTASKS "&Prikaz 16-bitnih opravil" + IDS_VIEW_CPUHISTORY "&Zgodovina procesorja" + IDS_VIEW_CPUHISTORY_ONEGRAPHALL "&En grafikon za vse procesorje" + IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU "E&n grafikon na CPE" + IDS_VIEW_SHOWKERNELTIMES "&Pokaži čase jedra" + IDS_APPLICATIONS "Aplikacije" + IDS_PROCESSES "Procesi" + IDS_PERFORMANCE "Učinkovitost delovanja" + IDS_STATUS_BAR_CPU_USAGE "Uporaba CPE: %3d%%" + IDS_STATUS_BAR_PROCESSES "Procesi: %d" + IDS_STATUS_BAR_MEMORY_USAGE "Uporaba pomnilnika: %dK / %dK" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGENAME "Ime" + IDS_PID "PID" + IDS_CPUUSAGE "Uporaba CPE" + IDS_CPUTIME "Čas CPE" + IDS_MEMORYUSAGE "Uporaba pomnilnika" + IDS_MEMORYUSAGEDELTA "Delata uporabe pomnilnika" + IDS_PEAKMEMORYUSAGE "Tem. vr. uporabe pomnilnika" + IDS_PAGEFAULTS "Napake izmenjevanja" + IDS_USEROBJECTS "USER predmeti" + IDS_IOREADS "V/I branje" + IDS_IOREADBYTES "V/I branje (bajti)" + IDS_SESSIONID "ID seje" + IDS_USERNAME "Uporabniško ime" + IDS_PAGEFAULTSDELTA "Delta napak izmenjevanja" + IDS_VIRTUALMEMORYSIZE "Velikost navideznega pomnilnika" + IDS_PAGEDPOOL "Izmenjana zaloga" + IDS_NONPAGEDPOOL "Neizmenjana zaloga" + IDS_BASEPRIORITY "Osnovna prioriteta" + IDS_HANDLECOUNT "Število dostopnih kod" + IDS_THREADCOUNT "Število niti" + IDS_GDIOBJECTS "GDI predmeti" + IDS_IOWRITES "V/I pisanje" + IDS_IOWRITEBYTES "V/I pisanje (bajti)" + IDS_IOOTHER "V/I drugo" + IDS_IOOTHERBYTES "V/I drugo (bajti)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WARNING_TITLE "Opozorilo upravitelja opravil" + IDS_PRIORITY_CHANGE_MESSAGE "OPOZORILO: Spreminjanje prioritete tega procesa lahko povzroči\n\ + nezaželjene posledice, vključno z nesabilnostjo sistema. Ali ste\n\ + prepričani, da želite spremeniti prioriteto?" + IDS_PRIORITY_UNABLE2CHANGE "Ne morem spremeniti prioritete" + IDS_TERMINATE_MESSAGE "OPOZORILO: Prekinjanje procesa lahko povzroči nezaželjene \n\ + posledice, vključno z izgubo podatkov in nestabilnostjo sistema.\n\ + Pred prekinitvijo proces ne bo imel možnosti shraniti svojega \n\ + stanja ali podatkov. Ali ste prepričani, da želite\n\ + prekiniti proces?" + IDS_TERMINATE_UNABLE2TERMINATE "Ne morem prekiniti procesa" + IDS_DEBUG_MESSAGE "OPOZORILO: Razhroščevanje tega procesa lahko privede do izgube podatkov.\n\ + Ali res želite dodati razhroščevalnik?" + IDS_DEBUG_UNABLE2DEBUG "Ne morem dodati razhroščevalnika" + IDS_AFFINITY_ERROR_MESSAGE "Proces mora imeti afiniteto vsaj z enim procesorjem" + IDS_AFFINITY_ERROR_TITLE "Neveljavna opcija" + IDS_AFFINITY_UNABLE2ACCESS "Ne morem dostopati ali nastaviti afinitete procesa" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SYSTEM_IDLE_PROCESS "Sistemski nedejavni proces" + IDS_APPLICATION_NOT_RESPONDING "Se ne odziva" + IDS_APPLICATION_RUNNING "Se izvaja" + IDS_APPLICATION_TASK "Opravilo" + IDS_APPLICATION_STATUS "Status" + IDS_DEBUG_CHANNEL "Kanali razhroščevalnika" + IDS_DEBUG_CHANNEL_FIXME "Fixme" + IDS_DEBUG_CHANNEL_ERR "Err" + IDS_DEBUG_CHANNEL_WARN "Warn" + IDS_DEBUG_CHANNEL_TRACE "Trace" END

1 0

Matteo Bruni : d3dx9: Add some more tests on register number checking.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: ce3e846f3bfb2d162d2d90b27c0da74e5b48b408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3e846f3bfb2d162d2d90b27… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri May 21 16:25:38 2010 +0200 d3dx9: Add some more tests on register number checking. --- dlls/d3dx9_36/tests/asm.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 68d634f..c91cae9 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -747,6 +747,11 @@ static void vs_2_0_test(void) { "ret\n", {0xfffe0200, 0x01000019, 0xa0e41003, 0x0000001c, 0x0100001e, 0xa0e41003, 0x0000001c, 0x0000ffff} }, + { /* shader 29: labels up to 2047 are accepted even in vs_2_0 */ + "vs_2_0\n" + "call l2047\n", + {0xfffe0200, 0x01000019, 0xa0e417ff, 0x0000ffff} + }, }; exec_tests("vs_2_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1088,6 +1093,13 @@ static void vs_3_0_test(void) { {0xfffe0300, 0x05000051, 0xa00f0000, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f000000, 0x0000ffff} }, + { /* shader 14: no register number checks with relative addressing */ + "vs_3_0\n" + "add r0, v20[aL], r2\n", + {0xfffe0300, 0x04000002, 0x800f0000, 0x90e42014, 0xf0e40800, 0x80e40002, + 0x0000ffff} + }, + }; exec_tests("vs_3_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1255,6 +1267,21 @@ static void failure_test(void) { /* shader 27: oC3 is the max in >= ps_2_0 */ "ps_3_0\n" "add oC4, r0, r1\n", + /* shader 28: register v17 doesn't exist */ + "vs_3_0\n" + "add r0, r0, v17\n", + /* shader 29: register o13 doesn't exist */ + "vs_3_0\n" + "add o13, r0, r1\n", + /* shader 30: label > 2047 not allowed */ + "vs_3_0\n" + "call l2048\n", + /* shader 31: s20 register does not exist */ + "ps_3_0\n" + "texld r0, r1, s20\n", + /* shader 32: t5 not allowed in ps_1_3 */ + "ps_1_3\n" + "tex t5\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Shader assembler ps_2_x support.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 5786d3a0c776a320e7f91f461ce05779562772fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5786d3a0c776a320e7f91f461… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 20 01:14:25 2010 +0200 d3dx9: Shader assembler ps_2_x support. --- dlls/d3dx9_36/asmparser.c | 229 ++++++++++++++++++++++++++- dlls/d3dx9_36/asmshader.y | 6 +- dlls/d3dx9_36/bytecodewriter.c | 335 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 6 + dlls/d3dx9_36/tests/asm.c | 13 ++- 5 files changed, 579 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5786d3a0c776a320e7f91…

1 0

Aric Stewart : usp10: Correct Left and Right confusions for Arabic joining and shaping.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: e276fbc22284135019c15bba055ad943328a4b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e276fbc22284135019c15bba0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 10:08:30 2010 -0500 usp10: Correct Left and Right confusions for Arabic joining and shaping. --- dlls/usp10/shape.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bccb1fd..71022ef 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -51,8 +51,8 @@ enum joining_types { enum joined_forms { Xn=0, - Xl, Xr, + Xl, Xm }; @@ -448,12 +448,12 @@ static CHAR neighbour_joining_type(int i, int delta, const CHAR* context_type, I static inline BOOL right_join_causing(CHAR joining_type) { - return (joining_type == jtR || joining_type == jtD || joining_type == jtC); + return (joining_type == jtL || joining_type == jtD || joining_type == jtC); } static inline BOOL left_join_causing(CHAR joining_type) { - return (joining_type == jtL || joining_type == jtD || joining_type == jtC); + return (joining_type == jtR || joining_type == jtD || joining_type == jtC); } /* SHAPE_ShapeArabicGlyphs @@ -470,13 +470,13 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC if (!psa->fLogicalOrder && psa->fRTL) { - dirR = -1; - dirL = 1; + dirR = 1; + dirL = -1; } else { - dirR = 1; - dirL = -1; + dirR = -1; + dirL = 1; } if (!psc->GSUB_Table)

1 0

Austin English : ntdll: Add stub for NtRaiseHardError.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: c4ea80cf9becae4a63f74ab818df26b69c55d911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ea80cf9becae4a63f74ab81… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 20 12:30:46 2010 -0500 ntdll: Add stub for NtRaiseHardError. --- dlls/ntdll/error.c | 11 +++++++++++ dlls/ntdll/ntdll.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 4c7d5a7..5537c87 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -128,6 +128,17 @@ DWORD WINAPI RtlGetLastWin32Error(void) return NtCurrentTeb()->LastErrorValue; } +/********************************************************************** + * NtRaiseHardError (NTDLL.@) + */ +NTSTATUS WINAPI NtRaiseHardError( NTSTATUS ErrorStatus, ULONG NumberOfParameters, + PUNICODE_STRING UnicodeStringParameterMask, PVOID *Paramaters, + HARDERROR_RESPONSE_OPTION ResponseOption, PHARDERROR_RESPONSE Response ) +{ + FIXME(": stub. Errorstatus was %08x\n", ErrorStatus); + return STATUS_NOT_IMPLEMENTED; +} + /*********************************************************************** * RtlSetLastWin32Error (NTDLL.@) * RtlRestoreLastWin32Error (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 241f3d8..37e0cca 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -275,7 +275,7 @@ @ stdcall NtQueryVolumeInformationFile(long ptr ptr long long) @ stdcall NtQueueApcThread(long ptr long long long) @ stdcall NtRaiseException(ptr ptr long) -@ stub NtRaiseHardError +@ stdcall NtRaiseHardError(long long ptr ptr long long) @ stdcall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) @ stub NtReadRequestData

1 0