Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[osiejka] 53780: [TRANSLATION] - Massive Romanian translation patch by Stefan Fulea. See bugs 6468 and 6478;
by osiejka＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: osiejka Date: Tue Sep 20 20:45:31 2011 New Revision: 53780 URL: http://svn.reactos.org/svn/reactos?rev=53780&view=rev Log: [TRANSLATION] - Massive Romanian translation patch by Stefan Fulea. See bugs 6468 and 6478; Added: trunk/reactos/base/applications/mmc/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc (with props) trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc (with props) trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc (with props) trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/aclui/aclui_Ro.rc (with props) trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/msports/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/shellext/deskadp/rsrc.rc trunk/reactos/dll/shellext/deskmon/rsrc.rc trunk/reactos/dll/shellext/slayer/rsrc.rc trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/aclui/aclui_Pl.rc trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/winnls/nls/rom.nls trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/netcfgx/netcfgx.rc Added: trunk/reactos/base/applications/mmc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,28 @@ +/* + * FILE: base/applications/mmc/lang/ro-RO.rc + ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum at fulea.stefan) + * CHANGE LOG: 2011-08-21 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Fi?ier" + BEGIN + MENUITEM SEPARATOR + MENUITEM "I&e?ire\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&?" + BEGIN + MENUITEM "&Despre...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Consola de gestiune ReactOS" + IDS_CONSOLETITLE "Consola%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/mmc/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -17,6 +17,7 @@ #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -3,6 +3,7 @@ ReactOS Project (http://www.reactos.org) * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-21 initial translation + * 2011-08-30 technical correction (checkbox in preferences) */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT @@ -62,7 +63,7 @@ BEGIN GROUPBOX "Generale", -1, 4, 2, 240, 61 AUTOCHECKBOX "PÄ&streazÄ poziÈia ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "Act&ualizeazÄ la pornire lista aplicaÈiilor disponibile", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + AUTOCHECKBOX "Act&ualizeazÄ la pornire lista aplicaÈiilor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12 AUTOCHECKBOX "MenÈine jurna&l de instalare/eliminare de aplicaÈii", IDC_LOG_ENABLED, 15, 46, 219, 12 GROUPBOX "DescÄrcÄri", -1, 4, 65, 240, 51 @@ -171,7 +172,7 @@ IDS_CAT_LIBS "Biblioteci" IDS_CAT_OFFICE "BiroticÄ" IDS_CAT_OTHER "Altele" - IDS_CAT_SCIENCE "ÈtiinÈÄ" + IDS_CAT_SCIENCE "ÈtiinÈÄ" IDS_CAT_TOOLS "Instrumente" IDS_CAT_VIDEO "Video" END Modified: trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -3,6 +3,7 @@ * ReactOS Project (http://www.reactos.org) * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) * CHANGE LOG: 2011-08-25 initial translation + * 2011-08-30 technical correction (icon) */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT @@ -18,7 +19,7 @@ CAPTION "Despre Ã®nregistrator audio ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "Ãnregistrator audio ReactOS, versiunea 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Drept de autor (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "Ã&nchide",IDOK,139,54,50,14,WS_GROUP Added: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,57 @@ +/* + * FILE: dll/cpl/appwiz/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum at fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crearea unei legÄturi" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crearea unei legÄturi" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crearea unei scurtÄturi" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Acest expert vÄ va asista Ã®n crearea unei scurtÄturi\ncÄtre adrese din Internet, calculatoare, dosare, fi?iere\nlocale sau din re?ea.", -1, 120, 15, 200, 30 + LTEXT "Scrie?i adresa elementului:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "&CautÄ...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Clic pe Ãnainte pentru a continua.", -1, 120, 97, 162, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Titlul scurtÄturii" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Scrie?i un &nume pentru scurtÄturÄ:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "ApÄsa?i pe TerminÄ pentru a crea scurtÄtura.", -1, 118, 97, 178, 17 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Gestionar de aplica?ii" + IDS_CPLSYSTEMDESCRIPTION "InstaleazÄ programe ?i creazÄ scurtÄturi." + IDS_CREATE_SHORTCUT "Creare scurtÄturÄ" + IDS_ERROR_NOT_FOUND "Elementul %s nu poate fi localizat." +END Propchange: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -16,5 +16,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc (added) +++ trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,34 @@ +/* + * FILE: dll/cpl/liccpa/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_PROPPAGE1 DIALOGEX DISCARDABLE 20, 40, 315, 104 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU +CAPTION "Alege?i modul de licen?iere" +FONT 8, "Helv" +BEGIN + CONTROL "Mod de licen?iere client", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "Per dispozitiv sau per utilizator", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 147, 12 + CONTROL "Per server. Numãrul de conexiuni paralele:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "Produs:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 + CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 + CONTROL "Con&firmã", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 + CONTROL "A&nuleazã", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 + CONTROL "Informa?ii", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 + CONTROL "Replicarea...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 + CONTROL "Adaugã licen?e", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 + CONTROL "Eliminã licen?e", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Gestionar de licen?e" + IDS_CPLDESCRIPTION_1 "Gestionar de licen?e" + IDS_REACTOS "ReactOS - SoftPublic" +END Propchange: trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/liccpa/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -18,5 +18,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc (added) +++ trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,55 @@ +/* + * FILE: dll/shellext/deskadp/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Adaptor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Tip de adaptor", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&ProprietÄÈi", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Despre adaptor", -1, 7, 56, 237, 75 + LTEXT "Tipul de cip:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "Tipul de DAC:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Memorie:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Èir adaptor:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "InformaÈie BIOS:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&EnumerÄ toate modurile...", IDC_LISTALLMODES, 7, 139, 130, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "AlegeÅ£i un mod" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "Con&firmÄ", IDOK, 112, 115, 50, 15 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Moduri valide", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "Rata implicitÄ de reÃ®mprospÄtare" + IDES_REFRESHRATEFMT "%d Hertz" + IDS_4BPP "16 Culori" + IDS_8BPP "256 Culori" + IDS_15BPP "Culoare de Ã®naltÄ calitate (15 bit)" + IDS_16BPP "Culoare de Ã®naltÄ calitate (16 bit)" + IDS_24BPP "Calitate fotograficÄ (24 bit)" + IDS_32BPP "Calitate fotograficÄ (32 bit)" +END + Propchange: trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/rsrc.… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -16,5 +16,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc (added) +++ trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,29 @@ +/* + * FILE: dll/shellext/deskmon/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ecran" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Tipu ecran", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "&ProprietÄÈi", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Configurare ecran", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&Rata de Ã®mprospÄtare:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Ascunde modurile incompatibile", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "UtilizeazÄ configura?ia fizicÄ implicitÄ" + IDS_FREQFMT "%u Hertz" +END Propchange: trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/rsrc.… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -16,5 +16,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/r… ============================================================================== --- trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc (added) +++ trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,45 @@ +/* + * FILE: dll/shellext/slayer/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Compatibilitate" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "DacÄ aplicaÈia nu merge Ã®n ReactOS, alegeÈi un alt sistem de operare pe care ReactOS Ã®l va simula aplicaÈiei.", -1, 7,7,210,31 + GROUPBOX "Mod de compatibilitate", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "ExecutaÈi aceastÄ aplicaÈie ca fiind pentru:", IDC_CHKRUNCOMPATIBILITY, 18,57,198,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Parametri de afiÈare", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "ExecutÄ Ã®n 256 culori", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "FoloseÈte o rezoluÈie de 640x480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "DezactiveazÄ temele vizuale", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Mo&duri de compatibilitate...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "GestioneazÄ compatibilitate" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&AdaugÄ...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&EditeazÄ...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "Ète&rge", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "Con&firmÄ", IDOK, 95,116,60,14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Stratul extensie de interfaÈÄ dedicat compatibilitÄÈii aplicaÈiilor" +END + Propchange: trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/rsrc.r… ============================================================================== --- trunk/reactos/dll/shellext/slayer/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -19,5 +19,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -22,11 +22,12 @@ #include "aclui_Lt.rc" #include "aclui_Nl.rc" #include "aclui_No.rc" -#include "aclui_Pl.rc" #include "aclui_Sv.rc" #include "aclui_Th.rc" // UTF-8 #pragma code_page(65001) +#include "aclui_Pl.rc" +#include "aclui_Ro.rc" #include "aclui_Ru.rc" #include "aclui_Uk.rc" Modified: trunk/reactos/dll/win32/aclui/aclui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Pl.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui_Pl.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -5,17 +5,17 @@ CAPTION "Zabezpieczenia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nazwy grupy lub u¿ytkownika:", -1, 7, 21, 105, 8 + LTEXT "&Nazwy grupy lub uÅ¼ytkownika:", -1, 7, 21, 105, 8 CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE - LTEXT "&W³aciciel:", -1, 7, 7, 49, 8 + LTEXT "&WÅaÅciciel:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Dodaj...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 - PUSHBUTTON "U&suñ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + PUSHBUTTON "U&suÅ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX LTEXT "Zezwalaj", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER - LTEXT "Odmów", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + LTEXT "OdmÃ³w", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE - LTEXT "Kliknij przycisk Zaawansowane, aby przejæ do specjalnych uprawnieñ lub ustawieñ zaawansowanych.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + LTEXT "Kliknij przycisk Zaawansowane, aby przejÅÄ do specjalnych uprawnieÅ lub ustawieÅ zaawansowanych.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT PUSHBUTTON "Z&aawansowane", IDC_ADVANCED, 165, 194, 55, 14 END Added: trunk/reactos/dll/win32/aclui/aclui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Ro.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Ro.rc (added) +++ trunk/reactos/dll/win32/aclui/aclui_Ro.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,38 @@ +/* + * FILE: dll/win32/aclui/aclui_Ro.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-03 initial translation + */ +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Securitate" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nume de &group sau utilizator:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Posesor:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + PUSHBUTTON "A&daugÄ...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&EliminÄ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "Permite", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "SuprimÄ", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Pentru permisiuni speciale sau opÅ£iuni avansate, clic pe Avansate.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "A&vansate", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "Permisiuni pentru %1" + IDS_UNKNOWN "Necunoscut" + IDS_SPECIAL_PERMISSIONS "Permisiuni speciale" + IDS_PERMISSIONS_FOR "Permisiuni pentru %1" + IDS_PERMISSIONS "Permisiuni" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" +} + Propchange: trunk/reactos/dll/win32/aclui/aclui_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/aclui/aclui_Ro.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -15,5 +15,6 @@ // UTF-8 #pragma code_page(65001) +#include "winnls/lang/ro-RO.rc" #include "winnls/lang/ru-RU.rc" #include "winnls/lang/uk-UA.rc" Added: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,168 @@ +/* + * FILE: dll/win32/kernel32/winnls/lang/ro-Ro.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-05 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - central european)" + 1251 "1251 (ANSI - chirilic)" + 1252 "1252 (ANSI - latin I)" + 1253 "1253 (ANSI - grecesc)" + 1254 "1254 (ANSI - turcesc)" + 1255 "1255 (ANSI - ebraic)" + 1256 "1256 (ANSI - arab)" + 1257 "1257 (ANSI - baltic)" + 1258 "1258 (ANSI/OEM - vietnamez)" + 874 "874 (ANSI/OEM - thailandez)" + 932 "932 (ANSI/OEM - japonez Shift-JIS)" + 936 "936 (ANSI/OEM - chinezesc simplificat GBK)" + 949 "949 (ANSI/OEM - coreean)" + 950 "950 (ANSI/OEM - chinezesc tradi?ional Big5)" + + 437 "437 (OEM - SUA)" + 737 "737 (OEM - grecesc 437G)" + 775 "775 (OEM - baltic)" + 850 "850 (OEM - latin multilingv I)" + 852 "852 (OEM - latin II)" + 855 "855 (OEM - chirilic)" + 857 "857 (OEM - turcesc)" + 858 "858 (OEM - latin multilingv I + Euro)" + 860 "860 (OEM - portughez)" + 861 "861 (OEM - islandez)" + 862 "862 (OEM - ebraic)" + 863 "863 (OEM - francez canadian)" + 864 "864 (OEM - arab)" + 865 "865 (OEM - nordic)" + 866 "866 (OEM - rusesc)" + 869 "869 (OEM - grecesc modern)" + + 10000 "10000 (MAC - latin)" + 10001 "10001 (MAC - japonez)" + 10002 "10002 (MAC - chinezesc tradi?ional Big5)" + 10003 "10003 (MAC - coreean)" + 10004 "10004 (MAC - arab)" + 10005 "10005 (MAC - ebraic)" + 10006 "10006 (MAC - grecesc I)" + 10007 "10007 (MAC - chirilic)" + 10008 "10008 (MAC - chinezesc simplificat GB 2312)" + 10010 "10010 (MAC - romÃ¢nesc)" + 10017 "10017 (MAC - ucrainean)" + 10021 "10021 (MAC - thailandez)" + 10029 "10029 (MAC - latin II)" + 10079 "10079 (MAC - islandez)" + 10081 "10081 (MAC - turcesc)" + 10082 "10082 (MAC - croat)" + + 65000 "65000 (UTF-7)" + 65001 "65001 (UTF-8)" + + 3700 "37 (IBM EBCDIC - SUA/canadian)" + 1026 "1026 (IBM EBCDIC - turcesc (latin-5))" + 1047 "1047 (IBM EBCDIC - latin-1/Open System)" + 1140 "1140 (IBM EBCDIC - SUA/canadian (37 + Euro))" + 1141 "1141 (IBM EBCDIC - nem?esc (20273 + Euro))" + 1142 "1142 (IBM EBCDIC - danez/norvegian (20277 + Euro))" + 1143 "1143 (IBM EBCDIC - finlandez/suedez (20278 + Euro))" + 1144 "1144 (IBM EBCDIC - italian (20280 + Euro))" + 1145 "1145 (IBM EBCDIC - latin american/spaniol (20284 + Euro))" + 1146 "1146 (IBM EBCDIC - britanic (20285 + Euro))" + 1147 "1147 (IBM EBCDIC - francez (20297 + Euro))" + 1148 "1148 (IBM EBCDIC - interna?ional (500 + Euro))" + 1149 "1149 (IBM EBCDIC - islandez (20871 + Euro))" + 20273 "20273 (IBM EBCDIC - nem?esc)" + 20277 "20277 (IBM EBCDIC - danez/norvegian)" + 20278 "20278 (IBM EBCDIC - finlandez/suedez)" + 20280 "20280 (IBM EBCDIC - italian)" + 20284 "20284 (IBM EBCDIC - latin american/spaniol)" + 20285 "20285 (IBM EBCDIC - britanic)" + 20290 "20290 (IBM EBCDIC - japonez katakana extins)" + 20297 "20297 (IBM EBCDIC - francez)" + 20420 "20420 (IBM EBCDIC - arab)" + 20423 "20423 (IBM EBCDIC - grecesc)" + 20424 "20424 (IBM EBCDIC - ebraic)" + 20833 "20833 (IBM EBCDIC - coreean extins)" + 20838 "20838 (IBM EBCDIC - thailandez)" + 20871 "20871 (IBM EBCDIC - islandez)" + 20880 "20880 (IBM EBCDIC - chirilic (rusesc))" + 20905 "20905 (IBM EBCDIC - turcesc)" + 20924 "20924 (IBM EBCDIC - latin-1/Open System (1047 + Euro))" + 21025 "21025 (IBM EBCDIC - chirilic (sÃ¢rbesc, bulgar))" + 500 "500 (IBM EBCDIC - interna?ional)" + 870 "870 (IBM EBCDIC - multilingv/ROECE (latin-2))" + 875 "875 (IBM EBCDIC - grecesc modern)" + + 20269 "20269 (ISO 6937 diacritice)" + 28591 "28591 (ISO 8859-1 latin I)" + 28592 "28592 (ISO 8859-2 central european)" + 28593 "28593 (ISO 8859-3 latin 3)" + 28594 "28594 (ISO 8859-4 baltic)" + 28595 "28595 (ISO 8859-5 chirilic)" + 28596 "28596 (ISO 8859-6 arab)" + 28597 "28597 (ISO 8859-7 grecesc)" + 28598 "28598 (ISO 8859-8 ebraic: ordonare vizualÄ)" + 28599 "28599 (ISO 8859-9 latin 5)" + 28605 "28605 (ISO 8859-15 latin 9)" + 38598 "38598 (ISO 8859-8 ebraic: ordonare logicÄ)" + + 20105 "20105 (IA5 alfabetul interna?ional IRV Nr.5)" + 20106 "20106 (IA5 nem?esc)" + 20107 "20107 (IA5 suedez)" + 20108 "20108 (IA5 norvegian)" + + 1361 "1361 (coreean - Johab)" + 20000 "20000 (CNS - taiwanez)" + 20001 "20001 (TCA - taiwanez)" + 20002 "20002 (Eten - taiwanez)" + 20003 "20003 (IBM5550 - taiwanez)" + 20004 "20004 (TeleText - taiwanez)" + 20005 "20005 (Wang - taiwanez)" + 20127 "20127 (SUA-ASCII)" + 20261 "20261 (T.61)" + 20866 "20866 (rusesc - KOI8)" + 21027 "21027 (alfab. extins minuscule)" + 21866 "21866 (ucrainean - KOI8-U)" + 708 "708 (arab - ASMO)" + 720 "720 (arab - transparent ASMO)" + 20932 "20932 (JIS X 0208-1990 & 0212-1990)" + 20936 "20936 (chinezesc simplificat GB2312)" + 20949 "20949 (Wansung - coreean)" + + 57002 "57002 (ISCII devanagari)" + 57003 "57003 (ISCII bengalez)" + 57004 "57004 (ISCII tamil)" + 57005 "57005 (ISCII telugu)" + 57006 "57006 (ISCII assamez)" + 57007 "57007 (ISCII orissean)" + 57008 "57008 (ISCII cannadez)" + 57009 "57009 (ISCII malabaric)" + 57010 "57010 (ISCII gujaratean)" + 57011 "57011 (ISCII gurmukhi)" + + 50930 "50930 (IBM EBCDIC - japonez (cu katakana))" + 50931 "50931 (IBM EBCDIC - SUA/canadian ?i japonez)" + 50933 "50933 (IBM EBCDIC - coreean extins Åi coreean)" + 50935 "50935 (IBM EBCDIC - chinezesc simplificat)" + 50937 "50937 (IBM EBCDIC - SUA/canadian ?i chinezesc tradi?ional)" + 50939 "50939 (IBM EBCDIC - japonez (latin) extins ?i japonez)" + + 50220 "50220 (ISO-2022 japonez fÄrÄ katakana restrÃ¢ns)" + 50221 "50221 (ISO-2022 japonez cu katakana restrÃ¢ns)" + 50222 "50222 (ISO-2022 japonez JIS X 0201-1989)" + 50225 "50225 (ISO-2022 coreean)" + 50227 "50227 (ISO-2022 chinezesc simplificat)" + 50229 "50229 (ISO-2022 chinezesc tradi?ional)" + + 51932 "51932 (EUC-japonez)" + 51936 "51936 (EUC-chinezesc simplificat)" + 51949 "51949 (EUC-coreean)" + 51950 "51950 (EUC-chinezesc tradi?ional)" + + 52936 "52936 (HZ-GB2312 chinezesc simplificat)" + 54936 "54936 (GB18030 chinezesc simplificat)" +END Propchange: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/kernel32/winnls/nls/rom.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/nls/rom.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/nls/rom.nls [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -101,12 +101,12 @@ LOCALE_SENGCURRNAME "Romanian Leu" LOCALE_SENGLANGUAGE "Romanian" LOCALE_SGROUPING "3;0" - LOCALE_SINTLSYMBOL "ROL" + LOCALE_SINTLSYMBOL "RON" LOCALE_SISO3166CTRYNAME "RO" LOCALE_SISO639LANGNAME "ro" LOCALE_SLANGUAGE "Romanian" LOCALE_SLIST ";" - LOCALE_SLONGDATE "d MMMM yyyy" + LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "ianuarie" @@ -140,19 +140,19 @@ LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Europa de vest Èi Statele Unite" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Europa centralÄ" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Grec" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Chirilic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turcic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japonez" - LGRPID_KOREAN+LGRPID_RES_BASE "Coreean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinez tradiÈional" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinez simplificat" - LGRPID_THAI+LGRPID_RES_BASE "Thailandez" - LGRPID_HEBREW+LGRPID_RES_BASE "Ebraic" - LGRPID_ARABIC+LGRPID_RES_BASE "Arab" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamez" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armean" + LGRPID_BALTIC+LGRPID_RES_BASE "baltic" + LGRPID_GREEK+LGRPID_RES_BASE "grecesc" + LGRPID_CYRILLIC+LGRPID_RES_BASE "chirilic" + LGRPID_TURKISH+LGRPID_RES_BASE "turcesc" + LGRPID_JAPANESE+LGRPID_RES_BASE "japonez" + LGRPID_KOREAN+LGRPID_RES_BASE "coreean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "chinezesc tradiÈional" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "chinezesc simplificat" + LGRPID_THAI+LGRPID_RES_BASE "thailandez" + LGRPID_HEBREW+LGRPID_RES_BASE "ebraic" + LGRPID_ARABIC+LGRPID_RES_BASE "arab" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "vietnamez" + LGRPID_INDIC+LGRPID_RES_BASE "indian" + LGRPID_GEORGIAN+LGRPID_RES_BASE "georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "armean" } Added: trunk/reactos/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/msports/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,27 @@ +/* + * FILE: dll/win32/msports/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-06 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_SERIALSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ConfiguraÅ£ia portului" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "B&iÈi pe secundÄ:", -1, 74, 19, 62, 8, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "BiÈi de &date:", -1, 74, 40, 62, 8 + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "&Paritate:", -1, 74, 61, 62, 8 + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "BiÈi de &stop:", -1, 74, 82, 62, 8 + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "Controlul &fluxului:", - 1, 74, 102, 62, 8 + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "&Avansate...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP + PUSHBUTTON "Valo&ri implicite",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP +END Propchange: trunk/reactos/dll/win32/msports/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -13,4 +13,5 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,236 @@ +/* + * FILE: dll/win32/netcfgx/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-06 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_TCPIP_BASIC_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generale" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "PuteÈi obÈine automat configurarea adresei IP Ã®n reÈelele cu DHCP. Altfel, este necesarÄ configurarea manualÄ de cÄtre administratorul de reÈea.", -1, 9, 9, 228, 27 + CONTROL "&ObÈine automat adresÄ IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "Folo&seÈte adresa urmÄtoare:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "AdresÄ &IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 + LTEXT "MascÄ de s&ubreÈea:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12 + LTEXT "Server ""gateway"" i&mplicit:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 + CONTROL "O&bÈine automat adresa serverului DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "Folos&eÈte adresa DNS &urmÄtoare", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Server DNS &preferat:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 + LTEXT "Server DNS &alternativ:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 + PUSHBUTTON "A&vansate", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "ConfiguraÈie alternativÄ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "DacÄ acest calculator este utilizat Ã®n mai multe reÈele, puteÈi specifica mai jos o configuraÈie alternativÄ.", -1, 9, 9, 220, 20 + CONTROL "AdresÄ IP priva&tÄ obÈinutÄ automat", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 + GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX + CONTROL "Con&figuratÄ manual", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 90, 12 + LTEXT "AdresÄ &IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 + LTEXT "MascÄ de s&ubreÈea:", -1, 14, 95, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 + LTEXT "Server ""&gateway"" i&mplicit:", -1, 14, 115, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 + LTEXT "Server DNS &preferat:", -1, 14, 150, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 + LTEXT "Server DNS &alternativ:", -1, 14, 165, 180, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 +END + +IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Parametri IP" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ad&resÄ IP", -1, 5, 5, 240, 90 + CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 + PUSHBUTTON "&AdaugÄ...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "&ModificÄ...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "&EliminÄ", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + GROUPBOX "Servere ""&gateway"" im&plicite:", -1, 5, 100, 240, 90 + CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 + PUSHBUTTON "A&daugÄ...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "M&odificÄ...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "E&liminÄ", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 5, 200, 240, 30 + CHECKBOX "MetricÄ stabilitÄ a&utomat", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Me&trica interfe?ei:", -1, 15, 215, 90, 12 + EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER +END + +IDD_TCPIP_ADVDNS_DLG DIALOGEX DISCARDABLE 0, 0, 247, 270 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "DNS" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LTEXT "Adrese de servere D&NS, Ã®n ordinea utilizÄrii:", -1, 5, 5, 180, 12 + PUSHBUTTON "&Sus", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "&Jos", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "&AdaugÄ...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&ModificÄ...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&EliminÄ", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP + LTEXT "UrmÄtoarele opÈiuni sunt aplicate tuturor conexiunilor cu TCP/IP active. Pentru rezoluÈia numelor necalificate:", -1, 5, 90, 220, 24 + CONTROL "Include sufixul DNS &primar Èi de conexiune", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 + CHECKBOX "Include sufi&xul pÄrinte al sufixului DNS primar", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CONTROL "In&clude urmÄtoarele sufixe DNS (Ã®n orine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + PUSHBUTTON "S&us", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Jo&s", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "A&daugÄ...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "M&odificÄ...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "E&liminÄ", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + LTEXT "Suf&ixul DNS al conexiunii curente:", -1, 5, 225, 110, 14 + EDITTEXT IDC_SUFFIX, 130, 225, 90, 12, WS_TABSTOP + CHECKBOX "Ãn&registreazÄ adresele conexiunii Ã®n DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "La Ã®nregistrare, utili&zeazÄ sufixul DNS al conexiunii", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "OpÈiuni" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OPTLIST, 5, 30, 230, 70 + LTEXT "C&onfigurÄri opÈionale", -1, 5, 15, 130, 12 + PUSHBUTTON "&ProprietÄÈi", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + GROUPBOX "Descriere:", -1, 5, 120, 240, 70 + LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 +END + +IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Adresa TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 + LTEXT "AdresÄ &IP:", -1, 5, 15, 70, 12 + LTEXT "MascÄ de &subreÈea:", -1, 5, 30, 70, 12 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Server ""gateway"" TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 + LTEXT "AdresÄ ""&gateway"":", -1, 5, 15, 70, 12 + CHECKBOX "MetricÄ stabilitÄ a&utomat", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&MetricÄ:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP +END + +IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Server DNS TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 + LTEXT "Server &DNS:", -1, 5, 10, 120, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Sufixul TCP/IP al domeniului" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP + LTEXT "Sufixul &domeniului:", -1, 5, 10, 120, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Filtrare TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "A&ctiveazÄ filtrarea TCP/IP (pentru toate adaptoarele)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "", -1, 5, 30, 90, 150 + CONTROL "Permite tot &TCP", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "&Permite doar", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 + PUSHBUTTON "&AdaugÄ", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "&EliminÄ", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 105, 30, 90, 150 + CONTROL "Permite tot &UDP", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "Pe&rmite doar", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 + PUSHBUTTON "A&daugÄ", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "E&liminÄ", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 205, 30, 90, 150 + CONTROL "Permite tot &IP", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "Permite d&oar", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 + PUSHBUTTON "Adau&gÄ", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Eli&minÄ", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Con&firmÄ", IDC_OK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "AdaugÄ filtru" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_PORT_DESC, 5, 15, 60, 12 + PUSHBUTTON "Con&firmÄ", IDC_OK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_NET_CONNECT "Conexiune de reÈea" + IDS_NO_IPADDR_SET "Acest adaptor de re?ea solicitÄ cel pu?in o adresÄ IP. IntroduceÈi una." + IDS_NO_SUBMASK_SET "AÈi introdus o adresÄ fÄrÄ mascÄ de subreÈea. AdÄugaÈi o mascÄ de subreÈea." + IDS_TCPFILTERDESC "Filtrarea TCP/IP permite controlul tipului de trafic TCP/IP din re?ea ce va fi recepÈionat de calculator." + IDS_TCPFILTER "Filtrare TCP/IP" + IDS_IPADDR "AdresÄ IP" + IDS_SUBMASK "MascÄ de subreÈea" + IDS_GATEWAY "Server ""gateway""" + IDS_METRIC "MetricÄ" + IDS_DHCPACTIVE "DHCP activat" + IDS_AUTOMATIC "automatÄ" + IDS_NOITEMSEL "Nu aÈi selectat nimic. AcÈiunea cere o selecÈie." + IDS_TCPIP "ReactOS-TCP/IP" + IDS_ADD "&AdaugÄ" + IDS_MOD "Con&firmÄ" + IDS_TCP_PORTS "Port TCP" + IDS_UDP_PORTS "Port UDP" + IDS_IP_PROTO "Protocol IP" + IDS_PORT_RANGE "NumÄrul unui port trebuie sÄ se fie Ã®ntre 0 Èi 65536. IntroduceÈi un numÄr Ã®n aceastÄ limitÄ." + IDS_PROT_RANGE "NumÄrul unui protocol trebuie sÄ fie Ã®ntre 0 Èi 256. IntroduceÈi un numÄr Ã®n aceastÄ limitÄ." + IDS_DUP_NUMBER "NumÄrul pe care Ã®ncercaÈi sÄ-l introduceÈi deja existÄ Ã®n listÄ. Introduce?i un alt numÄr." + IDS_DISABLE_FILTER "Dezactivarea acestei opÈiuni generale TCP/IP se va aplica pentru toate adaptoarele." + IDS_NO_SUFFIX "OpÈiunea curentÄ de cÄutare necesitÄ cel puÈin un sufix DNS. SpecificaÈi unul sau modificaÈi opÈiunea de cÄutare." + IDS_DOMAIN_SUFFIX "Sufixul de domeniu nu este valid." + IDS_DNS_SUFFIX "Numele domeniului DNS ""%s"" nu este valid." + IDS_DUP_SUFFIX "Sufixul DNS este deja Ã®n listÄ." + IDS_DUP_IPADDR "Adresa IP este deja Ã®n listÄ." + IDS_DUP_GW "Acest server ""gateway"" este deja Ã®n listÄ." +END + Propchange: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -35,5 +35,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[dreimer] 53779: Sync the recent changes from the themes merge to all languages, sync all the settings from the english rc file to all other languages. Fix some sizes and lengths
by dreimer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: dreimer Date: Tue Sep 20 20:43:42 2011 New Revision: 53779 URL: http://svn.reactos.org/svn/reactos?rev=53779&view=rev Log: Sync the recent changes from the themes merge to all languages, sync all the settings from the english rc file to all other languages. Fix some sizes and lengths Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc…

1 0

[gadamopoulos] 53778: [win32k] - Replace long file headers with short headers - Minor cleanup
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 19:41:33 2011 New Revision: 53778 URL: http://svn.reactos.org/svn/reactos?rev=53778&view=rev Log: [win32k] - Replace long file headers with short headers - Minor cleanup Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/clip.c trunk/reactos/subsystems/win32/win32k/eng/copybits.c trunk/reactos/subsystems/win32/win32k/eng/debug.c trunk/reactos/subsystems/win32/win32k/eng/engevent.c trunk/reactos/subsystems/win32/win32k/eng/engmisc.c trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/eng/float.c trunk/reactos/subsystems/win32/win32k/eng/gradient.c trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c trunk/reactos/subsystems/win32/win32k/eng/lineto.c trunk/reactos/subsystems/win32/win32k/eng/mem.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/eng/paint.c trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/eng/perfcnt.c trunk/reactos/subsystems/win32/win32k/eng/sort.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/eng/transblt.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/csr.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/prop.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/session.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bezier.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/polyfill.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/rect.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c trunk/reactos/subsystems/win32/win32k/objects/wingl.c trunk/reactos/subsystems/win32/win32k/pch.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/perfcnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bezier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/polyfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc…

1 0

[gadamopoulos] 53777: [win32k] - move function definitions from c files to headers
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 18:04:14 2011 New Revision: 53777 URL: http://svn.reactos.org/svn/reactos?rev=53777&view=rev Log: [win32k] - move function definitions from c files to headers Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/include/cliprgn.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/painting.h trunk/reactos/subsystems/win32/win32k/include/sysparams.h trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -189,6 +189,13 @@ NTSTATUS NTAPI PsGetProcessExitStatus( + PEPROCESS Process +); + +NTKERNELAPI +BOOLEAN +NTAPI +PsGetProcessExitProcessCalled( PEPROCESS Process ); Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/clipboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/clipboard.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -1,7 +1,4 @@ #pragma once - -#include "window.h" -#include <include/win32.h> typedef struct _CLIP { @@ -16,7 +13,5 @@ VOID FASTCALL UserClipboardFreeWindow(PWND pWindow); -struct _WINSTATION_OBJECT; - VOID NTAPI UserEmptyClipboardData(struct _WINSTATION_OBJECT *pWinSta); Modified: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -3,3 +3,4 @@ INT FASTCALL GdiGetClipBox(HDC hDC, RECTL *rc); INT FASTCALL GdiSelectVisRgn(HDC hdc, HRGN hrgn); INT FASTCALL GdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); +int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -51,7 +51,8 @@ BOOL UserInitDefaultKeyboardLayout(VOID); PKBL UserHklToKbl(HKL hKl); BOOL FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL); - +VOID FASTCALL DoTheScreenSaver(VOID); +WORD FASTCALL get_key_state(void); #define ThreadHasInputAccess(W32Thread) \ (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -69,3 +69,7 @@ PMENU_OBJECT FASTCALL IntGetSystemMenu(PWND Window, BOOL bRevert, BOOL RetMenu); + +UINT FASTCALL IntFindSubMenu(HMENU *hMenu, HMENU hSubTarget ); +UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags); + Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -145,6 +145,9 @@ IntSafeCopyUnicodeStringTerminateNULL(PUNICODE_STRING Dest, PUNICODE_STRING Source); +HBITMAP NTAPI UserLoadImage(PCWSTR); + +BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING); #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l)) Modified: trunk/reactos/subsystems/win32/win32k/include/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/painting.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/painting.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -5,3 +5,5 @@ BOOL FASTCALL IntGetPaintMessage(PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, PTHREADINFO Thread, MSG *Message, BOOL Remove); INT FASTCALL UserRealizePalette(HDC); INT FASTCALL co_UserGetUpdateRgn(PWND, HRGN, BOOL); +VOID FASTCALL co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse); +BOOL FASTCALL IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse); Modified: trunk/reactos/subsystems/win32/win32k/include/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -175,3 +175,6 @@ } SPIBUFFER; extern SPIVALUES gspv; + +BOOL InitSysParams(); + Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -177,4 +177,6 @@ #define UNIMPLEMENTED #endif +#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) + BOOL DbgInitDebugChannels(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -38,10 +38,6 @@ DBG_DEFAULT_CHANNEL(UserAccel); -UINT FASTCALL IntFindSubMenu(HMENU *hMenu, HMENU hSubTarget ); -HMENU FASTCALL IntGetSubMenu( HMENU hMenu, int nPos); -UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags); - /* FUNCTIONS *****************************************************************/ PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -10,9 +10,6 @@ /* INCLUDES ******************************************************************/ #include <win32k.h> - -#define NDEBUG -#include <debug.h> /* CALLPROC ******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -11,8 +11,6 @@ #include <intrin.h> DBG_DEFAULT_CHANNEL(UserDisplay); - -BOOL InitSysParams(); BOOL gbBaseVideo = 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -19,11 +19,6 @@ PKBL KBLList = NULL; // Keyboard layout list. typedef PVOID (*KbdLayerDescriptor)(VOID); -NTSTATUS APIENTRY LdrGetProcedureAddress(PVOID module, - PANSI_STRING import_name, - DWORD flags, - PVOID *func_addr); - /* PRIVATE FUNCTIONS ******************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -13,8 +13,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMsg); - -BOOLEAN NTAPI PsGetProcessExitProcessCalled(PEPROCESS Process); #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -15,8 +15,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMsgQ); - -VOID FASTCALL DoTheScreenSaver(VOID); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -12,8 +12,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); - -BOOL InitSysParams(); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -13,13 +13,8 @@ #include <win32k.h> -#include <winsta.h> - DBG_DEFAULT_CHANNEL(UserSysparams); -#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) -HBITMAP NTAPI UserLoadImage(PCWSTR); -BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING); SPIVALUES gspv; BOOL gbSpiInitialized = FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -15,8 +15,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserTimer); - -WORD FASTCALL get_key_state(void); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -12,8 +12,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserDce); - -int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -30,12 +30,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserWinpos); - -VOID FASTCALL -co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse); - -BOOL FASTCALL -IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Tue Sep 20 18:04:14 2011 @@ -457,9 +457,6 @@ return TRUE; } -int FASTCALL -CLIPPING_UpdateGCRegion(DC* Dc); - static void DC_vUpdateDC(PDC pdc)

1 0

[tkreuzer] 53776: [RTL] - Remove qsort, its already in crt. - Fix a number of MSVC/64 bit issues
by tkreuzer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: tkreuzer Date: Tue Sep 20 17:33:51 2011 New Revision: 53776 URL: http://svn.reactos.org/svn/reactos?rev=53776&view=rev Log: [RTL] - Remove qsort, its already in crt. - Fix a number of MSVC/64 bit issues Removed: trunk/reactos/lib/rtl/qsort.c Modified: trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/rtl/acl.c trunk/reactos/lib/rtl/bitmap.c trunk/reactos/lib/rtl/critical.c trunk/reactos/lib/rtl/dbgbuffer.c trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/dos8dot3.c trunk/reactos/lib/rtl/env.c trunk/reactos/lib/rtl/path.c trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/rtl/sd.c trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -42,7 +42,6 @@ ppb.c process.c propvar.c - qsort.c random.c rangelist.c registry.c Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=53776&r1… ============================================================================== --- trunk/reactos/lib/rtl/acl.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/acl.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -461,7 +461,7 @@ { PACE Ace; PACE Current; - ULONG NewAceCount; + WORD NewAceCount; ULONG Index; PAGED_CODE_RTL(); @@ -515,7 +515,7 @@ (ULONG)((ULONG_PTR)Ace - (ULONG_PTR)Current)); Acl->AceCount = Acl->AceCount + NewAceCount; - Acl->AclRevision = AclRevision; + Acl->AclRevision = (BYTE)AclRevision; return STATUS_SUCCESS; } @@ -737,8 +737,8 @@ } AclSize = ROUND_UP(AclSize, 4); - Acl->AclSize = AclSize; - Acl->AclRevision = AclRevision; + Acl->AclSize = (WORD)AclSize; + Acl->AclRevision = (BYTE)AclRevision; Acl->AceCount = 0; Acl->Sbz1 = 0; Acl->Sbz2 = 0; @@ -850,7 +850,7 @@ return STATUS_INVALID_PARAMETER; } - Acl->AclRevision = Info->AclRevision; + Acl->AclRevision = (BYTE)Info->AclRevision; } break; Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=53776… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -81,7 +81,7 @@ BitScanForward(&BitPos, Value); /* Calculate length up to where we read */ - Length = (Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; + Length = (ULONG)(Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; Length += BitPos - 32; /* Make sure we don't go past the last bit */ @@ -130,7 +130,7 @@ BitScanForward(&BitPos, InvValue); /* Calculate length up to where we read */ - Length = (Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; + Length = (ULONG)(Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; Length += BitPos - 32; /* Make sure we don't go past the last bit */ Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=537… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -407,7 +407,7 @@ RtlSetCriticalSectionSpinCount(PRTL_CRITICAL_SECTION CriticalSection, ULONG SpinCount) { - ULONG OldCount = CriticalSection->SpinCount; + ULONG OldCount = (ULONG)CriticalSection->SpinCount; /* Set to parameter if MP, or to 0 if this is Uniprocessor */ CriticalSection->SpinCount = (NtCurrentPeb()->NumberOfProcessors > 1) ? SpinCount : 0; Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=53… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -36,7 +36,7 @@ } Buf->ViewBaseClient = Buf; - Buf->ViewSize = ViewSize; + Buf->ViewSize = (ULONG)ViewSize; DPRINT("RtlCQDB: BA: %p BS: 0x%lx\n", Buf->ViewBaseClient, Buf->ViewSize); @@ -203,7 +203,7 @@ p = strrchr(ModulePtr->FullPathName, '\\'); if (p != NULL) - ModulePtr->OffsetToFileName = p - ModulePtr->FullPathName + 1; + ModulePtr->OffsetToFileName = (USHORT)(p - ModulePtr->FullPathName + 1); else ModulePtr->OffsetToFileName = 0; @@ -234,7 +234,7 @@ IN OUT PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; + ULONG Pid = (ULONG)(ULONG_PTR) NtCurrentTeb()->ClientId.UniqueProcess; Buf->Flags = DebugInfoMask; Buf->OffsetFree = sizeof(RTL_DEBUG_INFORMATION); Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=53776&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -57,7 +57,7 @@ NTSTATUS Status; STRING DebugString; CHAR Buffer[512]; - ULONG Length, PrefixLength; + SIZE_T Length, PrefixLength; EXCEPTION_RECORD ExceptionRecord; /* Check if we should print it or not */ @@ -110,7 +110,7 @@ } /* Build the string */ - DebugString.Length = Length; + DebugString.Length = (USHORT)Length; DebugString.Buffer = Buffer; /* First, let the debugger know as well */ @@ -281,7 +281,7 @@ Input.Buffer = Response; /* Setup the output string */ - Output.Length = strlen(Prompt); + Output.Length = (USHORT)strlen(Prompt); Output.Buffer = (PCHAR)Prompt; /* Call the system service */ @@ -380,9 +380,9 @@ /* Setup the strings */ NameString.Buffer = (PCHAR)Name; - NameString.Length = strlen(Name); + NameString.Length = (USHORT)strlen(Name); CommandString.Buffer = (PCHAR)Command; - CommandString.Length = strlen(Command); + CommandString.Length = (USHORT)strlen(Command); /* Send them to the debugger */ DebugService2(&NameString, &CommandString, BREAKPOINT_COMMAND_STRING); Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=537… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -119,7 +119,7 @@ { c = 0; RtlUpcaseUnicodeToOemN(&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); - if (Count != 1 || c == 0 || RtlpIsShortIllegal(Name->Buffer[i])) + if (Count != 1 || c == 0 || RtlpIsShortIllegal(c)) { ExtBuffer[ExtLength++] = L'_'; } @@ -211,12 +211,12 @@ j += IndexLength + 1; memcpy(Name8dot3->Buffer + j, ExtBuffer, ExtLength * sizeof(WCHAR)); - Name8dot3->Length = (j + ExtLength) * sizeof(WCHAR); + Name8dot3->Length = (USHORT)(j + ExtLength) * sizeof(WCHAR); DPRINT("Name8dot3: '%wZ'\n", Name8dot3); /* Update context */ - Context->NameLength = CopyLength; + Context->NameLength = (UCHAR)CopyLength; Context->ExtensionLength = ExtLength; memcpy(Context->NameBuffer, NameBuffer, CopyLength * sizeof(WCHAR)); memcpy(Context->ExtensionBuffer, ExtBuffer, ExtLength * sizeof(WCHAR)); Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=53776&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -163,11 +163,11 @@ if (Tail != 0) { Variable.MaximumLength = - Variable.Length = (VariableEnd - (SourceBuffer + 1)) * sizeof(WCHAR); + Variable.Length = (USHORT)(VariableEnd - (SourceBuffer + 1)) * sizeof(WCHAR); Variable.Buffer = SourceBuffer + 1; Value.Length = 0; - Value.MaximumLength = DestMax * sizeof(WCHAR); + Value.MaximumLength = (USHORT)DestMax * sizeof(WCHAR); Value.Buffer = DestBuffer; Status = RtlQueryEnvironmentVariable_U(Environment, &Variable, @@ -227,7 +227,7 @@ else ReturnStatus = STATUS_BUFFER_TOO_SMALL; - Destination->Length = (DestBuffer - Destination->Buffer) * sizeof(WCHAR); + Destination->Length = (USHORT)(DestBuffer - Destination->Buffer) * sizeof(WCHAR); if (Length != NULL) *Length = TotalLength * sizeof(WCHAR); @@ -271,7 +271,7 @@ { MEMORY_BASIC_INFORMATION mbi; UNICODE_STRING var; - int hole_len, new_len, env_len = 0; + size_t hole_len, new_len, env_len = 0; WCHAR *new_env = 0, *env_end = 0, *wcs, *env, *val = 0, *tail = 0, *hole = 0; PWSTR head = NULL; SIZE_T size = 0, new_size; @@ -328,7 +328,7 @@ } if (*wcs) { - var.Length = (wcs - var.Buffer) * sizeof(WCHAR); + var.Length = (USHORT)(wcs - var.Buffer) * sizeof(WCHAR); var.MaximumLength = var.Length; val = ++wcs; wcs += wcslen(wcs); @@ -532,14 +532,14 @@ } if (*wcs) { - var.Length = var.MaximumLength = (wcs - var.Buffer) * sizeof(WCHAR); + var.Length = var.MaximumLength = (USHORT)(wcs - var.Buffer) * sizeof(WCHAR); val = ++wcs; wcs += wcslen(wcs); DPRINT("Search at :%S\n", wcs); if (RtlEqualUnicodeString(&var, Name, TRUE)) { - Value->Length = (wcs - val) * sizeof(WCHAR); + Value->Length = (USHORT)(wcs - val) * sizeof(WCHAR); if (Value->Length <= Value->MaximumLength) { memcpy(Value->Buffer, val, Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=53776&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -47,7 +47,7 @@ { UNICODE_STRING DeviceName; PWCHAR Start, End, Ptr; - ULONG DeviceNameLength; + SIZE_T DeviceNameLength; /* Validate the input */ if (!PathString) return 0; @@ -363,9 +363,9 @@ } /* Build the final NT path string */ - NtPath->Length = DosLength; + NtPath->Length = (USHORT)DosLength; NtPath->Buffer = NewBuffer; - NtPath->MaximumLength = DosLength + sizeof(UNICODE_NULL); + NtPath->MaximumLength = (USHORT)DosLength + sizeof(UNICODE_NULL); return STATUS_SUCCESS; } @@ -502,8 +502,8 @@ /* Setup the actual NT path string and terminate it */ NtName->Buffer = NewBuffer; - NtName->Length = Length; - NtName->MaximumLength = MaxLength; + NtName->Length = (USHORT)Length; + NtName->MaximumLength = (USHORT)MaxLength; NewBuffer[LengthChars] = UNICODE_NULL; DPRINT("new buffer: %S\n", NewBuffer); DPRINT("NT Name: %wZ\n", NtName); @@ -550,7 +550,7 @@ { Length = ((cd->DosPath.Length / sizeof(WCHAR)) - PrefixCut) + ((InputPathType == 1) ? 8 : 4); RelativeName->RelativeName.Buffer = NewBuffer + Length; - RelativeName->RelativeName.Length = NtName->Length - (Length * sizeof(WCHAR)); + RelativeName->RelativeName.Length = NtName->Length - (USHORT)(Length * sizeof(WCHAR)); RelativeName->RelativeName.MaximumLength = RelativeName->RelativeName.Length; RelativeName->ContainingDirectory = cd->Handle; } @@ -875,7 +875,7 @@ IO_STATUS_BLOCK iosb; PCURDIR cd; NTSTATUS Status; - ULONG size; + USHORT size; HANDLE handle = NULL; PWSTR ptr; @@ -1055,7 +1055,7 @@ LPWSTR buffer, ULONG size) { - ULONG reqsize = 0, mark = 0, dep = 0, deplen; + SIZE_T reqsize = 0, mark = 0, dep = 0, deplen; LPWSTR ins_str = NULL; LPCWSTR ptr; const UNICODE_STRING* cd; @@ -1103,7 +1103,7 @@ var.MaximumLength = 4 * sizeof(WCHAR); var.Buffer = tmp; val.Length = 0; - val.MaximumLength = size; + val.MaximumLength = (USHORT)size; val.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, size); if (val.Buffer == NULL) { @@ -1221,12 +1221,12 @@ if (ins_str != tmp && ins_str != cd->Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, ins_str); - collapse_path( buffer, mark ); + collapse_path( buffer, (ULONG)mark ); reqsize = wcslen(buffer) * sizeof(WCHAR); done: RtlReleasePebLock(); - return reqsize; + return (ULONG)reqsize; } Removed: trunk/reactos/lib/rtl/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/qsort.c?rev=53775&… ============================================================================== --- trunk/reactos/lib/rtl/qsort.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/qsort.c (removed) @@ -1,220 +1,0 @@ -/* - * COPYRIGHT: - *- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * PROJECT: ReactOS system libraries - * PURPOSE: Unicode Conversion Routines - * FILE: lib/rtl/qsort.c - * PROGRAMMER: Adapted from CygWin newlib 2000-03-12. - */ -#include <rtl.h> - -/* FIXME: these types should be from the default includes */ - -typedef int (__cdecl* _pfunccmp_t) (const void *, const void *); - -/* - * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function". - */ -#define swapcode(TYPE, parmi, parmj, n) { \ - long i = (n) / sizeof (TYPE); \ - register TYPE *pi = (TYPE *) (parmi); \ - register TYPE *pj = (TYPE *) (parmj); \ - do { \ - register TYPE t = *pi; \ - *pi++ = *pj; \ - *pj++ = t; \ - } while (--i > 0); \ -} - -#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \ - es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1; - -static __inline void -swapfunc ( - char * a, - char * b, - int n, - int swaptype - ) -{ - if(swaptype <= 1) - swapcode(long, a, b, n) - else - swapcode(char, a, b, n) -} - -#define swap(a, b) \ - if (swaptype == 0) { \ - long t = *(long *)(a); \ - *(long *)(a) = *(long *)(b); \ - *(long *)(b) = t; \ - } else \ - swapfunc(a, b, es, swaptype) - -#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) - -static __inline char * -med3 ( - char * a, - char * b, - char * c, - _pfunccmp_t cmp - ) -{ - return cmp(a, b) < 0 ? - (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a )) - :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c )); -} - - -/* EXPORTED */ -void -__cdecl -qsort ( - void * a, - size_t n, - size_t es, - _pfunccmp_t cmp - ) -{ - char *pa, *pb, *pc, *pd, *pl, *pm, *pn; - int d, r, swaptype, swap_cnt; - -loop: SWAPINIT(a, es); - swap_cnt = 0; - if (n < 7) - { - for ( pm = (char *) a + es; - pm < (char *) a + n * es; - pm += es - ) - { - for ( pl = pm; - pl > (char *) a && cmp(pl - es, pl) > 0; - pl -= es - ) - { - swap(pl, pl - es); - } - } - return; - } - pm = (char *) a + (n / 2) * es; - if (n > 7) - { - pl = (char *) a; - pn = (char *) a + (n - 1) * es; - if (n > 40) - { - d = (n / 8) * es; - pl = med3(pl, pl + d, pl + 2 * d, cmp); - pm = med3(pm - d, pm, pm + d, cmp); - pn = med3(pn - 2 * d, pn - d, pn, cmp); - } - pm = med3(pl, pm, pn, cmp); - } - swap(a, pm); - pa = pb = (char *) a + es; - - pc = pd = (char *) a + (n - 1) * es; - for (;;) - { - while (pb <= pc && (r = cmp(pb, a)) <= 0) - { - if (r == 0) - { - swap_cnt = 1; - swap(pa, pb); - pa += es; - } - pb += es; - } - while (pb <= pc && (r = cmp(pc, a)) >= 0) - { - if (r == 0) - { - swap_cnt = 1; - swap(pc, pd); - pd -= es; - } - pc -= es; - } - if (pb > pc) - { - break; - } - swap(pb, pc); - swap_cnt = 1; - pb += es; - pc -= es; - } - if (swap_cnt == 0) /* Switch to insertion sort */ - { - for ( pm = (char *) a + es; - pm < (char *) a + n * es; - pm += es - ) - { - for ( pl = pm; - pl > (char *) a && cmp(pl - es, pl) > 0; - pl -= es - ) - { - swap(pl, pl - es); - } - } - return; - } - - pn = (char *) a + n * es; - r = min(pa - (char *)a, pb - pa); - vecswap(a, pb - r, r); - r = min(pd - pc, pn - pd - es); - vecswap(pb, pn - r, r); - if ((r = pb - pa) > es) - { - qsort(a, r / es, es, cmp); - } - if ((r = pd - pc) > es) - { - /* Iterate rather than recurse to save stack space */ - a = pn - r; - n = r / es; - goto loop; - } -/* qsort(pn - r, r / es, es, cmp);*/ -} - - -/* EOF */ Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=537… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -81,7 +81,6 @@ <file>ppb.c</file> <file>process.c</file> <file>propvar.c</file> - <file>qsort.c</file> <file>random.c</file> <file>rangelist.c</file> <file>registry.c</file> Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=53776&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -120,7 +120,7 @@ return STATUS_UNKNOWN_REVISION; } - pSD->Revision = Revision; + pSD->Revision = SECURITY_DESCRIPTOR_REVISION1; pSD->Sbz1 = 0; pSD->Control = 0; pSD->Owner = NULL; @@ -144,10 +144,10 @@ DWORD OwnerLength, GroupLength; PISECURITY_DESCRIPTOR srcSD = pSourceSecurityDescriptor; PISECURITY_DESCRIPTOR destSD = pDestinationSecurityDescriptor; - + if (srcSD->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; - + /* Copy non relative dependent data */ destSD->Revision = srcSD->Revision; destSD->Sbz1 = srcSD->Sbz1; @@ -230,7 +230,7 @@ return STATUS_UNKNOWN_REVISION; } - SecurityDescriptor->Revision = Revision; + SecurityDescriptor->Revision = SECURITY_DESCRIPTOR_REVISION1; SecurityDescriptor->Sbz1 = 0; SecurityDescriptor->Control = SE_SELF_RELATIVE; SecurityDescriptor->Owner = 0; Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=53776&r1… ============================================================================== --- trunk/reactos/lib/rtl/sid.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sid.c [iso-8859-1] Tue Sep 20 17:33:51 2011 @@ -332,7 +332,7 @@ { WCHAR Buffer[256]; PWSTR wcs; - ULONG Length; + SIZE_T Length; ULONG i; PISID Sid = Sid_; @@ -387,7 +387,7 @@ if (Length > String->MaximumLength) return STATUS_BUFFER_TOO_SMALL; - String->Length = Length; + String->Length = (USHORT)Length; RtlCopyMemory (String->Buffer, Buffer, Length);

1 0

[gadamopoulos] 53775: [win32k] - Remove a defined but not used definition of POINT_IN_RECT
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 15:21:29 2011 New Revision: 53775 URL: http://svn.reactos.org/svn/reactos?rev=53775&view=rev Log: [win32k] - Remove a defined but not used definition of POINT_IN_RECT Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Sep 20 15:21:29 2011 @@ -13,8 +13,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserWnd); - -#define POINT_IN_RECT(p, r) (((r.bottom >= p.y) && (r.top <= p.y))&&((r.left <= p.x )&&( r.right >= p.x ))) /* HELPER FUNCTIONS ***********************************************************/

1 0

[pschweitzer] 53774: [SYSSETUP] Fix broken logic in CreateShortcut() and add an explicit overall
by pschweitzer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: pschweitzer Date: Tue Sep 20 14:21:21 2011 New Revision: 53774 URL: http://svn.reactos.org/svn/reactos?rev=53774&view=rev Log: [SYSSETUP] Fix broken logic in CreateShortcut() and add an explicit overall 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Tue Sep 20 14:21:21 2011 @@ -153,20 +153,21 @@ &lpFilePart); if (dwLen != 0 && dwLen <= sizeof(szWorkingDir) / sizeof(szWorkingDir[0])) { + /* Since those should only be called with (.exe) files, + lpFilePart has not to be NULL */ + ASSERT(lpFilePart != NULL); + /* Save the file name */ _tcscpy(exeName, lpFilePart); - if (lpFilePart != NULL) - { - /* We're only interested in the path. Cut the file name off. - Also remove the trailing backslash unless the working directory - is only going to be a drive, ie. C:\ */ - *(lpFilePart--) = _T('\0'); - if (!(lpFilePart - szWorkingDir == 2 && szWorkingDir[1] == _T(':') && - szWorkingDir[2] == _T('\\'))) - { - *lpFilePart = _T('\0'); - } + /* We're only interested in the path. Cut the file name off. + Also remove the trailing backslash unless the working directory + is only going to be a drive, ie. C:\ */ + *(lpFilePart--) = _T('\0'); + if (!(lpFilePart - szWorkingDir == 2 && szWorkingDir[1] == _T(':') && + szWorkingDir[2] == _T('\\'))) + { + *lpFilePart = _T('\0'); } lpWorkingDir = szWorkingDir;

1 0

[gadamopoulos] 53773: [uxtheme] - Fix double includes
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 13:55:35 2011 New Revision: 53773 URL: http://svn.reactos.org/svn/reactos?rev=53773&view=rev Log: [uxtheme] - Fix double includes Modified: trunk/reactos/dll/win32/uxtheme/buffer.c trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/main.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c Modified: trunk/reactos/dll/win32/uxtheme/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -19,8 +19,6 @@ */ #include "uxthemep.h" -#include "wine/debug.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -19,8 +19,6 @@ */ #include "uxthemep.h" -#include "wine/debug.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -21,8 +21,6 @@ #include "uxthemep.h" #include "wine/debug.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /***********************************************************************/ Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -19,8 +19,6 @@ */ #include "uxthemep.h" -#include "wine/debug.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Tue Sep 20 13:55:35 2011 @@ -20,9 +20,7 @@ #include "uxthemep.h" #include "wine/debug.h" - #include "wine/unicode.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);

1 0

[pschweitzer] 53772: [KERNEL32] Fix wrong sizeof usage
by pschweitzer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: pschweitzer Date: Tue Sep 20 13:53:25 2011 New Revision: 53772 URL: http://svn.reactos.org/svn/reactos?rev=53772&view=rev Log: [KERNEL32] Fix wrong sizeof usage Modified: trunk/reactos/dll/win32/kernel32/client/power.c Modified: trunk/reactos/dll/win32/kernel32/client/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/power.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/power.c [iso-8859-1] Tue Sep 20 13:53:25 2011 @@ -40,7 +40,7 @@ return FALSE; } - RtlZeroMemory(PowerStatus, sizeof(LPSYSTEM_POWER_STATUS)); + RtlZeroMemory(PowerStatus, sizeof(SYSTEM_POWER_STATUS)); PowerStatus->BatteryLifeTime = BATTERY_LIFE_UNKNOWN; PowerStatus->BatteryFullLifeTime = BATTERY_LIFE_UNKNOWN;

1 0

[gadamopoulos] 53771: [uxtheme] - Use precompiled headers
by gadamopoulos＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: gadamopoulos Date: Tue Sep 20 13:08:36 2011 New Revision: 53771 URL: http://svn.reactos.org/svn/reactos?rev=53771&view=rev Log: [uxtheme] - Use precompiled headers Added: trunk/reactos/dll/win32/uxtheme/uxthemep.h (with props) Removed: trunk/reactos/dll/win32/uxtheme/msstyles.h trunk/reactos/dll/win32/uxtheme/ncthm.h trunk/reactos/dll/win32/uxtheme/uxthemedll.h Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt trunk/reactos/dll/win32/uxtheme/buffer.c trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/main.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/ncscrollbar.c trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/dll/win32/uxtheme/property.c trunk/reactos/dll/win32/uxtheme/stylemap.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxini.c trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -27,5 +27,6 @@ target_link_libraries(uxtheme wine) add_delay_importlibs(uxtheme msimg32) add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) +add_pch(uxtheme uxthemep.h) add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) add_importlib_target(uxtheme.spec) Modified: trunk/reactos/dll/win32/uxtheme/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/buffer.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/buffer.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,17 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdlib.h> -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "vfwmsgs.h" -#include "uxtheme.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/debug.h" Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,21 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdlib.h> -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" - -#include "msstyles.h" -#include "uxthemedll.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/debug.h" @@ -1881,7 +1868,7 @@ hbmp = UXTHEME_DrawThemePartToDib(hTheme, hdc, iPartId, iStateId, pRect); /* Retrieve the info of the dib section */ - GetObject(hbmp, sizeof (DIBSECTION), &dib); + GetObjectW(hbmp, sizeof (DIBSECTION), &dib); /* Convert the bits of the dib section to a region */ *pRegion = UXTHEME_RegionFromDibBits((RGBQUAD*)dib.dsBm.bmBits, &clrTransparent, pRect); Modified: trunk/reactos/dll/win32/uxtheme/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/main.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,13 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "uxthemedll.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/debug.h" Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,19 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" - -#include "msstyles.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/debug.h" Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,21 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" - -#include "msstyles.h" +#include "uxthemep.h" +#include "wine/debug.h" #include "wine/unicode.h" #include "wine/debug.h" Removed: trunk/reactos/dll/win32/uxtheme/msstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.h (removed) @@ -1,118 +1,0 @@ -/* - * Internal msstyles related defines & declarations - * - * Copyright (C) 2003 Kevin Koltzau - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_MSSTYLES_H -#define __WINE_MSSTYLES_H - -#define TMT_ENUM 200 - -#define MAX_THEME_APP_NAME 60 -#define MAX_THEME_CLASS_NAME 60 -#define MAX_THEME_VALUE_NAME 60 - -typedef struct _THEME_PROPERTY { - int iPrimitiveType; - int iPropertyId; - PROPERTYORIGIN origin; - - LPCWSTR lpValue; - DWORD dwValueLen; - - struct _THEME_PROPERTY *next; -} THEME_PROPERTY, *PTHEME_PROPERTY; - -typedef struct _THEME_PARTSTATE { - int iPartId; - int iStateId; - PTHEME_PROPERTY properties; - - struct _THEME_PARTSTATE *next; -} THEME_PARTSTATE, *PTHEME_PARTSTATE; - -struct _THEME_FILE; - -typedef struct _THEME_CLASS { - HMODULE hTheme; - struct _THEME_FILE* tf; - WCHAR szAppName[MAX_THEME_APP_NAME]; - WCHAR szClassName[MAX_THEME_CLASS_NAME]; - PTHEME_PARTSTATE partstate; - struct _THEME_CLASS *overrides; - - struct _THEME_CLASS *next; -} THEME_CLASS, *PTHEME_CLASS; - -typedef struct _THEME_IMAGE { - WCHAR name[MAX_PATH]; - HBITMAP image; - BOOL hasAlpha; - - struct _THEME_IMAGE *next; -} THEME_IMAGE, *PTHEME_IMAGE; - -typedef struct _THEME_FILE { - DWORD dwRefCount; - HMODULE hTheme; - WCHAR szThemeFile[MAX_PATH]; - LPWSTR pszAvailColors; - LPWSTR pszAvailSizes; - - LPWSTR pszSelectedColor; - LPWSTR pszSelectedSize; - - PTHEME_CLASS classes; - PTHEME_PROPERTY metrics; - PTHEME_IMAGE images; -} THEME_FILE, *PTHEME_FILE; - -typedef struct _UXINI_FILE *PUXINI_FILE; - -HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); -void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); -HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics); -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList); -HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); -BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId); -BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue); -BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); -PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); -PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); -PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); -PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); -HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); - -HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal); -HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor); -HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont); -HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal); -HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList); -HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint); -HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars); -HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); -HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); - -PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); -void UXINI_CloseINI(PUXINI_FILE uf); -LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); -BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); -LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); -BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); - -#endif Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -9,14 +9,7 @@ * Copyright 1994, 1996 Alexandre Julliard */ -#include <windows.h> -#include "undocuser.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include <tmschema.h> -#include <windowsx.h> -#include "ncthm.h" -#include <assert.h> +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Removed: trunk/reactos/dll/win32/uxtheme/ncthm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncthm.h?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncthm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncthm.h (removed) @@ -1,106 +1,0 @@ - -typedef struct _WND_CONTEXT -{ - BOOL HasAppDefinedRgn; - BOOL HasThemeRgn; - BOOL UpdatingRgn; -} WND_CONTEXT, *PWND_CONTEXT; - -typedef struct _DRAW_CONTEXT -{ - HWND hWnd; - HDC hDC; - HTHEME theme; - HTHEME scrolltheme; - HTHEME hPrevTheme; - WINDOWINFO wi; - BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ - HRGN hRgn; - int CaptionHeight; - - /* for double buffering */ - HDC hDCScreen; - HBITMAP hbmpOld; -} DRAW_CONTEXT, *PDRAW_CONTEXT; - -typedef enum -{ - CLOSEBUTTON, - MAXBUTTON, - MINBUTTON, - HELPBUTTON -} CAPTIONBUTTON; - -/* -The following values specify all possible vutton states -Note that not all of them are documented but it is easy to -find them by opening a theme file -*/ -typedef enum { - BUTTON_NORMAL = 1 , - BUTTON_HOT , - BUTTON_PRESSED , - BUTTON_DISABLED , - BUTTON_INACTIVE -} THEME_BUTTON_STATES; - - /* Scroll-bar hit testing */ -enum SCROLL_HITTEST -{ - SCROLL_NOWHERE, /* Outside the scroll bar */ - SCROLL_TOP_ARROW, /* Top or left arrow */ - SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ - SCROLL_THUMB, /* Thumb rectangle */ - SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ - SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ -}; - -#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ - ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ - ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ - (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ - (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) - -#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) - -#define BUTTON_GAP_SIZE 2 - -#define MENU_BAR_ITEMS_SPACE (12) - -#define SCROLL_TIMER 0 /* Scroll timer id */ - - /* Overlap between arrows and thumb */ -#define SCROLL_ARROW_THUMB_OVERLAP 0 - - /* Delay (in ms) before first repetition when holding the button down */ -#define SCROLL_FIRST_DELAY 200 - - /* Delay (in ms) between scroll repetitions */ -#define SCROLL_REPEAT_DELAY 50 - -/* Minimum size of the thumb in pixels */ -#define SCROLL_MIN_THUMB 6 - -/* Minimum size of the rectangle between the arrows */ -#define SCROLL_MIN_RECT 4 - -void -ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); - -VOID -NC_TrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt); - -void -ThemeInitDrawContext(PDRAW_CONTEXT pcontext, - HWND hWnd, - HRGN hRgn); - -void -ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext); - -PWND_CONTEXT -ThemeGetWndContext(HWND hWnd); - -extern ATOM atWindowTheme; -extern ATOM atWndContrext; - Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -6,14 +6,7 @@ * PROGRAMMER: Giannis Adamopoulos */ -#include <windows.h> -#include <windowsx.h> -#include "undocuser.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include <tmschema.h> -#include "ncthm.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" - -#include "msstyles.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/stylemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/stylemap… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/stylemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/stylemap.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,16 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "tmschema.h" - -#define TMT_ENUM 200 +#include "uxthemep.h" +#include "wine/debug.h" typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winreg.h" -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "tmschema.h" -#include "uxundoc.h" - -#include "uxthemedll.h" -#include "msstyles.h" -#include "ncthm.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -6,15 +6,7 @@ * PROGRAMMER: Giannis Adamopoulos */ -#include <windows.h> -#include <undocuser.h> - -#include "vfwmsgs.h" -#include "uxtheme.h" -#include "uxthemedll.h" -#include "ncthm.h" -#include "tmschema.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); Modified: trunk/reactos/dll/win32/uxtheme/uxini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxini.c?… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxini.c [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" - +#include "uxthemep.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -42,7 +35,7 @@ LPCWSTR lpIni; LPCWSTR lpCurLoc; LPCWSTR lpEnd; -} UXINI_FILE, *PUXINI_FILE; +} UXINI_FILE; /***********************************************************************/ Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -6,6 +6,7 @@ <include base="uxtheme">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <pch>uxthemep.h</pch> <file>buffer.c</file> <file>draw.c</file> <file>main.c</file> Removed: trunk/reactos/dll/win32/uxtheme/uxthemedll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemed… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemedll.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemedll.h (removed) @@ -1,35 +1,0 @@ -/* - * Internal uxtheme defines & declarations - * - * Copyright (C) 2003 Kevin Koltzau - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_UXTHEMEDLL_H -#define __WINE_UXTHEMEDLL_H - -extern void UXTHEME_InitSystem(HINSTANCE hInst); -extern void UXTHEME_LoadTheme(BOOL bLoad); -extern BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg); - -/* No alpha blending */ -#define ALPHABLEND_NONE 0 -/* "Cheap" binary alpha blending - but possibly faster */ -#define ALPHABLEND_BINARY 1 -/* Full alpha blending */ -#define ALPHABLEND_FULL 2 - -#endif /* __WINE_UXTHEMEDLL_H */ Added: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h (added) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Tue Sep 20 13:08:36 2011 @@ -1,0 +1,212 @@ +#include <windows.h> +#include <windowsx.h> +#include <undocuser.h> +#include <uxtheme.h> +#include <uxundoc.h> +#include <vfwmsgs.h> +#include <tmschema.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <assert.h> + +#define TMT_ENUM 200 + +#define MAX_THEME_APP_NAME 60 +#define MAX_THEME_CLASS_NAME 60 +#define MAX_THEME_VALUE_NAME 60 + +typedef struct _THEME_PROPERTY { + int iPrimitiveType; + int iPropertyId; + PROPERTYORIGIN origin; + + LPCWSTR lpValue; + DWORD dwValueLen; + + struct _THEME_PROPERTY *next; +} THEME_PROPERTY, *PTHEME_PROPERTY; + +typedef struct _THEME_PARTSTATE { + int iPartId; + int iStateId; + PTHEME_PROPERTY properties; + + struct _THEME_PARTSTATE *next; +} THEME_PARTSTATE, *PTHEME_PARTSTATE; + +struct _THEME_FILE; + +typedef struct _THEME_CLASS { + HMODULE hTheme; + struct _THEME_FILE* tf; + WCHAR szAppName[MAX_THEME_APP_NAME]; + WCHAR szClassName[MAX_THEME_CLASS_NAME]; + PTHEME_PARTSTATE partstate; + struct _THEME_CLASS *overrides; + + struct _THEME_CLASS *next; +} THEME_CLASS, *PTHEME_CLASS; + +typedef struct _THEME_IMAGE { + WCHAR name[MAX_PATH]; + HBITMAP image; + BOOL hasAlpha; + + struct _THEME_IMAGE *next; +} THEME_IMAGE, *PTHEME_IMAGE; + +typedef struct _THEME_FILE { + DWORD dwRefCount; + HMODULE hTheme; + WCHAR szThemeFile[MAX_PATH]; + LPWSTR pszAvailColors; + LPWSTR pszAvailSizes; + + LPWSTR pszSelectedColor; + LPWSTR pszSelectedSize; + + PTHEME_CLASS classes; + PTHEME_PROPERTY metrics; + PTHEME_IMAGE images; +} THEME_FILE, *PTHEME_FILE; + +typedef struct _UXINI_FILE *PUXINI_FILE; + +HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); +void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); +HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics); +PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList); +HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); +BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId); +BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue); +BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); +PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); +PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); +PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); +PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); +HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); + +HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal); +HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor); +HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont); +HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal); +HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList); +HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint); +HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars); +HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); +HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); + +PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); +void UXINI_CloseINI(PUXINI_FILE uf); +LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); +BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); +LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); +BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); + + + +typedef struct _WND_CONTEXT +{ + BOOL HasAppDefinedRgn; + BOOL HasThemeRgn; + BOOL UpdatingRgn; +} WND_CONTEXT, *PWND_CONTEXT; + +typedef struct _DRAW_CONTEXT +{ + HWND hWnd; + HDC hDC; + HTHEME theme; + HTHEME scrolltheme; + HTHEME hPrevTheme; + WINDOWINFO wi; + BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ + HRGN hRgn; + int CaptionHeight; + + /* for double buffering */ + HDC hDCScreen; + HBITMAP hbmpOld; +} DRAW_CONTEXT, *PDRAW_CONTEXT; + +typedef enum +{ + CLOSEBUTTON, + MAXBUTTON, + MINBUTTON, + HELPBUTTON +} CAPTIONBUTTON; + +/* +The following values specify all possible vutton states +Note that not all of them are documented but it is easy to +find them by opening a theme file +*/ +typedef enum { + BUTTON_NORMAL = 1 , + BUTTON_HOT , + BUTTON_PRESSED , + BUTTON_DISABLED , + BUTTON_INACTIVE +} THEME_BUTTON_STATES; + + /* Scroll-bar hit testing */ +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; + +#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ + ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ + ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ + (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ + (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) + +#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) + +#define BUTTON_GAP_SIZE 2 + +#define MENU_BAR_ITEMS_SPACE (12) + +#define SCROLL_TIMER 0 /* Scroll timer id */ + + /* Overlap between arrows and thumb */ +#define SCROLL_ARROW_THUMB_OVERLAP 0 + + /* Delay (in ms) before first repetition when holding the button down */ +#define SCROLL_FIRST_DELAY 200 + + /* Delay (in ms) between scroll repetitions */ +#define SCROLL_REPEAT_DELAY 50 + +/* Minimum size of the thumb in pixels */ +#define SCROLL_MIN_THUMB 6 + +/* Minimum size of the rectangle between the arrows */ +#define SCROLL_MIN_RECT 4 + +void ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); +VOID NC_TrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt); +void ThemeInitDrawContext(PDRAW_CONTEXT pcontext, HWND hWnd, HRGN hRgn); +void ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext); +PWND_CONTEXT ThemeGetWndContext(HWND hWnd); + +extern ATOM atWindowTheme; +extern ATOM atWndContrext; + +void UXTHEME_InitSystem(HINSTANCE hInst); +void UXTHEME_LoadTheme(BOOL bLoad); +BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg); + +/* No alpha blending */ +#define ALPHABLEND_NONE 0 +/* "Cheap" binary alpha blending - but possibly faster */ +#define ALPHABLEND_BINARY 1 +/* Full alpha blending */ +#define ALPHABLEND_FULL 2 Propchange: trunk/reactos/dll/win32/uxtheme/uxthemep.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
40
Older →

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 September 2011