Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[cgutman] 54120: [KBDCLASS] - Add a small hack to bind all keyboard port devices to the same keyboard class device when no default setting is present (circumvents win32k not supporting multiple key...

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Oct 13 21:38:07 2011 New Revision: 54120 URL: http://svn.reactos.org/svn/reactos?rev=54120&view=rev Log: [KBDCLASS] - Add a small hack to bind all keyboard port devices to the same keyboard class device when no default setting is present (circumvents win32k not supporting multiple keyboard class FDOs) Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Thu Oct 13 21:38:07 2011 @@ -227,7 +227,8 @@ RTL_QUERY_REGISTRY_TABLE Parameters[4]; NTSTATUS Status; - ULONG DefaultConnectMultiplePorts = 0; + /* HACK: We don't support multiple devices with this disabled */ + ULONG DefaultConnectMultiplePorts = 1; ULONG DefaultDataQueueSize = 0x64; PCWSTR DefaultDeviceBaseName = L"KeyboardClass";

13 years, 2 months

[osiejka] 54119: [TRANSLATION] - serialui, setupapi, shimgvw and tapiui romanian translation, patch by Stefan Fulea; See issue #6558 for more details.

by osiejka＠svn.reactos.org

Author: osiejka Date: Thu Oct 13 21:32:37 2011 New Revision: 54119 URL: http://svn.reactos.org/svn/reactos?rev=54119&view=rev Log: [TRANSLATION] - serialui, setupapi, shimgvw and tapiui romanian translation, patch by Stefan Fulea; See issue #6558 for more details. Added: trunk/reactos/dll/win32/serialui/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/tapiui/lang/ro-RO.rc (with props) Modified: trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/tapiui/tapiui.rc Added: trunk/reactos/dll/win32/serialui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/serialui/lang/ro-RO.rc [iso-8859-1] Thu Oct 13 21:32:37 2011 @@ -1,0 +1,48 @@ +/* + * FILE: dll/win32/serialui/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-10-10 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE LOADONCALL DISCARDABLE +BEGIN + IDS_EVENPARITY, "Par" + IDS_MARKPARITY, "Reper" + IDS_NOPARITY, "FÄrÄ paritate" + IDS_ODDPARITY, "Impar" + IDS_SPACEPARITY, "SpaÈiu" + + IDS_ONESTOPBIT, "1 bit de stop" + IDS_ONE5STOPBITS, "1.5 biÈi de stop" + IDS_TWOSTOPBITS, "2 biÈi de stop" + + IDS_FC_NO, "Nu" + IDS_FC_CTSRTS, "CTS/RTS" + IDS_FC_XONXOFF, "XON/XOFF" + + IDS_TITLE, "ProprietÄÈi pentru %s" +END + +IDD_COMMDLG DIALOGEX 6,5,222,175 +FONT 8, "MS Shell Dlg" +STYLE 0x10C80080 +EXSTYLE 0x00000001 +BEGIN + CONTROL "",IDC_GRP1,"Button",0x50000007,6,5,210,146,0x00000000 + CONTROL "Con&firmÄ",IDC_OKBTN,"Button",0x50010000,98,156,56,13,0x00000000 + CONTROL "A&nuleazÄ",IDC_CANCELBTN,"Button",0x50010000,158,156,56,13,0x00000000 + CONTROL "Rata baud:",IDC_STC1,"Static",0x50000000,24,31,42,9,0x00000000 + CONTROL "MÄrime octet:",IDC_STC2,"Static",0x50000000,24,53,42,9,0x00000000 + CONTROL "Paritate:",IDC_STC3,"Static",0x50000000,24,73,42,9,0x00000000 + CONTROL "BiÈi de stop:",IDC_STC4,"Static",0x50000000,24,96,42,9,0x00000000 + CONTROL "Control flux:",IDC_STC5,"Static",0x50000000,24,120,42,9,0x00000000 + CONTROL "",IDC_BAUDRATE,"ComboBox",0x50210003,98,29,100,50,0x00000000 + CONTROL "",IDC_BYTESIZE,"ComboBox",0x50210003,98,49,100,50,0x00000000 + CONTROL "",IDC_PARITY,"ComboBox",0x50210003,98,72,100,50,0x00000000 + CONTROL "",IDC_STOPBITS,"ComboBox",0x50210003,98,94,100,50,0x00000000 + CONTROL "",IDC_FLOW,"ComboBox",0x50210003,98,116,100,50,0x00000000 +END + Propchange: trunk/reactos/dll/win32/serialui/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/serialui/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/serialui/serialui.rc [iso-8859-1] Thu Oct 13 21:32:37 2011 @@ -22,5 +22,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/win32/setupapi/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc [iso-8859-1] Thu Oct 13 21:32:37 2011 @@ -1,0 +1,42 @@ +/* + * English resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Transl. Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copie fiÈiere..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Sursa:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "DestinaÈia:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUERY_REBOOT_TEXT "Este necesarÄ repornirea calculatorului pentru a finaliza instalarea. ContinuaÈi?" + IDS_QUERY_REBOOT_CAPTION "Repornire" + IDS_INF_FILE "InformaÈie de instalare" +END Propchange: trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rc [iso-8859-1] Thu Oct 13 21:32:37 2011 @@ -47,5 +47,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/win32/shimgvw/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc [iso-8859-1] Thu Oct 13 21:32:37 2011 @@ -1,0 +1,25 @@ +/* + * FILE: dll/win32/shimgvw/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-10-04 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APPTITLE "Vizualizare fax Èi imagini" + IDS_SETASDESKBG "PlaseazÄ ca decor de fundal" + IDS_PREVIEW "Previzualizare" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Imaginea urmÄtare" + IDS_TOOLTIP_PREV_PIC "Imaginea precedentÄ" + IDS_TOOLTIP_ZOOM_IN "MÄrire (+)" + IDS_TOOLTIP_ZOOM_OUT "MicÈorare (-)" + IDS_TOOLTIP_ROT_CLOCKW "Rotire Ã®n sens orar (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Rotire Ã®n sens antiorar (Ctrl+L)" + IDS_TOOLTIP_PRINT "ImprimÄ (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "PÄstreazÄ Ã®n... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Thu Oct 13 21:32:37 2011 @@ -15,5 +15,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/win32/tapiui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/tapiui/lang/ro-RO.rc [iso-8859-1] Thu Oct 13 21:32:37 2011 @@ -1,0 +1,453 @@ +/* + * FILE: dll/win32/tapiui/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-10-04 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +101 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Reguli de apel" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 201, 2000, 7, 7, 21, 20 + LTEXT "UrmÄtoarea listÄ conÈine locaÈiile specificate de dumneavoastrÄ. AlegeÈi locaÈia din care efectuaÈi apelul.", -1, 35, 7, 210, 16 + LTEXT "&LocaÈii:", -1, 7, 35, 210, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 46, 238, 105, WS_EX_CLIENTEDGE + PUSHBUTTON "&NouÄ...", 1030, 87, 155, 50, 14 + PUSHBUTTON "&Modificare...", 1031, 141, 155, 50, 14 + PUSHBUTTON "&EliminÄ", 1032, 195, 155, 50, 14 + LTEXT "NumÄrul de telefon va fi apelat astfel:", 1052, 7, 181, 180, 8 + LTEXT "", 1053, 14, 195, 224, 16 +END + +102 DIALOGEX 0, 0, 252, 255 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Generale" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 202, 2000, 7, 7, 20, 20 + LTEXT "N&umele locaÈiei:", -1, 35, 11, 56, 8, SS_CENTERIMAGE + EDITTEXT 1038, 96, 8, 149, 14, ES_AUTOHSCROLL + LTEXT "SpecificaÈi locaÈia din care va fi efectuat apelul.", 2001, 7, 33, 238, 8 + LTEXT "Èara/&regiunea:", -1, 7, 49, 161, 8 + COMBOBOX 1006, 7, 60, 175, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "&Codul regiunii:", -1, 190, 49, 48, 8 + EDITTEXT 1034, 190, 60, 48, 12, ES_AUTOHSCROLL + GROUPBOX "Reguli de apel", 2002, 7, 80, 238, 92 + LTEXT "Pentru apelurile din aceastÄ locaÈie, respectÄ urmÄtoarele reguli:", 2003, 14, 92, 224, 8 + LTEXT "FormeazÄ acest cod pentru a accesa o linie l&ocalÄ:", -1, 14, 106, 170, 8 + EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL + LTEXT "FormeazÄ acest cod pentru una &interurbanÄ:", -1, 14, 122, 170, 8 + EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL + LTEXT "Prefixul pentru &apeluri interurbane:", -1, 14, 138, 170, 8 + EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL + LTEXT "Prefixul pentru ap&eluri internaÈionale:", -1, 14, 154, 170, 8 + EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL + AUTOCHECKBOX "&DezactiveazÄ aÈteptarea apelurilor, formÃ¢nd:", 1035, 14, 177, 170, 10 + COMBOBOX 1013, 190, 176, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL + LTEXT "Apel prin:", -1, 14, 195, 40, 8 + AUTORADIOBUTTON "&Ton", 1036, 58, 194, 50, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "&Puls", 1037, 112, 194, 50, 10, NOT WS_TABSTOP + LTEXT "NumÄrul de telefon va fi apelat astfel:", 1052, 7, 219, 180, 8 + LTEXT "", 1053, 14, 232, 224, 16 +END + +103 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Reguli Èi coduri interurbane" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "O regulÄ de apel desemneazÄ modul Ã®n care sunt formate numerele Ã®n cazul apelurilor atÃ¢t Ã®n interiorul cÃ¢t Èi exteriorul regiunii Ã®n care vÄ aflaÈi.", 2000, 7, 7, 238, 16 + LTEXT "&Reguli de apel:", -1, 7, 31, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE + PUSHBUTTON "N&ouÄ...", 1030, 87, 147, 50, 14 + PUSHBUTTON "&Modificare...", 1031, 141, 147, 50, 14 + PUSHBUTTON "&EliminÄ", 1032, 195, 147, 50, 14 + GROUPBOX "Descriere", 2006, 7, 166, 238, 45 + LTEXT "", 1039, 14, 180, 224, 24 +END + +104 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "CartelÄ de apel" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "AlegeÈi o cartelÄ de apel existentÄ, sau adÄugaÈi o nouÄ cartelÄ.", 2000, 7, 7, 238, 8 + LTEXT "&Tipuri de cartelÄ:", -1, 7, 23, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE + PUSHBUTTON "N&ouÄ...", 1030, 87, 103, 50, 14 + PUSHBUTTON "&Modificare...", 1031, 141, 103, 50, 14 + PUSHBUTTON "&EliminÄ", 1032, 195, 103, 50, 14 + LTEXT "NumÄr de &cont:", -1, 7, 127, 91, 8 + EDITTEXT 1018, 102, 125, 143, 12, ES_AUTOHSCROLL + LTEXT "&PIN:", -1, 7, 145, 91, 8 + EDITTEXT 1019, 102, 143, 143, 12, ES_AUTOHSCROLL + GROUPBOX "Numere de telefon pentru", 2001, 7, 158, 238, 53 + LTEXT "Apeluri interurbane:", -1, 14, 172, 84, 8 + LTEXT "", 1042, 102, 172, 136, 8 + LTEXT "Apeluri internaÈionale:", -1, 14, 184, 84, 8 + LTEXT "", 1043, 102, 184, 136, 8 + LTEXT "Apeluri locale:", -1, 14, 196, 84, 8 + LTEXT "", 1051, 102, 196, 136, 8 +END + +105 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Generale" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 203, 2000, 7, 7, 20, 20 + LTEXT "N&umele cartelei:", -1, 35, 12, 64, 8, SS_CENTERIMAGE + EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL + LTEXT "NumÄr de &cont:", -1, 7, 35, 238, 8 + EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL + LTEXT "NumÄr de Identificare &Personal (PIN):", -1, 7, 68, 238, 8 + EDITTEXT 1019, 7, 80, 116, 14, ES_AUTOHSCROLL + LTEXT "AceastÄ cartelÄ de apel se va utiliza Ã®n cazul:", 1056, 14, 117, 224, 8 + GROUPBOX "Detaliile cartelei de apel", 2001, 7, 105, 238, 66 + LTEXT "", 1000, 22, 131, 216, 8 + LTEXT "", 1001, 22, 143, 216, 8 + LTEXT "", 1002, 22, 155, 216, 8 +END + +106 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Apeluri interurbane" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "NumÄrul de acces pentru apelurile &interurbane:", -1, 7, 7, 238, 8 + EDITTEXT 1044, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "UtilizaÈi butoanele de mai jos pentru a specifica paÈii necesari efectuÄrii de apeluri interurbane. IntroduceÈi aceÈti paÈi exact Ã®n ordinea apariÈiei lor pe cartela de apel.", 2000, 7, 40, 238, 24 + LTEXT "PaÈii de u&tilizare a cartelei:", -1, 7, 72, 120, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "MutÄ s&us", 1022, 195, 83, 50, 14 + PUSHBUTTON "MutÄ j&os", 1023, 195, 101, 50, 14 + PUSHBUTTON "&EliminÄ", 1024, 195, 119, 50, 14 + PUSHBUTTON "Nu&mÄrul de acces", 1025, 7, 161, 90, 14 + PUSHBUTTON "NumÄrul de &cont", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "NumÄr &destinaÈie...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&AÈteaptare ton...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Specifcare cifre...", 1021, 101, 197, 90, 14 +END + +107 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Apeluri internaÈionale" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "NumÄrul de acces pentru apeluri &internaÈionale:", -1, 7, 7, 238, 8 + EDITTEXT 1045, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "UtilizaÈi butoanele de mai jos pentru a specifica paÈii necesari efectuÄrii de apeluri internaÈionale. IntroduceÈi aceÈti paÈi exact Ã®n ordinea apariÈiei lor pe cartela de apel.", 2000, 7, 40, 244, 24 + LTEXT "PaÈii de u&tilizare a cartelei:", -1, 7, 72, 120, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "MutÄ s&us", 1022, 195, 83, 50, 14 + PUSHBUTTON "MutÄ j&os", 1023, 195, 101, 50, 14 + PUSHBUTTON "&EliminÄ", 1024, 195, 119, 50, 14 + PUSHBUTTON "Nu&mÄrul de acces", 1025, 7, 161, 90, 14 + PUSHBUTTON "NumÄrul de &cont", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "NumÄr &destinaÈie...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&AÈteaptare ton...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Specificare cifre...", 1021, 101, 197, 90, 14 +END + +108 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Apeluri locale" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "NumÄrul de acces pentru apeluri &locale:", -1, 7, 7, 238, 8 + EDITTEXT 1008, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "SpecificaÈi paÈii necesari efectuÄrii de apeluri locale. IntroduceÈi aceÈti paÈi exact Ã®n ordinea apariÈiei lor pe cartela de apel. Pentru a apela fÄrÄ cartelÄ, lÄsaÈi necompletatÄ aceastÄ secÈiune.", 2000, 7, 40, 238, 24 + LTEXT "PaÈii de u&tilizare a cartelei:", -1, 7, 72, 238, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "MutÄ s&us", 1022, 195, 83, 50, 14 + PUSHBUTTON "MutÄ j&os", 1023, 195, 101, 50, 14 + PUSHBUTTON "&EliminÄ", 1024, 195, 119, 50, 14 + PUSHBUTTON "Nu&mÄrul de acces", 1025, 7, 161, 90, 14 + PUSHBUTTON "NumÄrul de &cont", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "NumÄr &destinaÈie...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&AÈteptare ton...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Specificare cifre...", 1021, 101, 197, 90, 14 +END + +109 DIALOGEX 0, 0, 252, 257 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Reguli pentru cod nou de regiune" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "AceastÄ regulÄ se va aplica doar apelurilor cÄtre codul de regiune Èi prefixele pe care le veÈi specifica mai jos.", 2000, 7, 6, 238, 16 + LTEXT "Codul de regiune apelat:", -1, 7, 31, 110, 8 + LTEXT "Cod &reg.:", -1, 7, 47, 36, 8 + EDITTEXT 1034, 46, 44, 50, 14, ES_AUTOHSCROLL + LTEXT "SpecificaÈi prefixele utilizate cu acest cod de regiune.", -1, 14, 78, 224, 8 + AUTORADIOBUTTON "&Include toate prefixele din acest cod de regiune", 1014, 14, 90, 224, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "Include d&oar prefixele enumerate mai jos:", 1015, 14, 104, 224, 12, NOT WS_TABSTOP + LTEXT "&Prefixe incluse:", 1057, 26, 117, 119, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000411D, 25, 128, 66, 32, WS_EX_CLIENTEDGE + PUSHBUTTON "&AdÄugare...", 1005, 95, 128, 70, 14 + PUSHBUTTON "&EliminÄ", 1024, 95, 146, 70, 14 + LTEXT "Ãn cazul apelurilor ce conÈin prefixele menÈionate:", -1, 14, 184, 224, 8 + AUTOCHECKBOX "Apelea&zÄ:", 1012, 14, 198, 50, 12 + EDITTEXT 1007, 66, 196, 42, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "Include Èi &codul de regiune", 1029, 14, 214, 120, 12 + DEFPUSHBUTTON "Con&firmÄ", 1, 141, 236, 50, 14 + PUSHBUTTON "A&nuleazÄ", 2, 195, 236, 50, 14 + RTEXT "Cod regiune", 2001, 133, 31, 51, 8 + LTEXT "Prefix", 2002, 200, 31, 45, 8 + CONTROL "", 2003, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 180, 41, 1, 6 + CONTROL "", 2004, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 203, 41, 1, 6 + RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8 + GROUPBOX "Prefixe", -1, 7, 64, 238, 102 + GROUPBOX "Reguli", -1, 7, 170, 238, 60 +END + +110 DIALOGEX 0, 0, 227, 82 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", 1003, 7, 7, 213, 8 + LTEXT "", 1039, 7, 23, 213, 8 + EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "Con&firmÄ", 1, 116, 62, 50, 14 + PUSHBUTTON "A&nuleazÄ", 2, 170, 62, 50, 14 +END + +111 DIALOGEX 0, 0, 252, 124 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "AÈteptare" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "StabiliÈi normele perioadei de aÈteptare (Ã®n cazul Ã®n care este necesarÄ), Ã®n procesul de execuÈie a secvenÈei de apel.", 2000, 7, 7, 238, 16 + AUTORADIOBUTTON "AÈteaptÄ &tonul de apel", 1009, 7, 31, 238, 10, WS_GROUP + AUTORADIOBUTTON "AÈteaptÄ completarea mesajului &vocal", 1016, 7, 47, 238, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "AÈteaptÄ o anumitÄ &perioadÄ de timp:", 1048, 7, 63, 238, 10, NOT WS_TABSTOP + EDITTEXT 1050, 18, 77, 36, 14, ES_AUTOHSCROLL | WS_GROUP + CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 77, 11, 14 + LTEXT "&secunde", -1, 58, 81, 187, 8 + DEFPUSHBUTTON "Con&firmÄ", 1, 141, 103, 50, 14 + PUSHBUTTON "A&nuleazÄ", 2, 195, 103, 50, 14 +END + +112 DIALOGEX 0, 0, 252, 111 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "NumÄr destinaÈie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Acest pas va stabili numÄrul destinaÈie care va fi apelat Ã®n secvenÈa cartelei de apel. Cum doriÈi sÄ fie efectuatÄ apelarea numÄrului destinaÈie?", 2000, 7, 7, 238, 24 + AUTOCHECKBOX "ApelÃ¢nd &codul ÈÄrii/codul regiunii", 1027, 7, 39, 238, 10 + AUTOCHECKBOX "ApelÃ¢nd codul &zonei", 1034, 7, 55, 238, 10 + AUTOCHECKBOX "ApelÃ¢nd n&umÄrul", 1008, 7, 71, 238, 10, WS_DISABLED + DEFPUSHBUTTON "Con&firmÄ", 1, 141, 92, 50, 14 + PUSHBUTTON "A&nuleazÄ", 2, 195, 92, 50, 14 +END + +113 DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Avansate" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 201, 2000, 7, 7, 20, 20 + LTEXT "Ãn acest calculator sunt disponibili urmÄtorii furnizori de servicii de telefonie:", -1, 40, 7, 205, 24 + LTEXT "F&urnizori:", -1, 7, 35, 238, 8 + LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP + PUSHBUTTON "A&dÄugare...", 1005, 57, 197, 60, 14 + PUSHBUTTON "&EliminÄ", 1024, 121, 197, 60, 14 + PUSHBUTTON "&Configurare...", 1031, 185, 197, 60, 14 +END + +114 DIALOGEX 20, 15, 252, 127 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "AdÄugare furnizor" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "AlegeÈi un furnizor din lista de mai jos, apoi apÄsaÈi âAdaugÄâ", 2000, 7, 7, 241, 8 + LTEXT "F&urnizori de servicii de telefonie:", -1, 7, 23, 144, 10 + LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "&AdaugÄ", 1005, 141, 106, 50, 14 + DEFPUSHBUTTON "A&nuleazÄ", 2, 195, 106, 50, 14 +END + +115 DIALOGEX 10, 10, 303, 228 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "InformaÈii locale" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 + LTEXT "Ãnainte de a crea o conexiune de telefon sau modem, sunt necesare urmÄtoarele informaÈii referitoare la locaÈia curentÄ.", 2000, 107, 15, 188, 25 + LTEXT "Ãn ce ÈarÄ/&regiune vÄ aflaÈi?", -1, 107, 43, 189, 10 + COMBOBOX 1006, 107, 55, 180, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Ãn ce &zonÄ (sau oraÈ) vÄ aflaÈi?", -1, 107, 74, 189, 10 + EDITTEXT 1034, 107, 87, 45, 12, ES_AUTOHSCROLL + LTEXT "DacÄ se foloseÈte Èi un careva &cod purtÄtor, care este?", -1, 107, 105, 189, 10 + EDITTEXT 1058, 106, 118, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "DacÄ formaÈi un cod pentru liniile &externe, care este?", -1, 107, 137, 189, 10 + EDITTEXT 1010, 107, 149, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Sistemul de telefonie Ã®n aceastÄ locaÈie foloseÈte:", -1, 107, 168, 189, 10 + AUTORADIOBUTTON "&Ton", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Puls", 1037, 175, 178, 57, 14, NOT WS_TABSTOP + DEFPUSHBUTTON "Con&firmÄ", 1, 192, 204, 50, 14 + PUSHBUTTON "A&nuleazÄ", 2, 246, 204, 50, 14 +END + +400 DIALOGEX 0, 0, 290, 151 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 + LTEXT "Ãnainte de a crea o conexiune de telefon sau modem, sunt necesare urmÄtoarele informaÈii referitoare la locaÈia curentÄ.", 2000, 95, 2, 188, 25 + LTEXT "Ãn ce ÈarÄ/&regiune vÄ aflaÈi?", -1, 95, 30, 188, 10 + COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Ãn ce &zonÄ (sau oraÈ) vÄ aflaÈi?", -1, 95, 61, 188, 10 + EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL + LTEXT "DacÄ formaÈi un cod pentru liniile &externe, care este?", -1, 95, 96, 188, 10 + EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Sistemul de telefonie Ã®n aceastÄ locaÈie foloseÈte:", -1, 95, 129, 159, 10 + AUTORADIOBUTTON "&Ton", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Puls", 1037, 155, 139, 55, 12, NOT WS_TABSTOP +END + +500 DIALOGEX 0, 0, 235, 88 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ReactOS Explorer" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 504, 501, 13, 14, 21, 20 + LTEXT "", 502, 47, 15, 180, 32 + AUTOCHECKBOX "&EticheteazÄ pagina ca fiind de Ã®ncredere", 503, 50, 47, 147, 12 + DEFPUSHBUTTON "Con&firmÄ", 505, 110, 65, 50, 14 + PUSHBUTTON "A&nuleazÄ", 506, 164, 65, 50, 14 +END + +STRINGTABLE +BEGIN + 1 "OpÈiuni de telefon Èi modem" + 2 "ConfigureazÄ regulile de apel Èi parametrii de utilizare a modemului." + 3 "LocaÈia" + 4 "Pentru a adÄuga o nouÄ locaÈie, apÄsaÈi âNouÄâ." + 5 "LocaÈie nouÄ" + 6 "Editare locaÈie" + 7 "CartelÄ de apel nouÄ" + 8 "Editarea cartelei de apel" + 9 "Codul regiunii" + 10 "Prefixe" + 11 "Reguli" + 12 "Caracterul introdus nu este valid.\n\nCaracterele valide sunt de la 0 pÃ¢nÄ la 9, *, #, Èi virgulÄ." + 13 "Caracterul introdus nu este valid.\n\nCaracterele valide sunt de la 0 pÃ¢nÄ la 9, *, #, spaÈiu, Èi virgulÄ." + 14 "Caracterul introdus nu este valid.\n\nCaracterele valide sunt de la 0 pÃ¢nÄ la 9." + 15 "Caracterul introdus nu este valid." + 16 "Apelare %1" + 17 "Apelare %1 plus codul regiunii" + 18 "Apelare cod regiune" + 19 "Apelare doar numÄr" + 20 "Toate" + 21 "Selectate" + 22 "ModificÄ regula codului de regiune" + 23 "AlegeÈi o regulÄ Ã®n lista de mai sus pentru a-i vedea descrierea, sau apÄsaÈi âNouÄâ pentru a adÄuga o regulÄ." + 24 "FormeazÄ '%2' plus codul regiunii Ã®naintea numÄrului pentru toate apelurile din codul regional %1." + 25 "FormeazÄ '%2' Ã®naintea numÄrului pentru toate apelurile din codul regional %1." + 26 "FormeazÄ codul de regiune Ã®naintea numÄrului pentru toate apelurile din codul regional %1." + 27 "FormeazÄ doar numÄrul pentru toate apelurile din codul regional %1." + 28 "FormeazÄ '%2' plus codul de regiune Ã®naintea numÄrului pentru apelurile din codul regional %1, conÈinÃ¢nd prefixele specificate." + 29 "FormeazÄ '%2' Ã®naintea numÄrului pentru apelurile Ã®n codul regional %1, conÈinÃ¢nd prefixele specificate." + 30 "FormeazÄ codul regiunii Ã®naintea numÄrului pentru apelurile Ã®n codul regional %1, conÈinÃ¢nd prefixele specificate." + 31 "ApeleazÄ doar numÄrul pentru apelurile Ã®n codul regional %1, conÈinÃ¢nd prefixele specificate." + 32 "FormeazÄ un '1' Ã®naintea apelurile Ã®n toate celelalte coduri regionale Èi include codul de regiune pentru toate prefixele." + 33 "AdaugÄ prefix" + 34 "IntroduceÈi unul sau mai multe prefixe separate de spaÈii sau virgule." + 35 "SpecificaÈi cifrele" + 36 "IntroduceÈi unul sau mai multe cifre (inclusiv * Èi #) pentru a fi formate." + 37 "AÈi Ã®ncercat introducerea unui caracter nevalid.\n\nCaracterele valide sunt de la 0 la 9 Èi spaÈiu." + 38 "AÈteaptÄ %1!d! secunde." + 39 "FormeazÄ numÄrul de acces." + 40 "FormeazÄ numÄrul de cont." + 41 "ApeleazÄ codul PIN." + 42 "AÈteaptÄ tonul de apel." + 43 "AÈteaptÄ Ã®ncheierea mesajului vocal." + 44 "FormeazÄ codul ÈÄrii/regiunii, codul zonei, Èi numÄrul." + 45 "FormeazÄ codul ÈÄrii/regiunii Èi numÄrul." + 46 "FormeazÄ codul zonei Èi numÄrul." + 47 "FormeazÄ codul ÈÄrii/regiunii." + 48 "FormeazÄ codul zonei." + 49 "FormeazÄ numÄrul." + 50 "efectuarea apelurilor interurbane." + 51 "efectuarea apelurilor internaÈionale." + 52 "efectuarea apelurilor locale." + 53 "Nu existÄ reguli definite pentru modul de utilizare a cartelei de apel." + 54 "Pentru aceastÄ locaÈie este necesarÄ introducerea codulu purtÄtor pentru apeluri interurbane." + 55 "Este necesarÄ introducerea unui nume pentru aceastÄ locaÈie." + 56 "Este necesarÄ introducerea unui cod pentru aceastÄ locaÈie." + 57 "Este necesarÄ selecÈia formÄrii unui numÄr pentru a dezactiva aÈteptarea la apelare." + 58 "Este necesarÄ selectarea ÈÄrii sau regiunii din care efectuaÈi apelul." + 59 "InformaÈie lipsÄ" + 60 "Numele locaÈiei introduse este utilizat deja. IntroduceÈi un nume unic." + 61 "Aceastei cartele de apel Ã®i lipseÈte numele sau o careva informaÈie necesarÄ. Pentru a utiliza aceastÄ cartelÄ, editaÈi-o furnizÃ¢nd mai multe informaÈii sau alegeÈi o altÄ cartelÄ." + 62 "Este necesarÄ alegerea unei cartele implicite. Fie alegeÈi o cartelÄ din listÄ, fie creaÈi una nouÄ Ã®n acest scop." + 63 "Este necesarÄ introducerea numelui de cartelÄ." + 64 "Este necesarÄ introducerea numÄrului de cont." + 65 "Este necesarÄ introducerea numÄrului personal de identificare (PIN)." + 66 "Nu existÄ reguli definite pentru cartela de apelare. Pentru a crea o regulÄ, alegeÈi unul dintre compartimentele Interurban, InternaÈional sau Local." + 67 "Regula de apel interurban necesitÄ numÄrul de acces interurban al cartelei de apel." + 68 "Regula de apel internaÈional necesitÄ numÄrul de acces internaÈional al cartelei de apel." + 69 "Regula de apel local necesitÄ numÄrul de acces local al cartelei de apel." + 70 "Nespecificat" + 71 "Sigur doriÈi eliminarea Furnizorului de Servicii de Telefonie?" + 72 "<nu existÄ furnizori de servicii disponibili>" + 73 "Este necesarÄ introducerea prefixelor pentru care se aplicÄ aceastÄ regulÄ." + 74 "&Cifre:" + 75 "&Prefixe:" + 76 "Caracterul introdus nu este valid.\n\nCaracterele valide sunt de la 0 pÃ¢nÄ la 9, spaÈiu Èi virgulÄ." + 77 "ConfirmaÈi Ètergerea" + 78 "Sigur doriÈi Ètergerea acestei locaÈii?" + 79 "Sigur doriÈi Ètergerea acestei cartele de apel?" + 80 "Sigur doriÈi Ètergerea acestui reguli de cod regional?" + 81 "Pentru a apela trebuie sÄ introduceÈi cifre." + 82 "Numele cartelei pe care aÈi introdus-o existÄ deja. IntroduceÈi un nume unic." + 83 "Este necesarÄ informaÈia de telefonie despre locaÈia din care se efectueazÄ apelul. DacÄ omiteÈi furnizarea acestei informaÈii, pot surveni cazuri de funcÈionare incorectÄ a procedurii de apel. De asemenea, unele aplicaÈii pot rÄspunde la Ã®nchiderea acestei ferestre prin redeschiderea ei.\nSigur doriÈi anularea?" + 84 "ConfirmÄ anularea" + 85 "LocaÈia mea" + 86 "<nu existÄ furnizori disponibili pentru instalare>" + 87 "Caracterul introdus nu este valid.\n\nCaracterele valide sunt de la 0 pÃ¢nÄ la 9, de la A pÃ¢nÄ la D, *, #, +, !, spaÈiu, Èi virgulÄ." + 88 "Pentru aceastÄ locaÈie este necesarÄ introducerea unui cod (purtÄtor) internaÈional." + 89 "Pentru aceastÄ locaÈie este necesarÄ introducerea unui cod purtÄtor." + 90 "AceastÄ paginÄ Ã®ncearcÄ sÄ efectueze/monitorizeze apeluri telefonice sau conexiuni multimedia din acest calculator.\PermiteÈi acest lucru?" + 91 "AceastÄ paginÄ Ã®ncearcÄ sÄ acceseze informaÈii directoare prin reÈea.\nPermiteÈi acest lucru?" + 92 "AceastÄ paginÄ Ã®ncearcÄ accesarea sau modificarea informaÈiilor de conferinÈÄ Ã®n reÈea.\nPermiteÈi acest lucru?" + 93 "AceastÄ paginÄ Ã®ncearcÄ accesarea sau modificarea informaÈiilor din registru.\nPermiteÈi acest lucru?" + 1064 "Panelul de control Telefon Èi modem nu poate fi deschis. Este posibil sÄ survinÄ probleme la deschiderea serviciului de telefonie." + 1065 "EliminÄ furnizor" + 15800 "23" + 15801 "0,""Nespecificat (apelare directÄ)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T apelare directÄ prin 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T prin 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T prin 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI apelare directÄ 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI prin 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI prin 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI prin 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI prin 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US Sprint apelare directÄ prin 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint prin 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint prin 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""CartelÄ de apel prin 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Carte France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1" + 15815 "14,""Mercury (UK)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (UK)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (Noua ZelandÄ)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom New Zealand"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Global Card (Taiwan spre USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) prin 1818 (voice)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) prin 1818 (fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) prin 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) prin 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Propchange: trunk/reactos/dll/win32/tapiui/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/tapiui/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/tapiui.rc [iso-8859-1] Thu Oct 13 21:32:37 2011 @@ -22,5 +22,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"

13 years, 2 months

[rharabien] 54118: [WIN32K] - Add more clipboard internal functions for use by Print Screen support

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 20:49:03 2011 New Revision: 54118 URL: http://svn.reactos.org/svn/reactos?rev=54118&view=rev Log: [WIN32K] - Add more clipboard internal functions for use by Print Screen support Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c 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] Thu Oct 13 20:49:03 2011 @@ -13,5 +13,17 @@ VOID FASTCALL UserClipboardFreeWindow(PWND pWindow); +BOOL NTAPI +UserOpenClipboard(HWND hWnd); + +BOOL NTAPI +UserCloseClipboard(VOID); + +BOOL NTAPI +UserEmptyClipboard(VOID); + VOID NTAPI UserEmptyClipboardData(struct _WINSTATION_OBJECT *pWinSta); + +HANDLE NTAPI +UserSetClipboardData(UINT fmt, HANDLE hData, PSETCLIPBDATA scd); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Thu Oct 13 20:49:03 2011 @@ -377,23 +377,18 @@ return Ret; } -BOOL APIENTRY -NtUserOpenClipboard(HWND hWnd, DWORD Unknown1) +BOOL NTAPI +UserOpenClipboard(HWND hWnd) { PWND pWindow = NULL; BOOL bRet = FALSE; PWINSTATION_OBJECT pWinStaObj = NULL; - UserEnterExclusive(); - if (hWnd) { pWindow = UserGetWindowObject(hWnd); if (!pWindow) - { - EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); goto cleanup; - } } pWinStaObj = IntGetWinStaForCbAccess(); @@ -406,6 +401,7 @@ if (pWinStaObj->spwndClipOpen != pWindow) { EngSetLastError(ERROR_ACCESS_DENIED); + ERR("Access denied!\n"); goto cleanup; } } @@ -419,18 +415,26 @@ if (pWinStaObj) ObDereferenceObject(pWinStaObj); - UserLeave(); - return bRet; } BOOL APIENTRY -NtUserCloseClipboard(VOID) +NtUserOpenClipboard(HWND hWnd, DWORD Unknown1) +{ + BOOL bRet; + + UserEnterExclusive(); + bRet = UserOpenClipboard(hWnd); + UserLeave(); + + return bRet; +} + +BOOL NTAPI +UserCloseClipboard(VOID) { BOOL bRet = FALSE; PWINSTATION_OBJECT pWinStaObj = NULL; - - UserEnterExclusive(); pWinStaObj = IntGetWinStaForCbAccess(); if (!pWinStaObj) @@ -466,6 +470,16 @@ if (pWinStaObj) ObDereferenceObject(pWinStaObj); + return bRet; +} + +BOOL APIENTRY +NtUserCloseClipboard(VOID) +{ + BOOL bRet; + + UserEnterExclusive(); + bRet = UserCloseClipboard(); UserLeave(); return bRet; @@ -550,45 +564,52 @@ return cFormats; } +BOOL NTAPI +UserEmptyClipboard(VOID) +{ + BOOL bRet = FALSE; + PWINSTATION_OBJECT pWinStaObj; + + pWinStaObj = IntGetWinStaForCbAccess(); + if (!pWinStaObj) + return FALSE; + + if (IntIsClipboardOpenByMe(pWinStaObj)) + { + UserEmptyClipboardData(pWinStaObj); + + if (pWinStaObj->spwndClipOwner) + { + TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p", pWinStaObj->spwndClipOwner->head.h); + co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); + } + + pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen; + + pWinStaObj->iClipSequenceNumber++; + + bRet = TRUE; + } + else + { + EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); + ERR("Access denied!\n"); + } + + ObDereferenceObject(pWinStaObj); + + return bRet; +} + BOOL APIENTRY NtUserEmptyClipboard(VOID) { - BOOL bRet = FALSE; - PWINSTATION_OBJECT pWinStaObj; + BOOL bRet; TRACE("NtUserEmptyClipboard()\n"); UserEnterExclusive(); - - pWinStaObj = IntGetWinStaForCbAccess(); - if (!pWinStaObj) - goto cleanup; - - if (IntIsClipboardOpenByMe(pWinStaObj)) - { - UserEmptyClipboardData(pWinStaObj); - - if (pWinStaObj->spwndClipOwner) - { - TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p", pWinStaObj->spwndClipOwner->head.h); - co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); - } - - pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen; - - pWinStaObj->iClipSequenceNumber++; - - bRet = TRUE; - } - else - { - EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); - ERR("Access denied!\n"); - } - - ObDereferenceObject(pWinStaObj); - -cleanup: + bRet = UserEmptyClipboard(); UserLeave(); return bRet; @@ -865,17 +886,11 @@ return hRet; } -HANDLE APIENTRY -NtUserSetClipboardData(UINT fmt, HANDLE hData, PSETCLIPBDATA scd) +HANDLE NTAPI +UserSetClipboardData(UINT fmt, HANDLE hData, PSETCLIPBDATA scd) { HANDLE hRet = NULL; - NTSTATUS Status = STATUS_SUCCESS; PWINSTATION_OBJECT pWinStaObj = NULL; - BOOLEAN fGlobalHandle = FALSE; - - TRACE("NtUserSetClipboardData(%x %p %p)\n", fmt, hData, scd); - - UserEnterExclusive(); pWinStaObj = IntGetWinStaForCbAccess(); if (!pWinStaObj) @@ -891,24 +906,8 @@ goto cleanup; } - _SEH2_TRY - { - ProbeForRead(scd, sizeof(*scd), 1); - fGlobalHandle = scd->fGlobalHandle; - if (scd->fIncSerialNumber) - pWinStaObj->iClipSerialNumber++; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto cleanup; - } + if (scd->fIncSerialNumber) + pWinStaObj->iClipSerialNumber++; /* Is it a delayed render? */ if (hData) @@ -921,7 +920,7 @@ } /* Save data in the clipboard */ - IntAddFormatedData(pWinStaObj, fmt, hData, fGlobalHandle, FALSE); + IntAddFormatedData(pWinStaObj, fmt, hData, scd->fGlobalHandle, FALSE); TRACE("hData stored\n"); pWinStaObj->iClipSequenceNumber++; @@ -945,6 +944,41 @@ if(pWinStaObj) ObDereferenceObject(pWinStaObj); + return hRet; +} + +HANDLE APIENTRY +NtUserSetClipboardData(UINT fmt, HANDLE hData, PSETCLIPBDATA pUnsafeScd) +{ + SETCLIPBDATA scd; + NTSTATUS Status = STATUS_SUCCESS; + HANDLE hRet = NULL; + + TRACE("NtUserSetClipboardData(%x %p %p)\n", fmt, hData, scd); + + UserEnterExclusive(); + + _SEH2_TRY + { + ProbeForRead(pUnsafeScd, sizeof(*pUnsafeScd), 1); + RtlCopyMemory(&scd, pUnsafeScd, sizeof(scd)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + goto cleanup; + } + + /* Call internal function */ + hRet = UserSetClipboardData(fmt, hData, &scd); + +cleanup: UserLeave(); return hRet;

13 years, 2 months

[khornicek] 54117: [WINED3D] Finally recognize Mesa's GDI driver as HW_VENDOR_SOFTWARE. This commit was blessed by the Wine team.

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Oct 13 19:57:31 2011 New Revision: 54117 URL: http://svn.reactos.org/svn/reactos?rev=54117&view=rev Log: [WINED3D] Finally recognize Mesa's GDI driver as HW_VENDOR_SOFTWARE. This commit was blessed by the Wine team. Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Thu Oct 13 19:57:31 2011 @@ -1388,6 +1388,7 @@ return HW_VENDOR_INTEL; if (strstr(gl_vendor_string, "Mesa") + || strstr(gl_vendor_string, "Brian Paul") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.")) return HW_VENDOR_SOFTWARE;

13 years, 2 months

[fireball] 54116: [RTL] - Fix two bugs revealed by the newly added test in r54114. * Original length of the passed string should be used when checking for out-of-buffer access in the loop * PathCha...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 13 18:15:50 2011 New Revision: 54116 URL: http://svn.reactos.org/svn/reactos?rev=54116&view=rev Log: [RTL] - Fix two bugs revealed by the newly added test in r54114. * Original length of the passed string should be used when checking for out-of-buffer access in the loop * PathChars should be updated if a DOS device name was found in the given string. See issue #6390 for more details. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=54116&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Thu Oct 13 18:15:50 2011 @@ -48,7 +48,7 @@ UNICODE_STRING PathCopy; PWCHAR Start, End; USHORT PathChars, ColonCount = 0; - USHORT ReturnOffset = 0, ReturnLength; + USHORT ReturnOffset = 0, ReturnLength, OriginalLength; WCHAR c; /* Validate the input */ @@ -77,6 +77,7 @@ /* Make a copy of the string */ PathCopy = *PathString; + OriginalLength = PathString->Length; /* Return if there's no characters */ PathChars = PathCopy.Length / sizeof(WCHAR); @@ -124,16 +125,19 @@ c = *End | ' '; // ' ' == ('z' - 'Z') /* Check if it's a DOS device (LPT, COM, PRN, AUX, or NUL) */ - if ((End < &PathCopy.Buffer[PathCopy.Length / sizeof(WCHAR)]) && + if ((End < &PathCopy.Buffer[OriginalLength / sizeof(WCHAR)]) && ((c == 'l') || (c == 'c') || (c == 'p') || (c == 'a') || (c == 'n'))) { /* Calculate the offset */ ReturnOffset = (PCHAR)End - (PCHAR)PathCopy.Buffer; /* Build the final string */ - PathCopy.Length -= ReturnOffset; - PathCopy.Length -= (ColonCount * sizeof(WCHAR)); + PathCopy.Length = OriginalLength - ReturnOffset - (ColonCount * sizeof(WCHAR)); PathCopy.Buffer = End; + + /* Save new amount of chars in the path */ + PathChars = PathCopy.Length / sizeof(WCHAR); + break; } else

13 years, 2 months

[janderwald] 54115: [HID] - Implement HidD_GetIndexedString, HidD_GetMsGenreDescriptor, HidD_GetConfiguration, HidD_SetConfiguration, HidP_GetUsagesEx

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Oct 13 17:51:13 2011 New Revision: 54115 URL: http://svn.reactos.org/svn/reactos?rev=54115&view=rev Log: [HID] - Implement HidD_GetIndexedString, HidD_GetMsGenreDescriptor, HidD_GetConfiguration, HidD_SetConfiguration, HidP_GetUsagesEx Modified: branches/usb-bringup/dll/win32/hid/hid.c branches/usb-bringup/dll/win32/hid/stubs.c Modified: branches/usb-bringup/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/dll/win32/hid/hid.c… ============================================================================== --- branches/usb-bringup/dll/win32/hid/hid.c [iso-8859-1] (original) +++ branches/usb-bringup/dll/win32/hid/hid.c [iso-8859-1] Thu Oct 13 17:51:13 2011 @@ -70,7 +70,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_FLUSH_QUEUE, NULL, 0, NULL, 0, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -150,7 +150,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -182,7 +182,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -201,7 +201,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -219,7 +219,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(ULONG), - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -238,7 +238,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, Buffer, BufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -254,7 +254,7 @@ { HID_COLLECTION_INFORMATION hci; DWORD RetLen; - BOOL Ret; + BOOLEAN Ret; if(PreparsedData == NULL) { @@ -279,7 +279,7 @@ Ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, *PreparsedData, hci.DescriptorSize, - &RetLen, NULL); + &RetLen, NULL) != 0; if(!Ret) { @@ -312,7 +312,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -331,7 +331,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -394,7 +394,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -412,7 +412,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(ULONG), NULL, 0, - &RetLen, NULL); + &RetLen, NULL) != 0; } @@ -431,7 +431,112 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, - &RetLen, NULL); -} + &RetLen, NULL) != 0; +} + +/* + * HidD_GetIndexedString EXPORTED + * + * @implemented + */ +HIDAPI +BOOLEAN WINAPI +HidD_GetIndexedString(IN HANDLE HidDeviceObject, + IN ULONG StringIndex, + OUT PVOID Buffer, + IN ULONG BufferLength) +{ + DWORD RetLen; + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INDEXED_STRING, + &StringIndex, sizeof(ULONG), + Buffer, BufferLength, + &RetLen, NULL) != 0; +} + +/* + * HidD_GetMsGenreDescriptor EXPORTED + * + * @implemented + */ +HIDAPI +BOOLEAN WINAPI +HidD_GetMsGenreDescriptor(IN HANDLE HidDeviceObject, + OUT PVOID Buffer, + IN ULONG BufferLength) +{ + DWORD RetLen; + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MS_GENRE_DESCRIPTOR, + 0, 0, + Buffer, BufferLength, + &RetLen, NULL) != 0; +} + +/* + * HidD_GetConfiguration EXPORTED + * + * @implemented + */ +HIDAPI +BOOLEAN WINAPI +HidD_GetConfiguration(IN HANDLE HidDeviceObject, + OUT PHIDD_CONFIGURATION Configuration, + IN ULONG ConfigurationLength) +{ + + // magic cookie + Configuration->cookie = (PVOID)HidD_GetConfiguration; + + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_DRIVER_CONFIG, + 0, 0, + &Configuration->size, ConfigurationLength - sizeof(ULONG), + (PULONG)&Configuration->cookie, NULL) != 0; +} + +/* + * HidD_SetConfiguration EXPORTED + * + * @implemented + */ +HIDAPI +BOOLEAN WINAPI +HidD_SetConfiguration(IN HANDLE HidDeviceObject, + IN PHIDD_CONFIGURATION Configuration, + IN ULONG ConfigurationLength) +{ + BOOLEAN Ret = FALSE; + + if (Configuration->cookie == (PVOID)HidD_GetConfiguration) + { + Ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_DRIVER_CONFIG, + 0, 0, + (PVOID)&Configuration->size, ConfigurationLength - sizeof(ULONG), + (PULONG)&Configuration->cookie, NULL) != 0; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } + + return Ret; +} + +/* + * HidP_GetUsagesEx EXPORTED + * + * @implemented + */ +HIDAPI +NTSTATUS WINAPI +HidP_GetUsagesEx(IN HIDP_REPORT_TYPE ReportType, + IN USHORT LinkCollection, + OUT PUSAGE_AND_PAGE ButtonList, + IN OUT ULONG *UsageLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) +{ + return HidP_GetUsages(ReportType, ButtonList->UsagePage, LinkCollection, &ButtonList->Usage, UsageLength, PreparsedData, Report, ReportLength); +} + /* EOF */ Modified: branches/usb-bringup/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/dll/win32/hid/stubs… ============================================================================== --- branches/usb-bringup/dll/win32/hid/stubs.c [iso-8859-1] (original) +++ branches/usb-bringup/dll/win32/hid/stubs.c [iso-8859-1] Thu Oct 13 17:51:13 2011 @@ -15,63 +15,6 @@ * @unimplemented */ HIDAPI -BOOLEAN WINAPI -HidD_GetConfiguration(IN HANDLE HidDeviceObject, - OUT PHIDD_CONFIGURATION Configuration, - IN ULONG ConfigurationLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HIDAPI -BOOLEAN WINAPI -HidD_GetIndexedString(IN HANDLE HidDeviceObject, - IN ULONG StringIndex, - OUT PVOID Buffer, - IN ULONG BufferLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HIDAPI -BOOLEAN WINAPI -HidD_GetMsGenreDescriptor(IN HANDLE HidDeviceObject, - OUT PVOID Buffer, - IN ULONG BufferLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HIDAPI -BOOLEAN WINAPI -HidD_SetConfiguration(IN HANDLE HidDeviceObject, - IN PHIDD_CONFIGURATION Configuration, - IN ULONG ConfigurationLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HIDAPI NTSTATUS WINAPI HidP_GetCaps(IN PHIDP_PREPARSED_DATA PreparsedData, OUT PHIDP_CAPS Capabilities) @@ -246,24 +189,6 @@ */ HIDAPI NTSTATUS WINAPI -HidP_GetUsagesEx(IN HIDP_REPORT_TYPE ReportType, - IN USHORT LinkCollection, - OUT PUSAGE_AND_PAGE ButtonList, - IN OUT ULONG *UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED; - return HIDP_STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -HIDAPI -NTSTATUS WINAPI HidP_InitializeReportForID(IN HIDP_REPORT_TYPE ReportType, IN UCHAR ReportID, IN PHIDP_PREPARSED_DATA PreparsedData,

13 years, 2 months

[fireball] 54114: - Add a new RtlIsDosPathName_Ustr test which shows a flaw in the existing implementation.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 13 17:42:19 2011 New Revision: 54114 URL: http://svn.reactos.org/svn/reactos?rev=54114&view=rev Log: - Add a new RtlIsDosPathName_Ustr test which shows a flaw in the existing implementation. Modified: trunk/rostests/winetests/ntdll/path.c Modified: trunk/rostests/winetests/ntdll/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/path.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/path.c [iso-8859-1] Thu Oct 13 17:42:19 2011 @@ -135,6 +135,7 @@ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\nul.txt", 1000, 6 }, + { "c:\\nul", 6, 6 }, { NULL, 0 } };

13 years, 2 months

[rharabien] 54113: [EXPLORER] - If Start Menu is open, WIN key hides it

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 15:50:24 2011 New Revision: 54113 URL: http://svn.reactos.org/svn/reactos?rev=54113&view=rev Log: [EXPLORER] - If Start Menu is open, WIN key hides it Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.h trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.h Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Thu Oct 13 15:50:24 2011 @@ -306,7 +306,7 @@ else return 0; // disable any other resizing } else if (wparam == SC_TASKLIST) - ShowStartMenu(); + ShowOrHideStartMenu(); goto def; case WM_SIZE: @@ -430,7 +430,7 @@ { switch(id) { case IDC_START: - ShowStartMenu(); + ShowOrHideStartMenu(); break; case ID_ABOUT_EXPLORER: @@ -484,7 +484,7 @@ } -void DesktopBar::ShowStartMenu() +void DesktopBar::ShowOrHideStartMenu() { if (_startMenuRoot) { @@ -492,7 +492,10 @@ if (!Button_GetState(_hwndStartButton)) Button_SetState(_hwndStartButton, TRUE); - _startMenuRoot->TrackStartmenu(); + if (_startMenuRoot->IsStartMenuVisible()) + _startMenuRoot->CloseStartMenu(); + else + _startMenuRoot->TrackStartmenu(); // StartMenu was closed, release button state Button_SetState(_hwndStartButton, false); Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h [iso-8859-1] Thu Oct 13 15:50:24 2011 @@ -103,7 +103,7 @@ void ControlResize(WPARAM wparam, LPARAM lparam); void RegisterHotkeys(); void ProcessHotKey(int id_hotkey); - void ShowStartMenu(); + void ShowOrHideStartMenu(); LRESULT ProcessCopyData(COPYDATASTRUCT* pcd); WindowHandle _hwndTaskBar; Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Thu Oct 13 15:50:24 2011 @@ -1872,6 +1872,11 @@ ShowWindow(_hwnd, SW_HIDE); } +bool StartMenuRoot::IsStartMenuVisible() const +{ + return IsWindowVisible(_hwnd); +} + void StartMenuRoot::ProcessKey(int vk) { switch(vk) { Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.h [iso-8859-1] Thu Oct 13 15:50:24 2011 @@ -369,6 +369,8 @@ static HWND Create(HWND hwndDesktopBar, int icon_size); void TrackStartmenu(); + void CloseStartMenu(int id=0); + bool IsStartMenuVisible() const; int Command(int id, int code); HWND _hwndStartButton; @@ -383,7 +385,7 @@ virtual void ProcessKey(int vk); void Paint(PaintCanvas& canvas); - void CloseStartMenu(int id=0); + void ReadLogoSize(); UINT GetLogoResId();

13 years, 2 months

[tkreuzer] 54112: [ASM] Improve .proc / .endproc syntax, so that the full symbolic name is passed, which allows to create fastcall symbols. Remove the need to pass the function name to .endp

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 13 15:16:29 2011 New Revision: 54112 URL: http://svn.reactos.org/svn/reactos?rev=54112&view=rev Log: [ASM] Improve .proc / .endproc syntax, so that the full symbolic name is passed, which allows to create fastcall symbols. Remove the need to pass the function name to .endp Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S trunk/reactos/dll/win32/kernel32/client/i386/fiber.S trunk/reactos/dll/win32/rpcrt4/msvc.S trunk/reactos/hal/halx86/apic/tsccal.S trunk/reactos/include/asm/asm.inc trunk/reactos/include/asm/syscalls.inc trunk/reactos/include/reactos/asm.inc trunk/reactos/lib/rtl/i386/debug_asm.S trunk/reactos/lib/rtl/i386/rtlswap.S trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -184,7 +184,7 @@ PUBLIC _KiUserExceptionDispatcher@8 -.PROC KiUserExceptionDispatcher@8 +.PROC _KiUserExceptionDispatcher@8 FPO 0, 0, 0, 0, 0, FRAME_FPO /* Clear direction flag */ @@ -241,10 +241,10 @@ call _RtlRaiseException@4 ret 8 -.ENDP KiUserExceptionDispatcher@8 +.ENDP PUBLIC _KiIntSystemCall@0 -.PROC KiIntSystemCall@0 +.PROC _KiIntSystemCall@0 FPO 0, 0, 0, 0, 0, FRAME_FPO /* Set stack in EDX and do the interrupt */ @@ -254,26 +254,26 @@ /* Return to caller */ ret -.ENDP KiIntSystemCall@0 +.ENDP PUBLIC _KiFastSystemCall@0 -.PROC KiFastSystemCall@0 +.PROC _KiFastSystemCall@0 FPO 0, 0, 0, 0, 0, FRAME_FPO /* Put ESP in EDX and do the SYSENTER */ mov edx, esp sysenter -.ENDP KiFastSystemCall@0 +.ENDP PUBLIC _KiFastSystemCallRet@0 -.PROC KiFastSystemCallRet@0 +.PROC _KiFastSystemCallRet@0 FPO 0, 0, 0, 0, 0, FRAME_FPO /* Just return to caller */ ret -.ENDP KiFastSystemCallRet@0 +.ENDP PUBLIC _RtlpGetStackLimits@8 _RtlpGetStackLimits@8: Modified: trunk/reactos/dll/win32/kernel32/client/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/i386/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/i386/fiber.S [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -15,7 +15,7 @@ .code PUBLIC _BaseFiberStartup@0 -.PROC BaseFiberStartup@0 +.PROC _BaseFiberStartup@0 /* Frame pointer is zeroed */ FPO 0, 0, 0, 0, 0, FRAME_FPO @@ -25,7 +25,7 @@ push dword ptr [eax+FIBER_CONTEXT_EBX] /* Parameter */ push dword ptr [eax+FIBER_CONTEXT_EAX] /* Start Address */ call _BaseThreadStartup@8 -.ENDP BaseFiberStartup@0 +.ENDP PUBLIC _SwitchToFiber@4 @@ -135,6 +135,7 @@ /* Jump to new fiber */ mov esp, [ecx+FIBER_CONTEXT_ESP] ret 4 + + END - /* EOF */ Modified: trunk/reactos/dll/win32/rpcrt4/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/msvc.S?re… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/msvc.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/msvc.S [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -63,7 +63,7 @@ call ndr_client_call add rsp, 38h ret -ENDFUNC call_stubless_func +ENDFUNC PUBLIC call_server_func FUNC call_server_func @@ -102,7 +102,7 @@ pop rsi pop rbp ret -ENDFUNC call_server_func +ENDFUNC PUBLIC NdrClientCall2 @@ -121,7 +121,7 @@ add rsp, 28h ret -ENDFUNC NdrClientCall2 +ENDFUNC EXTERN ndr_async_client_call:PROC PUBLIC NdrAsyncClientCall @@ -139,7 +139,7 @@ add rsp, 28h ret -ENDFUNC NdrAsyncClientCall +ENDFUNC #endif Modified: trunk/reactos/hal/halx86/apic/tsccal.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsccal.S?r… ============================================================================== --- trunk/reactos/hal/halx86/apic/tsccal.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/tsccal.S [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -100,7 +100,7 @@ pop rbx pop rax iretq -ENDFUNC TscCalibrationISR +ENDFUNC #endif END Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=54… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -32,21 +32,18 @@ /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ .PROC MACRO name +__current_function_name EQU %name #ifdef _M_IX86 - _&name PROC + %name PROC #else - &name PROC FRAME + %name PROC FRAME #endif ENDM #define FUNC .PROC /* ... and .ENDP, replacing ENDP */ -.ENDP MACRO name -#ifdef _M_IX86 - _&name ENDP -#else - &name ENDP -#endif +.ENDP MACRO + %__current_function_name ENDP ENDM #define ENDFUNC .ENDP @@ -203,17 +200,17 @@ .macro .PROC name .func \name #ifdef _X86_ + /* x86 gas expects a label with _ prefix */ _\name: -#else +#endif \name: -#endif .cfi_startproc .equ cfa_current_offset, -8 .endm #define FUNC .PROC /* ... and .ENDP, replacing ENDP */ -.macro .ENDP name +.macro .ENDP .cfi_endproc .endfunc .endm Modified: trunk/reactos/include/asm/syscalls.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/syscalls.inc?r… ============================================================================== --- trunk/reactos/include/asm/syscalls.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/syscalls.inc [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -77,10 +77,7 @@ ENDM MACRO(START_PROC, Name, Stackbytes) PUBLIC _&Name&@&Stackbytes - .PROC &Name&@&Stackbytes -ENDM -MACRO(END_PROC, Name, Stackbytes) - .ENDP &Name&@&Stackbytes + .PROC _&Name&@&Stackbytes ENDM #else MACRO(MAKE_LABEL, Name, Stackbytes) @@ -91,9 +88,6 @@ PUBLIC &Name .PROC &Name ENDM -MACRO(END_PROC, Name, Stackbytes) - .ENDP &Name -ENDM #endif MACRO(STUB_U, Name, ArgCount) @@ -101,7 +95,7 @@ MAKE_LABEL Zw&Name, %Stackbytes START_PROC Nt&Name, %Stackbytes STUBCODE_U SyscallId, %Stackbytes - END_PROC Nt&Name, %Stackbytes + .ENDP SyscallId = SyscallId + 1 ENDM @@ -109,6 +103,6 @@ Stackbytes = 4 * &ArgCount START_PROC Zw&Name, %Stackbytes STUBCODE_K SyscallId, %Stackbytes - END_PROC Zw&Name, %Stackbytes + .ENDP SyscallId = SyscallId + 1 ENDM Modified: trunk/reactos/include/reactos/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.inc?re… ============================================================================== --- trunk/reactos/include/reactos/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.inc [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -32,14 +32,20 @@ /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ .PROC MACRO name - name PROC FRAME - _name: -ENDM +__current_function_name EQU %name +#ifdef _M_IX86 + %name PROC +#else + %name PROC FRAME +#endif +ENDM +#define FUNC .PROC /* ... and .ENDP, replacing ENDP */ -.ENDP MACRO name - name ENDP -ENDM +.ENDP MACRO + %__current_function_name ENDP +ENDM +#define ENDFUNC .ENDP /* check http://msdn.microsoft.com/en-us/library/9c9k076y%28VS.80%29.aspx and http://msdn.microsoft.com/en-us/library/ms679352%28VS.85%29.aspx */ @@ -150,17 +156,17 @@ .macro .PROC name .func \name #ifdef _X86_ + /* x86 gas expects a label with _ prefix */ _\name: -#else +#endif \name: -#endif .cfi_startproc .equ cfa_current_offset, -8 .endm #define FUNC .PROC /* ... and .ENDP, replacing ENDP */ -.macro .ENDP name +.macro .ENDP .cfi_endproc .endfunc .endm Modified: trunk/reactos/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/debug_asm.S?r… ============================================================================== --- trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -22,31 +22,31 @@ .code -FUNC DbgBreakPointNoBugCheck@0 +FUNC _DbgBreakPointNoBugCheck@0 FPO 0, 0, 0, 0, 0, FRAME_FPO int 3 ret -ENDFUNC DbgBreakPointNoBugCheck@0 +ENDFUNC _DbgUserBreakPoint@0: -FUNC DbgBreakPoint@0 +FUNC _DbgBreakPoint@0 FPO 0, 0, 0, 0, 0, FRAME_FPO int 3 ret -ENDFUNC DbgBreakPoint@0 +ENDFUNC -FUNC DbgBreakPointWithStatus@4 +FUNC _DbgBreakPointWithStatus@4 FPO 0, 1, 0, 0, 0, FRAME_FPO mov eax, [esp+4] -ENDFUNC DbgBreakPointWithStatus@4 +ENDFUNC -FUNC RtlpBreakWithStatusInstruction@0 +FUNC _RtlpBreakWithStatusInstruction@0 FPO 0, 0, 0, 0, 0, FRAME_FPO int 3 ret 4 -ENDFUNC RtlpBreakWithStatusInstruction@0 +ENDFUNC -FUNC DebugService2@12 +FUNC _DebugService2@12 FPO 0, 3, 3, 0, 1, FRAME_NONFPO /* Setup the stack */ @@ -63,9 +63,9 @@ /* Restore stack */ pop ebp ret 12 -ENDFUNC DebugService2@12 +ENDFUNC -FUNC DebugService@20 +FUNC _DebugService@20 FPO 0, 5, 3, 0, 1, FRAME_NONFPO /* Setup the stack */ @@ -92,6 +92,6 @@ /* Return */ pop ebp ret 20 -ENDFUNC DebugService@20 +ENDFUNC END Modified: trunk/reactos/lib/rtl/i386/rtlswap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlswap.S?rev… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlswap.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/rtlswap.S [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -16,28 +16,25 @@ /* FUNCTIONS ***************************************************************/ .code -@RtlUshortByteSwap@4: -FUNC RtlUshortByteSwap +FUNC @RtlUshortByteSwap@4 FPO 0, 0, 0, 0, 0, FRAME_FPO /* Swap high and low bits */ mov ah, cl mov al, ch ret -ENDFUNC RtlUshortByteSwap +ENDFUNC -@RtlUlongByteSwap@4: -FUNC RtlUlongByteSwap +FUNC @RtlUlongByteSwap@4 FPO 0, 0, 0, 0, 0, FRAME_FPO /* Swap high and low bits */ mov eax, ecx bswap eax ret -ENDFUNC RtlUlongByteSwap +ENDFUNC -@RtlUlonglongByteSwap@8: -FUNC RtlUlonglongByteSwap +FUNC @RtlUlonglongByteSwap@8 FPO 0, 2, 0, 0, 0, FRAME_FPO /* Get 64-bit integer */ @@ -53,6 +50,6 @@ and therefore put on tthe stack instead of in ecx and edx, but thats exactly how the function behaves on Windows! */ ret -ENDFUNC RtlUlonglongByteSwap +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -7,7 +7,7 @@ PUBLIC _tcscpy .code -FUNC tcscpy +FUNC _tcscpy FPO 0, 2, 2, 2, 0, FRAME_FPO push esi push edi @@ -27,7 +27,7 @@ pop edi pop esi ret -ENDFUNC tcscpy +ENDFUNC END /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -219,7 +219,7 @@ MACRO(TRAP_ENTRY, Trap, Flags) EXTERN @&Trap&Handler@4 :PROC PUBLIC _&Trap - .PROC &Trap + .PROC _&Trap /* Generate proper debugging symbols */ FPO 0, 0, 0, 0, 1, FRAME_TRAP @@ -228,7 +228,7 @@ /* Call the C handler */ KiCallHandler @&Trap&Handler@4 - .ENDP &Trap + .ENDP ENDM #define KI_RESTORE_EAX HEX(001) Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Thu Oct 13 15:16:29 2011 @@ -136,19 +136,19 @@ EXTERN @KiSystemServiceHandler@8:PROC PUBLIC _KiSystemService -.PROC KiSystemService +.PROC _KiSystemService FPO 0, 0, 0, 0, 1, FRAME_TRAP KiEnterTrap (KI_PUSH_FAKE_ERROR_CODE OR KI_NONVOLATILES_ONLY OR KI_DONT_SAVE_SEGS) KiCallHandler @KiSystemServiceHandler@8 -.ENDP KiSystemService +.ENDP EXTERN @KiFastCallEntryHandler@8:PROC PUBLIC _KiFastCallEntry -.PROC KiFastCallEntry +.PROC _KiFastCallEntry FPO 0, 0, 0, 0, 1, FRAME_TRAP KiEnterTrap (KI_FAST_SYSTEM_CALL OR KI_NONVOLATILES_ONLY OR KI_DONT_SAVE_SEGS) KiCallHandler @KiFastCallEntryHandler@8 -.ENDP KiFastCallEntry +.ENDP PUBLIC _KiEndUnexpectedRange@0

13 years, 2 months

[khornicek] 54111: [GDI32_WINETEST] Bail out of compare_emf_bits earlier. This way we only record one skipped test, but it allows us to actually complete the metafile tests. Restore formatting to i...

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Oct 13 14:11:50 2011 New Revision: 54111 URL: http://svn.reactos.org/svn/reactos?rev=54111&view=rev Log: [GDI32_WINETEST] Bail out of compare_emf_bits earlier. This way we only record one skipped test, but it allows us to actually complete the metafile tests. Restore formatting to its previous glory. Modified: trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Thu Oct 13 14:11:50 2011 @@ -1654,26 +1654,27 @@ "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); ok(emh1->nRecords == emh2->nRecords, "expected nRecords %u, got %u\n", emh1->nRecords, emh2->nRecords); + if(!winetest_interactive) + { + skip("skipping match_emf_record(), bug 5393\n"); + return 0; + } + offset1 = emh1->nSize; offset2 = emh2->nSize; /* Needed for Win9x/WinME/NT4 */ while (offset1 < emh1->nBytes) { - const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); - const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); - -if(!winetest_interactive) - skip("skipping match_emf_record(), bug 5393\n"); -else -{ - trace("%s: EMF record %u, size %u/record %u, size %u\n", + const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); + const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); + + trace("%s: EMF record %u, size %u/record %u, size %u\n", desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; -} /* We have already bailed out if iType or nSize don't match */ - offset1 += emr1->nSize; - offset2 += emr2->nSize; + offset1 += emr1->nSize; + offset2 += emr2->nSize; } return 0; }

13 years, 2 months

← Newer
1
...
14
15
16
17
18
19
20
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2011