January 2012 - Wine-Commits

Francois Gouget : po: French translation updates.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 44a064affecfbb098f7356b1cc9fbfed82dc2e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a064affecfbb098f7356b1c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 17 23:11:55 2012 +0100 po: French translation updates. --- po/fr.po | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9995608..a31ab42 100644 --- a/po/fr.po +++ b/po/fr.po @@ -35,9 +35,9 @@ msgid "" "to modify its installed components, select it from the list and click Change/" "Remove." msgstr "" -"Les logiciels suivants peuvent être désinstallés automatiquement.\n" -"Pour supprimer un programme ou modifier ses composants, sélectionnez-le dans " -"la liste et cliquez sur Supprimer ou Modifier respectivement." +"Les logiciels suivants peuvent être désinstallés automatiquement. Pour " +"supprimer un programme ou modifier ses composants, sélectionnez-le dans la " +"liste et cliquez sur Supprimer ou Modifier respectivement." #: appwiz.rc:64 msgid "&Support Information" @@ -127,8 +127,8 @@ msgid "" "details." msgstr "" "Wine n'a pu trouver de paquet Gecko, qui est nécessaire pour que les " -"applications incorporant du HTML puissent fonctionner correctement.\n" -"Wine peut automatiquement le télécharger et l'installer pour vous.\n" +"applications incorporant du HTML puissent fonctionner correctement. Wine " +"peut automatiquement le télécharger et l'installer pour vous.\n" "\n" "Note : il est recommandé d'utiliser le paquet de votre distribution. " "Consultez <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/" @@ -3003,7 +3003,7 @@ msgstr "Paramètres régionaux" #: dxdiagn.rc:26 msgid "%1!u!MB used, %2!u!MB available" -msgstr "%1!u! MB utilisés, %2!u! MB disponibles" +msgstr "%1!u! Mo utilisés, %2!u! Mo disponibles" #: gdi32.rc:25 msgid "Western" @@ -5248,7 +5248,7 @@ msgstr "Serveur non désactivé\n" #: winerror.mc:2116 msgid "Invalid ID authority\n" -msgstr "Autorité d'identificateurs invalide\n" +msgstr "Autorité d'identifiants invalide\n" #: winerror.mc:2121 msgid "Allotted space exceeded\n" @@ -9333,7 +9333,7 @@ msgstr "" "[nomFichier]\n" " [/S [/D]]\n" "\n" -"où\n" +"Où :\n" "\n" " + Définit un attribut.\n" " - Supprime un attribut.\n" @@ -10232,7 +10232,7 @@ msgstr "" " -ou-\n" "NET commande /HELP\n" "\n" -"où « commande » peut être HELP, START, STOP ou USE.\n" +"Où « commande » peut être HELP, START, STOP ou USE.\n" #: net.rc:28 msgid "" @@ -10262,7 +10262,7 @@ msgstr "" "\n" "NET STOP service\n" "\n" -"où « service » est le nom du service à arrêter.\n" +"Où « service » est le nom du service à arrêter.\n" #: net.rc:30 msgid "Stopping dependent service: %1\n" @@ -14241,11 +14241,11 @@ msgstr "" "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" -"où :\n" +"Où :\n" "\n" "[/I] Supposer que la destination est un répertoire si elle n'existe pas et " -"que l'on copie plus\n" -" d'un fichier.\n" +"que\n" +"\tl'on copie plus d'un fichier.\n" "[/S] Copier les répertoires et sous-répertoires.\n" "[/E] Copier les répertoires et sous-répertoires, y compris ceux qui sont " "vides.\n" @@ -14267,9 +14267,8 @@ msgstr "" "[/A] Ne copier que les fichiers ayant l'attribut archive défini.\n" "[/M] Ne copier que les fichiers ayant l'attribut archive défini ; supprime\n" " ensuite l'attribut.\n" -"[/D | /D:m-d-y] Ne copier que les nouveaux fichiers, ou ceux modifiés après " -"la date spécifiée.\n" -"\t\tSi aucune date n'est fournie, ne copier que si le fichier de destination " -"est plus ancien\n" -"\t\tque le fichier source.\n" +"[/D | /D:m-j-a] Ne copier que les nouveaux fichiers, ou ceux modifiés après " +"la\n" +"\t\tdate spécifiée. Si aucune date n'est fournie, ne copier que si\n" +"\t\tle fichier de destination est plus ancien que le fichier source.\n" "\n"

1 0

Francois Gouget : po: Tweak the Slovenian 'file or directory' xcopy translation.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: ca609ad9e06f4339b4916bb5fe5493039e210e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca609ad9e06f4339b4916bb5f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 17 23:28:15 2012 +0100 po: Tweak the Slovenian 'file or directory' xcopy translation. --- po/sl.po | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index d45e4a8..b368424 100644 --- a/po/sl.po +++ b/po/sl.po @@ -14185,7 +14185,7 @@ msgid "" msgstr "" "Ali je '%s' ime ciljne datoteke\n" "ali mape?\n" -"(F - Datoteka, D - Mapa)\n" +"(D - Datoteka, M - Mapa)\n" #: xcopy.rc:35 #, fuzzy @@ -14208,14 +14208,16 @@ msgid "Failed during reading of '%1'\n" msgstr "Napaka med branjem '%s'\n" #: xcopy.rc:43 +#, fuzzy msgctxt "File key" msgid "F" msgstr "F" #: xcopy.rc:44 +#, fuzzy msgctxt "Directory key" msgid "D" -msgstr "D" +msgstr "M" #: xcopy.rc:77 #, fuzzy

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: f6821d316902444cfc2d72d25ad5754248a8d96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6821d316902444cfc2d72d25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 18 01:01:33 2012 +0300 po: Update Russian translation. --- po/ru.po | 42 ++++++++++++++---------------------------- 1 files changed, 14 insertions(+), 28 deletions(-) diff --git a/po/ru.po b/po/ru.po index fcbd88e..3b389f0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -40,9 +40,8 @@ msgstr "" "нажмите кнопку Изменить/Удалить." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "Сведения о поддержке" +msgstr "&Сведения о поддержке" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -587,13 +586,11 @@ msgid "&Hue:" msgstr "О&ттенок:" #: comdlg32.rc:290 -#, fuzzy msgctxt "Saturation" msgid "&Sat:" -msgstr "&Контраст:" +msgstr "&Насыщенность:" #: comdlg32.rc:292 -#, fuzzy msgctxt "Luminance" msgid "&Lum:" msgstr "&Яркость:" @@ -3499,12 +3496,11 @@ msgstr "Выражение 'continue' не может находится вне #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "Метка переопределена" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "Файл не найден" +msgstr "Метка не найдена" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -8402,9 +8398,8 @@ msgid "The specified device handle is invalid." msgstr "Указанный идентификатор устройства (device handle) неверен." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "В системе не установлен драйвер!\n" +msgstr "В системе не установлено ни одного драйвера!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -13037,21 +13032,18 @@ msgid "&Color" msgstr "&Цвет" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " Настройка " +msgstr "Конфигурация" #: wineconsole.rc:100 msgid "Buffer zone" msgstr "Зона буфера" #: wineconsole.rc:101 -#, fuzzy msgid "&Width:" msgstr "&Ширина:" #: wineconsole.rc:104 -#, fuzzy msgid "&Height:" msgstr "&Высота:" @@ -13060,12 +13052,10 @@ msgid "Window size" msgstr "Размер окна" #: wineconsole.rc:109 -#, fuzzy msgid "W&idth:" msgstr "Ш&ирина:" #: wineconsole.rc:112 -#, fuzzy msgid "H&eight:" msgstr "В&ысота:" @@ -13218,7 +13208,6 @@ msgstr "" "Приносим извинения за неудобство." #: winedbg.rc:54 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13226,21 +13215,15 @@ msgid "" msgstr "" "Ошибка могла быть вызвана проблемой в программе или недоработкой в Wine. Вы " "можете посетить <a href=\"http://appdb.winehq.org\">Application Database</a> " -"и поискать советы о запуске этой программы.\n" -"\n" -"Если эта проблема не присутствует под Windows и ещё не была " -"зарегистрирована, вы можете сообщить <a href=\"http://wiki.winehq.org/Bugs" -"\">cообщить об ошибке</a>." +"и поискать советы о запуске этой программы." #: winedbg.rc:57 -#, fuzzy msgid "Show &Details" -msgstr "&Таблица" +msgstr "Показать &подробно" #: winedbg.rc:62 -#, fuzzy msgid "Program Error Details" -msgstr "Программная ошибка" +msgstr "Подробности об ошибке" #: winedbg.rc:69 msgid "" @@ -13249,6 +13232,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Если эта проблема отсутствует в Windows и о ней еще никто не сообщил, вы " +"можете сохранить подробную информация в файл с помощью кнопки \"Сохранить как" +"\", затем <a href=\"http://wiki.winehq.org/Bugs\">сообщить об ошибке</a> и " +"приложить этот файл к отчету." #: winedbg.rc:35 msgid "Wine program crash" @@ -13263,9 +13250,8 @@ msgid "(unidentified)" msgstr "(не определено)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "Создание не удалось\n" +msgstr "Ошибка при сохранении" #: winefile.rc:26 msgid "&Open\tEnter"

1 0

André Hentschel : winedbg: Adjust button size to fit more translations.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 5e9b57d5b6fc3904da66413ef5c3d32f1dd3eaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9b57d5b6fc3904da66413ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:30:42 2012 +0100 winedbg: Adjust button size to fit more translations. --- programs/winedbg/winedbg.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 314500c..2e83cda 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -68,6 +68,6 @@ BEGIN then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> \ and attach that file to the report.", IDC_STATIC_TXT2,"SysLink",0,6,185,288,32 - DEFPUSHBUTTON "Close", IDOK, 236, 220, 60, 16, WS_TABSTOP - PUSHBUTTON "&Save As...", ID_SAVEAS, 172, 220, 60, 16, WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 226, 220, 70, 16, WS_TABSTOP + PUSHBUTTON "&Save As...", ID_SAVEAS, 152, 220, 70, 16, WS_TABSTOP END

1 0

Dmitry Timoshkov : kernel32: Remove a no longer needed todo_wine.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: d50814846ee4fd58287767c918769cce8096c495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50814846ee4fd58287767c91… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 18 19:18:50 2012 +0800 kernel32: Remove a no longer needed todo_wine. --- dlls/kernel32/tests/virtual.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index eb213a6..915f92d 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2188,7 +2188,6 @@ static void test_mapping(void) /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ if (!ret && page_prot[k] == PAGE_EXECUTE_WRITECOPY) { - todo_wine ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY\n"); continue; }

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 2c38ea08b865cf29211c7d5de2a197306ef3820c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c38ea08b865cf29211c7d5de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 17 21:55:16 2012 +0100 po: Update French translation. --- po/fr.po | 40 +++++++++++++++------------------------- 1 files changed, 15 insertions(+), 25 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5dc4b5c..9995608 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: 2012-01-12 21:08+0100\n" +"PO-Revision-Date: 2012-01-17 21:53+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -40,9 +40,8 @@ msgstr "" "la liste et cliquez sur Supprimer ou Modifier respectivement." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "Informations de support" +msgstr "Inf&ormations de support" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -3505,20 +3504,19 @@ msgstr "Constante chaîne de caractères non clôturée" #: jscript.rc:38 msgid "Can't have 'break' outside of loop" -msgstr "" +msgstr "« break » impossible à l'extérieur d'une boucle" #: jscript.rc:39 msgid "Can't have 'continue' outside of loop" -msgstr "" +msgstr "« continue » impossible à l'extérieur d'une boucle" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "Étiquette redéfinie" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "Fichier introuvable" +msgstr "Étiquette introuvable" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -13159,7 +13157,6 @@ msgid "Command history" msgstr "Historique des commandes" #: wineconsole.rc:73 -#, fuzzy msgid "&Number of recalled commands:" msgstr "&Nombre de commandes mémorisées :" @@ -13184,12 +13181,10 @@ msgid "Buffer zone" msgstr "Taille mémoire tampon écran" #: wineconsole.rc:101 -#, fuzzy msgid "&Width:" msgstr "&Largeur :" #: wineconsole.rc:104 -#, fuzzy msgid "&Height:" msgstr "Ha&uteur :" @@ -13198,12 +13193,10 @@ msgid "Window size" msgstr "Taille de la fenêtre" #: wineconsole.rc:109 -#, fuzzy msgid "W&idth:" msgstr "La&rgeur :" #: wineconsole.rc:112 -#, fuzzy msgid "H&eight:" msgstr "Hau&teur :" @@ -13359,7 +13352,6 @@ msgstr "" "somme désolés pour le désagrément subi." #: winedbg.rc:54 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13368,21 +13360,15 @@ msgstr "" "Cela peut être causé par une erreur dans le programme ou un défaut dans " "Wine. Vous pouvez consulter la <a href=\"http://appdb.winehq.org\">base de " "données d'applications</a> pour obtenir des conseils sur la façon d'exécuter " -"cette application.\n" -"\n" -"Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, " -"vous pouvez <a href=\"http://wiki.winehq.org/Bugs\">soumettre un rapport " -"d'anomalie</a>." +"cette application." #: winedbg.rc:57 -#, fuzzy msgid "Show &Details" -msgstr "&Détails" +msgstr "Afficher les &détails" #: winedbg.rc:62 -#, fuzzy msgid "Program Error Details" -msgstr "Erreur du programme" +msgstr "Détails de l'erreur du programme" #: winedbg.rc:69 msgid "" @@ -13391,6 +13377,11 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, " +"vous pouvez enregistrer les informations détaillées dans un fichier en " +"utilisant le bouton « Enregistrer sous », et ensuite <a href=\"http://wiki." +"winehq.org/Bugs\">soumettre un rapport d'anomalie</a> en y attachant ledit " +"fichier." #: winedbg.rc:35 msgid "Wine program crash" @@ -13405,9 +13396,8 @@ msgid "(unidentified)" msgstr "(non identifié)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "Erreur lors de la création\n" +msgstr "Erreur lors de l'enregistrement" #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: f979e2d3b5ee615effcfcedb8b10c699b761534f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f979e2d3b5ee615effcfcedb8… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jan 17 22:21:30 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4ffc87b..c5d49d1 100644 --- a/po/lt.po +++ b/po/lt.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: 2012-01-16 21:21+0300\n" +"PO-Revision-Date: 2012-01-17 22:20+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -42,9 +42,8 @@ msgstr "" "spauskite „Pakeisti/pašalinti“." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "Priežiūros informacija" +msgstr "&Priežiūros informacija" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -3497,12 +3496,11 @@ msgstr "Negalima turėti „continue“ ne cikle" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "Žymė apibrėžta iš naujo" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "Failas nerastas" +msgstr "Žymė nerasta" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -13221,7 +13219,6 @@ msgstr "" "dėl nepatogumų." #: winedbg.rc:54 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13229,20 +13226,15 @@ msgid "" msgstr "" "Programos problemos ar Wine trūkumai gali būti to priežastimi. Jūs turbūt " "norėsite patikrinti <a href=\"http://appdb.winehq.org\">programų duomenų " -"bazę</a> dėl patarimų apie šios programos vykdymą.\n" -"\n" -"Jei šios problemos nėra Windows sistemoje ir apie ją dar nebuvo pranešta, " -"galite <a href=\"http://wiki.winehq.org/Bugs\">užregistruoti klaidą</a>." +"bazę</a> dėl patarimų apie šios programos vykdymą." #: winedbg.rc:57 -#, fuzzy msgid "Show &Details" -msgstr "&Išsamus" +msgstr "Rodyti &išsamiau" #: winedbg.rc:62 -#, fuzzy msgid "Program Error Details" -msgstr "Programos klaida" +msgstr "Išsamiau apie programos klaidą" #: winedbg.rc:69 msgid "" @@ -13251,6 +13243,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Jei šios problemos nėra Windows sistemoje ir apie ją dar nebuvo pranešta, " +"galite išsaugoti išsamią informaciją į failą naudodami mygtuką „Išsaugoti " +"kaip“, tada <a href=\"http://wiki.winehq.org/Bugs\">užregistruoti klaidą</a> " +"ir prikabinti tą failą prie pranešimo." #: winedbg.rc:35 msgid "Wine program crash" @@ -13265,9 +13261,8 @@ msgid "(unidentified)" msgstr "(nenustatytas)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "Nepavyko sukurti\n" +msgstr "Nepavyko išsaugoti" #: winefile.rc:26 msgid "&Open\tEnter"

1 0

André Hentschel : winedbg: Remove superfluous break instruction.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 2c568309e3cc026f1924ff4b09268e4c9d4ae0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c568309e3cc026f1924ff4b0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:22:09 2012 +0100 winedbg: Remove superfluous break instruction. --- programs/winedbg/crashdlg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 27de37d..1f2542e 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -134,7 +134,6 @@ static void load_crash_log( HANDLE file ) while (ReadFile( file, crash_log + pos, size - pos - 1, &len, NULL ) && len) { pos += len; - break; if (pos == size - 1) crash_log = HeapReAlloc( GetProcessHeap(), 0, crash_log, size *= 2 ); } crash_log[pos] = 0;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSTATEBLOCKTYPE typedef.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: ed417a6f136cf0c5e9938272f9b66a2bd10acf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed417a6f136cf0c5e9938272f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:39 2012 +0100 wined3d: Get rid of the WINED3DSTATEBLOCKTYPE typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/stateblock.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/stateblock.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 17 ++++++++--------- 7 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e631cec..91942e1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1622,7 +1622,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(IDirect3DDevice8 *if } wined3d_mutex_lock(); - hr = wined3d_stateblock_create(This->wined3d_device, (WINED3DSTATEBLOCKTYPE)Type, &stateblock); + hr = wined3d_stateblock_create(This->wined3d_device, (enum wined3d_stateblock_type)Type, &stateblock); if (FAILED(hr)) { wined3d_mutex_unlock(); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 06f8aed..6ecf596 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -150,7 +150,7 @@ HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Im { wined3d_mutex_lock(); hr = wined3d_stateblock_create(device->wined3d_device, - (WINED3DSTATEBLOCKTYPE)type, &stateblock->wined3d_stateblock); + (enum wined3d_stateblock_type)type, &stateblock->wined3d_stateblock); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index afe6c32..5099114 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -922,7 +922,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, { restore_state = TRUE; - if (FAILED(hr = wined3d_stateblock_create(This->wined3d_device, WINED3DSBT_ALL, &stateblock))) + if (FAILED(hr = wined3d_stateblock_create(This->wined3d_device, WINED3D_SBT_ALL, &stateblock))) { ERR("Failed to create stateblock, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 075b0bf5..6595422 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3915,7 +3915,7 @@ HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) if (device->isRecordingState) return WINED3DERR_INVALIDCALL; - hr = wined3d_stateblock_create(device, WINED3DSBT_RECORDED, &stateblock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &stateblock); if (FAILED(hr)) return hr; @@ -5609,7 +5609,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } /* Note: No parent needed for initial internal stateblock */ - hr = wined3d_stateblock_create(device, WINED3DSBT_INIT, &device->stateBlock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); if (FAILED(hr)) ERR("Resetting the stateblock failed with error %#x.\n", hr); else @@ -5902,7 +5902,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, } device->blitter = adapter->blitter; - hr = wined3d_stateblock_create(device, WINED3DSBT_INIT, &device->stateBlock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); if (FAILED(hr)) { WARN("Failed to create stateblock.\n"); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 59bb841..b00fb84 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -924,8 +924,8 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo unsigned int i; DWORD map; - TRACE("Applying stateblock %p to device %p.\n", stateblock, device); - TRACE("Blocktype: %#x.\n", stateblock->blockType); + TRACE("Applying stateblock %p of type %#x to device %p.\n", + stateblock, stateblock->blockType, device); if (stateblock->changed.vertexShader) wined3d_device_set_vertex_shader(device, stateblock->state.vertex_shader); @@ -1105,7 +1105,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) TRACE("stateblock %p.\n", stateblock); - stateblock->blockType = WINED3DSBT_INIT; + stateblock->blockType = WINED3D_SBT_INIT; memset(stateblock->changed.pixelShaderConstantsF, 0, device->d3d_pshader_constantF * sizeof(BOOL)); memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); @@ -1337,7 +1337,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, - struct wined3d_device *device, WINED3DSTATEBLOCKTYPE type) + struct wined3d_device *device, enum wined3d_stateblock_type type) { unsigned int i; HRESULT hr; @@ -1354,26 +1354,26 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, hr = stateblock_allocate_shader_constants(stateblock); if (FAILED(hr)) return hr; - /* The WINED3DSBT_INIT stateblock type is used during initialization to + /* The WINED3D_SBT_INIT stateblock type is used during initialization to * produce a placeholder stateblock so other functions called can update a * state block. */ - if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; + if (type == WINED3D_SBT_INIT || type == WINED3D_SBT_RECORDED) return WINED3D_OK; TRACE("Updating changed flags appropriate for type %#x.\n", type); switch (type) { - case WINED3DSBT_ALL: + case WINED3D_SBT_ALL: stateblock_init_lights(stateblock, device->stateBlock->state.light_map); stateblock_savedstates_set_all(&stateblock->changed, device->d3d_vshader_constantF, device->d3d_pshader_constantF); break; - case WINED3DSBT_PIXELSTATE: + case WINED3D_SBT_PIXEL_STATE: stateblock_savedstates_set_pixel(&stateblock->changed, device->d3d_pshader_constantF); break; - case WINED3DSBT_VERTEXSTATE: + case WINED3D_SBT_VERTEX_STATE: stateblock_init_lights(stateblock, device->stateBlock->state.light_map); stateblock_savedstates_set_vertex(&stateblock->changed, device->d3d_vshader_constantF); break; @@ -1390,7 +1390,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, } HRESULT CDECL wined3d_stateblock_create(struct wined3d_device *device, - WINED3DSTATEBLOCKTYPE type, struct wined3d_stateblock **stateblock) + enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock) { struct wined3d_stateblock *object; HRESULT hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 08a1bac..c9d1208 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2310,7 +2310,7 @@ struct wined3d_stateblock { LONG ref; /* Note: Ref counting not required */ struct wined3d_device *device; - WINED3DSTATEBLOCKTYPE blockType; + enum wined3d_stateblock_type blockType; /* Array indicating whether things have been set or changed */ struct wined3d_saved_states changed; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 10a91e5..f1e389d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -710,15 +710,14 @@ enum wined3d_query_type #define WINED3DISSUE_END (1 << 0) #define WINED3DGETDATA_FLUSH (1 << 0) -typedef enum _WINED3DSTATEBLOCKTYPE +enum wined3d_stateblock_type { - WINED3DSBT_INIT = 0, - WINED3DSBT_ALL = 1, - WINED3DSBT_PIXELSTATE = 2, - WINED3DSBT_VERTEXSTATE = 3, - WINED3DSBT_RECORDED = 4, /* WineD3D private */ - WINED3DSBT_FORCE_DWORD = 0xffffffff -} WINED3DSTATEBLOCKTYPE; + WINED3D_SBT_INIT = 0, + WINED3D_SBT_ALL = 1, + WINED3D_SBT_PIXEL_STATE = 2, + WINED3D_SBT_VERTEX_STATE = 3, + WINED3D_SBT_RECORDED = 4, /* WineD3D private */ +}; typedef enum _WINED3DDECLMETHOD { @@ -2292,7 +2291,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader * HRESULT __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, - WINED3DSTATEBLOCKTYPE type, struct wined3d_stateblock **stateblock); + enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DQUERYTYPE typedef.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: ae2e5d65ff7b23aeb3bd4948933a09c89b93a11e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2e5d65ff7b23aeb3bd49489… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:38 2012 +0100 wined3d: Get rid of the WINED3DQUERYTYPE typedef. --- dlls/wined3d/query.c | 38 +++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 38 +++++++++++++++++++------------------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 79572a2..8298058 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -251,12 +251,12 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) * deleting the query will obviously leak it, but that's still better * than potentially deleting a different query with the same id in this * context, and (still) leaking the actual query. */ - if (query->type == WINED3DQUERYTYPE_EVENT) + if (query->type == WINED3D_QUERY_TYPE_EVENT) { struct wined3d_event_query *event_query = query->extendedData; if (event_query) wined3d_event_query_destroy(event_query); } - else if (query->type == WINED3DQUERYTYPE_OCCLUSION) + else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) { struct wined3d_occlusion_query *oq = query->extendedData; @@ -412,7 +412,7 @@ static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query, return S_OK; } -WINED3DQUERYTYPE CDECL wined3d_query_get_type(const struct wined3d_query *query) +enum wined3d_query_type CDECL wined3d_query_get_type(const struct wined3d_query *query) { TRACE("query %p.\n", query); @@ -547,13 +547,13 @@ static const struct wined3d_query_ops occlusion_query_ops = wined3d_occlusion_query_ops_issue, }; -static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *device, WINED3DQUERYTYPE type) +static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *device, enum wined3d_query_type type) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; switch (type) { - case WINED3DQUERYTYPE_OCCLUSION: + case WINED3D_QUERY_TYPE_OCCLUSION: TRACE("Occlusion query.\n"); if (!gl_info->supported[ARB_OCCLUSION_QUERY]) { @@ -571,7 +571,7 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de ((struct wined3d_occlusion_query *)query->extendedData)->context = NULL; break; - case WINED3DQUERYTYPE_EVENT: + case WINED3D_QUERY_TYPE_EVENT: TRACE("Event query.\n"); if (!wined3d_event_query_supported(gl_info)) { @@ -591,18 +591,18 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de } break; - case WINED3DQUERYTYPE_VCACHE: - case WINED3DQUERYTYPE_RESOURCEMANAGER: - case WINED3DQUERYTYPE_VERTEXSTATS: - case WINED3DQUERYTYPE_TIMESTAMP: - case WINED3DQUERYTYPE_TIMESTAMPDISJOINT: - case WINED3DQUERYTYPE_TIMESTAMPFREQ: - case WINED3DQUERYTYPE_PIPELINETIMINGS: - case WINED3DQUERYTYPE_INTERFACETIMINGS: - case WINED3DQUERYTYPE_VERTEXTIMINGS: - case WINED3DQUERYTYPE_PIXELTIMINGS: - case WINED3DQUERYTYPE_BANDWIDTHTIMINGS: - case WINED3DQUERYTYPE_CACHEUTILIZATION: + case WINED3D_QUERY_TYPE_VCACHE: + case WINED3D_QUERY_TYPE_RESOURCE_MANAGER: + case WINED3D_QUERY_TYPE_VERTEX_STATS: + case WINED3D_QUERY_TYPE_TIMESTAMP: + case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: + case WINED3D_QUERY_TYPE_TIMESTAMP_FREQ: + case WINED3D_QUERY_TYPE_PIPELINE_TIMINGS: + case WINED3D_QUERY_TYPE_INTERFACE_TIMINGS: + case WINED3D_QUERY_TYPE_VERTEX_TIMINGS: + case WINED3D_QUERY_TYPE_PIXEL_TIMINGS: + case WINED3D_QUERY_TYPE_BANDWIDTH_TIMINGS: + case WINED3D_QUERY_TYPE_CACHE_UTILIZATION: default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; @@ -617,7 +617,7 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de } HRESULT CDECL wined3d_query_create(struct wined3d_device *device, - WINED3DQUERYTYPE type, struct wined3d_query **query) + enum wined3d_query_type type, struct wined3d_query **query) { struct wined3d_query *object; HRESULT hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 407d30b..08a1bac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2365,7 +2365,7 @@ struct wined3d_query const struct wined3d_query_ops *query_ops; struct wined3d_device *device; enum query_state state; - WINED3DQUERYTYPE type; + enum wined3d_query_type type; DWORD data_size; void *extendedData; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f2ad7b..10a91e5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -688,23 +688,23 @@ enum wined3d_pool WINED3D_POOL_SCRATCH = 3, }; -typedef enum _WINED3DQUERYTYPE -{ - WINED3DQUERYTYPE_VCACHE = 4, - WINED3DQUERYTYPE_RESOURCEMANAGER = 5, - WINED3DQUERYTYPE_VERTEXSTATS = 6, - WINED3DQUERYTYPE_EVENT = 8, - WINED3DQUERYTYPE_OCCLUSION = 9, - WINED3DQUERYTYPE_TIMESTAMP = 10, - WINED3DQUERYTYPE_TIMESTAMPDISJOINT = 11, - WINED3DQUERYTYPE_TIMESTAMPFREQ = 12, - WINED3DQUERYTYPE_PIPELINETIMINGS = 13, - WINED3DQUERYTYPE_INTERFACETIMINGS = 14, - WINED3DQUERYTYPE_VERTEXTIMINGS = 15, - WINED3DQUERYTYPE_PIXELTIMINGS = 16, - WINED3DQUERYTYPE_BANDWIDTHTIMINGS = 17, - WINED3DQUERYTYPE_CACHEUTILIZATION = 18 -} WINED3DQUERYTYPE; +enum wined3d_query_type +{ + WINED3D_QUERY_TYPE_VCACHE = 4, + WINED3D_QUERY_TYPE_RESOURCE_MANAGER = 5, + WINED3D_QUERY_TYPE_VERTEX_STATS = 6, + WINED3D_QUERY_TYPE_EVENT = 8, + WINED3D_QUERY_TYPE_OCCLUSION = 9, + WINED3D_QUERY_TYPE_TIMESTAMP = 10, + WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT = 11, + WINED3D_QUERY_TYPE_TIMESTAMP_FREQ = 12, + WINED3D_QUERY_TYPE_PIPELINE_TIMINGS = 13, + WINED3D_QUERY_TYPE_INTERFACE_TIMINGS = 14, + WINED3D_QUERY_TYPE_VERTEX_TIMINGS = 15, + WINED3D_QUERY_TYPE_PIXEL_TIMINGS = 16, + WINED3D_QUERY_TYPE_BANDWIDTH_TIMINGS = 17, + WINED3D_QUERY_TYPE_CACHE_UTILIZATION = 18 +}; #define WINED3DISSUE_BEGIN (1 << 1) #define WINED3DISSUE_END (1 << 0) @@ -2248,11 +2248,11 @@ HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries); HRESULT __cdecl wined3d_query_create(struct wined3d_device *device, - WINED3DQUERYTYPE type, struct wined3d_query **query); + enum wined3d_query_type type, struct wined3d_query **query); ULONG __cdecl wined3d_query_decref(struct wined3d_query *query); HRESULT __cdecl wined3d_query_get_data(struct wined3d_query *query, void *data, UINT data_size, DWORD flags); UINT __cdecl wined3d_query_get_data_size(const struct wined3d_query *query); -WINED3DQUERYTYPE __cdecl wined3d_query_get_type(const struct wined3d_query *query); +enum wined3d_query_type __cdecl wined3d_query_get_type(const struct wined3d_query *query); ULONG __cdecl wined3d_query_incref(struct wined3d_query *query); HRESULT __cdecl wined3d_query_issue(struct wined3d_query *query, DWORD flags);

1 0