Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49099: [CMAKE] Add CMAKE_RC_CREATE_SHARED_LIBRARY for msvc (simply copied from gcc atm)
by tkreuzer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: tkreuzer Date: Sun Oct 10 16:17:40 2010 New Revision: 49099 URL: http://svn.reactos.org/svn/reactos?rev=49099&view=rev Log: [CMAKE] Add CMAKE_RC_CREATE_SHARED_LIBRARY for msvc (simply copied from gcc atm) Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=490… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Oct 10 16:17:40 2010 @@ -13,6 +13,9 @@ add_definitions(/GS- /Zl /Zi) add_definitions(-Dinline=__inline -D__STDC__=1) + +set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + macro(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") @@ -78,4 +81,4 @@ list(APPEND OBJECTS ${OBJECT}) endforeach() add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) -endmacro() +endmacro()

1 0

[tkreuzer] 49098: [WINEBUILD] - add getpid() for MSC. Looks like some MSC versions don't have it in the msvcrt import lib.
by tkreuzer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: tkreuzer Date: Sun Oct 10 15:58:09 2010 New Revision: 49098 URL: http://svn.reactos.org/svn/reactos?rev=49098&view=rev Log: [WINEBUILD] - add getpid() for MSC. Looks like some MSC versions don't have it in the msvcrt import lib. Added: branches/cmake-bringup/tools/winebuild/getpid.c (with props) Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/C… ============================================================================== --- branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] Sun Oct 10 15:58:09 2010 @@ -18,7 +18,7 @@ add_definitions(-Dpopen=_popen) endif() if(MSVC) - list(APPEND SOURCE getopt.c) + list(APPEND SOURCE getopt.c getpid.c) include_directories(include) endif() Added: branches/cmake-bringup/tools/winebuild/getpid.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/g… ============================================================================== --- branches/cmake-bringup/tools/winebuild/getpid.c (added) +++ branches/cmake-bringup/tools/winebuild/getpid.c [iso-8859-1] Sun Oct 10 15:58:09 2010 @@ -1,0 +1,7 @@ + +int __declspec(dllimport) __stdcall GetCurrentProcessId(void); + +int getpid(void) +{ + return GetCurrentProcessId(); +} Propchange: branches/cmake-bringup/tools/winebuild/getpid.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 49097: really fix the branch now
by gadamopoulos＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: gadamopoulos Date: Sun Oct 10 14:49:45 2010 New Revision: 49097 URL: http://svn.reactos.org/svn/reactos?rev=49097&view=rev Log: really fix the branch now Added: branches/Tree-restructure-test/sdk/include/crt/ - copied from r48976, trunk/reactos/include/crt/ branches/Tree-restructure-test/sdk/include/host/ - copied from r48976, trunk/reactos/include/host/ branches/Tree-restructure-test/sdk/include/psdk/ - copied from r48976, trunk/reactos/include/psdk/ branches/Tree-restructure-test/sdk/include/reactos/ - copied from r48976, trunk/reactos/include/reactos/ branches/Tree-restructure-test/sdk/libs/atl/ - copied from r48976, trunk/reactos/lib/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ - copied from r48976, trunk/reactos/lib/cmlib/ branches/Tree-restructure-test/sdk/libs/debugsup/ - copied from r48976, trunk/reactos/lib/debugsup/ branches/Tree-restructure-test/sdk/libs/libxml2/ - copied from r48976, trunk/reactos/lib/3rdparty/libxml2/ branches/Tree-restructure-test/sdk/libs/mingw/ - copied from r48976, trunk/reactos/lib/3rdparty/mingw/ branches/Tree-restructure-test/sdk/libs/pseh/ - copied from r48976, trunk/reactos/lib/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ - copied from r48976, trunk/reactos/lib/rossym/ branches/Tree-restructure-test/sdk/libs/wcsfuncs/ - copied from r48976, trunk/reactos/lib/host/wcsfuncs/ branches/Tree-restructure-test/sdk/libs/zlib/ - copied from r48976, trunk/reactos/lib/3rdparty/zlib/ branches/Tree-restructure-test/sdk/tools/buildno/ - copied from r48976, trunk/reactos/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ - copied from r48976, trunk/reactos/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ - copied from r48976, trunk/reactos/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ - copied from r48976, trunk/reactos/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/gendib/ - copied from r48976, trunk/reactos/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ - copied from r48976, trunk/reactos/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ - copied from r48976, trunk/reactos/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ - copied from r48976, trunk/reactos/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/log2lines/ - copied from r48976, trunk/reactos/tools/log2lines/ branches/Tree-restructure-test/sdk/tools/mkhive/ - copied from r48976, trunk/reactos/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ - copied from r48976, trunk/reactos/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nandflash/ - copied from r48976, trunk/reactos/tools/nandflash/ branches/Tree-restructure-test/sdk/tools/nci/ - copied from r48976, trunk/reactos/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ - copied from r48976, trunk/reactos/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pipetools/ - copied from r48976, trunk/reactos/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ - copied from r48976, trunk/reactos/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ - copied from r48976, trunk/reactos/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ - copied from r48976, trunk/reactos/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ - copied from r48976, trunk/reactos/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ - copied from r48976, trunk/reactos/tools/rsym/ branches/Tree-restructure-test/sdk/tools/sysgen/ - copied from r48976, trunk/reactos/tools/sysgen/ branches/Tree-restructure-test/sdk/tools/unicode/ - copied from r48976, trunk/reactos/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ - copied from r48976, trunk/reactos/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ - copied from r48976, trunk/reactos/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ - copied from r48976, trunk/reactos/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ - copied from r48976, trunk/reactos/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ - copied from r48976, trunk/reactos/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/ - copied from r48976, trunk/reactos/tools/wrc/ Modified: branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h branches/Tree-restructure-test/sdk/tools/rbuild/test.h Modified: branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] Sun Oct 10 14:49:45 2010 @@ -25,11 +25,11 @@ BUILDNO_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o)) -BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Iinclude/reactos $(TOOLS_CPPFLAGS) +BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Isdk/include/reactos $(TOOLS_CPPFLAGS) BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS) -BUILDNO_VERSION = include$(SEP)reactos$(SEP)version.h +BUILDNO_VERSION = sdk$(SEP)include$(SEP)reactos$(SEP)version.h .PHONY: buildno buildno: $(BUILDNO_TARGET) @@ -52,6 +52,6 @@ #.PHONY: $(BUILDNO_TARGET) $(BUILDNO_H): $(BUILDNO_TARGET) - ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos 2>$(NUL) $(ECHO_BUILDNO) $(Q)$(BUILDNO_TARGET) $(BUILDNO_QUIET) $(BUILDNO_H) Modified: branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Oct 10 14:49:45 2010 @@ -358,13 +358,13 @@ GenerateGlobalVariables (); GenerateXmlBuildFilesMacro (); ProcessModules (); - GenerateInstallTarget (); - GenerateTestTarget (); +// GenerateInstallTarget (); +// GenerateTestTarget (); GenerateDirectoryTargets (); GenerateDirectories (); - GenerateTestSupportCode (); +// GenerateTestSupportCode (); GenerateCompilationUnitSupportCode (); - GenerateSysSetup (); +// GenerateSysSetup (); GenerateProxyMakefiles (); CheckAutomaticDependencies (); CloseMakefile (); @@ -429,9 +429,9 @@ void MingwBackend::GenerateGlobalVariables () const { - fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", ProjectNode.GetLinkerSet ().c_str () ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", ProjectNode.GetCompilerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)rules.mak\n", RBUILD_BASE ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetLinkerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetCompilerSet ().c_str () ); if ( mscPath.length() ) fprintf ( fMakefile, "export RBUILD_CL_PATH=%s\n", mscPath.c_str () ); @@ -1092,8 +1092,8 @@ if ( ProjectNode.configuration.Compiler == GnuGcc ) { printf ( "Detecting compiler -pipe support..." ); - - string pipe_detection = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; + string rbuild_base = RBUILD_BASE; + string pipe_detection = rbuild_base + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection, ".o" ); string command = ssprintf ( @@ -1130,7 +1130,8 @@ if ( configuration.PrecompiledHeadersEnabled && ProjectNode.configuration.Compiler == GnuGcc ) { - string path = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; + string rbuild_base = RBUILD_BASE; + string path = rbuild_base + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; string cmd = ssprintf ( "%s -c %s 1>%s 2>%s", FixSeparatorForSystemCommand(compilerCommand).c_str (), Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] Sun Oct 10 14:49:45 2010 @@ -67,6 +67,10 @@ #define DEF_SSEP "/" #define DEF_SBAD_SEP "\\" #endif + +#define SSEP DEF_SSEP +#define TOOLS_BASE "sdk" SSEP "tools" SSEP +#define RBUILD_BASE TOOLS_BASE "rbuild" SSEP #define MS_VS_DEF_VERSION "9.00" Modified: branches/Tree-restructure-test/sdk/tools/rbuild/test.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] Sun Oct 10 14:49:45 2010 @@ -20,10 +20,6 @@ #include "rbuild.h" #include "backend/mingw/mingw.h" - -#define SSEP DEF_SSEP - -#define RBUILD_BASE "tools" SSEP "rbuild" SSEP class BaseTest {

1 0

[dreimer] 49096: Replace \" with "" in resource files. This makes CMAKE build way more silent. Needs to be merged. TBD find a way to silent warnings happening due to \n in strings.
by dreimer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: dreimer Date: Sun Oct 10 14:45:03 2010 New Revision: 49096 URL: http://svn.reactos.org/svn/reactos?rev=49096&view=rev Log: Replace \" with "" in resource files. This makes CMAKE build way more silent. Needs to be merged. TBD find a way to silent warnings happening due to \n in strings. Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/dll/win32/modemui/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/bg-BG.rc trunk/reactos/dll/win32/netid/lang/cs-CZ.rc trunk/reactos/dll/win32/netid/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/el-GR.rc trunk/reactos/dll/win32/netid/lang/en-US.rc trunk/reactos/dll/win32/netid/lang/es-ES.rc trunk/reactos/dll/win32/netid/lang/fr-FR.rc trunk/reactos/dll/win32/netid/lang/id-ID.rc trunk/reactos/dll/win32/netid/lang/it-IT.rc trunk/reactos/dll/win32/netid/lang/ja-JP.rc trunk/reactos/dll/win32/netid/lang/nl-NL.rc trunk/reactos/dll/win32/netid/lang/no-NO.rc trunk/reactos/dll/win32/netid/lang/pl-PL.rc trunk/reactos/dll/win32/netid/lang/ru-RU.rc trunk/reactos/dll/win32/netid/lang/sk-SK.rc trunk/reactos/dll/win32/netid/lang/uk-UA.rc trunk/reactos/dll/win32/rasdlg/lang/en-US.rc trunk/reactos/dll/win32/rasdlg/lang/no-NO.rc trunk/reactos/dll/win32/rasdlg/lang/pl-PL.rc trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc trunk/reactos/dll/win32/tapiui/lang/de-DE.rc trunk/reactos/dll/win32/tapiui/lang/en-US.rc trunk/reactos/dll/win32/tapiui/lang/no-NO.rc trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -9,7 +9,7 @@ BEGIN LTEXT "Âàñ ïðèâåòñòâóåò ïðîãðàììà óñòàíîâêè ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Óñòàíîâêó ReactOS ìîæíî ïðîèçâîäèòü òîëüêî çàãðóçèâøèñü ñ ýòîãî äèñêà! Ïîñëå ïåðåçàïóñêà êîìïüþòåðà âûáåðèòå çàãðóçêó ñ CD è íà÷íèòå óñòàíîâêó ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Íàæìèòå êíîïêó \"Çàâåðøèòü\" äëÿ âûõîäà.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Íàæìèòå êíîïêó ""ÇàâåðøèòüW"" äëÿ âûõîäà.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -22,7 +22,7 @@ CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 CONTROL "Ðàñêëàäêà êëàâèàòóðû:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 - LTEXT "Äëÿ âûáîðà òèïà óñòàíîâêè íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Äëÿ âûáîðà òèïà óñòàíîâêè íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,297, 10 END IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -33,7 +33,7 @@ CONTROL "Òèï óñòàíîâêè", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 CONTROL "Óñòàíîâêà ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 CONTROL "Âîññòàíîâèòü èëè èçìåíèòü óñòàíîâëåííûé ðàíåå ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -48,7 +48,7 @@ CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "Êëàâèàòóðà:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -62,7 +62,7 @@ PUSHBUTTON "&Óäàëèòü", IDC_PARTDELETE, 76,155,50,15 PUSHBUTTON "Ä&ðàéâåð", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED PUSHBUTTON "&Äîïîëíèòåëüíûå ïàðàìåòðû...", IDC_PARTMOREOPTS, 176,155,122,15 - LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 @@ -103,7 +103,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -126,9 +126,9 @@ CONTROL "Çàâåðøåíèå ïåðâîãî ýòàïà óñòàíîâêè ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Ïåðâûé ýòàï óñòàíîâêè ReactOS çàêîí÷åí.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Ïîñëå íàæàòèÿ êëàâèøè \"Çàâåðøèòü\" âàø êîìïüþòåð áóäåò ïåðåçàãðóæåí.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Ïîñëå íàæàòèÿ êëàâèøè ""Çàâåðøèòü"" âàø êîìïüþòåð áóäåò ïåðåçàãðóæåí.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Âû ìîæåòå èçâëå÷ü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà íàæìèòå êëàâèøó \"Çàâåðøèòü\".", IDC_STATIC, 10, 176, 297, 20 + LTEXT "Âû ìîæåòå èçâëå÷ü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà íàæìèòå êëàâèøó ""Çàâåðøèòü"".", IDC_STATIC, 10, 176, 297, 20 END STRINGTABLE Modified: trunk/reactos/dll/win32/modemui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/modemui/lang/de-DE.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -282,7 +282,7 @@ 402 "Warnung" 460 "Es ist nicht genügend Arbeitsspeicher verfügbar, um das allgemeine Eigenschaftenfenster anzuzeigen.\nSchließen Sie einige Dateien, und wiederholen Sie den Vorgang." 461 "Es ist nicht genügend Arbeitsspeicher verfügbar, um das Eigenschaftenfenster für Modemeinstellungen anzuzeigen.\nSchließen Sie einige Dateien, und wiederholen Sie den Vorgang." - 463 "Jede Anrufadresse muss auf \"Automatisch\" gesetzt oder einem eindeutigen Rufsignal zugeordnet werden.\n\nÄndern Sie die doppelt vergebene Rufsignale in andere." + 463 "Jede Anrufadresse muss auf ""Automatisch"" gesetzt oder einem eindeutigen Rufsignal zugeordnet werden.\n\nÄndern Sie die doppelt vergebene Rufsignale in andere." 465 "Standard-EC" 466 "Erzwungenes EC" 467 "Mobil" @@ -331,7 +331,7 @@ 558 "Belgisch National (selten verwendet)" 559 "Australisch National (selten verwendet)" 560 "Unbekanntes Vermittlungsprotokoll" - 570 "Die ISDN-Konfiguration für dieses Modem ist\nnoch nicht vollständig.\n\nFüllen Sie die Informationen in der Registerkarte\n\"ISDN\" aus, bevor Sie das Modem verwenden." + 570 "Die ISDN-Konfiguration für dieses Modem ist\nnoch nicht vollständig.\n\nFüllen Sie die Informationen in der Registerkarte\n""ISDN"" aus, bevor Sie das Modem verwenden." 600 "PPP (56K,GSM)" 601 "PPP (64K,GSM)" 602 "V.120 (64K,GSM)" Modified: trunk/reactos/dll/win32/netid/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/bg-BG… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/bg-BG.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Çàáåëåæêà: Ñàìî óïðàâíèöèòå ìîãàò äà ïðîìåíÿò îïîçíàâàòåëèòå íà êîìïþòúðà." 1022 "Çàáåëåæêà: Îïîçíàâàòåëÿò íà êîìïþòúðà íå ìîæå äà áúäå ñìåíåí, çàùîòî:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Ïî&äðîáíîñòè >>" 3220 "<< &Ïî&äðîáíîñòè" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/cs-CZ… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/cs-CZ.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -75,7 +75,7 @@ 25 "Lze zmìnit název a èlenství tohoto poèítaèe. Zmìny mohou mít vliv na pøístup k síovým prostøedkùm." 1021 "Poznámka: Identifikaci tohoto poèítaèe mohou zmìnit pouze administrátoøi." 1022 "Poznámka: Identifikace poèítaèe nemùe být zmìnìna z následujících dùvodù:" - 1030 "Nový název poèítaèe ""%s"" obsahuje nepovolené znaky. Mezi nepovolené znaky patøí ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / ?" + 1030 "Nový název poèítaèe ""%s"" obsahuje nepovolené znaky. Mezi nepovolené znaky patøí ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ?" 3210 "&Detaily >>" 3220 "<< &Detaily" 4000 "Informace" Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -78,7 +78,7 @@ 25 "Sie können den Namen und die Zugehörigkeit dieses Computers ändern. Änderungen können sich auf den Zugriff auf Netzwerkressourcen auswirken." 1021 "Hinweis: Nur Administratoren können die Identifikation des Computers ändern." 1022 "Hinweis: Die Identifikation des Computers kann aus folgendem Grund nicht geändert werden:" - 1030 "Der Computername ""%s"" enthält unerlaubte Zeichen. Unerlaubte Zeichen sind ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / und ?" + 1030 "Der Computername ""%s"" enthält unerlaubte Zeichen. Unerlaubte Zeichen sind ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / und ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/el-GR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/el-GR.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/en-US… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/en-US.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/es-ES… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/es-ES.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -75,7 +75,7 @@ 25 "Puede cambiar el nombre y la pertenencia de este grupo. Los cambios pueden afectar el acceso a los recursos de red." 1021 "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo." 1022 "Nota: La identificación de este equipo no puede ser cambiada porque:" - 1030 "El nuevo nombre de equipo ""%s"" contiene caracteres no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / y ?" + 1030 "El nuevo nombre de equipo ""%s"" contiene caracteres no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / y ?" 3210 "&Detalles >>" 3220 "<< &Detalles" 4000 "Información" Modified: trunk/reactos/dll/win32/netid/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/fr-FR.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur." 1022 "Note : L'identification de l'ordinateur ne peut pas être modifiée car :" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Détails >>" 3220 "<< &Détails" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/id-ID… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/id-ID.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/it-IT… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/it-IT.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -71,7 +71,7 @@ 25 "Potete modificare il nome e il dominio di questo computer. Le modifiche potrebbero influenzare l'accesso alle risorse di rete." 1021 "Nota: Solo gli Amministratori possono cambiare l'identificazione di questo computer." 1022 "Nota: L'identificazione di questo computer non può essere cambiata perchè:" - 1030 "Il nuovo nome del computer ""%s"" contiene dei caratteri non permessi. I caratteri vietati sono `? ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / " + 1030 "Il nuovo nome del computer ""%s"" contiene dei caratteri non permessi. I caratteri vietati sono `? ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / " 3210 "&Dettagli >>" 3220 "<< &Dettagli" 4000 "Informazioni" Modified: trunk/reactos/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "±ÌRs[^Ì¼OÆoVbvðÏXÅ«Ü·BÏX·éÆlbg[N \\[XÖÌANZXÉe¿·éÂ\\«ª èÜ·B" 1021 "Ó: ±ÌRs[^Ì ID ðÏXÅ«éÌÍÇÒÌÝÅ·B" 1022 "Ó: ÌRÉæèA±ÌRs[^Ì ID ðÏXÅ«Ü¹ñ:" - 1030 "Vµ¢Rs[^¼ ""%s"" ÉÍAgpÅ«È¢È¶ªÜÜêÄ¢Ü·BgpÅ«È¢¶Í ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / ? Å·B" + 1030 "Vµ¢Rs[^¼ ""%s"" ÉÍAgpÅ«È¢È¶ªÜÜêÄ¢Ü·BgpÅ«È¢¶Í ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ? Å·B" 3210 "Ú×(&D) >>" 3220 "<< Ú×(&D)" 4000 "îñ" Modified: trunk/reactos/dll/win32/netid/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/nl-NL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Let op: Alleen Administrators mogen de indentificatie van deze computer aanpassen." 1022 "Let op: De indentificatie van deze computer kan niet gewijzigd worden omdat:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/no-NO… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/no-NO.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "OBS: Bare administratorer kan endre identifisering for denne datamaskinen." 1022 "OBS: Identifisering for datamaskinen kunne ikke endres fordi:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Detaljer >>" 3220 "<< &Detaljer" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -78,7 +78,7 @@ 25 "Mo¿esz zmieniæ nazwê i cz³onkostwo tego komputera. Zmiany mog¹ mieæ wp³yw na dostêp do zasobów sieciowych." 1021 "Uwaga: Tylko Administratorzy mog¹ zmieniaæ identyfikator tego komputera." 1022 "Uwaga: Identyfikator tego komputera nie zosta³ zmieniony, powód:" - 1030 "Nowa nazwa komputera ""%s"" zawiera niedozwolone znaki. Do niedozwolonych znaków nale¿¹ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / oraz ?" + 1030 "Nowa nazwa komputera ""%s"" zawiera niedozwolone znaki. Do niedozwolonych znaków nale¿¹ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / oraz ?" 3210 "&Szczegó³y >>" 3220 "<< &Szczegó³y" 4000 "Informacja" Modified: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -70,7 +70,7 @@ 25 "Ìîæíî èçìåíèòü èìÿ è ïðèíàäëåæíîñòü ýòîãî êîìïüþòåðà. Èçìåíåíèÿ ìîãóò ïîâëèÿòü íà äîñòóï ê ñåòåâûì ðåñóðñàì." 1021 "Ïðèìå÷àíèå: òîëüêî àäìèíèñòðàòîðû ìîãóò èçìåíèòü èäåíòèôèêàöèþ ýòîãî êîìïüþòåðà." 1022 "Ïðèìå÷àíèå: èäåíòèôèêàöèÿ ýòîãî êîìïüþòåðà íå ìîæåò áûòü èçìåíåíà, ïîòîìó ÷òî:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Ïîäðîáíî >>" 3220 "<< &Ïîäðîáíî" 4000 "Èíôîðìàöèÿ" Modified: trunk/reactos/dll/win32/netid/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/sk-SK… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/sk-SK.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -77,7 +77,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Poznámka: Iba správcovia môu zmeni identifikáciu tohto poèítaèa." 1022 "Poznámka: Identifikácia poèítaèa nemôe by zmenená, lebo:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Podrobnosti >>" 3220 "<< &Podrobnosti" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/uk-UA.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -78,7 +78,7 @@ 25 "Ìîæíà çí³íèòè ³ì'ÿ ³ ÷ëåíñòâî öüîãî êîìï'þòåðà. Çì³íè ìîæóòü âïëèíóòè íà äîñòóï äî ìåðåæíèõ ðåñóðñ³â." 1021 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà ìîæóòü ëèøå àäì³í³ñòðàòîðè." 1022 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà íåìîæëèâî, îñê³ëüêè:" - 1030 "Íîâå ³ì'ÿ êîìï'þòåðà ""%s"" ì³ñòèòü íåäîïóñòèì³ ñèìâîëè. Äî íåäîïóñòèìèõ ñèìâîë³â íàëåæàòü ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / òà ?" + 1030 "Íîâå ³ì'ÿ êîìï'þòåðà ""%s"" ì³ñòèòü íåäîïóñòèì³ ñèìâîëè. Äî íåäîïóñòèìèõ ñèìâîë³â íàëåæàòü ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / òà ?" 3210 "&Ïîäðîáèö³ >>" 3220 "<< &Ïîäðîáèö³" 4000 "²íôîðìàö³ÿ" Modified: trunk/reactos/dll/win32/rasdlg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/en-US.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -695,7 +695,7 @@ COMBOBOX 1551, 16, 169, 128, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "C&onfigure...", 1293, 150, 168, 60, 14 PUSHBUTTON "&X.25", 1295, 7, 194, 50, 14 - PUSHBUTTON "&Virtual \"tunnel\" connection", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "&Virtual ""tunnel"" connection", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED END 168 DIALOGEX 0, 0, 317, 143 @@ -706,7 +706,7 @@ LTEXT "Type the phone number below. ", -1, 7, 4, 306, 14 LTEXT "&Phone number:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "You might need to include a \"1\" or the area code, or both. If you are not sure you need the extra numbers, dial the phone number on your telephone. If you hear a modem sound, the number dialed is correct.", -1, 20, 50, 291, 53 + LTEXT "You might need to include a ""1"" or the area code, or both. If you are not sure you need the extra numbers, dial the phone number on your telephone. If you hear a modem sound, the number dialed is correct.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 @@ -1843,7 +1843,7 @@ 200 "Comment\0" 201 "The custom authentication package configuration failed.\0" 202 "TCP/IP is not installed or is disabled for Routing and Remote Access. In Control Panel, start Network, go to the Services page, choose 'Routing and Remote Access Service' Properties, and press the Network button.\0" - 203 "IPX is not installed or is disabled for Routing and Remote Access. You can install/enable IPX by viewing the properties of any connection in \"Connections\" folder.\0" + 203 "IPX is not installed or is disabled for Routing and Remote Access. You can install/enable IPX by viewing the properties of any connection in ""Connections"" folder.\0" 204 "Remove the selected device(s) from the list?\0" 205 "Delete %1 from the phonebook?\0" 206 "Disconnect from %1?\0" @@ -2256,10 +2256,10 @@ 1666 "Data sent to this computer can be acknowledged with a confirmation message indicating the time that the data was received.\0" 1667 "This computer will listen for and respond to requests for more information about the public network to which it is attached.\0" 1668 "This computer will respond to requests for information about the routes it recognizes.\0" - 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a \"destination unreachable\" message explaining the failure.\0" + 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a ""destination unreachable"" message explaining the failure.\0" 1670 "When this computer's ability to process incoming data cannot keep up with the rate of a transmission, data will be dropped and the sender will be asked to slow down.\0" - 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a \"bad header\" error message.\0" - 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a \"time expired\" message.\0" + 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a ""bad header"" error message.\0" + 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a ""time expired"" message.\0" 1673 "Data sent from this computer will be rerouted if the default path changes.\0" 1675 "The value entered for the log file size is not valid. Enter a value between 1 and 32767 k.\0" 1685 "Your user account does not have permission to use this connection. Usually, this is because you are logged in as Guest.\0" Modified: trunk/reactos/dll/win32/rasdlg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/no-NO.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -695,7 +695,7 @@ COMBOBOX 1551, 16, 169, 128, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "K&onfigurer...", 1293, 150, 168, 60, 14 PUSHBUTTON "&X.25", 1295, 7, 194, 50, 14 - PUSHBUTTON "&Virtuelt \"tunnel\" tilkobling", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "&Virtuelt ""tunnel"" tilkobling", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED END 168 DIALOGEX 0, 0, 317, 143 @@ -706,7 +706,7 @@ LTEXT "Velg telefonummer under. ", -1, 7, 4, 306, 14 LTEXT "&Telefonnummer:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "Du skulle kanskje trenge å inkludere en \"1\" eller område, eller begge. Hvis du ikke er sikker på om du trenger ekstra nummer, ring telefonnummer til din telefon. Hvis du hører en modem lyd, nummeret oppringt som er riktig.", -1, 20, 50, 291, 53 + LTEXT "Du skulle kanskje trenge å inkludere en ""1"" eller område, eller begge. Hvis du ikke er sikker på om du trenger ekstra nummer, ring telefonnummer til din telefon. Hvis du hører en modem lyd, nummeret oppringt som er riktig.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 @@ -1843,7 +1843,7 @@ 200 "Kommentarer\0" 201 "Tilpasset authentication pakke konfigurasjon mislykkes.\0" 202 "TCP/IP er ikke installert eller er deaktivert for Routing og fjern tilgang. I Kontrollpanel, start Nettverk, gå til tjeneste siden, velg 'Routing og fjern tilgang tjeneste' Egenskaper, og trykk på Nettverk knappen.\0" - 203 "IPX er ikke installert eller er deaktivert for Routing og fjern tilgang. Du kan installere/aktivere IPX ved å vise egenskapene for alle tilkoblinger i \"Tilkoblinger\" mappen.\0" + 203 "IPX er ikke installert eller er deaktivert for Routing og fjern tilgang. Du kan installere/aktivere IPX ved å vise egenskapene for alle tilkoblinger i ""Tilkoblinger"" mappen.\0" 204 "Fjern valgte enhet(er) fra listen?\0" 205 "Slett %1 fra telefonboken?\0" 206 "Koble fra %1?\0" @@ -2255,10 +2255,10 @@ 1666 "Data sent to this computer can be acknowledged with a confirmation message indicating the time that the data was received.\0" 1667 "This computer will listen for and respond to requests for more information about the public network to which it is attached.\0" 1668 "This computer will respond to requests for information about the routes it recognizes.\0" - 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a \"destination unreachable\" message explaining the failure.\0" + 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a ""destination unreachable"" message explaining the failure.\0" 1670 "When this computer's ability to process incoming data cannot keep up with the rate of a transmission, data will be dropped and the sender will be asked to slow down.\0" - 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a \"bad header\" error message.\0" - 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a \"time expired\" message.\0" + 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a ""bad header"" error message.\0" + 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a ""time expired"" message.\0" 1673 "Data sent from this computer will be rerouted if the default path changes.\0" 1675 "The value entered for the log file size is not valid. Enter a value between 1 and 32767 k.\0" 1685 "Your user account does not have permission to use this connection. Usually, this is because you are logged in as Guest.\0" Modified: trunk/reactos/dll/win32/rasdlg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -702,7 +702,7 @@ COMBOBOX 1551, 16, 169, 128, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "&Konfiguruj", 1293, 150, 168, 60, 14 PUSHBUTTON "&X.25", 1295, 7, 194, 50, 14 - PUSHBUTTON "P&o³¹czenie \"tunel\" wirtualne", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "P&o³¹czenie ""tunel"" wirtualne", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED END 168 DIALOGEX 0, 0, 317, 143 @@ -713,7 +713,7 @@ LTEXT "Wpisz numer telefoniczny poni¿ej. ", -1, 7, 4, 306, 14 LTEXT "&Numer telefoniczny:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "Prawdopodobnie bêdzie trzeba u¿yæ cyfry \"1\", numeru kierunkowego, albo obydwu. Jeli nie jeste pewien, wypróbuj ¿¹dany numer na swoim telefonie. Jeli us³yszysz sygna³ modemu, numer jest poprawny.", -1, 20, 50, 291, 53 + LTEXT "Prawdopodobnie bêdzie trzeba u¿yæ cyfry ""1"", numeru kierunkowego, albo obydwu. Jeli nie jeste pewien, wypróbuj ¿¹dany numer na swoim telefonie. Jeli us³yszysz sygna³ modemu, numer jest poprawny.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 @@ -2263,10 +2263,10 @@ 1666 "Dane wys³ane do tego komputera mog¹ byæ potwierdzane w specjalnej wiadomoci, zawieraj¹cej czas dostarczenia tych danych.\0" 1667 "Ten komputer bêdzie nas³uchiwa³ i odpowiada³ na ¿¹dania informacji o sieci publicznej, do której jest pod³¹czony.\0" 1668 "Ten komputer bêdzie odpowiada³ na ¿¹dania informacji dotycz¹cych znanych mu tras.\0" - 1669 "Dane, wys³ane przez Internet, które nie dotr¹ do tego komputera z powodu b³êdów zostan¹ odrzucone z odes³aniem komunikatu \"destination unreachable\" o przyczynach b³êdów.\0" + 1669 "Dane, wys³ane przez Internet, które nie dotr¹ do tego komputera z powodu b³êdów zostan¹ odrzucone z odes³aniem komunikatu ""destination unreachable"" o przyczynach b³êdów.\0" 1670 "Kiedy zdolnoæ tego komputera do przetwarzania nap³ywaj¹cych danych nie bêdzie w stanie nad¹¿yæ za prêdkoci¹ transmisji, dane zostan¹ odrzucone a wysy³aj¹cy dostanie wiadomoæ z prob¹ o zmniejszenie prêdkoci.\0" - 1671 "Kiedy ten komputer odrzuca otrzymane dane z powodu b³êdnego nag³ówka, wyle on do nadawcy wiadomoæ o b³êdzie \"bad header\".\0" - 1672 "Kiedy ten komputer odrzuca niekompletne dane z po³¹czenia, jako, ¿e ca³a transmisja danych wymaga³a wiêcej czasu ni¿ by³o przeznaczone, wyle on do nadawcy wiadomoæ o b³êdzie \"time expired\".\0" + 1671 "Kiedy ten komputer odrzuca otrzymane dane z powodu b³êdnego nag³ówka, wyle on do nadawcy wiadomoæ o b³êdzie ""bad header"".\0" + 1672 "Kiedy ten komputer odrzuca niekompletne dane z po³¹czenia, jako, ¿e ca³a transmisja danych wymaga³a wiêcej czasu ni¿ by³o przeznaczone, wyle on do nadawcy wiadomoæ o b³êdzie ""time expired"".\0" 1673 "Dane wys³ane z tego komputera bêd¹ przekierowane, gdy zmieni siê domylna trasa.\0" 1675 "Wartoæ podana jako rozmiar pliku logów. Podaj wartoæ od 1 and 32767 k.\0" 1685 "Twoje konto u¿ytkownika nie ma dostatecznych uprawnieñ by u¿ywaæ tego po³¹czenia. Zwykle dzieje sie tak gdy jeste zalogowany jako Goæ.\0" Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -714,7 +714,7 @@ LTEXT "Ââåä³òü íîìåð òåëåôîíó. ", -1, 7, 4, 306, 14 LTEXT "Íîìåð &òåëåôîíó:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "Ìîæëèâî, çíàäîáèòüñÿ äîäàòè \"1\", êîä ì³ñòà àáî îáèäâà çíà÷åííÿ. Ùîá âèçíà÷èòè, ÷è öå ïîòð³áíî, íàáåð³òü êîìá³íàö³þ íîìåðà é êîäó íà ñâîºìó òåëåôîí³. ßêùî ÷óòíî çâóê ìîäåìà, êîìá³íàö³þ âèáðàíî ïðàâèëüíî.", -1, 20, 50, 291, 53 + LTEXT "Ìîæëèâî, çíàäîáèòüñÿ äîäàòè ""1"", êîä ì³ñòà àáî îáèäâà çíà÷åííÿ. Ùîá âèçíà÷èòè, ÷è öå ïîòð³áíî, íàáåð³òü êîìá³íàö³þ íîìåðà é êîäó íà ñâîºìó òåëåôîí³. ßêùî ÷óòíî çâóê ìîäåìà, êîìá³íàö³þ âèáðàíî ïðàâèëüíî.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 @@ -1851,7 +1851,7 @@ 200 "Ïðèì³òêà\0" 201 "Íå âäàëîñÿ íàëàøòóâàòè ïàêåò ñïåö³àëüíî¿ ïåðåâ³ðêè.\0" 202 "Ïðîòîêîë TCP/IP íå óñòàíîâëåíî àáî âèìêíóòî äëÿ ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó. Â³äêðèéòå íà ïàíåë³ êåðóâàííÿ çíà÷îê ""Ìåðåæà"", ïåðåéä³òü íà ñòîð³íêó ""Ñëóæáè"", âèáåð³òü âëàñòèâîñò³ ñëóæáè ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó é íàòèñí³òü êíîïêó ""Ìåðåæà"".\0" - 203 "Ïðîòîêîë IPX íå óñòàíîâëåíî àáî âèìêíóòî äëÿ ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó. Ùîá óñòàíîâèòè àáî ââ³ìêíóòè IPX, â³äêðèéòå ñòîð³íêó âëàñòèâîñòåé áóäü-ÿêîãî ï³äêëþ÷åííÿ â ïàïö³ \"Ï³äêëþ÷åííÿ\".\0" + 203 "Ïðîòîêîë IPX íå óñòàíîâëåíî àáî âèìêíóòî äëÿ ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó. Ùîá óñòàíîâèòè àáî ââ³ìêíóòè IPX, â³äêðèéòå ñòîð³íêó âëàñòèâîñòåé áóäü-ÿêîãî ï³äêëþ÷åííÿ â ïàïö³ ""Ï³äêëþ÷åííÿ"".\0" 204 "Âèäàëèòè âèáðàí³ ïðèñòðî¿ ç öüîãî ñïèñêó?\0" 205 "Âèäàëèòè %1 ³ç òåëåôîííî¿ êíèãè?\0" 206 "Â³äêëþ÷èòèñÿ â³ä %1?\0" @@ -2264,10 +2264,10 @@ 1666 "Îòðèìàííÿ äàíèõ, íàä³ñëàíèõ íà öåé êîìï'þòåð, ìîæå áóòè ï³äòâåðäæåíî ïîâ³äîìëåííÿì, â ÿêîìó áóäå âêàçàíî äàòó òà ÷àñ ïðèéîìó.\0" 1667 "Öåé êîìï'þòåð îòðèìóâàòèìå òà â³äïîâ³äàòèìå íà çàïèòè ïðî äîäàòêîâó ³íôîðìàö³þ ùîäî ìåðåæ³, äî ÿêî¿ éîãî ï³äêëþ÷åíî.\0" 1668 "Öåé êîìï'þòåð â³äïîâ³äàòèìå íà çàïèòè ïðî ³íôîðìàö³þ ùîäî ðîçï³çíàíèõ ìàðøðóòèçàòîð³â.\0" - 1669 "Äàí³, ÿê³ áóëè íàä³ñëàí³ ÷åðåç ²íòåðíåò ³ íå äîñÿãëè öüîãî êîìï'þòåðà ïîìèëêîâî, áóäóòü â³äêèíóò³ ç ïîâ³äîìëåííÿì \"ì³ñöå ïðèçíà÷åííÿ íåäîñòóïíå\".\0" + 1669 "Äàí³, ÿê³ áóëè íàä³ñëàí³ ÷åðåç ²íòåðíåò ³ íå äîñÿãëè öüîãî êîìï'þòåðà ïîìèëêîâî, áóäóòü â³äêèíóò³ ç ïîâ³äîìëåííÿì ""ì³ñöå ïðèçíà÷åííÿ íåäîñòóïíå"".\0" 1670 "Êîëè ³íòåíñèâí³ñòü âõ³äíîãî ïîòîêó ïåðåâèùèòü ìîæëèâîñò³ öüîãî êîìï'þòåðà ç îáðîáêè âõ³äíèõ äàíèõ, äàí³ áóäóòü ïðîïóùåí³, à â³äïðàâíèêà ïîïðîñÿòü çìåíøèòè òåìï ïåðåäà÷³.\0" - 1671 "Êîëè öåé êîìï'þòåð â³äêèíå äàí³, îòðèìàí³ ç ïîìèëêîâèì çàãîëîâêîì, â³í â³äïîâ³ñòü â³äïðàâíèêîâ³ ïîâ³äîìëåííÿì ïðî ïîìèëêó \"íåïðàâèëüíèé çàãîëîâîê\".\0" - 1672 "Êîëè öåé êîìï'þòåð â³äêèíå íåçàê³í÷åíó ïåðåäà÷ó äàíèõ ÷åðåç ïåðåâèùåííÿ äîçâîëåíîãî ÷àñó ïåðåäà÷³, â³í â³äïîâ³ñòü â³äïðàâíèêîâ³ ïîâ³äîìëåííÿì ïðî ïîìèëêó \"÷àñ ìèíóâ\".\0" + 1671 "Êîëè öåé êîìï'þòåð â³äêèíå äàí³, îòðèìàí³ ç ïîìèëêîâèì çàãîëîâêîì, â³í â³äïîâ³ñòü â³äïðàâíèêîâ³ ïîâ³äîìëåííÿì ïðî ïîìèëêó ""íåïðàâèëüíèé çàãîëîâîê"".\0" + 1672 "Êîëè öåé êîìï'þòåð â³äêèíå íåçàê³í÷åíó ïåðåäà÷ó äàíèõ ÷åðåç ïåðåâèùåííÿ äîçâîëåíîãî ÷àñó ïåðåäà÷³, â³í â³äïîâ³ñòü â³äïðàâíèêîâ³ ïîâ³äîìëåííÿì ïðî ïîìèëêó ""÷àñ ìèíóâ"".\0" 1673 "Äàí³, íàä³ñëàí³ ç öüîãî êîìï'þòåðà, áóäóòü ïåðåñïðÿìîâàí³, ÿêùî ìàðøðóò çà çàìîâ÷óâàííÿì çì³íèòüñÿ.\0" 1675 "Ââåäåíå çíà÷åííÿ ðîçì³ðó ôàéëó æóðíàëó íåïðèïóñòèìå. Óêàæ³òü çíà÷åííÿ â³ä 1 äî 32767 ÊÁ.\0" 1685 "Âàø îáë³êîâèé çàïèñ íå ìàº äîçâîëó íà âèêîðèñòàííÿ öüîãî ï³äêëþ÷åííÿ. Çâè÷àéíî ïðè÷èíîþ öüîãî áóâàº âõ³ä ç îáë³êîâèì çàïèñîì ãîñòÿ.\0" Modified: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/de-DE.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -419,27 +419,27 @@ 1064 "Die Systemsteuerungsoption Telefon- und Modemoptionen konnte nicht geöffnet werden. Der Telefoniedienst konnte eventuell nicht gestartet werden." 1065 "Anbieter entfernen" 15800 "23" - 15801 "0,\"Keine (Direktwahl)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"AT&T-Direktwahl via 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T via 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T via 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"MCI-Direktwahl via 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI via 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI via 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI via 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI via 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"US-Sprint-Direktwahl via 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint via 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint via 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Callingcard via 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 (Vereinigtes Königreich)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" - 15816 "15,\"British Telecom (Vereinigtes Königreich)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" - 15817 "16,\"CLEAR Communications (Neuseeland)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" - 15818 "17,\"Telecom Neuseeland\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" - 15819 "18,\"Global Card (Taiwan nach USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Australia) via 1818 (Sprache)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Australia) via 1818 (Fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""Keine (Direktwahl)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T-Direktwahl via 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T via 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T via 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI-Direktwahl via 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI via 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI via 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI via 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI via 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US-Sprint-Direktwahl via 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint via 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint via 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Callingcard via 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 (Vereinigtes Königreich)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (Vereinigtes Königreich)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (Neuseeland)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom Neuseeland"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Global Card (Taiwan nach USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) via 1818 (Sprache)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) via 1818 (Fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) via 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) via 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: trunk/reactos/dll/win32/tapiui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/en-US.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -420,27 +420,27 @@ 1064 "Phone And Modem control panel can not be opened. You may have a problem starting telephony service." 1065 "Remove Provider" 15800 "23" - 15801 "0,\"None (Direct Dial)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"AT&T Direct Dial via 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T via 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T via 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"MCI Direct Dial via 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI via 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI via 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI via 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI via 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"US Sprint Direct Dial via 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint via 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint via 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Calling Card via 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 (New Zealand)\",\"\",\"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 to USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Australia) via 1818 (voice)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Australia) via 1818 (fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""None (Direct Dial)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T Direct Dial via 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T via 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T via 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI Direct Dial via 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI via 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI via 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI via 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI via 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US Sprint Direct Dial via 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint via 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint via 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Calling Card via 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 (New Zealand)"","""",""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 to USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) via 1818 (voice)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) via 1818 (fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) via 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) via 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: trunk/reactos/dll/win32/tapiui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/no-NO.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -420,27 +420,27 @@ 1064 "Telefon og Modem Kontrollpanel kan ikke bli åpnet. Du kan ha et problem med å starte telefoni tjeneste." 1065 "Fjern produsent" 15800 "23" - 15801 "0,\"None (Direct Dial)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"AT&T Direct Dial via 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T via 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T via 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"MCI Direct Dial via 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI via 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI via 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI via 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI via 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"US Sprint Direct Dial via 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint via 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint via 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Calling Card via 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 (New Zealand)\",\"\",\"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 to USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Australia) via 1818 (voice)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Australia) via 1818 (fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""None (Direct Dial)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T Direct Dial via 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T via 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T via 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI Direct Dial via 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI via 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI via 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI via 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI via 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US Sprint Direct Dial via 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint via 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint via 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Calling Card via 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 (New Zealand)"","""",""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 to USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) via 1818 (voice)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) via 1818 (fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) via 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) via 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -427,27 +427,27 @@ 1064 "Aplet Telefon i Modem w Panelu Sterowania nie mo¿e byæ otwarty. Mo¿esz mieæ problem z uruchomieniem us³ugi Telefon." 1065 "Usuñ Providera" 15800 "23" - 15801 "0,\"Brak (wybiernie bezporednie)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"AT&T wybieranie bezporednie przez 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T przez 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T przez 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"MCI wybieranie bezporednie przez 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI przez 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI przez 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI przez 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI przez 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"US Sprint wybieranie bezporednie przez 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint przez 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint przez 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Karta Telefoniczna przez 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" - 15814 "13,\"Karta 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 (New Zealand)\",\"\",\"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,\"Karta Global (Taiwan do USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Australia) przez 1818 (g³os)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Australia) przez 1818 (faks)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Australia) przez 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Australia) przez 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""Brak (wybiernie bezporednie)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T wybieranie bezporednie przez 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T przez 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T przez 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI wybieranie bezporednie przez 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI przez 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI przez 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI przez 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI przez 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US Sprint wybieranie bezporednie przez 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint przez 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint przez 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Karta Telefoniczna przez 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Karta 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 (New Zealand)"","""",""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,""Karta Global (Taiwan do USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) przez 1818 (g³os)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) przez 1818 (faks)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) przez 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) przez 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -420,27 +420,27 @@ 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 (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 (Íîâàÿ Çåëàíäèÿ)\",\"\",\"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 (Òàéâàíü - ÑØÀ)\",\"\",\"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 + 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 (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 (Íîâàÿ Çåëàíäèÿ)"","""",""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 (Òàéâàíü - ÑØÀ)"","""",""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 Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc [iso-8859-1] Sun Oct 10 14:45:03 2010 @@ -428,27 +428,27 @@ 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 + 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

1 0

[gadamopoulos] 49095: attempt to fix the branch
by gadamopoulos＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: gadamopoulos Date: Sun Oct 10 14:31:24 2010 New Revision: 49095 URL: http://svn.reactos.org/svn/reactos?rev=49095&view=rev Log: attempt to fix the branch Removed: branches/Tree-restructure-test/sdk/include/host/ branches/Tree-restructure-test/sdk/include/psdk/ branches/Tree-restructure-test/sdk/include/reactos/ branches/Tree-restructure-test/sdk/libs/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ branches/Tree-restructure-test/sdk/libs/debugsup/ branches/Tree-restructure-test/sdk/libs/libxml2/ branches/Tree-restructure-test/sdk/libs/mingw/ branches/Tree-restructure-test/sdk/libs/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ branches/Tree-restructure-test/sdk/libs/wcsfuncs/ branches/Tree-restructure-test/sdk/libs/zlib/ branches/Tree-restructure-test/sdk/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/log2lines/ branches/Tree-restructure-test/sdk/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nandflash/ branches/Tree-restructure-test/sdk/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ branches/Tree-restructure-test/sdk/tools/sysgen/ branches/Tree-restructure-test/sdk/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/

1 0

[tkreuzer] 49094: [XML] - Replace ssvprintf with _vsnprintf - get rid of ssprintf, a 2000 lines / 35 kb C++ reimplementation of vsprintf & friends
by tkreuzer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: tkreuzer Date: Sun Oct 10 14:31:04 2010 New Revision: 49094 URL: http://svn.reactos.org/svn/reactos?rev=49094&view=rev Log: [XML] - Replace ssvprintf with _vsnprintf - get rid of ssprintf, a 2000 lines / 35 kb C++ reimplementation of vsprintf & friends Removed: branches/cmake-bringup/tools/ssprintf.cpp branches/cmake-bringup/tools/ssprintf.h Modified: branches/cmake-bringup/tools/CMakeLists.txt branches/cmake-bringup/tools/xml.cpp Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sun Oct 10 14:31:04 2010 @@ -1,4 +1,4 @@ -add_library(xml xml.cpp ssprintf.cpp) +add_library(xml xml.cpp) add_executable(bin2c bin2c.c) #add_executable(pefixup pefixup.c) Removed: branches/cmake-bringup/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/ssprintf.cp… ============================================================================== --- branches/cmake-bringup/tools/ssprintf.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/tools/ssprintf.cpp (removed) @@ -1,1969 +1,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -// For character conversion functions like "wctomb" and "alloca" under Unix -#include <stdlib.h> - -#if defined(WIN32) - // Under Win32 hosts, "alloca" is not defined by stdlib.h, but by malloc.h - // On the other hand, malloc.h is deprecated under some Unix hosts, so only include it for Win32 hosts. - #include <malloc.h> -#endif - -#include <ctype.h> -#include <math.h> -#include <float.h> -#include <assert.h> -#include "ssprintf.h" - -#ifndef WIN32 -#define _finite __finite -#define _isnan __isnan -#endif - -#ifndef __APPLE__ -inline int iswdigit ( wchar_t c ) -{ - return ( c >= L'0' && c <= L'9' ); -} -#endif - -#if defined(__sun__) -#include <alloca.h> -#include <ieee.h> -#endif - -#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__sun__) || defined(__CYGWIN__) -# define __isnan isnan -# define __finite finite -# define powl __builtin_powl -# define modfl __builtin_modfl -#endif // _FreeBSD__ - -#ifdef _MSC_VER -#define alloca _alloca -#endif//_MSC_VER - -#ifdef _MSC_VER -typedef __int64 LONGLONG; -typedef unsigned __int64 ULONGLONG; -#else -typedef long long LONGLONG; -typedef unsigned long long ULONGLONG; -#endif - -typedef struct { - unsigned int mantissa:23; - unsigned int exponent:8; - unsigned int sign:1; -} ieee_float_t; - -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; -} ieee_double_t; - -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:32; - unsigned int exponent:15; - unsigned int sign:1; - unsigned int empty:16; -} ieee_long_double_t; - -std::string -ssprintf ( const char* fmt, ... ) -{ - va_list arg; - va_start(arg, fmt); - std::string f = ssvprintf ( fmt, arg ); - va_end(arg); - return f; -} - -std::wstring -sswprintf ( const wchar_t* fmt, ... ) -{ - va_list arg; - va_start(arg, fmt); - std::wstring f = sswvprintf ( fmt, arg ); - va_end(arg); - return f; -} - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define ZEROTRUNC 128 /* truncate zero 's */ - - -static int -skip_atoi(const char **s) -{ - int i=0; - - while (isdigit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - -static int -skip_wtoi(const wchar_t **s) -{ - int i=0; - - while (iswdigit(**s)) - i = i*10 + *((*s)++) - L'0'; - return i; -} - - -static int -do_div(LONGLONG *n,int base) -{ - int __res = ((ULONGLONG) *n) % (unsigned) base; - *n = ((ULONGLONG) *n) / (unsigned) base; - return __res; -} - - -static bool -number(std::string& f, LONGLONG num, int base, int size, int precision ,int type) -{ - char c,sign,tmp[66]; - const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; - int i; - - if (type & LARGE) - digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return false; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++]='0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - f += ' '; - if (sign) - f += sign; - if (type & SPECIAL) - { - if (base==8) - f += '0'; - else if (base==16) - { - f += '0'; - f += digits[33]; - } - } - if (!(type & LEFT)) - { - while (size-- > 0) - f += c; - } - while (i < precision--) - { - f += '0'; - } - while (i-- > 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += ' '; - } - return true; -} - -static bool -wnumber(std::wstring& f, LONGLONG num, int base, int size, int precision ,int type) -{ - wchar_t c,sign,tmp[66]; - const wchar_t *digits = L"0123456789abcdefghijklmnopqrstuvwxyz"; - int i; - - if (type & LARGE) - digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? L'0' : L' '; - sign = false; - if (type & SIGN) { - if (num < 0) { - sign = L'-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = L'+'; - size--; - } else if (type & SPACE) { - sign = L' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++]=L'0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - f += L' '; - if (sign) - f += sign; - if (type & SPECIAL) - { - if (base==8) - f += L'0'; - else if (base==16) - { - f += L'0'; - f += digits[33]; - } - } - if (!(type & LEFT)) - { - while (size-- > 0) - f += c; - } - while (i < precision--) - { - f += L'0'; - } - while (i-- > 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += L' '; - } - return true; -} - - -static bool -numberf(std::string& f, double __n, char exp_sign, int size, int precision, int type) -{ - double exponent = 0.0; - double e; - long ie; - - int i = 0; - int j = 0; - int ro = 0; - - double frac, intr; - double p; - char *buf, *tmp, sign, c; - int result; - - union - { - double* __n; - ieee_double_t* n; - } n; - - n.__n = &__n; - - if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) - { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - exponent = ie/3.321928; - } - - if ( exp_sign == 'g' || exp_sign == 'G' ) - { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - else - exp_sign = 'f'; - } - - if ( exp_sign == 'e' || exp_sign == 'E' ) - { - frac = modf(exponent,&e); - if ( frac > 0.5 ) - e++; - else if ( frac < -0.5 ) - e--; - - result = numberf(f,__n/pow(10.0L,(long double)e),'f',size-4, precision, type); - if (result < 0) - return false; - f += exp_sign; - size--; - ie = (long)e; - type = LEFT | PLUS; - if ( ie < 0 ) - type |= SIGN; - - result = number(f,ie, 10,2, 2,type ); - if (result < 0) - return false; - return true; - } - - if ( exp_sign == 'f' ) - { - buf = (char*)alloca(4096); - if (type & LEFT) - type &= ~ZEROPAD; - - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) - { - if (__n < 0) - { - sign = '-'; - __n = fabs(__n); - size--; - } - else if (type & PLUS) - { - sign = '+'; - size--; - } - else if (type & SPACE) - { - sign = ' '; - size--; - } - } - - frac = modf(__n,&intr); - - // # flags forces a . and prevents trucation of trailing zero's - if ( precision > 0 ) - { - i = precision-1; - while ( i >= 0 ) - { - frac*=10.0L; - frac = modf(frac, &p); - buf[i] = (int)p + '0'; - i--; - } - i = precision; - size -= precision; - - ro = 0; - if ( frac > 0.5 ) - ro = 1; - - if ( precision >= 1 || type & SPECIAL) - { - buf[i++] = '.'; - size--; - } - } - - if ( intr == 0.0 ) - { - buf[i++] = '0'; - size--; - } - else - { - while ( intr > 0.0 ) - { - p = intr; - intr/=10.0L; - modf(intr, &intr); - - p -= 10.0*intr; - - buf[i++] = (int)p + '0'; - size--; - } - } - - j = 0; - while ( j = '0' && buf[j] <= '8' ) - { - buf[j]++; - ro = 0; - } - else if ( buf[j] == '9' ) - { - buf[j] = '0'; - } - j++; - } - if ( ro == 1 ) - buf[i++] = '1'; - - buf[i] = 0; - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - - if (!(type & LEFT)) - { - while (size-- > 0) - f += c; - } - - tmp = buf; - if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) - { - j = 0; - while ( j 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += ' '; - } - } - return true; -} - -static bool -wnumberf(std::wstring& f, double __n, wchar_t exp_sign, int size, int precision, int type) -{ - double exponent = 0.0; - double e; - long ie; - - int i = 0; - int j = 0; - int ro = 0; - - double frac, intr; - double p; - wchar_t *buf, *tmp, sign, c; - int result; - - union - { - double* __n; - ieee_double_t* n; - } n; - - n.__n = &__n; - - if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) - { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - exponent = ie/3.321928; - } - - if ( exp_sign == L'g' || exp_sign == L'G' ) - { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - else - exp_sign = L'f'; - } - - if ( exp_sign == L'e' || exp_sign == L'E' ) - { - frac = modf(exponent,&e); - if ( frac > 0.5 ) - e++; - else if ( frac < -0.5 ) - e--; - - result = wnumberf(f,__n/pow(10.0L,(long double) e),L'f',size-4, precision, type); - if (result < 0) - return false; - f += exp_sign; - size--; - ie = (long)e; - type = LEFT | PLUS; - if ( ie < 0 ) - type |= SIGN; - - result = wnumber(f,ie, 10,2, 2,type ); - if (result < 0) - return false; - return true; - } - - if ( exp_sign == L'f' ) - { - buf = (wchar_t*)alloca(4096*sizeof(wchar_t)); - if (type & LEFT) - type &= ~ZEROPAD; - - c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; - if (type & SIGN) - { - if (__n < 0) - { - sign = L'-'; - __n = fabs(__n); - size--; - } - else if (type & PLUS) - { - sign = L'+'; - size--; - } - else if (type & SPACE) - { - sign = L' '; - size--; - } - } - - frac = modf(__n,&intr); - - // # flags forces a . and prevents trucation of trailing zero's - if ( precision > 0 ) - { - i = precision-1; - while ( i >= 0 ) - { - frac*=10.0L; - frac = modf(frac, &p); - buf[i] = (int)p + L'0'; - i--; - } - i = precision; - size -= precision; - - ro = 0; - if ( frac > 0.5 ) - ro = 1; - - if ( precision >= 1 || type & SPECIAL) - { - buf[i++] = L'.'; - size--; - } - } - - if ( intr == 0.0 ) - { - buf[i++] = L'0'; - size--; - } - else - { - while ( intr > 0.0 ) - { - p = intr; - intr/=10.0L; - modf(intr, &intr); - - p -= 10.0*intr; - - buf[i++] = (int)p + L'0'; - size--; - } - } - - j = 0; - while ( j = L'0' && buf[j] <= L'8' ) - { - buf[j]++; - ro = 0; - } - else if ( buf[j] == L'9' ) - { - buf[j] = L'0'; - } - j++; - } - if ( ro == 1 ) - buf[i++] = L'1'; - - buf[i] = 0; - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += L' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += L' '; - } - - if (!(type & LEFT)) - { - while (size-- > 0) - f += c; - } - - tmp = buf; - if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) - { - j = 0; - while ( j 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += L' '; - } - } - return true; -} - -static bool -numberfl(std::string& f, long double __n, char exp_sign, int size, int precision, int type) -{ - long double exponent = 0.0; - long double e; - long ie; - - int i = 0; - int j = 0; - int ro = 0; - - long double frac, intr; - long double p; - char *buf, *tmp, sign, c; - int result; - - union - { - long double* __n; - ieee_long_double_t* n; - } n; - - n.__n = &__n; - - if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) - { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff); - exponent = ie/3.321928; - } - - if ( exp_sign == 'g' || exp_sign == 'G' ) - { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - else - exp_sign = 'f'; - } - - if ( exp_sign == 'e' || exp_sign == 'E' ) - { - frac = modfl(exponent,&e); - if ( frac > 0.5 ) - e++; - else if ( frac < -0.5 ) - e--; - - result = numberf(f,__n/powl(10.0L,e),'f',size-4, precision, type); - if (result < 0) - return false; - f += exp_sign; - size--; - ie = (long)e; - type = LEFT | PLUS; - if ( ie < 0 ) - type |= SIGN; - - result = number(f,ie, 10,2, 2,type ); - if (result < 0) - return false; - return true; - } - - if ( exp_sign == 'f' ) - { - buf = (char*)alloca(4096); - if (type & LEFT) - type &= ~ZEROPAD; - - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) - { - if (__n < 0) - { - sign = '-'; - __n = fabs(__n); - size--; - } - else if (type & PLUS) - { - sign = '+'; - size--; - } - else if (type & SPACE) - { - sign = ' '; - size--; - } - } - - frac = modfl(__n,&intr); - - // # flags forces a . and prevents trucation of trailing zero's - if ( precision > 0 ) - { - i = precision-1; - while ( i >= 0 ) - { - frac*=10.0L; - frac = modfl((long double)frac, &p); - buf[i] = (int)p + '0'; - i--; - } - i = precision; - size -= precision; - - ro = 0; - if ( frac > 0.5 ) - ro = 1; - - if ( precision >= 1 || type & SPECIAL) - { - buf[i++] = '.'; - size--; - } - } - - if ( intr == 0.0 ) - { - buf[i++] = '0'; - size--; - } - else - { - while ( intr > 0.0 ) - { - p = intr; - intr/=10.0L; - modfl(intr, &intr); - - p -= 10.0L*intr; - - buf[i++] = (int)p + '0'; - size--; - } - } - - j = 0; - while ( j = '0' && buf[j] <= '8' ) - { - buf[j]++; - ro = 0; - } - else if ( buf[j] == '9' ) - { - buf[j] = '0'; - } - j++; - } - if ( ro == 1 ) - buf[i++] = '1'; - - buf[i] = 0; - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - - if (!(type & LEFT)) - { - while (size-- > 0) - f += c; - } - - tmp = buf; - if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) - { - j = 0; - while ( j 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += ' '; - } - } - return true; -} - -static bool -wnumberfl(std::wstring& f, long double __n, wchar_t exp_sign, int size, int precision, int type) -{ - long double exponent = 0.0; - long double e; - long ie; - - int i = 0; - int j = 0; - int ro = 0; - - long double frac, intr; - long double p; - wchar_t *buf, *tmp, sign, c; - int result; - - union - { - long double* __n; - ieee_long_double_t* n; - } n; - - n.__n = &__n; - - if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) - { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff); - exponent = ie/3.321928; - } - - if ( exp_sign == L'g' || exp_sign == L'G' ) - { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - else - exp_sign = 'f'; - } - - if ( exp_sign == L'e' || exp_sign == L'E' ) - { - frac = modfl(exponent,&e); - if ( frac > 0.5 ) - e++; - else if ( frac < -0.5 ) - e--; - - result = wnumberf(f,__n/powl(10.0L,e),L'f',size-4, precision, type); - if (result < 0) - return false; - f += exp_sign; - size--; - ie = (long)e; - type = LEFT | PLUS; - if ( ie < 0 ) - type |= SIGN; - - result = wnumber(f,ie, 10,2, 2,type ); - if (result < 0) - return false; - return true; - } - - if ( exp_sign == L'f' ) - { - buf = (wchar_t*)alloca(4096*sizeof(wchar_t)); - if (type & LEFT) - type &= ~ZEROPAD; - - c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; - if (type & SIGN) - { - if (__n < 0) - { - sign = L'-'; - __n = fabs(__n); - size--; - } - else if (type & PLUS) - { - sign = L'+'; - size--; - } - else if (type & SPACE) - { - sign = L' '; - size--; - } - } - - frac = modfl(__n,&intr); - - // # flags forces a . and prevents trucation of trailing zero's - if ( precision > 0 ) - { - i = precision-1; - while ( i >= 0 ) - { - frac*=10.0L; - frac = modfl((long double)frac, &p); - buf[i] = (int)p + L'0'; - i--; - } - i = precision; - size -= precision; - - ro = 0; - if ( frac > 0.5 ) - ro = 1; - - if ( precision >= 1 || type & SPECIAL) - { - buf[i++] = L'.'; - size--; - } - } - - if ( intr == 0.0 ) - { - buf[i++] = L'0'; - size--; - } - else - { - while ( intr > 0.0 ) - { - p = intr; - intr/=10.0L; - modfl(intr, &intr); - - p -= 10.0L*intr; - - buf[i++] = (int)p + L'0'; - size--; - } - } - - j = 0; - while ( j = L'0' && buf[j] <= L'8' ) - { - buf[j]++; - ro = 0; - } - else if ( buf[j] == L'9' ) - { - buf[j] = L'0'; - } - j++; - } - if ( ro == 1 ) - buf[i++] = L'1'; - - buf[i] = 0; - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += L' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += L' '; - } - - if (!(type & LEFT)) - { - while (size-- > 0) - f += c; - } - - tmp = buf; - if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) - { - j = 0; - while ( j 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += L' '; - } - } - return true; -} - -static int -do_string(std::string& f, const char* s, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (s == NULL) - { - s = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - f += ' '; - done++; - } - for (i = 0; i < len; ++i) - { - f += *s++; - done++; - } - while (len < field_width--) - { - f += ' '; - done++; - } - return done; -} - -static int -do_wstring(std::wstring& f, const wchar_t* s, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (s == NULL) - { - s = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - f += L' '; - done++; - } - for (i = 0; i < len; ++i) - { - f += *s++; - done++; - } - while (len < field_width--) - { - f += L' '; - done++; - } - return done; -} - -static int -stringw(std::string& f, const wchar_t* sw, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (sw == NULL) - { - sw = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sw[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - f += ' '; - done++; - } - for (i = 0; i < len; ++i) - { -#define MY_MB_CUR_MAX 1 - char mb[MY_MB_CUR_MAX]; - int mbcount, j; - mbcount = wctomb(mb, *sw++); - if (mbcount <= 0) - { - break; - } - for (j = 0; j < mbcount; j++) - { - f += mb[j]; - done++; - } - } - while (len < field_width--) - { - f += ' '; - done++; - } - return done; -} - -static int -wstringa(std::wstring& f, const char* sa, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (sa == NULL) - { - sa = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sa[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - f += L' '; - done++; - } - for (i = 0; i < len;) - { - wchar_t w; - int mbcount; - mbcount = mbtowc(&w, sa+i, len-i); - if (mbcount <= 0) - break; - f += w; - done++; - i += mbcount; - } - while (len < field_width--) - { - f += L' '; - done++; - } - return done; -} - -#define _isnanl _isnan -#define _finitel _finite - -std::string -ssvprintf ( const char *fmt, va_list args ) -{ - ULONGLONG num; - int base; - long double _ldouble; - double _double; - const char *s; - const wchar_t* sw; - int result; - std::string f; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier = 0; /* 'h', 'l', 'L' or 'I64' for integer fields */ - - for (; *fmt ; ++fmt) - { - if (*fmt != '%') - { - f += *fmt; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (isdigit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = 0; - // %Z can be just stand alone or as size_t qualifier - if ( *fmt == 'Z' ) { - qualifier = *fmt; - switch ( *(fmt+1)) { - case 'o': - case 'b': - case 'X': - case 'x': - case 'd': - case 'i': - case 'u': - ++fmt; - break; - default: - break; - } - } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { - qualifier = *fmt; - fmt += 3; - } - - // go fine with ll instead of L - if ( *fmt == 'l' ) { - ++fmt; - qualifier = 'L'; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case 'c': - if (!(flags & LEFT)) - while (--field_width > 0) - { - f += ' '; - } - if (qualifier == 'l' || qualifier == 'w') - { - f += (char)(unsigned char)(wchar_t) va_arg(args,int); - } - else - { - f += (char)(unsigned char) va_arg(args,int); - } - while (--field_width > 0) - { - f += ' '; - } - continue; - - case 'C': - if (!(flags & LEFT)) - while (--field_width > 0) - { - f += ' '; - } - if (qualifier == 'h') - { - f += (char)(unsigned char) va_arg(args,int); - } - else - { - f += (char)(unsigned char)(wchar_t) va_arg(args,int); - } - while (--field_width > 0) - { - f += ' '; - } - continue; - - case 's': - if (qualifier == 'l' || qualifier == 'w') { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - result = stringw(f, sw, -1, field_width, precision, flags); - } else { - /* print ascii string */ - s = va_arg(args, char *); - result = do_string(f, s, -1, field_width, precision, flags); - } - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case 'S': - if (qualifier == 'h') { - /* print ascii string */ - s = va_arg(args, char *); - result = do_string(f, s, -1, field_width, precision, flags); - } else { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - result = stringw(f, sw, -1, field_width, precision, flags); - } - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - /*case 'Z': - if (qualifier == 'w') { - // print counted unicode string - PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - sw = NULL; - len = -1; - } else { - sw = pus->Buffer; - len = pus->Length / sizeof(WCHAR); - } - result = stringw(f, sw, len, field_width, precision, flags); - } else { - // print counted ascii string - PANSI_STRING pas = va_arg(args, PANSI_STRING); - if ((pas == NULL) || (pas->Buffer == NULL)) { - s = NULL; - len = -1; - } else { - s = pas->Buffer; - len = pas->Length; - } - result = string(f, s, -1, field_width, precision, flags); - } - if (result < 0) - return -1; - continue;*/ - - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - if (qualifier == 'l' || qualifier == 'L' ) { - _ldouble = va_arg(args, long double); - - if ( _isnanl(_ldouble) ) - { - f += "Nan"; - } - else if ( !_finitel(_ldouble) ) - { - if ( _ldouble < 0 ) - f += "-Inf"; - else - f += "+Inf"; - } else { - if ( precision == -1 ) - precision = 6; - result = numberfl(f,_ldouble,*fmt,field_width,precision,flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - } else { - _double = (double)va_arg(args, double); - - if ( _isnan(_double) ) - { - f += "Nan"; - } - else if ( !_finite(_double) ) - { - if ( _double < 0 ) - f += "-Inf"; - else - f += "+Inf"; - } - else - { - if ( precision == -1 ) - precision = 6; - result = numberf(f,_double,*fmt,field_width,precision,flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - } - continue; - - case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - result = number(f, - (size_t) va_arg(args, void *), 16, - field_width, precision, flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case 'n': - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = 0; - } else { - int * ip = va_arg(args, int *); - *ip = 0; - } - continue; - - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; - - case 'b': - base = 2; - break; - - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; - - default: - if (*fmt != '%') - { - f += '%'; - } - if (*fmt) - { - f += *fmt; - } - else - --fmt; - continue; - } - - if (qualifier == 'I') - num = va_arg(args, ULONGLONG); - else if (qualifier == 'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == 'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - result = number(f, num, base, field_width, precision, flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - //putc('\0',f); - return f; -} - -std::wstring -sswvprintf ( const wchar_t* fmt, va_list args ) -{ - ULONGLONG num; - int base; - long double _ldouble; - double _double; - const wchar_t* s; - const char* sa; - int result; - std::wstring f; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier = 0; /* 'h', 'l', 'L' or 'I64' for integer fields */ - - for (; *fmt ; ++fmt) - { - if (*fmt != L'%') - { - f += *fmt; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case L'-': flags |= LEFT; goto repeat; - case L'+': flags |= PLUS; goto repeat; - case L' ': flags |= SPACE; goto repeat; - case L'#': flags |= SPECIAL; goto repeat; - case L'0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_wtoi(&fmt); - else if (*fmt == L'*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == L'.') { - ++fmt; - if (iswdigit(*fmt)) - precision = skip_wtoi(&fmt); - else if (*fmt == L'*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = 0; - // %Z can be just stand alone or as size_t qualifier - if ( *fmt == L'Z' ) { - qualifier = *fmt; - switch ( *(fmt+1)) { - case L'o': - case L'b': - case L'X': - case L'x': - case L'd': - case L'i': - case L'u': - ++fmt; - break; - default: - break; - } - } else if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') { - qualifier = *fmt; - fmt += 3; - } - - // go fine with ll instead of L - if ( *fmt == L'l' ) { - ++fmt; - qualifier = L'L'; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case L'c': - if (!(flags & LEFT)) - while (--field_width > 0) - { - f += L' '; - } - if ( qualifier == L'h' ) - { - f += (wchar_t)(char)(unsigned char) va_arg(args,int); - } - else - { - f += (wchar_t) va_arg(args,int); - } - while (--field_width > 0) - { - f += ' '; - } - continue; - - case 'C': - if (!(flags & LEFT)) - while (--field_width > 0) - { - f += L' '; - } - if (qualifier == L'l' || qualifier == L'w') - { - f += (wchar_t) va_arg(args,int); - } - else - { - f += (wchar_t)(char)(unsigned char) va_arg(args,int); - } - while (--field_width > 0) - { - f += L' '; - } - continue; - - case 's': - if (qualifier == L'h') { - /* print ascii string */ - sa = va_arg(args, char *); - result = wstringa(f, sa, -1, field_width, precision, flags); - } else { - /* print unicode string */ - s = va_arg(args, wchar_t *); - result = do_wstring(f, s, -1, field_width, precision, flags); - } - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case 'S': - if (qualifier == L'l' || qualifier == L'w') { - /* print unicode string */ - s = va_arg(args, wchar_t *); - result = do_wstring(f, s, -1, field_width, precision, flags); - } else { - /* print ascii string */ - sa = va_arg(args, char *); - result = wstringa(f, sa, -1, field_width, precision, flags); - } - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case L'e': - case L'E': - case L'f': - case L'g': - case L'G': - if (qualifier == L'l' || qualifier == L'L' ) - { - _ldouble = va_arg(args, long double); - - if ( _isnanl(_ldouble) ) - { - f += L"Nan"; - } - else if ( !_finitel(_ldouble) ) - { - if ( _ldouble < 0 ) - f += L"-Inf"; - else - f += L"+Inf"; - } else { - if ( precision == -1 ) - precision = 6; - result = wnumberfl(f,_ldouble,*fmt,field_width,precision,flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - } else { - _double = (double)va_arg(args, double); - - if ( _isnan(_double) ) - { - f += L"Nan"; - } - else if ( !_finite(_double) ) - { - if ( _double < 0 ) - f += L"-Inf"; - else - f += L"+Inf"; - } - else - { - if ( precision == -1 ) - precision = 6; - result = wnumberf(f,_double,*fmt,field_width,precision,flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - } - continue; - - case L'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - result = wnumber(f, - (size_t) va_arg(args, void *), 16, - field_width, precision, flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case L'n': - if (qualifier == L'l') { - long * ip = va_arg(args, long *); - *ip = 0; - } else { - int * ip = va_arg(args, int *); - *ip = 0; - } - continue; - - /* integer number formats - set up the flags and "break" */ - case L'o': - base = 8; - break; - - case L'b': - base = 2; - break; - - case L'X': - flags |= LARGE; - case L'x': - base = 16; - break; - - case L'd': - case L'i': - flags |= SIGN; - case L'u': - break; - - default: - if (*fmt != L'%') - { - f += L'%'; - } - if (*fmt) - { - f += *fmt; - } - else - --fmt; - continue; - } - - if (qualifier == L'I') - num = va_arg(args, ULONGLONG); - else if (qualifier == L'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == L'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - result = wnumber(f, num, base, field_width, precision, flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - //putc('\0',f); - return f; -} Removed: branches/cmake-bringup/tools/ssprintf.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/ssprintf.h?… ============================================================================== --- branches/cmake-bringup/tools/ssprintf.h [iso-8859-1] (original) +++ branches/cmake-bringup/tools/ssprintf.h (removed) @@ -1,40 +1,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include <string> -#include <stdarg.h> - -#ifdef __CYGWIN__ -namespace std { - typedef basic_string<wchar_t> wstring; -} -#endif - -std::string ssprintf ( const char* fmt, ... ); -std::string ssvprintf ( const char* fmt, va_list args ); - -std::wstring sswprintf ( const wchar_t* fmt, ... ); -std::wstring sswvprintf ( const wchar_t* fmt, va_list args ); - -#ifdef _UNICODE -#define sstprintf sswprintf -#define sstvprintf sswvprintf -#else -#define sstprintf ssprintf -#define sstvprintf ssvprintf -#endif Modified: branches/cmake-bringup/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/xml.cpp?rev… ============================================================================== --- branches/cmake-bringup/tools/xml.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/tools/xml.cpp [iso-8859-1] Sun Oct 10 14:31:04 2010 @@ -18,6 +18,7 @@ #ifdef _MSC_VER #pragma warning ( disable : 4786 ) +#pragma warning ( disable : 4996 ) #endif//_MSC_VER #ifdef WIN32 @@ -41,7 +42,6 @@ #include <stdlib.h> #include <stdio.h> #include "xml.h" -#include "ssprintf.h" #ifndef MAX_PATH #define MAX_PATH _MAX_PATH @@ -100,7 +100,9 @@ void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) { - _e = location + ": " + ssvprintf(format,args); + char buffer[1024]; + _vsnprintf(buffer, sizeof(buffer)-1, format, args); + _e = location + ": " + buffer; } void XMLException::SetException ( const std::string& location, const char* format, ... ) @@ -424,13 +426,14 @@ XMLFile::Location() const { int line = 1; + char line_str[10]; const char* p = strchr ( _buf.c_str(), '\n' ); while ( p && p < _p ) { ++line; p = strchr ( p+1, '\n' ); } - return ssprintf ( "%s(%i)",_filename.c_str(), line ); + return _filename + "(" + itoa(line, line_str, 10) + ")"; } XMLAttribute::XMLAttribute()

1 0

[gadamopoulos] 49093: Sync to trunk (2/2) Add crt, ndk, ddk, and dxsdk Remove from build mingw Fix generating buildno.h
by gadamopoulos＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: gadamopoulos Date: Sun Oct 10 14:08:28 2010 New Revision: 49093 URL: http://svn.reactos.org/svn/reactos?rev=49093&view=rev Log: Sync to trunk (2/2) Add crt, ndk, ddk, and dxsdk Remove from build mingw Fix generating buildno.h Added: branches/Tree-restructure-test/sdk/include/ddk/ - copied from r48976, trunk/reactos/include/ddk/ branches/Tree-restructure-test/sdk/include/dxsdk/ - copied from r48976, trunk/reactos/include/dxsdk/ branches/Tree-restructure-test/sdk/include/host/ - copied from r48976, branches/Tree-restructure-test/sdk/include/host/ branches/Tree-restructure-test/sdk/include/ndk/ - copied from r48976, trunk/reactos/include/ndk/ branches/Tree-restructure-test/sdk/include/psdk/ - copied from r48976, branches/Tree-restructure-test/sdk/include/psdk/ branches/Tree-restructure-test/sdk/include/reactos/ - copied from r48976, branches/Tree-restructure-test/sdk/include/reactos/ branches/Tree-restructure-test/sdk/libs/atl/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/cmlib/ branches/Tree-restructure-test/sdk/libs/crt/ - copied from r48976, trunk/reactos/lib/sdk/crt/ branches/Tree-restructure-test/sdk/libs/debugsup/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/debugsup/ branches/Tree-restructure-test/sdk/libs/inflib/ - copied from r48976, trunk/reactos/lib/inflib/ branches/Tree-restructure-test/sdk/libs/libxml2/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/libxml2/ branches/Tree-restructure-test/sdk/libs/mingw/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/mingw/ branches/Tree-restructure-test/sdk/libs/pseh/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/rossym/ branches/Tree-restructure-test/sdk/libs/wcsfuncs/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/wcsfuncs/ branches/Tree-restructure-test/sdk/libs/zlib/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/zlib/ branches/Tree-restructure-test/sdk/tools/bin2c.c - copied unchanged from r48976, trunk/reactos/tools/bin2c.c branches/Tree-restructure-test/sdk/tools/buildno/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/dumpstab.c - copied unchanged from r48976, trunk/reactos/tools/dumpstab.c branches/Tree-restructure-test/sdk/tools/gendib/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/log2lines/ - copied from r48976, trunk/reactos/tools/log2lines/ branches/Tree-restructure-test/sdk/tools/mkconfig.c - copied unchanged from r48976, trunk/reactos/tools/mkconfig.c branches/Tree-restructure-test/sdk/tools/mkhive/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nandflash/ - copied from r48976, trunk/reactos/tools/nandflash/ branches/Tree-restructure-test/sdk/tools/nci/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pefixup.c - copied unchanged from r48976, trunk/reactos/tools/pefixup.c branches/Tree-restructure-test/sdk/tools/pipetools/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ - copied from r48976, trunk/reactos/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rsym/ branches/Tree-restructure-test/sdk/tools/ssprintf.cpp - copied unchanged from r48976, trunk/reactos/tools/ssprintf.cpp branches/Tree-restructure-test/sdk/tools/ssprintf.h - copied unchanged from r48976, trunk/reactos/tools/ssprintf.h branches/Tree-restructure-test/sdk/tools/stubgen.c - copied unchanged from r48976, trunk/reactos/tools/stubgen.c branches/Tree-restructure-test/sdk/tools/sysgen/ - copied from r48976, trunk/reactos/tools/sysgen/ branches/Tree-restructure-test/sdk/tools/unicode/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wrc/ branches/Tree-restructure-test/sdk/tools/xml.cpp - copied unchanged from r48976, trunk/reactos/tools/xml.cpp branches/Tree-restructure-test/sdk/tools/xml.h - copied unchanged from r48976, trunk/reactos/tools/xml.h Modified: branches/Tree-restructure-test/Makefile branches/Tree-restructure-test/ReactOS-amd64.rbuild branches/Tree-restructure-test/ReactOS-arm.rbuild branches/Tree-restructure-test/ReactOS-generic.rbuild branches/Tree-restructure-test/ReactOS-i386.rbuild branches/Tree-restructure-test/baseaddress.rbuild branches/Tree-restructure-test/config-arm.template.rbuild branches/Tree-restructure-test/sdk/include/include.rbuild branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak branches/Tree-restructure-test/sdk/libs/libs.rbuild branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln branches/Tree-restructure-test/sdk/tools/rbuild/test.h branches/Tree-restructure-test/sdk/tools/tools.mak Modified: branches/Tree-restructure-test/Makefile URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/Makefile?… ============================================================================== --- branches/Tree-restructure-test/Makefile [iso-8859-1] (original) +++ branches/Tree-restructure-test/Makefile [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -169,11 +169,7 @@ endif ifeq ($(ROS_AUTOMAKE),) - ifeq ($(ARCH),i386) - ROS_AUTOMAKE=makefile.auto - else ROS_AUTOMAKE=makefile-$(ARCH).auto - endif endif all: $(ROS_AUTOMAKE) @@ -423,7 +419,7 @@ endif endif -BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h +BUILDNO_H = $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos$(SEP)buildno.h include sdk/libs/lib.mak include sdk/tools/tools.mak @@ -432,9 +428,9 @@ PREAUTO := \ $(BIN2C_TARGET) \ $(BIN2RES_TARGET) \ -# $(BUILDNO_H) \ - $(GENDIB_DIB_FILES) \ - $(NCI_SERVICE_FILES) + $(BUILDNO_H) \ + $(NCI_SERVICE_FILES) \ + $(GENDIB_DIB_FILES) ifeq ($(ARCH),powerpc) PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS) @@ -444,8 +440,7 @@ ROS_BUILDENGINE=$(RBUILD_TARGET) endif -$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(PREAUTO) - ${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL) +$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(BUILDNO_H) $(ECHO_RBUILD) $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw Modified: branches/Tree-restructure-test/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-a… ============================================================================== --- branches/Tree-restructure-test/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-amd64.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true"> <xi:include href="config-amd64.rbuild"> <xi:fallback> <xi:include href="config-amd64.template.rbuild" /> @@ -18,6 +18,7 @@ <define name="TARGET_amd64" host="true" /> <define name="USE_COMPILER_EXCEPTIONS" /> + <define name ="NO_UNDERSCORE_PREFIX" /> <property name="PLATFORM" value="PC"/> <property name="usewrc" value="false"/> @@ -28,11 +29,13 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=4</compilerflag> <compilerflag compiler="midl">-m64 --win64</compilerflag>   <compilerflag>-U_X86_</compilerflag> + <compilerflag>-UWIN32</compilerflag> <compilerflag>-Wno-format</compilerflag> </group> @@ -42,11 +45,31 @@ <linkerflag>-section-alignment=0x1000</linkerflag> <linkerflag>--unique=.eh_frame</linkerflag> <linkerflag>-static</linkerflag> + <linkerflag>--exclude-all-symbols</linkerflag> </group> <if property="USERMODE" value="1"> <directory name="base"> - <xi:include href="base/base.rbuild" /> + <directory name="applications"> + <xi:include href="base/applications/applications.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="base/services/services.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="base/setup/setup.rbuild" /> + </directory> + <directory name="shell"> + <directory name="cmd"> + <xi:include href="base/shell/cmd/cmd.rbuild" /> + </directory> + <directory name="explorer-new"> + <xi:include href="base/shell/explorer-new/explorer.rbuild" /> + </directory> + </directory> + <directory name="system"> + <xi:include href="base/system/system.rbuild" /> + </directory> </directory> <directory name="dll"> <xi:include href="dll/dll.rbuild" /> Modified: branches/Tree-restructure-test/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-a… ============================================================================== --- branches/Tree-restructure-test/ReactOS-arm.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-arm.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -7,18 +7,18 @@ </xi:fallback> </xi:include> - <xi:include href="ReactOS-generic.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> -  +  <define name="_ARM_" /> <define name="__arm__" /> <define name="TARGET_arm" host="true" /> - <define name="USE_COMPILER_EXCEPTIONS" /> + <define name="USE_COMPILER_EXCEPTIONS" /> - <property name="WINEBUILD_FLAGS" value="--kill-at"/> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> - <include>include/reactos/arm</include> + <include>include/reactos/arm</include> <if property="SARCH" value="versatile"> <define name="BOARD_CONFIG_VERSATILE"/> @@ -28,17 +28,18 @@ <if property="OPTIMIZE" value="1"> <compilerflag>-ftracer</compilerflag> </if> - <compilerflag>-Wno-attributes</compilerflag> - <compilerflag>-U_UNICODE</compilerflag> - <compilerflag>-UUNICODE</compilerflag> + <compilerflag>-fms-extensions</compilerflag> + <compilerflag>-Wno-attributes</compilerflag> + <compilerflag>-U_UNICODE</compilerflag> + <compilerflag>-UUNICODE</compilerflag> </group> <define name="__MSVCRT__"/>  <group linkerset="ld"> - <linkerflag>--strip-debug</linkerflag>  - <linkerflag>-static</linkerflag>  + <linkerflag>--strip-debug</linkerflag>  + <linkerflag>-static</linkerflag>  <linkerflag>-file-alignment=0x1000</linkerflag> <linkerflag>-section-alignment=0x1000</linkerflag> </group> @@ -52,7 +53,10 @@ <directory name="drivers"> <directory name="csq"> <xi:include href="lib/drivers/csq/csq.rbuild" /> - </directory> + </directory> + </directory> + <directory name="cportlib"> + <xi:include href="lib/cportlib/cportlib.rbuild" /> </directory> <directory name="debugsup"> <xi:include href="lib/debugsup/debugsup.rbuild" /> @@ -73,6 +77,9 @@ <directory name="inflib"> <xi:include href="lib/inflib/inflib.rbuild" /> </directory> + <directory name="newinflib"> + <xi:include href="lib/newinflib/inflib.rbuild" /> + </directory> <directory name="cmlib"> <xi:include href="lib/cmlib/cmlib.rbuild" /> </directory> @@ -86,6 +93,9 @@ <directory name="crt"> <xi:include href="lib/sdk/crt/crt.rbuild" /> <xi:include href="lib/sdk/crt/libcntpr.rbuild" /> + </directory> + <directory name="ioevent"> + <xi:include href="lib/sdk/ioevent/ioevent.rbuild" /> </directory> <directory name="nt"> <xi:include href="lib/sdk/nt/nt.rbuild" /> @@ -111,17 +121,7 @@ <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> </directory> <directory name="hal"> - <directory name="halarm"> - <directory name="generic"> - <xi:include href="hal/halarm/generic/generic.rbuild" /> - </directory> - <directory name="up"> - <xi:include href="hal/halarm/up/halup.rbuild" /> - </directory> - </directory> - <directory name="hal"> - <xi:include href="hal/hal/hal.rbuild" /> - </directory> + <xi:include href="hal/hal.rbuild" /> </directory> <directory name="boot"> <xi:include href="boot/boot.rbuild" /> @@ -155,9 +155,9 @@ </directory> <directory name="base"> <directory name="system"> - <directory name="smss"> - <xi:include href="base/system/smss/smss.rbuild" /> - </directory> + <directory name="smss"> + <xi:include href="base/system/smss/smss.rbuild" /> + </directory> </directory> </directory> </project> Modified: branches/Tree-restructure-test/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-g… ============================================================================== --- branches/Tree-restructure-test/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-generic.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -63,31 +63,31 @@ <define name="_SETUPAPI_VER">0x600</define> </if> - <include>.</include> - <include>include</include> - <include root="intermediate">include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include root="intermediate">include/dxsdk</include> - <include>include/crt</include> - <include compilerset="gcc">include/crt/mingw32</include> - <include compilerset="msc">include/crt/msc</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include root="intermediate">include/reactos</include> - <include root="intermediate">include/reactos/mc</include> - <include>include/reactos/libs</include> + <include>sdk/include</include> + <include root="intermediate">sdk/include</include> + <include>sdk/include/psdk</include> + <include root="intermediate">sdk/include/psdk</include> + <include>sdk/include/dxsdk</include> + <include root="intermediate">sdk/include/dxsdk</include> + <include>sdk/include/crt</include> + <include compilerset="gcc">sdk/include/crt/mingw32</include> + <include compilerset="msc">sdk/include/crt/msc</include> + <include>sdk/include/ddk</include> + <include>sdk/include/GL</include> + <include>sdk/include/ndk</include> + <include>sdk/include/reactos</include> + <include root="intermediate">sdk/include/reactos</include> + <include root="intermediate">sdk/include/reactos/mc</include> + <include>sdk/include/reactos/libs</include> - <include host="true">include</include> - <include host="true" root="intermediate">include</include> - <include host="true">include/reactos</include> - <include host="true">include/reactos/wine</include> + <include host="true">sdk/include</include> + <include host="true" root="intermediate">sdk/include</include> + <include host="true">sdk/include/reactos</include> + <include host="true">sdk/include/reactos/wine</include> <group compilerset="gcc"> <compilerflag>-Wall</compilerflag> + <compilerflag>-Wno-char-subscripts</compilerflag> <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> </group> @@ -117,14 +117,9 @@ </if> <compilerflag>-fno-strict-aliasing</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> -   </group> Modified: branches/Tree-restructure-test/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-i… ============================================================================== --- branches/Tree-restructure-test/ReactOS-i386.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-i386.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config.rbuild"> <xi:fallback> <xi:include href="config.template.rbuild" /> @@ -24,9 +24,12 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> <compilerflag compiler="midl">-m32 --win32</compilerflag> <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag> + <compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag> <compilerflag compiler="as">-gstabs+</compilerflag> </group> Modified: branches/Tree-restructure-test/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/baseaddre… ============================================================================== --- branches/Tree-restructure-test/baseaddress.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/baseaddress.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -3,6 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <property name="BASEADDRESS_FAULTREP" value="0x107A0000" /> <property name="BASEADDRESS_QMGRPRXY" value="0x1f710000" /> <property name="BASEADDRESS_CRYPTDLG" value="0x209c0000" /> <property name="BASEADDRESS_COMCAT" value="0x20a50000" /> @@ -23,13 +24,16 @@ <property name="BASEADDRESS_PSTOREC" value="0x513d0000" /> <property name="BASEADDRESS_LPK" value="0x516c0000" /> <property name="BASEADDRESS_MSGSM32ACM" value="0x56db0000" /> + <property name="BASEADDRESS_MSDVBNP" value="0x58280000" /> <property name="BASEADDRESS_MSG711ACM" value="0x584f0000" /> <property name="BASEADDRESS_IMAADP32ACM" value="0x585e0000" /> + <property name="BASEADDRESS_BDAPLGIN" value="0x58600000" /> <property name="BASEADDRESS_TELEPHON" value="0x58750000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> <property name="BASEADDRESS_JOY" value="0x589b0000" /> <property name="BASEADDRESS_QMGR" value="0x59620000" /> + <property name="BASEADDRESS_MSVIDCTL" value="0x59660000" /> <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_UNTFS" value="0x5b340000" /> @@ -116,6 +120,7 @@ <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_WINHTTP" value="0x70c60000" /> + <property name="BASEADDRESS_BATT" value="0x70cb0000" /> <property name="BASEADDRESS_AMSTREAM" value="0x71030000" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> <property name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> @@ -128,6 +133,7 @@ <property name="BASEADDRESS_OLESVR32" value="0x71dd0000" /> <property name="BASEADDRESS_OLECLI32" value="0x71df0000" /> <property name="BASEADDRESS_OLETHK32" value="0x71e10000" /> + <property name="BASEADDRESS_NETEVENT" value="0x71e70000" /> <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> <property name="BASEADDRESS_MSSIGN32" value="0x720c0000" /> @@ -182,8 +188,8 @@ <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> <property name="BASEADDRESS_SHLWAPI" value="0x76100000" /> <property name="BASEADDRESS_INETCOMM" value="0x76140000" /> - <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> - <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> + <property name="BASEADDRESS_COMCTL32" value="0x76170000" /> + <property name="BASEADDRESS_COMDLG32" value="0x76230000" /> <property name="BASEADDRESS_WINSTA" value="0x762f0000" /> <property name="BASEADDRESS_IMM32" value="0x76320000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> @@ -197,15 +203,15 @@ <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_MSHTML" value="0x76650000" /> - <property name="BASEADDRESS_ODBC32" value="0x76660000" /> - <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> - <property name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> - <property name="BASEADDRESS_SHFOLDER" value="0x76760000" /> - <property name="BASEADDRESS_NTDSAPI" value="0x76780000" /> - <property name="BASEADDRESS_NTMARTA" value="0x768a0000" /> - <property name="BASEADDRESS_RASDLG" value="0x768d0000" /> - <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> - <property name="BASEADDRESS_ATL" value="0x76a80000" /> + <property name="BASEADDRESS_ODBC32" value="0x76710000" /> + <property name="BASEADDRESS_SETUPAPI" value="0x76730000" /> + <property name="BASEADDRESS_CRYPTDLL" value="0x768f0000" /> + <property name="BASEADDRESS_SHFOLDER" value="0x76900000" /> + <property name="BASEADDRESS_NTDSAPI" value="0x76910000" /> + <property name="BASEADDRESS_NTMARTA" value="0x76920000" /> + <property name="BASEADDRESS_RASDLG" value="0x76930000" /> + <property name="BASEADDRESS_GDIPLUS" value="0x76a70000" /> + <property name="BASEADDRESS_ATL" value="0x76ac0000" /> <property name="BASEADDRESS_SFC" value="0x76b50000" /> <property name="BASEADDRESS_CREDUI" value="0x76bf0000" /> <property name="BASEADDRESS_SFC_OS" value="0x76c10000" /> @@ -236,7 +242,7 @@ <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_VERSION" value="0x77a40000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_OLEPRO32" value="0x77b10000" /> + <property name="BASEADDRESS_OLEPRO32" value="0x77b20000" /> <property name="BASEADDRESS_ACTIVEDS" value="0x77cb0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <property name="BASEADDRESS_USER32" value="0x77e50000" /> Modified: branches/Tree-restructure-test/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/config-ar… ============================================================================== --- branches/Tree-restructure-test/config-arm.template.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/config-arm.template.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -18,7 +18,7 @@ kurobox versatile omap3 --> -<property name="SARCH" value="omap3" /> +<property name="SARCH" value="versatile" />  <directory name="psdk"> <xi:include href="psdk/psdk.rbuild" /> </directory> Modified: branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude $(HOST_CFLAGS) + -Isdk/include/reactos -Isdk/include $(HOST_CFLAGS) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_HOSTAR) Modified: branches/Tree-restructure-test/sdk/libs/libs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- branches/Tree-restructure-test/sdk/libs/libs.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/libs.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -7,14 +7,14 @@ <directory name="cmlib"> <xi:include href="cmlib/cmlib.rbuild" /> </directory> + <directory name="crt"> + <xi:include href="crt/crt.rbuild" /> + </directory> <directory name="debugsup"> <xi:include href="debugsup/debugsup.rbuild" /> </directory> <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> - </directory> - <directory name="mingw"> - <xi:include href="mingw/mingw.rbuild" /> </directory> <directory name="pseh"> <xi:include href="pseh/pseh.rbuild" /> Modified: branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -25,11 +25,11 @@ BUILDNO_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o)) -BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Iinclude/reactos $(TOOLS_CPPFLAGS) +BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Isdk/include/reactos $(TOOLS_CPPFLAGS) BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS) -BUILDNO_VERSION = include$(SEP)reactos$(SEP)version.h +BUILDNO_VERSION = sdk$(SEP)include$(SEP)reactos$(SEP)version.h .PHONY: buildno buildno: $(BUILDNO_TARGET) @@ -52,6 +52,6 @@ #.PHONY: $(BUILDNO_TARGET) $(BUILDNO_H): $(BUILDNO_TARGET) - ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos 2>$(NUL) $(ECHO_BUILDNO) $(Q)$(BUILDNO_TARGET) $(BUILDNO_QUIET) $(BUILDNO_H) Modified: branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -358,13 +358,13 @@ GenerateGlobalVariables (); GenerateXmlBuildFilesMacro (); ProcessModules (); - GenerateInstallTarget (); - GenerateTestTarget (); +// GenerateInstallTarget (); +// GenerateTestTarget (); GenerateDirectoryTargets (); GenerateDirectories (); - GenerateTestSupportCode (); +// GenerateTestSupportCode (); GenerateCompilationUnitSupportCode (); - GenerateSysSetup (); +// GenerateSysSetup (); GenerateProxyMakefiles (); CheckAutomaticDependencies (); CloseMakefile (); @@ -429,9 +429,9 @@ void MingwBackend::GenerateGlobalVariables () const { - fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", ProjectNode.GetLinkerSet ().c_str () ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", ProjectNode.GetCompilerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)rules.mak\n", RBUILD_BASE ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetLinkerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetCompilerSet ().c_str () ); if ( mscPath.length() ) fprintf ( fMakefile, "export RBUILD_CL_PATH=%s\n", mscPath.c_str () ); @@ -1093,7 +1093,8 @@ { printf ( "Detecting compiler -pipe support..." ); - string pipe_detection = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; + string rbuild_base = RBUILD_BASE; + string pipe_detection = rbuild_base + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection, ".o" ); string command = ssprintf ( @@ -1130,7 +1131,8 @@ if ( configuration.PrecompiledHeadersEnabled && ProjectNode.configuration.Compiler == GnuGcc ) { - string path = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; + string rbuild_base = RBUILD_BASE; + string path = rbuild_base + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; string cmd = ssprintf ( "%s -c %s 1>%s 2>%s", FixSeparatorForSystemCommand(compilerCommand).c_str (), Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -67,6 +67,10 @@ #define DEF_SSEP "/" #define DEF_SBAD_SEP "\\" #endif + +#define SSEP DEF_SSEP +#define TOOLS_BASE "sdk" SSEP "tools" SSEP +#define RBUILD_BASE TOOLS_BASE "rbuild" SSEP #define MS_VS_DEF_VERSION "9.00" Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -296,7 +296,7 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_TEST_SPECIAL_OBJECTS) -RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos +RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Isdk/include -Isdk/include/reactos RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" +ï»¿ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcxproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Modified: branches/Tree-restructure-test/sdk/tools/rbuild/test.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -20,10 +20,6 @@ #include "rbuild.h" #include "backend/mingw/mingw.h" - -#define SSEP DEF_SSEP - -#define RBUILD_BASE "tools" SSEP "rbuild" SSEP class BaseTest { Modified: branches/Tree-restructure-test/sdk/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -43,7 +43,7 @@ include sdk/tools/bin2c.mak include sdk/tools/buildno/buildno.mak include sdk/tools/gendib/gendib.mak -include sdk/tools/rsym/log2lines.mak +include sdk/tools/log2lines/log2lines.mak include sdk/tools/nci/nci.mak ifeq ($(ARCH),powerpc) include sdk/tools/ofw_interface/ofw_interface.mak

1 0

[gadamopoulos] 49092: Remove empty folders Attempt to sync to trunk(1/2)
by gadamopoulos＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: gadamopoulos Date: Sun Oct 10 13:43:06 2010 New Revision: 49092 URL: http://svn.reactos.org/svn/reactos?rev=49092&view=rev Log: Remove empty folders Attempt to sync to trunk(1/2) Removed: branches/Tree-restructure-test/addons/ branches/Tree-restructure-test/audio/ branches/Tree-restructure-test/directx/ branches/Tree-restructure-test/gui/ branches/Tree-restructure-test/network/ branches/Tree-restructure-test/ntcore/ branches/Tree-restructure-test/sdk/include/crt/ branches/Tree-restructure-test/sdk/include/host/ branches/Tree-restructure-test/sdk/include/psdk/ branches/Tree-restructure-test/sdk/include/reactos/ branches/Tree-restructure-test/sdk/libs/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ branches/Tree-restructure-test/sdk/libs/debugsup/ branches/Tree-restructure-test/sdk/libs/inflib/ branches/Tree-restructure-test/sdk/libs/libxml2/ branches/Tree-restructure-test/sdk/libs/mingw/ branches/Tree-restructure-test/sdk/libs/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ branches/Tree-restructure-test/sdk/libs/wcsfuncs/ branches/Tree-restructure-test/sdk/libs/zlib/ branches/Tree-restructure-test/sdk/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ branches/Tree-restructure-test/sdk/tools/syssetup.inf.tpl branches/Tree-restructure-test/sdk/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/ branches/Tree-restructure-test/win32core/ Removed: branches/Tree-restructure-test/sdk/tools/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== Binary file - no diff available.

1 0

[ekohl] 49091: [NTOSKRNL] Implement SeImpersonateClientEx() and simplify SeImpersonateClient().
by ekohl＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: ekohl Date: Sun Oct 10 11:31:51 2010 New Revision: 49091 URL: http://svn.reactos.org/svn/reactos?rev=49091&view=rev Log: [NTOSKRNL] Implement SeImpersonateClientEx() and simplify SeImpersonateClient(). Modified: trunk/reactos/ntoskrnl/se/access.c Modified: trunk/reactos/ntoskrnl/se/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/access.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] Sun Oct 10 11:31:51 2010 @@ -331,15 +331,36 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI SeImpersonateClientEx(IN PSECURITY_CLIENT_CONTEXT ClientContext, IN PETHREAD ServerThread OPTIONAL) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + BOOLEAN EffectiveOnly; + + PAGED_CODE(); + + if (ClientContext->DirectlyAccessClientToken == FALSE) + { + EffectiveOnly = ClientContext->SecurityQos.EffectiveOnly; + } + else + { + EffectiveOnly = ClientContext->DirectAccessEffectiveOnly; + } + + if (ServerThread == NULL) + { + ServerThread = PsGetCurrentThread(); + } + + return PsImpersonateClient(ServerThread, + ClientContext->ClientToken, + TRUE, + EffectiveOnly, + ClientContext->SecurityQos.ImpersonationLevel); } /* @@ -350,29 +371,10 @@ SeImpersonateClient(IN PSECURITY_CLIENT_CONTEXT ClientContext, IN PETHREAD ServerThread OPTIONAL) { - UCHAR b; - - PAGED_CODE(); - - if (ClientContext->DirectlyAccessClientToken == FALSE) - { - b = ClientContext->SecurityQos.EffectiveOnly; - } - else - { - b = ClientContext->DirectAccessEffectiveOnly; - } - - if (ServerThread == NULL) - { - ServerThread = PsGetCurrentThread(); - } - - PsImpersonateClient(ServerThread, - ClientContext->ClientToken, - 1, - b, - ClientContext->SecurityQos.ImpersonationLevel); + PAGED_CODE(); + + SeImpersonateClientEx(ClientContext, + ServerThread); } /* EOF */

1 0

[fireball] 49090: [HEAP] - Add 64 bit compatibility.
by fireball＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: fireball Date: Sun Oct 10 11:16:55 2010 New Revision: 49090 URL: http://svn.reactos.org/svn/reactos?rev=49090&view=rev Log: [HEAP] - Add 64 bit compatibility. Modified: trunk/reactos/lib/rtl/heap.h Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=49090&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Sun Oct 10 11:16:55 2010 @@ -16,7 +16,11 @@ #define HEAP_SEGMENTS 64 #define HEAP_ENTRY_SIZE ((ULONG)sizeof(HEAP_ENTRY)) +#ifdef _WIN64 +#define HEAP_ENTRY_SHIFT 4 +#else #define HEAP_ENTRY_SHIFT 3 +#endif #define HEAP_MAX_BLOCK_SIZE ((0x80000 - PAGE_SIZE) >> HEAP_ENTRY_SHIFT) #define ARENA_INUSE_FILLER 0xBAADF00D @@ -106,7 +110,11 @@ struct _HEAP_COMMON_ENTRY; } HEAP_ENTRY, *PHEAP_ENTRY; +#ifdef _WIN64 +C_ASSERT(sizeof(HEAP_ENTRY) == 16); +#else C_ASSERT(sizeof(HEAP_ENTRY) == 8); +#endif C_ASSERT((1 << HEAP_ENTRY_SHIFT) == sizeof(HEAP_ENTRY)); typedef struct _HEAP_TAG_ENTRY

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