Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 15247: Did forget include En.rc :)
by greatlrd＠svn.reactos.com 12 May '05

12 May '05

Did forget include En.rc :) Modified: trunk/reactos/subsys/system/regsvr32/En.rc Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.c Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc Modified: trunk/reactos/subsys/system/rundll32/En.rc Modified: trunk/reactos/subsys/system/rundll32/rundll32.rc _____ Modified: trunk/reactos/subsys/system/regsvr32/En.rc --- trunk/reactos/subsys/system/regsvr32/En.rc 2005-05-12 20:04:02 UTC (rev 15246) +++ trunk/reactos/subsys/system/regsvr32/En.rc 2005-05-12 20:26:34 UTC (rev 15247) @@ -7,11 +7,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { -IDS_UsageMessage, "%s\n\n\ -"Usage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ -/u - Unregister server\n"\ -/s - Silent; display no message boxes\n"\ -/c - Console output\n"\ + +IDS_UsageMessage, "%s\n\nUsage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ +/u - Unregister server\n\ +/s - Silent; display no message boxes\n\ +/c - Console output\n\ /i - Call DllInstall passing it an optional [cmdline]; when used with /u calls dll uninstall\n\ /n - Do not call DllRegisterServer; this option must be used with /i" @@ -21,12 +21,12 @@ IDS_SwitchN_NoI, "Unrecognized flag: /n must be used with the /i switch" -IDS_DllNotLoaded, "LoadLibrary(\"%s\") failed.\nGetLastError returns 0x%08x." +IDS_DllNotLoaded, "LoadLibrary('%s') failed.\nGetLastError returns 0x%08x." IDS_MissingEntry, "%s was loaded, but the %s entry point was not found.\n\n\ %s may not be exported, or a corrupt version of %s may be in memory. Consider using PView to detect and remove it." IDS_FailureMessage, "%s in %s failed.\nReturn code was: 0x%08x" -IDS_SuccessMessage = "%s in %s succeeded." +IDS_SuccessMessage "%s in %s succeeded." } _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.c --- trunk/reactos/subsys/system/regsvr32/regsvr32.c 2005-05-12 20:04:02 UTC (rev 15246) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.c 2005-05-12 20:26:34 UTC (rev 15247) @@ -52,6 +52,8 @@ #define tszDllInstall szDllInstall #endif + + #include "resource.h" LPCTSTR ModuleTitle = _T("RegSvr32"); _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc --- trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-05-12 20:04:02 UTC (rev 15246) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-05-12 20:26:34 UTC (rev 15247) @@ -1,6 +1,9 @@ /* $Id$ */ +#include <windows.h> #define REACTOS_STR_FILE_DESCRIPTION "Register a COM component in the registry\0" #define REACTOS_STR_INTERNAL_NAME "regsvr32\0" #define REACTOS_STR_ORIGINAL_FILENAME "regsvr32.exe\0" #include <reactos/version.rc> + +#include "En.rc" _____ Modified: trunk/reactos/subsys/system/rundll32/En.rc --- trunk/reactos/subsys/system/rundll32/En.rc 2005-05-12 20:04:02 UTC (rev 15246) +++ trunk/reactos/subsys/system/rundll32/En.rc 2005-05-12 20:26:34 UTC (rev 15247) @@ -7,6 +7,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { -IDS_DllNotLoaded, "LoadLibrary failed to load \'%s\'" +IDS_DllNotLoaded, "LoadLibrary failed to load '%s'" IDS_MissingEntry, "Missing entry point:%s\nIn %s" } _____ Modified: trunk/reactos/subsys/system/rundll32/rundll32.rc --- trunk/reactos/subsys/system/rundll32/rundll32.rc 2005-05-12 20:04:02 UTC (rev 15246) +++ trunk/reactos/subsys/system/rundll32/rundll32.rc 2005-05-12 20:26:34 UTC (rev 15247) @@ -1,6 +1,10 @@ /* $Id$ */ +#include <windows.h> #define REACTOS_STR_FILE_DESCRIPTION "Run a DLL as an App\0" #define REACTOS_STR_INTERNAL_NAME "rundll32\0" #define REACTOS_STR_ORIGINAL_FILENAME "rundll32.exe\0" #include <reactos/version.rc> + +#include "En.rc" +

1 0

[greatlrd] 15246: Remove all hardcode string to En.rc
by greatlrd＠svn.reactos.com 12 May '05

12 May '05

Remove all hardcode string to En.rc so it can be translate Added: trunk/reactos/subsys/system/regsvr32/En.rc Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.c Added: trunk/reactos/subsys/system/regsvr32/resource.h _____ Added: trunk/reactos/subsys/system/regsvr32/En.rc --- trunk/reactos/subsys/system/regsvr32/En.rc 2005-05-12 19:46:14 UTC (rev 15245) +++ trunk/reactos/subsys/system/regsvr32/En.rc 2005-05-12 20:04:02 UTC (rev 15246) @@ -0,0 +1,32 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ +IDS_UsageMessage, "%s\n\n\ +"Usage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ +/u - Unregister server\n"\ +/s - Silent; display no message boxes\n"\ +/c - Console output\n"\ +/i - Call DllInstall passing it an optional [cmdline]; when used with /u calls dll uninstall\n\ +/n - Do not call DllRegisterServer; this option must be used with /i" + +IDS_NoDllSpecified, "No DLL name specified." + +IDS_InvalidFlag, "Unrecognized flag: %s" + +IDS_SwitchN_NoI, "Unrecognized flag: /n must be used with the /i switch" + +IDS_DllNotLoaded, "LoadLibrary(\"%s\") failed.\nGetLastError returns 0x%08x." + +IDS_MissingEntry, "%s was loaded, but the %s entry point was not found.\n\n\ +%s may not be exported, or a corrupt version of %s may be in memory. Consider using PView to detect and remove it." + +IDS_FailureMessage, "%s in %s failed.\nReturn code was: 0x%08x" + +IDS_SuccessMessage = "%s in %s succeeded." +} _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.c --- trunk/reactos/subsys/system/regsvr32/regsvr32.c 2005-05-12 19:46:14 UTC (rev 15245) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.c 2005-05-12 20:04:02 UTC (rev 15246) @@ -52,29 +52,20 @@ #define tszDllInstall szDllInstall #endif +#include "resource.h" + LPCTSTR ModuleTitle = _T("RegSvr32"); -LPCTSTR UsageMessage = - _T("%s\n\n") - _T("Usage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n") - _T("/u - Unregister server\n") - _T("/s - Silent; display no message boxes\n") - _T("/c - Console output\n") - _T("/i - Call DllInstall passing it an optional [cmdline]; when used with /u calls dll uninstall\n") - _T("/n - Do not call DllRegisterServer; this option must be used with /i"); -LPCTSTR NoDllSpecified = _T("No DLL name specified."); -LPCTSTR InvalidFlag = _T("Unrecognized flag: %s"); -LPCTSTR SwitchN_NoI = _T("Unrecognized flag: /n must be used with the /i switch"); -LPCTSTR DllNotLoaded = - _T("LoadLibrary(\"%s\") failed.\n") - _T("GetLastError returns 0x%08x."); -LPCTSTR MissingEntry = - _T("%s was loaded, but the %s entry point was not found.\n\n") - _T("%s may not be exported, or a corrupt version of %s may be in memory. Consider using PView to detect and remove it."); -LPCTSTR FailureMessage = - _T("%s in %s failed.\n") - _T("Return code was: 0x%08x"); -LPCTSTR SuccessMessage = _T("%s in %s succeeded."); +TCHAR UsageMessage[RC_STRING_MAX_SIZE]; +TCHAR NoDllSpecified[RC_STRING_MAX_SIZE]; +TCHAR InvalidFlag[RC_STRING_MAX_SIZE]; +TCHAR SwitchN_NoI[RC_STRING_MAX_SIZE]; +TCHAR DllNotLoaded[RC_STRING_MAX_SIZE]; +TCHAR MissingEntry[RC_STRING_MAX_SIZE]; +TCHAR FailureMessage[RC_STRING_MAX_SIZE]; +TCHAR SuccessMessage[RC_STRING_MAX_SIZE]; + + // The macro CommandLineToArgv maps to a function that converts // a command-line string to argc and argv similar to the ones // in the standard main function. If this code is compiled for @@ -276,6 +267,17 @@ DWORD dwErr; int nRetValue,i; + // Get Langues msg + LoadString( GetModuleHandle(NULL), IDS_UsageMessage, (LPTSTR) UsageMessage,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_NoDllSpecified, (LPTSTR) NoDllSpecified,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_InvalidFlag, (LPTSTR) InvalidFlag,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_SwitchN_NoI, (LPTSTR) SwitchN_NoI,RC_STRING_MAX_SIZE); + + LoadString( GetModuleHandle(NULL), IDS_DllNotLoaded, (LPTSTR) DllNotLoaded,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_MissingEntry, (LPTSTR) MissingEntry,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_FailureMessage, (LPTSTR) FailureMessage,RC_STRING_MAX_SIZE); + LoadString( GetModuleHandle(NULL), IDS_SuccessMessage, (LPTSTR) SuccessMessage,RC_STRING_MAX_SIZE); + // Get command-line in argc-argv format argv = CommandLineToArgv(GetCommandLine(),&argc); @@ -328,7 +330,8 @@ } } - // An unrecognized flag was used, display a message and show available options + // An unrecognized flag was used, display a message and show available options + if (lptFuncName) { lptMsgBuffer = (LPTSTR)malloc((_tcslen(UsageMessage) - 2 + _tcslen(InvalidFlag) - 2 + _tcslen(lptFuncName) + 1) * sizeof(TCHAR)); _stprintf(lptMsgBuffer + (_tcslen(UsageMessage) - 2),InvalidFlag,lptFuncName); _____ Added: trunk/reactos/subsys/system/regsvr32/resource.h --- trunk/reactos/subsys/system/regsvr32/resource.h 2005-05-12 19:46:14 UTC (rev 15245) +++ trunk/reactos/subsys/system/regsvr32/resource.h 2005-05-12 20:04:02 UTC (rev 15246) @@ -0,0 +1,13 @@ + + +#define RC_STRING_MAX_SIZE 4096 +#define IDS_UsageMessage 100 +#define IDS_NoDllSpecified 101 +#define IDS_InvalidFlag 102 +#define IDS_SwitchN_NoI 103 +#define IDS_DllNotLoaded 104 +#define IDS_MissingEntry 105 +#define IDS_FailureMessage 106 +#define IDS_SuccessMessage 107 + +/* EOF */

1 0

[fireball] 15245: Added MessageBoxes in case of registry funcs errors
by fireball＠svn.reactos.com 12 May '05

12 May '05

Added MessageBoxes in case of registry funcs errors Modified: trunk/reactos/lib/cpl/intl/locale.c _____ Modified: trunk/reactos/lib/cpl/intl/locale.c --- trunk/reactos/lib/cpl/intl/locale.c 2005-05-12 19:32:15 UTC (rev 15244) +++ trunk/reactos/lib/cpl/intl/locale.c 2005-05-12 19:46:14 UTC (rev 15245) @@ -102,7 +102,7 @@ if (ret != ERROR_SUCCESS) { // some serious error - //TODO: Tell user about it + MessageBoxW(NULL, L"Problem opening HKCU\\Control Panel\\International key", L"Big Problem", MB_OK); return; } @@ -116,7 +116,10 @@ ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", &langKey); if (ret != ERROR_SUCCESS) + { + MessageBoxW(NULL, L"Problem opening HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language key", L"Big Problem", MB_OK); return; + } RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, valuesize ); RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, valuesize );

1 0

[chorns] 15244: Generate make rules for creating directories if they don't exist
by chorns＠svn.reactos.com 12 May '05

12 May '05

Generate make rules for creating directories if they don't exist Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-12 19:31:10 UTC (rev 15243) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-12 19:32:15 UTC (rev 15244) @@ -179,7 +179,7 @@ { string path; - if ( parent.size() ) + if ( parent.size () > 0 ) { char buf[256]; @@ -191,11 +191,62 @@ else path = name; + for ( directory_map::iterator i = subdirs.begin (); + i != subdirs.end (); + ++i ) + { + i->second->GenerateTree ( path, verbose ); + } +} + +string +Directory::EscapeSpaces ( string path ) +{ + string newpath; + char* p = &path[0]; + while ( *p != 0 ) + { + if ( *p == ' ' ) + newpath = newpath + "\\ "; + else + newpath = newpath + *p; + *p++; + } + return newpath; +} + +void +Directory::CreateRule ( FILE* f, + const string& parent ) +{ + string path; + + if ( parent.size() > 0 ) + { + string escapedParent = EscapeSpaces ( parent ); + fprintf ( f, + "%s%c%s: | %s\n", + escapedParent.c_str (), + CSEP, + EscapeSpaces ( name ).c_str (), + escapedParent.c_str () ); + + fprintf ( f, + "\t$(ECHO_MKDIR)\n" ); + + fprintf ( f, + "\t${mkdir} $@\n" ); + + path = parent + SSEP + name; + } + else + path = name; + for ( directory_map::iterator i = subdirs.begin(); i != subdirs.end(); ++i ) { - i->second->GenerateTree ( path, verbose ); + i->second->CreateRule ( f, path ); } } @@ -302,6 +353,7 @@ GenerateXmlBuildFilesMacro (); ProcessModules (); GenerateInstallTarget (); + GenerateDirectoryTargets (); GenerateDirectories (); CheckAutomaticDependencies (); CloseMakefile (); @@ -723,7 +775,7 @@ NormalizeFilename ( targetDirectory ), installDirectory ); fprintf ( fMakefile, - "%s: %s %s\n", + "%s: %s | %s\n", normalizedTargetFilename.c_str (), sourceFilename.c_str (), normalizedTargetDirectory.c_str () ); @@ -832,3 +884,11 @@ fprintf ( fMakefile, "\n" ); } + +void +MingwBackend::GenerateDirectoryTargets () +{ + intermediateDirectory->CreateRule ( fMakefile, "" ); + outputDirectory->CreateRule ( fMakefile, "" ); + installDirectory->CreateRule ( fMakefile, "" ); +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-12 19:31:10 UTC (rev 15243) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-12 19:32:15 UTC (rev 15244) @@ -34,6 +34,9 @@ void Add ( const char* subdir ); void GenerateTree ( const std::string& parent, bool verbose ); + std::string EscapeSpaces ( std::string path ); + void CreateRule ( FILE* f, + const std::string& parent ); private: bool mkdir_p ( const char* path ); std::string ReplaceVariable ( std::string name, @@ -105,6 +108,7 @@ std::string GetRegistryTargetFiles (); void OutputRegistryInstallTarget (); void GenerateInstallTarget (); + void GenerateDirectoryTargets (); FILE* fMakefile; bool use_pch; }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-12 19:31:10 UTC (rev 15243) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-12 19:32:15 UTC (rev 15244) @@ -129,7 +129,7 @@ { string target = PassThruCacheDirectory ( NormalizeFilename ( module.GetPath () ), - backend->intermediateDirectory ); + GetTargetDirectoryTree ( module ) ); if ( pclean_files ) { string_list& clean_files = *pclean_files;

1 0

[greatlrd] 15243: Remove all hardcode string to En.rc
by greatlrd＠svn.reactos.com 12 May '05

12 May '05

Remove all hardcode string to En.rc so it can be translate Added: trunk/reactos/subsys/system/rundll32/En.rc Added: trunk/reactos/subsys/system/rundll32/resource.h Modified: trunk/reactos/subsys/system/rundll32/rundll32.c _____ Added: trunk/reactos/subsys/system/rundll32/En.rc --- trunk/reactos/subsys/system/rundll32/En.rc 2005-05-12 18:20:41 UTC (rev 15242) +++ trunk/reactos/subsys/system/rundll32/En.rc 2005-05-12 19:31:10 UTC (rev 15243) @@ -0,0 +1,12 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "LoadLibrary failed to load \'%s\'" +IDS_MissingEntry, "Missing entry point:%s\nIn %s" +} _____ Added: trunk/reactos/subsys/system/rundll32/resource.h --- trunk/reactos/subsys/system/rundll32/resource.h 2005-05-12 18:20:41 UTC (rev 15242) +++ trunk/reactos/subsys/system/rundll32/resource.h 2005-05-12 19:31:10 UTC (rev 15243) @@ -0,0 +1,7 @@ + + +#define RC_STRING_MAX_SIZE 200 +#define IDS_DllNotLoaded 100 +#define IDS_MissingEntry 101 + +/* EOF */ _____ Modified: trunk/reactos/subsys/system/rundll32/rundll32.c --- trunk/reactos/subsys/system/rundll32/rundll32.c 2005-05-12 18:20:41 UTC (rev 15242) +++ trunk/reactos/subsys/system/rundll32/rundll32.c 2005-05-12 19:31:10 UTC (rev 15243) @@ -28,6 +28,7 @@ #include <string.h> #include <malloc.h> #include <tchar.h> +#include "resource.h" typedef int (WINAPI *DllWinMainW)( HWND hWnd, @@ -42,13 +43,17 @@ int nCmdShow ); +/* LPCTSTR DllNotLoaded = _T("LoadLibrary failed to load \"%s\""); LPCTSTR MissingEntry = _T("Missing entry point:%s\nIn %s"); +*/ LPCTSTR rundll32_wtitle = _T("rundll32"); LPCTSTR rundll32_wclass = _T("rundll32_window"); + TCHAR ModuleFileName[MAX_PATH+1]; LPTSTR ModuleTitle; + // CommandLineToArgv converts a command-line string to argc and // argv similar to the ones in the standard main function. // This is a specialized version coded specifically for rundll32 @@ -327,6 +332,8 @@ ) { int argc; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LPTSTR *argv; LPTSTR lptCmdLine,lptDllName,lptFuncName,lptMsgBuffer; LPSTR lpFuncName,lpaCmdLine; @@ -440,8 +447,10 @@ else { // The specified dll function was not found; display an error message GetModuleTitle(); - lptMsgBuffer = (LPTSTR)malloc((_tcslen(MissingEntry) - 4 + _tcslen(lptFuncName) + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); - _stprintf(lptMsgBuffer,MissingEntry,lptFuncName,lptDllName); + LoadString( GetModuleHandle(NULL), IDS_MissingEntry, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + + lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 4 + _tcslen(lptFuncName) + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); + _stprintf(lptMsgBuffer,szMsg,lptFuncName,lptDllName); MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); free(lptMsgBuffer); } @@ -455,8 +464,11 @@ else { // The dll could not be loaded; display an error message GetModuleTitle(); - lptMsgBuffer = (LPTSTR)malloc((_tcslen(DllNotLoaded) - 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); - _stprintf(lptMsgBuffer,DllNotLoaded,lptDllName); + LoadString( GetModuleHandle(NULL), IDS_DllNotLoaded, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + + lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); + _stprintf(lptMsgBuffer,szMsg,lptDllName); + MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); free(lptMsgBuffer); }

1 0

[greatlrd] 15242: Add hex value to Color syntax so it working fine
by greatlrd＠svn.reactos.com 12 May '05

12 May '05

Add hex value to Color syntax so it working fine Color x x = a - f Modified: trunk/reactos/subsys/system/cmd/color.c _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-05-12 18:08:25 UTC (rev 15241) +++ trunk/reactos/subsys/system/cmd/color.c 2005-05-12 18:20:41 UTC (rev 15242) @@ -91,7 +91,20 @@ if ( (_tcscmp(&rest[0], _T("0")) >=0 ) && (_tcscmp(&rest[0], _T("9")) <=0 ) ) { SetConsoleTextAttribute (hConsole, (WORD)_ttoi(rest)); + return 0; } + else if ( (_tcscmp(&rest[0], _T("a")) >=0 ) && (_tcscmp(&rest[0], _T("f")) <=0 ) ) + { + SetConsoleTextAttribute (hConsole, (WORD) (rest[0] + 10) - _T('a') ); + return 0; + } + else if ( (_tcscmp(&rest[0], _T("A")) >=0 ) && (_tcscmp(&rest[0], _T("F")) <=0 ) ) + { + SetConsoleTextAttribute (hConsole, (WORD) (rest[0] + 10) - _T('A') ); + return 0; + } + ConErrResPuts(STRING_COLOR_ERROR2); + return 1; } if (StringToColor(&wColor, &rest) == FALSE)

1 0

[weiden] 15241:
by weiden＠svn.reactos.com 12 May '05

12 May '05

Modified: trunk/reactos/lib/cpl/intl/locale.c _____ Modified: trunk/reactos/lib/cpl/intl/locale.c --- trunk/reactos/lib/cpl/intl/locale.c 2005-05-12 18:05:22 UTC (rev 15240) +++ trunk/reactos/lib/cpl/intl/locale.c 2005-05-12 18:08:25 UTC (rev 15241) @@ -95,7 +95,7 @@ HKEY langKey; DWORD ret; TCHAR value[9]; - DWORD lenvalue; + DWORD valuesize; ret = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\International", &localeKey); @@ -107,9 +107,9 @@ } wsprintf(value, L"%04X", (DWORD)lcid); - lenvalue = wcslen(value) * sizeof(WCHAR); + valuesize = (wcslen(value) + 1) * sizeof(WCHAR); - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, lenvalue); + RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); RegCloseKey(localeKey); // Set language @@ -118,8 +118,8 @@ if (ret != ERROR_SUCCESS) return; - RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, lenvalue ); - RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, lenvalue ); + RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, valuesize ); + RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, valuesize ); RegCloseKey(langKey); }

1 0

[ion] 15240: Fix uninit var
by ion＠svn.reactos.com 12 May '05

12 May '05

Fix uninit var Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-05-12 17:30:52 UTC (rev 15239) +++ trunk/reactos/ntoskrnl/io/device.c 2005-05-12 18:05:22 UTC (rev 15240) @@ -1123,7 +1123,7 @@ PIRP Irp; PIO_STACK_LOCATION StackPtr; PKEVENT EventObject = NULL; - BOOLEAN LocalEvent; + BOOLEAN LocalEvent = FALSE; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); DPRINT("NtDeviceIoControlFile(DeviceHandle %x Event %x UserApcRoutine %x "

1 0

[greatlrd] 15239: Add syntax Color x
by greatlrd＠svn.reactos.com 12 May '05

12 May '05

Add syntax Color x x = 0 to 9 Now color are working as it should Modified: trunk/reactos/subsys/system/cmd/color.c _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-05-12 16:44:39 UTC (rev 15238) +++ trunk/reactos/subsys/system/cmd/color.c 2005-05-12 17:30:52 UTC (rev 15239) @@ -84,9 +84,18 @@ SetScreenColor (wColor, TRUE); return 0; } + + + if ( _tcslen(&rest[0])==1) + { + if ( (_tcscmp(&rest[0], _T("0")) >=0 ) && (_tcscmp(&rest[0], _T("9")) <=0 ) ) + { + SetConsoleTextAttribute (hConsole, (WORD)_ttoi(rest)); + } + } if (StringToColor(&wColor, &rest) == FALSE) - { + { ConErrResPuts(STRING_COLOR_ERROR2); return 1; }

1 0

[greatlrd] 15238: Fix two spelling error
by greatlrd＠svn.reactos.com 12 May '05

12 May '05

Fix two spelling error thx dnordenberg to notice them Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-12 11:54:08 UTC (rev 15237) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-12 16:44:39 UTC (rev 15238) @@ -360,7 +360,7 @@ STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ - /E No eror messages.\n\ + /E No error messages.\n\ /N Nothing.\n\ /P Prompts for confirmation before renaming each file.\n\ (Not implemented yet!)\n\ @@ -416,7 +416,7 @@ /S Split time. Return stopwatch split\n\ time without changing its value\n\ /n Specifiy the stopwach number.\n\ - Stopwaches avaliable are 0 to 10\n\ + Stopwaches avaliable are 0 to 9\n\ If it is not specified default is 1\n\ /Fn Format for output\n\ n can be:\n\

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