Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 28250: Add Cardsbav.dll to Build of RosApps
by dreimer＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: dreimer Date: Thu Aug 9 02:05:04 2007 New Revision: 28250 URL: http://svn.reactos.org/svn/reactos?rev=28250&view=rev Log: Add Cardsbav.dll to Build of RosApps Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=28250… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Thu Aug 9 02:05:04 2007 @@ -3,6 +3,10 @@ <xi:include href="avtest/avtest.rbuild" /> </directory> --> +<directory name="cardsbav"> + <xi:include href="cardsbav/cardsbav.rbuild" /> +</directory> + <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" /> </directory>

1 0

[cfinck] 28249: Slovak translations for Explorer, Taskmgr and Winhelp by Mario Kacmar (kario AT szm DOT sk) See issue #2543, 2551, 2552 for more details.
by cfinck＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: cfinck Date: Wed Aug 8 23:23:53 2007 New Revision: 28249 URL: http://svn.reactos.org/svn/reactos?rev=28249&view=rev Log: Slovak translations for Explorer, Taskmgr and Winhelp by Mario Kacmar (kario AT szm DOT sk) See issue #2543,2551,2552 for more details. Added: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/shell/explorer/explorer-sk.rc Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/base/applications/winhelp/lang/sk-SK.rc trunk/reactos/base/shell/explorer/explorer_intres.rc Added: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc Wed Aug 8 23:23:53 2007 @@ -1,0 +1,683 @@ +///////////////////////////////////////////////////////////////////////////// +// Slovak resource files by Kario (kario(a)szm.sk) (08-08-2007) + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Nová úloha (Spusti...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "U&konèi Správcu úloh", ID_FILE_EXIT + END + POPUP "&Monosti" + BEGIN + MENUITEM "&Vdy navrchu", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "&Minimalizova pri pouití", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "&Skrý pri minimalizovaní", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "&Zobrazi 16-bitové úlohy", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "&Zobrazi" + BEGIN + MENUITEM "&Obnovi", ID_VIEW_REFRESH + POPUP "&Rýchlos aktualizácie" + BEGIN + MENUITEM "&Vysoká", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "No&rmálna", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&Nízka", ID_VIEW_UPDATESPEED_LOW + MENUITEM "&Pozastavené", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "&Ve¾ké ikony", ID_VIEW_LARGE + MENUITEM "&Malé ikony", ID_VIEW_SMALL + MENUITEM "&Podrobnosti", ID_VIEW_DETAILS, CHECKED + MENUITEM "&Vybra såpce...", ID_VIEW_SELECTCOLUMNS + POPUP "&História procesora" + BEGIN + MENUITEM "&Jeden graf pre vetky procesory", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "Jeden graf pre &kadý procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "&Zobrazi èasy jadra", ID_VIEW_SHOWKERNELTIMES + END + POPUP "&Okna" + BEGIN + MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "&Ved¾a seba", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimalizova", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximalizova", ID_WINDOWS_MAXIMIZE + MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE + MENUITEM "Presunú dopred&u", ID_WINDOWS_BRINGTOFRONT + END + POPUP "&Pomocník" + BEGIN + MENUITEM "Témy &Pomocníka pre Správcu úloh", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "È&o je &Správca úloh", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "&Ved¾a seba", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimalizova", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximalizova", ID_WINDOWS_MAXIMIZE + MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE + MENUITEM "Presunú d&opredu", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Nová úloha (Spusti...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Ve¾ké ikony", ID_VIEW_LARGE + MENUITEM "&Malé ikony", ID_VIEW_SMALL + MENUITEM "&Podrobnosti", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "P&repnú", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "Presunú d&opredu", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "&Ved¾a seba", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimalizova", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximalizova", ID_WINDOWS_MAXIMIZE + MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "Ukonèi úlo&hu", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "Pr&ejs na proces", ID_APPLICATION_PAGE_GOTOPROCESS + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Obnovi", ID_RESTORE + MENUITEM "&Zavrie", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Vdy navrchu", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Ukonèi proces", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Ukonèi stro&m procesu", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&Ladi", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "&Nastavi prioritu" + BEGIN + MENUITEM "&V reálnom èase", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "Vy&soká", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "Vyia &ako normálna", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&Normálna", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "Niia ako nor&málna", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "Níz&ka", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "Nastavi &afinitu...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Upravi &kanály ladenia...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je Správca úloh systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Správca úloh v1.0\nCopyright (C) 1999 - 2001\nBrian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_TASKMANAGER,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_TASKMGR_DIALOG DIALOG DISCARDABLE 0, 0, 264, 246 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Správca úloh systému ReactOS" +MENU IDR_TASKMANAGER +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 +END + +IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Nová úloha...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "&Prepnú",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "Ukonèi úlo&hu",IDC_ENDTASK,75,189,53,14,WS_DISABLED +END + +IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Ukonèi proces",IDC_ENDPROCESS,171,189,69,14 + CONTROL "&Zobrazi procesy vetkých pouívate¾ov",IDC_SHOWALLPROCESSES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 +END + +//IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 +IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Procesor",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Stránkovanie",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Súèty",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Vyuitie pamäte (kB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Fyzická pamä (kB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Pamä jadra (kB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "Popisovaèe",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Vlákna",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Procesy",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Celkovo",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Maximum",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Celkovo",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "K dispozícii",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Vyrovnávacia pamä systému",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Celkovo",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "Stránkovaná",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "Nestránkovaná",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + GROUPBOX "História vyuitia procesora",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "História vyuitia stránkovacieho súboru",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "Zobrazenie vyuitia procesora",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Zobrazenie vyuitia pamäte",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "História vyuitia procesora",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,0,WS_EX_CLIENTEDGE + PUSHBUTTON "História vyuitia pamäte",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + 153,37,0,WS_EX_CLIENTEDGE +END + +IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Kanály ladenia" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | + LVS_SORTASCENDING,7,7,233,177 + PUSHBUTTON "Zavrie",IDOK,171,189,69,14 +END + +IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Afinita procesorov" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,120,133,50,14 + PUSHBUTTON "Zrui",IDCANCEL,174,133,50,14 + LTEXT "Nastavenie afinity procesorov riadi výber procesorov, na ktorých sa bude môc proces spusti.", + IDC_STATIC,5,5,220,16 + CONTROL "Procesor è. 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "Procesor è. 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "Procesor è. 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "Procesor è. 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "Procesor è. 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "Procesor è. 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "Procesor è. 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "Procesor è. 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "Procesor è. 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "Procesor è. 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "Procesor è. 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "Procesor è. 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "Procesor è. 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "Procesor è. 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "Procesor è. 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "Procesor è. 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "Procesor è. 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "Procesor è. 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "Procesor è. 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "Procesor è. 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "Procesor è. 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "Procesor è. 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "Procesor è. 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "Procesor è. 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "Procesor è. 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "Procesor è. 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "Procesor è. 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "Procesor è. 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "Procesor è. 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "Procesor è. 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "Procesor è. 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "Procesor è. 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,119,41,10 +END + +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Výber ståpcov" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,84,178,50,14 + PUSHBUTTON "Zrui",IDCANCEL,138,178,50,14 + LTEXT "Vyberte ståpce, ktoré sa majú zobrazi na karte procesov v Správcovi úloh.", + IDC_STATIC,7,7,181,17 + CONTROL "&Názov obrazu",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,56,10 + CONTROL "I&dentifikátor procesu (PID)",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + CONTROL "Vy&uitie procesora",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "Èa&s procesora",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,48,10 + CONTROL "&Vyuitie pamäte",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "&Rozdiel vyuitia pamäte",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + CONTROL "M&aximálne vyuitie pamäte",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + CONTROL "C&hyby stránkovania pamäte",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,53,10 + CONTROL "O&bjekty USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "Vstup a výstup - èítanie",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,49,10 + CONTROL "Vstup a výstup - preèítané bajty",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + CONTROL "&Identifikácia relácie",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "&Meno pouívate¾a",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,51,10 + CONTROL "Rozdiel &chýb stránkovania pamäte",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + CONTROL "V&e¾kos virtuálnej pamäte",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + CONTROL "Stránkovaný &fond",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,50,53,10 + CONTROL "Nes&tránkovaný fond",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + CONTROL "&Základná priorita",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + CONTROL "P&oèet popisovaèov",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,83,59,10 + CONTROL "&Poèet vlákien",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,94,59,10 + CONTROL "Objekty &GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,105,55,10 + CONTROL "Vstup a výstup - zápis",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,116,49,10 + CONTROL "Vstup a výstup - zapísané bajty",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + CONTROL "Vstup a výstup - iné",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,138,46,10 + CONTROL "Vstup a výstup - iné bajty",IDC_IOOTHERBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_TASKMGR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 260 + TOPMARGIN, 3 + BOTTOMMARGIN, 231 + END + + IDD_APPLICATION_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PROCESS_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PERFORMANCE_PAGE, DIALOG + BEGIN + LEFTMARGIN, 5 + RIGHTMARGIN, 242 + VERTGUIDE, 12 + VERTGUIDE, 65 + VERTGUIDE, 110 + TOPMARGIN, 5 + BOTTOMMARGIN, 205 + END + + IDD_AFFINITY_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 11 + VERTGUIDE, 61 + VERTGUIDE, 116 + VERTGUIDE, 175 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 + HORZGUIDE, 28 + HORZGUIDE, 38 + HORZGUIDE, 51 + HORZGUIDE, 64 + HORZGUIDE, 77 + HORZGUIDE, 90 + HORZGUIDE, 103 + HORZGUIDE, 116 + HORZGUIDE, 129 + END + + IDD_COLUMNS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 188 + VERTGUIDE, 107 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + HORZGUIDE, 28 + END +END +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Správca úloh" + IDC_TASKMGR "Správca úloh" + IDS_IDLE_PROCESS "Procesy systémovej neèinnosti" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "Spustí nový program." + ID_OPTIONS_ALWAYSONTOP "Ak Správca úloh nie je minimalizovaný, zostáva v popredí vetkých ostatných úloh." + ID_OPTIONS_MINIMIZEONUSE + "Správce úloh se zminimalizuje po pøepnutí na jinou úlohu" + ID_OPTIONS_HIDEWHENMINIMIZED "Skryje Správcu úloh pri minimalizovaní." + ID_VIEW_REFRESH "Správca úloh sa aktualizuje ihneï bez oh¾adu na nastavenie rýchlosti aktualizácie." + ID_VIEW_LARGE "Zobrazí úlohy ve¾kými ikonami." + ID_VIEW_SMALL "Zobrazí úlohy malými ikonami." + ID_VIEW_DETAILS "Zobrazí informácie o kadej úlohe." + ID_VIEW_UPDATESPEED_HIGH "Aktualizuje obrazovku dvakrát za sekundu." + ID_VIEW_UPDATESPEED_NORMAL "Aktualizuje obrazovku kadé dve sekundy." + ID_VIEW_UPDATESPEED_LOW "Aktualizuje obrazovku kadé tyri sekundy." +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "Obrazovka sa automaticky neaktualizuje." + ID_WINDOWS_TILEHORIZONTALLY + "Usporiada okná na pracovnej ploche pod seba." + ID_WINDOWS_TILEVERTICALLY "Usporiada okná na pracovnej ploche ved¾a seba." + ID_WINDOWS_MINIMIZE "Minimalizuje okná." + ID_WINDOWS_MAXIMIZE "Maximalizuje okná." + ID_WINDOWS_CASCADE "Vybraté okná usporiada na obrazovke do diagonálnej kaskády." + ID_WINDOWS_BRINGTOFRONT "Prenesie okno do popredia bez aktivácie." + ID_HELP_TOPICS "Zobrazí témy Pomocníka pre program Správca úloh." + ID_HELP_ABOUT "Zobrazí informácie o programe, jeho verziu a autorské práva." + ID_FILE_EXIT "Ukonèí program Správca úloh." + ID_OPTIONS_SHOW16BITTASKS + "Zobrazí 16-bitové úlohy pod procesom ntvdm.exe." + ID_VIEW_SELECTCOLUMNS "Vyberte ståpce, ktoré sa majú zobrazi na karte procesov v Správcovi úloh." + ID_VIEW_SHOWKERNELTIMES "Zobrazí èas jádra na grafoch výkonu." + ID_VIEW_CPUHISTORY_ONEGRAPHALL + "Graf histórie zobrazuje celkové vyuitie procesora." + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Kadý procesor má vlastný graf histórie." + ID_APPLICATION_PAGE_SWITCHTO + "Prenesie úlohu do popredia a aktivuje jej okno." +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Pokúsi sa ukonèi vybrané úlohy." + ID_GOTOPROCESS "Prepne na proces vybranej úlohy." + ID_RESTORE "Obnoví Správcu úloh zo skrytého stavu." + ID_PROCESS_PAGE_ENDPROCESS "Odstráni proces zo systému." + ID_PROCESS_PAGE_ENDPROCESSTREE + "Odstráni proces a jeho potomkov zo systému." + ID_PROCESS_PAGE_DEBUG "Pripojí k procesu ladiaci nástroj." + ID_PROCESS_PAGE_SETAFFINITY + "Urèuje procesor, na ktorom sa proces môe spusti." + ID_PROCESS_PAGE_SETPRIORITY_REALTIME + "Zaradí proces do triedy priorít REÁLNY ÈAS." + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Zaradí proces do triedy priorít ZVÝENÁ." + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + "Zaradí proces do triedy priorít VYSOKÁ." + ID_PROCESS_PAGE_SETPRIORITY_NORMAL + "Zaradí proces do triedy priorít NORMÁLNA." + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + "Zaradí proces do triedy priorít ZNÍENÁ." + ID_PROCESS_PAGE_SETPRIORITY_LOW "Zaradí proces do triedy priorít NÍZKA." + IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Menej veobecnej verejnej licencie (GNU Lesser General Public License) ako boli zverejnené nadáciou Free Software Foundation; buï verzie 2.1 tejto licencie, alebo (pod¾a váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detajlov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Aplikácie" + IDS_TAB_PROCESSES "Procesy" + IDS_TAB_PERFORMANCE "Výkon" + IDS_TAB_TASK "Úloha" + IDS_TAB_STATUS "Stav" + IDS_TAB_IMAGENAME "Názov obrazu" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Meno pouívate¾a" + IDS_TAB_SESSIONID "Identifikácia relácie" + IDS_TAB_CPU "Procesor" + IDS_TAB_CPUTIME "Èas procesora" + IDS_TAB_MEMUSAGE "Pouívanie pamäte" + IDS_TAB_PEAKMEMUSAGE "Vyuitie maximálnej ve¾kosti pamäte" + IDS_TAB_MEMDELTA "Rozdiel vyuitia pamäte" + IDS_TAB_PAGEFAULT "Chyby stránkovania pamäte" + IDS_TAB_PFDELTA "Rozdiel chýb stránkovania pamäte" + IDS_TAB_VMSIZE "Ve¾kos virtuálnej pamäte" + IDS_TAB_PAGEDPOOL "Stránkovaný fond" + IDS_TAB_NPPOOL "Nestránkovaný fond" + IDS_TAB_BASEPRI "Základná priorita" + IDS_TAB_HANDLES "Popisovaèe" + IDS_TAB_THREADS "Vlákna" + IDS_TAB_USERPBJECTS "Objekty USER" + IDS_TAB_GDIOBJECTS "Objekty GDI" + IDS_TAB_IOREADS "Vstup a výstup - èítanie" + IDS_TAB_IOWRITES "Vstup a výstup - zápis" + IDS_TAB_IOOTHER "Vstup a výstup - iné" + IDS_TAB_IOREADBYTES "Vstup a výstup - preèítané bajty" + IDS_TAB_IOWRITESBYTES "Vstup a výstup - zapísané bajty" + IDS_TAB_IOOTHERBYTES "Vstup a výstup - iné bajty" + IDS_MENU_SELECTCOLUMNS "&Vybra ståpce..." + IDS_MENU_16BITTASK "&Zobrazit 16-bitové úlohy" + IDS_MENU_WINDOWS "&Okna" + IDS_MENU_LARGEICONS "&Velké ikony" + IDS_MENU_SMALLICONS "&Malé ikony" + IDS_MENU_DETAILS "&Podrobnosti" + IDS_MENU_ONEGRAPHALLCPUS "&Jeden graf pre vetky procesory" + IDS_MENU_ONEGRAPHPERCPU "Jeden graf pre &kadý procesor" + IDS_MENU_CPUHISTORY "&História procesora" + IDS_MENU_SHOWKERNELTIMES "&Zobrazi èasy jadra" + IDS_CREATENEWTASK "Vytvori novú úlohu" + IDS_CREATENEWTASK_DESC "Zadajte názov programu, prieèinka, dokumentu alebo internetového zdroja a systém ReactOS ho otvorí." + IDS_MSG_ACCESSPROCESSAFF "Není moné zpøístupnit afinitu procesu" + IDS_MSG_PROCESSONEPRO "Proces musí ma afinitu aspoò k jednému procesoru." + IDS_MSG_INVALIDOPTION "Neplatná monos" + IDS_MSG_UNABLEDEBUGPROCESS "Ladiaci nástroj sa nepodarilo pripoji." + IDS_MSG_WARNINGDEBUG "UPOZORNENIE: Proces ladenia môe zapríèini stratu údajov.\nNaozaj chcete pripoji ladiaci nástroj?" + IDS_MSG_TASKMGRWARNING "Upozornenie Správcu úloh" + IDS_MSG_WARNINGTERMINATING "UPOZORNENIE: Ukonèenie procesu môe ma neiadúce\ndôsledky vrátane nestability systému.\nStav alebo údaje o procese sa nebudú da\npred ukonèením uloi.\nNaozaj chcete proces ukonèi?" + IDS_MSG_UNABLETERMINATEPRO "Proces sa nedá ukonèi." + IDS_MSG_UNABLECHANGEPRIORITY "Priorita sa nedá zmeni." + IDS_MSG_WARNINGCHANGEPRIORITY "UPOZORNENIE: Zmena triedy priority procesu môe ma\nneiadúce dôsledky vrátane nestability systému.\nNaozaj chcete zmeni triedu priority procesu?" + IDS_MSG_TRAYICONCPUUSAGE "Vyuitie procesora: %d%%" + IDS_STATUS_MEMUSAGE "Vyuitá pamä: %dK / %dK" + IDS_STATUS_CPUUSAGE "Vyuitie procesora: %3d%%" + IDS_STATUS_PROCESSES "Procesy: %d" + IDS_Not_Responding "Neodpovedá" + IDS_Running "Spustené" +END + +#endif // Slovak resource file +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/rsrc.rc (original) +++ trunk/reactos/base/applications/taskmgr/rsrc.rc Wed Aug 8 23:23:53 2007 @@ -18,5 +18,6 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/winhelp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/sk-SK.rc Wed Aug 8 23:23:53 2007 @@ -1,3 +1,10 @@ +/* +* FILE: base/applications/winhelp/lang/sk-SK.rc +* PURPOSE: Slovak Language File for winhelp +* TRANSLATOR: Kario (kario(a)szm.sk) +* DATE OF TR: 04-08-2007 +*/ + /* * Help Viewer * @@ -37,13 +44,13 @@ POPUP "&Záloka" { MENUITEM "&Definova...", MNID_BKMK_DEFINE } - POPUP "&Pomoc" { - MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON + POPUP "&Pomocík" { + MENUITEM "&Ako poui Pomocníka", MNID_HELP_HELPON MENUITEM "Vdy na &vrchu", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "O& WINE", MNID_HELP_WINE + MENUITEM "È&o je ReactOS", MNID_HELP_WINE #endif } } @@ -51,18 +58,18 @@ /* Strings */ STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "WINE Pomoc" +STID_WINE_HELP, "Pomocník ReactOSu" STID_WHERROR, "CHYBA" -STID_WARNING, "VAROVANIE" +STID_WARNING, "UPOZORNENIE" STID_INFO, "Informácie" STID_NOT_IMPLEMENTED, "Neimplementované" -STID_HLPFILE_ERROR_s, "Chyba poèas èítania súboru `%s'" +STID_HLPFILE_ERROR_s, "Pri pokuse otvori súbor pomocníka '%s' sa vyskytla chyba." STID_CONTENTS, "&Obsah" STID_SEARCH, "&H¾ada" STID_BACK, "&Spä" STID_HISTORY, "&História" -STID_TOPICS, "&Topics" +STID_TOPICS, "&Témy" STID_ALL_FILES, "Vetky súbory (*.*)" STID_HELP_FILES_HLP, "Súbory pomoci (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "Súbor '%s' nebol nájdený. Chcete sa pokúsi nájs tento súbor sami?" } Added: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc (added) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc Wed Aug 8 23:23:53 2007 @@ -1,0 +1,409 @@ +/* +* FILE: base/shell/explorer/explorer-sk.rc +* PURPOSE: Slovak Language File for winhelp +* TRANSLATOR: Kario (kario(a)szm.sk) +* DATE OF TR: 08-08-2007 +* _______________________________________________ +* NOTE: this file need to be fixed +*/ + + +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Slovak resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SKY) +#ifdef _WIN32 +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Spusti...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Ukonèi", ID_FILE_EXIT + END + POPUP "&Zobrazenie" + BEGIN + MENUITEM "&Panel nástrojov", ID_VIEW_TOOL_BAR + MENUITEM "&Extra panel", ID_VIEW_EXTRA_BAR + MENUITEM "&Lita diskov", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Boèný panel", ID_VIEW_SIDE_BAR + MENUITEM "&Stavový riadok", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Obnovi\tF5", ID_REFRESH + MENUITEM "&Celá obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Okno" + BEGIN + MENUITEM "&Nové okno", ID_WINDOW_NEW + MENUITEM "&Kaskáda\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&Pod seba", ID_WINDOW_TILE_HORZ + MENUITEM "&Ved¾a seba\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Usporiada &automaticky", ID_WINDOW_AUTOSORT + MENUITEM "Usporiada &symboly", ID_WINDOW_ARRANGE + END + POPUP "&Nástroje" + BEGIN + MENUITEM "&Monosti", ID_TOOLS_OPTIONS + END + POPUP "&Pomocník" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Èo je Explorer...", ID_ABOUT_EXPLORER + MENUITEM "È&o je operaèný systém...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Nastavenia...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Správca úloh...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "È&o je Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Otvori ovládanie hlasitosti", ID_TRAY_VOLUME + MENUITEM "Upravi vlastnosti zvuku", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Zobrazi skryté ikony", ID_SHOW_HIDDEN_ICONS + MENUITEM "Zo&brazi ikonu skrývania", ID_SHOW_ICON_BUTTON + MENUITEM "&Prispôsobi oznamovanie...", ID_CONFIG_NOTIFYAREA + MENUITEM "Upr&avi dátum a èas", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "È&o je Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Spusti...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Ukonèi", ID_FILE_EXIT + END + POPUP "&Zobrazenie" + BEGIN + MENUITEM "&Panel nástrojov", ID_VIEW_TOOL_BAR + MENUITEM "&Boèný panel", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Stavový riadok", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Obnovi\tF5", ID_REFRESH + MENUITEM "&Celá obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Nástroje" + BEGIN + MENUITEM "&Monosti", ID_TOOLS_OPTIONS + END + POPUP "&Pomocník" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Èo je Explorer...", ID_ABOUT_EXPLORER + MENUITEM "È&o je operaèný systém...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Spusti" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Príkaz:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Ako &symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Zrui",2,158,23,47,14 + PUSHBUTTON "&Pomocník",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "H¾ada program v ponuke tart" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti plochy" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Vyberte si prosím, vami uprednostòovaný spôsob zarovnania ikón:", + IDC_STATIC,7,7,166,8 + CONTROL "z¾ava zhora dole",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "z¾ava zhora vpravo",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "zprava zhora v¾avo",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "zprava zhora dole",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "z¾ava zdola hore",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "z¾ava zdola vpravo",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "zprava zdola v¾avo",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "zprava zdola hore",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "po okrajoch dole",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "po okrajoch H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "dookola",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Zobrazi èíslo &verzie",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti panela úloh" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Zobrazi &hodiny",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&Skry neaktívne ikony", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Prispôsobi...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti ponuky tart" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Prispôsobenie oznamovacích ikón" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Text popisu:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "&Názov okna:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Cesta:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Zobrazenie",IDC_LABEL4,7,96,157,28 + CONTROL "z&obrazi",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&skry",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "skry a&utomaticky",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Posledná zmena:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "zo&brazi skryté",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Zrui",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Vybra spôsob zobrazovania okien" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Vyberte si prosím, vami uprednostòované pouívate¾ské rozhranie:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (Mnoho dokumentové rozhranie)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (Jedno dokumentové rozhranie)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Otvára prieèinky v samostatných &oknách", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "Toto nastavenie sa v budúcnosti pouije ako predvolené pre vetké okná Priezkumníka.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Zrui",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS Explorer" + IDS_START "tart" + IDS_LOGOFF "Odhlási..." + IDS_SHUTDOWN "Vypnú..." + IDS_LAUNCH "Spusti..." + IDS_START_HELP "Pomocník" + IDS_SEARCH_FILES "H¾ada..." + IDS_DOCUMENTS "Moje dokumenty" + IDS_FAVORITES "Ob¾úbené poloky" + IDS_PROGRAMS "Programy" + IDS_SETTINGS "Nastavenia" + IDS_EXPLORE "Preskúma" + IDS_EMPTY "(Prázdne)" + IDS_RECENT "Nedávne dokumenty" + IDS_ADMIN "Administration" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Ponuka tart" + IDS_MINIMIZE_ALL "minimalizova vetké okná" + IDS_DESKTOP_NUM "Pracovná plocha %d" + IDS_VOLUME "Hlasitos" + IDS_ITEMS_CUR "súèasné poloky" + IDS_ITEMS_CONFIGURED "konfigurácia" + IDS_ITEMS_VISIBLE "vidite¾né" + IDS_ITEMS_HIDDEN "skryté" + IDS_NOTIFY_SHOW "zobrazi" + IDS_NOTIFY_HIDE "skry" + IDS_NOTIFY_AUTOHIDE "skry automaticky" + IDS_SHOW_HIDDEN_ICONS "Zobrazi skryté ikony" + IDS_HIDE_ICONS "Skry ikony" + IDS_TERMINATE "Ukonèi ReactOS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Sie" + IDS_CONNECTIONS "Sieové pripojenia" + IDS_DRIVES "Disky" + IDS_SEARCH_COMPUTER "H¾ada poèítaè..." + IDS_SETTINGS_MENU "Nastavenie" + IDS_CONTROL_PANEL "Ovládací panel" + IDS_PRINTERS "Tlaèiarne" + IDS_BROWSE "Prechádza súbory" + IDS_SEARCH_PRG "H¾ada program..." + IDS_ALL_USERS "All Users\\" + IDS_SEARCH "H¾ada" + IDS_ABOUT_EXPLORER "È&o je Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Vybrali ste viac programov.\nPrajete si spusti ich vetky?" + IDS_DESKTOPBAR_SETTINGS "Nastavenia plochy" + IDS_DESKTOP "Pracovná plocha" + IDS_TASKBAR "Panel úloh" +END + +#endif // Slovak resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Wed Aug 8 23:23:53 2007 @@ -124,6 +124,7 @@ "#include ""explorer-pt.rc""\r\n" "#include ""explorer-ro.rc""\r\n" "#include ""explorer-ru.rc""\r\n" + "#include ""explorer-sk.rc""\r\n" "#include ""explorer-sv.rc""\r\n" "#include ""explorer-uk.rc""\r\n" "\r\n" @@ -229,6 +230,7 @@ #include "explorer-pt.rc" #include "explorer-ro.rc" #include "explorer-ru.rc" +#include "explorer-sk.rc" #include "explorer-sv.rc" #include "explorer-uk.rc"

1 0

[jimtabor] 28248: - Removed NtGdiGet/SetArcDirection and NtGdiGetSetTextCharExtra, update ntgdibad.h. - Updated NtGdiGet/AndSet/DCDword. - Changes to other files to reflect the updates and removals.
by jimtabor＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: jimtabor Date: Wed Aug 8 22:58:06 2007 New Revision: 28248 URL: http://svn.reactos.org/svn/reactos?rev=28248&view=rev Log: - Removed NtGdiGet/SetArcDirection and NtGdiGetSetTextCharExtra, update ntgdibad.h. - Updated NtGdiGet/AndSet/DCDword. - Changes to other files to reflect the updates and removals. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Wed Aug 8 22:58:06 2007 @@ -334,7 +334,7 @@ GdiSwapBuffers@4 GdiTransparentBlt@44=NtGdiTransparentBlt@44 GdiValidateHandle@4 -GetArcDirection@4=NtGdiGetArcDirection@4 +GetArcDirection@4 GetAspectRatioFilterEx@8 GetBitmapAttributes@4 GetBitmapBits@12=NtGdiGetBitmapBits@12 @@ -529,7 +529,7 @@ SelectObject@8=NtGdiSelectObject@8 SelectPalette@12=NtGdiSelectPalette@12 SetAbortProc@8 -SetArcDirection@8=NtGdiSetArcDirection@8 +SetArcDirection@8 SetBitmapAttributes@8 SetBitmapBits@12=NtGdiSetBitmapBits@12 SetBitmapDimensionEx@16=NtGdiSetBitmapDimensionEx@16 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Aug 8 22:58:06 2007 @@ -176,19 +176,6 @@ /* * @unimplemented */ -int -STDCALL -GetTextCharacterExtra( - HDC hDc - ) -{ - return NtGdiGetSetTextCharExtra( hDc, 0, FALSE); -} - - -/* - * @unimplemented - */ DWORD STDCALL GetFontLanguageInfo( @@ -310,20 +297,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; -} - - -/* - * @unimplemented - */ -int -STDCALL -SetTextCharacterExtra( - HDC hDC, - int CharExtra - ) -{ - return NtGdiGetSetTextCharExtra( hDC, CharExtra, TRUE); } @@ -1267,22 +1240,6 @@ STDCALL SetFontEnumeration( DWORD a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -DWORD -STDCALL -SetRelAbs( - DWORD a0, - DWORD a1 ) { UNIMPLEMENTED; Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Wed Aug 8 22:58:06 2007 @@ -290,6 +290,22 @@ } +INT +STDCALL +GetArcDirection( HDC hdc ) +{ + return GetDCDWord( hdc, GdiGetArcDirection, 0); +} + + +INT +STDCALL +SetArcDirection( HDC hdc, INT nDirection ) +{ + return GetAndSetDCDWord( hdc, GdiGetSetArcDirection, nDirection, 0, 0, 0 ); +} + + /* * @implemented */ @@ -301,6 +317,20 @@ ) { return GetDCDWord( hdc, GdiGetRelAbs, 0); +} + + +/* + * @implemented + */ +DWORD +STDCALL +SetRelAbs( + HDC hdc, + INT Mode + ) +{ + return GetAndSetDCDWord( hdc, GdiGetSetRelAbs, Mode, 0, 0, 0 ); } Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Wed Aug 8 22:58:06 2007 @@ -44,6 +44,26 @@ int cbString) { return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL); +} + + +/* + * @unimplemented + */ +int +STDCALL +GetTextCharacterExtra( + HDC hDc + ) +{ +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hDc, (PVOID) &Dc_Attr)) return 0; + return Dc_Attr->lTextExtra; +#endif + // Do it this way for now. + return GetDCDWord( hDc, GdiGetTextCharExtra, 0); } @@ -393,3 +413,47 @@ return TRUE; } + + +/* + * @unimplemented + */ +int +STDCALL +SetTextCharacterExtra( + HDC hDC, + int CharExtra + ) +{ + INT cExtra = 0x80000000; +// PDC_ATTR Dc_Attr; + + if (CharExtra == cExtra) + { + SetLastError(ERROR_INVALID_PARAMETER); + return cExtra; + } +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + { + return 0; //call MFDRV META_SETTEXTCHAREXTRA + } + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return cExtra; + + if (NtCurrentTeb()->GdiTebBatch.HDC == hDC) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + cExtra = Dc_Attr->lTextExtra; + Dc_Attr->lTextExtra = CharExtra; + return cExrta; +#endif +// Do this for now. + return GetAndSetDCDWord( hDC, GdiGetSetTextCharExtra, CharExtra, 0, 0, 0 ); +} + + Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Aug 8 22:58:06 2007 @@ -259,11 +259,6 @@ CONST LPBYTE Data ); -/* Use NtGdiGetDCDword with GdiGetArcDirection. */ -INT -STDCALL -NtGdiGetArcDirection ( HDC hDC ); - /* Should be done in user-mode. */ BOOL STDCALL @@ -464,11 +459,6 @@ /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetROP2(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -INT -STDCALL -NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set); /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetStretchBltMode(HDC hDC); @@ -676,12 +666,6 @@ STDCALL NtGdiSetAbortProc(HDC hDC, ABORTPROC AbortProc); - -/* Use NtGdiGetAndSetDCDword with GdiGetSetArcDirection. */ -int -STDCALL -NtGdiSetArcDirection(HDC hDC, - int ArcDirection); /* Use NtGdiSetBitmapDimension. */ BOOL Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 8 22:58:06 2007 @@ -2161,20 +2161,31 @@ SafeResult = dc->Dc_Attr.lRelAbs; break; case GdiGetBreakExtra: + SafeResult = dc->Dc_Attr.lBreakExtra; break; case GdiGerCharBreak: + SafeResult = dc->Dc_Attr.cBreak; break; case GdiGetArcDirection: + SafeResult = dc->w.ArcDirection; break; case GdiGetEMFRestorDc: break; case GdiGetFontLanguageInfo: break; case GdiGetIsMemDc: + { + if (dc->w.flags & DC_MEMORY) + SafeResult = DC_TYPE_MEMORY; // = dc->DC_Type; + else + SafeResult = DC_TYPE_DIRECT; + } break; case GdiGetMapMode: + SafeResult = dc->Dc_Attr.iMapMode; break; case GdiGetTextCharExtra: + SafeResult = dc->Dc_Attr.lTextExtra; break; default: SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -2241,18 +2252,34 @@ case GdtGetSetCopyCount: break; case GdiGetSetTextAlign: + SafeResult = dc->Dc_Attr.lTextAlign; + dc->Dc_Attr.lTextAlign = dwIn; + dc->Dc_Attr.flTextAlign = dwIn; break; case GdiGetSetRelAbs: + SafeResult = dc->Dc_Attr.lRelAbs; + dc->Dc_Attr.lRelAbs = dwIn; break; case GdiGetSetTextCharExtra: + SafeResult = dc->Dc_Attr.lTextExtra; + dc->Dc_Attr.lTextExtra = dwIn; break; case GdiGetSetSelectFont: break; case GdiGetSetMapperFlagsInternal: break; case GdiGetSetMapMode: + SafeResult = dc->Dc_Attr.iMapMode; + dc->Dc_Attr.iMapMode = dwIn; break; case GdiGetSetArcDirection: + if (dwIn != AD_COUNTERCLOCKWISE && dwIn != AD_CLOCKWISE) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = FALSE; + } + SafeResult = dc->w.ArcDirection; + dc->w.ArcDirection = dwIn; break; default: SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -2290,7 +2317,6 @@ DC_SET_MODE( NtGdiSetBkMode, Dc_Attr.jBkMode, TRANSPARENT, OPAQUE ) DC_SET_MODE( NtGdiSetPolyFillMode, Dc_Attr.jFillMode, ALTERNATE, WINDING ) -// DC_SET_MODE( NtGdiSetRelAbs, Dc_Attr.lRelAbs, ABSOLUTE, RELATIVE ) DC_SET_MODE( NtGdiSetROP2, Dc_Attr.jROP2, R2_BLACK, R2_WHITE ) DC_SET_MODE( NtGdiSetStretchBltMode, Dc_Attr.jStretchBltMode, BLACKONWHITE, HALFTONE ) Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Wed Aug 8 22:58:06 2007 @@ -278,12 +278,6 @@ return ret; } -INT FASTCALL -IntGdiGetArcDirection(DC *dc) -{ - return dc->w.ArcDirection; -} - BOOL FASTCALL IntGdiPolyPolyline(DC *dc, @@ -327,25 +321,6 @@ return FALSE; } -INT -STDCALL -NtGdiGetArcDirection(HDC hDC) -{ - PDC dc = DC_LockDc (hDC); - int ret = 0; // default to failure - - if ( dc ) - { - ret = IntGdiGetArcDirection ( dc ); - DC_UnlockDc(dc); - } - else - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - } - - return ret; -} BOOL STDCALL @@ -956,24 +931,4 @@ return Ret; } -int -STDCALL -NtGdiSetArcDirection(HDC hDC, - int ArcDirection) -{ - PDC dc; - INT nOldDirection = 0; // default to FAILURE - - dc = DC_LockDc (hDC); - if ( !dc ) return 0; - - if ( ArcDirection == AD_COUNTERCLOCKWISE || ArcDirection == AD_CLOCKWISE ) - { - nOldDirection = dc->w.ArcDirection; - dc->w.ArcDirection = ArcDirection; - } - - DC_UnlockDc( dc ); - return nOldDirection; -} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Wed Aug 8 22:58:06 2007 @@ -39,9 +39,6 @@ VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint); BOOL FASTCALL PATH_StrokePath(DC *dc, GdiPath *pPath); BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, INT y2); - -INT FASTCALL -IntGdiGetArcDirection(DC *dc); VOID FASTCALL IntGetCurrentPositionEx(PDC dc, LPPOINT pt); @@ -750,7 +747,7 @@ ASSERT ( dc ); - clockwise = ( IntGdiGetArcDirection(dc) == AD_CLOCKWISE ); + clockwise = ( dc->w.ArcDirection == AD_CLOCKWISE ); /* Check that path is open */ if ( dc->w.path.state != PATH_Open ) Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Wed Aug 8 22:58:06 2007 @@ -4180,28 +4180,6 @@ } -/* Remove this HAX! after the below function is done in GDI32.DLL! */ -INT -STDCALL -NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set) -{ - /* Ulta-Ugly Hax! */ - INT Ret = 0x80000000; - - PDC dc = DC_LockDc ( hDC ); - if (!dc) - { - DPRINT("TextCharacterExtra %d", CharExtra); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return Ret; - } - DPRINT("TextCharacterExtra %d", CharExtra); - Ret = dc->Dc_Attr.lTextExtra; - if( Set ) dc->Dc_Attr.lTextExtra = CharExtra; - DC_UnlockDc(dc); - return (Ret); -} - static BOOL FASTCALL IntGetFullFileName( POBJECT_NAME_INFORMATION NameInfo, Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 8 22:58:06 2007 @@ -697,7 +697,6 @@ NtGdiSelectObject 2 NtGdiSelectPalette 3 NtGdiSetAbortProc 2 -NtGdiSetArcDirection 2 NtGdiSetBitmapDimensionEx 4 NtGdiSetBkColor 2 NtGdiSetBkMode 2 @@ -783,7 +782,6 @@ NtGdiEscape 5 NtGdiExtTextOut 8 NtGdiGdiComment 3 -NtGdiGetArcDirection 1 NtGdiGetAspectRatioFilterEx 2 NtGdiGetBitmapDimensionEx 2 NtGdiGetBkColor 1 @@ -816,7 +814,6 @@ NtGdiGetPixelFormat 1 NtGdiGetPolyFillMode 1 NtGdiGetROP2 1 -NtGdiGetSetTextCharExtra 3 NtGdiGetStretchBltMode 1 NtGdiGetSystemPaletteEntries 4 NtGdiGetTextAlign 1

1 0

[spetreolle] 28247: use unicode directive
by spetreolle＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: spetreolle Date: Wed Aug 8 20:41:25 2007 New Revision: 28247 URL: http://svn.reactos.org/svn/reactos?rev=28247&view=rev Log: use unicode directive Modified: trunk/rosapps/downloader/main.c trunk/rosapps/gettype/gettype.c trunk/rosapps/imagesoft/imagesoft.c trunk/rosapps/screenshot/screenshot.c trunk/rosapps/sysutils/ctm/ctm.c trunk/rosapps/winver/winver.c Modified: trunk/rosapps/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=2824… ============================================================================== --- trunk/rosapps/downloader/main.c (original) +++ trunk/rosapps/downloader/main.c Wed Aug 8 20:41:25 2007 @@ -444,8 +444,8 @@ return DefWindowProc (hwnd, Message, wParam, lParam); } -INT WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInst, - LPSTR lpCmdLine, INT nCmdShow) +INT WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInst, + LPTSTR lpCmdLine, INT nCmdShow) { int i; WNDCLASSEXW WndClass = {0}; Modified: trunk/rosapps/gettype/gettype.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/gettype/gettype.c?rev=2824… ============================================================================== --- trunk/rosapps/gettype/gettype.c (original) +++ trunk/rosapps/gettype/gettype.c Wed Aug 8 20:41:25 2007 @@ -226,7 +226,7 @@ } INT -main (VOID) +_tmain (VOID) { DWORD Operations = 0; INT ret = 255; Modified: trunk/rosapps/imagesoft/imagesoft.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/imagesoft.c?rev=… ============================================================================== --- trunk/rosapps/imagesoft/imagesoft.c (original) +++ trunk/rosapps/imagesoft/imagesoft.c Wed Aug 8 20:41:25 2007 @@ -4,9 +4,9 @@ HANDLE ProcessHeap; int WINAPI -WinMain(HINSTANCE hThisInstance, +_tWinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, + LPTSTR lpCmdLine, int nCmdShow) { LPTSTR lpAppName, lpVersion, lpTitle; Modified: trunk/rosapps/screenshot/screenshot.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/screenshot/screenshot.c?re… ============================================================================== --- trunk/rosapps/screenshot/screenshot.c (original) +++ trunk/rosapps/screenshot/screenshot.c Wed Aug 8 20:41:25 2007 @@ -334,9 +334,9 @@ // INT WINAPI GetScreenshot(BOOL bFullScreen) -int WINAPI WinMain(HINSTANCE hInstance, +int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - PSTR szCmdLine, + LPTSTR szCmdLine, int iCmdShow) { PSCREENSHOT pScrSht; Modified: trunk/rosapps/sysutils/ctm/ctm.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/ctm.c?rev=282… ============================================================================== --- trunk/rosapps/sysutils/ctm/ctm.c (original) +++ trunk/rosapps/sysutils/ctm/ctm.c Wed Aug 8 20:41:25 2007 @@ -602,7 +602,7 @@ } -int main(int argc, char **argv) +int _tmain(int argc, char **argv) { int i; TCHAR lpStr[80]; Modified: trunk/rosapps/winver/winver.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winver/winver.c?rev=28247&… ============================================================================== --- trunk/rosapps/winver/winver.c (original) +++ trunk/rosapps/winver/winver.c Wed Aug 8 20:41:25 2007 @@ -1,7 +1,7 @@ #include <windows.h> #include <tchar.h> -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { +int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) { static const WCHAR szROS[] = { 'R','e','a','c','t','O','S',0 }; UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(nCmdShow);

1 0

[spetreolle] 28246: use unicode directive
by spetreolle＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: spetreolle Date: Wed Aug 8 20:34:54 2007 New Revision: 28246 URL: http://svn.reactos.org/svn/reactos?rev=28246&view=rev Log: use unicode directive Modified: trunk/rosapps/cardsbav/cardsbav.rbuild trunk/rosapps/downloader/downloader.rbuild trunk/rosapps/gettype/gettype.rbuild trunk/rosapps/imagesoft/imagesoft.rbuild trunk/rosapps/screenshot/screenshot.rbuild trunk/rosapps/sysutils/ctm/ctm.rbuild trunk/rosapps/winver/winver.rbuild Modified: trunk/rosapps/cardsbav/cardsbav.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.rbuild?r… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.rbuild (original) +++ trunk/rosapps/cardsbav/cardsbav.rbuild Wed Aug 8 20:34:54 2007 @@ -1,8 +1,6 @@ -<module name="cardsbav" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cardsbav.dll"> +<module name="cardsbav" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cardsbav.dll" unicode="yes"> <importlibrary definition="cardsbav.def" /> <include base="cardsbav">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <library>kernel32</library> <library>gdi32</library> Modified: trunk/rosapps/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.rbui… ============================================================================== --- trunk/rosapps/downloader/downloader.rbuild (original) +++ trunk/rosapps/downloader/downloader.rbuild Wed Aug 8 20:34:54 2007 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <installfile base="system32">downloader.xml</installfile> -<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe"> +<module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe" unicode="yes"> <include base="downloader">.</include> <include base="expat">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE>0x0600</define> Modified: trunk/rosapps/gettype/gettype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/gettype/gettype.rbuild?rev… ============================================================================== --- trunk/rosapps/gettype/gettype.rbuild (original) +++ trunk/rosapps/gettype/gettype.rbuild Wed Aug 8 20:34:54 2007 @@ -1,9 +1,7 @@ -<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe"> +<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe" unicode="yes"> <include base="gettype">.</include> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>kernel32</library> <library>shell32</library> <library>mpr</library> Modified: trunk/rosapps/imagesoft/imagesoft.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/imagesoft.rbuild… ============================================================================== --- trunk/rosapps/imagesoft/imagesoft.rbuild (original) +++ trunk/rosapps/imagesoft/imagesoft.rbuild Wed Aug 8 20:34:54 2007 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="imagesoft" type="win32gui" installbase="system32" installname="imagesoft.exe"> + <module name="imagesoft" type="win32gui" installbase="system32" installname="imagesoft.exe" unicode="yes"> <include base="imagesoft">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/rosapps/screenshot/screenshot.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/screenshot/screenshot.rbui… ============================================================================== --- trunk/rosapps/screenshot/screenshot.rbuild (original) +++ trunk/rosapps/screenshot/screenshot.rbuild Wed Aug 8 20:34:54 2007 @@ -1,8 +1,6 @@ -<module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe"> +<module name="screenshot" type="win32gui" installbase="system32" installname="screenshot.exe" unicode="yes"> <include base="screenshot">.</include> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library> Modified: trunk/rosapps/sysutils/ctm/ctm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/ctm/ctm.rbuild?re… ============================================================================== --- trunk/rosapps/sysutils/ctm/ctm.rbuild (original) +++ trunk/rosapps/sysutils/ctm/ctm.rbuild Wed Aug 8 20:34:54 2007 @@ -1,7 +1,5 @@ -<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe"> +<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe" unicode="yes"> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>epsapi</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/rosapps/winver/winver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winver/winver.rbuild?rev=2… ============================================================================== --- trunk/rosapps/winver/winver.rbuild (original) +++ trunk/rosapps/winver/winver.rbuild Wed Aug 8 20:34:54 2007 @@ -1,8 +1,6 @@ -<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" > +<module name="winver" type="win32gui" installbase="system32" installname="winver.exe" unicode="yes"> <include base="winver">.</include> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x501</define> <define name="_WIN32_WINNT">0x0501</define> <library>shell32</library>

1 0

[cfinck] 28245: Never use spaces in rbuild files! Also re-unlock the file again
by cfinck＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: cfinck Date: Wed Aug 8 19:22:02 2007 New Revision: 28245 URL: http://svn.reactos.org/svn/reactos?rev=28245&view=rev Log: Never use spaces in rbuild files! Also re-unlock the file again Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild (contents, props changed) Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Wed Aug 8 19:22:02 2007 @@ -9,5 +9,5 @@ <file>bootdata.c</file> <file>vga.c</file> <file>bootvid.rc</file> - <pch>precomp.h</pch> + <pch>precomp.h</pch> </module> Propchange: trunk/reactos/drivers/base/bootvid/bootvid.rbuild ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 28244: Replace a call to undocumented function CreateUserProfile by its documented equivalent (LogonUser + LoadUserProfile) In all cases, this code should be removed once NtUnloadKey is implemented Add a message to remind when to remove this hack
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 17:44:03 2007 New Revision: 28244 URL: http://svn.reactos.org/svn/reactos?rev=28244&view=rev Log: Replace a call to undocumented function CreateUserProfile by its documented equivalent (LogonUser + LoadUserProfile) In all cases, this code should be removed once NtUnloadKey is implemented Add a message to remind when to remove this hack Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Aug 8 17:44:03 2007 @@ -722,17 +722,38 @@ } } - /* Create the Administrator profile */ - if (!CreateUserProfileW(AdminSid, L"Administrator")) - { - DebugPrint("CreateUserProfileW() failed!"); - RtlFreeSid(AdminSid); - RtlFreeSid(DomainSid); - return 0; - } - RtlFreeSid(AdminSid); RtlFreeSid(DomainSid); + + /* ROS HACK, as long as NtUnloadKey is not implemented */ + { + NTSTATUS Status = NtUnloadKey(NULL); + if (Status == STATUS_NOT_IMPLEMENTED) + { + /* Create the Administrator profile */ + PROFILEINFOW ProfileInfo; + HANDLE hToken; + BOOL ret; +#define LOGON32_LOGON_NETWORK 3 + ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &hToken); + if (!ret) + { + DebugPrint("LogonUserW() failed!"); + return 0; + } + ZeroMemory(&ProfileInfo, sizeof(PROFILEINFOW)); + ProfileInfo.dwSize = sizeof(PROFILEINFOW); + ProfileInfo.lpUserName = L"Administrator"; + ProfileInfo.dwFlags = PI_NOUI; + LoadUserProfileW(hToken, &ProfileInfo); + CloseHandle(hToken); + } + else + { + DPRINT1("ROS HACK not needed anymore. Please remove it\n"); + } + } + /* END OF ROS HACK */ CreateTempDir(L"TEMP"); CreateTempDir(L"TMP");

1 0

[hpoussin] 28243: Be less alarming in a debug message
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 14:46:03 2007 New Revision: 28243 URL: http://svn.reactos.org/svn/reactos?rev=28243&view=rev Log: Be less alarming in a debug message Modified: trunk/reactos/drivers/filesystems/vfat/create.c Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Wed Aug 8 14:46:03 2007 @@ -249,7 +249,7 @@ } else { - DPRINT1("File not found %wZ\n", &PathNameU); + DPRINT("FCB not found for %wZ\n", &PathNameU); Status = STATUS_UNSUCCESSFUL; } vfatReleaseFCB(DeviceExt, rcFcb);

1 0

[hpoussin] 28242: Add SCESTATUS_* constants
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 12:58:58 2007 New Revision: 28242 URL: http://svn.reactos.org/svn/reactos?rev=28242&view=rev Log: Add SCESTATUS_* constants Modified: trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h (original) +++ trunk/reactos/include/psdk/ntsecapi.h Wed Aug 8 12:58:58 2007 @@ -123,6 +123,27 @@ #define TRUST_TYPE_MIT 3 #define TRUST_TYPE_DCE 4 +#define SCESTATUS_SUCCESS 0L +#define SCESTATUS_INVALID_PARAMETER 1L +#define SCESTATUS_RECORD_NOT_FOUND 2L +#define SCESTATUS_INVALID_DATA 3L +#define SCESTATUS_OBJECT_EXISTS 4L +#define SCESTATUS_BUFFER_TOO_SMALL 5L +#define SCESTATUS_PROFILE_NOT_FOUND 6L +#define SCESTATUS_BAD_FORMAT 7L +#define SCESTATUS_NOT_ENOUGH_RESOURCE 8L +#define SCESTATUS_ACCESS_DENIED 9L +#define SCESTATUS_CANT_DELETE 10L +#define SCESTATUS_PREFIX_OVERFLOW 11L +#define SCESTATUS_OTHER_ERROR 12L +#define SCESTATUS_ALREADY_RUNNING 13L +#define SCESTATUS_SERVICE_NOT_SUPPORT 14L +#define SCESTATUS_MOD_NOT_FOUND 15L +#define SCESTATUS_EXCEPTION_IN_SERVER 16L +#define SCESTATUS_NO_TEMPLATE_GIVEN 17L +#define SCESTATUS_NO_MAPPING 18L +#define SCESTATUS_TRUST_FAIL 19L + #if !defined(_NTDEF_) typedef LONG NTSTATUS, *PNTSTATUS; #endif @@ -163,6 +184,13 @@ #endif +typedef enum _KERB_LOGON_SUBMIT_TYPE +{ + KerbInteractiveLogon = 2, + KerbS4ULogon = 12, + KerbTicketLogon = 10, + KerbTicketUnlockLogon = 11 +} KERB_LOGON_SUBMIT_TYPE, *PKERB_LOGON_SUBMIT_TYPE; typedef enum _MSV1_0_LOGON_SUBMIT_TYPE { MsV1_0InteractiveLogon = 2, MsV1_0Lm20Logon, @@ -377,6 +405,12 @@ LONG DomainIndex; } LSA_TRANSLATED_NAME, *PLSA_TRANSLATED_NAME; +typedef struct _KERB_INTERACTIVE_LOGON { + KERB_LOGON_SUBMIT_TYPE MessageType; + UNICODE_STRING LogonDomainName; + UNICODE_STRING UserName; + UNICODE_STRING Password; +} KERB_INTERACTIVE_LOGON, *PKERB_INTERACTIVE_LOGON; typedef struct _MSV1_0_INTERACTIVE_LOGON { MSV1_0_LOGON_SUBMIT_TYPE MessageType; UNICODE_STRING LogonDomainName; @@ -660,6 +694,8 @@ NTSTATUS NTAPI LsaLookupAuthenticationPackage(HANDLE,PLSA_STRING,PULONG); NTSTATUS NTAPI LsaLookupNames(LSA_HANDLE,ULONG,PLSA_UNICODE_STRING, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID*); +NTSTATUS NTAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING, + PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_NAME*); ULONG NTAPI LsaNtStatusToWinError(NTSTATUS);

1 0

[hpoussin] 28241: Improve LoadUserProfileW, by creating the profile if it doesn't exist
by hpoussin＠svn.reactos.org 08 Aug '07

08 Aug '07

Author: hpoussin Date: Wed Aug 8 12:26:44 2007 New Revision: 28241 URL: http://svn.reactos.org/svn/reactos?rev=28241&view=rev Log: Improve LoadUserProfileW, by creating the profile if it doesn't exist Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c (original) +++ trunk/reactos/dll/win32/userenv/profile.c Wed Aug 8 12:26:44 2007 @@ -63,7 +63,7 @@ lpszPtr++; } - if (wcslen(lpName) + wcslen(lpszPostfix) >= dwMaxLength) + if (wcslen(lpName) + wcslen(lpszPostfix) + 1 >= dwMaxLength) { DPRINT1("Error: buffer overflow\n"); SetLastError(ERROR_BUFFER_OVERFLOW); @@ -825,52 +825,194 @@ BOOL WINAPI -LoadUserProfileW (HANDLE hToken, - LPPROFILEINFOW lpProfileInfo) -{ - WCHAR szUserHivePath[MAX_PATH]; +LoadUserProfileW( + IN HANDLE hToken, + IN OUT LPPROFILEINFOW lpProfileInfo) +{ + WCHAR szUserHivePath[MAX_PATH]; + LPWSTR UserName = NULL, Domain = NULL; + DWORD UserNameLength = 0, DomainLength = 0; + PTOKEN_USER UserSid = NULL; + SID_NAME_USE AccountType; + UNICODE_STRING SidString = { 0, }; + LONG Error; + BOOL ret = FALSE; + DWORD dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); + + DPRINT("LoadUserProfileW() called\n"); + + /* Check profile info */ + if (!lpProfileInfo + || lpProfileInfo->dwSize != sizeof(PROFILEINFOW) + || lpProfileInfo->lpUserName == NULL + || lpProfileInfo->lpUserName[0] == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return TRUE; + } + + /* Don't load a profile twice */ + if (CheckForLoadedProfile(hToken)) + { + DPRINT ("Profile already loaded\n"); + lpProfileInfo->hProfile = NULL; + return TRUE; + } + + if (!GetProfilesDirectoryW(szUserHivePath, &dwLength)) + { + DPRINT1("GetProfilesDirectoryW() failed (error %ld)\n", GetLastError()); + return FALSE; + } + + wcscat(szUserHivePath, L"\\"); + wcscat(szUserHivePath, lpProfileInfo->lpUserName); + dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); + if (!AppendSystemPostfix(szUserHivePath, dwLength)) + { + DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); + return FALSE; + } + + /* Create user hive name */ + wcscat(szUserHivePath, L"\\ntuser.dat"); + DPRINT("szUserHivePath: %S\n", szUserHivePath); + + /* Create user profile directory if needed */ + if (GetFileAttributesW(szUserHivePath) == INVALID_FILE_ATTRIBUTES) + { + /* Get user sid */ + if (GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLength) + || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + DPRINT1 ("GetTokenInformation() failed\n"); + return FALSE; + } + UserSid = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!UserSid) + { + DPRINT1 ("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (!GetTokenInformation(hToken, TokenUser, UserSid, dwLength, &dwLength)) + { + DPRINT1 ("GetTokenInformation() failed\n"); + goto cleanup; + } + + /* Get user name */ + do + { + if (UserNameLength > 0) + { + HeapFree(GetProcessHeap(), 0, UserName); + UserName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, UserNameLength * sizeof(WCHAR)); + if (!UserName) + { + DPRINT1("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + if (DomainLength > 0) + { + HeapFree(GetProcessHeap(), 0, Domain); + Domain = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, DomainLength * sizeof(WCHAR)); + if (!Domain) + { + DPRINT1("HeapAlloc() failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + ret = LookupAccountSidW( + NULL, UserSid->User.Sid, + UserName, &UserNameLength, + Domain, &DomainLength, + &AccountType); + } while (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER); + + if (!ret) + { + DPRINT1("LookupAccountSidW() failed\n"); + goto cleanup; + } + + /* Create profile */ + /* FIXME: ignore Domain? */ + DPRINT("UserName %S, Domain %S\n", UserName, Domain); + ret = CreateUserProfileW(UserSid->User.Sid, UserName); + if (!ret) + { + DPRINT1("CreateUserProfileW() failed\n"); + goto cleanup; + } + } + + /* Get user SID string */ + ret = GetUserSidFromToken(hToken, &SidString); + if (!ret) + { + DPRINT1("GetUserSidFromToken() failed\n"); + goto cleanup; + } + ret = FALSE; + + /* Load user registry hive */ + Error = RegLoadKeyW(HKEY_USERS, + SidString.Buffer, + szUserHivePath); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegLoadKeyW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); + goto cleanup; + } + + /* Open future HKEY_CURRENT_USER */ + Error = RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + MAXIMUM_ALLOWED, + (PHKEY)&lpProfileInfo->hProfile); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); + goto cleanup; + } + + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, UserSid); + HeapFree(GetProcessHeap(), 0, UserName); + HeapFree(GetProcessHeap(), 0, Domain); + RtlFreeUnicodeString(&SidString); + + DPRINT("LoadUserProfileW() done\n"); + return ret; +} + + +BOOL WINAPI +UnloadUserProfile (HANDLE hToken, + HANDLE hProfile) +{ UNICODE_STRING SidString; LONG Error; - DWORD dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); - - DPRINT ("LoadUserProfileW() called\n"); - - /* Check profile info */ - if (lpProfileInfo->dwSize != sizeof(PROFILEINFOW) || - lpProfileInfo->lpUserName == NULL || - lpProfileInfo->lpUserName[0] == 0) - { + + DPRINT ("UnloadUserProfile() called\n"); + + if (hProfile == NULL) + { + DPRINT1 ("Invalide profile handle\n"); SetLastError (ERROR_INVALID_PARAMETER); return FALSE; } - /* Don't load a profile twice */ - if (CheckForLoadedProfile (hToken)) - { - DPRINT ("Profile already loaded\n"); - lpProfileInfo->hProfile = NULL; - return TRUE; - } - - if (!GetProfilesDirectoryW (szUserHivePath, - &dwLength)) - { - DPRINT1("GetProfilesDirectoryW() failed\n", GetLastError()); - return FALSE; - } - - wcscat (szUserHivePath, L"\\"); - wcscat (szUserHivePath, lpProfileInfo->lpUserName); - if (!AppendSystemPostfix (szUserHivePath, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; - } - - /* Create user hive name */ - wcscat (szUserHivePath, L"\\ntuser.dat"); - - DPRINT ("szUserHivePath: %S\n", szUserHivePath); + RegCloseKey (hProfile); if (!GetUserSidFromToken (hToken, &SidString)) @@ -881,65 +1023,6 @@ DPRINT ("SidString: '%wZ'\n", &SidString); - Error = RegLoadKeyW (HKEY_USERS, - SidString.Buffer, - szUserHivePath); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegLoadKeyW() failed (Error %ld)\n", Error); - RtlFreeUnicodeString (&SidString); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - MAXIMUM_ALLOWED, - (PHKEY)&lpProfileInfo->hProfile); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); - RtlFreeUnicodeString (&SidString); - SetLastError((DWORD)Error); - return FALSE; - } - - RtlFreeUnicodeString (&SidString); - - DPRINT ("LoadUserProfileW() done\n"); - - return TRUE; -} - - -BOOL WINAPI -UnloadUserProfile (HANDLE hToken, - HANDLE hProfile) -{ - UNICODE_STRING SidString; - LONG Error; - - DPRINT ("UnloadUserProfile() called\n"); - - if (hProfile == NULL) - { - DPRINT1 ("Invalide profile handle\n"); - SetLastError (ERROR_INVALID_PARAMETER); - return FALSE; - } - - RegCloseKey (hProfile); - - if (!GetUserSidFromToken (hToken, - &SidString)) - { - DPRINT1 ("GetUserSidFromToken() failed\n"); - return FALSE; - } - - DPRINT ("SidString: '%wZ'\n", &SidString); - Error = RegUnLoadKeyW (HKEY_USERS, SidString.Buffer); if (Error != ERROR_SUCCESS)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs