Ros-diffs March 2006

ros-diffs@reactos.org

2 participants
67 discussions

[fireball] 21421: - Translation of cpl/intl, liccpa, sysdm to Russian language by Lentin (lentind at yandex dot ru). - Proofread/edited by me
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: fireball Date: Fri Mar 31 00:50:27 2006 New Revision: 21421 URL: http://svn.reactos.ru/svn/reactos?rev=21421&view=rev Log: - Translation of cpl/intl, liccpa, sysdm to Russian language by Lentin (lentind at yandex dot ru). - Proofread/edited by me Added: trunk/reactos/dll/cpl/intl/ru.rc (with props) trunk/reactos/dll/cpl/liccpa/Ru.rc (with props) trunk/reactos/dll/cpl/sysdm/ru.rc (with props) Modified: trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc (original) +++ trunk/reactos/dll/cpl/intl/intl.rc Fri Mar 31 00:50:27 2006 @@ -30,4 +30,4 @@ #include "Ja.rc" #include "hu.rc" #include "Fr.rc" - +#include "Ru.rc" Added: trunk/reactos/dll/cpl/intl/ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl/ru.rc?rev=2142… ============================================================================== --- trunk/reactos/dll/cpl/intl/ru.rc (added) +++ trunk/reactos/dll/cpl/intl/ru.rc Fri Mar 31 00:50:27 2006 @@ -1,0 +1,82 @@ +/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âêëàäêà 1",-1,73,74,90,8 +END + + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "×èñëà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âêëàäêà 2",-1,73,74,90,8 +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Äåíåæíàÿ åäèíèöà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âêëàäêà 3",-1,73,74,90,8 +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Âðåìÿ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Îôîðìëåíèå", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Îáðàçåö:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Ôîðìàò âðåìåíè:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Ðàçäåëèòåëü êîìïîíåíòîâ âðåìåíè:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Î&áîçíà÷åíèå âðåìåíè äî ïîëóäíÿ (AM):", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Îáî&çíà÷åíèå âðåìåíè ïîñëå ïîëóäíÿ (PM):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE + LTEXT "Îáîçíà÷åíèå ôîðìàòà âðåìåíè\n\n\ +h = ÷àñ m = ìèíóòà s = ñåêóíäà t = am èëè pm\n\n\ +h = 12 ÷àñîâ H = 24 ÷àñà\n\ +hh, mm, ss = ñ âûâîäîì íóëåé â íà÷àëå h, m, s = áåç âûâîäà íóëåé", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Äàòà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âêëàäêà 5",-1,73,74,90,8 +END + + +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ßçûêè è ðàñêëàäêè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Ðåãèîíàëüíûå íàñòðîéêè" + IDS_CPLDESCRIPTION "Âûáåðèòå ÿçûêè è ôîðìàò ÷èñåë, äåíåæíûõ åäèíèö, âðåìåíè è äàòû." +END Propchange: trunk/reactos/dll/cpl/intl/ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/liccpa/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/liccpa/Ru.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/Ru.rc (added) +++ trunk/reactos/dll/cpl/liccpa/Ru.rc Fri Mar 31 00:50:27 2006 @@ -1,0 +1,27 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 +STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU +CAPTION "Âûáîð âàðèàíòîâ ëèöåíçèðîâàíèÿ" +FONT 8, "Helv" +BEGIN + CONTROL "Âàðèàíò êëèåíòñêîé ëèöåíçèè", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "Íà óñòðîéñòâî èëè íà ïîëüçîâàòåëÿ", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12 + CONTROL "Íà ñåðâåð. ×èñëî îäíîâðåìåííûõ ïîäêëþ÷åíèé:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "Ïðîäóêò:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 + CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 + CONTROL "OK", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 + CONTROL "Îòìåíà", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 + CONTROL "Ñïðàâêà", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 + CONTROL "Ðåïëèêàöèÿ...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 + CONTROL "Äîáàâèòü ëèöåíçèè", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 + CONTROL "Óäàëèòü ëèöåíçèè", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Ìåíåäæåð ëèöåíçèé" + IDS_CPLDESCRIPTION_1 "Ìåíåäæåð ëèöåíçèé" + IDS_REACTOS "ReactOS - Ñâîáîäíîå ïðîãðàììíîå îáåñïå÷åíèå" +END Propchange: trunk/reactos/dll/cpl/liccpa/Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?re… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.rc (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.rc Fri Mar 31 00:50:27 2006 @@ -16,3 +16,4 @@ #include "De.rc" #include "Ja.rc" #include "Es.rc" +#include "Ru.rc" Added: trunk/reactos/dll/cpl/sysdm/ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/sysdm/ru.rc?rev=214… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/ru.rc (added) +++ trunk/reactos/dll/cpl/sysdm/ru.rc Fri Mar 31 00:50:27 2006 @@ -1,0 +1,172 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL + +RC_LICENSE RTDATA "resources/gpl.txt" + +IDD_PROPPAGEGENERAL 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 "Îïåðàöèîííàÿ ñèñòåìà",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Âåðñèÿ " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + LTEXT "Êîìïüþòåð",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(9),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHEETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY +END + +IDD_PROPPAGECOMPUTER 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_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "ReactOS èñïîëüçóåò ñëåäóþùóþ èíôîðìàöèþ, ÷òîáû èíäåíòèôèöèðîâàòü âàø êîìïüþòåð â ñåòè.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Ïîëíîå èìÿ êîìïüþòåðà:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LABELLINE(4)-4 + LTEXT "(ïî óìîë÷àíèþ)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABELLINE(4)-5 + LTEXT "Ðàáî÷àÿ ãðàïïà:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROPSHEETPADDING,LABELLINE(6)-6 + LTEXT "(ïóñòî)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60,LABELLINE(6)-6 + LTEXT "Èñïîëüçóéòå Ìàñòåð ñåòåâîé èíäåíòèôèêàöèè, ÷òîáû ïðèñîåäèíèòüñÿ ê äîìåíó è ñîçäàòü ëîêàëüíîãî ïîëüçîâàòåëÿ, íàæìèòå êíîïêó Èíäåíòèôèêàöèÿ.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(8)+5 + PUSHBUTTON "&Èíäåíòèôèêàöèÿ...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 + LTEXT "×òîáû ïåðåèìåíîâàòü êîìïüþòåð èëè ïðèñîåäèíèòüñÿ ê äîìåíó, íàæìèòå êíîïêó Ñâîéñòâà",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 + PUSHBUTTON "&Ñâîéñòâà...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4 +END + +IDD_PROPPAGEHARDWARE 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 + GROUPBOX "Ìàñòåð îáîðóäîâàíèÿ",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Ìàñòåð îáîðóäîâàíèÿ ïîìîãàåò óñòàíîâèòü, âîñòàíîâèòü, îòêëþ÷èòü èëè èçâëå÷ü ëþáîå óñòðîéñòâî, à òàêæå íàñòðîèòü åãî.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + PUSHBUTTON "&Ìàñòåð îáîðóäîâàíèÿ...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Äèñïåò÷åð óñòðîéñòâ",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2 + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Äèñïåò÷åð óñòðîéñòâ ïðèâîäèò ñïèñîê âñåãî óñòàíîâëåííîãî îáîðóäîâàíèÿ íà äàííîì êîìïüþòåðå è ïîçâîëÿåò èçìåíèòü ñâîéñòâà ëþáîãî óñòðîéñòâà.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "&Äèñïåò÷åð óñòðîéñòâ...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Ïðîôèëè îáîðóäîâàíèÿ",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Ïðîôèëè îáîðóäîâàíèÿ ïîìîãàþò óñòàíàâëèâàòü è õðàíèòü ðàçëè÷íûå êîíôèãóðàöèè îáîðóäîâàíèÿ.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Ïðîôèëè îáîðóäîâàíèÿ...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14 +END + +IDD_PROPPAGEUSERPROFILE 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_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Ïðîôèëü ïîëüçîâàòåëÿ ñîäåðæèò íàñòðîéêè ðàáî÷åãî ñòîëà è äðóãèå ñâåäåíèÿ, èñïîëüçóåìûå ïðè âõîäå â ñèñòåìó. Ìîæíî ñîçäàòü ðàçëè÷íûå ïðîôèëè íà ðàçíûõ êîìïüþòåðàõ äëÿ îäíîãî ïîëüçîâàòåëÿ èëè èñïîëüçîâàòü îäèí îáùèé ïðîôèëü.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) + LTEXT "Ïðîôèëè, õðàíÿùèåñÿ íà ýòîì êîìïüþòåðå:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABELLINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTEDGE + + PUSHBUTTON "Óäàëèòü",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "Ñìåíèòü òèï...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "Êîïèðîâàòü...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING-60,LABELLINE(20),60,LABELLINE(1)+2 +END + +IDD_PROPPAGEADVANCED 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 + GROUPBOX "Áûñòðîäåéñòâèå",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Ïàðàìåòðû áåñòðîäåéñòâèÿ îïðåäåëÿþò, êàê ïðèëîæåíèÿ èñïîëüçóþò ïàìÿòü, ÷òî âëèÿåò íà ñêîðîñòü ðàáîòû êîìïüþòåðà.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Ïàðàìåòðû áûñòðîäåéñòâèÿ...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Ïåðåìåííûå ñðåäû",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Ïî ïåðåìåííûì ñðåäû îïðåäåëÿåòñÿ, ãäå õðàíèòñÿ íåîáõîäèìàÿ èíôîðìàöèÿ.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Ï&åðåìåííûå ñðåäû...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(12)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Çàãðóçêà è âîñòàíîâëåíèå",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Ïàðàìåòðû çàãðóçêè è âîñòàíîâëåíèÿ îïðåäåëÿþò äåéñòâèÿ, âûïîëíÿåìûå ïðè çàïóñêå êîìïüþòåðà èëè ïðè îñòàíîâêå, âûçâàííîé êàêîé-íèáóäü îøèáêîé.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Çàãðóçêà è âîñòàíîâëåíèå...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(19)+2,(18*PROPSHEETPADDING),14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Âèðòóàëüíàÿ ïàìÿòü" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + CONTROL "",IDC_PAGEFILELIST,"ListBox",0x50010141,10,16,204,52,0x00000200 + LTEXT "Äèñê [ìåòêà òîìà]", -1, 12, 5, 96, 9 + LTEXT "Ôàéë ïîäêà÷êè (MB)", -1, 114, 5, 100, 9 + CONTROL "Ðàçìåð ôàéëà ïîäêà÷êè äëÿ âûáðàííîãî äèñêà",IDC_DRIVEGROUP,"Button",0x50000007,10,70,204,104 + LTEXT "", IDC_DRIVE, 20, 84, 100, 9 + LTEXT "", IDC_SPACEAVAIL, 20, 94, 112, 8 + CONTROL "Çàäàòü",IDC_CUSTOM,"Button",0x50010009,20,105,54,9 + CONTROL "",IDC_INITIALSIZE,"Edit",0x50010000,100,114,44,13,0x00000200 + CONTROL "",IDC_MAXSIZE,"Edit",0x50010000,100,129,44,13,0x00000200 + LTEXT "Èñõîäíûé ðàçìåð (MB):", -1 ,22,118,54,9 + LTEXT "Ìàêñèìàëüíûé ðàçìåð (MB):", -1 ,22,131,64,9 + CONTROL "Ðàçìåð ïî âûáîðó ñèñòåìû",IDC_SYSMANSIZE,"Button",0x50010009,20,145,88,9 + CONTROL "Áåç ôàéëà ïîäêà÷êè",IDC_NOPAGEFILE,"Button",0x50010009,20,158,78,9 + PUSHBUTTON "Óñòàíîâèòü",IDC_SET, 158, 155, 50, 13 + CONTROL "Îáùèé îáúåì ôàéëà ïîäêà÷êè íà âñåõ äèñêàõ", IDC_TOTALGROUP, "Button", 0x50000007, 10, 179, 204, 46 + PUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "Îòìåíà", IDCANCEL, 168, 232, 48, 13 + LTEXT "", IDC_MINIMUM, 18, 200, 100, 9 + LTEXT "", IDC_RECOMMENDED, 18, 200, 100, 9 + LTEXT "", IDC_CURRENT, 18, 200, 100, 9 +END + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïåðåìííûå ñðåäû" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Ïåðåìåííûå ïîëüçîâàòåëÿ",-1,7,12,238,100 + LTEXT "&Ïåðåìåííûå:",-1,14,24,224,8 + CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Ñîçäàòü...",IDC_USER_VARIABLE_NEW,80,90,50,14 + PUSHBUTTON "&Èçìåíèòü...",IDC_USER_VARIABLE_EDIT,134,90,50,14 + PUSHBUTTON "&Óäàëèòü",IDC_USER_VARIABLE_DELETE,188,90,50,14 + + GROUPBOX "Ñèñòåìíûå ïåðåìåííûå",-1,7,116,238,100 + LTEXT "Ï&åðåìåííûå:",-1,14,128,224,8 + CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "Ñ&îçäàòü...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 + PUSHBUTTON "È&çìåíèòü...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "Ó&äàëèòü",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 + + DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP + PUSHBUTTON "Îòìåíà",IDCANCEL,195,224,50,14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èçìåíåíèå ïåðåìåííîé" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Èì&ÿ ïåðåìåííîé:",-1,7,14,50,8 + EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL + LTEXT "Çíà÷åíèå ïåðåìåí&íîé:",-1,7,32,50,8 + EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP + PUSHBUTTON "Îòìåíà",IDCANCEL,170,50,50,14 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "Ñèñòåìà" + IDS_CPLSYSTEMDESCRIPTION "Ïðîñìîòð èíôîðìàöèè î âàøåì êîìïüþòåðå è èçìåíåíèå ðàçëè÷íûõ ñèñòåìíûõ è àïïàðàòíûõ ïàðàìåòðîâ." + IDS_DRIVE "Äèñê: %s" + IDS_SPACE "Ñâîáîäíîå ìåñòî: %s" + IDS_MIN "Ìèíèìàëüíî âîçìîæíîå: %s" + IDS_REC "Ðåêîìåíäîâàííîå: %s" + IDS_CUR "Òåêóùåå: %s" +END Propchange: trunk/reactos/dll/cpl/sysdm/ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Fri Mar 31 00:50:27 2006 @@ -25,4 +25,4 @@ #include "es.rc" #include "Ja.rc" #include "hu.rc" - +#include "ru.rc"

1 0

[fireball] 21420: - Translation of expand and regsvr32 to Russian language by Lentin. - Proofread/edited by me
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: fireball Date: Fri Mar 31 00:39:33 2006 New Revision: 21420 URL: http://svn.reactos.ru/svn/reactos?rev=21420&view=rev Log: - Translation of expand and regsvr32 to Russian language by Lentin. - Proofread/edited by me Added: trunk/reactos/base/system/expand/Ru.rc (with props) trunk/reactos/base/system/regsvr32/Ru.rc (with props) Modified: trunk/reactos/base/system/expand/expand.rc trunk/reactos/base/system/regsvr32/regsvr32.rc Added: trunk/reactos/base/system/expand/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/expand/Ru.rc?re… ============================================================================== --- trunk/reactos/base/system/expand/Ru.rc (added) +++ trunk/reactos/base/system/expand/Ru.rc Fri Mar 31 00:39:33 2006 @@ -1,0 +1,12 @@ +#include "resource.h" + +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_Copy, "Óòèëèòà ðàñïàêîâêè ôàéëîâ ReactOS, âåðñèÿ 1.0\n\ +Copyright Victor Schneider 1997\n\n\ +Èñïîëüçîâàíèå: %s èñõîäíûé_ôàéë [âûõîäíîé_ôàéë]\n" + +IDS_FAILS "Íå óäàëîñü âûïîëíèòü LZCopy, âîçâðàùåíî: %ld\n" +} Propchange: trunk/reactos/base/system/expand/Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/expand/expand.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/expand/expand.r… ============================================================================== --- trunk/reactos/base/system/expand/expand.rc (original) +++ trunk/reactos/base/system/expand/expand.rc Fri Mar 31 00:39:33 2006 @@ -8,5 +8,6 @@ #include "De.rc" #include "Fr.rc" #include "Ja.rc" +#include "Ru.rc" #include "Sv.rc" #include "Hu.rc" Added: trunk/reactos/base/system/regsvr32/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/regsvr32/Ru.rc?… ============================================================================== --- trunk/reactos/base/system/regsvr32/Ru.rc (added) +++ trunk/reactos/base/system/regsvr32/Ru.rc Fri Mar 31 00:39:33 2006 @@ -1,0 +1,28 @@ +#include "resource.h" + +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nÈñïîëüçîâàíèå: regsvr32 [/u] [/s] [/c] [/n] [/i[:ïàðàìåòð]] èìÿ_dll\n\ +/u - Îòìåíà ðåãèñòðàöèè ñåðâåðà\n\ +/s - Òèõèé; íå îòîáðàæàòü îêîí ñîîáùåíèé\n\ +/c - Âûâîä â êîíñîëü\n\ +/i - Âûçûâàåò DllInstall ñ äîïîëíèòåëüíûì ïàðàìåòðîì [ïàðàìåòð]; Ïðè èñïîëüçîâàíèè êëþ÷à /u âûçûâàåò DllUninstall\n\ +/n - Íå âûçûâàåò DllRegisterServer; ýòà îïöèÿ äîëæíà èñïîëüçîâàòüñÿ ñ /i" + +IDS_NoDllSpecified, "Íå óêàçàíî èìÿ DLL." + +IDS_InvalidFlag, "Íåèçâåñòíûé ïàðàìåòð: %s" + +IDS_SwitchN_NoI, "Íåèçâåñòíûé ïàðàìåòð: /n äîëæåí èñïîëüçîâàòüñÿ ñîâìåñòíî ñ ïàðàìåòðîì /i" + +IDS_DllNotLoaded, "LoadLibrary('%s') çàâåðøèëñÿ íåóäà÷åé.\nGetLastError âîçâðàùàåò 0x%08x." + +IDS_MissingEntry, "%s áûë çàãðóæåí, íî òî÷êà âõîäà %s íå íàéäåíà.\n\n\ +%s ìîæåò áûòü íåýêñïîðòèðóåìîé èëè ïîâðåæäåííàÿ âåðñèÿ %s íàõîäèòñÿ â ïàìÿòè. Èñïîëüçóéòå PView, ÷òîáû îáíàðóæèòü è óäàëèòü åãî." + +IDS_FailureMessage, "%s â %s çàâåðøèëñÿ íåóäà÷åé.\nÂîçâðàùåííûé êîä: 0x%08x" + +IDS_SuccessMessage "%s â %s óñïåøíî çàâåðøåíî." +} Propchange: trunk/reactos/base/system/regsvr32/Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/regsvr32/regsvr32.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/regsvr32/regsvr… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.rc (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.rc Fri Mar 31 00:39:33 2006 @@ -10,4 +10,5 @@ #include "En.rc" #include "Fr.rc" #include "Hu.rc" +#include "Ru.rc" #include "Ja.rc"

1 0

[tretiakov] 21419: Implement NDRCContextUnmarshall()
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: tretiakov Date: Thu Mar 30 23:07:08 2006 New Revision: 21419 URL: http://svn.reactos.ru/svn/reactos?rev=21419&view=rev Log: Implement NDRCContextUnmarshall() Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsha… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Thu Mar 30 23:07:08 2006 @@ -3233,10 +3233,10 @@ /*********************************************************************** * NDRCContextMarshall */ -void WINAPI NDRCContextMarshall(IN NDR_CCONTEXT CContext, OUT void *pBuff ) +void WINAPI NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff ) { CContextHandle *ctx = (CContextHandle*)CContext; - memcpy(pBuff, ctx->Ndr, sizeof(ctx->Ndr)); + memcpy(pBuff, ctx->Ndr, 20); } /*********************************************************************** @@ -3254,6 +3254,45 @@ pStubMsg->Buffer += 20; +} + + +/*********************************************************************** + * NDRCContextUnmarshall + */ +void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, + RPC_BINDING_HANDLE hBinding, + void *pBuff, + unsigned long DataRepresentation ) +{ + CContextHandle *ctx; + RPC_STATUS status; + char *buf = (char*)pBuff; + int i; + + for(i = 0; i < 20 && !buf[i]; i++); + + if(i == 20) + { + ctx = (CContextHandle*)*pCContext; + if(ctx) + { + RPCRT4_DestroyBinding(ctx->Binding); + HeapFree(GetProcessHeap(), 0, ctx); + } + *pCContext = NULL; + } + else + { + ctx = HeapAlloc(GetProcessHeap(), 0, sizeof(CContextHandle)); + if(!ctx) RpcRaiseException(ERROR_OUTOFMEMORY); + + status = RpcBindingCopy(hBinding, (RPC_BINDING_HANDLE*) &ctx->Binding); + if(status != RPC_S_OK) RpcRaiseException(status); + + memcpy(ctx->Ndr, pBuff, 20); + *pCContext = (NDR_CCONTEXT)ctx; + } } /*********************************************************************** Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.spe… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Thu Mar 30 23:07:08 2006 @@ -139,7 +139,7 @@ @ stub MqRegisterQueue # win9x @ stdcall NDRCContextBinding(ptr) @ stdcall NDRCContextMarshall(ptr ptr) -@ stub NDRCContextUnmarshall +@ stdcall NDRCContextUnmarshall(ptr ptr ptr long) @ stub NDRSContextMarshall2 @ stub NDRSContextMarshall @ stub NDRSContextMarshallEx

1 0

[tretiakov] 21418: Implement NdrClinentContextMarshall()
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: tretiakov Date: Thu Mar 30 21:28:06 2006 New Revision: 21418 URL: http://svn.reactos.ru/svn/reactos?rev=21418&view=rev Log: Implement NdrClinentContextMarshall() Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsha… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Thu Mar 30 21:28:06 2006 @@ -3246,7 +3246,14 @@ NDR_CCONTEXT ContextHandle, int fCheck) { - FIXME("(%p, %p, %d): stub\n", pStubMsg, ContextHandle, fCheck); + + if(!ContextHandle) + RpcRaiseException(ERROR_INVALID_HANDLE); + + NDRCContextMarshall(ContextHandle, pStubMsg->Buffer); + + pStubMsg->Buffer += 20; + } /***********************************************************************

1 0

[tretiakov] 21417: NDRCContextBinding should raise an exception when NULL pointer is passed
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: tretiakov Date: Thu Mar 30 20:58:12 2006 New Revision: 21417 URL: http://svn.reactos.ru/svn/reactos?rev=21417&view=rev Log: NDRCContextBinding should raise an exception when NULL pointer is passed Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsha… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Thu Mar 30 20:58:12 2006 @@ -3303,6 +3303,8 @@ RPC_BINDING_HANDLE WINAPI NDRCContextBinding(NDR_CCONTEXT CContext) { - + if(!CContext) + RpcRaiseException(ERROR_INVALID_HANDLE); + return (RPC_BINDING_HANDLE)((CContextHandle*)CContext)->Binding; }

1 0

[tretiakov] 21416: More tests
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: tretiakov Date: Thu Mar 30 20:43:32 2006 New Revision: 21416 URL: http://svn.reactos.ru/svn/reactos?rev=21416&view=rev Log: More tests Modified: trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c Modified: trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/testsets/… ============================================================================== --- trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c (original) +++ trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c Thu Mar 30 20:43:32 2006 @@ -110,6 +110,98 @@ } +void m_CtxOpen2( + /* [out] */ PCTXTYPE __RPC_FAR *pphContext, + /* [in] */ long Value) +{ + + RPC_BINDING_HANDLE _Handle = 0; + + RPC_MESSAGE _RpcMessage; + + MIDL_STUB_MESSAGE _StubMsg; + + char buf[255]; + + NdrClientInitializeNew( + ( PRPC_MESSAGE )&_RpcMessage, + ( PMIDL_STUB_MESSAGE )&_StubMsg, + ( PMIDL_STUB_DESC )&hello_StubDesc, + 0); + + + _Handle = hBinding; + + + _StubMsg.BufferLength = 4U; + NdrGetBuffer( (PMIDL_STUB_MESSAGE) &_StubMsg, _StubMsg.BufferLength, _Handle ); + + *(( long __RPC_FAR * )_StubMsg.Buffer)++ = Value; + + NdrSendReceive( (PMIDL_STUB_MESSAGE) &_StubMsg, (unsigned char __RPC_FAR *) _StubMsg.Buffer ); + + if ( (_RpcMessage.DataRepresentation & 0X0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION ) + NdrConvert( (PMIDL_STUB_MESSAGE) &_StubMsg, (PFORMAT_STRING) &__MIDL_ProcFormatString.Format[0] ); + + *pphContext = (void *)0; + + RpcTryExcept + { + NdrClientContextUnmarshall( + ( PMIDL_STUB_MESSAGE )&_StubMsg, + NULL, + _Handle); + } + RpcExcept(1) + { + printf("NdrClientContextUnmarshall reported exception = %d\n", RpcExceptionCode()); + } + RpcEndExcept + + + + RpcTryExcept + { + NdrClientContextUnmarshall( + ( PMIDL_STUB_MESSAGE )&_StubMsg, + (NDR_CCONTEXT __RPC_FAR * )pphContext, + NULL); + } + RpcExcept(1) + { + printf("NdrClientContextUnmarshall reported exception = %d\n", RpcExceptionCode()); + } + RpcEndExcept + + + RpcTryExcept + { + NdrClientContextMarshall( + ( PMIDL_STUB_MESSAGE )&_StubMsg, + NULL, + 1); + } + RpcExcept(1) + { + printf("NdrClientContextMarshall reported exception = %d\n", RpcExceptionCode()); + } + RpcEndExcept + + RpcTryExcept + { + NDRCContextUnmarshall( NULL, _Handle, buf, _RpcMessage.DataRepresentation ); + } + RpcExcept(1) + { + printf("NDRCContextUnmarshall reported exception = %d\n", RpcExceptionCode()); + } + RpcEndExcept + + + NdrFreeBuffer( (PMIDL_STUB_MESSAGE) &_StubMsg ); + + +} void m_CtxHello( /* [in] */ PCTXTYPE phContext) @@ -245,12 +337,26 @@ } -void main() +void main(int argc, char **argv) { RPC_STATUS status; unsigned long ulCode; PCTXTYPE hContext; char *pszStringBinding = NULL; + int test_num = 0; + RPC_BINDING_HANDLE Handle = 0; + char buffer[255]; + + if(argc<2) + { + printf("USAGE: client.exe <test_number>\n" + "Available tests:\n" + "0. General test\n" + "1. NULL pointer test\n"); + return; + } + + test_num = atoi(argv[1]); status = RpcStringBindingCompose(NULL, "ncacn_np", @@ -275,13 +381,47 @@ RpcStringFree(&pszStringBinding); - m_CtxOpen(&hContext, 31337); - RpcBindingFree(&hBinding); - - m_CtxHello(hContext); - - m_CtxClose(&hContext); - + switch(test_num) + { + case 0: + m_CtxOpen(&hContext, 31337); + RpcBindingFree(&hBinding); + m_CtxHello(hContext); + m_CtxClose(&hContext); + break; + case 1: + ///////////////////////////////////////////////////////////////////////////////////////// + RpcTryExcept + { + Handle = NDRCContextBinding(NULL); + printf("NDRCContextBinding(NULL) returned %p\n", Handle); + } + RpcExcept(1) + { + printf("NDRCContextBinding(NULL) reported exception = %d\n", RpcExceptionCode()); + } + RpcEndExcept + + m_CtxOpen2(&hContext, 31337); + + ///////////////////////////////////////////////////////////////////////////////////////// + RpcTryExcept + { + NDRCContextMarshall(NULL, &buffer); + printf("NDRCContextMarshall(NULL) returned %p\n", Handle); + } + RpcExcept(1) + { + printf("NDRCContextMarshall(NULL) reported exception = %d\n", RpcExceptionCode()); + } + RpcEndExcept + + + ///////////////////////////////////////////////////////////////////////////////////////// + break; + default: + printf("Unknown test %d\n", test_num); + } }

1 0

[gedmurphy] 21415: add basic audit progress script
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: gedmurphy Date: Thu Mar 30 17:39:58 2006 New Revision: 21415 URL: http://svn.reactos.ru/svn/reactos?rev=21415&view=rev Log: add basic audit progress script Added: trunk/web/reactos.org/scripts/audit_progress.pl Added: trunk/web/reactos.org/scripts/audit_progress.pl URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/scripts/audit_progr… ============================================================================== --- trunk/web/reactos.org/scripts/audit_progress.pl (added) +++ trunk/web/reactos.org/scripts/audit_progress.pl Thu Mar 30 17:39:58 2006 @@ -1,0 +1,59 @@ +#!/usr/bin/perl + +# This script runs on a machine with access to a local ReactOS repositry +# Issues with the SVN perl bindings made this method easier. +# Also requires svn in your path. + +use strict; +use warnings; + +my $in_path = "/reactos"; # enter the local path of the main reactos folder +my $out_file = "/progress_bar.html"; # enter the html output path +my $log_file = "/audit_progress.log"; # enter the log file path +my $total_width = 200; +my ($unclean_files, $total_files, $todo_width, $done_width, $done_pct); + +open HTML, "> $out_file" + or die "couldn't open $out_file for writing: $!\n"; + +my @files = `svn ls -v -R $in_path`; + +foreach (@files) { + next if /\/$/; + $total_files++; + if (/\sO\s/) { + $unclean_files++; + } +} + +if ($unclean_files != 0) { + $todo_width = ($unclean_files / $total_files) * $total_width; + $done_width = (($total_files - $unclean_files) / $total_files) * $total_width; + $done_pct = (($total_files - $unclean_files) / $total_files) * 100; +} else { + $todo_width = 0; + $done_width = $total_width; + $done_pct = 100; +} + +output_html(); + +open LOG, ">> $log_file" + or die "couldn't open $log_file for writing: $!\n"; +my $date = localtime; +print LOG "$date : total files = $total_files\tfiles unaudited = $unclean_files\tcompleted $done_pct%\n"; + + + + +sub output_html { + print HTML "<center>\n"; + print HTML " <img border=\"0\" src=\"http://www.reactos.org/images/progress-end.gif\" width=\"1\" height=\"20\">"; + printf HTML "<img border=\"0\" src=\"http://www.reactos.org/images/progress-done.gif\" width=\"%d\" height=\"20\">", $done_width; + printf HTML "<img border=\"0\" src=\"http://www.reactos.org/images/progress-todo.gif\" width=\"%d\" height=\"20\">", $todo_width; + print HTML "<img border=\"0\" src=\"http://www.reactos.org/images/progress-end.gif\" width=\"1\" height=\"20\">\n"; + print HTML " <br>\n"; + printf HTML " <font size=\"2\" face=\"Verdana, Arial, Helvetica, sans-serif\">%.1f%% complete</font>\n", $done_pct; + print HTML "</center>\n"; +} +

1 0

[gedmurphy] 21414: remove the svn:needs-lock prop. These have already been unlocked but were missed.
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: gedmurphy Date: Thu Mar 30 14:10:31 2006 New Revision: 21414 URL: http://svn.reactos.ru/svn/reactos?rev=21414&view=rev Log: remove the svn:needs-lock prop. These have already been unlocked but were missed. Modified: trunk/reactos/base/applications/notepad/main.c (props changed) trunk/reactos/base/applications/notepad/main.h (props changed) Propchange: trunk/reactos/base/applications/notepad/main.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/notepad/main.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21413: update Wine sync doc
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: gedmurphy Date: Thu Mar 30 13:37:33 2006 New Revision: 21413 URL: http://svn.reactos.ru/svn/reactos?rev=21413&view=rev Log: update Wine sync doc Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Mar 30 13:37:33 2006 @@ -38,7 +38,7 @@ reactos/dll/win32/avifil32 # Synced to Wine-0_9_5 reactos/dll/win32/cabinet # Synced to Wine-0_9_5 -reactos/dll/win32/comctl32 # Synced to Wine-0_9_5 +reactos/dll/win32/comctl32 # Synced to Wine-20060328 reactos/dll/win32/comdlg32 # Synced to Wine-0_9_5 reactos/dll/win32/crypt32 # Synced to Wine-0_9_5 reactos/dll/win32/dbghelp # @@ -136,8 +136,8 @@ If any changes are found, see if they're present in the Wine code. If not, submit to WineHQ if apropriate. - Merge in Wine changes: - "svn merge svn://svn.reactos.com/vendor/wine/dlls/cabinet/Wine-20050111 - svn://svn.reactos.com/vendor/wine/dlls/cabinet/current" + "svn merge svn://svn.reactos.org/vendor/wine/dlls/cabinet/Wine-20050111 + svn://svn.reactos.org/vendor/wine/dlls/cabinet/current" - Fix any merge conflicts - Build and test (building will sometimes require adjusting header files) - Check which files were changed: "svn status"

1 0

[gedmurphy] 21412: revamp the recent docs icon
by aleksey＠studiocerebral.com 30 Mar '06

30 Mar '06

Author: gedmurphy Date: Thu Mar 30 13:26:48 2006 New Revision: 21412 URL: http://svn.reactos.ru/svn/reactos?rev=21412&view=rev Log: revamp the recent docs icon Modified: trunk/reactos/base/shell/explorer/res/recent-documents.ico Modified: trunk/reactos/base/shell/explorer/res/recent-documents.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/res/rec… ============================================================================== Binary files - no diff available.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2006