Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[dreimer] 30579: Patch: 2832 Ukrainian translation update (except the outdated downloader RC file) by temarezATyandex.ru

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Nov 19 23:05:05 2007 New Revision: 30579 URL: http://svn.reactos.org/svn/reactos?rev=30579&view=rev Log: Patch: 2832 Ukrainian translation update (except the outdated downloader RC file) by temarezATyandex.ru Added: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc (with props) trunk/reactos/dll/cpl/joy/lang/uk-UA.rc (with props) trunk/reactos/dll/win32/modemui/lang/uk-UA.rc (with props) trunk/reactos/dll/win32/rasapi32/lang/uk-UA.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/rasapi32/rsrc.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Added: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc Mon Nov 19 23:05:05 2007 @@ -1,0 +1,177 @@ +/* + * PROJECT: ReactOS Software Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/appwiz/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for appwiz + * PROGRAMMERS: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Çì³íèòè/Â&èäàëèòè",ID_APP_MODIFYREMOVE + MENUITEM "&Â³äîìîñò³", ID_APP_INFORMATION + END +END + +IDR_POPUP_UPD MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Â&èäàëèòè", ID_UPD_REMOVE + MENUITEM "&Â³äîìîñò³", ID_UPD_INFORMATION + END +END + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çì³íà é âèäàëåííÿ ïðîãðàì" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,6,16,16 + LTEXT "Íèæ÷åíàâåäåí³ ïðîãðàìè ìîæíà âèäàëèòè àáî ïåðåóñòàíîâèòè àâòîìàòè÷íî. Ùîá âèäàëèòè ïðîãðàìó àáî çì³íèòè ñêëàä óñòàíîâëåíèõ êîìïîíåíò³â, âèáåð³òü öþ ïðîãðàìó ç³ ñïèñêó é íàòèñí³òü êíîïêó ""Çì³íèòè/Âèäàëèòè"".",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Ïîøóê:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "Âèãëÿä:",-1,250,33,30,8 + COMBOBOX IDC_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_SOFTWARELIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "Çì³íèòè/Â&èäàëèòè", IDC_ADDREMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&Â³äîìîñò³", IDC_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEUPDATES DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Âèäàëåííÿ îíîâëåíü" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_UPDATES,-1,PROPSHEETPADDING,6,16,16 + LTEXT "Íèæ÷åíàâåäåí³ îíîâëåííÿ ìîæíà âèäàëèòè àâòîìàòè÷íî. Ùîá âèäàëèòè îíîâëåííÿ, âèáåð³òü éîãî ç³ ñïèñêó é íàòèñí³òü êíîïêó ""Âèäàëèòè"".",-1,36,7,PROPSHEETWIDTH-48,22 + LTEXT "Ïîøóê:",-1,PROPSHEETPADDING,33,30,8 + EDITTEXT IDC_UPD_FIND_EDIT, PROPSHEETPADDING+30, 30, 180, 14, WS_VISIBLE | WS_TABSTOP + LTEXT "Âèãëÿä:",-1,250,33,30,8 + COMBOBOX IDC_UPD_VIEW_COMBO, 280, 30, 94, 80, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + CONTROL "", IDC_UPDATESLIST, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL, PROPSHEETPADDING, 50, PROPSHEETWIDTH-12, 155, WS_EX_CLIENTEDGE + PUSHBUTTON "Â&èäàëèòè", IDC_UPD_REMOVE, PROPSHEETPADDING, 210, 80, 14, WS_DISABLED + PUSHBUTTON "&Â³äîìîñò³", IDC_UPD_INFO_BUTTON, PROPSHEETPADDING+85, 210, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEADD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Add New Programs" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,10,32,32 + LTEXT "Ùîá óñòàíîâèòè íîâó ïðîãðàìó, íàòèñí³òü êíîïêó ""Óñòàíîâèòè"".",-1,36,11,PROPSHEETWIDTH-48,8 + PUSHBUTTON "Óñ&òàíîâèòè...", IDC_INSTALL, PROPSHEETWIDTH-(90), 46, 80, 14 + LTEXT "", -1, PROPSHEETPADDING, 70, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_DOWNLOADICO,-1,PROPSHEETPADDING,80,32,32 + LTEXT "Ùîá çàâàíòàæèòè ³ óñòàíîâèòè íîâ³ äîäàòêè, íàòèñí³òü ""Çàâàíòàæèòè !"".",-1,36,83,PROPSHEETWIDTH-48,17 + PUSHBUTTON "&Çàâàíòàæèòè !", IDC_ADD_DOWNLOAD_BUTTON, PROPSHEETWIDTH-(90), 125, 80, 14, WS_DISABLED + LTEXT "", -1, PROPSHEETPADDING, 150, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + ICON IDI_APPINETICO,-1,PROPSHEETPADDING,160,32,32 + LTEXT "Íàòèñí³òü êíîïêó ""Ïîøóê â Internet"" ùîá çíàéòè íîâ³ äîäàòêè, äîñòóïí³ ÷åðåç ³íòåðíåò-ç'ºäíàííÿ.",-1,36,161,PROPSHEETWIDTH-48,17 + PUSHBUTTON "&Âëàñòèâîñò³...", IDC_ADD_PROP_BUTTON, PROPSHEETWIDTH-(175), 205, 80, 14, WS_DISABLED + PUSHBUTTON "&Ïîøóê â Internet", IDC_ADD_FIND_BUTTON, PROPSHEETWIDTH-(90), 205, 80, 14, WS_DISABLED +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_REACTOS,-1,PROPSHEETPADDING,6,16,16 + LTEXT "",-1,36,7,PROPSHEETWIDTH-48,22 +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñòâîðåííÿ ÿðëèêà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñòâîðåííÿ ÿðëèêà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ñòâîðåííÿ ÿðëèêà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Öåé ìàéñòåð äîïîìàãàº ñòâîðèòè ÿðëèê, ÿêèé óêàçóº íà\nëîêàëüí³ àáî ìåðåæí³ ïðîãðàìè, ôàéëè, ïàïêè, êîìï'þòåðè\nàáî àäðåñè â ²íòåðíåò³.", -1, 120, 15, 200, 30 + LTEXT "Óêàæ³òü ðîçòàøóâàííÿ îá'ºêòà:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Îãëÿä...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Ùîá ïðîäîâæèòè óñòàíîâêó, íàòèñí³òü êíîïêó ""Äàë³"".", -1, 120, 97, 162, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Âèá³ð íàçâè ïðîãðàìè" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Ââåä³òü ³ì'ÿ ÿðëèêà:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Ùîá ñòâîðèòè ÿðëèê, íàòèñí³òü êíîïêó ""Ãîòîâî"".", -1, 118, 97, 178, 17 +END + +IDD_INFORMATION DIALOG 5, 100, 269, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Â³äîìîñò³" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDS_INFO_DISPNAME, PROPSHEETPADDING, 6, 258, 15, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Çàðåºñòðîâàíèé âëàñíèê:", -1, PROPSHEETPADDING, 27, 97, 8 + EDITTEXT IDS_INFO_REGOWNER, PROPSHEETPADDING+97, 25, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Íîìåð ïðîäóêòó:", -1, PROPSHEETPADDING, 44, 97, 8 + EDITTEXT IDS_INFO_PRODUCTID, PROPSHEETPADDING+97, 42, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Âèäàâåöü:", -1, PROPSHEETPADDING, 61, 97, 8 + EDITTEXT IDS_INFO_PUBLISHER, PROPSHEETPADDING+97, 59, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Âåðñ³ÿ:", -1, PROPSHEETPADDING, 78, 97, 8 + EDITTEXT IDS_INFO_VERSION, PROPSHEETPADDING+97, 76, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Êîíòàêò:", -1, PROPSHEETPADDING, 95, 97, 8 + EDITTEXT IDS_INFO_CONTACT, PROPSHEETPADDING+97, 93, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Â³äîìîñò³ ïðî ï³äòðèìêó:", -1, PROPSHEETPADDING, 112, 97, 8 + EDITTEXT IDS_INFO_SUPPORTINFO, PROPSHEETPADDING+97, 110, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Òåëåôîí òåõí³÷íî¿ ï³äòðèìêè:", -1, PROPSHEETPADDING, 129, 97, 8 + EDITTEXT IDS_INFO_SUPPORTPHONE, PROPSHEETPADDING+97, 127, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Îíîâëåííÿ ïðîäóêòó:", -1, PROPSHEETPADDING, 146, 97, 8 + EDITTEXT IDS_INFO_PRODUCT_UPDATES, PROPSHEETPADDING+97, 144, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ôàéë ""Readme"":", -1, PROPSHEETPADDING, 163, 97, 8 + EDITTEXT IDS_INFO_README, PROPSHEETPADDING+97, 161, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Ïðèì³òêè:", -1, PROPSHEETPADDING, 180, 97, 8 + EDITTEXT IDS_INFO_COMMENTS, PROPSHEETPADDING+97, 178, 160, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Çàêðèòè", IDCANCEL, 212, 198, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Óñòàíîâêà é âèäàëåííÿ ïðîãðàì" + IDS_CPLSYSTEMDESCRIPTION "Âñòàíîâëåííÿ ïðîãðàì ³ ñòâîðåííÿ ÿðëèê³â." + IDS_ERROR "Ïîìèëêà" + IDS_UNABLEREAD_UNINSTSTR "Íå âäàëîñÿ ïðî÷èòàòè UninstallString. Öå çíà÷åííÿ íåâ³ðíå àáî ñòâîðåíî MSI-óñòàíîâíèêîì." + IDS_UNABLEOPEN_UNINSTKEY "Íå âäàëîñÿ â³äêðèòè êëþ÷ âèäàëåííÿ" + IDS_APPLIST "Óñòàíîâëåí³ ïðîãðàìè" + IDS_UPDATESLIST "Óñòàíîâëåí³ îíîâëåííÿ" + IDS_LARGEICONS "Âåëèê³ çíà÷êè" + IDS_LIST "Ñïèñîê" + IDS_DETAILS "Ïîäðîáèö³" + IDS_CREATE_SHORTCUT "Ñòâîðèòè ÿðëèê" + IDS_ERROR_NOT_FOUND "Ôàéë %s íå çíàéäåíèé." + IDS_UNABLEREAD_INFORMATION "Íå âäàëîñÿ â³äêðèòè êëþ÷³ ³íôîðìàö³¿" + IDS_NO_INFORMATION "Íåìàº ³íôîðìàö³¿" + IDS_NONE_APP "Íåìàº âñòàíîâëåíèõ äîäàòê³â." + IDS_NONE_UPD "Íåìàº âñòàíîâëåíèõ îíîâëåíü." +END Propchange: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc Mon Nov 19 23:05:05 2007 @@ -4,3 +4,4 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Mon Nov 19 23:05:05 2007 @@ -142,11 +142,11 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "&Ïðèºäíàíèé", ID_MENU_ATTACHED + MENUITEM "&Îñíîâíèé", ID_MENU_PRIMARY MENUITEM SEPARATOR - MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Âèçíà÷åííÿ", ID_MENU_IDENTIFY + MENUITEM "Â&ëàñòèâîñò³", ID_MENU_PROPERTIES END END Added: trunk/reactos/dll/cpl/joy/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/uk-UA.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/uk-UA.rc (added) +++ trunk/reactos/dll/cpl/joy/lang/uk-UA.rc Mon Nov 19 23:05:05 2007 @@ -1,0 +1,92 @@ +/* + * PROJECT: Joystick Properties Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/joy/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for joy.cpl + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "²ãðîâ³ ïðèñòðî¿" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "Ö³ ïàðàìåòðè äàþòü çìîãó íàëàøòóâàòè ³ãðîâ³ ïðèñòðî¿, óñòàíîâëåí³ íà öüîìó êîìï'þòåð³.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "&Óñòàíîâëåí³ ³ãðîâ³ ïðèñòðî¿", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&Äîäàòè...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "Â&èäàëèòè", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "Â&ëàñòèâîñò³", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "Ä&îäàòêîâî...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "Ä³à&ãíîñòèêà...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Äîäàâàííÿ ³ãðîâîãî ïðèñòðîþ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Âèáåð³òü ³ãðîâèé ïðèñòð³é ³ç íèæ÷åíàâåäåíîãî ñïèñêó é íàòèñí³òü êíîïêó ""OK"". ßêùî âàøîãî ³ãðîâîãî ïðèñòðîþ íåìàº ó ñïèñêó, íàòèñí³òü êíîïêó ""²íøèé"".", -1, 35, 7, 210, 33 + LTEXT "&²ãðîâ³ ïðèñòðî¿:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Ï³äêëþ÷èòè ðóëü ³ ïåäàë³", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "²&ãðîâèé ïîðò:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "²í&øèé...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Îñîáëèâèé ³ãðîâèé ïðèñòð³é" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Îñîáëèâîñò³", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "Äæî&éñòèê", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Øòóðâàë àáî ðó÷êà êåðóâàííÿ", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "²&ãðîâèé ïëàíøåò", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "Êåðóâàííÿ ïåðåãîíîâèì &àâòîìîá³ëåì", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "&Ñòåïåí³ â³ëüíîñò³", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Ðóëü àáî ïåäàë³", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Â³ñü Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "Ê&íîïêè", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "ª &ïåðåìèêà÷ òî÷êè çîðó", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "&²ì'ÿ ïðèñòðîþ:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Äîäàòêîâ³ ïàðàìåòðè" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 163, 65, 50, 14 + LTEXT "Âèáåð³òü ïðèñòð³é, ÿêèé ñë³ä âèêîðèñòîâóâàòè ç³ ñòàðèìè ïðîãðàìàìè.", -1, 7, 7, 208, 10 + LTEXT "&Êðàùèé ïðèñòð³é:", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "²ãðîâ³ ïðèñòðî¿" + IDS_CPLSYSTEMDESCRIPTION "Äîäàâàííÿ, âèäàëåííÿ é íàñòðîéêà ïàðàìåòð³â ³ãðîâèõ ïðèñòðî¿â, íàïðèêëàä, äæîéñòèê³â àáî ³ãðîâèõ ïëàíøåò³â." + IDS_CONTROLLER "Ïðèñòð³é" + IDS_STATUS "Ñòàí" +END Propchange: trunk/reactos/dll/cpl/joy/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=30… ============================================================================== --- trunk/reactos/dll/cpl/joy/rsrc.rc (original) +++ trunk/reactos/dll/cpl/joy/rsrc.rc Mon Nov 19 23:05:05 2007 @@ -5,3 +5,4 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc Mon Nov 19 23:05:05 2007 @@ -275,9 +275,9 @@ IDS_MINI_DUMP "Ì³í³äàìï(64Êá)" IDS_KERNEL_DUMP "Äàìï ÿäðà" IDS_FULL_DUMP "Ïîâíèé äàìï" - IDS_USERPROFILE_NAME "Name" - IDS_USERPROFILE_SIZE "Size" - IDS_USERPROFILE_TYPE "Type" - IDS_USERPROFILE_STATUS "Status" - IDS_USERPROFILE_MODIFIED "Modified" -END + IDS_USERPROFILE_NAME "²ì'ÿ" + IDS_USERPROFILE_SIZE "Ðîçì³ð" + IDS_USERPROFILE_TYPE "Òèï" + IDS_USERPROFILE_STATUS "Ñòàí" + IDS_USERPROFILE_MODIFIED "Çì³íåíî" +END Added: trunk/reactos/dll/win32/modemui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/modemui/lang/uk-UA.rc Mon Nov 19 23:05:05 2007 @@ -1,0 +1,621 @@ +/* + * PROJECT: ReactOS Modem Properties + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/modemui/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for modemui + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDM_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Äóáë&þâàòè...", 0 + MENUITEM "Â&èäàëèòè", 1 + MENUITEM "Ïåðåãëÿä &æóðíàëó", 2 + MENUITEM SEPARATOR + MENUITEM "Â&ëàñòèâîñò³", 3 + MENUITEM "&Êîï³þâàòè âëàñòèâîñò³", 4 + MENUITEM "&Çàñòîñóâàòè âëàñòèâîñò³", 5 + END +END + +IDD_ADVANCED DIALOG 17, 12, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîäàòêîâî" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Äîäàòêîâ³ ïàðàìåòðè", 1018, 6, 6, 225, 70 + LTEXT "Äîäàò&êîâ³ êîìàíäè ³í³ö³àë³çàö³¿:", 1011, 16, 20, 143, 8 + EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL + LTEXT "&×åêàòè íà ñèãíàë äëÿ òåëåôîííî¿ êàðòêè:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE + EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP + CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12 + LTEXT "ñåê", 1010, 173, 54, 40, 8, NOT WS_VISIBLE + GROUPBOX "&Âèá³ð êðà¿íè àáî ðåã³îíó", 1012, 6, 80, 225, 75 + COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP + PUSHBUTTON "&Äîäàòêîâ³ ïàðàìåòðè...", 1100, 107, 170, 125, 14 + DEFPUSHBUTTON "&Çì³íèòè çàìîâ÷óâàííÿ...", 3, 107, 188, 125, 14 +END + +IDD_GENERAL DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ïîðò:", 1018, 9, 8, 32, 10 + LTEXT "Ïîñë³äîâíèé ïîðò", 1095, 48, 8, 181, 10 + GROUPBOX "&Ãó÷í³ñòü äèíàì³êà", 1029, 10, 21, 218, 48 + CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20 + RTEXT "Âèìê.", 1045, 56, 40, 22, 8 + LTEXT "Âèùå", 1001, 155, 40, 25, 11 + GROUPBOX "&Øâèäê³ñòü ïîðòó äëÿ ìîäåìà", 1031, 10, 78, 218, 46 + COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Êåðóâàííÿ íàáîðîì íîìåðà", 1060, 10, 133, 218, 51 + AUTOCHECKBOX "&×åêàòè íà ãóäîê", 1003, 27, 157, 174, 10 +END + +IDD_DISTINCTIVE_RING DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ðîçð³çíåííÿ äçâ³íê³â" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 145 + AUTOCHECKBOX "Â&èêîðèñòîâóâàòè ñëóæáè ðîçð³çíåííÿ äçâ³íê³â", 1069, 20, 7, 184, 10 + CTEXT "Âèä äçâ³íêà", -1, 84, 21, 70, 8 + CTEXT "Òèï âèêëèêó", -1, 159, 21, 63, 8 + LTEXT "Îñíîâíà àäð&åñà:", 1070, 20, 41, 62, 8 + COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñà &1:", 1071, 20, 59, 62, 8 + COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñà &2:", 1072, 20, 77, 62, 8 + COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñà &3:", 1076, 20, 95, 62, 8 + COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Ïð³îðèòåòí³ âèêëèêè:", 1078, 20, 112, 62, 8 + COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Â³äïîâ³äíèé âèêëèê:", 1080, 20, 131, 62, 8 + COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DISTINCTIVE_RING_2 DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ðîçð³çíåííÿ äçâ³íê³â" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 87 + AUTOCHECKBOX "Â&èêîðèñòîâóâàòè ñëóæáè ðîçð³çíåííÿ äçâ³íê³â", 1069, 19, 7, 177, 10 + CTEXT "Âèä äçâ³íêà", -1, 20, 21, 74, 8 + CTEXT "Òèï âèêëèêó", -1, 96, 21, 65, 8 + LTEXT "Îäèí äçâ³íî&ê:", 1088, 20, 37, 53, 8 + COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Ïî&äâ³éíèé äçâ³íîê:", 1089, 20, 57, 53, 8 + COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Ïî&òð³éíèé äçâ³íîê:", 1090, 20, 76, 53, 8 + COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DIAGNOSTICS DIALOG 0, 0, 238, 215 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ä³àãíîñòèêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58 + CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58 + PUSHBUTTON "Îïèòàòè &ìîäåì", 1096, 138, 149, 75, 14 + AUTOCHECKBOX "&Âåñòè æóðíàë", 1020, 18, 187, 98, 10 + PUSHBUTTON "Ïåðåãëÿä &æóðíàëó", 1094, 138, 184, 75, 14, WS_DISABLED + GROUPBOX "Â³äîìîñò³ ïðî ìîäåì", 1047, 10, 6, 217, 164 + GROUPBOX "Âåäåííÿ æóðíàëó", -1, 10, 173, 217, 32 +END + +IDD_PLEASE_WAIT DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Çà÷åêàéòå..." +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Òðèâàº çâ'ÿçîê ³ç ìîäåìîì. Öå ìîæå çàáðàòè äåê³ëüêà ñåêóíä.", -1, 42, 7, 146, 28 + DEFPUSHBUTTON "Ñêàñóâàòè", 2, 72, 52, 50, 14 +END + +IDD_GENERAL_2 DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Ðó÷íèé àáî ïîëóàâòîìàòè÷íèé íàá³ð íîìåðà", 1002, 19, 22, 150, 10 + AUTOCHECKBOX "Â³äêë&þ÷åííÿ ïðè ïðîñòî¿ á³ëüøå", 1042, 19, 38, 143, 10 + EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Ñêàñóâà&òè âèêëèê çà â³äñóòíîñò³ â³äïîâ³ä³ ïðîòÿãîì", -1, 19, 56, 147, 10 + EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + RTEXT "&Øâèäê³ñòü ïîðòó:", 1034, 16, 102, 93, 8 + COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Ïðîòîêîë:", 1032, 16, 122, 93, 8 + COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Ñòèñêàííÿ:", 1035, 16, 139, 93, 8 + COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Êåðóâàííÿ ïîòîêîì:", 1027, 16, 157, 93, 8 + COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Ïàðàìåòðè âèêëèêó", 1060, 11, 7, 217, 66 + LTEXT "õâ", 1044, 195, 38, 22, 8 + LTEXT "ñåê", 1041, 194, 56, 22, 8 + GROUPBOX "Ïàðàìåòðè ï³äêëþ÷åííÿ ë³í³¿ äàíèõ", -1, 11, 82, 217, 94 +END + +IDD_ADVANCED_2 DIALOG 17, 12, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîäàòêîâî" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Â³äêðèòè â³êíî òåðì³íàëà äî íàáîðó íîìåðà", 1000, 20, 21, 200, 10 + AUTOCHECKBOX "Â&³äêðèòè â³êíî òåðì³íàëà ï³ñëÿ íàáîðó íîìåðà", 1001, 20, 38, 200, 10 + RTEXT "&Á³òè äàíèõ:", 1024, 18, 79, 93, 8 + COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Ïàðí³ñòü:", 1026, 18, 97, 93, 8 + COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "Ñ&òîïîâ³ á³òè:", 1029, 18, 115, 93, 8 + COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Ìîäóëþâàííÿ:", 1045, 18, 133, 93, 8 + COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Â³êíî òåðì³íàëà", 1004, 10, 7, 217, 49 + GROUPBOX "Ïàðàìåòðè íàñòðîéêè óñòàòêóâàííÿ", 1005, 10, 64, 217, 89 +END + +IDD_ISDN DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ISDN" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Òèï êîìóòàòîðà", -1, 11, 6, 217, 39 + COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "&Ïåðøèé íîìåð", -1, 11, 50, 217, 50 + EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8 + EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER + GROUPBOX "&Äðóãèé íîìåð", -1, 11, 105, 217, 49 + EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8 + EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER +END + +IDD_PLEASE_WAIT_2 DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Çà÷åêàéòå" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Íàäñèëàííÿ â³äîìîñòåé ïðî êðà¿íó/ðåã³îí íà ìîäåì.", -1, 42, 7, 146, 28 +END + +IDD_WARNING DIALOG 0, 0, 360, 105 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Ïîïåðåäæåííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Á³ëüøå íå ïîêàçóâàòè öå ïîâ³äîìëåííÿ", 1109, 17, 73, 118, 10 + DEFPUSHBUTTON "OK", 1, 302, 84, 50, 14 + LTEXT "Äåÿê³ ìîäåìè íåïðàâèëüíî îáðîáëÿþòü òàê³ äîâã³ ðÿäêè ³í³ö³àë³çàö³¿.", -1, 50, 27, 304, 8 + LTEXT "Â³äîìîñò³ ïðî öå îáìåæåííÿ ìîæíà îòðèìàòè â³ä âèðîáíèêà âàøîãî ìîäåìà.", -1, 50, 41, 304, 8 + ICON 5100, -1, 15, 14, 20, 20 + LTEXT "Ââåäåíî ðÿäîê ³í³ö³àë³çàö³¿ ìîäåìà, äîâøèé çà 57 çíàê³â.", -1, 50, 14, 304, 8 +END + +IDD_MODEMS DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ìîäåìè" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, 1057, 6, 7, 20, 20 + LTEXT "&Íà êîìï'þòåð³ óñòàíîâëåíî òàê³ ìîäåìè:", -1, 44, 12, 203, 9 + CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE + PUSHBUTTON "&Äîäàòè...", 110, 56, 198, 60, 14 + PUSHBUTTON "Â&èäàëèòè", 112, 121, 198, 60, 14 + PUSHBUTTON "Âëàñ&òèâîñò³", 109, 185, 198, 60, 14 +END + +IDD_PLEASE_WAIT_3 DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Çà÷åêàéòå..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Çóïèíèòè", 2, 74, 53, 50, 14 + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Âèäàëåííÿ", -1, 40, 8, 151, 8 + LTEXT "Ìîäåì", 1005, 40, 16, 151, 25 +END + +STRINGTABLE +BEGIN + 180 "Ïîñë³äîâíèé ïîðò RS-232" + 181 "Çîâí³øí³é ìîäåì" + 182 "Âíóòð³øí³é ìîäåì" + 183 "Ìîäåì PCMCIA" + 184 "Ïàðàëåëüíèé ìîäåì" + 185 "Ïàðàëåëüíèé ïîðò" + 200 "110" + 201 "1200" + 202 "2400" + 203 "4800" + 204 "9600" + 206 "19200" + 207 "38400" + 210 "115200" + 211 "57600" + 216 "300" + 220 "230400" + 221 "460800" + 222 "921600" + 240 "4" + 241 "5" + 242 "6" + 243 "7" + 244 "8" + 250 "Ïàðíà" + 251 "Íåïàðíà" + 252 "Áåç ïåðåâ³ðêè" + 253 "Ìàðêåð (1)" + 254 "Ïðîá³ë (0)" + 255 "1" + 256 "1,5" + 257 "2" + 260 "Xon/Xoff" + 261 "Àïàðàòíå" + 262 "Íåìàº" + 263 "Óâ³ìê." + 264 "Íèæ÷å" + 265 "V.23 (Minitel)" + 266 "Ñòàíäàðòíà" + 267 "Íåñòàíäàðòíà (Bell, HST)" + 270 "Ä&îäàòè äî æóðíàëó" + 300 "Íåìàº äàíèõ" + 301 "Äàí³" + 302 "Ôàêñ" + 303 "Ãîëîñ" + 304 "Íåìàº" + 320 "Ïàðàìåòðè êðà¿íè àáî ðåã³îíó îíîâëåíî" + 340 "Ìîäåì" + 341 "Ïàðàìåòðè ìîäåìà" + 342 "Àäðåñà ìîäåìà" + 400 "Ïàðàìåòðè êðà¿íè àáî ðåã³îíó íå îíîâëåíî" + 401 "Äåÿê³ ìîäåìè íå ñïðèéìàþòü êîìàíä ³í³ö³àë³çàö³¿, ÿêùî ðÿäîê êîìàíäè äîâøèé çà 57 çíàê³â.\n\nÂ³äîìîñò³ ïðî òàê³ îáìåæåííÿ ìîæíà îòðèìàòè â³ä âèðîáíèêà âàøîãî ìîäåìà" + 402 "Ïîïåðåäæåííÿ" + 460 "Íåäîñòàòíüî ïàì'ÿò³ äëÿ ïîêàçó ä³àëîãîâîãî â³êíà çàãàëüíèõ âëàñòèâîñòåé.\nÇàêðèéòå äåê³ëüêà ôàéë³â àáî ïðîãðàì ³ ïîâòîð³òü ñïðîáó." + 461 "Íåäîñòàòíüî ïàì'ÿò³ äëÿ ïîêàçó ä³àëîãîâîãî â³êíà ïàðàìåòð³â ìîäåìà.\nÇàêðèéòå äåê³ëüêà ôàéë³â àáî ïðîãðàì ³ ïîâòîð³òü ñïðîáó." + 463 "Êîæíà àäðåñà âèêëèêó ìàº áóòè ""Àâòîìàòè÷íîþ"" àáî ìàòè óí³êàëüíèé âèä äçâ³íêà.\n\nÇì³í³òü ïîâòîðþâàíèé âèä äçâ³íêà íà ³íøèé." + 465 "Ñòàíäàðòíèé EC" + 466 "Ôîðñîâàíèé EC" + 467 "Ìîá³ëüíèé" + 468 "Âèìêíåíî" + 469 "Óâ³ìêíóòî" + 470 "Âèìêíåíî" + 480 "ÀÂÒÎ (1 êàí.)" + 481 "ÀÂÒÎ (2 êàí.)" + 482 "PPP (56K)" + 483 "PPP (64K)" + 484 "PPP (112K)" + 485 "PPP (112K,PAP)" + 486 "PPP (112K,CHAP)" + 487 "PPP (112K,MSCHAP)" + 488 "PPP (128K)" + 489 "PPP (128K,PAP)" + 490 "PPP (128K,CHAP)" + 491 "PPP (128K,MSCHAP)" + 500 "V.120 (64K)" + 501 "V.120 (56K)" + 502 "V.120 (112K)" + 503 "V.120 (128K)" + 504 "X.75 (64K)" + 505 "X.75 (128K)" + 506 "X.75 (T.70)" + 507 "X.75 (BTX)" + 508 "V.110 (1.2K)" + 509 "V.110 (2.4K)" + 510 "V.110 (4.8K)" + 511 "V.110 (9.6K)" + 512 "V.110 (12.0K)" + 513 "V.110 (14.4K)" + 514 "V.110 (19.2K)" + 515 "V.110 (28.8K)" + 516 "V.110 (38.4K)" + 517 "V.110 (57.6K)" + 518 "Àíàëîãîâèé (V.34/V.90)" + 550 "ESS5 (AT&T) (Ï³âí³÷íà Àìåðèêà)" + 551 "ÀÒÒ ò&î÷êà - äåê³ëüêà òî÷îê" + 552 "National ISDN 1 (NI-1)" + 553 "Northern Telecom DMS 100 (NT1)" + 554 "NTT INS64 (ßïîí³ÿ)" + 555 "European ISDN (DSS1) (Åâðîïà)" + 556 "German National (1TR6) (ð³äêî âèêîðèñòîâóºòüñÿ)" + 557 "French National (VN3) (ð³äêî âèêîðèñòîâóºòüñÿ)" + 558 "Belgium National (ð³äêî âèêîðèñòîâóºòüñÿ)" + 559 "Australian National (ð³äêî âèêîðèñòîâóºòüñÿ)" + 560 "Íåâ³äîìèé êîìóòàòîð" + 570 "Íàñòðîéêó ISDN äëÿ öüîãî ìîäåìà\níå çàê³í÷åíî.\n\nÇàïîâí³òü â³äîìîñò³ íà âêëàäö³\nISDN ïåðåä âèêîðèñòàííÿì öüîãî ìîäåìà." + 600 "PPP (56K,GSM)" + 601 "PPP (64K,GSM)" + 602 "V.120 (64K,GSM)" + 604 "V.110 (1.2K,GSM)" + 605 "V.110 (2.4K,GSM)" + 606 "V.110 (4.8K,GSM)" + 607 "V.110 (9.6K,GSM)" + 608 "V.110 (12.0K,GSM)" + 609 "V.110 (14.4K,GSM)" + 610 "V.110 (19.2K,GSM)" + 611 "V.110 (28.8K,GSM)" + 612 "V.110 (38.4K,GSM)" + 613 "V.110 (57.6K,GSM)" + 614 "Àíàëîãîâèé RLP" + 615 "Àíàëîãîâèé NRLP" + 616 "GPRS" + 617 "PIAFS - âõ³äíèé" + 618 "PIAFS - âèõ³äíèé" + 700 "Âèêîðèñòîâóâàòè ïîòî÷íå ðîçòàøóâàííÿ ç TAPI" + 2006 "Ï³äêëþ÷åíèé äî" + 2007 "Íåìàº" + 2008 "Íå ïðàöþº" + 2009 "Ïîòð³áíå ïåðåçàâàíòàæåííÿ" + 2010 "#Ùîá çàê³í÷èòè óñòàíîâêó ìîäåìà, ñë³ä ïåðåçàïóñòèòè êîìï'þòåð.\n\nÏåðåçàïóñòèòè êîìï'þòåð çàðàç?" + 2011 "Ìîäåì óñòàíîâëåíî íåïðàâèëüíî" + 2012 "Íåâ³äîìèé ïîðò" + 3000 "Óñòàíîâêà ìîäåìà" + 3018 "Ìîäåìè" + 3019 "Óñòàíîâêà íîâîãî ìîäåìà òà çì³íà éîãî ïàðàìåòð³â." + 3053 "Âëàñòèâîñò³ ìîäåìà íåìîæëèâî ïîêàçàòè, îñê³ëüêè ìîäåì íåäîñòóïíèé.\n\nÏåðåçàâàíòàæòå ñèñòåìó òà ïîâòîð³òü ñïðîáó." + 3054 "Âëàñòèâîñò³: Ìîäåìè" + 3060 "Âè ä³éñíî áàæàºòå âèäàëèòè âèáðàí³ ìîäåìè ³ç ñèñòåìè?" + 3061 "Íå âäàëîñÿ âèäàëèòè ìîäåì ""%1"" ³ç ïîðòó %2." + 3062 "Ìîäåì" + 3069 "Íåäîñòàòíüî ïàì'ÿò³, ùîá â³äêðèòè ïàíåëü êåðóâàííÿ ìîäåì³â.\n\nÇàêðèéòå äåê³ëüêà ïðîãðàì ³ ïîâòîð³òü ñïðîáó." + 3073 "Óñòàíîâëþâàòè ìîäåìè äîçâîëåíî ëèøå ñèñòåìíèì àäì³í³ñòðàòîðàì." + 3074 "Íå óñòàíîâëåíî æîäíîãî ìîäåìà. Óñòàíîâëþâàòè ìîäåìè äîçâîëåíî ëèøå ñèñòåìíèì àäì³í³ñòðàòîðàì." + 3076 "Ùîá íîâ³ ïàðàìåòðè íàáðàëè ñèëè, ñë³ä ïåðåçàïóñòèòè êîìï'þòåð.\n\nÏåðåçàïóñòèòè êîìï'þòåð çàðàç?" + 3077 "Çì³íà ïàðàìåòð³â ìåðåæ³" + 3200 "300 áîä" + 3201 "1200 áîä" + 3202 "2400 áîä" + 3203 "9600 áîä" + 3204 "19,2K áîä" + 3205 "38,4K áîä" + 3206 "57,6K áîä" + 3207 "Íåìàº â³äïîâ³ä³" + 3212 "Êîìàíäà" + 3213 "Â³äïîâ³äü" + 3214 "Íåìîæëèâî â³äêðèòè ïîðò, äî ÿêîãî ï³äêëþ÷åíî ìîäåì. Öå ìîæå áóòè âèêëèêàíî êîíôë³êòîì óñòàòêóâàííÿ. Çà äîïîìîãîþ äèñïåò÷åðà ïðèñòðî¿â ïåðåâ³ðòå ðîáîòîçäàòí³ñòü âñ³õ ïðèñòðî¿â." + 3215 "Ïîðò, ÿêèé âèêîðèñòîâóºòüñÿ ìîäåìîì, çàðàç â³äêðèòèé ³íøèì äîäàòêîì. Çàêðèéòå âñ³ ïðîãðàìè, ÿê³ ìîæóòü âèêîðèñòîâóâàòè öåé ïîðò." + 3218 "OpenComm" + 3221 "115K áîä" + 3222 "Îíîâëåííÿ" + 3223 "Ïîìèëêà" + 3233 "Óñï³øíî" + 3236 "Ìîäåì íå â³äïîâ³äàº. Ïåðåêîíàéòåñÿ, ùî éîãî íàëåæíèì ÷èíîì ï³äêëþ÷åíî òà ââ³ìêíóòî. ßêùî öå âáóäîâàíèé ìîäåì àáî â³í ï³äêëþ÷åíèé ïðàâèëüíî, ïåðåâ³ðòå, ÷è ïðàâèëüíî ïåðåðèâàííÿ äëÿ ïîðòó." + 3237 "ÊÎÌÀÍÄÀ ÍÅ Ï²ÄÒÐÈÌÓªÒÜÑß" + 3238 "Ïîëå" + 3239 "Çíà÷åííÿ" + 3240 " Ïåðåâàãè çà çàìîâ÷óâàííÿì" + 3241 " Ïåðåâàãè ï³äêëþ÷åííÿ" + 6144 "ßïîí³ÿ" + 6145 "Àëáàí³ÿ" + 6146 "Àëæèð" + 6147 "Ñõ³äíå Ñàìîà" + 6148 "Í³ìå÷÷èíà (êîä êðà¿íè àáî ðåã³îíó 04)" + 6149 "Àíã³ëüÿ" + 6150 "Àíòèãóà ³ Áàðáóäà" + 6151 "Àðãåíòèíà" + 6152 "î. Âîçíåñ³ííÿ" + 6153 "Àâñòðàë³ÿ" + 6154 "Àâñòð³ÿ" + 6155 "Áàãàìñüê³ î-âè" + 6156 "Áàõðåéí" + 6157 "Áàíãëàäåø" + 6158 "Áàðáàäîñ" + 6159 "Áåëüã³ÿ" + 6160 "Áåë³ç" + 6161 "Áåí³í" + 6162 "Áåðìóäñüê³ î-âè" + 6163 "Áóòàí" + 6164 "Áîë³â³ÿ" + 6165 "Áîòñâàíà" + 6166 "Áðàçèë³ÿ" + 6167 "Êîä êðà¿íè àáî ðåã³îíó (23)" + 6168 "Áðèòàíñüê³ òåðèòîð³¿ â ²íä³éñüêîìó îêåàí³" + 6169 "Â³ðã³íñüê³ î-âè (Áðèòàíñüê³)" + 6170 "Áðóíåé" + 6171 "Áîëãàð³ÿ" + 6172 "Ì'ÿíìà" + 6173 "Áóðóíä³" + 6174 "Á³ëîðóñü" + 6175 "Êàìåðóí" + 6176 "Êàíàäà" + 6177 "Êàáî-Âåðäå" + 6178 "Êàéìàíîâ³ î-âè" + 6179 "Öåíòðàëüíîàôðèêàíñüêà Ðåñïóáë³êà" + 6180 "×àä" + 6181 "×èë³" + 6182 "Êèòàé" + 6183 "Êîëóìá³ÿ" + 6184 "Êîìîðñüê³ î-âè" + 6185 "Êîíãî" + 6186 "î-âè Êóêà" + 6187 "Êîñòà-Ð³êà" + 6188 "Êóáà" + 6189 "Ê³ïð" + 6190 "×åõ³ÿ" + 6191 "Êàìáîäæà" + 6192 "Ï³âí³÷íà Êîðåÿ" + 6193 "Äàí³ÿ" + 6194 "Äæèáóò³" + 6195 "Äîì³í³êàíñüêà Ðåñïóáë³êà" + 6196 "Äîì³í³êà" + 6197 "Åêâàäîð" + 6198 "ªãèïåò" + 6199 "Ñàëüâàäîð" + 6200 "Åêâàòîð³àëüíà Ãâ³íåÿ" + 6201 "Åô³îï³ÿ" + 6202 "Ôîëêëåíäñüê³ (Ìàëüâ³íñüê³) î-âè" + 6203 "î-âè Ô³äæ³" + 6204 "Ô³íëÿíä³ÿ" + 6205 "Ôðàíö³ÿ" + 6206 "Ïîë³íåç³ÿ (Ôðàíöóçüêà)" + 6207 "Êîä êðà¿íè àáî ðåã³îíó (63)" + 6208 "Ãàáîí" + 6209 "Ãàìá³ÿ" + 6210 "Í³ìå÷÷èíà (êîä êðà¿íè àáî ðåã³îíó 66)" + 6211 "Àíãîëà" + 6212 "Ãàíà" + 6213 "Ã³áðàëòàð" + 6214 "Ãðåö³ÿ" + 6215 "Ãðåíàäà" + 6216 "Ãóàì" + 6217 "Ãâàòåìàëà" + 6218 "Ãåðíñ³" + 6219 "Ãâ³íåÿ" + 6220 "Ãâ³íåÿ-Á³ñàó" + 6221 "Ãàéàíà" + 6222 "Ãà¿ò³" + 6223 "Ãîíäóðàñ" + 6224 "Ãîíêîíã (ÎÀÐ)" + 6225 "Óãîðùèíà" + 6226 "²ñëàíä³ÿ" + 6227 "²íä³ÿ" + 6228 "²íäîíåç³ÿ" + 6229 "²ðàí" + 6230 "²ðàê" + 6231 "²ðëàíä³ÿ" + 6232 "²çðà¿ëü" + 6233 "²òàë³ÿ" + 6234 "Êîò-ä'²âóàð" + 6235 "ßìàéêà" + 6236 "Àôãàí³ñòàí" + 6237 "Äæåðñ³" + 6238 "Éîðäàí³ÿ" + 6239 "Êåí³ÿ" + 6240 "Ê³ð³áàò³" + 6241 "Êîðåÿ" + 6242 "Êóâåéò" + 6243 "Ëàîñ" + 6244 "Ë³âàí" + 6245 "Ëåñîòî" + 6246 "Ë³áåð³ÿ" + 6247 "Ë³â³ÿ" + 6248 "Ë³õòåíøòåéí" + 6249 "Ëþêñåìáóðã" + 6250 "Àîìèíü (ÎÀÐ)" + 6251 "Ìàäàãàñêàð" + 6252 "Ìàëàéç³ÿ" + 6253 "Ìàëàâ³" + 6254 "Ìàëüäèâè" + 6255 "Ìàë³" + 6256 "Ìàëüòà" + 6257 "Ìàâðèòàí³ÿ" + 6258 "Ìàâðèê³é" + 6259 "Ìåêñèêà" + 6260 "Ìîíàêî" + 6261 "Ìîíãîë³ÿ" + 6262 "Ìîíòñåððàò" + 6263 "Ìàðîêêî" + 6264 "Ìîçàìá³ê" + 6265 "Íàóðó" + 6266 "Íåïàë" + 6267 "Í³äåðëàíäè" + 6268 "Àíòèëüñüê³ î-âè (Í³äåðëàíäñüê³)" + 6269 "Íîâà Êàëåäîí³ÿ" + 6270 "Íîâà Çåëàíä³ÿ" + 6271 "Í³êàðàãóà" + 6272 "Í³ãåð" + 6273 "Í³ãåð³ÿ" + 6274 "Íîðâåã³ÿ" + 6275 "Îìàí" + 6276 "Ïàêèñòàí" + 6277 "Ïàíàìà" + 6278 "Ïàïóà-Íîâà Ãâ³íåÿ" + 6279 "Ïàðàãâàé" + 6280 "Ïåðó" + 6281 "Ô³ë³ïï³íè" + 6282 "Ïîëüùà" + 6283 "Ïîðòóãàë³ÿ" + 6284 "Ïóåðòî-Ðèêî" + 6285 "Êàòàð" + 6286 "Ðóìóí³ÿ" + 6287 "Ðóàíäà" + 6288 "Ñåíò-Ê³òñ ³ Íåâ³ñ" + 6289 "Êîä êðà¿íè àáî ðåã³îíó (145)" + 6290 "î. Ñâÿòî¿ ªëåíè" + 6291 "Ñåíò-Ëþñ³ÿ" + 6292 "Ñàí-Ìàðèíî" + 6293 "Êîä êðà¿íè àáî ðåã³îíó (148)" + 6294 "Ñàí-Òîìå ³ Ïð³íñ³ï³" + 6295 "Ñåíò-Â³íñåíò ³ Ãðåíàäèíè" + 6296 "Ñàóä³âñüêà Àðàâ³ÿ" + 6297 "Ñåíåãàë" + 6298 "Ñåéøåëüñüê³ î-âè" + 6299 "Ñüºððà-Ëåîíå" + 6300 "Ñ³íãàïóð" + 6301 "Ñîëîìîíîâ³ î-âè" + 6302 "Ñîìàë³" + 6303 "Ï³âäåííî-Àôðèêàíñüêà Ðåñïóáë³êà" + 6304 "²ñïàí³ÿ" + 6305 "Øð³-Ëàíêà" + 6306 "Ñóäàí" + 6307 "Ñóðèíàì" + 6308 "Ñâàç³ëåíä" + 6309 "Øâåö³ÿ" + 6310 "Øâåéöàð³ÿ" + 6311 "Ñèð³ÿ" + 6312 "Òàíçàí³ÿ" + 6313 "Òà¿ëàíä" + 6314 "Òîãî" + 6315 "Òîíãà" + 6316 "Òðèí³äàä ³ Òîáàãî" + 6317 "Òóí³ñ" + 6318 "Òóðå÷÷èíà" + 6319 "î-âè Òåðêñ ³ Êàéêîñ" + 6320 "Òóâàëó" + 6321 "Óãàíäà" + 6322 "Óêðà¿íà" + 6323 "Îá'ºäíàí³ Àðàáñüê³ Åì³ðàòè" + 6324 "Âåëèêîáðèòàí³ÿ" + 6325 "Ñïîëó÷åí³ Øòàòè Àìåðèêè" + 6326 "Áóðê³íà-Ôàñî" + 6327 "Óðóãâàé" + 6328 "Êîä êðà¿íè àáî ðåã³îíó (184)" + 6329 "Âàíóàòó" + 6330 "Âàòèêàí" + 6331 "Âåíåñóåëà" + 6332 "Â'ºòíàì" + 6333 "î-âè Âîëë³ñ ³ Ôóòóíà" + 6334 "Ñàìîà" + 6335 "ªìåí" + 6336 "ªìåí" + 6337 "Êîä êðà¿íè àáî ðåã³îíó (193)" + 6338 "Êîíãî (ÄÐÊ)" + 6339 "Çàìá³ÿ" + 6340 "Ç³ìáàáâå" + 6501 "Ìîëäàâ³ÿ" + 6502 "Åñòîí³ÿ" + 6503 "Ëèòâà" + 6504 "Â³ðìåí³ÿ" + 6505 "Ãðóç³ÿ" + 6506 "Àçåðáàéäæàí" + 6507 "Òóðêìåí³ñòàí" + 6508 "Óçáåêèñòàí" + 6509 "Êàçàõñòàí" + 6510 "Òàäæèêèñòàí" + 6511 "Êèðãèç³ÿ" + 6512 "Ëàòâ³ÿ" + 6513 "Ðîñ³ÿ" + 6600 "Õîðâàò³ÿ" + 6601 "Ñëîâåí³ÿ" + 6602 "Ìàêåäîí³ÿ, Êîëèøíÿ Þãîñëàâñüêà Ðåñïóáë³êà" + 6603 "Áîñí³ÿ ³ Ãåðöåãîâèíà" + 6604 "Þãîñëàâ³ÿ" + 20013 "Êîä óñòàòêóâàííÿ" +END Propchange: trunk/reactos/dll/win32/modemui/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… ============================================================================== --- trunk/reactos/dll/win32/modemui/modemui.rc (original) +++ trunk/reactos/dll/win32/modemui/modemui.rc Mon Nov 19 23:05:05 2007 @@ -15,3 +15,4 @@ IDI_703 ICON "res/703.ico" #include "lang/en-US.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/rasapi32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/rasapi32/lang/uk-UA.rc Mon Nov 19 23:05:05 2007 @@ -1,0 +1,39 @@ +/* + * PROJECT: Remote Access API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/rasapi32/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for rasapi32 + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + 4097 "Íå âäàëîñÿ çíàéòè ñöåíàð³é '%1'." + 4098 "%1(%2!d!) : íåñïîä³âàíèé ê³íåöü ôàéëó" + 4099 "%1(%2!d!) : '%3' : ñèíòàêñè÷íà ïîìèëêà" + 4100 "%1 : â³äñóòíº îãîëîøåííÿ 'proc main'" + 4101 "%1(%2!d!) : î÷³êóºòüñÿ ³äåíòèô³êàòîð" + 4102 "%1(%2!d!) : î÷³êóºòüñÿ ðÿäêîâèé ïàðàìåòð" + 4103 "%1(%2!d!) : î÷³êóºòüñÿ ö³ëî÷èñåëüíèé ïàðàìåòð" + 4104 "%1(%2!d!) : '%3' : íåïðèïóñòèìèé òèï" + 4105 "Íåäîñòàòíüî ïàì'ÿò³ äëÿ âèêîíàííÿ ñöåíàð³þ." + 4106 "%1(%2!d!) : '%3' : âèÿâëåíà âíóòð³øíÿ ïîìèëêà." + 4107 "%1(%2!d!) : '%3' : íåïðèïóñòèìèé ïàðàìåòð" + 4108 "%1(%2!d!) : '%3' : íåïðèïóñòèìèé ïàðàìåòð 'set ipaddr'" + 4109 "%1(%2!d!) : '%3' : íåïðèïóñòèìèé ïàðàìåòð 'set port'" + 4110 "%1(%2!d!) : '%3' : íåïðèïóñòèìèé ÷èñëîâèé ä³àïàçîí" + 4111 "%1(%2!d!) : '%3' : íåïðèïóñòèìèé ïàðàìåòð 'set screen'" + 4112 "%1(%2!d!) : '%3' : î÷³êóºòüñÿ '('" + 4113 "%1(%2!d!) : '%3' : òèï ìàº áóòè ö³ëî÷èñëîâèì" + 4114 "%1(%2!d!) : '%3' : òèï ìàº áóòè ðÿäêîâèì" + 4115 "%1(%2!d!) : '%3' : òèï ìàº áóòè áóëåâèì" + 4116 "%1(%2!d!) : '%3' : òèï ìàº áóòè ö³ëî÷èñëîâèì àáî ðÿäêîâèì" + 4117 "%1(%2!d!) : '%3' : íåâ³äïîâ³äí³ñòü òèï³â" + 4118 "%1(%2!d!) : '%3' : ³äåíòèô³êàòîð âæå âèçíà÷åíèé" + 4119 "%1(%2!d!) : '%3' : ³äåíòèô³êàòîð íå âèçíà÷åíèé" + 4120 "%1(%2!d!) : '%3' : òèï ìàº áóòè òèïîì ì³òêè" + 4121 "%1(%2!d!) : ä³ëåííÿ íà íóëü" + 4122 "%1(%2!d!) : '%3' : òèï ìàº áóòè ö³ëî÷èñëîâèì, ðÿäêîâèì àáî áóëåâèì" +END Propchange: trunk/reactos/dll/win32/rasapi32/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/rasapi32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rsrc.rc (original) +++ trunk/reactos/dll/win32/rasapi32/rsrc.rc Mon Nov 19 23:05:05 2007 @@ -2,3 +2,4 @@ #include "lang/en-US.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Mon Nov 19 23:05:05 2007 @@ -164,135 +164,135 @@ SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 235, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Shortcut" +CAPTION "ßðëèê" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 64, 10 + LTEXT "Òèï îá'ºêòà:", 14004, 8, 38, 64, 10 LTEXT "", 14005, 78, 38, 142, 10 - LTEXT "Target location:", 14006, 8, 58, 64, 10 + LTEXT "Ðîçòàøóâàííÿ:", 14006, 8, 58, 64, 10 LTEXT "", 14007, 79, 58, 141, 10 - LTEXT "Target:", 14008, 8, 77, 45, 10 + LTEXT "Î&á'ºêò:", 14008, 8, 77, 45, 10 EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL - LTEXT "&Start in:", 14010, 8, 96, 57, 10 + LTEXT "&Ðîáî÷à ïàïêà:", 14010, 8, 96, 57, 10 EDITTEXT 14011, 79, 94, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 115, 57, 10 + LTEXT "&Øâèäêèé âèêëèê:", 14014, 8, 115, 57, 10 EDITTEXT 14015, 79, 112, 150, 14, ES_LEFT - LTEXT "Run:", 14016, 8, 134, 57, 10 + LTEXT "&Â³êíî:", 14016, 8, 134, 57, 10 EDITTEXT 14017, 79, 131, 150, 14, ES_AUTOHSCROLL - LTEXT "C&omment:", 14018, 8, 152, 57, 10 + LTEXT "&Ïðèì³òêà:", 14018, 8, 152, 57, 10 EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + PUSHBUTTON "Ç&íàéòè îá'ºêò...", 14020, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Çì³íèòè çíà÷îê...", 14021, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Äîäàòêîâî...", 14022, 159, 172, 70, 14, ES_LEFT END SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Extended Properties" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 - LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED +CAPTION "Äîäàòêîâ³ âëàñòèâîñò³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Âèáåð³òü ïîòð³áí³ âëàñòèâîñò³ äëÿ öüîãî ÿðëèêà.", -1, 5, 30, 210, 10 + CHECKBOX "Çàïóñêàòè ç ³íøèìè îáë³êîâèìè äàíèìè", 14000, 25, 50, 150, 10 + LTEXT "Öåé ïàðàìåòð äîçâîëÿº âèêîðèñòîâóâàòè öåé ÿðëèê â³ä ³ìåí³ ³íøîãî êîðèñòóâà÷à àáî ïðîäîâæóâàòè ðîáîòó â³ä ñâîãî ³ìåí³, ùî çàõèùàº êîìï'þòåð é äàí³ â³ä íåñàíêö³îíîâàíèõ ä³é ïðîãðàìè.", -1, 50, 60, 175, 40 + CHECKBOX "Çàïóñêàòè â îêðåì³é îáëàñò³ ïàì'ÿò³", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "Ñêàñóâàòè", 2, 120, 124, 50, 15, WS_VISIBLE END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 8, 35, 50, 10 - LTEXT "File", 14005, 68, 35, 160, 10 - LTEXT "Opens with:", 14006, 8, 53, 50, 10 + LTEXT "Òèï ôàéëó:", 14004, 8, 35, 50, 10 + LTEXT "Ôàéë", 14005, 68, 35, 160, 10 + LTEXT "Äîäàòîê:", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 160, 10 - LTEXT "Location:", 14008, 8, 72, 45, 10 + LTEXT "Ðîçòàøóâàííÿ:", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Size:", 14010, 8, 93, 45, 10 + LTEXT "Ðîçì³ð:", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "Ñòâîðåíî:", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - LTEXT "Modified:", 14016, 8, 140, 45, 10 + LTEXT "Çì³íåíî:", 14016, 8, 140, 45, 10 LTEXT "", 14017, 68, 140, 160, 10 - LTEXT "Accessed:", 14018, 8, 160, 45, 10 + LTEXT "Â³äêðèòî:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 189, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 - CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 - CHECKBOX "&Archive", 14023, 181, 189, 49, 10 + LTEXT "Àòðèáóòè:", 14020, 8, 189, 45, 10 + CHECKBOX "Ëèøå &÷èòàííÿ", 14021, 58, 189, 67, 10 + CHECKBOX "Ïðè&õîâàíèé", 14022, 126, 189, 50, 10 + CHECKBOX "&Àðõ³âíèé", 14023, 181, 189, 49, 10 END SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 235, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "File version: ", 14000, 10, 10, 55, 10 +CAPTION "Âåðñ³ÿ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Âåðñ³ÿ ôàéëó: ", 14000, 10, 10, 55, 10 LTEXT "", 14001, 77, 10, 152, 10 - LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "Îïèñ: ", 14002, 10, 27, 45, 10 LTEXT "", 14003, 77, 27, 152, 10 - LTEXT "Copyright: ", 14004, 10, 46, 66, 10 + LTEXT "Àâòîðñüê³ ïðàâà: ", 14004, 10, 46, 66, 10 LTEXT "", 14005, 77, 46, 152, 10 - GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115 - LTEXT "Item name: ", 14007, 13, 82, 50, 10 - LTEXT "Value: ", 14008, 112, 82, 45, 10 + GROUPBOX "Äîäàòêîâ³ â³äîìîñò³: ", 14006, 6, 70, 222, 115 + LTEXT "²ì'ÿ åëåìåíòà: ", 14007, 13, 82, 50, 10 + LTEXT "Çíà÷åííÿ: ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT 14001, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP - LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "Òèï:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 - LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "Ôàéëîâà ñèñòåìà:", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 - LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "Çàéíÿòî:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 - LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "Äîñòóïíî:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 - LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "Ì³ñòê³ñòü:", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - LTEXT "Drive %s", 14010, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED + LTEXT "Äèñê %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Î÷èùåííÿ äèñêà", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Ñòèñêàòè äèñê äëÿ çàîùàäæåííÿ ì³ñöÿ", 14012, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Äîçâîëèòè ³íäåêñóâàííÿ äèñêó äëÿ ïðèñêîðåííÿ ïîøóêó", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tools" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Error-checking", -1, 5, 5, 230, 60 - LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 - PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP - GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 - LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP - GROUPBOX "Backup", -1, 5, 130, 230, 60 - LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 - PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +CAPTION "Ñåðâ³ñ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Ïåðåâ³ðêà äèñêà", -1, 5, 5, 230, 60 + LTEXT "Ïåðåâ³ðêà òîìó íà íàÿâí³ñòü ïîìèëîê.", -1, 40, 25, 160, 20 + PUSHBUTTON "Âèêîíàòè ïåðåâ³ðêó...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Äåôðàãìåíòàö³ÿ äèñêà", -1, 5, 65, 230, 60 + LTEXT "Äåôðàãìåíòàö³ÿ ôàéë³â íà öüîìó òîì³", -1, 40, 85, 160, 20 + PUSHBUTTON "Âèêîíàòè äåôðàãìåíòàö³þ...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Àðõ³âàö³ÿ", -1, 5, 130, 230, 60 + LTEXT "Ðåçåðâíå êîï³þâàííÿ ôàéë³â íà öüîìó òîì³.", -1, 40, 150, 160, 20 + PUSHBUTTON "Âèêîíàòè àðõ³âàö³þ...", 14002, 130, 170, 90, 15, WS_TABSTOP END DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 @@ -304,19 +304,19 @@ RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Run As" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 - CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "The following user:", 14002, 10, 100, 90, 10 - LTEXT "User name:", -1, 20, 118, 54, 10 +CAPTION "Çàïóñê â³ä ³ìåí³ ³íøîãî êîðèñòóâà÷à" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "×èé îáë³êîâèé çàïèñ âèêîðèñòîâóâàòè äëÿ çàïóñêó ö³º¿ ïðîãðàìè?", -1, 10, 20, 220, 20 + CHECKBOX "Ïîòî÷íèé êîðèñòóâà÷ %s", 14000, 10, 45, 150, 10 + LTEXT "Çàõèñòèòè ì³é êîìï'þòåð ³ ìî¿ äàí³ â³ä íåñàíêö³îíîâàíî¿ ä³ÿëüíîñò³ ïðîãðàì", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "Öåé ðåæèì ìîæå çàõèñòèòè âàø êîìï'þòåð ³ äàí³ â³ä â³ðóñ³â, àëå ïðîãðàìà ìîæå ïðàöþâàòè íåïðàâèëüíî.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "Óêàçàíèé êîðèñòóâà÷:", 14002, 10, 100, 90, 10 + LTEXT "²ì'ÿ êîðèñòóâà÷à:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP - LTEXT "Password:", -1, 20, 143, 53, 10 + LTEXT "Ïàðîëü:", -1, 20, 143, 53, 10 EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP @@ -329,7 +329,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 - GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70 + GROUPBOX "Óñòàíîâêè äëÿ âèáðàíîãî ðîçòàøóâàííÿ", -1, 10, 72, 220, 70 RADIOBUTTON "&Êîðèñòóâàöüêèé ðîçì³ð:", 14001, 20, 90, 80, 10, WS_TABSTOP EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&Ãðàíè÷íèé îá'ºì êîøèêà (Ìá):", -1, 20, 105, 70, 10 @@ -366,7 +366,7 @@ IDS_VIEW_DETAILS "&Ïîäðîáèö³" IDS_SELECT "Âè&áðàòè" IDS_OPEN "Â³&äêðèòè" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Ïàíåëü êåðóâàííÿ" IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó ïàïêó: Â³äìîâà ó äîñòóï³." IDS_CREATEFOLDER_CAPTION "Ïîìèëêà ïðè ñòâîðåíí³ íîâî¿ ïàïêè" Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Mon Nov 19 23:05:05 2007 @@ -195,7 +195,7 @@ IDS_CMT_SCREENSHOT "Çðîáèòè çí³ìîê åêðàíà" IDS_CMT_DEVMGMT "Çàïóñòèòè Äèñïåò÷åð ïðèñòðî¿â" IDS_CMT_SERVMAN "Çàïóñòèòè Äèñïåò÷åð êåðóâàííÿ ñëóæáàìè" - IDS_CMT_RDESKTOP "Launch Remote Desktop" + IDS_CMT_RDESKTOP "Çàïóñòèòè Â³ääàëåíå êåðóâàííÿ ðîáî÷èì ñòîëîì" END STRINGTABLE

17 years, 1 month

[cwittich] 30578: don't crash on media change while accessing data

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Nov 19 17:24:03 2007 New Revision: 30578 URL: http://svn.reactos.org/svn/reactos?rev=30578&view=rev Log: don't crash on media change while accessing data Modified: trunk/reactos/drivers/filesystems/cdfs/common.c Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c Mon Nov 19 17:24:03 2007 @@ -199,9 +199,6 @@ NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); DPRINT1("IoVerifyVolume() returned (Status %lx)\n", NewStatus); - - if (NewStatus == STATUS_SUCCESS || NewStatus == STATUS_WRONG_VOLUME) - Status = STATUS_SUCCESS; } DPRINT("Returning Status %x\n", Status);

17 years, 1 month

[cwittich] 30577: don't crash when Buffer is NULL

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Nov 19 15:14:54 2007 New Revision: 30577 URL: http://svn.reactos.org/svn/reactos?rev=30577&view=rev Log: don't crash when Buffer is NULL Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=305… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c (original) +++ trunk/reactos/lib/rtl/dos8dot3.c Mon Nov 19 15:14:54 2007 @@ -255,7 +255,7 @@ if (RtlUpcaseUnicodeStringToCountedOemString( AnsiName, UnicodeName, FALSE ) != STATUS_SUCCESS) return FALSE; - if (AnsiName->Length > 12) return FALSE; + if ((AnsiName->Length > 12) || (AnsiName->Buffer == NULL)) return FALSE; /* a starting . is invalid, except for . and .. */ if (AnsiName->Buffer[0] == '.')

17 years, 1 month

[fireball] 30576: - Rewrite KdbSymProcessSymbols to use the KD_SYMBOLS_INFO structure kernel sends us. This removes the need for ugly names operations (maybe buggy!), and presents an elegant solution: just finding the needed module by its base address. - As a result, ALL modules get their symbols loaded now. - TODO: Remove KdbSymProcessBootSymbols(), it's used right now to load ntoskrnl and hal symbols during boot process.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 19 14:26:52 2007 New Revision: 30576 URL: http://svn.reactos.org/svn/reactos?rev=30576&view=rev Log: - Rewrite KdbSymProcessSymbols to use the KD_SYMBOLS_INFO structure kernel sends us. This removes the need for ugly names operations (maybe buggy!), and presents an elegant solution: just finding the needed module by its base address. - As a result, ALL modules get their symbols loaded now. - TODO: Remove KdbSymProcessBootSymbols(), it's used right now to load ntoskrnl and hal symbols during boot process. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h Mon Nov 19 14:26:52 2007 @@ -89,7 +89,7 @@ IN BOOLEAN LoadFromFile); VOID -KdbSymProcessSymbols(IN PANSI_STRING FileName); +KdbSymProcessSymbols(IN PANSI_STRING FileName, IN PKD_SYMBOLS_INFO SymbolInfo); BOOLEAN KdbSymPrintAddress(IN PVOID Address); @@ -119,12 +119,12 @@ # define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) # define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) -# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessSymbols(FILENAME) +# define KDB_SYMBOLFILE_HOOK(FILENAME, SYMBOLINFO) KdbSymProcessSymbols((FILENAME), (SYMBOLINFO)) #else # define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) # define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) -# define KDB_SYMBOLFILE_HOOK(FILENAME) do { } while (0) +# define KDB_SYMBOLFILE_HOOK(FILENAME, SYMBOLINFO) do { } while (0) # define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) #endif Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Mon Nov 19 14:26:52 2007 @@ -131,7 +131,8 @@ else if (ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) { /* Load symbols. Currently implemented only for KDBG! */ - KDB_SYMBOLFILE_HOOK((PANSI_STRING)ExceptionRecord->ExceptionInformation[1]); + KDB_SYMBOLFILE_HOOK((PANSI_STRING)ExceptionRecord->ExceptionInformation[1], + (PKD_SYMBOLS_INFO)ExceptionRecord->ExceptionInformation[2]); } /* This we can handle: simply bump EIP */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Mon Nov 19 14:26:52 2007 @@ -578,50 +578,77 @@ } VOID -KdbSymProcessSymbols(IN PANSI_STRING AnsiFileName) -{ - ANSI_STRING SystemPrefix, RealPathPrefix, ProperName; - CHAR Buffer[MAX_PATH], RealPathBuffer[MAX_PATH]; - - /* Init our strings for compare operations */ - RtlInitAnsiString(&SystemPrefix, "\\SystemRoot"); - - /* Convert system root to ansi */ - sprintf(RealPathBuffer, "%S", (PWCHAR)&SharedUserData->NtSystemRoot[2]); - RtlInitAnsiString(&RealPathPrefix, RealPathBuffer); - RealPathPrefix.MaximumLength = MAX_PATH; - - /* There are 3 cases: - 1) \SystemRoot\System32\ -> no change - 2) \ReactOS\System32 -> \SystemRoot\System32 - 3) module.dll -> \??\C:\ReactOS\system32\module.dll - */ - if (RtlPrefixString(&SystemPrefix, AnsiFileName, FALSE)) - { - /* Case: \SystemRoot\System32\ , just directly load it */ - KdbSymProcessBootSymbols(AnsiFileName, TRUE, FALSE); - } - else if (RtlPrefixString(&RealPathPrefix, AnsiFileName, FALSE)) - { - /* It's prefixed with a real path, instead of a \SystemRoot. - So build a new, proper name. */ - RtlZeroMemory(Buffer, MAX_PATH); - strcpy(Buffer, "\\SystemRoot"); - strncat(Buffer, - AnsiFileName->Buffer + RealPathPrefix.Length, - AnsiFileName->Length - RealPathPrefix.Length); - - /* Convert it to ANSI_STRING */ - RtlInitAnsiString(&ProperName, Buffer); - - /* Process symbols */ - KdbSymProcessBootSymbols(&ProperName, TRUE, TRUE); +KdbSymProcessSymbols(IN PANSI_STRING AnsiFileName, IN PKD_SYMBOLS_INFO SymbolInfo) +{ + BOOLEAN Found = FALSE; + PLIST_ENTRY ListHead, NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; + + //DPRINT("KdbSymProcessSymbols(%Z)\n", AnsiFileName); + + /* We use PsLoadedModuleList here, otherwise (in case of + using KeLoaderBlock) all our data will be just lost */ + ListHead = &PsLoadedModuleList; + + /* Found module we are interested in */ + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + if (SymbolInfo->BaseOfDll == LdrEntry->DllBase) + { + Found = TRUE; + break; + } + + /* Go to the next one */ + NextEntry = NextEntry->Flink; + } + + /* Exit if we didn't find the module requested */ + if (!Found) + return; + + DPRINT("Found LdrEntry=%p\n", LdrEntry); + if (!LoadSymbols) + { + LdrEntry->PatchInformation = NULL; + return; + } + + /* Remove symbol info if it already exists */ + if (LdrEntry->PatchInformation != NULL) + { + KdbpSymRemoveCachedFile(LdrEntry->PatchInformation); + } + + /* Load new symbol information */ + if (! RosSymCreateFromMem(LdrEntry->DllBase, + LdrEntry->SizeOfImage, + (PROSSYM_INFO*)&LdrEntry->PatchInformation)) + { + /* Error loading symbol info, try to load it from file */ + KdbpSymLoadModuleSymbols(&LdrEntry->FullDllName, + (PROSSYM_INFO*)&LdrEntry->PatchInformation); + + /* It already added symbols to cache */ } else { - /* Just a bare filename, nothing else. Why? Who knows... */ - KdbSymProcessBootSymbols(AnsiFileName, FALSE, TRUE); - } + /* Add file to cache */ + KdbpSymAddCachedFile(&LdrEntry->FullDllName, LdrEntry->PatchInformation); + } + + DPRINT("Installed symbols: %wZ@%08x-%08x %p\n", + &LdrEntry->BaseDllName, + LdrEntry->DllBase, + LdrEntry->SizeOfImage + (ULONG)LdrEntry->DllBase, + LdrEntry->PatchInformation); + }

17 years, 1 month

[jimtabor] 30575: Fireball found one I missed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 19 13:36:23 2007 New Revision: 30575 URL: http://svn.reactos.org/svn/reactos?rev=30575&view=rev Log: Fireball found one I missed. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Nov 19 13:36:23 2007 @@ -3852,6 +3852,7 @@ ) { PDC Dc; + PDC_ATTR Dc_Attr; HFONT hFont; PTEXTOBJ TextObj; NTSTATUS Status; @@ -3864,7 +3865,9 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - hFont = Dc->Dc_Attr.hlfntNew; + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + hFont = Dc_Attr->hlfntNew; DC_UnlockDc(Dc); TextObj = TEXTOBJ_LockText(hFont);

17 years, 1 month

[dreimer] 30574: Remove all trailing Spaces. Change the Name shown for the ScreenSaver in the String to a more fitting one. Add a German Resource.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Nov 19 13:04:29 2007 New Revision: 30574 URL: http://svn.reactos.org/svn/reactos?rev=30574&view=rev Log: Remove all trailing Spaces. Change the Name shown for the ScreenSaver in the String to a more fitting one. Add a German Resource. Added: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc (with props) Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c trunk/rosapps/applications/screensavers/butterflies/butterflies.def trunk/rosapps/applications/screensavers/butterflies/butterflies.rc trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc trunk/rosapps/applications/screensavers/butterflies/resource.h Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.c (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.c Mon Nov 19 13:04:29 2007 @@ -1,8 +1,8 @@ #include <windows.h> #include <scrnsave.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> +#include <math.h> +#include <stdio.h> +#include <stdlib.h> #include <GL/gl.h> #include <GL/glu.h> #include "resource.h" @@ -129,11 +129,11 @@ pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER; pfd.cColorBits = 24; pfd.cDepthBits = 24; - + nFormat = ChoosePixelFormat(hDC, &pfd); DescribePixelFormat(hDC, nFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); SetPixelFormat(hDC, nFormat, &pfd); - + hRC = wglCreateContext(hDC); wglMakeCurrent(hDC, hRC); @@ -157,13 +157,13 @@ glLoadIdentity(); // Reset The Projection Matrix // Calculate The Aspect Ratio Of The Window - gluPerspective (45.0f, (GLfloat)(width)/(GLfloat)(height),1.0f, 1000.0f); + gluPerspective (45.0f, (GLfloat)(width)/(GLfloat)(height),1.0f, 1000.0f); glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glLoadIdentity(); // Start Of User Initialization LoadGLTextures(); // Load The Textures From Our Resource File - + glClearColor (0.0f, 0.0f, 0.0f, 0.5f); // Black Background glClearDepth (1.0f); // Depth Buffer Setup glDepthFunc (GL_LEQUAL); // The Type Of Depth Testing (Less Or Equal) @@ -174,7 +174,7 @@ glBlendFunc(GL_ONE,GL_SRC_ALPHA); // Set Blending Mode (Cheap / Quick) glEnable(GL_BLEND); - + for (loop=0; loop<50; loop++) // Loop To Initialize 50 Objects { SetObject(loop); // Call SetObject To Assign New Random Values @@ -227,7 +227,7 @@ Sleep(15); // Create A Short Delay (15 Milliseconds) - glFlush (); + glFlush (); } @@ -251,7 +251,7 @@ case WM_COMMAND: switch(LOWORD(wpm)){ case IDOK: - EndDialog(hdlg, LOWORD(wpm)); + EndDialog(hdlg, LOWORD(wpm)); break; case WEBPAGE1: ShellExecute(NULL, "open", "http://nehe.gamedev.net", NULL, NULL, SW_SHOWNORMAL); @@ -264,8 +264,8 @@ return FALSE; } -LRESULT WINAPI ScreenSaverProc(HWND hWnd, UINT message, - WPARAM wParam, LPARAM lParam) +LRESULT WINAPI ScreenSaverProc(HWND hWnd, UINT message, + WPARAM wParam, LPARAM lParam) { static HGLRC hRC; static DWORD timer = 1; @@ -274,33 +274,33 @@ int width; int height; - switch (message) - { - case WM_CREATE: + switch (message) + { + case WM_CREATE: ReadRegistry(); hRC = InitOGLWindow(hWnd); - GetClientRect (hWnd, &WindowRect); + GetClientRect (hWnd, &WindowRect); width = WindowRect.right - WindowRect.left; height = WindowRect.bottom - WindowRect.top; InitOpenGL(width,height); SetTimer(hWnd, timer, 5, NULL); - break; + break; case WM_TIMER: hDC = GetDC(hWnd); Display(); SwapBuffers(hDC); ReleaseDC(hWnd, hDC); break; - case WM_DESTROY: + case WM_DESTROY: wglMakeCurrent(NULL, NULL); wglDeleteContext(hRC); break; - } + } return DefScreenSaverProc(hWnd, message, wParam, lParam); } -BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.def URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.def (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.def Mon Nov 19 13:04:29 2007 @@ -2,9 +2,9 @@ DESCRIPTION 'Lesson38Saver screen saver' -HEAPSIZE 1024 -STACKSIZE 4096 +HEAPSIZE 1024 +STACKSIZE 4096 -EXPORTS - ScreenSaverProc - ScreenSaverConfigureDialog +EXPORTS + ScreenSaverProc + ScreenSaverConfigureDialog Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Mon Nov 19 13:04:29 2007 @@ -10,4 +10,5 @@ #include <reactos/version.rc> +#include "lang/de-DE.rc" #include "lang/en-US.rc" Added: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc Mon Nov 19 13:04:29 2007 @@ -1,0 +1,97 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +#include "afxres.h" +#undef APSTUDIO_READONLY_SYMBOLS +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif + +IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Schmetterlinge Einstellungen" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,61,35,50,14 + CONTROL "Schmetterlinge rotieren",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,45,15,85,8 + PUSHBUTTON "Über",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Über" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Schmetterlinge",IDC_STATIC,7,7,135,9 + CTEXT "Demo von: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "Bildschirmschoner von: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DLG_SCREEN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 165 + TOPMARGIN, 7 + BOTTOMMARGIN, 50 + END + + IDD_DLG_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 142 + TOPMARGIN, 7 + BOTTOMMARGIN, 72 + END +END +#endif + + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif + +IDB_BUTTERFLY1 BITMAP DISCARDABLE "res/butterfly1.bmp" +IDB_BUTTERFLY2 BITMAP DISCARDABLE "res/butterfly2.bmp" +IDB_BUTTERFLY3 BITMAP DISCARDABLE "res/butterfly3.bmp" + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STR_DESCRIP "Schmetterlinge" +END + +#endif + +#ifndef APSTUDIO_INVOKED + +#endif Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc Mon Nov 19 13:04:29 2007 @@ -28,29 +28,29 @@ IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Butterflies Screen Saver Settings" +CAPTION "Butterflies ScreenSaver Settings" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,7,35,50,14 PUSHBUTTON "Cancel",IDCANCEL,61,35,50,14 - CONTROL "Rotate Butterflies",ROTATE,"Button",BS_AUTOCHECKBOX | + CONTROL "Rotate Butterflies",ROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,56,15,70,8 PUSHBUTTON "About",IDABOUT,115,35,50,14 END IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About " +CAPTION "About" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,48,58,56,14 - CTEXT "Lesson38Saver",IDC_STATIC,7,7,135,9 + CTEXT "Butterflies ScreenSaver",IDC_STATIC,7,7,135,9 CTEXT "Demo by: NeHe ",IDC_STATIC,7,20,135,8 - CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | NOT WS_GROUP - CTEXT "ScreenSaver by: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + CTEXT "ScreenSaver by: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT WS_GROUP - CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END @@ -61,7 +61,7 @@ // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_DLG_SCREEN, DIALOG BEGIN @@ -88,18 +88,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE DISCARDABLE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE DISCARDABLE BEGIN "\r\n" "\0" @@ -122,9 +122,9 @@ // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - IDS_STR_DESCRIP "Lesson38Saver" + IDS_STR_DESCRIP "Butterflies" END #endif // English (U.S.) resources Modified: trunk/rosapps/applications/screensavers/butterflies/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/resource.h (original) +++ trunk/rosapps/applications/screensavers/butterflies/resource.h Mon Nov 19 13:04:29 2007 @@ -16,7 +16,7 @@ #define IDD_DLG_SCREEN 2003 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 108

17 years, 1 month

[jimtabor] 30573: Add a test for VM address space when accessing user data.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 19 10:41:11 2007 New Revision: 30573 URL: http://svn.reactos.org/svn/reactos?rev=30573&view=rev Log: Add a test for VM address space when accessing user data. Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/misc/misc.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Mon Nov 19 10:41:11 2007 @@ -9,6 +9,7 @@ <library>kernel32</library> <library>advapi32</library> <library>win32ksys</library> + <library>pseh</library> <directory name="include"> <pch>precomp.h</pch> Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Mon Nov 19 10:41:11 2007 @@ -124,8 +124,25 @@ HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); if(pid == NULL || pid == CurrentProcessId) { - *UserData = Entry->UserData; - return TRUE; + // + // Need to test if we have Read & Write access to the VM address space. + // + BOOL Result = TRUE; + if(Entry->UserData) + { + volatile CHAR *Current = (volatile CHAR*)Entry->UserData; + _SEH_TRY + { + *Current = *Current; + } + _SEH_HANDLE + { + Result = FALSE; + } + _SEH_END + } + if (Result) *UserData = Entry->UserData; + return Result; } } SetLastError(ERROR_INVALID_PARAMETER);

17 years, 1 month

[jimtabor] 30572: Move gdi functions to dcattr. Tested Qemu with AbiWord.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 19 05:48:25 2007 New Revision: 30572 URL: http://svn.reactos.org/svn/reactos?rev=30572&view=rev Log: Move gdi functions to dcattr. Tested Qemu with AbiWord. Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Mon Nov 19 05:48:25 2007 @@ -194,13 +194,14 @@ return FALSE; } } +#endif PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; /* Check that graphics mode is GM_ADVANCED */ if ( Dc_Attr->iGraphicsMode != GM_ADVANCED ) return FALSE; -#endif + return NtGdiModifyWorldTransform(hDC, (CONST LPXFORM) Xform, iMode); } Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Mon Nov 19 05:48:25 2007 @@ -327,7 +327,6 @@ case GDI_OBJECT_TYPE_EXTPEN: case GDI_OBJECT_TYPE_PEN: { -#if 0 PBRUSH_ATTR Brh_Attr; PTEB pTeb; @@ -351,7 +350,6 @@ if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); return TRUE; } -#endif break; } case GDI_OBJECT_TYPE_BITMAP: @@ -750,13 +748,10 @@ HDC hdc ) { -//#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; return (COLORREF) Dc_Attr->ulPenClr; -//#endif - return NtUserGetDCBrushColor(hdc); } /* @@ -768,13 +763,10 @@ HDC hdc ) { -//#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return CLR_INVALID; return (COLORREF) Dc_Attr->ulPenClr; -//#endif - return NtUserGetDCPenColor(hdc); } /* @@ -787,7 +779,6 @@ COLORREF crColor ) { -//#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -804,8 +795,6 @@ } } return OldColor; -//#endif - return NtUserSetDCBrushColor(hdc, crColor); } /* @@ -818,7 +807,6 @@ COLORREF crColor ) { -//#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -835,8 +823,7 @@ } } return OldColor; -//#endif - return NtUserSetDCPenColor(hdc, crColor); +// return NtUserSetDCPenColor(hdc, crColor); } /* @@ -849,7 +836,6 @@ COLORREF crColor ) { -#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -883,8 +869,7 @@ Dc_Attr->crForegroundClr = crColor; } return OldColor; -#endif - return NtGdiSetTextColor(hdc, crColor); +// return NtGdiSetTextColor(hdc, crColor); } /* @@ -897,7 +882,6 @@ COLORREF crColor ) { -#if 0 PDC_ATTR Dc_Attr; COLORREF OldColor = CLR_INVALID; @@ -931,8 +915,7 @@ Dc_Attr->crBackgroundClr = crColor; } return OldColor; -#endif - return NtGdiSetBkColor(hdc, crColor); +// return NtGdiSetBkColor(hdc, crColor); } /* @@ -1087,22 +1070,18 @@ LPSIZE lpSize ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; if ( Dc_Attr->flXform & PAGE_EXTENTS_CHANGED ) // Something was updated, go to kernel. -#endif - return NtGdiGetDCPoint( hdc, GdiGetViewPortExt, (LPPOINT) lpSize ); -#if 0 + return NtGdiGetDCPoint( hdc, GdiGetViewPortExt, (LPPOINT) lpSize ); else { lpSize->cx = Dc_Attr->szlViewportExt.cx; lpSize->cy = Dc_Attr->szlViewportExt.cy; } return TRUE; -#endif } @@ -1113,16 +1092,13 @@ LPPOINT lpPoint ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; lpPoint->x = Dc_Attr->ptlViewportOrg.x; lpPoint->x = Dc_Attr->ptlViewportOrg.x; return TRUE; -#endif - // Do it this way for now. - return NtGdiGetDCPoint( hdc, GdiGetViewPortOrg, lpPoint ); + // return NtGdiGetDCPoint( hdc, GdiGetViewPortOrg, lpPoint ); } @@ -1133,16 +1109,13 @@ LPSIZE lpSize ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; lpSize->cx = Dc_Attr->szlWindowExt.cx; lpSize->cy = Dc_Attr->szlWindowExt.cy; return TRUE; -#endif - // Do it this way for now. - return NtGdiGetDCPoint( hdc, GdiGetWindowExt, (LPPOINT) lpSize ); + // return NtGdiGetDCPoint( hdc, GdiGetWindowExt, (LPPOINT) lpSize ); } @@ -1153,16 +1126,13 @@ LPPOINT lpPoint ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; lpPoint->x = Dc_Attr->ptlWindowOrg.x; lpPoint->x = Dc_Attr->ptlWindowOrg.x; return TRUE; -#endif - // Do it this way for now. - return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); + //return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); } /* FIXME: include correct header */ Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Mon Nov 19 05:48:25 2007 @@ -41,26 +41,26 @@ { PDC_ATTR Dc_Attr; + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam2( hDC, META_MOVETO, x, y); + else + { + PLDC pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + if (!EMFDRV_MoveTo( hDC, x, y)) return FALSE; + } + } + } + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam2( hDC, META_MOVETO, x, y); - else - { - PLDC pLDC = Dc_Attr->pvLDC; - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - if (!EMFDRV_MoveTo( hDC, x, y)) return FALSE; - } - } - } if ( Point ) { Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Mon Nov 19 05:48:25 2007 @@ -70,14 +70,11 @@ HDC hDc ) { -#if 0 PDC_ATTR Dc_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hDc, (PVOID) &Dc_Attr)) return 0; return Dc_Attr->lTextExtra; -#endif - // Do it this way for now. - return GetDCDWord( hDc, GdiGetTextCharExtra, 0); +// return GetDCDWord( hDc, GdiGetTextCharExtra, 0); } @@ -432,7 +429,7 @@ ) { INT cExtra = 0x80000000; -// PDC_ATTR Dc_Attr; + PDC_ATTR Dc_Attr; if (CharExtra == cExtra) { @@ -444,9 +441,10 @@ { return MFDRV_SetTextCharacterExtra( hDC, CharExtra ); // Wine port. } +#endif if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return cExtra; - if (NtCurrentTeb()->GdiTebBatch.HDC == hDC) + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hDC) { if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) { @@ -456,10 +454,8 @@ } cExtra = Dc_Attr->lTextExtra; Dc_Attr->lTextExtra = CharExtra; - return cExrta; -#endif -// Do this for now. - return GetAndSetDCDWord( hDC, GdiGetSetTextCharExtra, CharExtra, 0, 0, 0 ); -} - - + return cExtra; +// return GetAndSetDCDWord( hDC, GdiGetSetTextCharExtra, CharExtra, 0, 0, 0 ); +} + +

17 years, 1 month

[mpiulachs] 30571: Add butterfiles OpenGL screen saver to build

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Nov 19 04:26:33 2007 New Revision: 30571 URL: http://svn.reactos.org/svn/reactos?rev=30571&view=rev Log: Add butterfiles OpenGL screen saver to build Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/screensavers.rbuild (original) +++ trunk/rosapps/applications/screensavers/screensavers.rbuild Mon Nov 19 04:26:33 2007 @@ -16,4 +16,7 @@ <directory name="mazescr"> <xi:include href="mazescr/mazescr.rbuild" /> </directory> + <directory name="butterflies"> + <xi:include href="butterflies/butterflies.rbuild" /> + </directory> </group>

17 years, 1 month

[mpiulachs] 30570: Cool flying butterflies screen saver. It uses the new scrnsave library. All screen savers *should* be modified to use this library inset of replicating a large amount of code Original work by Jeff Molofee tutorials (http://nehe.gamedev.net) basically converted from C++ to C and adapted as a windows screensaver

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Nov 19 04:11:35 2007 New Revision: 30570 URL: http://svn.reactos.org/svn/reactos?rev=30570&view=rev Log: Cool flying butterflies screen saver. It uses the new scrnsave library. All screen savers *should* be modified to use this library inset of replicating a large amount of code Original work by Jeff Molofee tutorials (http://nehe.gamedev.net) basically converted from C++ to C and adapted as a windows screensaver Added: trunk/rosapps/applications/screensavers/butterflies/ trunk/rosapps/applications/screensavers/butterflies/butterflies.c (with props) trunk/rosapps/applications/screensavers/butterflies/butterflies.def (with props) trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild (with props) trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (with props) trunk/rosapps/applications/screensavers/butterflies/lang/ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (with props) trunk/rosapps/applications/screensavers/butterflies/res/ trunk/rosapps/applications/screensavers/butterflies/res/butterfly1.bmp (with props) trunk/rosapps/applications/screensavers/butterflies/res/butterfly2.bmp (with props) trunk/rosapps/applications/screensavers/butterflies/res/butterfly3.bmp (with props) trunk/rosapps/applications/screensavers/butterflies/resource.h (with props) Added: trunk/rosapps/applications/screensavers/butterflies/butterflies.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.c (added) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.c Mon Nov 19 04:11:35 2007 @@ -1,0 +1,336 @@ +#include <windows.h> +#include <scrnsave.h> +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <GL/gl.h> +#include <GL/glu.h> +#include "resource.h" + +/* missing declare from gl.h */ +#define GL_BGR_EXT 0x80E0 + +HINSTANCE hInstance; // Holds The Instance Of The Application + +GLuint texture[3]; //stores texture objects and display list + +LPCTSTR registryPath = ("Software\\tHaPuTeRProductions\\Lesson38Saver"); +BOOL dRotate; + + +struct object // Create A Structure Called Object +{ + int tex; // Integer Used To Select Our Texture + float x; // X Position + float y; // Y Position + float z; // Z Position + float yi; // Y Increase Speed (Fall Speed) + float spinz; // Z Axis Spin + float spinzi; // Z Axis Spin Speed + float flap; // Flapping Triangles :) + float fi; // Flap Direction (Increase Value) +}; + +struct object obj[50]; +//object obj[50]; // Create 50 Objects Using The Object Structure + +void SetDefaults() +{ + dRotate = TRUE; +} + +void ReadRegistry(){ + LONG result; + HKEY skey; + DWORD valtype, valsize, val; + + SetDefaults(); + + result = RegOpenKeyEx(HKEY_CURRENT_USER, registryPath, 0, KEY_READ, &skey); + if(result != ERROR_SUCCESS) + return; + + valsize=sizeof(val); + + result = RegQueryValueEx(skey, "Rotate", 0, &valtype, (LPBYTE)&val, &valsize); + if(result == ERROR_SUCCESS) + dRotate = val; + RegCloseKey(skey); +} + +void WriteRegistry(){ + LONG result; + HKEY skey; + DWORD val, disp; + + result = RegCreateKeyEx(HKEY_CURRENT_USER, registryPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey, &disp); + if(result != ERROR_SUCCESS) + return; + + val = dRotate; + RegSetValueEx(skey, "Rotate", 0, REG_DWORD, (CONST BYTE*)&val, sizeof(val)); + + RegCloseKey(skey); +} + +void SetObject(int loop) // Sets The Initial Value Of Each Object (Random) +{ + obj[loop].tex=rand()%3; // Texture Can Be One Of 3 Textures + obj[loop].x=rand()%34-17.0f; // Random x Value From -17.0f To 17.0f + obj[loop].y=18.0f; // Set y Position To 18 (Off Top Of Screen) + obj[loop].z=-((rand()%30000/1000.0f)+10.0f); // z Is A Random Value From -10.0f To -40.0f + obj[loop].spinzi=(rand()%10000)/5000.0f-1.0f; // spinzi Is A Random Value From -1.0f To 1.0f + obj[loop].flap=0.0f; // flap Starts Off At 0.0f; + obj[loop].fi=0.05f+(rand()%100)/1000.0f; // fi Is A Random Value From 0.05f To 0.15f + obj[loop].yi=0.001f+(rand()%1000)/10000.0f; // yi Is A Random Value From 0.001f To 0.101f +} + +void LoadGLTextures() // Creates Textures From Bitmaps In The Resource File +{ + HBITMAP hBMP; // Handle Of The Bitmap + BITMAP BMP; // Bitmap Structure + int loop; + + // The ID Of The 3 Bitmap Images We Want To Load From The Resource File + byte Texture[]={ IDB_BUTTERFLY1, IDB_BUTTERFLY2, IDB_BUTTERFLY3 }; + + glGenTextures(sizeof(Texture), &texture[0]); // Generate 3 Textures (sizeof(Texture)=3 ID's) + for (loop=0; loop<sizeof(Texture); loop++) // Loop Through All The ID's (Bitmap Images) + { + hBMP=(HBITMAP)LoadImage(GetModuleHandle(NULL),MAKEINTRESOURCE(Texture[loop]), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + if (hBMP) // Does The Bitmap Exist? + { // If So... + GetObject(hBMP,sizeof(BMP), &BMP); // Get The Object + // hBMP: Handle To Graphics Object + // sizeof(BMP): Size Of Buffer For Object Information + // Buffer For Object Information + glPixelStorei(GL_UNPACK_ALIGNMENT,4); // Pixel Storage Mode (Word Alignment / 4 Bytes) + glBindTexture(GL_TEXTURE_2D, texture[loop]); // Bind Our Texture + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); // Linear Filtering + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); // Mipmap Linear Filtering + + // Generate Mipmapped Texture (3 Bytes, Width, Height And Data From The BMP) + gluBuild2DMipmaps(GL_TEXTURE_2D, 3, BMP.bmWidth, BMP.bmHeight, GL_BGR_EXT, GL_UNSIGNED_BYTE, BMP.bmBits); + } + } +} + +HGLRC InitOGLWindow(HWND hWnd) +{ + HDC hDC = GetDC(hWnd); + HGLRC hRC = 0; + PIXELFORMATDESCRIPTOR pfd; + int nFormat; + + ZeroMemory(&pfd, sizeof(PIXELFORMATDESCRIPTOR)); + + pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR); + pfd.nVersion = 1; + pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER; + pfd.cColorBits = 24; + pfd.cDepthBits = 24; + + nFormat = ChoosePixelFormat(hDC, &pfd); + DescribePixelFormat(hDC, nFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + SetPixelFormat(hDC, nFormat, &pfd); + + hRC = wglCreateContext(hDC); + wglMakeCurrent(hDC, hRC); + + ReleaseDC(hWnd, hDC); + + return hRC; +} + +void InitOpenGL(GLsizei width, GLsizei height) +{ + int loop; + + if (height==0) // Prevent A Divide By Zero By + { + height=1; // Making Height Equal One + } + + glViewport(0,0,width,height); // Reset The Current Viewport + + glMatrixMode(GL_PROJECTION); // Select The Projection Matrix + glLoadIdentity(); // Reset The Projection Matrix + + // Calculate The Aspect Ratio Of The Window + gluPerspective (45.0f, (GLfloat)(width)/(GLfloat)(height),1.0f, 1000.0f); + + glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix + glLoadIdentity(); + // Start Of User Initialization + LoadGLTextures(); // Load The Textures From Our Resource File + + glClearColor (0.0f, 0.0f, 0.0f, 0.5f); // Black Background + glClearDepth (1.0f); // Depth Buffer Setup + glDepthFunc (GL_LEQUAL); // The Type Of Depth Testing (Less Or Equal) + glDisable(GL_DEPTH_TEST); // Disable Depth Testing + glShadeModel (GL_SMOOTH); // Select Smooth Shading + glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // Set Perspective Calculations To Most Accurate + glEnable(GL_TEXTURE_2D); // Enable Texture Mapping + glBlendFunc(GL_ONE,GL_SRC_ALPHA); // Set Blending Mode (Cheap / Quick) + glEnable(GL_BLEND); + + + for (loop=0; loop<50; loop++) // Loop To Initialize 50 Objects + { + SetObject(loop); // Call SetObject To Assign New Random Values + } + +} + +void Display() +{ + int loop; + glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear Screen And Depth Buffer + + for (loop=0; loop<50; loop++) // Loop Of 50 (Draw 50 Objects) + { + glLoadIdentity (); // Reset The Modelview Matrix + glBindTexture(GL_TEXTURE_2D, texture[obj[loop].tex]); // Bind Our Texture + glTranslatef(obj[loop].x,obj[loop].y,obj[loop].z); // Position The Object + glRotatef(45.0f,1.0f,0.0f,0.0f); // Rotate On The X-Axis + if (dRotate) + { + glRotatef((obj[loop].spinz),0.0f,0.0f,1.0f); // Spin On The Z-Axis + } + glBegin(GL_TRIANGLES); // Begin Drawing Triangles + // First Triangle _____ + glTexCoord2f(1.0f,1.0f); glVertex3f( 1.0f, 1.0f, 0.0f); // (2)| / (1) + glTexCoord2f(0.0f,1.0f); glVertex3f(-1.0f, 1.0f, obj[loop].flap); // | / + glTexCoord2f(0.0f,0.0f); glVertex3f(-1.0f,-1.0f, 0.0f); // (3)|/ + + // Second Triangle + glTexCoord2f(1.0f,1.0f); glVertex3f( 1.0f, 1.0f, 0.0f); // /|(1) + glTexCoord2f(0.0f,0.0f); glVertex3f(-1.0f,-1.0f, 0.0f); // / | + glTexCoord2f(1.0f,0.0f); glVertex3f( 1.0f,-1.0f, obj[loop].flap); // (2)/____|(3) + + glEnd(); // Done Drawing Triangles + + obj[loop].y-=obj[loop].yi; // Move Object Down The Screen + obj[loop].spinz+=obj[loop].spinzi; // Increase Z Rotation By spinzi + obj[loop].flap+=obj[loop].fi; // Increase flap Value By fi + + if (obj[loop].y<-18.0f) // Is Object Off The Screen? + { + SetObject(loop); // If So, Reassign New Values + } + + if ((obj[loop].flap>1.0f) || (obj[loop].flap<-1.0f)) // Time To Change Flap Direction? + { + obj[loop].fi=-obj[loop].fi; // Change Direction By Making fi = -fi + } + } + + Sleep(15); // Create A Short Delay (15 Milliseconds) + + glFlush (); + +} + +BOOL AboutProc(HWND hdlg, UINT msg, WPARAM wpm, LPARAM lpm){ + /* + switch(msg){ + case WM_CTLCOLORSTATIC: + if(HWND(lpm) == GetDlgItem(hdlg, WEBPAGE1)) + { + SetTextColor(HDC(wpm), RGB(0,0,255)); + SetBkColor(HDC(wpm), COLORREF(GetSysColor(COLOR_3DFACE))); + return(int(GetSysColorBrush(COLOR_3DFACE))); + } + if(HWND(lpm) == GetDlgItem(hdlg, WEBPAGE2)) + { + SetTextColor(HDC(wpm), RGB(0,0,255)); + SetBkColor(HDC(wpm), COLORREF(GetSysColor(COLOR_3DFACE))); + return(int(GetSysColorBrush(COLOR_3DFACE))); + } + break; + case WM_COMMAND: + switch(LOWORD(wpm)){ + case IDOK: + EndDialog(hdlg, LOWORD(wpm)); + break; + case WEBPAGE1: + ShellExecute(NULL, "open", "http://nehe.gamedev.net", NULL, NULL, SW_SHOWNORMAL); + break; + case WEBPAGE2: + ShellExecute(NULL, "open", "http://www.thaputer.com", NULL, NULL, SW_SHOWNORMAL); + break; + } + }*/ + return FALSE; +} + +LRESULT WINAPI ScreenSaverProc(HWND hWnd, UINT message, + WPARAM wParam, LPARAM lParam) +{ + static HGLRC hRC; + static DWORD timer = 1; + HDC hDC; + RECT WindowRect; + int width; + int height; + + switch (message) + { + case WM_CREATE: + ReadRegistry(); + hRC = InitOGLWindow(hWnd); + GetClientRect (hWnd, &WindowRect); + width = WindowRect.right - WindowRect.left; + height = WindowRect.bottom - WindowRect.top; + InitOpenGL(width,height); + SetTimer(hWnd, timer, 5, NULL); + break; + case WM_TIMER: + hDC = GetDC(hWnd); + Display(); + SwapBuffers(hDC); + ReleaseDC(hWnd, hDC); + break; + case WM_DESTROY: + wglMakeCurrent(NULL, NULL); + wglDeleteContext(hRC); + break; + } + + return DefScreenSaverProc(hWnd, message, wParam, lParam); +} + +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, + WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + ReadRegistry(); + CheckDlgButton(hDlg, ROTATE, dRotate); + return TRUE; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + dRotate = (IsDlgButtonChecked(hDlg, ROTATE) == BST_CHECKED); + WriteRegistry(); + EndDialog(hDlg, TRUE); + return TRUE; + case IDCANCEL: + EndDialog(hDlg, TRUE); + break; + case IDABOUT: + //DialogBox(hInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hDlg, DLGPROC(AboutProc)); + break; + } + } + + return FALSE; +} + +BOOL WINAPI RegisterDialogClasses(HANDLE hInst) +{ + return TRUE; +} + Propchange: trunk/rosapps/applications/screensavers/butterflies/butterflies.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/butterflies.def URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.def (added) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.def Mon Nov 19 04:11:35 2007 @@ -1,0 +1,10 @@ +NAME LESSON38SAVER.SCR + +DESCRIPTION 'Lesson38Saver screen saver' + +HEAPSIZE 1024 +STACKSIZE 4096 + +EXPORTS + ScreenSaverProc + ScreenSaverConfigureDialog Propchange: trunk/rosapps/applications/screensavers/butterflies/butterflies.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild (added) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild Mon Nov 19 04:11:35 2007 @@ -1,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" allowwarnings="true"> + <importlibrary definition="butterflies.def" /> + <include base="butterflies">.</include> + <library>scrnsavelib</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>opengl32</library> + <library>glu32</library> + <library>advapi32</library> + + <metadata description = "Butterflies screensaver" /> + + <file>butterflies.c</file> + <file>butterflies.rc</file> +</module> Propchange: trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Mon Nov 19 04:11:35 2007 @@ -1,0 +1,13 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Butterflies ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "butterflies\0" +#define REACTOS_STR_ORIGINAL_FILENAME "butterflies.scr\0" + +#include <reactos/version.rc> + +#include "lang/en-US.rc" Propchange: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc Mon Nov 19 04:11:35 2007 @@ -1,0 +1,144 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Butterflies Screen Saver Settings" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Cancel",IDCANCEL,61,35,50,14 + CONTROL "Rotate Butterflies",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "About",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About " +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Lesson38Saver",IDC_STATIC,7,7,135,9 + CTEXT "Demo by: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "ScreenSaver by: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DLG_SCREEN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 165 + TOPMARGIN, 7 + BOTTOMMARGIN, 50 + END + + IDD_DLG_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 142 + TOPMARGIN, 7 + BOTTOMMARGIN, 72 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BUTTERFLY1 BITMAP DISCARDABLE "res/butterfly1.bmp" +IDB_BUTTERFLY2 BITMAP DISCARDABLE "res/butterfly2.bmp" +IDB_BUTTERFLY3 BITMAP DISCARDABLE "res/butterfly3.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STR_DESCRIP "Lesson38Saver" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/res/butterfly1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/butterflies/res/butterfly1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/screensavers/butterflies/res/butterfly2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/butterflies/res/butterfly2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/screensavers/butterflies/res/butterfly3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/butterflies/res/butterfly3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/applications/screensavers/butterflies/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/resource.h (added) +++ trunk/rosapps/applications/screensavers/butterflies/resource.h Mon Nov 19 04:11:35 2007 @@ -1,0 +1,27 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by Lesson38Saver.rc +// +#define IDS_STR_DESCRIP 1 +#define IDABOUT 3 +#define IDI_ICON_SCREEN 100 +#define IDB_BUTTERFLY1 103 +#define IDB_BUTTERFLY2 104 +#define IDB_BUTTERFLY3 105 +#define IDI_ICON 106 +#define IDD_DLG_ABOUT 107 +#define ROTATE 1000 +#define WEBPAGE1 1001 +#define WEBPAGE2 1002 +#define IDD_DLG_SCREEN 2003 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 108 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 106 +#endif +#endif Propchange: trunk/rosapps/applications/screensavers/butterflies/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 1 month

← Newer
1
...
32
33
34
35
36
37
38
...
89
Older →

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

Ros-diffs November 2007