Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 30627: initialize Bios Parameter Block fix building with msvc
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 18:40:41 2007 New Revision: 30627 URL: http://svn.reactos.org/svn/reactos?rev=30627&view=rev Log: initialize Bios Parameter Block fix building with msvc Modified: trunk/reactos/drivers/filesystems/fs_rec/fat.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/ntfs.c Modified: trunk/reactos/drivers/filesystems/fs_rec/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fat.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fat.c Wed Nov 21 18:40:41 2007 @@ -22,6 +22,8 @@ BIOS_PARAMETER_BLOCK Bpb; BOOLEAN Result = TRUE; PAGED_CODE(); + + RtlZeroMemory(&Bpb, sizeof(BIOS_PARAMETER_BLOCK)); /* Unpack the BPB and do a small fix up */ FatUnpackBios(&Bpb, &PackedBootSector->PackedBpb); Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c Wed Nov 21 18:40:41 2007 @@ -74,6 +74,7 @@ return Status; } +DRIVER_DISPATCH FsRecCreate; NTSTATUS STDCALL FsRecCreate(IN PDEVICE_OBJECT DeviceObject, @@ -102,6 +103,7 @@ return Status; } +DRIVER_DISPATCH FsRecClose; NTSTATUS STDCALL FsRecClose(IN PDEVICE_OBJECT DeviceObject, @@ -114,6 +116,7 @@ return STATUS_SUCCESS; } +DRIVER_DISPATCH FsRecFsControl; NTSTATUS STDCALL FsRecFsControl(IN PDEVICE_OBJECT DeviceObject, @@ -162,6 +165,7 @@ return Status; } +DRIVER_UNLOAD FsRecUnload; VOID STDCALL FsRecUnload(IN PDRIVER_OBJECT DriverObject) Modified: trunk/reactos/drivers/filesystems/fs_rec/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ntfs.c Wed Nov 21 18:40:41 2007 @@ -21,11 +21,10 @@ IN ULONG BytesPerSector, IN PLARGE_INTEGER NumberOfSectors) { + /* Assume failure */ + BOOLEAN Result = FALSE; + PAGED_CODE(); - BOOLEAN Result; - - /* Assume failure */ - Result = FALSE; if ((BootSector->Oem[0] == 'N') && (BootSector->Oem[1] == 'T') &&

1 0

[cfinck] 30626: Simplify scut.cmd, remove much duplicated code
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Wed Nov 21 18:40:40 2007 New Revision: 30626 URL: http://svn.reactos.org/svn/reactos?rev=30626&view=rev Log: Simplify scut.cmd, remove much duplicated code Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Wed Nov 21 18:40:40 2007 @@ -3,63 +3,35 @@ :: LICENSE: GPL - See LICENSE.txt in the top level directory. :: FILE: Root/scut.cmd :: PURPOSE: Manages named shortcuts to ReactOS source directories. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> +:: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: @echo off -if /i "%1" == "" ( - for /f "usebackq tokens=*" %%i in (`"%_ROSBE_BASEDIR%\Tools\scut.exe"`) do ( - if /i not "%%i" == "Default" ( - cd /d %%i - set _ROSBE_ROSSOURCEDIR=%%i - ) - ) - goto :EOC +:: Check if the parameter is an scut parameter, which can just be forwarded to the EXE file +if /i "%1" == "add" goto paramcall +if /i "%1" == "rem" goto paramcall +if /i "%1" == "edit" goto paramcall +if /i "%1" == "def" goto paramcall +if /i "%1" == "list" goto paramcall +if /i "%1" == "/?" goto paramcall +if /i "%1" == "-h" goto paramcall +if /i "%1" == "--help" goto paramcall + +:: It's a shortcut name, so change the directory +for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\scut.exe" %*"`) do ( + if /i not "%%i" == "Default" ( + if exist "%%i\." ( + cd /d %%i + set _ROSBE_ROSSOURCEDIR=%%i + ) + ) ) -if /i "%1" == "add" ( - call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* - goto :EOC -) -if /i "%1" == "rem" ( - call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* - goto :EOC -) -if /i "%1" == "edit" ( - call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* - goto :EOC -) -if /i "%1" == "def" ( - call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* - goto :EOC -) -if /i "%1" == "list" ( - call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* - goto :EOC -) -if /i "%1" == "/?" ( - "%_ROSBE_BASEDIR%\Tools\scut.exe" %* - goto :EOC -) -if /i "%1" == "-h" ( - call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* - goto :EOC -) -if /i "%1" == "--help" ( - call "%_ROSBE_BASEDIR%\Tools\scut.exe" %* - goto :EOC -) -if not "%1" == "" ( - for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\scut.exe" %*"`) do ( - if /i not "%%i" == "Default" ( - if exist "%%i\." ( - cd /d %%i - set _ROSBE_ROSSOURCEDIR=%%i - ) - ) - ) - goto :EOC -) +goto :EOC + +:paramcall +"%_ROSBE_BASEDIR%\Tools\scut.exe" %* :EOC title ReactOS Build Environment %_ROSBE_VERSION%

1 0

[cfinck] 30625: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2836 for more details.
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Wed Nov 21 17:26:42 2007 New Revision: 30625 URL: http://svn.reactos.org/svn/reactos?rev=30625&view=rev Log: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2836 for more details. Added: trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc (with props) trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc (with props) Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc trunk/rosapps/applications/screensavers/butterflies/butterflies.rc trunk/rosapps/downloader/lang/uk-UA.rc Added: trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc Wed Nov 21 17:26:42 2007 @@ -1,0 +1,454 @@ +/* + * PROJECT: ReactOS Telephone API UI DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/tapiui/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for tapiui + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +101 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ïðàâèëà íàáîðó íîìåðà" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 201, 2000, 7, 7, 21, 20 + LTEXT "Íèæ÷åíàâåäåíèé ñïèñîê ì³ñòèòü âêàçàí³ ðîçòàøóâàííÿ. Âèáåð³òü ðîçòàøóâàííÿ, ç ÿêîãî âè òåëåôîíóºòå.", -1, 35, 7, 210, 16 + LTEXT "&Ðîçòàøóâàííÿ:", -1, 7, 35, 210, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 46, 238, 105, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ñòâîðèòè...", 1030, 87, 155, 50, 14 + PUSHBUTTON "Ç&ì³íèòè...", 1031, 141, 155, 50, 14 + PUSHBUTTON "Â&èäàëèòè", 1032, 195, 155, 50, 14 + LTEXT "Íîìåð òåëåôîíó áóäå íàáðàíî ÿê:", 1052, 7, 181, 100, 8 + LTEXT "", 1053, 14, 195, 224, 16 +END + +102 DIALOG 0, 0, 252, 255 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 202, 2000, 7, 7, 20, 20 + LTEXT "&²ì'ÿ ðîçòàøóâàííÿ:", -1, 35, 11, 56, 8, SS_CENTERIMAGE + EDITTEXT 1038, 96, 8, 149, 14, ES_AUTOHSCROLL + LTEXT "Óêàæ³òü ðîçòàøóâàííÿ, çâ³äêè âè òåëåôîíóºòå.", 2001, 7, 33, 238, 8 + LTEXT "&Êðà¿íà/ðåã³îí:", -1, 7, 49, 161, 8 + COMBOBOX 1006, 7, 60, 175, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Êîä &ì³ñòà:", -1, 190, 49, 48, 8 + EDITTEXT 1034, 190, 60, 48, 12, ES_AUTOHSCROLL + GROUPBOX "Ïðàâèëà íàáîðó íîìåðà", 2002, 7, 80, 238, 92 + LTEXT "Òåëåôîíóþ÷è ç öüîãî ðîçòàøóâàííÿ, çàñòîñîâóâàòè òàê³ ïðàâèëà:", 2003, 14, 92, 224, 8 + LTEXT "äëÿ äîñòóïó äî &çîâí³øíüî¿ ì³ñöåâî¿ ë³í³¿ íàáèðàòè:", -1, 14, 106, 170, 8 + EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL + LTEXT "äëÿ äîñòóïó äî çîâí³øíüî¿ ì³&æì³ñüêî¿ ë³í³¿ íàáèðàòè:", -1, 14, 122, 170, 8 + EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL + LTEXT "äëÿ ì³æì³ñüê&èõ äçâ³íê³â âèêîðèñòîâóâàòè êîä:", -1, 14, 138, 170, 8 + EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL + LTEXT "äë&ÿ ì³æíàðîäíèõ äçâ³íê³â âèêîðèñòîâóâàòè êîä:", -1, 14, 154, 170, 8 + EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL + AUTOCHECKBOX "Êîä âèìêíåííÿ ðåæèìó î÷³êó&þ÷îãî äçâ³íêà:", 1035, 14, 177, 170, 10 + COMBOBOX 1013, 190, 176, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL + LTEXT "Òèï íàáîðó íîìåðà:", -1, 14, 195, 40, 8 + AUTORADIOBUTTON "&òîíîâèé", 1036, 58, 194, 50, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "³ì&ïóëüñíèé", 1037, 112, 194, 50, 10, NOT WS_TABSTOP + LTEXT "Íîìåð òåëåôîíó áóäå íàáðàíî ÿê:", 1052, 7, 219, 100, 8 + LTEXT "", 1053, 14, 232, 224, 16 +END + +103 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ïðàâèëà íàáîðó êîäó ì³ñòà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ïðàâèëî íàáîðó êîäó ì³ñòà âèçíà÷àº ñïîñ³á íàáîðó íîìåð³â ³ç òàêèì ñàìèì àáî ³íøèì êîäîì ì³ñòà.", 2000, 7, 7, 238, 16 + LTEXT "&Ïðàâèëà íàáîðó êîäó ì³ñòà:", -1, 7, 31, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ñòâîðèòè...", 1030, 87, 147, 50, 14 + PUSHBUTTON "Ç&ì³íèòè...", 1031, 141, 147, 50, 14 + PUSHBUTTON "Â&èäàëèòè", 1032, 195, 147, 50, 14 + GROUPBOX "Îïèñ", 2006, 7, 166, 238, 45 + LTEXT "", 1039, 14, 180, 224, 24 +END + +104 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Òåëåôîííà êàðòêà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âèáåð³òü òåëåôîííó êàðòêó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ, àáî íàòèñí³òü êíîïêó ""Ñòâîðèòè"", ùîá äîäàòè ³íøó êàðòêó.", 2000, 7, 7, 238, 8 + LTEXT "&Òèïè êàðòîê:", -1, 7, 23, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ñòâîðèòè...", 1030, 87, 103, 50, 14 + PUSHBUTTON "Ç&ì³íèòè...", 1031, 141, 103, 50, 14 + PUSHBUTTON "Ç&ì³íèòè", 1032, 195, 103, 50, 14 + LTEXT "Îáë³êîâèé &íîìåð:", -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 "Íîìåðè, ÿê³ ñë³ä íàáèðàòè äëÿ", 2001, 7, 158, 238, 53 + LTEXT "ì³æì³ñüêèõ äçâ³íê³â:", -1, 14, 172, 84, 8 + LTEXT "", 1042, 102, 172, 136, 8 + LTEXT "ì³æíàðîäíèõ äçâ³íê³â:", -1, 14, 184, 84, 8 + LTEXT "", 1043, 102, 184, 136, 8 + LTEXT "ì³ñöåâèõ äçâ³íê³â:", -1, 14, 196, 84, 8 + LTEXT "", 1051, 102, 196, 136, 8 +END + +105 DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 203, 2000, 7, 7, 20, 20 + LTEXT "&²ì'ÿ êàðòêè:", -1, 35, 12, 64, 8, SS_CENTERIMAGE + EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL + LTEXT "Îáë³êîâèé &íîìåð:", -1, 7, 35, 238, 8 + EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL + LTEXT "Îñî&áèñòèé PIN-êîä:", -1, 7, 68, 238, 8 + EDITTEXT 1019, 7, 80, 116, 14, ES_AUTOHSCROLL + LTEXT "Öÿ òåëåôîííà êàðòêà çàñòîñîâóâàòèìåòüñÿ çà:", 1056, 14, 117, 224, 8 + GROUPBOX "Â³äîìîñò³ ïðî òåëåôîííó êàðòêó", 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_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ì³æì³ñüê³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Íîìåð äëÿ âè&õîäó íà ì³æì³ñüêó ë³í³þ:", -1, 7, 7, 238, 8 + EDITTEXT 1044, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "Çà äîïîìîãîþ êíîïîê óêàæ³òü ïîñë³äîâí³ñòü âèõîäó íà ì³æì³ñüêó ë³í³þ. Óêàæ³òü ïîñë³äîâí³ñòü êðîê³â ó òîìó ïîðÿäêó, ÿê âîíè çàçíà÷åí³ íà êàðòö³.", 2000, 7, 40, 238, 24 + LTEXT "Êðîêè íà&áîðó íîìåðà çà âèêîðèñòàííÿ êàðòêè:", -1, 7, 72, 80, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Â&ãîðó", 1022, 195, 83, 50, 14 + PUSHBUTTON "Â&íèç", 1023, 195, 101, 50, 14 + PUSHBUTTON "Â&èäàëèòè", 1024, 195, 119, 50, 14 + PUSHBUTTON "Íî&ìåð äîñòóïó", 1025, 7, 161, 90, 14 + PUSHBUTTON "Îáë³êîâèé íîì&åð", 1018, 101, 161, 90, 14 + PUSHBUTTON "PIN-&êîä", 1019, 7, 179, 90, 14 + PUSHBUTTON "Íîìåð ïðè&çíà÷åííÿ...", 1020, 101, 179, 90, 14 + PUSHBUTTON "Î&÷³êóâàííÿ...", 1017, 7, 197, 90, 14 + PUSHBUTTON "Óêà&æ³òü öèôðè...", 1021, 101, 197, 90, 14 +END + +107 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ì³æíàðîäí³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Íîìåð äëÿ âè&õîäó íà ì³æíàðîäíó ë³í³þ:", -1, 7, 7, 238, 8 + EDITTEXT 1045, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "Çà äîïîìîãîþ êíîïîê óêàæ³òü ïîñë³äîâí³ñòü âèõîäó íà ì³æíàðîäíó ë³í³þ. Óêàæ³òü ïîñë³äîâí³ñòü êðîê³â ó òîìó ïîðÿäêó, â ÿêîìó âîíè çàçíà÷åí³ íà êàðòö³.", 2000, 7, 40, 244, 24 + LTEXT "Êðîêè íà&áîðó íîìåðà çà âèêîðèñòàííÿ êàðòêè:", -1, 7, 72, 80, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Â&ãîðó", 1022, 195, 83, 50, 14 + PUSHBUTTON "Â&íèç", 1023, 195, 101, 50, 14 + PUSHBUTTON "Â&èäàëèòè", 1024, 195, 119, 50, 14 + PUSHBUTTON "Íî&ìåð äîñòóïó", 1025, 7, 161, 90, 14 + PUSHBUTTON "Îáë³êîâèé íîì&åð", 1018, 101, 161, 90, 14 + PUSHBUTTON "PIN-&êîä", 1019, 7, 179, 90, 14 + PUSHBUTTON "Íîìåð ïðè&çíà÷åííÿ...", 1020, 101, 179, 90, 14 + PUSHBUTTON "Î&÷³êóâàííÿ...", 1017, 7, 197, 90, 14 + PUSHBUTTON "Óêà&æ³òü öèôðè...", 1021, 101, 197, 90, 14 +END + +108 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ì³ñöåâ³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Íîìåð äëÿ âè&õîäó íà ì³ñöåâó ë³í³þ:", -1, 7, 7, 238, 8 + EDITTEXT 1008, 7, 18, 140, 14, ES_AUTOHSCROLL + LTEXT "Çà äîïîìîãîþ êíîïîê óêàæ³òü ïîñë³äîâí³ñòü âèõîäó íà ì³ñöåâó ë³í³þ. Óêàæ³òü ïîñë³äîâí³ñòü êðîê³â ó òîìó ïîðÿäêó, ÿê âîíè çàçíà÷åí³ íà êàðòö³. Äëÿ äçâ³íê³â áåç âèêîðèñòàííÿ òåëåôîííî¿ êàðòêè çàëèøòå ö³ ïîëÿ ïóñòèìè.", 2000, 7, 40, 238, 24 + LTEXT "Êðîêè íà&áîðó íîìåðà çà âèêîðèñòàííÿ êàðòêè:", -1, 7, 72, 238, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Â&ãîðó", 1022, 195, 83, 50, 14 + PUSHBUTTON "Â&íèç", 1023, 195, 101, 50, 14 + PUSHBUTTON "Â&èäàëèòè", 1024, 195, 119, 50, 14 + PUSHBUTTON "Íî&ìåð äîñòóïó", 1025, 7, 161, 90, 14 + PUSHBUTTON "Îáë³êîâèé íîì&åð", 1018, 101, 161, 90, 14 + PUSHBUTTON "PIN-&êîä", 1019, 7, 179, 90, 14 + PUSHBUTTON "Íîìåð ïðè&çíà÷åííÿ...", 1020, 101, 179, 90, 14 + PUSHBUTTON "Î&÷³êóâàííÿ...", 1017, 7, 197, 90, 14 + PUSHBUTTON "Óêà&æ³òü öèôðè...", 1021, 101, 197, 90, 14 +END + +109 DIALOGEX 0, 0, 252, 257 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Íîâå ïðàâèëî íàáîðó êîäó ì³ñòà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Öå ïðàâèëî çàñòîñîâóâàòèìåòüñÿ ëèøå äî äçâ³íê³â ç óêàçàíèìè êîäîì ì³ñòà é ïðåô³êñîì.", 2000, 7, 6, 238, 16 + LTEXT "Êîä ì³ñòà, êóäè òåëåôîíóþòü:", -1, 7, 31, 110, 8 + LTEXT "Êîä &ì³ñòà:", -1, 7, 47, 36, 8 + EDITTEXT 1034, 46, 44, 50, 14, ES_AUTOHSCROLL + LTEXT "Ïðåô³êñè, ÿê³ ñë³ä âèêîðèñòîâóâàòè ç öèì êîäîì ì³ñòà.", -1, 14, 78, 224, 8 + AUTORADIOBUTTON "&Âêëþ÷èòè âñ³ ïðåô³êñè äî êîäó ì³ñòà", 1014, 14, 90, 224, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "Â&êëþ÷èòè ëèøå ïðåô³êñè ç³ ñïèñêó:", 1015, 14, 104, 224, 12, NOT WS_TABSTOP + LTEXT "Ïðåô³êñè, ÿê³ ñ&ë³ä âêëþ÷èòè:", 1057, 26, 117, 119, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000411D, 25, 128, 66, 32, WS_EX_CLIENTEDGE + PUSHBUTTON "&Äîäàòè...", 1005, 95, 128, 50, 14 + PUSHBUTTON "Â&èäàëèòè", 1024, 95, 146, 50, 14 + LTEXT "Íàáèðàþ÷è íîìåðè, ÿê³ ì³ñòÿòü óêàçàí³ ïðåô³êñè:", -1, 14, 184, 224, 8 + AUTOCHECKBOX "Í&àáðàòè:", 1012, 14, 198, 30, 12 + EDITTEXT 1007, 46, 196, 42, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "Íà&áðàòè êîä ì³ñòà", 1029, 14, 214, 85, 12 + DEFPUSHBUTTON "OK", 1, 141, 236, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", 2, 195, 236, 50, 14 + RTEXT "Êîä ì³ñòà", 2001, 133, 31, 51, 8 + LTEXT "Ïðåô³êñ", 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 "Ïðåô³êñè", -1, 7, 64, 238, 102 + GROUPBOX "Ïðàâèëà", -1, 7, 170, 238, 60 +END + +110 DIALOGEX 0, 0, 227, 82 +STYLE DS_SETFONT | 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 "OK", 1, 116, 62, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", 2, 170, 62, 50, 14 +END + +111 DIALOGEX 0, 0, 252, 124 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Î÷³êóâàííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âèáåð³òü òèï î÷³êóâàíîãî ñèãíàëó ïåðåä ïðîäîâæåííÿì íàáîðó íîìåðà.", 2000, 7, 7, 238, 16 + AUTORADIOBUTTON "×åêàòè íà &ãóäîê", 1009, 7, 31, 238, 10, WS_GROUP + AUTORADIOBUTTON "×åêàòè íà &çàê³í÷åííÿ ãîëîñîâîãî ïîâ³äîìëåííÿ", 1016, 7, 47, 238, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "×åêàòè &ïðîòÿãîì ïåâíîãî ÷àñó:", 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, 78, 11, 14 + LTEXT "&ñåê", -1, 58, 81, 187, 8 + DEFPUSHBUTTON "OK", 1, 141, 103, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", 2, 195, 103, 50, 14 +END + +112 DIALOGEX 0, 0, 252, 111 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Íîìåð ïðèçíà÷åííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Íà öüîìó êðîö³ ñë³ä óêàçàòè ñïîñ³á íàáîðó íîìåðà çà âèêîðèñòàííÿ òåëåôîííî¿ êàðòêè. ßê³ ÷àñòèíè íîìåðà ñë³ä íàáèðàòè?", 2000, 7, 7, 238, 24 + AUTOCHECKBOX "Íà&áðàòè êîä êðà¿íè/ðåã³îíó", 1027, 7, 39, 238, 10 + AUTOCHECKBOX "Íàáðàòè &êîä ì³ñòà", 1034, 7, 55, 238, 10 + AUTOCHECKBOX "&Íàáðàòè íîìåð", 1008, 7, 71, 238, 10, WS_DISABLED + DEFPUSHBUTTON "OK", 1, 141, 92, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", 2, 195, 92, 50, 14 +END + +113 DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Äîäàòêîâî" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 201, 2000, 7, 7, 20, 20 + LTEXT "Íà öüîìó êîìï'þòåð³ óñòàíîâëåí³ òàê³ ñëóæáè òåëåôîííîãî äîñòóïó:", -1, 40, 7, 205, 8 + LTEXT "Ñëó&æáè äîñòóïó:", -1, 7, 35, 238, 8 + LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP + PUSHBUTTON "&Äîäàòè...", 1005, 87, 197, 50, 14 + PUSHBUTTON "Â&èäàëèòè", 1024, 141, 197, 50, 14 + PUSHBUTTON "&Íàëàøòóâàòè...", 1031, 195, 197, 50, 14 +END + +114 DIALOG 20, 15, 252, 127 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Óñòàíîâêà ñëóæáè äîñòóïó" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âèáåð³òü ç³ ñïèñêó ñëóæáó äîñòóïó, ÿêó ïîòð³áíî óñòàíîâèòè, é íàòèñí³òü êíîïêó ""Äîäàòè"".", 2000, 7, 7, 241, 8 + LTEXT "Ñ&ëóæáè òåëåôîííîãî äîñòóïó:", -1, 7, 23, 144, 10 + LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "&Äîäàòè", 1005, 141, 106, 50, 14 + DEFPUSHBUTTON "Ñêàñóâàòè", 2, 195, 106, 50, 14 +END + +115 DIALOGEX 10, 10, 303, 228 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Â³äîìîñò³ ïðî ðîçòàøóâàííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 + LTEXT "Ïåðåä ñòâîðåííÿì òåëåôîííîãî àáî ìîäåìíîãî ï³äêëþ÷åííÿ ïîòð³áíî âêàçàòè â³äîìîñò³ ïðî âàøå ïîòî÷íå ðîçòàøóâàííÿ.", 2000, 107, 15, 188, 25 + LTEXT "&Êðà¿íà, â ÿê³é âè çàðàç ïåðåáóâàºòå:", -1, 107, 43, 189, 10 + COMBOBOX 1006, 107, 55, 180, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Òå&ëåôîííèé êîä ì³ñòà:", -1, 107, 74, 189, 10 + EDITTEXT 1034, 107, 87, 45, 12, ES_AUTOHSCROLL + LTEXT "Êîä &âèõîäó íà ë³í³þ îïåðàòîðà çâ'ÿçêó:", -1, 107, 105, 189, 10 + EDITTEXT 1058, 106, 118, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Êîä âè&õîäó íà çîâí³øíþ ë³í³þ:", -1, 107, 137, 189, 10 + EDITTEXT 1010, 107, 149, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Òèï íàáîðó íîìåðà:", -1, 107, 168, 189, 10 + AUTORADIOBUTTON "&òîíîâèé íàá³ð", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&³ìïóëüñíèé íàá³ð", 1037, 175, 178, 57, 14, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 192, 204, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", 2, 246, 204, 50, 14 +END + +400 DIALOG 0, 0, 290, 151 +STYLE DS_SETFONT | 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 "Ïåðåä ñòâîðåííÿì òåëåôîííîãî àáî ìîäåìíîãî ï³äêëþ÷åííÿ ïîòð³áíî âêàçàòè â³äîìîñò³ ïðî âàøå ïîòî÷íå ðîçòàøóâàííÿ.", 2000, 95, 2, 188, 25 + LTEXT "&Êðà¿íà, â ÿê³é âè çàðàç ïåðåáóâàºòå:", -1, 95, 30, 188, 10 + COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Ò&åëåôîííèé êîä ì³ñòà:", -1, 95, 61, 188, 10 + EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL + LTEXT "Êîä âè&õîäó íà çîâí³øíþ ë³í³þ:", -1, 95, 96, 188, 10 + EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Òèï íàáîðó íîìåðà:", -1, 95, 129, 159, 10 + AUTORADIOBUTTON "&òîíîâèé íàá³ð", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&³ìïóëüñíèé íàá³ð", 1037, 155, 139, 55, 12, NOT WS_TABSTOP +END + +500 DIALOG 0, 0, 235, 88 +STYLE DS_SETFONT | 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 "Çà&âæäè äîâ³ðÿòè âì³ñòó ö³º¿ ñòîð³íêè", 503, 50, 47, 147, 12 + DEFPUSHBUTTON "&OK", 505, 110, 65, 50, 14 + PUSHBUTTON "&Ñêàñóâàòè", 506, 164, 65, 50, 14 +END + +STRINGTABLE +BEGIN + 1 "Òåëåôîí ³ ìîäåì" + 2 "Íàñòðîéêà ïðàâèë íàáîðó íîìåðà òà ³íøèõ ïàðàìåòð³â âèêîðèñòàííÿ ìîäåìà." + 3 "Ðîçòàøóâàííÿ" + 4 "Ùîá ñòâîðèòè íîâå ðîçòàøóâàííÿ, íàòèñí³òü êíîïêó ""Ñòâîðèòè""." + 5 "Íîâå ðîçòàøóâàííÿ" + 6 "Çì³íèòè ðîçòàøóâàííÿ" + 7 "Íîâà òåëåôîííà êàðòêà" + 8 "Çì³íèòè òåëåôîííó êàðòêó" + 9 "Êîä ì³ñòà" + 10 "Ïðåô³êñè" + 11 "Ïðàâèëî" + 12 "Ââåäåíî íåïðèïóñòèìèé ñèìâîë.\n\nÄîçâîëåí³ öèôðè â³ä 0 äî 9, ç³ðî÷êà (*), çíàê # ³ êîìà." + 13 "Ââåäåíî íåïðèïóñòèìèé ñèìâîë.\n\nÄîçâîëåí³ öèôðè â³ä 0 äî 9, ç³ðî÷êà (*), çíàê #, ïðîá³ë ³ êîìà." + 14 "Ââåäåíî íåïðèïóñòèìèé ñèìâîë.\n\nÄîçâîëåí³ öèôðè â³ä 0 äî 9." + 15 "Ââåäåíî íåïðèïóñòèìèé ñèìâîë." + 16 "Íàáðàòè %1" + 17 "Íàáðàòè %1 ³ êîä ì³ñòà" + 18 "Íàáðàòè êîä ì³ñòà" + 19 "Íàáðàòè ëèøå íîìåð" + 20 "Óñ³" + 21 "Âèáðàíèé" + 22 "Çì³íèòè ïðàâèëî íàáîðó êîäó ì³ñòà" + 23 "Âèáåð³òü ç³ ñïèñêó ïðàâèëî, ùîá ïåðåãëÿíóòè éîãî îïèñ, àáî íàòèñí³òü êíîïêó ""Ñòâîðèòè"", ùîá äîäàòè íîâå ïðàâèëî." + 24 "Íàáðàòè ""%2"" ³ êîä ì³ñòà ïåðåä íîìåðîì äëÿ âñ³õ íîìåð³â ³ç êîäîì ì³ñòà %1." + 25 "Íàáðàòè ""%2"" ïåðåä íîìåðîì äëÿ âñ³õ íîìåð³â ³ç êîäîì ì³ñòà %1." + 26 "Íàáðàòè êîä ì³ñòà ïåðåä íîìåðîì äëÿ âñ³õ íîìåð³â ³ç êîäîì ì³ñòà %1." + 27 "Íàáðàòè ëèøå íîìåð òåëåôîíó äëÿ âñ³õ íîìåð³â ³ç êîäîì ì³ñòà %1." + 28 "Íàáðàòè ""%2"" ³ êîä ì³ñòà ïåðåä íîìåðîì äëÿ íîìåð³â ³ç êîäîì ì³ñòà %1, ÿê³ ì³ñòÿòü óêàçàí³ ïðåô³êñè." + 29 "Íàáðàòè ""%2"" ïåðåä íîìåðîì äëÿ íîìåð³â ³ç êîäîì ì³ñòà %1, ÿê³ ì³ñòÿòü óêàçàí³ ïðåô³êñè." + 30 "Íàáðàòè êîä ì³ñòà ïåðåä íîìåðîì äëÿ íîìåð³â ³ç êîäîì ì³ñòà %1, ÿê³ ì³ñòÿòü óêàçàí³ ïðåô³êñè." + 31 "Íàáðàòè ëèøå íîìåð òåëåôîíó äëÿ íîìåð³â ³ç êîäîì ì³ñòà %1, ÿê³ ì³ñòÿòü óêàçàí³ ïðåô³êñè." + 32 "Íàáðàòè ""1"" ïåðåä íàáîðîì íîìåðà äëÿ âñ³õ êîä³â ì³ñò ³ âêëþ÷èòè êîä ì³ñòà äëÿ âñ³õ ïðåô³êñ³â." + 33 "Äîäàòè ïðåô³êñ" + 34 "Ââåä³òü îäèí àáî äåê³ëüêà ïðåô³êñ³â ÷åðåç ïðîá³ëè àáî êîìè." + 35 "Óêàæ³òü öèôðè" + 36 "Ââåä³òü îäíó àáî äåê³ëüêà öèôð (à òàêîæ * ³ #), ÿê³ ñë³ä íàáðàòè." + 37 "Ââåäåíî íåïðèïóñòèìèé ñèìâîë.\n\nÄîçâîëåí³ öèôðè â³ä 0 äî 9 ³ ïðîá³ë." + 38 "×åêàòè %1!d! ñåêóíä." + 39 "Íàáðàòè íîìåð äîñòóïó." + 40 "Íàáðàòè íîìåð îáë³êîâîãî çàïèñó." + 41 "Íàáðàòè PIN-êîä." + 42 "×åêàòè íà ãóäîê." + 43 "×åêàòè íà çàê³í÷åííÿ ãîëîñîâîãî ïîâ³äîìëåííÿ." + 44 "Íàáðàòè êîä êðà¿íè/ðåã³îíó, êîä ì³ñòà é íîìåð." + 45 "Íàáðàòè êîä êðà¿íè/ðåã³îíó é íîìåð." + 46 "Íàáðàòè êîä ì³ñòà é íîìåð." + 47 "Íàáðàòè êîä êðà¿íè/ðåã³îíó." + 48 "Íàáðàòè êîä ì³ñòà." + 49 "Íàáðàòè íîìåð." + 50 "íàáîð³ ì³æì³ñüêèõ íîìåð³â." + 51 "íàáîð³ ì³æíàðîäíèõ íîìåð³â." + 52 "íàáîð³ ì³ñöåâèõ íîìåð³â." + 53 "Äëÿ ö³º¿ òåëåôîííî¿ êàðòêè íå âèçíà÷åíî ïðàâèë íàáîðó íîìåðà." + 54 "Ñë³ä ââåñòè êîä îïåðàòîðà ì³æì³ñüêîãî çâ'ÿçêó äëÿ öüîãî ðîçòàøóâàííÿ." + 55 "Ñë³ä ââåñòè ³ì'ÿ äëÿ öüîãî ðîçòàøóâàííÿ." + 56 "Ñë³ä ââåñòè êîä ì³ñòà äëÿ öüîãî ðîçòàøóâàííÿ." + 57 "Ùîá âèìêíóòè ðåæèì î÷³êóþ÷îãî äçâ³íêà, ñë³ä âèáðàòè íîìåð." + 58 "Ñë³ä âèáðàòè êðà¿íó àáî ðåã³îí, ç ÿêîãî âè òåëåôîíóºòå." + 59 "Â³äîìîñò³ â³äñóòí³" + 60 "Óêàçàíå ³ì'ÿ ðîçòàøóâàííÿ âæå âèêîðèñòîâóºòüñÿ. Ââåä³òü óí³êàëüíå ³ì'ÿ." + 61 "Â³äñóòí³ äåÿê³ â³äîìîñò³, ïîòð³áí³ äëÿ âèêîðèñòàííÿ ö³º¿ òåëåôîííî¿ êàðòêè. Íàòèñí³òü êíîïêó ""Çì³íèòè"" ³ âêàæ³òü ïîòð³áí³ â³äîìîñò³ àáî âèáåð³òü ³íøó êàðòêó." + 62 "Ñë³ä âèáðàòè òåëåôîííó êàðòêó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ çà çàìîâ÷óâàííÿì. Âèáåð³òü ¿¿ ç³ ñïèñêó àáî íàòèñí³òü êíîïêó ""Ñòâîðèòè"", ùîá äîäàòè íîâó êàðòêó." + 63 "Ñë³ä ââåñòè ³ì'ÿ òåëåôîííî¿ êàðòêè." + 64 "Ñë³ä ââåñòè îáë³êîâèé íîìåð." + 65 "Ñë³ä ââåñòè PIN-êîä." + 66 "Äëÿ ö³º¿ òåëåôîííî¿ êàðòêè íå âèçíà÷åíî ïðàâèë íàáîðó íîìåðà. Ùîá ñòâîðèòè ïðàâèëî, âèáåð³òü âêëàäêó ""Ì³æì³ñüê³"", ""Ì³æíàðîäí³"" àáî ""Ì³ñöåâ³""." + 67 "Ïðàâèëî äëÿ ì³æì³ñüêîãî äçâ³íêà ïîòðåáóº âêàçàííÿ íîìåðà äîñòóïó äëÿ ì³æì³ñüêîãî çâ'ÿçêó." + 68 "Ïðàâèëî äëÿ ì³æíàðîäíîãî äçâ³íêà ïîòðåáóº âêàçàííÿ íîìåðà äîñòóïó äëÿ ì³æíàðîäíîãî çâ'ÿçêó." + 69 "Ïðàâèëî äëÿ ì³ñöåâîãî äçâ³íêà ïîòðåáóº âêàçàííÿ íîìåðà äîñòóïó äëÿ ì³ñöåâîãî çâ'ÿçêó." + 70 "Íåìàº" + 71 "Âè ä³éñíî áàæàºòå âèäàëèòè âèáðàíîãî ïîñòà÷àëüíèêà ïîñëóã òåëåôîííî¿ ñëóæáè?" + 72 "<íåìàº óñòàíîâëåíèõ ïîñòà÷àëüíèê³â ïîñëóã>" + 73 "Ñë³ä ââåñòè ïðåô³êñè, äëÿ ÿêèõ çàñòîñîâóºòüñÿ öå ïðàâèëî." + 74 "&Öèôðè:" + 75 "&Ïðåô³êñè:" + 76 "Ââåäåíî íåïðèïóñòèìèé ñèìâîë.\n\nÄîçâîëåí³ öèôðè â³ä 0 äî 9, ïðîá³ë ³ êîìà." + 77 "Ï³äòâåðäæåííÿ âèäàëåííÿ" + 78 "Âè ä³éñíî áàæàºòå âèäàëèòè öå ðîçòàøóâàííÿ?" + 79 "Âè ä³éñíî áàæàºòå âèäàëèòè öþ êàðòêó?" + 80 "Âè ä³éñíî áàæàºòå âèäàëèòè öå ïðàâèëî?" + 81 "Ñë³ä ââåñòè öèôðè äëÿ íàáîðó." + 82 "Óêàçàíå ³ì'ÿ òåëåôîííî¿ êàðòêè âæå âèêîðèñòîâóºòüñÿ. Ââåä³òü óí³êàëüíå ³ì'ÿ." + 83 "ReactOS ïîòðåáóº â³äîìîñòåé ïðî ðîçòàøóâàííÿ, çâ³äêè âè òåëåôîíóºòå. ßêùî íå âêàçàòè ö³ â³äîìîñò³, ïðîãðàìà ìîæå íåïðàâèëüíî íàáèðàòè íîìåð. Êð³ì òîãî, äåÿê³ äîäàòêè ðåàãóþòü íà ñêàñóâàííÿ ââîäó äàíèõ, â³äïðàâëÿþ÷è ¿õ ïîâòîðíî.\nÂè ä³éñíî áàæàºòå ñêàñóâàòè ââ³ä äàíèõ?" + 84 "Ï³äòâåðäæåííÿ ñêàñóâàííÿ" + 85 "Ìîº ðîçòàøóâàííÿ" + 86 "<íåìàº ïîñòà÷àëüíèê³â ïîñëóã äîñòóïó äëÿ óñòàíîâêè>" + 87 "Ââåäåíî íåïðèïóñòèìèé ñèìâîë.\n\nÄîçâîëåí³ öèôðè â³ä 0 äî 9, ë³òåðè â³ä A äî D, *, #, +, !, ïðîá³ë ³ êîìà." + 88 "Ñë³ä ââåñòè êîä îïåðàòîðà ì³æíàðîäíîãî çâ'ÿçêó äëÿ öüîãî ðîçòàøóâàííÿ." + 89 "Ñë³ä ââåñòè êîä îïåðàòîðà çâ'ÿçêó äëÿ öüîãî ðîçòàøóâàííÿ." + 90 "Öÿ ñòîð³íêà íàìàãàºòüñÿ çðîáèòè àáî ïðîêîíòðîëþâàòè òåëåôîíí³ äçâ³íêè àáî ³íø³ ç'ºäíàííÿ, ÿê³ âèêîíóþòüñÿ íà âàøîìó êîìï'þòåð³.\nÄîçâîëèòè ïðîäîâæåííÿ?" + 91 "Öÿ ñòîð³íêà íàìàãàºòüñÿ îòðèìàòè äîñòóï äî ³íôîðìàö³¿ êàòàëîã³â ó âàø³é ìåðåæ³.\nÄîçâîëèòè ïðîäîâæåííÿ?" + 92 "Öÿ ñòîð³íêà íàìàãàºòüñÿ îòðèìàòè äîñòóï àáî çì³íèòè ³íôîðìàö³þ ïðî ìåðåæí³ êîíôåðåíö³¿.\nÄîçâîëèòè ïðîäîâæåííÿ?" + 93 "Öÿ ñòîð³íêà íàìàãàºòüñÿ îòðèìàòè äîñòóï àáî çì³íèòè ³íôîðìàö³þ â ðåºñòð³.\nÄîçâîëèòè ïðîäîâæåííÿ?" + 1064 "Íå âäàëîñÿ â³äêðèòè ïàíåëü êåðóâàííÿ òåëåôîíîì ³ ìîäåìîì. Ìîæëèâ³ íåïîëàäêè ï³ä ÷àñ çàïóñêó òåëåôîííî¿ ñëóæáè." + 1065 "Âèäàëèòè ïîñòà÷àëüíèêà" + 15800 "23" + 15801 "0,\"Íå âèêîðèñòîâóºòüñÿ\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" + 15802 "1,\"Ïðÿìèé êàíàë AT&T ÷åðåç 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" + 15803 "2,\"AT&T ÷åðåç 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" + 15804 "3,\"AT&T ÷åðåç 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" + 15805 "4,\"Ïðÿìèé êàíàë MCI ÷åðåç 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" + 15806 "5,\"MCI ÷åðåç 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" + 15807 "6,\"MCI ÷åðåç 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" + 15808 "7,\"MCI ÷åðåç 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" + 15809 "8,\"MCI ÷åðåç 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" + 15810 "9,\"Ïðÿìèé êàíàë US Sprint ÷åðåç 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" + 15811 "10,\"US Sprint ÷åðåç 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" + 15812 "11,\"US Sprint ÷åðåç 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" + 15813 "12,\"Òåëåôîííà êàðòêà ÷åðåç 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 (Âåëèêîáðèòàí³ÿ)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" + 15816 "15,\"British Telecom (Âåëèêîáðèòàí³ÿ)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" + 15817 "16,\"CLEAR Communications (Íîâà Çåëàíä³ÿ)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" + 15818 "17,\"Telecom (Íîâà Çåëàíä³ÿ)\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" + 15819 "18,\"Global Card (Òàéâàíü - ÑØÀ)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" + 15820 "19,\"Telstra (Àâñòðàë³ÿ) ÷åðåç 1818 (ãîëîñîì)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" + 15821 "20,\"Telstra (Àâñòðàë³ÿ) ÷åðåç 1818 (ôàêñ)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" + 15822 "21,\"Optus (Àâñòðàë³ÿ) ÷åðåç 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" + 15823 "22,\"Optus (Àâñòðàë³ÿ) ÷åðåç 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" +END Propchange: trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native 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 (original) +++ trunk/reactos/dll/win32/tapiui/tapiui.rc Wed Nov 21 17:26:42 2007 @@ -19,3 +19,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Wed Nov 21 17:26:42 2007 @@ -12,3 +12,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/uk-UA.rc" Added: trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc Wed Nov 21 17:26:42 2007 @@ -1,0 +1,144 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Ukraianian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +#pragma code_page(1251) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DLG_SCREEN DIALOG DISCARDABLE 0, 0, 172, 57 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Butterflies ScreenSaver Settings" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,61,35,50,14 + CONTROL "Rotate Butterflies",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "Ïðî",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOG DISCARDABLE 0, 0, 149, 79 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Çàñòàâêà ""Butterflies""",IDC_STATIC,7,7,135,9 + CTEXT "Demo by: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "Çàñòàâêà â³ä: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DLG_SCREEN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 165 + TOPMARGIN, 7 + BOTTOMMARGIN, 50 + END + + IDD_DLG_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 142 + TOPMARGIN, 7 + BOTTOMMARGIN, 72 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_BUTTERFLY1 BITMAP DISCARDABLE "res/butterfly1.bmp" +IDB_BUTTERFLY2 BITMAP DISCARDABLE "res/butterfly2.bmp" +IDB_BUTTERFLY3 BITMAP DISCARDABLE "res/butterfly3.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STR_DESCRIP "Butterflies" +END + +#endif // Ukraianian resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/downloader/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/uk-UA.rc (original) +++ trunk/rosapps/downloader/lang/uk-UA.rc Wed Nov 21 17:26:42 2007 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Downloader * LICENSE: GPL - See COPYING in the top level directory - * FILE: rosapps/downloader/translations/uk.rc + * FILE: rosapps/downloader/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Downloader * TRANSLATOR: Artem Reznikov */ @@ -20,17 +20,17 @@ IDD_PROF DIALOGEX 6, 6, 267, 110 STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "Proferences" +CAPTION "Íàñòðîéêè" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 + LTEXT "Ïàïêà äëÿ çàâàíòàæåííÿ:", -1, 6, 10, 140, 8 EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 + PUSHBUTTON "&Âèáðàòè...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Âèäàëÿòè íàñòàíîâí³ ôàéëè ï³ñëÿ óñòàíîâêè", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Ñåðâåð îíîâëåíü:", -1, 6, 55, 140, 8 EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE @@ -55,11 +55,11 @@ IDS_VERSION "Âåðñ³ÿ: " IDS_LICENCE "Ë³öåíç³ÿ: " IDS_MAINTAINER "Âèðîáíèê: " - IDS_APPS_TITLE "Applications" - IDS_CATS_TITLE "Categories" - IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_APPS_TITLE "Äîäàòêè" + IDS_CATS_TITLE "Êàòåãîð³¿" + IDS_CHOOSE_FOLDER "Áóäü ëàñêà âèáåð³òü ïàïêó..." + IDS_NOTCREATE_REGKEY "Íå âäàëîñÿ ñòâîðèòè êëþ÷ ó ðåºñòð³." IDS_DOWNLOAD_FOLDER "Downloader" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UNABLECREATE_FOLDER "Íå âäàëîñÿ ñòâîðèòè ïàïêó ç òàêèì ³ì'ÿì!" IDS_UPDATE_URL "http://svn.reactos.org" END

1 0

[cfinck] 30624: Start sharing some tools between RosBE-Windows and RosBE-Unix, beginning with "cpucount" - Create a portable version (Windows, Mac OS X, other Unices) of "cpucount" based on the RosBE-Unix version along with a universal Makefile and a Readme file - Remove the other versions of "cpucount" - Remove the LFLAGS option from the RosBE-Windows Tools Makefile, it was never used. Instead add a STRIP option and use it for every target. - Set WINVER in the RosBE-Windows Tools Makefile to 0x
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Wed Nov 21 16:49:44 2007 New Revision: 30624 URL: http://svn.reactos.org/svn/reactos?rev=30624&view=rev Log: Start sharing some tools between RosBE-Windows and RosBE-Unix, beginning with "cpucount" - Create a portable version (Windows, Mac OS X, other Unices) of "cpucount" based on the RosBE-Unix version along with a universal Makefile and a Readme file - Remove the other versions of "cpucount" - Remove the LFLAGS option from the RosBE-Windows Tools Makefile, it was never used. Instead add a STRIP option and use it for every target. - Set WINVER in the RosBE-Windows Tools Makefile to 0x500 to ensure that no one uses API's, which are not compatible with Windows 2000 and XP Added: trunk/tools/RosBE/Tools/ (with props) trunk/tools/RosBE/Tools/SVN-Readme.txt (with props) trunk/tools/RosBE/Tools/cpucount.c (with props) trunk/tools/RosBE/Tools/makefile (with props) Removed: trunk/tools/RosBE/RosBE-Unix/tools/cpucount.c trunk/tools/RosBE/RosBE-Windows/Tools/cpucount.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ (props changed) trunk/tools/RosBE/RosBE-Windows/Tools/makefile Removed: trunk/tools/RosBE/RosBE-Unix/tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/tools/cpuco… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/tools/cpucount.c (original) +++ trunk/tools/RosBE/RosBE-Unix/tools/cpucount.c (removed) @@ -1,55 +1,0 @@ -/* Program for printing the CPU count. - The output value will be used for the -j option of gcc. - - Developed by Colin Finck <mail(a)colinfinck.de> - Released under GNU GPL v2 or any later version. -*/ - -#include <stdio.h> -#include <unistd.h> -#ifdef __APPLE__ -#include <sys/sysctl.h> -#endif - -int main(int argc, char *argv[]) -{ - int cpuCount = 0; - - if(argc > 2) - { - fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); - return -1; - } - -#ifdef __APPLE__ - size_t countSize = sizeof(cpuCount); - - sysctlbyname("hw.logicalcpu", &cpuCount, &countSize, NULL, 0); -#else - cpuCount = sysconf(_SC_NPROCESSORS_ONLN); -#endif - - if(argc != 1) - { - if(!strncmp(argv[1], "-x1", 3)) - { - cpuCount++; - } - else if(!strncmp(argv[1], "-x2", 3)) - { - cpuCount += cpuCount; - } - else - { - printf("Usage: %s [OPTIONS]\n", argv[0]); - printf("Running cpucount without options returns the number of\n"); - printf("processors in the system.\n"); - printf("-x1 - Number of processors in the system, plus 1.\n"); - printf("-x2 - Number of processors in the system, doubled.\n"); - return 0; - } - } - - printf("%u\n", cpuCount); - return 0; -} Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Nov 21 16:49:44 2007 @@ -1,0 +1,1 @@ +*.exe Removed: trunk/tools/RosBE/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cp… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/cpucount.c (removed) @@ -1,49 +1,0 @@ -/* - * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. - * FILE: Tools/cpucount.c - * PURPOSE: CPU Core Counter - * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> - * Copyright 2007 Peter Ward <dralnix(a)gmail.com> - * - */ - -#include <windows.h> -#include <stdio.h> - -int main(int argc, char* argv[]) -{ - SYSTEM_INFO SystemInformation; - - if (argc > 2) - { - fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); - return -1; - } - - GetSystemInfo(&SystemInformation); - - if(argc != 1) - { - if(!strncmp(argv[1], "-x1", 3)) - { - SystemInformation.dwNumberOfProcessors++; - } - else if(!strncmp(argv[1], "-x2", 3)) - { - SystemInformation.dwNumberOfProcessors += SystemInformation.dwNumberOfProcessors; - } - else - { - printf("Usage: %s [OPTIONS]\n", argv[0]); - printf("Running cpucount without options returns the number of\n"); - printf("processors in the system.\n"); - printf("-x1 - Number of processors in the system, plus 1.\n"); - printf("-x2 - Number of processors in the system, doubled.\n"); - return 0; - } - } - - printf("%u\n", SystemInformation.dwNumberOfProcessors); - return 0; -} Modified: trunk/tools/RosBE/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ma… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/makefile Wed Nov 21 16:49:44 2007 @@ -4,37 +4,43 @@ CC := gcc CFLAGS := ${HOST_CFLAGS} -Wall -O2 -o -LFLAGS := -s -WINVER := 0x502 +STRIP := strip +SUFFIX := .exe +WINVER := 0x500 -all: buildtime chknewer chkslash cpucount echoh flash getdate scut tee +all: buildtime chknewer chkslash echoh flash getdate scut tee buildtime: buildtime.c - ${CC} ${CFLAGS} buildtime buildtime.c + ${CC} ${CFLAGS} buildtime$(SUFFIX) buildtime.c + $(STRIP) buildtime$(SUFFIX) chknewer: chknewer.c ${CC} ${CFLAGS} chknewer chknewer.c + $(STRIP) chknewer$(SUFFIX) chkslash: chkslash.c ${CC} ${CFLAGS} chkslash chkslash.c - -cpucount: cpucount.c - ${CC} ${CFLAGS} cpucount cpucount.c + $(STRIP) chkslash$(SUFFIX) echoh: echoh.c ${CC} ${CFLAGS} echoh echoh.c + $(STRIP) echoh$(SUFFIX) flash: flash.c ${CC} -DWINVER=${WINVER} -D_WIN32_WINNT=${WINVER} ${CFLAGS} flash flash.c + $(STRIP) flash$(SUFFIX) getdate: getdate.c ${CC} ${CFLAGS} getdate getdate.c + $(STRIP) getdate$(SUFFIX) scut: scut.c ${CC} ${CFLAGS} scut scut.c + $(STRIP) scut$(SUFFIX) tee: tee.c ${CC} ${CFLAGS} tee tee.c + $(STRIP) tee$(SUFFIX) clean: - del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe scut.exe tee.exe + del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe scut.exe tee.exe Propchange: trunk/tools/RosBE/Tools/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Nov 21 16:49:44 2007 @@ -1,0 +1,1 @@ +*.exe Added: trunk/tools/RosBE/Tools/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/SVN-Readme.txt?r… ============================================================================== --- trunk/tools/RosBE/Tools/SVN-Readme.txt (added) +++ trunk/tools/RosBE/Tools/SVN-Readme.txt Wed Nov 21 16:49:44 2007 @@ -1,0 +1,9 @@ +This directory contains tools shared between RosBE-Windows and RosBE-Unix. + +For RosBE-Windows +------------------ + The built tools need to be copied to RosBE-Windows\Root\Tools + +For RosBE-Unix +--------------- + The source files of the tools need to be copied to RosBE-Unix/tools Propchange: trunk/tools/RosBE/Tools/SVN-Readme.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/cpucount.c?rev=3… ============================================================================== --- trunk/tools/RosBE/Tools/cpucount.c (added) +++ trunk/tools/RosBE/Tools/cpucount.c Wed Nov 21 16:49:44 2007 @@ -1,0 +1,69 @@ +/* + * PROJECT: ReactOS Build Environment Tools + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/cpucount.c + * PURPOSE: CPU Core Counter + * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> + * Copyright 2007 Colin Finck <mail(a)colinfinck.de> + * Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * + */ + +#if defined(WIN32) +# include <windows.h> +#elif defined(__APPLE__) +# include <sys/sysctl.h> +#else +# include <unistd.h> +#endif + +#include <stdio.h> +#include <string.h> + +int main(int argc, char *argv[]) +{ + int cpuCount = 0; + + if(argc > 2) + { + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + +#if defined(WIN32) + SYSTEM_INFO SystemInformation; + + GetSystemInfo(&SystemInformation); + cpuCount = SystemInformation.dwNumberOfProcessors; +#elif defined(__APPLE__) + size_t countSize = sizeof(cpuCount); + + sysctlbyname("hw.logicalcpu", &cpuCount, &countSize, NULL, 0); +#else + cpuCount = sysconf(_SC_NPROCESSORS_ONLN); +#endif + + if(argc != 1) + { + if(!strncmp(argv[1], "-x1", 3)) + { + cpuCount++; + } + else if(!strncmp(argv[1], "-x2", 3)) + { + cpuCount += cpuCount; + } + else + { + printf("Usage: %s [OPTIONS]\n", argv[0]); + printf("Running cpucount without options returns the number of\n"); + printf("processors in the system.\n"); + printf("-x1 - Number of processors in the system, plus 1.\n"); + printf("-x2 - Number of processors in the system, doubled.\n"); + return 0; + } + } + + printf("%u\n", cpuCount); + return 0; +} Propchange: trunk/tools/RosBE/Tools/cpucount.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/makefile?rev=306… ============================================================================== --- trunk/tools/RosBE/Tools/makefile (added) +++ trunk/tools/RosBE/Tools/makefile Wed Nov 21 16:49:44 2007 @@ -1,0 +1,27 @@ +# makefile - Simple makefile to build the various RosBE tools. + +.PHONY: all clean + +CC := gcc +CFLAGS := ${HOST_CFLAGS} -Wall -O2 -o +STRIP := strip + +ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) + # Windows host + RM := del /f + SUFFIX := .exe +else + # Unix host + RM := rm -f + SUFFIX := +endif + + +all: cpucount + +cpucount: cpucount.c + ${CC} ${CFLAGS} cpucount$(SUFFIX) cpucount.c + $(STRIP) cpucount$(SUFFIX) + +clean: + $(RM) cpucount$(SUFFIX) Propchange: trunk/tools/RosBE/Tools/makefile ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 30623: Update information about shell32, it has been forked at Wine-20071011
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Wed Nov 21 15:17:44 2007 New Revision: 30623 URL: http://svn.reactos.org/svn/reactos?rev=30623&view=rev Log: Update information about shell32, it has been forked at Wine-20071011 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Nov 21 15:17:44 2007 @@ -74,7 +74,7 @@ reactos/dll/win32/rsaenh # Autosync reactos/dll/win32/sensapi # Autosync reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shell32 # Synced to Wine-0_9_46 +reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync

1 0

[cwittich] 30622: adding back -enable-stdcall-fixup linkerflag
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 14:47:58 2007 New Revision: 30622 URL: http://svn.reactos.org/svn/reactos?rev=30622&view=rev Log: adding back -enable-stdcall-fixup linkerflag Modified: trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=30… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Wed Nov 21 14:47:58 2007 @@ -42,5 +42,6 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> + <linkerflag>-enable-stdcall-fixup</linkerflag> </project>

1 0

[fireball] 30621: - Slightly reformat.
by fireball＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: fireball Date: Wed Nov 21 14:21:07 2007 New Revision: 30621 URL: http://svn.reactos.org/svn/reactos?rev=30621&view=rev Log: - Slightly reformat. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.h (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.h Wed Nov 21 14:21:07 2007 @@ -499,18 +499,18 @@ /* Section 2.2 Host Controller Capability Registers */ #define HCS_DEBUG_PORT(p) (((p)>>20)&0xf) /* bits 23:20, debug port? */ #define HCS_INDICATOR(p) ((p)&(1 << 16)) /* true: has port indicators */ -#define HCS_N_CC(p) (((p)>>12)&0xf) /* bits 15:12, #companion HCs */ +#define HCS_N_CC(p) (((p)>>12)&0xf) /* bits 15:12, #companion HCs */ #define HCS_N_PCC(p) (((p)>>8)&0xf) /* bits 11:8, ports per CC */ #define HCS_PORTROUTED(p) ((p)&(1 << 7)) /* true: port routing */ #define HCS_PPC(p) ((p)&(1 << 4)) /* true: port power control */ #define HCS_N_PORTS(p) (((p)>>0)&0xf) /* bits 3:0, ports on HC */ #define HCC_EXT_CAPS(p) (((p)>>8)&0xff) /* for pci extended caps */ -#define HCC_ISOC_CACHE(p) ((p)&(1 << 7)) /* true: can cache isoc frame */ -#define HCC_ISOC_THRES(p) (((p)>>4)&0x7) /* bits 6:4, uframes cached */ +#define HCC_ISOC_CACHE(p) ((p)&(1 << 7)) /* true: can cache isoc frame */ +#define HCC_ISOC_THRES(p) (((p)>>4)&0x7) /* bits 6:4, uframes cached */ #define HCC_CANPARK(p) ((p)&(1 << 2)) /* true: can park on async qh */ #define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1)) /* true: periodic_size changes*/ -#define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */ +#define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */ /* 23:16 is r/w intr rate, in microframes; default "8" == 1/msec */ #define CMD_PARK (1<<11) /* enable "park" on async qh */

1 0

[fireball] 30620: - Remove stupid and greatly broken "let's wait in a loop, while querying current time" by calls to KeDelayExecutionThread().
by fireball＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: fireball Date: Wed Nov 21 14:18:15 2007 New Revision: 30620 URL: http://svn.reactos.org/svn/reactos?rev=30620&view=rev Log: - Remove stupid and greatly broken "let's wait in a loop, while querying current time" by calls to KeDelayExecutionThread(). Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c Wed Nov 21 14:18:15 2007 @@ -1014,80 +1014,24 @@ VOID usb_wait_ms_dpc(ULONG ms) { - LARGE_INTEGER start; - LARGE_INTEGER ticker; - LARGE_INTEGER freq; - ULONG interval; - ULONG expire_count; - - KeQueryPerformanceCounter(&freq); - - expire_count = 2000000; - if (cpu_clock_freq) - expire_count = (cpu_clock_freq / 1000) * ms; - - if (usb_query_clicks(&start) == FALSE) - { - ticker.QuadPart = 0; - while (TRUE) - { - KeQuerySystemTime(&ticker); - interval = ticker.LowPart - start.LowPart; - if (interval >= ms * 10000) - break; - } - } - else - { - ticker.QuadPart = 0; - while (TRUE) - { - usb_query_clicks(&ticker); - interval = ticker.LowPart - start.LowPart; - if (interval >= expire_count) - break; - } - } + LARGE_INTEGER Interval; + if (ms <= 0) + return; + + Interval.QuadPart = -ms * 10000; + KeDelayExecutionThread(KernelMode, FALSE, &Interval); } VOID usb_wait_us_dpc(ULONG us) { - LARGE_INTEGER start; - LARGE_INTEGER ticker; - LARGE_INTEGER freq; - ULONG interval; - ULONG expire_count; - - KeQueryPerformanceCounter(&freq); - - expire_count = 2000000; - if (cpu_clock_freq) - expire_count = (cpu_clock_freq / 1000000) * us; - - if (usb_query_clicks(&start) == FALSE) - { - ticker.QuadPart = 0; - while (TRUE) - { - KeQuerySystemTime(&ticker); - interval = ticker.LowPart - start.LowPart; - if (interval >= us * 10) - break; - } - } - else - { - ticker.QuadPart = 0; - while (TRUE) - { - usb_query_clicks(&ticker); - interval = ticker.LowPart - start.LowPart; - if (interval >= expire_count) - break; - } - } + LARGE_INTEGER Interval; + if (us <= 0) + return; + + Interval.QuadPart = -us; + KeDelayExecutionThread(KernelMode, FALSE, &Interval); } VOID

1 0

[fireball] 30619: - Implement some roothub URB handling, and generic URB completion (copied from EHCI's). - Now OHCI is able to read ports statuses, and even discovers a low-speed device connected to the port, however port status clearing doesn't seem to work.
by fireball＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: fireball Date: Wed Nov 21 14:15:43 2007 New Revision: 30619 URL: http://svn.reactos.org/svn/reactos?rev=30619&view=rev Log: - Implement some roothub URB handling, and generic URB completion (copied from EHCI's). - Now OHCI is able to read ports statuses, and even discovers a low-speed device connected to the port, however port status clearing doesn't seem to work. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Wed Nov 21 14:15:43 2007 @@ -990,6 +990,7 @@ PHUB2_EXTENSION hub_ext; PUSB_PORT_STATUS ps, psret; UCHAR port_count; + ULONG i; USE_NON_PENDING_IRQL; if (pdev == NULL || purb == NULL) @@ -1028,32 +1029,29 @@ ps = &hub_ext->rh_port_status[psetup->wIndex]; psret = (PUSB_PORT_STATUS) purb->data_buffer; -#if 0 - i = EHCI_PORTSC + 4 * (psetup->wIndex - 1); // USBPORTSC1; - status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); - ps = &hub_ext->rh_port_status[psetup->wIndex]; - - psret = (PUSB_PORT_STATUS) purb->data_buffer; + status = + OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[psetup->wIndex-1]); + ps->wPortStatus = 0; - if (status & PORT_CCS) + if (status & RH_PS_CCS) { ps->wPortStatus |= USB_PORT_STAT_CONNECTION; } - if (status & PORT_PE) + if (status & RH_PS_PES) { ps->wPortStatus |= USB_PORT_STAT_ENABLE; - ps->wPortStatus |= USB_PORT_STAT_HIGH_SPEED; // ehci spec + //ps->wPortStatus |= USB_PORT_STAT_HIGH_SPEED; // ehci spec } - if (status & PORT_PR) + if (status & RH_PS_PRS) { ps->wPortStatus |= USB_PORT_STAT_RESET; } - if (status & PORT_SUSP) + if (status & RH_PS_PSS) { ps->wPortStatus |= USB_PORT_STAT_SUSPEND; } - if (PORT_USB11(status)) + if (status & RH_PS_LSDA) { ps->wPortStatus |= USB_PORT_STAT_LOW_SPEED; } @@ -1062,15 +1060,15 @@ ps->wPortStatus |= USB_PORT_STAT_POWER; //now set change field - if ((status & PORT_CSC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) + if ((status & RH_PS_CSC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) { ps->wPortChange |= USB_PORT_STAT_C_CONNECTION; } - if ((status & PORT_PEC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) + if ((status & RH_PS_PESC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) { ps->wPortChange |= USB_PORT_STAT_C_ENABLE; } -#endif + //don't touch other fields, might be filled by //other function @@ -1093,8 +1091,8 @@ purb->status = STATUS_INVALID_PARAMETER; break; } -#if 0 - i = EHCI_PORTSC + 4 * (psetup->wIndex - 1); // USBPORTSC1; + + i = psetup->wIndex - 1; ps = &hub_ext->rh_port_status[psetup->wIndex]; purb->status = STATUS_SUCCESS; @@ -1102,19 +1100,19 @@ { case USB_PORT_FEAT_C_CONNECTION: { - SET_RH2_PORTSTAT(i, USBPORTSC_CSC); - status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + OHCI_WRITE_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i], RH_PS_CSC); + status = OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i]); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): clear csc, port%d=0x%x\n", psetup->wIndex)); + ("ohci_rh_submit_urb(): clear csc, port%d=0x%x\n", psetup->wIndex, status)); ps->wPortChange &= ~USB_PORT_STAT_C_CONNECTION; break; } case USB_PORT_FEAT_C_ENABLE: { - SET_RH2_PORTSTAT(i, USBPORTSC_PEC); - status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + OHCI_WRITE_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i], RH_PS_PESC); + status = OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i]); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): clear pec, port%d=0x%x\n", psetup->wIndex)); + ("ohci_rh_submit_urb(): clear pec, port%d=0x%x\n", psetup->wIndex, status)); ps->wPortChange &= ~USB_PORT_STAT_C_ENABLE; break; } @@ -1125,23 +1123,23 @@ // enable or not is set by host controller // status = EHCI_READ_PORT_ULONG( ( PUSHORT ) ( ehci->port_base + i ) ); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): clear pr, enable pe, port%d=0x%x\n", - psetup->wIndex)); + ("ohci_rh_submit_urb(): clear pr, enable pe, port%d=0x%x\n", + psetup->wIndex, 0)); break; } case USB_PORT_FEAT_ENABLE: { ps->wPortStatus &= ~USB_PORT_STAT_ENABLE; - CLR_RH2_PORTSTAT(i, USBPORTSC_PE); - status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + OHCI_WRITE_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i], RH_PS_PES); + status = OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i]); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): clear pe, port%d=0x%x\n", psetup->wIndex)); + ("ohci_rh_submit_urb(): clear pe, port%d=0x%x\n", psetup->wIndex, status)); break; } default: purb->status = STATUS_UNSUCCESSFUL; } -#endif + break; } else if (psetup->bmRequestType == 0xd3 && psetup->bRequest == HUB_REQ_GET_STATE) @@ -1170,7 +1168,7 @@ { purb->status = STATUS_INVALID_PARAMETER; ehci_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): set feature with wValue=0x%x\n", psetup->wValue)); + ("ohci_rh_submit_urb(): set feature with wValue=0x%x\n", psetup->wValue)); break; } @@ -1187,7 +1185,7 @@ OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[psetup->wIndex-1]); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): reset port, port%d=0x%x\n", psetup->wIndex, status)); + ("ohci_rh_submit_urb(): reset port, port%d=0x%x\n", psetup->wIndex, status)); InsertTailList(&dev_mgr->timer_svc_list, &ptimer->timer_svc_link); purb->status = STATUS_PENDING; } @@ -1294,7 +1292,7 @@ else purb->bytes_to_transfer = purb->data_length; - ehci_dbg_print(DBGLVL_MEDIUM, ("ehci_submit_urb(): bytes_to_transfer=0x%x\n", purb->bytes_to_transfer)); + ehci_dbg_print(DBGLVL_MEDIUM, ("ohci_submit_urb(): bytes_to_transfer=0x%x\n", purb->bytes_to_transfer)); purb->bytes_transfered = 0; InitializeListHead(&purb->trasac_list); @@ -1419,7 +1417,87 @@ VOID ohci_generic_urb_completion(PURB purb, PVOID context) { - DbgPrint("ohci_generic_urb_completion called, but not implemented!\n"); + PUSB_DEV pdev; + BOOLEAN is_ctrl = FALSE; + USE_NON_PENDING_IRQL; + + old_irql = KeGetCurrentIrql(); + if (old_irql > DISPATCH_LEVEL) + TRAP(); + + if (old_irql < DISPATCH_LEVEL) + KeRaiseIrql(DISPATCH_LEVEL, &old_irql); + + pdev = purb->pdev; + if (purb == NULL) + goto LBL_LOWER_IRQL; + + if (pdev == NULL) + goto LBL_LOWER_IRQL; + + lock_dev(pdev, TRUE); + + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + // no need to do following statistics + unlock_dev(pdev, TRUE); + goto LBL_CLIENT_PROCESS; + } + if (usb_error(purb->status)) + { + pdev->error_count++; + } + + if (purb->pendp == &pdev->default_endp) + { + if (usb_halted(purb->status)) + { + pdev->time_out_count++; + if (pdev->time_out_count > 3) + { + dev_set_state(pdev, USB_DEV_STATE_ZOMB); + ohci_dbg_print(DBGLVL_MAXIMUM, + ("ohci_generic_urb_completion(): contiguous error 3 times, dev 0x%x is deactivated\n", + pdev)); + } + } + else + pdev->time_out_count = 0; + + } + + if (endp_type(purb->pendp) == USB_ENDPOINT_XFER_CONTROL) + is_ctrl = TRUE; + + unlock_dev(pdev, TRUE); + + LBL_CLIENT_PROCESS: + if (!is_ctrl) + { + if (purb->completion) + purb->completion(purb, context); + } + else + { + if (purb->ctrl_req_context.ctrl_stack_count == 0) + { + if (purb->completion) + purb->completion(purb, context); + } + else + { + // pstack = &purb->ctrl_req_stack[ purb->ctrl_req_context.ctrl_cur_stack ]; + // if( pstack->urb_completion ) + // pstack->urb_completion( purb, pstack->context ); + usb_call_ctrl_completion(purb); + } + } + + LBL_LOWER_IRQL: + if (old_irql < DISPATCH_LEVEL) + KeLowerIrql(old_irql); + + return; } BOOLEAN

1 0

[cwittich] 30618: fix some PREfast warnings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 14:09:47 2007 New Revision: 30618 URL: http://svn.reactos.org/svn/reactos?rev=30618&view=rev Log: fix some PREfast warnings Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c trunk/reactos/drivers/storage/ide/pciidex/pciidex.h Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/miniport.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/miniport.c Wed Nov 21 14:09:47 2007 @@ -12,6 +12,7 @@ #define INITGUID #include "pciidex.h" +static DRIVER_DISPATCH PciIdeXForwardOrIgnore; static NTSTATUS NTAPI PciIdeXForwardOrIgnore( IN PDEVICE_OBJECT DeviceObject, @@ -43,6 +44,7 @@ } } +static DRIVER_DISPATCH PciIdeXPnpDispatch; static NTSTATUS NTAPI PciIdeXPnpDispatch( IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pciidex.h (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.h Wed Nov 21 14:09:47 2007 @@ -40,6 +40,7 @@ /* fdo.c */ +DRIVER_ADD_DEVICE PciIdeXAddDevice; NTSTATUS NTAPI PciIdeXAddDevice( IN PDRIVER_OBJECT DriverObject, @@ -52,6 +53,7 @@ /* misc.c */ +IO_COMPLETION_ROUTINE PciIdeXGenericCompletion; NTSTATUS NTAPI PciIdeXGenericCompletion( IN PDEVICE_OBJECT DeviceObject,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs