winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
972 discussions
Start a n
N
ew thread
Nikolay Sivov : po: Update Russian translations.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: 2c9595c0395f29b40336a9acb71e6aaff78c4fe6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2c9595c0395f29b40336a9acb…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:12:51 2012 +0300 po: Update Russian translations. --- po/ru.po | 76 ++++++++++++++++++++----------------------------------------- 1 files changed, 25 insertions(+), 51 deletions(-) diff --git a/po/ru.po b/po/ru.po index 972eb5b..294f9b1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
http://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-21 23:30+0300\n" +"PO-Revision-Date: 2011-12-31 13:50+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: none\n" "Language: Russian\n" @@ -2124,9 +2124,8 @@ msgid "Certification Path" msgstr "Путь сертификации" #: cryptui.rc:211 -#, fuzzy msgid "Certification path" -msgstr "П&уть сертификации" +msgstr "Путь сертификации" #: cryptui.rc:214 msgid "&View Certificate" @@ -3331,9 +3330,8 @@ msgid "Asking for %s" msgstr "Запрос %s" #: inetcpl.rc:46 -#, fuzzy msgid "Home page" -msgstr " Домашняя страница " +msgstr "Домашняя страница" #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." @@ -3352,9 +3350,8 @@ msgid "&Blank page" msgstr "Пу&стая страница" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " История использования браузера " +msgstr "История использования браузера" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -3530,11 +3527,11 @@ msgstr "Незавершённая строковая константа" #: jscript.rc:38 msgid "Can't have 'break' outside of loop" -msgstr "" +msgstr "Выражение 'break' не может находится вне цикла" #: jscript.rc:39 msgid "Can't have 'continue' outside of loop" -msgstr "" +msgstr "Выражение 'continue' не может находится вне цикла" #: jscript.rc:40 msgid "Conditional compilation is turned off" @@ -10367,9 +10364,8 @@ msgid "&Footer:" msgstr "Н&ижний колонтитул:" #: notepad.rc:112 -#, fuzzy msgid "Margins (millimeters)" -msgstr "Поля (мм):" +msgstr "Поля (мм)" #: notepad.rc:113 msgid "&Left:" @@ -11747,31 +11743,26 @@ msgid "&Show processes from all users" msgstr "&Отображать процессы всех пользователей" #: taskmgr.rc:376 -#, fuzzy msgid "CPU usage" msgstr "Загрузка ЦП" #: taskmgr.rc:377 -#, fuzzy msgid "MEM usage" -msgstr "Файл подкачки" +msgstr "использование памяти" #: taskmgr.rc:378 msgid "Totals" msgstr "Всего" #: taskmgr.rc:379 -#, fuzzy msgid "Commit charge (K)" -msgstr "Выделение памяти (КБ)" +msgstr "Выделено памяти (КБ)" #: taskmgr.rc:380 -#, fuzzy msgid "Physical memory (K)" msgstr "Физическая память (КБ)" #: taskmgr.rc:381 -#, fuzzy msgid "Kernel memory (K)" msgstr "Память ядра (КБ)" @@ -11812,14 +11803,12 @@ msgid "Nonpaged" msgstr "Невыгруж." #: taskmgr.rc:418 -#, fuzzy msgid "CPU usage history" msgstr "Хронология загрузки ЦП" #: taskmgr.rc:419 -#, fuzzy msgid "Memory usage history" -msgstr "Хронология использования файла подкачки" +msgstr "Хронология использования памяти" #: taskmgr.rc:432 taskmgr.rc:327 msgid "Debug Channels" @@ -12493,9 +12482,8 @@ msgstr "" "option) any later version." #: winecfg.rc:140 -#, fuzzy msgid "Windows registration information" -msgstr " Регистрационная информация Windows " +msgstr "Регистрационная информация Windows" #: winecfg.rc:141 msgid "&Owner:" @@ -12506,9 +12494,8 @@ msgid "Organi&zation:" msgstr "Организация:" #: winecfg.rc:151 -#, fuzzy msgid "Application settings" -msgstr " Настройка приложений " +msgstr "Настройка приложений" #: winecfg.rc:152 msgid "" @@ -12533,9 +12520,8 @@ msgid "&Windows Version:" msgstr "&Версия Windows:" #: winecfg.rc:166 -#, fuzzy msgid "Window settings" -msgstr " Настройки окна " +msgstr "Настройки окон" #: winecfg.rc:167 msgid "Automatically capture the &mouse in full-screen windows" @@ -12558,9 +12544,8 @@ msgid "Desktop &size:" msgstr "Размер рабочего стола:" #: winecfg.rc:177 -#, fuzzy msgid "Direct3D" -msgstr " Direct3D " +msgstr "Direct3D" #: winecfg.rc:178 msgid "&Vertex Shader Support: " @@ -12571,18 +12556,16 @@ msgid "Allow &Pixel Shader (if supported by hardware)" msgstr "Включить Pixel Shader (если поддерживается оборудованием)" #: winecfg.rc:182 -#, fuzzy msgid "Screen resolution" -msgstr " Разрешение экрана " +msgstr "Разрешение экрана" #: winecfg.rc:186 msgid "This is a sample text using 10 point Tahoma" msgstr "Пример текста (This is a sample text), шрифт Tahoma 10 пунктов" #: winecfg.rc:193 -#, fuzzy msgid "DLL overrides" -msgstr " Замещения DLL " +msgstr "Замещения DLL" #: winecfg.rc:194 msgid "" @@ -12614,9 +12597,8 @@ msgid "Edit Override" msgstr "Изменить замещение" #: winecfg.rc:210 -#, fuzzy msgid "Load order" -msgstr " Порядок загрузки " +msgstr "Порядок загрузки" #: winecfg.rc:211 msgid "&Builtin (Wine)" @@ -12643,9 +12625,8 @@ msgid "Select Drive Letter" msgstr "Выберите букву диска" #: winecfg.rc:234 -#, fuzzy msgid "Drive mappings" -msgstr " Настройка дисков " +msgstr "Настройка дисков" #: winecfg.rc:235 msgid "" @@ -12692,14 +12673,12 @@ msgid "Show &dot files" msgstr "Показывать файлы, начинающиеся с точки" #: winecfg.rc:267 -#, fuzzy msgid "Driver diagnostics" -msgstr " Диагностика драйвера " +msgstr "Диагностика драйвера" #: winecfg.rc:269 -#, fuzzy msgid "Defaults" -msgstr " По умолчанию " +msgstr "По умолчанию" #: winecfg.rc:270 msgid "Output device:" @@ -12722,13 +12701,12 @@ msgid "&Test Sound" msgstr "&Проверить звук" #: winecfg.rc:285 -#, fuzzy msgid "Appearance" -msgstr " Внешний вид " +msgstr "Внешний вид" #: winecfg.rc:286 msgid "&Theme:" -msgstr "Тема:" +msgstr "&Тема:" #: winecfg.rc:288 msgid "&Install theme..." @@ -12743,13 +12721,12 @@ msgid "C&olor:" msgstr "Цвет:" #: winecfg.rc:301 -#, fuzzy msgid "Folders" -msgstr "Стандартные папки" +msgstr "Папки" #: winecfg.rc:304 msgid "&Link to:" -msgstr "Направить в:" +msgstr "Привязать к:" #: winecfg.rc:31 msgid "Libraries" @@ -13444,7 +13421,6 @@ msgid "By File Type" msgstr "По типу файлов" #: winefile.rc:146 -#, fuzzy msgid "File type" msgstr "Тип файла" @@ -13505,9 +13481,8 @@ msgid "&Compressed" msgstr "С&жатый" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "&Информация о версии" +msgstr "Информация о версии" #: winefile.rc:93 msgid "Applying font settings" @@ -13613,7 +13588,6 @@ msgid "Fastest Times" msgstr "Лучшее время" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Лучшее время"
1
0
0
0
André Hentschel : po: Update German translation.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: 7346b9cf05de1cbeecd55e9a87a11763540e1f25 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7346b9cf05de1cbeecd55e9a8…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 1 17:39:22 2012 +0100 po: Update German translation. --- po/de.po | 68 +++++++++++++++++++------------------------------------------ 1 files changed, 21 insertions(+), 47 deletions(-) diff --git a/po/de.po b/po/de.po index 03697d1..2083839 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
http://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-29 17:17+0100\n" +"PO-Revision-Date: 2012-01-01 16:28+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2124,9 +2124,8 @@ msgid "Certification Path" msgstr "Zertifizierungspfad" #: cryptui.rc:211 -#, fuzzy msgid "Certification path" -msgstr "&Zertifizierungspfad" +msgstr "Zertifizierungspfad" #: cryptui.rc:214 msgid "&View Certificate" @@ -3329,9 +3328,8 @@ msgid "Asking for %s" msgstr "Frage nach %s" #: inetcpl.rc:46 -#, fuzzy msgid "Home page" -msgstr " Startseite " +msgstr "Startseite" #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." @@ -3350,9 +3348,8 @@ msgid "&Blank page" msgstr "&Leere Seite" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " Browserverlauf " +msgstr "Browserverlauf" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -3527,11 +3524,11 @@ msgstr "konstante Zeichenkette nicht terminiert" #: jscript.rc:38 msgid "Can't have 'break' outside of loop" -msgstr "" +msgstr "Unerwartetes 'break' außerhalb der Schleife" #: jscript.rc:39 msgid "Can't have 'continue' outside of loop" -msgstr "" +msgstr "Unerwartetes 'continue' außerhalb der Schleife" #: jscript.rc:40 msgid "Conditional compilation is turned off" @@ -10432,9 +10429,8 @@ msgid "&Footer:" msgstr "&Fußzeile:" #: notepad.rc:112 -#, fuzzy msgid "Margins (millimeters)" -msgstr "&Ränder (Millimeter):" +msgstr "Ränder (Millimeter):" #: notepad.rc:113 msgid "&Left:" @@ -11822,12 +11818,10 @@ msgid "&Show processes from all users" msgstr "P&rozesse aller Benutzern anzeigen" #: taskmgr.rc:376 -#, fuzzy msgid "CPU usage" -msgstr "CPU-Auslastung" +msgstr "CPU Auslastung" #: taskmgr.rc:377 -#, fuzzy msgid "MEM usage" msgstr "Speicherausl." @@ -11836,17 +11830,14 @@ msgid "Totals" msgstr "Insgesamt" #: taskmgr.rc:379 -#, fuzzy msgid "Commit charge (K)" msgstr "Zugesicherter Speicher (K)" #: taskmgr.rc:380 -#, fuzzy msgid "Physical memory (K)" msgstr "Physikalischer Speicher (K)" #: taskmgr.rc:381 -#, fuzzy msgid "Kernel memory (K)" msgstr "Kernelspeicher (K)" @@ -11887,12 +11878,10 @@ msgid "Nonpaged" msgstr "Nicht ausgelagert" #: taskmgr.rc:418 -#, fuzzy msgid "CPU usage history" msgstr "Verlauf der CPU-Auslastung" #: taskmgr.rc:419 -#, fuzzy msgid "Memory usage history" msgstr "Verlauf der Speicherauslastung" @@ -12573,9 +12562,8 @@ msgstr "" "Version 2.1 der Lizenz oder (nach Ihrer Option) jeder späteren Version." #: winecfg.rc:140 -#, fuzzy msgid "Windows registration information" -msgstr " Windows-Registrierungs-Informationen " +msgstr "Windows Registrierungs Informationen" #: winecfg.rc:141 msgid "&Owner:" @@ -12586,9 +12574,8 @@ msgid "Organi&zation:" msgstr "&Organisation:" #: winecfg.rc:151 -#, fuzzy msgid "Application settings" -msgstr " Anwendungseinstellungen " +msgstr "Anwendungseinstellungen" #: winecfg.rc:152 msgid "" @@ -12614,9 +12601,8 @@ msgid "&Windows Version:" msgstr "&Windows Version:" #: winecfg.rc:166 -#, fuzzy msgid "Window settings" -msgstr " Fenstereinstellungen " +msgstr "Fenstereinstellungen" #: winecfg.rc:167 msgid "Automatically capture the &mouse in full-screen windows" @@ -12639,9 +12625,8 @@ msgid "Desktop &size:" msgstr "Desktop-&Größe:" #: winecfg.rc:177 -#, fuzzy msgid "Direct3D" -msgstr " Direct3D " +msgstr "Direct3D" #: winecfg.rc:178 msgid "&Vertex Shader Support: " @@ -12652,18 +12637,16 @@ msgid "Allow &Pixel Shader (if supported by hardware)" msgstr "&Pixel Shader aktivieren (wenn von Hardware unterstützt)" #: winecfg.rc:182 -#, fuzzy msgid "Screen resolution" -msgstr " Bildschi&rmauflösung " +msgstr "Bildschirmauflösung" #: winecfg.rc:186 msgid "This is a sample text using 10 point Tahoma" msgstr "Dies ist ein Beispieltext in 10 Punkt Tahoma" #: winecfg.rc:193 -#, fuzzy msgid "DLL overrides" -msgstr " DLL Überschreibung " +msgstr "DLL Überschreibungen" #: winecfg.rc:194 msgid "" @@ -12696,9 +12679,8 @@ msgid "Edit Override" msgstr "Bearbeite Überschreibung" #: winecfg.rc:210 -#, fuzzy msgid "Load order" -msgstr " Ladereihenfolge " +msgstr "Ladereihenfolge" #: winecfg.rc:211 msgid "&Builtin (Wine)" @@ -12725,9 +12707,8 @@ msgid "Select Drive Letter" msgstr "Laufwerksbuchstaben wählen" #: winecfg.rc:234 -#, fuzzy msgid "Drive mappings" -msgstr " Laufwerksz&uordnung " +msgstr "Laufwerkszuordnung" #: winecfg.rc:235 msgid "" @@ -12774,14 +12755,12 @@ msgid "Show &dot files" msgstr "Zeige D&ot-Dateien an" #: winecfg.rc:267 -#, fuzzy msgid "Driver diagnostics" -msgstr " Treiber Diagnose " +msgstr "Treiber Diagnose" #: winecfg.rc:269 -#, fuzzy msgid "Defaults" -msgstr " Standards " +msgstr "Standards" #: winecfg.rc:270 msgid "Output device:" @@ -12804,9 +12783,8 @@ msgid "&Test Sound" msgstr "Sound &testen" #: winecfg.rc:285 -#, fuzzy msgid "Appearance" -msgstr " Darstellung " +msgstr "Darstellung" #: winecfg.rc:286 msgid "&Theme:" @@ -12825,9 +12803,8 @@ msgid "C&olor:" msgstr "F&arbe:" #: winecfg.rc:301 -#, fuzzy msgid "Folders" -msgstr "Shell-Ordner" +msgstr "Ordner" #: winecfg.rc:304 msgid "&Link to:" @@ -13529,7 +13506,6 @@ msgid "By File Type" msgstr "Angaben auswählen" #: winefile.rc:146 -#, fuzzy msgid "File type" msgstr "Dateityp" @@ -13590,9 +13566,8 @@ msgid "&Compressed" msgstr "&Komprimiert" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "&Versionsinformationen" +msgstr "Versionsinformationen" #: winefile.rc:93 msgid "Applying font settings" @@ -13698,7 +13673,6 @@ msgid "Fastest Times" msgstr "Beste Zeiten" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Beste Zeiten"
1
0
0
0
Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: 68968419ecceb3f9ba348b04df18170f7806532d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=68968419ecceb3f9ba348b04d…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 31 10:23:25 2011 +0100 po: Update French translation. --- po/fr.po | 46 +++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/po/fr.po b/po/fr.po index c725ea6..d6db593 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
http://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-29 21:39+0100\n" +"PO-Revision-Date: 2011-12-30 10:22+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -12618,9 +12618,8 @@ msgstr "" "Licence, soit (à votre gré) toute version ultérieure." #: winecfg.rc:140 -#, fuzzy msgid "Windows registration information" -msgstr "Informations d'enregistrement de Windows " +msgstr "Informations d'enregistrement de Windows" #: winecfg.rc:141 msgid "&Owner:" @@ -12631,9 +12630,8 @@ msgid "Organi&zation:" msgstr "&Organisation:" #: winecfg.rc:151 -#, fuzzy msgid "Application settings" -msgstr " Paramètres des applications " +msgstr "Paramètres des applications" #: winecfg.rc:152 msgid "" @@ -12659,9 +12657,8 @@ msgid "&Windows Version:" msgstr "Version de &Windows :" #: winecfg.rc:166 -#, fuzzy msgid "Window settings" -msgstr " Paramètres des fenêtres " +msgstr "Paramètres des fenêtres" #: winecfg.rc:167 msgid "Automatically capture the &mouse in full-screen windows" @@ -12684,9 +12681,8 @@ msgid "Desktop &size:" msgstr "Taille du bureau:" #: winecfg.rc:177 -#, fuzzy msgid "Direct3D" -msgstr " Direct3D " +msgstr "Direct3D" #: winecfg.rc:178 msgid "&Vertex Shader Support: " @@ -12697,18 +12693,16 @@ msgid "Allow &Pixel Shader (if supported by hardware)" msgstr "Utiliser le Pixel Shader (si supporté par le matériel)" #: winecfg.rc:182 -#, fuzzy msgid "Screen resolution" -msgstr " Résolution de l'écran " +msgstr "Résolution de l'écran" #: winecfg.rc:186 msgid "This is a sample text using 10 point Tahoma" msgstr "Ceci est un exemple utilisant du Tahoma 10 points" #: winecfg.rc:193 -#, fuzzy msgid "DLL overrides" -msgstr " Remplacement de DLL " +msgstr "Remplacement de DLL" #: winecfg.rc:194 msgid "" @@ -12742,9 +12736,8 @@ msgid "Edit Override" msgstr "Éditer le remplacement" #: winecfg.rc:210 -#, fuzzy msgid "Load order" -msgstr " Ordre de chargement " +msgstr "Ordre de chargement" #: winecfg.rc:211 msgid "&Builtin (Wine)" @@ -12771,9 +12764,8 @@ msgid "Select Drive Letter" msgstr "Sélectionnez la lettre du lecteur" #: winecfg.rc:234 -#, fuzzy msgid "Drive mappings" -msgstr " Assignation des lecteurs " +msgstr "Assignation des lecteurs" #: winecfg.rc:235 msgid "" @@ -12820,39 +12812,36 @@ msgid "Show &dot files" msgstr "Montrer les fichiers cachés" #: winecfg.rc:267 -#, fuzzy msgid "Driver diagnostics" -msgstr " Driver Diagnostics " +msgstr "Diagnostic de pilotes" #: winecfg.rc:269 -#, fuzzy msgid "Defaults" -msgstr " Defaults " +msgstr "Valeurs par défaut" #: winecfg.rc:270 msgid "Output device:" -msgstr "Output device:" +msgstr "Périphérique de sortie :" #: winecfg.rc:271 msgid "Voice output device:" -msgstr "Voice output device:" +msgstr "Périphérique de sortie voix :" #: winecfg.rc:272 msgid "Input device:" -msgstr "Input device:" +msgstr "Périphérique d'entrée :" #: winecfg.rc:273 msgid "Voice input device:" -msgstr "Voice input device:" +msgstr "Périphérique d'entrée voix :" #: winecfg.rc:278 msgid "&Test Sound" msgstr "&Tester le son" #: winecfg.rc:285 -#, fuzzy msgid "Appearance" -msgstr " Apparence " +msgstr "Apparence" #: winecfg.rc:286 msgid "&Theme:" @@ -12871,9 +12860,8 @@ msgid "C&olor:" msgstr "Couleu&r :" #: winecfg.rc:301 -#, fuzzy msgid "Folders" -msgstr "Dossier" +msgstr "Dossiers" #: winecfg.rc:304 msgid "&Link to:"
1
0
0
0
Marcus Meissner : msvcrt: Mark various internal functions as hidden.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: b057a3e898f9583053db97eae17bfb56ab9e28dc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b057a3e898f9583053db97eae…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:56 2012 +0100 msvcrt: Mark various internal functions as hidden. --- dlls/msvcrt/msvcrt.h | 62 +++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7ea0067..76f558c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -174,7 +174,7 @@ typedef struct MSVCRT_localeinfo_struct /* TLS data */ -extern DWORD msvcrt_tls_index; +extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN; /* Keep in sync with msvcr90/tests/msvcr90.c */ struct __thread_data { @@ -214,15 +214,15 @@ struct __thread_data { typedef struct __thread_data thread_data_t; -extern thread_data_t *msvcrt_get_thread_data(void); +extern thread_data_t *msvcrt_get_thread_data(void) DECLSPEC_HIDDEN; -LCID MSVCRT_locale_to_LCID(const char *); -extern MSVCRT__locale_t MSVCRT_locale; +LCID MSVCRT_locale_to_LCID(const char *) DECLSPEC_HIDDEN; +extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN; extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; -void msvcrt_set_errno(int); +void msvcrt_set_errno(int) DECLSPEC_HIDDEN; void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum); @@ -230,10 +230,10 @@ void __cdecl _amsg_exit(int errnum); extern char **MSVCRT__environ; extern MSVCRT_wchar_t **MSVCRT__wenviron; -extern char ** msvcrt_SnapshotOfEnvironmentA(char **); -extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **); +extern char ** msvcrt_SnapshotOfEnvironmentA(char **) DECLSPEC_HIDDEN; +extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **) DECLSPEC_HIDDEN; -MSVCRT_wchar_t *msvcrt_wstrdupa(const char *); +MSVCRT_wchar_t *msvcrt_wstrdupa(const char *) DECLSPEC_HIDDEN; /* FIXME: This should be declared in new.h but it's not an extern "C" so * it would not be much use anyway. Even for Winelib applications. @@ -250,21 +250,21 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int); /* Setup and teardown multi threaded locks */ -extern void msvcrt_init_mt_locks(void); -extern void msvcrt_free_mt_locks(void); - -extern BOOL msvcrt_init_locale(void); -extern void msvcrt_init_math(void); -extern void msvcrt_init_io(void); -extern void msvcrt_free_io(void); -extern void msvcrt_init_console(void); -extern void msvcrt_free_console(void); -extern void msvcrt_init_args(void); -extern void msvcrt_free_args(void); -extern void msvcrt_init_signals(void); -extern void msvcrt_free_signals(void); - -extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**); +extern void msvcrt_init_mt_locks(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_mt_locks(void) DECLSPEC_HIDDEN; + +extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_math(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_io(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_io(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_console(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_console(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_args(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_signals(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_signals(void) DECLSPEC_HIDDEN; + +extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern unsigned int __cdecl _control87(unsigned int, unsigned int); @@ -902,12 +902,12 @@ int __cdecl MSVCRT_raise(int sig); #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 extern MSVCRT__locale_t MSVCRT_locale; -MSVCRT_pthreadlocinfo get_locinfo(void); -MSVCRT_pthreadmbcinfo get_mbcinfo(void); +MSVCRT_pthreadlocinfo get_locinfo(void) DECLSPEC_HIDDEN; +MSVCRT_pthreadmbcinfo get_mbcinfo(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); -void free_locinfo(MSVCRT_pthreadlocinfo); -void free_mbcinfo(MSVCRT_pthreadmbcinfo); -int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo); +void free_locinfo(MSVCRT_pthreadlocinfo) DECLSPEC_HIDDEN; +void free_mbcinfo(MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; +int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int); @@ -972,10 +972,10 @@ typedef union _printf_arg } printf_arg; typedef printf_arg (*args_clbk)(void*, int, int, __ms_va_list*); int pf_printf_a(puts_clbk_a, void*, const char*, MSVCRT__locale_t, - BOOL, BOOL, args_clbk, void*, __ms_va_list*); + BOOL, BOOL, args_clbk, void*, __ms_va_list*) DECLSPEC_HIDDEN; int pf_printf_w(puts_clbk_w, void*, const MSVCRT_wchar_t*, MSVCRT__locale_t, - BOOL, BOOL, args_clbk, void*, __ms_va_list*); -printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*); + BOOL, BOOL, args_clbk, void*, __ms_va_list*) DECLSPEC_HIDDEN; +printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4
1
0
0
0
Marcus Meissner : wshom.ocx: Mark one function as static, one as hidden.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: eaae8f840069d6ea9176aa727b21b68df74856b7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eaae8f840069d6ea9176aa727…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:47 2012 +0100 wshom.ocx: Mark one function as static, one as hidden. --- dlls/wshom.ocx/wshom_main.c | 1 + dlls/wshom.ocx/wshom_private.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 6493d86..1c6bb44 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -80,6 +80,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) return S_OK; } +static void release_typelib(void) { unsigned i; diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index b39299f..5bf7403 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -33,6 +33,6 @@ typedef enum tid_t { LAST_tid } tid_t; -HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo); +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
1
0
0
0
Marcus Meissner : mshtml: Mark function as hidden.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: 3a58d2842757aef00193d891ac0965d5d569dc2e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a58d2842757aef00193d891a…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:22 2012 +0100 mshtml: Mark function as hidden. --- dlls/mshtml/binding.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index a392037..0d7a3a7 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -112,4 +112,4 @@ HRESULT super_navigate(HTMLWindow*,IUri*,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDD HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,nsChannelBSC**) DECLSPEC_HIDDEN; HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; -IUri *nsuri_get_uri(nsWineURI*); +IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN;
1
0
0
0
Marcus Meissner : usp10: Mark two functions as hidden.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: 77a3d90abf2cf197c6ccb4635a4db6c4eb3c7899 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=77a3d90abf2cf197c6ccb4635…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:39 2012 +0100 usp10: Mark two functions as hidden. --- dlls/usp10/usp10_internal.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 56de435..38ec49f 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -203,10 +203,10 @@ void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYS HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) DECLSPEC_HIDDEN; void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) DECLSPEC_HIDDEN; -HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags); +HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN; void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChars, IndicSyllable **syllables, int *syllable_count, lexical_function lexical_f, reorder_function reorder_f, BOOL modern) DECLSPEC_HIDDEN; -void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern); +void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern) DECLSPEC_HIDDEN; void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) DECLSPEC_HIDDEN;
1
0
0
0
Marcus Meissner : jscript: Mark some function DECLSPEC_HIDDEN.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: 0648a567a898475d241afe0965acae283c9c2ea8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0648a567a898475d241afe096…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:10 2012 +0100 jscript: Mark some function DECLSPEC_HIDDEN. --- dlls/jscript/jscript.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d67bdac..5a8d7f4 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -189,8 +189,8 @@ static inline IDispatch *to_disp(jsdisp_t *jsdisp) return (IDispatch*)&jsdisp->IDispatchEx_iface; } -jsdisp_t *as_jsdisp(IDispatch*); -jsdisp_t *to_jsdisp(IDispatch*); +jsdisp_t *as_jsdisp(IDispatch*) DECLSPEC_HIDDEN; +jsdisp_t *to_jsdisp(IDispatch*) DECLSPEC_HIDDEN; static inline void jsdisp_addref(jsdisp_t *jsdisp) {
1
0
0
0
Henri Verbeet : wined3d: Get rid of the WINED3DFILLMODE typedef.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: a03eeb5cac77fdbfd893889ccec9fca568823b45 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a03eeb5cac77fdbfd893889cc…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:30 2012 +0100 wined3d: Get rid of the WINED3DFILLMODE typedef. --- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 034fd34..a392f1f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -49,24 +49,24 @@ static void state_nop(struct wined3d_context *context, const struct wined3d_stat static void state_fillmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - WINED3DFILLMODE mode = state->render_states[WINED3D_RS_FILLMODE]; + enum wined3d_fill_mode mode = state->render_states[WINED3D_RS_FILLMODE]; switch (mode) { - case WINED3DFILL_POINT: + case WINED3D_FILL_POINT: glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_POINT)"); break; - case WINED3DFILL_WIREFRAME: + case WINED3D_FILL_WIREFRAME: glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)"); break; - case WINED3DFILL_SOLID: + case WINED3D_FILL_SOLID: glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)"); break; default: - FIXME("Unrecognized WINED3D_RS_FILLMODE %d.\n", mode); + FIXME("Unrecognized fill mode %#x.\n", mode); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4399446..feabe3d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1123,7 +1123,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; else state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; - state->render_states[WINED3D_RS_FILLMODE] = WINED3DFILL_SOLID; + state->render_states[WINED3D_RS_FILLMODE] = WINED3D_FILL_SOLID; state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0; lp.lp.line_pattern = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9ff53784..312b63c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -455,13 +455,12 @@ enum wined3d_shade_mode WINED3D_SHADE_PHONG = 3, }; -typedef enum _WINED3DFILLMODE +enum wined3d_fill_mode { - WINED3DFILL_POINT = 1, - WINED3DFILL_WIREFRAME = 2, - WINED3DFILL_SOLID = 3, - WINED3DFILL_FORCE_DWORD = 0x7fffffff -} WINED3DFILLMODE; + WINED3D_FILL_POINT = 1, + WINED3D_FILL_WIREFRAME = 2, + WINED3D_FILL_SOLID = 3, +}; typedef enum _WINED3DCULL {
1
0
0
0
Henri Verbeet : wined3d: Get rid of the WINED3DSHADEMODE typedef.
by Alexandre Julliard
03 Jan '12
03 Jan '12
Module: wine Branch: master Commit: 16e9d728f4f2b40dbed4a5c332da1931ccf6eb94 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=16e9d728f4f2b40dbed4a5c33…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:29 2012 +0100 wined3d: Get rid of the WINED3DSHADEMODE typedef. --- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4c64261..034fd34 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -155,19 +155,19 @@ static void state_shademode(struct wined3d_context *context, const struct wined3 { switch (state->render_states[WINED3D_RS_SHADEMODE]) { - case WINED3DSHADE_FLAT: + case WINED3D_SHADE_FLAT: glShadeModel(GL_FLAT); checkGLcall("glShadeModel(GL_FLAT)"); break; - case WINED3DSHADE_GOURAUD: + case WINED3D_SHADE_GOURAUD: glShadeModel(GL_SMOOTH); checkGLcall("glShadeModel(GL_SMOOTH)"); break; - case WINED3DSHADE_PHONG: - FIXME("WINED3DSHADE_PHONG isn't supported\n"); + case WINED3D_SHADE_PHONG: + FIXME("WINED3D_SHADE_PHONG isn't supported.\n"); break; default: - FIXME("Unrecognized/Unhandled WINED3DSHADEMODE value %#x.\n", + FIXME("Unrecognized shade mode %#x.\n", state->render_states[WINED3D_RS_SHADEMODE]); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8a6bad8..4399446 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1124,7 +1124,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) else state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; state->render_states[WINED3D_RS_FILLMODE] = WINED3DFILL_SOLID; - state->render_states[WINED3D_RS_SHADEMODE] = WINED3DSHADE_GOURAUD; + state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0; lp.lp.line_pattern = 0; state->render_states[WINED3D_RS_LINEPATTERN] = lp.d; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 312f978..9ff53784 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -448,13 +448,12 @@ enum wined3d_fog_mode WINED3D_FOG_LINEAR = 3, }; -typedef enum _WINED3DSHADEMODE +enum wined3d_shade_mode { - WINED3DSHADE_FLAT = 1, - WINED3DSHADE_GOURAUD = 2, - WINED3DSHADE_PHONG = 3, - WINED3DSHADE_FORCE_DWORD = 0x7fffffff -} WINED3DSHADEMODE; + WINED3D_SHADE_FLAT = 1, + WINED3D_SHADE_GOURAUD = 2, + WINED3D_SHADE_PHONG = 3, +}; typedef enum _WINED3DFILLMODE {
1
0
0
0
← Newer
1
...
91
92
93
94
95
96
97
98
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
Results per page:
10
25
50
100
200