wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Igor Paliychuk : regedit: Add Ukrainian translation.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: stable Commit: 95f166749f548e248ea12838d5e0d9397862c69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f166749f548e248ea12838d… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 17:08:41 2010 +0300 regedit: Add Ukrainian translation. (cherry picked from commit 32e6007010a8bf7ef201a3530676148b72eb0a63) --- programs/regedit/Makefile.in | 1 + programs/regedit/Uk.rc | 337 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 338 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95f166749f548e248ea12…

1 0

Igor Paliychuk : winecfg: Add Ukrainian translation.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: stable Commit: b7d9eb0ff1099cad10d07c7de34d90320a113adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d9eb0ff1099cad10d07c7de… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 17:09:08 2010 +0300 winecfg: Add Ukrainian translation. (cherry picked from commit 23c627af26d6d8dd377ec2df241f0e6981d8a14a) --- programs/winecfg/Makefile.in | 1 + programs/winecfg/Uk.rc | 338 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 339 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7d9eb0ff1099cad10d07…

1 0

Igor Paliychuk : appwiz.cpl: Add Ukrainian translation.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: stable Commit: 14e8a0625eec33dc403a37dcdf0c1e850d0c80e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e8a0625eec33dc403a37dcd… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 23:43:03 2010 +0300 appwiz.cpl: Add Ukrainian translation. (cherry picked from commit 15f36468de04c66703b9808fa079386b842b95fc) --- dlls/appwiz.cpl/Makefile.in | 1 + dlls/appwiz.cpl/Uk.rc | 88 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 1bc8808..079c1e0 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ Ru.rc \ Si.rc \ Sv.rc \ + Uk.rc \ Zh.rc \ appwiz.rc diff --git a/dlls/appwiz.cpl/Uk.rc b/dlls/appwiz.cpl/Uk.rc new file mode 100644 index 0000000..c133f81 --- /dev/null +++ b/dlls/appwiz.cpl/Uk.rc @@ -0,0 +1,88 @@ +/* +* Add/Remove Programs Ukrainian resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2010 Igor Paliychuk +* +* 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 "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "Встановлення/Видалення Програм" + IDS_CPL_DESC, "Дозволяє встановити нове ПЗ та видалити наявне з вашого комп'ютера." + IDS_TAB1_TITLE, "Програми" + + IDS_UNINSTALL_FAILED, "Неможливо виконати видалення, '%s'. Вилучити дані про встановлену програму з реєстру?" + IDS_NOT_SPECIFIED, "Не зазначено" + + IDS_COLUMN_NAME, "Назва" + IDS_COLUMN_PUBLISHER, "Видавець" + IDS_COLUMN_VERSION, "Версія" + IDS_INSTALL_FILTER, "Програми встановлення\0*instal*.exe;*setup*.exe;*.msi\0Програми (*.exe)\0*.exe\0Всі Файли (*.*)\0*.*\0\0" + + IDS_REMOVE, "&Видалити..." + IDS_MODIFY_REMOVE, "&Змінити/Видалити..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Встановлення/Видалення" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Щоб встановити нову програму з дискети, CD-ROM, чи жорсткого диску, натисніть Встановити.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Встановити...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Дане ПЗ може бути видалене автоматично. Щоб видалити програму чи змінити її склад, виберіть її зі списку та натисніть Змінити/Видалити.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Дані підтримки...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 100, 198, 64, 14 + CONTROL "&Змінити...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 168, 198, 68, 14 + CONTROL "Ви&далити...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 198, 72, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Дані підтримки" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ці дані можуть бути використані для отримання тех. підтримки для %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Видавець:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Версія:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Контактна особа:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Дані підтримки:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Телефон підтримки:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Файл Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Оновлення:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Коментарі:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +}

1 0

Sven Baars : user32: Fix the Dutch translation.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: stable Commit: 16a3478a797996d4750a1ffc715fe756127f1af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a3478a797996d4750a1ffc7… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jul 17 14:41:22 2010 +0200 user32: Fix the Dutch translation. (cherry picked from commit cb07a59a805b6d55636fce02da0a6b0d8ed360e8) --- dlls/user32/resources/user32_Nl.rc | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/resources/user32_Nl.rc b/dlls/user32/resources/user32_Nl.rc index 2216976..0f15806 100644 --- a/dlls/user32/resources/user32_Nl.rc +++ b/dlls/user32/resources/user32_Nl.rc @@ -20,6 +20,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { MENUITEM "&Vorig formaat", 61728 @@ -40,7 +42,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM "&Ongedaan maken", EM_UNDO MENUITEM SEPARATOR MENUITEM "K&nippen", WM_CUT - MENUITEM "&Kopieren", WM_COPY + MENUITEM "&Kopiëren", WM_COPY MENUITEM "&Plakken", WM_PASTE MENUITEM "&Wissen", WM_CLEAR MENUITEM SEPARATOR @@ -56,11 +58,11 @@ BEGIN PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Annuleren", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "A&fbreken", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Herhaal", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "N&egeer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "O&pnieuw", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "N&egeren", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nee", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Probeer opnieuw", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "P&robeer opnieuw", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Verder", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Paul Vriens : msi: Add the Serbian (Latin) translation.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: stable Commit: 449382213c811d89b2c3d8cf7de65d7d594e74bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=449382213c811d89b2c3d8cf7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 18 23:14:23 2010 +0200 msi: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> (cherry picked from commit 4662e12164a1e1e66bcabef96441c8799f15bd4f) --- dlls/msi/Makefile.in | 1 + dlls/msi/msi_Sr.rc | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 194c1a2..5b0b3fc 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -80,6 +80,7 @@ RC_SRCS = \ msi_Ro.rc \ msi_Ru.rc \ msi_Si.rc \ + msi_Sr.rc \ msi_Sv.rc \ msi_Tr.rc \ msi_Uk.rc \ diff --git a/dlls/msi/msi_Sr.rc b/dlls/msi/msi_Sr.rc new file mode 100644 index 0000000..854b811 --- /dev/null +++ b/dlls/msi/msi_Sr.rc @@ -0,0 +1,65 @@ +/* + * Serbian resources for MSI + * + * Copyright 2010 Nenad Vujic + * Paul Vriens + * + * 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 "windef.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE DISCARDABLE +{ + 4 "Instalacija ne može biti otvorena. Molimo proverite destinaciju fajla i pokušajte ponovo." + 5 "putanja %s nije nađena" + 9 "Ubacite disk %s" + 10 "Windows Instalacija programa %s\n\n" \ + "Svrha:\n" \ + "msiexec komanda {traženi parametar} [opcioni parametar]\n\n" \ + "Instalacija proizvoda:\n" \ + "\t/i {paket|kod} [svojina]\n" \ + "\t/package {paket|kod} [svojina]\n" \ + "\t/a paket [svojina]\n" \ + "Popravak instalacije:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {paket|kod}\n" \ + "Uninstal programa:\n" \ + "\t/uninstall {paket|kod} [svojina]\n" \ + "\t/x {paket|kod} [svojina]\n" \ + "Reklama programa:\n" \ + "\t/j[u|m] paket [/t pretvori] [/g id jezika]\n" \ + "Primeni peč:\n" \ + "\t/p pečpaket [svojina]\n" \ + "\t/p pečpaket /a paket [svojina]\n" \ + "Izveštalj i Izgled Modifikatori za komande iznad:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] izvestaj\n" \ + "\t/q{|n|b|r|f|n+|b+|b-}\n" \ + "Registracija MSI Servisa:\n" \ + "\t/y\n " \ + "Uklanjanje MSI Servisa:\n" \ + "\t/z\n" \ + "Prikaži ovu Pomoć:\n" \ + "\t/help\n" \ + "\t/?\n" + 11 "unesite koji folder sadrži %s" + 12 "instalacija nedostaje" + 13 "mrežni drajv nedostaje" + 14 "dodatak sa:" + 15 "izaberite koji folder sadrži %s" +}

1 0

Paul Vriens : comctl32: Add the Serbian (Latin) translation.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: stable Commit: 84e420d79f67c85debf093b43aee841939f55688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e420d79f67c85debf093b43… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 18 23:03:43 2010 +0200 comctl32: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> (cherry picked from commit 04678d955d56bda8f9f05a47d6179df51329a1bf) --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/comctl_Sr.rc | 92 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 04e84fa..807178d 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -69,6 +69,7 @@ RC_SRCS = \ comctl_Ru.rc \ comctl_Si.rc \ comctl_Sk.rc \ + comctl_Sr.rc \ comctl_Sv.rc \ comctl_Th.rc \ comctl_Tr.rc \ diff --git a/dlls/comctl32/comctl_Sr.rc b/dlls/comctl32/comctl_Sr.rc new file mode 100644 index 0000000..a5cdfbf --- /dev/null +++ b/dlls/comctl32/comctl_Sr.rc @@ -0,0 +1,92 @@ +/* + * Copyright 2010 Nenad Vujic + * Paul Vriens + * + * 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 "comctl32.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Detalji za %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Otkaži", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Primeni", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Pomoć", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Čarobnjak" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Nazad", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Sledeće >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Završi", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Otkaži", IDCANCEL,178,138,50,14 + PUSHBUTTON "Pomoć", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Podesi Toolbar" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Zatvori", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&esetuj", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Pomoć", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Pomeri &Gore", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Pomeri &Dole", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "D&ostupni tasteri:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Dodaj ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Ukloni", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Toolbar tasteri:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Zatvori" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Danas:" + IDM_GOTODAY "Idi na danas" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Odvajanje" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Ništa" +}

1 0

Juan Lang : crypt32/tests: Test OpenSSL chain separately to address test failures on Win98.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 6e89a61446088dbe029913896dfae467bb8d37a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e89a61446088dbe029913896… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 6 11:19:04 2010 -0700 crypt32/tests: Test OpenSSL chain separately to address test failures on Win98. --- dlls/crypt32/tests/chain.c | 57 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 2c62ec0..2e453e1 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3257,6 +3257,21 @@ static const SimpleChainStatusCheck opensslSimpleStatus[] = { { sizeof(opensslElementStatus) / sizeof(opensslElementStatus[0]), opensslElementStatus }, }; +/* The OpenSSL chain may not have its root trusted, in which case the chain + * is truncated (on Win98). + */ +static CONST_DATA_BLOB incompleteOpensslChain[] = { + { sizeof(global_sign_ca), global_sign_ca }, + { sizeof(openssl_org), openssl_org }, +}; +static const CERT_TRUST_STATUS incompleteOpensslElementStatus[] = { + { CERT_TRUST_IS_NOT_TIME_VALID, CERT_TRUST_HAS_KEY_MATCH_ISSUER }, + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_KEY_MATCH_ISSUER }, +}; +static const SimpleChainStatusCheck incompleteOpensslSimpleStatus[] = { + { sizeof(incompleteOpensslElementStatus) / sizeof(incompleteOpensslElementStatus[0]), + incompleteOpensslElementStatus }, +}; /* entrust_ca -> aaa_certificate_services -> cs_stanford_edu */ /* cs.stanford.edu's cert is only valid from 7/16/2009 to 7/16/2012, so with * the date tested (October 2007) it's not time valid. @@ -3515,12 +3530,6 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, googleSimpleStatus }, 0 }, - /* The openssl chain may or may not have its root trusted, so ignore the error - */ - { { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, - { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, opensslSimpleStatus }, 0 }, /* The stanford chain may or may not have its root trusted, so ignore the error */ { { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, @@ -3549,6 +3558,20 @@ static ChainCheck chainCheckNoStore[] = { 0 }, }; + /* The openssl chain may or may not have its root trusted, so ignore the error + */ +static ChainCheck opensslChainCheck = + { { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, + { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, + 1, opensslSimpleStatus }, 0 }; +static ChainCheck incompleteOpensslChainCheck = + { { sizeof(incompleteOpensslChain) / sizeof(incompleteOpensslChain[0]), + incompleteOpensslChain }, + { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_PARTIAL_CHAIN, 0 }, + 1, incompleteOpensslSimpleStatus }, 0 }; + /* Chain27 checks a certificate with a subject alternate name containing an * embedded NULL. Newer crypt32 versions fail to decode such alternate names, * correctly prohibiting them. Older crypt32 versions do not. Rather than @@ -3722,6 +3745,28 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); } } + chain = getChain(NULL, &opensslChainCheck.certs, 0, TRUE, &oct2007, + opensslChainCheck.todo, 0); + if (chain) + { + ok(chain->TrustStatus.dwErrorStatus == + opensslChainCheck.status.status.dwErrorStatus || + broken((chain->TrustStatus.dwErrorStatus & + ~incompleteOpensslChainCheck.status.statusToIgnore.dwErrorStatus) == + (incompleteOpensslChainCheck.status.status.dwErrorStatus & + ~incompleteOpensslChainCheck.status.statusToIgnore.dwErrorStatus)), + "unexpected chain error status %08x\n", + chain->TrustStatus.dwErrorStatus); + if (opensslChainCheck.status.status.dwErrorStatus == + chain->TrustStatus.dwErrorStatus) + checkChainStatus(chain, &opensslChainCheck.status, + opensslChainCheck.todo, "opensslChainCheck", 0); + else + checkChainStatus(chain, &incompleteOpensslChainCheck.status, + incompleteOpensslChainCheck.todo, "incompleteOpensslChainCheck", + 0); + pCertFreeCertificateChain(chain); + } for (i = 0; i < sizeof(chainCheckNoStore) / sizeof(chainCheckNoStore[0]); i++) {

1 0

Juan Lang : crypt32/tests: Fix another test failure on Win98.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 251ccfc8486340dd30214f31bdfb46de56344a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=251ccfc8486340dd30214f31b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 6 10:28:12 2010 -0700 crypt32/tests: Fix another test failure on Win98. --- dlls/crypt32/tests/chain.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 24831b5..2c62ec0 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3506,10 +3506,13 @@ static ChainCheck chainCheck[] = { { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { 0, 0 }, 1, iTunesSimpleStatus }, 0 }, - /* The google chain may or may not have its root trusted, so ignore the error + /* The google chain may or may not have its root trusted, so ignore the error. + * The chain is also considered not time nested on Win98, so ignore that + * error too. */ { { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, - { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_NESTED, + CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, googleSimpleStatus }, 0 }, /* The openssl chain may or may not have its root trusted, so ignore the error

1 0

Juan Lang : crypt32/tests: Add name to test to help identify test failures.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 8fbcad75babe646ff1a7535cb77631fd3318fa8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbcad75babe646ff1a7535cb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 6 10:21:16 2010 -0700 crypt32/tests: Add name to test to help identify test failures. --- dlls/crypt32/tests/chain.c | 70 +++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index ede6edb..24831b5 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2655,62 +2655,64 @@ typedef struct _SimpleChainStatusCheck static void checkElementStatus(const CERT_TRUST_STATUS *expected, const CERT_TRUST_STATUS *got, const CERT_TRUST_STATUS *ignore, - DWORD todo, DWORD testIndex, DWORD chainIndex, DWORD elementIndex) + DWORD todo, LPCSTR testName, DWORD testIndex, DWORD chainIndex, + DWORD elementIndex) { if (got->dwErrorStatus == expected->dwErrorStatus) ok(got->dwErrorStatus == expected->dwErrorStatus, - "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + "%s[%d], element [%d,%d]: expected error %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); else if (todo & TODO_ERROR) todo_wine ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == (expected->dwErrorStatus & ~ignore->dwErrorStatus)), - "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + "%s[%d], element [%d,%d]: expected error %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); else ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == (expected->dwErrorStatus & ~ignore->dwErrorStatus)), - "Chain %d, element [%d,%d]: expected error %08x, got %08x. %08x is " + "%s[%d], element [%d,%d]: expected error %08x, got %08x. %08x is " "expected if no valid Verisign root certificate is available.\n", - testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + testName, testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus, CERT_TRUST_IS_UNTRUSTED_ROOT); if (got->dwInfoStatus == expected->dwInfoStatus) ok(got->dwInfoStatus == expected->dwInfoStatus, - "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + "%s[%d], element [%d,%d]: expected info %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); else if (todo & TODO_INFO) todo_wine ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == (expected->dwInfoStatus & ~ignore->dwInfoStatus)), - "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + "%s[%d], element [%d,%d]: expected info %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); else ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == (expected->dwInfoStatus & ~ignore->dwInfoStatus)), - "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + "%s[%d], element [%d,%d]: expected info %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); } static void checkSimpleChainStatus(const CERT_SIMPLE_CHAIN *simpleChain, const SimpleChainStatusCheck *simpleChainStatus, - const CERT_TRUST_STATUS *ignore, DWORD todo, DWORD testIndex, DWORD chainIndex) + const CERT_TRUST_STATUS *ignore, DWORD todo, LPCSTR testName, DWORD testIndex, + DWORD chainIndex) { if (todo & TODO_ELEMENTS) todo_wine ok(simpleChain->cElement == simpleChainStatus->cElement, - "Chain %d: expected %d elements, got %d\n", testIndex, + "%s[%d]: expected %d elements, got %d\n", testName, testIndex, simpleChainStatus->cElement, simpleChain->cElement); else ok(simpleChain->cElement == simpleChainStatus->cElement, - "Chain %d: expected %d elements, got %d\n", testIndex, + "%s[%d]: expected %d elements, got %d\n", testName, testIndex, simpleChainStatus->cElement, simpleChain->cElement); if (simpleChain->cElement == simpleChainStatus->cElement) { @@ -2718,8 +2720,8 @@ static void checkSimpleChainStatus(const CERT_SIMPLE_CHAIN *simpleChain, for (i = 0; i < simpleChain->cElement; i++) checkElementStatus(&simpleChainStatus->rgElementStatus[i], - &simpleChain->rgpElement[i]->TrustStatus, ignore, todo, testIndex, - chainIndex, i); + &simpleChain->rgpElement[i]->TrustStatus, ignore, todo, testName, + testIndex, chainIndex, i); } } @@ -2732,10 +2734,11 @@ typedef struct _ChainStatusCheck } ChainStatusCheck; static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, - const ChainStatusCheck *chainStatus, DWORD todo, DWORD testIndex) + const ChainStatusCheck *chainStatus, DWORD todo, LPCSTR testName, + DWORD testIndex) { ok(chain->cChain == chainStatus->cChain, - "Chain %d: expected %d simple chains, got %d\n", testIndex, + "%s[%d]: expected %d simple chains, got %d\n", testName, testIndex, chainStatus->cChain, chain->cChain); if (todo & TODO_ERROR && chain->TrustStatus.dwErrorStatus != chainStatus->status.dwErrorStatus) @@ -2745,8 +2748,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwErrorStatus) == (chainStatus->status.dwErrorStatus & ~chainStatus->statusToIgnore.dwErrorStatus)), - "Chain %d: expected error %08x, got %08x\n", - testIndex, chainStatus->status.dwErrorStatus, + "%s[%d]: expected error %08x, got %08x\n", + testName, testIndex, chainStatus->status.dwErrorStatus, chain->TrustStatus.dwErrorStatus); else ok(chain->TrustStatus.dwErrorStatus == @@ -2755,9 +2758,9 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwErrorStatus) == (chainStatus->status.dwErrorStatus & ~chainStatus->statusToIgnore.dwErrorStatus)), - "Chain %d: expected error %08x, got %08x. %08x is expected if no valid " + "%s[%d]: expected error %08x, got %08x. %08x is expected if no valid " "Verisign root certificate is available.\n", - testIndex, chainStatus->status.dwErrorStatus, + testName, testIndex, chainStatus->status.dwErrorStatus, chain->TrustStatus.dwErrorStatus, CERT_TRUST_IS_UNTRUSTED_ROOT); if (todo & TODO_INFO && chain->TrustStatus.dwInfoStatus != chainStatus->status.dwInfoStatus) @@ -2767,8 +2770,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwInfoStatus) == (chainStatus->status.dwInfoStatus & ~chainStatus->statusToIgnore.dwInfoStatus)), - "Chain %d: expected info %08x, got %08x\n", - testIndex, chainStatus->status.dwInfoStatus, + "%s[%d]: expected info %08x, got %08x\n", + testName, testIndex, chainStatus->status.dwInfoStatus, chain->TrustStatus.dwInfoStatus); else ok(chain->TrustStatus.dwInfoStatus == @@ -2777,8 +2780,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwInfoStatus) == (chainStatus->status.dwInfoStatus & ~chainStatus->statusToIgnore.dwInfoStatus)), - "Chain %d: expected info %08x, got %08x\n", - testIndex, chainStatus->status.dwInfoStatus, + "%s[%d]: expected info %08x, got %08x\n", + testName, testIndex, chainStatus->status.dwInfoStatus, chain->TrustStatus.dwInfoStatus); if (chain->cChain == chainStatus->cChain) { @@ -2787,7 +2790,7 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, for (i = 0; i < chain->cChain; i++) checkSimpleChainStatus(chain->rgpChain[i], &chainStatus->rgChainStatus[i], &chainStatus->statusToIgnore, - todo, testIndex, i); + todo, testName, testIndex, i); } } @@ -3712,7 +3715,7 @@ static void testGetCertChain(void) if (chain) { checkChainStatus(chain, &chainCheck[i].status, chainCheck[i].todo, - i); + "chainCheck", i); pCertFreeCertificateChain(chain); } } @@ -3724,7 +3727,7 @@ static void testGetCertChain(void) if (chain) { checkChainStatus(chain, &chainCheckNoStore[i].status, - chainCheckNoStore[i].todo, i); + chainCheckNoStore[i].todo, "chainCheckNoStore", i); pCertFreeCertificateChain(chain); } } @@ -3743,10 +3746,11 @@ static void testGetCertChain(void) if (chainCheckEmbeddedNull.status.status.dwErrorStatus == chain->TrustStatus.dwErrorStatus) checkChainStatus(chain, &chainCheckEmbeddedNull.status, - chainCheckEmbeddedNull.todo, 0); + chainCheckEmbeddedNull.todo, "chainCheckEmbeddedNull", 0); else checkChainStatus(chain, &chainCheckEmbeddedNullBroken.status, - chainCheckEmbeddedNullBroken.todo, 0); + chainCheckEmbeddedNullBroken.todo, "chainCheckEmbeddedNullBroken", + 0); pCertFreeCertificateChain(chain); } }

1 0

Juan Lang : crypt32/tests: Fix more Win9x failures.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: d8fcffc7e76f65c7cfd9a41256a932cb5ec34e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8fcffc7e76f65c7cfd9a4125… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 6 10:10:06 2010 -0700 crypt32/tests: Fix more Win9x failures. --- dlls/crypt32/tests/chain.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 5037a76..ede6edb 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3918,9 +3918,13 @@ static const ChainPolicyCheck googlePolicyCheckWithMatchingNameExpired = { { 0, CERT_E_EXPIRED, 0, 0, NULL}, NULL, 0 }; +/* Win98 sees the chain as expired, even though it isn't for the date tested */ +static const CERT_CHAIN_POLICY_STATUS expiredStatus = + { 0, CERT_E_EXPIRED, 0, 0, NULL }; + static const ChainPolicyCheck googlePolicyCheckWithMatchingName = { { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, - { 0, 0, -1, -1, NULL}, NULL, 0 + { 0, 0, -1, -1, NULL}, &expiredStatus, 0 }; /* Windows NT 4 has a different error code when the name doesn't match. */ @@ -3932,14 +3936,18 @@ static const ChainPolicyCheck iTunesPolicyCheckWithoutMatchingName = { { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, &noMatchingNameBrokenStatus, 0 }; +/* Win98 does not trust the root of the OpenSSL chain or the Stanford chain */ +static const CERT_CHAIN_POLICY_STATUS untrustedRootStatus = + { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }; + static const ChainPolicyCheck opensslPolicyCheckWithMatchingName = { { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, - { 0, 0, -1, -1, NULL}, NULL, 0 + { 0, 0, -1, -1, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck opensslPolicyCheckWithoutMatchingName = { { sizeof(opensslChain) / sizeof(opensslChain[0]), opensslChain }, - { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 + { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck winehqPolicyCheckWithMatchingName = { @@ -3954,12 +3962,12 @@ static const ChainPolicyCheck winehqPolicyCheckWithoutMatchingName = { static const ChainPolicyCheck stanfordPolicyCheckWithMatchingName = { { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, - { 0, 0, -1, -1, NULL}, NULL, 0 + { 0, 0, -1, -1, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck stanfordPolicyCheckWithoutMatchingName = { { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, - { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 + { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, &untrustedRootStatus, 0 }; static const ChainPolicyCheck invalidExtensionPolicyCheck = {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010