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

Igor Paliychuk : oleview: Add Ukrainian translation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 86603e52eb67ab8a8c1d6d1f39f6e71fe231c5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86603e52eb67ab8a8c1d6d1f3… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 17:10:00 2010 +0300 oleview: Add Ukrainian translation. --- programs/oleview/Makefile.in | 1 + programs/oleview/Uk.rc | 219 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 297aef2..ca8ed0c 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -31,6 +31,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Sv.rc \ + Uk.rc \ Zh.rc \ rsrc.rc diff --git a/programs/oleview/Uk.rc b/programs/oleview/Uk.rc new file mode 100644 index 0000000..94b1ccd --- /dev/null +++ b/programs/oleview/Uk.rc @@ -0,0 +1,219 @@ +/* + * OleView (Uk.rc) + * Ukrainian Language Support + * + * Copyright 2006 Piotr Caban + * 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 "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDM_MENU MENU +{ + POPUP "&Файл" + { + MENUITEM "&Прив'язати до файлу...", IDM_BIND + MENUITEM "П&ерегляд TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&Конфігураця системи...", IDM_SYSCONF + MENUITEM "&Запустити Редактор реєстру", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "&Вихід", IDM_EXIT + } + POPUP "&Об'єкт" + { + POPUP "&CoCreateInstance Flag" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Перегляд інформації про &тип", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Створити &Екземпляр", IDM_CREATEINST, GRAYED + MENUITEM "Створити Екземпляр &на...", IDM_CREATEINSTON, GRAYED + MENUITEM "&Видалити Екземпляр", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Копіювати C&LSID в буфер", IDM_COPYCLSID, GRAYED + MENUITEM "Копіювати &HTML object Tag в буфер", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Перегляд...", IDM_VIEW, GRAYED + } + POPUP "&Вигляд" + { + MENUITEM "&Режим експерта", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Приховані категорії компонентів", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Панель &інструментів", IDM_TOOLBAR,CHECKED + MENUITEM "Рядок &стану", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Оновити\tF5", IDM_REFRESH + } + POPUP "&Довідка" + { + MENUITEM "&Про OleView", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&Файл" + { + MENUITEM "&Зберегти як...", IDM_SAVEAS + MENUITEM "За&крити", IDM_CLOSE + } + POPUP "&Вигляд" + { + MENUITEM "&Групувати за типом", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "Панель &інструментів", IDM_TOOLBAR + MENUITEM "Рядок &стану", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "Готово" + IDS_ABOUT "OleView - Переглядач об'єктів OLE/COM" + IDS_ABOUTVER "версія 1.0" + IDS_TYPELIBTITLE "ITypeLib viewer" + IDS_OPEN "Відкрити" + IDS_OPEN_TYPELIB_FILTER "Файли TypeLib (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0Всі файли (*.*)\0*.*\0\0" + + IDM_BIND, "Прив'язати до файлу через File Moniker" + IDM_TYPELIB, "Відкрити файл TypeLib і переглянути вміст" + IDM_SYSCONF, "Змінити загальносистемні параметри Distributed COM" + IDM_REGEDIT, "Запустити редактор реєстру Wine" + IDM_EXIT, "Вийти з програми з пропозицією зберегти зміни" + IDM_CREATEINST, "Створити екземпляр вибраного об'єкту" + IDM_CREATEINSTON, "Створити екземпляр вибраного об'єкту на вказаній машині" + IDM_RELEASEINST, "Видалити екземпляр вибраного об'єкту" + IDM_COPYCLSID, "Копіювати GUID вибраного об'єкту в буфер" + IDM_VIEW, "Відкрити перегляд для вибраного пункту" + IDM_FLAG_INSERV, "Використовувати CLSCTX_INPROC_SERVER при виклику CoGetClassObject" + IDM_FLAG_INHANDL, "Використовувати CLSCTX_INPROC_HANDLER при виклику CoGetClassObject" + IDM_FLAG_LOCSERV, "Використовувати CLSCTX_LOCAL_SERVER при виклику CoGetClassObject" + IDM_FLAG_REMSERV, "Використовувати CLSCTX_REMOTE_SERVER при виклику CoGetClassObject" + IDM_EXPERT, "Переключитись між режимами експерт/новачок" + IDM_HIDDEN, "Переключити відображення категорій компонентів, які не повинні бути видимі" + IDM_TOOLBAR, "Показати/приховати панель інструментів" + IDM_STATUSBAR, "Показати/приховати рядок стану" + IDM_REFRESH, "Оновити всі списки" + IDM_ABOUT, "Показати інформацію про програму, номер версії і копірайт" + + IDM_SAVEAS, "Зберегти як .IDL чи .H файл" + IDM_CLOSE, "Закрити вікно" + IDM_GROUP, "Групувати typeinfos за видом" + + IDS_TREE_OC, "ObjectClasses" + IDS_TREE_GBCC, "Згруповано за категоріями компонентів" + IDS_TREE_O1O, "Об'єкти OLE 1.0" + IDS_TREE_CLO, "Об'єкти бібліотеки COM" + IDS_TREE_AO, "Всі об'єкти" + IDS_TREE_AID, "ID програми" + IDS_TREE_TL, "Бібліотеки Типу" + IDS_TL_VER, "вер." + IDS_TREE_I, "Інтерфейси" + + IDS_TAB_REG, "Реєстр" + IDS_TAB_IMPL, "Реалізація" + IDS_TAB_ACTIV, "Активація" + + IDS_CGCOFAIL, "CoGetClassObject не вдався." + IDS_ERROR_UNKN, "Невідома помилка" + IDS_TRUE, "True" + IDS_FALSE, "False" + IDS_BYTES, "байт" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) не зміг ($%x)" + IDS_INHERITINTERFACES, "Успадковані Інтерфейси" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Під'єднатись до іншого комп'ютера" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Ім'я комп'ютера:", -1, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Скасувати", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Конфігурація системи" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Параметри системи", -1, 5, 6, 160, 8 + CHECKBOX "&Дозволити роподілений COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Дозволити віддалені &з'єднання (лише Win95)", IDC_ENABLEREMOTE, 5, 35, 163, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Ці налаштування змінюють лише значення реєстру.\nВони не впливають на продуктивність Wine.", -1, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Скасувати", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Default Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Інтерфейс", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Закрити", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Дивитись дані про тип", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ім'я класу:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Закрити", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream Interface Viewer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ім'я класу:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Закрити", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +}

1 0

Igor Paliychuk : winecfg: Add Ukrainian translation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 23c627af26d6d8dd377ec2df241f0e6981d8a14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c627af26d6d8dd377ec2df2… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 17:09:08 2010 +0300 winecfg: Add Ukrainian translation. --- 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=23c627af26d6d8dd377ec…

1 0

Igor Paliychuk : notepad: Add Ukrainian translation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: efe7fbd20b49109963695158db24b2aea0d9fafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe7fbd20b49109963695158d… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 23:44:12 2010 +0300 notepad: Add Ukrainian translation. --- programs/notepad/Makefile.in | 1 + programs/notepad/Uk.rc | 144 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 773c63e..79c8416 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -40,6 +40,7 @@ RC_SRCS = \ Sv.rc \ Th.rc \ Tr.rc \ + Uk.rc \ Wa.rc \ Zh.rc \ rsrc.rc diff --git a/programs/notepad/Uk.rc b/programs/notepad/Uk.rc new file mode 100644 index 0000000..95938e9 --- /dev/null +++ b/programs/notepad/Uk.rc @@ -0,0 +1,144 @@ +/* + * Notepad (Ukrainian resources) + * + * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> + * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * 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 "notepad_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&Файл" { + MENUITEM "&Новий\tCtrl+N", CMD_NEW + MENUITEM "&Відкрити...\tCtrl+O", CMD_OPEN + MENUITEM "&Зберегти\tCtrl+S", CMD_SAVE + MENUITEM "Зберегти &як...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Друк...\tCtrl+P", CMD_PRINT + MENUITEM "Параметри &сторінки...", CMD_PAGE_SETUP + MENUITEM "Налаштування &принтера...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Ви&хід", CMD_EXIT + } +POPUP "&Редагування" { + MENUITEM "&Назад\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Ви&різати\tCtrl+X", CMD_CUT + MENUITEM "&Копіювати\tCtrl+C", CMD_COPY + MENUITEM "&Вставити\tCtrl+V", CMD_PASTE + MENUITEM "Ви&далити\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Виділити в&се\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Час/Дата\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Перенос слів", CMD_WRAP + MENUITEM "&Шрифт...", CMD_FONT + } +POPUP "&Пошук" { + MENUITEM "&Знайти...\tCtrl+F", CMD_SEARCH + MENUITEM "Знайти &далі\tF3", CMD_SEARCH_NEXT + MENUITEM "За&мінити...\tCtrl+H", CMD_REPLACE + } +POPUP "&Довідка" { + MENUITEM "&Зміст", CMD_HELP_CONTENTS + MENUITEM "&Пошук...", CMD_HELP_SEARCH + MENUITEM "&Використання Довідки", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Про Notepad", CMD_HELP_ABOUT_NOTEPAD + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Параметри сторінки" +{ +LTEXT "&Верхній колонтитул:", 0x140, 10, 07, 40, 15 +EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Нижній колонтитул:", 0x142, 10, 24, 40, 15 +EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&Поля (мм):", 0x144, 10, 43,160, 45 +LTEXT "&Ліве:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Верхнє:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Праве:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Нижнє:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Скасувати", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Довідка", IDHELP, 180, 39, 40, 15, WS_TABSTOP +} + +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Кодування:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&f" +STRING_PAGESETUP_FOOTERVALUE, "Сторінка &p" + +STRING_NOTEPAD, "Блокнот" +STRING_ERROR, "ПОМИЛКА" +STRING_WARNING, "УВАГА" +STRING_INFO, "Інформація" + +STRING_UNTITLED, "Без назви" + +STRING_ALL_FILES, "Всі файли (*.*)" +STRING_TEXT_FILES_TXT, "Текстові файли (*.txt)" + +STRING_TOOLARGE, "Файл '%s' завеликий для блокноту.\n\ +Використайте інший редактор." +STRING_NOTEXT, "Ви не ввели жодного тексту.\ +\nНапишіть щось і спробуйте знов" +STRING_DOESNOTEXIST, "Файл '%s' не існує.\n\n\ +Створити новий файл?" +STRING_NOTSAVED, "Файл '%s' було змінено.\n\n\ +Хочете зберегти зміни?" +STRING_NOTFOUND, "'%s' не знайдений." +STRING_OUT_OF_MEMORY, "Замало пам'яті для завершення цього \ +завдання.\nЗакрийте одну чи кілька програм щоб звільнити пам'ять." + +STRING_UNICODE_LE, "Юнікод (UTF-16)" +STRING_UNICODE_BE, "Юнікод (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Файл містить Юнікод-текст, який буде втрачено при збереженні файлу\n\ +в кодуванні %s .\n\ +Щоб не втратити цей текст, натисніть Скасувати, та\n\ +виберіть зі списку один з варіантів Юнікод.\n\ +Продовжити?" +}

1 0

Igor Paliychuk : appwiz.cpl: Add Ukrainian translation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 15f36468de04c66703b9808fa079386b842b95fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f36468de04c66703b9808fa… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sun Jul 18 23:43:03 2010 +0300 appwiz.cpl: Add Ukrainian translation. --- 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

Thomas Mullaly : urlmon: Implemented functionality for retrieving the RAW_URI property of a IUri.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: fe41d09d7530d37a4846328d295a97a0d26a02e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe41d09d7530d37a4846328d2… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 6 16:19:58 2010 -0400 urlmon: Implemented functionality for retrieving the RAW_URI property of a IUri. --- dlls/urlmon/tests/uri.c | 24 ++++++++-------- dlls/urlmon/uri.c | 67 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 31f22a5..a89e5c6 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -104,7 +104,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, /* PATH */ {"/",S_OK,TRUE}, /* PATH_AND_QUERY */ {"",S_FALSE,TRUE}, /* QUERY */ - {"http://www.winehq.org/tests/../tests/../..",S_OK,TRUE}, /* RAW_URI */ + {"http://www.winehq.org/tests/../tests/../..",S_OK,FALSE}, /* RAW_URI */ {"http",S_OK,TRUE}, /* SCHEME_NAME */ {"",S_FALSE,TRUE}, /* USER_INFO */ {"",S_FALSE,TRUE} /* USER_NAME */ @@ -133,7 +133,7 @@ static const uri_properties uri_tests[] = { {"/tests",S_OK,TRUE}, {"/tests",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"http://winehq.org/tests/.././tests",S_OK,TRUE}, + {"http://winehq.org/tests/.././tests",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -162,7 +162,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"/?query=x&return=y",S_OK,TRUE}, {"?query=x&return=y",S_OK,TRUE}, - {"HtTp://www.winehq.org/tests/..?query=x&return=y",S_OK,TRUE}, + {"HtTp://www.winehq.org/tests/..?query=x&return=y",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -191,7 +191,7 @@ static const uri_properties uri_tests[] = { {"/path/a/Forbidden'%3C%7C%3E%20Characters",S_OK,TRUE}, {"/path/a/Forbidden'%3C%7C%3E%20Characters",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"hTTp://us%45r%3Ainfo(a)examp%4CE.com:80/path/a/b/./c/../%2E%2E/Forbidden'<|> Characters",S_OK,TRUE}, + {"hTTp://us%45r%3Ainfo(a)examp%4CE.com:80/path/a/b/./c/../%2E%2E/Forbidden'<|> Characters",S_OK,FALSE}, {"http",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE}, {"usEr%3Ainfo",S_OK,TRUE} @@ -221,7 +221,7 @@ static const uri_properties uri_tests[] = { {"/dir/foo%20bar.txt",S_OK,TRUE}, {"/dir/foo%20bar.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"ftp://winepass:wine(a)ftp.winehq.org:9999/dir/foo bar.txt",S_OK,TRUE}, + {"ftp://winepass:wine(a)ftp.winehq.org:9999/dir/foo bar.txt",S_OK,FALSE}, {"ftp",S_OK,TRUE}, {"winepass:wine",S_OK,TRUE}, {"winepass",S_OK,TRUE} @@ -249,7 +249,7 @@ static const uri_properties uri_tests[] = { {"/c:/tests/foo%2520bar.mp3",S_OK,TRUE}, {"/c:/tests/foo%2520bar.mp3",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"file://c:\\tests\\../tests/foo%20bar.mp3",S_OK,TRUE}, + {"file://c:\\tests\\../tests/foo%20bar.mp3",S_OK,FALSE}, {"file",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -277,7 +277,7 @@ static const uri_properties uri_tests[] = { {"/tests/test%20file.README.txt",S_OK,TRUE}, {"/tests/test%20file.README.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"FILE://localhost/test dir\\../tests/test%20file.README.txt",S_OK,TRUE}, + {"FILE://localhost/test dir\\../tests/test%20file.README.txt",S_OK,FALSE}, {"file",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -305,7 +305,7 @@ static const uri_properties uri_tests[] = { {"nothing:should:happen here",S_OK,TRUE}, {"nothing:should:happen here",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"urn:nothing:should:happen here",S_OK,TRUE}, + {"urn:nothing:should:happen here",S_OK,FALSE}, {"urn",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -334,7 +334,7 @@ static const uri_properties uri_tests[] = { {"/test%20dir/test.txt",S_OK,TRUE}, {"/test%20dir/test.txt",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"http://127.0.0.1/tests/../test dir/./test.txt",S_OK,TRUE}, + {"http://127.0.0.1/tests/../test dir/./test.txt",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -363,7 +363,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]",S_OK,TRUE}, + {"http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -392,7 +392,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"ftp://[::13.1.68.3]",S_OK,TRUE}, + {"ftp://[::13.1.68.3]",S_OK,FALSE}, {"ftp",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE} @@ -421,7 +421,7 @@ static const uri_properties uri_tests[] = { {"/",S_OK,TRUE}, {"/",S_OK,TRUE}, {"",S_FALSE,TRUE}, - {"http://[FEDC:BA98:0:0:0:0:0:3210]",S_OK,TRUE}, + {"http://[FEDC:BA98:0:0:0:0:0:3210]",S_OK,FALSE}, {"http",S_OK,TRUE}, {"",S_FALSE,TRUE}, {"",S_FALSE,TRUE}, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index df5ca8b..732ec44 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IUriVtbl *lpIUriVtbl; LONG ref; + + BSTR raw_uri; } Uri; typedef struct { @@ -74,8 +76,10 @@ static ULONG WINAPI Uri_Release(IUri *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + SysFreeString(This->raw_uri); heap_free(This); + } return ref; } @@ -83,7 +87,8 @@ static ULONG WINAPI Uri_Release(IUri *iface) static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BSTR *pbstrProperty, DWORD dwFlags) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + HRESULT hres; + TRACE("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); if(!pbstrProperty) return E_POINTER; @@ -99,13 +104,33 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST return S_OK; } - return E_NOTIMPL; + /* Don't have support for flags yet. */ + if(dwFlags) { + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + return E_NOTIMPL; + } + + switch(uriProp) { + case Uri_PROPERTY_RAW_URI: + *pbstrProperty = SysAllocString(This->raw_uri); + if(!(*pbstrProperty)) + hres = E_OUTOFMEMORY; + else + hres = S_OK; + break; + default: + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + hres = E_NOTIMPL; + } + + return hres; } static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + HRESULT hres; + TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); if(!pcchProperty) return E_INVALIDARG; @@ -114,7 +139,23 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D if(uriProp > Uri_PROPERTY_STRING_LAST) return E_INVALIDARG; - return E_NOTIMPL; + /* Don't have support for flags yet. */ + if(dwFlags) { + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + return E_NOTIMPL; + } + + switch(uriProp) { + case Uri_PROPERTY_RAW_URI: + *pcchProperty = SysStringLen(This->raw_uri); + hres = S_OK; + break; + default: + FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + hres = E_NOTIMPL; + } + + return hres; } static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) @@ -278,12 +319,10 @@ static HRESULT WINAPI Uri_GetQuery(IUri *iface, BSTR *pstrQuery) static HRESULT WINAPI Uri_GetRawUri(IUri *iface, BSTR *pstrRawUri) { Uri *This = URI_THIS(iface); - FIXME("(%p)->(%p)\n", This, pstrRawUri); - - if(!pstrRawUri) - return E_POINTER; + TRACE("(%p)->(%p)\n", This, pstrRawUri); - return E_NOTIMPL; + /* Just forward the call to GetPropertyBSTR. */ + return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_RAW_URI, pstrRawUri, 0); } static HRESULT WINAPI Uri_GetSchemeName(IUri *iface, BSTR *pstrSchemeName) @@ -454,6 +493,14 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU ret->lpIUriVtbl = &UriVtbl; ret->ref = 1; + /* Create a copy of pwzURI and store it as the raw_uri. */ + ret->raw_uri = SysAllocString(pwzURI); + + if(!ret->raw_uri) { + heap_free(ret); + return E_OUTOFMEMORY; + } + *ppURI = URI(ret); return S_OK; }

1 0

Dylan Smith : richedit: Don't break when streaming out a table, just continue.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: e2f6b1d83d15a069b2f07415f6ff9029dbe9f6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f6b1d83d15a069b2f07415f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jul 17 15:29:08 2010 -0400 richedit: Don't break when streaming out a table, just continue. This is a regression caused by commit 54b53b6018da93cf82a4ee60ae5a4d3357cd7cfc which change the code to use if statements instead of a switch, so the break statement should have been changed to a continue statement. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 107fadf..dfc4dd4 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -838,7 +838,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, TRACE("flags %xh\n", cursor.pRun->member.run.nFlags); /* TODO: emit embedded objects */ if (cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) - break; + continue; if (cursor.pRun->member.run.nFlags & MERF_GRAPHICS) { FIXME("embedded objects are not handled\n"); } else if (cursor.pRun->member.run.nFlags & MERF_TAB) {

1 0

Dylan Smith : richedit: Fix streaming rtf with table at the start of the text.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: be3073fce1586bc2d5a888007f89cde510392964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3073fce1586bc2d5a888007… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jul 17 15:29:28 2010 -0400 richedit: Fix streaming rtf with table at the start of the text. The first paragraph was being handled just by ME_StreamOutParaProps, but subsequent paragraphs would check if the paragraph was starting or ending a table. So I moved the code to check for tables into ME_StreamOutParaProps. --- dlls/riched20/writer.c | 71 ++++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index dfc4dd4..8c87145 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -406,12 +406,44 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, static BOOL ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, - const ME_DisplayItem *para) + ME_DisplayItem *para) { PARAFORMAT2 *fmt = para->member.para.pFmt; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; - + + if (!editor->bEmulateVersion10) { /* v4.1 */ + if (para->member.para.nFlags & MEPF_ROWSTART) { + pStream->nNestingLevel++; + if (pStream->nNestingLevel == 1) { + if (!ME_StreamOutRTFTableProps(editor, pStream, para)) + return FALSE; + } + return TRUE; + } else if (para->member.para.nFlags & MEPF_ROWEND) { + pStream->nNestingLevel--; + if (pStream->nNestingLevel >= 1) { + if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) + return FALSE; + if (!ME_StreamOutRTFTableProps(editor, pStream, para)) + return FALSE; + if (!ME_StreamOutPrint(pStream, "\\nestrow}{\\nonesttables\\par}\r\n")) + return FALSE; + } else { + if (!ME_StreamOutPrint(pStream, "\\row \r\n")) + return FALSE; + } + return TRUE; + } + } else { /* v1.0 - 3.0 */ + if (para->member.para.pFmt->dwMask & PFM_TABLE && + para->member.para.pFmt->wEffects & PFE_TABLE) + { + if (!ME_StreamOutRTFTableProps(editor, pStream, para)) + return FALSE; + } + } + /* TODO: Don't emit anything if the last PARAFORMAT2 is inherited */ if (!ME_StreamOutPrint(pStream, "\\pard")) return FALSE; @@ -798,39 +830,8 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, if (cursor.pPara != prev_para) { prev_para = cursor.pPara; - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (cursor.pPara->member.para.nFlags & MEPF_ROWSTART) { - pStream->nNestingLevel++; - if (pStream->nNestingLevel == 1) { - if (!ME_StreamOutRTFTableProps(editor, pStream, cursor.pPara)) - return FALSE; - } - } else if (cursor.pPara->member.para.nFlags & MEPF_ROWEND) { - pStream->nNestingLevel--; - if (pStream->nNestingLevel >= 1) { - if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) - return FALSE; - if (!ME_StreamOutRTFTableProps(editor, pStream, cursor.pPara)) - return FALSE; - if (!ME_StreamOutPrint(pStream, "\\nestrow}{\\nonesttables\\par}\r\n")) - return FALSE; - } else { - if (!ME_StreamOutPrint(pStream, "\\row \r\n")) - return FALSE; - } - } else if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) { - return FALSE; - } - } else { /* v1.0 - 3.0 */ - if (cursor.pPara->member.para.pFmt->dwMask & PFM_TABLE && - cursor.pPara->member.para.pFmt->wEffects & PFE_TABLE) - { - if (!ME_StreamOutRTFTableProps(editor, pStream, cursor.pPara)) - return FALSE; - } - if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) - return FALSE; - } + if (!ME_StreamOutRTFParaProps(editor, pStream, cursor.pPara)) + return FALSE; } if (cursor.pRun == endCur.pRun && !endCur.nOffset)

1 0

Dylan Smith : user32: RegisterClassEx should check for invalid cbSize field .
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 41dbacdc71d86770ab81ab86b7e014ced96c8d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41dbacdc71d86770ab81ab86b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jul 18 00:59:34 2010 -0400 user32: RegisterClassEx should check for invalid cbSize field. --- dlls/user32/class.c | 4 ++-- dlls/user32/tests/class.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 72cafc7..6d1ab7f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -486,7 +486,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) CLASS *classPtr; HINSTANCE instance; - if (wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || + if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || wc->hInstance == user32_module) /* we can't register a class for user32 */ { SetLastError( ERROR_INVALID_PARAMETER ); @@ -535,7 +535,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) CLASS *classPtr; HINSTANCE instance; - if (wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || + if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || wc->hInstance == user32_module) /* we can't register a class for user32 */ { SetLastError( ERROR_INVALID_PARAMETER ); diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 33c78bf..800d763 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -315,6 +315,7 @@ static void check_thread_instance( const char *name, HINSTANCE inst, HINSTANCE i static void test_instances(void) { WNDCLASSA cls, wc; + WNDCLASSEXA wcexA; HWND hwnd, hwnd2; const char *name = "__test__"; HINSTANCE kernel32 = GetModuleHandleA("kernel32"); @@ -348,6 +349,25 @@ static void test_instances(void) check_thread_instance( name, kernel32, kernel32, kernel32 ); ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" ); + ZeroMemory(&wcexA, sizeof(wcexA)); + wcexA.lpfnWndProc = DefWindowProcA; + wcexA.lpszClassName = "__classex_test__"; + SetLastError(0xdeadbeef); + wcexA.cbSize = sizeof(wcexA) - 1; + ok( ((RegisterClassExA( &wcexA ) == 0) && (GetLastError() == ERROR_INVALID_PARAMETER)), + "Succeeded with invalid number of cbSize bytes\n"); + SetLastError(0xdeadbeef); + wcexA.cbSize = sizeof(wcexA) + 1; + ok( ((RegisterClassExA( &wcexA ) == 0) && (GetLastError() == ERROR_INVALID_PARAMETER)), + "Succeeded with invalid number of cbSize bytes\n"); + SetLastError(0xdeadbeef); + wcexA.cbSize = sizeof(wcexA); + ok( RegisterClassExA( &wcexA ), "Failed with valid number of cbSize bytes\n"); + wcexA.cbSize = 0xdeadbeef; + ok( GetClassInfoEx(main_module, wcexA.lpszClassName, &wcexA), "GetClassInfoEx failed\n"); + ok( wcexA.cbSize == 0xdeadbeef, "GetClassInfoEx returned wrong cbSize value %d\n", wcexA.cbSize); + UnregisterClassA(wcexA.lpszClassName, main_module); + /* Bug 2631 - Supplying an invalid number of bytes fails */ cls.cbClsExtra = 0; cls.cbWndExtra = -1;

1 0

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

19 Jul '10

Module: wine Branch: master Commit: 04678d955d56bda8f9f05a47d6179df51329a1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=04678d955d56bda8f9f05a47d… 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> --- 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

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

19 Jul '10

Module: wine Branch: master Commit: 4662e12164a1e1e66bcabef96441c8799f15bd4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4662e12164a1e1e66bcabef96… 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> --- 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