Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 23280: patch from LMH1 : Bug#: 1676 : Norwegian translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 25 12:41:07 2006 New Revision: 23280 URL: http://svn.reactos.org/svn/reactos?rev=23280&view=rev Log: patch from LMH1 : Bug#: 1676 : Norwegian translation Added: trunk/reactos/base/applications/calc/No.rc (with props) Modified: trunk/reactos/base/applications/calc/rsrc.rc Added: trunk/reactos/base/applications/calc/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/No.… ============================================================================== --- trunk/reactos/base/applications/calc/No.rc (added) +++ trunk/reactos/base/applications/calc/No.rc Tue Jul 25 12:41:07 2006 @@ -1,0 +1,155 @@ +/* + * WineCalc (En.rc) + * + * Copyright 2003 James Briggs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Kalkulator" + + IDS_COPYRIGHT1, "Kalkulator 5.0. Lisensert under LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Tilbake" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "Ugyldig informasjon for funksjon." + IDS_ERR_DIVIDE_BY_ZERO, "Kan ikke dividere på null." + IDS_ERR_UNDEFINED, "Resultatet av funksjoner er ubestemt." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Rediger" { + MENUITEM "&Kopier Ctrl+C", IDM_COPY + MENUITEM "&Lim inn Ctrl+V", IDM_PASTE + } + POPUP "&Vis" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vitenskapelig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Hjelp" { + MENUITEM "Emner i hjelp", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om kalkulator", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Rediger" { + MENUITEM "&Kopiere Ctrl+C", IDM_COPY + MENUITEM "&Lim inn Ctrl+V", IDM_PASTE + } + POPUP "&Vis" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vitenskapelig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Heksadesimalt\tF5", ID_CALC_NS_HEX + MENUITEM "Desimalt\tF6", ID_CALC_NS_DEC + MENUITEM "Oktalt\tF7", ID_CALC_NS_OCT + MENUITEM "Binært\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Grader\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radianer\tF3", ID_CALC_MS_RADIANS + MENUITEM "Gradienter\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Hjelp" { + MENUITEM "Emner i hjelp", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om Kalkulator", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Rediger" { + MENUITEM "&Kopier Ctrl+C", IDM_COPY + MENUITEM "&Lim inn Ctrl+V", IDM_PASTE + } + POPUP "&Vis" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vitenskapelig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Heksadesimalt\tF5", ID_CALC_NS_HEX + MENUITEM "Desimal\tF6", ID_CALC_NS_DEC + MENUITEM "Oktalt\tF7", ID_CALC_NS_OCT + MENUITEM "Binært\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Help" { + MENUITEM "Emner i hjelp", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om Kalkulator", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Om GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Hva er dette?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Propchange: trunk/reactos/base/applications/calc/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Tue Jul 25 12:41:07 2006 @@ -37,5 +37,6 @@ #include "Hu.rc" #include "Uk.rc" #include "Gr.rc" +#include "No.rc" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL

18 years, 5 months

[janderwald] 23279: Ukraianian translation by Temarez

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jul 25 11:12:28 2006 New Revision: 23279 URL: http://svn.reactos.org/svn/reactos?rev=23279&view=rev Log: Ukraianian translation by Temarez Added: trunk/reactos/base/setup/vmwinst/Uk.rc (with props) Modified: trunk/reactos/base/setup/vmwinst/vmwinst.rc Added: trunk/reactos/base/setup/vmwinst/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/Uk.rc?r… ============================================================================== --- trunk/reactos/base/setup/vmwinst/Uk.rc (added) +++ trunk/reactos/base/setup/vmwinst/Uk.rc Tue Jul 25 11:12:28 2006 @@ -1,0 +1,139 @@ +/* + * PROJECT: ReactOS VMware(r) driver installation utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/setup/vmwinst/Uk.rc + * PURPOSE: Ukraianian Language File for vmwinst + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE 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 "Ïðîãðàìà óñòàíîâêè ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 100, 8, 160, 24 + LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü 'Äàë³', ³íàêøå íàòèñí³òü 'Ñêàñóâàòè'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS 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 "Ïðîãðàìà óñòàíîâêè ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ 'VM' ó VMware(r) workstation ³ âèáåð³òü 'Install VMware tools...'\n\n\nÍàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ àáî 'Ñêàñóâàòè', ùîá ïðîïóñòèòè óñòàíîâêó SVGA äðàéâåðà.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS 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 "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG 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 "Óñòàíîâêó SVGA äðàéâåðà VMware(r) çàâåðøåíî óñï³øíî. Îáåð³òü ïåðåâàæíó ðîçä³ëüíó çäàòí³ñòü åêðàíó:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "Áóäü ëàñêà îáåð³òü ÿê³ñòü ïåðåäà÷³ êîëüîðó:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED 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 "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü 'Çàâåðøèòè' äëÿ ïðîäîâæåííÿ ïðîöåñó óñòàíîâêè.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION 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 "SVGA äðàéâåð VMware(r) SVGA âæå âñòàíîâëåíèé.\n\nÎáåð³òü, ùî Âè õî÷åòå çðîáèòè:",-1,25,5,225,30 + PUSHBUTTON "Íàëàøòóâàòè ïàðàìåòðè åêðàíó", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Ñêîðèñòàòèñÿ ³íøèì ãðàô³÷íèì äðàéâåðîì", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Âèäàëèòè SVGA äðàéâåð VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Íàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ àáî 'Ñêàñóâàòè' äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER 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,25,25,225,15 + PUSHBUTTON "ReactOS VGA äðàéâåð", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE äðàéâåð (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Íàòèñí³òü 'Çàâåðøèòè' äëÿ çàâåðøåííÿ îïåðàö³¿ àáî 'Ñêàñóâàòè' äëÿ âèõîäó ç ïðîãðàìè óñòàíîâêè áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL 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 "Ïðîãðàìà óñòàíîâêè ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü 'Çàâåðøèòè' äëÿ âèäàëåííÿ äðàéâåðà àáî 'Ñêàñóâàòè' ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Âèÿâëåíèé VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà çíàéòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé." + IDS_FAILEDTOCOPYFILES "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà ñêîï³þâàòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé.\n" + IDS_FAILEDTOACTIVATEDRIVER "Íå âäàëîñÿ çàïóñòèòè SVGA äðàéâåð VMware(r)!" + IDS_FAILEDTOSELVGADRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VGA äðàéâåð!" + IDS_FAILEDTOSELVBEDRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VBE äðàéâåð!" + IDS_UNINSTNOTICE "Ôàéëè SVGA äðàéâåðà VMware(r) ùå íå áóëè âèäàëåí³.\nÁóäü ëàñêà âèäàë³òü ¿õ âðó÷íó ï³ñëÿ ïåðåçàâàíòàæåííÿ ñèñòåìè." + IDS_FAILEDTOADDREGENTRIES "Íå âäàëîñÿ ñòâîðèòè çàïèñè â ðåºñòð³ äëÿ SVGA äðàéâåðà VMware(r)!" +END + +STRINGTABLE +BEGIN + 10001 "Íèçüêà (8BPP)" + 10002 "Ñåðåäíÿ (16BPP)" + 10003 "Íàéâèùà (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Ïîøóê êîìïàêò-äèñêà VMware(r) Tools..." + IDS_COPYINGFILES "Êîï³þâàííÿ ôàéë³â..." + IDS_ENABLINGDRIVER "Çàïóñê SVGA äðàéâåðà VMware(r)..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Áóäü ëàñêà âñòàâòå äèñê VMware tools." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Ïîøóê ³ êîï³þâàííÿ SVGA äðàéâåðà VMware (r)." + IDD_CONFIGTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_CONFIGSUBTITLE "Îáåð³òü Âàøó óëþáëåíó ðîçä³ëüíó çäàòí³ñòü åêðàíó." + IDD_INSTALLATION_FAILEDTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSTALLATION_FAILEDSUBTITLE "Óñòàíîâêà SVGA äðàéâåðà VMware (r) íå âäàëàñÿ." + IDD_CHOOSEACTIONTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_CHOOSEACTIONSUBTITLE "Âèáåð³òü, ùî Âè õî÷åòå çðîáèòè." + IDD_SELECTDRIVERTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_SELECTDRIVERSUBTITLE "Îáðàòè äðàéâåð." + IDD_DOUNINSTALLTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_DOUNINSTALLSUBTITLE "Âèäàëèòè äðàéâåð." +END Propchange: trunk/reactos/base/setup/vmwinst/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/vmwinst/vmwinst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.rc (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.rc Tue Jul 25 11:12:28 2006 @@ -33,3 +33,4 @@ #include "Ja.rc" #include "Hu.rc" #include "Ru.rc" +#include "Uk.rc"

18 years, 5 months

[janderwald] 23278: Ukraianian translation by Temarez

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jul 25 11:10:14 2006 New Revision: 23278 URL: http://svn.reactos.org/svn/reactos?rev=23278&view=rev Log: Ukraianian translation by Temarez Added: trunk/reactos/subsystems/ntvdm/Uk.rc (with props) Added: trunk/reactos/subsystems/ntvdm/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/Uk.rc?rev… ============================================================================== --- trunk/reactos/subsystems/ntvdm/Uk.rc (added) +++ trunk/reactos/subsystems/ntvdm/Uk.rc Tue Jul 25 11:10:14 2006 @@ -1,0 +1,18 @@ +/* + * PROJECT: Virtual DOS Machine + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/ntvdm/Uk.rc + * PURPOSE: Ukraianian Language File for Virtual DOS Machine + * TRANSLATOR: Artem Reznikov + */ + +#include "resource.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "Ï³äòðèìêà â³ðòóàëüíî¿ ìàøèíè DOS ó ReactOS.\n" +STRING_PromptMsg, "Ââåä³òü r<cr> äëÿ çàïóñêó, s<cr> äëÿ çàêðèòòÿ àáî q<cr>, ùîá âèéòè çàðàç." +} Propchange: trunk/reactos/subsystems/ntvdm/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 5 months

[janderwald] 23277: Ukraianian translation by Temarez

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jul 25 11:06:38 2006 New Revision: 23277 URL: http://svn.reactos.org/svn/reactos?rev=23277&view=rev Log: Ukraianian translation by Temarez Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc Tue Jul 25 11:06:38 2006 @@ -12,4 +12,4 @@ #include "Hu.rc" #include "Es.rc" #include "No.rc" - +#include "Uk.rc"

18 years, 5 months

[janderwald] 23276: Ukraianian translation by Temarez

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jul 25 11:03:34 2006 New Revision: 23276 URL: http://svn.reactos.org/svn/reactos?rev=23276&view=rev Log: Ukraianian translation by Temarez Added: trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc (with props) Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc Tue Jul 25 11:03:34 2006 @@ -50,4 +50,4 @@ #include "syssetup_Ja.rc" #include "syssetup_Es.rc" #include "syssetup_Hu.rc" - +#include "syssetup_Uk.rc" Added: trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc (added) +++ trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc Tue Jul 25 11:03:34 2006 @@ -1,0 +1,211 @@ +/* + * PROJECT: System setup + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/syssetup/syssetup_Uk.rc + * PURPOSE: Ukraianian Language File for syssetup + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ëàñêàâî ïðîñèìî äî ìàéñòðà óñòàíîâêè ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Öåé ìàéñòåð âñòàíîâëþº ReactOS íà Âàø êîìï'þòåð. Éîìó "\ + "ïîòð³áíî ç³áðàòè äåÿê³ â³äîìîñò³ ïðî Âàñ ³ Âàø êîìï'þòåð "\ + "ùîá óñòàíîâèòè ReactOS íàëåæíèì ÷èíîì.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Íàòèñí³òü 'Äàë³', ùîá ïðîäîâæèòè óñòàíîâêó.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ðîçðîáíèêè ReactOS õîò³ëè á ïîäÿêóâàòè íàñòóïíèì Open Source ïðîåêòàì, "\ + "ùî (÷àñòêîâî) âèêîðèñòîâóâàëèñÿ ïðè ñòâîðåíí³ ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS ë³öåíçóºòüñÿ ïî GPL, òàê ùî ÿêùî Âè õî÷åòå ïîâòîðíî âèêîðèñòîâóâàòè "\ + "àáî ïîøèðþâàòè éîãî (÷àñòèíè), Âè ìàºòå ïîâàæàòè GPL", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&Ïåðåãëÿä GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Íàòèñí³òü 'Äàë³', ùîá ïðîäîâæèòè óñòàíîâêó.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ââåä³òü ñâîº ïîâíå ³ì'ÿ ³ íàçâó âàøî¿ êîìïàí³¿ àáî îðãàí³çàö³¿.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "&²ì'ÿ:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Îðãàí³çàö³ÿ:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ââåä³òü ³ì'ÿ Âàøîãî êîìï'þòåðà äîâæèíîþ äî 63 ñèìâîë³â. "\ + "ßêùî Âè ïðàöþº â ìåðåæ³, ³ì'ÿ Âàøîãî êîìï'þòåðà ìàº áóòè óí³êàëüíèì.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&²ì'ÿ êîìï'þòåðà:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "Ïðîãðàìà óñòàíîâêè ñòâîðèòü îáë³êîâèé çàïèñ êîðèñòóâà÷à 'Àäì³í³ñòðàòîð', "\ + "ÿêèé äàº ïîâí³ ïðàâà äîñòóïó äî Âàøîãî êîìï'þòåðà.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Ââåä³òü ïàðîëü àäì³í³ñòðàòîðà äîâæèíîþ äî 14 ñèìâîë³â.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Ïàðîëü àäì³í³ñòðàòîðà:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "Ï³&äòâåðäæåííÿ:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìîâà ñèñòåìè ìàº â³äïîâ³äàòè ìîâ³ äîäàòê³â, ÿê³ âè õî÷åòå "\ + "âèêîðèñòîâóâàòè. Ìîâà êîðèñòóâà÷à çàäàº ôîðìàò âèâåäåííÿ, "\ + "÷èñåë, ãðîøîâèõ îäèíèöü ³ äàò.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Äëÿ çì³íè ìîâè ñèñòåìè àáî ìîâè êîðèñòóâà÷à íàòèñí³òü 'Íàëàøòóâàòè'.", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "Íà&ëàøòóâàòè...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "Ðîçêëàäêà êëàâ³àòóðè çàäàº ñèìâîëè, ùî ââîäÿòüñÿ ïðè íàòèñíåíí³ êëàâ³ø.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Äëÿ çì³íè ðîçêëàäêè êëàâ³àòóðè íàòèñí³òü 'Íàëàøòóâàòè'.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "Íàë&àøòóâàòè...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Äàòà é ÷àñ", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "×àñîâèé ïîÿñ", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Àâòîìàòè&÷íå ïåðåâåäåííÿ ãîäèííèêà íà ë³òíèé/çèìîâèé ÷àñ", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâåðøåííÿ óñòàíîâêè ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Çàâåðøåííÿ óñòàíîâêè ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Âè óñï³øíî çàâåðøèëè óñòàíîâêó ReactOS.\n\n" \ + "Ï³ñëÿ íàòèñíåííÿ êíîïêè 'Çàâåðøèòè' êîìï'þòåð áóäå ïåðåçàâàíòàæåíèé.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "ßêùî â äèñêîâîä âñòàâëåíèé êîìïàêò-äèñê, âèéì³òü éîãî. Ïîò³ì "\ + "äëÿ ïåðåçàâàíòàæåííÿ Âàøîãî êîìï'þòåðà íàòèñòí³òü 'Çàâåðøèòè'.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Ï³äòâåðäæåííÿ" + IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" + IDS_OWNERTITLE "Íàëàøòóâàííÿ ïðèíàëåæíîñò³ ïðîãðàì" + IDS_OWNERSUBTITLE "Ö³ îñîáèñò³ â³äîìîñò³ âêàçóþòü íà ïðèíàëåæí³ñòü ïðîãðàì ReactOS." + IDS_COMPUTERTITLE "²ì'ÿ êîìï'þòåðà òà ïàðîëü àäì³í³ñòðàòîðà" + IDS_COMPUTERSUBTITLE "Âè ìàºòå âêàçàòè ³ì'ÿ òà ïàðîëü àäì³í³ñòðàòîðà Âàøîãî êîìï'þòåðà." + IDS_LOCALETITLE "Ìîâà ³ ñòàíäàðòè" + IDS_LOCALESUBTITLE "Âè ìîæåòå íàëàøòóâàòè ReactOS äëÿ ð³çíèõ ðåã³îí³â ³ ìîâ." + IDS_DATETIMETITLE "Äàòà é ÷àñ" + IDS_DATETIMESUBTITLE "Âñòàíîâèòè ïðàâèëüí³ äàòó ³ ÷àñ äëÿ Âàøîãî êîìï'þòåðà." + IDS_PROCESSTITLE "Process page title" + IDS_PROCESSSUBTITLE "Process page subtitle" +END + +STRINGTABLE +BEGIN + IDS_CMT_WINEFILE "Çàïóñòèòè Winefile" + IDS_CMT_IBROWSER "Çàïóñòèòè iBrowser" + IDS_CMT_GETFIREFOX "Çàâàíòàæèòè/âñòàíîâèòè Firefox" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Äîïîì³æí³ ïðîãðàìè" + IDS_CMT_CALC "Çàïóñòèòè Êàëüêóëÿòîð" + IDS_CMT_CMD "Â³äêðèòè êîìàíäíèé ðÿäîê" + IDS_CMT_EXPLORER "Çàïóñòèòè Ïðîâ³äíèê" + IDS_CMT_NOTEPAD "Çàïóñòèòè Òåêñòîâèé ðåäàêòîð" + IDS_CMT_REGEDIT "Çàïóñòèòè Ðåäàêòîð ðåºñòðà" + IDS_CMT_WORDPAD "Çàïóñòèòè Ðåäàêòîð äîêóìåíò³â" + IDS_CMT_SCREENSHOT "Çðîáèòè çí³ìîê åêðàíà" +END + +STRINGTABLE +BEGIN + IDS_GAMES "²ãðè" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "Ñàïåð" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" + IDS_UNKNOWN_ERROR "Íåâ³äîìà ïîìèëêà" + IDS_REGISTERING_COMPONENTS "Ðåºñòðàö³ÿ êîìïîíåíò³â..." + IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " + IDS_GETPROCADDR_FAILED "GetProcAddr failed: " + IDS_REGSVR_FAILED "DllRegisterServer failed: " + IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_TIMEOUT "Timeout during registration" + IDS_REASON_UNKNOWN "" +END + +/* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 5 months

[janderwald] 23275: Ukraianian translation by Temarez

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jul 25 11:02:51 2006 New Revision: 23275 URL: http://svn.reactos.org/svn/reactos?rev=23275&view=rev Log: Ukraianian translation by Temarez Added: trunk/reactos/base/system/rundll32/Uk.rc (with props) trunk/reactos/base/system/userinit/Uk.rc (with props) Modified: trunk/reactos/base/system/rundll32/rundll32.rc trunk/reactos/base/system/userinit/userinit.rc Added: trunk/reactos/base/system/rundll32/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/Uk.rc… ============================================================================== --- trunk/reactos/base/system/rundll32/Uk.rc (added) +++ trunk/reactos/base/system/rundll32/Uk.rc Tue Jul 25 11:02:51 2006 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS rundll32.exe + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/rundll32/Uk.rc + * PURPOSE: Ukraianian Language File for rundll32 + * TRANSLATOR: Artem Reznikov + */ + +#include "resource.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "LoadLibrary íå âäàëîñÿ çàâàíòàæèòè '%s'" +IDS_MissingEntry, "Íåìîæëèâî çíàéòè òî÷êó âõîäó:%s\nÂ á³áë³îòåö³ %s" +} Propchange: trunk/reactos/base/system/rundll32/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.rc (original) +++ trunk/reactos/base/system/rundll32/rundll32.rc Tue Jul 25 11:02:51 2006 @@ -12,4 +12,4 @@ #include "Ru.rc" #include "Gr.rc" #include "No.rc" - +#include "Uk.rc" Added: trunk/reactos/base/system/userinit/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/Uk.rc… ============================================================================== --- trunk/reactos/base/system/userinit/Uk.rc (added) +++ trunk/reactos/base/system/userinit/Uk.rc Tue Jul 25 11:02:51 2006 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS Userinit Logon Application + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/userinit/Uk.rc + * PURPOSE: Ukraianian Language File for userinit + * TRANSLATOR: Artem Reznikov + */ + +#include "resource.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "Userinit íå âäàëîñÿ çàïóñòèòè îáîëîíêó!\n" + +} Propchange: trunk/reactos/base/system/userinit/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/userinit/userinit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.rc (original) +++ trunk/reactos/base/system/userinit/userinit.rc Tue Jul 25 11:02:51 2006 @@ -14,3 +14,4 @@ #include "Es.rc" #include "Ru.rc" #include "Gr.rc" +#include "Uk.rc"

18 years, 5 months

[jimtabor] 23274: Broken explorer popups with IsBadString, revert string pointer checking. Misc fix to win32k menu and removed byposition flag check and save.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 25 04:50:35 2006 New Revision: 23274 URL: http://svn.reactos.org/svn/reactos?rev=23274&view=rev Log: Broken explorer popups with IsBadString, revert string pointer checking. Misc fix to win32k menu and removed byposition flag check and save. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Tue Jul 25 04:50:35 2006 @@ -3698,11 +3698,6 @@ mii->fType |= MFT_RIGHTJUSTIFY; } - if(Flags & MF_BYPOSITION) - { - mii->fType |= MF_BYPOSITION; - } - if(Flags & MF_MENUBREAK) { mii->fType |= MFT_MENUBREAK; @@ -4396,9 +4391,6 @@ ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) && mi.dwTypeData != NULL) { - UINT Count = lpmii->cch; - if(!Count) Count++; - if (IsBadStringPtrA(lpmii->dwTypeData, Count)) return FALSE; Status = RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData); if (!NT_SUCCESS (Status)) { @@ -4451,9 +4443,6 @@ ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) && mi.dwTypeData != NULL) { - UINT Count = lpmii->cch; - if(!Count) Count++; - if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE; RtlInitUnicodeString(&MenuText, (PWSTR)lpmii->dwTypeData); mi.dwTypeData = MenuText.Buffer; mi.cch = MenuText.Length / sizeof(WCHAR); @@ -4826,9 +4815,6 @@ && MenuItemInfoW.dwTypeData != NULL) { /* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */ - UINT Count = lpmii->cch; - if(!Count) Count++; - if (IsBadStringPtrA(lpmii->dwTypeData, Count )) return FALSE; Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)MenuItemInfoW.dwTypeData); if (!NT_SUCCESS (Status)) @@ -4883,9 +4869,6 @@ (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING))) && MenuItemInfoW.dwTypeData != NULL) { - UINT Count = lpmii->cch; - if (!Count) Count++; - if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE; MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); } Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Tue Jul 25 04:50:35 2006 @@ -756,7 +756,7 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii) { PMENU_OBJECT SubMenuObject; - UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MF_BYPOSITION | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); + UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); if(!MenuItem || !MenuObject || !lpmii) { @@ -805,7 +805,7 @@ SetLastNtError( ERROR_INVALID_PARAMETER); return FALSE; } - MenuItem->fType |= lpmii->fType; + MenuItem->fType |= lpmii->fType; /* Need to save all the flags, this fixed MFT_RIGHTJUSTIFY */ } if(lpmii->fMask & MIIM_BITMAP) { @@ -1058,6 +1058,7 @@ mii.hSubMenu = CurItem->hSubMenu; mii.Rect = CurItem->Rect; mii.XTab = CurItem->XTab; + mii.Text = CurItem->Text.Buffer; Status = MmCopyToCaller(Buf, &mii, sizeof(ROSMENUITEMINFO)); if (! NT_SUCCESS(Status))

18 years, 5 months

[greatlrd] 23273: 1. Cleanup some stuff 2. Fixing the build again 3. Fixing a memory leak.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 25 02:02:13 2006 New Revision: 23273 URL: http://svn.reactos.org/svn/reactos?rev=23273&view=rev Log: 1. Cleanup some stuff 2. Fixing the build again 3. Fixing a memory leak. Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Tue Jul 25 02:02:13 2006 @@ -27,8 +27,7 @@ <file>videoport.c</file> <file>kernel.c</file> - <directory name="hal"> - <file>ddraw_hal.c</file> + <directory name="hal"> <file>surface_hal.c</file> </directory> @@ -37,8 +36,7 @@ <file>surface_main.c</file> </directory> - <directory name="soft"> - <file>ddraw_hel.c</file> + <directory name="soft"> <file>surface_hel.c</file> <file>surface_callbacks_hel.c</file> </directory> Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Tue Jul 25 02:02:13 2006 @@ -13,6 +13,15 @@ #include "rosdraw.h" #include "d3dhal.h" + +// This function is exported by the dll +HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, + LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN pUnkOuter) +{ + DX_WINDBG_trace(); + + return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); +} /* * IMPLEMENT Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Jul 25 02:02:13 2006 @@ -1108,8 +1108,12 @@ return This->mDdSetMode.ddRVal; } - -HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { DX_WINDBG_trace(); @@ -1133,7 +1137,12 @@ return DDERR_NODRIVERSUPPORT; } -HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) { DX_WINDBG_trace(); @@ -1165,65 +1174,10 @@ return DDERR_NODRIVERSUPPORT; } - - - - - - - - - - -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ - - - - -// This function is exported by the dll -HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, - LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN pUnkOuter) -{ - DX_WINDBG_trace(); - - return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); -} - - - - - - - - - - - - - - -/********************************** Stubs **********************************/ - - - - - - - - - - - - - - - - - - +/* + * Stub + * Status todo + */ HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { @@ -1231,18 +1185,30 @@ DX_STUB; } +/* + * Stub + * Status todo + */ HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) { DX_WINDBG_trace(); DX_STUB; } +/* + * Stub + * Status todo + */ HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) { DX_WINDBG_trace(); DX_STUB; } +/* + * Stub + * Status todo + */ HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { @@ -1250,6 +1216,10 @@ DX_STUB; } +/* + * Stub + * Status todo + */ HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) { @@ -1257,11 +1227,16 @@ DX_STUB; } +/* + * Stub + * Status todo + */ HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) { DX_WINDBG_trace(); DX_STUB; } + IDirectDraw7Vtbl DirectDraw7_Vtable = { Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue Jul 25 02:02:13 2006 @@ -364,11 +364,6 @@ DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->mHALInfo.GetDriverInfo(&DriverInfo); - if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY) - { - This->mDdGetDriverMemory.GetAvailDriverMemory = This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory; - } - /* Setup global surface */ /*This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; @@ -378,7 +373,7 @@ This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch;*/ /* FIXME free it in cleanup */ - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); + // This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); return DD_OK; }

18 years, 5 months

[greatlrd] 23272: Kill more of the old design.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 25 01:51:31 2006 New Revision: 23272 URL: http://svn.reactos.org/svn/reactos?rev=23272&view=rev Log: Kill more of the old design. Removed: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Removed: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (removed) @@ -1,74 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/hal/ddraw.c - * PURPOSE: DirectDraw HAL Implementation - * PROGRAMMER: Magnus Olsen, Maarten Bosma - * - */ - -#include "rosdraw.h" - - - - -HRESULT -Hal_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - DDHAL_GETAVAILDRIVERMEMORYDATA mem; - - if (!(This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) - { - return DDERR_NODRIVERSUPPORT; - } - - mem.lpDD = &This->mDDrawGlobal; - mem.ddRVal = DDERR_NOTPALETTIZED; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory(&mem) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - ddscaps->dwCaps = mem.DDSCaps.dwCaps; - ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; - ddscaps->dwCaps3 = mem.ddsCapsEx.dwCaps3; - ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; - *total = mem.dwTotal; - *free = mem.dwFree; - - return mem.ddRVal; -} - -HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; - - if (!(This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) - { - return DDERR_NODRIVERSUPPORT; - } - - WaitVectorData.lpDD = &This->mDDrawGlobal; - WaitVectorData.dwFlags = dwFlags; - WaitVectorData.hEvent = (DWORD)h; - WaitVectorData.ddRVal = DDERR_NOTPALETTIZED; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.WaitForVerticalBlank(&WaitVectorData) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return WaitVectorData.ddRVal; -} - - - - - Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Jul 25 01:51:31 2006 @@ -920,17 +920,20 @@ return DDERR_NODRIVERSUPPORT; } - - - - - - - - -/* - * IMPLEMENT - * Status this api is finish and is 100% correct +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok */ HRESULT WINAPI @@ -957,7 +960,25 @@ return DD_OK; } -HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + ChangeDisplaySettings(NULL, 0); + return DD_OK; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) { // TODO: // - create a scaner that check which driver we should get the HDC from @@ -1015,7 +1036,12 @@ return SetExclusiveMode.ddRVal; } -HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { DX_WINDBG_trace(); @@ -1083,9 +1109,76 @@ } - - - +HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, + HANDLE h) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (This->mDdWaitForVerticalBlank.WaitForVerticalBlank == NULL) + { + return DDERR_NODRIVERSUPPORT; + } + + This->mDdWaitForVerticalBlank.dwFlags = dwFlags; + This->mDdWaitForVerticalBlank.hEvent = (DWORD)h; + This->mDdWaitForVerticalBlank.ddRVal = DDERR_NOTPALETTIZED; + + if (This->mDdWaitForVerticalBlank.WaitForVerticalBlank(&This->mDdWaitForVerticalBlank)==DDHAL_DRIVER_HANDLED); + { + return This->mDdWaitForVerticalBlank.ddRVal; + } + + return DDERR_NODRIVERSUPPORT; +} + +HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD total, LPDWORD free) +{ + DX_WINDBG_trace(); + DDHAL_GETAVAILDRIVERMEMORYDATA mem; + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + /* Only Hal version exists acodring msdn */ + if (!(This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) + { + return DDERR_NODRIVERSUPPORT; + } + + mem.lpDD = &This->mDDrawGlobal; + mem.ddRVal = DDERR_NOTPALETTIZED; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory(&mem) == DDHAL_DRIVER_HANDLED); + { + ddscaps->dwCaps = mem.DDSCaps.dwCaps; + ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; + ddscaps->dwCaps3 = mem.ddsCapsEx.dwCaps3; + ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; + *total = mem.dwTotal; + *free = mem.dwFree; + + return mem.ddRVal; + } + + return DDERR_NODRIVERSUPPORT; +} + + + + + + + + + + + +/* + * IMPLEMENT + * Status this api is finish and is 100% correct + */ @@ -1105,48 +1198,12 @@ -HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, - HANDLE h) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) - { - return Hal_DirectDraw_WaitForVerticalBlank( iface, dwFlags, h); - } - - return Hel_DirectDraw_WaitForVerticalBlank( iface, dwFlags, h); -} - -HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - - if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY) - { - return Hal_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free); - } - - return Hel_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free); -} - - - - - -HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - ChangeDisplaySettings(NULL, 0); - return DD_OK; -} + + + + + + /********************************** Stubs **********************************/ @@ -1163,11 +1220,7 @@ -HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) -{ - DX_WINDBG_trace(); - DX_STUB; -} + Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue Jul 25 01:51:31 2006 @@ -97,7 +97,7 @@ DDHAL_GETSCANLINEDATA mDdGetScanLine; DDHAL_SETEXCLUSIVEMODEDATA mDdSetExclusiveMode; DDHAL_FLIPTOGDISURFACEDATA mDdFlipToGDISurface; - + DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; /* adding a switch */ Removed: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (removed) @@ -1,31 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/soft/ddraw.c - * PURPOSE: DirectDraw Software Implementation - * PROGRAMMER: Magnus Olsen, Maarten Bosma - * - */ - -#include "rosdraw.h" - - -HRESULT Hel_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - *total = HEL_GRAPHIC_MEMORY_MAX; - *free = This->HELMemoryAvilable; - return DD_OK; -} - - -HRESULT Hel_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) -{ - DX_STUB; -} - - - Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue Jul 25 01:51:31 2006 @@ -364,6 +364,11 @@ DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->mHALInfo.GetDriverInfo(&DriverInfo); + if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY) + { + This->mDdGetDriverMemory.GetAvailDriverMemory = This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory; + } + /* Setup global surface */ /*This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; @@ -413,7 +418,7 @@ This->mCallbacks.HELDD.dwFlags += DDHAL_CB32_FLIPTOGDISURFACE; This->mCallbacks.HELDD.FlipToGDISurface = HelDdFlipToGDISurface; - + return DD_OK; }

18 years, 5 months

[winesync] 23271: Alexey Minnekhanov: - Registry keys are created if they don't exist - "Custom colors" are stored in the registry too now (tested to work under Windows XP) - Fixed a check during adding of a new wallpaper to the list. Now it will actually deny addition of the same wallpaper image more than once - Some TAB -> Spaces fixes

by winesync＠svn.reactos.org

Author: winesync Date: Tue Jul 25 01:24:10 2006 New Revision: 23271 URL: http://svn.reactos.org/svn/reactos?rev=23271&view=rev Log: Alexey Minnekhanov: - Registry keys are created if they don't exist - "Custom colors" are stored in the registry too now (tested to work under Windows XP) - Fixed a check during adding of a new wallpaper to the list. Now it will actually deny addition of the same wallpaper image more than once - Some TAB -> Spaces fixes Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Tue Jul 25 01:24:10 2006 @@ -32,7 +32,11 @@ int g_placementSelection = 0; int g_backgroundSelection = 0; + +/* this holds current selection of background color */ COLORREF g_backgroundDesktopColor = 0; +/* this holds selection of custom colors in dialog box */ +COLORREF custom_colors[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0}; int g_listViewItemCount = 0; @@ -147,75 +151,70 @@ /* Add all the images in the C:\ReactOS directory. */ - LoadString(hApplet, IDS_SUPPORTED_EXT, szFileTypes, sizeof(szFileTypes) / sizeof(TCHAR)); + LoadString(hApplet, IDS_SUPPORTED_EXT, szFileTypes, sizeof(szFileTypes) / sizeof(TCHAR)); - token = _tcstok ( szFileTypes, separators ); - while ( token != NULL ) - { - GetWindowsDirectory(szSearchPath, MAX_PATH); - _tcscat(szSearchPath, TEXT("\\")); - _tcscat(szSearchPath, token); + token = _tcstok ( szFileTypes, separators ); + while ( token != NULL ) + { + GetWindowsDirectory(szSearchPath, MAX_PATH); + _tcscat(szSearchPath, TEXT("\\")); + _tcscat(szSearchPath, token); - hFind = FindFirstFile(szSearchPath, &fd); - while(hFind != INVALID_HANDLE_VALUE) - { - /* Don't add any hidden bitmaps */ - if((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) - { - TCHAR filename[MAX_PATH]; + hFind = FindFirstFile(szSearchPath, &fd); + while(hFind != INVALID_HANDLE_VALUE) + { + /* Don't add any hidden bitmaps */ + if((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) + { + TCHAR filename[MAX_PATH]; - GetWindowsDirectory(filename, MAX_PATH); - - _tcscat(filename, TEXT("\\")); - _tcscat(filename, fd.cFileName); + GetWindowsDirectory(filename, MAX_PATH); + + _tcscat(filename, TEXT("\\")); + _tcscat(filename, fd.cFileName); - himl = (HIMAGELIST)SHGetFileInfo(filename, - 0, - &sfi, - sizeof(sfi), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | - SHGFI_DISPLAYNAME); - - if(himl == NULL) - { - break; - } + himl = (HIMAGELIST)SHGetFileInfo(filename, + 0, + &sfi, + sizeof(sfi), + SHGFI_SYSICONINDEX | SHGFI_SMALLICON | + SHGFI_DISPLAYNAME); + + if(himl == NULL) break; - if(i++ == 0) - { - g_hShellImageList = himl; - (void)ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); - } - - backgroundItem = &g_backgroundItems[g_listViewItemCount]; - - backgroundItem->bWallpaper = TRUE; + if(i++ == 0) + { + g_hShellImageList = himl; + (void)ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); + } + + backgroundItem = &g_backgroundItems[g_listViewItemCount]; + + backgroundItem->bWallpaper = TRUE; - _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); - _tcscpy(backgroundItem->szFilename, filename); - - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.pszText = backgroundItem->szDisplayName; - listItem.state = 0; - listItem.iImage = sfi.iIcon; - listItem.iItem = g_listViewItemCount; - listItem.lParam = g_listViewItemCount; + _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + _tcscpy(backgroundItem->szFilename, filename); + + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + listItem.pszText = backgroundItem->szDisplayName; + listItem.state = 0; + listItem.iImage = sfi.iIcon; + listItem.iItem = g_listViewItemCount; + listItem.lParam = g_listViewItemCount; - (void)ListView_InsertItem(g_hBackgroundList, &listItem); + (void)ListView_InsertItem(g_hBackgroundList, &listItem); - g_listViewItemCount++; - } + g_listViewItemCount++; + } - if(!FindNextFile(hFind, &fd)) - hFind = INVALID_HANDLE_VALUE; - } - - token = _tcstok ( NULL, separators ); - } - - + if(!FindNextFile(hFind, &fd)) + hFind = INVALID_HANDLE_VALUE; + } + + token = _tcstok ( NULL, separators ); + } } void InitBackgroundDialog() @@ -229,8 +228,7 @@ BITMAP bitmap; g_backgroundDesktopColor = GetSysColor( COLOR_BACKGROUND ); - - g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); + g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); g_hBackgroundPreview = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_PREVIEW); g_hPlacementCombo = GetDlgItem(g_hBackgroundPage, IDC_PLACEMENT_COMBO); g_hColorButton = GetDlgItem(g_hBackgroundPage, IDC_COLOR_BUTTON); @@ -247,7 +245,17 @@ SendMessage(g_hPlacementCombo, CB_INSERTSTRING, PLACEMENT_TILE, (LPARAM)szString); /* Load the default settings from the registry */ - RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); + result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); + if( result != ERROR_SUCCESS ) + { + /* reg key open failed; maybe it does not exist? create it! */ + DWORD dwDisposition = 0; + result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, NULL, 0, KEY_ALL_ACCESS, NULL, + &regKey, &dwDisposition ); + /* now the key must be created & opened and regKey points to opened key */ + /* On error result will not contain ERROR_SUCCESS. I don't know how to handle */ + /* this case :( */ + } result = RegQueryValueEx(regKey, TEXT("WallpaperStyle"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); @@ -296,37 +304,69 @@ void OnColorButton() { + /* Load custom colors from Registry */ + HKEY hKey = NULL; + LONG res = ERROR_SUCCESS; + res = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hKey, NULL ); + /* Now the key is either created or opened existing, if res == ERROR_SUCCESS */ + if( res == ERROR_SUCCESS ) + { + /* Key opened */ + DWORD dwType = REG_BINARY; + DWORD cbData = sizeof(custom_colors); + res = RegQueryValueEx( hKey, TEXT("CustomColors"), NULL, &dwType, + (LPBYTE)custom_colors, &cbData ); + RegCloseKey( hKey ); + hKey = NULL; + } + + /* Launch ChooseColor() dialog */ CHOOSECOLOR cc; - COLORREF custom_colors[16]; - cc.lStructSize = sizeof(CHOOSECOLOR); cc.hwndOwner = g_hBackgroundPage; cc.hInstance = NULL; cc.rgbResult = g_backgroundDesktopColor; - - memset(custom_colors, RGB(255,255,255), sizeof(custom_colors)); - cc.lpCustColors = custom_colors; cc.Flags = CC_ANYCOLOR | /* Causes the dialog box to display all available colors in the set of basic colors. */ - CC_FULLOPEN | /* opens dialog in full size */ - CC_RGBINIT ; /* init chosen color by rgbResult value */ + CC_FULLOPEN | /* opens dialog in full size */ + CC_RGBINIT ; /* init chosen color by rgbResult value */ cc.lCustData = 0; cc.lpfnHook = NULL; cc.lpTemplateName = NULL; - if( ChooseColor( &cc ) ) { - g_backgroundDesktopColor = cc.rgbResult; /* save selected color to var */ - PropSheet_Changed( GetParent( g_hBackgroundPage ), g_hBackgroundPage ); /* Apply button will be activated */ - InvalidateRect(g_hBackgroundPreview, NULL, TRUE); /* window will be updated :) */ - } -} - -BOOL CheckListBoxFilename(HWND list, TCHAR *filename) -{ - UNREFERENCED_PARAMETER(filename); - UNREFERENCED_PARAMETER(list); - return FALSE; + /* Save selected color to var */ + g_backgroundDesktopColor = cc.rgbResult; + /* Allpy buuton will be activated */ + PropSheet_Changed( GetParent( g_hBackgroundPage ), g_hBackgroundPage ); + /* Window will be updated :) */ + InvalidateRect(g_hBackgroundPreview, NULL, TRUE); + /* Save custom colors to reg. To this moment key must be ceated already. See above */ + res = RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, + KEY_WRITE, &hKey ); + if( res == ERROR_SUCCESS ) + { + /* Key opened */ + RegSetValueEx( hKey, TEXT("CustomColors"), 0, REG_BINARY, + (const BYTE *)custom_colors, sizeof(custom_colors) ); + RegCloseKey( hKey ); + hKey = NULL; + } + } +} + +BOOL CheckListViewFilenameExists(HWND hWndList, LPCTSTR tszFileName) +{ + /* ListView_FindItem() Macro: Searches for a list-view item with the specified * + * characteristics. Returns the index of the item if successful, or -1 otherwise */ + LVFINDINFO lvfi; + lvfi.flags = LVFI_STRING; /* search item by EXACT string */ + lvfi.psz = tszFileName; /* string to search */ + /* other items of this structure are not valid, besacuse flags are not set. */ + int retVal = ListView_FindItem( hWndList, -1, &lvfi ); + if( retVal != -1 ) return TRUE; /* item found! */ + return FALSE; /* item not found. */ } void OnBrowseButton() @@ -361,7 +401,7 @@ if(GetOpenFileName(&ofn) == TRUE) { /* Check if there is already a entry that holds this filename */ - if(CheckListBoxFilename(g_hBackgroundList, filename) == TRUE) + if(CheckListViewFilenameExists(g_hBackgroundList, ofn.lpstrFileTitle) == TRUE) return; if(g_listViewItemCount > (MAX_BACKGROUNDS - 1)) @@ -419,7 +459,7 @@ InvalidateRect(g_hBackgroundPreview, NULL, TRUE); - EnableWindow(g_hColorButton, (backgroundItem->bWallpaper == FALSE ? TRUE : FALSE)); + EnableWindow(g_hColorButton, (backgroundItem->bWallpaper == FALSE ? TRUE : FALSE)); EnableWindow(g_hPlacementCombo, backgroundItem->bWallpaper); PropSheet_Changed(GetParent(g_hBackgroundPage), g_hBackgroundPage); @@ -427,19 +467,18 @@ void DrawBackgroundPreview(LPDRAWITEMSTRUCT draw) { - float scaleX; - float scaleY; - int scaledWidth; - int scaledHeight; - int posX; - int posY; + float scaleX; + float scaleY; + int scaledWidth; + int scaledHeight; + int posX; + int posY; if(g_backgroundItems[g_backgroundSelection].bWallpaper == FALSE) { + /* update desktop background color image */ HBRUSH hBrush = CreateSolidBrush( g_backgroundDesktopColor ); - //HBRUSH hBrushOld = SelectObject( draw->hDC, hBrush ); FillRect(draw->hDC, &draw->rcItem, hBrush ); - //SelectObject( draw->hDC, hBrushOld ); DeleteObject( hBrush ); return; } @@ -562,26 +601,31 @@ void SetDesktopBackColor() { - /* change system color */ + /* Change system color */ INT iElement = COLOR_BACKGROUND; - if(!SetSysColors(1, &iElement, &g_backgroundDesktopColor)) - { - MessageBox(g_hBackgroundPage, TEXT("SetSysColor() failed!"), /* these error texts can need internationalization? */ - TEXT("Error!"), MB_ICONSTOP ); - } - - /* write color to registry key: HKEY_CURRENT_USER\Control Panel\Colors\Background */ + if( !SetSysColors( 1, &iElement, &g_backgroundDesktopColor ) ) + MessageBox( g_hBackgroundPage, TEXT("SetSysColor() failed!"), /* these error texts can need internationalization? */ + TEXT("Error!"), MB_ICONSTOP ); + /* Write color to registry key: HKEY_CURRENT_USER\Control Panel\Colors\Background */ HKEY hKey = NULL; - if( RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS ) - { - TCHAR clText[16] = {0}; // COLORREF(DWORD) holds colors as := 0x00BBGGRR - DWORD red = (g_backgroundDesktopColor & 0x000000FF); - DWORD green = (g_backgroundDesktopColor & 0x0000FF00) >> 8; - DWORD blue = (g_backgroundDesktopColor & 0x00FF0000) >> 16; - wsprintf( clText, TEXT("%d %d %d"), red, green, blue ); /* format string to be set to registry */ - RegSetValueEx( hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR) ); - RegCloseKey( hKey ); - } + LONG result = ERROR_SUCCESS; + result = RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_WRITE, &hKey ); + if( result != ERROR_SUCCESS ) + { + /* Key open failed; maybe it does not exist? create it! */ + result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hKey, NULL ); + /* Now key must be created and opened and hKey must point at newly created key */ + /* On error result will not contain ERROR_SUCCESS. I don't know how to handle */ + /* this case :( */ + } + TCHAR clText[16] = {0}; + DWORD red = GetRValue( g_backgroundDesktopColor ); + DWORD green = GetGValue( g_backgroundDesktopColor ); + DWORD blue = GetBValue( g_backgroundDesktopColor ); + wsprintf( clText, TEXT("%d %d %d"), red, green, blue ); /* format string to be set to registry */ + RegSetValueEx( hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR) ); + RegCloseKey( hKey ); } INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg,

18 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006